September 2019 - Wine-commits

Francois Gouget : testbot/SpecialJobs: Tweak GetWindowsTestVMs() to work the same for 32 and 64 bit.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: tools Branch: master Commit: 9cf225863b45409d1a0f3c016d80131a09295d65 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9cf225863b45409d1a0f3c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 13:34:47 2019 +0200 testbot/SpecialJobs: Tweak GetWindowsTestVMs() to work the same for 32 and 64 bit. Also make it possible to retrieve all the enabled VMs, regardless of their role like is possible with the other GetXxxVMs() functions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/SpecialJobs.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index b0cb148..d709e48 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -113,21 +113,21 @@ sub GetWindowsTestVMs($$$) my ($VMKey, $Build, $BaseJob) = @_; my $VMs = CreateVMs(); - $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); - if ($Build eq "exe64") + $VMs->AddFilter("Type", $Build eq "exe32" ? ["win32", "win64"] : ["win64"]); + if (defined $VMKey) { - $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]) if (!defined $VMKey); + $VMs->AddFilter("Name", [$VMKey]); + $VMs->FilterEnabledRole(); } - elsif ($BaseJob eq "base") + elsif ($BaseJob) { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]) if (!defined $VMKey); + $VMs->AddFilter("Role", $BaseJob eq "base" ? ["base"] : + $BaseJob eq "other" ? ["winetest"] : + ["base", "winetest"]); } else { - $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]) if (!defined $VMKey); + $VMs->FilterEnabledRole(); } my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys());

1 0

Francois Gouget : testbot/WineRunReconfig: Use SpecialJobs to create the WineTest job.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: tools Branch: master Commit: 03268afd2ba530ebb95c72f3795f397386dd7abe URL: https://source.winehq.org/git/tools.git/?a=commit;h=03268afd2ba530ebb95c72f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 13:35:15 2019 +0200 testbot/WineRunReconfig: Use SpecialJobs to create the WineTest job. Also notify the administrator if that job creation fails. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 2e62a2e..0bf417b 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -526,10 +526,24 @@ if ($NewStatus eq 'completed') FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); } - if ($VM->Type eq "wine" and - system("$BinDir/CheckForWinetestUpdate.pl", "--vm", $VM->Name, "--create", "winetest")) + if ($VM->Type eq "wine") { - Error("Could not create a job to run WineTest on the ". $VM->Name ." VM\n"); + require WineTestBot::SpecialJobs; + $ErrMessage = WineTestBot::SpecialJobs::AddWineTestJob([$VM], $VM->Name); + if (defined $ErrMessage) + { + Error("Could not create a WineTest job for ". $VM->Name .": $ErrMessage\n"); + NotifyAdministrator("Could not create a WineTest job for ". $VM->Name, + "Could not create a job to run WineTest on ". $VM->Name + ." after its update:\n\n". + "$ErrMessage\n\n". + "See the link below for more details:\n". + MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); + } + else + { + Debug(Elapsed($Start), " Added a WineTest job for ". $VM->Name ."\n"); + } } }

1 0

Francois Gouget : testbot/web: Document and slightly optimize PageBase::Redirect().
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: tools Branch: master Commit: 900e6913a2c2eefac07a0947fcc254aa62974410 URL: https://source.winehq.org/git/tools.git/?a=commit;h=900e6913a2c2eefac07a094… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 13:35:22 2019 +0200 testbot/web: Document and slightly optimize PageBase::Redirect(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index c1a8c8c..e3d2e04 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -395,18 +395,18 @@ sub Redirect($$$) $self->SetCookies(); if (substr($Location, 0, 4) ne "http") { - my $Protocol = "http"; - if (SecureConnection()) - { - $Protocol .= "s"; - } + # Use the same protocol as for the current page. To force switching to + # https the caller should use MakeSecureURL(). + my $Protocol = SecureConnection() ? "https://" : "http://"; if (substr($Location, 0, 1) ne "/") { + # Despite its name, Request->uri only contains the path portion of the + # URI, excluding the protocol, hostname and parameters! my $URI = $self->{Request}->uri; - $URI =~ s=^(.*)/[^/]*$=$1/=; - $Location = $URI . $Location; + $URI =~ s=^(.*)/[^/]*$=$1/$Location=; + $Location = $URI; } - $Location = $Protocol . "://" . $ENV{"HTTP_HOST"} . $Location; + $Location = $Protocol . $ENV{"HTTP_HOST"} . $Location; } $self->{Request}->headers_out->set("Location", $Location); $self->{Request}->status(Apache2::Const::REDIRECT);

