diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c
index 0acf11b4b4..348a95fe34 100644
--- a/win32ss/user/user32/windows/class.c
+++ b/win32ss/user/user32/windows/class.c
@@ -337,7 +337,7 @@ GetClassInfoExA(
             if ( dwLastError == ERROR_CANNOT_FIND_WND_CLASS ||
                  dwLastError == ERROR_CLASS_DOES_NOT_EXIST )
             {
-                ClassFound = VersionRegisterClass(ClassName.Buffer, lpLibFileName, pCtx, &hLibModule);
+                ClassFound = VersionRegisterClass(ClassName.Buffer, NULL, NULL, &hLibModule);
                 if (ClassFound) continue;
             }
         }
@@ -445,7 +445,7 @@ GetClassInfoExW(
             if ( dwLastError == ERROR_CANNOT_FIND_WND_CLASS ||
                  dwLastError == ERROR_CLASS_DOES_NOT_EXIST )
             {
-                ClassFound = VersionRegisterClass(ClassName.Buffer, lpLibFileName, pCtx, &hLibModule);
+                ClassFound = VersionRegisterClass(ClassName.Buffer, NULL, NULL, &hLibModule);
                 if (ClassFound) continue;
             }
         }
@@ -1495,7 +1495,7 @@ RegisterClassExWOWW(WNDCLASSEXW *lpwcx,
     ClassVersion = ClassName;
     if (fnID == 0)
     {
-        lpszClsVersion = ClassNameToVersion(lpwcx->lpszClassName, NULL, NULL, NULL, FALSE);
+        lpszClsVersion = NULL;
         if (lpszClsVersion)
         {
             RtlInitUnicodeString(&ClassVersion, lpszClsVersion);
diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c
index 60c9feb47f..0948f8e78f 100644
--- a/win32ss/user/user32/windows/window.c
+++ b/win32ss/user/user32/windows/window.c
@@ -320,7 +320,7 @@ User32CreateWindowEx(DWORD dwExStyle,
     {
         Handle = NtUserCreateWindowEx(dwExStyle,
                                       plstrClassName,
-                                      plstrClassVersion,
+                                      plstrClassName,
                                       &WindowName,
                                       dwStyle,
                                       x,
@@ -340,7 +340,7 @@ User32CreateWindowEx(DWORD dwExStyle,
             dwLastError = GetLastError();
             if (dwLastError == ERROR_CANNOT_FIND_WND_CLASS)
             {
-                ClassFound = VersionRegisterClass(ClassName.Buffer, lpLibFileName, pCtx, &hLibModule);
+                ClassFound = VersionRegisterClass(ClassName.Buffer, NULL, NULL, &hLibModule);
                 if (ClassFound) continue;
             }
         }