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

[PATCH 2/5] wevtapi: Return TRUE from EvtSetChannelConfigProperty.
by Dmitry Timoshkov Feb. 1, 2021

Feb. 1, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wevtapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 8521ac3cae8..d11287a5dee 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -72,7 +72,7 @@ BOOL WINAPI EvtSetChannelConfigProperty(EVT_HANDLE ChannelConfig, PEVT_VARIANT PropertyValue) { FIXME("(%p %i %u %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValue); - return FALSE; + return TRUE; } EVT_HANDLE WINAPI EvtSubscribe(EVT_HANDLE Session, HANDLE SignalEvent, LPCWSTR ChannelPath, -- 2.29.2

1 0

[PATCH 1/5] wevtapi: Return fake handle from EvtOpenChannelConfig.
by Dmitry Timoshkov Feb. 1, 2021

Feb. 1, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wevtapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index f7aa7a2a593..8521ac3cae8 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -99,7 +99,7 @@ BOOL WINAPI EvtNextChannelPath(EVT_HANDLE channel_enum, DWORD buffer_len, WCHAR EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags) { FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags); - return NULL; + return (EVT_HANDLE)0xdeadbeef; } EVT_HANDLE WINAPI EvtQuery(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, DWORD flags) -- 2.29.2

1 0

[PATCH] dwrite: Fix vtable variables types.
by Nikolay Sivov Feb. 1, 2021

Feb. 1, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 6 ++++-- dlls/dwrite/font.c | 6 +++--- dlls/dwrite/gdiinterop.c | 8 +++++--- dlls/dwrite/main.c | 6 +++--- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7446665674a..8d573ed530d 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1815,7 +1815,8 @@ static HRESULT WINAPI dwritetextanalyzer2_CheckTypographicFeature(IDWriteTextAna return hr; } -static const struct IDWriteTextAnalyzer2Vtbl textanalyzervtbl = { +static const IDWriteTextAnalyzer2Vtbl textanalyzervtbl = +{ dwritetextanalyzer_QueryInterface, dwritetextanalyzer_AddRef, dwritetextanalyzer_Release, @@ -1891,7 +1892,8 @@ static ULONG WINAPI dwritenumbersubstitution_Release(IDWriteNumberSubstitution * return ref; } -static const struct IDWriteNumberSubstitutionVtbl numbersubstitutionvtbl = { +static const IDWriteNumberSubstitutionVtbl numbersubstitutionvtbl = +{ dwritenumbersubstitution_QueryInterface, dwritenumbersubstitution_AddRef, dwritenumbersubstitution_Release diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 014240a1c8f..f1db6dd732b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4567,7 +4567,7 @@ err: return hr; } -static const struct IDWriteFontFileEnumeratorVtbl systemfontfileenumeratorvtbl = +static const IDWriteFontFileEnumeratorVtbl systemfontfileenumeratorvtbl = { systemfontfileenumerator_QueryInterface, systemfontfileenumerator_AddRef, @@ -5450,7 +5450,7 @@ static HRESULT WINAPI localfontfileloader_GetLastWriteTimeFromKey(IDWriteLocalFo return S_OK; } -static const struct IDWriteLocalFontFileLoaderVtbl localfontfileloadervtbl = +static const IDWriteLocalFontFileLoaderVtbl localfontfileloadervtbl = { localfontfileloader_QueryInterface, localfontfileloader_AddRef, @@ -5873,7 +5873,7 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaBlendParams(IDWriteGlyphRunAnalys return S_OK; } -static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = +static const IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = { glyphrunanalysis_QueryInterface, glyphrunanalysis_AddRef, diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index ae421822a77..84d1f615f75 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -911,7 +911,8 @@ static HRESULT WINAPI gdiinterop1_GetMatchingFontsByLOGFONT(IDWriteGdiInterop1 * return E_NOTIMPL; } -static const struct IDWriteGdiInterop1Vtbl gdiinteropvtbl = { +static const IDWriteGdiInterop1Vtbl gdiinteropvtbl = +{ gdiinterop_QueryInterface, gdiinterop_AddRef, gdiinterop_Release, @@ -1022,7 +1023,7 @@ static HRESULT WINAPI memresourcestream_GetLastWriteTime(IDWriteFontFileStream * return E_NOTIMPL; } -static const struct IDWriteFontFileStreamVtbl memresourcestreamvtbl = +static const IDWriteFontFileStreamVtbl memresourcestreamvtbl = { memresourcestream_QueryInterface, memresourcestream_AddRef, @@ -1082,7 +1083,8 @@ static HRESULT WINAPI memresourceloader_CreateStreamFromKey(IDWriteFontFileLoade return S_OK; } -static const struct IDWriteFontFileLoaderVtbl memresourceloadervtbl = { +static const IDWriteFontFileLoaderVtbl memresourceloadervtbl = +{ memresourceloader_QueryInterface, memresourceloader_AddRef, memresourceloader_Release, diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 0cc0edd1ffc..f550c204b6d 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -204,7 +204,7 @@ static DWRITE_RENDERING_MODE1 WINAPI renderingparams3_GetRenderingMode1(IDWriteR return params->mode; } -static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl = +static const IDWriteRenderingParams3Vtbl renderingparamsvtbl = { renderingparams_QueryInterface, renderingparams_AddRef, @@ -1756,7 +1756,7 @@ static HRESULT WINAPI dwritefactory7_GetSystemFontCollection(IDWriteFactory7 *if return E_NOTIMPL; } -static const struct IDWriteFactory7Vtbl dwritefactoryvtbl = +static const IDWriteFactory7Vtbl dwritefactoryvtbl = { dwritefactory_QueryInterface, dwritefactory_AddRef, @@ -1831,7 +1831,7 @@ static ULONG WINAPI shareddwritefactory_Release(IDWriteFactory7 *iface) return 1; } -static const struct IDWriteFactory7Vtbl shareddwritefactoryvtbl = +static const IDWriteFactory7Vtbl shareddwritefactoryvtbl = { dwritefactory_QueryInterface, shareddwritefactory_AddRef, -- 2.30.0

1 0

[PATCH] mfreadwrite: Fix vtable variables types.
by Nikolay Sivov Feb. 1, 2021

Feb. 1, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 85aec9aaedc..0e0fe1ad9cd 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2011,7 +2011,7 @@ static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface return hr; } -struct IMFSourceReaderVtbl srcreader_vtbl = +static const IMFSourceReaderVtbl srcreader_vtbl = { src_reader_QueryInterface, src_reader_AddRef, @@ -2536,7 +2536,7 @@ static HRESULT WINAPI classfactory_LockServer(IClassFactory *iface, BOOL dolock) return S_OK; } -static const struct IClassFactoryVtbl classfactoryvtbl = +static const IClassFactoryVtbl classfactoryvtbl = { classfactory_QueryInterface, classfactory_AddRef, -- 2.30.0

1 0

[PATCH V3 1/2] msxml3/tests: Test mxwriter DOMDocument output.
by Jefferson Carpenter Feb. 1, 2021

Feb. 1, 2021

Re-submit

2 6

[tools] testbot/TestWTBS: Allow mission-specific directives, e.g. for test=module.
by Francois Gouget Feb. 1, 2021

Feb. 1, 2021

A different set of tests are run depending on whether a VM's mission is test=test (the default) or test=module. Being unable to distinguish these two cases prevents checking that the right set of test units is being run in many cases. So add support for the wine:build, wine:test, wine:module categories to allow providing specific checks for the test=build/test/module cases respectively. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 184 +++++++++++++++++++++++++++++------------ 1 file changed, 131 insertions(+), 53 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index bc4e0d9ba..f6ca54e84 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -48,6 +48,7 @@ use WineTestBot::Config; # For $PatchesMailingList use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::Patches; use WineTestBot::VMs; @@ -190,13 +191,15 @@ Property names are of the form 'category.name' where the category is one of: - build for checks to perform on the build task. - win32, win64 for checks to perform on the Windows 32- or 64-bit test results respectively. -- win for the checks to perform on both the 32- and 64-bit test results; that - is equivalent to duplicating the directive for the win32 and win64 - categories. -- wine for the checks to perform on the Wine test results. +- win for the checks to perform on both the 32- and 64-bit test results. This + is equivalent to duplicating the directive for win32 and win64. +- wine:build, wine:test, wine:module for checks to perform on test results of + missions with test=build, test=test and test=module respectively. +- wine for the checks to perform on the Wine test results. This is equivalent + to duplicating the directive for the wine:build, wine:test and wine:module. - tests for checks to perform on all test results, that is equivalent to - duplicating the directive for the win32, win64 and wine categories (but not - build since it does not run the tests). + duplicating the directive for the win and wine categories (but not build + since it does not run the tests). A corollary is that any property which is documented as being valid for a category can also be specified for any of its subcategories. So for instance if @@ -208,8 +211,9 @@ sub DumpTestInfo($) { my ($TestInfo) = @_; - foreach my $Category ("webpatch", "patch", "job", "tasks", "tests", "win", - "build", "win32", "win64", "wine") + foreach my $Category ("webpatch", "patch", "job", "tasks", "tests", "build", + "win", "win32", "win64", + "wine", "wine:build", "wine:test", "wine:module") { WineTestBot::LogUtils::_WriteLogErrorsToFh(*STDERR, $TestInfo->{$Category}); WineTestBot::LogUtils::_DumpErrors($Category, $TestInfo->{$Category}); @@ -293,14 +297,15 @@ sub LoadTestInfo($) # Split up the information to jobs, tasks, etc. my $TestInfo = { webpatch => {}, patch => {}, job => {}, - tasks => {}, tests => {}, win => {}, - build => {}, win32 => {}, win64 => {}, wine => {}, + tasks => {}, tests => {}, build => {}, + win => {}, win32 => {}, win64 => {}, + wine => {}, "wine:build" => {}, "wine:test" => {}, "wine:module" => {}, }; my $HasTestInfo; foreach my $Entry (keys %{$RawInfo}) { my $Field = lcfirst($Entry); - if ($Field =~ s/^(webpatch|patch|job|tasks|tests|win|build|win32|win64|wine)\.//) + if ($Field =~ s/^(webpatch|patch|job|tasks|tests|build|win|win32|win64|wine|wine:build|wine:test|wine:module)\.//) { my $TaskType = $1; $TestInfo->{$TaskType}->{$Field} = $RawInfo->{$Entry}; @@ -314,7 +319,7 @@ sub LoadTestInfo($) foreach my $RawGroupName (@{$RawInfo->{ErrGroupNames}}) { my $GroupName = lcfirst($RawGroupName); - if ($GroupName =~ s/^(tasks|build|tests|win|win32|win64|wine)\.(report|log|testbot)\.//) + if ($GroupName =~ s/^(tasks|tests|build|win|win32|win64|wine|wine:build|wine:test|wine:module)\.(report|log|testbot)\.//) { my $ErrInfo = ($TestInfo->{$1}->{"$2.errors"} ||= {}); push @{$ErrInfo->{ErrGroupNames}}, $GroupName; @@ -338,11 +343,16 @@ sub LoadTestInfo($) SetDefault($TestInfo, "tasks", "Status", "completed"); SetDefault($TestInfo, "tasks", "HasTask", 1); } + if (defined $TestInfo->{"wine:build"}->{TestUnits}) + { + fail("wine:build.TestUnits should not be set"); + } # Then propagate the defaults foreach my $Pair (["tasks", ["build", "tests"]], ["tests", ["win", "wine"]], - ["win", ["win32", "win64"]]) + ["win", ["win32", "win64"]], + ["wine", ["wine:test", "wine:module"]]) { my ($Src, $TaskTypes) = @$Pair; foreach my $Field (keys %{$TestInfo->{$Src}}) @@ -368,41 +378,51 @@ sub LoadTestInfo($) } } } + # Reset the inherited wine:build.TestUnits since it makes no sense + delete $TestInfo->{"wine:build"}->{TestUnits}; # Automatically check the Task: lines in simple cases - # Make sure no test is run for build tasks - my $GrepV = ($TestInfo->{build}->{"report.GrepV"} ||= []); - push @$GrepV, '.'; - $GrepV = ($TestInfo->{build}->{"log.GrepV"} ||= []); - push @$GrepV, '^Task: tests$'; - if (($TestInfo->{build}->{Status} || "") =~ /^bad(?:build|patch)$/ or - $TestInfo->{build}->{HasTimeout}) - { - push @$GrepV, '^Task: ok$'; - } - else + foreach my $Build ("build", "wine:build") { - my $Grep = ($TestInfo->{build}->{"log.Grep"} ||= []); - push @$Grep, '^Task: ok$'; + # Make sure no test is run for build tasks + my $GrepV = ($TestInfo->{$Build}->{"report.GrepV"} ||= []); + push @$GrepV, '.'; + $GrepV = ($TestInfo->{$Build}->{"log.GrepV"} ||= []); + push @$GrepV, '^Task: tests$'; + + if (($TestInfo->{$Build}->{Status} || "") =~ /^bad(?:build|patch)$/ or + $TestInfo->{$Build}->{HasTimeout}) + { + push @$GrepV, '^Task: ok$'; + } + else + { + my $Grep = ($TestInfo->{$Build}->{"log.Grep"} ||= []); + push @$Grep, '^Task: ok$'; + } } - # Note: Depending on where the timeout occurs, the wine task log may or - # may not have a 'Task: ok' line. - if (($TestInfo->{wine}->{Status} || "") eq "completed" and - !$TestInfo->{wine}->{HasTimeout}) + foreach my $Test ("test", "module") { - my $Grep = ($TestInfo->{wine}->{"log.Grep"} ||= []); - if (CheckValue($TestInfo->{wine}->{TestUnits})) + # Note: Depending on where the timeout occurs, the wine task log may or + # may not have a 'Task: ok' line. + if (($TestInfo->{"wine:$Test"}->{Status} || "") eq "completed" and + !$TestInfo->{"wine:$Test"}->{HasTimeout}) { - push @$Grep, '^Task: tests$'; + my $Grep = ($TestInfo->{"wine:$Test"}->{"log.Grep"} ||= []); + if (CheckValue($TestInfo->{"wine:$Test"}->{TestUnits})) + { + push @$Grep, '^Task: tests$'; + } + push @$Grep, '^Task: ok$'; } - push @$Grep, '^Task: ok$'; } # Validate and fix the Grep* fields foreach my $GrepType ("Grep", "GrepV") { - foreach my $TaskType ("tasks", "tests", "build", "win", "win32", "win64", "wine") + foreach my $TaskType ("tasks", "tests", "build", "win", "win32", "win64", + "wine", "wine:build", "wine:test", "wine:module") { foreach my $LogType ("report", "log", "testbot") { @@ -426,15 +446,19 @@ sub LoadTestInfo($) CheckValue($TestInfo->{job}->{Status}) and !SkipCheck($TestInfo->{win32}->{TestFailures}) and !SkipCheck($TestInfo->{win64}->{TestFailures}) and - !SkipCheck($TestInfo->{wine}->{TestFailures})) + !SkipCheck($TestInfo->{"wine:test"}->{TestFailures}) and + !SkipCheck($TestInfo->{"wine:module"}->{TestFailures})) { my $Status = ($TestInfo->{job}->{Status} ne 'completed' or $TestInfo->{win32}->{TestFailures} or $TestInfo->{win64}->{TestFailures} or - $TestInfo->{wine}->{TestFailures} or + $TestInfo->{"wine:test"}->{TestFailures} or + $TestInfo->{"wine:module"}->{TestFailures} or $TestInfo->{win32}->{HasTimeout} or $TestInfo->{win64}->{HasTimeout} or - $TestInfo->{wine}->{HasTimeout}) ? "Failed" : "OK"; + $TestInfo->{"wine:build"}->{HasTimeout} or + $TestInfo->{"wine:test"}->{HasTimeout} or + $TestInfo->{"wine:module"}->{HasTimeout}) ? "Failed" : "OK"; SetDefault($TestInfo, "webpatch", "Status", $Status); } @@ -828,9 +852,30 @@ sub CheckTask($$$$) $TestUnits->{$TaskType}->{"*skipped*"} = 1; } + # Assume the VM's Missions field has not changed since the tests were run + my ($ErrMessage, $Missions) = ParseMissionStatement($Task->Missions); + if (@$Missions != 1) + { + fail(TaskKeyStr($Task) ." has an invalid missions field: ". $Task->Missions); + return; + } + + my %ReportTypes; + if ($TaskType =~ /^win/) + { + foreach my $Mission (@{$Missions->[0]->{Missions}}) + { + my $ReportName = GetMissionBaseName($Mission) .".report"; + my $MissionType = $TaskType; + $MissionType .= ":". ($Mission->{test} || "test") if ($TaskType eq "wine"); + $ReportTypes{$ReportName} = $MissionType; + } + } + my $CheckTimeouts = ($Task->Status eq "completed" and CheckValue($TaskInfo->{HasTimeout})); + my $ExpectedFailures; my ($ReportCount, $TimeoutCount, $NewFailures) = (0, 0, 0); foreach my $LogName (@{GetLogFileNames($Task->GetDir())}) { @@ -838,15 +883,33 @@ sub CheckTask($$$$) my $LogInfo = LoadLogErrors($LogPath); $NewFailures += $LogInfo->{NewCount} || 0; + # Get the mission-specific "wine:xxx" report directives + my $MissionType = $ReportTypes{$LogName} || $TaskType; + my $MissionInfo = $TestInfo->{$MissionType}; my $LogType = "log"; if ($LogName =~ /\.report$/) { - $ReportCount++; $LogType = "report"; + $ReportCount++; + + ok($ReportTypes{$LogName}, "Check that $LogName is expected"); + if ($TaskType eq "wine") { my $ReportTestUnits = GetReportTestUnits($LogPath); - map { $TestUnits->{wine}->{$_} = 1 } (keys %$ReportTestUnits); + map { $TestUnits->{$MissionType}->{$_} = 1 } (keys %$ReportTestUnits); + } + + if (CheckValue($MissionInfo->{TestFailures})) + { + ok(($LogInfo->{ErrCount} || 0) <= $MissionInfo->{TestFailures}, + "Check Failures of $LogName in task ". TaskKeyStr($Task)) + or diag("report error count = ", ($LogInfo->{ErrCount} || 0), ", expected at most $MissionInfo->{TestFailures}"); + $ExpectedFailures += $MissionInfo->{TestFailures}; + } + else + { + $ExpectedFailures = undef; } } elsif ($LogName =~ /^testbot\./) @@ -854,24 +917,35 @@ sub CheckTask($$$$) $LogType = "testbot"; } - if ($TaskInfo->{"$LogType.errors"} or $CheckTimeouts) + if ($MissionInfo->{"$LogType.errors"} or $CheckTimeouts) { - my $HasTimeout = CheckLogErrors($LogInfo, $TaskInfo->{"$LogType.errors"}, + my $HasTimeout = CheckLogErrors($LogInfo, $MissionInfo->{"$LogType.errors"}, TaskKeyStr($Task) ."/$LogName", - $TaskInfo->{HasTimeout}); + $MissionInfo->{HasTimeout}); $TimeoutCount++ if ($HasTimeout); } - GrepTaskLog($Task, $LogName, $TaskInfo, "$LogType."); + GrepTaskLog($Task, $LogName, $MissionInfo, "$LogType."); } if ($CheckTimeouts) { ok($TimeoutCount >= $ReportCount, "Expecting 1+ timeout per report: $TimeoutCount timeouts, $ReportCount reports"); } - if ($Task->Status eq "completed" and CheckValue($TaskInfo->{TestFailures})) + if ($Task->Status eq "completed") { - # Scale the expected TestFailures count with the number of times the test - # was run, i.e. $ReportCount, or take it as is if no report is available. - is($Task->TestFailures, $TaskInfo->{TestFailures} * ($ReportCount || 1), "Check Failures of task ". TaskKeyStr($Task)); + if (defined $ExpectedFailures) + { + is($Task->TestFailures, $ExpectedFailures, "Check Failures of task ". TaskKeyStr($Task)); + } + elsif (CheckValue($TaskInfo->{TestFailures}) and !$ReportCount) + { + # Scale the expected TestFailures count with the number of times the test + # was run, i.e. $ReportCount, or take it as is if no report is available. + is($Task->TestFailures, $TaskInfo->{TestFailures}, "Check Failures of task ". TaskKeyStr($Task)); + } + # else there are reports for which we cannot check the TestFailures count. + # In particular this can happen if the test failure count can be checked + # for test=test but not for test=module. Then whether TestFailures can be + # checked or not depends on the missions mix. } return $NewFailures; } @@ -973,7 +1047,7 @@ sub CheckJobTree($;$) $CheckedJobs{$JobId} = 1; my ($HasTask, $HasNewFailures); - my $TestUnits = { wine => {} }; + my $TestUnits = {}; my $Email = $Emails{$JobId}; my %FailedVMs; @@ -1059,12 +1133,16 @@ sub CheckJobTree($;$) } next if ($TestUnits->{$Type}->{"*skipped*"}); - if (CheckValue($TypeInfo->{TestUnits})) + my @MissionTypes = $Type eq "wine" ? ("wine:test", "wine:module") : ($Type); + foreach my $MissionType (@MissionTypes) { - foreach my $TestUnit (split / +/, $TypeInfo->{TestUnits}) + my $MissionInfo = $TestInfo->{$MissionType}; + next if (!CheckValue($MissionInfo->{TestUnits})); + + foreach my $TestUnit (split / +/, $MissionInfo->{TestUnits}) { - ok($TestUnits->{$Type}->{$TestUnit}, "Check that $TestUnit was tested by $Type VMs for job $JobId") - or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$Type}})); + ok($TestUnits->{$MissionType}->{$TestUnit}, "Check that $TestUnit was tested by $MissionType VMs for job $JobId") + or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$MissionType}})); } } } -- 2.20.1

1 0

[PATCH v3 1/3] windowscodecs: Use IWICImagingFactory_CreatePalette in write_source.
by Rémi Bernon Feb. 1, 2021

Feb. 1, 2021

Instead of PaletteImpl_Create. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Don't import palette.c anymore, use WINCODECS_CUSTOM_UNIXLIB define to guard custom encoders / decoders. Resending jxrlib integration later. Supersedes: 198861-198864 dlls/windowscodecs/wincodecs_common.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/wincodecs_common.c b/dlls/windowscodecs/wincodecs_common.c index 37ad7128f10..1b146908be9 100644 --- a/dlls/windowscodecs/wincodecs_common.c +++ b/dlls/windowscodecs/wincodecs_common.c @@ -121,9 +121,17 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, if (need_palette) { + IWICImagingFactory *factory; IWICPalette *palette; - hr = PaletteImpl_Create(&palette); + hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICImagingFactory, (void**)&factory); + + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreatePalette(factory, &palette); + IWICImagingFactory_Release(factory); + } + if (SUCCEEDED(hr)) { hr = IWICBitmapSource_CopyPalette(converted_source, palette); -- 2.30.0

3 7

[PATCH] gdiplus/metafile: Fix copy-paste typo when setting resolution (Coverity).
by Nikolay Sivov Feb. 1, 2021

Feb. 1, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 3c2e8eb3aa2..d506d0dc8bf 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -4078,7 +4078,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, * If clear, metafile was recorded with a DC for a printer */ (*metafile)->printer_display = !(header.EmfPlusFlags & (1u << 31)); (*metafile)->logical_dpix = header.LogicalDpiX; - (*metafile)->logical_dpix = header.LogicalDpiY; + (*metafile)->logical_dpiy = header.LogicalDpiY; list_init(&(*metafile)->containers); TRACE("<-- %p\n", *metafile); -- 2.30.0

1 0

[PATCH 1/5] include: Add IWMPVideoRenderConfig interface to wmprealestate.idl.
by Rémi Bernon Feb. 1, 2021

Feb. 1, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/Makefile.in | 1 + include/wmprealestate.idl | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 include/wmprealestate.idl diff --git a/include/Makefile.in b/include/Makefile.in index fc5ffbbc721..b03c2e8c602 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -797,6 +797,7 @@ SOURCES = \ wmiutils.idl \ wmp.idl \ wmpids.h \ + wmprealestate.idl \ wmsbuffer.idl \ wmsdk.h \ wmsdkidl.idl \ diff --git a/include/wmprealestate.idl b/include/wmprealestate.idl new file mode 100644 index 00000000000..cb9d6b417fb --- /dev/null +++ b/include/wmprealestate.idl @@ -0,0 +1,31 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "mfidl.idl"; + +[ + odl, + uuid(6d6cf803-1ec0-4c8d-b3ca-f18e27282074), + oleautomation +] +interface IWMPVideoRenderConfig : IUnknown +{ + [propput] HRESULT presenterActivate([in] IMFActivate *activate); +} -- 2.30.0

1 4

[PATCH] kernelbase: Add rudimentary mui resource support to loader.c
by Craig Schulstad Jan. 31, 2021

Jan. 31, 2021

Signed-off-by: Craig Schulstad <craigaschulstad(a)gmail.com> --- dlls/kernelbase/loader.c | 169 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 164 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index fc9b0ce0083..0fbe9bcd9e8 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -48,6 +48,9 @@ struct exclusive_datafile }; static struct list exclusive_datafile_list = LIST_INIT( exclusive_datafile_list ); +static WCHAR mui_locale[LOCALE_NAME_MAX_LENGTH]; +static BOOL locale_found = 0; +static BOOL recursion_flag = 0; /*********************************************************************** * Modules @@ -1011,11 +1014,122 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExW( HMODULE module, ENUMRESTYPEP return ret; } +/***********************************************************************/ +/* get_mui - Acquire an MUI module for the associated resource */ +/***********************************************************************/ + +HMODULE get_mui(HMODULE module) + +{ + + HMODULE mui_module = NULL; + + WCHAR module_name[MAX_PATH], mui_name[MAX_PATH]; + + INT i, j, k, l; + + /* Initialize the work strings */ + + for (i = 0; i < MAX_PATH; i++) { + module_name[i] = 0; + mui_name[i] = 0; + } + + /* Note - the reference to the Windows file name for an "MUI" file has a structure such as */ + /* "C:\Program Files\Application Directory\xx-XX\Application.exe.mui"; however, in testing */ + /* out the usage of the "GetModuleFileNameW" function, it was determined that it works with */ + /* a relative Linux file structure such as "xx-XX/Application.exe.mui". */ + + /* Acquire the base resource file name */ + + if (!(GetModuleFileNameW(module, module_name, MAX_PATH))) return module; + + /* Stay with the original module reference if this file is not an executable file. */ + + if (!(wcsstr(module_name, L".exe"))) return module; + + /* Acquire the locale name using LCIDToLocaleName. Since this function utilizes the FindResourceExW function, this */ + /* sets up a recursive call to this function. In order to avoid a stack overflow condition that would be caused by */ + /* repeated calls, a flag will be set on to return back to the FindResourceExW function without again calling the */ + /* locale acquisition function. */ + + if (!(locale_found)) { + + if (recursion_flag) return module; + + recursion_flag = 1; + + LCIDToLocaleName( GetUserDefaultLCID(), mui_locale, LOCALE_NAME_MAX_LENGTH, 0 ); + + recursion_flag = 0; + + locale_found = 1; + + } + + /* Locate the position of the final backslash in the retrieved executable file. */ + + j = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + if (module_name[i] == '\\') j = i; + } + + /* Set up the work index that will be used to extract just the executable file from the fully qualified file name. */ + + k = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + /* If work index "j" has been set to -1, then the file portion of the qualified name has been reached and will */ + /* be copied to the "MUI" file reference. */ + + if (j < 0) { + mui_name[k] = module_name[i]; + k++; + } + + /* When the position of the final backslash has been reached, add the locale name as the folder/directory */ + /* containing the "MUI" file and reset work index "j" to -1. */ + + if (i >= j && j > 0) { + for (l = 0; l < 5; l++) { + mui_name[k] = mui_locale[l]; + k++; + } + mui_name[k] = '/'; + k++; + j = -1; + } + } + + /* Finally, append the literal ".mui" onto the file reference. */ + + wcscat(mui_name, L".mui"); + + /* Now, see if there is an associated "MUI" file and if so use its handle for the module handle. */ + + mui_module = LoadLibraryExW(mui_name, 0, 0); + + if (mui_module) { + return mui_module; + } else { + return module; + } + +} + +/***********************************************************************/ +/* get_res_handle - Isolated call of the LdrFindResource function */ +/***********************************************************************/ + +HRSRC get_res_handle(HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang) -/********************************************************************** - * FindResourceExW (kernelbase.@) - */ -HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) { NTSTATUS status; UNICODE_STRING nameW, typeW; @@ -1024,7 +1138,6 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); - if (!module) module = GetModuleHandleW( 0 ); nameW.Buffer = typeW.Buffer = NULL; __TRY @@ -1046,7 +1159,41 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP if (!IS_INTRESOURCE(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + return (HRSRC)entry; + +} + +/********************************************************************** + * FindResourceExW (kernelbase.@) + */ +HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) +{ + + HRSRC rsrc; + + TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); + + if (!module) module = GetModuleHandleW( 0 ); + + rsrc = get_res_handle(module, type, name, lang); + + if (rsrc) { + + return rsrc; + + } else { + + /* If a resource retrieval failed using the initial module value, attempt to */ + /* locate an associated MUI file and retry the resource retrieval. */ + + module = get_mui(module); + + rsrc = get_res_handle(module, type, name, lang); + + return rsrc; + + } } @@ -1074,11 +1221,23 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeResource( HGLOBAL handle ) HGLOBAL WINAPI DECLSPEC_HOTPATCH LoadResource( HINSTANCE module, HRSRC rsrc ) { void *ret; + HMODULE mui_module = NULL; TRACE( "%p %p\n", module, rsrc ); if (!rsrc) return 0; if (!module) module = GetModuleHandleW( 0 ); + + + /* Only check for an MUI reference if the resource handle value is less than the module value, */ + /* or if an MUI reference was found and the MUI reference and handle value are larger than the */ + /* module value for the executable file. That is a signal that the resource handle is to be */ + /* associated with the MUI file instead of the executable file. */ + + mui_module = get_mui(module); + + if (((HMODULE)rsrc < module) || ((mui_module > module) && ((HMODULE)rsrc > mui_module))) module = mui_module; + if (!set_ntstatus( LdrAccessResource( module, (IMAGE_RESOURCE_DATA_ENTRY *)rsrc, &ret, NULL ))) return 0; return ret; -- 2.17.1

2 1