1 0

Francois Gouget : testbot/Engine: Increase VM::errors when a process dies and put it offline.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: tools Branch: master Commit: f624b582e35d21eaa01bbcf8e5a72cda3ab3d07a URL: https://source.winehq.org/git/tools.git/?a=commit;h=f624b582e35d21eaa01bbcf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 13:35:46 2019 +0200 testbot/Engine: Increase VM::errors when a process dies and put it offline. A process dying is most likely to be a TestBot bug. But increase the VM's error count regardless and eventually put it offline. This will have two benefits: * If the crash is specific to that VM it will let other VMs runs. * It will notify the administrator that the VM was put offline and that something is wrong. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 530a2ee..b6a8998 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -360,7 +360,18 @@ sub _CheckAndClassifyVMs() $FoundVMErrors = 1; $VM->ChildDeadline(undef); $VM->ChildPid(undef); - $VM->Status("dirty"); + my $Errors = ($VM->Errors || 0) + 1; + $VM->Errors($Errors); + if ($Errors >= $MaxVMErrors) + { + $VM->Status("offline"); + NotifyAdministrator("The TestBot and/or the ". $VM->Name ." VM needs fixing", + "The ". $VM->Name ." VM got $Errors consecutive errors, the last of which is a child process crash which indicates a TestBot bug. But something may also be wrong with the VM for it to have triggered the crash so it has been put offline.\n"); + } + else + { + $VM->Status("dirty"); + } $VM->Save(); $VM->RecordResult($Sched->{records}, "boterror process died"); $Sched->{lambvms}->{$VMKey} = 1;

1 0

Francois Gouget : testbot/LibvirtTool: Set up new live snapshots with the latest TestAgentd.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: tools Branch: master Commit: dc42eb68bbf70d656fe81a5be890b0d86ec6b035 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dc42eb68bbf70d656fe81a5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 13:36:23 2019 +0200 testbot/LibvirtTool: Set up new live snapshots with the latest TestAgentd. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 46 +++++++++++++++++++++++++++++++++++++++--- testbot/bin/WineRunReconfig.pl | 3 ++- testbot/lib/Build/Utils.pm | 7 +++++++ 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 936c386..37f95e9 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -365,9 +365,9 @@ sub CheckOff() return ChangeStatus("dirty", "off", "done"); } -sub SetupTestAgentd($$$) +sub SetupTestAgentd($$$$) { - my ($VM, $Booting, $ResetStartCount) = @_; + my ($VM, $Booting, $UpgradeTestAgentd, $ResetStartCount) = @_; Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n"); LogMsg "Setting up the $VMKey TestAgent server\n"; @@ -380,6 +380,46 @@ sub SetupTestAgentd($$$) FatalError("Could not connect to the $VMKey TestAgent: $ErrMessage\n"); } + # Upgrade TestAgentd + if ($UpgradeTestAgentd and ($VM->Type eq "win32" or $VM->Type eq "win64")) + { + Debug(Elapsed($Start), " Upgrading the $VMKey TestAgent server from $Version\n"); + LogMsg "Upgrading the $VMKey TestAgent server from $Version\n"; + if ($Version !~ / ([0-9]+)\.([0-9]+)$/) + { + FatalError("Unsupported TestAgent server version: $Version\n"); + } + # We want 'TestAgentd --detach --show-restarts' on Windows but this was + # not supported before this version and changing how the server is started + # is too complex. + $Version = sprintf("%02d.%02d", $1, $2); + if ($Version lt "01.07") + { + FatalError("The TestAgent server is too old to be upgraded: $Version\n"); + } + + if (!$TA->Upgrade("$DataDir/latest/TestAgentd.exe")) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not upgrade the $VMKey TestAgent: $ErrMessage\n"); + } + # Give the server enough time to restart, thus (maybe) avoiding a timeout + # on the first (re)connection attempt. + sleep(1); + $Version = $TA->GetVersion(); + if (!$Version) + { + my $ErrMessage = $TA->GetLastError(); + FatalError("Could not connect to the new $VMKey TestAgent: $ErrMessage\n"); + } + LogMsg "Upgraded the $VMKey TestAgent server to $Version\n"; + + # Note that the privileged TestAgent server (if any) is usually run with + # --set-time-only which means it cannot be upgraded since the restart RPC + # is blacklisted. But that also means it's unlikely to need upgrading. + # A side effect is that it will force TestAgentd.exe.old to stay around. + } + if ($ResetStartCount) { # If SetProperty() is not supported neither is --show-restarts. @@ -516,7 +556,7 @@ sub Revert() # Set up the TestAgent server. Note that setting the locale will require a # reboot so reset start.count in that case. - SetupTestAgentd($VM, $Booting, $SetLocale); + SetupTestAgentd($VM, $Booting, ($CreateSnapshot or $SetLocale), $SetLocale); if ($CreateSnapshot) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 0bf417b..0a5e606 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -464,7 +464,8 @@ FatalTAError(undef, $TAError) if (defined $TAError); if ($NewStatus eq "completed") { use File::Copy; - foreach my $FileName ("../src/TestLauncher/TestLauncher32.exe", + foreach my $FileName ("../src/testagentd/TestAgentd.exe", + "../src/TestLauncher/TestLauncher32.exe", "../src/TestLauncher/TestLauncher64.exe", "latest/winefiles.txt", "latest/wine-parentsrc.txt") diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 50d5735..9a45906 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -215,6 +215,9 @@ sub BuildNativeTestAgentd() sub BuildWindowsTestAgentd() { + my $WindowsTestAgentd = "$::RootDir/src/testagentd/TestAgentd.exe"; + my $Before = GetMTime($WindowsTestAgentd); + InfoMsg "\nRebuilding the Windows TestAgentd\n"; my $CPUCount = GetCPUCount(); system("cd '$::RootDir/src/testagentd' && set -x && ". @@ -225,6 +228,10 @@ sub BuildWindowsTestAgentd() return !1; } + if ($Before != GetMTime($WindowsTestAgentd)) + { + LogMsg "Updated TestAgentd.exe\n"; + } return 1; }

