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

[PATCH 1/8] comctl32/taskdialog: Zero out taskdialog_info at initialization.
by Zhiyi Zhang June 12, 2018

June 12, 2018

Zero init taskdialog_info to avoid garbage values. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 346a079ab6..56133ffb89 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -560,6 +560,8 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) { const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + memset(dialog_info, 0, sizeof(*dialog_info)); + dialog_info->taskconfig = taskconfig; dialog_info->hwnd = hwnd; if (taskconfig->dwFlags & TDF_CALLBACK_TIMER) -- 2.17.1

2 1

[PATCH 1/2] testbot/build: Always rebuild all the impacted test executables.
by Francois Gouget June 12, 2018

June 12, 2018

This means Build.pl no longer needs the PatchType and BaseName parameters. But still keep support for them for compatibility with WineRunBuild.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Later on this will make it possible to reduce the number of build tasks (and associated reverts), and to have only one job per patch. testbot/bin/build/Build.pl | 104 +++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 56 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 77bc9ca9d..a7ecb1f1c 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -6,6 +6,7 @@ # resulting 32 and 64 bit binaries. # # Copyright 2009 Ge van Geldorp +# Copyright 2012-2014, 2017-2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -83,7 +84,7 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "Patch failed to apply\n"; - return 0; + return undef; } my $Impacts = GetPatchImpact($PatchFile, "nounits"); @@ -96,7 +97,7 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "make_makefiles failed\n"; - return 0; + return undef; } } @@ -109,11 +110,11 @@ sub ApplyPatch($) if ($? != 0) { LogMsg "Autoconf failed\n"; - return 0; + return undef; } } - return 1; + return $Impacts; } my $ncpus; @@ -136,57 +137,71 @@ sub BuildNative() system("( cd $DataDir/build-native && set -x && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Build.log 2>&1"); - if ($? != 0) { - LogMsg "Build native failed\n"; + LogMsg "Rebuild of native tools failed\n"; return !1; } return 1; } -sub BuildTestExecutable($$$) +sub BuildTestExecutables($$) { - my ($BaseName, $PatchType, $Bits) = @_; + my ($Impacts, $Bits) = @_; - my $TestsDir = "$PatchType/$BaseName/tests"; - my $TestExecutable = "$TestsDir/$BaseName"; - if ($PatchType eq "programs") + my (@BuildDirs, @TestExes); + foreach my $TestInfo (values %{$Impacts->{Tests}}) { - $TestExecutable .= ".exe"; + push @BuildDirs, $TestInfo->{Path}; + my $TestExe = "$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; + push @TestExes, $TestExe; + unlink("$DataDir/build-mingw$Bits/$TestExe"); # Ignore errors } - $TestExecutable .= "_test.exe"; - unlink("$DataDir/build-mingw${Bits}/$TestExecutable"); - InfoMsg "\nBuilding the $Bits-bit test executable\n"; + InfoMsg "\nBuilding the $Bits-bit test executable(s)\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " time make -j$ncpus $TestsDir " . + " time make -j$ncpus ". join(" ", sort @BuildDirs) . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { LogMsg "Rebuild of $Bits-bit crossbuild failed\n"; return !1; } - if (! -f "$DataDir/build-mingw${Bits}/$TestExecutable") + + my $Success = 1; + foreach my $TestExe (@TestExes) { - LogMsg "Make didn't produce a $TestExecutable file\n"; - return !1; + if (!-f "$DataDir/build-mingw$Bits/$TestExe") + { + LogMsg "Make didn't produce a $TestExe file\n"; + $Success = undef; + } } - return 1; + return $Success; } $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; -# Start with clean logfile +# Start with a clean logfile unlink("$LogDir/Build.log"); -my ($PatchFile, $PatchType, $BaseName, $BitIndicators) = @ARGV; -if (! $PatchFile || ! $PatchType || ! $BaseName || !$BitIndicators) +my ($PatchFile, $BitIndicators); +if (@ARGV == 2) { - FatalError "Usage: Build.pl <patchfile> <patchtype> <basename> <bits>\n"; + ($PatchFile, $BitIndicators) = @ARGV; +} +else +{ + # FIXME Remove support for the legacy parameters + my ($_PatchType, $_BaseName); + ($PatchFile, $_PatchType, $_BaseName, $BitIndicators) = @ARGV; +} +if (! $PatchFile || !$BitIndicators) +{ + FatalError "Usage: Build.pl <patchfile> <bits>\n"; } # Untaint parameters @@ -203,36 +218,16 @@ else FatalError "Invalid patch file $PatchFile\n"; } -if ($PatchType =~ m/^patch(dlls|programs)$/) -{ - $PatchType = $1; -} -else -{ - FatalError "Invalid patch type $PatchType\n"; -} - -if ($BaseName =~ m/^([\w_.\-]+)$/) -{ - $BaseName = $1; -} -else -{ - FatalError "Invalid DLL base name $BaseName\n"; -} - -my $Run32 = !1; -my $Run64 = !1; +my ($Run32, $Run64); if ($BitIndicators =~ m/^([\d,]+)$/) { - my @Bits = split /,/, $1; - foreach my $BitsValue (@Bits) + foreach my $BitsValue (split /,/, $1) { - if ($BitsValue == 32) + if ($BitsValue eq "32") { $Run32 = 1; } - elsif ($BitsValue == 64) + elsif ($BitsValue eq "64") { $Run64 = 1; } @@ -241,7 +236,7 @@ if ($BitIndicators =~ m/^([\d,]+)$/) FatalError "Invalid number of bits $BitsValue\n"; } } - if (! $Run32 && ! $Run64) + if (!$Run32 && !$Run64) { FatalError "Specify at least one of 32 or 64 bits\n"; } @@ -251,10 +246,8 @@ else FatalError "Invalid number of bits $BitIndicators\n"; } -if (!ApplyPatch($PatchFile)) -{ - exit(1); -} +my $Impacts = ApplyPatch($PatchFile); +exit(1) if (!$Impacts); CountCPUs(); @@ -262,12 +255,11 @@ if (!BuildNative()) { exit(1); } - -if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32)) +if ($Run32 && !BuildTestExecutables($Impacts, 32)) { exit(1); } -if ($Run64 && ! BuildTestExecutable($BaseName, $PatchType, 64)) +if ($Run64 && !BuildTestExecutables($Impacts, 64)) { exit(1); } -- 2.17.1

1 1

[PATCH] testbot: Make sure UpdateStatus() iterates over all the Steps and Tasks.
by Francois Gouget June 12, 2018

June 12, 2018

It tends to be called from places where filters have been put on the Steps and/or Tasks collections which prevents it from getting the full picture. So work on a clone that has no filter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 2 +- testbot/lib/WineTestBot/Steps.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b3512e1f2..a13b3468e 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -209,7 +209,7 @@ sub UpdateStatus($) return $Status if ($Status ne "queued" && $Status ne "running"); my %Has; - my $Steps = $self->Steps; + my $Steps = $self->Steps->Clone(); my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; foreach my $Step (@SortedSteps) { diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index aea1aee04..8afe79396 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -199,7 +199,7 @@ sub UpdateStatus($$) return $Status if ($Status ne "queued" && $Status ne "running"); my %Has; - map { $Has{$_->UpdateStatus($Skip)} = 1 } (@{$self->Tasks->GetItems()}); + map { $Has{$_->UpdateStatus($Skip)} = 1 } (@{$self->Tasks->Clone()->GetItems()}); # Inherit the tasks most significant status. # Note that one or more tasks may have been requeued during the cleanup phase -- 2.17.1

1 0

[PATCH] testbot: Ignore process deadlines for the disabled VMs.
by Francois Gouget June 12, 2018

June 12, 2018

Disabled VMs should probably not have deadlines but it makes sense to ignore them anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 85bc0f397..159b10cf8 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -1010,7 +1010,9 @@ sub ScheduleJobs() # Reschedule at the latest when the next task times out my $FirstDeadline; - foreach my $VM (@{$Sched->{VMs}->GetItems()}) + my $VMs = $Sched->{VMs}->Clone(); + $VMs->FilterEnabledRole(); + foreach my $VM (@{$VMs->GetItems()}) { if (defined $VM->ChildDeadline and (!defined $FirstDeadline or $VM->ChildDeadline < $FirstDeadline)) -- 2.17.1

1 0

[PATCH] testbot: Update Job::Restart() for the new Job file storage.
by Francois Gouget June 12, 2018

June 12, 2018

With the new file storage scheme the Step directories only contain generated files and thus they can all be deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Restarting an old job that still uses the old scheme will delete the input file, thus breaking that job. However the restart button is currently only available on three jobs, two where only the administrator can trigger it (39025 and 39003), and one job which is already broken (39001, I attribute this one to a temporary insanity episode of the TestBot, it's a multiple modules test patch). testbot/lib/WineTestBot/Jobs.pm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 3fd78aaa2..b3512e1f2 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -352,7 +352,6 @@ sub Restart($) return "This job is already " . $self->Status; } - my $FirstStep = 1; my $Steps = $self->Steps; my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; foreach my $Step (@SortedSteps) @@ -360,21 +359,13 @@ sub Restart($) my $Tasks = $Step->Tasks; foreach my $Task (@{$Tasks->GetItems()}) { - if ($FirstStep) - { - # The first step contains the patch or test executable - # so only delete its task folders - $Task->RmTree(); - } $Task->Status("queued"); $Task->Started(undef); $Task->Ended(undef); $Task->TestFailures(undef); } - # Subsequent steps only contain files generated by the previous steps - $Step->RmTree() if (!$FirstStep); - $FirstStep = undef; $Step->Status("queued"); + $Step->RmTree(); } $self->Status("queued"); $self->Submitted(time); -- 2.17.1

1 0

[PATCH] testbot: A minor indentation fix in PatchUtils.pm.
by Francois Gouget June 12, 2018

June 12, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 02c89e285..833394abe 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -211,8 +211,8 @@ sub GetPatchImpact($;$$) last; } if (exists $TestInfo->{Files}->{"$Base.spec"} and - ($TestInfo->{Files}->{"$Base.c"} or - $TestInfo->{Files}->{"$Base.spec"})) + ($TestInfo->{Files}->{"$Base.c"} or + $TestInfo->{Files}->{"$Base.spec"})) { # Any change to a helper dll can potentially impact all tests $AllUnits = 1; -- 2.17.1

1 0

[PATCH] testbot: Make sure AddReconfigJob() returns true when successful.
by Francois Gouget June 12, 2018

June 12, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 137db572c..80c57b9e1 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -291,6 +291,8 @@ sub AddReconfigJob() Error "Failed to save the Reconfig job (staging): $ErrMessage\n"; return 0; } + + return 1; } -- 2.17.1

