DONOTPICK: add Fixed-Scancodes staging patchset

Author: loathingKernel

patches/wine/0005-staging/0001-winex11-Always-create-the-HKCU-configuration-registr.patch

@@ -0,0 +1,111 @@
+From f68070c821e4fc58ce32b5e01f9e5c96f17a39fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
+Date: Fri, 6 Jan 2023 11:22:10 +0100
+Subject: [PATCH 1/8] winex11: Always create the HKCU configuration registry
+ key.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30984
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605
+---
+ dlls/winex11.drv/x11drv_main.c | 67 ++++++++++++++++++++++++++++++++--
+ 1 file changed, 64 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
+index 0ddf6cf1147..2c834c8cd69 100644
+--- a/dlls/winex11.drv/x11drv_main.c
++++ b/dlls/winex11.drv/x11drv_main.c
+@@ -360,11 +360,61 @@ HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len )
+     return NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 ) ? 0 : ret;
+ }
+ 
++/* wrapper for NtCreateKey that creates the key recursively if necessary */
++static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len,
++                            DWORD options, DWORD *disposition )
++{
++    UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name };
++    OBJECT_ATTRIBUTES attr;
++    NTSTATUS status;
++    HANDLE ret;
+ 
+-HKEY open_hkcu_key( const char *name )
++    attr.Length = sizeof(attr);
++    attr.RootDirectory = root;
++    attr.ObjectName = &nameW;
++    attr.Attributes = 0;
++    attr.SecurityDescriptor = NULL;
++    attr.SecurityQualityOfService = NULL;
++
++    status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition );
++    if (status == STATUS_OBJECT_NAME_NOT_FOUND)
++    {
++        static const WCHAR registry_rootW[] = { '\\','R','e','g','i','s','t','r','y','\\' };
++        DWORD pos = 0, i = 0, len = name_len / sizeof(WCHAR);
++
++        /* don't try to create registry root */
++        if (!root && len > ARRAY_SIZE(registry_rootW) &&
++            !memcmp( name, registry_rootW, sizeof(registry_rootW) ))
++            i += ARRAY_SIZE(registry_rootW);
++
++        while (i < len && name[i] != '\\') i++;
++        if (i == len) return 0;
++        for (;;)
++        {
++            unsigned int subkey_options = options;
++            if (i < len) subkey_options &= ~(REG_OPTION_CREATE_LINK | REG_OPTION_OPEN_LINK);
++            nameW.Buffer = (WCHAR *)name + pos;
++            nameW.Length = (i - pos) * sizeof(WCHAR);
++            status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, subkey_options, disposition );
++
++            if (attr.RootDirectory != root) NtClose( attr.RootDirectory );
++            if (!NT_SUCCESS(status)) return 0;
++            if (i == len) break;
++            attr.RootDirectory = ret;
++            while (i < len && name[i] == '\\') i++;
++            pos = i;
++            while (i < len && name[i] != '\\') i++;
++        }
++    }
++    return ret;
++}
++
++static HKEY reg_open_hkcu_key( const char *name, BOOL create )
+ {
+     WCHAR bufferW[256];
+     static HKEY hkcu;
++    DWORD disp;
++    HKEY key;
+ 
+     if (!hkcu)
+     {
+@@ -389,7 +439,18 @@ HKEY open_hkcu_key( const char *name )
+         hkcu = reg_open_key( NULL, bufferW, len * sizeof(WCHAR) );
+     }
+ 
+-    return reg_open_key( hkcu, bufferW, asciiz_to_unicode( bufferW, name ) - sizeof(WCHAR) );
++    if ((key = reg_open_key( hkcu, bufferW, asciiz_to_unicode( bufferW, name ) - sizeof(WCHAR) )) || !create) return key;
++    return reg_create_key( hkcu, bufferW, asciiz_to_unicode( bufferW, name ) - sizeof(WCHAR), 0, &disp );
++}
++
++HKEY open_hkcu_key( const char *name )
++{
++    return reg_open_hkcu_key( name, FALSE );
++}
++
++static HKEY create_hkcu_key( const char *name )
++{
++    return reg_open_hkcu_key( name, TRUE );
+ }
+ 
+ 
+@@ -453,7 +514,7 @@ static void setup_options(void)
+     DWORD len;
+ 
+     /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver */
+-    hkey = open_hkcu_key( "Software\\Wine\\X11 Driver" );
++    hkey = create_hkcu_key( "Software\\Wine\\X11 Driver" );
+ 
+     /* open the app-specific key */
+ 
+-- 
+2.54.0
+

