Author: gadamopoulos
Date: Wed Jul 27 20:51:36 2016
New Revision: 72026
URL:
http://svn.reactos.org/svn/reactos?rev=72026&view=rev
Log:
[SHELL32]
- Query the drop effect from the key state. After latest wine sync we correctly get all
possible effects instead of the effect of the last DragOver event.
CORE-11681
Modified:
trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp
Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Wed Jul 27 20:51:36
2016
@@ -1177,7 +1177,7 @@
if (fAcceptFmt) { /* Does our interpretation of the keystate ... */
*pdwEffect = KeyStateToDropEffect (dwKeyState);
-
+
if (*pdwEffect == DROPEFFECT_NONE)
*pdwEffect = dwEffect;
@@ -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;