From 5b5baba7f5089d85ce1e2a2d68f73486c03d73c7 Mon Sep 17 00:00:00 2001
From: Ged Murphy <gedmurphy@reactos.org>
Date: Sat, 26 Jan 2008 12:55:46 +0000
Subject: [PATCH] - fix number of params in 3 win32k syscalls - patch by Stefan
 Ginsberg  (stefan__100__@hotmail.com) (NtUserGetClassInfo params advised by
 myself)

svn path=/trunk/; revision=32010
---
 reactos/dll/win32/user32/windows/class.c         | 8 ++++++--
 reactos/include/reactos/win32k/ntuser.h          | 7 +++++--
 reactos/subsystems/win32/win32k/ntuser/class.c   | 6 ++++--
 reactos/subsystems/win32/win32k/ntuser/ntstubs.c | 3 ++-
 reactos/subsystems/win32/win32k/w32ksvc.db       | 9 +++------
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/reactos/dll/win32/user32/windows/class.c b/reactos/dll/win32/user32/windows/class.c
index 8ad0d5a022f..f3b9004c659 100644
--- a/reactos/dll/win32/user32/windows/class.c
+++ b/reactos/dll/win32/user32/windows/class.c
@@ -63,6 +63,7 @@ GetClassInfoExA(
     Ret = NtUserGetClassInfo(hInstance,
                              &ClassName,
                              (LPWNDCLASSEXW)lpwcx,
+                             NULL,
                              TRUE);
 
     if (!IS_ATOM(lpszClass))
@@ -118,6 +119,7 @@ GetClassInfoExW(
     return NtUserGetClassInfo(hInstance,
                               &ClassName,
                               lpwcx,
+                              NULL,
                               FALSE);
 }
 
@@ -1226,7 +1228,8 @@ UnregisterClassA(
         ClassName.Buffer = (PWSTR)((ULONG_PTR)lpClassName);
 
     Ret = NtUserUnregisterClass(&ClassName,
-                                hInstance);
+                                hInstance,
+                                0);
 
     if (!IS_ATOM(lpClassName))
         RtlFreeUnicodeString(&ClassName);
@@ -1260,7 +1263,8 @@ UnregisterClassW(
         ClassName.Buffer = (PWSTR)((ULONG_PTR)lpClassName);
 
     return NtUserUnregisterClass(&ClassName,
-                                 hInstance);
+                                 hInstance,
+                                 0);
 }
 
 /* EOF */
diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h
index c072e37b894..9426b06da94 100644
--- a/reactos/include/reactos/win32k/ntuser.h
+++ b/reactos/include/reactos/win32k/ntuser.h
@@ -1099,6 +1099,7 @@ BOOL NTAPI
 NtUserGetClassInfo(HINSTANCE hInstance,
 		   PUNICODE_STRING ClassName,
 		   LPWNDCLASSEXW wcex,
+		   LPWSTR *ppszMenuName,
 		   BOOL Ansi);
 
 INT
@@ -1496,7 +1497,8 @@ NtUserInitTask(
   DWORD Unknown7,
   DWORD Unknown8,
   DWORD Unknown9,
-  DWORD Unknown10);
+  DWORD Unknown10,
+  DWORD Unknown11);
 
 INT
 NTAPI
@@ -2422,7 +2424,8 @@ BOOL
 NTAPI
 NtUserUnregisterClass(
   PUNICODE_STRING ClassNameOrAtom,
-  HINSTANCE hInstance);
+  HINSTANCE hInstance,
+  DWORD Unknown);
 
 BOOL
 NTAPI
diff --git a/reactos/subsystems/win32/win32k/ntuser/class.c b/reactos/subsystems/win32/win32k/ntuser/class.c
index bc52a313516..db7a98835b5 100644
--- a/reactos/subsystems/win32/win32k/ntuser/class.c
+++ b/reactos/subsystems/win32/win32k/ntuser/class.c
@@ -2104,7 +2104,8 @@ NtUserSetClassWord(DWORD Unknown0,
 
 BOOL NTAPI
 NtUserUnregisterClass(IN PUNICODE_STRING ClassNameOrAtom,
-                      IN HINSTANCE hInstance)
+                      IN HINSTANCE hInstance,
+                      DWORD Unknown)
 {
     UNICODE_STRING CapturedClassName;
     BOOL Ret = FALSE;
@@ -2157,7 +2158,8 @@ NtUserGetClassInfo(
    HINSTANCE hInstance,
    PUNICODE_STRING ClassName,
    LPWNDCLASSEXW lpWndClassEx,
-   BOOL Ansi)
+   LPWSTR *ppszMenuName,
+   BOOL Ansi);
 {
     UNICODE_STRING CapturedClassName;
     PWINDOWCLASS Class;
diff --git a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
index a40920319de..a8c37d40ee4 100644
--- a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
+++ b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
@@ -414,7 +414,8 @@ NtUserInitTask(
    DWORD Unknown7,
    DWORD Unknown8,
    DWORD Unknown9,
-   DWORD Unknown10)
+   DWORD Unknown10,
+   DWORD Unknown11)
 {
    UNIMPLEMENTED
 
diff --git a/reactos/subsystems/win32/win32k/w32ksvc.db b/reactos/subsystems/win32/win32k/w32ksvc.db
index 32c70bd1de5..45980f23f5b 100644
--- a/reactos/subsystems/win32/win32k/w32ksvc.db
+++ b/reactos/subsystems/win32/win32k/w32ksvc.db
@@ -391,8 +391,7 @@ NtUserGetAsyncKeyState                           1
 NtUserGetAtomName                                2
 NtUserGetCaretBlinkTime                          0
 NtUserGetCaretPos                                1
-# NtUserGetClassInfo                             5   Wrong number of param ?
-NtUserGetClassInfo                               4
+NtUserGetClassInfo                               5
 NtUserGetClassName                               3
 NtUserGetClipboardData                           2
 NtUserGetClipboardFormatName                     3
@@ -453,8 +452,7 @@ NtUserHiliteMenuItem                             4
 NtUserImpersonateDdeClientWindow                 2
 NtUserInitialize                                 3
 NtUserInitializeClientPfnArrays                  4
-# NtUserInitTask                                12 Wrong number of param ?
-NtUserInitTask                                  11
+NtUserInitTask                                  12
 NtUserInternalGetWindowText                      3
 NtUserInvalidateRect                             3
 NtUserInvalidateRgn                              3
@@ -580,8 +578,7 @@ NtUserUnhookWindowsHookEx                        1
 NtUserUnhookWinEvent                             1
 NtUserUnloadKeyboardLayout                       1
 NtUserUnlockWindowStation                        1
-# NtUserUnregisterClass                          3 Wrong number of param ?
-NtUserUnregisterClass                            2
+NtUserUnregisterClass                            3
 NtUserUnregisterUserApiHook                      0
 NtUserUnregisterHotKey                           2
 NtUserUpdateInputContext                         3