April 2021 - Wine-Commits - list.winehq.org

Hugh McMaster : reg/tests: Use string literals instead of a char buffer for REG_MULTI_SZ tests.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 1110421da93ebd6cc2648008fed874a49b8bbf28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1110421da93ebd6cc2648008… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:44 2021 +1000 reg/tests: Use string literals instead of a char buffer for REG_MULTI_SZ tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 3ac4ca800dd..d2d09e79ce6 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -723,37 +723,34 @@ static void test_reg_multi_sz(void) { HKEY hkey; DWORD r; - char buffer[22]; add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - buffer[0] = 0; - todo_wine verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, 0); + todo_wine verify_reg(hkey, NULL, REG_MULTI_SZ, "", 1, 0); todo_wine delete_value(hkey, NULL); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_MULTI_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, 0); + verify_reg(hkey, NULL, REG_MULTI_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - memcpy(buffer, "three\0little\0strings\0", 22); - verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, 0); + verify_reg(hkey, "multi0", REG_MULTI_SZ, "three\0little\0strings\0", 22, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi1 /s \"#\" /d \"three#little#strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, 0); + verify_reg(hkey, "multi1", REG_MULTI_SZ, "three\0little\0strings\0", 22, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi2 /d \"\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, 0); + verify_reg(hkey, "multi2", REG_MULTI_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi3 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, 0); + verify_reg(hkey, "multi3", REG_MULTI_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"threelittlestrings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -779,8 +776,7 @@ static void test_reg_multi_sz(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi11 /s \"#\" /d \"a#\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - buffer[0]='a'; buffer[1]=0; buffer[2]=0; - verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, 0); + verify_reg(hkey, "multi11", REG_MULTI_SZ, "a\0", 3, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi12 /t REG_MULTI_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -793,19 +789,18 @@ static void test_reg_multi_sz(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi15 /t REG_MULTI_SZ /d \"a\\0\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi15", REG_MULTI_SZ, buffer, 3, 0); + verify_reg(hkey, "multi15", REG_MULTI_SZ, "a\0", 3, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi16 /d \"two\\0\\0strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi17 /t REG_MULTI_SZ /s \"#\" /d \"#\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - buffer[0] = 0; buffer[1] = 0; - verify_reg(hkey, "multi17", REG_MULTI_SZ, buffer, 2, 0); + verify_reg(hkey, "multi17", REG_MULTI_SZ, "\0", 2, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi18 /t REG_MULTI_SZ /d \"\\0\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi18", REG_MULTI_SZ, buffer, 2, 0); + verify_reg(hkey, "multi18", REG_MULTI_SZ, "\0", 2, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi19 /t REG_MULTI_SZ /s \"#\" /d \"two\\0#strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r);

1 0

Alexandre Julliard : server: Don't return a handle for user apcs.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 384c042feafeb82e08db895c16df3a3b4e7652dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=384c042feafeb82e08db895c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 30 12:03:21 2021 +0200 server: Don't return a handle for user apcs. Reported by David Torok. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/server/thread.c b/server/thread.c index 7b248f24a30..2f11d7d51c2 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1639,21 +1639,13 @@ DECL_HANDLER(select) select_on( &select_op, op_size, req->cookie, req->flags, req->timeout ); - while (get_error() == STATUS_USER_APC) + if (get_error() == STATUS_USER_APC) { apc = thread_dequeue_apc( current, 0 ); - if ((reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) - { - reply->call = apc->call; - release_object( apc ); - break; - } - apc->executed = 1; - wake_up( &apc->obj, 0 ); + reply->call = apc->call; release_object( apc ); } - - if (get_error() == STATUS_KERNEL_APC) + else if (get_error() == STATUS_KERNEL_APC) { apc = thread_dequeue_apc( current, 1 ); if ((reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 )))

1 0

Rémi Bernon : user32: Move GetKeyboardLayoutList from nulldrv.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 66c3181444dbe4ba93b1a53c8db4fcb836e7b61f URL: https://source.winehq.org/git/wine.git/?a=commit;h=66c3181444dbe4ba93b1a53c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 30 10:43:58 2021 +0200 user32: Move GetKeyboardLayoutList from nulldrv. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 54 +----------------------------------- dlls/user32/input.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 56 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index e3cf41561b5..c075a49a350 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -198,59 +198,7 @@ static void CDECL nulldrv_Beep(void) static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts ) { - HKEY hKeyKeyboard; - DWORD rc; - INT count = 0; - ULONG_PTR baselayout; - LANGID langid; - - baselayout = GetUserDefaultLCID(); - langid = PRIMARYLANGID(LANGIDFROMLCID(baselayout)); - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - baselayout = MAKELONG( baselayout, 0xe001 ); /* IME */ - else - baselayout |= baselayout << 16; - - /* Enumerate the Registry */ - rc = RegOpenKeyW(HKEY_LOCAL_MACHINE,L"System\\CurrentControlSet\\Control\\Keyboard Layouts",&hKeyKeyboard); - if (rc == ERROR_SUCCESS) - { - do { - WCHAR szKeyName[9]; - HKL layout; - rc = RegEnumKeyW(hKeyKeyboard, count, szKeyName, 9); - if (rc == ERROR_SUCCESS) - { - layout = (HKL)(ULONG_PTR)wcstoul(szKeyName,NULL,16); - if (baselayout != 0 && layout == (HKL)baselayout) - baselayout = 0; /* found in the registry do not add again */ - if (size && layouts) - { - if (count >= size ) break; - layouts[count] = layout; - } - count ++; - } - } while (rc == ERROR_SUCCESS); - RegCloseKey(hKeyKeyboard); - } - - /* make sure our base layout is on the list */ - if (baselayout != 0) - { - if (size && layouts) - { - if (count < size) - { - layouts[count] = (HKL)baselayout; - count++; - } - } - else - count++; - } - - return count; + return ~0; /* use default implementation */ } static INT CDECL nulldrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 4ecc73c4ad0..4895a007500 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -77,6 +77,43 @@ static WORD get_key_state(void) } +/*********************************************************************** + * get_locale_kbd_layout + */ +static HKL get_locale_kbd_layout(void) +{ + ULONG_PTR layout; + LANGID langid; + + /* FIXME: + * + * layout = main_key_tab[kbd_layout].lcid; + * + * Winword uses return value of GetKeyboardLayout as a codepage + * to translate ANSI keyboard messages to unicode. But we have + * a problem with it: for instance Polish keyboard layout is + * identical to the US one, and therefore instead of the Polish + * locale id we return the US one. + */ + + layout = GetUserDefaultLCID(); + + /* + * Microsoft Office expects this value to be something specific + * for Japanese and Korean Windows with an IME the value is 0xe001 + * We should probably check to see if an IME exists and if so then + * set this word properly. + */ + langid = PRIMARYLANGID( LANGIDFROMLCID( layout ) ); + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + layout = MAKELONG( layout, 0xe001 ); /* IME */ + else + layout = MAKELONG( layout, layout ); + + return (HKL)layout; +} + + /********************************************************************** * set_capture_window */ @@ -1297,11 +1334,45 @@ BOOL WINAPI BlockInput(BOOL fBlockIt) * Return number of values available if either input parm is * 0, per MS documentation. */ -UINT WINAPI GetKeyboardLayoutList(INT nBuff, HKL *layouts) +UINT WINAPI GetKeyboardLayoutList( INT size, HKL *layouts ) { - TRACE_(keyboard)( "(%d, %p)\n", nBuff, layouts ); + WCHAR klid[KL_NAMELENGTH]; + UINT count, tmp, i = 0; + HKEY hkey; + HKL layout; + + TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts ); + + if ((count = USER_Driver->pGetKeyboardLayoutList( size, layouts )) != ~0) return count; + + layout = get_locale_kbd_layout(); + count = 0; + + count++; + if (size && layouts) + { + layouts[count - 1] = layout; + if (count == size) return count; + } + + if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Keyboard Layouts", &hkey )) + { + while (!RegEnumKeyW( hkey, i++, klid, ARRAY_SIZE(klid) )) + { + tmp = wcstoul( klid, NULL, 16 ); + if (layout == UlongToHandle( tmp )) continue; + + count++; + if (size && layouts) + { + layouts[count - 1] = UlongToHandle( tmp ); + if (count == size) break; + } + } + RegCloseKey( hkey ); + } - return USER_Driver->pGetKeyboardLayoutList( nBuff, layouts ); + return count; }

1 0

Rémi Bernon : user32: Add a default VkKeyScanEx implementation.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: d1c2fadac4406ede61de8ca0b7be4b275310a80f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1c2fadac4406ede61de8ca0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 30 10:43:57 2021 +0200 user32: Add a default VkKeyScanEx implementation. This is basically the reverse of ToUnicodeEx. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 9 +------- dlls/user32/input.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 10 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 97733bb9bd3..e3cf41561b5 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -300,14 +300,7 @@ static void CDECL nulldrv_UnregisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) { - static const short ctrl_vks[] = { - 0x332, 0x241, 0x242, 0x003, 0x244, 0x245, 0x246, 0x247, - 0x008, 0x009, 0x20d, 0x24b, 0x24c, 0x00d, 0x24e, 0x24f, - 0x250, 0x251, 0x252, 0x253, 0x254, 0x255, 0x256, 0x257, - 0x258, 0x259, 0x25a, 0x01b, 0x2dc, 0x2dd, 0x336, 0x3bd - }; - - return ch < ARRAY_SIZE(ctrl_vks) ? ctrl_vks[ch] : -1; + return -256; /* use default implementation */ } static void CDECL nulldrv_DestroyCursorIcon( HCURSOR cursor ) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index d2e41cd8212..4ecc73c4ad0 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -674,9 +674,66 @@ WORD WINAPI VkKeyScanExA(CHAR cChar, HKL dwhkl) /****************************************************************************** * VkKeyScanExW (USER32.@) */ -WORD WINAPI VkKeyScanExW(WCHAR cChar, HKL dwhkl) +WORD WINAPI VkKeyScanExW( WCHAR chr, HKL layout ) { - return USER_Driver->pVkKeyScanEx(cChar, dwhkl); + WORD shift = 0x100, ctrl = 0x200; + SHORT ret; + + TRACE_(keyboard)( "chr %s, layout %p\n", debugstr_wn(&chr, 1), layout ); + + if ((ret = USER_Driver->pVkKeyScanEx( chr, layout )) != -256) return ret; + + /* FIXME: English keyboard layout specific */ + + if (chr == VK_CANCEL || chr == VK_BACK || chr == VK_TAB || chr == VK_RETURN || + chr == VK_ESCAPE || chr == VK_SPACE) ret = chr; + else if (chr >= '0' && chr <= '9') ret = chr; + else if (chr == ')') ret = shift + '0'; + else if (chr == '!') ret = shift + '1'; + else if (chr == '@') ret = shift + '2'; + else if (chr == '#') ret = shift + '3'; + else if (chr == '$') ret = shift + '4'; + else if (chr == '%') ret = shift + '5'; + else if (chr == '^') ret = shift + '6'; + else if (chr == '&') ret = shift + '7'; + else if (chr == '*') ret = shift + '8'; + else if (chr == '(') ret = shift + '9'; + else if (chr >= 'a' && chr <= 'z') ret = chr - 'a' + 'A'; + else if (chr >= 'A' && chr <= 'Z') ret = shift + chr; + else if (chr == ';') ret = VK_OEM_1; + else if (chr == '=') ret = VK_OEM_PLUS; + else if (chr == ',') ret = VK_OEM_COMMA; + else if (chr == '-') ret = VK_OEM_MINUS; + else if (chr == '.') ret = VK_OEM_PERIOD; + else if (chr == '/') ret = VK_OEM_2; + else if (chr == '`') ret = VK_OEM_3; + else if (chr == '[') ret = VK_OEM_4; + else if (chr == '\\') ret = VK_OEM_5; + else if (chr == ']') ret = VK_OEM_6; + else if (chr == '\'') ret = VK_OEM_7; + else if (chr == ':') ret = shift + VK_OEM_1; + else if (chr == '+') ret = shift + VK_OEM_PLUS; + else if (chr == '<') ret = shift + VK_OEM_COMMA; + else if (chr == '_') ret = shift + VK_OEM_MINUS; + else if (chr == '>') ret = shift + VK_OEM_PERIOD; + else if (chr == '?') ret = shift + VK_OEM_2; + else if (chr == '~') ret = shift + VK_OEM_3; + else if (chr == '{') ret = shift + VK_OEM_4; + else if (chr == '|') ret = shift + VK_OEM_5; + else if (chr == '}') ret = shift + VK_OEM_6; + else if (chr == '\"') ret = shift + VK_OEM_7; + else if (chr == 0x7f) ret = ctrl + VK_BACK; + else if (chr == '\n') ret = ctrl + VK_RETURN; + else if (chr == 0xf000) ret = ctrl + '2'; + else if (chr == 0x0000) ret = ctrl + shift + '2'; + else if (chr >= 0x0001 && chr <= 0x001a) ret = ctrl + 'A' + chr - 1; + else if (chr >= 0x001c && chr <= 0x001d) ret = ctrl + VK_OEM_3 + chr; + else if (chr == 0x001e) ret = ctrl + shift + '6'; + else if (chr == 0x001f) ret = ctrl + shift + VK_OEM_MINUS; + else ret = -1; + + TRACE_(keyboard)( "ret %04x\n", ret ); + return ret; } /**********************************************************************

1 0

Rémi Bernon : user32: Add a default GetKeyNameTextW implementation.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 4cf6023c6225456934e69b8fe2fa7d808f594077 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cf6023c6225456934e69b8f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 30 10:43:56 2021 +0200 user32: Add a default GetKeyNameTextW implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 2 +- dlls/user32/input.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index aedc0366615..97733bb9bd3 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -255,7 +255,7 @@ static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts ) static INT CDECL nulldrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) { - return 0; + return -1; /* use default implementation */ } static HKL CDECL nulldrv_GetKeyboardLayout( DWORD thread_id ) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 4eaac54343e..d2e41cd8212 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -853,6 +853,43 @@ static const UINT kbd_en_vk2char[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static const WCHAR *kbd_en_vscname[] = +{ + 0, L"Esc", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, L"Backspace", L"Tab", + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, L"Enter", L"Ctrl", 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, L"Shift", 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, L"Right Shift", L"Num *", L"Alt", L"Space", L"Caps Lock", L"F1", L"F2", L"F3", L"F4", L"F5", + L"F6", L"F7", L"F8", L"F9", L"F10", L"Pause", L"Scroll Lock", L"Num 7", L"Num 8", L"Num 9", L"Num -", L"Num 4", L"Num 5", L"Num 6", L"Num +", L"Num 1", + L"Num 2", L"Num 3", L"Num 0", L"Num Del", L"Sys Req", 0, 0, L"F11", L"F12", 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, L"F13", L"F14", L"F15", L"F16", + L"F17", L"F18", L"F19", L"F20", L"F21", L"F22", L"F23", L"F24", 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + /* extended */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, L"Num Enter", L"Right Ctrl", 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, L"Num /", 0, L"Prnt Scrn", L"Right Alt", 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, L"Num Lock", L"Break", L"Home", L"Up", L"Page Up", 0, L"Left", 0, L"Right", 0, L"End", + L"Down", L"Page Down", L"Insert", L"Delete", L"<00>", 0, L"Help", 0, 0, 0, 0, L"Left Windows", L"Right Windows", L"Application", 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + /****************************************************************************** * MapVirtualKeyExW (USER32.@) @@ -1007,10 +1044,52 @@ INT WINAPI GetKeyNameTextA(LONG lParam, LPSTR lpBuffer, INT nSize) /**************************************************************************** * GetKeyNameTextW (USER32.@) */ -INT WINAPI GetKeyNameTextW(LONG lParam, LPWSTR lpBuffer, INT nSize) +INT WINAPI GetKeyNameTextW( LONG lparam, LPWSTR buffer, INT size ) { - if (!lpBuffer || !nSize) return 0; - return USER_Driver->pGetKeyNameText( lParam, lpBuffer, nSize ); + INT code = ((lparam >> 16) & 0x1ff), vkey, len; + UINT vsc2vk_size, vscname_size; + const WCHAR *const *vscname; + const UINT *vsc2vk; + WCHAR tmp[2]; + + TRACE_(keyboard)( "lparam %d, buffer %p, size %d.\n", lparam, buffer, size ); + + if (!buffer || !size) return 0; + if ((len = USER_Driver->pGetKeyNameText( lparam, buffer, size )) >= 0) return len; + + /* FIXME: English keyboard layout specific */ + + vsc2vk = kbd_en_vsc2vk; + vsc2vk_size = ARRAYSIZE(kbd_en_vsc2vk); + vscname = kbd_en_vscname; + vscname_size = ARRAYSIZE(kbd_en_vscname); + + if (lparam & 0x2000000) + { + switch ((vkey = vsc2vk[code])) + { + case VK_RSHIFT: + case VK_RCONTROL: + case VK_RMENU: + for (code = 0; code < vsc2vk_size; ++code) + if (vsc2vk[code] == (vkey - 1)) break; + break; + } + } + + if (code >= vscname_size) buffer[0] = 0; + else if (vscname[code]) lstrcpynW( buffer, vscname[code], size ); + else + { + vkey = MapVirtualKeyW( code & 0xff, MAPVK_VSC_TO_VK ); + tmp[0] = MapVirtualKeyW( vkey, MAPVK_VK_TO_CHAR ); + tmp[1] = 0; + lstrcpynW( buffer, tmp, size ); + } + len = wcslen( buffer ); + + TRACE_(keyboard)( "ret %d, str %s.\n", len, debugstr_w(buffer) ); + return len; } /****************************************************************************

1 0

Rémi Bernon : user32: Add a default MapVirtualKeyEx implementation.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 1feb05485be8039c4140c390fb31f0d0feb3c8cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1feb05485be8039c4140c390… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 30 10:43:55 2021 +0200 user32: Add a default MapVirtualKeyEx implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 2 +- dlls/user32/input.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 152 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1feb05485be8039c4140…

1 0

Hans Leidekker : msv1_0: Implement SpMakeSignature.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: d865c04336139a0e894f418f9430142168319dc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d865c04336139a0e894f418f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 30 11:59:37 2021 +0200 msv1_0: Implement SpMakeSignature. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/main.c | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 198 insertions(+), 1 deletion(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index e039b68c920..d9b9d16fa64 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -523,6 +523,26 @@ static void arc4_init( struct arc4_info *info, const char *key, unsigned int len } } +static void arc4_process( struct arc4_info *info, char *buf, unsigned int len ) +{ + char *state = info->state; + unsigned int x = info->x, y = info->y, a, b; + + while (len--) + { + x = (x + 1) & 0xff; + a = state[x]; + y = (y + a) & 0xff; + b = state[y]; + state[x] = b; + state[y] = a; + *buf++ ^= state[(a + b) & 0xff]; + } + + info->x = x; + info->y = y; +} + static int get_buffer_index( SecBufferDesc *desc, ULONG type ) { int idx; @@ -1178,11 +1198,188 @@ static NTSTATUS NTAPI ntlm_SpInstanceInit( ULONG version, SECPKG_DLL_FUNCTIONS * return STATUS_SUCCESS; } +struct hmac_md5_ctx +{ + struct md5_ctx ctx; + char outer_padding[64]; +}; + +static void hmac_md5_init( struct hmac_md5_ctx *ctx, const char *key, unsigned int key_len ) +{ + char inner_padding[64], tmp_key[16]; + unsigned int i; + + if (key_len > 64) + { + struct md5_ctx tmp_ctx; + + MD5Init( &tmp_ctx ); + MD5Update( &tmp_ctx, key, key_len ); + MD5Final( &tmp_ctx ); + memcpy( tmp_key, tmp_ctx.digest, 16 ); + + key = tmp_key; + key_len = 16; + } + + memset( inner_padding, 0, 64 ); + memset( ctx->outer_padding, 0, 64 ); + memcpy( inner_padding, key, key_len ); + memcpy( ctx->outer_padding, key, key_len ); + + for (i = 0; i < 64; i++) + { + inner_padding[i] ^= 0x36; + ctx->outer_padding[i] ^= 0x5c; + } + + MD5Init( &ctx->ctx ); + MD5Update( &ctx->ctx, inner_padding, 64 ); +} + +static void hmac_md5_update( struct hmac_md5_ctx *ctx, const char *buf, unsigned int len ) +{ + MD5Update( &ctx->ctx, buf, len ); +} + +static void hmac_md5_final( struct hmac_md5_ctx *ctx, char *digest ) +{ + struct md5_ctx outer_ctx; + char inner_digest[16]; + + MD5Final( &ctx->ctx ); + memcpy( inner_digest, ctx->ctx.digest, 16 ); + + MD5Init( &outer_ctx ); + MD5Update( &outer_ctx, ctx->outer_padding, 64 ); + MD5Update( &outer_ctx, inner_digest, 16 ); + MD5Final( &outer_ctx ); + + memcpy( digest, outer_ctx.digest, 16 ); +} + +static SECURITY_STATUS create_signature( struct ntlm_ctx *ctx, unsigned int flags, SecBufferDesc *msg, int idx, + enum sign_direction dir, BOOL encrypt ) +{ + unsigned int i, sign_version = 1; + char *sig = msg->pBuffers[idx].pvBuffer; + + if (flags & FLAG_NEGOTIATE_NTLM2 && flags & FLAG_NEGOTIATE_SIGN) + { + char digest[16], seq_no[4]; + struct hmac_md5_ctx hmac_md5; + + if (dir == SIGN_SEND) + { + seq_no[0] = (ctx->crypt.ntlm2.send_seq_no >> 0) & 0xff; + seq_no[1] = (ctx->crypt.ntlm2.send_seq_no >> 8) & 0xff; + seq_no[2] = (ctx->crypt.ntlm2.send_seq_no >> 16) & 0xff; + seq_no[3] = (ctx->crypt.ntlm2.send_seq_no >> 24) & 0xff; + ctx->crypt.ntlm2.send_seq_no++; + + hmac_md5_init( &hmac_md5, ctx->crypt.ntlm2.send_sign_key, 16 ); + } + else + { + seq_no[0] = (ctx->crypt.ntlm2.recv_seq_no >> 0) & 0xff; + seq_no[1] = (ctx->crypt.ntlm2.recv_seq_no >> 8) & 0xff; + seq_no[2] = (ctx->crypt.ntlm2.recv_seq_no >> 16) & 0xff; + seq_no[3] = (ctx->crypt.ntlm2.recv_seq_no >> 24) & 0xff; + ctx->crypt.ntlm2.recv_seq_no++; + + hmac_md5_init( &hmac_md5, ctx->crypt.ntlm2.recv_sign_key, 16 ); + } + + hmac_md5_update( &hmac_md5, seq_no, 4 ); + for (i = 0; i < msg->cBuffers; ++i) + { + if (msg->pBuffers[i].BufferType & SECBUFFER_DATA) + hmac_md5_update( &hmac_md5, msg->pBuffers[i].pvBuffer, msg->pBuffers[i].cbBuffer ); + } + hmac_md5_final( &hmac_md5, digest ); + + if (encrypt && flags & FLAG_NEGOTIATE_KEY_EXCHANGE) + { + if (dir == SIGN_SEND) + arc4_process( &ctx->crypt.ntlm2.send_arc4info, digest, 8 ); + else + arc4_process( &ctx->crypt.ntlm2.recv_arc4info, digest, 8 ); + } + + sig[0] = (sign_version >> 0) & 0xff; + sig[1] = (sign_version >> 8) & 0xff; + sig[2] = (sign_version >> 16) & 0xff; + sig[3] = (sign_version >> 24) & 0xff; + memcpy( sig + 4, digest, 8 ); + memcpy( sig + 12, seq_no, 4 ); + + msg->pBuffers[idx].cbBuffer = 16; + return SEC_E_OK; + } + + if (flags & FLAG_NEGOTIATE_SIGN) + { + unsigned int crc = 0; + + for (i = 0; i < msg->cBuffers; ++i) + { + if (msg->pBuffers[i].BufferType & SECBUFFER_DATA) + crc = RtlComputeCrc32( crc, msg->pBuffers[i].pvBuffer, msg->pBuffers[i].cbBuffer ); + } + + sig[0] = (sign_version >> 0) & 0xff; + sig[1] = (sign_version >> 8) & 0xff; + sig[2] = (sign_version >> 16) & 0xff; + sig[3] = (sign_version >> 24) & 0xff; + memset( sig + 4, 0, 4 ); + sig[8] = (crc >> 0) & 0xff; + sig[9] = (crc >> 8) & 0xff; + sig[10] = (crc >> 16) & 0xff; + sig[11] = (crc >> 24) & 0xff; + sig[12] = (ctx->crypt.ntlm.seq_no >> 0) & 0xff; + sig[13] = (ctx->crypt.ntlm.seq_no >> 8) & 0xff; + sig[14] = (ctx->crypt.ntlm.seq_no >> 16) & 0xff; + sig[15] = (ctx->crypt.ntlm.seq_no >> 24) & 0xff; + ctx->crypt.ntlm.seq_no++; + + if (encrypt) arc4_process( &ctx->crypt.ntlm.arc4info, sig + 4, 12 ); + return SEC_E_OK; + } + + if (flags & FLAG_NEGOTIATE_ALWAYS_SIGN || !flags) + { + /* create dummy signature */ + memset( msg->pBuffers[idx].pvBuffer, 0, 16 ); + memset( msg->pBuffers[idx].pvBuffer, 1, 1 ); + msg->pBuffers[idx].cbBuffer = 16; + return SEC_E_OK; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + +static NTSTATUS NTAPI ntlm_SpMakeSignature( LSA_SEC_HANDLE handle, ULONG qop, SecBufferDesc *msg, ULONG msg_seq_no ) +{ + struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle; + int idx; + + TRACE( "%lx, 0x%08x, %p, %u\n", handle, qop, msg, msg_seq_no ); + if (qop) FIXME( "ignoring quality of protection %08x\n", qop ); + if (msg_seq_no) FIXME( "ignoring message sequence number %u\n", msg_seq_no ); + + if (!handle) return SEC_E_INVALID_HANDLE; + if (!msg || !msg->pBuffers || msg->cBuffers < 2 || (idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) + return SEC_E_INVALID_TOKEN; + if (msg->pBuffers[idx].cbBuffer < 16) return SEC_E_BUFFER_TOO_SMALL; + + return create_signature( ctx, ctx->flags, msg, idx, SIGN_SEND, TRUE ); +} + static SECPKG_USER_FUNCTION_TABLE ntlm_user_table = { ntlm_SpInstanceInit, NULL, /* SpInitUserModeContext */ - NULL, /* SpMakeSignature */ + ntlm_SpMakeSignature, NULL, /* SpVerifySignature */ NULL, /* SpSealMessage */ NULL, /* SpUnsealMessage */

1 0

Hans Leidekker : msv1_0: Implement SpQueryContextAttributes.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: ce7da2e16b31a57c7a74827cdbdb39c66c19ecde URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce7da2e16b31a57c7a74827c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 30 11:59:36 2021 +0200 msv1_0: Implement SpQueryContextAttributes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/main.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index 28cad0cb14c..e039b68c920 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -1047,6 +1047,80 @@ static NTSTATUS NTAPI ntlm_SpDeleteContext( LSA_SEC_HANDLE handle ) return SEC_E_OK; } +static SecPkgInfoW *build_package_info( const SecPkgInfoW *info ) +{ + SecPkgInfoW *ret; + DWORD size_name = (wcslen(info->Name) + 1) * sizeof(WCHAR); + DWORD size_comment = (wcslen(info->Comment) + 1) * sizeof(WCHAR); + + if (!(ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*ret) + size_name + size_comment ))) return NULL; + ret->fCapabilities = info->fCapabilities; + ret->wVersion = info->wVersion; + ret->wRPCID = info->wRPCID; + ret->cbMaxToken = info->cbMaxToken; + ret->Name = (SEC_WCHAR *)(ret + 1); + memcpy( ret->Name, info->Name, size_name ); + ret->Comment = (SEC_WCHAR *)((char *)ret->Name + size_name); + memcpy( ret->Comment, info->Comment, size_comment ); + return ret; +} + +static NTSTATUS NTAPI ntlm_SpQueryContextAttributes( LSA_SEC_HANDLE handle, ULONG attr, void *buf ) +{ + TRACE( "%lx, %u, %p\n", handle, attr, buf ); + + if (!handle) return SEC_E_INVALID_HANDLE; + + switch (attr) + { +#define X(x) case (x) : FIXME(#x" stub\n"); break + X(SECPKG_ATTR_ACCESS_TOKEN); + X(SECPKG_ATTR_AUTHORITY); + X(SECPKG_ATTR_DCE_INFO); + X(SECPKG_ATTR_KEY_INFO); + X(SECPKG_ATTR_LIFESPAN); + X(SECPKG_ATTR_NAMES); + X(SECPKG_ATTR_NATIVE_NAMES); + X(SECPKG_ATTR_PACKAGE_INFO); + X(SECPKG_ATTR_PASSWORD_EXPIRY); + X(SECPKG_ATTR_SESSION_KEY); + X(SECPKG_ATTR_STREAM_SIZES); + X(SECPKG_ATTR_TARGET_INFORMATION); + case SECPKG_ATTR_FLAGS: + { + SecPkgContext_Flags *flags = (SecPkgContext_Flags *)buf; + struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle; + + flags->Flags = 0; + if (ctx->flags & FLAG_NEGOTIATE_SIGN) flags->Flags |= ISC_RET_INTEGRITY; + if (ctx->flags & FLAG_NEGOTIATE_SEAL) flags->Flags |= ISC_RET_CONFIDENTIALITY; + return SEC_E_OK; + } + case SECPKG_ATTR_SIZES: + { + SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)buf; + sizes->cbMaxToken = NTLM_MAX_BUF; + sizes->cbMaxSignature = 16; + sizes->cbBlockSize = 0; + sizes->cbSecurityTrailer = 16; + return SEC_E_OK; + } + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)buf; + if (!(info->PackageInfo = build_package_info( &ntlm_package_info ))) return SEC_E_INSUFFICIENT_MEMORY; + info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; + return SEC_E_OK; + } +#undef X + default: + FIXME( "unknown attribute %u\n", attr ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static SECPKG_FUNCTION_TABLE ntlm_table = { ntlm_LsaApInitializePackage, @@ -1073,7 +1147,7 @@ static SECPKG_FUNCTION_TABLE ntlm_table = NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */ NULL, /* GetExtendedInformation */ - NULL, /* SpQueryContextAttributes */ + ntlm_SpQueryContextAttributes, NULL, /* SpAddCredentials */ NULL, /* SetExtendedInformation */ NULL, /* SetContextAttributes */

1 0

Hans Leidekker : msv1_0: Implement SpAcceptLsaModeContext.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 57ae625141ba4d90aa75f08787fa57e04a03eef6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57ae625141ba4d90aa75f087… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 30 11:59:35 2021 +0200 msv1_0: Implement SpAcceptLsaModeContext. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/main.c | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 208 insertions(+), 1 deletion(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index 4b0a636bd77..28cad0cb14c 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -829,6 +829,213 @@ done: return status; } +static NTSTATUS NTAPI ntlm_SpAcceptLsaModeContext( LSA_SEC_HANDLE cred_handle, LSA_SEC_HANDLE ctx_handle, + SecBufferDesc *input, ULONG ctx_req, ULONG data_rep, + LSA_SEC_HANDLE *new_ctx_handle, SecBufferDesc *output, + ULONG *ctx_attr, TimeStamp *expiry, BOOLEAN *mapped_ctx, + SecBuffer *ctx_data ) +{ + NTSTATUS status = SEC_E_INSUFFICIENT_MEMORY; + struct ntlm_ctx *ctx = NULL; + char *buf, *bin, *want_flags = NULL; + unsigned int len, bin_len; + + TRACE( "%lx, %lx, %08x, %u, %p, %p, %p, %p, %p, %p, %p\n", cred_handle, ctx_handle, ctx_req, data_rep, input, + new_ctx_handle, output, ctx_attr, expiry, mapped_ctx, ctx_data ); + if (ctx_req) FIXME( "ignoring flags %08x\n", ctx_req ); + + if (!(buf = malloc( NTLM_MAX_BUF ))) return SEC_E_INSUFFICIENT_MEMORY; + if (!(bin = malloc( NTLM_MAX_BUF ))) goto done; + + if (!ctx_handle) + { + struct ntlm_cred *cred = (struct ntlm_cred *)cred_handle; + char *argv[3]; + + if (!cred || cred->mode != MODE_SERVER) + { + status = SEC_E_INVALID_HANDLE; + goto done; + } + + if (!input || input->cBuffers < 1) + { + status = SEC_E_INCOMPLETE_MESSAGE; + goto done; + } + + if (input->pBuffers[0].cbBuffer > NTLM_MAX_BUF) + { + status = SEC_E_INVALID_TOKEN; + goto done; + } + else bin_len = input->pBuffers[0].cbBuffer; + + argv[0] = (char *)"ntlm_auth"; + argv[1] = (char *)"--helper-protocol=squid-2.5-ntlmssp"; + argv[2] = NULL; + if ((status = ntlm_funcs->fork( argv, &ctx )) != SEC_E_OK) goto done; + ctx->mode = MODE_SERVER; + + if (!(want_flags = malloc( 73 ))) + { + status = SEC_E_INSUFFICIENT_MEMORY; + goto done; + } + strcpy( want_flags, "SF" ); + if (ctx_req & ASC_REQ_CONFIDENTIALITY) strcat( want_flags, " NTLMSSP_FEATURE_SEAL" ); + if (ctx_req & ASC_REQ_CONNECTION) + { + strcat( want_flags, " NTLMSSP_FEATURE_SESSION_KEY" ); + ctx->attrs |= ASC_RET_CONNECTION; + } + if (ctx_req & ASC_REQ_INTEGRITY) strcat( want_flags, " NTLMSSP_FEATURE_SIGN" ); + if (ctx_req & ASC_REQ_ALLOCATE_MEMORY) FIXME( "ASC_REQ_ALLOCATE_MEMORY\n" ); + if (ctx_req & ASC_REQ_EXTENDED_ERROR) FIXME( "ASC_REQ_EXTENDED_ERROR\n" ); + if (ctx_req & ASC_REQ_MUTUAL_AUTH) FIXME( "ASC_REQ_MUTUAL_AUTH\n" ); + if (ctx_req & ASC_REQ_REPLAY_DETECT) FIXME( "ASC_REQ_REPLAY_DETECT\n" ); + if (ctx_req & ASC_REQ_SEQUENCE_DETECT) FIXME( "ASC_REQ_SEQUENCE_DETECT\n" ); + if (ctx_req & ASC_REQ_STREAM) FIXME( "ASC_REQ_STREAM\n" ); + + if (strlen( want_flags ) > 3) + { + TRACE( "want flags are %s\n", debugstr_a(want_flags) ); + strcpy( buf, want_flags ); + if ((status = ntlm_funcs->chat( ctx, buf, NTLM_MAX_BUF, &len )) != SEC_E_OK) goto done; + if (!strncmp( buf, "BH", 2 )) ERR( "ntlm_auth doesn't understand new command set\n" ); + } + + memcpy( bin, input->pBuffers[0].pvBuffer, bin_len ); + strcpy( buf, "YR " ); + encode_base64( bin, bin_len, buf + 3 ); + + if ((status = ntlm_funcs->chat( ctx, buf, NTLM_MAX_BUF, &len )) != SEC_E_OK) goto done; + TRACE( "ntlm_auth returned %s\n", buf ); + if (strncmp( buf, "TT ", 3)) + { + status = SEC_E_INTERNAL_ERROR; + goto done; + } + bin_len = decode_base64( buf + 3, len - 3, bin ); + + if (!output || output->cBuffers < 1) + { + status = SEC_E_INSUFFICIENT_MEMORY; + goto done; + } + output->pBuffers[0].cbBuffer = bin_len; + output->pBuffers[0].BufferType = SECBUFFER_DATA; + memcpy( output->pBuffers[0].pvBuffer, bin, bin_len ); + + *new_ctx_handle = (LSA_SEC_HANDLE)ctx; + status = SEC_I_CONTINUE_NEEDED; + } + else + { + if (!input || input->cBuffers < 1) + { + status = SEC_E_INCOMPLETE_MESSAGE; + goto done; + } + + ctx = (struct ntlm_ctx *)ctx_handle; + if (!ctx || ctx->mode != MODE_SERVER) + { + status = SEC_E_INVALID_HANDLE; + goto done; + } + + if (input->pBuffers[0].cbBuffer > NTLM_MAX_BUF) + { + status = SEC_E_INVALID_TOKEN; + goto done; + } + else bin_len = input->pBuffers[0].cbBuffer; + memcpy( bin, input->pBuffers[0].pvBuffer, bin_len ); + + strcpy( buf, "KK " ); + encode_base64( bin, bin_len, buf + 3 ); + + TRACE( "client sent %s\n", debugstr_a(buf) ); + if ((status = ntlm_funcs->chat( ctx, buf, NTLM_MAX_BUF, &len )) != SEC_E_OK) goto done; + TRACE( "ntlm_auth returned %s\n", debugstr_a(buf) ); + + /* At this point, we get a NA if the user didn't authenticate, but a BH if ntlm_auth could not + * connect to winbindd. Apart from running Wine as root, there is no way to fix this for now, + * so just handle this as a failed login. */ + if (strncmp( buf, "AF ", 3 )) + { + if (!strncmp( buf, "NA ", 3 )) + { + status = SEC_E_LOGON_DENIED; + goto done; + } + else + { + const char err_v3[] = "BH NT_STATUS_ACCESS_DENIED"; + const char err_v4[] = "BH NT_STATUS_UNSUCCESSFUL"; + + if ((len >= strlen(err_v3) && !strncmp( buf, err_v3, strlen(err_v3) )) || + (len >= strlen(err_v4) && !strncmp( buf, err_v4, strlen(err_v4) ))) + { + TRACE( "connection to winbindd failed\n" ); + status = SEC_E_LOGON_DENIED; + } + else status = SEC_E_INTERNAL_ERROR; + goto done; + } + } + output->pBuffers[0].cbBuffer = 0; + + strcpy( buf, "GF" ); + if ((status = ntlm_funcs->chat( ctx, buf, NTLM_MAX_BUF, &len )) != SEC_E_OK) goto done; + if (len < 3) ctx->flags = 0; + else sscanf( buf + 3, "%x", &ctx->flags ); + + strcpy( buf, "GK" ); + if ((status = ntlm_funcs->chat( ctx, buf, NTLM_MAX_BUF, &len )) != SEC_E_OK) goto done; + + if (!strncmp( buf, "BH", 2 )) TRACE( "no key negotiated\n" ); + else if (!strncmp( buf, "GK ", 3 )) + { + bin_len = decode_base64( buf + 3, len - 3, bin ); + TRACE( "session key is %s\n", debugstr_a(buf + 3) ); + memcpy( ctx->session_key, bin, bin_len ); + } + + if (len < 3) memset( ctx->session_key, 0 , 16 ); + else + { + if (!strncmp( buf, "BH ", 3 )) + { + TRACE( "helper sent %s\n", debugstr_a(buf + 3) ); + /*FIXME: generate dummy session key = MD4(MD4(password))*/ + memset( ctx->session_key, 0 , 16 ); + } + else if (!strncmp( buf, "GK ", 3 )) + { + bin_len = decode_base64( buf + 3, len - 3, bin ); + TRACE( "session key is %s\n", debugstr_a(buf + 3) ); + memcpy( ctx->session_key, bin, 16 ); + } + } + arc4_init( &ctx->crypt.ntlm.arc4info, ctx->session_key, 16 ); + ctx->crypt.ntlm.seq_no = 0; + + *new_ctx_handle = (LSA_SEC_HANDLE)ctx; + status = SEC_E_OK; + } + +done: + if (status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED) ntlm_funcs->cleanup( ctx ); + free( buf ); + free( bin ); + free( want_flags ); + + TRACE( "returning %08x\n", status ); + return status; +} + static NTSTATUS NTAPI ntlm_SpDeleteContext( LSA_SEC_HANDLE handle ) { struct ntlm_ctx *ctx = (struct ntlm_ctx *)handle; @@ -861,7 +1068,7 @@ static SECPKG_FUNCTION_TABLE ntlm_table = NULL, /* GetCredentials */ NULL, /* DeleteCredentials */ ntlm_SpInitLsaModeContext, - NULL, /* SpAcceptLsaModeContext */ + ntlm_SpAcceptLsaModeContext, ntlm_SpDeleteContext, NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */

1 0

Hans Leidekker : msv1_0: Use RtlAllocateHeap to allocate output buffers.
by Alexandre Julliard April 30, 2021

April 30, 2021

Module: wine Branch: master Commit: 179e214dca29a654f834b546acfe809034c75a23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=179e214dca29a654f834b546… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 30 11:59:34 2021 +0200 msv1_0: Use RtlAllocateHeap to allocate output buffers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index e07dcf6f352..4b0a636bd77 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -765,7 +765,8 @@ static NTSTATUS NTAPI ntlm_SpInitLsaModeContext( LSA_SEC_HANDLE cred_handle, LSA if (ctx_req & ISC_REQ_ALLOCATE_MEMORY) { - if (!(output->pBuffers[idx].pvBuffer = malloc( bin_len ))) + /* freed with secur32.FreeContextBuffer */ + if (!(output->pBuffers[idx].pvBuffer = RtlAllocateHeap( GetProcessHeap(), 0, bin_len ))) { status = SEC_E_INSUFFICIENT_MEMORY; goto done;

1 0