June 2018 - Wine-Devel - list.winehq.org

[PATCH] testbot/WineRunTask: Better detect standard Wine tests.
by Francois Gouget June 26, 2018

June 26, 2018

It's better to take the step dependencies into account and to verify that the previous step was dealing with a Wine patch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ff8aab9f4..9fa263eea 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -441,9 +441,10 @@ if ($Step->Type eq "single") } $Script .= "> $RptFileName\r\n"; - # If StepNo is 1 then the user gave us an executable. Then there is no - # telling if it's going to follow the Wine test standards. - $IsWineTest = ($StepNo != 1); + # If the user gave us an executable there is no telling + # if it is going going to follow the Wine test standards. + $IsWineTest = (defined $Step->PreviousNo and + $Job->Steps->GetItem($Step->PreviousNo)->FileType eq "patchdlls"); } elsif ($Step->Type eq "suite") { -- 2.18.0

1 0

[PATCH] testbot/WineRun*: Standardize a couple of TestBot error messages.
by Francois Gouget June 26, 2018

June 26, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunTask.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index ff04ded0c..176ade6b6 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -458,7 +458,7 @@ foreach my $TestInfo (values %{$Impacts->{Tests}}) } elsif ($TA->GetLastError() !~ /: No such file or directory/) { - FatalTAError($TA, "Could not retrieve '$Local'"); + FatalTAError($TA, "An error occurred while retrieving '$Local'"); } } } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 9fa263eea..9faae28c3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -482,7 +482,7 @@ elsif ($Step->Type eq "suite") Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "script.bat", $TestAgent::SENDFILE_EXE)) { - FatalTAError($TA, "Could not send the script to the VM"); + FatalTAError($TA, "Could not send the task script to the VM"); } -- 2.18.0

1 0

[PATCH] testbot: Rename the Makefiles patch impact to MakeMakefiles.
by Francois Gouget June 26, 2018

June 26, 2018

