wine-commits October 2022

wine-commits@winehq.org

1 participants
537 discussions

Joel Holdsworth : ntdll/tests: Add initial tests for reparse points.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: ed8161883a6a9f4391371a84b1b7921095ba2839 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed8161883a6a9f4391371a84b1b792… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Oct 20 11:07:48 2022 +0100 ntdll/tests: Add initial tests for reparse points. --- dlls/ntdll/tests/file.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index c011733626f..8157848e41d 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -5326,6 +5326,37 @@ static void test_mailslot_name(void) CloseHandle( device ); } +static void test_reparse_points(void) +{ + OBJECT_ATTRIBUTES attr; + HANDLE handle; + IO_STATUS_BLOCK io; + NTSTATUS status; + UNICODE_STRING nameW; + unsigned char reparse_data[1]; + + pRtlInitUnicodeString( &nameW, L"\\??\\C:\\" ); + InitializeObjectAttributes( &attr, &nameW, 0, NULL, NULL ); + + status = pNtOpenFile( &handle, READ_CONTROL, &attr, &io, 0, 0 ); + ok( !status, "open %s failed %#lx\n", wine_dbgstr_w(nameW.Buffer), status ); + + status = pNtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, NULL, 0 ); + todo_wine + ok( status == STATUS_INVALID_USER_BUFFER, "expected %#lx, got %#lx\n", STATUS_INVALID_USER_BUFFER, status ); + + status = pNtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, reparse_data, 0 ); + todo_wine + ok( status == STATUS_INVALID_USER_BUFFER, "expected %#lx, got %#lx\n", STATUS_INVALID_USER_BUFFER, status ); + + /* a volume cannot be a reparse point by definition */ + status = pNtFsControlFile( handle, NULL, NULL, NULL, &io, FSCTL_GET_REPARSE_POINT, NULL, 0, reparse_data, 1 ); + todo_wine + ok( status == STATUS_NOT_A_REPARSE_POINT, "expected %#lx, got %#lx\n", STATUS_NOT_A_REPARSE_POINT, status ); + + CloseHandle( handle ); +} + START_TEST(file) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -5399,4 +5430,5 @@ START_TEST(file) test_query_ea(); test_flush_buffers_file(); test_mailslot_name(); + test_reparse_points(); }

1 0

Alistair Leslie-Hughes : sapi: Add Voice enum tests.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: a67b9e79615d6dd6133b38055d45b0296fd803af URL: https://gitlab.winehq.org/wine/wine/-/commit/a67b9e79615d6dd6133b38055d45b0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Oct 22 09:11:47 2022 +1100 sapi: Add Voice enum tests. --- dlls/sapi/tests/token.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 7ef58e697b0..958c50359f5 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -191,6 +191,41 @@ static void test_default_token_id(void) ISpObjectTokenCategory_Release( cat ); } +static void tests_token_voices(void) +{ + ISpObjectTokenCategory *cat; + HRESULT hr; + IEnumSpObjectTokens *tokens; + ISpObjectToken *item; + ULONG fetched = 0; + ULONG count; + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_VOICES, FALSE ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = ISpObjectTokenCategory_EnumTokens(cat, NULL, NULL, &tokens); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = IEnumSpObjectTokens_GetCount( tokens, &count ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( count != 0, "got %lu\n", count ); + ISpObjectTokenCategory_Release( cat ); + + hr = IEnumSpObjectTokens_Item(tokens, 0, &item); + ok( hr == S_OK, "got %08lx\n", hr ); + ISpObjectToken_Release(item); + + hr = IEnumSpObjectTokens_Next(tokens, 1, &item, &fetched); + ok( hr == S_OK, "got %08lx\n", hr ); + ISpObjectToken_Release(item); + + IEnumSpObjectTokens_Release(tokens); +} + static void test_object_token(void) { ISpObjectToken *token; @@ -331,5 +366,6 @@ START_TEST(token) test_token_enum(); test_default_token_id(); test_object_token(); + tests_token_voices(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : sapi: Add default voice registry key.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: c651cf190c233ad3a2455ede6ae0f19cc00a5394 URL: https://gitlab.winehq.org/wine/wine/-/commit/c651cf190c233ad3a2455ede6ae0f1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 22 19:01:44 2021 +1000 sapi: Add default voice registry key. --- dlls/sapi/sapi.rgs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/sapi/sapi.rgs b/dlls/sapi/sapi.rgs index bf784fd58d6..cba07ab6184 100644 --- a/dlls/sapi/sapi.rgs +++ b/dlls/sapi/sapi.rgs @@ -30,6 +30,13 @@ HKLM } NoRemove Voices { + NoRemove Tokens + { + NoRemove 'Wine Default Voice' + { + NoRemove Attributes + } + } } } }

