From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Tue, 13 Dec 2005 21:26:25 +0000 (+0000)
Subject: implemented GetKeyboardLayoutNameW
X-Git-Tag: backups/expat-rbuild@40467~948
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=86498fffe41bd5b43e18f52c76ccd263edb63e94;hp=9f345c304d666b0fbda57c30b41a9adf9eeb8787;ds=sidebyside

implemented GetKeyboardLayoutNameW
fixed declaration of NtUserGetKeyboardLayoutName

svn path=/trunk/; revision=20150
---

diff --git a/reactos/include/win32k/ntuser.h b/reactos/include/win32k/ntuser.h
index 895416817bd..8f7534093c2 100644
--- a/reactos/include/win32k/ntuser.h
+++ b/reactos/include/win32k/ntuser.h
@@ -752,10 +752,10 @@ NtUserGetKeyboardLayoutList(
   DWORD Unknown0,
   DWORD Unknown1);
 
-DWORD
+BOOL
 STDCALL
 NtUserGetKeyboardLayoutName(
-  DWORD Unknown0);
+  LPWSTR lpszName);
 
 DWORD
 STDCALL
diff --git a/reactos/lib/user32/windows/input.c b/reactos/lib/user32/windows/input.c
index e1594833088..5f30b2164d7 100644
--- a/reactos/lib/user32/windows/input.c
+++ b/reactos/lib/user32/windows/input.c
@@ -260,13 +260,12 @@ GetKeyboardLayoutNameA(LPSTR pwszKLID)
 
 
 /*
- * @unimplemented
+ * @implemented
  */
 BOOL STDCALL
 GetKeyboardLayoutNameW(LPWSTR pwszKLID)
 {
-  UNIMPLEMENTED;
-  return FALSE;
+  return NtUserGetKeyboardLayoutName( pwszKLID );
 }
 
 
diff --git a/reactos/subsys/win32k/ntuser/keyboard.c b/reactos/subsys/win32k/ntuser/keyboard.c
index 5d6fc6ac091..f0b83168856 100644
--- a/reactos/subsys/win32k/ntuser/keyboard.c
+++ b/reactos/subsys/win32k/ntuser/keyboard.c
@@ -1254,18 +1254,16 @@ NtUserGetKeyboardLayoutList(
    return 0;
 }
 
-DWORD
+BOOL
 STDCALL
 NtUserGetKeyboardLayoutName(
-   DWORD lpszName)
+   LPWSTR lpszName)
 {
    UNIMPLEMENTED
 
    return 0;
 }
 
-
-
 HKL FASTCALL
 UserGetKeyboardLayout(
    DWORD dwThreadId)