- Wine-Devel - list.winehq.org

[PATCH] winemac.drv: Set view.WantsBestResolutionOpenGLSurface.
by Stefan Dösinger May 12, 2021

May 12, 2021

This used to default to false before Catalina, and it still does so when the application is built with XCode 10 or earlier. When building with XCode 11 or later Catalina and newer will create a high DPI GL view even if the window is low dpi. Because we don't adjust glViewport parameters (and glDrawPixels, etc) we render only to the lower left quadrant. --- Vulkan via MoltenVK already works correctly. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b6c5386469c..29ac32d6be0 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -685,6 +685,7 @@ - (void) setRetinaMode:(int)mode frame.size.width *= scale; frame.size.height *= scale; [self setFrame:frame]; + [self setWantsBestResolutionOpenGLSurface:mode]; [self updateGLContexts]; [super setRetinaMode:mode]; @@ -3575,6 +3576,7 @@ macdrv_view macdrv_create_view(CGRect rect) [view setAutoresizesSubviews:NO]; [view setAutoresizingMask:NSViewNotSizable]; [view setHidden:YES]; + [view setWantsBestResolutionOpenGLSurface:retina_on]; [nc addObserver:view selector:@selector(updateGLContexts) name:NSViewGlobalFrameDidChangeNotification -- 2.30.1 (Apple Git-130)

1 0

[PATCH] winegstreamer: Ensure that the source reports both PCM and floating point audio formats.
by Giovanni Mascellani May 12, 2021

May 12, 2021

From: Derek Lesho <dlesho(a)codeweavers.com> Unfortunately this causes a small regression in mfreadwrite tests. In an ideal world we would implement everything as in Windows, letting the media source just emit a compressed stream and having the stream reader decompress it to whatever the client is asking for. Since currently the source reader is unable to handle compressed streams, it makes sense to have winegstreamer's media source offer both PCM and floating point streams. The patch is originally by Derek Lesho, with some changes by Giovanni Mascellani. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 1 + dlls/winegstreamer/media_source.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 8ea4e5038f6..1967015e865 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -751,6 +751,7 @@ static void test_source_reader(void) IMFMediaType_Release(mediatype); hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 1, &mediatype); +todo_wine ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); /* Current media type. */ diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index eb5b9e366ec..626e273780b 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -806,6 +806,34 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) goto done; } } + else if (format.major_type == WG_MAJOR_TYPE_AUDIO) + { + /* Expose at least one PCM and one floating point type for the + consumer to pick from. */ + stream_types = malloc( sizeof(IMFMediaType *) * 2 ); + + stream_types[0] = mf_media_type_from_wg_format(&format); + if (stream_types[0]) + { + stream_types[1] = mf_media_type_from_wg_format(&format); + if (stream_types[1]) + { + GUID base_subtype; + IMFMediaType_GetGUID(stream_types[1], &MF_MT_SUBTYPE, &base_subtype); + if (IsEqualGUID(&base_subtype, &MFAudioFormat_Float)) + { + IMFMediaType_SetGUID(stream_types[1], &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + IMFMediaType_SetUINT32(stream_types[1], &MF_MT_AUDIO_BITS_PER_SAMPLE, 16); + } + else + { + IMFMediaType_SetGUID(stream_types[1], &MF_MT_SUBTYPE, &MFAudioFormat_Float); + IMFMediaType_SetUINT32(stream_types[1], &MF_MT_AUDIO_BITS_PER_SAMPLE, 32); + } + type_count = 2; + } + } + } else { stream_type = mf_media_type_from_wg_format(&format); -- 2.31.1

2 1

[PATCH 1/4] wined3d: Use the correct device context ops in wined3d_device_context_issue_query().
by Zebediah Figura May 12, 2021

