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

[PATCH 2/5] webservices: Always queue an async in WsReceiveMessage and WsRequestReply.
by Hans Leidekker 18 May '21

18 May '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 58 +++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 69ceb2f051e..76b0c1a96e2 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -771,6 +771,34 @@ static HRESULT send_byte( SOCKET socket, BYTE byte ) return S_OK; } +struct async +{ + HRESULT hr; + HANDLE done; +}; + +static void CALLBACK async_callback( HRESULT hr, WS_CALLBACK_MODEL model, void *state ) +{ + struct async *async = state; + async->hr = hr; + SetEvent( async->done ); +} + +static void async_init( struct async *async, WS_ASYNC_CONTEXT *ctx ) +{ + async->done = CreateEventW( NULL, FALSE, FALSE, NULL ); + async->hr = E_FAIL; + ctx->callback = async_callback; + ctx->callbackState = async; +} + +static HRESULT async_wait( struct async *async ) +{ + DWORD err; + if ((err = WaitForSingleObject( async->done, INFINITE )) == WAIT_OBJECT_0) return async->hr; + return HRESULT_FROM_WIN32( err ); +} + static HRESULT shutdown_session( struct channel *channel ) { HRESULT hr; @@ -2154,6 +2182,8 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M void *value, ULONG size, ULONG *index, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + WS_ASYNC_CONTEXT ctx_local; + struct async async; HRESULT hr; TRACE( "%p %p %p %u %08x %08x %p %p %u %p %p %p\n", handle, msg, desc, count, option, read_option, heap, @@ -2170,10 +2200,14 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M return E_INVALIDARG; } - if (ctx) - hr = queue_receive_message( channel, msg, desc, count, option, read_option, heap, value, size, index, ctx ); - else - hr = receive_message( channel, msg, desc, count, option, read_option, heap, value, size, index ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_receive_message( channel, msg, desc, count, option, read_option, heap, value, size, index, + ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr ); @@ -2266,6 +2300,8 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS WS_HEAP *heap, void *value, ULONG size, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + WS_ASYNC_CONTEXT ctx_local; + struct async async; HRESULT hr; TRACE( "%p %p %p %08x %p %u %p %p %08x %p %p %u %p %p\n", handle, request, request_desc, write_option, @@ -2287,12 +2323,14 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS return WS_E_INVALID_OPERATION; } - if (ctx) - hr = queue_request_reply( channel, request, request_desc, write_option, request_body, request_size, reply, - reply_desc, read_option, heap, value, size, ctx ); - else - hr = request_reply( channel, request, request_desc, write_option, request_body, request_size, reply, - reply_desc, read_option, heap, value, size ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_request_reply( channel, request, request_desc, write_option, request_body, request_size, reply, + reply_desc, read_option, heap, value, size, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr ); -- 2.30.2

1 0

[PATCH 1/5] webservices: Implement WsAbortChannel.
by Hans Leidekker 18 May '21

18 May '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 42 +++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index fb9f5b3162c..69ceb2f051e 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -290,10 +290,37 @@ static void clear_queue( struct queue *queue ) queue->ready = NULL; } -static void reset_channel( struct channel *channel ) +static void abort_channel( struct channel *channel ) { clear_queue( &channel->send_q ); clear_queue( &channel->recv_q ); +} + +/************************************************************************** + * WsAbortChannel [webservices.@] + */ +HRESULT WINAPI WsAbortChannel( WS_CHANNEL *handle, WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + + TRACE( "%p %p\n", handle, error ); + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + + abort_channel( channel ); + + LeaveCriticalSection( &channel->cs ); + return S_OK; +} + +static void reset_channel( struct channel *channel ) +{ channel->state = WS_CHANNEL_STATE_CREATED; channel->session_state = SESSION_STATE_UNINITIALIZED; clear_addr( &channel->addr ); @@ -352,6 +379,7 @@ static void free_props( struct channel *channel ) static void free_channel( struct channel *channel ) { + abort_channel( channel ); reset_channel( channel ); WsFreeWriter( channel->writer ); @@ -631,7 +659,10 @@ HRESULT WINAPI WsResetChannel( WS_CHANNEL *handle, WS_ERROR *error ) if (channel->state != WS_CHANNEL_STATE_CREATED && channel->state != WS_CHANNEL_STATE_CLOSED) hr = WS_E_INVALID_OPERATION; else + { + abort_channel( channel ); reset_channel( channel ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr ); @@ -2521,12 +2552,3 @@ HRESULT channel_accept_udp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE LeaveCriticalSection( &channel->cs ); return hr; } - -/************************************************************************** - * WsAbortChannel [webservices.@] - */ -HRESULT WINAPI WsAbortChannel( WS_CHANNEL *handle, WS_ERROR *error ) -{ - FIXME( "%p %p: stub!\n", handle, error ); - return E_NOTIMPL; -} -- 2.30.2

1 0

[PATCH] ws2_32: Very minimal support for AF_UNIX.
by Richard W.M. Jones 18 May '21

18 May '21

This is actually a repost, it was originally posted last year: https://www.winehq.org/pipermail/wine-devel/2020-September/thread.html#1732… This patch is substantially the same except that I have fixed it so it compiled against the latest master branch, and also fixed a place where I was not calculating a structure size correctly. I did not add tests. The current socket tests (without this patch) don't pass for me and I don't understand how to make them work. However we do run this patch against our NBD server which makes extensive use of AF_UNIX in its test suite, and everything runs fine there. I'd be happy if someone who understands the Wine code base better than me and wants AF_UNIX support wants to take this over. Rich.

1 1

[PATCH 1/3] user32/tests: Remove todo_wine for ShowWindow(SW_SHOWMINIMIZED):overlapped.
by Rémi Bernon 18 May '21

18 May '21

It seems to consistently succeed now, although the failure origin is probably still there. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7eaa2c67945..13e085dfacc 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5405,7 +5405,7 @@ static void test_messages(void) ShowWindow(hwnd, SW_MINIMIZE); flush_events(); - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", FALSE); flush_sequence(); if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE) -- 2.31.0

