Moved window move/resize syscommand handling to the graphics driver.

dlls/ttydrv/ttydrv.h

@@ -134,8 +134,6 @@ extern struct tagWND_DRIVER TTYDRV_WND_Driver;
 extern HANDLE TTYDRV_LoadOEMResource(WORD resid, WORD type);
 
 extern void TTYDRV_WND_ForceWindowRaise(struct tagWND *pWnd);
-extern void TTYDRV_WND_PreSizeMove(struct tagWND *wndPtr);
-extern void TTYDRV_WND_PostSizeMove(struct tagWND *wndPtr);
 extern void TTYDRV_WND_ScrollWindow(struct tagWND *wndPtr, HDC hdc, INT dx, INT dy, const RECT *clipRect, BOOL bUpdate);
 extern BOOL TTYDRV_WND_SetHostAttr(struct tagWND *wndPtr, INT haKey, INT value);
 

dlls/ttydrv/wnd.c

@@ -18,8 +18,6 @@ DEFAULT_DEBUG_CHANNEL(ttydrv);
 WND_DRIVER TTYDRV_WND_Driver =
 {
   TTYDRV_WND_ForceWindowRaise,
-  TTYDRV_WND_PreSizeMove,
-  TTYDRV_WND_PostSizeMove,
   TTYDRV_WND_ScrollWindow,
   TTYDRV_WND_SetHostAttr
 };
@@ -101,22 +99,6 @@ void TTYDRV_WND_ForceWindowRaise(WND *wndPtr)
 }
 
 /*****************************************************************
- *		TTYDRV_WND_PreSizeMove
- */
-void TTYDRV_WND_PreSizeMove(WND *wndPtr)
-{
-  FIXME("(%p): stub\n", wndPtr);
-}
-
-/*****************************************************************
- *		 TTYDRV_WND_PostSizeMove
- */
-void TTYDRV_WND_PostSizeMove(WND *wndPtr)
-{
-  FIXME("(%p): stub\n", wndPtr);
-}
-
-/*****************************************************************
  *		 TTYDRV_WND_ScrollWindow
  */
 void TTYDRV_WND_ScrollWindow( WND *wndPtr, HDC hdc, INT dx, INT dy, 

dlls/user/user_main.c

@@ -94,6 +94,7 @@ static BOOL load_driver(void)
     GET_USER_FUNC(SetWindowRgn);
     GET_USER_FUNC(SetWindowIcon);
     GET_USER_FUNC(SetWindowText);
+    GET_USER_FUNC(SysCommandSizeMove);
 
     return TRUE;
 }

dlls/x11drv/x11drv.spec

@@ -38,6 +38,7 @@ debug_channels (bitblt bitmap clipboard cursor dinput event font gdi graphics
 @ cdecl SetWindowRgn(long long long) X11DRV_SetWindowRgn
 @ cdecl SetWindowIcon(long long long) X11DRV_SetWindowIcon
 @ cdecl SetWindowText(long wstr) X11DRV_SetWindowText
+@ cdecl SysCommandSizeMove(long long) X11DRV_SysCommandSizeMove
 @ cdecl IsSingleWindow() X11DRV_IsSingleWindow
 @ cdecl AcquireClipboard() X11DRV_AcquireClipboard
 @ cdecl ReleaseClipboard() X11DRV_ReleaseClipboard

include/nonclient.h

@@ -22,5 +22,6 @@ extern LONG   NC_HandleSetCursor( HWND hwnd, WPARAM16 wParam, LPARAM lParam );
 extern void   NC_DrawSysButton( HWND hwnd, HDC hdc, BOOL down );
 extern BOOL NC_DrawSysButton95( HWND hwnd, HDC hdc, BOOL down );
 extern BOOL NC_GetSysPopupPos( struct tagWND* wndPtr, RECT* rect );
+extern void NC_GetInsideRect( HWND hwnd, RECT *rect );
 
 #endif /* __WINE_NONCLIENT_H */

include/user.h

@@ -81,6 +81,7 @@ typedef struct tagUSER_DRIVER {
     BOOL   (*pSetWindowRgn)(HWND,HRGN,BOOL);
     HICON  (*pSetWindowIcon)(HWND,HICON,BOOL);
     BOOL   (*pSetWindowText)(HWND,LPCWSTR);
+    void   (*pSysCommandSizeMove)(HWND,WPARAM);
     BOOL   (*pIsSingleWindow)(void);
 } USER_DRIVER;
 

include/win.h

@@ -71,8 +71,6 @@ typedef struct tagWND
 typedef struct tagWND_DRIVER
 {
     void   (*pForceWindowRaise)(WND *);
-    void   (*pPreSizeMove)(WND *);
-    void   (*pPostSizeMove)(WND *);
     void   (*pSurfaceCopy)(WND *, HDC, INT, INT, const RECT *, BOOL);
     BOOL   (*pSetHostAttr)(WND *, INT haKey, INT value);
 } WND_DRIVER;

include/x11drv.h

@@ -391,8 +391,6 @@ extern Window X11DRV_WND_FindXWindow(struct tagWND *wndPtr);
 extern void X11DRV_WND_ForceWindowRaise(struct tagWND *pWnd);
 extern void X11DRV_WND_SetWindowPos(struct tagWND *wndPtr, const struct tagWINDOWPOS *winpos, BOOL bSMC_SETXPOS);
 extern void X11DRV_WND_SetText(struct tagWND *wndPtr, LPCWSTR text);
-extern void X11DRV_WND_PreSizeMove(struct tagWND *wndPtr);
-extern void X11DRV_WND_PostSizeMove(struct tagWND *wndPtr);
 extern void X11DRV_WND_SurfaceCopy(struct tagWND *wndPtr, HDC hdc, INT dx, INT dy, const RECT *clipRect, BOOL bUpdate);
 extern void X11DRV_WND_SetGravity(struct tagWND* wndPtr, int value );
 extern BOOL X11DRV_WND_SetHostAttr(struct tagWND *wndPtr, INT haKey, INT value);

windows/x11drv/wnd.c

@@ -41,8 +41,6 @@ extern Atom wmChangeState;
 WND_DRIVER X11DRV_WND_Driver =
 {
   X11DRV_WND_ForceWindowRaise,
-  X11DRV_WND_PreSizeMove,
-  X11DRV_WND_PostSizeMove,
   X11DRV_WND_SurfaceCopy,
   X11DRV_WND_SetHostAttr
 };
@@ -317,27 +315,6 @@ void X11DRV_WND_SetWindowPos(WND *wndPtr, const WINDOWPOS *winpos, BOOL bChangeP
 }
 
 /*****************************************************************
- *		X11DRV_WND_PreSizeMove
- */
-void X11DRV_WND_PreSizeMove(WND *wndPtr)
-{
-  /* Grab the server only when moving top-level windows without desktop */
-  if ((X11DRV_GetXRootWindow() == DefaultRootWindow(display)) &&
-      (wndPtr->parent->hwndSelf == GetDesktopWindow()))
-    TSXGrabServer( display );
-}
-
-/*****************************************************************
- *		 X11DRV_WND_PostSizeMove
- */
-void X11DRV_WND_PostSizeMove(WND *wndPtr)
-{
-  if ((X11DRV_GetXRootWindow() == DefaultRootWindow(display)) &&
-      (wndPtr->parent->hwndSelf == GetDesktopWindow()))
-    TSXUngrabServer( display );
-}
-
-/*****************************************************************
  *		 X11DRV_WND_SurfaceCopy
  *
  * Copies rect to (rect.left + dx, rect.top + dy).