October 2020 - Wine-commits

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

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

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 : wintrust: Stub CryptCATPutMemberInfo().
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 63523b55be712466023bdc1464724b9fcf4adfb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63523b55be712466023bdc14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Oct 18 12:58:11 2020 -0500 wintrust: Stub CryptCATPutMemberInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 13 +++++++++++++ dlls/wintrust/wintrust.spec | 2 +- include/mscat.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 975d51f14fd..15b21a299f3 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -848,6 +848,19 @@ BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO hcatinfo, CATALOG_INFO *info return TRUE; } +/*********************************************************************** + * CryptCATPutMemberInfo (WINTRUST.@) + */ +CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, + WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data) +{ + FIXME("catalog %p, filename %s, member %s, subject %s, version %u, size %u, data %p, stub!\n", + catalog, debugstr_w(filename), debugstr_w(member), debugstr_guid(subject), version, size, data); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + /*********************************************************************** * CryptCATOpen (WINTRUST.@) */ diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 7ebd53f0396..a01d1dd93c9 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -37,7 +37,7 @@ @ stub CryptCATPersistStore @ stub CryptCATPutAttrInfo @ stub CryptCATPutCatAttrInfo -@ stub CryptCATPutMemberInfo +@ stdcall CryptCATPutMemberInfo(ptr wstr wstr ptr long long ptr) @ stub CryptCATStoreFromHandle @ stub CryptCATVerifyMember @ stdcall CryptSIPCreateIndirectData(ptr ptr ptr) diff --git a/include/mscat.h b/include/mscat.h index 4571a0b2647..3931b71596c 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -131,6 +131,7 @@ CRYPTCATATTRIBUTE * WINAPI CryptCATGetAttrInfo(HANDLE, CRYPTCATMEMBER *, LPWSTR) CRYPTCATATTRIBUTE * WINAPI CryptCATGetCatAttrInfo(HANDLE, LPWSTR); CRYPTCATMEMBER * WINAPI CryptCATGetMemberInfo(HANDLE, LPWSTR); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); +CRYPTCATMEMBER * WINAPI CryptCATPutMemberInfo(HANDLE catalog, WCHAR *filename, WCHAR *member, GUID *subject, DWORD version, DWORD size, BYTE *data); #ifdef __cplusplus }

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: 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: 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

Nikolay Sivov : mf/tests: Add a test for EVRConfig_ handling for already initialized presenter.
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: bfeae85fdd210ebecd69923ad172fb490c784f21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfeae85fdd210ebecd69923a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 16 16:38:08 2020 +0300 mf/tests: Add a test for EVRConfig_ handling for already initialized presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 465bd7e3c43..7dc325424a6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -39,6 +39,7 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, #include "mferror.h" #include "mfidl.h" #include "initguid.h" +#include "uuids.h" #include "mmdeviceapi.h" #include "audioclient.h" #include "evr.h" @@ -3237,6 +3238,7 @@ static void test_evr(void) { IMFVideoSampleAllocatorCallback *allocator_callback; IMFStreamSink *stream_sink, *stream_sink2; + IMFVideoDisplayControl *display_control; IMFMediaType *media_type, *media_type2; IMFMediaEventGenerator *ev_generator; IMFVideoSampleAllocator *allocator; @@ -3292,6 +3294,15 @@ static void test_evr(void) hr = IMFAttributes_GetCount(attributes, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!count, "Unexpected count %u.\n", count); + /* Rendering preferences are not immediately propagated to the presenter. */ + hr = IMFAttributes_SetUINT32(attributes, &EVRConfig_ForceBob, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = MFGetService((IUnknown *)sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoDisplayControl_GetRenderingPrefs(display_control, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!flags, "Unexpected flags %#x.\n", flags); + IMFVideoDisplayControl_Release(display_control); IMFAttributes_Release(attributes); /* Primary stream type handler. */

1 0

