wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Roman Pišl : kernelbase: Fix comment and trace message in console.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: c8af17187ef48816cdf42ced5ade7ee5d8d2842a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8af17187ef48816cdf42ced… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Oct 18 12:47:42 2020 +0200 kernelbase: Fix comment and trace message in console. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index d387b49c534..71c594b3c18 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -351,7 +351,7 @@ BOOL WINAPI AllocConsole(void) memset(&console_si, 0, sizeof(console_si)); console_si.cb = sizeof(console_si); - /* setup a view arguments for wineconsole (it'll use them as default values) */ + /* setup a view arguments for conhost (it'll use them as default values) */ if (app_si.dwFlags & STARTF_USECOUNTCHARS) { console_si.dwFlags |= STARTF_USECOUNTCHARS; @@ -386,7 +386,7 @@ BOOL WINAPI AllocConsole(void) if (!init_console_std_handles( !(app_si.dwFlags & STARTF_USESTDHANDLES) )) goto error; RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = console; - TRACE( "Started wineconsole pid=%08x tid=%08x\n", pi.dwProcessId, pi.dwThreadId ); + TRACE( "Started conhost pid=%08x tid=%08x\n", pi.dwProcessId, pi.dwThreadId ); CloseHandle( server ); RtlLeaveCriticalSection( &console_section );

1 0

Zebediah Figura : wine.inf: IsInstalled is a DWORD value.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: cb8d58598b3b95f21ebc1d4f325cced930fedceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb8d58598b3b95f21ebc1d4f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 17 10:01:30 2020 -0500 wine.inf: IsInstalled is a DWORD value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50016 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ff9a221feaa..fba071fe0d8 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -764,19 +764,19 @@ HKCU,Software\Microsoft\Protected Storage System Provider,,16 ; Some apps requires at least four subkeys of Active Setup\Installed Components HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},,2,"DirectDrawEx" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"ComponentID",2,"DirectDrawEx" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"IsInstalled",0x10003,1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Version",2,"4,71,1113,0" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},,2,"HTML Help" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"ComponentID",2,"HTMLHelp" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"IsInstalled",0x10003,1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Version",2,"4,74,9273,0" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},,2,"Windows Media Player" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"ComponentID",2,"wmp" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"IsInstalled",0x10003,1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Version",2,"12,0,7601,18840"

1 0