patches/wine/0005-staging/0002-winex11-Write-supported-keyboard-layout-list-in-regi.patch

@@ -0,0 +1,99 @@
+From 62d60fb2e854d31b222d24804c94907cbc22552d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
+Date: Fri, 6 Jan 2023 08:09:11 +0100
+Subject: [PATCH 2/8] winex11: Write supported keyboard layout list in
+ registry.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30984
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605
+---
+ dlls/winex11.drv/keyboard.c    | 21 +++++++++++++++++++++
+ dlls/winex11.drv/x11drv.h      |  4 ++++
+ dlls/winex11.drv/x11drv_main.c | 17 +++++++++++++++++
+ 3 files changed, 42 insertions(+)
+
+diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
+index 3907828201f..8dad121d637 100644
+--- a/dlls/winex11.drv/keyboard.c
++++ b/dlls/winex11.drv/keyboard.c
+@@ -1093,6 +1093,27 @@ static const WORD xfree86_vendor_key_vkey[256] =
+     0, 0, 0, 0, 0, 0, 0, 0                                      /* 1008FFF8 */
+ };
+ 
++WCHAR *x11drv_get_keyboard_layout_list( DWORD *length )
++{
++    WCHAR *tmp, *layouts = calloc( 1, sizeof(WCHAR) );
++    int i;
++
++    for (i = 0, *length = 1; main_key_tab[i].comment; i++)
++    {
++        const char *name = main_key_tab[i].comment;
++        int len = strlen( name ) + 1;
++
++        if (!(tmp = realloc( layouts, (*length + len) * sizeof(WCHAR) ))) return layouts;
++        layouts = tmp;
++
++        asciiz_to_unicode( layouts + *length - 1, name );
++        layouts[*length + len - 1] = 0;
++        (*length) += len;
++    }
++
++    return layouts;
++}
++
+ /* Returns the Windows virtual key code associated with the X event <e> */
+ /* kbd_section must be held */
+ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e)
+diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
+index 41fc515357a..034899147bd 100644
+--- a/dlls/winex11.drv/x11drv.h
++++ b/dlls/winex11.drv/x11drv.h
+@@ -797,6 +797,10 @@ extern void xinerama_init( unsigned int width, unsigned int height );
+ extern void init_recursive_mutex( pthread_mutex_t *mutex );
+ extern void init_icm_profile(void);
+ 
++/* keyboard.c */
++
++extern WCHAR *x11drv_get_keyboard_layout_list( DWORD *size );
++
+ #define DEPTH_COUNT 3
+ extern const unsigned int *depths;
+ extern RECT gamescope_screen_rect;
+diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
+index 2c834c8cd69..190a19e0afb 100644
+--- a/dlls/winex11.drv/x11drv_main.c
++++ b/dlls/winex11.drv/x11drv_main.c
+@@ -453,6 +453,19 @@ static HKEY create_hkcu_key( const char *name )
+     return reg_open_hkcu_key( name, TRUE );
+ }
+ 
++static BOOL set_reg_value( HKEY hkey, const WCHAR *name, UINT type, const void *value, DWORD count )
++{
++    unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0;
++    UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name };
++    return !NtSetValueKey( hkey, &nameW, 0, type, value, count );
++}
++
++static void set_reg_string_value( HKEY hkey, const char *name, const WCHAR *value, DWORD count )
++{
++    WCHAR nameW[64];
++    asciiz_to_unicode( nameW, name );
++    set_reg_value( hkey, nameW, REG_MULTI_SZ, value, count );
++}
+ 
+ ULONG query_reg_value( HKEY hkey, const WCHAR *name, KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size )
+ {
+@@ -565,6 +578,10 @@ static void setup_options(void)
+     if (!get_config_key( hkey, appkey, "GrabFullscreen", buffer, sizeof(buffer) ))
+         grab_fullscreen = IS_OPTION_TRUE( buffer[0] );
+ 
++    p = x11drv_get_keyboard_layout_list( &len );
++    if (p) set_reg_string_value( hkey, "KeyboardLayoutList", p, len * sizeof(WCHAR) );
++    free( p );
++
+     if (!get_config_key( hkey, appkey, "ScreenDepth", buffer, sizeof(buffer) ))
+         default_visual.depth = wcstol( buffer, NULL, 0 );
+ 
+-- 
+2.54.0
+

patches/wine/0005-staging/0003-winecfg-Add-a-keyboard-layout-selection-config-optio.patch

@@ -0,0 +1,134 @@
+From 36cb225502f88e66423b71752dfd1f8c35aef705 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
+Date: Fri, 6 Jan 2023 08:15:41 +0100
+Subject: [PATCH 3/8] winecfg: Add a keyboard layout selection config option.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30984
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605
+---
+ programs/winecfg/input.c    | 48 ++++++++++++++++++++++++++++++++++++-
+ programs/winecfg/resource.h |  3 +++
+ programs/winecfg/winecfg.rc |  9 +++++++
+ 3 files changed, 59 insertions(+), 1 deletion(-)
+
+diff --git a/programs/winecfg/input.c b/programs/winecfg/input.c
+index 115161b9040..f2f035df80f 100644
+--- a/programs/winecfg/input.c
++++ b/programs/winecfg/input.c
+@@ -35,7 +35,9 @@ static BOOL updating_ui;
+ 
+ static void init_dialog( HWND dialog )
+ {
+-    WCHAR *buffer;
++    WCHAR auto_detect_layout[256];
++    WCHAR *buffer, *layout;
++    HWND layouts;
+ 
+     convert_x11_desktop_key();
+ 
+@@ -46,6 +48,23 @@ static void init_dialog( HWND dialog )
+     else CheckDlgButton( dialog, IDC_FULLSCREEN_GRAB, BST_UNCHECKED );
+     free( buffer );
+ 
++    layouts = GetDlgItem( dialog, IDC_KEYBOARD_LAYOUT );
++    LoadStringW( GetModuleHandleW( NULL ), IDS_INPUT_AUTO_DETECT_LAYOUT, auto_detect_layout,
++                 ARRAY_SIZE(auto_detect_layout) );
++
++    SendMessageW( layouts, CB_RESETCONTENT, 0, 0 );
++    SendMessageW( layouts, CB_ADDSTRING, 0, (LPARAM)auto_detect_layout );
++
++    buffer = get_reg_key( config_key, keypath( L"X11 Driver" ), L"KeyboardLayoutList", L"" );
++    for (layout = buffer; *layout; layout += wcslen( layout ) + 1)
++        SendMessageW( layouts, CB_ADDSTRING, 0, (LPARAM)layout );
++    free( buffer );
++
++    buffer = get_reg_key( config_key, keypath( L"X11 Driver" ), L"KeyboardLayout", L"" );
++    if (!buffer || !buffer[0]) SendMessageW( layouts, CB_SETCURSEL, 0, 0 );
++    else SendMessageW( layouts, CB_SELECTSTRING, -1, (LPARAM)buffer );
++    free( buffer );
++
+     updating_ui = FALSE;
+ }
+ 
+@@ -56,6 +75,24 @@ static void on_fullscreen_grab_clicked( HWND dialog )
+     else set_reg_key( config_key, keypath( L"X11 Driver" ), L"GrabFullscreen", L"N" );
+ }
+ 
++static void on_keyboard_layout_changed( HWND dialog )
++{
++    int len, index;
++    WCHAR *buffer;
++
++    if (!(index = SendMessageW( GetDlgItem( dialog, IDC_KEYBOARD_LAYOUT ), CB_GETCURSEL, 0, 0 )))
++        set_reg_key( config_key, keypath( L"X11 Driver" ), L"KeyboardLayout", L"" );
++    else
++    {
++        len = SendMessageW( GetDlgItem( dialog, IDC_KEYBOARD_LAYOUT ), CB_GETLBTEXTLEN, index, 0 ) + 1;
++        if (!(buffer = malloc( len * sizeof(WCHAR) ))) return;
++
++        SendMessageW( GetDlgItem( dialog, IDC_KEYBOARD_LAYOUT ), CB_GETLBTEXT, index, (LPARAM)buffer );
++        set_reg_key( config_key, keypath( L"X11 Driver" ), L"KeyboardLayout", buffer );
++        free( buffer );
++    }
++}
++
+ INT_PTR CALLBACK InputDlgProc( HWND dialog, UINT message, WPARAM wparam, LPARAM lparam )
+ {
+     TRACE( "dialog %p, message %#x, wparam %#Ix, lparam %#Ix\n", dialog, message, wparam, lparam );
+@@ -77,6 +114,15 @@ INT_PTR CALLBACK InputDlgProc( HWND dialog, UINT message, WPARAM wparam, LPARAM
+             case IDC_FULLSCREEN_GRAB: on_fullscreen_grab_clicked( dialog ); break;
+             }
+             break;
++
++        case CBN_SELCHANGE:
++            if (updating_ui) break;
++            SendMessageW( GetParent( dialog ), PSM_CHANGED, 0, 0 );
++            switch (LOWORD(wparam))
++            {
++            case IDC_KEYBOARD_LAYOUT: on_keyboard_layout_changed( dialog ); break;
++            }
++            break;
+         }
+         break;
+ 
+diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
+index 8022bf4b30c..05331f9db58 100644
+--- a/programs/winecfg/resource.h
++++ b/programs/winecfg/resource.h
+@@ -235,3 +235,6 @@
+ 
+ /* input tab */
+ #define IDC_FULLSCREEN_GRAB             1501
++#define IDC_KEYBOARD_LAYOUT             1502
++
++#define IDS_INPUT_AUTO_DETECT_LAYOUT    8501
+diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
+index f993e5eec89..6c814617f15 100644
+--- a/programs/winecfg/winecfg.rc
++++ b/programs/winecfg/winecfg.rc
+@@ -136,6 +136,11 @@ BEGIN
+     IDC_SYSPARAMS_MENUBAR           "Menu Bar"
+ END
+ 
++STRINGTABLE
++BEGIN
++    IDS_INPUT_AUTO_DETECT_LAYOUT  "(Auto detect)"
++END
++
+ IDD_ABOUTCFG DIALOGEX 0, 0, 260, 220
+ STYLE WS_CHILD
+ FONT 8, "MS Shell Dlg"
+@@ -340,6 +345,10 @@ FONT 8, "MS Shell Dlg"
+ BEGIN
+     GROUPBOX    "Mouse settings",IDC_STATIC,8,4,244,64
+     CONTROL     "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,10
++
++    GROUPBOX    "Keyboard settings",IDC_STATIC,8,70,244,64
++    LTEXT       "&Layout:",IDC_STATIC,15,82,230,8
++    COMBOBOX    IDC_KEYBOARD_LAYOUT,110,80,135,60,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ END
+ 
+ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+-- 
+2.54.0
+