Nikolay Sivov : mf/evr: Add per-stream lock.
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: bd86e9341657f47a19f608c47f488f39d3703c86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd86e9341657f47a19f608c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 16 16:38:09 2020 +0300 mf/evr: Add per-stream lock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index af9bd9e0e42..ac80193ddd6 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -47,6 +47,7 @@ struct video_stream struct video_renderer *parent; IMFMediaEventQueue *event_queue; IMFVideoSampleAllocator *allocator; + CRITICAL_SECTION cs; }; struct video_renderer @@ -213,6 +214,7 @@ static ULONG WINAPI video_stream_sink_Release(IMFStreamSink *iface) IMFMediaEventQueue_Release(stream->event_queue); if (stream->allocator) IMFVideoSampleAllocator_Release(stream->allocator); + DeleteCriticalSection(&stream->cs); heap_free(stream); } @@ -260,20 +262,23 @@ static HRESULT WINAPI video_stream_sink_QueueEvent(IMFStreamSink *iface, MediaEv static HRESULT WINAPI video_stream_sink_GetMediaSink(IMFStreamSink *iface, IMFMediaSink **sink) { struct video_stream *stream = impl_from_IMFStreamSink(iface); + HRESULT hr = S_OK; TRACE("%p, %p.\n", iface, sink); + EnterCriticalSection(&stream->cs); if (!stream->parent) - return MF_E_STREAMSINK_REMOVED; - - if (!sink) - return E_POINTER; - - /* FIXME: not entirely safe if sink is being shut down. */ - *sink = &stream->parent->IMFMediaSink_iface; - IMFMediaSink_AddRef(*sink); + hr = MF_E_STREAMSINK_REMOVED; + else if (!sink) + hr = E_POINTER; + else + { + *sink = &stream->parent->IMFMediaSink_iface; + IMFMediaSink_AddRef(*sink); + } + LeaveCriticalSection(&stream->cs); - return S_OK; + return hr; } static HRESULT WINAPI video_stream_sink_GetIdentifier(IMFStreamSink *iface, DWORD *id) @@ -533,6 +538,7 @@ static HRESULT video_renderer_stream_create(struct video_renderer *renderer, uns stream->IMFMediaTypeHandler_iface.lpVtbl = &video_stream_type_handler_vtbl; stream->IMFGetService_iface.lpVtbl = &video_stream_get_service_vtbl; stream->refcount = 1; + InitializeCriticalSection(&stream->cs); if (FAILED(hr = MFCreateEventQueue(&stream->event_queue))) goto failed; @@ -894,10 +900,15 @@ static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) /* Detach streams from the sink. */ for (i = 0; i < renderer->stream_count; ++i) { - IMFMediaSink_Release(&renderer->streams[i]->parent->IMFMediaSink_iface); - renderer->streams[i]->parent = NULL; - IMFMediaEventQueue_Shutdown(renderer->streams[i]->event_queue); - IMFStreamSink_Release(&renderer->streams[i]->IMFStreamSink_iface); + struct video_stream *stream = renderer->streams[i]; + + EnterCriticalSection(&stream->cs); + stream->parent = NULL; + LeaveCriticalSection(&stream->cs); + + IMFMediaEventQueue_Shutdown(stream->event_queue); + IMFStreamSink_Release(&stream->IMFStreamSink_iface); + IMFMediaSink_Release(iface); renderer->streams[i] = NULL; } heap_free(renderer->streams);

1 0

Nikolay Sivov : mf/evr: Implement NotifyPreroll().
by Alexandre Julliard 16 Oct '20

16 Oct '20

Module: wine Branch: master Commit: 4e11368295174a7dc39647b19fb172bb0770e9b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e11368295174a7dc39647b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 16 16:38:10 2020 +0300 mf/evr: Implement NotifyPreroll(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index ac80193ddd6..0cd13c25501 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -35,6 +35,12 @@ enum video_renderer_flags EVR_PRESENTER_INITED_SERVICES = 0x8, }; +enum video_stream_flags +{ + EVR_STREAM_PREROLLING = 0x1, + EVR_STREAM_PREROLLED = 0x2, +}; + struct video_renderer; struct video_stream @@ -44,6 +50,7 @@ struct video_stream IMFGetService IMFGetService_iface; LONG refcount; unsigned int id; + unsigned int flags; struct video_renderer *parent; IMFMediaEventQueue *event_queue; IMFVideoSampleAllocator *allocator; @@ -318,8 +325,19 @@ static HRESULT WINAPI video_stream_sink_GetMediaTypeHandler(IMFStreamSink *iface static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample *sample) { + struct video_stream *stream = impl_from_IMFStreamSink(iface); + FIXME("%p, %p.\n", iface, sample); + EnterCriticalSection(&stream->cs); + if (stream->flags & EVR_STREAM_PREROLLING) + { + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPrerolled, &GUID_NULL, S_OK, NULL); + stream->flags &= ~EVR_STREAM_PREROLLING; + stream->flags |= EVR_STREAM_PREROLLED; + } + LeaveCriticalSection(&stream->cs); + return E_NOTIMPL; } @@ -958,9 +976,34 @@ static ULONG WINAPI video_renderer_preroll_Release(IMFMediaSinkPreroll *iface) static HRESULT WINAPI video_renderer_preroll_NotifyPreroll(IMFMediaSinkPreroll *iface, MFTIME start_time) { - FIXME("%p, %s.\n", iface, debugstr_time(start_time)); + struct video_renderer *renderer = impl_from_IMFMediaSinkPreroll(iface); + HRESULT hr = S_OK; + size_t i; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_time(start_time)); + + EnterCriticalSection(&renderer->cs); + if (renderer->flags & EVR_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + { + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + + EnterCriticalSection(&stream->cs); + if (!(stream->flags & (EVR_STREAM_PREROLLING | EVR_STREAM_PREROLLED))) + { + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkRequestSample, + &GUID_NULL, S_OK, NULL); + stream->flags |= EVR_STREAM_PREROLLING; + } + LeaveCriticalSection(&stream->cs); + } + } + LeaveCriticalSection(&renderer->cs); + + return hr; } static const IMFMediaSinkPrerollVtbl video_renderer_preroll_vtbl =

1 0