1 0

[PATCH 04/17] vcomp/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 12, 2018

June 12, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 154744b7c5..ea62909756 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -766,7 +766,7 @@ static void CDECL for_static_simple_cb(void) int thread_num = pomp_get_thread_num(); int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { unsigned int my_begin, my_end, begin, end; @@ -966,7 +966,7 @@ static void CDECL for_static_cb(void) int thread_num = pomp_get_thread_num(); int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { int my_begin, my_end, my_next, my_lastchunk; int begin, end, next, lastchunk; @@ -1614,25 +1614,25 @@ static void test_atomic_integer8(void) }; int i; - for (i = 0; i < sizeof(tests1)/sizeof(tests1[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests1); i++) { char val = tests1[i].v1; tests1[i].func(&val, tests1[i].v2); ok(val == tests1[i].expected, "test %d: expected val == %d, got %d\n", i, tests1[i].expected, val); } - for (i = 0; i < sizeof(tests2)/sizeof(tests2[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests2); i++) { char val = tests2[i].v1; tests2[i].func(&val, tests2[i].v2); ok(val == tests2[i].expected, "test %d: expected val == %d, got %d\n", i, tests2[i].expected, val); } - for (i = 0; i < sizeof(tests3)/sizeof(tests3[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests3); i++) { unsigned char val = tests3[i].v1; tests3[i].func(&val, tests3[i].v2); ok(val == tests3[i].expected, "test %d: expected val == %u, got %u\n", i, tests3[i].expected, val); } - for (i = 0; i < sizeof(tests4)/sizeof(tests4[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests4); i++) { unsigned char val = tests4[i].v1; tests4[i].func(&val, tests4[i].v2); @@ -1707,25 +1707,25 @@ static void test_atomic_integer16(void) }; int i; - for (i = 0; i < sizeof(tests1)/sizeof(tests1[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests1); i++) { short val = tests1[i].v1; tests1[i].func(&val, tests1[i].v2); ok(val == tests1[i].expected, "test %d: expected val == %d, got %d\n", i, tests1[i].expected, val); } - for (i = 0; i < sizeof(tests2)/sizeof(tests2[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests2); i++) { short val = tests2[i].v1; tests2[i].func(&val, tests2[i].v2); ok(val == tests2[i].expected, "test %d: expected val == %d, got %d\n", i, tests2[i].expected, val); } - for (i = 0; i < sizeof(tests3)/sizeof(tests3[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests3); i++) { unsigned short val = tests3[i].v1; tests3[i].func(&val, tests3[i].v2); ok(val == tests3[i].expected, "test %d: expected val == %u, got %u\n", i, tests3[i].expected, val); } - for (i = 0; i < sizeof(tests4)/sizeof(tests4[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests4); i++) { unsigned short val = tests4[i].v1; tests4[i].func(&val, tests4[i].v2); @@ -1777,13 +1777,13 @@ static void test_atomic_integer32(void) }; int i; - for (i = 0; i < sizeof(tests1)/sizeof(tests1[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests1); i++) { int val = tests1[i].v1; tests1[i].func(&val, tests1[i].v2); ok(val == tests1[i].expected, "test %d: expected val == %d, got %d\n", i, tests1[i].expected, val); } - for (i = 0; i < sizeof(tests2)/sizeof(tests2[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests2); i++) { unsigned int val = tests2[i].v1; tests2[i].func(&val, tests2[i].v2); @@ -1871,26 +1871,26 @@ static void test_atomic_integer64(void) }; int i; - for (i = 0; i < sizeof(tests1)/sizeof(tests1[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests1); i++) { LONG64 val = tests1[i].v1; tests1[i].func(&val, tests1[i].v2); ok(val == tests1[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } - for (i = 0; i < sizeof(tests2)/sizeof(tests2[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests2); i++) { LONG64 val = tests2[i].v1; tests2[i].func(&val, tests2[i].v2); todo_wine_if(tests2[i].todo) ok(val == tests2[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } - for (i = 0; i < sizeof(tests3)/sizeof(tests3[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests3); i++) { ULONG64 val = tests3[i].v1; tests3[i].func(&val, tests3[i].v2); ok(val == tests3[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } - for (i = 0; i < sizeof(tests4)/sizeof(tests4[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests4); i++) { ULONG64 val = tests4[i].v1; tests4[i].func(&val, tests4[i].v2); @@ -1915,7 +1915,7 @@ static void test_atomic_float(void) }; int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { float val = tests[i].v1; tests[i].func(&val, tests[i].v2); @@ -1940,7 +1940,7 @@ static void test_atomic_double(void) }; int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { double val = tests[i].v1; tests[i].func(&val, tests[i].v2); @@ -1978,13 +1978,13 @@ static void test_reduction_integer8(void) }; int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { char val = tests[i].v1; p_vcomp_reduction_i1(tests[i].flags, &val, tests[i].v2); ok(val == tests[i].expected, "test %d: expected val == %d, got %d\n", i, tests[i].expected, val); } - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { unsigned char val = tests[i].v1; p_vcomp_reduction_u1(tests[i].flags, &val, tests[i].v2); @@ -2022,13 +2022,13 @@ static void test_reduction_integer16(void) }; int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { short val = tests[i].v1; p_vcomp_reduction_i2(tests[i].flags, &val, tests[i].v2); ok(val == tests[i].expected, "test %d: expected val == %d, got %d\n", i, tests[i].expected, val); } - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { unsigned short val = tests[i].v1; p_vcomp_reduction_u2(tests[i].flags, &val, tests[i].v2); @@ -2105,13 +2105,13 @@ static void test_reduction_integer32(void) pomp_set_num_threads(max_threads); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { int val = tests[i].v1; p_vcomp_reduction_i4(tests[i].flags, &val, tests[i].v2); ok(val == tests[i].expected, "test %d: expected val == %d, got %d\n", i, tests[i].expected, val); } - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { unsigned int val = tests[i].v1; p_vcomp_reduction_u4(tests[i].flags, &val, tests[i].v2); @@ -2148,13 +2148,13 @@ static void test_reduction_integer64(void) }; int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { LONG64 val = tests[i].v1; p_vcomp_reduction_i8(tests[i].flags, &val, tests[i].v2); ok(val == tests[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { ULONG64 val = tests[i].v1; p_vcomp_reduction_u8(tests[i].flags, &val, tests[i].v2); @@ -2206,14 +2206,14 @@ static void test_reduction_float_double(void) }; int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { float val = tests[i].v1; p_vcomp_reduction_r4(tests[i].flags, &val, tests[i].v2); ok(tests[i].expected - 0.001 < val && val < tests[i].expected + 0.001, "test %d: expected val == %f, got %f\n", i, tests[i].expected, val); } - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { double val = tests[i].v1; p_vcomp_reduction_r8(tests[i].flags, &val, tests[i].v2); -- 2.14.3

2 1

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

June 12, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/tests/notification.c | 20 ++++++++++---------- dlls/winhttp/tests/winhttp.c | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 2a647e3633..086f2e7935 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -187,7 +187,7 @@ static void test_connection_cache( void ) struct info info, *context = &info; info.test = cache_test; - info.count = sizeof(cache_test) / sizeof(cache_test[0]); + info.count = ARRAY_SIZE( cache_test ); info.index = 0; info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -427,7 +427,7 @@ static void test_redirect( void ) struct info info, *context = &info; info.test = redirect_test; - info.count = sizeof(redirect_test) / sizeof(redirect_test[0]); + info.count = ARRAY_SIZE( redirect_test ); info.index = 0; info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -508,7 +508,7 @@ static void test_async( void ) char buffer[1024]; info.test = async_test; - info.count = sizeof(async_test) / sizeof(async_test[0]); + info.count = ARRAY_SIZE( async_test ); info.index = 0; info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -779,12 +779,12 @@ static void open_async_request(int port, struct test_request *req, struct info * if (reuse_connection) { info->test = reuse_socket_request_test; - info->count = sizeof(reuse_socket_request_test) / sizeof(reuse_socket_request_test[0]); + info->count = ARRAY_SIZE( reuse_socket_request_test ); } else { info->test = open_socket_request_test; - info->count = sizeof(open_socket_request_test) / sizeof(open_socket_request_test[0]); + info->count = ARRAY_SIZE( open_socket_request_test ); } req->session = WinHttpOpen( user_agent, 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); @@ -830,7 +830,7 @@ static void server_send_reply(struct test_request *req, struct info *info, const WaitForSingleObject( info->wait, INFINITE ); info->test = server_reply_test; - info->count = sizeof(server_reply_test) / sizeof(server_reply_test[0]); + info->count = ARRAY_SIZE( server_reply_test ); info->index = 0; setup_test( info, winhttp_send_request, __LINE__ ); ret = WinHttpReceiveResponse( req->request, NULL ); @@ -879,12 +879,12 @@ static void close_request(struct test_request *req, struct info *info, BOOL allo if (allow_closing_connection) { info->test = close_allow_connection_close_request_test; - info->count = sizeof(close_allow_connection_close_request_test)/sizeof(*close_allow_connection_close_request_test); + info->count = ARRAY_SIZE( close_allow_connection_close_request_test ); } else { info->test = close_request_test; - info->count = sizeof(close_request_test)/sizeof(*close_request_test); + info->count = ARRAY_SIZE( close_request_test ); } info->index = 0; setup_test( info, winhttp_close_handle, __LINE__ ); @@ -926,12 +926,12 @@ static void _read_request_data(struct test_request *req, struct info *info, cons if (closing_connection) { info->test = read_allow_close_test; - info->count = sizeof(read_allow_close_test)/sizeof(*read_allow_close_test); + info->count = ARRAY_SIZE( read_allow_close_test ); } else { info->test = read_test; - info->count = sizeof(read_test)/sizeof(*read_test); + info->count = ARRAY_SIZE( read_test ); } info->index = 0; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 4b4a84c5fc..46504e1b0c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2907,7 +2907,7 @@ static void test_not_modified(int port) memcpy(today, ifmodifiedW, sizeof(ifmodifiedW)); GetSystemTime(&st); - WinHttpTimeFromSystemTime(&st, &today[sizeof(ifmodifiedW)/sizeof(WCHAR)]); + WinHttpTimeFromSystemTime(&st, &today[ARRAY_SIZE(ifmodifiedW)]); session = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); @@ -3277,13 +3277,13 @@ static void test_credentials(void) req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); - size = sizeof(buffer)/sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); ok(ret, "failed to query proxy username %u\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(!size, "expected 0, got %u\n", size); - size = sizeof(buffer)/sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); ok(ret, "failed to query proxy password %u\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); @@ -3292,19 +3292,19 @@ static void test_credentials(void) ret = WinHttpSetOption(req, WINHTTP_OPTION_PROXY_USERNAME, proxy_userW, lstrlenW(proxy_userW)); ok(ret, "failed to set username %u\n", GetLastError()); - size = sizeof(buffer)/sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); ok(ret, "failed to query proxy username %u\n", GetLastError()); ok(!winetest_strcmpW(buffer, proxy_userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(proxy_userW) * sizeof(WCHAR), "unexpected result %u\n", size); - size = sizeof(buffer)/sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); ok(ret, "failed to query username %u\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(!size, "expected 0, got %u\n", size); - size = sizeof(buffer)/sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); ok(ret, "failed to query password %u\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); @@ -3313,7 +3313,7 @@ static void test_credentials(void) ret = WinHttpSetOption(req, WINHTTP_OPTION_PROXY_PASSWORD, proxy_passW, lstrlenW(proxy_passW)); ok(ret, "failed to set proxy password %u\n", GetLastError()); - size = sizeof(buffer)/sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); ok(ret, "failed to query proxy password %u\n", GetLastError()); ok(!winetest_strcmpW(buffer, proxy_passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); @@ -3322,7 +3322,7 @@ static void test_credentials(void) ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, userW, lstrlenW(userW)); ok(ret, "failed to set username %u\n", GetLastError()); - size = sizeof(buffer)/sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); ok(ret, "failed to query username %u\n", GetLastError()); ok(!winetest_strcmpW(buffer, userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); @@ -3331,7 +3331,7 @@ static void test_credentials(void) ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, passW, lstrlenW(passW)); ok(ret, "failed to set password %u\n", GetLastError()); - size = sizeof(buffer)/sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); ok(ret, "failed to query password %u\n", GetLastError()); ok(!winetest_strcmpW(buffer, passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); @@ -3357,7 +3357,7 @@ static void test_credentials(void) ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, passW, NULL); ok(ret, "failed to set credentials %u\n", GetLastError()); - size = sizeof(buffer)/sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); ok(ret, "failed to query username %u\n", GetLastError()); todo_wine { @@ -3365,7 +3365,7 @@ static void test_credentials(void) ok(!size, "expected 0, got %u\n", size); } - size = sizeof(buffer)/sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); ok(ret, "failed to query password %u\n", GetLastError()); todo_wine { @@ -3920,7 +3920,7 @@ static void test_IWinHttpRequest(int port) ok( hr == S_OK, "got %08x\n", hr ); sprintf( buf, "http://localhost:%d/auth", port ); - MultiByteToWideChar( CP_ACP, 0, buf, -1, bufW, sizeof(bufW)/sizeof(bufW[0]) ); + MultiByteToWideChar( CP_ACP, 0, buf, -1, bufW, ARRAY_SIZE( bufW )); url = SysAllocString( bufW ); method = SysAllocString( method3W ); V_VT( &async ) = VT_BOOL; -- 2.14.4

2 1

[PATCH 1/7] wsdapi: Add support for listening for UDP multicast broadcasts.
by Owen Rudge June 12, 2018

June 12, 2018

v2: Returns HRESULT from functions where applicable, adds Probe message body parsing to avoid leaving todo_wine statements in place. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/network.c | 281 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/wsdapi_internal.h | 4 + 2 files changed, 284 insertions(+), 1 deletion(-)

2 1