July 2022 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : ntdll: RtlFirstFreeAce only return FALSE on error.
by Alexandre Julliard 19 Jul '22

19 Jul '22

Module: wine Branch: master Commit: 0cc26c121831be32bb20092398668f4dfd732327 URL: https://gitlab.winehq.org/wine/wine/-/commit/0cc26c121831be32bb20092398668f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 8 13:16:52 2021 +1100 ntdll: RtlFirstFreeAce only return FALSE on error. --- dlls/ntdll/sec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index ba8d7b71593..20adc044158 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1149,9 +1149,8 @@ BOOLEAN WINAPI RtlFirstFreeAce( return FALSE; ace = (PACE_HEADER)(((BYTE*)ace)+ace->AceSize); } - if ((BYTE *)ace >= (BYTE *)acl + acl->AclSize) - return FALSE; - *x = ace; + if ((BYTE *)ace <= (BYTE *)acl + acl->AclSize) + *x = ace; return TRUE; }

1 0

Alistair Leslie-Hughes : ntdll/tests: Add RtlFirstFreeAce tests.
by Alexandre Julliard 19 Jul '22

19 Jul '22

Module: wine Branch: master Commit: d70273363be2e2abc5d5af17341a7e6a31156abb URL: https://gitlab.winehq.org/wine/wine/-/commit/d70273363be2e2abc5d5af17341a7e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 11 14:19:41 2022 +1000 ntdll/tests: Add RtlFirstFreeAce tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/tests/rtl.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index aeae4e8adf3..2e0bfb650e4 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -3682,6 +3682,54 @@ static void test_RtlDestroyHeap(void) RtlRemoveVectoredExceptionHandler( handler ); } +static void test_RtlFirstFreeAce(void) +{ + PACL acl; + PACE_HEADER first; + BOOL ret; + DWORD size; + BOOLEAN found; + + size = sizeof(ACL) + (sizeof(ACCESS_ALLOWED_ACE)); + acl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + ret = InitializeAcl(acl, sizeof(ACL), ACL_REVISION); + ok(ret, "InitializeAcl failed with error %ld\n", GetLastError()); + + /* AceCount = 0 */ + first = (ACE_HEADER *)0xdeadbeef; + found = RtlFirstFreeAce(acl, &first); + ok(found, "RtlFirstFreeAce failed\n"); + ok(first == (PACE_HEADER)(acl + 1), "Failed to find ACL\n"); + + acl->AclSize = sizeof(ACL) - 1; + first = (ACE_HEADER *)0xdeadbeef; + found = RtlFirstFreeAce(acl, &first); + ok(found, "RtlFirstFreeAce failed\n"); + ok(first == NULL, "Found FirstAce = %p\n", first); + + /* AceCount = 1 */ + acl->AceCount = 1; + acl->AclSize = size; + first = (ACE_HEADER *)0xdeadbeef; + found = RtlFirstFreeAce(acl, &first); + ok(found, "RtlFirstFreeAce failed\n"); + ok(first == (PACE_HEADER)(acl + 1), "Failed to find ACL %p, %p\n", first, (PACE_HEADER)(acl + 1)); + + acl->AclSize = sizeof(ACL) - 1; + first = (ACE_HEADER *)0xdeadbeef; + found = RtlFirstFreeAce(acl, &first); + ok(!found, "RtlFirstFreeAce failed\n"); + ok(first == NULL, "Found FirstAce = %p\n", first); + + acl->AclSize = sizeof(ACL); + first = (ACE_HEADER *)0xdeadbeef; + found = RtlFirstFreeAce(acl, &first); + ok(!found, "RtlFirstFreeAce failed\n"); + ok(first == NULL, "Found FirstAce = %p\n", first); + + HeapFree(GetProcessHeap(), 0, acl); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -3725,4 +3773,5 @@ START_TEST(rtl) test_LdrRegisterDllNotification(); test_DbgPrint(); test_RtlDestroyHeap(); + test_RtlFirstFreeAce(); }

1 0

Paul Gofman : shell32: Don't quote args substituted through wildcard in SHELL_ArgifyW().
by Alexandre Julliard 19 Jul '22

19 Jul '22

