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

Hugh McMaster : reg: Fail if the source and destination keys are the same when copying.
by Alexandre Julliard May 31, 2021

May 31, 2021

1 0

Zebediah Figura : ws2_32/tests: Add more tests for SIO_GET_EXTENSION_FUNCTION_ADDRESS.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: de48f96d8cc3a77a8243e3dabc127ec25145526a URL: https://source.winehq.org/git/wine.git/?a=commit;h=de48f96d8cc3a77a8243e3da… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 31 10:42:51 2021 -0500 ws2_32/tests: Add more tests for SIO_GET_EXTENSION_FUNCTION_ADDRESS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index bb4f1b74044..f5f7e32649f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4187,6 +4187,98 @@ static void test_unsupported_ioctls(void) } } +static void test_get_extension_func(void) +{ + OVERLAPPED overlapped = {0}, *overlapped_ptr; + GUID acceptex_guid = WSAID_ACCEPTEX; + GUID bogus_guid = {0xdeadbeef}; + ULONG_PTR key; + HANDLE port; + DWORD size; + void *func; + SOCKET s; + int ret; + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + port = CreateIoCompletionPort((HANDLE)s, NULL, 123, 0); + + WSASetLastError(0xdeadbeef); + ret = WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptex_guid, sizeof(GUID), + &func, sizeof(func), NULL, &overlapped, NULL); + todo_wine ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptex_guid, sizeof(GUID), + &func, sizeof(func), &size, NULL, NULL); + ok(!ret, "expected success\n"); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(size == sizeof(func), "got size %u\n", size); + + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + overlapped.Internal = 0xdeadbeef; + overlapped.InternalHigh = 0xdeadbeef; + ret = WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptex_guid, sizeof(GUID), + &func, sizeof(func), &size, &overlapped, NULL); + ok(!ret, "expected success\n"); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(size == sizeof(func), "got size %u\n", size); + + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + ok(ret, "got error %u\n", GetLastError()); + todo_wine ok(!size, "got size %u\n", size); + ok(key == 123, "got key %Iu\n", key); + ok(overlapped_ptr == &overlapped, "got overlapped %p\n", overlapped_ptr); + ok(!overlapped.Internal, "got status %#x\n", (NTSTATUS)overlapped.Internal); + todo_wine ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh); + + size = 0xdeadbeef; + overlapped.Internal = 0xdeadbeef; + overlapped.InternalHigh = 0xdeadbeef; + ret = WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &bogus_guid, sizeof(GUID), + &func, sizeof(func), &size, &overlapped, NULL); + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(size == 0xdeadbeef, "got size %u\n", size); + todo_wine ok(overlapped.Internal == 0xdeadbeef, "got status %#x\n", (NTSTATUS)overlapped.Internal); + todo_wine ok(overlapped.InternalHigh == 0xdeadbeef, "got size %Iu\n", overlapped.InternalHigh); + + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == WAIT_TIMEOUT, "got error %u\n", WSAGetLastError()); + + CloseHandle(port); + closesocket(s); + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + ret = WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptex_guid, sizeof(GUID), + &func, sizeof(func), NULL, &overlapped, socket_apc); + todo_wine ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + apc_count = 0; + size = 0xdeadbeef; + ret = WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptex_guid, sizeof(GUID), + &func, sizeof(func), &size, &overlapped, socket_apc); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(size == sizeof(func), "got size %u\n", size); + + ret = SleepEx(0, TRUE); + todo_wine ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret); + if (ret == WAIT_IO_COMPLETION) + { + ok(apc_count == 1, "APC was called %u times\n", apc_count); + ok(!apc_error, "got APC error %u\n", apc_error); + ok(!apc_size, "got APC size %u\n", apc_size); + ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped); + } + + closesocket(s); +} + static BOOL drain_pause = FALSE; static DWORD WINAPI drain_socket_thread(LPVOID arg) { @@ -10406,6 +10498,7 @@ START_TEST( sock ) test_address_list_query(); test_fionbio(); test_fionread_siocatmark(); + test_get_extension_func(); test_keepalive_vals(); test_sioRoutingInterfaceQuery(); test_sioAddressListChange();

1 0

