[akhaldi] 72027: [0.4.2] * Merge the shell fix by Giannis in r72026. CORE-11681

Author: akhaldi
Date: Wed Jul 27 21:35:54 2016
New Revision: 72027

URL: http://svn.reactos.org/svn/reactos?rev=72027&view=rev
Log:
[0.4.2] * Merge the shell fix by Giannis in r72026. CORE-11681

Modified:
    branches/ros-branch-0_4_2/   (props changed)
    branches/ros-branch-0_4_2/reactos/   (props changed)
    branches/ros-branch-0_4_2/reactos/dll/win32/shell32/folders/CFSFolder.cpp

Propchange: branches/ros-branch-0_4_2/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed Jul 27 21:35:54 2016
@@ -1 +1 @@
-/trunk:72020-72022
+/trunk:72020-72022,72026

Propchange: branches/ros-branch-0_4_2/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed Jul 27 21:35:54 2016
@@ -20,4 +20,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:72020-72022
+/trunk/reactos:72020-72022,72026

Modified: branches/ros-branch-0_4_2/reactos/dll/win32/shell32/folders/CFSFolder.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_4_2/reactos/dll/win32/shell32/folders/CFSFolder.cpp	[iso-8859-1]
(original)
+++ branches/ros-branch-0_4_2/reactos/dll/win32/shell32/folders/CFSFolder.cpp	[iso-8859-1]
Wed Jul 27 21:35:54 2016
@@ -1236,6 +1236,11 @@
 {
     TRACE("(%p) object dropped, effect %u\n", this, *pdwEffect);
     
+    if (!pdwEffect)
+        return E_INVALIDARG;
+
+    QueryDrop(dwKeyState, pdwEffect);
+
     BOOL fIsOpAsync = FALSE;
     CComPtr<IAsyncOperation> pAsyncOperation;