1 0

Alistair Leslie-Hughes : sapi: Implement ISpObjectTokenEnumBuilder Next.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 490f8aaae0e12896cc2c771fdd48165841efd9c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/490f8aaae0e12896cc2c771fdd4816… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 28 14:41:16 2021 +1000 sapi: Implement ISpObjectTokenEnumBuilder Next. --- dlls/sapi/token.c | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 0f37d6efa00..8972a5086ed 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -519,6 +519,7 @@ struct token_enum WCHAR *req, *opt; ULONG count; HKEY key; + DWORD index; }; static struct token_enum *impl_from_ISpObjectTokenEnumBuilder( ISpObjectTokenEnumBuilder *iface ) @@ -704,15 +705,54 @@ static HRESULT WINAPI token_enum_Next( ISpObjectTokenEnumBuilder *iface, ULONG *fetched ) { struct token_enum *This = impl_from_ISpObjectTokenEnumBuilder( iface ); + struct object_token *object; + HRESULT hr; + DWORD retCode; + WCHAR *subkey_name; + HKEY sub_key; + DWORD size; TRACE( "(%p)->(%lu %p %p)\n", This, num, tokens, fetched ); if (!This->init) return SPERR_UNINITIALIZED; + if (fetched) *fetched = 0; - FIXME( "semi-stub: Returning an empty enumerator\n" ); + *tokens = NULL; - if (fetched) *fetched = 0; - return S_FALSE; + RegQueryInfoKeyW( This->key, NULL, NULL, NULL, NULL, &size, NULL, NULL, NULL, NULL, NULL, NULL ); + size = (size+1) * sizeof(WCHAR); + subkey_name = heap_alloc(size); + if (!subkey_name) + return E_OUTOFMEMORY; + + retCode = RegEnumKeyExW( This->key, This->index, subkey_name, &size, NULL, NULL, NULL, NULL ); + if (retCode != ERROR_SUCCESS) + { + heap_free(subkey_name); + return S_FALSE; + } + + This->index++; + + if (RegOpenKeyExW( This->key, subkey_name, 0, KEY_READ, &sub_key ) != ERROR_SUCCESS) + { + heap_free(subkey_name); + return E_FAIL; + } + + hr = token_create( NULL, &IID_ISpObjectToken, (void**)tokens ); + if (FAILED(hr)) + { + heap_free(subkey_name); + return hr; + } + + object = impl_from_ISpObjectToken( *tokens ); + object->token_key = sub_key; + object->token_id = subkey_name; + + if (fetched) *fetched = 1; + return hr; } static HRESULT WINAPI token_enum_Skip( ISpObjectTokenEnumBuilder *iface, @@ -887,6 +927,7 @@ HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) This->init = FALSE; This->count = 0; This->key = NULL; + This->index = 0; hr = ISpObjectTokenEnumBuilder_QueryInterface( &This->ISpObjectTokenEnumBuilder_iface, iid, obj );

1 0

