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

[PATCH] testbot: Make Step::FileName and FileType optional.
by Francois Gouget 05 Jun '18

05 Jun '18

Some steps don't have an input filename (like the Reconfig tasks) so it makes no sense to force setting FileName or FileType to a dummy value. However enum fields cannot be left undefined so add a 'none' value. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note: This requires updating the database schema and then restarting the TestBot Engine and website. testbot/bin/CheckForWinetestUpdate.pl | 3 +-- testbot/ddl/update35.sql | 5 +++++ testbot/ddl/winetestbot.sql | 4 ++-- testbot/lib/WineTestBot/Steps.pm | 11 +++++++++-- testbot/lib/WineTestBot/StepsTasks.pm | 4 +++- testbot/web/JobDetails.pl | 2 +- 6 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 testbot/ddl/update35.sql diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index a79f60c71..f41148f12 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -251,8 +251,7 @@ sub AddReconfigJob() my $Steps = $NewJob->Steps; my $NewStep = $Steps->Add(); $NewStep->Type("reconfig"); - $NewStep->FileName("-"); - $NewStep->FileType("patchdlls"); + $NewStep->FileType("none"); $NewStep->InStaging(!1); # Add a task for the build VM diff --git a/testbot/ddl/update35.sql b/testbot/ddl/update35.sql new file mode 100644 index 000000000..3ca3023f3 --- /dev/null +++ b/testbot/ddl/update35.sql @@ -0,0 +1,5 @@ +USE winetestbot; + +ALTER TABLE Steps + MODIFY FileName VARCHAR(100) NULL, + MODIFY FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 9ec428c04..9a28385a9 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -132,8 +132,8 @@ CREATE TABLE Steps PreviousNo INT(2) NULL, Type ENUM('suite', 'single', 'build', 'reconfig') NOT NULL, Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped') NOT NULL, - FileName VARCHAR(100) NOT NULL, - FileType ENUM('exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL, + FileName VARCHAR(100) NULL, + FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL, InStaging ENUM('Y', 'N') NOT NULL, DebugLevel INT(2) NOT NULL, ReportSuccessfulTests ENUM('Y', 'N') NOT NULL, diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 977419474..aea1aee04 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -89,6 +89,7 @@ sub InitializeNew($$) $self->Status("queued"); $self->Type("single"); + $self->FileType("none"); $self->InStaging(1); $self->DebugLevel(1); $self->ReportSuccessfulTests(!1); @@ -117,6 +118,10 @@ sub Validate($) { return ("PreviousNo", "The previous step number must be less than this one's."); } + if (defined $self->FileName and $self->FileType eq "none") + { + return ("FileType", "A file has been specified but no FileType"); + } return $self->SUPER::Validate(); } @@ -146,6 +151,8 @@ sub GetFullFileName($) { my ($self) = @_; + return undef if (!defined $self->FileName); + my ($JobId, $StepNo) = @{$self->GetMasterKey()}; # FIXME: Remove legacy support once no such job remains (so after # $JobPurgeDays). @@ -256,8 +263,8 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("PreviousNo", "Previous step", !1, !1, "N", 2), CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), - CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['exe32', 'exe64', 'patchdlls', 'patchprograms']), + CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), + CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['none', 'exe32', 'exe64', 'patchdlls', 'patchprograms']), CreateBasicPropertyDescriptor("InStaging", "File is in staging area", !1, 1, "B", 1), CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index b9f70d768..84c5a005f 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -44,6 +44,8 @@ sub GetFullFileName($) { my ($self) = @_; + return undef if (!defined $self->FileName); + my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; # FIXME: Remove legacy support once no such job remains (so after # $JobPurgeDays). @@ -189,7 +191,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Status", "Status", !1, 1, "A", 32), CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), - CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 100), + CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 32), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 6bf4a12e8..3e638f717 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -486,7 +486,7 @@ sub GenerateDataCell($$$$$) elsif ($PropertyName eq "FileName") { my $FileName = $StepTask->GetFullFileName(); - if (-r $FileName) + if ($FileName and -r $FileName) { my $URI = "/GetFile.pl?JobKey=" . uri_escape($self->{JobId}) . "&StepKey=" . uri_escape($StepTask->StepNo); -- 2.17.0

1 0

[PATCH] testbot: Log errors that happen when updating a Job's status.
by Francois Gouget 05 Jun '18

05 Jun '18

Such errors are important as they can prevent the Jobs from ever being marked as completed. So trace them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This helps diagnose issues where the database schema and the TestBot's ORM database model are out of sync. testbot/lib/WineTestBot/Jobs.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b1ffd3e48..13a389586 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -243,7 +243,12 @@ sub UpdateStatus($) { $self->Ended(time); } - $self->Save(); + my ($ErrProperty, $ErrMessage) = $self->Save(); + if (defined $ErrMessage) + { + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Could not update job status: $ErrMessage\n"); + } last; } } -- 2.17.0

1 0

[PATCH] testbot: Add proper command line options to CheckForWinetestUpdate.pl.
by Francois Gouget 05 Jun '18

05 Jun '18

The options make it possible to test a specific job/task creation without having to way for a new WineTest binary download each time. Also it is now possible to specify the exact task type to create and if none is given the script will now handle all of them. This way the crontab commands don't need to be updated when new task types are added. Also the script now prints the error messages to stderr by default to make it easier to figure things out when running it on the command line. The --log-only option can be used when that's not desired. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note: This requires updating the crontab entries. Typically they can both be replaced with a single command that will create all the relevant jobs: */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl --log-only testbot/bin/CheckForWinetestUpdate.pl | 273 +++++++++++++++++++------- testbot/doc/INSTALL.txt | 3 +- 2 files changed, 199 insertions(+), 77 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 20eacec63..a79f60c71 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -6,6 +6,7 @@ # runs the full test suite on the standard Windows test VMs. # # Copyright 2009 Ge van Geldorp +# Copyright 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 @@ -37,6 +38,8 @@ sub BEGIN unshift @INC, "$::RootDir/lib"; } } +my $Name0 = $0; +$Name0 =~ s+^.*/++; use File::Basename; use File::Compare; @@ -60,11 +63,112 @@ my %WineTestUrls = ( 64 => "http://test.winehq.org/builds/winetest64-latest.exe" ); +my %TaskTypes = (build => 1, base32 => 1, winetest32 => 1, all64 => 1); + + +my $Debug; +sub Debug(@) +{ + print STDERR @_ if ($Debug); +} + +my $LogOnly; +sub Error(@) +{ + print STDERR "$Name0:error: ", @_ if (!$LogOnly); + LogMsg @_; +} + + +=pod +=over 12 + +=item C<UpdateWineTest()> + +Downloads the latest WineTest executable. + +Returns 1 if the executable was updated, 0 if it was not, and -1 if an +error occurred. + +=back +=cut + +sub UpdateWineTest($$) +{ + my ($OptCreate, $Bits) = @_; + + my $BitsSuffix = ($Bits == 64 ? "64" : ""); + my $LatestBaseName = "winetest${BitsSuffix}-latest.exe"; + my $LatestFileName = "$DataDir/latest/$LatestBaseName"; + if ($OptCreate) + { + return (1, $LatestBaseName) if (-r $LatestFileName); + Debug("$LatestBaseName is missing\n"); + } + + # See if the online WineTest executable is newer + my $UA = LWP::UserAgent->new(); + $UA->agent("WineTestBot"); + my $Request = HTTP::Request->new(GET => $WineTestUrls{$Bits}); + if (-r $LatestFileName) + { + my $Since = gmtime((stat $LatestFileName)[9]); + $Request->header("If-Modified-Since" => "$Since GMT"); + } + Debug("Checking $WineTestUrls{$Bits}\n"); + my $Response = $UA->request($Request); + if ($Response->code == RC_NOT_MODIFIED) + { + Debug("$LatestBaseName is already up to date\n"); + return (0, $LatestBaseName); # Already up to date + } + if ($Response->code != RC_OK) + { + Error "Unexpected HTTP response code ", $Response->code, "\n"; + return (-1, undef); + } + + # Download the WineTest executable + Debug("Downloading $LatestBaseName\n"); + umask 002; + mkdir "$DataDir/staging"; + my ($fh, $StagingFileName) = OpenNewFile("$DataDir/staging", "_$LatestBaseName"); + if (!$fh) + { + Error "Could not create staging file: $!\n"; + return (-1, undef); + } + print $fh $Response->decoded_content(); + close($fh); + + if (-r $LatestFileName and compare($StagingFileName, $LatestFileName) == 0) + { + Debug("$LatestBaseName did not change\n"); + unlink($StagingFileName); + return (0, $LatestBaseName); # No change after all + } + + # Save the WineTest executable to the latest directory for the next round + mkdir "$DataDir/latest"; + if (!move($StagingFileName, $LatestFileName)) + { + Error "Could not move '$StagingFileName' to '$LatestFileName': $!\n"; + unlink($StagingFileName); + return (-1, undef); + } + utime time, $Response->last_modified, $LatestFileName; + + return (1, $LatestBaseName); +} sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; + my $Remarks = ($Bits == 64 ? "64-bit" : $BaseJob ? "base" : "other"); + $Remarks = "WineTest: $Remarks VMs"; + Debug("Creating the '$Remarks' job\n"); + my $VMs = CreateVMs(); if ($Bits == 64) { @@ -84,6 +188,7 @@ sub AddJob($$$) if ($VMs->GetItemsCount() == 0) { # There is nothing to do + Debug(" Found no VM\n"); return 1; } @@ -97,9 +202,7 @@ sub AddJob($$$) my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 8 : 9); - $NewJob->Remarks("WineTest: " . - ($Bits == 64 ? "64-bit" : $BaseJob ? "base" : "other") . - " VMs"); + $NewJob->Remarks($Remarks); # Add a step to the job my $Steps = $NewJob->Steps; @@ -114,6 +217,7 @@ sub AddJob($$$) my $Tasks = $NewStep->Tasks; foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { + Debug(" $VMKey\n"); my $Task = $Tasks->Add(); $Task->VM($VMs->GetItem($VMKey)); $Task->Timeout($SuiteTimeout); @@ -123,7 +227,7 @@ sub AddJob($$$) my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - LogMsg "Failed to save job: $ErrMessage\n"; + Error "Failed to save job: $ErrMessage\n"; unlink($StagingFileName); return 0; } @@ -133,12 +237,15 @@ sub AddJob($$$) sub AddReconfigJob() { + my $Remarks = "Update Wine to latest git"; + Debug("Creating the '$Remarks' job\n"); + # First create a new job my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority(3); - $NewJob->Remarks("Update Wine to latest git"); + $NewJob->Remarks($Remarks); # Add a step to the job my $Steps = $NewJob->Steps; @@ -153,6 +260,7 @@ sub AddReconfigJob() $VMs->AddFilter("Type", ["build"]); $VMs->AddFilter("Role", ["base"]); my $BuildVM = ${$VMs->GetItems()}[0]; + Debug(" ", $BuildVM->GetKey(), "\n"); my $Task = $NewStep->Tasks->Add(); $Task->VM($BuildVM); $Task->Timeout($ReconfigTimeout); @@ -161,97 +269,112 @@ sub AddReconfigJob() my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - LogMsg "Failed to save reconfig job: $ErrMessage\n"; + Error "Failed to save reconfig job: $ErrMessage\n"; return 0; } } -my $Bits = $ARGV[0]; -if (!$Bits) -{ - die "Usage: CheckForWinetestUpdate.pl <bits>"; -} -if ($Bits =~ m/^(32|64)$/) + +# +# Command line processing +# + +my ($OptCreate, %OptTypes, $Usage); +while (@ARGV) { - $Bits = $1; + my $Arg = shift @ARGV; + if ($Arg eq "--create") + { + $OptCreate = 1; + } + elsif ($TaskTypes{$Arg}) + { + $OptTypes{$Arg} = 1; + } + elsif ($Arg eq "--debug") + { + $Debug = 1; + } + elsif ($Arg eq "--log-only") + { + $LogOnly = 1; + } + elsif ($Arg =~ /^(?:-\?|-h|--help)$/) + { + $Usage = 0; + last; + } + elsif ($Arg =~ /^-/) + { + Error "unknown option '$Arg'\n"; + $Usage = 2; + last; + } + else + { + Error "unexpected argument '$Arg'\n"; + $Usage = 2; + last; + } } -else + +# Check parameters +if (!defined $Usage) { - die "Invalid number of bits $Bits"; + map { $OptTypes{$_} = 1 } keys %TaskTypes if (!%OptTypes); } -my $BitsSuffix = ($Bits == 64 ? "64" : ""); - -# Download the winetest executable if new -my $UA = LWP::UserAgent->new(); -$UA->agent("WineTestBot"); -my $Request = HTTP::Request->new(GET => $WineTestUrls{$Bits}); -my $LatestBaseName = "winetest${BitsSuffix}-latest.exe"; -my $LatestFileName = "$DataDir/latest/$LatestBaseName"; -if (-r $LatestFileName) +if (defined $Usage) { - my $Since = gmtime((stat $LatestFileName)[9]); - $Request->header("If-Modified-Since" => "$Since GMT"); + print "Usage: $Name0 [--debug] [--log-only] [--help] [--create] [TASKTYPE] ...\n"; + print "\n"; + print "Where TASKTYPE is one of: ", join(" ", sort keys %TaskTypes), "\n"; + exit $Usage; } -my $Response = $UA->request($Request); -if ($Response->code != RC_OK) + + +# +# Create the 32 bit tasks +# + +my $Rc = 0; +if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32}) { - if ($Response->code != RC_NOT_MODIFIED) + my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, 32); + if ($Create < 0) { - LogMsg "Unexpected HTTP response code ", $Response->code, "\n"; - exit 1; + $Rc = 1; + } + elsif ($Create == 1) + { + # A new executable means there have been commits so update Wine. Create + # this job first purely to make the WineTestBot job queue look nice, and + # arbitrarily do it only for 32-bit executables to avoid redundant updates. + $Rc = 1 if ($OptTypes{build} and !AddReconfigJob()); + $Rc = 1 if ($OptTypes{base32} and !AddJob("base", $LatestBaseName, 32)); + $Rc = 1 if ($OptTypes{winetest32} and !AddJob("", $LatestBaseName, 32)); } - exit 0; } -# Store the new WineTest executable in the staging directory: -# - So we can compare it to the reference one in the latest directory to -# verify that it truly is new. -# - Because we don't know the relevant Job and Step IDs yet and thus cannot -# put it in the jobs directory tree. -umask 002; -mkdir "$DataDir/staging"; -my ($fh, $StagingFileName) = OpenNewFile("$DataDir/staging", "_$LatestBaseName"); -if (!$fh) -{ - LogMsg "Could not create staging file: $!\n"; - exit 1; -} -print $fh $Response->decoded_content(); -close($fh); -my $NewFile = 1; -if (-r $LatestFileName) -{ - $NewFile = compare($StagingFileName, $LatestFileName) != 0; -} -if (!$NewFile) -{ - # Nothing to do - unlink($StagingFileName); - exit 0; -} +# +# Create the 64 bit tasks +# -# Save the WineTest executable in the latest directory for the next round -mkdir "$DataDir/latest"; -if (!move($StagingFileName, $LatestFileName)) +if ($OptTypes{all64}) { - LogMsg "Could not move '$StagingFileName' to '$LatestFileName': $!\n"; - unlink($StagingFileName); - exit 1; + my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, 64); + if ($Create < 0) + { + $Rc = 1; + } + elsif ($Create == 1) + { + $Rc = 1 if ($OptTypes{all64} and !AddJob("", $LatestBaseName, 64)); + } } -utime time, $Response->last_modified, $LatestFileName; - -# A new executable means there have been commits so update Wine. Create this -# job first purely to make the WineTestBot job queue look nice, and arbitrarily -# do it only for 32-bit executables to avoid redundant updates. -my $rc = 0; -$rc = 1 if ($Bits == 32 and !AddReconfigJob()); - -$rc = 1 if (!AddJob(1, $LatestBaseName, $Bits)); -$rc = 1 if ($Bits == 32 and !AddJob(!1, $LatestBaseName, $Bits)); RescheduleJobs(); LogMsg "Submitted jobs\n"; -exit $rc; +exit $Rc; diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 8827c227d..cb7c31b97 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -86,8 +86,7 @@ Setup for Wine's patches site: Setup for Winetest updates: - Use a cron job to run CheckForWinetestUpdate.pl periodically. For instance: - */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 32 - */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 64 + */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl --log-only Setup for wine-devel: - A proper WineTestBot system should integrate with Wine's patches site. -- 2.17.0

1 0

[PATCH v2 2/2] wbemdisp/tests: Add ISWbemSecurity tests
by Hans Leidekker 05 Jun '18

05 Jun '18

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: Add more tests for default settings. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemdisp/tests/wbemdisp.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 171a91edb4..1ce045697a 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -265,7 +265,10 @@ static void test_locator(void) ISWbemObject *object; ISWbemPropertySet *prop_set; ISWbemProperty *prop; + ISWbemSecurity *security; VARIANT var; + WbemImpersonationLevelEnum imp_level; + WbemAuthenticationLevelEnum auth_level; hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); ok( hr == S_OK, "got %x\n", hr ); @@ -284,6 +287,34 @@ static void test_locator(void) SysFreeString( lang_bstr ); SysFreeString( query_bstr ); + hr = ISWbemLocator_get_Security_( locator, &security ); + ok( hr == S_OK, "got %x\n", hr ); + imp_level = 0xdeadbeef; + hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( imp_level == wbemImpersonationLevelImpersonate, "got %u\n", imp_level ); + hr = ISWbemSecurity_put_ImpersonationLevel( security, wbemImpersonationLevelAnonymous ); + ok( hr == S_OK, "got %x\n", hr ); + imp_level = 0xdeadbeef; + hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( imp_level == wbemImpersonationLevelAnonymous, "got %u\n", imp_level ); + + auth_level = 0xdeadbeef; + hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); + todo_wine { + ok( hr == WBEM_E_FAILED, "got %x\n", hr ); + ok( auth_level == 0xdeadbeef, "got %u\n", auth_level ); + } + hr = ISWbemSecurity_put_AuthenticationLevel( security, wbemAuthenticationLevelNone ); + ok( hr == S_OK, "got %x\n", hr ); + auth_level = 0xdeadbeef; + hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( auth_level == wbemAuthenticationLevelNone, "got %u\n", auth_level ); + ISWbemSecurity_Release( security ); + security = NULL; + hr = ISWbemObjectSet_get__NewEnum( object_set, (IUnknown**)&enum_var ); ok( hr == S_OK, "got %x\n", hr ); @@ -318,6 +349,18 @@ static void test_locator(void) ok( V_VT(&var) == VT_BSTR, "got %x\n", V_VT(&var) ); VariantClear( &var ); + hr = ISWbemServices_get_Security_( services, &security ); + ok( hr == S_OK, "got %x\n", hr ); + imp_level = 0xdeadbeef; + hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( imp_level == wbemImpersonationLevelImpersonate, "got %u\n", imp_level ); + auth_level = 0xdeadbeef; + hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); + ok( hr == S_OK, "got %x\n", hr ); + ok( auth_level == wbemAuthenticationLevelPktPrivacy, "got %u\n", auth_level ); + + ISWbemSecurity_Release(security); ISWbemProperty_Release( prop ); ISWbemPropertySet_Release( prop_set ); ISWbemObject_Release( object ); -- 2.11.0

