[5/5] GetWindowLongPtr: User

Robert Shearman rob at codeweavers.com
Wed Sep 22 12:18:17 CDT 2004


Hi,

Once again, if this patch conflicts with your work just shout and make 
Alexandre drop it for the moment.

Rob

Changelog:
GetWindowLong -> GetWindowLongPtr.
-------------- next part --------------
Index: wine/dlls/user/dialog16.c
===================================================================
RCS file: /home/wine/wine/dlls/user/dialog16.c,v
retrieving revision 1.7
diff -u -p -r1.7 dialog16.c
--- wine/dlls/user/dialog16.c	14 Jul 2004 00:49:40 -0000	1.7
+++ wine/dlls/user/dialog16.c	22 Sep 2004 17:13:29 -0000
@@ -196,7 +196,7 @@ static BOOL DIALOG_CreateControls16( HWN
                 SendMessageA( hwndDefButton, BM_SETSTYLE,
                                 BS_PUSHBUTTON,FALSE );
             hwndDefButton = hwndCtrl;
-            dlgInfo->idResult = GetWindowLongA( hwndCtrl, GWL_ID );
+            dlgInfo->idResult = GetWindowLongPtrA( hwndCtrl, GWLP_ID );
         }
     }
     TRACE(" END\n" );
Index: wine/dlls/user/message.c
===================================================================
RCS file: /home/wine/wine/dlls/user/message.c,v
retrieving revision 1.51
diff -u -p -r1.51 message.c
--- wine/dlls/user/message.c	15 Sep 2004 18:04:07 -0000	1.51
+++ wine/dlls/user/message.c	22 Sep 2004 17:13:30 -0000
@@ -1452,12 +1452,12 @@ static LRESULT call_window_proc( HWND hw
     /* now call the window procedure */
     if (unicode)
     {
-        if (!(winproc = (WNDPROC)GetWindowLongW( hwnd, GWL_WNDPROC ))) goto done;
+        if (!(winproc = (WNDPROC)GetWindowLongPtrW( hwnd, GWLP_WNDPROC ))) goto done;
         result = CallWindowProcW( winproc, hwnd, msg, wparam, lparam );
     }
     else
     {
-        if (!(winproc = (WNDPROC)GetWindowLongA( hwnd, GWL_WNDPROC ))) goto done;
+        if (!(winproc = (WNDPROC)GetWindowLongPtrA( hwnd, GWLP_WNDPROC ))) goto done;
         result = CallWindowProcA( winproc, hwnd, msg, wparam, lparam );
     }
 
Index: wine/dlls/user/msg16.c
===================================================================
RCS file: /home/wine/wine/dlls/user/msg16.c,v
retrieving revision 1.23
diff -u -p -r1.23 msg16.c
--- wine/dlls/user/msg16.c	31 Dec 2003 00:15:16 -0000	1.23
+++ wine/dlls/user/msg16.c	22 Sep 2004 17:13:30 -0000
@@ -64,7 +64,7 @@ LRESULT WINAPI SendMessage16( HWND16 hwn
             }
         }
 
-        if (!(winproc = (WNDPROC16)GetWindowLong16( hwnd16, GWL_WNDPROC ))) return 0;
+        if (!(winproc = (WNDPROC16)GetWindowLong16( hwnd16, GWLP_WNDPROC ))) return 0;
 
         SPY_EnterMessage( SPY_SENDMESSAGE16, hwnd, msg, wparam, lparam );
         result = CallWindowProc16( (WNDPROC16)winproc, hwnd16, msg, wparam, lparam );


More information about the wine-patches mailing list