wine/dlls/shell32 shell32_main.h

[Alexandre Julliard]

ChangeSet ID:	21478
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard at winehq.org	2005/11/28 05:04:35

Modified files:
	dlls/shell32   : shell32_main.h 

Log message:
	Michael Jung <mjung at iss.tu-darmstadt.de>
	Modified KeyStateToDropEffect macro to match native shellview's
	behaviour.

Patch: http://cvs.winehq.org/patch.py?id=21478

Old revision  New revision  Changes     Path
 1.109         1.110         +3 -3       wine/dlls/shell32/shell32_main.h

Index: wine/dlls/shell32/shell32_main.h
diff -u -p wine/dlls/shell32/shell32_main.h:1.109 wine/dlls/shell32/shell32_main.h:1.110
--- wine/dlls/shell32/shell32_main.h:1.109	28 Nov 2005 11: 4:35 -0000
+++ wine/dlls/shell32/shell32_main.h	28 Nov 2005 11: 4:35 -0000
@@ -121,9 +121,9 @@ HRESULT WINAPI Shell_MergeMenus (HMENU h
 	};
 
 #define KeyStateToDropEffect(kst)\
-	(((kst) & MK_CONTROL) ?\
-	(((kst) & MK_SHIFT) ? DROPEFFECT_LINK : DROPEFFECT_COPY):\
-	DROPEFFECT_MOVE)
+    ((((kst)&(MK_CONTROL|MK_SHIFT))==(MK_CONTROL|MK_SHIFT)) ? DROPEFFECT_LINK :\
+    (((kst)&(MK_CONTROL|MK_SHIFT)) ? DROPEFFECT_COPY :\
+    DROPEFFECT_MOVE))
 
 /* Systray */
 BOOL SYSTRAY_Init(void);