Module: wine Branch: master Commit: 435ba2c6844ace16a9fcd71370dbe9eaa6d0c8e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/435ba2c6844ace16a9fcd71370dbe9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 29 19:24:54 2022 -0500 shell32: Don't quote args substituted through wildcard in SHELL_ArgifyW(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/shell32/shlexec.c | 4 ---- dlls/shell32/tests/shlexec.c | 13 +++++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 8c7e3cf0808..fbf39e99fc6 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -110,8 +110,6 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp if (*fmt == '*') { used++; - if (used < len) - *res++ = '"'; while(*args) { used++; @@ -121,8 +119,6 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp args++; } used++; - if (used < len) - *res++ = '"'; } else { diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 50c2e84578b..50de1eeb750 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1418,11 +1418,11 @@ typedef struct static const argify_tests_t argify_tests[] = { - /* Start with three simple parameters. Notice that one can reorder and - * duplicate the parameters. Also notice how %* take the raw input - * parameters string, including the trailing spaces, no matter what - * arguments have already been used. - */ + {"ParamsS", "p2 p3 \"p4 ", FALSE, " p2 p3 \"p4 "}, + + /* Notice that one can reorder and duplicate the parameters. + * Also notice how %* take the raw input parameters string, including + * the trailing spaces, no matter what arguments have already been used. */ {"Params232S", "p2 p3 p4 ", TRUE, " p2 p3 \"p2\" \"p2 p3 p4 \""}, @@ -1567,6 +1567,7 @@ static void test_argify(void) return; } + create_test_verb("shlexec.shlexec", "ParamsS", 0, "ParamsS %*"); create_test_verb("shlexec.shlexec", "Params232S", 0, "Params232S %2 %3 \"%2\" \"%*\""); create_test_verb("shlexec.shlexec", "Params23456", 0, "Params23456 \"%2\" \"%3\" \"%4\" \"%5\" \"%6\""); create_test_verb("shlexec.shlexec", "Params23456789", 0, "Params23456789 \"%2\" \"%3\" \"%4\" \"%5\" \"%6\" \"%7\" \"%8\" \"%9\""); @@ -1594,7 +1595,7 @@ static void test_argify(void) if (!cmd) cmd = "(null)"; todo_wine_if(test->todo) okShell(!strcmp(cmd, test->cmd) || broken(!strcmp(cmd, bad)), - "expected '%s', got '%s'\n", cmd, test->cmd); + "expected '%s', got '%s'\n", test->cmd, cmd); test++; } }

1 0

Paul Gofman : shell32: Handle file extensions in SHELL_FindExecutableByVerb().
by Alexandre Julliard 19 Jul '22

19 Jul '22

