X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=reactos%2Fwin32ss%2Fuser%2Fntuser%2Fclass.c;h=db02845b3bab47d6a7fd13f98b6881f17f416f2b;hp=46a78c3feffd2e0af95fc738cfae4b5f0dd2c2b8;hb=ae875ccc884d357cba178ac0322c55b3be73f43d;hpb=8b95cbf0e26ef5fc2bcc29e5ef5fe8a6ffa9d0d3

diff --git a/reactos/win32ss/user/ntuser/class.c b/reactos/win32ss/user/ntuser/class.c
index 46a78c3feff..db02845b3ba 100644
--- a/reactos/win32ss/user/ntuser/class.c
+++ b/reactos/win32ss/user/ntuser/class.c
@@ -1228,7 +1228,8 @@ NoMem:
     }
 
     TRACE("Created class 0x%p with name %wZ and proc 0x%p for atom 0x%x and version atom 0x%x and hInstance 0x%p, global %u\n",
-            Class, ClassName, Class->lpfnWndProc, Atom, verAtom, Class->hModule, Class->Global);
+          Class, ClassName, Class ? Class->lpfnWndProc : NULL, Atom, verAtom,
+          Class ? Class->hModule : NULL , Class ? Class->Global : 0);
 
     return Class;
 }
@@ -2332,6 +2333,7 @@ UserRegisterSystemClasses(VOID)
             if (SYSTEMCUR(ARROW) == NULL)
             {
                 ERR("SYSTEMCUR(ARROW) == NULL, should not happen!!\n");
+                //ASSERT(FALSE);
             }
             else
             {
@@ -2382,7 +2384,7 @@ APIENTRY
 NtUserRegisterClassExWOW(
     WNDCLASSEXW* lpwcx,
     PUNICODE_STRING ClassName,
-    PUNICODE_STRING ClsNVersion,
+    PUNICODE_STRING ClsVersion,
     PCLSMENUNAME pClassMenuName,
     DWORD fnID,
     DWORD Flags,
@@ -2437,7 +2439,7 @@ NtUserRegisterClassExWOW(
                       sizeof(WNDCLASSEXW));
 
         CapturedName = ProbeForReadUnicodeString(ClassName);
-        CapturedVersion = ProbeForReadUnicodeString(ClsNVersion);
+        CapturedVersion = ProbeForReadUnicodeString(ClsVersion);
 
         ProbeForRead(pClassMenuName,
                      sizeof(CLSMENUNAME),
@@ -2743,6 +2745,7 @@ NtUserGetClassInfo(
                                 NULL);
     if (ClassAtom != (RTL_ATOM)0)
     {
+        ClassAtom = Class->atomNVClassName;
         Ret = UserGetClassInfo(Class, &Safewcexw, bAnsi, hInstance);
     }
     else