Rémi Bernon : user32: Factor unsupported cases into ActivateKeyboardLayout.
Alexandre Julliard
julliard at winehq.org
Mon May 3 16:37:06 CDT 2021
Module: wine
Branch: master
Commit: f044f401f70bb9b9f7488378504d5b14f3d4b8f8
URL: https://source.winehq.org/git/wine.git/?a=commit;h=f044f401f70bb9b9f7488378504d5b14f3d4b8f8
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Mon May 3 11:37:57 2021 +0200
user32: Factor unsupported cases into ActivateKeyboardLayout.
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/input.c | 9 +++++++++
dlls/winemac.drv/keyboard.c | 9 ---------
dlls/winex11.drv/keyboard.c | 10 ----------
3 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/dlls/user32/input.c b/dlls/user32/input.c
index ff90bc6f343..d3dcf375746 100644
--- a/dlls/user32/input.c
+++ b/dlls/user32/input.c
@@ -1316,6 +1316,15 @@ HKL WINAPI ActivateKeyboardLayout( HKL layout, UINT 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)
return old_layout;
diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c
index 1ea15f59341..6732c5755ee 100644
--- a/dlls/winemac.drv/keyboard.c
+++ b/dlls/winemac.drv/keyboard.c
@@ -1169,15 +1169,6 @@ HKL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT 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);
update_layout_list();
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 01620c5e4a4..d583c8588cd 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -1943,16 +1943,6 @@ HKL CDECL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags)
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))
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
More information about the wine-cvs
mailing list