This makes it clearer that it does not mean a makefile was modified, but that the make_makefiles script should be rerun. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 2 +- testbot/bin/build/WineTest.pl | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 4df107005..a3cb170a0 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -103,7 +103,7 @@ sub ApplyPatch($) } my $Impacts = GetPatchImpact($PatchFile, "nounits"); - if ($Impacts->{Makefiles}) + if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; system("cd '$DataDir/wine' && set -x && ./tools/make_makefiles"); diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 01396f9bf..032ee4640 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -100,7 +100,7 @@ sub ApplyPatch($) } my $Impacts = GetPatchImpact($PatchFile, "nounits"); - if ($Impacts->{Makefiles}) + if ($Impacts->{MakeMakefiles}) { InfoMsg "\nRunning make_makefiles\n"; system("cd '$DataDir/wine' && set -x && ./tools/make_makefiles"); diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index c37a1d3ab..b2bfe6a9a 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -178,7 +178,7 @@ sub _HandleFile($$$) if ($Change eq "new" or $Change eq "rm") { # This adds / removes a directory - $Impacts->{Makefiles} = 1; + $Impacts->{MakeMakefiles} = 1; } return; } @@ -216,7 +216,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->{Makefiles} = 1; + $Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1; } } } @@ -289,7 +289,7 @@ sub GetPatchImpact($;$$) } elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) { - $Impacts->{WineBuild} = $Impacts->{Makefiles} = 1; + $Impacts->{WineBuild} = $Impacts->{MakeMakefiles} = 1; $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- /dev/null$=) -- 2.18.0

1 0

[PATCH] testbot/web: Adjust the GetFile MIME type based on Step->FileType.
by Francois Gouget June 26, 2018

June 26, 2018

This lets the browser offer to open the patches in a text editor instead of systematically suggesting to save them to disk. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Not an urgent or very important patch but I believe it will make some people pretty happy. testbot/web/GetFile.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index 7e274a8bf..1fe140788 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -84,9 +84,11 @@ sub GetFile($$$) # HTTP/1.0 $Request->headers_out->add("Pragma", "no-cache"); - - # Binary file - $Request->content_type("application/octet-stream"); + + # Text or binary file + my $MIME = $Step->FileType eq "patchdlls" ? "text/plain" : + "application/octet-stream"; + $Request->content_type($MIME); $Request->headers_out->add("Content-Disposition", 'attachment; filename="' . $Step->FileName . '"'); -- 2.18.0

1 0

[PATCH 1/7] testbot: Move log line categorization to LogUtils and simplify line highlighting.
by Francois Gouget June 26, 2018

June 26, 2018

GetLogLineCategory() identifies log lines of interest which makes it possible to decide how to display them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This makes it reusable in WineSendLog.pl. testbot/lib/WineTestBot/LogUtils.pm | 61 +++++++++++++++++++++- testbot/web/JobDetails.pl | 78 +++++++++++------------------ 2 files changed, 88 insertions(+), 51 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3e40fbc35..daa9c0bd8 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -27,7 +27,7 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; -our @EXPORT = qw(ParseTaskLog); +our @EXPORT = qw(GetLogLineCategory ParseTaskLog); # @@ -74,4 +74,63 @@ sub ParseTaskLog($$) return "nolog:Unable to open the task log for reading: $!"; } + +# +# Log querying and formatting +# + +=pod +=over 12 + +=item C<GetLogLineCategory()> + +Identifies the category of the given log line: an error message, a todo, just +an informational message or none of these. The category can then be used to +decide whether to hide the line or, on the contrary, highlight it. + +=back +=cut + +sub GetLogLineCategory($) +{ + my ($Line) = @_; + + if ($Line =~ /: Test marked todo: /) + { + return "todo"; + } + if ($Line =~ /: Tests skipped: / or + $Line =~ /^\w+:\w+ skipped /) + { + return "skip"; + } + if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or + $Line =~ /Fatal: test .* does not exist/ or + $Line =~ / done $258$/ or + $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or + $Line =~ /^Unhandled exception: / or + # Git errors + $Line =~ /^CONFLICT / or + $Line =~ /^error: patch failed:/ or + $Line =~ /^error: corrupt patch / or + # Build errors + $Line =~ /: error: / or + $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or + $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or + # Typical perl errors + $Line =~ /^Use of uninitialized value/) + { + return "error"; + } + if ($Line =~ /^\+ \S/ or + $Line =~ /^\w+:\w+ start / or + # Build messages + $Line =~ /^(?:Build|Reconfig|Task): ok/) + { + return "info"; + } + + return "none"; +} + 1; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index f05c0f62e..07924f4e6 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -28,6 +28,7 @@ use URI::Escape; use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::LogUtils; use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; @@ -228,59 +229,36 @@ sub GeneratePage($) $self->SUPER::GeneratePage(); } +=pod +=over 12 + +=item C<GetHtmlLine()> + +Determines if the log line should be shown, how, and escapes it so it is valid +HTML. + +When not showing the full log, returns undef except for error messages which +are the only lines tha should be shown. +When showing the full log error messages and other lines of interest are +highlighted to make the log more readable. + +=back +=cut + sub GetHtmlLine($$$) { my ($self, $FullLog, $Line) = @_; - $Line = $self->escapeHTML($Line); - if ($Line =~ /: Test marked todo: /) - { - return (undef, $Line) if (!$FullLog); - my $Html = $Line; - $Html =~ s~^(.*\S)\s*\r?$~$1~; - return ($Html, $Line); - } - if ($Line =~ /: Tests skipped: / or - $Line =~ /^\w+:\w+ skipped /) - { - return (undef, $Line) if (!$FullLog); - my $Html = $Line; - $Html =~ s~^(.*\S)\s*\r?$~$1~; - return ($Html, $Line); - } - if ($Line =~ /: Test (?:failed|succeeded inside todo block): / or - $Line =~ /Fatal: test .* does not exist/ or - $Line =~ / done $258$/ or - $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or - $Line =~ /^Unhandled exception: / or - # Git errors - $Line =~ /^CONFLICT / or - $Line =~ /^error: patch failed:/ or - $Line =~ /^error: corrupt patch / or - # Build errors - $Line =~ /: error: / or - $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or - $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or - # Typical perl errors - $Line =~ /^Use of uninitialized value/) - { - return ($Line, $Line) if (!$FullLog); - my $Html = $Line; - $Html =~ s~^(.*\S)\s*\r?$~$1~; - return ($Html, $Line); - } - if ($FullLog && - ($Line =~ /^\+ \S/ or - $Line =~ /^\w+:\w+ start / or - # Build messages - $Line =~ /^(?:Build|Reconfig|Task): ok/)) + my $Category = GetLogLineCategory($Line); + return undef if ($Category ne "error" and !$FullLog); + + my $Html = $self->escapeHTML($Line); + if ($FullLog and $Category ne "none") { - my $Html = $Line; - $Html =~ s~^(.*\S)\s*\r?$~$1~; - return ($Html, $Line); + # Highlight all line categories in the full log + $Html =~ s~^(.*\S)\s*\r?$~$1~; } - - return (undef, $Line); + return $Html; } my @MILogFiles = qw(exe32.report exe64.report log log.old); @@ -429,8 +407,8 @@ sub GenerateBody($) { $CurrentDll = $1; } - my ($Highlight, $Plain) = $self->GetHtmlLine($MoreInfo->{Full}, $Line); - next if (!$MoreInfo->{Full} and !defined $Highlight); + my $Html = $self->GetHtmlLine($MoreInfo->{Full}, $Line); + next if (!defined $Html); if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) { @@ -451,7 +429,7 @@ sub GenerateBody($) } else { - print(($Highlight || $Plain), "\n"); + print "$Html\n"; } } close($LogFile); -- 2.18.0

1 6

Re: [PATCH 2/2] msvcp120: Add test for Concurrent_vector_grow_to_at_least_with_result.
by Piotr Caban June 26, 2018

June 26, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

1 0

Re: [PATCH 1/2] msvcp120: Add test for Concurrent_vector_grow_by.
by Piotr Caban June 26, 2018

June 26, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

1 0

[PATCH 2/2] msvcp120: Add test for Concurrent_vector_grow_to_at_least_with_result.
by Hua Meng June 26, 2018

June 26, 2018

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp120/tests/msvcp120.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index b5e470cba3..2974482ec1 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -420,6 +420,8 @@ static void* (__thiscall *p_vector_base_v4__Internal_compact)( void (__cdecl*)(void*, const void*, size_t)); static size_t (__thiscall *p_vector_base_v4__Internal_grow_by)( vector_base_v4*, size_t, size_t, void (__cdecl*)(void*, const void*, size_t), const void *); +static size_t (__thiscall *p_vector_base_v4__Internal_grow_to_at_least_with_result)( + vector_base_v4*, size_t, size_t, void (__cdecl*)(void*, const void*, size_t), const void *); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -572,6 +574,8 @@ static BOOL init(void) "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KPEAXP6AX10(a)ZP6AX1PEBX0@Z(a)Z"); SET(p_vector_base_v4__Internal_grow_by, "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAA_K_K0P6AXPEAXPEBX0(a)Z2@Z"); + SET(p_vector_base_v4__Internal_grow_to_at_least_with_result, + "?_Internal_grow_to_at_least_with_result(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAA_K_K0P6AXPEAXPEBX0(a)Z2@Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -693,6 +697,8 @@ static BOOL init(void) "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEPAXIPAXP6AX0I(a)ZP6AX0PBXI@Z(a)Z"); SET(p_vector_base_v4__Internal_grow_by, "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIIIP6AXPAXPBXI(a)Z1@Z"); + SET(p_vector_base_v4__Internal_grow_to_at_least_with_result, + "?_Internal_grow_to_at_least_with_result(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIIIP6AXPAXPBXI(a)Z1@Z"); #else SET(p__Thrd_current, "_Thrd_current"); @@ -742,6 +748,8 @@ static BOOL init(void) "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAPAXIPAXP6AX0I(a)ZP6AX0PBXI@Z(a)Z"); SET(p_vector_base_v4__Internal_grow_by, "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAIIIP6AXPAXPBXI(a)Z1@Z"); + SET(p_vector_base_v4__Internal_grow_to_at_least_with_result, + "?_Internal_grow_to_at_least_with_result(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAIIIP6AXPAXPBXI(a)Z1@Z"); #endif } SET(p__Thrd_equal, @@ -3036,6 +3044,44 @@ static void test_vector_base_v4(void) CHECK_CALLED(concurrent_vector_int_destroy); concurrent_vector_int_dtor(&v2); + /* test for Internal_grow_to_at_least_with_result */ + concurrent_vector_int_ctor(&v2); + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + vector_elem_count += 2; + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 2, "v2.early_size got %ld expected 2\n", (long)v2.early_size); + i = 0; + SET_EXPECT(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_copy); + idx = (size_t)call_func5(p_vector_base_v4__Internal_grow_to_at_least_with_result, + &v2, 3, sizeof(int), concurrent_vector_int_copy, &i); + CHECK_CALLED(concurrent_vector_int_alloc); + CHECK_CALLED(concurrent_vector_int_copy); + ok(idx == 2, "_Internal_grow_to_at_least_with_result returned %ld expected 2\n", (long)idx); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 3, "v2.early_size got %ld expected 3\n", (long)v2.early_size); + i = 0; + SET_EXPECT(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_copy); + idx = (size_t)call_func5(p_vector_base_v4__Internal_grow_to_at_least_with_result, + &v2, 5, sizeof(int), concurrent_vector_int_copy, &i); + CHECK_CALLED(concurrent_vector_int_alloc); + CHECK_CALLED(concurrent_vector_int_copy); + ok(idx == 3, "_Internal_grow_to_at_least_with_result returned %ld expected 3\n", (long)idx); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 5, "v2.early_size got %ld expected 5\n", (long)v2.early_size); + SET_EXPECT(concurrent_vector_int_destroy); + size = (size_t)call_func2(p_vector_base_v4__Internal_clear, + &v2, concurrent_vector_int_destroy); + ok(size == 3, "_Internal_clear returned %ld expected 3\n", (long)size); + CHECK_CALLED(concurrent_vector_int_destroy); + concurrent_vector_int_dtor(&v2); + SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &vector, concurrent_vector_int_destroy); -- 2.11.0

1 0

[PATCH 1/2] msvcp120: Add test for Concurrent_vector_grow_by.
by Hua Meng June 26, 2018

June 26, 2018

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp120/tests/msvcp120.c | 46 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 0ec9fbd3b1..b5e470cba3 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -418,6 +418,8 @@ static void (__thiscall *p_vector_base_v4__Internal_swap)( static void* (__thiscall *p_vector_base_v4__Internal_compact)( vector_base_v4*, size_t, void*, void (__cdecl*)(void*, size_t), void (__cdecl*)(void*, const void*, size_t)); +static size_t (__thiscall *p_vector_base_v4__Internal_grow_by)( + vector_base_v4*, size_t, size_t, void (__cdecl*)(void*, const void*, size_t), const void *); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -568,6 +570,8 @@ static BOOL init(void) "?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEAV123@@Z"); SET(p_vector_base_v4__Internal_compact, "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KPEAXP6AX10(a)ZP6AX1PEBX0@Z(a)Z"); + SET(p_vector_base_v4__Internal_grow_by, + "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAA_K_K0P6AXPEAXPEBX0(a)Z2@Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -687,6 +691,8 @@ static BOOL init(void) "?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXAAV123@@Z"); SET(p_vector_base_v4__Internal_compact, "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEPAXIPAXP6AX0I(a)ZP6AX0PBXI@Z(a)Z"); + SET(p_vector_base_v4__Internal_grow_by, + "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIIIP6AXPAXPBXI(a)Z1@Z"); #else SET(p__Thrd_current, "_Thrd_current"); @@ -734,7 +740,8 @@ static BOOL init(void) "?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXAAV123@@Z"); SET(p_vector_base_v4__Internal_compact, "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAPAXIPAXP6AX0I(a)ZP6AX0PBXI@Z(a)Z"); - + SET(p_vector_base_v4__Internal_grow_by, + "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAIIIP6AXPAXPBXI(a)Z1@Z"); #endif } SET(p__Thrd_equal, @@ -2992,6 +2999,43 @@ static void test_vector_base_v4(void) CHECK_CALLED(concurrent_vector_int_destroy); concurrent_vector_int_dtor(&v2); + /* test for Internal_grow_by */ + concurrent_vector_int_ctor(&v2); + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + vector_elem_count += 2; + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 2, "v2.early_size got %ld expected 2\n", (long)v2.early_size); + i = 0; + SET_EXPECT(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_copy); + idx = (size_t)call_func5(p_vector_base_v4__Internal_grow_by, + &v2, 1, sizeof(int), concurrent_vector_int_copy, &i); + CHECK_CALLED(concurrent_vector_int_alloc); + CHECK_CALLED(concurrent_vector_int_copy); + ok(idx == 2, "_Internal_grow_by returned %ld expected 2\n", (long)idx); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 3, "v2.early_size got %ld expected 3\n", (long)v2.early_size); + SET_EXPECT(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_copy); + idx = (size_t)call_func5(p_vector_base_v4__Internal_grow_by, + &v2, 2, sizeof(int), concurrent_vector_int_copy, &i); + CHECK_CALLED(concurrent_vector_int_alloc); + CHECK_CALLED(concurrent_vector_int_copy); + ok(idx == 3, "_Internal_grow_by returned %ld expected 3\n", (long)idx); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 5, "v2.early_size got %ld expected 5\n", (long)v2.early_size); + SET_EXPECT(concurrent_vector_int_destroy); + size = (size_t)call_func2(p_vector_base_v4__Internal_clear, + &v2, concurrent_vector_int_destroy); + ok(size == 3, "_Internal_clear returned %ld expected 3\n", (long)size); + CHECK_CALLED(concurrent_vector_int_destroy); + concurrent_vector_int_dtor(&v2); + SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &vector, concurrent_vector_int_destroy); -- 2.11.0

1 0

[PATCH] gdi32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 26, 2018

June 26, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 10 ++++----- dlls/gdi32/tests/brush.c | 2 +- dlls/gdi32/tests/dc.c | 6 +++--- dlls/gdi32/tests/dib.c | 38 ++++++++++++++++----------------- dlls/gdi32/tests/font.c | 52 ++++++++++++++++++++++----------------------- dlls/gdi32/tests/gdiobj.c | 2 +- dlls/gdi32/tests/icm.c | 2 +- dlls/gdi32/tests/metafile.c | 7 +++--- dlls/gdi32/tests/path.c | 14 ++++++------ dlls/gdi32/tests/pen.c | 2 +- 10 files changed, 67 insertions(+), 68 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a4002c83b5..4748691791 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -84,7 +84,7 @@ static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHE SetLastError(0xdeadbeef); test_size[0] = bm.bmWidthBytes * bm.bmHeight; /* NULL output buffer with different count values */ - for (i = 0; i < sizeof(test_size) / sizeof(test_size[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_size); i++) { ret = GetBitmapBits(hbm, test_size[i], NULL); ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); @@ -94,7 +94,7 @@ static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHE memset(buf_cmp, 0, bm.bmWidthBytes * bm.bmHeight); /* Correct output buffer with different count values */ - for (i = 0; i < sizeof(test_size) / sizeof(test_size[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_size); i++) { int expect = i == 1 ? 0 : bm.bmWidthBytes * bm.bmHeight; memset(buf, 0xAA, sizeof(buf)); @@ -1745,7 +1745,7 @@ static void test_mono_bitmap(void) SelectObject( hdc, hbmp ); - for (col = 0; col < sizeof(colors) / sizeof(colors[0]); col++) + for (col = 0; col < ARRAY_SIZE(colors); col++) { SetTextColor( hdc, colors[col][0] ); SetBkColor( hdc, colors[col][1] ); @@ -2690,7 +2690,7 @@ static void test_select_object(void) DeleteObject(hbm); - for(i = 0; i < sizeof(depths)/sizeof(depths[0]); i++) { + for(i = 0; i < ARRAY_SIZE(depths); i++) { /* test a color bitmap to dc bpp matching */ planes = GetDeviceCaps(hdc, PLANES); bpp = GetDeviceCaps(hdc, BITSPIXEL); @@ -5710,7 +5710,7 @@ static void test_D3DKMTCreateDCFromMemory( void ) status = pD3DKMTCreateDCFromMemory( NULL ); ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { memset( data, 0xaa, sizeof(data) ); diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index 1a10429c05..a3ebb91e1e 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -48,7 +48,7 @@ static void test_solidbrush(void) size_t i; INT ret; - for(i=0; i<sizeof(stock)/sizeof(stock[0]); i++) { + for(i = 0; i < ARRAY_SIZE(stock); i++) { solidBrush = CreateSolidBrush(stock[i].color); if(stock[i].stockobj != -1) { diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 3c1fa603a6..5ad3b31483 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -361,7 +361,7 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale if (GetObjectType( hdc ) == OBJ_METADC) { - for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) + for (i = 0; i < ARRAY_SIZE(caps); i++) ok( GetDeviceCaps( hdc, caps[i] ) == (caps[i] == TECHNOLOGY ? DT_METAFILE : 0), "wrong caps on %s for %u: %u\n", descr, caps[i], GetDeviceCaps( hdc, caps[i] ) ); @@ -384,7 +384,7 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale } else { - for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) + for (i = 0; i < ARRAY_SIZE(caps); i++) { INT precision = 0; INT hdc_caps = GetDeviceCaps( hdc, caps[i] ); @@ -506,7 +506,7 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale dib = CreateDIBSection( ref_dc, info, DIB_RGB_COLORS, NULL, NULL, 0 ); old = SelectObject( hdc, dib ); - for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++) + for (i = 0; i < ARRAY_SIZE(caps); i++) ok( GetDeviceCaps( hdc, caps[i] ) == GetDeviceCaps( ref_dc, caps[i] ), "mismatched caps on %s and DIB for %u: %u/%u\n", descr, caps[i], GetDeviceCaps( hdc, caps[i] ), GetDeviceCaps( ref_dc, caps[i] ) ); diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index e3f188749d..d16cb0df5c 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1559,7 +1559,7 @@ static const POINT polypoly_lines[] = static const DWORD polypoly_counts[] = { - sizeof(polypoly_lines)/sizeof(polypoly_lines[0]) + ARRAY_SIZE(polypoly_lines) }; static const RECT patblt_clips[] = @@ -1816,7 +1816,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) } compare_hash(hdc, bmi, bits, "diagonal solid lines"); - for(i = 0; i < sizeof(bias_check) / sizeof(bias_check[0]); i++) + for(i = 0; i < ARRAY_SIZE(bias_check); i++) { MoveToEx(hdc, bias_check[i].left, bias_check[i].top, NULL); LineTo(hdc, bias_check[i].right, bias_check[i].bottom); @@ -1851,21 +1851,21 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) ExtSelectClipRgn(hdc, hrgn, RGN_COPY); DeleteObject(hrgn2); - for(i = 0; i < sizeof(hline_clips)/sizeof(hline_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(hline_clips); i++) { MoveToEx(hdc, hline_clips[i].left, hline_clips[i].top, NULL); LineTo(hdc, hline_clips[i].right, hline_clips[i].bottom); } compare_hash(hdc, bmi, bits, "clipped solid hlines"); - for(i = 0; i < sizeof(vline_clips)/sizeof(vline_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(vline_clips); i++) { MoveToEx(hdc, vline_clips[i].left, vline_clips[i].top, NULL); LineTo(hdc, vline_clips[i].right, vline_clips[i].bottom); } compare_hash(hdc, bmi, bits, "clipped solid vlines"); - for(i = 0; i < sizeof(line_clips)/sizeof(line_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(line_clips); i++) { MoveToEx(hdc, line_clips[i].left, line_clips[i].top, NULL); LineTo(hdc, line_clips[i].right, line_clips[i].bottom); @@ -1873,7 +1873,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) compare_hash(hdc, bmi, bits, "clipped solid diagonal lines"); /* clipped PatBlt */ - for(i = 0; i < sizeof(patblt_clips) / sizeof(patblt_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(patblt_clips); i++) { PatBlt(hdc, patblt_clips[i].left, patblt_clips[i].top, patblt_clips[i].right - patblt_clips[i].left, @@ -1887,35 +1887,35 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) SetBkMode(hdc, TRANSPARENT); SetBkColor(hdc, RGB(0, 0xff, 0)); - for(i = 0; i < sizeof(hline_clips)/sizeof(hline_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(hline_clips); i++) { MoveToEx(hdc, hline_clips[i].left, hline_clips[i].top, NULL); LineTo(hdc, hline_clips[i].right, hline_clips[i].bottom); } compare_hash(hdc, bmi, bits, "clipped dashed hlines"); - for(i = 0; i < sizeof(hline_clips)/sizeof(hline_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(hline_clips); i++) { MoveToEx(hdc, hline_clips[i].right - 1, hline_clips[i].bottom, NULL); LineTo(hdc, hline_clips[i].left - 1, hline_clips[i].top); } compare_hash(hdc, bmi, bits, "clipped dashed hlines r -> l"); - for(i = 0; i < sizeof(vline_clips)/sizeof(vline_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(vline_clips); i++) { MoveToEx(hdc, vline_clips[i].left, vline_clips[i].top, NULL); LineTo(hdc, vline_clips[i].right, vline_clips[i].bottom); } compare_hash(hdc, bmi, bits, "clipped dashed vlines"); - for(i = 0; i < sizeof(vline_clips)/sizeof(vline_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(vline_clips); i++) { MoveToEx(hdc, vline_clips[i].right, vline_clips[i].bottom - 1, NULL); LineTo(hdc, vline_clips[i].left, vline_clips[i].top - 1); } compare_hash(hdc, bmi, bits, "clipped dashed vlines b -> t"); - for(i = 0; i < sizeof(line_clips)/sizeof(line_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(line_clips); i++) { MoveToEx(hdc, line_clips[i].left, line_clips[i].top, NULL); LineTo(hdc, line_clips[i].right, line_clips[i].bottom); @@ -1924,7 +1924,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) SetBkMode(hdc, OPAQUE); - for(i = 0; i < sizeof(line_clips)/sizeof(line_clips[0]); i++) + for(i = 0; i < ARRAY_SIZE(line_clips); i++) { MoveToEx(hdc, line_clips[i].left, line_clips[i].top, NULL); LineTo(hdc, line_clips[i].right, line_clips[i].bottom); @@ -2163,13 +2163,13 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) SelectObject(hdc, solid_pen); SelectObject(hdc, solid_brush); - for(i = 0; i < sizeof(rectangles)/sizeof(rectangles[0]); i++) + for(i = 0; i < ARRAY_SIZE(rectangles); i++) { Rectangle(hdc, rectangles[i].left, rectangles[i].top, rectangles[i].right, rectangles[i].bottom); } SelectObject(hdc, dashed_pen); - for(i = 0; i < sizeof(rectangles)/sizeof(rectangles[0]); i++) + for(i = 0; i < ARRAY_SIZE(rectangles); i++) { Rectangle(hdc, rectangles[i].left, rectangles[i].top + 150, rectangles[i].right, rectangles[i].bottom + 150); } @@ -2775,7 +2775,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) wide_pen = CreatePen( PS_SOLID, 7, RGB( 0xff, 0, 0 ) ); SelectObject( hdc, wide_pen ); - for (i = 0; i < sizeof( wide_lines ) / sizeof( wide_lines[0] ); i++) + for (i = 0; i < ARRAY_SIZE(wide_lines); i++) { MoveToEx( hdc, wide_lines[i].left, wide_lines[i].top, NULL ); LineTo( hdc, wide_lines[i].right, wide_lines[i].bottom ); @@ -2794,7 +2794,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) 9, &log_brush, 0, NULL ); SelectObject( hdc, wide_pen ); SetBrushOrgEx( hdc, 3, 3, NULL ); - Polyline( hdc, poly_lines, sizeof(poly_lines) / sizeof(poly_lines[0]) ); + Polyline( hdc, poly_lines, ARRAY_SIZE( poly_lines )); compare_hash_broken_todo( hdc, bmi, bits, "wide pen - flat caps, mitred", is_ddb, is_ddb ); SetBrushOrgEx( hdc, 0, 0, NULL ); @@ -2805,7 +2805,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) 16, &log_brush, 0, NULL ); SelectObject( hdc, wide_pen ); - Polyline( hdc, poly_lines, sizeof(poly_lines) / sizeof(poly_lines[0]) ); + Polyline( hdc, poly_lines, ARRAY_SIZE( poly_lines )); compare_hash_broken_todo( hdc, bmi, bits, "wide pen - square caps, bevelled", is_ddb, is_ddb ); SelectObject( hdc, orig_pen ); @@ -2815,7 +2815,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) 9, &log_brush, 0, NULL ); SelectObject( hdc, wide_pen ); - PolyPolyline( hdc, polypoly_lines, polypoly_counts, sizeof(polypoly_counts)/sizeof(polypoly_counts[0]) ); + PolyPolyline( hdc, polypoly_lines, polypoly_counts, ARRAY_SIZE( polypoly_counts )); compare_hash_broken_todo( hdc, bmi, bits, "wide pen - empty segments", is_ddb, is_ddb ); SelectObject( hdc, orig_pen ); @@ -2833,7 +2833,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) 12, &log_brush, 0, NULL ); ok( wide_pen != 0, "failed to create pen\n" ); SelectObject( hdc, wide_pen ); - Polyline( hdc, poly_lines, sizeof(poly_lines) / sizeof(poly_lines[0]) ); + Polyline( hdc, poly_lines, ARRAY_SIZE( poly_lines )); for (i = 1; i < 20; i++) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6243a6d339..8f5454b918 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -937,7 +937,7 @@ static void test_bitmap_font_metrics(void) screen_log_pixels = GetDeviceCaps(hdc, LOGPIXELSY); diff = 32768; font_res = 0; - for (i = 0; i < sizeof(font_log_pixels)/sizeof(font_log_pixels[0]); i++) + for (i = 0; i < ARRAY_SIZE(font_log_pixels); i++) { int new_diff = abs(font_log_pixels[i] - screen_log_pixels); if (new_diff < diff) @@ -948,7 +948,7 @@ static void test_bitmap_font_metrics(void) } trace("best font resolution is %d\n", font_res); - for (i = 0; i < sizeof(fd)/sizeof(fd[0]); i++) + for (i = 0; i < ARRAY_SIZE(fd); i++) { int bit, height; @@ -1190,7 +1190,7 @@ static void test_GetCharABCWidths(void) UINT cs; UINT a; UINT w; - BOOL r[sizeof range / sizeof range[0]]; + BOOL r[ARRAY_SIZE(range)]; } c[] = { {ANSI_CHARSET, 0x30, 0x30, @@ -1253,7 +1253,7 @@ static void test_GetCharABCWidths(void) hfont = SelectObject(hdc, hfont); DeleteObject(hfont); - for (i = 0; i < sizeof c / sizeof c[0]; ++i) + for (i = 0; i < ARRAY_SIZE(c); ++i) { ABC a[2], w[2]; ABC full[256]; @@ -1285,7 +1285,7 @@ static void test_GetCharABCWidths(void) ok(memcmp(&a[0], &full[code], sizeof(ABC)) == 0, "GetCharABCWidthsA info should match. codepage = %u\n", c[i].cs); - for (j = 0; j < sizeof range / sizeof range[0]; ++j) + for (j = 0; j < ARRAY_SIZE(range); ++j) { memset(full, 0xdd, sizeof full); ret = pGetCharABCWidthsA(hdc, range[j].first, range[j].last, full); @@ -1774,7 +1774,7 @@ static void test_GetKerningPairs(void) return; } - for (i = 0; i < sizeof(kd)/sizeof(kd[0]); i++) + for (i = 0; i < ARRAY_SIZE(kd); i++) { OUTLINETEXTMETRICW otm; UINT uiRet; @@ -2095,7 +2095,7 @@ static void test_height_selection_vdmx( HDC hdc ) return; } - for (i = 0; i < sizeof(data) / sizeof(data[0]); i++) + for (i = 0; i < ARRAY_SIZE(data); i++) { res = get_res_data( "wine_vdmx.ttf", &size ); @@ -2356,7 +2356,7 @@ static void testJustification(HDC hdc, PCSTR str, RECT *clientArea) { SetTextJustification(hdc, areaWidth - size.cx, breakCount); GetTextExtentPoint32A(hdc, pFirstChar, pLastChar - pFirstChar, &size); - if (size.cx != areaWidth && nErrors < sizeof(error)/sizeof(error[0]) - 1) + if (size.cx != areaWidth && nErrors < ARRAY_SIZE(error) - 1) { error[nErrors].start = pFirstChar; error[nErrors].len = pLastChar - pFirstChar; @@ -2613,7 +2613,7 @@ static void test_font_charset(void) return; } - for (i = 0; i < sizeof(cd)/sizeof(cd[0]); i++) + for (i = 0; i < ARRAY_SIZE(cd); i++) { if (cd[i].charset == SYMBOL_CHARSET) { @@ -2687,7 +2687,7 @@ static void test_GdiGetCodePage(void) acp = GetACP(); - for (i = 0; i < sizeof(matching_data) / sizeof(struct _matching_data); i++) + for (i = 0; i < ARRAY_SIZE(matching_data); i++) { /* only test data matched current locale codepage */ if (matching_data[i].current_codepage != acp) @@ -3700,7 +3700,7 @@ static int match_name_table_language( const sfnt_name *name, LANGID lang ) break; case TT_PLATFORM_MACINTOSH: if (!IsValidCodePage( get_mac_code_page( name ))) return 0; - if (GET_BE_WORD(name->language_id) >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + if (GET_BE_WORD(name->language_id) >= ARRAY_SIZE(mac_langid_table)) return 0; name_lang = mac_langid_table[GET_BE_WORD(name->language_id)]; break; case TT_PLATFORM_APPLE_UNICODE: @@ -3710,7 +3710,7 @@ static int match_name_table_language( const sfnt_name *name, LANGID lang ) case TT_APPLE_ID_DEFAULT: case TT_APPLE_ID_ISO_10646: case TT_APPLE_ID_UNICODE_2_0: - if (GET_BE_WORD(name->language_id) >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + if (GET_BE_WORD(name->language_id) >= ARRAY_SIZE(mac_langid_table)) return 0; name_lang = mac_langid_table[GET_BE_WORD(name->language_id)]; break; default: @@ -4105,7 +4105,7 @@ static void test_nonexistent_font(void) hdc = CreateCompatibleDC(0); - for (i = 0; i < sizeof(shell_subst)/sizeof(shell_subst[0]); i++) + for (i = 0; i < ARRAY_SIZE(shell_subst); i++) { ret = is_font_installed(shell_subst[i].name); ok(ret || broken(!ret) /* win2000 */, "%s should be enumerated\n", shell_subst[i].name); @@ -4201,7 +4201,7 @@ todo_wine /* Wine uses Arial for all substitutions */ ok(cs == ANSI_CHARSET, "expected ANSI_CHARSET, got %d\n", cs); DeleteObject(SelectObject(hdc, hfont)); - for (i = 0; i < sizeof(font_subst)/sizeof(font_subst[0]); i++) + for (i = 0; i < ARRAY_SIZE(font_subst); i++) { ret = is_font_installed(font_subst[i].name); todo_wine @@ -4487,8 +4487,8 @@ static void test_GetTextFace(void) dc = GetDC(NULL); g = SelectObject(dc, f); - n = GetTextFaceW(dc, sizeof bufW / sizeof bufW[0], bufW); - ok(n == sizeof faceW / sizeof faceW[0], "GetTextFaceW returned %d\n", n); + n = GetTextFaceW(dc, ARRAY_SIZE(bufW), bufW); + ok(n == ARRAY_SIZE(faceW), "GetTextFaceW returned %d\n", n); ok(lstrcmpW(faceW, bufW) == 0, "GetTextFaceW\n"); /* Play with the count arg. */ @@ -4508,7 +4508,7 @@ static void test_GetTextFace(void) ok(bufW[0] == faceW[0] && bufW[1] == '\0', "GetTextFaceW didn't copy\n"); n = GetTextFaceW(dc, 0, NULL); - ok(n == sizeof faceW / sizeof faceW[0], "GetTextFaceW returned %d\n", n); + ok(n == ARRAY_SIZE(faceW), "GetTextFaceW returned %d\n", n); DeleteObject(SelectObject(dc, g)); ReleaseDC(NULL, dc); @@ -4719,7 +4719,7 @@ static void test_GetGlyphOutline(void) if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) ok(ret == GDI_ERROR, "GetGlyphOutlineW should return an error when the buffer size is too small.\n"); - for (i = 0; i < sizeof(fmt) / sizeof(fmt[0]); ++i) + for (i = 0; i < ARRAY_SIZE(fmt); ++i) { DWORD dummy; @@ -4785,7 +4785,7 @@ static void test_GetGlyphOutline(void) SelectObject(hdc, old_hfont); DeleteObject(hfont); - for (i = 0; i < sizeof c / sizeof c[0]; ++i) + for (i = 0; i < ARRAY_SIZE(c); ++i) { static const MAT2 rotate_mat = {{0, 0}, {0, -1}, {0, 1}, {0, 0}}; TEXTMETRICA tm; @@ -4955,7 +4955,7 @@ static void test_CreateFontIndirect(void) lf.lfItalic = FALSE; lf.lfWeight = FW_DONTCARE; - for (i = 0; i < sizeof(TestName)/sizeof(TestName[0]); i++) + for (i = 0; i < ARRAY_SIZE(TestName); i++) { lstrcpyA(lf.lfFaceName, TestName[i]); hfont = CreateFontIndirectA(&lf); @@ -5409,7 +5409,7 @@ static void test_fullname(void) lf.lfItalic = FALSE; lf.lfWeight = FW_DONTCARE; - for (i = 0; i < sizeof(TestName) / sizeof(TestName[0]); i++) + for (i = 0; i < ARRAY_SIZE(TestName); i++) { if (!is_font_installed_fullname("Lucida Sans", TestName[i])) { @@ -6058,7 +6058,7 @@ static void test_vertical_font(void) ok(hgi != vgi, "same glyph h:%u v:%u\n", hgi, vgi); - for (i = 0; i < sizeof(face_list)/sizeof(face_list[0]); i++) { + for (i = 0; i < ARRAY_SIZE(face_list); i++) { const char* face = face_list[i]; if (!is_truetype_font_installed(face)) { skip("%s is not installed\n", face); @@ -6092,7 +6092,7 @@ static void test_east_asian_font_selection(void) hdc = GetDC(NULL); - for (i = 0; i < sizeof(charset)/sizeof(charset[0]); i++) + for (i = 0; i < ARRAY_SIZE(charset); i++) { LOGFONTA lf; HFONT hfont; @@ -6214,7 +6214,7 @@ static void test_stock_fonts(void) }; int i, j; - for (i = 0; i < sizeof(font)/sizeof(font[0]); i++) + for (i = 0; i < ARRAY_SIZE(font); i++) { HFONT hfont; LOGFONTA lf; @@ -6314,7 +6314,7 @@ static void test_max_height(void) DeleteObject(SelectObject(hdc, hfont_old)); /* test an invalid value */ - for (i = 0; i < sizeof(invalid_height)/sizeof(invalid_height[0]); i++) { + for (i = 0; i < ARRAY_SIZE(invalid_height); i++) { lf.lfHeight = invalid_height[i]; hfont = CreateFontIndirectA(&lf); hfont_old = SelectObject(hdc, hfont); @@ -6638,7 +6638,7 @@ static void test_bitmap_font_glyph_index(void) bmi.bmiHeader.biHeight = 32; bmi.bmiHeader.biCompression = BI_RGB; - for (i = 0; i < sizeof(bitmap_font_list)/sizeof(bitmap_font_list[0]); i++) { + for (i = 0; i < ARRAY_SIZE(bitmap_font_list); i++) { memset(&lf, 0, sizeof(lf)); lf.lfCharSet = bitmap_font_list[i].charset; strcpy(lf.lfFaceName, bitmap_font_list[i].face); diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 65374ea85d..8f3d01c27d 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -345,7 +345,7 @@ static void test_handles_on_win64(void) if (sizeof(void*) != 8) return; - for (i = 0; i < sizeof(cases)/sizeof(cases[0]); i++) + for (i = 0; i < ARRAY_SIZE(cases); i++) { hrgn = CreateRectRgn(10, 10, 20, 20); hrgn_test = (HRGN)(ULONG_PTR)((ULONG_PTR)hrgn | ((ULONGLONG)cases[i].high << 32) | cases[i].low); diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 620809018a..340ebeef55 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -278,7 +278,7 @@ static void test_SetICMProfileW( HDC dc ) return; } - len = sizeof(profile)/sizeof(profile[0]); + len = ARRAY_SIZE(profile); ret = GetICMProfileW( dc, &len, profile ); ok(ret, "GetICMProfileW failed %u\n", GetLastError()); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 780b65f1b6..230d1e6d84 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -183,7 +183,7 @@ static void test_ExtTextOut(void) static const RECT rc = { 0, 0, 100, 100 }; BOOL ret; - assert(sizeof(dx)/sizeof(dx[0]) >= lstrlenA(text)); + assert(ARRAY_SIZE(dx) >= lstrlenA(text)); /* Win9x doesn't play EMFs on invisible windows */ hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, @@ -3895,8 +3895,7 @@ static void test_emf_GradientFill(void) * written to the EMF, but is not considered in the bounds * calculation. */ - ret = GdiGradientFill( mf, v, sizeof(v) / sizeof(v[0]), tri, sizeof(tri) / sizeof(tri[0]), - GRADIENT_FILL_TRIANGLE ); + ret = GdiGradientFill( mf, v, ARRAY_SIZE(v), tri, ARRAY_SIZE(tri), GRADIENT_FILL_TRIANGLE ); ok( ret, "GradientFill\n" ); hemf = CloseEnhMetaFile( mf ); @@ -4117,7 +4116,7 @@ static void test_emf_WorldTransform(void) { "manual modify", TRUE, FALSE } }; - for(i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for(i = 0; i < ARRAY_SIZE(test_data); ++i) { hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 48ef4f016a..80145fc6b2 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -495,7 +495,7 @@ static void test_arcto(void) CloseFigure(hdc); EndPath(hdc); - ok_path(hdc, "arcto_path", arcto_path, sizeof(arcto_path)/sizeof(path_test_t)); + ok_path(hdc, "arcto_path", arcto_path, ARRAY_SIZE(arcto_path)); done: ReleaseDC(0, hdc); } @@ -540,7 +540,7 @@ static void test_anglearc(void) CloseFigure(hdc); EndPath(hdc); - ok_path(hdc, "anglearc_path", anglearc_path, sizeof(anglearc_path)/sizeof(path_test_t)); + ok_path(hdc, "anglearc_path", anglearc_path, ARRAY_SIZE(anglearc_path)); done: ReleaseDC(0, hdc); } @@ -681,7 +681,7 @@ static void test_polydraw(void) ok( pos.x == 80 && pos.y == 80, "wrong pos %d,%d\n", pos.x, pos.y ); EndPath(hdc); - ok_path(hdc, "polydraw_path", polydraw_path, sizeof(polydraw_path)/sizeof(path_test_t)); + ok_path(hdc, "polydraw_path", polydraw_path, ARRAY_SIZE(polydraw_path)); GetCurrentPositionEx( hdc, &pos ); ok( pos.x == 80 && pos.y == 80, "wrong pos %d,%d\n", pos.x, pos.y ); done: @@ -966,7 +966,7 @@ static void test_rectangle(void) SetArcDirection( hdc, AD_COUNTERCLOCKWISE ); EndPath( hdc ); SetMapMode( hdc, MM_TEXT ); - ok_path( hdc, "rectangle_path", rectangle_path, sizeof(rectangle_path)/sizeof(path_test_t) ); + ok_path( hdc, "rectangle_path", rectangle_path, ARRAY_SIZE(rectangle_path) ); ReleaseDC( 0, hdc ); } @@ -1327,7 +1327,7 @@ static void test_roundrect(void) SetArcDirection( hdc, AD_COUNTERCLOCKWISE ); EndPath( hdc ); SetMapMode( hdc, MM_TEXT ); - ok_path( hdc, "roundrect_path", roundrect_path, sizeof(roundrect_path)/sizeof(path_test_t) ); + ok_path( hdc, "roundrect_path", roundrect_path, ARRAY_SIZE(roundrect_path) ); ReleaseDC( 0, hdc ); } @@ -1707,7 +1707,7 @@ static void test_ellipse(void) SetArcDirection( hdc, AD_COUNTERCLOCKWISE ); EndPath( hdc ); SetMapMode( hdc, MM_TEXT ); - ok_path( hdc, "ellipse_path", ellipse_path, sizeof(ellipse_path)/sizeof(path_test_t) ); + ok_path( hdc, "ellipse_path", ellipse_path, ARRAY_SIZE(ellipse_path) ); } static const path_test_t all_funcs_path[] = @@ -1890,7 +1890,7 @@ static void test_all_functions(void) LineTo( hdc, 150, 150 ); /* FIXME: ExtTextOut */ EndPath( hdc ); - ok_path( hdc, "all_funcs_path", all_funcs_path, sizeof(all_funcs_path)/sizeof(path_test_t) ); + ok_path( hdc, "all_funcs_path", all_funcs_path, ARRAY_SIZE(all_funcs_path) ); ReleaseDC( 0, hdc ); } diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 43f00d8f50..badc585f57 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -72,7 +72,7 @@ static void test_logpen(void) EXTLOGPEN *ext_pen = (EXTLOGPEN *)elp_buffer; DWORD *ext_style = ext_pen->elpStyleEntry; - for (i = 0; i < sizeof(pen)/sizeof(pen[0]); i++) + for (i = 0; i < ARRAY_SIZE(pen); i++) { trace("%d: testing style %u\n", i, pen[i].style); -- 2.14.4

2 1