Zebediah Figura : ws2_32/tests: Add some tests for unsupported socket ioctls.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: e969cf095ebc75886ee89b9a18638d7f1660ba3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e969cf095ebc75886ee89b9a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 31 10:42:50 2021 -0500 ws2_32/tests: Add some tests for unsupported socket ioctls. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 33ab1e1b576..bb4f1b74044 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4092,6 +4092,101 @@ static void test_keepalive_vals(void) closesocket(sock); } +static void test_unsupported_ioctls(void) +{ + OVERLAPPED overlapped = {0}, *overlapped_ptr; + unsigned int i; + ULONG_PTR key; + HANDLE port; + DWORD size; + SOCKET s; + int ret; + + static const DWORD codes[] = {0xdeadbeef, FIOASYNC, 0x667e, SIO_FLUSH}; + + for (i = 0; i < ARRAY_SIZE(codes); ++i) + { + winetest_push_context("ioctl %#x", codes[i]); + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + port = CreateIoCompletionPort((HANDLE)s, NULL, 123, 0); + + WSASetLastError(0xdeadbeef); + ret = WSAIoctl(s, codes[i], NULL, 0, NULL, 0, NULL, &overlapped, NULL); + todo_wine_if (codes[i] == SIO_FLUSH) + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = WSAIoctl(s, codes[i], NULL, 0, NULL, 0, &size, NULL, NULL); + todo_wine_if (codes[i] == SIO_FLUSH) + ok(ret == -1, "expected failure\n"); + todo_wine_if (codes[i] == FIOASYNC || codes[i] == SIO_FLUSH) + ok(WSAGetLastError() == WSAEOPNOTSUPP, "got error %u\n", WSAGetLastError()); + todo_wine_if (codes[i] != SIO_FLUSH) + ok(!size, "got size %u\n", size); + + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + overlapped.Internal = 0xdeadbeef; + overlapped.InternalHigh = 0xdeadbeef; + ret = WSAIoctl(s, codes[i], NULL, 0, NULL, 0, &size, &overlapped, NULL); + todo_wine_if (codes[i] == SIO_FLUSH) + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + todo_wine_if (codes[i] == SIO_FLUSH) + ok(size == 0xdeadbeef, "got size %u\n", size); + + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + todo_wine_if (codes[i] == SIO_FLUSH) + ok(!ret, "expected failure\n"); + todo_wine_if (codes[i] != 0xdeadbeef) + ok(GetLastError() == ERROR_NOT_SUPPORTED, "got error %u\n", GetLastError()); + todo_wine_if (codes[i] == FIOASYNC || codes[i] == 0x667e) + ok(!size, "got size %u\n", size); + ok(key == 123, "got key %Iu\n", key); + todo_wine_if (codes[i] == FIOASYNC || codes[i] == 0x667e) + ok(overlapped_ptr == &overlapped, "got overlapped %p\n", overlapped_ptr); + todo_wine_if (codes[i] != 0xdeadbeef) + ok((NTSTATUS)overlapped.Internal == STATUS_NOT_SUPPORTED, + "got status %#x\n", (NTSTATUS)overlapped.Internal); + todo_wine_if (codes[i] == FIOASYNC || codes[i] == 0x667e) + ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh); + + CloseHandle(port); + closesocket(s); + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + ret = WSAIoctl(s, codes[i], NULL, 0, NULL, 0, NULL, &overlapped, socket_apc); + todo_wine_if (codes[i] == SIO_FLUSH) + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + apc_count = 0; + size = 0xdeadbeef; + ret = WSAIoctl(s, codes[i], NULL, 0, NULL, 0, &size, &overlapped, socket_apc); + todo_wine_if (codes[i] == SIO_FLUSH) + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + todo_wine_if (codes[i] == SIO_FLUSH) + ok(size == 0xdeadbeef, "got size %u\n", size); + + ret = SleepEx(0, TRUE); + todo_wine ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret); + if (ret == WAIT_IO_COMPLETION) + { + ok(apc_count == 1, "APC was called %u times\n", apc_count); + ok(apc_error == WSAEOPNOTSUPP, "got APC error %u\n", apc_error); + ok(!apc_size, "got APC size %u\n", apc_size); + ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped); + } + + closesocket(s); + winetest_pop_context(); + } +} + static BOOL drain_pause = FALSE; static DWORD WINAPI drain_socket_thread(LPVOID arg) { @@ -10314,6 +10409,7 @@ START_TEST( sock ) test_keepalive_vals(); test_sioRoutingInterfaceQuery(); test_sioAddressListChange(); + test_unsupported_ioctls(); test_WSASendMsg(); test_WSASendTo();

1 0

Zebediah Figura : ws2_32/tests: Fix some more test failures on Vista and older.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: 92989dbb1fe7eb0072d19ce1d91a40d907a5a2c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92989dbb1fe7eb0072d19ce1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 31 10:42:49 2021 -0500 ws2_32/tests: Fix some more test failures on Vista and older. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 3f03c14a94f..87e4779b980 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -111,9 +111,10 @@ static void test_open_device(void) closesocket(s); } -#define check_poll(a, b, c) check_poll_(__LINE__, a, b, c, FALSE) -#define check_poll_todo(a, b, c) check_poll_(__LINE__, a, b, c, TRUE) -static void check_poll_(int line, SOCKET s, HANDLE event, int expect, BOOL todo) +#define check_poll(a, b, c) check_poll_(__LINE__, a, b, ~0, c, FALSE) +#define check_poll_mask(a, b, c, d) check_poll_(__LINE__, a, b, c, d, FALSE) +#define check_poll_todo(a, b, c) check_poll_(__LINE__, a, b, ~0, c, TRUE) +static void check_poll_(int line, SOCKET s, HANDLE event, int mask, int expect, BOOL todo) { struct afd_poll_params in_params = {0}, out_params = {0}; IO_STATUS_BLOCK io; @@ -122,12 +123,17 @@ static void check_poll_(int line, SOCKET s, HANDLE event, int expect, BOOL todo) in_params.timeout = -1000 * 10000; in_params.count = 1; in_params.sockets[0].socket = s; - in_params.sockets[0].flags = ~0; + in_params.sockets[0].flags = mask; in_params.sockets[0].status = 0xdeadbeef; ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_POLL, &in_params, sizeof(in_params), &out_params, sizeof(out_params)); - ok_(__FILE__, line)(!ret, "got %#x\n", ret); + ok_(__FILE__, line)(!ret || ret == STATUS_PENDING, "got %#x\n", ret); + if (ret == STATUS_PENDING) + { + ret = WaitForSingleObject(event, 1000); + ok_(__FILE__, line)(!ret, "wait timed out\n"); + } ok_(__FILE__, line)(!io.Status, "got %#x\n", io.Status); ok_(__FILE__, line)(io.Information == sizeof(out_params), "got %#Ix\n", io.Information); ok_(__FILE__, line)(out_params.timeout == in_params.timeout, "got timeout %I64d\n", out_params.timeout); @@ -311,6 +317,7 @@ static void test_poll(void) ret = send(server, "data", 5, 0); ok(ret == 5, "got %d\n", ret); + check_poll_mask(client, event, AFD_POLL_READ, AFD_POLL_READ); check_poll(client, event, AFD_POLL_WRITE | AFD_POLL_CONNECT | AFD_POLL_READ); check_poll(server, event, AFD_POLL_WRITE | AFD_POLL_CONNECT); @@ -325,6 +332,7 @@ static void test_poll(void) ok(ret == 1, "got %d\n", ret); check_poll(client, event, AFD_POLL_WRITE | AFD_POLL_CONNECT | AFD_POLL_READ); + check_poll_mask(server, event, AFD_POLL_OOB, AFD_POLL_OOB); check_poll(server, event, AFD_POLL_CONNECT | AFD_POLL_OOB); ret = recv(server, large_buffer, 1, MSG_OOB); @@ -341,6 +349,7 @@ static void test_poll(void) ok(ret == 1, "got %d\n", ret); check_poll(client, event, AFD_POLL_WRITE | AFD_POLL_CONNECT | AFD_POLL_READ); + check_poll_mask(server, event, AFD_POLL_READ, AFD_POLL_READ); check_poll(server, event, AFD_POLL_CONNECT | AFD_POLL_READ); closesocket(client); @@ -364,6 +373,7 @@ static void test_poll(void) ok(!ret, "got error %u\n", WSAGetLastError()); check_poll(client, event, AFD_POLL_WRITE | AFD_POLL_CONNECT); + check_poll_mask(server, event, AFD_POLL_HUP, AFD_POLL_HUP); check_poll(server, event, AFD_POLL_WRITE | AFD_POLL_CONNECT | AFD_POLL_HUP); closesocket(client); @@ -381,12 +391,14 @@ static void test_poll(void) ok(ret == 5, "got %d\n", ret); check_poll(client, event, AFD_POLL_WRITE | AFD_POLL_CONNECT); + check_poll_mask(server, event, AFD_POLL_READ, AFD_POLL_READ); check_poll(server, event, AFD_POLL_WRITE | AFD_POLL_CONNECT | AFD_POLL_READ); ret = shutdown(client, SD_SEND); ok(!ret, "got error %u\n", WSAGetLastError()); check_poll(client, event, AFD_POLL_WRITE | AFD_POLL_CONNECT); + check_poll_mask(server, event, AFD_POLL_READ, AFD_POLL_READ); check_poll_todo(server, event, AFD_POLL_WRITE | AFD_POLL_CONNECT | AFD_POLL_READ | AFD_POLL_HUP); /* Test closing a socket while polling on it. Note that AFD_POLL_CLOSE @@ -862,6 +874,9 @@ static void test_recv(void) ret = send(server, "data", 5, 0); ok(ret == 5, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, event, AFD_POLL_READ, AFD_POLL_READ); + memset(&io, 0xcc, sizeof(io)); memset(buffer, 0xcc, sizeof(buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, @@ -886,6 +901,9 @@ static void test_recv(void) ret = send(server, "data", 5, 0); ok(ret == 5, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, event, AFD_POLL_READ, AFD_POLL_READ); + memset(&io, 0xcc, sizeof(io)); memset(buffer, 0xcc, sizeof(buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, @@ -926,6 +944,9 @@ static void test_recv(void) ret = send(server, "data", 5, 0); ok(ret == 5, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, event, AFD_POLL_READ, AFD_POLL_READ); + memset(&io, 0xcc, sizeof(io)); memset(buffer, 0xcc, sizeof(buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, @@ -966,6 +987,9 @@ static void test_recv(void) ret = send(server, "data", 4, 0); ok(ret == 4, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, event, AFD_POLL_READ, AFD_POLL_READ); + memset(buffer, 0xcc, sizeof(buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); @@ -1082,6 +1106,9 @@ static void test_recv(void) ret = sendto(server, "moredata", 9, 0, (struct sockaddr *)&addr, sizeof(addr)); ok(ret == 9, "got %d\n", ret); + /* wait for the data to be available */ + check_poll_mask(client, event, AFD_POLL_READ, AFD_POLL_READ); + memset(&io, 0, sizeof(io)); memset(buffer, 0xcc, sizeof(buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io,

