From a02bfc61973113e3989ee9d2d1e248521652c281 Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Fri, 17 Aug 2007 02:06:36 +0000
Subject: [PATCH] Fix NtUserLoadKeyboardLayoutEx size.

svn path=/trunk/; revision=28378
---
 reactos/dll/win32/user32/windows/input.c           | 4 ++--
 reactos/include/reactos/win32k/ntuser.h            | 1 +
 reactos/subsystems/win32/win32k/ntuser/kbdlayout.c | 1 +
 reactos/subsystems/win32/win32k/w32ksvc.db         | 3 +--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/reactos/dll/win32/user32/windows/input.c b/reactos/dll/win32/user32/windows/input.c
index 562bce1fbc3..abb0a7c5b05 100644
--- a/reactos/dll/win32/user32/windows/input.c
+++ b/reactos/dll/win32/user32/windows/input.c
@@ -289,7 +289,7 @@ HKL STDCALL
 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 @@ LoadKeyboardLayoutW(LPCWSTR pwszKLID,
 {
   // 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);
 }
diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h
index beeea8163d3..33e100066ef 100644
--- a/reactos/include/reactos/win32k/ntuser.h
+++ b/reactos/include/reactos/win32k/ntuser.h
@@ -1232,6 +1232,7 @@ STDCALL
 NtUserLoadKeyboardLayoutEx( 
    IN HANDLE Handle,
    IN DWORD offTable,
+   IN PUNICODE_STRING puszKeyboardName,
    IN HKL hKL,
    IN PUNICODE_STRING puszKLID,
    IN DWORD dwKLID,
diff --git a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c b/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
index 2e1f424de3a..d1fe34a4823 100644
--- a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
+++ b/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
@@ -491,6 +491,7 @@ STDCALL
 NtUserLoadKeyboardLayoutEx( 
    IN HANDLE Handle,
    IN DWORD offTable,
+   IN PUNICODE_STRING puszKeyboardName,
    IN HKL hKL,
    IN PUNICODE_STRING puszKLID,
    IN DWORD dwKLID,
diff --git a/reactos/subsystems/win32/win32k/w32ksvc.db b/reactos/subsystems/win32/win32k/w32ksvc.db
index 1ee2c21db5d..915589bf222 100644
--- a/reactos/subsystems/win32/win32k/w32ksvc.db
+++ b/reactos/subsystems/win32/win32k/w32ksvc.db
@@ -460,7 +460,7 @@ NtUserInvalidateRect                             3
 NtUserInvalidateRgn                              3
 NtUserIsClipboardFormatAvailable                 1
 NtUserKillTimer                                  2
-# NtUserLoadKeyboardLayoutEx                       7   Wrong number of param ?
+NtUserLoadKeyboardLayoutEx                       7
 NtUserLockWindowStation                          1
 NtUserLockWindowUpdate                           1
 NtUserLockWorkStation                            0
@@ -684,7 +684,6 @@ NtUserFindWindowEx                      4
 NtUserGetClassInfo                      4
 NtUserGetClipboardViewer                0
 NtUserInitTask                          11
-NtUserLoadKeyboardLayoutEx              6
 NtUserSetClassWord                      3
 NtUserSetCursorIconData                 6
 NtUserSetWinEventHook                   8