[ros-diffs] [jimtabor] 42110: - [Win32k] Update class structure and fixed on class wine test.

Author: jimtabor
Date: Tue Jul 21 04:56:24 2009
New Revision: 42110

URL: http://svn.reactos.org/svn/reactos?rev=42110&view=rev
Log:
- [Win32k] Update class structure and fixed on class wine test.

Modified:
    trunk/reactos/dll/win32/user32/windows/class.c
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/win32k/ntuser/class.c
    trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c
    trunk/reactos/subsystems/win32/win32k/ntuser/menu.c
    trunk/reactos/subsystems/win32/win32k/ntuser/message.c
    trunk/reactos/subsystems/win32/win32k/ntuser/windc.c
    trunk/reactos/subsystems/win32/win32k/ntuser/window.c

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] Tue Jul 21 04:56:24 2009
@@ -136,6 +136,8 @@
     WNDCLASSEXA wcex;
     BOOL retval;
 
+    if (!hInstance) hInstance = User32Instance;
+
     retval = GetClassInfoExA(hInstance, lpClassName, &wcex);
     if (retval)
     {
@@ -143,7 +145,7 @@
         lpWndClass->lpfnWndProc   = wcex.lpfnWndProc;
         lpWndClass->cbClsExtra    = wcex.cbClsExtra;
         lpWndClass->cbWndExtra    = wcex.cbWndExtra;
-        lpWndClass->hInstance     = wcex.hInstance;
+        lpWndClass->hInstance     = (User32Instance == hInstance) ? 0 :
wcex.hInstance;
         lpWndClass->hIcon         = wcex.hIcon;
         lpWndClass->hCursor       = wcex.hCursor;
         lpWndClass->hbrBackground = wcex.hbrBackground;
@@ -167,6 +169,8 @@
     WNDCLASSEXW wcex;
     BOOL retval;
 
+    if (!hInstance) hInstance = User32Instance;
+
     retval = GetClassInfoExW(hInstance, lpClassName, &wcex);
     if (retval)
     {
@@ -174,7 +178,7 @@
         lpWndClass->lpfnWndProc   = wcex.lpfnWndProc;
         lpWndClass->cbClsExtra    = wcex.cbClsExtra;
         lpWndClass->cbWndExtra    = wcex.cbWndExtra;
-        lpWndClass->hInstance     = wcex.hInstance;
+        lpWndClass->hInstance     = (User32Instance == hInstance) ? 0 :
wcex.hInstance;
         lpWndClass->hIcon         = wcex.hIcon;
         lpWndClass->hCursor       = wcex.hCursor;
         lpWndClass->hbrBackground = wcex.hbrBackground;
@@ -208,7 +212,7 @@
             if (nIndex >= 0)
             {
                 if (nIndex + sizeof(ULONG_PTR) < nIndex ||
-                    nIndex + sizeof(ULONG_PTR) > Class->ClsExtra)
+                    nIndex + sizeof(ULONG_PTR) > Class->cbclsExtra)
                 {
                     SetLastError(ERROR_INVALID_PARAMETER);
                 }
@@ -220,11 +224,11 @@
                 switch (nIndex)
                 {
                     case GCL_CBWNDEXTRA:
-                        Ret = (ULONG_PTR)Class->WndExtra;
+                        Ret = (ULONG_PTR)Class->cbwndExtra;
                         break;
 
                     case GCL_CBCLSEXTRA:
-                        Ret = (ULONG_PTR)Class->ClsExtra;
+                        Ret = (ULONG_PTR)Class->cbclsExtra;
                         break;
 
                     case GCL_HBRBACKGROUND:
@@ -234,7 +238,7 @@
                         break;
 
                     case GCL_HMODULE:
-                        Ret = (ULONG_PTR)Class->hInstance;
+                        Ret = (ULONG_PTR)Class->hModule;
                         break;
 
                     case GCL_MENUNAME:
@@ -242,11 +246,11 @@
                         break;
 
                     case GCL_STYLE:
-                        Ret = (ULONG_PTR)Class->Style;
+                        Ret = (ULONG_PTR)Class->style;
                         break;
 
                     case GCW_ATOM:
-                        Ret = (ULONG_PTR)Class->Atom;
+                        Ret = (ULONG_PTR)Class->atomClassName;
                         break;
 
                     case GCLP_HCURSOR:
@@ -321,7 +325,7 @@
             if (nIndex >= 0)
             {
                 if (nIndex + sizeof(ULONG_PTR) < nIndex ||
-                    nIndex + sizeof(ULONG_PTR) > Class->ClsExtra)
+                    nIndex + sizeof(ULONG_PTR) > Class->cbclsExtra)
                 {
                     SetLastError(ERROR_INVALID_PARAMETER);
                 }
@@ -333,11 +337,11 @@
                 switch (nIndex)
                 {
                     case GCL_CBWNDEXTRA:
-                        Ret = (ULONG_PTR)Class->WndExtra;
+                        Ret = (ULONG_PTR)Class->cbwndExtra;
                         break;
 
                     case GCL_CBCLSEXTRA:
-                        Ret = (ULONG_PTR)Class->ClsExtra;
+                        Ret = (ULONG_PTR)Class->cbclsExtra;
                         break;
 
                     case GCL_HBRBACKGROUND:
@@ -347,7 +351,7 @@
                         break;
 
                     case GCL_HMODULE:
-                        Ret = (ULONG_PTR)Class->hInstance;
+                        Ret = (ULONG_PTR)Class->hModule;
                         break;
 
                     case GCL_MENUNAME:
@@ -355,11 +359,11 @@
                         break;
 
                     case GCL_STYLE:
-                        Ret = (ULONG_PTR)Class->Style;
+                        Ret = (ULONG_PTR)Class->style;
                         break;
 
                     case GCW_ATOM:
-                        Ret = (ULONG_PTR)Class->Atom;
+                        Ret = (ULONG_PTR)Class->atomClassName;
                         break;
 
                     case GCLP_HCURSOR:

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] Tue Jul 21 04:56:24 2009
@@ -98,40 +98,52 @@
     UINT Unicode : 1;
 } CALLPROC, *PCALLPROC;
 
+#define CSF_SERVERSIDEPROC      0x0001
+#define CSF_ANSIPROC            0x0002
+#define CSF_WOWDEFERDESTROY     0x0004
+#define CSF_SYSTEMCLASS         0x0008
+#define CSF_WOWCLASS            0x0010
+#define CSF_WOWEXTRA            0x0020
+#define CSF_CACHEDSMICON        0x0040
+#define CSF_WIN40COMPAT         0x0080
+
 typedef struct _WINDOWCLASS
 {
-    struct _WINDOWCLASS *Next;
-    struct _WINDOWCLASS *Clone;
-    struct _WINDOWCLASS *Base;
+    struct _WINDOWCLASS *pclsNext;
+    RTL_ATOM atomClassName;
+    ATOM atomNVClassName;
+    DWORD fnid; // New ClassId
     struct _DESKTOP *rpdeskParent;
-    RTL_ATOM Atom;
-    ULONG Windows;
-
-    UINT Style;
-    WNDPROC WndProc;
+    PVOID pdce;
+    DWORD CSF_flags;
+    PSTR  lpszClientAnsiMenuName;
+    PWSTR lpszClientUnicodeMenuName;
+    HANDLE hMenu; /* FIXME - Use pointer! */
+    PCALLPROC spcpdFirst;
+    struct _WINDOWCLASS *pclsBase;
+    struct _WINDOWCLASS *pclsClone;
+    ULONG cWndReferenceCount;
+    UINT style;
+    WNDPROC lpfnWndProc;
     union
     {
         WNDPROC WndProcExtra;
         PCALLPROC CallProc;
     };
-    PCALLPROC CallProcList;
-    INT ClsExtra;
-    INT WndExtra;
-    PVOID Dce;
-    DWORD fnID; // New ClassId
-    HINSTANCE hInstance;
+    INT cbclsExtra;
+    INT cbwndExtra;
+    HINSTANCE hModule;
     HANDLE hIcon; /* FIXME - Use pointer! */
-    HANDLE hIconSm; /* FIXME - Use pointer! */
     HANDLE hCursor; /* FIXME - Use pointer! */
     HBRUSH hbrBackground;
-    HANDLE hMenu; /* FIXME - Use pointer! */
     PWSTR MenuName;
     PSTR AnsiMenuName;
+    HANDLE hIconSm; /* FIXME - Use pointer! */
 
     UINT Destroying : 1;
     UINT Unicode : 1;
-    UINT System : 1;
-    UINT Global : 1;
+    UINT System : 1;  // CSF_SYSTEMCLASS
+    UINT Global : 1;  // CS_GLOBALCLASS
     UINT MenuNameIsString : 1;
     UINT NotUsed : 27;
 } WINDOWCLASS, *PWINDOWCLASS;

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] Tue Jul 21 04:56:24
2009
@@ -90,15 +90,15 @@
 IntDestroyClass(IN OUT PWINDOWCLASS Class)
 {
     /* there shouldn't be any clones anymore */
-    ASSERT(Class->Windows == 0);
-    ASSERT(Class->Clone == NULL);
-
-    if (Class->Base == Class)
+    ASSERT(Class->cWndReferenceCount == 0);
+    ASSERT(Class->pclsClone == NULL);
+
+    if (Class->pclsBase == Class)
     {
         PCALLPROC CallProc, NextCallProc;
 
         /* Destroy allocated callproc handles */
-        CallProc = Class->CallProcList;
+        CallProc = Class->spcpdFirst;
         while (CallProc != NULL)
         {
             NextCallProc = CallProc->Next;
@@ -110,10 +110,10 @@
             CallProc = NextCallProc;
         }
 
-        if (Class->Dce)
-        {
-           DceFreeClassDCE(((PDCE)Class->Dce)->hDC);
-           Class->Dce = NULL;
+        if (Class->pdce)
+        {
+           DceFreeClassDCE(((PDCE)Class->pdce)->hDC);
+           Class->pdce = NULL;
         }
 
         IntFreeClassMenuName(Class);
@@ -144,9 +144,9 @@
         Class = pi->LocalClassList;
         while (Class != NULL)
         {
-            pi->LocalClassList = Class->Next;
-
-            ASSERT(Class->Base == Class);
+            pi->LocalClassList = Class->pclsNext;
+
+            ASSERT(Class->pclsBase == Class);
             IntDestroyClass(Class);
 
             Class = pi->LocalClassList;
@@ -156,9 +156,9 @@
         Class = pi->GlobalClassList;
         while (Class != NULL)
         {
-            pi->GlobalClassList = Class->Next;
-
-            ASSERT(Class->Base == Class);
+            pi->GlobalClassList = Class->pclsNext;
+
+            ASSERT(Class->pclsBase == Class);
             IntDestroyClass(Class);
 
             Class = pi->GlobalClassList;
@@ -168,9 +168,9 @@
         Class = pi->SystemClassList;
         while (Class != NULL)
         {
-            pi->SystemClassList = Class->Next;
-
-            ASSERT(Class->Base == Class);
+            pi->SystemClassList = Class->pclsNext;
+
+            ASSERT(Class->pclsBase == Class);
             IntDestroyClass(Class);
 
             Class = pi->SystemClassList;
@@ -245,7 +245,7 @@
 {
     PCALLPROC CallProc;
 
-    CallProc = Class->CallProcList;
+    CallProc = Class->spcpdFirst;
     while (CallProc != NULL)
     {
         if (CallProc->WndProc == WndProc &&
@@ -268,17 +268,17 @@
 
     ASSERT(CallProc->Next == NULL);
 
-    BaseClass = Class->Base;
+    BaseClass = Class->pclsBase;
     ASSERT(CallProc->Next == NULL);
-    CallProc->Next = BaseClass->CallProcList;
-    BaseClass->CallProcList = CallProc;
+    CallProc->Next = BaseClass->spcpdFirst;
+    BaseClass->spcpdFirst = CallProc;
 
     /* Update all clones */
-    Class = Class->Clone;
+    Class = Class->pclsClone;
     while (Class != NULL)
     {
-        Class->CallProcList = BaseClass->CallProcList;
-        Class = Class->Next;
+        Class->spcpdFirst = BaseClass->spcpdFirst;
+        Class = Class->pclsNext;
     }
 }
 
@@ -289,7 +289,7 @@
     RTL_ATOM Atom = (RTL_ATOM)0;
 
     /* update the base class first */
-    Class = Class->Base;
+    Class = Class->pclsBase;
 
     if (!IntRegisterClassAtom(ClassName,
                               &Atom))
@@ -297,17 +297,17 @@
         return FALSE;
     }
 
-    IntDeregisterClassAtom(Class->Atom);
-
-    Class->Atom = Atom;
+    IntDeregisterClassAtom(Class->atomClassName);
+
+    Class->atomClassName = Atom;
 
     /* update the clones */
-    Class = Class->Clone;
+    Class = Class->pclsClone;
     while (Class != NULL)
     {
-        Class->Atom = Atom;
-
-        Class = Class->Next;
+        Class->atomClassName = Atom;
+
+        Class = Class->pclsNext;
     }
 
     return TRUE;
@@ -322,13 +322,13 @@
 
     if (Class->System)
     {
-        return (Ansi ? Class->WndProcExtra : Class->WndProc);
+        return (Ansi ? Class->WndProcExtra : Class->lpfnWndProc);
     }
     else
     {
         if (!Ansi == Class->Unicode)
         {
-            return Class->WndProc;
+            return Class->lpfnWndProc;
         }
         else
         {
@@ -336,7 +336,7 @@
 
             /* make sure the call procedures are located on the desktop
                of the base class! */
-            BaseClass = Class->Base;
+            BaseClass = Class->pclsBase;
             Class = BaseClass;
 
             if (Class->CallProc != NULL)
@@ -351,12 +351,12 @@
                     return NULL;
 
                 NewCallProc = UserFindCallProc(Class,
-                                               Class->WndProc,
+                                               Class->lpfnWndProc,
                                                Class->Unicode);
                 if (NewCallProc == NULL)
                 {
                     NewCallProc = CreateCallProc(NULL,
-                                                 Class->WndProc,
+                                                 Class->lpfnWndProc,
                                                  Class->Unicode,
                                                  pi);
                     if (NewCallProc == NULL)
@@ -372,12 +372,12 @@
                 Class->CallProc = NewCallProc;
 
                 /* update the clones */
-                Class = Class->Clone;
+                Class = Class->pclsClone;
                 while (Class != NULL)
                 {
                     Class->CallProc = NewCallProc;
 
-                    Class = Class->Next;
+                    Class = Class->pclsNext;
                 }
 
                 return GetCallProcHandle(NewCallProc);
@@ -395,13 +395,13 @@
 
     if (Class->System)
     {
-        DPRINT1("Attempted to change window procedure of system window class
0x%p!\n", Class->Atom);
+        DPRINT1("Attempted to change window procedure of system window class
0x%p!\n", Class->atomClassName);
         SetLastWin32Error(ERROR_ACCESS_DENIED);
         return NULL;
     }
 
     /* update the base class first */
-    Class = Class->Base;
+    Class = Class->pclsBase;
 
     /* resolve any callproc handle if possible */
     if (IsCallProcHandle(WndProc))
@@ -426,16 +426,16 @@
 
     /* update the class info */
     Class->Unicode = !Ansi;
-    Class->WndProc = WndProc;
+    Class->lpfnWndProc = WndProc;
 
     /* update the clones */
-    Class = Class->Clone;
+    Class = Class->pclsClone;
     while (Class != NULL)
     {
         Class->Unicode = !Ansi;
-        Class->WndProc = WndProc;
-
-        Class = Class->Next;
+        Class->lpfnWndProc = WndProc;
+
+        Class = Class->pclsNext;
     }
 
     return Ret;
@@ -450,7 +450,7 @@
     PWINDOWCLASS Class;
 
     ASSERT(Desktop != NULL);
-    ASSERT(BaseClass->Base == BaseClass);
+    ASSERT(BaseClass->pclsBase == BaseClass);
 
     if (BaseClass->rpdeskParent == Desktop)
     {
@@ -462,8 +462,8 @@
 
     if (BaseClass->rpdeskParent == NULL)
     {
-        ASSERT(BaseClass->Windows == 0);
-        ASSERT(BaseClass->Clone == NULL);
+        ASSERT(BaseClass->cWndReferenceCount == 0);
+        ASSERT(BaseClass->pclsClone == NULL);
 
         /* Classes are also located in the shared heap when the class
            was created before the thread attached to a desktop. As soon
@@ -476,17 +476,17 @@
     {
         /* The user is asking for a class object on a different desktop,
            try to find one! */
-        Class = BaseClass->Clone;
+        Class = BaseClass->pclsClone;
         while (Class != NULL)
         {
             if (Class->rpdeskParent == Desktop)
             {
-                ASSERT(Class->Base == BaseClass);
-                ASSERT(Class->Clone == NULL);
+                ASSERT(Class->pclsBase == BaseClass);
+                ASSERT(Class->pclsClone == NULL);
                 break;
             }
 
-            Class = Class->Next;
+            Class = Class->pclsNext;
         }
     }
 
@@ -494,7 +494,7 @@
     {
         /* The window is created on a different desktop, we need to
            clone the class object to the desktop heap of the window! */
-        ClassSize = sizeof(*BaseClass) + (SIZE_T)BaseClass->ClsExtra;
+        ClassSize = sizeof(*BaseClass) + (SIZE_T)BaseClass->cbclsExtra;
 
         Class = DesktopHeapAlloc(Desktop,
                                  ClassSize);
@@ -507,7 +507,7 @@
 
             /* update some pointers and link the class */
             Class->rpdeskParent = Desktop;
-            Class->Windows = 0;
+            Class->cWndReferenceCount = 0;
 
             if (BaseClass->rpdeskParent == NULL)
             {
@@ -515,27 +515,27 @@
                    heap anymore, delete it so the only class left is
                    the clone we just created, which now serves as the
                    new base class */
-                ASSERT(BaseClass->Clone == NULL);
-                ASSERT(Class->Clone == NULL);
-                Class->Base = Class;
-                Class->Next = BaseClass->Next;
+                ASSERT(BaseClass->pclsClone == NULL);
+                ASSERT(Class->pclsClone == NULL);
+                Class->pclsBase = Class;
+                Class->pclsNext = BaseClass->pclsNext;
 
                 /* replace the base class */
                 (void)InterlockedExchangePointer((PVOID*)ClassLink,
                                                  Class);
 
                 /* destroy the obsolete copy on the shared heap */
-                BaseClass->Base = NULL;
-                BaseClass->Clone = NULL;
+                BaseClass->pclsBase = NULL;
+                BaseClass->pclsClone = NULL;
                 IntDestroyClass(BaseClass);
             }
             else
             {
                 /* link in the clone */
-                Class->Clone = NULL;
-                Class->Base = BaseClass;
-                Class->Next = BaseClass->Clone;
-                (void)InterlockedExchangePointer(&BaseClass->Clone,
+                Class->pclsClone = NULL;
+                Class->pclsBase = BaseClass;
+                Class->pclsNext = BaseClass->pclsClone;
+                (void)InterlockedExchangePointer(&BaseClass->pclsClone,
                                                  Class);
             }
         }
@@ -555,14 +555,14 @@
 {
     PWINDOWCLASS Class;
 
-    ASSERT(BaseClass->Base == BaseClass);
+    ASSERT(BaseClass->pclsBase == BaseClass);
 
     Class = IntGetClassForDesktop(BaseClass,
                                   ClassLink,
                                   Desktop);
     if (Class != NULL)
     {
-        Class->Windows++;
+        Class->cWndReferenceCount++;
     }
 
     return Class;
@@ -575,34 +575,34 @@
 {
     PWINDOWCLASS Clone, BaseClass;
 
-    ASSERT(Class->Base != Class);
-    ASSERT(Class->Base->Clone != NULL);
+    ASSERT(Class->pclsBase != Class);
+    ASSERT(Class->pclsBase->pclsClone != NULL);
     ASSERT(Class->rpdeskParent != NULL);
-    ASSERT(Class->Windows != 0);
-    ASSERT(Class->Base->rpdeskParent != NULL);
-    ASSERT(Class->Base->Windows == 0);
+    ASSERT(Class->cWndReferenceCount != 0);
+    ASSERT(Class->pclsBase->rpdeskParent != NULL);
+    ASSERT(Class->pclsBase->cWndReferenceCount == 0);
 
     /* unlink the clone */
-    *CloneLink = Class->Next;
-    Class->Clone = Class->Base->Clone;
-
-    BaseClass = Class->Base;
+    *CloneLink = Class->pclsNext;
+    Class->pclsClone = Class->pclsBase->pclsClone;
+
+    BaseClass = Class->pclsBase;
 
     /* update the class information to make it a base class */
-    Class->Base = Class;
-    Class->Next = (*BaseClassLink)->Next;
+    Class->pclsBase = Class;
+    Class->pclsNext = (*BaseClassLink)->pclsNext;
 
     /* update all clones */
-    Clone = Class->Clone;
+    Clone = Class->pclsClone;
     while (Clone != NULL)
     {
-        ASSERT(Clone->Clone == NULL);
-        Clone->Base = Class;
+        ASSERT(Clone->pclsClone == NULL);
+        Clone->pclsBase = Class;
 
         if (!Class->System)
             Clone->CallProc = Class->CallProc;
 
-        Clone = Clone->Next;
+        Clone = Clone->pclsNext;
     }
 
     /* link in the new base class */
@@ -617,19 +617,19 @@
 {
     PWINDOWCLASS *PrevLink, BaseClass, CurrentClass;
 
-    BaseClass = Class->Base;
-
-    if (--Class->Windows == 0)
+    BaseClass = Class->pclsBase;
+
+    if (--Class->cWndReferenceCount == 0)
     {
         if (BaseClass == Class)
         {
-            ASSERT(Class->Base == Class);
+            ASSERT(Class->pclsBase == Class);
 
             /* check if there are clones of the class on other desktops,
                link the first clone in if possible. If there are no clones
                then leave the class on the desktop heap. It will get moved
                to the shared heap when the thread detaches. */
-            if (BaseClass->Clone != NULL)
+            if (BaseClass->pclsClone != NULL)
             {
                 if (BaseClass->System)
                     PrevLink = &pi->SystemClassList;
@@ -643,45 +643,45 @@
                 {
                     ASSERT(CurrentClass != NULL);
 
-                    PrevLink = &CurrentClass->Next;
-                    CurrentClass = CurrentClass->Next;
+                    PrevLink = &CurrentClass->pclsNext;
+                    CurrentClass = CurrentClass->pclsNext;
                 }
 
                 ASSERT(*PrevLink == BaseClass);
 
                 /* make the first clone become the new base class */
-                IntMakeCloneBaseClass(BaseClass->Clone,
+                IntMakeCloneBaseClass(BaseClass->pclsClone,
                                       PrevLink,
-                                      &BaseClass->Clone);
+                                      &BaseClass->pclsClone);
 
                 /* destroy the class, there's still another clone of the class
                    that now serves as a base class. Make sure we don't destruct
                    resources shared by all classes (Base = NULL)! */
-                BaseClass->Base = NULL;
-                BaseClass->Clone = NULL;
+                BaseClass->pclsBase = NULL;
+                BaseClass->pclsClone = NULL;
                 IntDestroyClass(BaseClass);
             }
         }
         else
         {
             /* locate the cloned class and unlink it */
-            PrevLink = &BaseClass->Clone;
-            CurrentClass = BaseClass->Clone;
+            PrevLink = &BaseClass->pclsClone;
+            CurrentClass = BaseClass->pclsClone;
             while (CurrentClass != Class)
             {
                 ASSERT(CurrentClass != NULL);
 
-                PrevLink = &CurrentClass->Next;
-                CurrentClass = CurrentClass->Next;
+                PrevLink = &CurrentClass->pclsNext;
+                CurrentClass = CurrentClass->pclsNext;
             }
 
             ASSERT(CurrentClass == Class);
 
             (void)InterlockedExchangePointer((PVOID*)PrevLink,
-                                             Class->Next);
-
-            ASSERT(Class->Base == BaseClass);
-            ASSERT(Class->Clone == NULL);
+                                             Class->pclsNext);
+
+            ASSERT(Class->pclsBase == BaseClass);
+            ASSERT(Class->pclsClone == NULL);
 
             /* the class was just a clone, we don't need it anymore */
             IntDestroyClass(Class);
@@ -696,12 +696,12 @@
     PWINDOWCLASS NewClass;
     SIZE_T ClassSize;
 
-    ASSERT(Class->Base == Class);
+    ASSERT(Class->pclsBase == Class);
     ASSERT(Class->rpdeskParent != NULL);
-    ASSERT(Class->Windows == 0);
-    ASSERT(Class->Clone == NULL);
-
-    ClassSize = sizeof(*Class) + (SIZE_T)Class->ClsExtra;
+    ASSERT(Class->cWndReferenceCount == 0);
+    ASSERT(Class->pclsClone == NULL);
+
+    ClassSize = sizeof(*Class) + (SIZE_T)Class->cbclsExtra;
 
     /* allocate the new base class on the shared heap */
     NewClass = UserHeapAlloc(ClassSize);
@@ -712,15 +712,15 @@
                       ClassSize);
 
         NewClass->rpdeskParent = NULL;
-        NewClass->Base = NewClass;
+        NewClass->pclsBase = NewClass;
 
         /* replace the class in the list */
         (void)InterlockedExchangePointer((PVOID*)*ClassLinkPtr,
                                          NewClass);
-        *ClassLinkPtr = &NewClass->Next;
+        *ClassLinkPtr = &NewClass->pclsNext;
 
         /* free the obsolete class on the desktop heap */
-        Class->Base = NULL;
+        Class->pclsBase = NULL;
         IntDestroyClass(Class);
         return TRUE;
     }
@@ -749,15 +749,15 @@
     Class = *Link;
     while (Class != NULL)
     {
-        NextClass = Class->Next;
-
-        ASSERT(Class->Base == Class);
+        NextClass = Class->pclsNext;
+
+        ASSERT(Class->pclsBase == Class);
 
         if (Class->rpdeskParent == Desktop &&
-            Class->Windows == 0)
+            Class->cWndReferenceCount == 0)
         {
             /* there shouldn't be any clones around anymore! */
-            ASSERT(Class->Clone == NULL);
+            ASSERT(Class->pclsClone == NULL);
 
             /* FIXME - If process is terminating, don't move the class but rather
destroy it! */
             /* FIXME - We could move the class to another desktop heap if there's
still desktops
@@ -771,27 +771,27 @@
             }
             else
             {
-                ASSERT(NextClass == Class->Next);
+                ASSERT(NextClass == Class->pclsNext);
 
                 if (FreeOnFailure)
                 {
                     /* unlink the base class */
                     (void)InterlockedExchangePointer((PVOID*)Link,
-                                                     Class->Next);
+                                                     Class->pclsNext);
 
                     /* we can free the old base class now */
-                    Class->Base = NULL;
+                    Class->pclsBase = NULL;
                     IntDestroyClass(Class);
                 }
                 else
                 {
-                    Link = &Class->Next;
+                    Link = &Class->pclsNext;
                     *Ret = FALSE;
                 }
             }
         }
         else
-            Link = &Class->Next;
+            Link = &Class->pclsNext;
 
         Class = NextClass;
     }
@@ -889,8 +889,8 @@
                       ClassSize);
 
         Class->rpdeskParent = Desktop;
-        Class->Base = Class;
-        Class->Atom = Atom;
+        Class->pclsBase = Class;
+        Class->atomClassName = Atom;
 
         if (dwFlags & REGISTERCLASS_SYSTEM)
         {
@@ -906,11 +906,11 @@
             /* need to protect with SEH since accessing the WNDCLASSEX structure
                and string buffers might raise an exception! We don't want to
                leak memory... */
-            Class->WndProc = lpwcx->lpfnWndProc;
-            Class->Style = lpwcx->style;
-            Class->ClsExtra = lpwcx->cbClsExtra;
-            Class->WndExtra = lpwcx->cbWndExtra;
-            Class->hInstance = lpwcx->hInstance;
+            Class->lpfnWndProc = lpwcx->lpfnWndProc;
+            Class->style = lpwcx->style;
+            Class->cbclsExtra = lpwcx->cbClsExtra;
+            Class->cbwndExtra = lpwcx->cbWndExtra;
+            Class->hModule = lpwcx->hInstance;
             Class->hIcon = lpwcx->hIcon; /* FIXME */
             Class->hIconSm = lpwcx->hIconSm; /* FIXME */
             Class->hCursor = lpwcx->hCursor; /* FIXME */
@@ -957,7 +957,7 @@
             if (!(dwFlags & REGISTERCLASS_ANSI))
                 Class->Unicode = TRUE;
 
-            if (Class->Style & CS_GLOBALCLASS)
+            if (Class->style & CS_GLOBALCLASS)
                 Class->Global = TRUE;
         }
         _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
@@ -1009,19 +1009,19 @@
     Class = *PrevLink;
     while (Class != NULL)
     {
-        if (Class->Atom == Atom &&
-            (hInstance == NULL || Class->hInstance == hInstance) &&
+        if (Class->atomClassName == Atom &&
+            (hInstance == NULL || Class->hModule == hInstance) &&
             !Class->Destroying)
         {
-            ASSERT(Class->Base == Class);
+            ASSERT(Class->pclsBase == Class);
 
             if (Link != NULL)
                 *Link = PrevLink;
             break;
         }
 
-        PrevLink = &Class->Next;
-        Class = Class->Next;
+        PrevLink = &Class->pclsNext;
+        Class = Class->pclsNext;
     }
 
     return Class;
@@ -1250,11 +1250,11 @@
         else
             List = &pi->LocalClassList;
 
-        Class->Next = *List;
+        Class->pclsNext = *List;
         (void)InterlockedExchangePointer((PVOID*)List,
                                          Class);
 
-        Ret = Class->Atom;
+        Ret = Class->atomClassName;
     }
 
     return Ret;
@@ -1291,20 +1291,20 @@
 
     ASSERT(Class != NULL);
 
-    if (Class->Windows != 0 ||
-        Class->Clone != NULL)
+    if (Class->cWndReferenceCount != 0 ||
+        Class->pclsClone != NULL)
     {
         SetLastWin32Error(ERROR_CLASS_HAS_WINDOWS);
         return FALSE;
     }
 
     /* must be a base class! */
-    ASSERT(Class->Base == Class);
+    ASSERT(Class->pclsBase == Class);
 
     /* unlink the class */
-    *Link = Class->Next;
-
-    if (NT_SUCCESS(IntDeregisterClassAtom(Class->Atom)))
+    *Link = Class->pclsNext;
+
+    if (NT_SUCCESS(IntDeregisterClassAtom(Class->atomClassName)))
     {
         /* finally free the resources */
         IntDestroyClass(Class);
@@ -1342,7 +1342,7 @@
 
             /* find out how big the buffer needs to be */
             Status = RtlQueryAtomInAtomTable(gAtomTable,
-                                             Class->Atom,
+                                             Class->atomClassName,
                                              NULL,
                                              NULL,
                                              szStaticTemp,
@@ -1368,7 +1368,7 @@
 
                 /* query the class name */
                 Status = RtlQueryAtomInAtomTable(gAtomTable,
-                                                 Class->Atom,
+                                                 Class->atomClassName,
                                                  NULL,
                                                  NULL,
                                                  szTemp,
@@ -1402,7 +1402,7 @@
 
             /* query the atom name */
             Status = RtlQueryAtomInAtomTable(gAtomTable,
-                                             Class->Atom,
+                                             Class->atomClassName,
                                              NULL,
                                              NULL,
                                              ClassName->Buffer,
@@ -1444,7 +1444,7 @@
 
         TRACE("GetClassLong(%d)\n", Index);
         if (Index + sizeof(ULONG_PTR) < Index ||
-            Index + sizeof(ULONG_PTR) > Class->ClsExtra)
+            Index + sizeof(ULONG_PTR) > Class->cbclsExtra)
         {
             SetLastWin32Error(ERROR_INVALID_PARAMETER);
             return 0;
@@ -1463,11 +1463,11 @@
     switch (Index)
     {
         case GCL_CBWNDEXTRA:
-            Ret = (ULONG_PTR)Class->WndExtra;
+            Ret = (ULONG_PTR)Class->cbwndExtra;
             break;
 
         case GCL_CBCLSEXTRA:
-            Ret = (ULONG_PTR)Class->ClsExtra;
+            Ret = (ULONG_PTR)Class->cbclsExtra;
             break;
 
         case GCLP_HBRBACKGROUND:
@@ -1490,7 +1490,7 @@
             break;
 
         case GCLP_HMODULE:
-            Ret = (ULONG_PTR)Class->hInstance;
+            Ret = (ULONG_PTR)Class->hModule;
             break;
 
         case GCLP_MENUNAME:
@@ -1502,7 +1502,7 @@
             break;
 
         case GCL_STYLE:
-            Ret = (ULONG_PTR)Class->Style;
+            Ret = (ULONG_PTR)Class->style;
             break;
 
         case GCLP_WNDPROC:
@@ -1512,7 +1512,7 @@
             break;
 
         case GCW_ATOM:
-            Ret = (ULONG_PTR)Class->Atom;
+            Ret = (ULONG_PTR)Class->atomClassName;
             break;
 
         default:
@@ -1530,7 +1530,7 @@
     BOOL Ret = FALSE;
 
     /* change the base class first */
-    Class = Class->Base;
+    Class = Class->pclsBase;
 
     if (MenuName->Length != 0)
     {
@@ -1581,14 +1581,14 @@
                 Class->MenuNameIsString = TRUE;
 
                 /* update the clones */
-                Class = Class->Clone;
+                Class = Class->pclsClone;
                 while (Class != NULL)
                 {
                     Class->MenuName = strBufW;
                     Class->AnsiMenuName = AnsiString.Buffer;
                     Class->MenuNameIsString = TRUE;
 
-                    Class = Class->Next;
+                    Class = Class->pclsNext;
                 }
             }
             else
@@ -1611,14 +1611,14 @@
         Class->MenuNameIsString = FALSE;
 
         /* update the clones */
-        Class = Class->Clone;
+        Class = Class->pclsClone;
         while (Class != NULL)
         {
             Class->MenuName = MenuName->Buffer;
             Class->AnsiMenuName = (PSTR)MenuName->Buffer;
             Class->MenuNameIsString = FALSE;
 
-            Class = Class->Next;
+            Class = Class->pclsNext;
         }
 
         Ret = TRUE;
@@ -1638,7 +1638,7 @@
     /* NOTE: For GCLP_MENUNAME and GCW_ATOM this function may raise an exception! */
 
     /* change the information in the base class first, then update the clones */
-    Class = Class->Base;
+    Class = Class->pclsBase;
 
     if (Index >= 0)
     {
@@ -1647,7 +1647,7 @@
         TRACE("SetClassLong(%d, %x)\n", Index, NewLong);
 
         if (Index + sizeof(ULONG_PTR) < Index ||
-            Index + sizeof(ULONG_PTR) > Class->ClsExtra)
+            Index + sizeof(ULONG_PTR) > Class->cbclsExtra)
         {
             SetLastWin32Error(ERROR_INVALID_PARAMETER);
             return 0;
@@ -1662,11 +1662,11 @@
         *Data = NewLong;
 
         /* update the clones */
-        Class = Class->Clone;
+        Class = Class->pclsClone;
         while (Class != NULL)
         {
             *(PULONG_PTR)((ULONG_PTR)(Class + 1) + Index) = NewLong;
-            Class = Class->Next;
+            Class = Class->pclsNext;
         }
 
         return Ret;
@@ -1675,15 +1675,15 @@
     switch (Index)
     {
         case GCL_CBWNDEXTRA:
-            Ret = (ULONG_PTR)Class->WndExtra;
-            Class->WndExtra = (INT)NewLong;
+            Ret = (ULONG_PTR)Class->cbwndExtra;
+            Class->cbwndExtra = (INT)NewLong;
 
             /* update the clones */
-            Class = Class->Clone;
+            Class = Class->pclsClone;
             while (Class != NULL)
             {
-                Class->WndExtra = (INT)NewLong;
-                Class = Class->Next;
+                Class->cbwndExtra = (INT)NewLong;
+                Class = Class->pclsNext;
             }
 
             break;
@@ -1697,11 +1697,11 @@
             Class->hbrBackground = (HBRUSH)NewLong;
 
             /* update the clones */
-            Class = Class->Clone;
+            Class = Class->pclsClone;
             while (Class != NULL)
             {
                 Class->hbrBackground = (HBRUSH)NewLong;
-                Class = Class->Next;
+                Class = Class->pclsNext;
             }
             break;
 
@@ -1711,11 +1711,11 @@
             Class->hCursor = (HANDLE)NewLong;
 
             /* update the clones */
-            Class = Class->Clone;
+            Class = Class->pclsClone;
             while (Class != NULL)
             {
                 Class->hCursor = (HANDLE)NewLong;
-                Class = Class->Next;
+                Class = Class->pclsNext;
             }
             break;
 
@@ -1725,11 +1725,11 @@
             Class->hIcon = (HANDLE)NewLong;
 
             /* update the clones */
-            Class = Class->Clone;
+            Class = Class->pclsClone;
             while (Class != NULL)
             {
                 Class->hIcon = (HANDLE)NewLong;
-                Class = Class->Next;
+                Class = Class->pclsNext;
             }
             break;
 
@@ -1739,24 +1739,24 @@
             Class->hIconSm = (HANDLE)NewLong;
 
             /* update the clones */
-            Class = Class->Clone;
+            Class = Class->pclsClone;
             while (Class != NULL)
             {
                 Class->hIconSm = (HANDLE)NewLong;
-                Class = Class->Next;
+                Class = Class->pclsNext;
             }
             break;
 
         case GCLP_HMODULE:
-            Ret = (ULONG_PTR)Class->hInstance;
-            Class->hInstance = (HINSTANCE)NewLong;
+            Ret = (ULONG_PTR)Class->hModule;
+            Class->hModule = (HINSTANCE)NewLong;
 
            /* update the clones */
-            Class = Class->Clone;
+            Class = Class->pclsClone;
             while (Class != NULL)
             {
-                Class->hInstance = (HINSTANCE)NewLong;
-                Class = Class->Next;
+                Class->hModule = (HINSTANCE)NewLong;
+                Class = Class->pclsNext;
             }
             break;
 
@@ -1775,8 +1775,8 @@
         }
 
         case GCL_STYLE:
-            Ret = (ULONG_PTR)Class->Style;
-            Class->Style = (UINT)NewLong;
+            Ret = (ULONG_PTR)Class->style;
+            Class->style = (UINT)NewLong;
 
             /* FIXME - what if the CS_GLOBALCLASS style is changed? should we
                        move the class to the appropriate list? For now, we save
@@ -1784,11 +1784,11 @@
                        locate the appropriate list */
 
            /* update the clones */
-            Class = Class->Clone;
+            Class = Class->pclsClone;
             while (Class != NULL)
             {
-                Class->Style = (UINT)NewLong;
-                Class = Class->Next;
+                Class->style = (UINT)NewLong;
+                Class = Class->pclsNext;
             }
             break;
 
@@ -1802,7 +1802,7 @@
         {
             PUNICODE_STRING Value = (PUNICODE_STRING)NewLong;
 
-            Ret = (ULONG_PTR)Class->Atom;
+            Ret = (ULONG_PTR)Class->atomClassName;
             if (!IntSetClassAtom(Class,
                                  Value))
             {
@@ -1827,15 +1827,15 @@
 {
     PPROCESSINFO pi;
 
-    lpwcx->style = Class->Style;
+    lpwcx->style = Class->style;
 
     pi = GetW32ProcessInfo();
     lpwcx->lpfnWndProc = IntGetClassWndProc(Class,
                                             pi,
                                             Ansi);
 
-    lpwcx->cbClsExtra = Class->ClsExtra;
-    lpwcx->cbWndExtra = Class->WndExtra;
+    lpwcx->cbClsExtra = Class->cbclsExtra;
+    lpwcx->cbWndExtra = Class->cbwndExtra;
     lpwcx->hIcon = Class->hIcon; /* FIXME - get handle from pointer */
     lpwcx->hCursor = Class->hCursor; /* FIXME - get handle from pointer */
     lpwcx->hbrBackground = Class->hbrBackground;
@@ -1845,12 +1845,12 @@
     else
         lpwcx->lpszMenuName = Class->MenuName;
 
-    if (Class->hInstance == pi->hModUser)
+    if (Class->hModule == pi->hModUser)
         lpwcx->hInstance = NULL;
     else
-        lpwcx->hInstance = Class->hInstance;
-
-    lpwcx->lpszClassName = (LPCWSTR)((ULONG_PTR)Class->Atom); /* FIXME - return the
string? */
+        lpwcx->hInstance = Class->hModule;
+
+    lpwcx->lpszClassName = (LPCWSTR)((ULONG_PTR)Class->atomClassName); /* FIXME -
return the string? */
 
     lpwcx->hIconSm = Class->hIconSm; /* FIXME - get handle from pointer */
 
@@ -1908,14 +1908,14 @@
         {
             int iCls;
 
-            Class->fnID = SystemClasses[i].ClassId;
-            if (LockupFnIdToiCls(Class->fnID, &iCls))
-            {
-                gpsi->atomSysClass[iCls] = Class->Atom;
+            Class->fnid = SystemClasses[i].ClassId;
+            if (LockupFnIdToiCls(Class->fnid, &iCls))
+            {
+                gpsi->atomSysClass[iCls] = Class->atomClassName;
             }
 
             ASSERT(Class->System);
-            Class->Next = pi->SystemClassList;
+            Class->pclsNext = pi->SystemClassList;
             (void)InterlockedExchangePointer((PVOID*)&pi->SystemClassList,
                                              Class);
         }

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] Tue Jul 21
04:56:24 2009
@@ -1140,7 +1140,7 @@
    if (Class != NULL)
    {
       ASSERT(Class->System);
-      Class->Next = pi->SystemClassList;
+      Class->pclsNext = pi->SystemClassList;
       (void)InterlockedExchangePointer((PVOID*)&pi->SystemClassList,
                                              Class);
    }

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Tue Jul 21 04:56:24
2009
@@ -1425,7 +1425,7 @@
                 {
                     bti->rgstate[4] = STATE_SYSTEM_INVISIBLE;
                 }
-                if (pWindowObject->Wnd->pcls->Style & CS_NOCLOSE)
+                if (pWindowObject->Wnd->pcls->style & CS_NOCLOSE)
                 {
                     bti->rgstate[5] = STATE_SYSTEM_UNAVAILABLE;
                 }

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue Jul 21
04:56:24 2009
@@ -694,7 +694,7 @@
    {
       /* generate double click messages, if necessary */
       if ((((*HitTest) != HTCLIENT) ||
-            (Window->Wnd->pcls->Style & CS_DBLCLKS)) &&
+            (Window->Wnd->pcls->style & CS_DBLCLKS)) &&
             MsqIsDblClk(Msg, Remove))
       {
          Msg->message += WM_LBUTTONDBLCLK - WM_LBUTTONDOWN;

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] Tue Jul 21 04:56:24
2009
@@ -342,20 +342,20 @@
       Flags &= ~(DCX_CLIPCHILDREN | DCX_CLIPSIBLINGS | DCX_PARENTCLIP);
       if (!(Flags & DCX_WINDOW)) // not window rectangle
       {
-         if (Wnd->pcls->Style & CS_PARENTDC)
+         if (Wnd->pcls->style & CS_PARENTDC)
          {
             Flags |= DCX_PARENTCLIP;
          }
 
          if (!(Flags & DCX_CACHE) && // Not on the cheap wine list.
-             !(Wnd->pcls->Style & CS_OWNDC) )
-         {
-            if (!(Wnd->pcls->Style & CS_CLASSDC))
+             !(Wnd->pcls->style & CS_OWNDC) )
+         {
+            if (!(Wnd->pcls->style & CS_CLASSDC))
             // The window is not POWNED or has any CLASS, so we are looking for cheap
wine.
                Flags |= DCX_CACHE;
             else
             {
-               if (Wnd->pcls->Dce) hDC = ((PDCE)Wnd->pcls->Dce)->hDC;
+               if (Wnd->pcls->pdce) hDC = ((PDCE)Wnd->pcls->pdce)->hDC;
                DPRINT("We have CLASS!!\n");
             }
          }
@@ -646,7 +646,7 @@
       {
          if (!(pDCE->DCXFlags & DCX_CACHE)) /* owned or Class DCE*/
          {
-            if (Window->Wnd->pcls->Style & CS_CLASSDC ||
+            if (Window->Wnd->pcls->style & CS_CLASSDC ||
                 Window->Wnd->style & CS_CLASSDC) /* Test Class first */
             {
                if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) /* Class
DCE*/
@@ -657,7 +657,7 @@
                pDCE->DCXFlags = DCX_DCEEMPTY;
                pDCE->hwndCurrent = 0;
             }
-            else if (Window->Wnd->pcls->Style & CS_OWNDC ||
+            else if (Window->Wnd->pcls->style & CS_OWNDC ||
                      Window->Wnd->style & CS_OWNDC) /* owned DCE*/
             {
                pDCE = DceFreeDCE(pDCE, FALSE);

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] Tue Jul 21 04:56:24
2009
@@ -604,7 +604,7 @@
    pwi->dwExStyle = Wnd->ExStyle;
    pwi->dwWindowStatus = (UserGetForegroundWindow() == Window->hSelf); /*
WS_ACTIVECAPTION */
    IntGetWindowBorderMeasures(Window, &pwi->cxWindowBorders,
&pwi->cyWindowBorders);
-   pwi->atomWindowType = (Wnd->pcls ? Wnd->pcls->Atom : 0);
+   pwi->atomWindowType = (Wnd->pcls ? Wnd->pcls->atomClassName : 0);
    pwi->wCreatorVersion = 0x400; /* FIXME - return a real version number */
    return TRUE;
 }
@@ -1664,11 +1664,11 @@
    if (Window)
    {
        Window->Wnd = DesktopHeapAlloc(pti->Desktop,
-                                      sizeof(WINDOW) + Class->WndExtra);
+                                      sizeof(WINDOW) + Class->cbwndExtra);
        if (!Window->Wnd)
            goto AllocErr;
        RtlZeroMemory(Window->Wnd,
-                     sizeof(WINDOW) + Class->WndExtra);
+                     sizeof(WINDOW) + Class->cbwndExtra);
        Window->Wnd->hdr.Handle = hWnd; /* FIXME: Remove hack , are you sure?*/
        Wnd = Window->Wnd;
 
@@ -1749,13 +1749,13 @@
    {
        /* NOTE: Always create a unicode window for system classes! */
        Wnd->Unicode = TRUE;
-       Wnd->lpfnWndProc = Wnd->pcls->WndProc;
+       Wnd->lpfnWndProc = Wnd->pcls->lpfnWndProc;
        Wnd->WndProcExtra = Wnd->pcls->WndProcExtra;
    }
    else
    {
        Wnd->Unicode = Wnd->pcls->Unicode;
-       Wnd->lpfnWndProc = Wnd->pcls->WndProc;
+       Wnd->lpfnWndProc = Wnd->pcls->lpfnWndProc;
        Wnd->CallProc = NULL;
    }
 
@@ -1764,7 +1764,7 @@
    Window->LastChild = NULL;
    Window->PrevSibling = NULL;
    Window->NextSibling = NULL;
-   Wnd->cbwndExtra = Wnd->pcls->WndExtra;
+   Wnd->cbwndExtra = Wnd->pcls->cbwndExtra;
 
    InitializeListHead(&Wnd->PropListHead);
    InitializeListHead(&Window->WndObjListHead);
@@ -1848,10 +1848,10 @@
    InsertTailList (&pti->WindowListHead, &Window->ThreadListEntry);
 
    /*  Handle "CS_CLASSDC", it is tested first. */
-   if ((Wnd->pcls->Style & CS_CLASSDC) && !(Wnd->pcls->Dce)) //
One DCE per class to have CLASS.
-      Wnd->pcls->Dce = DceAllocDCE(Window, DCE_CLASS_DC);
+   if ((Wnd->pcls->style & CS_CLASSDC) && !(Wnd->pcls->pdce)) //
One DCE per class to have CLASS.
+      Wnd->pcls->pdce = DceAllocDCE(Window, DCE_CLASS_DC);
    /* Allocate a DCE for this window. */
-   else if ( Wnd->pcls->Style & CS_OWNDC)
+   else if ( Wnd->pcls->style & CS_OWNDC)
       Window->Dce = DceAllocDCE(Window, DCE_WINDOW_DC);
 
    Pos.x = x;
@@ -2656,7 +2656,7 @@
             The user mode version however calls GetWindowText() which will
             send WM_GETTEXT messages to windows belonging to its processes */
          if((!CheckWindowName || !RtlCompareUnicodeString(WindowName,
&(Child->Wnd->strName), TRUE)) &&
-               (!ClassAtom || Child->Wnd->pcls->Atom == ClassAtom))
+               (!ClassAtom || Child->Wnd->pcls->atomClassName == ClassAtom))
          {
             Ret = Child->hSelf;
             break;
@@ -2829,7 +2829,7 @@
                 WindowMatches = !CheckWindowName || !RtlCompareUnicodeString(
                                    &WindowName,
&TopLevelWindow->Wnd->strName, TRUE);
                 ClassMatches = (ClassAtom == (RTL_ATOM)0) ||
-                               ClassAtom == TopLevelWindow->Wnd->pcls->Atom;
+                               ClassAtom ==
TopLevelWindow->Wnd->pcls->atomClassName;
 
                 if (WindowMatches && ClassMatches)
                 {
@@ -3760,12 +3760,12 @@
     {
         /* check if the new procedure matches with the one in the
            window class. If so, we need to restore both procedures! */
-        Wnd->IsSystem = (NewWndProc == Wnd->pcls->WndProc ||
+        Wnd->IsSystem = (NewWndProc == Wnd->pcls->lpfnWndProc ||
                          NewWndProc == Wnd->pcls->WndProcExtra);
 
         if (Wnd->IsSystem)
         {
-            Wnd->lpfnWndProc = Wnd->pcls->WndProc;
+            Wnd->lpfnWndProc = Wnd->pcls->lpfnWndProc;
             Wnd->WndProcExtra = Wnd->pcls->WndProcExtra;
             Wnd->Unicode = !Ansi;
             return Ret;
@@ -4334,7 +4334,7 @@
          RETURN( FALSE);
       }
       else
-         Wnd->pcls->fnID |= fnID;
+         Wnd->pcls->fnid |= fnID;
    }
    RETURN( TRUE);