1 0

Francois Gouget : testbot/LibvirtTool: Create a reconfig job for new live Build/Wine VM snapshots.
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: tools Branch: master Commit: 489a36c8f60b146d5be6dc29f1b6e627d98e6de1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=489a36c8f60b146d5be6dc2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 13:36:44 2019 +0200 testbot/LibvirtTool: Create a reconfig job for new live Build/Wine VM snapshots. Only the live snapshots are kept up to date by the TestBot. So Wine will always be out of date in powered off snapshots making any live snapshot created from them unusable. The fix is to create a high priority reconfig job so they are brought up to date before being used for any other task. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 37f95e9..f6e2d4f 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -562,6 +562,24 @@ sub Revert() { $DomainSnapshot .= "-live"; CreateSnapshot($Domain, $DomainSnapshot); + + if ($VM->Type eq "build" or $VM->Type eq "wine") + { + require WineTestBot::SpecialJobs; + $ErrMessage = WineTestBot::SpecialJobs::AddReconfigJob([$VM], $VM->Name, $VM->Type); + if (defined $ErrMessage) + { + Error("Could not create a job to update and rebuild Wine on the $VMKey VM: $ErrMessage\n"); + NotifyAdministrator("Could not create a job to update $VMKey", + "A live snapshot was created for $VMKey but no job could be\n". + "created to update and rebuild Wine on it:\n\n". + "$ErrMessage\n"); + } + else + { + Debug(Elapsed($Start), " Added a job to update and rebuild Wine on $VMKey\n"); + } + } } # Set up the VM locale

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Use WineTestBot::Utils so we get GetMTime().
by Alexandre Julliard 26 Sep '19

26 Sep '19

Module: tools Branch: master Commit: 07c25b805729f9cb294c5c1aae040f2fbc8aa071 URL: https://source.winehq.org/git/tools.git/?a=commit;h=07c25b805729f9cb294c5c1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 26 03:48:02 2019 +0200 testbot/CheckForWinetestUpdate: Use WineTestBot::Utils so we get GetMTime(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 3f69731..c3ec3a4 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -53,6 +53,7 @@ use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::Log; use WineTestBot::SpecialJobs; +use WineTestBot::Utils; use WineTestBot::VMs;

1 0

