wine-commits September 2018

wine-commits@winehq.org

2 participants
670 discussions

Gabriel Ivăncescu : shell32/autocomplete: Remove the property after replacing the callback instead of before.
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: 644358bdf704d077372a8a8ed60cf2a29196358c URL: https://source.winehq.org/git/wine.git/?a=commit;h=644358bdf704d077372a8a8e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 18 23:59:55 2018 +0300 shell32/autocomplete: Remove the property after replacing the callback instead of before. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 86abab3..e3fe1fd 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -367,8 +367,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, { WNDPROC proc = This->wpOrigEditProc; - RemovePropW(hwnd, autocomplete_propertyW); SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)proc); + RemovePropW(hwnd, autocomplete_propertyW); destroy_autocomplete_object(This); return CallWindowProcW(proc, hwnd, uMsg, wParam, lParam); }

1 0

Gabriel Ivăncescu : shell32/autocomplete: Avoid another buffer overflow and handle arbitrary sizes for the auto-append string.
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: 2a8df60a8c4e0dd335b0af902b2552e9c248652b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a8df60a8c4e0dd335b0af90… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 18 23:59:53 2018 +0300 shell32/autocomplete: Avoid another buffer overflow and handle arbitrary sizes for the auto-append string. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 38f53db..86abab3 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -126,6 +126,28 @@ static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *st return dst - base; } +static void autoappend_str(IAutoCompleteImpl *ac, WCHAR *text, UINT len, WCHAR *str, HWND hwnd) +{ + WCHAR *tmp; + size_t size; + + /* The character capitalization can be different, + so merge text and str into a new string */ + size = len + strlenW(&str[len]) + 1; + + if ((tmp = heap_alloc(size * sizeof(*tmp)))) + { + memcpy(tmp, text, len * sizeof(*tmp)); + memcpy(&tmp[len], &str[len], (size - len) * sizeof(*tmp)); + } + else tmp = str; + + SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)tmp); + SendMessageW(hwnd, EM_SETSEL, len, size - 1); + if (tmp != str) + heap_free(tmp); +} + static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_flag flag) { HRESULT hr; @@ -166,12 +188,7 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ { if (cpt == 0 && flag == autoappend_flag_yes) { - WCHAR buffW[255]; - - strcpyW(buffW, text); - strcatW(buffW, &strs[len]); - SetWindowTextW(hwnd, buffW); - SendMessageW(hwnd, EM_SETSEL, len, strlenW(strs)); + autoappend_str(ac, text, len, strs, hwnd); if (!(ac->options & ACO_AUTOSUGGEST)) { CoTaskMemFree(strs);

1 0

Gabriel Ivăncescu : shell32/autocomplete: Simplify a calculation.
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: 72d8b7befd321be4df62b78bca7cdbae34b2302c URL: https://source.winehq.org/git/wine.git/?a=commit;h=72d8b7befd321be4df62b78b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 18 23:59:54 2018 +0300 shell32/autocomplete: Simplify a calculation. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index b0c92c3..38f53db 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -200,7 +200,7 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ /* It seems that Windows XP displays 7 lines at most and otherwise displays a vertical scroll bar */ SetWindowPos(ac->hwndListBox, HWND_TOP, - r.left, r.bottom + 1, r.right - r.left, min(height * 7, height*(cpt+1)), + r.left, r.bottom + 1, r.right - r.left, height * min(cpt + 1, 7), SWP_SHOWWINDOW ); } else

1 0

Gabriel Ivăncescu : shell32/autocomplete: Don' t auto-append on control characters.
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: wine Branch: master Commit: 964420554055059c4157b732a70181a766c0dec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=964420554055059c4157b732… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 18 23:59:52 2018 +0300 shell32/autocomplete: Don't auto-append on control characters. We must not auto-append on control characters, most notably Backspace, but also ^X (cut) and so on. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 183b37b..b0c92c3 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -343,7 +343,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, case WM_CHAR: case WM_UNICHAR: ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - autocomplete_text(This, hwnd, (This->options & ACO_AUTOAPPEND) + autocomplete_text(This, hwnd, (This->options & ACO_AUTOAPPEND) && wParam >= ' ' ? autoappend_flag_yes : autoappend_flag_no); return ret; case WM_DESTROY:

1 0

Francois Gouget : testbot: Set a flag when all of a module' s test units must be rerun.
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: tools Branch: master Commit: 84ae9f5f5448d38a29f307b9c381cfc3fd8a5793 URL: https://source.winehq.org/git/tools.git/?a=commit;h=84ae9f5f5448d38a29f307b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 19 12:09:45 2018 +0200 testbot: Set a flag when all of a module's test units must be rerun. This will let GetPatchImpacts() callers make optimisations like passing the module name to WineTest instead of the full test unit list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 476757f..9e0e689 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -353,7 +353,6 @@ sub GetPatchImpacts($;$) foreach my $TestInfo (values %{$Impacts->{Tests}}) { # For each module, identify modifications to non-C files and helper dlls - my $AllUnits; foreach my $File (keys %{$TestInfo->{Files}}) { # Skip unmodified files @@ -363,7 +362,7 @@ sub GetPatchImpacts($;$) if ($Base !~ s/(?:\.c|\.spec)$//) { # Any change to a non-C non-Spec file can potentially impact all tests - $AllUnits = 1; + $TestInfo->{All} = 1; last; } if (exists $TestInfo->{Files}->{"$Base.spec"} and @@ -371,7 +370,7 @@ sub GetPatchImpacts($;$) $TestInfo->{Files}->{"$Base.spec"})) { # Any change to a helper dll can potentially impact all tests - $AllUnits = 1; + $TestInfo->{All} = 1; last; } } @@ -380,7 +379,7 @@ sub GetPatchImpacts($;$) foreach my $File (keys %{$TestInfo->{Files}}) { # Skip unmodified files - next if (!$AllUnits and !$TestInfo->{Files}->{$File}); + next if (!$TestInfo->{All} and !$TestInfo->{Files}->{$File}); my $Base = $File; # Non-C files are not test units @@ -388,7 +387,7 @@ sub GetPatchImpacts($;$) # Helper dlls are not test units next if (exists $TestInfo->{Files}->{"$Base.spec"}); - if (($AllUnits or $TestInfo->{Files}->{$File}) and + if (($TestInfo->{All} or $TestInfo->{Files}->{$File}) and $TestInfo->{Files}->{$File} ne "rm") { # Only new/modified test units are impacted

1 0

Francois Gouget : testbot: Remove the HasConfigure patch impact.
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: tools Branch: master Commit: 5141879b5e9bd6423322eb21c57e5e34f5f53e73 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5141879b5e9bd6423322eb2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 19 12:09:42 2018 +0200 testbot: Remove the HasConfigure patch impact. Even if the patch provides an updated configure file the TestBot needs to be able to recreate it in case another patch does not provide it. Furthermore skipping the autoconf steps correctly is complex when a patchset changes configure.ac in part 1 and provides configure in part 2, or provides both in part 1 and only some other configure.ac change in part 2, etc. So it's better to just run autoconf whenever configure.ac is patched. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 2fe7a97..2e6cc85 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -125,7 +125,7 @@ sub ApplyPatch($$) } } - if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure}) + if ($Impacts->{Autoconf}) { InfoMsg "\nRunning autoconf\n"; system("cd '$DataDir/$Dir' && set -x && autoconf"); diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 4ce5bf4..476757f 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -317,10 +317,6 @@ sub GetPatchImpacts($;$) { $Impacts->{WineBuild} = $Impacts->{Autoconf} = 1; } - elsif ($Line =~ m=^--- \w+/configure$=) - { - $Impacts->{WineBuild} = $Impacts->{HasConfigure} = 1; - } elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) { $Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1;

1 0

Francois Gouget : testbot: Remove the $NoUnits GetPatchImpacts() parameter.
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: tools Branch: master Commit: 73d3e48acd0e037bae0c58da5f355bf8061c3259 URL: https://source.winehq.org/git/tools.git/?a=commit;h=73d3e48acd0e037bae0c58d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 19 12:09:38 2018 +0200 testbot: Remove the $NoUnits GetPatchImpacts() parameter. The goal was to be able to use it on systems that don't have the winefiles.txt file. However nowadays all systems have access to it. Furthermore the amount of work saved is not really significant so there is no reason for the extra complexity. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/lib/Build/Utils.pm | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 9 +++++---- testbot/lib/WineTestBot/Patches.pm | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index d9bedb5..ec36b62 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -446,7 +446,7 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Grab the executables for the next steps # -my $Impacts = GetPatchImpacts($FileName, "nounit"); +my $Impacts = GetPatchImpacts($FileName); my $StepDir = $Step->CreateDir(); foreach my $TestInfo (values %{$Impacts->{Tests}}) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 38a8012..2fe7a97 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -113,7 +113,7 @@ sub ApplyPatch($$) return undef; } - my $Impacts = GetPatchImpacts($PatchFile, "nounits"); + my $Impacts = GetPatchImpacts($PatchFile); if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 4a1761a..4ce5bf4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -193,7 +193,6 @@ sub _HandleFile($$$) } return; } - return if ($Impacts->{NoUnits}); if (!$Tests->{$Module}->{Files}) { @@ -258,15 +257,17 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpacts($;$$) +sub GetPatchImpacts($;$) { - my ($PatchFileName, $NoUnits, $PastImpacts) = @_; + my ($PatchFileName, $PastImpacts) = @_; my $fh; return undef if (!open($fh, "<", $PatchFileName)); my $Impacts = { - NoUnits => $NoUnits, + # Number of test units impacted either directly, or indirectly by a module + # patch. + ModuleUnitCount => 0, # Number of patched test units. UnitCount => 0, # The modules that need a rebuild, even if only for the tests. diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index a052c5a..5024ed4 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -134,7 +134,7 @@ sub Submit($$$) my $PastImpacts; $PastImpacts = GetPatchImpacts($PatchFileName) if ($IsSet); - my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, undef, $PastImpacts); + my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, $PastImpacts); if (!$Impacts->{WineBuild} and !$Impacts->{ModuleBuild} and !$Impacts->{TestBuild})

1 0

Francois Gouget : testbot: Rename the patch analyzer to GetPatchImpacts().
by Alexandre Julliard 19 Sep '18

19 Sep '18

Module: tools Branch: master Commit: 46de79b0bf47d1989a263e2fb80feb5cf974aa1e URL: https://source.winehq.org/git/tools.git/?a=commit;h=46de79b0bf47d1989a263e2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 19 12:09:35 2018 +0200 testbot: Rename the patch analyzer to GetPatchImpacts(). The returned structure is called $Impacts everywhere so this makes the naming more consistent. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/lib/Build/Utils.pm | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 6 +++--- testbot/lib/WineTestBot/Patches.pm | 4 ++-- testbot/web/Submit.pl | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 11b41c6..d9bedb5 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -446,7 +446,7 @@ FatalTAError(undef, $TAError) if (defined $TAError); # Grab the executables for the next steps # -my $Impacts = GetPatchImpact($FileName, "nounit"); +my $Impacts = GetPatchImpacts($FileName, "nounit"); my $StepDir = $Step->CreateDir(); foreach my $TestInfo (values %{$Impacts->{Tests}}) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index fd1b846..38a8012 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -113,7 +113,7 @@ sub ApplyPatch($$) return undef; } - my $Impacts = GetPatchImpact($PatchFile, "nounits"); + my $Impacts = GetPatchImpacts($PatchFile, "nounits"); if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 7049694..4a1761a 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -31,7 +31,7 @@ the Wine builds. =cut use Exporter 'import'; -our @EXPORT = qw(GetPatchImpact UpdateWineData GetBuildTimeout); +our @EXPORT = qw(GetPatchImpacts UpdateWineData GetBuildTimeout); use List::Util qw(min max); @@ -249,7 +249,7 @@ sub _HandleFile($$$) =pod =over 12 -=item C<GetPatchImpact()> +=item C<GetPatchImpacts()> Analyzes a patch and returns a hashtable describing the impact it has on the Wine build: whether it requires updating the makefiles, re-running autoconf or @@ -258,7 +258,7 @@ configure, whether it impacts the tests, etc. =back =cut -sub GetPatchImpact($;$$) +sub GetPatchImpacts($;$$) { my ($PatchFileName, $NoUnits, $PastImpacts) = @_; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 390b161..a052c5a 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -133,8 +133,8 @@ sub Submit($$$) my ($self, $PatchFileName, $IsSet) = @_; my $PastImpacts; - $PastImpacts = GetPatchImpact($PatchFileName) if ($IsSet); - my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts); + $PastImpacts = GetPatchImpacts($PatchFileName) if ($IsSet); + my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, undef, $PastImpacts); if (!$Impacts->{WineBuild} and !$Impacts->{ModuleBuild} and !$Impacts->{TestBuild}) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 621b017..fe10104 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -597,7 +597,7 @@ sub DetermineFileType($$) my ($ErrMessage, $ExeBase, $TestUnit); if ($FileType eq "unknown") { - my $Impacts = GetPatchImpact($FileName); + my $Impacts = GetPatchImpacts($FileName); if ($Impacts->{UnitCount} == 0) { $ErrMessage = "Patch doesn't affect tests"; @@ -781,7 +781,7 @@ sub OnSubmit($) if ($FileType eq "patch") { my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); - $Impacts = GetPatchImpact($TmpStagingFullPath); + $Impacts = GetPatchImpacts($TmpStagingFullPath); } my $BuildStep;

1 0

Michael Stefaniuc : uxtheme: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: 93994dfc0b99789e3a9c1490b4d93082f34b8dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=93994dfc0b99789e3a9c1490… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Sep 18 20:38:19 2018 +0200 uxtheme: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 5 ++--- dlls/uxtheme/metric.c | 2 +- dlls/uxtheme/msstyles.c | 22 +++++++++++----------- dlls/uxtheme/property.c | 4 ++-- dlls/uxtheme/stylemap.c | 2 +- dlls/uxtheme/system.c | 46 +++++++++++++++++++++------------------------- 6 files changed, 38 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93994dfc0b99789e3a9c…

1 0

André Hentschel : user32/tests: Allow newer Win10 behaviour.
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: bfad5527acacbdbac623da57413a60c532218423 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfad5527acacbdbac623da57… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 18 20:19:10 2018 +0200 user32/tests: Allow newer Win10 behaviour. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index f4c1a4b..8f1b2c6 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -585,7 +585,7 @@ static void test_display_config(void) paths = modes = 100; ret = pGetDisplayConfigBufferSizes(0, &paths, &modes); ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); - ok(modes == 0 && paths == 0, "got %u, %u\n", modes, paths); + ok((modes == 0 || modes == 100) && paths == 0, "got %u, %u\n", modes, paths); } START_TEST(monitor)

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
67
Older →

Jump to page:

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-commits September 2018