Author: jimtabor Date: Fri Aug 17 06:06:36 2007 New Revision: 28378
URL: http://svn.reactos.org/svn/reactos?rev=28378&view=rev Log: Fix NtUserLoadKeyboardLayoutEx size.
Modified: trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db
Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/in... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Fri Aug 17 06:06:36 2007 @@ -289,7 +289,7 @@ LoadKeyboardLayoutA(LPCSTR pwszKLID, UINT Flags) { - return NtUserLoadKeyboardLayoutEx( NULL, 0, NULL, NULL, + return NtUserLoadKeyboardLayoutEx( NULL, 0, NULL, NULL, NULL, strtoul(pwszKLID, NULL, 16), Flags); } @@ -304,7 +304,7 @@ { // Look at revision 25596 to see how it's done in windows. // We will do things our own way. Also be compatible too! - return NtUserLoadKeyboardLayoutEx( NULL, 0, NULL, NULL, + return NtUserLoadKeyboardLayoutEx( NULL, 0, NULL, NULL, NULL, wcstoul(pwszKLID, NULL, 16), Flags); }
Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntus... ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Fri Aug 17 06:06:36 2007 @@ -1232,6 +1232,7 @@ NtUserLoadKeyboardLayoutEx( IN HANDLE Handle, IN DWORD offTable, + IN PUNICODE_STRING puszKeyboardName, IN HKL hKL, IN PUNICODE_STRING puszKLID, IN DWORD dwKLID,
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Fri Aug 17 06:06:36 2007 @@ -491,6 +491,7 @@ NtUserLoadKeyboardLayoutEx( IN HANDLE Handle, IN DWORD offTable, + IN PUNICODE_STRING puszKeyboardName, IN HKL hKL, IN PUNICODE_STRING puszKLID, IN DWORD dwKLID,
Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w32... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Fri Aug 17 06:06:36 2007 @@ -460,7 +460,7 @@ NtUserInvalidateRgn 3 NtUserIsClipboardFormatAvailable 1 NtUserKillTimer 2 -# NtUserLoadKeyboardLayoutEx 7 Wrong number of param ? +NtUserLoadKeyboardLayoutEx 7 NtUserLockWindowStation 1 NtUserLockWindowUpdate 1 NtUserLockWorkStation 0 @@ -684,7 +684,6 @@ NtUserGetClassInfo 4 NtUserGetClipboardViewer 0 NtUserInitTask 11 -NtUserLoadKeyboardLayoutEx 6 NtUserSetClassWord 3 NtUserSetCursorIconData 6 NtUserSetWinEventHook 8