mirror of
https://github.com/reactos/reactos.git
synced 2025-04-05 13:11:22 +00:00
[USER32] Refactoring on LoadKeyboardLayout(W/Ex) (#4601)
- Add IntLoadKeyboardLayout (Win: LoadKeyboardLayoutWorker) helper function. - Use it in LoadKeyboardLayoutW and LoadKeyboardLayoutEx functions. CORE-11700
This commit is contained in:
parent
c15a9c1d09
commit
1381cea2a7
2 changed files with 34 additions and 13 deletions
|
@ -441,15 +441,6 @@ BOOL WINAPI IsServerSideWindow(HWND wnd)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* @unimplemented
|
|
||||||
*/
|
|
||||||
HKL WINAPI LoadKeyboardLayoutEx(DWORD unknown,LPCWSTR pwszKLID,UINT Flags) //1st parameter unknown
|
|
||||||
{
|
|
||||||
UNIMPLEMENTED;
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* @unimplemented
|
* @unimplemented
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -639,11 +639,16 @@ LoadKeyboardLayoutA(LPCSTR pszKLID,
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* @implemented
|
* @unimplemented
|
||||||
*/
|
*/
|
||||||
HKL WINAPI
|
/* Win: LoadKeyboardLayoutWorker */
|
||||||
LoadKeyboardLayoutW(LPCWSTR pwszKLID,
|
HKL APIENTRY
|
||||||
UINT Flags)
|
IntLoadKeyboardLayout(
|
||||||
|
_In_ HKL hklUnload,
|
||||||
|
_In_z_ LPCWSTR pwszKLID,
|
||||||
|
_In_ LANGID wLangID,
|
||||||
|
_In_ UINT Flags,
|
||||||
|
_In_ BOOL unknown5)
|
||||||
{
|
{
|
||||||
DWORD dwhkl, dwType, dwSize;
|
DWORD dwhkl, dwType, dwSize;
|
||||||
UNICODE_STRING ustrKbdName;
|
UNICODE_STRING ustrKbdName;
|
||||||
|
@ -712,6 +717,31 @@ LoadKeyboardLayoutW(LPCWSTR pwszKLID,
|
||||||
dwhkl, Flags);
|
dwhkl, Flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @implemented
|
||||||
|
*/
|
||||||
|
HKL WINAPI
|
||||||
|
LoadKeyboardLayoutW(LPCWSTR pwszKLID,
|
||||||
|
UINT Flags)
|
||||||
|
{
|
||||||
|
TRACE("(%s, 0x%X)", debugstr_w(pwszKLID), Flags);
|
||||||
|
return IntLoadKeyboardLayout(NULL, pwszKLID, 0, Flags, FALSE);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @unimplemented
|
||||||
|
*/
|
||||||
|
HKL WINAPI
|
||||||
|
LoadKeyboardLayoutEx(HKL hklUnload,
|
||||||
|
LPCWSTR pwszKLID,
|
||||||
|
UINT Flags)
|
||||||
|
{
|
||||||
|
FIXME("(%p, %s, 0x%X)", hklUnload, debugstr_w(pwszKLID), Flags);
|
||||||
|
if (!hklUnload)
|
||||||
|
return NULL;
|
||||||
|
return IntLoadKeyboardLayout(hklUnload, pwszKLID, 0, Flags, FALSE);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* @implemented
|
* @implemented
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue