Changeset 121319 in webkit

Timestamp:

Jun 26, 2012, 9:22:47 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

DragData::asFilenames should not push same file names to result in Windows.
​https://bugs.webkit.org/show_bug.cgi?id=79861

Patch by Xueqing Huang <​huangxueqing@baidu.com> on 2012-06-26
Reviewed by Alexey Proskuryakov.

Source/WebCore:

Test: platform/win/fast/forms/file/drag-and-drop-files.html

• platform/win/DragDataWin.cpp:

(WebCore::DragData::asFilenames):

LayoutTests:

• platform/win/fast/forms/file/drag-and-drop-files-expected.txt: Added.
• platform/win/fast/forms/file/drag-and-drop-files.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/win/fast/forms/file/drag-and-drop-files-expected.txt (added)
• LayoutTests/platform/win/fast/forms/file/drag-and-drop-files.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/win/DragDataWin.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-26  Xueqing Huang  <huangxueqing@baidu.com>
+
+        DragData::asFilenames should not push same file names to result in Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=79861
+
+        Reviewed by Alexey Proskuryakov.
+
+        * platform/win/fast/forms/file/drag-and-drop-files-expected.txt: Added.
+        * platform/win/fast/forms/file/drag-and-drop-files.html: Added.
+
 2012-06-26  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-26  Xueqing Huang  <huangxueqing@baidu.com>
+
+        DragData::asFilenames should not push same file names to result in Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=79861
+
+        Reviewed by Alexey Proskuryakov.
+
+        Test: platform/win/fast/forms/file/drag-and-drop-files.html 
+
+        * platform/win/DragDataWin.cpp:
+        (WebCore::DragData::asFilenames):
+
 2012-06-26  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/platform/win/DragDataWin.cpp

@@ -141 +141 @@
         if (FAILED(m_platformDragData->GetData(cfHDropFormat(), &medium)))
             return;
-        
-        HDROP hdrop = (HDROP)GlobalLock(medium.hGlobal);
+       
+        HDROP hdrop = reinterpret_cast<HDROP>(GlobalLock(medium.hGlobal)); 
         
         if (!hdrop)
@@ -149 +149 @@
         const unsigned numFiles = DragQueryFileW(hdrop, 0xFFFFFFFF, 0, 0);
         for (unsigned i = 0; i < numFiles; i++) {
-            if (!DragQueryFileW(hdrop, 0, filename, WTF_ARRAY_LENGTH(filename)))
+            if (!DragQueryFileW(hdrop, i, filename, WTF_ARRAY_LENGTH(filename)))
                 continue;
-            result.append((UChar*)filename);
+            result.append(static_cast<UChar*>(filename)); 
         }