1 0

Nikolay Sivov : propsys: Add support for VT_VECTOR|VT_UI1 type in PropVariantCompareEx().
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: e91b05bb5be6fd70a767bea9991e818a49cc5547 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e91b05bb5be6fd70a767bea9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:31:11 2021 +0300 propsys: Add support for VT_VECTOR|VT_UI1 type in PropVariantCompareEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 13 +++++++- dlls/propsys/tests/propsys.c | 75 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index a18d83eabab..977fbebb918 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -798,7 +798,10 @@ static BOOL isemptyornull(const PROPVARIANT *propvar) if (propvar->vt == VT_CLSID) return !propvar->puuid; - /* FIXME: vectors, byrefs, errors? */ + if (propvar->vt & VT_VECTOR) + return !propvar->caub.cElems; + + /* FIXME: byrefs, errors? */ return FALSE; } @@ -807,6 +810,7 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 { const PROPVARIANT *propvar2_converted; PROPVARIANT propvar2_static; + unsigned int count; HRESULT hr; INT res=-1; @@ -894,6 +898,13 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 res = memcmp(propvar1->puuid, propvar2->puuid, sizeof(*propvar1->puuid)); if (res) res = res > 0 ? 1 : -1; break; + case VT_VECTOR | VT_UI1: + count = min(propvar1->caub.cElems, propvar2->caub.cElems); + res = count ? memcmp(propvar1->caub.pElems, propvar2->caub.pElems, sizeof(*propvar1->caub.pElems) * count) : 0; + if (res) res = res > 0 ? 1 : -1; + if (!res && propvar1->caub.cElems != propvar2->caub.cElems) + res = propvar1->caub.cElems > propvar2->caub.cElems ? 1 : -1; + break; default: FIXME("vartype %#x not handled\n", propvar1->vt); res = -1; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 07d035376d9..9ffa048a8b7 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -666,15 +666,18 @@ static void test_PropVariantToStringAlloc(void) CoTaskMemFree(str); } -static void test_PropVariantCompare(void) +static void test_PropVariantCompareEx(void) { PROPVARIANT empty, null, emptyarray, i2_0, i2_2, i4_large, i4_largeneg, i4_2, str_2, str_02, str_b; PROPVARIANT clsid_null, clsid, clsid2, r4_0, r4_2, r8_0, r8_2; + PROPVARIANT var1, var2; INT res; static const WCHAR str_2W[] = {'2', 0}; static const WCHAR str_02W[] = {'0', '2', 0}; static const WCHAR str_bW[] = {'b', 0}; SAFEARRAY emptysafearray; + unsigned char bytevector1[] = {1,2,3}; + unsigned char bytevector2[] = {4,5,6}; PropVariantInit(&empty); PropVariantInit(&null); @@ -847,6 +850,74 @@ todo_wine res = PropVariantCompareEx(&r8_2, &r8_0, 0, 0); ok(res == 1, "res=%i\n", res); + /* VT_VECTOR | VT_UI1 */ + var1.vt = VT_VECTOR | VT_UI1; + var1.caub.cElems = 1; + var1.caub.pElems = bytevector1; + var2.vt = VT_VECTOR | VT_UI1; + var2.caub.cElems = 1; + var2.caub.pElems = bytevector2; + + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + /* Vector length mismatch */ + var1.caub.cElems = 2; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + var1.caub.pElems = bytevector2; + var2.caub.pElems = bytevector1; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == 1, "res=%i\n", res); + + var1.caub.pElems = bytevector1; + var2.caub.pElems = bytevector2; + + var1.caub.cElems = 1; + var2.caub.cElems = 2; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + /* Length mismatch over same data */ + var1.caub.pElems = bytevector1; + var2.caub.pElems = bytevector1; + + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + var1.caub.cElems = 1; + var2.caub.cElems = 1; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == 0, "res=%i\n", res); + + var1.caub.cElems = 0; + res = PropVariantCompareEx(&var1, &var2, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == 1, "res=%i\n", res); + res = PropVariantCompareEx(&var2, &var1, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == -1, "res=%i\n", res); + res = PropVariantCompareEx(&var2, &var1, 0, 0); + ok(res == 1, "res=%i\n", res); + + var2.caub.cElems = 0; + res = PropVariantCompareEx(&var1, &var2, 0, 0); + ok(res == 0, "res=%i\n", res); + SysFreeString(str_2.bstrVal); SysFreeString(str_02.bstrVal); SysFreeString(str_b.bstrVal); @@ -1957,7 +2028,7 @@ START_TEST(propsys) test_InitPropVariantFromBuffer(); test_PropVariantToGUID(); test_PropVariantToStringAlloc(); - test_PropVariantCompare(); + test_PropVariantCompareEx(); test_intconversions(); test_PropVariantChangeType_LPWSTR(); test_PropVariantToBoolean();

