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

[tools] winetest/build-patterns: Identify commits indirectly related to a test unit.
by Francois Gouget May 11, 2021

May 11, 2021

Some test units depend on files other than the main C source file such as resource file, JavaScript source, etc. Patches modifying these files could also impact the test results. Also tests may fail in Wine because of modifications to the Wine module rather than to the test. So report patches to any of these components, but hide the more indirect and numerous ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 144 ++++++++++++++++++++++++++++++++-------- winetest/report.css | 9 +++ 2 files changed, 127 insertions(+), 26 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index eb152c872..10cc0214c 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -312,6 +312,9 @@ my %reports; # by commit id. my %tests; +# A set containing the test units source files. +my %testsources; + foreach my $build (@sortedbuilds) { my $filename = "data/$build->{name}/testresults.txt"; @@ -360,6 +363,7 @@ foreach my $build (@sortedbuilds) name => $testname, source => $source, }; + $testsources{$source} = 1; } foreach my $statreps (@items) @@ -679,7 +683,34 @@ if (open(my $fh, "-|", $cmd)) foreach my $filename ($path1, $path2) { next if (!$filename); - $path2commits{$filename}->{$commit->{id}} = $commit; + + if ($filename =~ m~((?:dlls|programs)/([^/]+))/tests/([^/]+)\.c$~) + { + my ($moddir, $module, $unit) = ($1, $2, $3); + if ($tests{"$module:$unit"}) + { + $path2commits{$filename}->{$commit->{id}} = $commit; + } + else + { + # This C file is not the source for a test unit + # so it could impact any test in that directory + $path2commits{"$moddir/tests"}->{$commit->{id}} = $commit; + } + } + elsif ($filename =~ m~((?:dlls|programs)/[^/]+)/tests/~) + { + my $moddir = $1; + # This is not not a C file so it could impact any test in + # that directory + $path2commits{"$moddir/tests"}->{$commit->{id}} = $commit; + } + elsif ($filename =~ m~((?:dlls|programs)/[^/]+)/~) + { + my $moddir = $1; + $path2commits{$moddir}->{$commit->{id}} = $commit; + } + # ignore changes to other files } } else @@ -924,44 +955,85 @@ sub index2symbol($) return $symbols[$index % 62]; } +my %scope_descs = ( + U => "Modifies this test", + t => "Modifies a test resource (maybe for another test)", + m => "Modifies the module", +); + sub write_commits($$) { my ($html, $test) = @_; print $html "<div class='pattern'>"; my $i = 0; - my @symbuilds; + my (@udescs, @tmdescs); foreach my $build (@sortedbuilds) { - if ($test->{commits}->{$build->{name}}) - { - my $symbol = index2symbol($i++); - push @symbuilds, [$symbol, $build]; - printf $html "<a title='%s'>%s</a>", - short_date($build->{date}), $symbol; - } - else + my $buildcommits = $test->{commits}->{$build->{name}}; + if (!$buildcommits) { print $html " "; + next; } - } - print $html "</div> <i>← potentially related commits</i>\n"; - if (@symbuilds) - { - print $html "\n"; - foreach my $symbuild (@symbuilds) + my $symbol = index2symbol($i++); + my ($ucount, $tcount, $tmcount) = (0, 0, 0); + foreach my $commit (sort { $a->{index} <=> $b->{index} } values %$buildcommits) { - my $first = 1; - my ($symbol, $build) = @$symbuild; - my $buildcommits = $test->{commits}->{$build->{name}}; - foreach my $commit (sort { $a->{index} <=> $b->{index} } values %$buildcommits) + my $scope = "m"; + if ($path2commits{$test->{source}}->{$commit->{id}}) { - print $html $first ? "$symbol." : " "; - $first = undef; - printf $html " <a href='%s/commitdiff/%s' title='%s'>%s</a>\n", $gitweb, $commit->{id}, short_date($build->{date}), $commit->{summary}; + $scope = "U"; + } + else + { + my $testdir = $test->{source}; + $testdir =~ s~/[^/]+$~~; + if ($path2commits{$testdir}->{$commit->{id}}) + { + $scope = "t"; + $tcount++; + } + } + + my $desc = sprintf(" <a class='commit%s' title='%s'>%s</a> <a href='%s/commitdiff/%s' title='%s'>%s</a>", + $scope, $scope_descs{$scope}, $scope, + $gitweb, $commit->{id}, + short_date($build->{date}), + $commit->{summary}); + if ($scope eq "U") + { + push @udescs, ($ucount ? "\n " : "\n$symbol."), $desc; + $ucount++; + } + else + { + push @tmdescs, ($tmcount ? " " : "$symbol."), $desc, "\n"; + $tmcount++; } } + push @udescs, " <i>[+$tmcount in details]</i>" if ($ucount and $tmcount); + + my @impacts; + push @impacts, "this test" if ($ucount); + push @impacts, "test resources" if ($tcount); + push @impacts, "the module" if ($tmcount > $tcount); + my $scope = $ucount ? "U" : $tcount ? "t" : "m"; + my $count = $ucount + $tmcount; + printf $html "<a class='commit%s' title='%s : %s commit%s to %s'>%s</a>", + $scope, short_date($build->{date}), + $count, $count > 1 ? "s" : "", + join(", ", @impacts), $symbol; + } + print $html "</div> <i>← potentially related commits</i>\n"; + + print $html @udescs if (@udescs); + if (@tmdescs) + { + print $html "<details><summary>Test and module patch details</summary>"; + print $html @tmdescs; + print $html "</details>"; } } @@ -1012,6 +1084,18 @@ sub write_patterns_list($$$$) } } +sub add_path_commits($$) +{ + my ($commits, $path) = @_; + + return if (!$path2commits{$path}); + foreach my $commit (values %{$path2commits{$path}}) + { + my $buildname = $commit->{build}->{name}; + $commits->{$buildname}->{$commit->{id}} = $commit; + } +} + sub write_patterns_page($$$) { my ($pagereports, $subpage, $title) = (@_); @@ -1055,6 +1139,7 @@ EOF $test->{colors} = {}; $test->{commits} = {}; + my $has_wine_failures; my $first = @sortedbuilds; my $last = -1; my $fixed = 1; @@ -1073,6 +1158,8 @@ EOF $testreport->{first}; $last = $replast if ($replast > $last); + $has_wine_failures ||= $reports{$reportdir}->{is_wine}; + for my $i (0..(a)sortedbuilds-1) { my $build = $sortedbuilds[$i]; @@ -1103,10 +1190,15 @@ EOF "regular"; push @{$lists{$listid}->{testnames}}, $testname; - foreach my $commit (values %{$path2commits{$test->{source}}}) + add_path_commits($test->{commits}, $test->{source}); + # Also take into account commits to test resources + my $moddir = $test->{source}; + $moddir =~ s~/tests/[^/]+$~~; + add_path_commits($test->{commits}, "$moddir/tests"); + if ($has_wine_failures) { - my $buildname = $commit->{build}->{name}; - $test->{commits}->{$buildname}->{$commit->{id}} = $commit; + # In Wine any patch to the module could have caused the failures + add_path_commits($test->{commits}, $moddir); } } diff --git a/winetest/report.css b/winetest/report.css index 2cc466304..4c9197250 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -111,3 +111,12 @@ div.pattern :hover { color: black; text-decoration: underline; } .patL { /* error while getting the test list */ background-color: #80aaff; } + +.commitU { + font-weight: bold; +} +.committ { +} +.commitm { + font-style: italic; +} -- 2.20.1

