commit dea3d786e47c0b1242cf519625c87780c800dc10
author François Gouget <fgouget@codeweavers.com> Tue Jan 02 21:00:46 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Jan 02 21:00:46 2001 +0000
tree 807c97abf2cdf671ad600f1ee2a236690e50c5ba
parent 504973de499496e334fd523c431ae957d8f65e0a

Moved HDROP to shellapi.h.

dlls/shell32/shellole.c

diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index 4eb090b..ec1fe85 100644
--- a/dlls/shell32/shellole.c
+++ b/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

diff --git a/include/shellapi.h b/include/shellapi.h
index b964fc8..03b1b2c 100644
--- a/include/shellapi.h
+++ b/include/shellapi.h
@@ -9,6 +9,8 @@
 
 #include "pshpack1.h"
 
+DECLARE_HANDLE(HDROP);
+
 /******************************************
  * DragObject
  */

include/windef.h

diff --git a/include/windef.h b/include/windef.h
index 3e0f0db..c057d4c 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -67,7 +67,6 @@
 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(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

diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index b1c3760..2204d39 100644
--- a/windows/x11drv/event.c
+++ b/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 @@
 		      p += strlen(p) + 1;
 		    }
 		  *p_drop = '\0';
-		  PostMessageA( hWnd, WM_DROPFILES, hDrop, 0L );
+		  PostMessageA( hWnd, WM_DROPFILES, (WPARAM)hDrop, 0L );
 		}
 	    }
 	}
@@ -1708,7 +1709,7 @@
       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 @@
 	}
 
         GlobalUnlock(hDrop);
-        PostMessageA( hWnd, WM_DROPFILES, hDrop, 0L );
+        PostMessageA( hWnd, WM_DROPFILES, (WPARAM)hDrop, 0L );
       }
       WIN_ReleaseWndPtr(pDropWnd);
     }