Merge to trunk HEAD(r36856)

[reactos.git] / reactos / subsystems / win32 / win32k / ntuser / kbdlayout.c

diff --git a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c b/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
index daaf0bb..4b8822b 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
+++ b/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
@@ -407,7 +407,7 @@ BOOL UserUnloadKbl(PKBL pKbl)
    return TRUE;\r
 }\r
 \r
-static PKBL co_UserActivateKbl(PW32THREAD w32Thread, PKBL pKbl, UINT Flags)\r
+static PKBL co_UserActivateKbl(PTHREADINFO w32Thread, PKBL pKbl, UINT Flags)\r
 {\r
    PKBL Prev;\r
 \r
@@ -444,7 +444,7 @@ UserGetKeyboardLayout(
 {\r
    NTSTATUS Status;\r
    PETHREAD Thread;\r
-   PW32THREAD W32Thread;\r
+   PTHREADINFO W32Thread;\r
    HKL Ret;\r
 \r
    if(!dwThreadId)\r
@@ -523,13 +523,15 @@ NtUserGetKeyboardLayoutName(
 {\r
    BOOL ret = FALSE;\r
    PKBL pKbl;\r
+   PTHREADINFO pti;\r
 \r
    UserEnterShared();\r
 \r
    _SEH_TRY\r
    {\r
       ProbeForWrite(lpszName, KL_NAMELENGTH*sizeof(WCHAR), 1);\r
-      pKbl = PsGetCurrentThreadWin32Thread()->KeyboardLayout;\r
+      pti = PsGetCurrentThreadWin32Thread();\r
+      pKbl = pti->KeyboardLayout;\r
       RtlCopyMemory(lpszName,  pKbl->Name, KL_NAMELENGTH*sizeof(WCHAR));\r
       ret = TRUE;\r
    }\r
@@ -614,7 +616,7 @@ NtUserActivateKeyboardLayout(
 {\r
    PKBL pKbl;\r
    HKL Ret = NULL;\r
-   PW32THREAD pWThread;\r
+   PTHREADINFO pWThread;\r
 \r
    UserEnterExclusive();\r
 \r