1 0

Proposal for joining OSPP Summer Code 2021
by litimetal＠gmail.com May 11, 2021

May 11, 2021

Hi all, Institute of Software Chinese Academy of Sciences[1] (ISCAS) and openEuler community are jointly organizing Summer 2021 of Open Source Promotion Plan (OSPP). This project[3] is very similar to Google Summer of Code (GSoC) and Outreachy[4]. OSPP opens to all projects with OSI-approved licenses, and worldwide students. When students finish their projects, both students and mentors will be paid. OSPP committee will process international wire transfers if needed[5]. One interesting point, OSPP is providing three different levels[6], with different awards (about USD 1.8k, 1.4k, 0.9k)[7]. That might make it easier to find projects/students (Thanks to Austin English to notice it) If we're going to participate in OSPP, we could reuse our GSoC page[8]. Our GSoC history[9] could also be a guide for new candidates. Obviously, new ideas are welcome. If an idea is interesting but too easy for GSoC, please consider sending it to OSPP with medium/low difficulty. Please send your questions/doubts/complaints/etc to wine-devel. If we're going to participate in OSPP 2021, I will submit the Wine community's application before May 20th (deadline for community). Disclaimer: I am not affiliated, associated, or endorsed by ISCAS/openEuler. [1]: http://english.is.cas.cn/au/ [2]: https://openeuler.org/en/ [3]: https://summer.iscas.ac.cn/help/en/ [4]: https://wiki.winehq.org/Outreachy [5]: https://summer.iscas.ac.cn/help/en/mentor/ [6]: https://summer.iscas.ac.cn/help/en/community/#how-to-set-project-difficulty… [7]: https://summer.iscas.ac.cn/help/en/student/ [8]: https://wiki.winehq.org/Summer_Of_Code [9]: https://wiki.winehq.org/Previous_Summers_of_Code [10]: (Chinese page) https://isrc.iscas.ac.cn/summer2020/#/announcement Sincerely,Zhenbo Li

