September 2018 - Wine-commits

Huw Davies : msvcp90: Remove unnecessary check for __arm__.
by Alexandre Julliard 21 Sep '18

21 Sep '18

Module: wine Branch: master Commit: d23b5f1008b323d2c706f6d021ee0ae1a3c97459 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d23b5f1008b323d2c706f6d0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 21 14:33:37 2018 +0100 msvcp90: Remove unnecessary check for __arm__. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 0d1a74e..ef02129 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -618,7 +618,7 @@ unsigned int __cdecl _Random_device(void) #endif #if _MSVCP_VER >= 110 -#if defined(__i386__) && !defined(__arm__) +#if defined(__i386__) extern void *call_thiscall_func; __ASM_GLOBAL_FUNC(call_thiscall_func,

1 0

Nikolay Sivov : dwrite/layout: Test resulting line width before adding inline trimming run.
by Alexandre Julliard 21 Sep '18

21 Sep '18

Module: wine Branch: master Commit: 8a14df1e781e7d92c4eb325dca400e7d6379d989 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a14df1e781e7d92c4eb325d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 21 16:54:19 2018 +0300 dwrite/layout: Test resulting line width before adding inline trimming run. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 +++ dlls/dwrite/tests/layout.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 10d5914..5deae45 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1926,6 +1926,9 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust if (FAILED(hr)) return; + if (get_cluster_range_width(layout, start, i) + sign_metrics.width > layout->metrics.layoutWidth) + append_trimming_run = FALSE; + if (append_trimming_run) { struct layout_effective_inline *trimming_sign; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 652f6b7..c77a0ea 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1636,6 +1636,11 @@ static const struct drawcall_entry draw_seq[] = { { DRAW_LAST_KIND } }; +static const struct drawcall_entry draw_trimmed_seq[] = { + { DRAW_GLYPHRUN, {'a',0}, {'e','n','-','u','s',0}, 1 }, + { DRAW_LAST_KIND } +}; + static const struct drawcall_entry draw_seq2[] = { { DRAW_GLYPHRUN, {'s',0}, {'r','u',0}, 1 }, { DRAW_GLYPHRUN, {'t',0}, {'r','u',0}, 1 }, @@ -2386,6 +2391,44 @@ todo_wine IDWriteTextLayout_Release(layout); + /* Single cluster layout, trigger trimming. */ + hr = IDWriteFactory_CreateTextLayout(factory, str6W, 1, format, 1000.0f, 200.0f, &layout); + ok(hr == S_OK, "Failed to create layout, hr %#x.\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 1, &count); + ok(hr == S_OK, "Failed to get cluster metrics, hr %#x.\n", hr); + ok(count == 1, "Unexpected cluster count %u.\n", count); + + hr = IDWriteTextLayout_SetMaxWidth(layout, metrics[0].width / 2.0f); + ok(hr == S_OK, "Failed to set layout width, hr %#x.\n", hr); + + trimming_options.granularity = DWRITE_TRIMMING_GRANULARITY_CHARACTER; + trimming_options.delimiter = 0; + trimming_options.delimiterCount = 0; + hr = IDWriteTextLayout_SetTrimming(layout, &trimming_options, trimm); + ok(hr == S_OK, "Failed to set trimming options, hr %#x.\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 1, &count); + ok(hr == S_OK, "Failed to get cluster metrics, hr %#x.\n", hr); + ok(count == 1, "Unexpected cluster count %u.\n", count); + + hr = IDWriteTextLayout_GetLineMetrics(layout, &line, 1, &count); + ok(hr == S_OK, "Failed to get line metrics, hr %#x.\n", hr); + ok(count == 1, "Unexpected line count %u.\n", count); + ok(line.length == 1, "Unexpected line length %u.\n", line.length); + ok(line.isTrimmed, "Unexpected trimming flag %x.\n", line.isTrimmed); + + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0f, 0.0f); + ok(hr == S_OK, "Draw() failed, hr %#x.\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_trimmed_seq, "Trimmed draw test", FALSE); + + IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(trimm); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory);

1 0

Zhiyi Zhang : comctl32/pager: Support toolbar notification conversion.
by Alexandre Julliard 21 Sep '18

21 Sep '18

Module: wine Branch: master Commit: 76f8ea750150b61e26aa41b9de961e5c94685323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76f8ea750150b61e26aa41b9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 17 23:26:31 2018 +0800 comctl32/pager: Support toolbar notification conversion. Fix BibleWorks 10 not displaying toolbar. Pager always wants Unicode notifications from its children. And the parent of pager may want ANSI notifications. In this case, pager need to convert Unicode notifications to ANSI ones before sending them to parent and convert ANSI notifications from parent to Unicode before returning the result to its children. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 96 +++++++++++ dlls/comctl32/tests/pager.c | 398 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 494 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76f8ea750150b61e26aa…

1 0

Zhiyi Zhang : comctl32/pager: Support tooltip notification conversion.
by Alexandre Julliard 21 Sep '18

21 Sep '18

Module: wine Branch: master Commit: d7dcfe032f0d5213284a27145c127f8973446477 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7dcfe032f0d5213284a2714… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 17 23:26:48 2018 +0800 comctl32/pager: Support tooltip notification conversion. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 72 ++++++++++++++++++++++++++++++ dlls/comctl32/tests/pager.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d7dcfe032f0d5213284a…

1 0

Zhiyi Zhang : comctl32/pager: Support comboboxex notification conversion.
by Alexandre Julliard 21 Sep '18

21 Sep '18

Module: wine Branch: master Commit: eb317039e081805dac62281f29cacdbaa9b6deb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb317039e081805dac62281f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 17 23:27:00 2018 +0800 comctl32/pager: Support comboboxex notification conversion. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 61 ++++++++++++++++++++++++++++++++++---- dlls/comctl32/tests/pager.c | 72 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 125 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb317039e081805dac62…

1 0

Francois Gouget : testbot: Add a ModuleBuild check in GetPatchImpacts().
by Alexandre Julliard 21 Sep '18

21 Sep '18

Module: tools Branch: master Commit: fa8080c7e9f3013d26ab6f1c26f7fe03488df840 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fa8080c7e9f3013d26ab6f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 21 10:35:22 2018 +0200 testbot: Add a ModuleBuild check in GetPatchImpacts(). Patches that impact a single module can impact the Wine files list too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 9e0e689..602c80b 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -279,7 +279,8 @@ sub GetPatchImpacts($;$) if ($PastImpacts) { - if ($PastImpacts->{WineBuild} or $PastImpacts->{TestBuild}) + if ($PastImpacts->{WineBuild} or $PastImpacts->{ModuleBuild} or + $PastImpacts->{TestBuild}) { # Update the list of Wine files so we correctly recognize patchset parts # that modify new Wine files.

1 0

Francois Gouget : testbot: Fix Makefile.in additions / removals in GetPatchImpacts().
by Alexandre Julliard 21 Sep '18

21 Sep '18

Module: tools Branch: master Commit: 0eef5517017e63a53ad7f0c3a6402723dced096c URL: https://source.winehq.org/git/tools.git/?a=commit;h=0eef5517017e63a53ad7f0c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 21 10:35:27 2018 +0200 testbot: Fix Makefile.in additions / removals in GetPatchImpacts(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 602c80b..7c57b2c 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -183,15 +183,10 @@ sub _HandleFile($$$) }; } - # Assume makefile modifications may break the build but not the tests - if ($File eq "Makefile.in") + if ($File eq "Makefile.in" and $Change ne "modify") { - if ($Change eq "new" or $Change eq "rm") - { - # This adds / removes a directory - $Impacts->{MakeMakefiles} = 1; - } - return; + # This adds / removes a directory + $Impacts->{MakeMakefiles} = 1; } if (!$Tests->{$Module}->{Files}) @@ -233,6 +228,11 @@ sub _HandleFile($$$) if ($FilePath !~ /^(?:$IgnoredPathsRe)/) { $Impacts->{WineBuild} = 1; + if ($FilePath =~ m~/Makefile.in$~ and $Change ne "modify") + { + # This adds / removes a directory + $Impacts->{MakeMakefiles} = 1; + } } # Else patches to this file don't impact the Wine build. } @@ -358,6 +358,8 @@ sub GetPatchImpacts($;$) { # Skip unmodified files next if (!$TestInfo->{Files}->{$File}); + # Assume makefile modifications may break the build but not the tests + next if ($File eq "Makefile.in"); my $Base = $File; if ($Base !~ s/(?:\.c|\.spec)$//)

1 0

Francois Gouget : testbot: Add _CreateTestInfo() to reduce code duplication in PatchUtils.
by Alexandre Julliard 21 Sep '18

21 Sep '18

Module: tools Branch: master Commit: b44393b440c7a15b7b1cfd0631e15434429ecfe9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b44393b440c7a15b7b1cfd0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 21 10:35:30 2018 +0200 testbot: Add _CreateTestInfo() to reduce code duplication in PatchUtils. _CreateTestInfo() creates the initial $Impacts->{Tests} structure for GetPachImpacts(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 64 ++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 7c57b2c..04aea18 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -150,6 +150,31 @@ my $IgnoredPathsRe = join('|', 'tools/winemaker/', ); +sub _CreateTestInfo($$$) +{ + my ($Impacts, $Root, $Dir) = @_; + + my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; + $Impacts->{BuildModules}->{$Module} = 1; + $Impacts->{IsWinePatch} = 1; + + my $Tests = $Impacts->{Tests}; + if (!$Tests->{$Module}) + { + $Tests->{$Module} = { + "Module" => $Module, + "Path" => "$Root/$Dir/tests", + "ExeBase" => "${Module}_test", + }; + foreach my $File (keys %{$_TestList->{$Module}}) + { + $Tests->{$Module}->{Files}->{$File} = 0; # not modified + } + } + + return $Module; +} + sub _HandleFile($$$) { my ($Impacts, $FilePath, $Change) = @_; @@ -168,43 +193,23 @@ sub _HandleFile($$$) if ($FilePath =~ m~^(dlls|programs)/([^/]+)/tests/([^/\s]+)$~) { my ($Root, $Dir, $File) = ($1, $2, $3); - my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; - $Impacts->{BuildModules}->{$Module} = 1; - $Impacts->{TestBuild} = 1; - $Impacts->{IsWinePatch} = 1; - my $Tests = $Impacts->{Tests}; - if (!$Tests->{$Module}) - { - $Tests->{$Module} = { - "Module" => $Module, - "Path" => "$Root/$Dir/tests", - "ExeBase" => "${Module}_test", - }; - } + my $Module = _CreateTestInfo($Impacts, $Root, $Dir); + $Impacts->{TestBuild} = 1; + $Impacts->{Tests}->{$Module}->{Files}->{$File} = $Change; if ($File eq "Makefile.in" and $Change ne "modify") { # This adds / removes a directory $Impacts->{MakeMakefiles} = 1; } - - if (!$Tests->{$Module}->{Files}) - { - foreach my $File (keys %{$_TestList->{$Module}}) - { - $Tests->{$Module}->{Files}->{$File} = 0; # not modified - } - } - $Tests->{$Module}->{Files}->{$File} = $Change; } elsif ($FilePath =~ m~^(dlls|programs)/([^/]+)/([^/\s]+)$~) { my ($Root, $Dir, $File) = ($1, $2, $3); - my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; - $Impacts->{BuildModules}->{$Module} = 1; + + my $Module = _CreateTestInfo($Impacts, $Root, $Dir); $Impacts->{ModuleBuild} = 1; - $Impacts->{IsWinePatch} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -300,13 +305,10 @@ sub GetPatchImpacts($;$) foreach my $PastInfo (values %{$PastImpacts->{Tests}}) { - if ($PastInfo->{Files}) + foreach my $File (keys %{$PastInfo->{Files}}) { - foreach my $File (keys %{$PastInfo->{Files}}) - { - _HandleFile($Impacts, "$PastInfo->{Path}/$File", - $PastInfo->{Files}->{$File} eq "rm" ? "rm" : 0); - } + _HandleFile($Impacts, "$PastInfo->{Path}/$File", + $PastInfo->{Files}->{$File} eq "rm" ? "rm" : 0); } } }

1 0

Francois Gouget : testbot: Rename some GetPatchImpacts() fields.
by Alexandre Julliard 21 Sep '18

21 Sep '18

Module: tools Branch: master Commit: f4c3c990f09bd918e2c193d4bf46dd5b49d96cf5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f4c3c990f09bd918e2c193d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 21 10:35:34 2018 +0200 testbot: Rename some GetPatchImpacts() fields. The new names are less ambiguous and less Wine-specific. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 25 ++++++++++++------------- testbot/lib/WineTestBot/Patches.pm | 6 +++--- testbot/web/Submit.pl | 4 ++-- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 7a268db..1287f6d 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -222,7 +222,7 @@ if ($DataDir =~ /'/) my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or - ($Impacts->{WineBuild} and !BuildNative()) or + ($Impacts->{PatchedRoot} and !BuildNative()) or !BuildTestExecutables($Targets, $Impacts, "exe32") or !BuildTestExecutables($Targets, $Impacts, "exe64")) { diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 04aea18..2bac7be 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -195,7 +195,7 @@ sub _HandleFile($$$) my ($Root, $Dir, $File) = ($1, $2, $3); my $Module = _CreateTestInfo($Impacts, $Root, $Dir); - $Impacts->{TestBuild} = 1; + $Impacts->{PatchedTests} = 1; $Impacts->{Tests}->{$Module}->{Files}->{$File} = $Change; if ($File eq "Makefile.in" and $Change ne "modify") @@ -209,7 +209,7 @@ sub _HandleFile($$$) my ($Root, $Dir, $File) = ($1, $2, $3); my $Module = _CreateTestInfo($Impacts, $Root, $Dir); - $Impacts->{ModuleBuild} = 1; + $Impacts->{PatchedModules} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -227,12 +227,11 @@ sub _HandleFile($$$) $Impacts->{IsWinePatch} = 1; } # Else this file exists in Wine but has a very common name so it may just - # as well belong to another repository. Still update WineBuild in case - # this patch really is for Wine. + # as well belong to another repository. if ($FilePath !~ /^(?:$IgnoredPathsRe)/) { - $Impacts->{WineBuild} = 1; + $Impacts->{PatchedRoot} = 1; if ($FilePath =~ m~/Makefile.in$~ and $Change ne "modify") { # This adds / removes a directory @@ -245,7 +244,7 @@ sub _HandleFile($$$) { # This may or may not be a Wine patch but the new Makefile.in will be # added to the build by make_makefiles. - $Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1; + $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; } } } @@ -274,7 +273,7 @@ sub GetPatchImpacts($;$) # patch. ModuleUnitCount => 0, # Number of patched test units. - UnitCount => 0, + TestUnitCount => 0, # The modules that need a rebuild, even if only for the tests. BuildModules => {}, # Information about 'tests' directories. @@ -284,8 +283,8 @@ sub GetPatchImpacts($;$) if ($PastImpacts) { - if ($PastImpacts->{WineBuild} or $PastImpacts->{ModuleBuild} or - $PastImpacts->{TestBuild}) + if ($PastImpacts->{PatchedRoot} or $PastImpacts->{PatchedModules} or + $PastImpacts->{PatchedTests}) { # Update the list of Wine files so we correctly recognize patchset parts # that modify new Wine files. @@ -318,11 +317,11 @@ sub GetPatchImpacts($;$) { if ($Line =~ m=^--- \w+/(?:aclocal\.m4|configure\.ac)$=) { - $Impacts->{WineBuild} = $Impacts->{Autoconf} = 1; + $Impacts->{PatchedRoot} = $Impacts->{Autoconf} = 1; } elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) { - $Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1; + $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- /dev/null$=) @@ -401,7 +400,7 @@ sub GetPatchImpacts($;$) } $TestInfo->{UnitCount} = scalar(keys %{$TestInfo->{Units}}); - $Impacts->{UnitCount} += $TestInfo->{UnitCount}; + $Impacts->{TestUnitCount} += $TestInfo->{UnitCount}; } return $Impacts; @@ -420,7 +419,7 @@ sub GetBuildTimeout($$) map {$_ =~ /^exe/ ? $ExeCount++ : $WineCount++ } keys %$Builds; # Set $ModuleCount to 0 if a full rebuild is needed - my $ModuleCount = (!$Impacts or $Impacts->{WineBuild}) ? 0 : + my $ModuleCount = (!$Impacts or $Impacts->{PatchedRoot}) ? 0 : scalar(keys %{$Impacts->{BuildModules}}); my ($ExeTimeout, $WineTimeout) = (0, 0); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 5024ed4..0387543 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -136,8 +136,8 @@ sub Submit($$$) $PastImpacts = GetPatchImpacts($PatchFileName) if ($IsSet); my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, $PastImpacts); - if (!$Impacts->{WineBuild} and !$Impacts->{ModuleBuild} and - !$Impacts->{TestBuild}) + if (!$Impacts->{PatchedRoot} and !$Impacts->{PatchedModules} and + !$Impacts->{PatchedTests}) { if ($Impacts->{IsWinePatch}) { @@ -176,7 +176,7 @@ sub Submit($$$) my $BuildVMs = CreateVMs(); $BuildVMs->AddFilter("Type", ["build"]); $BuildVMs->AddFilter("Role", ["base"]); - if ($Impacts->{UnitCount} and !$BuildVMs->IsEmpty()) + if ($Impacts->{TestUnitCount} and !$BuildVMs->IsEmpty()) { # Create the Build Step my $BuildStep = $NewJob->Steps->Add(); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index fe10104..ae4aca3 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -598,11 +598,11 @@ sub DetermineFileType($$) if ($FileType eq "unknown") { my $Impacts = GetPatchImpacts($FileName); - if ($Impacts->{UnitCount} == 0) + if ($Impacts->{TestUnitCount} == 0) { $ErrMessage = "Patch doesn't affect tests"; } - elsif ($Impacts->{UnitCount} > 1) + elsif ($Impacts->{TestUnitCount} > 1) { $ErrMessage = "Patch contains changes to multiple tests"; }

1 0

Józef Kucia : wined3d: Add support for variable-sized format structures.
by Alexandre Julliard 20 Sep '18

20 Sep '18

Module: wine Branch: master Commit: ff6d7de8cad0cd7eb3812b1027619f641e10d0b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff6d7de8cad0cd7eb3812b10… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 20 09:02:00 2018 +0200 wined3d: Add support for variable-sized format structures. In order to move GL-specific fields into their own structure. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/utils.c | 28 +++++++++++++++------------- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 345e7b7..8968447 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2490,7 +2490,7 @@ static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); - if (!wined3d_adapter_init_format_info(adapter)) + if (!wined3d_adapter_init_format_info(adapter, sizeof(struct wined3d_format))) return FALSE; adapter->vertex_pipe = &none_vertex_pipe; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4f9fc13..9627b13 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1927,7 +1927,7 @@ static inline int get_format_idx(enum wined3d_format_id format_id) static struct wined3d_format *get_format_by_idx(const struct wined3d_adapter *adapter, int fmt_idx) { - return &adapter->formats[fmt_idx]; + return (struct wined3d_format *)((BYTE *)adapter->formats + fmt_idx * adapter->format_size); } static struct wined3d_format *get_format_internal(const struct wined3d_adapter *adapter, @@ -1944,10 +1944,11 @@ static struct wined3d_format *get_format_internal(const struct wined3d_adapter * return get_format_by_idx(adapter, fmt_idx); } -static void copy_format(struct wined3d_format *dst_format, const struct wined3d_format *src_format) +static void copy_format(const struct wined3d_adapter *adapter, + struct wined3d_format *dst_format, const struct wined3d_format *src_format) { enum wined3d_format_id id = dst_format->id; - *dst_format = *src_format; + memcpy(dst_format, src_format, adapter->format_size); dst_format->id = id; } @@ -1993,13 +1994,14 @@ static enum wined3d_channel_type map_channel_type(char t) } } -static BOOL init_format_base_info(struct wined3d_adapter *adapter) +static BOOL init_format_base_info(struct wined3d_adapter *adapter, size_t format_size) { struct wined3d_format *format; unsigned int i, j; + adapter->format_size = format_size; if (!(adapter->formats = heap_calloc(WINED3D_FORMAT_COUNT - + ARRAY_SIZE(typeless_depth_stencil_formats), sizeof(*adapter->formats)))) + + ARRAY_SIZE(typeless_depth_stencil_formats), adapter->format_size))) { ERR("Failed to allocate memory.\n"); return FALSE; @@ -3198,7 +3200,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win if (!srgb_format) continue; - copy_format(srgb_format, format); + copy_format(adapter, srgb_format, format); if (gl_info->supported[EXT_TEXTURE_SRGB] && !(adapter->d3d_info.wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL)) @@ -3716,7 +3718,7 @@ static BOOL init_typeless_formats(const struct wined3d_adapter *adapter) return FALSE; memcpy(flags, typeless_format->flags, sizeof(flags)); - copy_format(typeless_format, format); + copy_format(adapter, typeless_format, format); for (j = 0; j < ARRAY_SIZE(typeless_format->flags); ++j) typeless_format->flags[j] |= flags[j]; } @@ -3734,7 +3736,7 @@ static BOOL init_typeless_formats(const struct wined3d_adapter *adapter) typeless_ds_format = get_format_by_idx(adapter, WINED3D_FORMAT_COUNT + i); typeless_ds_format->id = typeless_depth_stencil_formats[i].typeless_id; - copy_format(typeless_ds_format, ds_format); + copy_format(adapter, typeless_ds_format, ds_format); for (j = 0; j < ARRAY_SIZE(typeless_ds_format->flags); ++j) { typeless_ds_format->flags[j] = typeless_format->flags[j]; @@ -3746,13 +3748,13 @@ static BOOL init_typeless_formats(const struct wined3d_adapter *adapter) { if (!(depth_view_format = get_format_internal(adapter, format_id))) return FALSE; - copy_format(depth_view_format, ds_format); + copy_format(adapter, depth_view_format, ds_format); } if ((format_id = typeless_depth_stencil_formats[i].stencil_view_id)) { if (!(stencil_view_format = get_format_internal(adapter, format_id))) return FALSE; - copy_format(stencil_view_format, ds_format); + copy_format(adapter, stencil_view_format, ds_format); } } @@ -3947,9 +3949,9 @@ static void init_format_depth_bias_scale(struct wined3d_adapter *adapter, } } -BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter) +BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, size_t format_size) { - if (!init_format_base_info(adapter)) return FALSE; + if (!init_format_base_info(adapter, format_size)) return FALSE; if (!init_format_block_info(adapter)) goto fail; if (!init_format_decompress_info(adapter)) goto fail; @@ -3966,7 +3968,7 @@ BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct { struct wined3d_gl_info *gl_info = &adapter->gl_info; - if (!wined3d_adapter_init_format_info(adapter)) + if (!wined3d_adapter_init_format_info(adapter, sizeof(struct wined3d_format))) return FALSE; if (!init_format_texture_info(adapter, gl_info)) goto fail; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d8d5b04..a501da1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2667,7 +2667,8 @@ struct wined3d_adapter UINT64 vram_bytes_used; LUID luid; - struct wined3d_format *formats; + void *formats; + size_t format_size; const struct wined3d_vertex_pipe_ops *vertex_pipe; const struct fragment_pipeline *fragment_pipe; @@ -2690,7 +2691,7 @@ struct wined3d_caps_gl_ctx GLuint test_program_id; }; -BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; +BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, size_t format_size) DECLSPEC_HIDDEN; BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN;

1 0