Module: wine Branch: master Commit: 6888e92ebc77655ea1af4fe49c83f17d60fda871 URL: https://gitlab.winehq.org/wine/wine/-/commit/6888e92ebc77655ea1af4fe49c83f1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jun 30 14:17:46 2022 -0500 shell32: Handle file extensions in SHELL_FindExecutableByVerb(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/shell32/shlexec.c | 12 +++++++++ dlls/shell32/tests/shlexec.c | 61 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 63 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index fbf39e99fc6..da2b5fdc2b0 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -473,6 +473,18 @@ static UINT SHELL_FindExecutableByVerb(LPCWSTR lpVerb, LPWSTR key, LPWSTR classn HKEY hkeyClass; WCHAR verb[MAX_PATH]; + if (*classname == '.') + { + /* Extension, default key value holds class name. Extension may also have + * empty class name and shell\verb\command subkey. */ + WCHAR class[MAX_PATH]; + LONG len; + + len = sizeof(class); + if (!RegQueryValueW(HKEY_CLASSES_ROOT, classname, class, &len) && *class) + wcscpy(classname, class); + } + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, classname, 0, 0x02000000, &hkeyClass)) return SE_ERR_NOASSOC; if (!HCR_GetDefaultVerbW(hkeyClass, lpVerb, verb, ARRAY_SIZE(verb))) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 50de1eeb750..4af4d735b68 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -708,23 +708,31 @@ static BOOL create_test_class(const char* class, BOOL protocol) return TRUE; } -static BOOL create_test_association(const char* extension) +static BOOL create_test_association_key(const char* extension, const char *class) { HKEY hkey; - char class[MAX_PATH]; LONG rc; - sprintf(class, "shlexec%s", extension); - rc=RegCreateKeyExA(HKEY_CLASSES_ROOT, extension, 0, NULL, 0, KEY_SET_VALUE, - NULL, &hkey, NULL); + rc = RegCreateKeyExA(HKEY_CLASSES_ROOT, extension, 0, NULL, 0, KEY_SET_VALUE, + NULL, &hkey, NULL); ok(rc == ERROR_SUCCESS || rc == ERROR_ACCESS_DENIED, "could not create association %s (rc=%ld)\n", class, rc); if (rc != ERROR_SUCCESS) return FALSE; - rc=RegSetValueExA(hkey, NULL, 0, REG_SZ, (LPBYTE) class, strlen(class)+1); - ok(rc==ERROR_SUCCESS, "RegSetValueEx '%s' failed, expected ERROR_SUCCESS, got %ld\n", class, rc); + rc = RegSetValueExA(hkey, NULL, 0, REG_SZ, (LPBYTE) class, strlen(class)+1); + ok(rc == ERROR_SUCCESS, "RegSetValueEx '%s' failed, expected ERROR_SUCCESS, got %ld\n", class, rc); CloseHandle(hkey); + return TRUE; +} + +static BOOL create_test_association(const char* extension) +{ + char class[MAX_PATH]; + + sprintf(class, "shlexec%s", extension); + if (!create_test_association_key(extension, class)) + return FALSE; return create_test_class(class, FALSE); } @@ -2216,6 +2224,39 @@ static void test_exes(void) okChildInt("argcA", 4); okChildString("argvA3", "Exec"); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS | SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, NULL, argv0, params, + NULL, ".exe"); + okShell(rc > 32, "returned %Iu\n", rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + + if (create_test_association_key(".qqqq", "exefile")) + { + rc = shell_execute_ex(SEE_MASK_NOZONECHECKS | SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, NULL, argv0, params, + NULL, ".qqqq"); + okShell(rc > 32, "returned %Iu\n", rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + delete_test_association(".qqqq"); + } + else + { + skip("Could not create associtation.\n"); + } + + if (create_test_association_key("qqqq", "exefile")) + { + rc = shell_execute_ex(SEE_MASK_NOZONECHECKS | SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, NULL, argv0, params, + NULL, "qqqq"); + okShell(rc < 32, "returned %Iu\n", rc); + todo_wine okShell(rc == SE_ERR_NOASSOC, "returned %Iu\n", rc); + delete_test_association("qqqq"); + } + else + { + skip("Could not create associtation.\n"); + } + if (! skip_noassoc_tests) { sprintf(filename, "%s\\test file.noassoc", tmpdir); @@ -2252,10 +2293,10 @@ static void test_exes(void) /* FIXME SEE_MASK_FLAG_NO_UI is only needed due to Wine's bug */ rc = shell_execute_ex(SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, NULL, argv0, NULL, NULL, ".shlexec"); - todo_wine okShell(rc > 32, "returned %Iu\n", rc); + okShell(rc > 32, "returned %Iu\n", rc); okChildInt("argcA", 5); - todo_wine okChildString("argvA3", "Open"); - todo_wine okChildPath("argvA4", argv0); + okChildString("argvA3", "Open"); + okChildPath("argvA4", argv0); } }

1 0

Paul Gofman : loader/wine.inf: Add runas shell execute verb.
by Alexandre Julliard 19 Jul '22

19 Jul '22