Jacek Caban : scrobj: Add InvokeEx implementation.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: 86d1a24e4417372b418b14d93c7c69d1d225c9d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86d1a24e4417372b418b14d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 19:23:14 2019 +0200 scrobj: Add InvokeEx implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 56 +++++++++++++++++++++++++++++++++++++++++++++- dlls/scrobj/tests/scrobj.c | 22 ------------------ 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index b0a8dc7d55..e9262c53dc 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1072,7 +1072,61 @@ static HRESULT WINAPI scriptlet_InvokeEx(IDispatchEx *iface, DISPID id, LCID lci VARIANT *res, EXCEPINFO *pei, IServiceProvider *caller) { struct scriptlet_instance *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, pdp, res, pei, caller); + struct object_member *member; + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, pdp, res, pei, caller); + + if (id < 1 || id > This->member_cnt) + { + WARN("Unknown id %xu\n", id); + return DISP_E_MEMBERNOTFOUND; + } + member = &This->members[id - 1]; + + switch (member->type) + { + case MEMBER_METHOD: + if ((flags & ~DISPATCH_PROPERTYGET) != DISPATCH_METHOD) + { + FIXME("unsupported method flags %x\n", flags); + return DISP_E_MEMBERNOTFOUND; + } + return IDispatchEx_InvokeEx(member->u.method.host->script_dispatch, member->u.method.id, lcid, + DISPATCH_METHOD, pdp, res, pei, caller); + case MEMBER_PROPERTY: + if (flags & DISPATCH_PROPERTYGET) + { + if (!member->u.property.get.host) + { + FIXME("No %s getter\n", debugstr_w(member->name)); + return DISP_E_MEMBERNOTFOUND; + } + return IDispatchEx_InvokeEx(member->u.property.get.host->script_dispatch, member->u.property.get.id, lcid, + DISPATCH_METHOD, pdp, res, pei, caller); + } + if (flags & DISPATCH_PROPERTYPUT) + { + DISPPARAMS dp; + + if (!member->u.property.put.host) + { + FIXME("No %s setter\n", debugstr_w(member->name)); + return DISP_E_MEMBERNOTFOUND; + } + if (pdp->cNamedArgs != 1 || pdp->rgdispidNamedArgs[0] != DISPID_PROPERTYPUT) + { + FIXME("no propput argument\n"); + return E_FAIL; + } + dp = *pdp; + dp.cNamedArgs = 0; + return IDispatchEx_InvokeEx(member->u.property.put.host->script_dispatch, member->u.property.put.id, lcid, + DISPATCH_METHOD, &dp, res, pei, caller); + } + + FIXME("unsupported flags %x\n", flags); + } + return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index d61815ef65..023aa30f92 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -890,11 +890,8 @@ static void test_create_object(void) dp.cArgs = 1; dp.rgvarg = &v; hres = IDispatchEx_InvokeEx(dispex, vb_add_one_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &r, &ei, NULL); - todo_wine ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); - todo_wine ok(V_VT(&r) == VT_I4, "V_VT(r) = %d\n", V_VT(&r)); - todo_wine ok(V_I4(&r) == 3, "V_I4(r) = %d\n", V_I4(&r)); memset(&ei, 0, sizeof(ei)); @@ -905,11 +902,8 @@ static void test_create_object(void) dp.cArgs = 1; dp.rgvarg = &v; hres = IDispatchEx_InvokeEx(dispex, js_add_two_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &r, &ei, NULL); - todo_wine ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); - todo_wine ok(V_VT(&r) == VT_I4, "V_VT(r) = %d\n", V_VT(&r)); - todo_wine ok(V_I4(&r) == 6, "V_I4(r) = %d\n", V_I4(&r)); memset(&ei, 0, sizeof(ei)); @@ -921,13 +915,9 @@ static void test_create_object(void) dp.rgvarg = &v; SET_EXPECT(InvokeEx); hres = IDispatchEx_InvokeEx(dispex, wt_test_id, 0x100, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &r, &ei, (void*)0xdeadbeef); - todo_wine ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); - todo_wine CHECK_CALLED(InvokeEx); - todo_wine ok(V_VT(&r) == VT_BOOL, "V_VT(r) = %d\n", V_VT(&r)); - todo_wine ok(V_BOOL(&r) == VARIANT_TRUE, "V_I4(r) = %d\n", V_I4(&r)); memset(&ei, 0, sizeof(ei)); @@ -935,13 +925,9 @@ static void test_create_object(void) V_VT(&r) = VT_ERROR; SET_EXPECT(InvokeEx); hres = IDispatchEx_InvokeEx(dispex, wt_test_id, 0x100, DISPATCH_METHOD, &dp, &r, &ei, (void*)0xdeadbeef); - todo_wine ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); - todo_wine CHECK_CALLED(InvokeEx); - todo_wine ok(V_VT(&r) == VT_BOOL, "V_VT(r) = %d\n", V_VT(&r)); - todo_wine ok(V_BOOL(&r) == VARIANT_TRUE, "V_I4(r) = %d\n", V_I4(&r)); memset(&ei, 0, sizeof(ei)); @@ -953,13 +939,9 @@ static void test_create_object(void) dp.rgvarg = &v; SET_EXPECT(InvokeEx_get_gsProp); hres = IDispatchEx_InvokeEx(dispex, wt_gsprop_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &r, &ei, NULL); - todo_wine ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); - todo_wine CHECK_CALLED(InvokeEx_get_gsProp); - todo_wine ok(V_VT(&r) == VT_BOOL, "V_VT(r) = %d\n", V_VT(&r)); - todo_wine ok(V_BOOL(&r) == VARIANT_TRUE, "V_I4(r) = %d\n", V_I4(&r)); memset(&ei, 0, sizeof(ei)); @@ -973,13 +955,9 @@ static void test_create_object(void) dp.cNamedArgs = 1; SET_EXPECT(InvokeEx_put_gsProp); hres = IDispatchEx_InvokeEx(dispex, wt_gsprop_id, 0, DISPATCH_PROPERTYPUT, &dp, &r, &ei, NULL); - todo_wine ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); - todo_wine CHECK_CALLED(InvokeEx_put_gsProp); - todo_wine ok(V_VT(&r) == VT_BOOL, "V_VT(r) = %d\n", V_VT(&r)); - todo_wine ok(V_BOOL(&r) == VARIANT_FALSE, "V_I4(r) = %d\n", V_I4(&r)); hres = IDispatchEx_InvokeEx(dispex, wt_test_id, 0x100, DISPATCH_PROPERTYGET, &dp, &r, &ei, (void*)0xdeadbeef);

