May 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : ws2_32/tests: Clean up and expand tests for DisconnectEx().
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: ae76d94e55cd0edcaa8cb799d7e39742fdfe00d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae76d94e55cd0edcaa8cb799… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 21:19:45 2021 -0500 ws2_32/tests: Clean up and expand tests for DisconnectEx(). 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 | 194 +++++++++++++++++++++++++++++++---------------- 1 file changed, 130 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae76d94e55cd0edcaa8c…

1 0

Stefan Dösinger : winemac.drv: Set view.WantsBestResolutionOpenGLSurface.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: 004b1179e96648495fc0b7ff6711cc990a8a03bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=004b1179e96648495fc0b7ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 12 11:55:12 2021 +0200 winemac.drv: Set view.WantsBestResolutionOpenGLSurface. 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. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi 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

1 0

Zebediah Figura : ws2_32/tests: Add some tests for shutdown with completion ports.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: 9fd8a298dd1e5c199ab898b7188b29032ec02734 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fd8a298dd1e5c199ab898b7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 21:19:46 2021 -0500 ws2_32/tests: Add some tests for shutdown with completion ports. 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 | 188 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5da92361bbd..ec78e62969e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8469,6 +8469,193 @@ static void test_connect_completion_port(void) CloseHandle(port); } +static void test_shutdown_completion_port(void) +{ + OVERLAPPED overlapped = {0}, *overlapped_ptr; + GUID disconnectex_guid = WSAID_DISCONNECTEX; + struct sockaddr_in addr, destaddr; + LPFN_DISCONNECTEX pDisconnectEx; + SOCKET listener, server, client; + int ret, addrlen; + ULONG_PTR key; + HANDLE port; + DWORD size; + + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\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(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &addrlen); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + + ret = listen(listener, 1); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + ret = WSAIoctl(client, SIO_GET_EXTENSION_FUNCTION_POINTER, &disconnectex_guid, sizeof(disconnectex_guid), + &pDisconnectEx, sizeof(pDisconnectEx), &size, NULL, NULL); + ok(!ret, "Failed to get ConnectEx, error %u\n", WSAGetLastError()); + + /* shutdown() does not queue completion. */ + + port = CreateIoCompletionPort((HANDLE)client, NULL, 0, 0); + ok(!!port, "failed to create port, error %u\n", GetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + ret = shutdown(client, SD_BOTH); + ok(!ret, "failed to shutdown, error %u\n", WSAGetLastError()); + + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_TIMEOUT, "got error %u\n", GetLastError()); + + closesocket(server); + closesocket(client); + CloseHandle(port); + + /* WSASendDisconnect() and WSARecvDisconnect() do not queue completion. */ + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + port = CreateIoCompletionPort((HANDLE)client, NULL, 0, 0); + ok(!!port, "failed to create port, error %u\n", GetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + ret = WSASendDisconnect(client, NULL); + ok(!ret, "failed to shutdown, error %u\n", WSAGetLastError()); + + ret = WSARecvDisconnect(client, NULL); + ok(!ret, "failed to shutdown, error %u\n", WSAGetLastError()); + + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_TIMEOUT, "got error %u\n", GetLastError()); + + closesocket(server); + closesocket(client); + CloseHandle(port); + + /* DisconnectEx() queues completion. */ + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + port = CreateIoCompletionPort((HANDLE)client, NULL, 0, 0); + ok(!!port, "failed to create port, error %u\n", GetLastError()); + ret = SetFileCompletionNotificationModes((HANDLE)client, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); + ok(ret, "got error %u\n", GetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + SetLastError(0xdeadbeef); + ret = pDisconnectEx(client, &overlapped, 0, 0); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_IO_PENDING, "got error %u\n", GetLastError()); + if (GetLastError() == ERROR_IO_PENDING) + { + ret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!ret, "wait failed\n"); + + size = 0xdeadbeef; + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, TRUE); + ok(ret, "got error %u\n", GetLastError()); + ok(!size, "got %u bytes\n", size); + } + + size = 0xdeadbeef; + key = 0xdeadbeef; + overlapped_ptr = NULL; + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + todo_wine ok(ret, "got error %u\n", GetLastError()); + todo_wine ok(!key, "got key %#Ix\n", key); + todo_wine ok(!size, "got %u bytes\n", size); + todo_wine ok(overlapped_ptr == &overlapped, "got overlapped %p\n", overlapped_ptr); + + closesocket(server); + closesocket(client); + CloseHandle(port); + + /* Test passing a NULL overlapped structure to DisconnectEx(). */ + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + port = CreateIoCompletionPort((HANDLE)client, NULL, 0, 0); + ok(!!port, "failed to create port, error %u\n", GetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + SetLastError(0xdeadbeef); + ret = pDisconnectEx(client, NULL, 0, 0); + ok(ret, "expected success\n"); + ok(!GetLastError() || GetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", GetLastError()); + + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_TIMEOUT, "got error %u\n", GetLastError()); + + closesocket(server); + closesocket(client); + CloseHandle(port); + + /* Suppress completion by setting the low bit. */ + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + port = CreateIoCompletionPort((HANDLE)client, NULL, 0, 0); + ok(!!port, "failed to create port, error %u\n", GetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + overlapped.hEvent = (HANDLE)((ULONG_PTR)overlapped.hEvent | 1); + + SetLastError(0xdeadbeef); + ret = pDisconnectEx(client, &overlapped, 0, 0); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_IO_PENDING, "got error %u\n", GetLastError()); + if (GetLastError() == ERROR_IO_PENDING) + { + ret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!ret, "wait failed\n"); + + size = 0xdeadbeef; + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, TRUE); + ok(ret, "got error %u\n", GetLastError()); + ok(!size, "got %u bytes\n", size); + } + + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_TIMEOUT, "got error %u\n", GetLastError()); + + closesocket(server); + closesocket(client); + CloseHandle(port); + + overlapped.hEvent = (HANDLE)((ULONG_PTR)overlapped.hEvent & ~1); + + CloseHandle(overlapped.hEvent); +} + static void test_address_list_query(void) { SOCKET_ADDRESS_LIST *address_list; @@ -9766,6 +9953,7 @@ START_TEST( sock ) test_completion_port(); test_connect_completion_port(); + test_shutdown_completion_port(); test_address_list_query(); test_bind(); test_connecting_socket();

1 0

Zebediah Figura : server: Rename "pmask" to "pending_events".
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: 30c02f67ceef2f504dc7d47c9b525da1437bff9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=30c02f67ceef2f504dc7d47c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 21:19:48 2021 -0500 server: Rename "pmask" to "pending_events". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/server/sock.c b/server/sock.c index 791e4912c89..8b0b56f4070 100644 --- a/server/sock.c +++ b/server/sock.c @@ -112,8 +112,8 @@ struct sock struct fd *fd; /* socket file descriptor */ unsigned int state; /* status bits */ unsigned int mask; /* event mask */ + unsigned int pending_events; /* pending FD_* events which have not yet been reported to the application */ unsigned int hmask; /* held (blocked) events */ - unsigned int pmask; /* pending events */ unsigned int flags; /* socket flags */ int polling; /* is socket being polled? */ unsigned short proto; /* socket protocol */ @@ -386,7 +386,7 @@ static int sock_reselect( struct sock *sock ) /* wake anybody waiting on the socket event or send the associated message */ static void sock_wake_up( struct sock *sock ) { - unsigned int events = sock->pmask & sock->mask; + unsigned int events = sock->pending_events & sock->mask; int i; if ( !events ) return; @@ -402,13 +402,13 @@ static void sock_wake_up( struct sock *sock ) for (i = 0; i < FD_MAX_EVENTS; i++) { int event = event_bitorder[i]; - if (sock->pmask & (1 << event)) + if (sock->pending_events & (1 << event)) { lparam_t lparam = (1 << event) | (sock->errors[event] << 16); post_message( sock->window, sock->message, sock->wparam, lparam ); } } - sock->pmask = 0; + sock->pending_events = 0; sock_reselect( sock ); } } @@ -616,7 +616,7 @@ static void post_socket_event( struct sock *sock, unsigned int event_bit, unsign { unsigned int event = (1 << event_bit); - sock->pmask |= event; + sock->pending_events |= event; sock->hmask |= event; sock->errors[event_bit] = error; } @@ -745,7 +745,7 @@ static void sock_dump( struct object *obj, int verbose ) assert( obj->ops == &sock_ops ); fprintf( stderr, "Socket fd=%p, state=%x, mask=%x, pending=%x, held=%x\n", sock->fd, sock->state, - sock->mask, sock->pmask, sock->hmask ); + sock->mask, sock->pending_events, sock->hmask ); } static int sock_get_poll_events( struct fd *fd ) @@ -893,7 +893,7 @@ static struct sock *create_socket(void) sock->state = 0; sock->mask = 0; sock->hmask = 0; - sock->pmask = 0; + sock->pending_events = 0; sock->polling = 0; sock->flags = 0; sock->proto = 0; @@ -1143,7 +1143,7 @@ static struct sock *accept_socket( struct sock *sock ) } } clear_error(); - sock->pmask &= ~FD_ACCEPT; + sock->pending_events &= ~FD_ACCEPT; sock->hmask &= ~FD_ACCEPT; sock_reselect( sock ); return acceptsock; @@ -1180,7 +1180,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) acceptsock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; acceptsock->hmask = 0; - acceptsock->pmask = 0; + acceptsock->pending_events = 0; acceptsock->polling = 0; acceptsock->proto = sock->proto; acceptsock->type = sock->type; @@ -1193,7 +1193,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) acceptsock->fd = newfd; clear_error(); - sock->pmask &= ~FD_ACCEPT; + sock->pending_events &= ~FD_ACCEPT; sock->hmask &= ~FD_ACCEPT; sock_reselect( sock ); @@ -1801,7 +1801,7 @@ DECL_HANDLER(get_socket_event) FILE_READ_ATTRIBUTES, &sock_ops ))) return; if (get_unix_fd( sock->fd ) == -1) return; reply->mask = sock->mask; - reply->pmask = sock->pmask; + reply->pmask = sock->pending_events; reply->state = sock->state; set_reply_data( sock->errors, min( get_reply_max_size(), sizeof(sock->errors) )); @@ -1817,7 +1817,7 @@ DECL_HANDLER(get_socket_event) release_object( cevent ); } } - sock->pmask = 0; + sock->pending_events = 0; sock_reselect( sock ); } release_object( &sock->obj ); @@ -1835,7 +1835,7 @@ DECL_HANDLER(enable_socket_event) if (get_unix_fd( sock->fd ) == -1) return; /* for event-based notification, windows erases stale events */ - sock->pmask &= ~req->mask; + sock->pending_events &= ~req->mask; sock->hmask &= ~req->mask; sock->state |= req->sstate;

