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

Zebediah Figura : ws2_32/tests: Call getsockname() on the right socket.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: 2543d4b0af38677200f8524a403f9fcde71b7ff5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2543d4b0af38677200f8524a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 31 10:42:48 2021 -0500 ws2_32/tests: Call getsockname() on the right socket. Also fixes spurious test failures wherein the broken call would return ENOTSOCK. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 97b35e1f3ea..3f03c14a94f 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -565,7 +565,7 @@ static void test_poll(void) ret = bind(client, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); ok(!ret, "got error %u\n", WSAGetLastError()); len = sizeof(addr); - ret = getsockname(listener, (struct sockaddr *)&addr, &len); + ret = getsockname(client, (struct sockaddr *)&addr, &len); ok(!ret, "got error %u\n", WSAGetLastError()); check_poll(client, event, AFD_POLL_WRITE); @@ -1046,7 +1046,7 @@ static void test_recv(void) ret = bind(client, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); ok(!ret, "got error %u\n", WSAGetLastError()); len = sizeof(addr); - ret = getsockname(listener, (struct sockaddr *)&addr, &len); + ret = getsockname(client, (struct sockaddr *)&addr, &len); ok(!ret, "got error %u\n", WSAGetLastError()); memset(buffer, 0xcc, sizeof(buffer));

1 0

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

31 May '21

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

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

31 May '21

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: Add more tests for SIO_GET_EXTENSION_FUNCTION_ADDRESS.
by Alexandre Julliard 31 May '21

31 May '21

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: Expand tests for SIO_ROUTING_INTERFACE_QUERY.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: e8ccb28c38bf9273c02861bccf159cf60f71ee39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8ccb28c38bf9273c02861bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 31 10:42:52 2021 -0500 ws2_32/tests: Expand tests for SIO_ROUTING_INTERFACE_QUERY. 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 | 137 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 107 insertions(+), 30 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f5f7e32649f..cf3878eba40 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7672,44 +7672,121 @@ static void test_getpeername(void) static void test_sioRoutingInterfaceQuery(void) { - int ret; + OVERLAPPED overlapped = {0}, *overlapped_ptr; + struct sockaddr_in in = {0}, out = {0}; + ULONG_PTR key; + HANDLE port; SOCKET sock; - SOCKADDR_IN sin = { 0 }, sout = { 0 }; - DWORD bytesReturned; + DWORD size; + int ret; - sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); + sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); ok(sock != INVALID_SOCKET, "Expected socket to return a valid socket\n"); - ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, NULL, 0, NULL, 0, NULL, - NULL, NULL); - ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, - "expected WSAEFAULT, got %d\n", WSAGetLastError()); - ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), - NULL, 0, NULL, NULL, NULL); - ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, - "expected WSAEFAULT, got %d\n", WSAGetLastError()); - ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), - NULL, 0, &bytesReturned, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEAFNOSUPPORT, - "expected WSAEAFNOSUPPORT, got %d\n", WSAGetLastError()); - sin.sin_family = AF_INET; - ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), - NULL, 0, &bytesReturned, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, - "expected WSAEINVAL, got %d\n", WSAGetLastError()); - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), - NULL, 0, &bytesReturned, NULL, NULL); - ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, - "expected WSAEFAULT, got %d\n", WSAGetLastError()); - ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), - &sout, sizeof(sout), &bytesReturned, NULL, NULL); - ok(!ret, "WSAIoctl failed: %d\n", WSAGetLastError()); - ok(sout.sin_family == AF_INET, "expected AF_INET, got %d\n", sout.sin_family); + port = CreateIoCompletionPort((HANDLE)sock, NULL, 123, 0); + + WSASetLastError(0xdeadbeef); + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &in, sizeof(in), &out, sizeof(out), NULL, NULL, NULL); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + size = 0xdeadbeef; + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &in, sizeof(in) - 1, &out, sizeof(out), &size, NULL, 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); + + size = 0xdeadbeef; + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, NULL, sizeof(in), &out, sizeof(out), &size, NULL, 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); + + size = 0xdeadbeef; + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &in, sizeof(in), &out, sizeof(out), &size, NULL, NULL); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); + ok(size == 0xdeadbeef, "got size %u\n", size); + + in.sin_family = AF_INET; + size = 0xdeadbeef; + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &in, sizeof(in), &out, sizeof(out), &size, NULL, NULL); + todo_wine ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + todo_wine ok(size == 0xdeadbeef, "got size %u\n", size); + + in.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &in, sizeof(in), &out, sizeof(out), &size, NULL, NULL); + ok(!ret, "expected failure\n"); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(size == sizeof(out), "got size %u\n", size); /* We expect the source address to be INADDR_LOOPBACK as well, but * there's no guarantee that a route to the loopback address exists, * so rather than introduce spurious test failures we do not test the * source address. */ + + size = 0xdeadbeef; + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &in, sizeof(in), &out, sizeof(out) - 1, &size, NULL, NULL); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + todo_wine ok(size == sizeof(out), "got size %u\n", size); + + size = 0xdeadbeef; + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &in, sizeof(in), NULL, sizeof(out), &size, NULL, NULL); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(size == 0xdeadbeef, "got size %u\n", size); + + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &in, sizeof(in), &out, sizeof(out), NULL, &overlapped, NULL); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(size == 0xdeadbeef, "got size %u\n", size); + + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + overlapped.Internal = 0xdeadbeef; + overlapped.InternalHigh = 0xdeadbeef; + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &in, sizeof(in), &out, sizeof(out), &size, &overlapped, NULL); + ok(!ret, "expected failure\n"); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(size == sizeof(out), "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(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); + + CloseHandle(port); + closesocket(sock); + + sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &in, sizeof(in), + &out, sizeof(out), NULL, &overlapped, socket_apc); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + apc_count = 0; + size = 0xdeadbeef; + ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &in, sizeof(in), + &out, sizeof(out), &size, &overlapped, socket_apc); + ok(!ret, "expected success\n"); + ok(size == sizeof(out), "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(sock); }

1 0

Jacek Caban : d3dcompiler: Use return value in read_dword.
by Alexandre Julliard 31 May '21

31 May '21

Module: wine Branch: master Commit: e6961f6e16b35729301967b04078158cd66eaab2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6961f6e16b35729301967b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 28 20:11:30 2021 +0200 d3dcompiler: Use return value in read_dword. Fixes warnings like on clang with MSVC target, where enums may be signed: dlls/d3dcompiler_43/reflection.c:1160:22: warning: passing 'D3D_PRIMITIVE *' (aka 'enum D3D_PRIMITIVE *') to parameter of type 'DWORD *' (aka 'unsigned int *') converts between pointers to integer types with different sign [-Wpointer-sign] Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 8 +- dlls/d3dcompiler_43/reflection.c | 144 +++++++++++++++--------------- dlls/d3dcompiler_43/utils.c | 14 +-- 3 files changed, 84 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6961f6e16b357293019…

1 0

Hugh McMaster : reg: Group resource IDs by source location.
by Alexandre Julliard 31 May '21

31 May '21

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: Partially implement the 'copy' command.
by Alexandre Julliard 31 May '21

31 May '21

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: Support recursion in the 'copy' command.
by Alexandre Julliard 31 May '21

31 May '21

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 31 May '21

31 May '21

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