[jimtabor] 42130: - [Win32k] Rename class and window structures.

Author: jimtabor
Date: Wed Jul 22 07:23:08 2009
New Revision: 42130

URL: http://svn.reactos.org/svn/reactos?rev=42130&view=rev
Log:
- [Win32k] Rename class and window structures.


Modified:
    trunk/reactos/dll/win32/user32/include/user32.h
    trunk/reactos/dll/win32/user32/include/window.h
    trunk/reactos/dll/win32/user32/misc/misc.c
    trunk/reactos/dll/win32/user32/windows/class.c
    trunk/reactos/dll/win32/user32/windows/defwnd.c
    trunk/reactos/dll/win32/user32/windows/dialog.c
    trunk/reactos/dll/win32/user32/windows/menu.c
    trunk/reactos/dll/win32/user32/windows/message.c
    trunk/reactos/dll/win32/user32/windows/prop.c
    trunk/reactos/dll/win32/user32/windows/window.c
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/win32k/include/class.h
    trunk/reactos/subsystems/win32/win32k/include/desktop.h
    trunk/reactos/subsystems/win32/win32k/include/win32.h
    trunk/reactos/subsystems/win32/win32k/include/window.h
    trunk/reactos/subsystems/win32/win32k/ntuser/class.c
    trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c
    trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c
    trunk/reactos/subsystems/win32/win32k/ntuser/focus.c
    trunk/reactos/subsystems/win32/win32k/ntuser/painting.c
    trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c
    trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c
    trunk/reactos/subsystems/win32/win32k/ntuser/vis.c
    trunk/reactos/subsystems/win32/win32k/ntuser/windc.c
    trunk/reactos/subsystems/win32/win32k/ntuser/window.c
    trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c

Modified: trunk/reactos/dll/win32/user32/include/user32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Wed Jul 22 07:23:08 2009
@@ -109,11 +109,11 @@
 }
 
 PCALLPROC FASTCALL ValidateCallProc(HANDLE hCallProc);
-PWINDOW FASTCALL ValidateHwnd(HWND hwnd);
-PWINDOW FASTCALL ValidateHwndOrDesk(HWND hwnd);
-PWINDOW FASTCALL GetThreadDesktopWnd(VOID);
+PWND FASTCALL ValidateHwnd(HWND hwnd);
+PWND FASTCALL ValidateHwndOrDesk(HWND hwnd);
+PWND FASTCALL GetThreadDesktopWnd(VOID);
 PVOID FASTCALL ValidateHandleNoErr(HANDLE handle, UINT uType);
-PWINDOW FASTCALL ValidateHwndNoErr(HWND hwnd);
+PWND FASTCALL ValidateHwndNoErr(HWND hwnd);
 VOID FASTCALL GetConnected(VOID);
 BOOL FASTCALL DefSetText(HWND hWnd, PCWSTR String, BOOL Ansi);
-BOOL FASTCALL TestWindowProcess(PWINDOW);
+BOOL FASTCALL TestWindowProcess(PWND);

Modified: trunk/reactos/dll/win32/user32/include/window.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/w…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] Wed Jul 22 07:23:08 2009
@@ -40,7 +40,7 @@
 void
 UserGetFrameSize(ULONG Style, ULONG ExStyle, SIZE *Size);
 void
-UserGetInsideRectNC(PWINDOW Wnd, RECT *rect);
+UserGetInsideRectNC(PWND Wnd, RECT *rect);
 
 DWORD
 SCROLL_HitTest( HWND hwnd, INT nBar, POINT pt, BOOL bDragging );

Modified: trunk/reactos/dll/win32/user32/misc/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Wed Jul 22 07:23:08 2009
@@ -268,7 +268,7 @@
 
 BOOL
 FASTCALL
