[3/5] GetWindowLongPtr: X11Drv

[Robert Shearman]

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/x11drv/desktop.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/desktop.c,v
retrieving revision 1.20
diff -u -p -r1.20 desktop.c
--- wine/dlls/x11drv/desktop.c	11 Aug 2004 23:45:34 -0000	1.20
+++ wine/dlls/x11drv/desktop.c	22 Sep 2004 15:48:27 -0000
@@ -80,7 +80,7 @@ static DWORD CALLBACK desktop_thread( LP
     X11DRV_register_window( display, hwnd, win->pDriverData );
     WIN_ReleasePtr( win );
 
-    SetWindowLongW( hwnd, GWL_WNDPROC, (LONG)desktop_winproc );
+    SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_winproc );
     wine_tsx11_lock();
     XChangeProperty ( display, root_window, x11drv_atom(WM_PROTOCOLS),
                       XA_ATOM, 32, PropModeReplace, (char *)&atom, 1 );
Index: wine/dlls/x11drv/window.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/window.c,v
retrieving revision 1.80
diff -u -p -r1.80 window.c
--- wine/dlls/x11drv/window.c	9 Sep 2004 00:30:29 -0000	1.80
+++ wine/dlls/x11drv/window.c	22 Sep 2004 15:48:28 -0000
@@ -1282,7 +1282,7 @@ HWND X11DRV_SetParent( HWND hwnd, HWND p
         {
             if (!(wndPtr->dwStyle & WS_CHILD))
             {
-                HMENU menu = (HMENU)SetWindowLongW( hwnd, GWL_ID, 0 );
+                HMENU menu = (HMENU)SetWindowLongPtrW( hwnd, GWLP_ID, 0 );
                 if (menu) DestroyMenu( menu );
             }
         }
Index: wine/dlls/x11drv/x11ddraw.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/x11ddraw.c,v
retrieving revision 1.25
diff -u -p -r1.25 x11ddraw.c
--- wine/dlls/x11drv/x11ddraw.c	11 Aug 2004 23:45:34 -0000	1.25
+++ wine/dlls/x11drv/x11ddraw.c	22 Sep 2004 15:48:28 -0000
@@ -108,15 +108,13 @@ static void GrabPointer(BOOL grab)
   if(!X11DRV_DD_GrabMessage)
     X11DRV_DD_GrabMessage = RegisterWindowMessageA("WINE_X11DRV_GRABPOINTER");
 
-  /* FIXME: Replace with SetWindowLongPtrA when available */
-  X11DRV_DD_GrabOldProcedure = (WNDPROC)SetWindowLongA(X11DRV_DD_PrimaryWnd,
-                                                       GWL_WNDPROC, (LONG)GrabWndProc);
+  X11DRV_DD_GrabOldProcedure = (WNDPROC)SetWindowLongPtrA(X11DRV_DD_PrimaryWnd,
+                                                       GWLP_WNDPROC, (LONG_PTR)GrabWndProc);
 
   SendMessageA(X11DRV_DD_PrimaryWnd, X11DRV_DD_GrabMessage, grab ? 1 : 0, 0);
 
-  /* FIXME: Replace with SetWindowLongPtrA when available */
-  if(SetWindowLongA(X11DRV_DD_PrimaryWnd, GWL_WNDPROC,
-                    (LONG)X11DRV_DD_GrabOldProcedure) != (LONG)GrabWndProc)
+  if(SetWindowLongPtrA(X11DRV_DD_PrimaryWnd, GWLP_WNDPROC,
+                    (LONG_PTR)X11DRV_DD_GrabOldProcedure) != (LONG_PTR)GrabWndProc)
     ERR("Window procedure has been changed!\n");
 }