1 0

[PATCH v2 1/2] wbemdisp: Add ISWbemSecurity stub interface.
by Hans Leidekker 05 Jun '18

05 Jun '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 249 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 244 insertions(+), 5 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index e782d1f523..cdc0ab4479 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); static HRESULT EnumVARIANT_create( IEnumWbemClassObject *, IEnumVARIANT ** ); +static HRESULT ISWbemSecurity_create( ISWbemSecurity ** ); enum type_id { @@ -47,6 +48,7 @@ enum type_id ISWbemProperty_tid, ISWbemPropertySet_tid, ISWbemServices_tid, + ISWbemSecurity_tid, last_tid }; @@ -60,7 +62,8 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemObjectSet, &IID_ISWbemProperty, &IID_ISWbemPropertySet, - &IID_ISWbemServices + &IID_ISWbemServices, + &IID_ISWbemSecurity }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -1873,8 +1876,12 @@ static HRESULT WINAPI services_get_Security_( ISWbemServices *iface, ISWbemSecurity **objWbemSecurity ) { - FIXME( "\n" ); - return E_NOTIMPL; + TRACE( "%p, %p\n", iface, objWbemSecurity ); + + if (!objWbemSecurity) + return E_INVALIDARG; + + return ISWbemSecurity_create( objWbemSecurity ); } static const ISWbemServicesVtbl services_vtbl = @@ -2128,8 +2135,12 @@ static HRESULT WINAPI locator_get_Security_( ISWbemLocator *iface, ISWbemSecurity **objWbemSecurity ) { - FIXME( "%p, %p\n", iface, objWbemSecurity ); - return E_NOTIMPL; + TRACE( "%p, %p\n", iface, objWbemSecurity ); + + if (!objWbemSecurity) + return E_INVALIDARG; + + return ISWbemSecurity_create( objWbemSecurity ); } static const ISWbemLocatorVtbl locator_vtbl = @@ -2160,3 +2171,231 @@ HRESULT SWbemLocator_create( void **obj ) TRACE( "returning iface %p\n", *obj ); return S_OK; } + +struct security +{ + ISWbemSecurity ISWbemSecurity_iface; + LONG refs; + WbemImpersonationLevelEnum implevel; + WbemAuthenticationLevelEnum authlevel; +}; + +static inline struct security *impl_from_ISWbemSecurity( ISWbemSecurity *iface ) +{ + return CONTAINING_RECORD( iface, struct security, ISWbemSecurity_iface ); +} + +static ULONG WINAPI security_AddRef( + ISWbemSecurity *iface ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + return InterlockedIncrement( &security->refs ); +} + +static ULONG WINAPI security_Release( + ISWbemSecurity *iface ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + LONG refs = InterlockedDecrement( &security->refs ); + if (!refs) + { + TRACE( "destroying %p\n", security ); + heap_free( security ); + } + return refs; +} + +static HRESULT WINAPI security_QueryInterface( + ISWbemSecurity *iface, + REFIID riid, + void **ppvObject ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %s, %p\n", security, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemSecurity ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemSecurity_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI security_GetTypeInfoCount( + ISWbemSecurity *iface, + UINT *count ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %p\n", security, count ); + + *count = 1; + return S_OK; +} + +static HRESULT WINAPI security_GetTypeInfo( + ISWbemSecurity *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + TRACE( "%p, %u, %u, %p\n", security, index, lcid, info ); + + return get_typeinfo( ISWbemSecurity_tid, info ); +} + +static HRESULT WINAPI security_GetIDsOfNames( + ISWbemSecurity *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", security, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemSecurity_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI security_Invoke( + ISWbemSecurity *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", security, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemSecurity_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &security->ISWbemSecurity_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI security_get_ImpersonationLevel( + ISWbemSecurity *iface, + WbemImpersonationLevelEnum *impersonation_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, impersonation_level ); + + if (!impersonation_level) + return E_INVALIDARG; + + *impersonation_level = security->implevel; + return S_OK; +} + +static HRESULT WINAPI security_put_ImpersonationLevel( + ISWbemSecurity *iface, + WbemImpersonationLevelEnum impersonation_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %d: stub\n", security, impersonation_level ); + + security->implevel = impersonation_level; + return S_OK; +} + +static HRESULT WINAPI security_get_AuthenticationLevel( + ISWbemSecurity *iface, + WbemAuthenticationLevelEnum *authentication_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, authentication_level ); + + if (!authentication_level) + return E_INVALIDARG; + + *authentication_level = security->authlevel; + return S_OK; +} + +static HRESULT WINAPI security_put_AuthenticationLevel( + ISWbemSecurity *iface, + WbemAuthenticationLevelEnum authentication_level ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %d: stub\n", security, authentication_level ); + + security->authlevel = authentication_level; + return S_OK; +} + +static HRESULT WINAPI security_get_Privileges( + ISWbemSecurity *iface, + ISWbemPrivilegeSet **privilege_set ) +{ + struct security *security = impl_from_ISWbemSecurity( iface ); + FIXME( "%p, %p: stub\n", security, privilege_set ); + + if (!privilege_set) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static const ISWbemSecurityVtbl security_vtbl = +{ + security_QueryInterface, + security_AddRef, + security_Release, + security_GetTypeInfoCount, + security_GetTypeInfo, + security_GetIDsOfNames, + security_Invoke, + security_get_ImpersonationLevel, + security_put_ImpersonationLevel, + security_get_AuthenticationLevel, + security_put_AuthenticationLevel, + security_get_Privileges +}; + +static HRESULT ISWbemSecurity_create( ISWbemSecurity **obj ) +{ + struct security *security; + + TRACE( "%p\n", obj ); + + if (!(security = heap_alloc( sizeof(*security) ))) return E_OUTOFMEMORY; + security->ISWbemSecurity_iface.lpVtbl = &security_vtbl; + security->refs = 1; + security->implevel = wbemImpersonationLevelImpersonate; + security->authlevel = wbemAuthenticationLevelPktPrivacy; + + *obj = &security->ISWbemSecurity_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} -- 2.11.0