1 0

Francois Gouget : winetest/build-patterns: Add a header documenting the pattern pages.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: tools Branch: master Commit: 29ddcf4488b3919d84946a702da4464aa8dc4e38 URL: https://source.winehq.org/git/tools.git/?a=commit;h=29ddcf4488b3919d84946a7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 12 19:19:13 2021 +0200 winetest/build-patterns: Add a header documenting the pattern pages. Also tweak the descriptions for the pattern lists. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 98290f5..f6704bd 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1114,22 +1114,41 @@ sub write_patterns_page($$$) </head> <body> <div class="navbar"><a href="..">index</a> | Failure patterns: <a href="patterns.html">all</a> | <a href="patterns-tb-win.html">testbot windows</a> | <a href="patterns-tb-wine.html">testbot wine</a></div> + +<div class='testfile' id='summary'> +<div class='updownbar'>$title</div> +<p>The purpose of this page is to:</p> +<ul> + <li>Help detect new test failures, that is test / Wine regressions.</li> + <li>Help diagnose failures by showing when they are specific to a set of Windows versions, a locale, a day of the week, etc.</li> +</ul> +<p>The patterns on this page read as follows:</p> +<ul> + <li>Each line corresponds to a test configuration sorted by platform and tag name.</li> + <li>Test configurations with no failure for a given test are omitted from that test's pattern.</li> + <li>Each column corresponds to a WineTest build from oldest to newest.</li> + <li>Lines with a _N suffix are when WineTest was run more than once for a test configuration + build combination. They are rare and thus hang at the bottom of the pattern to not disrupt it.</li> + <li>Each cell is a single letter describing the result for that test. See the tooltips for a description. Click on the letter to go to that result page.</li> + <li>Each result is also color coded to make the patterns pop out. There is one color per type of result (crash , timeout, etc.), and one per number of failures (to help detect changes).</li> + <li>Failure modes that have not been seen before (test that newly crashes, new failure count, etc.) are highlighted, as well as the configuration names in which it appears.</li> + <li>Below the patterns is a line showing which builds have potentially related commits if any. +</ul> EOF # Show the test units with recent failures first. # Also use these lists to link the test units to each other. my %lists = ( recent => {title => "Recent failures", - desc => "have recent failures (that is failures that did not happen for the $patternbuilds oldest builds).", + desc => "recently started failing (the $patternbuilds oldest builds had no failure).", testnames => []}, newmode => {title => "New failure modes", - desc => "failed in new ways in the $patternbuilds most recent builds.", + desc => "failed in new ways in the $patternbuilds most recent builds (for instance they have more failures than before).", testnames => []}, regular => {title => "Regular failures", - desc => "had failures.", + desc => "have failures... as usual :-(.", testnames => []}, old => {title => "Old failures", - desc => "had no failure in the most recent $patternbuilds builds. Fixed or just rare failures?", + desc => "look like they are fixed: they had no failure in the most recent $patternbuilds builds but that may also just be a lucky streak.", testnames => []}, ); foreach my $testname (sort keys %tests) @@ -1202,7 +1221,7 @@ EOF } # Generate the lists index (and up test unit links) - print $html "<h1>$title</h1>\n"; + print $html "<p>The patterns are grouped according to the likelyhood that they contain new failures:</p>\n"; print $html "<ul>\n"; my @listids = ("recent", "newmode", "regular", "old"); my ($prevunit, $nolist) = ("", 1); @@ -1211,13 +1230,14 @@ EOF my $list = $lists{$listid}; my $count = @{$list->{testnames}}; next if (!$count); - print $html "<li><a href='#$listid'>$count test units</a> $list->{desc}</li>\n"; + print $html "<li><a href='#$listid'>$count tests</a> $list->{desc}</li>\n"; $nolist = 0; $list->{prevunit} = $prevunit; $prevunit = $list->{testnames}->[-1]; } print $html "<p>No failures. Don't change anything!</p>\n" if ($nolist); print $html "</ul>\n"; + print $html "</div>\n"; # Link the last test unit of each list to the first one of the next list my $nextunit;