1 0

Dmitry Timoshkov : rpcrt4: Reimplement rpcrt4_conn_np_wait_for_incoming_data() using asynchronous read with zero sized buffer.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: a6fe4f6e65e595ffcba625d22a62e340c5e22e62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6fe4f6e65e595ffcba625d2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 25 15:25:20 2019 +0800 rpcrt4: Reimplement rpcrt4_conn_np_wait_for_incoming_data() using asynchronous read with zero sized buffer. The problem with NtFsControlFile(FSCTL_PIPE_PEEK) is that it happily returns STATUS_SUCCESS with 0 bytes of data available. That makes the client think that the server already sent a reply and try to read the reply data, which hangs. A solution to this is call NtReadFile() with zero sized buffer, which has correct behaviour: just waits for incoming data to appear without mangling the data in the pipe. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 12d15f8654..243c4780bf 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -465,31 +465,7 @@ static void rpcrt4_conn_np_cancel_call(RpcConnection *conn) static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *conn) { - RpcConnection_np *connection = (RpcConnection_np *)conn; - FILE_PIPE_PEEK_BUFFER buf; - HANDLE event; - NTSTATUS status; - int ret; - - event = get_np_event(connection); - if (!event) return -1; - - status = NtFsControlFile(connection->pipe, event, NULL, NULL, &connection->io_status, FSCTL_PIPE_PEEK, NULL, 0, &buf, sizeof(buf)); - if (status == STATUS_SUCCESS) - ret = 0; - else if (status == STATUS_PENDING) - { - WaitForSingleObject(event, INFINITE); - ret = 0; - } - else - { - WARN("NtFsControlFile error %08x\n", status); - ret = -1; - } - - release_np_event(connection, event); - return ret; + return rpcrt4_conn_np_read(conn, NULL, 0); } static size_t rpcrt4_ncacn_np_get_top_of_tower(unsigned char *tower_data,

1 0

Alex Henrie : include: Add Tag field to SYSTEM_BATTERY_STATE.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: 4407fb7ada185b301532def526d3411ee026ac18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4407fb7ada185b301532def5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 25 00:45:54 2019 -0600 include: Add Tag field to SYSTEM_BATTERY_STATE. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 5e9057199e..3f59bd9f30 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5607,7 +5607,8 @@ typedef struct { BOOLEAN BatteryPresent; BOOLEAN Charging; BOOLEAN Discharging; - BOOLEAN Spare1[4]; + BOOLEAN Spare1[3]; + BYTE Tag; ULONG MaxCapacity; ULONG RemainingCapacity; ULONG Rate;

1 0