3 7

[tools] winetest/build-patterns: Show regressions identified in related bugs.
by Francois Gouget 18 May '21

18 May '21

If a commit has been identified as causing a bug related to a test, show and highlight that commit even if it is older than the oldest build. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 98 +++++++++++++++++++++++++++++++---------- winetest/report.css | 4 ++ 2 files changed, 79 insertions(+), 23 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 3c9b8aa84..aacbb5217 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -766,14 +766,35 @@ if (open(my $fh, "-|", $cmd)) # # - desc # The bug's one-line description. +# +# - regression +# The bug's "Regression SHA1" field. If set this identifies the Git commit +# causing the bug. my %bugs; my $old_build_date = $sortedbuilds[0]->{date}; my $mid_build_date = $sortedbuilds[int(@sortedbuilds/2)]->{date}; -sub create_bug($$$) +sub create_bug($$$$) { - my ($bugid, $mtime, $desc) = @_; + my ($bugid, $mtime, $regression, $desc) = @_; + + my $commit; + if ($regression) + { + $commit = $commits{$regression}; + if (!$commit) + { + my ($date, $summary) = get_build_info($regression); + $commits{$regression} = $commit = { + index => -(a)sortedbuilds, # not sorted + id => $regression, + date => $date, + build => $sortedbuilds[0], + summary => $summary, + }; + } + } my $t = Time::Piece->strptime($mtime, "%Y-%m-%d %H:%M:%S"); return { @@ -782,10 +803,11 @@ sub create_bug($$$) class => $t < $old_build_date ? "bugold" : $t < $mid_build_date ? "buginactive" : "bugactive", desc => $desc, + regression => $commit, }; } -$cmd = "wget -qO- '$bugweb/buglist.cgi?product=Wine&product=Wine-Testbot&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=source%2Ctestcase&keywords_type=allwords&rep_platform=x86&rep_platform=x86-64&columnlist=changeddate%2Cshort_desc&query_format=advanced&ctype=csv'"; +$cmd = "wget -qO- '$bugweb/buglist.cgi?product=Wine&product=Wine-Testbot&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=source%2Ctestcase&keywords_type=allwords&rep_platform=x86&rep_platform=x86-64&columnlist=changeddate%2Ccf_regression_sha1sum%2Cshort_desc&query_format=advanced&ctype=csv'"; if (open(my $fh, "-|", $cmd)) { <$fh>; # skip the header line @@ -799,15 +821,16 @@ if (open(my $fh, "-|", $cmd)) next; } - my ($bugid, $mtime, $desc) = $csv->fields(); + my ($bugid, $mtime, $commitid, $desc) = $csv->fields(); my $teststr = $desc; while ($teststr =~ s~\b([_.a-z0-9-]+)(?:/tests/|/|:)([_a-z0-9]+)\b~ ~) { my ($module, $unit) = ($1, $2); my $test = $tests{"$module:$unit"}; next if (!$test); - $bugs{$bugid} ||= create_bug($bugid, $mtime, $desc); + $bugs{$bugid} ||= create_bug($bugid, $mtime, $commitid, $desc); push @{$test->{bugs}}, $bugs{$bugid}; + $test->{regressions}->{$commitid} = $commits{$commitid}; } } close($fh); @@ -820,6 +843,10 @@ if (open(my $fh, "-|", $cmd)) foreach my $bug (sort { $a->{mtime} <=> $b->{mtime} } @{$test->{bugs}}) { $test->{desc} .= "<a href='$bugweb/show_bug.cgi?id=$bug->{id}'>$bug->{id}</a> {class}'>$bug->{desc}"; + if ($bug->{regression}) + { + $test->{desc} .= " (<a href='$gitweb/commitdiff/$bug->{regression}->{id}'>bisected</a>)"; + } $test->{desc} .= " "; } $test->{desc} .= ""; @@ -1069,6 +1096,7 @@ sub index2symbol($) } my %scope_descs = ( + R => "Caused a test regression", U => "Modifies this test", t => "Modifies a test resource (maybe for another test)", m => "Modifies the module", @@ -1091,11 +1119,16 @@ sub write_commits($$) } my $symbol = index2symbol($i++); - my ($ucount, $tcount, $tmcount) = (0, 0, 0); + my ($rcount, $sumcount, $tcount, $detcount) = (0, 0, 0, 0); foreach my $commit (sort { $a->{index} <=> $b->{index} } values %$buildcommits) { my $scope = "m"; - if ($path2commits{$test->{source}}->{$commit->{id}}) + if ($test->{regressions}->{$commit->{id}}) + { + $scope = "R"; + $rcount++; + } + elsif ($path2commits{$test->{source}}->{$commit->{id}}) { $scope = "U"; } @@ -1115,29 +1148,38 @@ sub write_commits($$) $gitweb, $commit->{id}, short_date($build->{date}), $commit->{summary}); - if ($scope eq "U") + if ($scope eq "R" or $scope eq "U") { - push @udescs, ($ucount ? "\n " : "\n$symbol."), $desc; - $ucount++; + push @udescs, ($sumcount ? "\n " : "\n$symbol."), $desc; + $sumcount++; } else { - push @tmdescs, ($tmcount ? " " : "$symbol."), $desc, "\n"; - $tmcount++; + push @tmdescs, ($detcount ? " " : "$symbol."), $desc, "\n"; + $detcount++; } } - push @udescs, " [+$tmcount in details]" 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>", + push @udescs, " [+$detcount in details]" if ($sumcount and $detcount); + + my @desc; + push @desc, "this test" if ($sumcount > $rcount); + push @desc, "test resources" if ($tcount); + push @desc, "the module" if ($detcount > $tcount); + if (@desc) + { + my $count = $sumcount + $detcount - $rcount; + @desc = ( sprintf("%s commit%s to %s", $count, + $count > 1 ? "s" : "", join(", ", @desc)) ); + } + if ($rcount) + { + unshift @desc, sprintf("%s regression%s", $rcount, + $rcount > 1 ? "s" : ""); + } + my $scope = $rcount ? "R" : $sumcount ? "U" : $tcount ? "t" : "m"; + printf $html "<a class='commit%s' title='%s : %s'>%s</a>", $scope, short_date($build->{date}), - $count, $count > 1 ? "s" : "", - join(", ", @impacts), $symbol; + join(", ", @desc), $symbol; } print $html "</div> ← potentially related commits\n"; @@ -1255,6 +1297,16 @@ EOF $test->{colors} = {}; $test->{commits} = {}; + # The regression commits may only impact the results in Wine. + # Add them even if only reporting on the Windows results. + foreach my $bug (@{$test->{bugs}}) + { + my $commit = $bug->{regression}; + next if (!$commit); + my $buildname = $commit->{build}->{name}; + $test->{commits}->{$buildname}->{$commit->{id}} = $commit; + } + my $has_wine_failures; my $first = @sortedbuilds; my $last = -1; diff --git a/winetest/report.css b/winetest/report.css index 05ee035a4..80be53dbe 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -118,6 +118,10 @@ div.pattern :hover { color: black; text-decoration: underline; } background-color: #80aaff; } +.commitR { + color: #cc0000; + font-weight: bold; +} .commitU { font-weight: bold; } -- 2.20.1

