commit 0ff083bab8af1bb9acfc4a140c48ae043b8dbaed
author Alexandre Julliard <julliard@winehq.org> Sun Sep 24 19:51:15 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Sep 24 19:51:15 2000 +0000
tree f0f12c3a4ec58e36839fef028f6975bee5f5c46d
parent 2a6acd3d70631e444be877ed6cf0ab8e0c15a948

Call WH_GETMESSAGE hook in PeekMessage too (based on a patch by Rob
Farnum).

windows/win.c

diff --git a/windows/win.c b/windows/win.c
index f7103d6..6342c64 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -3223,8 +3223,8 @@
  */
 BOOL WINAPI DragDetect( HWND hWnd, POINT pt )
 {
-    MSG16 msg;
-    RECT16  rect;
+    MSG msg;
+    RECT rect;
 
     rect.left = pt.x - wDragWidth;
     rect.right = pt.x + wDragWidth;
@@ -3236,7 +3236,7 @@
 
     while(1)
     {
-	while(PeekMessage16(&msg ,0 ,WM_MOUSEFIRST ,WM_MOUSELAST ,PM_REMOVE))
+	while(PeekMessageA(&msg ,0 ,WM_MOUSEFIRST ,WM_MOUSELAST ,PM_REMOVE))
         {
             if( msg.message == WM_LBUTTONUP )
 	    {
@@ -3245,7 +3245,10 @@
             }
             if( msg.message == WM_MOUSEMOVE )
 	    {
-		if( !PtInRect16( &rect, MAKEPOINT16(msg.lParam) ) )
+                POINT tmp;
+                tmp.x = LOWORD(msg.lParam);
+                tmp.y = HIWORD(msg.lParam);
+		if( !PtInRect( &rect, tmp ))
                 {
 		    ReleaseCapture();
 		    return 1;
@@ -3263,7 +3266,7 @@
 DWORD WINAPI DragObject16( HWND16 hwndScope, HWND16 hWnd, UINT16 wObj,
                            HANDLE16 hOfStruct, WORD szList, HCURSOR16 hCursor )
 {
-    MSG16	msg;
+    MSG	msg;
     LPDRAGINFO	lpDragInfo;
     SEGPTR	spDragInfo;
     HCURSOR16 	hDragCursor=0, hOldCursor=0, hBummer=0;
@@ -3318,11 +3321,12 @@
     do
     {
 	do{  WaitMessage(); }
-	while( !PeekMessage16(&msg,0,WM_MOUSEFIRST,WM_MOUSELAST,PM_REMOVE) );
+	while( !PeekMessageA(&msg,0,WM_MOUSEFIRST,WM_MOUSELAST,PM_REMOVE) );
 
        *(lpDragInfo+1) = *lpDragInfo;
 
-	lpDragInfo->pt = msg.pt;
+	lpDragInfo->pt.x = msg.pt.x;
+	lpDragInfo->pt.y = msg.pt.y;
 
 	/* update DRAGINFO struct */
 	TRACE_(msg)("lpDI->hScope = %04x\n",lpDragInfo->hScope);