1 0

Nikolay Sivov : mf/topology: Implement MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES connection method.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: 33ea3fc8060b55b074a6234c3cb681685a023580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33ea3fc8060b55b074a6234c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 31 13:28:45 2021 +0300 mf/topology: Implement MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES connection method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 99 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 81 insertions(+), 18 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index bbed2cba893..a054eca27e1 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2010,7 +2010,10 @@ struct connect_context IMFTopologyNode *upstream_node; IMFTopologyNode *sink; IMFMediaTypeHandler *sink_handler; - const GUID *converter_category; + unsigned int output_index; + unsigned int input_index; + GUID converter_category; + GUID decoder_category; }; typedef HRESULT (*p_connect_func)(struct transform_output_type *output_type, struct connect_context *context); @@ -2142,7 +2145,7 @@ static HRESULT connect_to_converter(struct transform_output_type *output_type, s sink_ctx = *context; sink_ctx.upstream_node = node; - if (SUCCEEDED(hr = topology_loader_enumerate_output_types(context->converter_category, output_type->type, + if (SUCCEEDED(hr = topology_loader_enumerate_output_types(&context->converter_category, output_type->type, connect_to_sink, &sink_ctx))) { hr = IMFTopology_AddNode(context->context->output_topology, node); @@ -2225,13 +2228,62 @@ static HRESULT topology_loader_get_mft_categories(IMFMediaTypeHandler *handler, return S_OK; } +static HRESULT topology_loader_connect(IMFMediaTypeHandler *sink_handler, unsigned int sink_method, + struct connect_context *sink_ctx, struct connect_context *convert_ctx, IMFMediaType *media_type) +{ + HRESULT hr; + + if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(sink_handler, media_type, NULL)) + && SUCCEEDED(hr = IMFMediaTypeHandler_SetCurrentMediaType(sink_handler, media_type))) + { + hr = IMFTopologyNode_ConnectOutput(sink_ctx->upstream_node, sink_ctx->output_index, sink_ctx->sink, sink_ctx->input_index); + } + + if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_CONVERTER) + { + hr = topology_loader_enumerate_output_types(&convert_ctx->converter_category, media_type, connect_to_sink, sink_ctx); + } + + if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_DECODER) + { + hr = topology_loader_enumerate_output_types(&convert_ctx->decoder_category, media_type, + connect_to_converter, convert_ctx); + } + + return hr; +} + +static HRESULT topology_loader_foreach_source_type(IMFMediaTypeHandler *sink_handler, IMFMediaTypeHandler *source_handler, + unsigned int sink_method, struct connect_context *sink_ctx, struct connect_context *convert_ctx) +{ + unsigned int index = 0; + IMFMediaType *media_type; + HRESULT hr; + + while (SUCCEEDED(hr = IMFMediaTypeHandler_GetMediaTypeByIndex(source_handler, index++, &media_type))) + { + hr = topology_loader_connect(sink_handler, sink_method, sink_ctx, convert_ctx, media_type); + if (SUCCEEDED(hr)) break; + IMFMediaType_Release(media_type); + media_type = NULL; + } + + if (media_type) + { + hr = IMFMediaTypeHandler_SetCurrentMediaType(source_handler, media_type); + IMFMediaType_Release(media_type); + } + + return hr; +} + static HRESULT topology_loader_connect_source_to_sink(struct topoloader_context *context, IMFTopologyNode *source, unsigned int output_index, IMFTopologyNode *sink, unsigned int input_index) { IMFMediaTypeHandler *source_handler = NULL, *sink_handler = NULL; struct connect_context convert_ctx, sink_ctx; MF_CONNECT_METHOD source_method, sink_method; - GUID decode_cat, convert_cat; + unsigned int enumerate_source_types = 0; IMFMediaType *media_type; HRESULT hr; @@ -2248,35 +2300,46 @@ static HRESULT topology_loader_connect_source_to_sink(struct topoloader_context if (FAILED(IMFTopologyNode_GetUINT32(sink, &MF_TOPONODE_CONNECT_METHOD, &sink_method))) sink_method = MF_CONNECT_ALLOW_DECODER; - if (FAILED(hr = topology_loader_get_mft_categories(source_handler, &decode_cat, &convert_cat))) - goto done; - sink_ctx.context = context; sink_ctx.upstream_node = source; sink_ctx.sink = sink; sink_ctx.sink_handler = sink_handler; + sink_ctx.output_index = output_index; + sink_ctx.input_index = input_index; convert_ctx = sink_ctx; - convert_ctx.converter_category = &convert_cat; + if (FAILED(hr = topology_loader_get_mft_categories(source_handler, &convert_ctx.decoder_category, + &convert_ctx.converter_category))) + goto done; - if (SUCCEEDED(hr = IMFMediaTypeHandler_GetCurrentMediaType(source_handler, &media_type))) + IMFTopology_GetUINT32(context->output_topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, &enumerate_source_types); + + if (enumerate_source_types) { - /* Direct connection. */ - if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(sink_handler, media_type, NULL)) - && SUCCEEDED(hr = IMFMediaTypeHandler_SetCurrentMediaType(sink_handler, media_type))) + if (source_method & MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES) { - hr = IMFTopologyNode_ConnectOutput(source, output_index, sink, input_index); + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_ALLOW_DECODER, + &sink_ctx, &convert_ctx); } - if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_CONVERTER) + else { - hr = topology_loader_enumerate_output_types(&convert_cat, media_type, connect_to_sink, &sink_ctx); + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_DIRECT, + &sink_ctx, &convert_ctx); + if (FAILED(hr)) + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_ALLOW_CONVERTER, + &sink_ctx, &convert_ctx); + if (FAILED(hr)) + hr = topology_loader_foreach_source_type(sink_handler, source_handler, MF_CONNECT_ALLOW_DECODER, + &sink_ctx, &convert_ctx); } - if (FAILED(hr) && sink_method & MF_CONNECT_ALLOW_DECODER) + } + else + { + if (SUCCEEDED(hr = IMFMediaTypeHandler_GetCurrentMediaType(source_handler, &media_type))) { - hr = topology_loader_enumerate_output_types(&decode_cat, media_type, connect_to_converter, &convert_ctx); + hr = topology_loader_connect(sink_handler, sink_method, &sink_ctx, &convert_ctx, media_type); + IMFMediaType_Release(media_type); } - - IMFMediaType_Release(media_type); } done:

1 0

Hugh McMaster : reg: Partially implement the 'copy' command.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: b1ccb87d9debb1a07e35263a76b6e34a7dd6ee49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1ccb87d9debb1a07e35263a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 31 19:45:22 2021 +1000 reg: Partially implement the 'copy' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/copy.c | 129 +++++++++++++++++++++++++++++++++ programs/reg/tests/copy.c | 178 +++++++++++++++++++++++----------------------- 2 files changed, 218 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1ccb87d9debb1a07e35…

1 0

Hugh McMaster : reg: Group resource IDs by source location.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: 8f997a8b9b75320449711d3b05241b5f1f580ac3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f997a8b9b75320449711d3b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 31 19:45:21 2021 +1000 reg: Group resource IDs by source location. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 344 ++++++++++++++++----------------- po/ast.po | 314 +++++++++++++++--------------- po/bg.po | 318 +++++++++++++++--------------- po/ca.po | 342 ++++++++++++++++---------------- po/cs.po | 338 ++++++++++++++++---------------- po/da.po | 354 +++++++++++++++++----------------- po/de.po | 504 ++++++++++++++++++++++++------------------------ po/el.po | 310 ++++++++++++++--------------- po/en.po | 444 +++++++++++++++++++++--------------------- po/en_US.po | 444 +++++++++++++++++++++--------------------- po/eo.po | 330 +++++++++++++++---------------- po/es.po | 338 ++++++++++++++++---------------- po/fa.po | 298 ++++++++++++++-------------- po/fi.po | 490 +++++++++++++++++++++++----------------------- po/fr.po | 344 ++++++++++++++++----------------- po/he.po | 346 ++++++++++++++++----------------- po/hi.po | 286 +++++++++++++-------------- po/hr.po | 350 ++++++++++++++++----------------- po/hu.po | 348 ++++++++++++++++----------------- po/it.po | 354 +++++++++++++++++----------------- po/ja.po | 478 ++++++++++++++++++++++----------------------- po/ko.po | 330 +++++++++++++++---------------- po/lt.po | 446 +++++++++++++++++++++--------------------- po/ml.po | 286 +++++++++++++-------------- po/nb_NO.po | 336 ++++++++++++++++---------------- po/nl.po | 456 +++++++++++++++++++++---------------------- po/or.po | 286 +++++++++++++-------------- po/pa.po | 286 +++++++++++++-------------- po/pl.po | 502 +++++++++++++++++++++++------------------------ po/pt_BR.po | 452 +++++++++++++++++++++---------------------- po/pt_PT.po | 344 ++++++++++++++++----------------- po/rm.po | 296 ++++++++++++++-------------- po/ro.po | 340 ++++++++++++++++---------------- po/ru.po | 330 +++++++++++++++---------------- po/si.po | 322 +++++++++++++++---------------- po/sk.po | 330 +++++++++++++++---------------- po/sl.po | 344 ++++++++++++++++----------------- po/sr_RS(a)cyrillic.po | 328 +++++++++++++++---------------- po/sr_RS(a)latin.po | 334 ++++++++++++++++---------------- po/sv.po | 336 ++++++++++++++++---------------- po/ta.po | 286 +++++++++++++-------------- po/te.po | 286 +++++++++++++-------------- po/th.po | 302 ++++++++++++++--------------- po/tr.po | 336 ++++++++++++++++---------------- po/uk.po | 330 +++++++++++++++---------------- po/wa.po | 296 ++++++++++++++-------------- po/wine.pot | 286 +++++++++++++-------------- po/zh_CN.po | 330 +++++++++++++++---------------- po/zh_TW.po | 344 ++++++++++++++++----------------- programs/reg/resource.h | 98 ++++++---- 50 files changed, 8633 insertions(+), 8619 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f997a8b9b7532044971…

