- wine-devel - winehq.org

[PATCH 6/6] msvcrt: Import remquof implementation from musl.
by Piotr Caban 18 May '21

18 May '21

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

1 0

[PATCH 5/6] msvcrt: Import remquo implementation from musl.
by Piotr Caban 18 May '21

18 May '21

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

1 0

[PATCH 4/6] msvcrt: Import modff implementation from musl.
by Piotr Caban 18 May '21

18 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 32 +++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 31 insertions(+), 11 deletions(-)

1 0

[PATCH 3/6] msvcrt: Import modf implementation from musl.
by Piotr Caban 18 May '21

18 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 32 +++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 31 insertions(+), 11 deletions(-)

1 0

[PATCH 2/6] msvcrt: Import fmodf implementation from musl.
by Piotr Caban 18 May '21

18 May '21

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

1 0

[PATCH 1/6] msvcrt: Import fmod implementation from musl.
by Piotr Caban 18 May '21

18 May '21

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

1 0

[PATCH 5/5] webservices: Add async support in WsOpenChannel.
by Hans Leidekker 18 May '21

18 May '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 48 ++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 458815ea7cc..bc65f0943bf 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1177,18 +1177,52 @@ static HRESULT open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS return hr; } +struct open_channel +{ + struct task task; + struct channel *channel; + const WS_ENDPOINT_ADDRESS *endpoint; + WS_ASYNC_CONTEXT ctx; +}; + +static void open_channel_proc( struct task *task ) +{ + struct open_channel *o = (struct open_channel *)task; + HRESULT hr; + + hr = open_channel( o->channel, o->endpoint ); + + TRACE( "calling %p(%08x)\n", o->ctx.callback, hr ); + o->ctx.callback( hr, WS_LONG_CALLBACK, o->ctx.callbackState ); + TRACE( "%p returned\n", o->ctx.callback ); +} + +static HRESULT queue_open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS *endpoint, + const WS_ASYNC_CONTEXT *ctx ) +{ + struct open_channel *o; + + if (!(o = heap_alloc( sizeof(*o) ))) return E_OUTOFMEMORY; + o->task.proc = open_channel_proc; + o->channel = channel; + o->endpoint = endpoint; + o->ctx = *ctx; + return queue_task( &channel->send_q, &o->task ); +} + /************************************************************************** * WsOpenChannel [webservices.@] */ -HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *endpoint, - const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *endpoint, 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 %p\n", handle, endpoint, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel || !endpoint) return E_INVALIDARG; @@ -1205,7 +1239,13 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end return WS_E_INVALID_OPERATION; } - hr = open_channel( channel, endpoint ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_open_channel( channel, endpoint, 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 4/5] webservices: Add async support in WsCloseChannel.
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, 39 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 539a7813605..458815ea7cc 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -894,17 +894,47 @@ static void close_channel( struct channel *channel ) channel->state = WS_CHANNEL_STATE_CLOSED; } +struct close_channel +{ + struct task task; + struct channel *channel; + WS_ASYNC_CONTEXT ctx; +}; + +static void close_channel_proc( struct task *task ) +{ + struct close_channel *c = (struct close_channel *)task; + + close_channel( c->channel ); + + TRACE( "calling %p(S_OK)\n", c->ctx.callback ); + c->ctx.callback( S_OK, WS_LONG_CALLBACK, c->ctx.callbackState ); + TRACE( "%p returned\n", c->ctx.callback ); +} + +static HRESULT queue_close_channel( struct channel *channel, const WS_ASYNC_CONTEXT *ctx ) +{ + struct close_channel *c; + + if (!(c = heap_alloc( sizeof(*c) ))) return E_OUTOFMEMORY; + c->task.proc = close_channel_proc; + c->channel = channel; + c->ctx = *ctx; + return queue_task( &channel->send_q, &c->task ); +} + /************************************************************************** * WsCloseChannel [webservices.@] */ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; - HRESULT hr = S_OK; + WS_ASYNC_CONTEXT ctx_local; + struct async async; + HRESULT hr; TRACE( "%p %p %p\n", handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel) return E_INVALIDARG; @@ -916,7 +946,13 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, return E_INVALIDARG; } - close_channel( channel ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_close_channel( channel, 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 3/5] webservices: Add async support in WsShutdownSessionChannel.
by Hans Leidekker 18 May '21

18 May '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 41 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 76b0c1a96e2..539a7813605 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -820,14 +820,45 @@ static HRESULT shutdown_session( struct channel *channel ) } } +struct shutdown_session +{ + struct task task; + struct channel *channel; + WS_ASYNC_CONTEXT ctx; +}; + +static void shutdown_session_proc( struct task *task ) +{ + struct shutdown_session *s = (struct shutdown_session *)task; + HRESULT hr; + + hr = shutdown_session( s->channel ); + + TRACE( "calling %p(%08x)\n", s->ctx.callback, hr ); + s->ctx.callback( hr, WS_LONG_CALLBACK, s->ctx.callbackState ); + TRACE( "%p returned\n", s->ctx.callback ); +} + +static HRESULT queue_shutdown_session( struct channel *channel, const WS_ASYNC_CONTEXT *ctx ) +{ + struct shutdown_session *s; + + if (!(s = heap_alloc( sizeof(*s) ))) return E_OUTOFMEMORY; + s->task.proc = shutdown_session_proc; + s->channel = channel; + s->ctx = *ctx; + return queue_task( &channel->send_q, &s->task ); +} + HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, 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\n", handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel) return E_INVALIDARG; @@ -844,7 +875,13 @@ HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONT return WS_E_INVALID_OPERATION; } - hr = shutdown_session( channel ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_shutdown_session( channel, 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 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 => -@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> <span class='$bug->{class}'>$bug->{desc}</span>"; + if ($bug->{regression}) + { + $test->{desc} .= " (<a href='$gitweb/commitdiff/$bug->{regression}->{id}'>bisected</a>)"; + } $test->{desc} .= "<br>"; } $test->{desc} .= "</p>"; @@ -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, " <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>", + push @udescs, " <i>[+$detcount in details]</i>" 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> <i>← potentially related commits</i>\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

[PATCH v2 4/4] gdi32: Return correct color depth for display DCs in GetDeviceCaps().
by Zhiyi Zhang 18 May '21

18 May '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29184 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/driver.c | 19 ++++++++++++++++++- dlls/user32/tests/monitor.c | 1 - dlls/winex11.drv/init.c | 2 -- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index a2ebd018bca..2042701dd45 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -460,7 +460,24 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; } - case BITSPIXEL: return 32; + case BITSPIXEL: + { + DEVMODEW devmode; + WCHAR *display; + DC *dc; + + if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && pEnumDisplaySettingsW) + { + dc = get_nulldrv_dc( dev ); + display = dc->display[0] ? dc->display : NULL; + memset( &devmode, 0, sizeof(devmode) ); + devmode.dmSize = sizeof(devmode); + if (pEnumDisplaySettingsW( display, ENUM_CURRENT_SETTINGS, &devmode ) + && devmode.dmFields & DM_BITSPERPEL && devmode.dmBitsPerPel) + return devmode.dmBitsPerPel; + } + return 32; + } case PLANES: return 1; case NUMBRUSHES: return -1; case NUMPENS: return -1; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ab03837f5e6..654f77ed617 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2068,7 +2068,6 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ dm->dmDisplayFrequency, value); value = GetDeviceCaps(hdc, BITSPIXEL); - todo_wine_if(dm->dmBitsPerPel != 32) ok_(__FILE__, line)(value == dm->dmBitsPerPel, "Expected BITSPIXEL %d, got %d.\n", dm->dmBitsPerPel, value); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index d070c0f1171..ff3d5317697 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -162,8 +162,6 @@ static INT CDECL X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch(cap) { - case BITSPIXEL: - return screen_bpp; case SIZEPALETTE: return palette_size; default: -- 2.30.2

2 2

[PATCH 4/6] user32: Use get_primary_monitor_rect() helper.
by Zhiyi Zhang 18 May '21

18 May '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/input.c | 16 +++++++--------- dlls/user32/sysparams.c | 6 ++---- dlls/user32/user_private.h | 1 + dlls/user32/win.c | 3 +-- dlls/user32/winpos.c | 7 ++++--- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index ba0292c8f88..b4e3579f5e8 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -195,17 +195,15 @@ static void update_mouse_coords( INPUT *input ) if (input->u.mi.dwFlags & MOUSEEVENTF_ABSOLUTE) { DPI_AWARENESS_CONTEXT context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + RECT rc; + if (input->u.mi.dwFlags & MOUSEEVENTF_VIRTUALDESK) - { - RECT rc = get_virtual_screen_rect(); - input->u.mi.dx = rc.left + ((input->u.mi.dx * (rc.right - rc.left)) >> 16); - input->u.mi.dy = rc.top + ((input->u.mi.dy * (rc.bottom - rc.top)) >> 16); - } + rc = get_virtual_screen_rect(); else - { - input->u.mi.dx = (input->u.mi.dx * GetSystemMetrics( SM_CXSCREEN )) >> 16; - input->u.mi.dy = (input->u.mi.dy * GetSystemMetrics( SM_CYSCREEN )) >> 16; - } + rc = get_primary_monitor_rect(); + + input->u.mi.dx = rc.left + ((input->u.mi.dx * (rc.right - rc.left)) >> 16); + input->u.mi.dy = rc.top + ((input->u.mi.dy * (rc.bottom - rc.top)) >> 16); SetThreadDpiAwarenessContext( context ); } else diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3d0cb2a6566..015db0db50e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -366,7 +366,7 @@ static BOOL CALLBACK get_primary_monitor_proc( HMONITOR monitor, HDC hdc, LPRECT return TRUE; } -static RECT get_primary_monitor_rect(void) +RECT get_primary_monitor_rect(void) { RECT rect = {0}; @@ -1818,9 +1818,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, spi_idx = SPI_SETWORKAREA_IDX; if (!spi_loaded[spi_idx]) { - SetRect( &work_area, 0, 0, - GetSystemMetrics( SM_CXSCREEN ), - GetSystemMetrics( SM_CYSCREEN ) ); + work_area = get_primary_monitor_rect(); EnumDisplayMonitors( 0, NULL, enum_monitors, (LPARAM)&work_area ); spi_loaded[spi_idx] = TRUE; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 974d18be482..82cf376ef54 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -261,6 +261,7 @@ extern void update_window_state( HWND hwnd ) DECLSPEC_HIDDEN; extern void wait_graphics_driver_ready(void) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; +extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern DWORD get_input_codepage( void ) DECLSPEC_HIDDEN; extern BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 680defc2071..86a1f50ca77 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -855,8 +855,7 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind } else { - rect.right = GetSystemMetrics(SM_CXSCREEN); - rect.bottom = GetSystemMetrics(SM_CYSCREEN); + rect = get_primary_monitor_rect(); } if (rectWindow) *rectWindow = rect; if (rectClient) *rectClient = rect; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index de5d50d4c3a..5a2b8ccdfe8 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -740,7 +740,7 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) if ((monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ))) { - RECT rc_work; + RECT rc_work, rc_primary; MONITORINFO mon_info; mon_info.cbSize = sizeof(mon_info); @@ -754,8 +754,9 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) rc_work = mon_info.rcWork; } - if (MinMax.ptMaxSize.x == GetSystemMetrics(SM_CXSCREEN) + 2 * xinc && - MinMax.ptMaxSize.y == GetSystemMetrics(SM_CYSCREEN) + 2 * yinc) + rc_primary = get_primary_monitor_rect(); + if (MinMax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc && + MinMax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc) { MinMax.ptMaxSize.x = (rc_work.right - rc_work.left) + 2 * xinc; MinMax.ptMaxSize.y = (rc_work.bottom - rc_work.top) + 2 * yinc; -- 2.30.2

1 0

[PATCH 3/6] user32: Optimize getting virtual screen rectangle 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 | 49 +++++++++++++---------------------------- 1 file changed, 15 insertions(+), 34 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index ab1c5af0c1b..3d0cb2a6566 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -337,38 +337,20 @@ static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A /* Helper functions to retrieve monitors info */ -struct monitor_info +static BOOL CALLBACK get_virtual_screen_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) { - int count; - RECT primary_rect; - RECT virtual_rect; -}; + RECT *virtual_rect = (RECT *)lp; -static BOOL CALLBACK monitor_info_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) -{ - MONITORINFO mi; - struct monitor_info *info = (struct monitor_info *)lp; - info->count++; - UnionRect( &info->virtual_rect, &info->virtual_rect, rect ); - mi.cbSize = sizeof(mi); - if (GetMonitorInfoW( monitor, &mi ) && (mi.dwFlags & MONITORINFOF_PRIMARY)) - info->primary_rect = mi.rcMonitor; + UnionRect( virtual_rect, virtual_rect, rect ); return TRUE; } -static void get_monitors_info( struct monitor_info *info ) -{ - info->count = 0; - SetRectEmpty( &info->primary_rect ); - SetRectEmpty( &info->virtual_rect ); - EnumDisplayMonitors( 0, NULL, monitor_info_proc, (LPARAM)info ); -} - RECT get_virtual_screen_rect(void) { - struct monitor_info info; - get_monitors_info( &info ); - return info.virtual_rect; + RECT rect = {0}; + + EnumDisplayMonitors( 0, NULL, get_virtual_screen_proc, (LPARAM)&rect ); + return rect; } static BOOL CALLBACK get_primary_monitor_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) @@ -2527,7 +2509,6 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, */ INT WINAPI GetSystemMetrics( INT index ) { - struct monitor_info info; NONCLIENTMETRICSW ncm; MINIMIZEDMETRICS mm; ICONMETRICSW im; @@ -2743,17 +2724,17 @@ INT WINAPI GetSystemMetrics( INT index ) rect = get_primary_monitor_rect(); return rect.bottom - rect.top; case SM_XVIRTUALSCREEN: - get_monitors_info( &info ); - return info.virtual_rect.left; + rect = get_virtual_screen_rect(); + return rect.left; case SM_YVIRTUALSCREEN: - get_monitors_info( &info ); - return info.virtual_rect.top; + rect = get_virtual_screen_rect(); + return rect.top; case SM_CXVIRTUALSCREEN: - get_monitors_info( &info ); - return info.virtual_rect.right - info.virtual_rect.left; + rect = get_virtual_screen_rect(); + return rect.right - rect.left; case SM_CYVIRTUALSCREEN: - get_monitors_info( &info ); - return info.virtual_rect.bottom - info.virtual_rect.top; + rect = get_virtual_screen_rect(); + return rect.bottom - rect.top; case SM_CMONITORS: return get_monitor_count(); case SM_SAMEDISPLAYFORMAT: -- 2.30.2

1 0

[PATCH v4 1/2] ws2_32: Check if waiting asyncs exist in WSARecv/WSASend
by Dongwan Kim 18 May '21

18 May '21

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 2ba1982b1d9..b3d5b92c610 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) * @@ -5048,7 +5065,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(); @@ -6128,7 +6150,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 27557f2c1d7..dd0b6f0ba65 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5403,6 +5403,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 { @@ -5680,6 +5695,7 @@ enum request REQ_suspend_process, REQ_resume_process, REQ_get_next_thread, + REQ_query_async_waiting, REQ_NB_REQUESTS }; @@ -5961,6 +5977,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 { @@ -6240,11 +6257,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 701 +#define SERVER_PROTOCOL_VERSION 702 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 6d8208b128b..da754cc89b6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3711,3 +3711,11 @@ struct handle_info @REPLY obj_handle_t handle; /* next thread handle */ @END + +/* Query if there are waiting asyncs of the socket */ +@REQ(query_async_waiting) + obj_handle_t handle; /* socket handle */ + int type; /* async type */ +@REPLY + int state; /* waiting async exists */ +@END diff --git a/server/request.h b/server/request.h index 41810b89299..88eee241b9b 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 565fb4c5a2c..c1142d75e2f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1923,3 +1923,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 ad7236dd393..63960a5fec4 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4478,6 +4478,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, @@ -4754,6 +4763,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] = { @@ -5031,6 +5041,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] = { @@ -5308,6 +5319,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 2

[PATCH v2 2/2] wbemprox: Partially implement Win32_Process.Create method.
by Hans Leidekker 18 May '21

18 May '21

From: Paul Gofman <pgofman(a)codeweavers.com> Fixes FunCom launcher failure to launch games. v2: Keep table data sorted. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 14 +++- dlls/wbemprox/process.c | 110 +++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 123 ++++++++++++++++++++++++++++++- dlls/wbemprox/wbemprox_private.h | 1 + 4 files changed, 244 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3922331f650..862c461d8b7 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -312,6 +312,7 @@ static const struct column col_process[] = { L"ThreadCount", CIM_UINT32 }, { L"WorkingSetSize", CIM_UINT64 }, /* methods */ + { L"Create", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"GetOwner", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; static const struct column col_processor[] = @@ -725,6 +726,7 @@ struct record_process UINT32 thread_count; UINT64 workingsetsize; /* methods */ + class_method *create; class_method *get_owner; }; struct record_processor @@ -892,6 +894,9 @@ static const struct record_param data_param[] = { L"StdRegProv", L"CreateKey", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, { L"StdRegProv", L"CreateKey", 1, L"sSubKeyName", CIM_STRING }, { L"StdRegProv", L"CreateKey", -1, L"ReturnValue", CIM_UINT32 }, + { L"StdRegProv", L"DeleteKey", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, + { L"StdRegProv", L"DeleteKey", 1, L"sSubKeyName", CIM_STRING }, + { L"StdRegProv", L"DeleteKey", -1, L"ReturnValue", CIM_UINT32 }, { L"StdRegProv", L"EnumKey", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, { L"StdRegProv", L"EnumKey", 1, L"sSubKeyName", CIM_STRING }, { L"StdRegProv", L"EnumKey", -1, L"ReturnValue", CIM_UINT32 }, @@ -916,13 +921,14 @@ static const struct record_param data_param[] = { L"StdRegProv", L"SetDWORDValue", 1, L"sValueName", CIM_STRING }, { L"StdRegProv", L"SetDWORDValue", 1, L"uValue", CIM_UINT32 }, { L"StdRegProv", L"SetDWORDValue", -1, L"ReturnValue", CIM_UINT32 }, - { L"StdRegProv", L"DeleteKey", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, - { L"StdRegProv", L"DeleteKey", 1, L"sSubKeyName", CIM_STRING }, - { L"StdRegProv", L"DeleteKey", -1, L"ReturnValue", CIM_UINT32 }, { L"SystemRestore", L"Disable", 1, L"Drive", CIM_STRING }, { L"SystemRestore", L"Disable", -1, L"ReturnValue", CIM_UINT32 }, { L"SystemRestore", L"Enable", 1, L"Drive", CIM_STRING }, { L"SystemRestore", L"Enable", -1, L"ReturnValue", CIM_UINT32 }, + { L"Win32_Process", L"Create", 1, L"CommandLine", CIM_STRING }, + { L"Win32_Process", L"Create", 1, L"CurrentDirectory", CIM_STRING }, + { L"Win32_Process", L"Create", -1, L"ProcessId", CIM_UINT32 }, + { L"Win32_Process", L"Create", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"User", CIM_STRING }, { L"Win32_Process", L"GetOwner", -1, L"Domain", CIM_STRING }, @@ -3162,6 +3168,8 @@ static enum fill_status fill_process( struct table *table, const struct expr *co rec->pprocess_id = entry.th32ParentProcessID; rec->thread_count = entry.cntThreads; rec->workingsetsize = 0; + /* methods */ + rec->create = process_create; rec->get_owner = process_get_owner; if (!match_row( table, row, cond, &status )) { diff --git a/dlls/wbemprox/process.c b/dlls/wbemprox/process.c index 2f11530da2f..5d8af54f217 100644 --- a/dlls/wbemprox/process.c +++ b/dlls/wbemprox/process.c @@ -110,3 +110,113 @@ done: if (out_params) IWbemClassObject_Release( out_params ); return hr; } + +HRESULT process_create( IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out ) +{ + VARIANT command_line, current_directory, startup_info; + HRESULT ret = WBEM_E_INVALID_PARAMETER, hr; + IWbemClassObject *sig, *out_params = NULL; + PROCESS_INFORMATION pi; + STARTUPINFOW si; + UINT32 error; + VARIANT v; + BOOL bret; + CIMTYPE type; + + FIXME("%p, %p, %p, %p stub\n", obj, context, in, out); + + *out = NULL; + + if ((hr = create_signature( L"Win32_Process", L"Create", PARAM_OUT, &sig ))) return hr; + + VariantInit( &command_line ); + VariantInit( &current_directory ); + VariantInit( &startup_info ); + + if (FAILED(hr = IWbemClassObject_Get( in, L"CommandLine", 0, &command_line, &type, NULL )) + || V_VT( &command_line ) != VT_BSTR) + WARN( "Invalid CommandLine, hr %#x, type %u.\n", hr, V_VT( &command_line )); + else + TRACE( "CommandLine %s.\n", debugstr_w( V_BSTR( &command_line ))); + + if (FAILED(hr = IWbemClassObject_Get( in, L"CurrentDirectory", 0, &current_directory, &type, NULL )) + || V_VT( &current_directory ) != VT_BSTR) + WARN("Invalid CurrentDirectory, hr %#x, type %u.\n", hr, V_VT( &current_directory )); + else + TRACE( "CurrentDirectory %s.\n", debugstr_w( V_BSTR( &current_directory ))); + + if (SUCCEEDED(IWbemClassObject_Get( in, L"ProcessStartupInformation", 0, &startup_info, &type, NULL )) + && V_VT( &startup_info ) == VT_UNKNOWN && V_UNKNOWN( &startup_info )) + FIXME( "ProcessStartupInformation is not implemented, vt_type %u, type %u, val %p.\n", + V_VT( &startup_info ), type, V_UNKNOWN( &startup_info )); + + if (out && (hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ))) + { + ret = hr; + goto done; + } + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + + if (V_VT( &command_line ) == VT_BSTR && V_BSTR( &command_line )) + { + bret = CreateProcessW( NULL, V_BSTR( &command_line ), NULL, NULL, FALSE, 0L, + V_VT( &current_directory ) == VT_BSTR ? V_BSTR( &current_directory ) : NULL, + NULL, &si, &pi ); + TRACE( "CreateProcessW ret %#x, GetLastError() %u.\n", bret, GetLastError() ); + if (bret) + { + CloseHandle( pi.hThread ); + CloseHandle( pi.hProcess ); + error = 0; + } + else + { + switch (GetLastError()) + { + case ERROR_FILE_NOT_FOUND: + case ERROR_PATH_NOT_FOUND: + error = 9; + break; + case ERROR_ACCESS_DENIED: + error = 2; + break; + default: + error = 8; + break; + } + } + } + else + { + bret = FALSE; + error = 21; + } + + if (out) + { + VariantInit( &v ); + + V_VT( &v ) = VT_UI4; + V_UI4( &v ) = pi.dwProcessId; + + if (bret && (ret = IWbemClassObject_Put( out_params, L"ProcessId", 0, &v, 0 ))) goto done; + + V_UI4( &v ) = error; + if ((ret = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &v, 0 ))) goto done; + + *out = out_params; + IWbemClassObject_AddRef( out_params ); + } + ret = S_OK; + +done: + IWbemClassObject_Release( sig ); + if (out_params) IWbemClassObject_Release( out_params ); + VariantClear( &command_line ); + VariantClear( &current_directory ); + VariantClear( &startup_info ); + TRACE( "ret %#x.\n", ret ); + return ret; +} diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 85b242aba6f..784ebd3503d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -453,6 +453,10 @@ static void test_Win32_Baseboard( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_Process_created_process(void) +{ +} + static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) { static const LONG expected_flavor = WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE | @@ -460,15 +464,19 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) WBEM_FLAVOR_ORIGIN_PROPAGATED; WCHAR full_path[MAX_COMPUTERNAME_LENGTH + ARRAY_SIZE( L"\\\\%s\\ROOT\\CIMV2:" )]; BSTR class, method; - IWbemClassObject *process, *sig_in, *sig_out, *out; + IWbemClassObject *process, *sig_in, *sig_out, *out, *params; + WCHAR cmdlineW[MAX_PATH + 64 + 1]; IWbemQualifierSet *qualifiers; VARIANT retval, val; SAFEARRAY *names; LONG bound, i; DWORD full_path_len = 0; + ULONG refcount; LONG flavor; CIMTYPE type; HRESULT hr; + DWORD ret; + HANDLE h; if (use_full_path) { @@ -511,6 +519,109 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) ok( !sig_in, "Got unexpected sig_in %p.\n", sig_in ); ok( !sig_out, "Got unexpected sig_out %p.\n", sig_out ); + sig_in = (void *)0xdeadbeef; + sig_out = (void *)0xdeadbeef; + hr = IWbemClassObject_GetMethod( process, L"Create", 0, &sig_in, &sig_out ); + ok( hr == S_OK, "Got unexpected hr %#x\n", hr ); + ok( !!sig_in, "Got unexpected sig_in %p.\n", sig_in ); + ok( !!sig_out, "Got unexpected sig_out %p.\n", sig_out ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &params ); + ok( hr == S_OK, "got %08x\n", hr ); + + out = NULL; + class = SysAllocString( L"Win32_Process" ); + method = SysAllocString( L"Create" ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, params, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + SysFreeString( class ); + + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); + ok( V_I4( &retval ) == 21, "unexpected error %u\n", V_I4( &retval ) ); + + IWbemClassObject_Release( out ); + + V_VT( &val ) = VT_BSTR; + V_BSTR( &val ) = SysAllocString( L"unknown" ); + hr = IWbemClassObject_Put( params, L"CommandLine", 0, &val, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + VariantClear( &val ); + + out = NULL; + class = SysAllocString( L"Win32_Process" ); + method = SysAllocString( L"Create" ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, params, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + SysFreeString( class ); + + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); + ok( V_I4( &retval ) == 9, "unexpected error %u\n", V_I4( &retval ) ); + + VariantInit( &retval ); + V_VT( &retval ) = VT_I4; + hr = IWbemClassObject_Get( out, L"ProcessId", 0, &retval, &type, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + todo_wine ok( V_VT( &retval ) == VT_NULL && type == CIM_UINT32, "unexpected variant type 0x%x, type %u\n", + V_VT( &retval ), type ); + + IWbemClassObject_Release( out ); + + ret = GetModuleFileNameW( NULL, cmdlineW, MAX_PATH + 1 ); + ok( ret < MAX_PATH + 1, "Got unexpected ret %u.\n", ret ); + lstrcatW( cmdlineW, L" query created_process"); + V_VT( &val ) = VT_BSTR; + V_BSTR( &val ) = SysAllocString( cmdlineW ); + hr = IWbemClassObject_Put( params, L"CommandLine", 0, &val, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + VariantClear( &val ); + + out = NULL; + class = SysAllocString( L"Win32_Process" ); + method = SysAllocString( L"Create" ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, params, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + SysFreeString( class ); + + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); + + VariantInit( &retval ); + V_VT( &retval ) = VT_I4; + hr = IWbemClassObject_Get( out, L"ProcessId", 0, &retval, &type, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_VT( &retval ) == VT_I4 && type == CIM_UINT32, "unexpected variant type 0x%x, type %u\n", + V_VT( &retval ), type ); + ok( !!V_UI4( &retval ), "unexpected zero pid\n" ); + + IWbemClassObject_Release( out ); + + h = OpenProcess( SYNCHRONIZE, FALSE, V_UI4( &retval )); + ok( !!h, "failed to open process %#x.\n", V_UI4( &retval )); + + ret = WaitForSingleObject( h, INFINITE ); + ok( ret == WAIT_OBJECT_0, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError() ); + CloseHandle( h ); + + refcount = IWbemClassObject_Release( params ); + ok( !refcount, "Got unexpected refcount %u.\n", refcount ); + + refcount = IWbemClassObject_Release( sig_in ); + ok( !refcount, "Got unexpected refcount %u.\n", refcount ); + refcount = IWbemClassObject_Release( sig_out ); + ok( !refcount, "Got unexpected refcount %u.\n", refcount ); + sig_in = (void*)0xdeadbeef; hr = IWbemClassObject_GetMethod( process, L"getowner", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr ); @@ -1956,7 +2067,17 @@ START_TEST(query) IWbemLocator *locator; IWbemServices *services; DWORD authn_svc; + char **argv; HRESULT hr; + int argc; + + argc = winetest_get_mainargs( &argv ); + if (argc >= 3) + { + if (!strcmp( argv[2], "created_process" )) + test_Win32_Process_created_process(); + return; + } CoInitialize( NULL ); CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index fec67f47e1b..ded413c99a7 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -245,6 +245,7 @@ HRESULT EnumWbemClassObject_create(struct query *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemQualifierSet_create(const WCHAR *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; HRESULT process_get_owner(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; +HRESULT process_create(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; HRESULT reg_create_key(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; HRESULT reg_enum_key(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; HRESULT reg_enum_values(IWbemClassObject *obj, IWbemContext *context, IWbemClassObject *in, IWbemClassObject **out) DECLSPEC_HIDDEN; -- 2.30.2

1 0

[PATCH v2 1/2] wbemprox: Check for method existence in class_object_GetMethod().
by Hans Leidekker 18 May '21

18 May '21

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/class.c | 17 +++++++++++++++++ dlls/wbemprox/tests/query.c | 11 +++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index f48c815ef8d..2f2d3ef2bfb 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -875,10 +875,27 @@ static HRESULT WINAPI class_object_GetMethod( { struct class_object *co = impl_from_IWbemClassObject( iface ); IWbemClassObject *in, *out; + struct table *table; + unsigned int i; HRESULT hr; TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); + if (ppInSignature) *ppInSignature = NULL; + if (ppOutSignature) *ppOutSignature = NULL; + + table = get_view_table( impl_from_IEnumWbemClassObject( co->iter )->query->view, co->index ); + + for (i = 0; i < table->num_cols; ++i) + { + if (is_method( table, i ) && !lstrcmpiW( table->columns[i].name, wszName )) break; + } + if (i == table->num_cols) + { + FIXME("Method %s not found in class %s.\n", debugstr_w(wszName), debugstr_w(co->name)); + return WBEM_E_NOT_FOUND; + } + hr = create_signature( co->name, wszName, PARAM_IN, &in ); if (hr != S_OK) return hr; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a79bc759bea..85b242aba6f 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -460,7 +460,7 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) WBEM_FLAVOR_ORIGIN_PROPAGATED; WCHAR full_path[MAX_COMPUTERNAME_LENGTH + ARRAY_SIZE( L"\\\\%s\\ROOT\\CIMV2:" )]; BSTR class, method; - IWbemClassObject *process, *sig_in, *out; + IWbemClassObject *process, *sig_in, *sig_out, *out; IWbemQualifierSet *qualifiers; VARIANT retval, val; SAFEARRAY *names; @@ -504,8 +504,15 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) } SafeArrayDestroy( names ); + sig_in = (void *)0xdeadbeef; + sig_out = (void *)0xdeadbeef; + hr = IWbemClassObject_GetMethod( process, L"unknown", 0, &sig_in, &sig_out ); + ok( hr == WBEM_E_NOT_FOUND, "Got unexpected hr %#x\n", hr ); + ok( !sig_in, "Got unexpected sig_in %p.\n", sig_in ); + ok( !sig_out, "Got unexpected sig_out %p.\n", sig_out ); + sig_in = (void*)0xdeadbeef; - hr = IWbemClassObject_GetMethod( process, L"GetOwner", 0, &sig_in, NULL ); + hr = IWbemClassObject_GetMethod( process, L"getowner", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr ); ok( !sig_in, "sig_in != NULL\n"); IWbemClassObject_Release( process ); -- 2.30.2

1 0

[PATCH] winegstreamer: Advertise support for thinned or reverse playback.
by Giovanni Mascellani 18 May '21

18 May '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index eb5b9e366ec..397f4224c9f 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -917,13 +917,7 @@ static HRESULT WINAPI media_source_rate_support_GetSlowestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - if (direction == MFRATE_REVERSE) - return MF_E_REVERSE_UNSUPPORTED; - - if (thin) - return MF_E_THINNING_UNSUPPORTED; - - *rate = 1.0f; + *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; return S_OK; } @@ -932,31 +926,21 @@ static HRESULT WINAPI media_source_rate_support_GetFastestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - if (direction == MFRATE_REVERSE) - return MF_E_REVERSE_UNSUPPORTED; - - if (thin) - return MF_E_THINNING_UNSUPPORTED; - - *rate = 1.0f; + *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; return S_OK; } static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_support_rate) { - TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate); + const float supported_rate = rate >= 0.0f ? 1.0f : -1.0f; - if (rate < 0.0f) - return MF_E_REVERSE_UNSUPPORTED; - - if (thin) - return MF_E_THINNING_UNSUPPORTED; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate); if (nearest_support_rate) - *nearest_support_rate = 1.0f; + *nearest_support_rate = supported_rate; - return rate == 1.0f ? S_OK : MF_E_UNSUPPORTED_RATE; + return rate == supported_rate ? S_OK : MF_E_UNSUPPORTED_RATE; } static const IMFRateSupportVtbl media_source_rate_support_vtbl = -- 2.31.1

3 3

Using native Chrome OS FilesApp for file chooser
by Joel Hockey 18 May '21

18 May '21

I'm one of the Chrome OS developers. I would like to make it possible for wine apps running in the crostini linux VM to use the Chrome OS native FilesApp for file chooser when possible. Using the native FilesApp improves the UX consistency, and also allows us to let VM apps get access to files outside the VM which can be shared on-demand when a user selects. Does wine already have any APIs where a native file chooser dialog can be configured either during compile or at runtime? I don't see anything. I've been looking at the possibilities today, and doing some testing using Notepad2.exe (since it is the simplest windows app I know). I see that it calls GetOpenFilenameW() to launch a file chooser which is implemented in dlls/comdlg32/filedlg.c GetFileDialog95(). Do most (all) apps use this same API for a file chooser? Would GetFileDialog95() be a possible place to call out to a native file chooser? I'm not familiar with this space, but I've discovered today that xdg-desktop-portal dbus APIs (org.freedesktop.portal.FileChooser) could be a suitable approach. https://github.com/flatpak/xdg-desktop-portal I'm planning to look at this a little more and try and get some code running soon. I can send some patches then, but any help now to point me in a good direction is appreciated. Thanks Joel

5 9

[PATCH] ntdll/tests: Fix a copy-paste error in an ok message.
by Zebediah Figura 18 May '21

18 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2c604408943..453e77f9063 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3026,7 +3026,7 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, todo_wine ok( context->SegEs == context->SegSs, "%u: es %#x does not match ss %#x\n", entry, context->SegEs, context->SegSs ); todo_wine ok( context->SegGs == context->SegSs, - "%u: ds %#x does not match ss %#x\n", entry, context->SegGs, context->SegSs ); + "%u: gs %#x does not match ss %#x\n", entry, context->SegGs, context->SegSs ); todo_wine ok( context->SegFs && context->SegFs != context->SegSs, "%u: got fs %#x\n", entry, context->SegFs ); -- 2.30.2

1 0

[PATCH] advapi32: Quiet a couple of noisy FIXMEs.
by Zebediah Figura 18 May '21

18 May '21

The .NET installers call these many times. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/lsa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 7b118733b50..7e6bfc74620 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -190,7 +190,7 @@ NTSTATUS WINAPI LsaAddAccountRights( */ NTSTATUS WINAPI LsaClose(IN LSA_HANDLE ObjectHandle) { - FIXME("(%p) stub\n", ObjectHandle); + WARN("(%p) stub\n", ObjectHandle); return STATUS_SUCCESS; } @@ -734,7 +734,7 @@ NTSTATUS WINAPI LsaOpenPolicy( IN ACCESS_MASK DesiredAccess, IN OUT PLSA_HANDLE PolicyHandle) { - FIXME("(%s,%p,0x%08x,%p) stub\n", + WARN("(%s,%p,0x%08x,%p) stub\n", SystemName?debugstr_w(SystemName->Buffer):"(null)", ObjectAttributes, DesiredAccess, PolicyHandle); -- 2.30.2

1 0

[PATCH 1/2] winegstreamer: Shut down the read thread before releasing the IMFByteStream.
by Zebediah Figura 18 May '21

18 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/media_source.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 90efc9aaed2..e153c8e9161 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1211,6 +1211,13 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) unix_funcs->wg_parser_disconnect(source->wg_parser); + if (source->read_thread) + { + source->read_thread_shutdown = true; + WaitForSingleObject(source->read_thread, INFINITE); + CloseHandle(source->read_thread); + } + if (source->pres_desc) IMFPresentationDescriptor_Release(source->pres_desc); if (source->event_queue) @@ -1234,13 +1241,6 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) IMFMediaStream_Release(&stream->IMFMediaStream_iface); } - if (source->read_thread) - { - source->read_thread_shutdown = true; - WaitForSingleObject(source->read_thread, INFINITE); - CloseHandle(source->read_thread); - } - unix_funcs->wg_parser_destroy(source->wg_parser); if (source->stream_count) -- 2.30.2

1 1

[PATCH v2 1/6] ws2_32: Cache the synchronous I/O event in the per-thread data.
by Zebediah Figura 18 May '21

18 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/socket.c | 18 +++++++++++++----- dlls/ws2_32/ws2_32_private.h | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2ba1982b1d9..94f3f139c9c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1280,6 +1280,8 @@ static void free_per_thread_data(void) if (!ptb) return; + CloseHandle( ptb->sync_event ); + /* delete scratch buffers */ HeapFree( GetProcessHeap(), 0, ptb->he_buffer ); HeapFree( GetProcessHeap(), 0, ptb->se_buffer ); @@ -1290,6 +1292,16 @@ static void free_per_thread_data(void) NtCurrentTeb()->WinSockData = NULL; } +static HANDLE get_sync_event(void) +{ + struct per_thread_data *data; + + if (!(data = get_per_thread_data())) return NULL; + if (!data->sync_event) + data->sync_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + return data->sync_event; +} + /*********************************************************************** * DllMain (WS2_32.init) */ @@ -2339,19 +2351,15 @@ SOCKET WINAPI WS_accept( SOCKET s, struct WS_sockaddr *addr, int *len ) TRACE("%#lx\n", s); - if (!(sync_event = CreateEventW( NULL, TRUE, FALSE, NULL ))) return INVALID_SOCKET; + if (!(sync_event = get_sync_event())) return INVALID_SOCKET; status = NtDeviceIoControlFile( SOCKET2HANDLE(s), (HANDLE)((ULONG_PTR)sync_event | 0), NULL, NULL, &io, IOCTL_AFD_WINE_ACCEPT, NULL, 0, &accept_handle, sizeof(accept_handle) ); if (status == STATUS_PENDING) { if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) - { - CloseHandle( sync_event ); return SOCKET_ERROR; - } status = io.u.Status; } - CloseHandle( sync_event ); if (status) { WARN("failed; status %#x\n", status); diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index e86a3569510..527dbe903b4 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -181,6 +181,7 @@ UINT sock_get_error( int err ) DECLSPEC_HIDDEN; struct per_thread_data { + HANDLE sync_event; /* event to wait on for synchronous ioctls */ int opentype; struct WS_hostent *he_buffer; struct WS_servent *se_buffer; -- 2.30.2

1 5

[PATCH 1/2] wbemprox: Check for method existence in class_object_GetMethod().
by Paul Gofman 17 May '21

17 May '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wbemprox/class.c | 17 +++++++++++++++++ dlls/wbemprox/tests/query.c | 11 +++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index f48c815ef8d..2f2d3ef2bfb 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -875,10 +875,27 @@ static HRESULT WINAPI class_object_GetMethod( { struct class_object *co = impl_from_IWbemClassObject( iface ); IWbemClassObject *in, *out; + struct table *table; + unsigned int i; HRESULT hr; TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); + if (ppInSignature) *ppInSignature = NULL; + if (ppOutSignature) *ppOutSignature = NULL; + + table = get_view_table( impl_from_IEnumWbemClassObject( co->iter )->query->view, co->index ); + + for (i = 0; i < table->num_cols; ++i) + { + if (is_method( table, i ) && !lstrcmpiW( table->columns[i].name, wszName )) break; + } + if (i == table->num_cols) + { + FIXME("Method %s not found in class %s.\n", debugstr_w(wszName), debugstr_w(co->name)); + return WBEM_E_NOT_FOUND; + } + hr = create_signature( co->name, wszName, PARAM_IN, &in ); if (hr != S_OK) return hr; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a79bc759bea..85b242aba6f 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -460,7 +460,7 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) WBEM_FLAVOR_ORIGIN_PROPAGATED; WCHAR full_path[MAX_COMPUTERNAME_LENGTH + ARRAY_SIZE( L"\\\\%s\\ROOT\\CIMV2:" )]; BSTR class, method; - IWbemClassObject *process, *sig_in, *out; + IWbemClassObject *process, *sig_in, *sig_out, *out; IWbemQualifierSet *qualifiers; VARIANT retval, val; SAFEARRAY *names; @@ -504,8 +504,15 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) } SafeArrayDestroy( names ); + sig_in = (void *)0xdeadbeef; + sig_out = (void *)0xdeadbeef; + hr = IWbemClassObject_GetMethod( process, L"unknown", 0, &sig_in, &sig_out ); + ok( hr == WBEM_E_NOT_FOUND, "Got unexpected hr %#x\n", hr ); + ok( !sig_in, "Got unexpected sig_in %p.\n", sig_in ); + ok( !sig_out, "Got unexpected sig_out %p.\n", sig_out ); + sig_in = (void*)0xdeadbeef; - hr = IWbemClassObject_GetMethod( process, L"GetOwner", 0, &sig_in, NULL ); + hr = IWbemClassObject_GetMethod( process, L"getowner", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr ); ok( !sig_in, "sig_in != NULL\n"); IWbemClassObject_Release( process ); -- 2.31.1

1 1

[PATCH 9/9] winepulse: Move timer loop to unix lib.
by Jacek Caban 17 May '21

17 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 87 +-------------------------- dlls/winepulse.drv/pulse.c | 107 +++++++++++++++++++++++++++++++++- dlls/winepulse.drv/unixlib.h | 2 +- 3 files changed, 107 insertions(+), 89 deletions(-)

2 1

[PATCH 8/9] winepulse: Move pulse_write to unix lib.
by Jacek Caban 17 May '21

17 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 190 +--------------------------------- dlls/winepulse.drv/mult.c | 4 + dlls/winepulse.drv/pulse.c | 190 ++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 4 files changed, 197 insertions(+), 188 deletions(-)

2 1

[PATCH 7/9] winepulse: Move mult_* functions to separated file.
by Jacek Caban 17 May '21

17 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/Makefile.in | 1 + dlls/winepulse.drv/mmdevdrv.c | 1995 +------------------------------ dlls/winepulse.drv/mult.c | 2011 ++++++++++++++++++++++++++++++++ 3 files changed, 2014 insertions(+), 1993 deletions(-) create mode 100644 dlls/winepulse.drv/mult.c

2 1

[PATCH 6/9] winepulse: Set pulse master volume to 0 when session is muted.
by Jacek Caban 17 May '21

17 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)

2 1

[PATCH 5/9] winepulse: Adjust pulse stream volumes for session volumes.
by Jacek Caban 17 May '21

17 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 14 +++++++++----- dlls/winepulse.drv/pulse.c | 4 ++-- dlls/winepulse.drv/unixlib.h | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-)

2 1

[PATCH 4/9] winepulse: Adjust pulse stream volumes for master volume.
by Jacek Caban 17 May '21

17 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 7 +++++-- dlls/winepulse.drv/pulse.c | 5 +++-- dlls/winepulse.drv/unixlib.h | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-)

2 1

[PATCH 3/9] winepulse: Store volume levels in pulse_stream.
by Jacek Caban 17 May '21

17 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 9 ++++++++- dlls/winepulse.drv/pulse.c | 13 ++++++++++++- dlls/winepulse.drv/unixlib.h | 2 ++ 3 files changed, 22 insertions(+), 2 deletions(-)

2 1

[PATCH 2/9] winepulse: Move pulse_stop to unix lib.
by Jacek Caban 17 May '21

17 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 34 ++--------------------- dlls/winepulse.drv/pulse.c | 52 +++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 56 insertions(+), 31 deletions(-)

2 1

[PATCH 1/9] winepulse: Move pulse_read to unix lib.
by Jacek Caban 17 May '21

17 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 92 +------------------------------ dlls/winepulse.drv/pulse.c | 101 ++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 103 insertions(+), 91 deletions(-)

2 1

[PATCH 1/6] server: Also clear pending events in set_socket_event.
by Zebediah Figura 17 May '21

17 May '21

In particular, prevent FD_CONNECT from being reported when not selected for. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/sock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 945895b51a4..565fb4c5a2c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1809,7 +1809,10 @@ DECL_HANDLER(set_socket_event) old_event = sock->event; sock->mask = req->mask; if (req->window) - sock->reported_events &= ~req->mask; /* re-enable held events */ + { + sock->pending_events &= ~req->mask; + sock->reported_events &= ~req->mask; + } sock->event = NULL; sock->window = req->window; sock->message = req->msg; -- 2.30.2

2 6

[PATCH] msvcrt: Add sincos to importlib.
by Jacek Caban 17 May '21

17 May '21

Fixes cross compilation with GCC 11, which may optimize a pair or sin(), cos() calls to a single sincos() call, which is not exported by any msvcrt version. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/mathf.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

1 0

[PATCH] configure: Try using pure clang as a cross compiler when mingw is not available.
by Jacek Caban 17 May '21

17 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- aclocal.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH 4/4] quartz: Notify EC_USERABORT event when closing video window.
by Akihiro Sagawa 17 May '21

17 May '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/tests/vmr7.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/window.c | 11 +++++++++++ 4 files changed, 14 insertions(+), 3 deletions(-)

3 2

[PATCH 3/4] quartz: Hide video window on WM_CLOSE.
by Akihiro Sagawa 17 May '21

17 May '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/tests/vmr7.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/window.c | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-)

3 2

[PATCH 2/4] quartz: Use own destory message in video window.
by Akihiro Sagawa 17 May '21

17 May '21

Preparation for the next commit. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/window.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

3 2

[PATCH v2 1/2] quartz/tests: Avoid testing the result of GetQueueStatus().
by Zebediah Figura 17 May '21

17 May '21

It's very unreliable; our window can receive messages not related to the ones we're trying to test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 44 ++++++++++++++++++++++--------- dlls/quartz/tests/vmr7.c | 44 ++++++++++++++++++++++--------- dlls/quartz/tests/vmr9.c | 44 ++++++++++++++++++++++--------- 3 files changed, 93 insertions(+), 39 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index f4d9660316c..797ea7acc7c 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2109,37 +2109,55 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our flush_events(); + /* Demonstrate that messages should be sent, not posted, and that only some + * messages should be forwarded. A previous implementation unconditionally + * posted all messages. */ + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SYSCOLORCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } - hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SETCURSOR, - (WPARAM)hwnd, MAKELONG(HTCLIENT, WM_MOUSEMOVE)); + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_FONTCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } params.window = window; params.hwnd = our_hwnd; params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(ret == ((QS_SENDMESSAGE << 16) | QS_SENDMESSAGE), "Got unexpected status %#x.\n", ret); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); + while ((ret = MsgWaitForMultipleObjects(1, &thread, FALSE, 1000, QS_ALLINPUT)) == 1) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } + } + ok(!ret, "Wait timed out.\n"); CloseHandle(thread); - params.message = WM_SETCURSOR; + params.message = WM_FONTCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(!WaitForSingleObject(thread, 1000), "Thread should not block.\n"); CloseHandle(thread); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } hr = IVideoWindow_put_Owner(window, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 212ce213e89..02b5a626d74 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2094,37 +2094,55 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our flush_events(); + /* Demonstrate that messages should be sent, not posted, and that only some + * messages should be forwarded. A previous implementation unconditionally + * posted all messages. */ + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SYSCOLORCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } - hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SETCURSOR, - (WPARAM)hwnd, MAKELONG(HTCLIENT, WM_MOUSEMOVE)); + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_FONTCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } params.window = window; params.hwnd = our_hwnd; params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_SENDMESSAGE); - ok(!ret, "Did not find a sent message.\n"); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); + while ((ret = MsgWaitForMultipleObjects(1, &thread, FALSE, 1000, QS_ALLINPUT)) == 1) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } + } + ok(!ret, "Wait timed out.\n"); CloseHandle(thread); - params.message = WM_SETCURSOR; + params.message = WM_FONTCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(!WaitForSingleObject(thread, 1000), "Thread should not block.\n"); CloseHandle(thread); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } hr = IVideoWindow_put_Owner(window, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 44b9a453305..1697a321915 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2333,37 +2333,55 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our flush_events(); + /* Demonstrate that messages should be sent, not posted, and that only some + * messages should be forwarded. A previous implementation unconditionally + * posted all messages. */ + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SYSCOLORCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } - hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SETCURSOR, - (WPARAM)hwnd, MAKELONG(HTCLIENT, WM_MOUSEMOVE)); + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_FONTCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } params.window = window; params.hwnd = our_hwnd; params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_SENDMESSAGE); - ok(!ret, "Did not find a sent message.\n"); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); + while ((ret = MsgWaitForMultipleObjects(1, &thread, FALSE, 1000, QS_ALLINPUT)) == 1) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } + } + ok(!ret, "Wait timed out.\n"); CloseHandle(thread); - params.message = WM_SETCURSOR; + params.message = WM_FONTCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(!WaitForSingleObject(thread, 1000), "Thread should not block.\n"); CloseHandle(thread); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } hr = IVideoWindow_put_Owner(window, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.30.2

2 2

[PATCH] d3d11/tests: Trace the name of the tests in single threaded mode.
by Francois Gouget 17 May '21

17 May '21

This allows figuring out which function the crash happens in when there is no backtrace. Just set WINETEST_NO_MT_D3D=1 WINETEST_DEBUG=2. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The patch decodes the feature level before printing it but maybe that's presuming too much and a simple %04x would be better. --- dlls/d3d11/tests/d3d11.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d412f430b60..29f8c7ce831 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -49,6 +49,7 @@ static struct test_entry void (*test)(void); void (*test_fl)(D3D_FEATURE_LEVEL fl); } u; + const char* name; D3D_FEATURE_LEVEL fl; } *mt_tests; size_t mt_tests_size, mt_test_count; @@ -121,21 +122,25 @@ static void queue_test_entry(const struct test_entry *t) mt_tests[mt_test_count++] = *t; } -static void queue_test_fl(void (*test)(const D3D_FEATURE_LEVEL fl), D3D_FEATURE_LEVEL fl) +#define queue_test_fl(f,fl) _queue_test_fl(f,#f,fl) +static void _queue_test_fl(void (*test)(const D3D_FEATURE_LEVEL fl), const char* name, D3D_FEATURE_LEVEL fl) { struct test_entry t; t.u.test_fl = test; t.fl = fl; + t.name = name; queue_test_entry(&t); } -static void queue_test(void (*test)(void)) +#define queue_test(f) _queue_test(f,#f) +static void _queue_test(void (*test)(void), const char* name) { struct test_entry t; t.u.test = test; t.fl = 0; + t.name = name; queue_test_entry(&t); } @@ -172,6 +177,7 @@ static void run_queued_tests(void) { for (i = 0; i < mt_test_count; ++i) { + trace("fl=%d.%d %s\n", mt_tests[i].fl >> 12, (mt_tests[i].fl >> 8) & 0xf, mt_tests[i].name); run_mt_test(&mt_tests[i]); } @@ -20452,8 +20458,10 @@ static void test_fl9_draw(const D3D_FEATURE_LEVEL feature_level) release_test_context(&test_context); } -static void queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL begin, - D3D_FEATURE_LEVEL end, void (*test_func)(const D3D_FEATURE_LEVEL fl)) +#define queue_for_each_feature_level_in_range(b,e,f) _queue_for_each_feature_level_in_range(b,e,f,#f) +static void _queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL begin, + D3D_FEATURE_LEVEL end, void (*test_func)(const D3D_FEATURE_LEVEL fl), + const char* name) { static const D3D_FEATURE_LEVEL feature_levels[] = { @@ -20471,20 +20479,24 @@ static void queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL begin, for (i = 0; i < ARRAY_SIZE(feature_levels); ++i) { if (begin <= feature_levels[i] && feature_levels[i] <= end) - queue_test_fl(test_func, feature_levels[i]); + _queue_test_fl(test_func, name, feature_levels[i]); } } -static void queue_for_each_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) +#define queue_for_each_feature_level(f) _queue_for_each_feature_level(f,#f) +static void _queue_for_each_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl), + const char* name) { - queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, - D3D_FEATURE_LEVEL_11_1, test_func); + _queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, + D3D_FEATURE_LEVEL_11_1, test_func, name); } -static void queue_for_each_9_x_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) +#define queue_for_each_9_x_feature_level(f) _queue_for_each_9_x_feature_level(f,#f) +static void _queue_for_each_9_x_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl), + const char* name) { - queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, - D3D_FEATURE_LEVEL_9_3, test_func); + _queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, + D3D_FEATURE_LEVEL_9_3, test_func, name); } static void test_ddy(void) -- 2.20.1

3 8

[PATCH 1/3] wined3d: Pass a wined3d_device_context to wined3d_device_set_light().
by Zebediah Figura 17 May '21

17 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 484130b3103..2cd0ac6bb38 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1348,15 +1348,13 @@ static void wined3d_device_get_transform(const struct wined3d_device *device, * stateblock problems. When capturing the state block, I duplicate the * hashmap, but when recording, just build a chain pretty much of commands to * be replayed. */ -static void wined3d_device_set_light(struct wined3d_device *device, - UINT light_idx, const struct wined3d_light *light) +static void wined3d_device_context_set_light(struct wined3d_device_context *context, + unsigned int light_idx, const struct wined3d_light *light) { struct wined3d_light_info *object = NULL; float rho; - TRACE("device %p, light_idx %u, light %p.\n", device, light_idx, light); - - if (FAILED(wined3d_light_state_set_light(&device->cs->c.state->light_state, light_idx, light, &object))) + if (FAILED(wined3d_light_state_set_light(&context->state->light_state, light_idx, light, &object))) return; /* Initialize the object. */ @@ -1445,7 +1443,7 @@ static void wined3d_device_set_light(struct wined3d_device *device, FIXME("Unrecognized light type %#x.\n", light->type); } - wined3d_device_context_emit_set_light(&device->cs->c, object); + wined3d_device_context_emit_set_light(context, object); } static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable) @@ -1459,7 +1457,7 @@ static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT if (!(light_info = wined3d_light_state_get_light(light_state, light_idx))) { TRACE("Light enabled requested but light not defined, so defining one!\n"); - wined3d_device_set_light(device, light_idx, &WINED3D_default_light); + wined3d_device_context_set_light(&device->cs->c, light_idx, &WINED3D_default_light); if (!(light_info = wined3d_light_state_get_light(light_state, light_idx))) { @@ -1849,7 +1847,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 { LIST_FOR_EACH_ENTRY(light, &state->light_state.light_map[i], struct wined3d_light_info, entry) { - wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_context_set_light(context, light->OriginalIndex, &light->OriginalParms); wined3d_device_context_emit_set_light_enable(context, light->OriginalIndex, light->glIndex != -1); } } @@ -4046,7 +4044,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) { - wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_context_set_light(context, light->OriginalIndex, &light->OriginalParms); wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); } } -- 2.30.2

3 6

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel