user32: Factor unsupported cases into ActivateKeyboardLayout.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
66a46120a0
commit
f044f401f7
|
@ -1316,6 +1316,15 @@ HKL WINAPI ActivateKeyboardLayout( HKL layout, UINT flags )
|
||||||
|
|
||||||
TRACE_(keyboard)( "layout %p, flags %x\n", layout, flags );
|
TRACE_(keyboard)( "layout %p, flags %x\n", layout, flags );
|
||||||
|
|
||||||
|
if (flags) FIXME_(keyboard)( "flags %x not supported\n", flags );
|
||||||
|
|
||||||
|
if (layout == (HKL)HKL_NEXT || layout == (HKL)HKL_PREV)
|
||||||
|
{
|
||||||
|
SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
|
||||||
|
FIXME_(keyboard)( "HKL_NEXT and HKL_PREV not supported\n" );
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
if ((old_layout = USER_Driver->pActivateKeyboardLayout( layout, flags )) != (HKL)~0)
|
if ((old_layout = USER_Driver->pActivateKeyboardLayout( layout, flags )) != (HKL)~0)
|
||||||
return old_layout;
|
return old_layout;
|
||||||
|
|
||||||
|
|
|
@ -1169,15 +1169,6 @@ HKL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags)
|
||||||
|
|
||||||
TRACE("hkl %p flags %04x\n", hkl, flags);
|
TRACE("hkl %p flags %04x\n", hkl, flags);
|
||||||
|
|
||||||
if (flags) FIXME("flags %x not supported\n",flags);
|
|
||||||
|
|
||||||
if (hkl == (HKL)HKL_NEXT || hkl == (HKL)HKL_PREV)
|
|
||||||
{
|
|
||||||
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
|
||||||
FIXME("HKL_NEXT and HKL_PREV not supported\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
EnterCriticalSection(&layout_list_section);
|
EnterCriticalSection(&layout_list_section);
|
||||||
update_layout_list();
|
update_layout_list();
|
||||||
|
|
||||||
|
|
|
@ -1943,16 +1943,6 @@ HKL CDECL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flags)
|
|
||||||
FIXME("flags %x not supported\n",flags);
|
|
||||||
|
|
||||||
if (hkl == (HKL)HKL_NEXT || hkl == (HKL)HKL_PREV)
|
|
||||||
{
|
|
||||||
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
|
||||||
FIXME("HKL_NEXT and HKL_PREV not supported\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!match_x11_keyboard_layout(hkl))
|
if (!match_x11_keyboard_layout(hkl))
|
||||||
{
|
{
|
||||||
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||||
|
|
Loading…
Reference in New Issue