[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
paroga at webkit.org
paroga at webkit.org
Wed Dec 22 15:28:00 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b7c516ded1eb4e20c6239ca33f6018cb4e77c216
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 4 04:10:29 2010 +0000
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
* platform/win/ClipboardWin.cpp:
(WebCore::writeFileToDataObject):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71304 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 73975a4..f137e2d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -6,6 +6,16 @@
https://bugs.webkit.org/show_bug.cgi?id=48412
* platform/win/ClipboardWin.cpp:
+ (WebCore::writeFileToDataObject):
+
+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
+
+ * platform/win/ClipboardWin.cpp:
(WebCore::filesystemPathFromUrlOrTitle):
(WebCore::createGlobalHDropContent):
(WebCore::ClipboardWin::files):
diff --git a/WebCore/platform/win/ClipboardWin.cpp b/WebCore/platform/win/ClipboardWin.cpp
index 3754090..5bc2557 100644
--- a/WebCore/platform/win/ClipboardWin.cpp
+++ b/WebCore/platform/win/ClipboardWin.cpp
@@ -318,11 +318,13 @@ static HRESULT writeFileToDataObject(IDataObject* dataObject, HGLOBAL fileDescri
if (FAILED(hr = dataObject->SetData(fe, &medium, TRUE)))
goto exit;
+#if PLATFORM(CF)
// HDROP
if (hDropContent) {
medium.hGlobal = hDropContent;
hr = dataObject->SetData(cfHDropFormat(), &medium, TRUE);
}
+#endif
exit:
if (FAILED(hr)) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list