[PATCH v2 4/4] win32u: Send WM_INPUTLANGCHANGE when activating new layout.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/win32u/input.c          | 18 +++++++++++++++++-
 dlls/win32u/ntgdi_private.h  |  1 -
 dlls/win32u/win32u_private.h |  1 +
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
index 8735dc9fa74..c11d542037d 100644
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -1193,6 +1193,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
 {
     struct user_thread_info *info = get_user_thread_info();
     HKL old_layout;
+    HWND focus;

TRACE_(keyboard)( "layout %p, flags %x\n", layout, flags );

@@ -1210,7 +1211,22 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )

old_layout = info->kbd_layout;
     info->kbd_layout = layout;
-    if (old_layout != layout) info->kbd_layout_id = 0;
+    if (old_layout != layout)
+    {
+        const NLS_LOCALE_DATA *data;
+        CHARSETINFO cs = {0};
+
+        if (HIWORD(layout) & 0x8000)
+            FIXME( "Aliased keyboard layout not yet implemented\n" );
+        else if (!(data = get_locale_data( HIWORD(layout) )))
+            WARN( "Failed to find locale data for %04x\n", HIWORD(layout) );
+        else
+            translate_charset_info( ULongToPtr(data->idefaultansicodepage), &cs, TCI_SRCCODEPAGE );
+
+        info->kbd_layout_id = 0;
+        if ((focus = get_focus()) && get_window_thread( focus, NULL ) == GetCurrentThreadId())
+            send_message( focus, WM_INPUTLANGCHANGE, cs.ciCharset, (LPARAM)layout );
+    }

if (!old_layout) return get_locale_kbd_layout();
     return old_layout;
diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h
index ce5e30ab07d..93be59c9d7e 100644
--- a/dlls/win32u/ntgdi_private.h
+++ b/dlls/win32u/ntgdi_private.h
@@ -368,7 +368,6 @@ extern BOOL opentype_enum_full_names( const struct tt_name_v0 *tt_name_v0,

extern BOOL opentype_get_properties( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1,
                                      DWORD *version, FONTSIGNATURE *fs, DWORD *ntm_flags ) DECLSPEC_HIDDEN;
-extern BOOL translate_charset_info( DWORD *src, CHARSETINFO *cs, DWORD flags ) DECLSPEC_HIDDEN;

/* gdiobj.c */
 extern HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type,
diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h
index 44847829b75..32c6c2b905b 100644
--- a/dlls/win32u/win32u_private.h
+++ b/dlls/win32u/win32u_private.h
@@ -456,6 +456,7 @@ extern CPTABLEINFO ansi_cp DECLSPEC_HIDDEN;

CPTABLEINFO *get_cptable( WORD cp ) DECLSPEC_HIDDEN;
 const NLS_LOCALE_DATA *get_locale_data( LCID lcid ) DECLSPEC_HIDDEN;
+extern BOOL translate_charset_info( DWORD *src, CHARSETINFO *cs, DWORD flags ) DECLSPEC_HIDDEN;
 DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src,
                      DWORD srclen ) DECLSPEC_HIDDEN;
 DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src,