Moved HDROP to shellapi.h.

dlls/shell32/shellole.c

@@ -10,6 +10,7 @@
 #include <string.h>
 
 #include "shlobj.h"
+#include "shellapi.h"
 #include "shlguid.h"
 #include "winreg.h"
 #include "wine/unicode.h"

include/shellapi.h

@@ -9,6 +9,8 @@ extern "C" {
 
 #include "pshpack1.h"
 
+DECLARE_HANDLE(HDROP);
+
 /******************************************
  * DragObject
  */

include/windef.h

@@ -67,7 +67,6 @@ DECLARE_OLD_HANDLE(HBITMAP);
 DECLARE_OLD_HANDLE(HBRUSH);
 DECLARE_HANDLE(HCOLORSPACE);
 DECLARE_OLD_HANDLE(HDC);
-DECLARE_OLD_HANDLE(HDROP);
 DECLARE_OLD_HANDLE(HDRVR);
 DECLARE_OLD_HANDLE(HDWP);
 DECLARE_OLD_HANDLE(HENHMETAFILE);
@@ -87,7 +86,6 @@ DECLARE_OLD_HANDLE(HMIXEROBJ);
 DECLARE_OLD_HANDLE(HMMIO);
 DECLARE_OLD_HANDLE(HPALETTE);
 DECLARE_OLD_HANDLE(HPEN);
-DECLARE_OLD_HANDLE(HQUEUE);
 DECLARE_OLD_HANDLE(HRGN);
 DECLARE_OLD_HANDLE(HRSRC);
 DECLARE_OLD_HANDLE(HTASK);

windows/x11drv/event.c

@@ -41,6 +41,7 @@
 #include "file.h"
 #include "windef.h"
 #include "x11drv.h"
+#include "shellapi.h"
 
 DEFAULT_DEBUG_CHANNEL(event);
 DECLARE_DEBUG_CHANNEL(win);
@@ -1628,7 +1629,7 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event )
 		      p += strlen(p) + 1;
 		    }
 		  *p_drop = '\0';
-		  PostMessageA( hWnd, WM_DROPFILES, hDrop, 0L );
+		  PostMessageA( hWnd, WM_DROPFILES, (WPARAM)hDrop, 0L );
 		}
 	    }
 	}
@@ -1708,7 +1709,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
       pDropWnd = WIN_FindWndPtr( hWnd );
       
       drop_len += sizeof(DROPFILES) + 1;
-      hDrop = (HDROP)GlobalAlloc( GMEM_SHARE, drop_len );
+      hDrop = GlobalAlloc( GMEM_SHARE, drop_len );
       lpDrop = (DROPFILES *) GlobalLock( hDrop );
 
       if( lpDrop ) {
@@ -1752,7 +1753,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
 	}
 
         GlobalUnlock(hDrop);
-        PostMessageA( hWnd, WM_DROPFILES, hDrop, 0L );
+        PostMessageA( hWnd, WM_DROPFILES, (WPARAM)hDrop, 0L );
       }
       WIN_ReleaseWndPtr(pDropWnd);
     }