1 0

[PATCH 1/3] msi: Only delete empty registry keys in delete_key().
by Zebediah Figura 05 Jun '18

05 Jun '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/action.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7197bca..ddd676d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2981,12 +2981,27 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package) return rc; } +static int is_key_empty(const MSICOMPONENT *comp, HKEY root, const WCHAR *path) +{ + DWORD subkeys, values; + HKEY key; + LONG res; + + key = open_key(comp, root, path, FALSE, get_registry_view(comp) | KEY_READ); + if (!key) return 0; + + res = RegQueryInfoKeyW(key, 0, 0, 0, &subkeys, 0, 0, &values, 0, 0, 0, 0); + RegCloseKey(key); + + return !res && !subkeys && !values; +} + static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) { + LONG res = ERROR_SUCCESS; REGSAM access = 0; WCHAR *subkey, *p; HKEY hkey; - LONG res; access |= get_registry_view( comp ); @@ -2999,10 +3014,15 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) if (!p[1]) continue; /* trailing backslash */ hkey = open_key( comp, root, subkey, FALSE, access | READ_CONTROL ); if (!hkey) break; + if (!is_key_empty(comp, hkey, p + 1)) + { + RegCloseKey(hkey); + break; + } res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); RegCloseKey( hkey ); } - else + else if (is_key_empty(comp, root, subkey)) res = RegDeleteKeyExW( root, subkey, access, 0 ); if (res) { @@ -3017,17 +3037,14 @@ static void delete_value( const MSICOMPONENT *comp, HKEY root, const WCHAR *path { LONG res; HKEY hkey; - DWORD num_subkeys, num_values; if ((hkey = open_key( comp, root, path, FALSE, KEY_SET_VALUE | KEY_QUERY_VALUE ))) { if ((res = RegDeleteValueW( hkey, value ))) TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); - res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, &num_subkeys, NULL, NULL, &num_values, - NULL, NULL, NULL, NULL ); RegCloseKey( hkey ); - if (!res && !num_subkeys && !num_values) + if (is_key_empty(comp, root, path)) { TRACE("removing empty key %s\n", debugstr_w(path)); delete_key( comp, root, path ); -- 2.7.4