4 6

[PATCH] dwrite: Check for allocation failures of glyph buffers.
by Nikolay Sivov May 11, 2021

May 11, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 93d507cf3dc..89c76da0bb9 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1190,6 +1190,12 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, *actual_glyph_count = 0; + if (!context.u.subst.glyphs || !context.u.subst.glyph_props || !context.glyph_infos) + { + hr = E_OUTOFMEMORY; + goto failed; + } + scriptprops = &dwritescripts_properties[context.script]; hr = shape_get_glyphs(&context, scriptprops->scripttags); if (SUCCEEDED(hr)) @@ -1199,6 +1205,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, memcpy(glyph_props, context.u.subst.glyph_props, context.glyph_count * sizeof(*glyph_props)); } +failed: heap_free(context.u.subst.glyph_props); heap_free(context.u.subst.glyphs); heap_free(context.glyph_infos); @@ -1261,12 +1268,19 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 context.user_features.features = features; context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; - context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * glyph_count); + context.glyph_infos = heap_calloc(glyph_count, sizeof(*context.glyph_infos)); context.table = &context.cache->gpos; + if (!context.glyph_infos) + { + hr = E_OUTOFMEMORY; + goto failed; + } + scriptprops = &dwritescripts_properties[context.script]; hr = shape_get_positions(&context, scriptprops->scripttags); +failed: heap_free(context.glyph_infos); return hr; @@ -1331,12 +1345,19 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite context.user_features.features = features; context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; - context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * glyph_count); + context.glyph_infos = heap_calloc(glyph_count, sizeof(*context.glyph_infos)); context.table = &context.cache->gpos; + if (!context.glyph_infos) + { + hr = E_OUTOFMEMORY; + goto failed; + } + scriptprops = &dwritescripts_properties[context.script]; hr = shape_get_positions(&context, scriptprops->scripttags); +failed: heap_free(context.glyph_infos); return hr; @@ -1805,7 +1826,8 @@ static HRESULT WINAPI dwritetextanalyzer2_CheckTypographicFeature(IDWriteTextAna context.cache = fontface_get_shaping_cache(font_obj); context.language_tag = get_opentype_language(locale); - context.glyph_infos = heap_calloc(glyph_count, sizeof(*context.glyph_infos)); + if (!(context.glyph_infos = heap_calloc(glyph_count, sizeof(*context.glyph_infos)))) + return E_OUTOFMEMORY; props = &dwritescripts_properties[sa.script]; @@ -2355,7 +2377,7 @@ static HRESULT WINAPI fontfallbackbuilder_AddMapping(IDWriteFontFallbackBuilder mapping->ranges = heap_calloc(ranges_count, sizeof(*mapping->ranges)); memcpy(mapping->ranges, ranges, sizeof(*mapping->ranges) * ranges_count); mapping->ranges_count = ranges_count; - mapping->families = heap_alloc_zero(sizeof(*mapping->families) * families_count); + mapping->families = heap_calloc(families_count, sizeof(*mapping->families)); mapping->families_count = families_count; for (i = 0; i < families_count; i++) mapping->families[i] = heap_strdupW(target_families[i]); -- 2.30.2

1 0

[PATCH 1/2] winevulkan: Allow some experimental VK extensions to be translated.
by Liam Middlebrook May 11, 2021

May 11, 2021

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 76d5fa94155..201fe46d935 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -131,6 +131,13 @@ CORE_EXTENSIONS = [ "VK_KHR_win32_surface", ] +# Some experimental extensions are used by shipping applications so their API is extremely unlikely +# to change in a backwards-incompatible way. Allow translation of those extensions with WineVulkan. +ALLOWED_X_EXTENSIONS = [ + "VK_NVX_binary_import", + "VK_NVX_image_view_handle", +] + # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES @@ -3095,7 +3102,7 @@ class VkRegistry(object): # Disable highly experimental extensions as the APIs are unstable and can # change between minor Vulkan revisions until API is final and becomes KHR # or NV. - if "KHX" in ext_name or "NVX" in ext_name: + if ("KHX" in ext_name or "NVX" in ext_name) and ext_name not in ALLOWED_X_EXTENSIONS: LOGGER.debug("Skipping experimental extension: {0}".format(ext_name)) skipped_exts.append(ext_name) return -- 2.31.1

2 4

[PATCH v2] ws2_32: Check if waiting asyncs exist in WSARecv/WSASend
by Dongwan Kim May 11, 2021

May 11, 2021

WSARecv call should not intercept message for the waiting overlapped WSARecv. To do that, We should know if waiting asyncs exist before trying ws2_recv/ws2_send. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/ws2_32/socket.c | 31 +++++++++++++++++++++++++++++-- include/wine/server_protocol.h | 20 +++++++++++++++++++- server/protocol.def | 8 ++++++++ server/request.h | 8 ++++++++ server/sock.c | 26 ++++++++++++++++++++++++++ server/trace.c | 12 ++++++++++++ 6 files changed, 102 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3a8bfa0ce41..cf76d96894c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2016,6 +2016,23 @@ static void WINAPI ws2_async_apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserv release_async_io( &wsa->io ); } +/* query if the socket has pending asyncs */ +static int WS_QueryAsyncWaiting( SOCKET sock, int type ) +{ + int result=0; + + SERVER_START_REQ( query_async_waiting ) + { + req->handle = wine_server_obj_handle( SOCKET2HANDLE(sock) ); + req->type = type; + wine_server_call(req); + result = reply->state; + } + SERVER_END_REQ; + return result; + +} + /*********************************************************************** * WS2_recv (INTERNAL) * @@ -5049,7 +5066,12 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } flags = convert_flags(dwFlags); - n = WS2_send( fd, wsa, flags ); + if(WS_QueryAsyncWaiting(s , ASYNC_TYPE_WRITE)) + { + n = -1; errno = EAGAIN; + } + else + n = WS2_send( fd, wsa, flags ); if (n == -1 && errno != EAGAIN) { err = wsaErrno(); @@ -6129,7 +6151,12 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, flags = convert_flags(wsa->flags); for (;;) { - n = WS2_recv( fd, wsa, flags ); + if(WS_QueryAsyncWaiting(s, ASYNC_TYPE_READ)) + { + n = -1; errno = EAGAIN; + } + else + n = WS2_recv( fd, wsa, flags ); if (n == -1) { /* Unix-like systems return EINVAL when attempting to read OOB data from diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f326d78bc3c..949e0cbda6e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5392,6 +5392,21 @@ struct get_next_thread_reply char __pad_12[4]; }; +struct query_async_waiting_request +{ + struct request_header __header; + obj_handle_t handle; + int type; + char __pad_20[4]; + +}; +struct query_async_waiting_reply +{ + struct reply_header __header; + int state; + char __pad_12[4]; +}; + enum request { @@ -5669,6 +5684,7 @@ enum request REQ_suspend_process, REQ_resume_process, REQ_get_next_thread, + REQ_query_async_waiting, REQ_NB_REQUESTS }; @@ -5950,6 +5966,7 @@ union generic_request struct suspend_process_request suspend_process_request; struct resume_process_request resume_process_request; struct get_next_thread_request get_next_thread_request; + struct query_async_waiting_request query_async_waiting_request; }; union generic_reply { @@ -6229,11 +6246,12 @@ union generic_reply struct suspend_process_reply suspend_process_reply; struct resume_process_reply resume_process_reply; struct get_next_thread_reply get_next_thread_reply; + struct query_async_waiting_reply query_async_waiting_reply; }; /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 698 +#define SERVER_PROTOCOL_VERSION 699 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index abfd6d70240..cab791bb089 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3700,3 +3700,11 @@ struct handle_info @REPLY obj_handle_t handle; /* next thread handle */ @END + +/* Query if there are waiting asyncs of the socket */ +(a)REQ(query_async_waiting) + obj_handle_t handle; /* socket handle */ + int type; /* async type */ +(a)REPLY + int state; /* waiting async exists */ +(a)END diff --git a/server/request.h b/server/request.h index ec5595bedf2..450667e9cf3 100644 --- a/server/request.h +++ b/server/request.h @@ -393,6 +393,7 @@ DECL_HANDLER(terminate_job); DECL_HANDLER(suspend_process); DECL_HANDLER(resume_process); DECL_HANDLER(get_next_thread); +DECL_HANDLER(query_async_waiting); #ifdef WANT_REQUEST_HANDLERS @@ -673,6 +674,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_suspend_process, (req_handler)req_resume_process, (req_handler)req_get_next_thread, + (req_handler)req_query_async_waiting, }; C_ASSERT( sizeof(abstime_t) == 8 ); @@ -2236,6 +2238,12 @@ C_ASSERT( FIELD_OFFSET(struct get_next_thread_request, flags) == 28 ); C_ASSERT( sizeof(struct get_next_thread_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_next_thread_reply, handle) == 8 ); C_ASSERT( sizeof(struct get_next_thread_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_request, type) == 16 ); +C_ASSERT( sizeof(struct query_async_waiting_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_reply, state) == 8 ); +C_ASSERT( sizeof(struct query_async_waiting_reply) == 16 ); + #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/sock.c b/server/sock.c index 36fda31f9c1..a2704a31287 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1889,3 +1889,29 @@ DECL_HANDLER(get_socket_info) release_object( &sock->obj ); } + +DECL_HANDLER( query_async_waiting ) +{ + struct sock *sock; + struct async *async; + reply->state = 0; + + if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle, + FILE_READ_ATTRIBUTES, &sock_ops))) return; + if (get_unix_fd( sock->fd ) == -1) return; + + if (is_fd_overlapped( sock->fd )) + { + if(req->type == ASYNC_TYPE_READ && ( async = find_pending_async(&sock->read_q) )) { + reply->state = 1; + release_object(async); + } + if(req->type == ASYNC_TYPE_WRITE && ( async = find_pending_async(&sock->write_q )) ) + { + reply->state = 1; + release_object(async); + } + } + release_object( &sock->obj ); + +} diff --git a/server/trace.c b/server/trace.c index 6b8c1ad3342..0787e717d09 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4450,6 +4450,15 @@ static void dump_get_next_thread_reply( const struct get_next_thread_reply *req { fprintf( stderr, " handle=%04x", req->handle ); } +static void dump_query_async_waiting_request( const struct query_async_waiting_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", type=%d", req->type ); +} +static void dump_query_async_waiting_reply( const struct query_async_waiting_reply *req ) +{ + fprintf( stderr, " state=%d", req->state ); +} static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, @@ -4726,6 +4735,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_suspend_process_request, (dump_func)dump_resume_process_request, (dump_func)dump_get_next_thread_request, + (dump_func)dump_query_async_waiting_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -5003,6 +5013,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, (dump_func)dump_get_next_thread_reply, + (dump_func)dump_query_async_waiting_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -5280,6 +5291,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "suspend_process", "resume_process", "get_next_thread", + "query_async_waiting", }; static const struct -- 2.30.2

2 1

[PATCH 1/5] server: Add process argument to find_rawinput_device.
by Rémi Bernon May 11, 2021

May 11, 2021

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> --- 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; } -- 2.31.0

1 4

[PATCH 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 7/7 v2] msvcrt: Implement llrintf using rintf function.
by Piotr Caban May 10, 2021

May 10, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 10 +++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 9 insertions(+), 16 deletions(-)

1 0

[PATCH 6/7 v2] msvcrt: Implement llrint using rint function.
by Piotr Caban May 10, 2021

May 10, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 10 +++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 9 insertions(+), 16 deletions(-)

1 0

[PATCH 5/7 v2] msvcrt: Implement lrintf using rintf function.
by Piotr Caban May 10, 2021

May 10, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 10 +++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 9 insertions(+), 16 deletions(-)

1 0