1 0

[PATCH v4 1/2] server: Support nested jobs.
by Paul Gofman 18 May '21

18 May '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v4: - get rid of walk_job() and use recursive helpers instead; - make sure job parameter for terminate_job() always has at least one reference during function call; - simplify add_job_process() a bit; - don't remove process from job's process list on error in add_job_process(). dlls/kernel32/tests/process.c | 180 +++++++++++++++++++++++++++++++++- server/process.c | 139 +++++++++++++++++++------- 2 files changed, 280 insertions(+), 39 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 7d5d2ead75b..f170043b5b9 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -71,6 +71,7 @@ static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFla static BOOL (WINAPI *pQueryFullProcessImageNameW)(HANDLE hProcess, DWORD dwFlags, LPWSTR lpExeName, PDWORD lpdwSize); static DWORD (WINAPI *pK32GetProcessImageFileNameA)(HANDLE,LPSTR,DWORD); static HANDLE (WINAPI *pCreateJobObjectW)(LPSECURITY_ATTRIBUTES sa, LPCWSTR name); +static HANDLE (WINAPI *pOpenJobObjectA)(DWORD access, BOOL inherit, LPCSTR name); static BOOL (WINAPI *pAssignProcessToJobObject)(HANDLE job, HANDLE process); static BOOL (WINAPI *pIsProcessInJob)(HANDLE process, HANDLE job, PBOOL result); static BOOL (WINAPI *pTerminateJobObject)(HANDLE job, UINT exit_code); @@ -257,6 +258,7 @@ static BOOL init(void) pQueryFullProcessImageNameW = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameW"); pK32GetProcessImageFileNameA = (void *) GetProcAddress(hkernel32, "K32GetProcessImageFileNameA"); pCreateJobObjectW = (void *)GetProcAddress(hkernel32, "CreateJobObjectW"); + pOpenJobObjectA = (void *)GetProcAddress(hkernel32, "OpenJobObjectA"); pAssignProcessToJobObject = (void *)GetProcAddress(hkernel32, "AssignProcessToJobObject"); pIsProcessInJob = (void *)GetProcAddress(hkernel32, "IsProcessInJob"); pTerminateJobObject = (void *)GetProcAddress(hkernel32, "TerminateJobObject"); @@ -2976,13 +2978,14 @@ static void test_jobInheritance(HANDLE job) wait_and_close_child_process(&pi); } -static void test_BreakawayOk(HANDLE job) +static void test_BreakawayOk(HANDLE parent_job) { JOBOBJECT_EXTENDED_LIMIT_INFORMATION limit_info; PROCESS_INFORMATION pi; STARTUPINFOA si = {0}; char buffer[MAX_PATH + 23]; - BOOL ret, out; + BOOL ret, out, nested_jobs; + HANDLE job; if (!pIsProcessInJob) { @@ -2990,6 +2993,16 @@ static void test_BreakawayOk(HANDLE job) return; } + job = pCreateJobObjectW(NULL, NULL); + ok(!!job, "CreateJobObjectW error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job, GetCurrentProcess()); + ok(ret || broken(!ret && GetLastError() == ERROR_ACCESS_DENIED) /* before Win 8. */, + "AssignProcessToJobObject error %u\n", GetLastError()); + nested_jobs = ret; + if (!ret) + win_skip("Nested jobs are not supported.\n"); + sprintf(buffer, "\"%s\" process exit", selfname); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); ok(!ret, "CreateProcessA expected failure\n"); @@ -3001,8 +3014,30 @@ static void test_BreakawayOk(HANDLE job) wait_and_close_child_process(&pi); } + if (nested_jobs) + { + limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_BREAKAWAY_OK; + ret = pSetInformationJobObject(job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); + ok(ret, "SetInformationJobObject error %u\n", GetLastError()); + + sprintf(buffer, "\"%s\" process exit", selfname); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); + ok(ret, "CreateProcessA error %u\n", GetLastError()); + + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + ret = pIsProcessInJob(pi.hProcess, parent_job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + TerminateProcess(pi.hProcess, 0); + wait_and_close_child_process(&pi); + } + limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_BREAKAWAY_OK; - ret = pSetInformationJobObject(job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); + ret = pSetInformationJobObject(parent_job, JobObjectExtendedLimitInformation, &limit_info, sizeof(limit_info)); ok(ret, "SetInformationJobObject error %u\n", GetLastError()); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); @@ -3012,6 +3047,10 @@ static void test_BreakawayOk(HANDLE job) ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); + ret = pIsProcessInJob(pi.hProcess, parent_job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + wait_and_close_child_process(&pi); limit_info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK; @@ -4309,6 +4348,135 @@ static void test_dead_process(void) CloseHandle(pi.hThread); } +static void test_nested_jobs_child(unsigned int index) +{ + HANDLE job, job_parent, job_other; + PROCESS_INFORMATION pi; + char job_name[32]; + BOOL ret, out; + + sprintf(job_name, "test_nested_jobs_%u", index); + job = pOpenJobObjectA(JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_QUERY + | JOB_OBJECT_TERMINATE, FALSE, job_name); + ok(!!job, "OpenJobObjectA error %u\n", GetLastError()); + + sprintf(job_name, "test_nested_jobs_%u", !index); + job_other = pOpenJobObjectA(JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_QUERY + | JOB_OBJECT_TERMINATE, FALSE, job_name); + ok(!!job_other, "OpenJobObjectA error %u\n", GetLastError()); + + job_parent = pCreateJobObjectW(NULL, NULL); + ok(!!job_parent, "CreateJobObjectA error %u\n", GetLastError()); + + ret = pAssignProcessToJobObject(job_parent, GetCurrentProcess()); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + create_process("wait", &pi); + + ret = pAssignProcessToJobObject(job_parent, pi.hProcess); + ok(ret || broken(!ret && GetLastError() == ERROR_ACCESS_DENIED) /* Supported since Windows 8. */, + "AssignProcessToJobObject error %u\n", GetLastError()); + if (!ret) + { + win_skip("Nested jobs are not supported.\n"); + goto done; + } + ret = pAssignProcessToJobObject(job, pi.hProcess); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, NULL, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = TRUE; + ret = pIsProcessInJob(GetCurrentProcess(), job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + ret = pAssignProcessToJobObject(job, GetCurrentProcess()); + ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + + TerminateProcess(pi.hProcess, 0); + wait_child_process(pi.hProcess); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + create_process("wait", &pi); + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, job_parent, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(out, "IsProcessInJob returned out=%u\n", out); + + if (index) + { + ret = pAssignProcessToJobObject(job_other, GetCurrentProcess()); + ok(!ret, "AssignProcessToJobObject succeded\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Got unexpected error %u.\n", GetLastError()); + } +done: + TerminateProcess(pi.hProcess, 0); + wait_child_process(pi.hProcess); + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(job_parent); + CloseHandle(job); + CloseHandle(job_other); +} + +static void test_nested_jobs(void) +{ + PROCESS_INFORMATION info[2]; + char buffer[MAX_PATH + 26]; + STARTUPINFOA si = {0}; + HANDLE job1, job2; + unsigned int i; + + if (!pIsProcessInJob) + { + win_skip("IsProcessInJob not available.\n"); + return; + } + + job1 = pCreateJobObjectW(NULL, L"test_nested_jobs_0"); + ok(!!job1, "CreateJobObjectW failed, error %u.\n", GetLastError()); + job2 = pCreateJobObjectW(NULL, L"test_nested_jobs_1"); + ok(!!job2, "CreateJobObjectW failed, error %u.\n", GetLastError()); + + sprintf(buffer, "\"%s\" process nested_jobs 0", selfname); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info[0]), + "CreateProcess failed\n"); + wait_child_process(info[0].hProcess); + sprintf(buffer, "\"%s\" process nested_jobs 1", selfname); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info[1]), + "CreateProcess failed\n"); + wait_child_process(info[1].hProcess); + for (i = 0; i < 2; ++i) + { + CloseHandle(info[i].hProcess); + CloseHandle(info[i].hThread); + } + + CloseHandle(job1); + CloseHandle(job2); +} + START_TEST(process) { HANDLE job, hproc, h, h2; @@ -4384,6 +4552,11 @@ START_TEST(process) test_handle_list_attribute(TRUE, h, h2); return; } + else if (!strcmp(myARGV[2], "nested_jobs") && myARGC >= 4) + { + test_nested_jobs_child(atoi(myARGV[3])); + return; + } ok(0, "Unexpected command %s\n", myARGV[2]); return; @@ -4452,6 +4625,7 @@ START_TEST(process) test_CompletionPort(); test_KillOnJobClose(); test_WaitForJobObject(); + test_nested_jobs(); job = test_AddSelfToJob(); test_jobInheritance(job); test_BreakawayOk(job); diff --git a/server/process.c b/server/process.c index aab723114a8..8baccdbad94 100644 --- a/server/process.c +++ b/server/process.c @@ -182,7 +182,7 @@ static void job_destroy( struct object *obj ); struct job { struct object obj; /* object header */ - struct list process_list; /* list of all processes */ + struct list process_list; /* list of processes */ int num_processes; /* count of running processes */ int total_processes; /* count of processes which have been assigned */ unsigned int limit_flags; /* limit flags */ @@ -190,6 +190,9 @@ struct job int signaled; /* job is signaled */ struct completion *completion_port; /* associated completion port */ apc_param_t completion_key; /* key to send with completion messages */ + struct job *parent; + struct list parent_job_entry; /* list entry for parent job */ + struct list child_job_list; /* list of child jobs */ }; static const struct object_ops job_ops = @@ -227,6 +230,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ { /* initialize it if it didn't already exist */ list_init( &job->process_list ); + list_init( &job->child_job_list ); job->num_processes = 0; job->total_processes = 0; job->limit_flags = 0; @@ -234,6 +238,7 @@ static struct job *create_job_object( struct object *root, const struct unicode_ job->signaled = 0; job->completion_port = NULL; job->completion_key = 0; + job->parent = NULL; } } return job; @@ -250,14 +255,59 @@ static void add_job_completion( struct job *job, apc_param_t msg, apc_param_t pi add_completion( job->completion_port, job->completion_key, pid, STATUS_SUCCESS, msg ); } +static int process_in_job( struct job *job, struct process *process ) +{ + struct job *j; + + LIST_FOR_EACH_ENTRY( j, &job->child_job_list, struct job, parent_job_entry ) + { + assert( j->parent == job ); + if (process_in_job( j, process )) return 1; + } + return process->job == job; +} + static void add_job_process( struct job *job, struct process *process ) { + struct job *j, *common_parent; + process_id_t pid; + + if (job == process->job) return; + + if ((common_parent = process->job)) + { + if (job->parent) + { + for (j = job->parent; j; j = j->parent) + if (j == common_parent) break; + + if (j != common_parent) + { + /* Job already has parent and the process is not in the job's chain. */ + set_error( STATUS_ACCESS_DENIED ); + return; + } + /* process->job is referenced in the job->parent chain. */ + release_object( process->job ); + } + else + { + /* transfer reference. */ + job->parent = process->job; + list_add_tail( &job->parent->child_job_list, &job->parent_job_entry ); + } + list_remove( &process->job_entry ); + } process->job = (struct job *)grab_object( job ); list_add_tail( &job->process_list, &process->job_entry ); - job->num_processes++; - job->total_processes++; - add_job_completion( job, JOB_OBJECT_MSG_NEW_PROCESS, get_process_id(process) ); + pid = get_process_id( process ); + for (j = job; j != common_parent; j = j->parent) + { + j->num_processes++; + j->total_processes++; + add_job_completion( j, JOB_OBJECT_MSG_NEW_PROCESS, pid ); + } } /* called when a process has terminated, allow one additional process */ @@ -265,37 +315,41 @@ static void release_job_process( struct process *process ) { struct job *job = process->job; - if (!job) return; + while (job) + { + assert( job->num_processes ); + job->num_processes--; - assert( job->num_processes ); - job->num_processes--; + if (!job->terminating) + add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); - if (!job->terminating) - add_job_completion( job, JOB_OBJECT_MSG_EXIT_PROCESS, get_process_id(process) ); + if (!job->num_processes) + add_job_completion( job, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, 0 ); - if (!job->num_processes) - add_job_completion( job, JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO, 0 ); + job = job->parent; + } } static void terminate_job( struct job *job, int exit_code ) { - /* don't report completion events for terminated processes */ - job->terminating = 1; + struct process *process, *next_process; + struct job *j, *next_job; - for (;;) /* restart from the beginning of the list every time */ + LIST_FOR_EACH_ENTRY_SAFE( j, next_job, &job->child_job_list, struct job, parent_job_entry ) { - struct process *process; + assert( j->parent == job ); - /* find the first process associated with this job and still running */ - LIST_FOR_EACH_ENTRY( process, &job->process_list, struct process, job_entry ) - { - if (process->running_threads) break; - } - if (&process->job_entry == &job->process_list) break; /* no process found */ - assert( process->job == job ); - terminate_process( process, NULL, exit_code ); + grab_object( j ); + terminate_job( j, exit_code ); + release_object( j ); } + job->terminating = 1; + LIST_FOR_EACH_ENTRY_SAFE( process, next_process, &job->process_list, struct process, job_entry ) + { + assert( process->job == job ); + if (process->running_threads) terminate_process( process, NULL, exit_code ); + } job->terminating = 0; job->signaled = 1; wake_up( &job->obj, 0 ); @@ -320,16 +374,23 @@ static void job_destroy( struct object *obj ) assert( obj->ops == &job_ops ); assert( !job->num_processes ); - assert( list_empty(&job->process_list) ); + assert( list_empty( &job->process_list )); + assert( list_empty( &job->child_job_list )); if (job->completion_port) release_object( job->completion_port ); + if (job->parent) + { + list_remove( &job->parent_job_entry ); + release_object( job->parent ); + } } static void job_dump( struct object *obj, int verbose ) { struct job *job = (struct job *)obj; assert( obj->ops == &job_ops ); - fprintf( stderr, "Job processes=%d\n", list_count(&job->process_list) ); + fprintf( stderr, "Job processes=%d child_jobs=%d parent=%p\n", + list_count(&job->process_list), list_count(&job->child_job_list), job->parent ); } static int job_signaled( struct object *obj, struct wait_queue_entry *entry ) @@ -1026,6 +1087,7 @@ DECL_HANDLER(new_process) struct thread *parent_thread = current; int socket_fd = thread_get_inflight_fd( current, req->socket_fd ); const obj_handle_t *handles = NULL; + struct job *job; if (socket_fd == -1) { @@ -1062,6 +1124,8 @@ DECL_HANDLER(new_process) } else parent = (struct process *)grab_object( current->process ); + /* If a job further in the job chain does not permit breakaway process creation + * succeeds and the process which is trying to breakaway is assigned to that job. */ if (parent->job && (req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY) && !(parent->job->limit_flags & (JOB_OBJECT_LIMIT_BREAKAWAY_OK | JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK))) { @@ -1152,11 +1216,18 @@ DECL_HANDLER(new_process) process->startup_info = (struct startup_info *)grab_object( info ); - if (parent->job - && !(req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY) - && !(parent->job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK)) + job = parent->job; + while (job) { - add_job_process( parent->job, process ); + if (!(job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK) + && !(req->flags & PROCESS_CREATE_FLAGS_BREAKAWAY + && job->limit_flags & JOB_OBJECT_LIMIT_BREAKAWAY_OK)) + { + add_job_process( job, process ); + assert( !get_error() ); + break; + } + job = job->parent; } /* connect to the window station */ @@ -1570,12 +1641,8 @@ DECL_HANDLER(assign_job) if ((process = get_process_from_handle( req->process, PROCESS_SET_QUOTA | PROCESS_TERMINATE ))) { - if (!process->running_threads) - set_error( STATUS_PROCESS_IS_TERMINATING ); - else if (process->job) - set_error( STATUS_ACCESS_DENIED ); - else - add_job_process( job, process ); + if (!process->running_threads) set_error( STATUS_PROCESS_IS_TERMINATING ); + else add_job_process( job, process ); release_object( process ); } release_object( job ); @@ -1597,7 +1664,7 @@ DECL_HANDLER(process_in_job) } else if ((job = get_job_obj( current->process, req->job, JOB_OBJECT_QUERY ))) { - set_error( process->job == job ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); + set_error( process_in_job( job, process ) ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); release_object( job ); } release_object( process ); -- 2.31.1