3 6

[PATCH v2 1/2] stdole2.idl: Use more accurate sizes for Automation types.
by Zebediah Figura 05 Jun '18

05 Jun '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/stdole2.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/stdole2.idl b/include/stdole2.idl index 18c402a..d372384 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -32,15 +32,15 @@ ] library stdole { - /* typedefs aren't stored in the type library. - These type names are known by the type compiler so it - doesn't really matter what we define them as. */ - + /* These typedefs need to have the same size as their real counterparts. */ typedef short VARIANT_BOOL; - typedef long BSTR; + typedef void *BSTR; typedef double CURRENCY; typedef unsigned long HRESULT; - typedef void *VARIANT; + typedef struct { + short word1, word2, word3, word4; + void *ptr1, *ptr2; + } VARIANT; typedef unsigned long SCODE; typedef struct GUID { -- 2.7.4

2 3

Re: [PATCH] msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity.
by Zhiyi Zhang 05 Jun '18

05 Jun '18

On Tue 6 5 14:39, Hua Meng wrote: > Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> > --- > dlls/msvcp120/tests/msvcp120.c | 120 +++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 117 insertions(+), 3 deletions(-) > mode change 100644 => 100755 dlls/msvcp120/tests/msvcp120.c Hi, I don't think you need to change the file permission from 644 to 755. And there are some style inconsistencies. Thanks, Zhiyi Zhang > > diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c > old mode 100644 > new mode 100755 > index dfd2d06..84e20bd > --- a/dlls/msvcp120/tests/msvcp120.c > +++ b/dlls/msvcp120/tests/msvcp120.c > @@ -35,6 +35,7 @@ struct expect_struct { > DEFINE_EXPECT(queue_char__Move_item); > DEFINE_EXPECT(queue_char__Copy_item); > DEFINE_EXPECT(queue_char__Assign_and_destroy_item); > + DEFINE_EXPECT(concurrent_vector_int_alloc); > }; > > #define SET_EXPECT(func) \ > @@ -105,6 +106,8 @@ struct thiscall_thunk > > static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); > static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); > +static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, > + const void *b ); > > static void init_thiscall_thunk(void) > { > @@ -117,17 +120,19 @@ static void init_thiscall_thunk(void) > thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ > call_thiscall_func1 = (void *)thunk; > call_thiscall_func2 = (void *)thunk; > + call_thiscall_func3 = (void *)thunk; > } > > #define call_func1(func,_this) call_thiscall_func1(func,_this) > #define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) > - > +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),\ > + (const void*)(b)) > #else > > #define init_thiscall_thunk() > #define call_func1(func,_this) func(_this) > #define call_func2(func,_this,a) func(_this,a) > - > +#define call_func3(func,_this,a,b) func(_this,a,b) > #endif /* __i386__ */ > > static inline float __port_infinity(void) > @@ -360,6 +365,19 @@ static void (__thiscall *p_queue_base_v4__Internal_move_push)(queue_base_v4*, vo > static MSVCP_bool (__thiscall *p_queue_base_v4__Internal_pop_if_present)(queue_base_v4*, void*); > static void (__thiscall *p_queue_base_v4__Internal_finish_clear)(queue_base_v4*); > > +typedef struct vector_base_v4 > +{ > + void* (__cdecl *allocator)(struct vector_base_v4 *, size_t); > + void *storage[3]; > + size_t first_block; > + size_t early_size; > + void **segment; > +} vector_base_v4; > + > +static void (__thiscall *p_vector_base_v4_dtor)(vector_base_v4*); > +static size_t (__thiscall *p_vector_base_v4__Internal_capacity)(vector_base_v4*); > +static void* (__thiscall *p_vector_base_v4__Internal_push_back)(vector_base_v4*, size_t, size_t*); > + > static HMODULE msvcp; > #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) > #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) > @@ -493,7 +511,13 @@ static BOOL init(void) > "?_Internal_pop_if_present(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEAA_NPEAX(a)Z"); > SET(p_queue_base_v4__Internal_finish_clear, > "?_Internal_finish_clear(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEAAXXZ"); > - } else { > + SET(p_vector_base_v4_dtor, > + "??1_Concurrent_vector_base_v4(a)details@Concurrency@@IEAA(a)XZ"); > + SET(p_vector_base_v4__Internal_capacity, > + "?_Internal_capacity(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBA_KXZ"); > + SET(p_vector_base_v4__Internal_push_back, > + "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KAEA_K(a)Z"); > +} else { > SET(p_tr2_sys__File_size, > "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); > SET(p_tr2_sys__File_size_wchar, > @@ -596,6 +620,12 @@ static BOOL init(void) > "?_Internal_pop_if_present(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAE_NPAX(a)Z"); > SET(p_queue_base_v4__Internal_finish_clear, > "?_Internal_finish_clear(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAEXXZ"); > + SET(p_vector_base_v4_dtor, > + "??1_Concurrent_vector_base_v4(a)details@Concurrency@@IAE(a)XZ"); > + SET(p_vector_base_v4__Internal_capacity, > + "?_Internal_capacity(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEIXZ"); > + SET(p_vector_base_v4__Internal_push_back, > + "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEPAXIAAI(a)Z"); > #else > SET(p__Thrd_current, > "_Thrd_current"); > @@ -627,6 +657,12 @@ static BOOL init(void) > "?_Internal_pop_if_present(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAA_NPAX(a)Z"); > SET(p_queue_base_v4__Internal_finish_clear, > "?_Internal_finish_clear(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAAXXZ"); > + SET(p_vector_base_v4_dtor, > + "??1_Concurrent_vector_base_v4(a)details@Concurrency@@IAA(a)XZ"); > + SET(p_vector_base_v4__Internal_capacity, > + "?_Internal_capacity(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAIXZ"); > + SET(p_vector_base_v4__Internal_push_back, > + "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAPAXIAAI(a)Z"); > #endif > } > SET(p__Thrd_equal, > @@ -2396,6 +2432,83 @@ static DWORD WINAPI queue_pop_thread(void*arg) > return 0; > } > > +static void* __cdecl concurrent_vector_int_alloc(vector_base_v4 *this, size_t n) > +{ > + CHECK_EXPECT(concurrent_vector_int_alloc); > + return malloc(n*sizeof(int)); > +} > + > +static void concurrent_vector_int_ctor(vector_base_v4 *this) > +{ > + memset(this, 0, sizeof(*this)); > + this->allocator = concurrent_vector_int_alloc; > + this->segment = &this->storage[0]; > +} > + > +static void test_vector_base_v4(void) > +{ > + vector_base_v4 vector; > + size_t idx; > + size_t size; > + int *data; > + > + /* test for concurrent_vector_base_v4__Internal_push_back and _Internal_capacity */ > + concurrent_vector_int_ctor(&vector); > + > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 0, "size of vector got %ld expected %d\n", (long)size, 0); > + > + SET_EXPECT(concurrent_vector_int_alloc); > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + CHECK_CALLED(concurrent_vector_int_alloc); > + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); > + if(!data){ > + skip("_Internal_capacity not yet implemented\n"); > + return; > + } > + todo_wine ok(idx == 0, "idx got %ld expected %d\n", (long)idx, 0); > + *data = 1; > + todo_wine ok(data == vector.storage[0], "vector.storage[0] got %p expected %p\n", vector.storage[0], data); > + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); > + todo_wine ok(vector.early_size == 1, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 1); > + > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 2, "size of vector got %ld expected %d\n", (long)size, 2); > + > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); > + todo_wine ok(idx == 1, "idx got %ld expected %d\n", (long)idx, 1); > + *data = 2; > + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); > + todo_wine ok(vector.early_size == 2, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 2); > + > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 2, "size of vector got %ld expected %d\n", (long)size, 2); > + > + SET_EXPECT(concurrent_vector_int_alloc); > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + CHECK_CALLED(concurrent_vector_int_alloc); > + todo_wine ok(data != NULL, "_Internal_push_back returned NULL\n"); > + todo_wine ok(idx == 2, "idx got %ld expected %d\n", (long)idx, 2); > + *data = 3; > + todo_wine ok(vector.first_block == 1, "vector.first_block got %ld expected %d\n", (long)vector.first_block, 1); > + todo_wine ok(vector.early_size == 3, "vector.early_size got %ld expected %d\n", (long)vector.early_size, 3); > + > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 4, "size of vector got %ld expected %d\n", (long)size, 4); > + > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 4, "size of vector got %ld expected %d\n", (long)size, 4); > + > + SET_EXPECT(concurrent_vector_int_alloc); > + data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); > + CHECK_CALLED(concurrent_vector_int_alloc); > + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); > + todo_wine ok(size == 8, "size of vector got %ld expected %d\n", (long)size, 8); > + > + call_func1(p_vector_base_v4_dtor, &vector); > +} > static void test_queue_base_v4(void) > { > queue_base_v4 queue; > @@ -2626,6 +2739,7 @@ START_TEST(msvcp120) > > test_vector_base_v4__Segment_index_of(); > test_queue_base_v4(); > + test_vector_base_v4(); > > test_vbtable_size_exports(); > >

1 0

[PATCH] netapi32: NetUserGetInfo should return Admin privilege - wine users run as Administrators
by Jeff Latimer 05 Jun '18

05 Jun '18

Resend to wine-devel. --- dlls/netapi32/netapi32.c | 11 +++++++---- dlls/netapi32/tests/access.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-)

2 1

Re: netapi32/tests: Fix a memory leak
by Marvin 05 Jun '18

05 Jun '18

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38962 Your paranoid android. === build (build) === Patch failed to apply

1 0