1 0

Hugh McMaster : reg: Support recursion in the 'copy' command.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: 8d9a228e99e1252a0d82c88e6a64635548c478a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d9a228e99e1252a0d82c88e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 31 19:45:23 2021 +1000 reg: Support recursion in the 'copy' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/copy.c | 19 +++++++++++++++++++ programs/reg/tests/copy.c | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/programs/reg/copy.c b/programs/reg/copy.c index 29ada63da56..34abf8ade18 100644 --- a/programs/reg/copy.c +++ b/programs/reg/copy.c @@ -90,6 +90,25 @@ static int run_copy(struct key *src, struct key *dest, BOOL recurse, BOOL force) } } + for (i = 0; recurse; i++) + { + struct key subkey_src, subkey_dest; + + name_len = max_name_len; + + rc = RegEnumKeyExW(src->hkey, i, name, &name_len, NULL, NULL, NULL, NULL); + if (rc) break; + + subkey_src.root = src->hkey; + subkey_src.subkey = name; + + subkey_dest.root = dest->hkey; + subkey_dest.subkey = name; + + rc = run_copy(&subkey_src, &subkey_dest, TRUE, force); + if (rc) goto cleanup; + } + cleanup: free(name); free(data); diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index ef4a5f6acb8..70f9496b149 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -322,7 +322,7 @@ static void test_copy_complex_data(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", complex_data_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", complex_data_test, 0), "compare_export() failed\n"); } static void test_copy_key_order(void) @@ -347,7 +347,7 @@ static void test_copy_key_order(void) run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", key_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); } static void test_copy_value_order(void)