May 12, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b8ec5baa862..38ab2aed900 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5387,7 +5387,7 @@ void CDECL wined3d_device_context_issue_query(struct wined3d_device_context *con { TRACE("context %p, query %p, flags %#x.\n", context, query, flags); - query->device->cs->c.ops->issue_query(context, query, flags); + context->ops->issue_query(context, query, flags); } struct wined3d_rendertarget_view * CDECL wined3d_device_context_get_rendertarget_view( -- 2.30.2

5 11

[PATCH v3 1/5] ws2_32/tests: Clean up and expand tests for DisconnectEx().
by Zebediah Figura May 12, 2021

May 12, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: appease Vista again... dlls/ws2_32/tests/sock.c | 194 ++++++++++++++++++++++++++------------- 1 file changed, 130 insertions(+), 64 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 05e5cdd62ad..5da92361bbd 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6700,98 +6700,164 @@ static void test_shutdown(void) static void test_DisconnectEx(void) { - SOCKET listener, acceptor, connector; + struct sockaddr_in server_addr, client_addr, addr; + GUID disconnectex_guid = WSAID_DISCONNECTEX; + SOCKET listener, server, client; LPFN_DISCONNECTEX pDisconnectEx; - GUID disconnectExGuid = WSAID_DISCONNECTEX; - struct sockaddr_in address; - DWORD num_bytes, flags; - OVERLAPPED overlapped; - int addrlen, iret; - BOOL bret; + OVERLAPPED overlapped = {0}; + int addrlen, ret; + char buffer[5]; + DWORD size; - connector = socket(AF_INET, SOCK_STREAM, 0); - ok(connector != INVALID_SOCKET, "failed to create connector socket, error %d\n", WSAGetLastError()); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &disconnectExGuid, sizeof(disconnectExGuid), - &pDisconnectEx, sizeof(pDisconnectEx), &num_bytes, NULL, NULL); - if (iret) + client = socket(AF_INET, SOCK_STREAM, 0); + ok(client != INVALID_SOCKET, "failed to create connector socket, error %u\n", WSAGetLastError()); + + ret = WSAIoctl(client, SIO_GET_EXTENSION_FUNCTION_POINTER, &disconnectex_guid, sizeof(disconnectex_guid), + &pDisconnectEx, sizeof(pDisconnectEx), &size, NULL, NULL); + if (ret) { win_skip("WSAIoctl failed to get DisconnectEx, error %d\n", WSAGetLastError()); - closesocket(connector); + closesocket(client); return; } listener = socket(AF_INET, SOCK_STREAM, 0); ok(listener != INVALID_SOCKET, "failed to create listener socket, error %d\n", WSAGetLastError()); - memset(&address, 0, sizeof(address)); - address.sin_family = AF_INET; - address.sin_addr.s_addr = inet_addr("127.0.0.1"); - iret = bind(listener, (struct sockaddr *)&address, sizeof(address)); - ok(iret == 0, "failed to bind, error %d\n", WSAGetLastError()); + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ret = bind(listener, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + addrlen = sizeof(server_addr); + ret = getsockname(listener, (struct sockaddr *)&server_addr, &addrlen); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ret = listen(listener, 1); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); - addrlen = sizeof(address); - iret = getsockname(listener, (struct sockaddr *)&address, &addrlen); - ok(iret == 0, "failed to lookup bind address, error %d\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); + ret = pDisconnectEx(INVALID_SOCKET, &overlapped, 0, 0); + ok(!ret, "expected failure\n"); + ok(WSAGetLastError() == WSAENOTSOCK, "got error %u\n", WSAGetLastError()); - iret = listen(listener, 1); - ok(iret == 0, "failed to listen, error %d\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); + ret = pDisconnectEx(client, &overlapped, 0, 0); + ok(!ret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); - set_blocking(listener, TRUE); + ret = connect(client, (struct sockaddr *)&server_addr, sizeof(server_addr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError()); - memset(&overlapped, 0, sizeof(overlapped)); - bret = pDisconnectEx(INVALID_SOCKET, &overlapped, 0, 0); - ok(bret == FALSE, "DisconnectEx unexpectedly succeeded\n"); - ok(WSAGetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %d\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); + ret = pDisconnectEx(client, &overlapped, 0, 0); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); - memset(&overlapped, 0, sizeof(overlapped)); - bret = pDisconnectEx(connector, &overlapped, 0, 0); - ok(bret == FALSE, "DisconnectEx unexpectedly succeeded\n"); - todo_wine ok(WSAGetLastError() == WSAENOTCONN, "expected WSAENOTCONN, got %d\n", WSAGetLastError()); + if (WSAGetLastError() == ERROR_IO_PENDING) + { + ret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!ret, "wait timed out\n"); + size = 0xdeadbeef; + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); + ok(ret, "got error %u\n", GetLastError()); + ok(!size, "got size %u\n", size); + } - iret = connect(connector, (struct sockaddr *)&address, addrlen); - ok(iret == 0, "failed to connect, error %d\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&server_addr, sizeof(server_addr)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEISCONN, "got error %u\n", WSAGetLastError()); - acceptor = accept(listener, NULL, NULL); - ok(acceptor != INVALID_SOCKET, "could not accept socket, error %d\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); + ret = send(client, "test", 5, 0); + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); - memset(&overlapped, 0, sizeof(overlapped)); - overlapped.hEvent = WSACreateEvent(); - ok(overlapped.hEvent != WSA_INVALID_EVENT, "WSACreateEvent failed, error %d\n", WSAGetLastError()); - bret = pDisconnectEx(connector, &overlapped, 0, 0); - if (bret) - ok(overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", overlapped.Internal); - else if (WSAGetLastError() == ERROR_IO_PENDING) - bret = WSAGetOverlappedResult(connector, &overlapped, &num_bytes, TRUE, &flags); - ok(bret, "DisconnectEx failed, error %d\n", WSAGetLastError()); - WSACloseEvent(overlapped.hEvent); + ret = recv(server, buffer, sizeof(buffer), 0); + ok(!ret, "got %d\n", ret); - iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); - ok(iret != 0, "connect unexpectedly succeeded\n"); - ok(WSAGetLastError() == WSAEISCONN, "expected WSAEISCONN, got %d\n", WSAGetLastError()); + ret = send(server, "test", 5, 0); + ok(ret == 5, "got %d\n", ret); - closesocket(acceptor); - closesocket(connector); + ret = recv(client, buffer, sizeof(buffer), 0); + ok(ret == 5, "got %d\n", ret); + ok(!strcmp(buffer, "test"), "got %s\n", debugstr_an(buffer, ret)); - connector = socket(AF_INET, SOCK_STREAM, 0); - ok(connector != INVALID_SOCKET, "failed to create connector socket, error %d\n", WSAGetLastError()); + addrlen = sizeof(addr); + ret = getpeername(client, (struct sockaddr *)&addr, &addrlen); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(!memcmp(&addr, &server_addr, sizeof(server_addr)), "address didn't match\n"); - iret = connect(connector, (struct sockaddr *)&address, addrlen); - ok(iret == 0, "failed to connect, error %d\n", WSAGetLastError()); + addrlen = sizeof(client_addr); + ret = getsockname(client, (struct sockaddr *)&client_addr, &addrlen); + ok(!ret, "got error %u\n", WSAGetLastError()); + addrlen = sizeof(addr); + ret = getpeername(server, (struct sockaddr *)&addr, &addrlen); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(!memcmp(&addr, &client_addr, sizeof(addr)), "address didn't match\n"); - acceptor = accept(listener, NULL, NULL); - ok(acceptor != INVALID_SOCKET, "could not accept socket, error %d\n", WSAGetLastError()); + closesocket(client); + closesocket(server); - bret = pDisconnectEx(connector, NULL, 0, 0); - ok(bret, "DisconnectEx failed, error %d\n", WSAGetLastError()); + /* Test the synchronous case. */ - iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); - ok(iret != 0, "connect unexpectedly succeeded\n"); - ok(WSAGetLastError() == WSAEISCONN, "expected WSAEISCONN, got %d\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 *)&server_addr, sizeof(server_addr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = pDisconnectEx(client, NULL, 0, 0); + ok(ret, "expected success\n"); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = pDisconnectEx(client, NULL, 0, 0); + todo_wine ok(ret, "expected success\n"); + todo_wine ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); + + ret = connect(client, (struct sockaddr *)&server_addr, sizeof(server_addr)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEISCONN, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = send(client, "test", 5, 0); + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAESHUTDOWN, "got error %u\n", WSAGetLastError()); + + ret = recv(server, buffer, sizeof(buffer), 0); + ok(!ret, "got %d\n", ret); + + ret = send(server, "test", 5, 0); + ok(ret == 5, "got %d\n", ret); + + ret = recv(client, buffer, sizeof(buffer), 0); + ok(ret == 5, "got %d\n", ret); + ok(!strcmp(buffer, "test"), "got %s\n", debugstr_an(buffer, ret)); + + addrlen = sizeof(addr); + ret = getpeername(client, (struct sockaddr *)&addr, &addrlen); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(!memcmp(&addr, &server_addr, sizeof(server_addr)), "address didn't match\n"); + + addrlen = sizeof(client_addr); + ret = getsockname(client, (struct sockaddr *)&client_addr, &addrlen); + ok(!ret, "got error %u\n", WSAGetLastError()); + addrlen = sizeof(addr); + ret = getpeername(server, (struct sockaddr *)&addr, &addrlen); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(!memcmp(&addr, &client_addr, sizeof(addr)), "address didn't match\n"); + + closesocket(client); + closesocket(server); - closesocket(acceptor); - closesocket(connector); closesocket(listener); + CloseHandle(overlapped.hEvent); } #define compare_file(h,s,o) compare_file2(h,s,o,__FILE__,__LINE__) -- 2.30.2