1 0

Francois Gouget : winetest/build-patterns: Remove an unneeded <div class='main'>.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: tools Branch: master Commit: c60021723fd5b8f59cc694eedd885e6415712341 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c60021723fd5b8f59cc694e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 12 19:19:07 2021 +0200 winetest/build-patterns: Remove an unneeded <div class='main'>. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 10cc021..eb02e88 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1114,7 +1114,6 @@ sub write_patterns_page($$$) </head> <body> <div class="navbar"><a href="..">index</a> | Failure patterns: <a href="patterns.html">all</a> | <a href="patterns-tb-win.html">testbot windows</a> | <a href="patterns-tb-wine.html">testbot wine</a></div> -<div class="main"> EOF # Show the test units with recent failures first. @@ -1240,7 +1239,7 @@ EOF write_patterns_list($html, $pagereports, $mainpage, $list); } - print $html "</div></body></html>\n"; + print $html "</body></html>\n"; close($html); if (!rename "$filename.new", "$filename")

1 0

Francois Gouget : winetest/build-patterns: Add a message if a page has no failure.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: tools Branch: master Commit: cab866b47e1d3127130fb144ecc78a9e68c19a05 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cab866b47e1d3127130fb14… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 12 19:19:10 2021 +0200 winetest/build-patterns: Add a message if a page has no failure. Otherwise the page is very empty and cryptic. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index eb02e88..98290f5 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1205,16 +1205,18 @@ EOF print $html "<h1>$title</h1>\n"; print $html "<ul>\n"; my @listids = ("recent", "newmode", "regular", "old"); - my $prevunit = ""; + my ($prevunit, $nolist) = ("", 1); foreach my $listid (@listids) { my $list = $lists{$listid}; my $count = @{$list->{testnames}}; next if (!$count); print $html "<li><a href='#$listid'>$count test units</a> $list->{desc}</li>\n"; + $nolist = 0; $list->{prevunit} = $prevunit; $prevunit = $list->{testnames}->[-1]; } + print $html "<p>No failures. Don't change anything!</p>\n" if ($nolist); print $html "</ul>\n"; # Link the last test unit of each list to the first one of the next list