Michael Stefaniuc : wbemprox: Use wide-char string literals.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 99392eafaac89d39a69cc31e178eec211de40b74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99392eafaac89d39a69cc31e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:22:01 2020 +0200 wbemprox: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8daa55eaeb4..590714b826b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1320,7 +1320,7 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond static enum fill_status fill_cdromdrive( struct table *table, const struct expr *cond ) { - WCHAR drive[3], root[] = {'A',':','\\',0}; + WCHAR drive[3], root[] = L"A:\\"; struct record_cdromdrive *rec; UINT i, row = 0, offset = 0; DWORD drives = GetLogicalDrives(); @@ -1846,7 +1846,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c { struct record_datafile *rec; UINT i, len, row = 0, offset = 0, num_expected_rows; - WCHAR *glob = NULL, *path = NULL, *new_path, root[] = {'A',':','\\',0}; + WCHAR *glob = NULL, *path = NULL, *new_path, root[] = L"A:\\"; DWORD drives = GetLogicalDrives(); WIN32_FIND_DATAW data; HANDLE handle; @@ -1974,7 +1974,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * { struct record_directory *rec; UINT i, len, row = 0, offset = 0, num_expected_rows; - WCHAR *glob = NULL, *path = NULL, *new_path, root[] = {'A',':','\\',0}; + WCHAR *glob = NULL, *path = NULL, *new_path, root[] = L"A:\\"; DWORD drives = GetLogicalDrives(); WIN32_FIND_DATAW data; HANDLE handle; @@ -2071,7 +2071,7 @@ done: static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) { - WCHAR root[] = {'\\','\\','.','\\','A',':',0}; + WCHAR root[] = L"\\\\.\\A:"; ULARGE_INTEGER free; DISK_GEOMETRY_EX info; HANDLE handle; @@ -2130,7 +2130,7 @@ done: static enum fill_status fill_diskdrive( struct table *table, const struct expr *cond ) { static const WCHAR fmtW[] = L"\\\\\\\\.\\\\PHYSICALDRIVE%u"; - WCHAR device_id[ARRAY_SIZE( fmtW ) + 10], root[] = {'A',':','\\',0}; + WCHAR device_id[ARRAY_SIZE( fmtW ) + 10], root[] = L"A:\\"; struct record_diskdrive *rec; UINT i, row = 0, offset = 0, index = 0, type; UINT64 size = 1024 * 1024 * 1024; @@ -2283,7 +2283,7 @@ static WCHAR *get_filesystem( const WCHAR *root ) static enum fill_status fill_diskpartition( struct table *table, const struct expr *cond ) { - WCHAR device_id[32], root[] = {'A',':','\\',0}; + WCHAR device_id[32], root[] = L"A:\\"; struct record_diskpartition *rec; UINT i, row = 0, offset = 0, type, index = 0; UINT64 size = 1024 * 1024 * 1024; @@ -2435,7 +2435,7 @@ static WCHAR *get_volumeserialnumber( const WCHAR *root ) static enum fill_status fill_logicaldisk( struct table *table, const struct expr *cond ) { - WCHAR device_id[3], root[] = {'A',':','\\',0}; + WCHAR device_id[3], root[] = L"A:\\"; struct record_logicaldisk *rec; UINT i, row = 0, offset = 0, type; UINT64 size = 1024 * 1024 * 1024;

1 0

Michael Stefaniuc : wbemprox: Use 0 terminated WCHAR strings in wql.y.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: a03b796cc24edf7861a4499cd1ba6d53b9d7b8cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=a03b796cc24edf7861a4499c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:22:02 2020 +0200 wbemprox: Use 0 terminated WCHAR strings in wql.y. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wql.y | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index f5b249aaba4..95c8d8fe817 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -637,38 +637,25 @@ struct wql_keyword #define MIN_TOKEN_LEN 2 #define MAX_TOKEN_LEN 11 -static const WCHAR andW[] = {'A','N','D'}; -static const WCHAR associatorsW[] = {'A','S','S','O','C','I','A','T','O','R','S'}; -static const WCHAR byW[] = {'B','Y'}; -static const WCHAR falseW[] = {'F','A','L','S','E'}; -static const WCHAR fromW[] = {'F','R','O','M'}; -static const WCHAR isW[] = {'I','S'}; -static const WCHAR likeW[] = {'L','I','K','E'}; -static const WCHAR notW[] = {'N','O','T'}; -static const WCHAR nullW[] = {'N','U','L','L'}; -static const WCHAR ofW[] = {'O','F'}; -static const WCHAR orW[] = {'O','R'}; -static const WCHAR selectW[] = {'S','E','L','E','C','T'}; -static const WCHAR trueW[] = {'T','R','U','E'}; -static const WCHAR whereW[] = {'W','H','E','R','E'}; - +#define X(str) str, ARRAY_SIZE(str) - 1 static const struct wql_keyword keyword_table[] = { - { andW, ARRAY_SIZE(andW), TK_AND }, - { associatorsW, ARRAY_SIZE(associatorsW), TK_ASSOCIATORS }, - { byW, ARRAY_SIZE(byW), TK_BY }, - { falseW, ARRAY_SIZE(falseW), TK_FALSE }, - { fromW, ARRAY_SIZE(fromW), TK_FROM }, - { isW, ARRAY_SIZE(isW), TK_IS }, - { likeW, ARRAY_SIZE(likeW), TK_LIKE }, - { notW, ARRAY_SIZE(notW), TK_NOT }, - { nullW, ARRAY_SIZE(nullW), TK_NULL }, - { ofW, ARRAY_SIZE(ofW), TK_OF }, - { orW, ARRAY_SIZE(orW), TK_OR }, - { selectW, ARRAY_SIZE(selectW), TK_SELECT }, - { trueW, ARRAY_SIZE(trueW), TK_TRUE }, - { whereW, ARRAY_SIZE(whereW), TK_WHERE } + { X(L"AND"), TK_AND }, + { X(L"ASSOCIATORS"), TK_ASSOCIATORS }, + { X(L"BY"), TK_BY }, + { X(L"FALSE"), TK_FALSE }, + { X(L"FROM"), TK_FROM }, + { X(L"IS"), TK_IS }, + { X(L"LIKE"), TK_LIKE }, + { X(L"NOT"), TK_NOT }, + { X(L"NULL"), TK_NULL }, + { X(L"OF"), TK_OF }, + { X(L"OR"), TK_OR }, + { X(L"SELECT"), TK_SELECT }, + { X(L"TRUE"), TK_TRUE }, + { X(L"WHERE"), TK_WHERE } }; +#undef X static int __cdecl cmp_keyword( const void *arg1, const void *arg2 ) {

1 0

Zebediah Figura : ws2_32/tests: Add more tests for passing short buffers to AcceptEx().
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: 0c249e6125fc9dc6ee86b4ef6ae0d9fa2fc6291b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c249e6125fc9dc6ee86b4ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 14:57:31 2020 -0500 ws2_32/tests: Add more tests for passing short buffers to AcceptEx(). 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 | 105 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 98 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e92442eb00d..5fb85bfaa60 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7334,6 +7334,7 @@ static void test_AcceptEx(void) DWORD dwret; memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); listener = socket(AF_INET, SOCK_STREAM, 0); ok(listener != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); @@ -7341,9 +7342,6 @@ static void test_AcceptEx(void) acceptor = socket(AF_INET, SOCK_STREAM, 0); ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - connector = socket(AF_INET, SOCK_STREAM, 0); - ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - memset(&bindAddress, 0, sizeof(bindAddress)); bindAddress.sin_family = AF_INET; bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); @@ -7408,8 +7406,101 @@ todo_wine "AcceptEx on too small local address size returned %d + errno %d\n", bret, WSAGetLastError()); ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); - bret = CancelIo((HANDLE) listener); - ok(bret, "Failed to cancel pending accept socket\n"); + + connector = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(connector != -1, "failed to create socket, error %u\n", WSAGetLastError()); + iret = connect(connector, (struct sockaddr *)&bindAddress, sizeof(bindAddress)); + ok(!iret, "failed to connect, error %u\n", WSAGetLastError()); + iret = getsockname(connector, (struct sockaddr *)&peerAddress, &remoteSize); + ok(!iret, "getsockname failed, error %u\n", WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!dwret, "wait failed\n"); + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + ok(bret, "got error %u\n", GetLastError()); + ok(!(NTSTATUS)overlapped.Internal, "got %#lx\n", overlapped.Internal); + ok(!bytesReturned, "got size %u\n", bytesReturned); + + readBindAddress = readRemoteAddress = (struct sockaddr_in *)0xdeadbeef; + localSize = remoteSize = 0xdeadbeef; + pGetAcceptExSockaddrs(buffer, 0, 0, sizeof(struct sockaddr_in) + 16, + (struct sockaddr **)&readBindAddress, &localSize, (struct sockaddr **)&readRemoteAddress, &remoteSize); + todo_wine ok(readBindAddress == (struct sockaddr_in *)0xdeadbeef, "got local addr %p\n", readBindAddress); + ok(!memcmp(readRemoteAddress, &peerAddress, sizeof(peerAddress)), "remote addr didn't match\n"); + todo_wine ok(localSize == 0xdeadbeef, "got local size %u\n", localSize); + ok(remoteSize == sizeof(struct sockaddr_in), "got remote size %u\n", remoteSize); + + closesocket(connector); + closesocket(acceptor); + + acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(acceptor != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor, buffer, 0, 3, + sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret && WSAGetLastError() == ERROR_IO_PENDING, "got %d, error %u\n", bret, WSAGetLastError()); + ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "got %#lx\n", overlapped.Internal); + + connector = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(connector != -1, "failed to create socket, error %u\n", WSAGetLastError()); + iret = connect(connector, (struct sockaddr *)&bindAddress, sizeof(bindAddress)); + ok(!iret, "failed to connect, error %u\n", WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!dwret, "wait failed\n"); + bytesReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + todo_wine ok(!bret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); + todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", overlapped.Internal); + ok(!bytesReturned, "got size %u\n", bytesReturned); + + closesocket(acceptor); + + /* The above connection request is not accepted. */ + acceptor = accept(listener, NULL, NULL); + todo_wine ok(acceptor != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(acceptor); + + closesocket(connector); + + acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(acceptor != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 4, + sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret && WSAGetLastError() == ERROR_IO_PENDING, "got %d, error %u\n", bret, WSAGetLastError()); + ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "got %#lx\n", overlapped.Internal); + + connector = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(connector != -1, "failed to create socket, error %u\n", WSAGetLastError()); + iret = connect(connector, (struct sockaddr *)&bindAddress, sizeof(bindAddress)); + ok(!iret, "failed to connect, error %u\n", WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!dwret, "wait failed\n"); + bytesReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + todo_wine ok(!bret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); + todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", overlapped.Internal); + ok(!bytesReturned, "got size %u\n", bytesReturned); + + closesocket(acceptor); + + /* The above connection request is not accepted. */ + acceptor = accept(listener, NULL, NULL); + todo_wine ok(acceptor != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(acceptor); + + closesocket(connector); + + acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(acceptor != -1, "failed to create socket, error %u\n", WSAGetLastError()); overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 15, @@ -7447,8 +7538,6 @@ todo_wine ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "AcceptEx on a NULL overlapped " "returned %d + errno %d\n", bret, WSAGetLastError()); - overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, @@ -7499,6 +7588,8 @@ todo_wine ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); } + connector = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(connector != -1, "failed to create socket, error %u\n", WSAGetLastError()); overlapped.Internal = 0xdeadbeef; iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError());

1 0

Zebediah Figura : ws2_32/tests: Fix a test failure on w10pro64.
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: 2aebe0b628a171abd2ffb63054e3d3d0da60dd05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aebe0b628a171abd2ffb630… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 14:57:30 2020 -0500 ws2_32/tests: Fix a test failure on w10pro64. 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 | 63 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e917705d3d1..e92442eb00d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6268,7 +6268,7 @@ static BOOL poll_isset(WSAPOLLFD *fds, int max, SOCKET s, int rev) static void test_WSAPoll(void) { - int ix, ret, err, poll_timeout; + int ix, ret, err; SOCKET fdListen, fdRead, fdWrite; struct sockaddr_in address; socklen_t len; @@ -6315,19 +6315,18 @@ static void test_WSAPoll(void) address.sin_family = AF_INET; len = sizeof(address); fdListen = setup_server_socket(&address, &len); - poll_timeout = 100; /* When no events are pending poll returns 0 with no error */ POLL_CLEAR(); POLL_SET(fdListen, POLLIN); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 100); ok(ret == 0, "expected 0, got %d\n", ret); /* Test listening socket connection attempt notifications */ fdWrite = setup_connector_socket(&address, len, TRUE); POLL_CLEAR(); POLL_SET(fdListen, POLLIN | POLLOUT); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 100); ok(ret == 1, "expected 1, got %d\n", ret); ok(POLL_ISSET(fdListen, POLLRDNORM), "fdListen socket events incorrect\n"); len = sizeof(address); @@ -6339,7 +6338,7 @@ static void test_WSAPoll(void) POLL_SET(fdListen, POLLIN | POLLOUT); POLL_SET(fdRead, POLLIN | POLLOUT); POLL_SET(fdWrite, POLLIN | POLLOUT); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 100); ok(ret == 2, "expected 2, got %d\n", ret); ok(POLL_ISSET(fdWrite, POLLWRNORM), "fdWrite socket events incorrect\n"); ok(POLL_ISSET(fdRead, POLLWRNORM), "fdRead socket events incorrect\n"); @@ -6355,7 +6354,7 @@ static void test_WSAPoll(void) POLL_CLEAR(); POLL_SET(fdListen, POLLIN | POLLOUT); POLL_SET(fdRead, POLLIN); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 100); ok(ret == 1, "expected 1, got %d\n", ret); ok(POLL_ISSET(fdRead, POLLRDNORM), "fdRead socket events incorrect\n"); ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), 0); @@ -6368,7 +6367,7 @@ static void test_WSAPoll(void) POLL_CLEAR(); POLL_SET(fdListen, POLLIN | POLLOUT); POLL_SET(fdRead, POLLIN); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 100); ok(ret == 1, "expected 1, got %d\n", ret); ok(POLL_ISSET(fdRead, POLLRDBAND), "fdRead socket events incorrect\n"); tmp_buf[0] = 0xAF; @@ -6385,7 +6384,7 @@ static void test_WSAPoll(void) POLL_CLEAR(); POLL_SET(fdListen, POLLIN | POLLOUT); POLL_SET(fdRead, POLLIN | POLLOUT); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 100); ok(ret == 1, "expected 1, got %d\n", ret); tmp_buf[0] = 0xAF; SetLastError(0xdeadbeef); @@ -6402,34 +6401,34 @@ static void test_WSAPoll(void) POLL_CLEAR(); POLL_SET(fdListen, POLLIN | POLLOUT); POLL_SET(fdWrite, POLLIN); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 100); ok(ret == 1, "expected 1, got %d\n", ret); ok(POLL_ISSET(fdWrite, POLLHUP), "fdWrite socket events incorrect\n"); ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0); ok(ret == 0, "expected 0, got %d\n", ret); - - /* When a connection is attempted to a non-listening socket due to a bug - * in the MS code it will never be notified. This is a long standing issue - * that will never be fixed for compatibility reasons so we have to deal - * with it manually. */ ret = closesocket(fdWrite); ok(ret == 0, "expected 0, got %d\n", ret); ret = closesocket(fdListen); ok(ret == 0, "expected 0, got %d\n", ret); - len = sizeof(address); - fdWrite = setup_connector_socket(&address, len, TRUE); - POLL_CLEAR(); - POLL_SET(fdWrite, POLLIN | POLLOUT); - poll_timeout = 2000; - ret = pWSAPoll(fds, ix, poll_timeout); -todo_wine - ok(ret == 0, "expected 0, got %d\n", ret); - len = sizeof(id); - id = 0xdeadbeef; - err = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); - ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); - closesocket(fdWrite); + + /* The following WSAPoll() call times out on versions older than w10pro64, + * but even on w10pro64 it takes over 2 seconds for an error to be reported, + * so make the test interactive-only. */ + if (winetest_interactive) + { + len = sizeof(address); + fdWrite = setup_connector_socket(&address, len, TRUE); + POLL_CLEAR(); + POLL_SET(fdWrite, POLLIN | POLLOUT); + ret = pWSAPoll(fds, ix, 10000); + ok(ret == 1, "expected 0, got %d\n", ret); + len = sizeof(id); + id = 0xdeadbeef; + err = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); + closesocket(fdWrite); + } /* Try poll() on a closed socket after connection */ tcp_socketpair(&fdRead, &fdWrite); @@ -6437,12 +6436,12 @@ todo_wine POLL_CLEAR(); POLL_SET(fdWrite, POLLIN | POLLOUT); POLL_SET(fdRead, POLLIN | POLLOUT); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 2000); ok(ret == 1, "expected 1, got %d\n", ret); ok(POLL_ISSET(fdRead, POLLNVAL), "fdRead socket events incorrect\n"); POLL_CLEAR(); POLL_SET(fdWrite, POLLIN | POLLOUT); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 2000); ok(ret == 1, "expected 1, got %d\n", ret); todo_wine ok(POLL_ISSET(fdWrite, POLLWRNORM | POLLHUP) || broken(POLL_ISSET(fdWrite, POLLWRNORM)) /* <= 2008 */, @@ -6455,7 +6454,7 @@ todo_wine ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); POLL_CLEAR(); POLL_SET(fdWrite, POLLIN | POLLOUT); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 2000); ok(ret == 1, "expected 1, got %d\n", ret); ok(POLL_ISSET(fdWrite, POLLWRNORM), "fdWrite socket events incorrect\n"); WaitForSingleObject (thread_handle, 1000); @@ -6466,7 +6465,7 @@ todo_wine ok(thread_handle != NULL, "CreateThread failed unexpectedly: %d\n", GetLastError()); POLL_CLEAR(); POLL_SET(fdWrite, POLLIN); - ret = pWSAPoll(fds, ix, poll_timeout); + ret = pWSAPoll(fds, ix, 2000); ok(ret == 1, "expected 1, got %d\n", ret); ok(POLL_ISSET(fdWrite, POLLNVAL), "fdWrite socket events incorrect\n"); WaitForSingleObject (thread_handle, 1000);

