Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-07 10:46:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTUSER][USER32] NtUserGetKeyboardLayoutName and GetKeyboardLayoutNameW (#4595)

Browse source 
#4594 has proved that the 1st argument of NtUserGetKeyboardLayoutName has type PUNICODE_STRING.
CORE-11700
This commit is contained in:
Katayama Hirofumi MZ 2022-08-06 08:02:31 +09:00 committed by GitHub
parent 786017c5b6
commit 3e42f7b478
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/rostests/apitests/win32u/win32u_2k3sp2/win32u_2k3sp2.spec
View file

@ -417,7 +417,7 @@
@ stdcall NtUserGetImeInfoEx(long long) @ stdcall NtUserGetImeInfoEx(long long)
@ stdcall NtUserGetInternalWindowPos(ptr ptr ptr) @ stdcall NtUserGetInternalWindowPos(ptr ptr ptr)
@ stdcall NtUserGetKeyboardLayoutList(long ptr) @ stdcall NtUserGetKeyboardLayoutList(long ptr)
@ stdcall NtUserGetKeyboardLayoutName(str) @ stdcall NtUserGetKeyboardLayoutName(ptr)
@ stdcall NtUserGetKeyboardState(ptr) @ stdcall NtUserGetKeyboardState(ptr)
@ stdcall NtUserGetKeyNameText(long wstr long) @ stdcall NtUserGetKeyNameText(long wstr long)
@ stdcall NtUserGetKeyState(long) @ stdcall NtUserGetKeyState(long)

2
modules/rostests/apitests/win32u/win32u_ros/win32u_ros.spec
View file

@ -418,7 +418,7 @@
@ stdcall NtUserGetImeInfoEx(long long) @ stdcall NtUserGetImeInfoEx(long long)
@ stdcall NtUserGetInternalWindowPos(ptr ptr ptr) @ stdcall NtUserGetInternalWindowPos(ptr ptr ptr)
@ stdcall NtUserGetKeyboardLayoutList(long ptr) @ stdcall NtUserGetKeyboardLayoutList(long ptr)
@ stdcall NtUserGetKeyboardLayoutName(str) @ stdcall NtUserGetKeyboardLayoutName(ptr)
@ stdcall NtUserGetKeyboardState(ptr) @ stdcall NtUserGetKeyboardState(ptr)
@ stdcall NtUserGetKeyNameText(long wstr long) @ stdcall NtUserGetKeyNameText(long wstr long)
@ stdcall NtUserGetKeyState(long) @ stdcall NtUserGetKeyState(long)

2
modules/rostests/apitests/win32u/win32u_vista/win32u_vista.spec
View file

@ -431,7 +431,7 @@
@ stdcall NtUserGetImeInfoEx(long long) @ stdcall NtUserGetImeInfoEx(long long)
@ stdcall NtUserGetInternalWindowPos(ptr ptr ptr) @ stdcall NtUserGetInternalWindowPos(ptr ptr ptr)
@ stdcall NtUserGetKeyboardLayoutList(long ptr) @ stdcall NtUserGetKeyboardLayoutList(long ptr)
@ stdcall NtUserGetKeyboardLayoutName(str) @ stdcall NtUserGetKeyboardLayoutName(ptr)
@ stdcall NtUserGetKeyboardState(ptr) @ stdcall NtUserGetKeyboardState(ptr)
@ stdcall NtUserGetKeyNameText(long wstr long) @ stdcall NtUserGetKeyNameText(long wstr long)
@ stdcall NtUserGetKeyState(long) @ stdcall NtUserGetKeyState(long)

2
modules/rostests/apitests/win32u/win32u_xpsp2/win32u_xpsp2.spec
View file

@ -417,7 +417,7 @@
@ stdcall NtUserGetImeInfoEx(long long) @ stdcall NtUserGetImeInfoEx(long long)
@ stdcall NtUserGetInternalWindowPos(ptr ptr ptr) @ stdcall NtUserGetInternalWindowPos(ptr ptr ptr)
@ stdcall NtUserGetKeyboardLayoutList(long ptr) @ stdcall NtUserGetKeyboardLayoutList(long ptr)
@ stdcall NtUserGetKeyboardLayoutName(str) @ stdcall NtUserGetKeyboardLayoutName(ptr)
@ stdcall NtUserGetKeyboardState(ptr) @ stdcall NtUserGetKeyboardState(ptr)
@ stdcall NtUserGetKeyNameText(long wstr long) @ stdcall NtUserGetKeyNameText(long wstr long)
@ stdcall NtUserGetKeyState(long) @ stdcall NtUserGetKeyState(long)

2
win32ss/include/ntuser.h
View file

@ -2431,7 +2431,7 @@ NtUserGetKeyboardLayoutList(
BOOL BOOL
NTAPI NTAPI
NtUserGetKeyboardLayoutName( NtUserGetKeyboardLayoutName(
LPWSTR lpszName); _Inout_ PUNICODE_STRING pustrName);
DWORD DWORD
NTAPI NTAPI

23
win32ss/user/ntuser/kbdlayout.c
View file

@ -649,11 +649,12 @@ Quit:
BOOL BOOL
APIENTRY APIENTRY
NtUserGetKeyboardLayoutName( NtUserGetKeyboardLayoutName(
LPWSTR pwszName) _Inout_ PUNICODE_STRING pustrName)
{ {
BOOL bRet = FALSE; BOOL bRet = FALSE;
PKL pKl; PKL pKl;
PTHREADINFO pti; PTHREADINFO pti;
UNICODE_STRING ustrTemp;
UserEnterShared(); UserEnterShared();
@ -665,8 +666,24 @@ NtUserGetKeyboardLayoutName(
_SEH2_TRY _SEH2_TRY
{ {
ProbeForWrite(pwszName, KL_NAMELENGTH*sizeof(WCHAR), 1); ProbeForWriteUnicodeString(pustrName);
wcscpy(pwszName, pKl->spkf->awchKF); ProbeForWrite(pustrName->Buffer, pustrName->MaximumLength, 1);
if (IS_IME_HKL(pKl->hkl))
{
RtlIntegerToUnicodeString((ULONG)(ULONG_PTR)pKl->hkl, 16, pustrName);
}
else
{
if (pustrName->MaximumLength < KL_NAMELENGTH * sizeof(WCHAR))
{
EngSetLastError(ERROR_INVALID_PARAMETER);
goto cleanup;
}
RtlInitUnicodeString(&ustrTemp, pKl->spkf->awchKF); /* FIXME: Do not use awchKF */
RtlCopyUnicodeString(pustrName, &ustrTemp);
}
bRet = TRUE; bRet = TRUE;
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)

8
win32ss/user/user32/windows/input.c
View file

@ -584,7 +584,13 @@ GetKeyboardLayoutNameA(LPSTR pwszKLID)
BOOL WINAPI BOOL WINAPI
GetKeyboardLayoutNameW(LPWSTR pwszKLID) GetKeyboardLayoutNameW(LPWSTR pwszKLID)
{ {
return NtUserGetKeyboardLayoutName(pwszKLID); UNICODE_STRING Name;
RtlInitEmptyUnicodeString(&Name,
pwszKLID,
KL_NAMELENGTH * sizeof(WCHAR));
return NtUserGetKeyboardLayoutName(&Name);
} }
/* /*