[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 74f3494e80625f94d6bc0de37917a4cd76622fa2
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 4 05:36:28 2010 +0000

    2010-11-03  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Adam Roben.
    
            Port WCDataObject.cpp to WinCE
            https://bugs.webkit.org/show_bug.cgi?id=48921
    
            OleDuplicateData is not supported on WinCE.
    
            * platform/win/WCDataObject.cpp:
            (WebCore::WCDataObject::CopyMedium):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71307 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f137e2d..9485361 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Adam Roben.
 
+        Port WCDataObject.cpp to WinCE
+        https://bugs.webkit.org/show_bug.cgi?id=48921
+
+        OleDuplicateData is not supported on WinCE.
+
+        * platform/win/WCDataObject.cpp:
+        (WebCore::WCDataObject::CopyMedium):
+
+2010-11-03  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Adam Roben.
+
         Port ClipboardWin.cpp to WinCE
         https://bugs.webkit.org/show_bug.cgi?id=48412
 
diff --git a/WebCore/platform/win/WCDataObject.cpp b/WebCore/platform/win/WCDataObject.cpp
index aaa41cf..6b4c859 100644
--- a/WebCore/platform/win/WCDataObject.cpp
+++ b/WebCore/platform/win/WCDataObject.cpp
@@ -285,6 +285,7 @@ void WCDataObject::CopyMedium(STGMEDIUM* pMedDest, STGMEDIUM* pMedSrc, FORMATETC
 {
     switch(pMedSrc->tymed)
     {
+#if !OS(WINCE)
     case TYMED_HGLOBAL:
         pMedDest->hGlobal = (HGLOBAL)OleDuplicateData(pMedSrc->hGlobal,pFmtSrc->cfFormat, 0);
         break;
@@ -300,6 +301,7 @@ void WCDataObject::CopyMedium(STGMEDIUM* pMedDest, STGMEDIUM* pMedSrc, FORMATETC
     case TYMED_FILE:
         pMedSrc->lpszFileName = (LPOLESTR)OleDuplicateData(pMedSrc->lpszFileName,pFmtSrc->cfFormat, 0);
         break;
+#endif
     case TYMED_ISTREAM:
         pMedDest->pstm = pMedSrc->pstm;
         pMedSrc->pstm->AddRef();

-- 
WebKit Debian packaging