Module: wine Branch: master Commit: e0d8bd3f5a7b4c8722d3632a9954f1647851f3d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0d8bd3f5a7b4c8722d3632a9954f1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 29 20:52:44 2022 -0500 loader/wine.inf: Add runas shell execute verb. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/shell32/tests/shlexec.c | 24 ++++++++++++++++++++++++ loader/wine.inf.in | 1 + 2 files changed, 25 insertions(+) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 4af4d735b68..5096eef380f 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -54,6 +54,7 @@ static DLLVERSIONINFO dllver; static BOOL skip_shlexec_tests = FALSE; static BOOL skip_noassoc_tests = FALSE; static HANDLE dde_ready_event; +static BOOL is_elevated; /*** @@ -2257,6 +2258,19 @@ static void test_exes(void) skip("Could not create associtation.\n"); } + if (is_elevated) + { + rc = shell_execute_ex(SEE_MASK_NOZONECHECKS | SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, "runas", argv0, params, + NULL, ".exe"); + okShell(rc > 32, "returned %Iu\n", rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + } + else + { + skip("No admin privileges, skipping runas test.\n"); + } + if (! skip_noassoc_tests) { sprintf(filename, "%s\\test file.noassoc", tmpdir); @@ -2698,6 +2712,9 @@ static void init_test(void) lnk_desc_t desc; DWORD rc; HRESULT r; + TOKEN_ELEVATION elevation; + HANDLE token; + BOOL ret; hdll=GetModuleHandleA("shell32.dll"); pDllGetVersion=(void*)GetProcAddress(hdll, "DllGetVersion"); @@ -2822,6 +2839,13 @@ static void init_test(void) /* Set an environment variable to see if it is inherited */ SetEnvironmentVariableA("ShlexecVar", "Present"); + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + ok(ret, "OpenProcessToken failed.\n"); + ret = GetTokenInformation(token, TokenElevation, &elevation, sizeof(elevation), &rc); + ok(ret, "GetTokenInformation failed.\n"); + is_elevated = elevation.TokenIsElevated; + CloseHandle(token); } static void cleanup_test(void) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 58283e271de..e7b435ed0f0 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -272,6 +272,7 @@ HKCR,DirectShow,,16 HKCR,exefile,,2,"Application" HKCR,exefile\DefaultIcon,,2,"%1" HKCR,exefile\shell\open\command,,2,"""%1"" %*" +HKCR,exefile\shell\runas\command,,2,"""%1"" %*" HKCR,folder\shell\open\ddeexec,,2,"[ViewFolder("%l", %I, %S)]" HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,folder\shell\open\ddeexec\application,,2,"Folders"

1 0

Zebediah Figura : ws2_32/tests: Add more tests for SO_CONNECT_TIME.
by Alexandre Julliard 19 Jul '22

19 Jul '22