1 0

Zebediah Figura : ws2_32/tests: Remove workarounds from test_events().
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: ff8b5a51d7e961ec506d1695a139c0a6079a3fd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff8b5a51d7e961ec506d1695… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 14:57:29 2020 -0500 ws2_32/tests: Remove workarounds from test_events(). 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 | 182 +++++++++++++---------------------------------- 1 file changed, 48 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff8b5a51d7e961ec506d…

1 0

Zebediah Figura : ws2_32/tests: Remove some workarounds for no longer supported versions of Windows.
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: 102c7903ead405d3236dfd843d40b96c38d784ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=102c7903ead405d3236dfd84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 14:57:28 2020 -0500 ws2_32/tests: Remove some workarounds for no longer supported versions of Windows. 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 | 86 +++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 55 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 834cca71960..9143518f4e8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1048,8 +1048,8 @@ static void WINAPI event_client ( client_params *par ) break; } n = recv ( mem->s, recv_p, min ( recv_last - recv_p, par->buflen ), 0 ); - if ( n < 0 && ( err = WSAGetLastError()) != WSAEWOULDBLOCK ) - ok ( 0, "event_client (%x): read error: %d\n", id, err ); + ok(n >= 0 || WSAGetLastError() == WSAEWOULDBLOCK, + "event_client (%x): got error %u\n", id, WSAGetLastError()); } } @@ -1364,16 +1364,15 @@ static void test_set_getsockopt(void) for( i = 0; i < ARRAY_SIZE(linger_testvals);i++) { size = sizeof(lingval); lingval = linger_testvals[i]; - err = setsockopt(s, SOL_SOCKET, SO_LINGER, (char *) &lingval, size); - if( !err) - err = getsockopt(s, SOL_SOCKET, SO_LINGER, (char *) &lingval, &size); - ok( !err, "get/setsockopt(SO_LINGER) failed error: %d\n", WSAGetLastError()); - ok( !lingval.l_onoff == !linger_testvals[i].l_onoff && - (lingval.l_linger == linger_testvals[i].l_linger || - (!lingval.l_linger && !linger_testvals[i].l_onoff)) - , "getsockopt(SO_LINGER #%d) returned wrong value %d,%d not %d,%d\n", i, - lingval.l_onoff, lingval.l_linger, - linger_testvals[i].l_onoff, linger_testvals[i].l_linger); + err = setsockopt(s, SOL_SOCKET, SO_LINGER, (char *)&lingval, size); + ok(!err, "Test %u: failed to set SO_LINGER, error %u\n", i, WSAGetLastError()); + err = getsockopt(s, SOL_SOCKET, SO_LINGER, (char *)&lingval, &size); + ok(!err, "Test %u: failed to get SO_LINGER, error %u\n", i, WSAGetLastError()); + ok(!lingval.l_onoff == !linger_testvals[i].l_onoff, "Test %u: expected %d, got %d\n", + i, linger_testvals[i].l_onoff, lingval.l_onoff); + if (lingval.l_onoff) + ok(lingval.l_linger == linger_testvals[i].l_linger, "Test %u: expected %d, got %d\n", + i, linger_testvals[i].l_linger, lingval.l_linger); } size = sizeof(lingval); @@ -2583,8 +2582,7 @@ static void test_WSASocket(void) sock = WSASocketA(AF_IPX, SOCK_DGRAM, NSPROTO_IPX, NULL, 0, 0); if (sock == INVALID_SOCKET) { - err = WSAGetLastError(); - ok(err == WSAEAFNOSUPPORT || broken(err == WSAEPROTONOSUPPORT), "Expected 10047, received %d\n", err); + ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); skip("IPX is not supported\n"); } else @@ -3752,11 +3750,7 @@ static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len, BOOL non if (!nonblock) ok(!ret, "connecting to accepting socket failed %d\n", WSAGetLastError()); else if (ret == SOCKET_ERROR) - { - DWORD error = WSAGetLastError(); - ok(error == WSAEWOULDBLOCK || error == WSAEINPROGRESS, - "expected 10035 or 10036, got %d\n", error); - } + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); return connector; } @@ -4648,13 +4642,11 @@ static void test_ioctlsocket(void) ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &arg, 0, NULL, 0, &arg, NULL, NULL); ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); - ret = WSAGetLastError(); - ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, NULL, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); - ret = WSAGetLastError(); - ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); make_keepalive(kalive, 0, 0, 0); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); @@ -4835,8 +4827,8 @@ static void test_send(void) bytes_sent = 0; WSASetLastError(12345); ret = WSASend(dst, &buf, 1, &bytes_sent, 0, &ov, NULL); - ok((ret == SOCKET_ERROR && WSAGetLastError() == ERROR_IO_PENDING) || broken(bytes_sent == buflen), - "Failed to start overlapped send %d - %d - %d/%d\n", ret, WSAGetLastError(), bytes_sent, buflen); + ok(ret == SOCKET_ERROR, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "wrong error %u\n", WSAGetLastError()); /* don't check for completion yet, we may need to drain the buffer while still sending */ set_blocking(src, FALSE); @@ -6087,8 +6079,8 @@ static void test_WSARecv(void) ok(dwret == WAIT_OBJECT_0, "Waiting for disconnect event failed with %d + errno %d\n", dwret, GetLastError()); bret = GetOverlappedResult((HANDLE)dest, &ov, &bytesReturned, FALSE); - todo_wine ok(!bret && (GetLastError() == ERROR_NETNAME_DELETED || broken(GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */), - "Did not get disconnect event: %d, error %d\n", bret, GetLastError()); + todo_wine ok(!bret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED, "got error %u\n", GetLastError()); ok(bytesReturned == 0, "Bytes received is %d\n", bytesReturned); closesocket(dest); dest = INVALID_SOCKET; @@ -6105,17 +6097,17 @@ static void test_WSARecv(void) addr.sin_family = AF_INET; addr.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(server, (struct sockaddr *)&addr, sizeof(addr)); - if (iret) goto end; + ok(!iret, "failed to bind, error %u\n", WSAGetLastError()); len = sizeof(addr); iret = getsockname(server, (struct sockaddr *)&addr, &len); - if (iret) goto end; + ok(!iret, "failed to get address, error %u\n", WSAGetLastError()); iret = listen(server, 1); - if (iret) goto end; + ok(!iret, "failed to listen, error %u\n", WSAGetLastError()); iret = connect(src, (struct sockaddr *)&addr, sizeof(addr)); - if (iret) goto end; + ok(!iret, "failed to connect, error %u\n", WSAGetLastError()); len = sizeof(addr); dest = accept(server, (struct sockaddr *)&addr, &len); @@ -6772,7 +6764,7 @@ static void test_GetAddrInfoW(void) result2 = NULL; ret = GetAddrInfoW(idn_domain, NULL, NULL, &result2); - if (ret == WSAHOST_NOT_FOUND && broken(1)) + if (broken(ret == WSAHOST_NOT_FOUND)) { FreeAddrInfoW(result); win_skip("IDN resolution not supported in Win <= 7\n"); @@ -8590,9 +8582,6 @@ static void test_WSAAsyncGetServByPort(void) HANDLE ret; char buffer[MAXGETHOSTSTRUCT]; - if (!hwnd) - return; - /* FIXME: The asynchronous window messages should be tested. */ /* Parameters are not checked when initiating the asynchronous operation. */ @@ -8620,9 +8609,6 @@ static void test_WSAAsyncGetServByName(void) HANDLE ret; char buffer[MAXGETHOSTSTRUCT]; - if (!hwnd) - return; - /* FIXME: The asynchronous window messages should be tested. */ /* Parameters are not checked when initiating the asynchronous operation. */ @@ -9391,19 +9377,13 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED || - GetLastError() == ERROR_OPERATION_ABORTED || - GetLastError() == ERROR_CONNECTION_ABORTED || - GetLastError() == ERROR_PIPE_NOT_CONNECTED /* win 2000 */, - "Last error was %d\n", GetLastError()); + todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED + || GetLastError() == ERROR_CONNECTION_ABORTED, "got error %u\n", GetLastError()); ok(key == 125, "Key is %lu\n", key); ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT || - olp->Internal == (ULONG)STATUS_CANCELLED || - olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED || - olp->Internal == (ULONG)STATUS_PIPE_DISCONNECTED /* win 2000 */), - "Internal status is %lx\n", olp ? olp->Internal : 0); + todo_wine ok((NTSTATUS)olp->Internal == STATUS_CANCELLED + || (NTSTATUS)olp->Internal == STATUS_CONNECTION_ABORTED, "got status %#lx\n", olp->Internal); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -9550,14 +9530,10 @@ todo_wine ok(error == WSAEFAULT, "expected 10014, got %d\n", error); ret = WSALookupServiceBeginW(qs, 0, &hnd); - error = WSAGetLastError(); ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); -todo_wine - ok(error == WSAEINVAL - || broken(error == ERROR_INVALID_PARAMETER) /* == XP */ - || broken(error == WSAEFAULT) /* == NT */ - || broken(error == WSASERVICE_NOT_FOUND) /* == 2000 */, - "expected 10022, got %d\n", error); + todo_wine ok(WSAGetLastError() == ERROR_INVALID_PARAMETER + || broken(WSAGetLastError() == WSASERVICE_NOT_FOUND) /* win10 1809 */, + "got error %u\n", WSAGetLastError()); ret = WSALookupServiceEnd(NULL); error = WSAGetLastError();

