[ros-diffs] [fireball] 50315: - Change SWM interface to better suit new requirements. Move to window ids instead of always referencing by hwnd (will be needed to distinct between whole and client windows).

Author: fireball
Date: Fri Jan  7 21:51:51 2011
New Revision: 50315

URL: http://svn.reactos.org/svn/reactos?rev=50315&view=rev
Log:
- Change SWM interface to better suit new requirements. Move to window ids instead of
always referencing by hwnd (will be needed to distinct between whole and client windows).

Modified:
    branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c
    branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db

Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Fri Jan  7
21:51:51 2011
@@ -329,16 +329,16 @@
 }
 
 
-VOID
-NTAPI
-SwmAddWindow(HWND hWnd, RECT *WindowRect, DWORD style, DWORD ex_style)
+GR_WINDOW_ID
+NTAPI
+SwmNewWindow(GR_WINDOW_ID parent, RECT *WindowRect, HWND hWnd, DWORD ex_style)
 {
     PSWM_WINDOW Win, FirstNonTop;
 
     DPRINT("SwmAddWindow %x\n", hWnd);
-    DPRINT("rect (%d,%d)-(%d,%d), style %x, ex_style %x\n",
+    DPRINT("rect (%d,%d)-(%d,%d), ex_style %x\n",
         WindowRect->left, WindowRect->top, WindowRect->right,
WindowRect->bottom,
-        style, ex_style);
+        ex_style);
 
     /* Acquire the lock */
     SwmAcquire();
@@ -381,6 +381,8 @@
 
     /* Release the lock */
     SwmRelease();
+
+    return (GR_WINDOW_ID)Win;
 }
 
 VOID
@@ -458,25 +460,20 @@
 
 VOID
 NTAPI
-SwmRemoveWindow(HWND hWnd)
+SwmDestroyWindow(GR_WINDOW_ID Wid)
 {
     PSWM_WINDOW Win;
+
+    /* Check for root window */
+    if (Wid == SWM_ROOT_WINDOW_ID) return;
 
     /* Acquire the lock */
     SwmAcquire();
 
-    DPRINT("SwmRemoveWindow %x\n", hWnd);
-
     /* Allocate entry */
-    Win = SwmFindByHwnd(hWnd);
-    //ASSERT(Win != NULL);
-    if (!Win)
-    {
-        /* Release the lock */
-        SwmRelease();
-
-        return;
-    }
+    Win = (PSWM_WINDOW)Wid;
+
+    DPRINT("SwmRemoveWindow %x\n", Win->hwnd);
 
     /* Remove it from the zorder list */
     RemoveEntryList(&Win->Entry);
@@ -713,13 +710,7 @@
 
 VOID
 NTAPI
-SwmPosChanging(HWND hWnd, const RECT *WindowRect)
-{
-}
-
-VOID
-NTAPI
-SwmPosChanged(HWND hWnd, const RECT *WindowRect, const RECT *OldRect, HWND hWndAfter,
UINT SwpFlags)
+SwmPosChanged(GR_WINDOW_ID Wid, const RECT *WindowRect, const RECT *OldRect, HWND
hWndAfter, UINT SwpFlags)
 {
     PSWM_WINDOW SwmWin, SwmPrev;
     LONG Width, Height, OldWidth, OldHeight;
@@ -727,17 +718,13 @@
     struct region *OldRegion, *DiffRegion;
     rectangle_t OldRectSafe;
 
+    /* Check for root window */
+    if (Wid == SWM_ROOT_WINDOW_ID) return;
+
     /* Acquire the lock */
     SwmAcquire();
 
-    /* Allocate entry */
-    SwmWin = SwmFindByHwnd(hWnd);
-    if (!SwmWin)
-    {
-        /* Release the lock */
-        SwmRelease();
-        return;
-    }
+    SwmWin = (PSWM_WINDOW)Wid;
 
     /* Save parameters */
     OldRectSafe.left = OldRect->left; OldRectSafe.top = OldRect->top;
@@ -770,7 +757,7 @@
         return;
     }
 
-    DPRINT("SwmPosChanged hwnd %x, new rect (%d,%d)-(%d,%d)\n", hWnd,
+    DPRINT("SwmPosChanged hwnd %x, new rect (%d,%d)-(%d,%d)\n",
SwmWin->hwnd,
         WindowRect->left, WindowRect->top, WindowRect->right,
WindowRect->bottom);
 
     SwmWin->Window.left = WindowRect->left;
@@ -828,24 +815,20 @@
 
 VOID
 NTAPI
-SwmShowWindow(HWND hWnd, BOOLEAN Show, UINT SwpFlags)
+SwmShowWindow(GR_WINDOW_ID Wid, BOOLEAN Show, UINT SwpFlags)
 {
     PSWM_WINDOW Win;
     struct region *OldRegion;
 
+    /* Check for root window */
+    if (Wid == SWM_ROOT_WINDOW_ID) return;
+
     /* Acquire the lock */
     SwmAcquire();
 
-    DPRINT("SwmShowWindow %x, Show %d\n", hWnd, Show);
-
-    /* Allocate entry */
-    Win = SwmFindByHwnd(hWnd);
-    if (!Win)
-    {
-        /* Release the lock */
-        SwmRelease();
-        return;
-    }
+    Win = (PSWM_WINDOW)Wid;
+
+    DPRINT("SwmShowWindow %x, Show %d\n", Win->hwnd, Show);
 
     if (Show && Win->Hidden)
     {

Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Fri Jan  7
21:51:51 2011
@@ -85,11 +85,10 @@
 RosUserRegisterShellHookWindow     1
 RosUserDeRegisterShellHookWindow   1
 RosUserBuildShellHookHwndList      2
-SwmAddWindow                       4
+SwmNewWindow                       4
 SwmAddDesktopWindow                3
-SwmRemoveWindow                    1
+SwmDestroyWindow                   1
 SwmSetForeground                   1
-SwmPosChanging                     2
 SwmPosChanged                      5
 SwmGetWindowFromPoint              2
 SwmShowWindow                      3