Module: wine Branch: master Commit: 913a96d753e756fbca1c66c902c2bbb0be7038f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/913a96d753e756fbca1c66c902c2bb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 29 11:31:18 2022 -0500 ws2_32/tests: Add more tests for SO_CONNECT_TIME. --- dlls/ws2_32/tests/sock.c | 90 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 74 insertions(+), 16 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 32872e1b683..c00d156d354 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7841,7 +7841,7 @@ static void test_AcceptEx(void) const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; SOCKET listener, acceptor, acceptor2, connector, connector2; struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress; - int socklen, optlen; + int socklen, iret, localSize = sizeof(struct sockaddr_in), remoteSize = localSize; GUID acceptExGuid = WSAID_ACCEPTEX, getAcceptExGuid = WSAID_GETACCEPTEXSOCKADDRS; GUID connectex_guid = WSAID_CONNECTEX; LPFN_ACCEPTEX pAcceptEx = NULL; @@ -7849,12 +7849,10 @@ static void test_AcceptEx(void) LPFN_CONNECTEX pConnectEx = NULL; fd_set fds_accept, fds_send; static const struct timeval timeout = {1, 0}; - DWORD bytesReturned, connect_time; char buffer[1024], ipbuffer[32]; OVERLAPPED overlapped = {0}, overlapped2 = {0}; - int iret, localSize = sizeof(struct sockaddr_in), remoteSize = localSize; + DWORD bytesReturned, dwret; BOOL bret; - DWORD dwret; overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); overlapped2.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); @@ -8188,22 +8186,10 @@ static void test_AcceptEx(void) ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); ok(overlapped.Internal == STATUS_PENDING, "got %08lx\n", (ULONG)overlapped.Internal); - connect_time = 0xdeadbeef; - optlen = sizeof(connect_time); - iret = getsockopt(connector, SOL_SOCKET, SO_CONNECT_TIME, (char *)&connect_time, &optlen); - ok(!iret, "getsockopt failed %d\n", WSAGetLastError()); - ok(connect_time == ~0u, "unexpected connect time %lu\n", connect_time); - /* AcceptEx() still won't complete until we send data */ iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - connect_time = 0xdeadbeef; - optlen = sizeof(connect_time); - iret = getsockopt(connector, SOL_SOCKET, SO_CONNECT_TIME, (char *)&connect_time, &optlen); - ok(!iret, "getsockopt failed %d\n", WSAGetLastError()); - ok(connect_time < 0xdeadbeef, "unexpected connect time %lu\n", connect_time); - dwret = WaitForSingleObject(overlapped.hEvent, 0); ok(dwret == WAIT_TIMEOUT, "Waiting for accept event timeout failed with %ld + errno %ld\n", dwret, GetLastError()); ok(overlapped.Internal == STATUS_PENDING, "got %08lx\n", (ULONG)overlapped.Internal); @@ -12965,6 +12951,77 @@ static void test_icmp(void) closesocket(s); } +static void test_connect_time(void) +{ + struct sockaddr_in addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; + SOCKET client, server; + unsigned int time; + int ret, len; + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + len = sizeof(time); + SetLastError(0xdeadbeef); + ret = getsockopt(client, SOL_SOCKET, SO_CONNECT_TIME, (char *)&time, &len); + ok(!ret, "got %d\n", ret); + ok(!GetLastError(), "got error %lu\n", GetLastError()); + ok(len == sizeof(time), "got len %d\n", len); + ok(time == ~0u, "got time %u\n", time); + + closesocket(client); + + tcp_socketpair(&client, &server); + + len = sizeof(time); + SetLastError(0xdeadbeef); + ret = getsockopt(client, SOL_SOCKET, SO_CONNECT_TIME, (char *)&time, &len); + ok(!ret, "got %d\n", ret); + ok(!GetLastError(), "got error %lu\n", GetLastError()); + ok(len == sizeof(time), "got len %d\n", len); + ok(time == 0, "got time %u\n", time); + + len = sizeof(time); + SetLastError(0xdeadbeef); + ret = getsockopt(server, SOL_SOCKET, SO_CONNECT_TIME, (char *)&time, &len); + ok(!ret, "got %d\n", ret); + ok(!GetLastError(), "got error %lu\n", GetLastError()); + ok(len == sizeof(time), "got len %d\n", len); + ok(time == 0, "got time %u\n", time); + + closesocket(client); + closesocket(server); + + client = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + server = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + + ret = bind(server, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "got error %lu\n", GetLastError()); + len = sizeof(addr); + ret = getsockname(server, (struct sockaddr *)&addr, &len); + ok(!ret, "got error %lu\n", GetLastError()); + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "got error %lu\n", GetLastError()); + + len = sizeof(time); + SetLastError(0xdeadbeef); + ret = getsockopt(client, SOL_SOCKET, SO_CONNECT_TIME, (char *)&time, &len); + ok(!ret, "got %d\n", ret); + ok(!GetLastError(), "got error %lu\n", GetLastError()); + ok(len == sizeof(time), "got len %d\n", len); + todo_wine ok(time == ~0u, "got time %u\n", time); + + len = sizeof(time); + SetLastError(0xdeadbeef); + ret = getsockopt(server, SOL_SOCKET, SO_CONNECT_TIME, (char *)&time, &len); + ok(!ret, "got %d\n", ret); + ok(!GetLastError(), "got error %lu\n", GetLastError()); + ok(len == sizeof(time), "got len %d\n", len); + ok(time == ~0u, "got time %u\n", time); + + closesocket(server); + closesocket(client); +} + START_TEST( sock ) { int i; @@ -12984,6 +13041,7 @@ START_TEST( sock ) test_extendedSocketOptions(); test_so_debug(); test_sockopt_validity(); + test_connect_time(); for (i = 0; i < ARRAY_SIZE(tests); i++) do_test(&tests[i]);

1 0

Zebediah Figura : ws2_32/tests: Test FD_CONNECT with UDP sockets.
by Alexandre Julliard 19 Jul '22

19 Jul '22

Module: wine Branch: master Commit: f792b0828596a802165fd913033e84fc5733179b URL: https://gitlab.winehq.org/wine/wine/-/commit/f792b0828596a802165fd913033e84… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 29 12:54:56 2022 -0500 ws2_32/tests: Test FD_CONNECT with UDP sockets. --- dlls/ws2_32/tests/sock.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c00d156d354..685a2348666 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5878,7 +5878,7 @@ static void test_connect_events(struct event_test_ctx *ctx) check_events(ctx, FD_WRITE, 0, 200); - select_events(ctx, client, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + select_events(ctx, client, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); if (ctx->is_message) check_events(ctx, FD_WRITE, 0, 200); @@ -5888,6 +5888,33 @@ static void test_connect_events(struct event_test_ctx *ctx) closesocket(client); closesocket(server); + /* Test with UDP sockets. */ + + client = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + server = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + + select_events(ctx, client, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + if (ctx->is_message) + check_events(ctx, FD_WRITE, 0, 200); + check_events_todo_event(ctx, 0, 0, 0); + + ret = bind(server, (const struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + len = sizeof(destaddr); + ret = getsockname(server, (struct sockaddr *)&destaddr, &len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "got error %lu\n", GetLastError()); + + if (ctx->is_message) + check_events_todo(ctx, FD_WRITE, 0, 200); + else + check_events_todo(ctx, FD_CONNECT, FD_WRITE, 200); + check_events(ctx, 0, 0, 0); + + closesocket(client); + closesocket(server); + closesocket(listener); }

1 0

Zebediah Figura : ws2_32/tests: Add some tests for connecting a UDP socket.
by Alexandre Julliard 19 Jul '22

19 Jul '22

Module: wine Branch: master Commit: 6a59b1a521e3f9201e35143e4d7b7afed804110c URL: https://gitlab.winehq.org/wine/wine/-/commit/6a59b1a521e3f9201e35143e4d7b7a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 29 13:10:13 2022 -0500 ws2_32/tests: Add some tests for connecting a UDP socket. --- dlls/ws2_32/tests/sock.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 685a2348666..184285927b5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -13049,6 +13049,91 @@ static void test_connect_time(void) closesocket(client); } +static void test_connect_udp(void) +{ + const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; + struct sockaddr_in addr, ret_addr; + SOCKET client, server; + char buffer[5]; + int ret, len; + + client = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + server = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + set_blocking(client, FALSE); + set_blocking(server, FALSE); + + SetLastError(0xdeadbeef); + ret = send(client, "data", 4, 0); + ok(ret == -1, "got %d\n", ret); + todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = recv(server, buffer, sizeof(buffer), 0); + ok(ret == -1, "got %d\n", ret); + todo_wine ok(GetLastError() == WSAEINVAL, "got error %lu\n", GetLastError()); + + ret = bind(server, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ok(!ret, "got error %lu\n", GetLastError()); + len = sizeof(addr); + ret = getsockname(server, (struct sockaddr *)&addr, &len); + ok(!ret, "got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = recv(server, buffer, sizeof(buffer), 0); + ok(ret == -1, "got %d\n", ret); + ok(GetLastError() == WSAEWOULDBLOCK, "got error %lu\n", GetLastError()); + + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "got error %lu\n", GetLastError()); + ret = getpeername(client, (struct sockaddr *)&ret_addr, &len); + ok(!ret, "got error %lu\n", GetLastError()); + ok(!memcmp(&ret_addr, &addr, sizeof(addr)), "addresses didn't match\n"); + + ret = getsockname(client, (struct sockaddr *)&ret_addr, &len); + ok(!ret, "got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = getpeername(server, (struct sockaddr *)&ret_addr, &len); + ok(ret == -1, "got %d\n", ret); + ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + + ret = send(client, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + memset(buffer, 0xcc, sizeof(buffer)); + ret = recv(server, buffer, sizeof(buffer), 0); + ok(ret == 4, "got %d\n", ret); + ok(!memcmp(buffer, "data", 4), "got %s\n", debugstr_an(buffer, ret)); + + SetLastError(0xdeadbeef); + ret = recv(server, buffer, sizeof(buffer), 0); + ok(ret == -1, "got %d\n", ret); + ok(GetLastError() == WSAEWOULDBLOCK, "got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = send(server, "data", 4, 0); + ok(ret == -1, "got %d\n", ret); + todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + todo_wine ok(!ret, "got error %lu\n", GetLastError()); + ++addr.sin_port; + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + todo_wine ok(!ret, "got error %lu\n", GetLastError()); + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_UNSPEC; + ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); + todo_wine ok(!ret, "got error %lu\n", GetLastError()); + + ret = getpeername(client, (struct sockaddr *)&ret_addr, &len); + todo_wine ok(ret == -1, "got %d\n", ret); + todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + + closesocket(server); + closesocket(client); +} + START_TEST( sock ) { int i; @@ -13127,6 +13212,7 @@ START_TEST( sock ) test_timeout(); test_tcp_reset(); test_icmp(); + test_connect_udp(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

Zebediah Figura : ws2_32/tests: Test polling for AFD_POLL_CONNECT with UDP sockets.
by Alexandre Julliard 19 Jul '22

19 Jul '22

Module: wine Branch: master Commit: 568a715378c6afca2b0999a42f7a3705ab486f6a URL: https://gitlab.winehq.org/wine/wine/-/commit/568a715378c6afca2b0999a42f7a37… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 29 17:19:14 2022 -0500 ws2_32/tests: Test polling for AFD_POLL_CONNECT with UDP sockets. --- dlls/ws2_32/tests/afd.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 334c2c41be6..f2dccd465a3 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -829,6 +829,37 @@ static void test_poll(void) ok(out_params->sockets[0].flags == AFD_POLL_READ, "got flags %#x\n", out_params->sockets[0].flags); ok(!out_params->sockets[0].status, "got status %#x\n", out_params->sockets[0].status); + in_params->timeout = -1000 * 10000; + in_params->count = 1; + in_params->sockets[0].socket = server; + in_params->sockets[0].flags = AFD_POLL_CONNECT; + params_size = offsetof(struct afd_poll_params, sockets[1]); + + ret = NtDeviceIoControlFile((HANDLE)server, event, NULL, NULL, &io, + IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); + ok(ret == STATUS_PENDING, "got %#x\n", ret); + + ret = connect(server, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "got error %lu\n", GetLastError()); + + ret = WaitForSingleObject(event, 100); + todo_wine ok(!ret, "got %#x\n", ret); + if (!ret) + { + ok(!io.Status, "got %#lx\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == server, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_CONNECT, "got flags %#x\n", out_params->sockets[0].flags); + ok(!out_params->sockets[0].status, "got status %#x\n", out_params->sockets[0].status); + } + else + { + CancelIo((HANDLE)server); + ret = WaitForSingleObject(event, 100); + ok(!ret, "wait timed out\n"); + } + closesocket(client); closesocket(server);

1 0

Zebediah Figura : server: Do not set connectionless sockets into the CONNECTING or CONNECTED state.
by Alexandre Julliard 19 Jul '22

19 Jul '22

Module: wine Branch: master Commit: 8a4433d6a7755fb6b156563b166a9993f54c8103 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a4433d6a7755fb6b156563b166a99… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 29 17:32:28 2022 -0500 server: Do not set connectionless sockets into the CONNECTING or CONNECTED state. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53058 --- dlls/ws2_32/tests/sock.c | 12 ++++++------ server/sock.c | 10 +++++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 184285927b5..5ed0f286c55 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -13035,7 +13035,7 @@ static void test_connect_time(void) ok(!ret, "got %d\n", ret); ok(!GetLastError(), "got error %lu\n", GetLastError()); ok(len == sizeof(time), "got len %d\n", len); - todo_wine ok(time == ~0u, "got time %u\n", time); + ok(time == ~0u, "got time %u\n", time); len = sizeof(time); SetLastError(0xdeadbeef); @@ -13116,19 +13116,19 @@ static void test_connect_udp(void) todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); - todo_wine ok(!ret, "got error %lu\n", GetLastError()); + ok(!ret, "got error %lu\n", GetLastError()); ++addr.sin_port; ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); - todo_wine ok(!ret, "got error %lu\n", GetLastError()); + ok(!ret, "got error %lu\n", GetLastError()); memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_UNSPEC; ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); - todo_wine ok(!ret, "got error %lu\n", GetLastError()); + ok(!ret, "got error %lu\n", GetLastError()); ret = getpeername(client, (struct sockaddr *)&ret_addr, &len); - todo_wine ok(ret == -1, "got %d\n", ret); - todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + ok(ret == -1, "got %d\n", ret); + ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); closesocket(server); closesocket(client); diff --git a/server/sock.c b/server/sock.c index 2bf56045612..4eef5c1ddb7 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2385,13 +2385,17 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (!ret) { - sock->state = SOCK_CONNECTED; - sock->connect_time = current_time; + if (sock->type != WS_SOCK_DGRAM) + { + sock->state = SOCK_CONNECTED; + sock->connect_time = current_time; + } if (!send_len) return; } - sock->state = SOCK_CONNECTING; + if (sock->type != WS_SOCK_DGRAM) + sock->state = SOCK_CONNECTING; if (params->synchronous && sock->nonblocking) {

1 0