October 2022 - Wine-commits

Connor McAdams : uiautomationcore: Add support for UIAutomationType_IntArray property comparisons.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: wine Branch: master Commit: 2cfcddb2fefaf6b3c26d213ae6be2b0d355ec8f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2cfcddb2fefaf6b3c26d213ae6be2b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Oct 26 10:39:36 2022 -0400 uiautomationcore: Add support for UIAutomationType_IntArray property comparisons. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 51 ++++++++++++++---------------- dlls/uiautomationcore/uia_client.c | 50 +++++++++++++++++++++-------- dlls/uiautomationcore/uia_private.h | 2 +- dlls/uiautomationcore/uia_provider.c | 2 +- 4 files changed, 62 insertions(+), 43 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 7a79ea2a4a5..91c9e75c46a 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -7257,17 +7257,15 @@ static void test_UiaGetUpdatedCache(void) tree_struct = NULL; out_req = NULL; hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(!!out_req, "out_req == NULL\n"); - todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); - if (out_req) - { - exp_lbound[0] = exp_lbound[1] = 0; - exp_elems[0] = exp_elems[1] = 1; - test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); - ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); - ok_method_sequence(cache_req_seq4, NULL); - } + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!out_req, "out_req == NULL\n"); + ok(!!tree_struct, "tree_struct == NULL\n"); + + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = exp_elems[1] = 1; + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); + ok_method_sequence(cache_req_seq4, NULL); SafeArrayDestroy(out_req); SysFreeString(tree_struct); @@ -7286,13 +7284,12 @@ static void test_UiaGetUpdatedCache(void) tree_struct = NULL; out_req = NULL; hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - ok_method_sequence(cache_req_seq5, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok_method_sequence(cache_req_seq5, NULL); ok(!out_req, "out_req != NULL\n"); - todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); - if (tree_struct) - ok(!wcscmp(tree_struct, L""), "tree structure %s\n", debugstr_w(tree_struct)); + ok(!!tree_struct, "tree_struct == NULL\n"); + ok(!wcscmp(tree_struct, L""), "tree structure %s\n", debugstr_w(tree_struct)); + SysFreeString(tree_struct); VariantClear(&v); } @@ -7312,17 +7309,15 @@ static void test_UiaGetUpdatedCache(void) tree_struct = NULL; out_req = NULL; hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(!!out_req, "out_req == NULL\n"); - todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); - if (out_req) - { - exp_lbound[0] = exp_lbound[1] = 0; - exp_elems[0] = exp_elems[1] = 1; - test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); - ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); - ok_method_sequence(cache_req_seq6, NULL); - } + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!out_req, "out_req == NULL\n"); + ok(!!tree_struct, "tree_struct == NULL\n"); + + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = exp_elems[1] = 1; + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); + ok_method_sequence(cache_req_seq6, NULL); SafeArrayDestroy(out_req); SysFreeString(tree_struct); diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 328afa7acb2..11a6e3ffc45 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -49,7 +49,7 @@ static HRESULT get_safearray_bounds(SAFEARRAY *sa, LONG *lbound, LONG *elems) return S_OK; } -int uia_compare_runtime_ids(SAFEARRAY *sa1, SAFEARRAY *sa2) +int uia_compare_safearrays(SAFEARRAY *sa1, SAFEARRAY *sa2, int prop_type) { LONG i, idx, lbound[2], elems[2]; int val[2]; @@ -72,6 +72,12 @@ int uia_compare_runtime_ids(SAFEARRAY *sa1, SAFEARRAY *sa2) if (elems[0] != elems[1]) return (elems[0] > elems[1]) - (elems[0] < elems[1]); + if (prop_type != UIAutomationType_IntArray) + { + FIXME("Array type %#x value comparsion currently unimplemented.\n", prop_type); + return -1; + } + for (i = 0; i < elems[0]; i++) { idx = lbound[0] + i; @@ -1932,18 +1938,7 @@ static HRESULT uia_property_condition_check(HUIANODE node, struct UiaPropertyCon switch (prop_info->type) { case UIAutomationType_Bool: - hr = UiaGetPropertyValue(node, prop_info->prop_id, &v); - if (FAILED(hr) || V_VT(&v) == VT_UNKNOWN) - { - hr = S_FALSE; - break; - } - - if ((V_VT(&v) == V_VT(&prop_cond->Value)) && (V_BOOL(&v) == V_BOOL(&prop_cond->Value))) - hr = S_OK; - else - hr = S_FALSE; - + case UIAutomationType_IntArray: break; default: @@ -1951,6 +1946,35 @@ static HRESULT uia_property_condition_check(HUIANODE node, struct UiaPropertyCon return E_NOTIMPL; } + hr = UiaGetPropertyValue(node, prop_info->prop_id, &v); + if (FAILED(hr) || V_VT(&v) == VT_UNKNOWN) + return S_FALSE; + + if (V_VT(&v) == V_VT(&prop_cond->Value)) + { + switch (prop_info->type) + { + case UIAutomationType_Bool: + if (V_BOOL(&v) == V_BOOL(&prop_cond->Value)) + hr = S_OK; + else + hr = S_FALSE; + break; + + case UIAutomationType_IntArray: + if (!uia_compare_safearrays(V_ARRAY(&v), V_ARRAY(&prop_cond->Value), prop_info->type)) + hr = S_OK; + else + hr = S_FALSE; + break; + + default: + break; + } + } + else + hr = S_FALSE; + VariantClear(&v); return hr; } diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index 697a1d6aa4e..39c9aac847b 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -87,7 +87,7 @@ static inline struct uia_provider *impl_from_IWineUiaProvider(IWineUiaProvider * } /* uia_client.c */ -int uia_compare_runtime_ids(SAFEARRAY *sa1, SAFEARRAY *sa2) DECLSPEC_HIDDEN; +int uia_compare_safearrays(SAFEARRAY *sa1, SAFEARRAY *sa2, int prop_type) DECLSPEC_HIDDEN; int get_node_provider_type_at_idx(struct uia_node *node, int idx) DECLSPEC_HIDDEN; HRESULT create_uia_node_from_elprov(IRawElementProviderSimple *elprov, HUIANODE *out_node, BOOL get_hwnd_providers) DECLSPEC_HIDDEN; diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index e88d4be9565..fc718fabe43 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1159,7 +1159,7 @@ struct uia_provider_thread_map_entry static int uia_runtime_id_compare(const void *key, const struct rb_entry *entry) { struct uia_provider_thread_map_entry *prov_entry = RB_ENTRY_VALUE(entry, struct uia_provider_thread_map_entry, entry); - return uia_compare_runtime_ids(prov_entry->runtime_id, (SAFEARRAY *)key); + return uia_compare_safearrays(prov_entry->runtime_id, (SAFEARRAY *)key, UIAutomationType_IntArray); } void uia_provider_thread_remove_node(HUIANODE node)

1 0

Jinoh Kang : ntdll/tests: Add tests for pipe names.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: wine Branch: master Commit: 71959b68879ee56ed4ef851b6177b6b192b49a7f URL: https://gitlab.winehq.org/wine/wine/-/commit/71959b68879ee56ed4ef851b6177b6… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Oct 15 20:01:31 2022 +0900 ntdll/tests: Add tests for pipe names. --- dlls/ntdll/tests/pipe.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 569de22b013..6ee3f569e79 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -2795,6 +2795,94 @@ static void test_empty_name(void) CloseHandle(hdirectory); } +struct pipe_name_test { + const WCHAR *name; + NTSTATUS status; + BOOL todo; + const WCHAR *no_open_name; +}; + +static void subtest_pipe_name(const struct pipe_name_test *pnt) +{ + OBJECT_ATTRIBUTES attr; + LARGE_INTEGER timeout; + IO_STATUS_BLOCK iosb; + HANDLE pipe, client; + UNICODE_STRING name; + NTSTATUS status; + + pRtlInitUnicodeString(&name, pnt->name); + InitializeObjectAttributes(&attr, &name, OBJ_CASE_INSENSITIVE, NULL, NULL); + timeout.QuadPart = -100000000; + pipe = NULL; + status = pNtCreateNamedPipeFile(&pipe, + GENERIC_READ | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, + &attr, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, + 0, 0, 0, 3, 4096, 4096, &timeout); + todo_wine_if(pnt->todo) + ok(status == pnt->status, "Expected status %#lx, got %#lx\n", pnt->status, status); + + if (!NT_SUCCESS(status)) + { + ok(pipe == NULL, "expected NULL handle, got %p\n", pipe); + return; + } + + ok(pipe != NULL, "expected non-NULL handle, got %p\n", client); + + client = NULL; + status = NtCreateFile(&client, SYNCHRONIZE, &attr, &iosb, NULL, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0); + ok(status == STATUS_SUCCESS, "Expected success, got %#lx\n", status); + ok(client != NULL, "expected non-NULL handle, got %p\n", client); + NtClose(client); + + if (pnt->no_open_name) + { + OBJECT_ATTRIBUTES no_open_attr; + UNICODE_STRING no_open_name; + + pRtlInitUnicodeString(&no_open_name, pnt->no_open_name); + InitializeObjectAttributes(&no_open_attr, &no_open_name, OBJ_CASE_INSENSITIVE, NULL, NULL); + client = NULL; + status = NtCreateFile(&client, SYNCHRONIZE, &no_open_attr, &iosb, NULL, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, + "Expected STATUS_OBJECT_NAME_NOT_FOUND opening %s, got %#lx\n", + debugstr_wn(no_open_name.Buffer, no_open_name.Length / sizeof(WCHAR)), status); + ok(client == NULL, "expected NULL handle, got %p\n", client); + } + + NtClose(pipe); +} + +static void test_pipe_names(void) +{ + static const struct pipe_name_test tests[] = { + { L"\\Device\\NamedPipe" , STATUS_OBJECT_NAME_INVALID, TRUE }, + { L"\\Device\\NamedPipe\\" , STATUS_OBJECT_NAME_INVALID, TRUE }, + { L"\\Device\\NamedPipe\\\\" , STATUS_SUCCESS }, + { L"\\Device\\NamedPipe\\wine-test\\" , STATUS_SUCCESS, 0, L"\\Device\\NamedPipe\\wine-test" }, + { L"\\Device\\NamedPipe\\wine/test" , STATUS_SUCCESS, 0, L"\\Device\\NamedPipe\\wine\\test" }, + { L"\\Device\\NamedPipe\\wine:test" , STATUS_SUCCESS }, + { L"\\Device\\NamedPipe\\wine\\.\\test" , STATUS_SUCCESS, 0, L"\\Device\\NamedPipe\\wine\\test" }, + { L"\\Device\\NamedPipe\\wine\\..\\test" , STATUS_SUCCESS, 0, L"\\Device\\NamedPipe\\test" }, + { L"\\Device\\NamedPipe\\..\\wine-test" , STATUS_SUCCESS }, + { L"\\Device\\NamedPipe\\!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", STATUS_SUCCESS }, + }; + size_t i; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + const struct pipe_name_test *pnt = &tests[i]; + + winetest_push_context("test %Iu: %s", i, debugstr_w(pnt->name)); + subtest_pipe_name(pnt); + winetest_pop_context(); + } +} + START_TEST(pipe) { if (!init_func_ptrs()) @@ -2854,6 +2942,7 @@ START_TEST(pipe) test_file_info(); test_security_info(); test_empty_name(); + test_pipe_names(); pipe_for_each_state(create_pipe_server, connect_pipe, test_pipe_state); pipe_for_each_state(create_pipe_server, connect_and_write_pipe, test_pipe_with_data_state);

1 0

Jinoh Kang : ntdll/tests: Add more tests for \Device\NamedPipe and \Device\NamedPipe\.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: wine Branch: master Commit: dd5ce0295b998ad99262d1e1a6fb60dc3908a50d URL: https://gitlab.winehq.org/wine/wine/-/commit/dd5ce0295b998ad99262d1e1a6fb60… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Oct 15 21:28:46 2022 +0900 ntdll/tests: Add more tests for \Device\NamedPipe and \Device\NamedPipe\. --- dlls/ntdll/tests/pipe.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 6ee3f569e79..6f26655b118 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -2608,6 +2608,93 @@ static void test_security_info(void) HeapFree(GetProcessHeap(), 0, local_sid); } +static void subtest_empty_name_pipe_operations(HANDLE handle) +{ + static const struct fsctl_test { + const char *name; + ULONG code; + NTSTATUS status; + NTSTATUS status_broken; + } fsctl_tests[] = { +#define FSCTL_TEST(code, ...) { #code, code, __VA_ARGS__ } + FSCTL_TEST(FSCTL_PIPE_ASSIGN_EVENT, STATUS_NOT_SUPPORTED), + FSCTL_TEST(FSCTL_PIPE_DISCONNECT, STATUS_PIPE_DISCONNECTED), + FSCTL_TEST(FSCTL_PIPE_LISTEN, STATUS_ILLEGAL_FUNCTION), + FSCTL_TEST(FSCTL_PIPE_QUERY_EVENT, STATUS_NOT_SUPPORTED), + FSCTL_TEST(FSCTL_PIPE_TRANSCEIVE, STATUS_PIPE_DISCONNECTED), + FSCTL_TEST(FSCTL_PIPE_IMPERSONATE, STATUS_ILLEGAL_FUNCTION), + FSCTL_TEST(FSCTL_PIPE_SET_CLIENT_PROCESS, STATUS_NOT_SUPPORTED), + FSCTL_TEST(FSCTL_PIPE_QUERY_CLIENT_PROCESS, STATUS_INVALID_PARAMETER, /* win10 1507 */ STATUS_PIPE_DISCONNECTED), +#undef FSCTL_TEST + }; + FILE_PIPE_PEEK_BUFFER peek_buf; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + char buffer[1024]; + NTSTATUS status; + ULONG peer_pid; + HANDLE event; + size_t i; + + event = NULL; + InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); + status = NtCreateEvent(&event, GENERIC_ALL, &attr, NotificationEvent, FALSE); + ok(status == STATUS_SUCCESS, "NtCreateEvent returned %#lx\n", status); + + status = NtReadFile(handle, event, NULL, NULL, &io, buffer, sizeof(buffer), NULL, NULL); + todo_wine + ok(status == STATUS_INVALID_PARAMETER, "NtReadFile on \\Device\\NamedPipe: got %#lx\n", status); + + status = NtWriteFile(handle, event, NULL, NULL, &io, buffer, sizeof(buffer), NULL, NULL); + todo_wine + ok(status == STATUS_INVALID_PARAMETER, "NtWriteFile on \\Device\\NamedPipe: got %#lx\n", status); + + status = NtFsControlFile(handle, event, NULL, NULL, &io, FSCTL_PIPE_PEEK, NULL, 0, &peek_buf, sizeof(peek_buf)); + if (status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + status = io.Status; + } + todo_wine + ok(status == STATUS_INVALID_PARAMETER, "FSCTL_PIPE_PEEK on \\Device\\NamedPipe: got %lx\n", status); + + status = NtFsControlFile(handle, event, NULL, NULL, &io, FSCTL_PIPE_GET_CONNECTION_ATTRIBUTE, (void *)"ClientProcessId", sizeof("ClientProcessId"), &peer_pid, sizeof(peer_pid)); + if (status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + status = io.Status; + } + todo_wine + ok(status == STATUS_INVALID_PARAMETER, "FSCTL_PIPE_GET_CONNECTION_ATTRIBUTE ClientProcessId on \\Device\\NamedPipe: got %lx\n", status); + + status = NtFsControlFile(handle, event, NULL, NULL, &io, FSCTL_PIPE_GET_CONNECTION_ATTRIBUTE, (void *)"ServerProcessId", sizeof("ServerProcessId"), &peer_pid, sizeof(peer_pid)); + if (status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + status = io.Status; + } + todo_wine + ok(status == STATUS_INVALID_PARAMETER, "FSCTL_PIPE_GET_CONNECTION_ATTRIBUTE ServerProcessId on \\Device\\NamedPipe: got %lx\n", status); + + for (i = 0; i < ARRAY_SIZE(fsctl_tests); i++) + { + const struct fsctl_test *ft = &fsctl_tests[i]; + + status = NtFsControlFile(handle, event, NULL, NULL, &io, ft->code, 0, 0, 0, 0); + if (status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + status = io.Status; + } + todo_wine_if(ft->status != STATUS_NOT_SUPPORTED) + ok(status == ft->status || (ft->status_broken && broken(status == ft->status_broken)), + "NtFsControlFile(%s) on \\Device\\NamedPipe: expected %#lx, got %#lx\n", + ft->name, ft->status, status); + } + + NtClose(event); +} + static void test_empty_name(void) { static const LARGE_INTEGER zero_timeout = {{ 0 }}; @@ -2637,7 +2724,7 @@ static void test_empty_name(void) attr.RootDirectory = 0; attr.ObjectName = &name; - status = NtCreateFile(&hdirectory, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, + status = NtCreateFile(&hdirectory, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); ok(!status, "Got unexpected status %#lx.\n", status); @@ -2645,6 +2732,8 @@ static void test_empty_name(void) status = wait_pipe(hdirectory, &name, &zero_timeout); todo_wine ok(status == STATUS_ILLEGAL_FUNCTION, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe: %#lx\n", status); + subtest_empty_name_pipe_operations(hdirectory); + name.Buffer = NULL; name.Length = 0; name.MaximumLength = 0; @@ -2677,7 +2766,7 @@ static void test_empty_name(void) status = pNtCreateDirectoryObject(&hdirectory, GENERIC_READ | SYNCHRONIZE, &attr); todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#lx.\n", status); - status = NtCreateFile(&hdirectory, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, + status = NtCreateFile(&hdirectory, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); ok(!status, "Got unexpected status %#lx.\n", status); @@ -2685,6 +2774,8 @@ static void test_empty_name(void) status = wait_pipe(hdirectory, &name, &zero_timeout); ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe\\: %#lx\n", status); + subtest_empty_name_pipe_operations(hdirectory); + name.Buffer = NULL; name.Length = 0; name.MaximumLength = 0;

1 0

Hans Leidekker : wbemprox: WQL string comparisons are case insensitive.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: wine Branch: master Commit: 7bfa058a0b89e6a4f24dd43db9a0ea5c1a304b71 URL: https://gitlab.winehq.org/wine/wine/-/commit/7bfa058a0b89e6a4f24dd43db9a0ea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 25 11:21:28 2022 +0200 wbemprox: WQL string comparisons are case insensitive. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53832 --- dlls/wbemprox/query.c | 12 ++++++------ dlls/wbemprox/tests/query.c | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 8233d35878d..1b79523d66f 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -118,22 +118,22 @@ static HRESULT eval_strcmp( UINT op, const WCHAR *lstr, const WCHAR *rstr, LONGL switch (op) { case OP_EQ: - *val = !wcscmp( lstr, rstr ); + *val = !wcsicmp( lstr, rstr ); break; case OP_GT: - *val = wcscmp( lstr, rstr ) > 0; + *val = wcsicmp( lstr, rstr ) > 0; break; case OP_LT: - *val = wcscmp( lstr, rstr ) < 0; + *val = wcsicmp( lstr, rstr ) < 0; break; case OP_LE: - *val = wcscmp( lstr, rstr ) <= 0; + *val = wcsicmp( lstr, rstr ) <= 0; break; case OP_GE: - *val = wcscmp( lstr, rstr ) >= 0; + *val = wcsicmp( lstr, rstr ) >= 0; break; case OP_NE: - *val = wcscmp( lstr, rstr ); + *val = wcsicmp( lstr, rstr ); break; case OP_LIKE: *val = eval_like( lstr, rstr ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 12bc42d249c..e86f7fd5b62 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -2141,6 +2141,28 @@ static void test_Win32_LogicalDisk( IWbemServices *services ) IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + + query = SysAllocString( L"SELECT * FROM Win32_LogicalDisk WHERE DeviceID > 'b:' AND DeviceID < 'd:'" ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %#lx\n", hr ); + count = 0; + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 1, "got %lu\n", count ); + IWbemClassObject_Release( obj ); + SysFreeString( query ); + + query = SysAllocString( L"SELECT * FROM Win32_LogicalDisk WHERE DeviceID = 'C:'" ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %#lx\n", hr ); + count = 0; + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 1, "got %lu\n", count ); + IWbemClassObject_Release( obj ); + SysFreeString( query ); IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql );

1 0

Eric Pouech : kernel32/tests: Workaround some broken Windows behavior in console tests.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: wine Branch: master Commit: 35c65edcb92557e34c424c2026614adfff21b500 URL: https://gitlab.winehq.org/wine/wine/-/commit/35c65edcb92557e34c424c2026614a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 25 16:36:32 2022 +0200 kernel32/tests: Workaround some broken Windows behavior in console tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48105 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/console.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index c2b7eb63a1e..1f285faf1e2 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -925,10 +925,16 @@ static void testScreenBuffer(HANDLE hConOut) SetConsoleCursorPosition(hConOutRW, c); ret = WriteConsoleA(hConOutRW, test_cp866, lstrlenA(test_cp866), &len, NULL); ok(ret && len == lstrlenA(test_cp866), "WriteConsoleA failed\n"); - ret = ReadConsoleOutputCharacterW(hConOutRW, str_wbuf, lstrlenA(test_cp866), c, &len); - ok(ret && len == lstrlenA(test_cp866), "ReadConsoleOutputCharacterW failed\n"); - str_wbuf[lstrlenA(test_cp866)] = 0; - ok(!lstrcmpW(str_wbuf, test_unicode), "string does not match the pattern\n"); + ret = ReadConsoleOutputCharacterW(hConOutRW, str_wbuf, lstrlenW(test_unicode), c, &len); + /* Work around some broken results under Windows with some locale (ja, cn, ko...) + * Looks like a real bug in Win10 (at least). + */ + if (ret && broken(len == lstrlenW(test_unicode) / sizeof(WCHAR))) + ret = ReadConsoleOutputCharacterW(hConOutRW, str_wbuf, lstrlenW(test_unicode) * sizeof(WCHAR), c, &len); + ok(ret, "ReadConsoleOutputCharacterW failed\n"); + ok(len == lstrlenW(test_unicode), "unexpected len %lu %u\n", len, lstrlenW(test_unicode)); + ok(!memcmp(str_wbuf, test_unicode, lstrlenW(test_unicode) * sizeof(WCHAR)), + "string does not match the pattern\n"); /* * cp866 is OK, let's switch to cp1251.

1 0

Piotr Caban : comctl32: Create page if PROPSHEETPAGE was passed as HPROPSHEETPAGE to PropertySheetAW or PSM_INSERTPAGE.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: wine Branch: master Commit: fc767fd589c8544b59ad0508089636bde23b2059 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc767fd589c8544b59ad0508089636… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 13:07:12 2022 +0200 comctl32: Create page if PROPSHEETPAGE was passed as HPROPSHEETPAGE to PropertySheetAW or PSM_INSERTPAGE. --- dlls/comctl32/propsheet.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/comctl32/tests/propsheet.c | 4 ++-- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index e043e34a6cd..95b464934dc 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -66,6 +66,8 @@ #include "wine/debug.h" +#define HPROPSHEETPAGE_MAGIC 0x5A9234E3 + /****************************************************************************** * Data structures */ @@ -95,6 +97,7 @@ typedef struct struct _PSP { + ULONG_PTR magic; PROPSHEETPAGEW psp; PROPSHEETPAGEW callback_psp; }; @@ -2302,6 +2305,14 @@ static BOOL PROPSHEET_InsertPage(HWND hwndDlg, HPROPSHEETPAGE hpageInsertAfter, if (!ppi) return FALSE; + if (hpage && hpage->magic != HPROPSHEETPAGE_MAGIC) + { + if (psInfo->unicode) + hpage = CreatePropertySheetPageW((const PROPSHEETPAGEW *)hpage); + else + hpage = CreatePropertySheetPageA((const PROPSHEETPAGEA *)hpage); + } + /* * Fill in a new PropPageInfo entry. */ @@ -2855,7 +2866,18 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) for (n = i = 0; i < lppsh->nPages; i++, n++) { if (!psInfo->usePropPage) - psInfo->proppage[n].hpage = psInfo->ppshheader.u3.phpage[i]; + { + if (psInfo->ppshheader.u3.phpage[i] && + psInfo->ppshheader.u3.phpage[i]->magic == HPROPSHEETPAGE_MAGIC) + { + psInfo->proppage[n].hpage = psInfo->ppshheader.u3.phpage[i]; + } + else + { + psInfo->proppage[n].hpage = CreatePropertySheetPageA( + (const PROPSHEETPAGEA *)psInfo->ppshheader.u3.phpage[i]); + } + } else { psInfo->proppage[n].hpage = CreatePropertySheetPageA((LPCPROPSHEETPAGEA)pByte); @@ -2895,7 +2917,18 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh) for (n = i = 0; i < lppsh->nPages; i++, n++) { if (!psInfo->usePropPage) - psInfo->proppage[n].hpage = psInfo->ppshheader.u3.phpage[i]; + { + if (psInfo->ppshheader.u3.phpage[i] && + psInfo->ppshheader.u3.phpage[i]->magic == HPROPSHEETPAGE_MAGIC) + { + psInfo->proppage[n].hpage = psInfo->ppshheader.u3.phpage[i]; + } + else + { + psInfo->proppage[n].hpage = CreatePropertySheetPageW( + (const PROPSHEETPAGEW *)psInfo->ppshheader.u3.phpage[i]); + } + } else { psInfo->proppage[n].hpage = CreatePropertySheetPageW((LPCPROPSHEETPAGEW)pByte); @@ -2974,6 +3007,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( return NULL; ret = Alloc(sizeof(*ret)); + ret->magic = HPROPSHEETPAGE_MAGIC; ppsp = &ret->psp; memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA))); /* original data is used for callback notifications */ @@ -3053,6 +3087,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage return NULL; ret = Alloc(sizeof(*ret)); + ret->magic = HPROPSHEETPAGE_MAGIC; ppsp = &ret->psp; memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); /* original data is used for callback notifications */ diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 7e0e7087f67..cf435703d1e 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1343,7 +1343,7 @@ static void test_invalid_hpropsheetpage(void) ret = SendMessageA(hdlg, PSM_INDEXTOPAGE, 0, 0); ok(ret, "page was not created\n"); - todo_wine ok((HPROPSHEETPAGE)ret != hpsp[0], "invalid HPROPSHEETPAGE was preserved\n"); + ok((HPROPSHEETPAGE)ret != hpsp[0], "invalid HPROPSHEETPAGE was preserved\n"); DestroyWindow(hdlg); memset(pspW, 0, sizeof(*pspW)); @@ -1383,7 +1383,7 @@ static void test_invalid_hpropsheetpage(void) ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); ret = SendMessageA(hdlg, PSM_INDEXTOPAGE, 0, 0); - todo_wine ok(ret, "page was not created\n"); + ok(ret, "page was not created\n"); ok((HPROPSHEETPAGE)ret != hpsp[0], "invalid HPROPSHEETPAGE was preserved\n"); DestroyWindow(hdlg); }

1 0

Piotr Caban : comctl32: Don't use PROPSHEETPAGE structure to store internal HPROPSHEETPAGE data.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: wine Branch: master Commit: eb5a4f216079a4ea056611c8e658478a74ef4fd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb5a4f216079a4ea056611c8e65847… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 13:11:56 2022 +0200 comctl32: Don't use PROPSHEETPAGE structure to store internal HPROPSHEETPAGE data. --- dlls/comctl32/propsheet.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 95b464934dc..3d9ed5b961a 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -97,7 +97,8 @@ typedef struct struct _PSP { - ULONG_PTR magic; + DWORD magic; + BOOL unicode; PROPSHEETPAGEW psp; PROPSHEETPAGEW callback_psp; }; @@ -149,8 +150,6 @@ typedef struct static const WCHAR PropSheetInfoStr[] = L"PropertySheetInfo"; -#define PSP_INTERNAL_UNICODE 0x80000000 - #define MAX_CAPTION_LENGTH 255 #define MAX_TABTEXT_LENGTH 255 #define MAX_BUTTONTEXT_LENGTH 64 @@ -361,7 +360,7 @@ static const DLGTEMPLATE* HPSP_load_template(HPROPSHEETPAGE hpsp, DWORD *size) return hpsp->psp.u.pResource; } - if (hpsp->psp.dwFlags & PSP_INTERNAL_UNICODE) + if (hpsp->unicode) { res = FindResourceW(hpsp->psp.hInstance, hpsp->psp.u.pszTemplate, (LPWSTR)RT_DIALOG); @@ -428,7 +427,7 @@ static HWND HPSP_create_page(HPROPSHEETPAGE hpsp, DLGTEMPLATE *template, HWND pa { HWND hwnd; - if(hpsp->psp.dwFlags & PSP_INTERNAL_UNICODE) + if (hpsp->unicode) { hwnd = CreateDialogIndirectParamW(hpsp->psp.hInstance, template, parent, hpsp->psp.pfnDlgProc, (LPARAM)&hpsp->psp); @@ -3017,8 +3016,6 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA))); } - ppsp->dwFlags &= ~PSP_INTERNAL_UNICODE; - if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) ) { if (!IS_INTRESOURCE( ppsp->u.pszTemplate )) @@ -3088,6 +3085,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage ret = Alloc(sizeof(*ret)); ret->magic = HPROPSHEETPAGE_MAGIC; + ret->unicode = TRUE; ppsp = &ret->psp; memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); /* original data is used for callback notifications */ @@ -3097,8 +3095,6 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); } - ppsp->dwFlags |= PSP_INTERNAL_UNICODE; - if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) ) { if (!IS_INTRESOURCE( ppsp->u.pszTemplate ))

1 0

Piotr Caban : comctl32: Fix PROPSHEETPAGE[AW] structure content in messages and callbacks.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: wine Branch: master Commit: cae20edb0ba0cfb65db10021277061405d8a58ee URL: https://gitlab.winehq.org/wine/wine/-/commit/cae20edb0ba0cfb65db10021277061… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 17:06:07 2022 +0200 comctl32: Fix PROPSHEETPAGE[AW] structure content in messages and callbacks. --- dlls/comctl32/propsheet.c | 370 +++++++++++++++++++++++----------------- dlls/comctl32/tests/propsheet.c | 4 +- 2 files changed, 220 insertions(+), 154 deletions(-)

1 0

Piotr Caban : comctl32: Add support for adding extra data in CreatePropertySheetPage.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: wine Branch: master Commit: ebe35f6f0a629b49524aa03eebbbdac7e948f387 URL: https://gitlab.winehq.org/wine/wine/-/commit/ebe35f6f0a629b49524aa03eebbbda… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 17:23:21 2022 +0200 comctl32: Add support for adding extra data in CreatePropertySheetPage. --- dlls/comctl32/propsheet.c | 9 +++++---- dlls/comctl32/tests/propsheet.c | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 10361d280e1..43192771300 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -103,6 +103,7 @@ struct _PSP { PROPSHEETPAGEA pspA; PROPSHEETPAGEW pspW; + BYTE data[1]; }; }; @@ -3076,10 +3077,10 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( if (lpPropSheetPage->dwSize < PROPSHEETPAGEA_V1_SIZE) return NULL; - ret = Alloc(sizeof(*ret)); + ret = Alloc(FIELD_OFFSET(struct _PSP, data[lpPropSheetPage->dwSize])); ret->magic = HPROPSHEETPAGE_MAGIC; ppsp = &ret->pspA; - memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEA))); + memcpy(ppsp, lpPropSheetPage, lpPropSheetPage->dwSize); if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) ) { @@ -3131,11 +3132,11 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage if (lpPropSheetPage->dwSize < PROPSHEETPAGEW_V1_SIZE) return NULL; - ret = Alloc(sizeof(*ret)); + ret = Alloc(FIELD_OFFSET(struct _PSP, data[lpPropSheetPage->dwSize])); ret->magic = HPROPSHEETPAGE_MAGIC; ret->unicode = TRUE; ppsp = &ret->pspW; - memcpy(ppsp, lpPropSheetPage, min(lpPropSheetPage->dwSize, sizeof(PROPSHEETPAGEW))); + memcpy(ppsp, lpPropSheetPage, lpPropSheetPage->dwSize); if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) ) { diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 70f46c83d85..7c0d5f81642 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1058,7 +1058,7 @@ static UINT CALLBACK proppage_callback_a(HWND hwnd, UINT msg, PROPSHEETPAGEA *ps if (psp->dwSize >= FIELD_OFFSET(struct custom_proppage, addref_called)) { struct custom_proppage *extra_data = (struct custom_proppage *)psp; - todo_wine ok(extra_data->extra_data == 0x1234, "Expected extra_data to be preserved, got %lx\n", + ok(extra_data->extra_data == 0x1234, "Expected extra_data to be preserved, got %lx\n", extra_data->extra_data); } @@ -1092,7 +1092,7 @@ static UINT CALLBACK proppage_callback_w(HWND hwnd, UINT msg, PROPSHEETPAGEW *ps if (psp->dwSize >= FIELD_OFFSET(struct custom_proppage, addref_called)) { struct custom_proppage *extra_data = (struct custom_proppage *)psp; - todo_wine ok(extra_data->extra_data == 0x4321, "Expected extra_data to be preserved, got %lx\n", + ok(extra_data->extra_data == 0x4321, "Expected extra_data to be preserved, got %lx\n", extra_data->extra_data); }

1 0

Jinoh Kang : kernel32/tests: Add test for pipe name with a trailing backslash.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: wine Branch: master Commit: ea9c9fe5bdbf4cacbda093759780ccac1ef386b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/ea9c9fe5bdbf4cacbda093759780cc… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Oct 15 20:02:57 2022 +0900 kernel32/tests: Add test for pipe name with a trailing backslash. --- dlls/kernel32/tests/pipe.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 9481835b49b..797e7e0031b 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -682,6 +682,17 @@ static void test_CreateNamedPipe(int pipemode) CloseHandle(hFile); CloseHandle(hnp); + hnp = CreateNamedPipeA("\\\\.\\pipe\\trailingslash\\", PIPE_ACCESS_DUPLEX, + PIPE_TYPE_BYTE, 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(hnp != INVALID_HANDLE_VALUE, "failed to create pipe, error %lu\n", GetLastError()); + hFile = CreateFileA("\\\\.\\pipe\\trailingslash", 0, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hFile == INVALID_HANDLE_VALUE, "expected opening pipe to fail\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %lu\n", GetLastError()); + hFile = CreateFileA("\\\\.\\pipe\\trailingslash\\", 0, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hFile != INVALID_HANDLE_VALUE, "failed to open pipe, error %lu\n", GetLastError()); + CloseHandle(hFile); + CloseHandle(hnp); + if (winetest_debug > 1) trace("test_CreateNamedPipe returning\n"); }

1 0