Alistair Leslie-Hughes : sapi: Implement ISpObjectTokenEnumBuilder Item.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: ca3ffa655dcbe0ef88fcf7ef3bef7163f7b26d4b URL: https://gitlab.winehq.org/wine/wine/-/commit/ca3ffa655dcbe0ef88fcf7ef3bef71… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 22 19:01:44 2021 +1000 sapi: Implement ISpObjectTokenEnumBuilder Item. --- dlls/sapi/token.c | 75 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 59 insertions(+), 16 deletions(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 34d26f6740d..0f37d6efa00 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -48,6 +48,20 @@ static struct data_key *impl_from_ISpRegDataKey( ISpRegDataKey *iface ) return CONTAINING_RECORD( iface, struct data_key, ISpRegDataKey_iface ); } +struct object_token +{ + ISpObjectToken ISpObjectToken_iface; + LONG ref; + + HKEY token_key; + WCHAR *token_id; +}; + +static struct object_token *impl_from_ISpObjectToken( ISpObjectToken *iface ) +{ + return CONTAINING_RECORD( iface, struct object_token, ISpObjectToken_iface ); +} + static HRESULT WINAPI data_key_QueryInterface( ISpRegDataKey *iface, REFIID iid, void **obj ) { struct data_key *This = impl_from_ISpRegDataKey( iface ); @@ -724,8 +738,51 @@ static HRESULT WINAPI token_enum_Clone( ISpObjectTokenEnumBuilder *iface, static HRESULT WINAPI token_enum_Item( ISpObjectTokenEnumBuilder *iface, ULONG index, ISpObjectToken **token ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_enum *This = impl_from_ISpObjectTokenEnumBuilder( iface ); + struct object_token *object; + ISpObjectToken *subtoken; + HRESULT hr; + WCHAR *subkey; + DWORD size; + LONG ret; + HKEY key; + + TRACE( "%p, %lu, %p\n", This, index, token ); + + if (!This->init) + return SPERR_UNINITIALIZED; + + RegQueryInfoKeyW(This->key, NULL, NULL, NULL, NULL, &size, NULL, NULL, NULL, NULL, NULL, NULL); + size = (size+1) * sizeof(WCHAR); + subkey = heap_alloc(size); + if (!subkey) + return E_OUTOFMEMORY; + + ret = RegEnumKeyExW(This->key, index, subkey, &size, NULL, NULL, NULL, NULL); + if (ret != ERROR_SUCCESS) + { + heap_free(subkey); + return HRESULT_FROM_WIN32(ret); + } + + ret = RegOpenKeyExW (This->key, subkey, 0, KEY_READ, &key); + if (ret != ERROR_SUCCESS) + { + heap_free(subkey); + return HRESULT_FROM_WIN32(ret); + } + + hr = token_create( NULL, &IID_ISpObjectToken, (void**)&subtoken ); + if (FAILED(hr)) + return hr; + + object = impl_from_ISpObjectToken( subtoken ); + object->token_key = key; + object->token_id = subkey; + + *token = subtoken; + + return hr; } static HRESULT WINAPI token_enum_GetCount( ISpObjectTokenEnumBuilder *iface, @@ -837,20 +894,6 @@ HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) return hr; } -struct object_token -{ - ISpObjectToken ISpObjectToken_iface; - LONG ref; - - HKEY token_key; - WCHAR *token_id; -}; - -static struct object_token *impl_from_ISpObjectToken( ISpObjectToken *iface ) -{ - return CONTAINING_RECORD( iface, struct object_token, ISpObjectToken_iface ); -} - static HRESULT WINAPI token_QueryInterface( ISpObjectToken *iface, REFIID iid, void **obj ) {

1 0

