June 2022 - Wine-Commits - list.winehq.org

Jacek Caban : user32: Reimplement GetMenuContextHelpId on top of GetMenuInfo.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: eda3732afda87367d8196f360ee07c833be275d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eda3732afda87367d8196f36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 11 02:20:22 2022 +0200 user32: Reimplement GetMenuContextHelpId on top of GetMenuInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index f5b74a24c25..73aee6b849d 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4309,20 +4309,13 @@ BOOL WINAPI GetMenuInfo( HMENU menu, MENUINFO *info ) /********************************************************************** * GetMenuContextHelpId (USER32.@) */ -DWORD WINAPI GetMenuContextHelpId( HMENU hMenu ) +DWORD WINAPI GetMenuContextHelpId( HMENU menu ) { - DWORD help_id = 0; - POPUPMENU *menu; - - TRACE("(%p)\n", hMenu); - - if ((menu = grab_menu_ptr(hMenu))) - { - help_id = menu->dwContextHelpID; - release_menu_ptr(menu); - } - - return help_id; + MENUINFO info; + TRACE( "(%p)\n", menu ); + info.cbSize = sizeof(info); + info.fMask = MIM_HELPID; + return GetMenuInfo( menu, &info ) ? info.dwContextHelpID : 0; } /**********************************************************************

1 0

Jacek Caban : win32u: Move WM_NCCALCSIZE implementation from user32.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: 05b29423e592481a9e09165f484346ff0444304f URL: https://source.winehq.org/git/wine.git/?a=commit;h=05b29423e592481a9e09165f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 18:23:21 2022 +0200 win32u: Move WM_NCCALCSIZE implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 3 - dlls/user32/defwnd.c | 4 - dlls/user32/menu.c | 25 ---- dlls/user32/nonclient.c | 70 --------- dlls/win32u/defwnd.c | 64 ++++++++ dlls/win32u/menu.c | 345 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 4 +- dlls/win32u/win32u_private.h | 3 + 8 files changed, 414 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05b29423e592481a9e09…

1 0

Rémi Bernon : winegstreamer: Return NS_E_INVALID_REQUEST on WMReader Start before Open.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: d54b194550171726ebe7a926bcaf1688b91055de URL: https://source.winehq.org/git/wine.git/?a=commit;h=d54b194550171726ebe7a926… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 10 17:12:00 2022 +0200 winegstreamer: Return NS_E_INVALID_REQUEST on WMReader Start before Open. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wm_asyncreader.c | 7 +++++++ dlls/wmvcore/tests/wmvcore.c | 2 ++ 2 files changed, 9 insertions(+) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 947b3307a3a..df7c701f6f0 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -318,6 +318,13 @@ static HRESULT WINAPI WMReader_Start(IWMReader *iface, EnterCriticalSection(&reader->reader.cs); + if (!reader->reader.wg_parser) + { + LeaveCriticalSection(&reader->reader.cs); + WARN("No stream is open; returning NS_E_INVALID_REQUEST.\n"); + return NS_E_INVALID_REQUEST; + } + stop_streaming(reader); IWMReaderCallback_OnStatus(reader->callback, WMT_STARTED, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, context); diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 50a7a023488..315173b9860 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -2171,6 +2171,8 @@ static void test_async_reader_streaming(void) hr = IWMReader_Stop(reader); ok(hr == E_UNEXPECTED, "Got hr %#lx.\n", hr); + hr = IWMReader_Start(reader, 0, 0, 1.0, NULL); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_OpenStream(advanced, &stream.IStream_iface, &callback.IWMReaderCallback_iface, (void **)0xdeadbeef); ok(hr == S_OK, "Got hr %#lx.\n", hr);

1 0

Rémi Bernon : winegstreamer: Simplify wm_asyncreader stream loop exit code path.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: fdb0f101888547285417cca54826a1c99c9f4099 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdb0f101888547285417cca5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 10 17:35:27 2022 +0200 winegstreamer: Simplify wm_asyncreader stream loop exit code path. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wm_asyncreader.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 15e7c2dc9ca..fbfbd38f99e 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -102,15 +102,10 @@ static DWORD WINAPI stream_thread(void *arg) IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, user_time, reader->context); while (pts > reader->user_time && reader->running) SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, INFINITE); - if (!reader->running) - { - INSSBuffer_Release(sample); - goto out; - } } else { - for (;;) + while (reader->running) { REFERENCE_TIME current_time = get_current_time(reader); @@ -119,22 +114,20 @@ static DWORD WINAPI stream_thread(void *arg) SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, (pts - (current_time - start_time)) / 10000); - - if (!reader->running) - { - INSSBuffer_Release(sample); - goto out; - } } } - if (stream->read_compressed) - hr = IWMReaderCallbackAdvanced_OnStreamSample(reader->reader.callback_advanced, - stream_number, pts, duration, flags, sample, reader->context); - else - hr = IWMReaderCallback_OnSample(callback, stream_number - 1, pts, duration, - flags, sample, reader->context); - TRACE("Callback returned %#lx.\n", hr); + if (reader->running) + { + if (stream->read_compressed) + hr = IWMReaderCallbackAdvanced_OnStreamSample(reader->reader.callback_advanced, + stream_number, pts, duration, flags, sample, reader->context); + else + hr = IWMReaderCallback_OnSample(callback, stream_number - 1, pts, duration, + flags, sample, reader->context); + TRACE("Callback returned %#lx.\n", hr); + } + INSSBuffer_Release(sample); } @@ -161,7 +154,6 @@ static DWORD WINAPI stream_thread(void *arg) ERR("Failed to get sample, hr %#lx.\n", hr); } -out: LeaveCriticalSection(&reader->stream_cs); TRACE("Reader is stopping; exiting.\n");

1 0

Rémi Bernon : winegstreamer: Leave the wm_reader stream_cs when calling the callbacks.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: 81d04f9326c75c755bb0947b2521b955aedc2afa URL: https://source.winehq.org/git/wine.git/?a=commit;h=81d04f9326c75c755bb0947b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 10 17:58:41 2022 +0200 winegstreamer: Leave the wm_reader stream_cs when calling the callbacks. They may block and we need to enter the stream_cs to stop the reader. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wm_asyncreader.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index fbfbd38f99e..ef6e445a51b 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -99,7 +99,12 @@ static DWORD WINAPI stream_thread(void *arg) QWORD user_time = reader->user_time; if (pts > user_time && reader->reader.callback_advanced) + { + LeaveCriticalSection(&reader->stream_cs); IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, user_time, reader->context); + EnterCriticalSection(&reader->stream_cs); + } + while (pts > reader->user_time && reader->running) SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, INFINITE); } @@ -119,18 +124,23 @@ static DWORD WINAPI stream_thread(void *arg) if (reader->running) { + LeaveCriticalSection(&reader->stream_cs); if (stream->read_compressed) hr = IWMReaderCallbackAdvanced_OnStreamSample(reader->reader.callback_advanced, stream_number, pts, duration, flags, sample, reader->context); else hr = IWMReaderCallback_OnSample(callback, stream_number - 1, pts, duration, flags, sample, reader->context); + EnterCriticalSection(&reader->stream_cs); + TRACE("Callback returned %#lx.\n", hr); } INSSBuffer_Release(sample); } + LeaveCriticalSection(&reader->stream_cs); + if (hr == NS_E_NO_MORE_SAMPLES) { IWMReaderCallback_OnStatus(callback, WMT_END_OF_STREAMING, S_OK, @@ -154,8 +164,6 @@ static DWORD WINAPI stream_thread(void *arg) ERR("Failed to get sample, hr %#lx.\n", hr); } - LeaveCriticalSection(&reader->stream_cs); - TRACE("Reader is stopping; exiting.\n"); return 0; }

1 0

Alex Henrie : user32: Plug icon handle leak in MDI_AugmentFrameMenu (Coverity).
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: 001d78a58257b67871924774485ce226f4b87a9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=001d78a58257b67871924774… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 29 16:37:19 2022 -0600 user32: Plug icon handle leak in MDI_AugmentFrameMenu (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/user32/mdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 26772aed763..11c17a6dbd8 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -859,7 +859,7 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON); if (!hIcon) hIcon = LoadImageW(0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); + GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR | LR_SHARED); if (hIcon) { HDC hMemDC;

1 0

Francois Gouget : testbot/WineSendLog: Tweak the job report emails.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: tools Branch: master Commit: c994604d5ca260f598f2a8ab4104f4fbc3ce0e1d URL: https://source.winehq.org/git/tools.git/?a=commit;h=c994604d5ca260f598f2a8a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 14 17:26:59 2022 +0200 testbot/WineSendLog: Tweak the job report emails. Don't assume that jobs coming from the patches website necessarily have a sender email address. Update the patches website in all cases. Also mark a patch as failed in the patches website when the job has skipped tasks or TestBot errors. Clearly identify the new failures in the report sent to the developer. Provide more details about the job result, particularly TestBot errors, the presence of skipped tasks, and consequences. Call for help fixing preexisting failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 340 +++++++++++++++++++++++++++++---------------- testbot/tests/TestWTBS | 7 +- 2 files changed, 226 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=c994604d5ca260f598f…

1 0

Francois Gouget : testbot: Include the filename in LoadLogErrors() error messages.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: tools Branch: master Commit: dde9a39ccbb2985603ae02ba5b76be4eb6db9a4a URL: https://source.winehq.org/git/tools.git/?a=commit;h=dde9a39ccbb2985603ae02b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 14 15:59:16 2022 +0200 testbot: Include the filename in LoadLogErrors() error messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 17cfc352..2e3de83b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1016,6 +1016,10 @@ sub LoadLogErrors($) if (open(my $ErrorsFile, "<", "$LogPath.errors")) { LoadLogErrorsFromFh($LogInfo, $ErrorsFile); + if ($LogInfo->{BadLog}) + { + $LogInfo->{BadLog} = "$LogInfo->{LogName}.errors: $LogInfo->{BadLog}"; + } delete $LogInfo->{CurGroup}; close($ErrorsFile); }

1 0

Alexandre Julliard : patches: Use gitlab instead of gitweb.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: tools Branch: master Commit: 0c4caff2510bca35a93e9215448a0f78c9c36ee0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0c4caff2510bca35a93e921… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 14 18:48:19 2022 +0200 patches: Use gitlab instead of gitweb. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update-regressions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/update-regressions b/patches/update-regressions index f617b980..f37939a1 100755 --- a/patches/update-regressions +++ b/patches/update-regressions @@ -29,7 +29,7 @@ binmode STDOUT, ':utf8'; $ENV{"GIT_DIR"} = "/home/winehq/opt/source/git/wine.git"; my $bugzilla_base = "//bugs.winehq.org/show_bug.cgi?id="; -my $gitweb_base = "//source.winehq.org/git/wine.git/commit/"; +my $gitlab_base = "https://gitlab.winehq.org/wine/wine/-/commit/"; my $dest = "/home/winehq/opt/source"; my %regressions; @@ -95,7 +95,7 @@ sub print_bugs($@) printf OUTPUT "<tr class=\"regression %s\">", ++$row & 1 ? "odd" : "even"; printf OUTPUT "<td class=\"id\"><a href=\"%s%u\">%u</a></td>", $bugzilla_base, $id, $id; printf OUTPUT "<td class=\"sha1\"><a href=\"%s%s\" title=\"%s\">%s</a></td>", - $gitweb_base, escapeHTML($commit_id), + $gitlab_base, escapeHTML($commit_id), escapeHTML($commits{$commit_id}->{"subject"}), escapeHTML(substr($commit_id,0,12)); printf OUTPUT "<td class=\"subject\" width=\"100%%\"><a href=\"%s%u\">%s</a></td></tr>\n", $bugzilla_base, $id, escapeHTML($regression->{"description"});

1 0

Francois Gouget : testbot/web: Tweak GenerateFullLog() in the job details page.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: tools Branch: master Commit: c6f40dd1d94cb832674f4e4f94f102a4748c691f URL: https://source.winehq.org/git/tools.git/?a=commit;h=c6f40dd1d94cb832674f4e4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 14 15:59:45 2022 +0200 testbot/web: Tweak GenerateFullLog() in the job details page. Rename %ErrLineNos to %ErrCategory since it contains the error's category indexed by the full log line number. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 36bba0d0..7860a4c9 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -400,16 +400,14 @@ sub GenerateFullLog($$$$) print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; } - my %ErrLineNos; + my %ErrCategory; foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - my $ErrCount = @{$Group->{Errors}}; - next if (!$ErrCount); - for my $ErrIndex (0..$ErrCount-1) + for my $ErrIndex (0..$#{$Group->{Errors}}) { - $ErrLineNos{$Group->{LineNos}->[$ErrIndex]} = \ - $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; + my $LineNo = $Group->{LineNos}->[$ErrIndex]; + $ErrCategory{$LineNo} = $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; } } @@ -432,7 +430,7 @@ sub GenerateFullLog($$$$) } my $Html = $self->escapeHTML($Line); - my $Category = $ErrLineNos{$LineNo} || $GetCategory->($Line); + my $Category = $ErrCategory{$LineNo} || $GetCategory->($Line); if ($Category ne "none") { $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~;

1 0