1 1

[PATCH 5/6] user32: Add a cache for EnumDisplayDevicesW().
by Zhiyi Zhang 18 May '21

18 May '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- You might notice that there are duplications with update_display_cache() and update_monitor_cache(). EnumDisplayMonitors() is planned to use wineserver calls directly and subsequently update_monitor_cache() will be removed. So I don't try to deduplicate the code. dlls/user32/sysparams.c | 313 ++++++++++++++++++++++++++++------------ 1 file changed, 218 insertions(+), 95 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 015db0db50e..0336bf943c4 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -107,6 +107,32 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4ab #define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) +/* Cached display device information */ +struct display_device +{ + struct list entry; /* Device list entry */ + struct list childs; /* Child device list entry. For adapters, this is monitor list. For monitors, this is unused. */ + WCHAR device_name[32]; /* as DeviceName in DISPLAY_DEVICEW */ + WCHAR device_string[128]; /* as DeviceString in DISPLAY_DEVICEW */ + DWORD state_flags; /* as StateFlags in DISPLAY_DEVICEW */ + WCHAR device_id[128]; /* as DeviceID in DISPLAY_DEVICEW when EDD_GET_DEVICE_INTERFACE_NAME is not set */ + WCHAR interface_name[128]; /* as DeviceID in DISPLAY_DEVICEW when EDD_GET_DEVICE_INTERFACE_NAME is set */ + WCHAR device_key[128]; /* as DeviceKey in DISPLAY_DEVICEW */ +}; + +static struct list adapters = LIST_INIT(adapters); +static FILETIME last_query_display_time; +static CRITICAL_SECTION display_section; +static CRITICAL_SECTION_DEBUG display_critsect_debug = +{ + 0, 0, &display_section, + { &display_critsect_debug.ProcessLocksList, &display_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": display_section") } +}; +static CRITICAL_SECTION display_section = { &display_critsect_debug, -1, 0, 0, 0, 0 }; + +static BOOL enum_display_device( WCHAR *device, DWORD index, struct display_device *info ); + /* Cached monitor information */ static MONITORINFOEXW *monitors; static UINT monitor_count; @@ -3791,6 +3817,69 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) return MonitorFromRect( &rect, dwFlags ); } +/* Return FALSE on failure and TRUE on success */ +static BOOL update_display_cache(void) +{ + struct display_device device, *adapter, *adapter2, *monitor, *monitor2; + DWORD adapter_idx, monitor_idx; + struct list *monitor_list; + FILETIME filetime = {0}; + HANDLE mutex = NULL; + BOOL ret = FALSE; + + /* Update display cache from SetupAPI if it's outdated */ + wait_graphics_driver_ready(); + + if (!video_key && RegOpenKeyW( HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\VIDEO", &video_key )) + return FALSE; + if (RegQueryInfoKeyW( video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime )) + return FALSE; + if (CompareFileTime( &filetime, &last_query_display_time ) < 1) + return TRUE; + + mutex = get_display_device_init_mutex(); + EnterCriticalSection( &display_section ); + + LIST_FOR_EACH_ENTRY_SAFE(adapter, adapter2, &adapters, struct display_device, entry) + { + LIST_FOR_EACH_ENTRY_SAFE(monitor, monitor2, &adapter->childs, struct display_device, entry) + { + list_remove( &monitor->entry ); + heap_free( monitor ); + } + list_remove( &adapter->entry ); + heap_free( adapter ); + } + + for (adapter_idx = 0; enum_display_device( NULL, adapter_idx, &device ); ++adapter_idx) + { + adapter = heap_alloc( sizeof(*adapter) ); + if (!adapter) + goto fail; + + memcpy( adapter, &device, sizeof(device) ); + monitor_list = &adapter->childs; + list_init( monitor_list ); + list_add_tail( &adapters, &adapter->entry ); + for (monitor_idx = 0; enum_display_device( adapter->device_name, monitor_idx, &device ); ++monitor_idx) + { + monitor = heap_alloc( sizeof(*monitor) ); + if (!monitor) + goto fail; + + memcpy( monitor, &device, sizeof(device) ); + list_add_tail( monitor_list, &monitor->entry ); + } + } + + last_query_display_time = filetime; + ret = TRUE; +fail: + LeaveCriticalSection( &display_section ); + release_display_device_init_mutex( mutex ); + return ret; +} + /* Return FALSE on failure and TRUE on success */ static BOOL update_monitor_cache(void) { @@ -4117,6 +4206,76 @@ BOOL WINAPI EnumDisplayDevicesA( LPCSTR device, DWORD index, DISPLAY_DEVICEA *in * EnumDisplayDevicesW (USER32.@) */ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *info, DWORD flags ) +{ + struct display_device *adapter, *monitor, *found = NULL; + DWORD device_idx = 0; + + TRACE("%s %u %p %#x\n", debugstr_w( device ), index, info, flags); + + if (!update_display_cache()) + return FALSE; + + EnterCriticalSection( &display_section ); + /* Enumerate adapters */ + if (!device) + { + LIST_FOR_EACH_ENTRY(adapter, &adapters, struct display_device, entry) + { + if (index == device_idx++) + { + found = adapter; + break; + } + } + } + /* Enumerate monitors */ + else + { + LIST_FOR_EACH_ENTRY(adapter, &adapters, struct display_device, entry) + { + if (!lstrcmpiW( device, adapter->device_name )) + { + found = adapter; + break; + } + } + + if (found) + { + found = NULL; + LIST_FOR_EACH_ENTRY(monitor, &adapter->childs, struct display_device, entry) + { + if (index == device_idx++) + { + found = monitor; + break; + } + } + } + } + + if (!found) + { + LeaveCriticalSection( &display_section ); + return FALSE; + } + + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceName) + sizeof(info->DeviceName)) + lstrcpyW( info->DeviceName, found->device_name ); + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceString) + sizeof(info->DeviceString)) + lstrcpyW( info->DeviceString, found->device_string ); + if (info->cb >= offsetof(DISPLAY_DEVICEW, StateFlags) + sizeof(info->StateFlags)) + info->StateFlags = found->state_flags; + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) + lstrcpyW( info->DeviceID, (flags & EDD_GET_DEVICE_INTERFACE_NAME) ? found->interface_name : found->device_id ); + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) + lstrcpyW( info->DeviceKey, found->device_key ); + LeaveCriticalSection( &display_section ); + return TRUE; +} + +/* Call this function with the display_device_init mutex held */ +static BOOL enum_display_device( WCHAR *device, DWORD index, struct display_device *info ) { SP_DEVINFO_DATA device_data = {sizeof(device_data)}; HDEVINFO set = INVALID_HANDLE_VALUE; @@ -4125,17 +4284,11 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i WCHAR bufferW[1024]; LONG adapter_index; WCHAR *next_charW; - HANDLE mutex; DWORD size; DWORD type; HKEY hkey; BOOL ret = FALSE; - TRACE("%s %d %p %#x\n", debugstr_w( device ), index, info, flags); - - wait_graphics_driver_ready(); - mutex = get_display_device_init_mutex(); - /* Find adapter */ if (!device) { @@ -4145,46 +4298,40 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i goto done; /* DeviceKey */ - if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) - lstrcpyW( info->DeviceKey, bufferW ); + lstrcpyW( info->device_key, bufferW ); /* DeviceName */ - swprintf( info->DeviceName, ARRAY_SIZE(info->DeviceName), L"\\\\.\\DISPLAY%d", index + 1 ); + swprintf( info->device_name, ARRAY_SIZE(info->device_name), L"\\\\.\\DISPLAY%d", index + 1 ); /* Strip \Registry\Machine\ */ lstrcpyW( key_nameW, bufferW + 18 ); /* DeviceString */ - size = sizeof(info->DeviceString); + size = sizeof(info->device_string); if (RegGetValueW( HKEY_LOCAL_MACHINE, key_nameW, L"DriverDesc", RRF_RT_REG_SZ, NULL, - info->DeviceString, &size )) + info->device_string, &size )) goto done; /* StateFlags */ - size = sizeof(info->StateFlags); + size = sizeof(info->state_flags); if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"StateFlags", RRF_RT_REG_DWORD, NULL, - &info->StateFlags, &size )) + &info->state_flags, &size )) goto done; + /* Interface name */ + info->interface_name[0] = 0; + /* DeviceID */ - if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) - { - if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - info->DeviceID[0] = 0; - else - { - size = sizeof(bufferW); - if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"GPUID", RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, - bufferW, &size )) - goto done; - set = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); - if (!SetupDiOpenDeviceInfoW( set, bufferW, NULL, 0, &device_data ) - || !SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL )) - goto done; - lstrcpyW( info->DeviceID, bufferW ); - } - } + size = sizeof(bufferW); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"GPUID", RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, + bufferW, &size )) + goto done; + set = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); + if (!SetupDiOpenDeviceInfoW( set, bufferW, NULL, 0, &device_data ) + || !SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL )) + goto done; + lstrcpyW( info->device_id, bufferW ); } /* Find monitor */ else @@ -4201,7 +4348,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i goto done; /* DeviceName */ - swprintf( info->DeviceName, ARRAY_SIZE(info->DeviceName), L"\\\\.\\DISPLAY%d\\Monitor%d", adapter_index, index ); + swprintf( info->device_name, ARRAY_SIZE(info->device_name), L"\\\\.\\DISPLAY%d\\Monitor%d", adapter_index, index ); /* Get monitor instance */ /* Strip \Registry\Machine\ first */ @@ -4218,63 +4365,51 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i /* StateFlags */ if (!SetupDiGetDevicePropertyW( set, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, - (BYTE *)&info->StateFlags, sizeof(info->StateFlags), NULL, 0 )) + (BYTE *)&info->state_flags, sizeof(info->state_flags), NULL, 0 )) goto done; /* DeviceString */ if (!SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_DEVICEDESC, NULL, - (BYTE *)info->DeviceString, - sizeof(info->DeviceString), NULL )) + (BYTE *)info->device_string, + sizeof(info->device_string), NULL )) goto done; /* DeviceKey */ - if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) - { - if (!SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL )) - goto done; + if (!SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL )) + goto done; - lstrcpyW( info->DeviceKey, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class\\" ); - lstrcatW( info->DeviceKey, bufferW ); + lstrcpyW( info->device_key, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class\\" ); + lstrcatW( info->device_key, bufferW ); + + /* Interface name */ + lstrcpyW( info->interface_name, L"\\\\\?\\" ); + lstrcatW( info->interface_name, instanceW ); + lstrcatW( info->interface_name, L"#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}" ); + /* Replace '\\' with '#' after prefix */ + for (next_charW = info->interface_name + lstrlenW( L"\\\\\?\\" ); *next_charW; next_charW++) + { + if (*next_charW == '\\') + *next_charW = '#'; } /* DeviceID */ - if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) - { - if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - { - lstrcpyW( info->DeviceID, L"\\\\\?\\" ); - lstrcatW( info->DeviceID, instanceW ); - lstrcatW( info->DeviceID, L"#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}" ); - /* Replace '\\' with '#' after prefix */ - for (next_charW = info->DeviceID + lstrlenW( L"\\\\\?\\" ); *next_charW; - next_charW++) - { - if (*next_charW == '\\') - *next_charW = '#'; - } - } - else - { - if (!SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL )) - goto done; + if (!SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL )) + goto done; - lstrcpyW( info->DeviceID, bufferW ); - lstrcatW( info->DeviceID, L"\\" ); + lstrcpyW( info->device_id, bufferW ); + lstrcatW( info->device_id, L"\\" ); - if (!SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, - sizeof(bufferW), NULL )) - goto done; + if (!SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL )) + goto done; - lstrcatW( info->DeviceID, bufferW ); - } - } + lstrcatW( info->device_id, bufferW ); } ret = TRUE; done: - release_display_device_init_mutex( mutex ); SetupDiDestroyDeviceInfoList( set ); if (ret) return ret; @@ -4294,17 +4429,12 @@ done: /* Adapter */ if (!device) { - lstrcpyW( info->DeviceName, L"\\\\.\\DISPLAY1" ); - lstrcpyW( info->DeviceString, L"Wine Adapter" ); - info->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; - if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) - { - if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - info->DeviceID[0] = 0; - else - lstrcpyW( info->DeviceID, L"PCI\\VEN_0000&DEV_0000&SUBSYS_00000000&REV_00" ); - } + lstrcpyW( info->device_name, L"\\\\.\\DISPLAY1" ); + lstrcpyW( info->device_string, L"Wine Adapter" ); + info->state_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; + info->interface_name[0] = 0; + lstrcpyW( info->device_id, L"PCI\\VEN_0000&DEV_0000&SUBSYS_00000000&REV_00" ); + info->device_key[0] = 0; } /* Monitor */ else @@ -4312,21 +4442,14 @@ done: if (lstrcmpiW( L"\\\\.\\DISPLAY1", device )) return FALSE; - lstrcpyW( info->DeviceName, L"\\\\.\\DISPLAY1\\Monitor0" ); - lstrcpyW( info->DeviceString, L"Generic Non-PnP Monitor" ); - info->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; - if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) - { - if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - lstrcpyW( info->DeviceID, L"\\\\\?\\DISPLAY#Default_Monitor#4&17f0ff54&0&UID0#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}" ); - else - lstrcpyW( info->DeviceID, L"MONITOR\\Default_Monitor\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\0000" ); - } + lstrcpyW( info->device_name, L"\\\\.\\DISPLAY1\\Monitor0" ); + lstrcpyW( info->device_string, L"Generic Non-PnP Monitor" ); + info->state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; + lstrcpyW( info->interface_name, L"\\\\\?\\DISPLAY#Default_Monitor#4&17f0ff54&0&UID0#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}" ); + lstrcpyW( info->device_id, L"MONITOR\\Default_Monitor\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\0000" ); + info->device_key[0] = 0; } - if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) - info->DeviceKey[0] = 0; - return TRUE; } -- 2.30.2

2 1

[PATCH]: po: Update Lithuanian translation
by Aurimas Fišeras 18 May '21

18 May '21

1 0

[PATCH 2/6] user32: Optimize getting primary monitor rectangle with GetSystemMetrics().
by Zhiyi Zhang 18 May '21

18 May '21

This saves calls to GetMonitorInfo() and return from EnumDisplayMonitors() immediately after the primary monitor is found. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 7dc2a8df645..ab1c5af0c1b 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -371,6 +371,27 @@ RECT get_virtual_screen_rect(void) return info.virtual_rect; } +static BOOL CALLBACK get_primary_monitor_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) +{ + RECT *primary_rect = (RECT *)lp; + + if (!rect->top && !rect->left && rect->right && rect->bottom) + { + *primary_rect = *rect; + return FALSE; + } + + return TRUE; +} + +static RECT get_primary_monitor_rect(void) +{ + RECT rect = {0}; + + EnumDisplayMonitors( 0, NULL, get_primary_monitor_proc, (LPARAM)&rect ); + return rect; +} + static BOOL CALLBACK get_monitor_count_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) { INT *count = (INT *)lp; @@ -2510,6 +2531,7 @@ INT WINAPI GetSystemMetrics( INT index ) NONCLIENTMETRICSW ncm; MINIMIZEDMETRICS mm; ICONMETRICSW im; + RECT rect; UINT ret; HDC hdc; @@ -2715,11 +2737,11 @@ INT WINAPI GetSystemMetrics( INT index ) case SM_MOUSEWHEELPRESENT: return 1; case SM_CXSCREEN: - get_monitors_info( &info ); - return info.primary_rect.right - info.primary_rect.left; + rect = get_primary_monitor_rect(); + return rect.right - rect.left; case SM_CYSCREEN: - get_monitors_info( &info ); - return info.primary_rect.bottom - info.primary_rect.top; + rect = get_primary_monitor_rect(); + return rect.bottom - rect.top; case SM_XVIRTUALSCREEN: get_monitors_info( &info ); return info.virtual_rect.left; -- 2.30.2

2 1

[PATCH 1/6] user32: Optimize getting monitor count with GetSystemMetrics().
by Zhiyi Zhang 18 May '21

18 May '21

This saves calls to GetMonitorInfo(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 0b4dbfc2d78..7dc2a8df645 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -371,6 +371,22 @@ RECT get_virtual_screen_rect(void) return info.virtual_rect; } +static BOOL CALLBACK get_monitor_count_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) +{ + INT *count = (INT *)lp; + + ++(*count); + return TRUE; +} + +static INT get_monitor_count(void) +{ + INT count = 0; + + EnumDisplayMonitors( 0, NULL, get_monitor_count_proc, (LPARAM)&count ); + return count; +} + static BOOL get_primary_adapter(WCHAR *name) { DISPLAY_DEVICEW dd; @@ -2717,8 +2733,7 @@ INT WINAPI GetSystemMetrics( INT index ) get_monitors_info( &info ); return info.virtual_rect.bottom - info.virtual_rect.top; case SM_CMONITORS: - get_monitors_info( &info ); - return info.count; + return get_monitor_count(); case SM_SAMEDISPLAYFORMAT: return 1; case SM_IMMENABLED: -- 2.30.2

2 1