1 0

Zebediah Figura : ws2_32/tests: Rewrite the CF_DEFER test in test_AcceptEx().
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: d1461b622eaf5acd1515e9c8925134e6d878d3fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1461b622eaf5acd1515e9c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 14:57:27 2020 -0500 ws2_32/tests: Rewrite the CF_DEFER test in test_AcceptEx(). The previous test in fact regularly failed on Windows, hidden by the presence of broken(), since both sockets could be connected before the listener was signaled. 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 | 92 ++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 58 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ba03e16ebb1..834cca71960 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7413,18 +7413,14 @@ static void test_ConnectEx(void) static void test_AcceptEx(void) { - SOCKET listener = INVALID_SOCKET; - SOCKET acceptor = INVALID_SOCKET; - SOCKET connector = INVALID_SOCKET; - SOCKET connector2 = INVALID_SOCKET; + SOCKET listener, acceptor, acceptor2, connector, connector2; struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress; int socklen, optlen; GUID acceptExGuid = WSAID_ACCEPTEX, getAcceptExGuid = WSAID_GETACCEPTEXSOCKADDRS; LPFN_ACCEPTEX pAcceptEx = NULL; LPFN_GETACCEPTEXSOCKADDRS pGetAcceptExSockaddrs = NULL; fd_set fds_accept, fds_send; - struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ - int got, conn1, i; + static const struct timeval timeout = {1, 0}; DWORD bytesReturned, connect_time; char buffer[1024], ipbuffer[32]; OVERLAPPED overlapped; @@ -7703,66 +7699,47 @@ todo_wine iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - FD_ZERO ( &fds_accept ); - FD_ZERO ( &fds_send ); + buffer[0] = '0'; - FD_SET ( listener, &fds_accept ); - FD_SET ( connector, &fds_send ); + FD_ZERO(&fds_accept); + FD_SET(listener, &fds_accept); + iret = select(0, &fds_accept, NULL, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - buffer[0] = '0'; - got = 0; - conn1 = 0; + acceptor2 = WSAAccept(listener, NULL, NULL, AlwaysDeferConditionFunc, 0); + ok(acceptor2 == INVALID_SOCKET, "expected failure\n"); + ok(WSAGetLastError() == WSATRY_AGAIN, "got error %u\n", WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, + sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); - for (i = 0; i < 4000; ++i) - { - fd_set fds_openaccept = fds_accept, fds_opensend = fds_send; + FD_ZERO(&fds_send); + FD_SET(connector, &fds_send); + iret = select(0, NULL, &fds_send, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - wsa_ok ( ( select ( 0, &fds_openaccept, &fds_opensend, NULL, &timeout ) ), SOCKET_ERROR !=, - "acceptex test(%d): could not select on socket, errno %d\n" ); + iret = send(connector, "1", 1, 0); + ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError()); - /* check for incoming requests */ - if ( FD_ISSET ( listener, &fds_openaccept ) ) { - got++; - if (got == 1) { - SOCKET tmp = WSAAccept(listener, NULL, NULL, (LPCONDITIONPROC) AlwaysDeferConditionFunc, 0); - ok(tmp == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection, %d\n", WSAGetLastError()); - bret = pAcceptEx(listener, acceptor, buffer, 0, - sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, - &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); - } - else if (got == 2) { - /* this should be socket #2 */ - SOCKET tmp = accept(listener, NULL, NULL); - ok(tmp != INVALID_SOCKET, "accept failed %d\n", WSAGetLastError()); - closesocket(tmp); - } - else { - ok(FALSE, "Got more than 2 connections?\n"); - } - } - if ( conn1 && FD_ISSET ( connector2, &fds_opensend ) ) { - /* Send data on second socket, and stop */ - send(connector2, "2", 1, 0); - FD_CLR ( connector2, &fds_send ); + iret = connect(connector2, (struct sockaddr *)&bindAddress, sizeof(bindAddress)); + ok(iret == SOCKET_ERROR, "expected failure\n"); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - break; - } - if ( FD_ISSET ( connector, &fds_opensend ) ) { - /* Once #1 is connected, allow #2 to connect */ - conn1 = 1; + iret = select(0, &fds_accept, NULL, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - send(connector, "1", 1, 0); - FD_CLR ( connector, &fds_send ); + acceptor2 = accept(listener, NULL, NULL); + ok(acceptor2 != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); + closesocket(acceptor2); - iret = connect(connector2, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - FD_SET ( connector2, &fds_send ); - } - } + FD_ZERO(&fds_send); + FD_SET(connector2, &fds_send); + iret = select(0, NULL, &fds_send, NULL, &timeout); + ok(iret == 1, "wait timed out\n"); - ok (got == 2 || broken(got == 1) /* NT4 */, - "Did not get both connections, got %d\n", got); + iret = send(connector2, "2", 1, 0); + ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 0); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); @@ -7774,7 +7751,6 @@ todo_wine set_blocking(acceptor, TRUE); iret = recv( acceptor, buffer, 2, 0); ok(iret == 1, "Failed to get data, %d, errno: %d\n", iret, WSAGetLastError()); - ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]); closesocket(connector);

1 0

Nikolay Sivov : mf/evr: Implement stream state change events.
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: 5a68001d695dd21348d9045be00ae9b8e2abf926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a68001d695dd21348d9045b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 16 16:38:11 2020 +0300 mf/evr: Implement stream state change events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 84 insertions(+), 8 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 0cd13c25501..957d0e0f797 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -35,6 +35,13 @@ enum video_renderer_flags EVR_PRESENTER_INITED_SERVICES = 0x8, }; +enum video_renderer_state +{ + EVR_STATE_STOPPED = 0, + EVR_STATE_RUNNING, + EVR_STATE_PAUSED, +}; + enum video_stream_flags { EVR_STREAM_PREROLLING = 0x1, @@ -77,6 +84,7 @@ struct video_renderer IMFTransform *mixer; IMFVideoPresenter *presenter; unsigned int flags; + unsigned int state; struct video_stream **streams; size_t stream_size; @@ -1338,30 +1346,98 @@ static ULONG WINAPI video_renderer_clock_sink_Release(IMFClockStateSink *iface) static HRESULT WINAPI video_renderer_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) { - FIXME("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + size_t i; - return E_NOTIMPL; + TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); + + EnterCriticalSection(&renderer->cs); + + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStarted, &GUID_NULL, S_OK, NULL); + + EnterCriticalSection(&stream->cs); + if (!(stream->flags & EVR_STREAM_PREROLLED)) + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkRequestSample, + &GUID_NULL, S_OK, NULL); + stream->flags |= EVR_STREAM_PREROLLED; + LeaveCriticalSection(&stream->cs); + } + renderer->state = EVR_STATE_RUNNING; + + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static HRESULT WINAPI video_renderer_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, debugstr_time(systime)); + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + size_t i; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + EnterCriticalSection(&renderer->cs); + + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStopped, &GUID_NULL, S_OK, NULL); + + EnterCriticalSection(&stream->cs); + stream->flags &= ~EVR_STREAM_PREROLLED; + LeaveCriticalSection(&stream->cs); + } + renderer->state = EVR_STATE_STOPPED; + + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static HRESULT WINAPI video_renderer_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, debugstr_time(systime)); + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + size_t i; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + EnterCriticalSection(&renderer->cs); + + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPaused, &GUID_NULL, S_OK, NULL); + } + renderer->state = EVR_STATE_PAUSED; + + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static HRESULT WINAPI video_renderer_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, debugstr_time(systime)); + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + size_t i; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(systime)); + + EnterCriticalSection(&renderer->cs); + + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStarted, &GUID_NULL, S_OK, NULL); + } + renderer->state = EVR_STATE_RUNNING; + + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static HRESULT WINAPI video_renderer_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate)

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
80
Older →

Jump to page:

2025

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 October 2020