wine-commits December 2021

2 participants
569 discussions

Jacek Caban : ntdll/tests: Remove workarounds for old Windows versions.

by Alexandre Julliard

Module: wine Branch: master Commit: b6dc83990872106fdb957b2947b71f0dbd77efc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6dc83990872106fdb957b29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 30 15:49:45 2021 +0100 ntdll/tests: Remove workarounds for old Windows versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index e56f0b29be2..5211945437c 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -127,37 +127,37 @@ static void test_RtlIsDosDeviceName_U(void) { "c:\\nul:", 6, 6 }, { "c:\\nul\\", 0, 0 }, { "c:\\nul\\foo", 0, 0 }, - { "c:\\nul::", 6, 6, TRUE }, /* fails on nt4 */ - { "c:\\nul::::::", 6, 6, TRUE }, /* fails on nt4 */ + { "c:\\nul::", 6, 6 }, + { "c:\\nul::::::", 6, 6 }, { "c:prn ", 4, 6 }, { "c:prn.......", 4, 6 }, { "c:prn... ...", 4, 6 }, - { "c:NUL .... ", 4, 6, TRUE }, /* fails on nt4 */ + { "c:NUL .... ", 4, 6 }, { "c: . . .", 0, 0 }, { "c:", 0, 0 }, { " . . . :", 0, 0 }, { ":", 0, 0 }, { "c:nul. . . :", 4, 6 }, - { "c:nul . . :", 4, 6, TRUE }, /* fails on nt4 */ + { "c:nul . . :", 4, 6 }, { "c:nul0", 0, 0 }, - { "c:prn:aaa", 4, 6, TRUE }, /* fails on win9x */ + { "c:prn:aaa", 4, 6 }, { "c:PRN:.txt", 4, 6 }, { "c:aux:.txt...", 4, 6 }, { "c:prn:.txt:", 4, 6 }, - { "c:nul:aaa", 4, 6, TRUE }, /* fails on win9x */ + { "c:nul:aaa", 4, 6 }, { "con:", 0, 6 }, { "lpt1:", 0, 8 }, { "c:com5:", 4, 8 }, { "CoM4:", 0, 8 }, { "lpt9:", 0, 8 }, { "c:\\lpt0.txt", 0, 0 }, - { "CONIN$", 0, 12, TRUE }, /* fails on winxp */ - { "CONOUT$", 0, 14, TRUE }, /* fails on winxp */ + { "CONIN$", 0, 12, TRUE }, /* fails on win7 */ + { "CONOUT$", 0, 14, TRUE }, /* fails on win7 */ { "CONERR$", 0, 0 }, { "CON", 0, 6 }, { "PIPE", 0, 0 }, - { "\\??\\CONIN$", 8, 12, TRUE }, /* fails on winxp */ - { "\\??\\CONOUT$", 8, 14, TRUE }, /* fails on winxp */ + { "\\??\\CONIN$", 8, 12, TRUE }, /* fails on win7 */ + { "\\??\\CONOUT$", 8, 14, TRUE }, /* fails on win7 */ { "\\??\\CONERR$", 0, 0 }, { "\\??\\CON", 8, 6 }, { "c:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" @@ -422,8 +422,6 @@ static void test_RtlGetFullPathName_U(void) static void test_RtlDosPathNameToNtPathName_U(void) { - static const WCHAR broken_global_prefix[] = L"\\??\\C:\\??"; - char curdir[MAX_PATH]; UNICODE_STRING nameW; WCHAR *file_part; @@ -560,9 +558,9 @@ static void test_RtlDosPathNameToNtPathName_U(void) {L"\\??\\foo\\..", L"\\??\\foo\\..", 8}, {L"\\??\\foo. . ", L"\\??\\foo. . ", 4}, - {L"CONIN$", L"\\??\\CONIN$", -1, L"\\??\\C:\\windows\\CONIN$" /* winxp */ }, - {L"CONOUT$", L"\\??\\CONOUT$", -1, L"\\??\\C:\\windows\\CONOUT$" /* winxp */ }, - {L"cOnOuT$", L"\\??\\cOnOuT$", -1, L"\\??\\C:\\windows\\cOnOuT$" /* winxp */ }, + {L"CONIN$", L"\\??\\CONIN$", -1, L"\\??\\C:\\windows\\CONIN$" /* win7 */ }, + {L"CONOUT$", L"\\??\\CONOUT$", -1, L"\\??\\C:\\windows\\CONOUT$" /* win7 */ }, + {L"cOnOuT$", L"\\??\\cOnOuT$", -1, L"\\??\\C:\\windows\\cOnOuT$" /* win7 */ }, {L"CONERR$", L"\\??\\C:\\windows\\CONERR$", 15}, }; static const WCHAR *error_paths[] = { @@ -582,8 +580,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) if (pRtlDosPathNameToNtPathName_U_WithStatus) { status = pRtlDosPathNameToNtPathName_U_WithStatus(error_paths[i], &nameW, &file_part, NULL); - ok(status == STATUS_OBJECT_NAME_INVALID || broken(status == STATUS_OBJECT_PATH_NOT_FOUND /* 2003 */), - "Got status %#x.\n", status); + ok(status == STATUS_OBJECT_NAME_INVALID, "Got status %#x.\n", status); } winetest_pop_context(); @@ -606,13 +603,6 @@ static void test_RtlDosPathNameToNtPathName_U(void) ok(status == STATUS_SUCCESS, "%s: Got status %#x.\n", debugstr_w(tests[i].dos), status); } - if (!wcsncmp(tests[i].dos, L"\\??\\", 4) && tests[i].dos[4] && - broken(!wcsncmp(nameW.Buffer, broken_global_prefix, wcslen(broken_global_prefix)))) - { - /* Windows version prior to 2003 don't interpret the \??\ prefix */ - continue; - } - ok(!wcscmp(nameW.Buffer, tests[i].nt) || (tests[i].alt_nt && broken(!wcscmp(nameW.Buffer, tests[i].alt_nt))), "%s: Expected %s, got %s.\n", debugstr_w(tests[i].dos),

2 years, 3 months

Jacek Caban : ntdll: Fix handling \\.\CON path in RtlDosPathNameToNtPathName.

by Alexandre Julliard

Module: wine Branch: master Commit: 32b81bfaff734164143343657bb40ea4e2c073e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32b81bfaff73416414334365… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 30 15:49:38 2021 +0100 ntdll: Fix handling \\.\CON path in RtlDosPathNameToNtPathName. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32183 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 4 +++- dlls/ntdll/tests/path.c | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 47196067cd4..cccd000a6c6 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -197,7 +197,8 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U return STATUS_OBJECT_NAME_INVALID; if (!memcmp(dos_path, global_prefix, sizeof(global_prefix)) || - (!memcmp(dos_path, global_prefix2, sizeof(global_prefix2)) && dos_path[4])) + (!memcmp(dos_path, global_prefix2, sizeof(global_prefix2)) && dos_path[4]) || + !wcsicmp( dos_path, L"\\\\.\\CON" )) { ntpath->Length = wcslen(dos_path) * sizeof(WCHAR); ntpath->MaximumLength = ntpath->Length + sizeof(WCHAR); @@ -205,6 +206,7 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U if (!ntpath->Buffer) return STATUS_NO_MEMORY; memcpy( ntpath->Buffer, dos_path, ntpath->MaximumLength ); ntpath->Buffer[1] = '?'; /* change \\?\ to \??\ */ + ntpath->Buffer[2] = '?'; if (file_part) { if ((ptr = wcsrchr( ntpath->Buffer, '\\' )) && ptr[1]) *file_part = ptr + 1; diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index dba889fdec7..e56f0b29be2 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -120,6 +120,8 @@ static void test_RtlIsDosDeviceName_U(void) { "\\\\.\\CON", 8, 6, TRUE }, /* fails on win8 */ { "\\\\.\\con", 8, 6, TRUE }, /* fails on win8 */ { "\\\\.\\CON2", 0, 0 }, + { "\\\\.\\CONIN$", 0, 0 }, + { "\\\\.\\CONOUT$",0, 0 }, { "", 0, 0 }, { "\\\\foo\\nul", 0, 0 }, { "c:\\nul:", 6, 6 }, @@ -435,6 +437,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) const WCHAR *nt; int file_offset; /* offset to file part */ const WCHAR *alt_nt; + BOOL may_fail; } tests[] = { @@ -519,6 +522,9 @@ static void test_RtlDosPathNameToNtPathName_U(void) {L"\\\\.\\foo/.", L"\\??\\foo", 4}, {L"\\\\.\\foo/..", L"\\??\\", -1}, {L"\\\\.\\foo. . ", L"\\??\\foo", 4}, + {L"\\\\.\\CON", L"\\??\\CON", 4, NULL, TRUE}, /* broken on win7 */ + {L"\\\\.\\CONIN$", L"\\??\\CONIN$", 4}, + {L"\\\\.\\CONOUT$", L"\\??\\CONOUT$", 4}, {L"\\\\?", L"\\??\\", -1}, {L"\\\\?\\", L"\\??\\", -1}, @@ -586,6 +592,11 @@ static void test_RtlDosPathNameToNtPathName_U(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { ret = pRtlDosPathNameToNtPathName_U(tests[i].dos, &nameW, &file_part, NULL); + if (!ret && tests[i].may_fail) + { + win_skip("skipping broken %s\n", debugstr_w(tests[i].dos)); + continue; + } ok(ret == TRUE, "%s: Got %d.\n", debugstr_w(tests[i].dos), ret); if (pRtlDosPathNameToNtPathName_U_WithStatus)

2 years, 3 months

Alex Henrie : mshtml: Fix use after free in use_gecko_script (Coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: 4ef2557d87e363a1ed38083f9b1ed413bff76d26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ef2557d87e363a1ed38083f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 29 22:56:38 2021 -0700 mshtml: Fix use after free in use_gecko_script (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 28e07a50c8e..2a0d86c9f76 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1716,12 +1716,13 @@ static BOOL use_gecko_script(IUri *uri) return FALSE; hres = IInternetSecurityManager_MapUrlToZone(get_security_manager(), display_uri, &zone, 0); - SysFreeString(display_uri); if(FAILED(hres)) { WARN("Could not map %s to zone: %08x\n", debugstr_w(display_uri), hres); + SysFreeString(display_uri); return TRUE; } + SysFreeString(display_uri); TRACE("zone %d\n", zone); return zone == URLZONE_UNTRUSTED; }

2 years, 3 months

Zebediah Figura : ws2_32: Do not assume that an fd_set is bounded by FD_SETSIZE.

by Alexandre Julliard

Module: wine Branch: master Commit: 45b9dccb70fc645c244f733de5c9c6c31005da28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45b9dccb70fc645c244f733d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 15:46:00 2021 -0600 ws2_32: Do not assume that an fd_set is bounded by FD_SETSIZE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52302 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 92 ++++++++++++++++++++++++++++---------------- dlls/ws2_32/tests/sock.c | 31 +++++++++++---- dlls/ws2_32/ws2_32_private.h | 1 + 3 files changed, 84 insertions(+), 40 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b5f479f5a07..6bad74e3c8d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2364,13 +2364,8 @@ static int add_fd_to_set( SOCKET fd, struct fd_set *set ) return 0; } - if (set->fd_count < FD_SETSIZE) - { - set->fd_array[set->fd_count++] = fd; - return 1; - } - - return 0; + set->fd_array[set->fd_count++] = fd; + return 1; } @@ -2380,9 +2375,9 @@ static int add_fd_to_set( SOCKET fd, struct fd_set *set ) int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, fd_set *except_ptr, const struct timeval *timeout) { - char buffer[offsetof( struct afd_poll_params, sockets[FD_SETSIZE * 3] )] = {0}; - struct afd_poll_params *params = (struct afd_poll_params *)buffer; - struct fd_set read_input; + struct fd_set *read_input = NULL; + struct afd_poll_params *params; + unsigned int poll_count = 0; ULONG params_size, i, j; SOCKET poll_socket = 0; IO_STATUS_BLOCK io; @@ -2392,22 +2387,49 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, TRACE( "read %p, write %p, except %p, timeout %p\n", read_ptr, write_ptr, except_ptr, timeout ); - FD_ZERO( &read_input ); - if (read_ptr) read_input.fd_count = read_ptr->fd_count; - if (!(sync_event = get_sync_event())) return -1; + if (read_ptr) poll_count += read_ptr->fd_count; + if (write_ptr) poll_count += write_ptr->fd_count; + if (except_ptr) poll_count += except_ptr->fd_count; + + if (!poll_count) + { + SetLastError( WSAEINVAL ); + return -1; + } + + params_size = offsetof( struct afd_poll_params, sockets[poll_count] ); + if (!(params = calloc( params_size, 1 ))) + { + SetLastError( WSAENOBUFS ); + return -1; + } + if (timeout) params->timeout = timeout->tv_sec * -10000000 + timeout->tv_usec * -10; else params->timeout = TIMEOUT_INFINITE; - for (i = 0; i < read_input.fd_count; ++i) + if (read_ptr) { - params->sockets[params->count].socket = read_input.fd_array[i] = read_ptr->fd_array[i]; - params->sockets[params->count].flags = AFD_POLL_READ | AFD_POLL_ACCEPT | AFD_POLL_HUP; - ++params->count; - poll_socket = read_input.fd_array[i]; + unsigned int read_size = offsetof( struct fd_set, fd_array[read_ptr->fd_count] ); + + if (!(read_input = malloc( read_size ))) + { + free( params ); + SetLastError( WSAENOBUFS ); + return -1; + } + memcpy( read_input, read_ptr, read_size ); + + for (i = 0; i < read_ptr->fd_count; ++i) + { + params->sockets[params->count].socket = read_ptr->fd_array[i]; + params->sockets[params->count].flags = AFD_POLL_READ | AFD_POLL_ACCEPT | AFD_POLL_HUP; + ++params->count; + poll_socket = read_ptr->fd_array[i]; + } } if (write_ptr) @@ -2432,42 +2454,43 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, } } - if (!params->count) - { - SetLastError( WSAEINVAL ); - return -1; - } - - params_size = offsetof( struct afd_poll_params, sockets[params->count] ); + assert( params->count == poll_count ); status = NtDeviceIoControlFile( (HANDLE)poll_socket, sync_event, NULL, NULL, &io, IOCTL_AFD_POLL, params, params_size, params, params_size ); if (status == STATUS_PENDING) { if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) + { + free( read_input ); + free( params ); return -1; + } status = io.u.Status; } if (status == STATUS_TIMEOUT) status = STATUS_SUCCESS; if (!status) { /* pointers may alias, so clear them all first */ - if (read_ptr) FD_ZERO( read_ptr ); - if (write_ptr) FD_ZERO( write_ptr ); - if (except_ptr) FD_ZERO( except_ptr ); + if (read_ptr) read_ptr->fd_count = 0; + if (write_ptr) write_ptr->fd_count = 0; + if (except_ptr) except_ptr->fd_count = 0; for (i = 0; i < params->count; ++i) { unsigned int flags = params->sockets[i].flags; SOCKET s = params->sockets[i].socket; - for (j = 0; j < read_input.fd_count; ++j) + if (read_input) { - if (read_input.fd_array[j] == s - && (flags & (AFD_POLL_READ | AFD_POLL_ACCEPT | AFD_POLL_HUP | AFD_POLL_CLOSE))) + for (j = 0; j < read_input->fd_count; ++j) { - ret_count += add_fd_to_set( s, read_ptr ); - flags &= ~AFD_POLL_CLOSE; + if (read_input->fd_array[j] == s + && (flags & (AFD_POLL_READ | AFD_POLL_ACCEPT | AFD_POLL_HUP | AFD_POLL_CLOSE))) + { + ret_count += add_fd_to_set( s, read_ptr ); + flags &= ~AFD_POLL_CLOSE; + } } } @@ -2482,6 +2505,9 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, } } + free( read_input ); + free( params ); + SetLastError( NtStatusToWSAError( status ) ); return status ? -1 : ret_count; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d4db48d1861..d4585c2b1dc 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3151,9 +3151,8 @@ static void test_select(void) { static char tmp_buf[1024]; - SOCKET fdListen, fdRead, fdWrite; - fd_set readfds, writefds, exceptfds, *alloc_readfds; - unsigned int maxfd; + fd_set readfds, writefds, exceptfds, *alloc_fds; + SOCKET fdListen, fdRead, fdWrite, sockets[200]; int ret, len; char buffer; struct timeval select_timeout; @@ -3161,6 +3160,7 @@ static void test_select(void) select_thread_params thread_params; HANDLE thread_handle; DWORD ticks, id, old_protect; + unsigned int maxfd, i; char *page_pair; fdRead = socket(AF_INET, SOCK_STREAM, 0); @@ -3339,16 +3339,33 @@ static void test_select(void) page_pair = VirtualAlloc(NULL, 0x1000 * 2, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); VirtualProtect(page_pair + 0x1000, 0x1000, PAGE_NOACCESS, &old_protect); - alloc_readfds = (fd_set *)((page_pair + 0x1000) - offsetof(fd_set, fd_array[1])); - alloc_readfds->fd_count = 1; - alloc_readfds->fd_array[0] = fdRead; - ret = select(fdRead+1, alloc_readfds, NULL, NULL, &select_timeout); + alloc_fds = (fd_set *)((page_pair + 0x1000) - offsetof(fd_set, fd_array[1])); + alloc_fds->fd_count = 1; + alloc_fds->fd_array[0] = fdRead; + ret = select(fdRead+1, alloc_fds, NULL, NULL, &select_timeout); ok(ret == 1, "select returned %d\n", ret); VirtualFree(page_pair, 0, MEM_RELEASE); closesocket(fdRead); closesocket(fdWrite); + alloc_fds = malloc(offsetof(fd_set, fd_array[ARRAY_SIZE(sockets)])); + alloc_fds->fd_count = ARRAY_SIZE(sockets); + for (i = 0; i < ARRAY_SIZE(sockets); i += 2) + { + tcp_socketpair(&sockets[i], &sockets[i + 1]); + alloc_fds->fd_array[i] = sockets[i]; + alloc_fds->fd_array[i + 1] = sockets[i + 1]; + } + ret = select(0, NULL, alloc_fds, NULL, &select_timeout); + ok(ret == ARRAY_SIZE(sockets), "got %d\n", ret); + for (i = 0; i < ARRAY_SIZE(sockets); ++i) + { + ok(alloc_fds->fd_array[i] == sockets[i], "got socket %#Ix at index %u\n", alloc_fds->fd_array[i], i); + closesocket(sockets[i]); + } + free(alloc_fds); + /* select() works in 3 distinct states: * - to check if a connection attempt ended with success or error; * - to check if a pending connection is waiting for acceptance; diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index fa2f89f6e98..f6b6ecc7eba 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -19,6 +19,7 @@ #ifndef __WINE_WS2_32_PRIVATE_H #define __WINE_WS2_32_PRIVATE_H +#include <assert.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h>

2 years, 3 months

Zebediah Figura : ws2_32: Don't bother checking sockets against the input write or except sets.

by Alexandre Julliard

Module: wine Branch: master Commit: 40494359cb5839131368847063902b4bc228f6bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=40494359cb58391313688470… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 15:45:59 2021 -0600 ws2_32: Don't bother checking sockets against the input write or except sets. We only need to check the input set for CLOSE. For all other flags we can guarantee that the socket was included in a unique input set. E.g. the presence of WRITE in the output flags implies that the socket must have been in the "write" set to begin with. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 60 ++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 698e788c459..b5f479f5a07 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2382,7 +2382,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, { char buffer[offsetof( struct afd_poll_params, sockets[FD_SETSIZE * 3] )] = {0}; struct afd_poll_params *params = (struct afd_poll_params *)buffer; - struct fd_set read, write, except; + struct fd_set read_input; ULONG params_size, i, j; SOCKET poll_socket = 0; IO_STATUS_BLOCK io; @@ -2392,12 +2392,8 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, TRACE( "read %p, write %p, except %p, timeout %p\n", read_ptr, write_ptr, except_ptr, timeout ); - FD_ZERO( &read ); - FD_ZERO( &write ); - FD_ZERO( &except ); - if (read_ptr) read.fd_count = read_ptr->fd_count; - if (write_ptr) write.fd_count = write_ptr->fd_count; - if (except_ptr) except.fd_count = except_ptr->fd_count; + FD_ZERO( &read_input ); + if (read_ptr) read_input.fd_count = read_ptr->fd_count; if (!(sync_event = get_sync_event())) return -1; @@ -2406,28 +2402,34 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, else params->timeout = TIMEOUT_INFINITE; - for (i = 0; i < read.fd_count; ++i) + for (i = 0; i < read_input.fd_count; ++i) { - params->sockets[params->count].socket = read.fd_array[i] = read_ptr->fd_array[i]; + params->sockets[params->count].socket = read_input.fd_array[i] = read_ptr->fd_array[i]; params->sockets[params->count].flags = AFD_POLL_READ | AFD_POLL_ACCEPT | AFD_POLL_HUP; ++params->count; - poll_socket = read.fd_array[i]; + poll_socket = read_input.fd_array[i]; } - for (i = 0; i < write.fd_count; ++i) + if (write_ptr) { - params->sockets[params->count].socket = write.fd_array[i] = write_ptr->fd_array[i]; - params->sockets[params->count].flags = AFD_POLL_WRITE; - ++params->count; - poll_socket = write.fd_array[i]; + for (i = 0; i < write_ptr->fd_count; ++i) + { + params->sockets[params->count].socket = write_ptr->fd_array[i]; + params->sockets[params->count].flags = AFD_POLL_WRITE; + ++params->count; + poll_socket = write_ptr->fd_array[i]; + } } - for (i = 0; i < except.fd_count; ++i) + if (except_ptr) { - params->sockets[params->count].socket = except.fd_array[i] = except_ptr->fd_array[i]; - params->sockets[params->count].flags = AFD_POLL_OOB | AFD_POLL_CONNECT_ERR; - ++params->count; - poll_socket = except.fd_array[i]; + for (i = 0; i < except_ptr->fd_count; ++i) + { + params->sockets[params->count].socket = except_ptr->fd_array[i]; + params->sockets[params->count].flags = AFD_POLL_OOB | AFD_POLL_CONNECT_ERR; + ++params->count; + poll_socket = except_ptr->fd_array[i]; + } } if (!params->count) @@ -2459,9 +2461,9 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, unsigned int flags = params->sockets[i].flags; SOCKET s = params->sockets[i].socket; - for (j = 0; j < read.fd_count; ++j) + for (j = 0; j < read_input.fd_count; ++j) { - if (read.fd_array[j] == s + if (read_input.fd_array[j] == s && (flags & (AFD_POLL_READ | AFD_POLL_ACCEPT | AFD_POLL_HUP | AFD_POLL_CLOSE))) { ret_count += add_fd_to_set( s, read_ptr ); @@ -2472,17 +2474,11 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, if (flags & AFD_POLL_CLOSE) status = STATUS_INVALID_HANDLE; - for (j = 0; j < write.fd_count; ++j) - { - if (write.fd_array[j] == s && (flags & AFD_POLL_WRITE)) - ret_count += add_fd_to_set( s, write_ptr ); - } + if (flags & AFD_POLL_WRITE) + ret_count += add_fd_to_set( s, write_ptr ); - for (j = 0; j < except.fd_count; ++j) - { - if (except.fd_array[j] == s && (flags & (AFD_POLL_OOB | AFD_POLL_CONNECT_ERR))) - ret_count += add_fd_to_set( s, except_ptr ); - } + if (flags & (AFD_POLL_OOB | AFD_POLL_CONNECT_ERR)) + ret_count += add_fd_to_set( s, except_ptr ); } }

2 years, 3 months

Zebediah Figura : ws2_32/tests: Test selecting the same socket twice.

by Alexandre Julliard

Module: wine Branch: master Commit: b4609ec199432327d678f2aee05503a95a5505f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4609ec199432327d678f2ae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 15:45:57 2021 -0600 ws2_32/tests: Test selecting the same socket twice. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5e16343a577..d4db48d1861 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3272,6 +3272,16 @@ static void test_select(void) ok(ret == 1, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); + /* select the same socket twice */ + writefds.fd_count = 2; + writefds.fd_array[0] = fdWrite; + writefds.fd_array[1] = fdWrite; + ret = select(0, NULL, &writefds, NULL, &select_timeout); + ok(ret == 1, "select returned %d\n", ret); + ok(writefds.fd_count == 1, "got count %u\n", writefds.fd_count); + ok(writefds.fd_array[0] == fdWrite, "got fd %#Ix\n", writefds.fd_array[0]); + ok(writefds.fd_array[1] == fdWrite, "got fd %#Ix\n", writefds.fd_array[1]); + /* tests for overlapping fd_set pointers */ FD_ZERO(&readfds); FD_SET(fdWrite, &readfds);

2 years, 3 months

Zebediah Figura : ws2_32/tests: Increase tolerance in a timing test.

by Alexandre Julliard

Module: wine Branch: master Commit: 9d7f41e702e9f2cacc3b16e8b88a73d81e44860f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d7f41e702e9f2cacc3b16e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 17:20:59 2021 -0600 ws2_32/tests: Increase tolerance in a timing test. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9ff4a5d844d..5e16343a577 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3182,7 +3182,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ticks = GetTickCount() - ticks; ok(ret == 0, "select should not return any socket handles\n"); - ok(ticks < 10, "select was blocking for %u ms, expected < 10 ms\n", ticks); + ok(ticks < 100, "select was blocking for %u ms\n", ticks); ok(!FD_ISSET(fdRead, &readfds), "FD should not be set\n"); ok(!FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); ok(!FD_ISSET(fdRead, &exceptfds), "FD should not be set\n");

2 years, 3 months

Zebediah Figura : server: Reselect the socket returned from accept_socket().

by Alexandre Julliard

Module: wine Branch: master Commit: b1a2238a10413af1437982dd80f0c61d216ec12e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1a2238a10413af1437982dd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 17:15:33 2021 -0600 server: Reselect the socket returned from accept_socket(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52024 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 ++-- server/sock.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6bbd1c24666..9ff4a5d844d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5166,8 +5166,8 @@ static void test_accept_events(struct event_test_ctx *ctx) server = accept(listener, NULL, NULL); ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); ctx->socket = server; - check_events_todo(ctx, FD_WRITE, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, FD_WRITE, 0, 200); + check_events(ctx, 0, 0, 0); closesocket(server); closesocket(client); diff --git a/server/sock.c b/server/sock.c index 2df4f3d3056..736f34feac5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -722,6 +722,7 @@ static void complete_async_accept( struct sock *sock, struct accept_req *req ) handle = alloc_handle_no_access_check( async_get_thread( async )->process, &acceptsock->obj, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, OBJ_INHERIT ); acceptsock->wparam = handle; + sock_reselect( acceptsock ); release_object( acceptsock ); if (!handle) { @@ -2174,6 +2175,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) handle = alloc_handle( current->process, &acceptsock->obj, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, OBJ_INHERIT ); acceptsock->wparam = handle; + sock_reselect( acceptsock ); release_object( acceptsock ); set_reply_data( &handle, sizeof(handle) ); return;

2 years, 3 months

Zebediah Figura : ws2_32/tests: Test that the socket returned from accept() inherits event selection parameters.

by Alexandre Julliard

Module: wine Branch: master Commit: 4c617058a288aca09d943bfb5a627bb425fb2b8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c617058a288aca09d943bfb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 17:15:32 2021 -0600 ws2_32/tests: Test that the socket returned from accept() inherits event selection parameters. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d1cefd5eccc..6bbd1c24666 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5142,6 +5142,37 @@ static void test_accept_events(struct event_test_ctx *ctx) closesocket(client); closesocket(listener); + + /* The socket returned from accept() inherits the same parameters. */ + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = bind(listener, (const struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + len = sizeof(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ret = listen(listener, 2); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT | FD_WRITE); + check_events(ctx, FD_ACCEPT, 0, 200); + + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + ctx->socket = server; + check_events_todo(ctx, FD_WRITE, 0, 200); + check_events_todo_event(ctx, 0, 0, 0); + + closesocket(server); + closesocket(client); + + closesocket(listener); } static void test_connect_events(struct event_test_ctx *ctx)

2 years, 3 months

Zebediah Figura : winegstreamer: Always set the initial video type for the WMF reader to WG_VIDEO_FORMAT_BGR.

by Alexandre Julliard

Module: wine Branch: master Commit: 03d92af78a5000097b26560bba97320eb013441a URL: https://source.winehq.org/git/wine.git/?a=commit;h=03d92af78a5000097b26560b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 22:04:35 2021 -0600 winegstreamer: Always set the initial video type for the WMF reader to WG_VIDEO_FORMAT_BGR. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52273 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 8 +++++--- dlls/wmvcore/tests/wmvcore.c | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 3a1f1684fdc..693e9adfc19 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1503,9 +1503,11 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size) { /* Call of Juarez: Bound in Blood breaks if I420 is enumerated. * Some native decoders output I420, but the msmpeg4v3 decoder - * never does. */ - if (stream->format.u.video.format == WG_VIDEO_FORMAT_I420) - stream->format.u.video.format = WG_VIDEO_FORMAT_YV12; + * never does. + * + * Shadowgrounds provides wmv3 video and assumes that the initial + * video type will be BGR. */ + stream->format.u.video.format = WG_VIDEO_FORMAT_BGR; } wg_parser_stream_enable(stream->wg_stream, &stream->format); } diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 66ad89a185e..1b9cffaee1d 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -2388,6 +2388,8 @@ static void test_async_reader_types(void) else { ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); + /* Shadowgrounds assumes that the initial video type will be RGB24. */ + ok(IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24), "Got subtype %s.\n", debugstr_guid(&mt->subtype)); got_video = true; check_video_type(mt); }

2 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021