Alistair Leslie-Hughes : sapi: Store registry key to Enum builder.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: ff1c9633665e3cd9c3eb5382a19e0081e6597639 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff1c9633665e3cd9c3eb5382a19e00… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 13 13:58:37 2022 +1100 sapi: Store registry key to Enum builder. --- dlls/sapi/token.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 9be15e01ac0..34d26f6740d 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -504,6 +504,7 @@ struct token_enum BOOL init; WCHAR *req, *opt; ULONG count; + HKEY key; }; static struct token_enum *impl_from_ISpObjectTokenEnumBuilder( ISpObjectTokenEnumBuilder *iface ) @@ -517,9 +518,11 @@ static HRESULT WINAPI token_category_EnumTokens( ISpObjectTokenCategory *iface, { struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); ISpObjectTokenEnumBuilder *builder; + struct token_enum *tokenenum; + struct data_key *this_data_key; HRESULT hr; - FIXME( "(%p)->(%s %s %p): semi-stub\n", This, debugstr_w( req ), debugstr_w( opt ), enum_tokens ); + TRACE( "(%p)->(%s %s %p)\n", This, debugstr_w( req ), debugstr_w( opt ), enum_tokens ); if (!This->data_key) return SPERR_UNINITIALIZED; @@ -530,7 +533,15 @@ static HRESULT WINAPI token_category_EnumTokens( ISpObjectTokenCategory *iface, hr = ISpObjectTokenEnumBuilder_SetAttribs( builder, req, opt ); if (FAILED(hr)) goto fail; - /* FIXME: Build the enumerator */ + this_data_key = impl_from_ISpRegDataKey( This->data_key ); + + tokenenum = impl_from_ISpObjectTokenEnumBuilder( builder ); + + if (!RegOpenKeyExW( this_data_key->key, L"Tokens", 0, KEY_ALL_ACCESS, &tokenenum->key )) + { + RegQueryInfoKeyW(tokenenum->key, NULL, NULL, NULL, &tokenenum->count, NULL, NULL, + NULL, NULL, NULL, NULL, NULL); + } hr = ISpObjectTokenEnumBuilder_QueryInterface( builder, &IID_IEnumSpObjectTokens, (void **)enum_tokens ); @@ -664,6 +675,8 @@ static ULONG WINAPI token_enum_Release( ISpObjectTokenEnumBuilder *iface ) if (!ref) { + if (This->key) + RegCloseKey(This->key); heap_free( This->req ); heap_free( This->opt ); heap_free( This ); @@ -816,6 +829,7 @@ HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) This->opt = NULL; This->init = FALSE; This->count = 0; + This->key = NULL; hr = ISpObjectTokenEnumBuilder_QueryInterface( &This->ISpObjectTokenEnumBuilder_iface, iid, obj );

1 0

Alistair Leslie-Hughes : sapi: Move token structure before EnumTokens function.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 2e9d351526c8852d8fbd5c2e5597584bc9ab2f8e URL: https://gitlab.winehq.org/wine/wine/-/commit/2e9d351526c8852d8fbd5c2e559758… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 13 13:42:23 2022 +1100 sapi: Move token structure before EnumTokens function. --- dlls/sapi/token.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 476e8d6d248..9be15e01ac0 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -496,6 +496,21 @@ static HRESULT WINAPI token_category_GetDataKey( ISpObjectTokenCategory *iface, return E_NOTIMPL; } +struct token_enum +{ + ISpObjectTokenEnumBuilder ISpObjectTokenEnumBuilder_iface; + LONG ref; + + BOOL init; + WCHAR *req, *opt; + ULONG count; +}; + +static struct token_enum *impl_from_ISpObjectTokenEnumBuilder( ISpObjectTokenEnumBuilder *iface ) +{ + return CONTAINING_RECORD( iface, struct token_enum, ISpObjectTokenEnumBuilder_iface ); +} + static HRESULT WINAPI token_category_EnumTokens( ISpObjectTokenCategory *iface, LPCWSTR req, LPCWSTR opt, IEnumSpObjectTokens **enum_tokens ) @@ -610,21 +625,6 @@ HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) return hr; } -struct token_enum -{ - ISpObjectTokenEnumBuilder ISpObjectTokenEnumBuilder_iface; - LONG ref; - - BOOL init; - WCHAR *req, *opt; - ULONG count; -}; - -static struct token_enum *impl_from_ISpObjectTokenEnumBuilder( ISpObjectTokenEnumBuilder *iface ) -{ - return CONTAINING_RECORD( iface, struct token_enum, ISpObjectTokenEnumBuilder_iface ); -} - static HRESULT WINAPI token_enum_QueryInterface( ISpObjectTokenEnumBuilder *iface, REFIID iid, void **obj ) {

1 0

Eric Pouech : conhost/tests: Fix some tests on input sequences.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 5a8350120c27f4bcb5f53817dec4a6f5964e06b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a8350120c27f4bcb5f53817dec4a6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Oct 24 15:24:35 2022 +0200 conhost/tests: Fix some tests on input sequences. Correctly handling keyboards (French, German...) which report right-alt as ctrl+alt in VkKeyScan(). Splitting escape_test input tests into pure virtual keys on one hand, and modified char key on the other. Generating the virtual codes for the later instead of hardcoding the results (bound to generic US keyboard). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52980 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/tests/tty.c | 124 ++++++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 56 deletions(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 78e24cdb42d..5befbd2ea82 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -586,16 +586,17 @@ static void expect_key_pressed_(unsigned int line, unsigned int ctx, WCHAR ch, u expect_key_input_(line, ctx, 0, VK_SHIFT, FALSE, 0); } -#define expect_char_key(a) expect_char_key_(__LINE__,a) -static void expect_char_key_(unsigned int line, WCHAR ch) +#define expect_char_key(a) expect_char_key_(__LINE__,a,0) +#define expect_char_key_ctrl(a,c) expect_char_key_(__LINE__,a,c) +static void expect_char_key_(unsigned int line, WCHAR ch, unsigned int ctrl) { - unsigned int ctrl = 0, vk; + unsigned int vk; vk = VkKeyScanW(ch); if (vk == ~0) vk = 0; if (vk & 0x0100) ctrl |= SHIFT_PRESSED; /* Some keyboard (like German or French one) report right alt as ctrl+alt */ - if ((vk & 0x0600) == 0x0600) ctrl |= RIGHT_ALT_PRESSED; + if ((vk & 0x0600) == 0x0600 && !(ctrl & LEFT_ALT_PRESSED)) ctrl |= RIGHT_ALT_PRESSED; if (vk & 0x0200) ctrl |= LEFT_CTRL_PRESSED; vk &= 0xff; expect_key_pressed_(line, ch, ch, vk, ctrl); @@ -1448,62 +1449,67 @@ static void test_tty_input(void) static const struct { const char *str; - WCHAR ch; unsigned int vk; unsigned int ctrl; } escape_test[] = { - { "\x1b[A", 0, VK_UP, 0 }, - { "\x1b[B", 0, VK_DOWN, 0 }, - { "\x1b[C", 0, VK_RIGHT, 0 }, - { "\x1b[D", 0, VK_LEFT, 0 }, - { "\x1b[H", 0, VK_HOME, 0 }, - { "\x1b[F", 0, VK_END, 0 }, - { "\x1b[Z", 0x9, VK_TAB, SHIFT_PRESSED }, - { "\x1b[2~", 0, VK_INSERT, 0 }, - { "\x1b[3~", 0, VK_DELETE, 0 }, - { "\x1b[5~", 0, VK_PRIOR, 0 }, - { "\x1b[6~", 0, VK_NEXT, 0 }, - { "\x1b[15~", 0, VK_F5, 0 }, - { "\x1b[17~", 0, VK_F6, 0 }, - { "\x1b[18~", 0, VK_F7, 0 }, - { "\x1b[19~", 0, VK_F8, 0 }, - { "\x1b[20~", 0, VK_F9, 0 }, + { "\x1b[A", VK_UP, 0 }, + { "\x1b[B", VK_DOWN, 0 }, + { "\x1b[C", VK_RIGHT, 0 }, + { "\x1b[D", VK_LEFT, 0 }, + { "\x1b[H", VK_HOME, 0 }, + { "\x1b[F", VK_END, 0 }, + { "\x1b[2~", VK_INSERT, 0 }, + { "\x1b[3~", VK_DELETE, 0 }, + { "\x1b[5~", VK_PRIOR, 0 }, + { "\x1b[6~", VK_NEXT, 0 }, + { "\x1b[15~", VK_F5, 0 }, + { "\x1b[17~", VK_F6, 0 }, + { "\x1b[18~", VK_F7, 0 }, + { "\x1b[19~", VK_F8, 0 }, + { "\x1b[20~", VK_F9, 0 }, + { "\x1b[21~", VK_F10, 0 }, /* 0x10 */ - { "\x1b[21~", 0, VK_F10, 0 }, - { "\x1b[23~", 0, VK_F11, 0 }, - { "\x1b[24~", 0, VK_F12, 0 }, - { "\x1bOP", 0, VK_F1, 0 }, - { "\x1bOQ", 0, VK_F2, 0 }, - { "\x1bOR", 0, VK_F3, 0 }, - { "\x1bOS", 0, VK_F4, 0 }, - { "\x1b[1;1A", 0, VK_UP, 0 }, - { "\x1b[1;2A", 0, VK_UP, SHIFT_PRESSED }, - { "\x1b[1;3A", 0, VK_UP, LEFT_ALT_PRESSED }, - { "\x1b[1;4A", 0, VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED }, - { "\x1b[1;5A", 0, VK_UP, LEFT_CTRL_PRESSED }, - { "\x1b[1;6A", 0, VK_UP, SHIFT_PRESSED | LEFT_CTRL_PRESSED }, - { "\x1b[1;7A", 0, VK_UP, LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, - { "\x1b[1;8A", 0, VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, - { "\x1b[1;9A", 0, VK_UP, 0 }, + { "\x1b[23~", VK_F11, 0 }, + { "\x1b[24~", VK_F12, 0 }, + { "\x1bOP", VK_F1, 0 }, + { "\x1bOQ", VK_F2, 0 }, + { "\x1bOR", VK_F3, 0 }, + { "\x1bOS", VK_F4, 0 }, + { "\x1b[1;1A", VK_UP, 0 }, + { "\x1b[1;2A", VK_UP, SHIFT_PRESSED }, + { "\x1b[1;3A", VK_UP, LEFT_ALT_PRESSED }, + { "\x1b[1;4A", VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED }, + { "\x1b[1;5A", VK_UP, LEFT_CTRL_PRESSED }, + { "\x1b[1;6A", VK_UP, SHIFT_PRESSED | LEFT_CTRL_PRESSED }, + { "\x1b[1;7A", VK_UP, LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, + { "\x1b[1;8A", VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, + { "\x1b[1;9A", VK_UP, 0 }, + { "\x1b[1;10A", VK_UP, SHIFT_PRESSED }, /* 0x20 */ - { "\x1b[1;10A", 0, VK_UP, SHIFT_PRESSED }, - { "\x1b[1;11A", 0, VK_UP, LEFT_ALT_PRESSED }, - { "\x1b[1;12A", 0, VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED }, - { "\x1b[1;13A", 0, VK_UP, LEFT_CTRL_PRESSED }, - { "\x1b[1;14A", 0, VK_UP, SHIFT_PRESSED | LEFT_CTRL_PRESSED }, - { "\x1b[1;15A", 0, VK_UP, LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, - { "\x1b[1;16A", 0, VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, - { "\x1b[1;2P", 0, VK_F1, SHIFT_PRESSED }, - { "\x1b[2;3~", 0, VK_INSERT, LEFT_ALT_PRESSED }, - { "\x1b[2;3;5;6~", 0, VK_INSERT, 0 }, - { "\x1b[6;2;3;5;1~", 0, VK_NEXT, 0 }, - { "\xe4\xb8\x80", 0x4e00, 0, 0 }, - { "\x1b\x1b", 0x1b, VK_ESCAPE, LEFT_ALT_PRESSED }, - { "\x1b""1", '1', '1', LEFT_ALT_PRESSED }, - { "\x1b""x", 'x', 'X', LEFT_ALT_PRESSED }, - { "\x1b""[", '[', VK_OEM_4, LEFT_ALT_PRESSED }, - /* 0x30 */ - { "\x7f", '\b', VK_BACK, 0 }, + { "\x1b[1;11A", VK_UP, LEFT_ALT_PRESSED }, + { "\x1b[1;12A", VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED }, + { "\x1b[1;13A", VK_UP, LEFT_CTRL_PRESSED }, + { "\x1b[1;14A", VK_UP, SHIFT_PRESSED | LEFT_CTRL_PRESSED }, + { "\x1b[1;15A", VK_UP, LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, + { "\x1b[1;16A", VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, + { "\x1b[1;2P", VK_F1, SHIFT_PRESSED }, + { "\x1b[2;3~", VK_INSERT, LEFT_ALT_PRESSED }, + { "\x1b[2;3;5;6~", VK_INSERT, 0 }, + { "\x1b[6;2;3;5;1~", VK_NEXT, 0 }, + }; + static const struct + { + const char *str; + WCHAR ch; + unsigned int ctrl; + } escape_char_test[] = { + { "\x1b[Z", 0x9, SHIFT_PRESSED }, + { "\xe4\xb8\x80", 0x4e00, 0 }, + { "\x1b\x1b", 0x1b, LEFT_ALT_PRESSED }, + { "\x1b""1", '1', LEFT_ALT_PRESSED }, + { "\x1b""x", 'x', LEFT_ALT_PRESSED }, + { "\x1b""[", '[', LEFT_ALT_PRESSED }, + { "\x7f", '\b', 0 }, }; write_console_pipe("x"); @@ -1555,7 +1561,13 @@ static void test_tty_input(void) for (i = 0; i < ARRAY_SIZE(escape_test); i++) { write_console_pipe(escape_test[i].str); - expect_key_pressed_ctx(i, escape_test[i].ch, escape_test[i].vk, escape_test[i].ctrl); + expect_key_pressed_ctx(i, 0, escape_test[i].vk, escape_test[i].ctrl); + } + + for (i = 0; i < ARRAY_SIZE(escape_char_test); i++) + { + write_console_pipe(escape_char_test[i].str); + expect_char_key_ctrl(escape_char_test[i].ch, escape_char_test[i].ctrl); } for (i = 0x80; i < 0x100; i += 11)

1 0

Eric Pouech : conhost/tests: Fix tests for some keyboard layouts.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: bdad6f2c853045602ab3995ec3490bee3d0a60fb URL: https://gitlab.winehq.org/wine/wine/-/commit/bdad6f2c853045602ab3995ec3490b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Oct 24 15:24:33 2022 +0200 conhost/tests: Fix tests for some keyboard layouts. Some keyboards (French, German and some others) report the right alt key (which is some cases the right-shift one) as ctrl+alt. Add proper handling for ctrl+alt return from VkKeyScan(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52980 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/tests/tty.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index cab7cd5574f..78e24cdb42d 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -543,7 +543,7 @@ static void expect_key_input_(unsigned int line, unsigned int ctx, WCHAR ch, uns "%x: wVirtualScanCode = %x expected %x\n", ctx, record.Event.KeyEvent.wVirtualScanCode, vs); ok_(__FILE__,line)(record.Event.KeyEvent.dwControlKeyState == ctrl_state, - "%x: dwControlKeyState = %lx\n", ctx, record.Event.KeyEvent.dwControlKeyState); + "%x: dwControlKeyState = %lx expected %x\n", ctx, record.Event.KeyEvent.dwControlKeyState, ctrl_state); } #define get_input_key_vt() get_input_key_vt_(__LINE__) @@ -567,12 +567,17 @@ static void expect_key_pressed_(unsigned int line, unsigned int ctx, WCHAR ch, u if (ctrl_state & LEFT_ALT_PRESSED) expect_key_input_(line, ctx, 0, VK_MENU, TRUE, LEFT_ALT_PRESSED | (ctrl_state & SHIFT_PRESSED)); - if (ctrl_state & LEFT_CTRL_PRESSED) + if (ctrl_state & RIGHT_ALT_PRESSED) + expect_key_input_(line, ctx, 0, VK_MENU, TRUE, + RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED | ENHANCED_KEY | (ctrl_state & SHIFT_PRESSED)); + else if (ctrl_state & LEFT_CTRL_PRESSED) expect_key_input_(line, ctx, 0, VK_CONTROL, TRUE, LEFT_CTRL_PRESSED | (ctrl_state & (SHIFT_PRESSED | LEFT_ALT_PRESSED))); expect_key_input_(line, ctx, ch, vk, TRUE, ctrl_state); expect_key_input_(line, ctx, ch, vk, FALSE, ctrl_state); - if (ctrl_state & LEFT_CTRL_PRESSED) + if (ctrl_state & RIGHT_ALT_PRESSED) + expect_key_input_(line, ctx, 0, VK_MENU, FALSE, ENHANCED_KEY | (ctrl_state & SHIFT_PRESSED)); + else if (ctrl_state & LEFT_CTRL_PRESSED) expect_key_input_(line, ctx, 0, VK_CONTROL, FALSE, ctrl_state & (SHIFT_PRESSED | LEFT_ALT_PRESSED)); if (ctrl_state & LEFT_ALT_PRESSED) @@ -585,9 +590,12 @@ static void expect_key_pressed_(unsigned int line, unsigned int ctx, WCHAR ch, u static void expect_char_key_(unsigned int line, WCHAR ch) { unsigned int ctrl = 0, vk; + vk = VkKeyScanW(ch); if (vk == ~0) vk = 0; if (vk & 0x0100) ctrl |= SHIFT_PRESSED; + /* Some keyboard (like German or French one) report right alt as ctrl+alt */ + if ((vk & 0x0600) == 0x0600) ctrl |= RIGHT_ALT_PRESSED; if (vk & 0x0200) ctrl |= LEFT_CTRL_PRESSED; vk &= 0xff; expect_key_pressed_(line, ch, ch, vk, ctrl);

1 0

Bartosz Kosiorek : msvcrt: Add _ismbstrail_l implementation.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 5b425baf925a085bc916cee0fa0900550195a45a URL: https://gitlab.winehq.org/wine/wine/-/commit/5b425baf925a085bc916cee0fa0900… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Thu Oct 20 00:56:00 2022 +0200 msvcrt: Add _ismbstrail_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 17 ++++++++++++++--- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 8 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8f24047e8b5..54f988ee9cd 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1009,7 +1009,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -@ stub _ismbstrail_l(ptr ptr ptr) +@ cdecl _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 160dce837d9..d84a88ea50b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1355,7 +1355,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -@ stub _ismbstrail_l +@ cdecl _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 268c6db59d7..5c65b082309 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1361,7 +1361,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -@ stub _ismbstrail_l +@ cdecl _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index cafb0a8f644..4f3425acc35 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -681,7 +681,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -@ stub _ismbstrail_l +@ cdecl _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2773762b176..4e26468b489 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -659,7 +659,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -@ stub _ismbstrail_l +@ cdecl _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 0e6e0bdcc7f..bdcfea3b01a 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1848,17 +1848,28 @@ int CDECL _ismbslead(const unsigned char* start, const unsigned char* str) } /********************************************************************* - * _ismbstrail(MSVCRT.@) + * _ismbstrail_l(MSVCRT.@) */ -int CDECL _ismbstrail(const unsigned char* start, const unsigned char* str) +int CDECL _ismbstrail_l(const unsigned char* start, const unsigned char* str, _locale_t locale) { + if (!MSVCRT_CHECK_PMT(start && str)) + return 0; + /* Note: this function doesn't check _ismbbtrail */ - if ((str > start) && _ismbslead(start, str-1)) + if ((str > start) && _ismbslead_l(start, str-1, locale)) return -1; else return 0; } +/********************************************************************* + * _ismbstrail(MSVCRT.@) + */ +int CDECL _ismbstrail(const unsigned char* start, const unsigned char* str) +{ + return _ismbstrail_l(start, str, NULL); +} + /********************************************************************* * _mbbtype_l(MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ae70c2619b6..156216ae715 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -630,7 +630,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -# stub _ismbstrail_l(long ptr) +@ cdecl _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4d0e69fc57b..805ccc908f7 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -501,7 +501,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -@ stub _ismbstrail_l +@ cdecl _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) @@ -1100,7 +1100,7 @@ @ cdecl _o__ismbslead(ptr ptr) _ismbslead @ cdecl _o__ismbslead_l(ptr ptr ptr) _ismbslead_l @ cdecl _o__ismbstrail(ptr ptr) _ismbstrail -@ stub _o__ismbstrail_l +@ cdecl _o__ismbstrail_l(ptr ptr ptr) _ismbstrail_l @ cdecl _o__iswctype_l(long long ptr) _iswctype_l @ cdecl _o__itoa(long ptr long) _itoa @ cdecl _o__itoa_s(long ptr long long) _itoa_s

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2022