1 0

Rémi Bernon : server: Implement WM_INPUT_DEVICE_CHANGE message dispatch.
by Alexandre Julliard May 11, 2021

May 11, 2021

Module: wine Branch: master Commit: 4e956dc0fea1b7b20553bfd6d6f7a528363e4245 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e956dc0fea1b7b20553bfd6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 11 10:17:21 2021 +0200 server: Implement WM_INPUT_DEVICE_CHANGE message dispatch. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 13 ++++++++----- server/queue.c | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 148b35f8caf..9af33c3291e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2289,11 +2289,14 @@ static void accept_hardware_message( UINT hw_id ) static BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ) { struct rawinput_thread_data *thread_data = rawinput_thread_data(); - if (!rawinput_from_hardware_message( thread_data->buffer, msg_data )) - return FALSE; - thread_data->hw_id = hw_id; - msg->lParam = (LPARAM)hw_id; + if (msg->message == WM_INPUT) + { + if (!rawinput_from_hardware_message( thread_data->buffer, msg_data )) return FALSE; + thread_data->hw_id = hw_id; + msg->lParam = (LPARAM)hw_id; + } + msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); return TRUE; } @@ -2613,7 +2616,7 @@ static BOOL process_hardware_message( MSG *msg, UINT hw_id, const struct hardwar /* hardware messages are always in physical coords */ context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - if (msg->message == WM_INPUT) + if (msg->message == WM_INPUT || msg->message == WM_INPUT_DEVICE_CHANGE) ret = process_rawinput_message( msg, hw_id, msg_data ); else if (is_keyboard_message( msg->message )) ret = process_keyboard_message( msg, hw_id, hwnd_filter, first, last, remove ); diff --git a/server/queue.c b/server/queue.c index 73828fafbe6..5d65e030112 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1464,7 +1464,7 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru *thread = NULL; *msg_code = msg->msg; - if (msg->msg == WM_INPUT) + if (msg->msg == WM_INPUT || msg->msg == WM_INPUT_DEVICE_CHANGE) { if (!(win = msg->win) && input) win = input->focus; } @@ -1553,7 +1553,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg if (msg->wparam == VK_SHIFT || msg->wparam == VK_LSHIFT || msg->wparam == VK_RSHIFT) msg->lparam &= ~(KF_EXTENDED << 16); } - else if (msg->msg != WM_INPUT) + else if (msg->msg != WM_INPUT && msg->msg != WM_INPUT_DEVICE_CHANGE) { if (msg->msg == WM_MOUSEMOVE) { @@ -1695,7 +1695,7 @@ static int queue_rawinput_message( struct process* process, void *arg ) if (process != foreground->process) { - if (!(device->flags & RIDEV_INPUTSINK)) goto done; + if (raw_msg->message == WM_INPUT && !(device->flags & RIDEV_INPUTSINK)) goto done; if (!(target_thread = get_window_thread( device->target ))) goto done; if (!(target_desktop = get_thread_desktop( target_thread, 0 ))) goto done; if (target_desktop != desktop) goto done; @@ -1711,6 +1711,12 @@ static int queue_rawinput_message( struct process* process, void *arg ) msg->lparam = 0; memcpy( msg->data, &raw_msg->data, sizeof(raw_msg->data) ); + if (raw_msg->message == WM_INPUT_DEVICE_CHANGE && raw_msg->data.rawinput.type == RIM_TYPEHID) + { + msg->wparam = raw_msg->data.rawinput.hid.param; + msg->lparam = raw_msg->data.rawinput.hid.device; + } + queue_hardware_message( desktop, msg, 1 ); done: @@ -1975,8 +1981,30 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ unsigned int origin, const hw_input_t *input ) { struct hw_msg_source source = { IMDT_UNAVAILABLE, origin }; + struct hardware_msg_data *msg_data; + struct rawinput_message raw_msg; struct message *msg; + switch (input->hw.msg) + { + case WM_INPUT_DEVICE_CHANGE: + raw_msg.foreground = NULL; + raw_msg.desktop = NULL; + raw_msg.source = source; + raw_msg.time = get_tick_count(); + raw_msg.message = input->hw.msg; + + msg_data = &raw_msg.data; + msg_data->info = 0; + msg_data->flags = 0; + msg_data->rawinput = input->hw.rawinput; + + enum_processes( queue_rawinput_message, &raw_msg ); + + if (raw_msg.foreground) release_object( raw_msg.foreground ); + return; + } + if (!(msg = alloc_hardware_message( 0, source, get_tick_count() ))) return; msg->win = get_user_full_handle( win ); @@ -2109,7 +2137,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); - if (msg->msg == WM_INPUT && (flags & PM_REMOVE)) + if ((msg->msg == WM_INPUT || msg->msg == WM_INPUT_DEVICE_CHANGE) && (flags & PM_REMOVE)) release_hardware_message( current->queue, data->hw_id ); return 1; }

1 0

Louis Lenders : advapi32: Add stub for LsaEnumerateAccounts.
by Alexandre Julliard May 11, 2021

May 11, 2021

Module: wine Branch: master Commit: c74508d22528548940db3c8ac6a350064ca445e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c74508d22528548940db3c8a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri May 7 09:28:30 2021 +0200 advapi32: Add stub for LsaEnumerateAccounts. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50830 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/lsa.c | 16 ++++++++++++++++ include/ntlsa.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 1b7a83d347a..0391643aa6a 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -452,7 +452,7 @@ @ stub LsaDelete @ stdcall LsaDeleteTrustedDomain(ptr ptr) @ stdcall LsaEnumerateAccountRights(ptr ptr ptr ptr) -@ stub LsaEnumerateAccounts +@ stdcall LsaEnumerateAccounts(ptr ptr ptr long ptr) @ stdcall LsaEnumerateAccountsWithUserRight(ptr ptr ptr ptr) @ stub LsaEnumeratePrivileges @ stub LsaEnumeratePrivilegesOfAccount diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 55e42400c6d..7b118733b50 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -236,6 +236,22 @@ NTSTATUS WINAPI LsaEnumerateAccountRights( return STATUS_OBJECT_NAME_NOT_FOUND; } +/****************************************************************************** + * LsaEnumerateAccounts [ADVAPI32.@] + * + */ +NTSTATUS WINAPI LsaEnumerateAccounts( + LSA_HANDLE policy, + PLSA_ENUMERATION_HANDLE context, + PVOID *buffer, + ULONG maxlen, + PULONG count) +{ + FIXME("(%p,%p,%p,%d,%p) stub\n", policy, context, buffer, maxlen, count); + if (count) *count = 0; + return STATUS_NO_MORE_ENTRIES; +} + /****************************************************************************** * LsaEnumerateAccountsWithUserRight [ADVAPI32.@] * diff --git a/include/ntlsa.h b/include/ntlsa.h index ca864f6356c..9a0cf378c50 100644 --- a/include/ntlsa.h +++ b/include/ntlsa.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +NTSTATUS WINAPI LsaEnumerateAccounts(LSA_HANDLE,PLSA_ENUMERATION_HANDLE,PVOID*,ULONG,PULONG); NTSTATUS WINAPI LsaLookupPrivilegeDisplayName(LSA_HANDLE policy, LSA_UNICODE_STRING *name, LSA_UNICODE_STRING **display_name, SHORT *language); NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE policy, LUID *value, LSA_UNICODE_STRING **name);

1 0

Rémi Bernon : server: Add process argument to find_rawinput_device.
by Alexandre Julliard May 11, 2021

May 11, 2021

Module: wine Branch: master Commit: 427168ba5a1412a9ab53ee489821a4ab8c5726ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=427168ba5a1412a9ab53ee48… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 11 10:17:17 2021 +0200 server: Add process argument to find_rawinput_device. And use it to find registered HID rawinput devices. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/server/queue.c b/server/queue.c index b026c03e13d..3a37dd96385 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1489,11 +1489,11 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru return win; } -static struct rawinput_device_entry *find_rawinput_device( unsigned short usage_page, unsigned short usage ) +static struct rawinput_device_entry *find_rawinput_device( struct process *process, unsigned short usage_page, unsigned short usage ) { struct rawinput_device_entry *e; - LIST_FOR_EACH_ENTRY( e, &current->process->rawinput_devices, struct rawinput_device_entry, entry ) + LIST_FOR_EACH_ENTRY( e, &process->rawinput_devices, struct rawinput_device_entry, entry ) { if (e->device.usage_page != usage_page || e->device.usage != usage) continue; return e; @@ -1506,7 +1506,7 @@ static void update_rawinput_device(const struct rawinput_device *device) { struct rawinput_device_entry *e; - if (!(e = find_rawinput_device( device->usage_page, device->usage ))) + if (!(e = find_rawinput_device( current->process, device->usage_page, device->usage ))) { if (!(e = mem_alloc( sizeof(*e) ))) return; list_add_tail( &current->process->rawinput_devices, &e->entry ); @@ -1669,6 +1669,7 @@ struct rawinput_message static int queue_rawinput_message( struct process* process, void *arg ) { const struct rawinput_message* raw_msg = arg; + const struct rawinput_device_entry *entry; const struct rawinput_device *device = NULL; struct desktop *target_desktop = NULL; struct thread *target_thread = NULL; @@ -1679,6 +1680,8 @@ static int queue_rawinput_message( struct process* process, void *arg ) device = process->rawinput_mouse; else if (raw_msg->data.rawinput.type == RIM_TYPEKEYBOARD) device = process->rawinput_kbd; + else if ((entry = find_rawinput_device( process, raw_msg->data.rawinput.hid.usage_page, raw_msg->data.rawinput.hid.usage ))) + device = &entry->device; if (!device) return 0; if (process != raw_msg->foreground->process) @@ -3296,9 +3299,9 @@ DECL_HANDLER(update_rawinput_devices) update_rawinput_device(&devices[i]); } - e = find_rawinput_device( 1, 2 ); + e = find_rawinput_device( current->process, 1, 2 ); current->process->rawinput_mouse = e ? &e->device : NULL; - e = find_rawinput_device( 1, 6 ); + e = find_rawinput_device( current->process, 1, 6 ); current->process->rawinput_kbd = e ? &e->device : NULL; }

1 0