[ros-diffs] [tfaber] 60805: [SHELL32] - Fix copy/paste in shell views when multiple files are selected. Patch by Huw Campbell CORE-4771

Author: tfaber
Date: Thu Oct 31 16:46:14 2013
New Revision: 60805

URL: http://svn.reactos.org/svn/reactos?rev=60805&view=rev
Log:
[SHELL32]
- Fix copy/paste in shell views when multiple files are selected. Patch by Huw Campbell
CORE-4771

Modified:
    trunk/reactos/dll/win32/shell32/folders/desktop.cpp
    trunk/reactos/dll/win32/shell32/folders/fs.cpp

Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/desktop.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/desktop.cpp	[iso-8859-1] Thu Oct 31 16:46:14
2013
@@ -1283,14 +1283,16 @@
             }
 
             op.pTo = szTargetPath;
+            op.fFlags = 0;
         }
         else
         {
             op.pTo = pszTargetList;
+            op.fFlags = FOF_MULTIDESTFILES;
         }
         op.hwnd = GetActiveWindow();
         op.wFunc = FO_COPY;
-        op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR;
+        op.fFlags |= FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR;
 
         res = SHFileOperationW(&op);
 

Modified: trunk/reactos/dll/win32/shell32/folders/fs.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/fs.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/fs.cpp	[iso-8859-1] Thu Oct 31 16:46:14 2013
@@ -1124,14 +1124,16 @@
             }
 
             op.pTo = szTargetPath;
+            op.fFlags = 0;
         }
         else
         {
             op.pTo = pszTargetList;
+            op.fFlags = FOF_MULTIDESTFILES;
         }
         op.hwnd = GetActiveWindow();
         op.wFunc = FO_COPY;
-        op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR;
+        op.fFlags |= FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR;
 
         res = SHFileOperationW(&op);