[ros-diffs] [gedmurphy] 32010: - fix number of params in 3 win32k syscalls - patch by Stefan Ginsberg ([e-mail]) (NtUserGetClassInfo params advised by myself)

Author: gedmurphy
Date: Sat Jan 26 15:55:46 2008
New Revision: 32010

URL: http://svn.reactos.org/svn/reactos?rev=32010&view=rev
Log:
- fix number of params in 3 win32k syscalls
- patch by Stefan Ginsberg  (stefan__100__(a)hotmail.com)
(NtUserGetClassInfo params advised by myself)


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/ntstubs.c
    trunk/reactos/subsystems/win32/win32k/w32ksvc.db

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 (original)
+++ trunk/reactos/dll/win32/user32/windows/class.c Sat Jan 26 15:55:46 2008
@@ -63,6 +63,7 @@
     Ret = NtUserGetClassInfo(hInstance,
                              &ClassName,
                              (LPWNDCLASSEXW)lpwcx,
+                             NULL,
                              TRUE);
 
     if (!IS_ATOM(lpszClass))
@@ -118,6 +119,7 @@
     return NtUserGetClassInfo(hInstance,
                               &ClassName,
                               lpwcx,
+                              NULL,
                               FALSE);
 }
 
@@ -1226,7 +1228,8 @@
         ClassName.Buffer = (PWSTR)((ULONG_PTR)lpClassName);
 
     Ret = NtUserUnregisterClass(&ClassName,
-                                hInstance);
+                                hInstance,
+                                0);
 
     if (!IS_ATOM(lpClassName))
         RtlFreeUnicodeString(&ClassName);
@@ -1260,7 +1263,8 @@
         ClassName.Buffer = (PWSTR)((ULONG_PTR)lpClassName);
 
     return NtUserUnregisterClass(&ClassName,
-                                 hInstance);
+                                 hInstance,
+                                 0);
 }
 
 /* EOF */

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 (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h Sat Jan 26 15:55:46 2008
@@ -1099,6 +1099,7 @@
 NtUserGetClassInfo(HINSTANCE hInstance,
 		   PUNICODE_STRING ClassName,
 		   LPWNDCLASSEXW wcex,
+		   LPWSTR *ppszMenuName,
 		   BOOL Ansi);
 
 INT
@@ -1496,7 +1497,8 @@
   DWORD Unknown7,
   DWORD Unknown8,
   DWORD Unknown9,
-  DWORD Unknown10);
+  DWORD Unknown10,
+  DWORD Unknown11);
 
 INT
 NTAPI
@@ -2422,7 +2424,8 @@
 NTAPI
 NtUserUnregisterClass(
   PUNICODE_STRING ClassNameOrAtom,
-  HINSTANCE hInstance);
+  HINSTANCE hInstance,
+  DWORD Unknown);
 
 BOOL
 NTAPI

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 (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Sat Jan 26 15:55:46 2008
@@ -2104,7 +2104,8 @@
 
 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 @@
    HINSTANCE hInstance,
    PUNICODE_STRING ClassName,
    LPWNDCLASSEXW lpWndClassEx,
-   BOOL Ansi)
+   LPWSTR *ppszMenuName,
+   BOOL Ansi);
 {
     UNICODE_STRING CapturedClassName;
     PWINDOWCLASS Class;

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Sat Jan 26 15:55:46 2008
@@ -414,7 +414,8 @@
    DWORD Unknown7,
    DWORD Unknown8,
    DWORD Unknown9,
-   DWORD Unknown10)
+   DWORD Unknown10,
+   DWORD Unknown11)
 {
    UNIMPLEMENTED
 

Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original)
+++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Jan 26 15:55:46 2008
@@ -391,8 +391,7 @@
 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 @@
 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 @@
 NtUserUnhookWinEvent                             1
 NtUserUnloadKeyboardLayout                       1
 NtUserUnlockWindowStation                        1
-# NtUserUnregisterClass                          3 Wrong number of param ?
-NtUserUnregisterClass                            2
+NtUserUnregisterClass                            3
 NtUserUnregisterUserApiHook                      0
 NtUserUnregisterHotKey                           2
 NtUserUpdateInputContext                         3