1 4

[PATCH] sechost: Allow hexadecimal and string rights flags to be interleaved.
by Zebediah Figura May 11, 2021

May 11, 2021

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- This allows the Unreal Engine 4 prerequisite installer shipped with several games (Everspace 2, POSTAL 4, The Turing Test, KARDS) to run, instead of terminating with an "invalid ACL" message. dlls/advapi32/tests/security.c | 4 ++++ dlls/sechost/security.c | 36 ++++++++++++---------------------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 299a340dcf3..b3361795761 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4212,6 +4212,10 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, { "S:(AU;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;0xDeAdBeEf;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;GR0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;0xFFFFFFFFGR;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;0xFFFFFGR;;;WD)", SDDL_REVISION_1, TRUE }, /* test ACE string access right error case */ { "D:(A;;ROB;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL }, /* test behaviour with empty strings */ diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index 47ffba9ed52..2a28d834ac2 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -868,14 +868,21 @@ static DWORD parse_ace_flag( const WCHAR *string ) return 0; } -static DWORD parse_ace_right( const WCHAR *string ) +static DWORD parse_ace_right( const WCHAR **string_ptr ) { + const WCHAR *string = *string_ptr; unsigned int i; + if (string[0] == '0' && string[1] == 'x') + return wcstoul( string, string_ptr, 16 ); + for (i = 0; i < ARRAY_SIZE(ace_rights); ++i) { if (!wcsncmp( string, ace_rights[i].str, 2 )) + { + *string_ptr += 2; return ace_rights[i].value; + } } return 0; } @@ -908,30 +915,11 @@ static DWORD parse_ace_rights( const WCHAR **string_ptr ) while (*string == ' ') string++; - if (string[0] == '0' && string[1] == 'x') + while (*string != ';') { - const WCHAR *p = string; - - while (*p && *p != ';') - p++; - - if (p - string <= 10 /* 8 hex digits + "0x" */ ) - { - rights = wcstoul( string, NULL, 16 ); - string = p; - } - else - WARN("Invalid rights string format: %s\n", debugstr_wn(string, p - string)); - } - else - { - while (*string != ';') - { - DWORD right = parse_ace_right( string ); - if (!right) return 0; - rights |= right; - string += 2; - } + DWORD right = parse_ace_right( &string ); + if (!right) return 0; + rights |= right; } *string_ptr = string; -- 2.30.2

1 0

[PATCH] user32: Honor SMTO_ABORTIFHUNG while awaiting reply.
by Shawn M. Chapla May 11, 2021

May 11, 2021

If the SMTO_ABORTIFHUNG flag is set, periodically time out (every 1000ms) to check whether the thread from which a reply is expected has become hung while the sending thread has been waiting for that reply. While it is the case that, when necessary, the wineserver checks whether a thread is hung before putting a message into its queue, this does not account for cases in which a thread becomes hung after that message has been enqueued but before it has been handled. In order to abort when hung in those cases, client code must perform this check itself. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- dlls/user32/message.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index a54ecccc7cd..6e988a6aeb0 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2949,15 +2949,17 @@ static HANDLE get_server_queue_handle(void) * * Wait until a sent message gets replied to. */ -static void wait_message_reply( UINT flags ) +static void wait_message_reply( UINT flags, HWND hwnd ) { struct user_thread_info *thread_info = get_user_thread_info(); HANDLE server_queue = get_server_queue_handle(); unsigned int wake_mask = QS_SMRESULT | ((flags & SMTO_BLOCK) ? 0 : QS_SENDMESSAGE); + DWORD timeout = (flags & SMTO_ABORTIFHUNG) ? 1000 : INFINITE; for (;;) { unsigned int wake_bits = 0; + DWORD ret = 0; SERVER_START_REQ( set_queue_mask ) { @@ -2978,7 +2980,12 @@ static void wait_message_reply( UINT flags ) continue; } - wow_handlers.wait_message( 1, &server_queue, INFINITE, wake_mask, 0 ); + ret = wow_handlers.wait_message( 1, &server_queue, timeout, wake_mask, 0 ); + + /* If the wait call timed out and the window we're waiting + on is now hung, bail. */ + if (ret == WAIT_TIMEOUT && IsHungAppWindow(hwnd)) + return; } } @@ -3156,7 +3163,7 @@ static LRESULT send_inter_thread_message( const struct send_message_info *info, /* there's no reply to wait for on notify/callback messages */ if (info->type == MSG_NOTIFY || info->type == MSG_CALLBACK) return 1; - wait_message_reply( info->flags ); + wait_message_reply( info->flags, info->hwnd ); return retrieve_reply( info, reply_size, res_ptr ); } @@ -3309,7 +3316,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) if (wait) { LRESULT ignored; - wait_message_reply( 0 ); + wait_message_reply( 0, NULL ); retrieve_reply( &info, 0, &ignored ); } return ret; -- 2.28.0

