user32: Move (Un)LoadKeyboardLayoutW from winex11.drv to user32.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon
Alexandre Julliard
parent
30460460e5
commit
4bec69b104
|
|
@ -109,11 +109,9 @@ static const USER_DRIVER *load_driver(void)
|
|||
GET_USER_FUNC(Beep);
|
||||
GET_USER_FUNC(GetKeyNameText);
|
||||
GET_USER_FUNC(GetKeyboardLayoutList);
|
||||
GET_USER_FUNC(LoadKeyboardLayout);
|
||||
GET_USER_FUNC(MapVirtualKeyEx);
|
||||
GET_USER_FUNC(RegisterHotKey);
|
||||
GET_USER_FUNC(ToUnicodeEx);
|
||||
GET_USER_FUNC(UnloadKeyboardLayout);
|
||||
GET_USER_FUNC(UnregisterHotKey);
|
||||
GET_USER_FUNC(VkKeyScanEx);
|
||||
GET_USER_FUNC(DestroyCursorIcon);
|
||||
|
|
@ -204,11 +202,6 @@ static INT CDECL nulldrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size )
|
|||
return -1; /* use default implementation */
|
||||
}
|
||||
|
||||
static HKL CDECL nulldrv_LoadKeyboardLayout( LPCWSTR name, UINT flags )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static UINT CDECL nulldrv_MapVirtualKeyEx( UINT code, UINT type, HKL layout )
|
||||
{
|
||||
return -1; /* use default implementation */
|
||||
|
|
@ -225,11 +218,6 @@ static INT CDECL nulldrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, L
|
|||
return -2; /* use default implementation */
|
||||
}
|
||||
|
||||
static BOOL CDECL nulldrv_UnloadKeyboardLayout( HKL layout )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void CDECL nulldrv_UnregisterHotKey( HWND hwnd, UINT modifiers, UINT vk )
|
||||
{
|
||||
}
|
||||
|
|
@ -416,11 +404,9 @@ static USER_DRIVER null_driver =
|
|||
nulldrv_Beep,
|
||||
nulldrv_GetKeyNameText,
|
||||
nulldrv_GetKeyboardLayoutList,
|
||||
nulldrv_LoadKeyboardLayout,
|
||||
nulldrv_MapVirtualKeyEx,
|
||||
nulldrv_RegisterHotKey,
|
||||
nulldrv_ToUnicodeEx,
|
||||
nulldrv_UnloadKeyboardLayout,
|
||||
nulldrv_UnregisterHotKey,
|
||||
nulldrv_VkKeyScanEx,
|
||||
/* cursor/icon functions */
|
||||
|
|
@ -493,11 +479,6 @@ static UINT CDECL loaderdrv_GetKeyboardLayoutList( INT size, HKL *layouts )
|
|||
return load_driver()->pGetKeyboardLayoutList( size, layouts );
|
||||
}
|
||||
|
||||
static HKL CDECL loaderdrv_LoadKeyboardLayout( LPCWSTR name, UINT flags )
|
||||
{
|
||||
return load_driver()->pLoadKeyboardLayout( name, flags );
|
||||
}
|
||||
|
||||
static UINT CDECL loaderdrv_MapVirtualKeyEx( UINT code, UINT type, HKL layout )
|
||||
{
|
||||
return load_driver()->pMapVirtualKeyEx( code, type, layout );
|
||||
|
|
@ -514,11 +495,6 @@ static INT CDECL loaderdrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state,
|
|||
return load_driver()->pToUnicodeEx( virt, scan, state, str, size, flags, layout );
|
||||
}
|
||||
|
||||
static BOOL CDECL loaderdrv_UnloadKeyboardLayout( HKL layout )
|
||||
{
|
||||
return load_driver()->pUnloadKeyboardLayout( layout );
|
||||
}
|
||||
|
||||
static void CDECL loaderdrv_UnregisterHotKey( HWND hwnd, UINT modifiers, UINT vk )
|
||||
{
|
||||
load_driver()->pUnregisterHotKey( hwnd, modifiers, vk );
|
||||
|
|
@ -619,11 +595,9 @@ static USER_DRIVER lazy_load_driver =
|
|||
loaderdrv_Beep,
|
||||
loaderdrv_GetKeyNameText,
|
||||
loaderdrv_GetKeyboardLayoutList,
|
||||
loaderdrv_LoadKeyboardLayout,
|
||||
loaderdrv_MapVirtualKeyEx,
|
||||
loaderdrv_RegisterHotKey,
|
||||
loaderdrv_ToUnicodeEx,
|
||||
loaderdrv_UnloadKeyboardLayout,
|
||||
loaderdrv_UnregisterHotKey,
|
||||
loaderdrv_VkKeyScanEx,
|
||||
/* cursor/icon functions */
|
||||
|
|
|
|||
|
|
@ -1538,11 +1538,11 @@ BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id)
|
|||
/***********************************************************************
|
||||
* LoadKeyboardLayoutW (USER32.@)
|
||||
*/
|
||||
HKL WINAPI LoadKeyboardLayoutW(LPCWSTR pwszKLID, UINT Flags)
|
||||
HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags )
|
||||
{
|
||||
TRACE_(keyboard)("(%s, %d)\n", debugstr_w(pwszKLID), Flags);
|
||||
|
||||
return USER_Driver->pLoadKeyboardLayout(pwszKLID, Flags);
|
||||
FIXME_(keyboard)( "name %s, flags %x, semi-stub!\n", debugstr_w( name ), flags );
|
||||
/* FIXME: semi-stub: returning default layout */
|
||||
return get_locale_kbd_layout();
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
|
|
@ -1565,11 +1565,11 @@ HKL WINAPI LoadKeyboardLayoutA(LPCSTR pwszKLID, UINT Flags)
|
|||
/***********************************************************************
|
||||
* UnloadKeyboardLayout (USER32.@)
|
||||
*/
|
||||
BOOL WINAPI UnloadKeyboardLayout(HKL hkl)
|
||||
BOOL WINAPI UnloadKeyboardLayout( HKL layout )
|
||||
{
|
||||
TRACE_(keyboard)("(%p)\n", hkl);
|
||||
|
||||
return USER_Driver->pUnloadKeyboardLayout(hkl);
|
||||
FIXME_(keyboard)( "layout %p, stub!\n", layout );
|
||||
SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
typedef struct __TRACKINGLIST {
|
||||
|
|
|
|||
|
|
@ -66,11 +66,9 @@ typedef struct tagUSER_DRIVER {
|
|||
void (CDECL *pBeep)(void);
|
||||
INT (CDECL *pGetKeyNameText)(LONG, LPWSTR, INT);
|
||||
UINT (CDECL *pGetKeyboardLayoutList)(INT, HKL *);
|
||||
HKL (CDECL *pLoadKeyboardLayout)(LPCWSTR, UINT);
|
||||
UINT (CDECL *pMapVirtualKeyEx)(UINT, UINT, HKL);
|
||||
BOOL (CDECL *pRegisterHotKey)(HWND, UINT, UINT);
|
||||
INT (CDECL *pToUnicodeEx)(UINT, UINT, const BYTE *, LPWSTR, int, UINT, HKL);
|
||||
BOOL (CDECL *pUnloadKeyboardLayout)(HKL);
|
||||
void (CDECL *pUnregisterHotKey)(HWND, UINT, UINT);
|
||||
SHORT (CDECL *pVkKeyScanEx)(WCHAR, HKL);
|
||||
/* cursor/icon functions */
|
||||
|
|
|
|||
|
|
@ -1850,27 +1850,6 @@ static BOOL match_x11_keyboard_layout(HKL hkl)
|
|||
}
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* LoadKeyboardLayout (X11DRV.@)
|
||||
*/
|
||||
HKL CDECL X11DRV_LoadKeyboardLayout(LPCWSTR name, UINT flags)
|
||||
{
|
||||
FIXME("%s, %04x: semi-stub! Returning default layout.\n", debugstr_w(name), flags);
|
||||
return get_locale_kbd_layout();
|
||||
}
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* UnloadKeyboardLayout (X11DRV.@)
|
||||
*/
|
||||
BOOL CDECL X11DRV_UnloadKeyboardLayout(HKL hkl)
|
||||
{
|
||||
FIXME("%p: stub!\n", hkl);
|
||||
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* ActivateKeyboardLayout (X11DRV.@)
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -7,10 +7,8 @@
|
|||
@ cdecl ActivateKeyboardLayout(long long) X11DRV_ActivateKeyboardLayout
|
||||
@ cdecl Beep() X11DRV_Beep
|
||||
@ cdecl GetKeyNameText(long ptr long) X11DRV_GetKeyNameText
|
||||
@ cdecl LoadKeyboardLayout(wstr long) X11DRV_LoadKeyboardLayout
|
||||
@ cdecl MapVirtualKeyEx(long long long) X11DRV_MapVirtualKeyEx
|
||||
@ cdecl ToUnicodeEx(long long ptr ptr long long long) X11DRV_ToUnicodeEx
|
||||
@ cdecl UnloadKeyboardLayout(long) X11DRV_UnloadKeyboardLayout
|
||||
@ cdecl VkKeyScanEx(long long) X11DRV_VkKeyScanEx
|
||||
@ cdecl DestroyCursorIcon(long) X11DRV_DestroyCursorIcon
|
||||
@ cdecl SetCursor(long) X11DRV_SetCursor
|
||||
|
|
|
|||
Loading…
Reference in New Issue