1 0

Dmitry Timoshkov : msxml3: When saving XML use encoding specified in the processing instruction.
by Alexandre Julliard May 31, 2021

May 31, 2021

Module: wine Branch: master Commit: 2ea0d5470eec92cf34d90f6d3b1addabcc04ce25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ea0d5470eec92cf34d90f6d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 28 13:38:42 2021 +0300 msxml3: When saving XML use encoding specified in the processing instruction. Otherwise when a PI node with not default encoding is assigned to a document then saving an XML leads to document being encoded as UTF-8 while XML declaration has what PI specifies. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c67e570a8ea..45fbd6f43aa 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2563,6 +2563,63 @@ static int XMLCALL domdoc_stream_save_closecallback(void *ctx) return 0; } +static char *xmldoc_encoding(IXMLDOMDocument3 *doc) +{ + HRESULT hr; + IXMLDOMNode *node; + char *encoding = NULL; + + hr = IXMLDOMDocument3_get_firstChild(doc, &node); + if (hr == S_OK) + { + DOMNodeType type; + + hr = IXMLDOMNode_get_nodeType(node, &type); + if (hr == S_OK && type == NODE_PROCESSING_INSTRUCTION) + { + IXMLDOMProcessingInstruction *pi; + IXMLDOMNode *item; + IXMLDOMNamedNodeMap *node_map; + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMProcessingInstruction, (void **)&pi); + if (hr == S_OK) + { + hr = IXMLDOMNode_get_attributes(node, &node_map); + if (hr == S_OK) + { + static const WCHAR encodingW[] = {'e','n','c','o','d','i','n','g',0}; + BSTR bstr; + + bstr = SysAllocString(encodingW); + hr = IXMLDOMNamedNodeMap_getNamedItem(node_map, bstr, &item); + SysFreeString(bstr); + if (hr == S_OK) + { + VARIANT var; + + hr = IXMLDOMNode_get_nodeValue(item, &var); + if (hr == S_OK) + { + if (V_VT(&var) == VT_BSTR) + encoding = (char *)xmlchar_from_wchar(V_BSTR(&var)); + + VariantClear(&var); + } + } + + IXMLDOMNamedNodeMap_Release(node_map); + } + + IXMLDOMProcessingInstruction_Release(pi); + } + } + + IXMLDOMNode_Release(node); + } + + return encoding; +} + static HRESULT WINAPI domdoc_save( IXMLDOMDocument3 *iface, VARIANT destination ) @@ -2601,8 +2658,12 @@ static HRESULT WINAPI domdoc_save( ret = IUnknown_QueryInterface(pUnk, &IID_IStream, (void**)&stream); if(ret == S_OK) { + char *encoding = xmldoc_encoding(iface); + + TRACE("using encoding %s\n", encoding ? debugstr_a(encoding) : "default"); ctx = xmlSaveToIO(domdoc_stream_save_writecallback, - domdoc_stream_save_closecallback, stream, NULL, XML_SAVE_NO_DECL); + domdoc_stream_save_closecallback, stream, encoding, XML_SAVE_NO_DECL); + heap_free(encoding); if(!ctx) { @@ -2616,6 +2677,7 @@ static HRESULT WINAPI domdoc_save( case VT_BSTR: case VT_BSTR | VT_BYREF: { + char *encoding; /* save with file path */ HANDLE handle = CreateFileW( (V_VT(&destination) & VT_BYREF)? *V_BSTRREF(&destination) : V_BSTR(&destination), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); @@ -2625,8 +2687,12 @@ static HRESULT WINAPI domdoc_save( return E_FAIL; } + encoding = xmldoc_encoding(iface); + TRACE("using encoding %s\n", encoding ? debugstr_a(encoding) : "default"); ctx = xmlSaveToIO(domdoc_save_writecallback, domdoc_save_closecallback, - handle, NULL, XML_SAVE_NO_DECL); + handle, encoding, XML_SAVE_NO_DECL); + heap_free(encoding); + if (!ctx) { CloseHandle(handle);

1 0