2 2

[PATCH v2 1/5] ws2_32/tests: Do not close the port passed to CreateIoCompletionPort separately from the port returned.
by Zebediah Figura May 11, 2021

May 11, 2021

They are the same port handle. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 60 +++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 35 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 24259ad4cf2..885bfc2fd67 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5730,7 +5730,7 @@ static void test_ConnectEx(void) OVERLAPPED overlapped, *olp; LPFN_CONNECTEX pConnectEx; GUID connectExGuid = WSAID_CONNECTEX; - HANDLE previous_port, io_port; + HANDLE io_port; DWORD bytesReturned; char buffer[1024]; ULONG_PTR key; @@ -5853,10 +5853,7 @@ static void test_ConnectEx(void) address.sin_port = htons(1); - previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); - ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError()); - - io_port = CreateIoCompletionPort((HANDLE)connector, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)connector, NULL, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = SetFileCompletionNotificationModes((HANDLE)connector, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); @@ -5884,8 +5881,6 @@ static void test_ConnectEx(void) WSACloseEvent(overlapped.hEvent); closesocket(connector); - - CloseHandle(previous_port); } static void test_AcceptEx(void) @@ -7068,7 +7063,7 @@ todo_wine static void test_synchronous_WSAIoctl(void) { - HANDLE previous_port, io_port; + HANDLE io_port; WSAOVERLAPPED overlapped, *olp; SOCKET socket; ULONG on; @@ -7077,13 +7072,10 @@ static void test_synchronous_WSAIoctl(void) BOOL ret; int res; - previous_port = CreateIoCompletionPort( INVALID_HANDLE_VALUE, NULL, 0, 0 ); - ok( previous_port != NULL, "failed to create completion port %u\n", GetLastError() ); - socket = WSASocketW( AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED ); ok( socket != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError() ); - io_port = CreateIoCompletionPort( (HANDLE)socket, previous_port, 0, 0 ); + io_port = CreateIoCompletionPort( (HANDLE)socket, NULL, 0, 0 ); ok( io_port != NULL, "failed to create completion port %u\n", GetLastError() ); on = 1; @@ -7096,7 +7088,6 @@ static void test_synchronous_WSAIoctl(void) CloseHandle( io_port ); closesocket( socket ); - CloseHandle( previous_port ); } /* @@ -7131,7 +7122,7 @@ static SOCKET setup_iocp_src(struct sockaddr_in *bindAddress) static void test_completion_port(void) { - HANDLE previous_port, io_port; + HANDLE io_port; WSAOVERLAPPED ov, *olp; SOCKET src, dest, dup, connector = INVALID_SOCKET; WSAPROTOCOL_INFOA info; @@ -7148,8 +7139,8 @@ static void test_completion_port(void) fd_set fds_recv; memset(buf, 0, sizeof(buf)); - previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); - ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError()); + io_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); + ok( io_port != NULL, "Failed to create completion port %u\n", GetLastError()); memset(&ov, 0, sizeof(ov)); @@ -7164,7 +7155,7 @@ static void test_completion_port(void) iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); ok(!iret, "Failed to set linger %d\n", GetLastError()); - io_port = CreateIoCompletionPort( (HANDLE)dest, previous_port, 125, 0 ); + io_port = CreateIoCompletionPort( (HANDLE)dest, io_port, 125, 0 ); ok(io_port != NULL, "Failed to create completion port %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -7218,7 +7209,7 @@ static void test_completion_port(void) iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); ok(!iret, "Failed to set linger %d\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); set_blocking(dest, FALSE); @@ -7263,7 +7254,7 @@ static void test_completion_port(void) ok(!iret, "WSASend failed - %d, last error %u\n", iret, GetLastError()); ok(num_bytes == sizeof(buf), "Managed to send %d\n", num_bytes); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); set_blocking(dest, FALSE); @@ -7336,7 +7327,7 @@ static void test_completion_port(void) iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); ok(!iret, "Failed to set linger %d\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); set_blocking(dest, FALSE); @@ -7374,7 +7365,7 @@ static void test_completion_port(void) dest = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(dest != INVALID_SOCKET, "socket() failed\n"); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); set_blocking(dest, FALSE); @@ -7421,7 +7412,7 @@ static void test_completion_port(void) ok(bret == FALSE, "AcceptEx returned %d\n", bret); ok(GetLastError() == ERROR_IO_PENDING, "Last error was %d\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); closesocket(src); @@ -7457,7 +7448,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = pAcceptEx(src, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -7499,7 +7490,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); @@ -7557,7 +7548,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); @@ -7623,7 +7614,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); @@ -7678,7 +7669,7 @@ static void test_completion_port(void) SetLastError(0xdeadbeef); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); closesocket(src); @@ -7702,10 +7693,10 @@ static void test_completion_port(void) connector = socket(AF_INET, SOCK_STREAM, 0); ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 236, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 236, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = pAcceptEx(src, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -7759,10 +7750,10 @@ static void test_completion_port(void) connector = socket(AF_INET, SOCK_STREAM, 0); ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 236, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 236, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = pAcceptEx(src, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -7821,10 +7812,10 @@ static void test_completion_port(void) connector = socket(AF_INET, SOCK_STREAM, 0); ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); - io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); + io_port = CreateIoCompletionPort((HANDLE)src, io_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 236, 0); + io_port = CreateIoCompletionPort((HANDLE)dest, io_port, 236, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); bret = pAcceptEx(src, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -7864,10 +7855,9 @@ static void test_completion_port(void) ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); ok(!olp, "Overlapped structure is at %p\n", olp); - closesocket(src); closesocket(connector); - CloseHandle(previous_port); + CloseHandle(io_port); } static void test_address_list_query(void) -- 2.30.2

2 7

[PATCH v2] windowscodecs: Add stub for IWICDdsEncoder.
by Ziqing Hui May 11, 2021

May 11, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Fix typo in QueryInterface. dlls/windowscodecs/ddsformat.c | 63 ++++++++++++++++++++++++++++++++-- include/wincodec.idl | 19 ++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-)

2 1

[tools] winetest: Share the group definitions.
by Francois Gouget May 11, 2021

May 11, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-index | 36 +------------------------- winetest/gather | 59 +++++------------------------------------- winetest/winetest.conf | 27 +++++++++++++++++++ 3 files changed, 35 insertions(+), 87 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index e69ea1f28..d6f04a0c1 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -32,7 +32,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb/; +use vars qw/$workdir $gitdir $gitweb @groups/; require "winetest.conf"; my $name0=$0; @@ -80,40 +80,6 @@ sub short_date($) } -# This should match the definitions in gather - -my %w95 = (name => "Win95"); -my %w98 = (name => "Win98"); -my %me = (name => "Me"); -my %nt3 = (name => "NT3"); -my %nt4 = (name => "NT4"); -my %w2k = (name => "2000"); -my %xp = (name => "XP"); -my %w2k3 = (name => "2003"); -my %vista = (name => "Vista"); -my %w2k8 = (name => "2008"); -my %win7 = (name => "Win7"); -my %win8 = (name => "Win8"); -my %win1507 = (name => "Win1507+"); -my %win1709 = (name => "Win1709+"); -my %win1909 = (name => "Win1909+"); -my %win10 = (name => "Win10"); -my %win10l = (name => "Win10L"); -my %unknown = (name => "Other"); -my %linux = (name => "Linux"); -my %mac = (name => "Mac"); -my %bsd = (name => "BSD"); -my %solaris = (name => "Solaris"); -my %wine = (name => "Wine"); - -# Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, - \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, - \%vista, \%w2k8, \%win7, \%win8, - \%win1507, \%win1709, \%win1909, \%win10, \%win10l, - \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); - - # # Command line processing # diff --git a/winetest/gather b/winetest/gather index b4b9464e4..e00077792 100755 --- a/winetest/gather +++ b/winetest/gather @@ -32,7 +32,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb/; +use vars qw/$workdir $gitdir $gitweb @groups/; require "winetest.conf"; my $name0=$0; @@ -126,57 +126,12 @@ sub short_date($) # errors The number of unit tests with errors. # todos The number of unit tests with no error but todos. -# This should match the definitions in build-index - -my %w95 = (name => "Win95"); -my %w98 = (name => "Win98"); -my %me = (name => "Me"); -my %nt3 = (name => "NT3"); -my %nt4 = (name => "NT4"); -my %w2k = (name => "2000"); -my %xp = (name => "XP"); -my %w2k3 = (name => "2003"); -my %vista = (name => "Vista"); -my %w2k8 = (name => "2008"); -my %win7 = (name => "Win7"); -my %win8 = (name => "Win8"); -my %win1507 = (name => "Win1507+"); -my %win1709 = (name => "Win1709+"); -my %win1909 = (name => "Win1909+"); -my %win10 = (name => "Win10"); -my %win10l = (name => "Win10L"); -my %unknown = (name => "Other"); -my %linux = (name => "Linux"); -my %mac = (name => "Mac"); -my %bsd = (name => "BSD"); -my %solaris = (name => "Solaris"); -my %wine = (name => "Wine"); - -# Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, - \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, - \%vista, \%w2k8, \%win7, \%win8, - \%win1507, \%win1709, \%win1909, \%win10, \%win10l, - \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); - -# Map dissect's IDs to the above hashes -my %idmap = (95 => \%w95, 98 => \%w98, me => \%me, - nt3 => \%nt3, nt4 => \%nt4, 2000 => \%w2k, - xp => \%xp, 2003 => \%w2k3, - vista => \%vista, 2008 => \%w2k8, - win7 => \%win7, - win8 => \%win8, win81 => \%win8, - win1507 => \%win1507, win1511 => \%win1507, - win1607 => \%win1507, win1703 => \%win1507, - win1709 => \%win1709, win1803 => \%win1709, - win1809 => \%win1709, win1903 => \%win1709, - win1909 => \%win1909, - win2004 => \%win10l, - win2009 => \%win10, - win10 => \%win10, # for backward compatibility - unknown => \%unknown, - wine => \%wine, linux => \%linux, mac => \%mac, - bsd => \%bsd, solaris => \%solaris); +# Map dissect's IDs to the platform groups +my %idmap; +foreach my $group (@groups) +{ + map { $idmap{$_} = $group } @{$group->{ids}}; +} # diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 1f587b3bc..3041cf7df 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -30,4 +30,31 @@ $patternbuilds = 10; # Probability above which a failure is considered to be fixed (0..1) $fixed_threshold = 0.99; +# Define how and in which order to group the platform results +(a)groups = ( + { name => "Win95", ids => [ "95" ] }, + { name => "Win98", ids => [ "98" ] }, + { name => "Me", ids => [ "me" ] }, + { name => "NT3", ids => [ "nt3" ] }, + { name => "NT4", ids => [ "nt4" ] }, + { name => "2000", ids => [ "2000" ] }, + { name => "XP", ids => [ "xp" ] }, + { name => "2003", ids => [ "2003" ] }, + { name => "Vista", ids => [ "vista" ] }, + { name => "2008", ids => [ "2008" ] }, + { name => "Win7", ids => [ "win7" ] }, + { name => "Win8", ids => [ "win8", "win81" ] }, + { name => "Win1507+", ids => [ "win1507", "win1511", "win1607", "win1703" ] }, + { name => "Win1709+", ids => [ "win1709", "win1803", "win1809", "win1903" ] }, + { name => "Win1909+", ids => [ "win1909" ] }, + { name => "Win10", ids => [ "win2009", "win10" ] }, # win10 for backward compatibility + { name => "Win10L", ids => [ "win2004" ] }, + { name => "Other", ids => [ "unknown" ] }, + { name => "Linux", ids => [ "linux" ] }, + { name => "Mac", ids => [ "mac" ] }, + { name => "BSD", ids => [ "bsd" ] }, + { name => "Solaris", ids => [ "solaris" ] }, + { name => "Wine", ids => [ "wine" ] }, +); + 1; # keep require happy -- 2.20.1

1 0

[PATCH] winemac.drv: Set view.WantsBestResolutionOpenGLSurface.
by Stefan Dösinger May 11, 2021

May 11, 2021

This used to default to false before Catalina, and it still does so when the application is built with XCode 10 or earlier. When building with XCode 11 or later Catalina and newer will create a high DPI GL view even if the window is low dpi. Because we don't adjust glViewport parameters (and glDrawPixels, etc) we render only to the lower left quadrant. --- Vulkan via MoltenVK already works correctly. --- dlls/winemac.drv/cocoa_window.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b6c5386469c..29ac32d6be0 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -685,6 +685,7 @@ - (void) setRetinaMode:(int)mode frame.size.width *= scale; frame.size.height *= scale; [self setFrame:frame]; + [self setWantsBestResolutionOpenGLSurface:mode]; [self updateGLContexts]; [super setRetinaMode:mode]; @@ -3575,6 +3576,7 @@ macdrv_view macdrv_create_view(CGRect rect) [view setAutoresizesSubviews:NO]; [view setAutoresizingMask:NSViewNotSizable]; [view setHidden:YES]; + [view setWantsBestResolutionOpenGLSurface:retina_on]; [nc addObserver:view selector:@selector(updateGLContexts) name:NSViewGlobalFrameDidChangeNotification -- 2.30.1 (Apple Git-130)

1 2