-TestWindowProcess(PWINDOW Wnd)
+TestWindowProcess(PWND Wnd)
 {
    if (Wnd->ti == (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo)
       return TRUE;
@@ -440,11 +440,11 @@
 //
 // Validate a window handle and return the pointer to the object.
 //
-PWINDOW
+PWND
 FASTCALL
 ValidateHwnd(HWND hwnd)
 {
-    PWINDOW Wnd;
+    PWND Wnd;
     PCLIENTINFO ClientInfo = GetWin32ClientInfo();
     ASSERT(ClientInfo != NULL);
 
@@ -479,11 +479,11 @@
 //
 // Validate a window handle and return the pointer to the object.
 //
-PWINDOW
+PWND
 FASTCALL
 ValidateHwndNoErr(HWND hwnd)
 {
-    PWINDOW Wnd;
+    PWND Wnd;
     PCLIENTINFO ClientInfo = GetWin32ClientInfo();
     ASSERT(ClientInfo != NULL);
 
@@ -515,11 +515,11 @@
     return NULL;
 }
 
-PWINDOW
+PWND
 FASTCALL
 GetThreadDesktopWnd(VOID)
 {
-    PWINDOW Wnd = GetThreadDesktopInfo()->Wnd;
+    PWND Wnd = GetThreadDesktopInfo()->Wnd;
     if (Wnd != NULL)
         Wnd = DesktopPtrToUser(Wnd);
     return Wnd;
@@ -528,7 +528,7 @@
 //
 // Validate a window handle and return the pointer to the object.
 //
-PWINDOW
+PWND
 FASTCALL
 ValidateHwndOrDesk(HWND hwnd)
 {

Modified: trunk/reactos/dll/win32/user32/windows/class.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Wed Jul 22 07:23:08 2009
@@ -194,8 +194,8 @@
 DWORD WINAPI
 GetClassLongA(HWND hWnd, int nIndex)
 {
-    PWINDOW Wnd;
-    PWINDOWCLASS Class;
+    PWND Wnd;
+    PCLS Class;
     ULONG_PTR Ret = 0;
 
     TRACE("%p %d\n", hWnd, nIndex);
@@ -307,8 +307,8 @@
 DWORD WINAPI
 GetClassLongW ( HWND hWnd, int nIndex )
 {
-    PWINDOW Wnd;
-    PWINDOWCLASS Class;
+    PWND Wnd;
+    PCLS Class;
     ULONG_PTR Ret = 0;
 
     TRACE("%p %d\n", hWnd, nIndex);
@@ -500,7 +500,7 @@
 WINAPI
 GetWindowLongA ( HWND hWnd, int nIndex )
 {
-    PWINDOW Wnd;
+    PWND Wnd;
 
     Wnd = ValidateHwnd(hWnd);
     if (Wnd == NULL)
@@ -557,7 +557,7 @@
 WINAPI
 GetWindowLongW(HWND hWnd, int nIndex)
 {
-    PWINDOW Wnd;
+    PWND Wnd;
 
     Wnd = ValidateHwnd(hWnd);
     if (Wnd == NULL)

Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Wed Jul 22 07:23:08 2009
@@ -115,7 +115,7 @@
 }
 
 void
-UserGetInsideRectNC(PWINDOW Wnd, RECT *rect)
+UserGetInsideRectNC(PWND Wnd, RECT *rect)
 {
     ULONG Style;
     ULONG ExStyle;
@@ -262,7 +262,7 @@
 }
 
 static LONG
-DefWndStartSizeMove(HWND hWnd, PWINDOW Wnd, WPARAM wParam, POINT *capturePoint)
+DefWndStartSizeMove(HWND hWnd, PWND Wnd, WPARAM wParam, POINT *capturePoint)
 {
   LONG hittest = 0;
   POINT pt;
@@ -409,7 +409,7 @@
   DWORD dwPoint = GetMessagePos();
   BOOL DragFullWindows = FALSE;
   HWND hWndParent = NULL;
-  PWINDOW Wnd;
+  PWND Wnd;
 
   Wnd = ValidateHwnd(hwnd);
   if (!Wnd)
@@ -1616,7 +1616,7 @@
         case WM_QUERYUISTATE:
         {
             LRESULT Ret = 0;
-            PWINDOW Wnd = ValidateHwnd(hWnd);
+            PWND Wnd = ValidateHwnd(hWnd);
             if (Wnd != NULL)
             {
                 if (Wnd->HideFocus)
@@ -1632,7 +1632,7 @@
             BOOL AlwaysShowCues = FALSE;
             WORD Action = LOWORD(wParam);
             WORD Flags = HIWORD(wParam);
-            PWINDOW Wnd;
+            PWND Wnd;
 
             SystemParametersInfoW(SPI_GETKEYBOARDCUES, 0, &AlwaysShowCues, 0);
             if (AlwaysShowCues)
@@ -1694,7 +1694,7 @@
             {
                 /* We're a child window and we need to pass this message down until
                    we reach the root */
-                hWnd = UserHMGetHandle((PWINDOW)DesktopPtrToUser(Wnd->spwndParent));
+                hWnd = UserHMGetHandle((PWND)DesktopPtrToUser(Wnd->spwndParent));
             }
             else
             {
@@ -1714,7 +1714,7 @@
             BOOL AlwaysShowCues = FALSE;
             WORD Action = LOWORD(wParam);
             WORD Flags = HIWORD(wParam);
-            PWINDOW Wnd;
+            PWND Wnd;
 
             SystemParametersInfoW(SPI_GETKEYBOARDCUES, 0, &AlwaysShowCues, 0);
             if (AlwaysShowCues)
@@ -1870,7 +1870,7 @@
 	       LPARAM lParam)
 {
     LRESULT Result = 0;
-    PWINDOW Wnd;
+    PWND Wnd;
 
     SPY_EnterMessage(SPY_DEFWNDPROC, hWnd, Msg, wParam, lParam);
     switch (Msg)
@@ -2019,7 +2019,7 @@
 	       LPARAM lParam)
 {
     LRESULT Result = 0;
-    PWINDOW Wnd;
+    PWND Wnd;
 
     SPY_EnterMessage(SPY_DEFWNDPROC, hWnd, Msg, wParam, lParam);
     switch (Msg)

Modified: trunk/reactos/dll/win32/user32/windows/dialog.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Wed Jul 22 07:23:08 2009
@@ -146,7 +146,7 @@
 */
 DIALOGINFO * DIALOG_get_info( HWND hWnd, BOOL create )
 {
-    PWINDOW pWindow;
+    PWND pWindow;
     DIALOGINFO* dlgInfo = (DIALOGINFO *)GetWindowLongPtrW( hWnd, DWLP_ROS_DIALOGINFO );
 
     if(!dlgInfo && create)

Modified: trunk/reactos/dll/win32/user32/windows/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Jul 22 07:23:08 2009
@@ -566,7 +566,7 @@
   PWCHAR Text;
   BOOL flat_menu = FALSE;
   int bkgnd;
-  PWINDOW Wnd = ValidateHwnd(hWnd);
+  PWND Wnd = ValidateHwnd(hWnd);
 
   if (!Wnd)
       return;

Modified: trunk/reactos/dll/win32/user32/windows/message.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Wed Jul 22 07:23:08
2009
@@ -1304,7 +1304,7 @@
 
 
 static LRESULT WINAPI
-IntCallMessageProc(IN PWINDOW Wnd, IN HWND hWnd, IN UINT Msg, IN WPARAM wParam, IN LPARAM
lParam, IN BOOL Ansi)
+IntCallMessageProc(IN PWND Wnd, IN HWND hWnd, IN UINT Msg, IN WPARAM wParam, IN LPARAM
lParam, IN BOOL Ansi)
 {
     WNDPROC WndProc;
     BOOL IsAnsi;
@@ -1335,7 +1335,7 @@
 {
     LRESULT Ret = 0;
     MSG UnicodeMsg;
-    PWINDOW Wnd;
+    PWND Wnd;
 
     if (lpmsg->hwnd != NULL)
     {
@@ -1396,7 +1396,7 @@
 DispatchMessageW(CONST MSG *lpmsg)
 {
     LRESULT Ret = 0;
-    PWINDOW Wnd;
+    PWND Wnd;
 
     if (lpmsg->hwnd != NULL)
     {
@@ -1797,7 +1797,7 @@
 
   if (Wnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST))
   {
-      PWINDOW Window;
+      PWND Window;
       PW32THREADINFO ti = GetW32ThreadInfo();
 
       Window = ValidateHwnd(Wnd);
@@ -1861,7 +1861,7 @@
 
   if (Wnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST))
   {
-      PWINDOW Window;
+      PWND Window;
       PW32THREADINFO ti = GetW32ThreadInfo();
 
       Window = ValidateHwnd(Wnd);

Modified: trunk/reactos/dll/win32/user32/windows/prop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/prop.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/prop.c [iso-8859-1] Wed Jul 22 07:23:08 2009
@@ -43,7 +43,7 @@
 {
   PLIST_ENTRY ListEntry, temp;
   PPROPERTY Property;
-  PWINDOW pWnd;
+  PWND pWnd;
   int i;
 
   pWnd = ValidateHwnd(hWnd);

Modified: trunk/reactos/dll/win32/user32/windows/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Wed Jul 22 07:23:08 2009
@@ -515,7 +515,7 @@
 HWND WINAPI
 GetDesktopWindow(VOID)
 {
-    PWINDOW Wnd;
+    PWND Wnd;
     HWND Ret = NULL;
 
     _SEH2_TRY
@@ -838,7 +838,7 @@
 GetAncestor(HWND hwnd, UINT gaFlags)
 {
     HWND Ret = NULL;
-    PWINDOW Ancestor, Wnd;
+    PWND Ancestor, Wnd;
     
     Wnd = ValidateHwnd(hwnd);
     if (!Wnd)
@@ -882,7 +882,7 @@
 BOOL WINAPI
 GetClientRect(HWND hWnd, LPRECT lpRect)
 {
-    PWINDOW Wnd = ValidateHwnd(hWnd);
+    PWND Wnd = ValidateHwnd(hWnd);
 
     if (Wnd != NULL)
     {
@@ -902,7 +902,7 @@
 HWND WINAPI
 GetLastActivePopup(HWND hWnd)
 {
-    PWINDOW Wnd;
+    PWND Wnd;
     HWND Ret = hWnd;
 
     Wnd = ValidateHwnd(hWnd);
@@ -929,7 +929,7 @@
 HWND WINAPI
 GetParent(HWND hWnd)
 {
-    PWINDOW Wnd, WndParent;
+    PWND Wnd, WndParent;
     HWND Ret = NULL;
 
     Wnd = ValidateHwnd(hWnd);
@@ -989,7 +989,7 @@
 GetWindow(HWND hWnd,
           UINT uCmd)
 {
-    PWINDOW Wnd, FoundWnd;
+    PWND Wnd, FoundWnd;
     HWND Ret = NULL;
 
     Wnd = ValidateHwnd(hWnd);
@@ -1095,7 +1095,7 @@
 GetWindowRect(HWND hWnd,
               LPRECT lpRect)
 {
-    PWINDOW Wnd = ValidateHwnd(hWnd);
+    PWND Wnd = ValidateHwnd(hWnd);
 
     if (Wnd != NULL)
     {
@@ -1113,7 +1113,7 @@
 int WINAPI
 GetWindowTextA(HWND hWnd, LPSTR lpString, int nMaxCount)
 {
-    PWINDOW Wnd;
+    PWND Wnd;
     PCWSTR Buffer;
     INT Length = 0;
 
@@ -1203,7 +1203,7 @@
 int WINAPI
 GetWindowTextW(HWND hWnd, LPWSTR lpString, int nMaxCount)
 {
-    PWINDOW Wnd;
+    PWND Wnd;
     PCWSTR Buffer;
     INT Length = 0;
 
@@ -1264,7 +1264,7 @@
 {
     DWORD Ret = 0;
     PW32THREADINFO ti;
-    PWINDOW pWnd = ValidateHwnd(hWnd);
+    PWND pWnd = ValidateHwnd(hWnd);
 
     if (!pWnd) return Ret;
 
@@ -1298,7 +1298,7 @@
 IsChild(HWND hWndParent,
     HWND hWnd)
 {
-    PWINDOW WndParent, Wnd;
+    PWND WndParent, Wnd;
     BOOL Ret = FALSE;
 
     WndParent = ValidateHwnd(hWndParent);
@@ -1341,7 +1341,7 @@
 BOOL WINAPI
 IsIconic(HWND hWnd)
 {
-    PWINDOW Wnd = ValidateHwnd(hWnd);
+    PWND Wnd = ValidateHwnd(hWnd);
 
     if (Wnd != NULL)
         return (Wnd->style & WS_MINIMIZE) != 0;
@@ -1356,7 +1356,7 @@
 BOOL WINAPI
 IsWindow(HWND hWnd)
 {
-    PWINDOW Wnd = ValidateHwndNoErr(hWnd);
+    PWND Wnd = ValidateHwndNoErr(hWnd);
     if (Wnd != NULL)
     {
         /* FIXME: If window is being destroyed return FALSE! */
@@ -1373,7 +1373,7 @@
 BOOL WINAPI
 IsWindowUnicode(HWND hWnd)
 {
-    PWINDOW Wnd = ValidateHwnd(hWnd);
+    PWND Wnd = ValidateHwnd(hWnd);
 
     if (Wnd != NULL)
         return Wnd->Unicode;
@@ -1389,7 +1389,7 @@
 IsWindowVisible(HWND hWnd)
 {
     BOOL Ret = FALSE;
-    PWINDOW Wnd = ValidateHwnd(hWnd);
+    PWND Wnd = ValidateHwnd(hWnd);
 
     if (Wnd != NULL)
     {
@@ -1678,7 +1678,7 @@
 int WINAPI
 MapWindowPoints(HWND hWndFrom, HWND hWndTo, LPPOINT lpPoints, UINT cPoints)
 {
-    PWINDOW FromWnd, ToWnd;
+    PWND FromWnd, ToWnd;
     POINT Delta;
     UINT i;
 
@@ -1709,7 +1709,7 @@
 BOOL WINAPI
 ScreenToClient(HWND hWnd, LPPOINT lpPoint)
 {
-    PWINDOW Wnd, DesktopWnd;
+    PWND Wnd, DesktopWnd;
 
     Wnd = ValidateHwnd(hWnd);
     if (!Wnd)
@@ -1730,7 +1730,7 @@
 BOOL WINAPI
 ClientToScreen(HWND hWnd, LPPOINT lpPoint)
 {
-    PWINDOW Wnd, DesktopWnd;
+    PWND Wnd, DesktopWnd;
 
     Wnd = ValidateHwnd(hWnd);
     if (!Wnd)

Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Jul 22 07:23:08 2009
@@ -3,7 +3,7 @@
 
 typedef struct _PROCESSINFO *PPROCESSINFO;
 struct _W32THREADINFO;
-struct _WINDOW;
+struct _WND;
 
 typedef struct _LARGE_UNICODE_STRING
 {
@@ -75,7 +75,7 @@
     HWND hTaskManWindow;
     HWND hProgmanWindow;
     HWND hShellWindow;
-    struct _WINDOW *Wnd;
+    struct _WND *Wnd;
 
     union
     {
@@ -107,9 +107,9 @@
 #define CSF_CACHEDSMICON        0x0040
 #define CSF_WIN40COMPAT         0x0080
 
-typedef struct _WINDOWCLASS
-{
-    struct _WINDOWCLASS *pclsNext;
+typedef struct _CLS
+{
+    struct _CLS *pclsNext;
     RTL_ATOM atomClassName;
     ATOM atomNVClassName;
     DWORD fnid; // New ClassId
@@ -119,8 +119,8 @@
     PSTR  lpszClientAnsiMenuName;
     PWSTR lpszClientUnicodeMenuName;
     PCALLPROC spcpdFirst;
-    struct _WINDOWCLASS *pclsBase;
-    struct _WINDOWCLASS *pclsClone;
+    struct _CLS *pclsBase;
+    struct _CLS *pclsClone;
     ULONG cWndReferenceCount;
     UINT style;
     WNDPROC lpfnWndProc;
@@ -145,7 +145,7 @@
     UINT Global : 1;  // CS_GLOBALCLASS
     UINT MenuNameIsString : 1;
     UINT NotUsed : 27;
-} WINDOWCLASS, *PWINDOWCLASS;
+} CLS, *PCLS;
 
 
 // State Flags !Not Implemented!
@@ -239,7 +239,7 @@
 #define WS_EX2_CONSOLEWINDOW            0X00000400
 #define WS_EX2_CHILDNOACTIVATE          0X00000800
 
-typedef struct _WINDOW
+typedef struct _WND
 {
     USER_OBJHDR hdr; /* FIXME: Move out of the structure once new handle manager is
implemented */
     /* NOTE: This structure is located in the desktop heap and will
@@ -259,11 +259,11 @@
     /* Handle of the module that created the window. */
     HINSTANCE hModule;
     DWORD fnid;
-    struct _WINDOW *spwndNext;
-    struct _WINDOW *spwndPrev;
-    struct _WINDOW *spwndParent;
-    struct _WINDOW *spwndChild;
-    struct _WINDOW *spwndOwner;
+    struct _WND *spwndNext;
+    struct _WND *spwndPrev;
+    struct _WND *spwndParent;
+    struct _WND *spwndChild;
+    struct _WND *spwndOwner;
     RECT rcWindow;
     RECT rcClient;
     WNDPROC lpfnWndProc;
@@ -276,7 +276,7 @@
     };
 
     /* Pointer to the window class. */
-    PWINDOWCLASS pcls;
+    PCLS pcls;
     HRGN hrgnUpdate;
     /* Property list head.*/
     LIST_ENTRY PropListHead;
@@ -291,12 +291,12 @@
     /* Size of the extra data associated with the window. */
     ULONG cbwndExtra;
     HWND hWndLastActive;
-    struct _WINDOW *spwndLastActive;
+    struct _WND *spwndLastActive;
     //HIMC hImc; // Input context associated with this window.
     LONG dwUserData;
     //PACTIVATION_CONTEXT pActCtx;
     //PD3DMATRIX pTransForm;
-    struct _WINDOW *spwndClipboardListener;
+    struct _WND *spwndClipboardListener;
     DWORD ExStyle2;
 
     struct
@@ -312,7 +312,7 @@
     UINT InternalPosInitialized : 1;
     UINT HideFocus : 1; // WS_EX_UISTATEFOCUSRECTHIDDEN ?
     UINT HideAccel : 1; // WS_EX_UISTATEKBACCELHIDDEN ?
-} WINDOW, *PWINDOW;
+} WND, *PWND;
 
 typedef struct _PFNCLIENT
 {

Modified: trunk/reactos/subsystems/win32/win32k/include/class.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] Wed Jul 22 07:23:08
2009
@@ -44,13 +44,13 @@
 void FASTCALL
 DestroyProcessClasses(PW32PROCESS Process );
 
-PWINDOWCLASS
-IntReferenceClass(IN OUT PWINDOWCLASS BaseClass,
-                  IN OUT PWINDOWCLASS *ClassLink,
+PCLS
+IntReferenceClass(IN OUT PCLS BaseClass,
+                  IN OUT PCLS *ClassLink,
                   IN PDESKTOP Desktop);
 
 VOID
-IntDereferenceClass(IN OUT PWINDOWCLASS Class,
+IntDereferenceClass(IN OUT PCLS Class,
                     IN PDESKTOPINFO Desktop,
                     IN PPROCESSINFO pi);
 
@@ -66,7 +66,7 @@
                     IN HINSTANCE hInstance);
 
 ULONG_PTR
-UserGetClassLongPtr(IN PWINDOWCLASS Class,
+UserGetClassLongPtr(IN PCLS Class,
                     IN INT Index,
                     IN BOOL Ansi);
 
@@ -74,10 +74,10 @@
 IntGetClassAtom(IN PUNICODE_STRING ClassName,
                 IN HINSTANCE hInstance  OPTIONAL,
                 IN PPROCESSINFO pi  OPTIONAL,
-                OUT PWINDOWCLASS *BaseClass  OPTIONAL,
-                OUT PWINDOWCLASS **Link  OPTIONAL);
+                OUT PCLS *BaseClass  OPTIONAL,
+                OUT PCLS **Link  OPTIONAL);
 
-PWINDOWCLASS
+PCLS
 FASTCALL
 IntCreateClass(IN CONST WNDCLASSEXW* lpwcx,
                IN PUNICODE_STRING ClassName,
@@ -88,7 +88,7 @@
                IN PPROCESSINFO pi);
 
 PCALLPROC
-UserFindCallProc(IN PWINDOWCLASS Class,
+UserFindCallProc(IN PCLS Class,
                  IN WNDPROC WndProc,
                  IN BOOL bUnicode);
 
@@ -97,7 +97,7 @@
                           IN PREGISTER_SYSCLASS SystemClasses);
 
 VOID
-UserAddCallProcToClass(IN OUT PWINDOWCLASS Class,
+UserAddCallProcToClass(IN OUT PCLS Class,
                        IN PCALLPROC CallProc);
 
 BOOL

Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Wed Jul 22
07:23:08 2009
@@ -28,12 +28,12 @@
     PWIN32HEAP pheapDesktop;
     PSECTION_OBJECT DesktopHeapSection;
     PDESKTOPINFO DesktopInfo;
-    PWINDOW spwndMessage;
+    PWND spwndMessage;
 } DESKTOP, *PDESKTOP;
 
 extern PDESKTOP InputDesktop;
 extern HDESK InputDesktopHandle;
-extern PWINDOWCLASS DesktopWindowClass;
+extern PCLS DesktopWindowClass;
 extern HDC ScreenDeviceContext;
 extern BOOL g_PaintDesktopVersion;
 

Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Wed Jul 22 07:23:08
2009
@@ -101,9 +101,9 @@
     W32PROCESS          XzyxW32Process; /* Place holder. */
     /* ReactOS */
     HINSTANCE    hModUser;
-    PWINDOWCLASS LocalClassList;
-    PWINDOWCLASS GlobalClassList;
-    PWINDOWCLASS SystemClassList;
+    PCLS LocalClassList;
+    PCLS GlobalClassList;
+    PCLS SystemClassList;
                     
     UINT RegisteredSysClasses : 1;
                         

Modified: trunk/reactos/subsystems/win32/win32k/include/window.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Wed Jul 22
07:23:08 2009
@@ -15,7 +15,7 @@
 
 extern ATOM AtomMessage;
 
-BOOL FASTCALL UserUpdateUiState(PWINDOW Wnd, WPARAM wParam);
+BOOL FASTCALL UserUpdateUiState(PWND Wnd, WPARAM wParam);
 
 typedef struct _WINDOW_OBJECT
 {
@@ -23,7 +23,7 @@
            is a pointer to the WINDOW structure that eventually replaces
            the WINDOW_OBJECT structure! USER32 expects this pointer to
            be here until WINDOW_OBJECT has completely been superseded! */
-  PWINDOW Wnd;
+  PWND Wnd;
 
   /* Pointer to the thread information */
   PW32THREADINFO ti;
@@ -171,7 +171,7 @@
 
 VOID FASTCALL IntNotifyWinEvent(DWORD, HWND, LONG, LONG);
 
-PWINDOW APIENTRY
co_IntCreateWindowEx(DWORD,PUNICODE_STRING,PUNICODE_STRING,DWORD,LONG,LONG,LONG,LONG,HWND,HMENU,HINSTANCE,LPVOID,DWORD,BOOL);
+PWND APIENTRY
co_IntCreateWindowEx(DWORD,PUNICODE_STRING,PUNICODE_STRING,DWORD,LONG,LONG,LONG,LONG,HWND,HMENU,HINSTANCE,LPVOID,DWORD,BOOL);
 #endif /* _WIN32K_WINDOW_H */
 
 /* EOF */

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Wed Jul 22 07:23:08
2009
@@ -75,7 +75,7 @@
 /* WINDOWCLASS ***************************************************************/
 
 static VOID
-IntFreeClassMenuName(IN OUT PWINDOWCLASS Class)
+IntFreeClassMenuName(IN OUT PCLS Class)
 {
     /* free the menu name, if it was changed and allocated */
     if (Class->MenuName != NULL && Class->MenuNameIsString)
@@ -87,7 +87,7 @@
 }
 
 static VOID
-IntDestroyClass(IN OUT PWINDOWCLASS Class)
+IntDestroyClass(IN OUT PCLS Class)
 {
     /* there shouldn't be any clones anymore */
     ASSERT(Class->cWndReferenceCount == 0);
@@ -135,7 +135,7 @@
 /* clean all process classes. all process windows must cleaned first!! */
 void FASTCALL DestroyProcessClasses(PW32PROCESS Process )
 {
-    PWINDOWCLASS Class;
+    PCLS Class;
     PPROCESSINFO pi = (PPROCESSINFO)Process;
 
     if (pi != NULL)
@@ -239,7 +239,7 @@
 }
 
 PCALLPROC
-UserFindCallProc(IN PWINDOWCLASS Class,
+UserFindCallProc(IN PCLS Class,
                  IN WNDPROC WndProc,
                  IN BOOL bUnicode)
 {
@@ -261,10 +261,10 @@
 }
 
 VOID
-UserAddCallProcToClass(IN OUT PWINDOWCLASS Class,
+UserAddCallProcToClass(IN OUT PCLS Class,
                        IN PCALLPROC CallProc)
 {
-    PWINDOWCLASS BaseClass;
+    PCLS BaseClass;
 
     ASSERT(CallProc->Next == NULL);
 
@@ -283,7 +283,7 @@
 }
 
 static BOOL
-IntSetClassAtom(IN OUT PWINDOWCLASS Class,
+IntSetClassAtom(IN OUT PCLS Class,
                 IN PUNICODE_STRING ClassName)
 {
     RTL_ATOM Atom = (RTL_ATOM)0;
@@ -314,7 +314,7 @@
 }
 
 static WNDPROC
-IntGetClassWndProc(IN PWINDOWCLASS Class,
+IntGetClassWndProc(IN PCLS Class,
                    IN PPROCESSINFO pi,
                    IN BOOL Ansi)
 {
@@ -332,7 +332,7 @@
         }
         else
         {
-            PWINDOWCLASS BaseClass;
+            PCLS BaseClass;
 
             /* make sure the call procedures are located on the desktop
                of the base class! */
@@ -387,7 +387,7 @@
 }
 
 static WNDPROC
-IntSetClassWndProc(IN OUT PWINDOWCLASS Class,
+IntSetClassWndProc(IN OUT PCLS Class,
                    IN WNDPROC WndProc,
                    IN BOOL Ansi)
 {
@@ -441,13 +441,13 @@
     return Ret;
 }
 
-static PWINDOWCLASS
-IntGetClassForDesktop(IN OUT PWINDOWCLASS BaseClass,
-                      IN OUT PWINDOWCLASS *ClassLink,
+static PCLS
+IntGetClassForDesktop(IN OUT PCLS BaseClass,
+                      IN OUT PCLS *ClassLink,
                       IN PDESKTOP Desktop)
 {
     SIZE_T ClassSize;
-    PWINDOWCLASS Class;
+    PCLS Class;
 
     ASSERT(Desktop != NULL);
     ASSERT(BaseClass->pclsBase == BaseClass);
@@ -548,12 +548,12 @@
     return Class;
 }
 
-PWINDOWCLASS
-IntReferenceClass(IN OUT PWINDOWCLASS BaseClass,
-                  IN OUT PWINDOWCLASS *ClassLink,
+PCLS
+IntReferenceClass(IN OUT PCLS BaseClass,
+                  IN OUT PCLS *ClassLink,
                   IN PDESKTOP Desktop)
 {
-    PWINDOWCLASS Class;
+    PCLS Class;
 
     ASSERT(BaseClass->pclsBase == BaseClass);
 
@@ -569,11 +569,11 @@
 }
 
 static VOID
-IntMakeCloneBaseClass(IN OUT PWINDOWCLASS Class,
-                      IN OUT PWINDOWCLASS *BaseClassLink,
-                      IN OUT PWINDOWCLASS *CloneLink)
-{
-    PWINDOWCLASS Clone, BaseClass;
+IntMakeCloneBaseClass(IN OUT PCLS Class,
+                      IN OUT PCLS *BaseClassLink,
+                      IN OUT PCLS *CloneLink)
+{
+    PCLS Clone, BaseClass;
 
     ASSERT(Class->pclsBase != Class);
     ASSERT(Class->pclsBase->pclsClone != NULL);
@@ -611,11 +611,11 @@
 }
 
 VOID
-IntDereferenceClass(IN OUT PWINDOWCLASS Class,
+IntDereferenceClass(IN OUT PCLS Class,
                     IN PDESKTOPINFO Desktop,
                     IN PPROCESSINFO pi)
 {
-    PWINDOWCLASS *PrevLink, BaseClass, CurrentClass;
+    PCLS *PrevLink, BaseClass, CurrentClass;
 
     BaseClass = Class->pclsBase;
 
@@ -690,10 +690,10 @@
 }
 
 static BOOL
-IntMoveClassToSharedHeap(IN OUT PWINDOWCLASS Class,
-                         IN OUT PWINDOWCLASS **ClassLinkPtr)
-{
-    PWINDOWCLASS NewClass;
+IntMoveClassToSharedHeap(IN OUT PCLS Class,
+                         IN OUT PCLS **ClassLinkPtr)
+{
+    PCLS NewClass;
     SIZE_T ClassSize;
 
     ASSERT(Class->pclsBase == Class);
@@ -730,11 +730,11 @@
 
 static VOID
 IntCheckDesktopClasses(IN PDESKTOP Desktop,
-                       IN OUT PWINDOWCLASS *ClassList,
+                       IN OUT PCLS *ClassList,
                        IN BOOL FreeOnFailure,
                        OUT BOOL *Ret)
 {
-    PWINDOWCLASS Class, NextClass, *Link;
+    PCLS Class, NextClass, *Link;
 
     /* NOTE: We only need to check base classes! When classes are no longer needed
              on a desktop, the clones will be freed automatically as soon as possible.
@@ -835,7 +835,7 @@
     return Ret;
 }
 
-PWINDOWCLASS
+PCLS
 FASTCALL
 IntCreateClass(IN CONST WNDCLASSEXW* lpwcx,
                IN PUNICODE_STRING ClassName,
@@ -846,7 +846,7 @@
                IN PPROCESSINFO pi)
 {
     SIZE_T ClassSize;
-    PWINDOWCLASS Class = NULL;
+    PCLS Class = NULL;
     RTL_ATOM Atom;
     PWSTR pszMenuName = NULL;
     NTSTATUS Status = STATUS_SUCCESS;
@@ -998,13 +998,13 @@
     return Class;
 }
 
-static PWINDOWCLASS
+static PCLS
 IntFindClass(IN RTL_ATOM Atom,
              IN HINSTANCE hInstance,
-             IN PWINDOWCLASS *ClassList,
-             OUT PWINDOWCLASS **Link  OPTIONAL)
-{
-    PWINDOWCLASS Class, *PrevLink = ClassList;
+             IN PCLS *ClassList,
+             OUT PCLS **Link  OPTIONAL)
+{
+    PCLS Class, *PrevLink = ClassList;
 
     Class = *PrevLink;
     while (Class != NULL)
@@ -1097,8 +1097,8 @@
 IntGetClassAtom(IN PUNICODE_STRING ClassName,
                 IN HINSTANCE hInstance  OPTIONAL,
                 IN PPROCESSINFO pi  OPTIONAL,
-                OUT PWINDOWCLASS *BaseClass  OPTIONAL,
-                OUT PWINDOWCLASS **Link  OPTIONAL)
+                OUT PCLS *BaseClass  OPTIONAL,
+                OUT PCLS **Link  OPTIONAL)
 {
     RTL_ATOM Atom = (RTL_ATOM)0;
 
@@ -1108,7 +1108,7 @@
                                    &Atom) &&
         Atom != (RTL_ATOM)0)
     {
-        PWINDOWCLASS Class;
+        PCLS Class;
 
         /* attempt to locate the class object */
 
@@ -1183,7 +1183,7 @@
     PTHREADINFO pti;
     PW32THREADINFO ti;
     PPROCESSINFO pi;
-    PWINDOWCLASS Class;
+    PCLS Class;
     RTL_ATOM ClassAtom;
     RTL_ATOM Ret = (RTL_ATOM)0;
 
@@ -1236,7 +1236,7 @@
 
     if (Class != NULL)
     {
-        PWINDOWCLASS *List;
+        PCLS *List;
 
         /* Register the class */
         if (Class->System)
@@ -1260,10 +1260,10 @@
 UserUnregisterClass(IN PUNICODE_STRING ClassName,
                     IN HINSTANCE hInstance)
 {
-    PWINDOWCLASS *Link;
+    PCLS *Link;
     PPROCESSINFO pi;
     RTL_ATOM ClassAtom;
-    PWINDOWCLASS Class;
+    PCLS Class;
 
     pi = GetW32ProcessInfo();
     if (pi == NULL)
@@ -1310,7 +1310,7 @@
 }
 
 INT
-UserGetClassName(IN PWINDOWCLASS Class,
+UserGetClassName(IN PCLS Class,
                  IN OUT PUNICODE_STRING ClassName,
                  IN BOOL Ansi)
 {
@@ -1428,7 +1428,7 @@
 }
 
 ULONG_PTR
-UserGetClassLongPtr(IN PWINDOWCLASS Class,
+UserGetClassLongPtr(IN PCLS Class,
                     IN INT Index,
                     IN BOOL Ansi)
 {
@@ -1520,7 +1520,7 @@
 }
 
 static BOOL
-IntSetClassMenuName(IN PWINDOWCLASS Class,
+IntSetClassMenuName(IN PCLS Class,
                     IN PUNICODE_STRING MenuName)
 {
     BOOL Ret = FALSE;
@@ -1624,7 +1624,7 @@
 }
 
 ULONG_PTR
-UserSetClassLongPtr(IN PWINDOWCLASS Class,
+UserSetClassLongPtr(IN PCLS Class,
                     IN INT Index,
                     IN ULONG_PTR NewLong,
                     IN BOOL Ansi)
@@ -1816,7 +1816,7 @@
 }
 
 static BOOL
-UserGetClassInfo(IN PWINDOWCLASS Class,
+UserGetClassInfo(IN PCLS Class,
                  OUT PWNDCLASSEXW lpwcx,
                  IN BOOL Ansi,
                  HINSTANCE hInstance)
@@ -1862,7 +1862,7 @@
     UNICODE_STRING ClassName, MenuName;
     PPROCESSINFO pi = GetW32ProcessInfo();
     WNDCLASSEXW wc;
-    PWINDOWCLASS Class;
+    PCLS Class;
     BOOL Ret = TRUE;
 
     if (pi->RegisteredSysClasses || pi->hModUser == NULL)
@@ -1992,7 +1992,7 @@
              CapturedClassInfo.cbClsExtra +
                 CapturedName.Length +
                 CapturedMenuName.Length +
-                sizeof(WINDOWCLASS) < CapturedClassInfo.cbClsExtra ||
+                sizeof(CLS) < CapturedClassInfo.cbClsExtra ||
              CapturedClassInfo.cbWndExtra < 0 ||
              CapturedClassInfo.hInstance == NULL)
         {
@@ -2231,7 +2231,7 @@
    BOOL Ansi)
 {
     UNICODE_STRING CapturedClassName;
-    PWINDOWCLASS Class;
+    PCLS Class;
     RTL_ATOM ClassAtom;
     PPROCESSINFO pi;
     BOOL Ret = FALSE;

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Wed Jul 22 07:23:08
2009
@@ -108,7 +108,7 @@
    LPARAM lParam,
    BOOL Ansi)
 {
-   PWINDOW Wnd;
+   PWND Wnd;
    LRESULT lResult = 0;
 
    if (Msg > WM_USER) return 0;

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Wed Jul 22
07:23:08 2009
@@ -686,7 +686,7 @@
 #else
 
    PWINDOW_OBJECT DesktopWindow;
-   PWINDOW DesktopWnd;
+   PWND DesktopWnd;
 
    DesktopWindow = IntGetWindowObject(Desktop->DesktopWindow);
    if (! DesktopWindow)
@@ -914,8 +914,8 @@
    UNICODE_STRING ClassName, WindowName, MenuName;
    PPROCESSINFO pi = GetW32ProcessInfo();
    WNDCLASSEXW wc;
-   PWINDOWCLASS Class;
-   PWINDOW pWnd;
+   PCLS Class;
+   PWND pWnd;
    DECLARE_RETURN(HDESK);
 
    DPRINT("Enter NtUserCreateDesktop: %wZ\n", lpszDesktopName);

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Wed Jul 22 07:23:08
2009
@@ -196,7 +196,7 @@
    HWND hWndFocus = FocusWindow->hSelf;
    HWND hWndFocusPrev = NULL;
    PUSER_MESSAGE_QUEUE PrevForegroundQueue;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    ASSERT_REFS_CO(Window);
 
@@ -273,7 +273,7 @@
    HWND Top;
    PWINDOW_OBJECT TopWindow;
    USER_REFERENCE_ENTRY Ref;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    ASSERT_REFS_CO(Window);
 
@@ -319,7 +319,7 @@
    PUSER_MESSAGE_QUEUE ThreadQueue;
    HWND hWndPrev;
    HWND hWnd = 0;
-   PWINDOW Wnd;
+   PWND Wnd;
    CBTACTIVATESTRUCT cbt;
 
    if (Window)
@@ -577,7 +577,7 @@
       HWND hWndPrev;
       PWINDOW_OBJECT TopWnd;
       USER_REFERENCE_ENTRY Ref;
-      PWINDOW Wnd;
+      PWND Wnd;
 
       ASSERT_REFS_CO(Window);
 

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Wed Jul 22
07:23:08 2009
@@ -58,7 +58,7 @@
 IntIntersectWithParents(PWINDOW_OBJECT Child, RECTL *WindowRect)
 {
    PWINDOW_OBJECT ParentWindow;
-   PWINDOW ParentWnd;
+   PWND ParentWnd;
 
    ParentWindow = Child->Parent;
    while (ParentWindow != NULL)
@@ -87,7 +87,7 @@
 IntValidateParent(PWINDOW_OBJECT Child, HRGN hValidateRgn, BOOL Recurse)
 {
    PWINDOW_OBJECT ParentWindow = Child->Parent;
-   PWINDOW ParentWnd;
+   PWND ParentWnd;
 
    while (ParentWindow)
    {
@@ -119,7 +119,7 @@
 HRGN FASTCALL
 IntCalcWindowRgn(PWINDOW_OBJECT Window, BOOL Client)
 {
-   PWINDOW Wnd;
+   PWND Wnd;
    HRGN hRgnWindow;
    UINT RgnType;
 
@@ -241,7 +241,7 @@
    HDC hDC;
    HWND hWnd = Window->hSelf;
    HRGN TempRegion;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    Wnd = Window->Wnd;
 
@@ -339,7 +339,7 @@
 IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags)
 {
    INT RgnType;
-   PWINDOW Wnd;
+   PWND Wnd;
    BOOL HadPaintMessage, HadNCPaintMessage;
    BOOL HasPaintMessage, HasNCPaintMessage;
 
@@ -511,7 +511,7 @@
 IntIsWindowDrawable(PWINDOW_OBJECT Window)
 {
    PWINDOW_OBJECT WndObject;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    for (WndObject = Window; WndObject != NULL; WndObject = WndObject->Parent)
    {
@@ -628,7 +628,7 @@
 BOOL FASTCALL
 IntIsWindowDirty(PWINDOW_OBJECT Window)
 {
-   PWINDOW Wnd = Window->Wnd;
+   PWND Wnd = Window->Wnd;
    return (Wnd->style & WS_VISIBLE) &&
           ((Window->UpdateRegion != NULL) ||
            (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) ||
@@ -640,7 +640,7 @@
 {
    HWND hChild;
    PWINDOW_OBJECT TempWindow;
-   PWINDOW Wnd, TempWnd;
+   PWND Wnd, TempWnd;
 
    for (; Window != NULL; Window = Window->NextSibling)
    {
@@ -773,7 +773,7 @@
    NTSTATUS Status;
    DECLARE_RETURN(HDC);
    USER_REFERENCE_ENTRY Ref;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    DPRINT("Enter NtUserBeginPaint\n");
    UserEnterExclusive();
@@ -1623,7 +1623,7 @@
    RECTL r = *lpRc;
    LONG ButtonWidth, IconWidth;
    BOOL HasIcon;
-   PWINDOW Wnd = NULL;
+   PWND Wnd = NULL;
 
    //ASSERT(pWnd != NULL);
 

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] Wed Jul 22
07:23:08 2009
@@ -60,7 +60,7 @@
 IntGetScrollBarRect (PWINDOW_OBJECT Window, INT nBar, RECTL *lprect)
 {
    BOOL vertical;
-   PWINDOW Wnd = Window->Wnd;
+   PWND Wnd = Window->Wnd;
    RECTL ClientRect = Window->Wnd->rcClient;
    RECTL WindowRect = Window->Wnd->rcWindow;
 
@@ -105,7 +105,7 @@
 BOOL FASTCALL
 IntCalculateThumb(PWINDOW_OBJECT Window, LONG idObject, PSCROLLBARINFO psbi, LPSCROLLINFO
psi)
 {
-   PWINDOW Wnd = Window->Wnd;
+   PWND Wnd = Window->Wnd;
    INT Thumb, ThumbBox, ThumbPos, cxy, mx;
    RECTL ClientRect;
 
@@ -829,7 +829,7 @@
 co_UserShowScrollBar(PWINDOW_OBJECT Window, int wBar, DWORD bShow)
 {
    DWORD Style, OldStyle;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    ASSERT_REFS_CO(Window);
 

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Wed Jul 22
07:23:08 2009
@@ -646,7 +646,7 @@
 {
    BOOL Ret = 0;
    PWINDOW_OBJECT Window;
-   PWINDOW Wnd;
+   PWND Wnd;
    USER_REFERENCE_ENTRY Ref;
    DECLARE_RETURN(BOOLEAN);
 

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] Wed Jul 22 07:23:08
2009
@@ -39,7 +39,7 @@
 {
    HRGN VisRgn, ClipRgn;
    PWINDOW_OBJECT PreviousWindow, CurrentWindow, CurrentSibling;
-   PWINDOW Wnd, CurrentWnd, PreviousWnd, CurrentSiblingWnd;
+   PWND Wnd, CurrentWnd, PreviousWnd, CurrentSiblingWnd;
 
    Wnd = Window->Wnd;
 
@@ -151,7 +151,7 @@
    HRGN Temp;
    PWINDOW_OBJECT Parent;
    USER_REFERENCE_ENTRY Ref;
-   PWINDOW Wnd, ParentWnd;
+   PWND Wnd, ParentWnd;
 
    ASSERT_REFS_CO(Window);
 

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Wed Jul 22 07:23:08
2009
@@ -73,7 +73,7 @@
 DceAllocDCE(PWINDOW_OBJECT Window OPTIONAL, DCE_TYPE Type)
 {
   PDCE pDce;
-  PWINDOW Wnd = NULL;
+  PWND Wnd = NULL;
 
   if (Window) Wnd = Window->Wnd;
 
@@ -137,7 +137,7 @@
 DceSetDrawable(PWINDOW_OBJECT Window OPTIONAL, HDC hDC, ULONG Flags,
                BOOL SetClipOrigin)
 {
-  PWINDOW Wnd;
+  PWND Wnd;
   DC *dc = DC_LockDc(hDC);
   if(!dc)
       return;
@@ -240,7 +240,7 @@
    if (Flags & DCX_PARENTCLIP)
    {
       PWINDOW_OBJECT Parent;
-      PWINDOW ParentWnd;
+      PWND ParentWnd;
 
       Parent = Window->Parent;
       if(!Parent)
@@ -323,7 +323,7 @@
    DCE* Dce = NULL;
    BOOL UpdateVisRgn = TRUE;
    BOOL UpdateClipOrigin = FALSE;
-   PWINDOW Wnd = NULL;
+   PWND Wnd = NULL;
    HDC hDC = NULL;   
 
    if (NULL == Window)

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Jul 22 07:23:08
2009
@@ -49,7 +49,7 @@
 
 /* HELPER FUNCTIONS ***********************************************************/
 
-BOOL FASTCALL UserUpdateUiState(PWINDOW Wnd, WPARAM wParam)
+BOOL FASTCALL UserUpdateUiState(PWND Wnd, WPARAM wParam)
 {
     WORD Action = LOWORD(wParam);
     WORD Flags = HIWORD(wParam);
@@ -317,7 +317,7 @@
 UserFreeWindowInfo(PW32THREADINFO ti, PWINDOW_OBJECT WindowObject)
 {
     PCLIENTINFO ClientInfo = GetWin32ClientInfo();
-    PWINDOW Wnd = WindowObject->Wnd;
+    PWND Wnd = WindowObject->Wnd;
 
     if (ClientInfo->CallbackWnd.pvWnd ==
DesktopHeapAddressToUser(WindowObject->Wnd))
     {
@@ -357,7 +357,7 @@
    PWINDOW_OBJECT Child;
    PMENU_OBJECT Menu;
    BOOLEAN BelongsToThreadData;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    ASSERT(Window);
 
@@ -509,7 +509,7 @@
 VOID FASTCALL
 IntGetWindowBorderMeasures(PWINDOW_OBJECT Window, UINT *cx, UINT *cy)
 {
-   PWINDOW Wnd = Window->Wnd;
+   PWND Wnd = Window->Wnd;
    if(HAS_DLGFRAME(Wnd->style, Wnd->ExStyle) && !(Wnd->style &
WS_MINIMIZE))
    {
       *cx = UserGetSystemMetrics(SM_CXDLGFRAME);
@@ -538,7 +538,7 @@
 IntGetWindowProc(IN PWINDOW_OBJECT Window,
                  IN BOOL Ansi)
 {
-    PWINDOW Wnd = Window->Wnd;
+    PWND Wnd = Window->Wnd;
 
     ASSERT(UserIsEnteredExclusive() == TRUE);
 
@@ -595,7 +595,7 @@
 BOOL FASTCALL
 IntGetWindowInfo(PWINDOW_OBJECT Window, PWINDOWINFO pwi)
 {
-   PWINDOW Wnd = Window->Wnd;
+   PWND Wnd = Window->Wnd;
 
    pwi->cbSize = sizeof(WINDOWINFO);
    pwi->rcWindow = Window->Wnd->rcWindow;
@@ -616,7 +616,7 @@
    BOOL *Changed)
 {
    PMENU_OBJECT OldMenu, NewMenu = NULL;
-   PWINDOW Wnd = Window->Wnd;
+   PWND Wnd = Window->Wnd;
 
    if ((Wnd->style & (WS_CHILD | WS_POPUP)) == WS_CHILD)
    {
@@ -870,7 +870,7 @@
 IntIsChildWindow(PWINDOW_OBJECT Parent, PWINDOW_OBJECT BaseWindow)
 {
    PWINDOW_OBJECT Window;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    Window = BaseWindow;
    while (Window)
@@ -895,7 +895,7 @@
 IntIsWindowVisible(PWINDOW_OBJECT BaseWindow)
 {
    PWINDOW_OBJECT Window;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    Window = BaseWindow;
    while(Window)
@@ -1179,7 +1179,7 @@
 FASTCALL
 IntGetWindowPlacement(PWINDOW_OBJECT Window, WINDOWPLACEMENT *lpwndpl)
 {
-   PWINDOW Wnd;
+   PWND Wnd;
    POINT Size;
 
    Wnd = Window->Wnd;
@@ -1438,7 +1438,7 @@
       for(phWnd = List; *phWnd; phWnd++)
       {
          PWINDOW_OBJECT Child;
-         PWINDOW ChildWnd;
+         PWND ChildWnd;
          if((Child = UserGetWindowObject(*phWnd)))
          {
             ChildWnd = Child->Wnd;
@@ -1518,7 +1518,7 @@
 /*
  * @implemented
  */
-PWINDOW APIENTRY
+PWND APIENTRY
 co_IntCreateWindowEx(DWORD dwExStyle,
                      PUNICODE_STRING ClassName,
                      PUNICODE_STRING WindowName,
@@ -1535,8 +1535,8 @@
                      BOOL bUnicodeWindow)
 {
    PWINSTATION_OBJECT WinSta;
-   PWINDOW Wnd = NULL;
-   PWINDOWCLASS *ClassLink, Class = NULL;
+   PWND Wnd = NULL;
+   PCLS *ClassLink, Class = NULL;
    RTL_ATOM ClassAtom;
    PWINDOW_OBJECT Window = NULL;
    PWINDOW_OBJECT ParentWindow = NULL, OwnerWindow;
@@ -1558,7 +1558,7 @@
    CBT_CREATEWNDW CbtCreate;
    LRESULT Result;
    BOOL MenuChanged;
-   DECLARE_RETURN(PWINDOW);
+   DECLARE_RETURN(PWND);
    BOOL HasOwner;
    USER_REFERENCE_ENTRY ParentRef, Ref;
    PTHREADINFO pti;
@@ -1595,7 +1595,7 @@
    else if ((dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD)
    {
       SetLastWin32Error(ERROR_TLW_WITH_WSCHILD);
-      RETURN( (PWINDOW)0);  /* WS_CHILD needs a parent, but WS_POPUP doesn't */
+      RETURN( (PWND)0);  /* WS_CHILD needs a parent, but WS_POPUP doesn't */
    }
 
    if (ParentWindowHandle)
@@ -1616,7 +1616,7 @@
    if (ti == NULL || pti->Desktop == NULL)
    {
       DPRINT1("Thread is not attached to a desktop! Cannot create window!\n");
-      RETURN( (PWINDOW)0);
+      RETURN( (PWND)0);
    }
 
    /* Check the class. */
@@ -1639,7 +1639,7 @@
       }
 
       SetLastWin32Error(ERROR_CANNOT_FIND_WND_CLASS);
-      RETURN((PWINDOW)0);
+      RETURN((PWND)0);
    }
 
    Class = IntReferenceClass(Class,
@@ -1664,11 +1664,11 @@
    if (Window)
    {
        Window->Wnd = DesktopHeapAlloc(pti->Desktop,
-                                      sizeof(WINDOW) + Class->cbwndExtra);
+                                      sizeof(WND) + Class->cbwndExtra);
        if (!Window->Wnd)
            goto AllocErr;
        RtlZeroMemory(Window->Wnd,
-                     sizeof(WINDOW) + Class->cbwndExtra);
+                     sizeof(WND) + Class->cbwndExtra);
        Window->Wnd->hdr.Handle = hWnd; /* FIXME: Remove hack , are you sure?*/
        Wnd = Window->Wnd;
 
@@ -1684,7 +1684,7 @@
 AllocErr:
       ObDereferenceObject(WinSta);
       SetLastNtError(STATUS_INSUFFICIENT_RESOURCES);
-      RETURN( (PWINDOW)0);
+      RETURN( (PWND)0);
    }
 
    UserRefObjectCo(Window, &Ref);
@@ -1775,7 +1775,7 @@
       if (Wnd->strName.Buffer == NULL)
       {
           SetLastNtError(STATUS_INSUFFICIENT_RESOURCES);
-          RETURN( (PWINDOW)0);
+          RETURN( (PWND)0);
       }
 
       Wnd->strName.Buffer[WindowName->Length / sizeof(WCHAR)] = L'\0';
@@ -1889,7 +1889,7 @@
          /* FIXME - Delete window object and remove it from the thread windows list */
          /* FIXME - delete allocated DCE */
          DPRINT1("CBT-hook returned !0\n");
-         RETURN( (PWINDOW) NULL);
+         RETURN( (PWND) NULL);
       }
    }
    x = Cs.x;
@@ -2056,7 +2056,7 @@
    {
       /* FIXME: Cleanup. */
       DPRINT1("IntCreateWindowEx(): NCCREATE message failed. No cleanup
performed!\n");
-      RETURN((PWINDOW)0);
+      RETURN((PWND)0);
    }
 
    /* Calculate the non-client size. */
@@ -2120,7 +2120,7 @@
       /* FIXME: Cleanup. */
       DPRINT1("IntCreateWindowEx(): send CREATE message failed. No cleanup
performed!\n");
       IntUnlinkWindow(Window);
-      RETURN((PWINDOW)0);
+      RETURN((PWND)0);
    }
 
    IntNotifyWinEvent(EVENT_OBJECT_CREATE, Window->hSelf, OBJID_WINDOW, 0);
@@ -2302,7 +2302,7 @@
    UNICODE_STRING WindowName;
    UNICODE_STRING ClassName;
    HWND NewWindow = NULL;
-   PWINDOW pNewWindow;
+   PWND pNewWindow;
    DECLARE_RETURN(HWND);
 
    DPRINT("Enter NtUserCreateWindowEx(): (%d,%d-%d,%d)\n", x, y, nWidth,
nHeight);
@@ -2405,7 +2405,7 @@
 BOOLEAN FASTCALL co_UserDestroyWindow(PWINDOW_OBJECT Window)
 {
    BOOLEAN isChild;
-   PWINDOW Wnd;
+   PWND Wnd;
    HWND hWnd;
 
    ASSERT_REFS_CO(Window); // FIXME: temp hack?
@@ -3055,7 +3055,7 @@
                             LPPOINT ptIcon)
 {
    PWINDOW_OBJECT Window;
-   PWINDOW Wnd;
+   PWND Wnd;
    DWORD Ret = 0;
    BOOL Hit = FALSE;
    WINDOWPLACEMENT wndpl;
@@ -3575,7 +3575,7 @@
 UserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi)
 {
    PWINDOW_OBJECT Window, Parent;
-   PWINDOW Wnd;
+   PWND Wnd;
    LONG Result = 0;
 
    DPRINT("NtUserGetWindowLong(%x,%d,%d)\n", hWnd, (INT)Index, Ansi);
@@ -3694,7 +3694,7 @@
 {
     WNDPROC Ret;
     PCALLPROC CallProc;
-    PWINDOW Wnd = Window->Wnd;
+    PWND Wnd = Window->Wnd;
 
     /* resolve any callproc handle if possible */
     if (IsCallProcHandle(NewWndProc))
@@ -3789,7 +3789,7 @@
 co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi)
 {
    PWINDOW_OBJECT Window, Parent;
-   PWINDOW Wnd;
+   PWND Wnd;
    PWINSTATION_OBJECT WindowStation;
    LONG OldValue;
    STYLESTRUCT Style;
@@ -3987,7 +3987,7 @@
                          WINDOWPLACEMENT *lpwndpl)
 {
    PWINDOW_OBJECT Window;
-   PWINDOW Wnd;
+   PWND Wnd;
    POINT Size;
    WINDOWPLACEMENT Safepl;
    NTSTATUS Status;
@@ -4318,7 +4318,7 @@
                     WORD fnID)
 {
    PWINDOW_OBJECT Window;
-   PWINDOW Wnd;
+   PWND Wnd;
    DECLARE_RETURN(BOOL);
 
    DPRINT("Enter NtUserSetWindowFNID\n");
@@ -4356,7 +4356,7 @@
                          WINDOWPLACEMENT *lpwndpl)
 {
    PWINDOW_OBJECT Window;
-   PWINDOW Wnd;
+   PWND Wnd;
    WINDOWPLACEMENT Safepl;
    NTSTATUS Status;
    DECLARE_RETURN(BOOL);
@@ -4472,7 +4472,7 @@
    INT Ret;
    HRGN VisRgn;
    ROSRGNDATA *pRgn;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    if(!Window)
    {
@@ -4513,7 +4513,7 @@
    INT Ret;
    HRGN VisRgn;
    ROSRGNDATA *pRgn;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    if(!Window)
    {
@@ -4741,7 +4741,7 @@
 NtUserDefSetText(HWND hWnd, PLARGE_STRING WindowText)
 {
    PWINDOW_OBJECT Window;
-   PWINDOW Wnd;
+   PWND Wnd;
    LARGE_STRING SafeText;
    UNICODE_STRING UnicodeString;
    BOOL Ret = TRUE;
@@ -4877,7 +4877,7 @@
 NtUserInternalGetWindowText(HWND hWnd, LPWSTR lpString, INT nMaxCount)
 {
    PWINDOW_OBJECT Window;
-   PWINDOW Wnd;
+   PWND Wnd;
    NTSTATUS Status;
    INT Result;
    DECLARE_RETURN(INT);

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Wed Jul 22 07:23:08
2009
@@ -137,7 +137,7 @@
    PWINDOW_OBJECT WndTo = NULL;
    HWND Fg;
    USER_REFERENCE_ENTRY Ref;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    ASSERT_REFS_CO(Window);
 
@@ -209,7 +209,7 @@
    for( i = 0; List[i]; i++)
    {
       PWINDOW_OBJECT WndChild;
-      PWINDOW ChildWnd;
+      PWND ChildWnd;
 
       if (!(WndChild = UserGetWindowObject(List[i])))
          continue;
@@ -252,7 +252,7 @@
 {
     PWINDOW_OBJECT Parent;
     UINT XInc, YInc;
-    PWINDOW Wnd = Window->Wnd;
+    PWND Wnd = Window->Wnd;
 
    if (!Wnd->InternalPosInitialized)
    {
@@ -299,7 +299,7 @@
 {
    POINT Size;
    UINT SwpFlags = 0;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    ASSERT_REFS_CO(Window);
    Wnd = Window->Wnd;
@@ -505,7 +505,7 @@
 {
    PWINDOW_OBJECT Parent;
    UINT wvrFlags = 0;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    ASSERT_REFS_CO(Window);
    Wnd = Window->Wnd;
@@ -584,7 +584,7 @@
                           PRECTL ClientRect)
 {
    INT X, Y;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    ASSERT_REFS_CO(Window);
    Wnd = Window->Wnd;
@@ -760,7 +760,7 @@
 BOOL FASTCALL
 WinPosFixupFlags(WINDOWPOS *WinPos, PWINDOW_OBJECT Window)
 {
-   PWINDOW Wnd = Window->Wnd;
+   PWND Wnd = Window->Wnd;
 
    if (!Wnd) return FALSE;
 
@@ -1327,7 +1327,7 @@
    RECTL NewPos;
    BOOLEAN ShowFlag;
    //  HRGN VisibleRgn;
-   PWINDOW Wnd;
+   PWND Wnd;
 
    ASSERT_REFS_CO(Window);
    Wnd = Window->Wnd;
@@ -1553,7 +1553,7 @@
    )
 {
    PWINDOW_OBJECT Current;
-   PWINDOW CurrentWnd;
+   PWND CurrentWnd;
    HWND *List, *phWnd;
    USER_REFERENCE_ENTRY Ref;
 
@@ -1680,7 +1680,7 @@
 {
    POINT Size;
    PWINDOW_OBJECT Window = NULL;
-   PWINDOW Wnd;
+   PWND Wnd;
    MINMAXINFO SafeMinMax;
    NTSTATUS Status;
    BOOL ret;