September 2019 - Wine-commits

Hans Leidekker : wbemprox: Avoid a crash when a class is not implemented.
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: wine Branch: master Commit: 58572fc916ecbd6ae77f2b181f51daf4169dcef1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58572fc916ecbd6ae77f2b18… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 19 19:33:28 2019 +0200 wbemprox: Avoid a crash when a class is not implemented. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index b311fdaf2d..b60ad956b3 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1123,6 +1123,8 @@ void set_variant( VARTYPE type, LONGLONG val, void *val_ptr, VARIANT *ret ) static HRESULT map_view_index( const struct view *view, UINT index, UINT *table_index, UINT *result_index ) { + if (!view->table) return WBEM_E_NOT_FOUND; + switch (view->type) { case VIEW_TYPE_SELECT:

1 0

Francois Gouget : testbot: Separate running reconfig and winetest Wine VM tasks.
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: tools Branch: master Commit: 9937fccca36c3908b0d0fbd00201db7ba09c3cd0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9937fccca36c3908b0d0fbd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 19 15:01:34 2019 +0200 testbot: Separate running reconfig and winetest Wine VM tasks. The reconfig task updates and rebuilds Wine and is a high priority task because patches should always be applied on top of the latest Wine version. In contrast re-running WineTest normally does not impact the test results much and thus should not get in the way of providing the results to the developpers in a timely manner. But priorities are set at the job level. So create a first high priority job for the reconfig tasks, and create a separate low priority job if and when these tasks complete successfully. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 159 ++++++++++++++++++++-------------- testbot/bin/WineRunReconfig.pl | 6 ++ 2 files changed, 102 insertions(+), 63 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index c677af2..7e58afc 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -69,7 +69,8 @@ my %TaskTypes = (build => "Update and rebuild Wine on the build VMs.", base32 => "Run WineTest on the 32 bit Windows VMs with the 'base' role.", other32 => "Run WineTest on the 32 bit Windows VMs with the 'winetest' role.", all64 => "Run WineTest on the all the 64 bit Windows VMs.", - wine => "Update, rebuild and run WineTest on the Wine VMs."); + winebuild => "Update and rebuild Wine on the Wine VMs.", + winetest => "Run WineTest on the Wine VMs."); my $Debug; @@ -275,6 +276,86 @@ sub AddJob($$$$) return 1; } +sub AddWineTestJob($) +{ + my ($VMKey) = @_; + + my $Remarks = defined $VMKey ? "$VMKey VM" : "Wine VMs"; + $Remarks = "WineTest: $Remarks"; + Debug("Creating the '$Remarks' job\n"); + + my $VMs = CreateVMs(); + $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); + $VMs->AddFilter("Type", ["wine"]); + $VMs->FilterEnabledRole(); + if ($VMs->GetItemsCount() == 0) + { + if (defined $VMKey) + { + Error "The $VMKey VM is not a wine VM\n"; + return 0; + } + # There is nothing to do + Debug(" Found no VM\n"); + return 1; + } + + # First create a new job + my $Jobs = CreateJobs(); + my $NewJob = $Jobs->Add(); + $NewJob->User(GetBatchUser()); + $NewJob->Priority(7); + $NewJob->Remarks($Remarks); + my $Steps = $NewJob->Steps; + + # Add a step for each VM + my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); + foreach my $VMKey (@$SortedKeys) + { + my $VM = $VMs->GetItem($VMKey); + # Move all the missions into separate tasks so we don't have one very + # long task hogging the VM forever. Note that this is also ok because + # the WineTest tasks don't have to recompile Wine. + my $MissionStatement = SplitMissionStatementTasks($VM->Missions); + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) + { + Debug("$VMKey has an invalid mission statement: $!\n"); + next; + } + + my $Tasks; + foreach my $TaskMissions (@$Missions) + { + if (!$Tasks) + { + # Add a step to the job + my $TestStep = $Steps->Add(); + $TestStep->Type("suite"); + $TestStep->FileType("none"); + $Tasks = $TestStep->Tasks; + } + + Debug(" $VMKey $TaskMissions->{Statement}\n"); + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->Timeout(GetTestTimeout(undef, $TaskMissions)); + $Task->Missions($TaskMissions->{Statement}); + } + } + + # Save it all + $NewJob->Status("staging"); + my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + if (defined $ErrMessage) + { + Error "Failed to save the WineTest job: $ErrMessage\n"; + return 0; + } + + return 1; +} + sub AddReconfigJob($$) { my ($VMKey, $VMType) = @_; @@ -312,7 +393,7 @@ sub AddReconfigJob($$) $BuildStep->Type("reconfig"); $BuildStep->FileType("none"); - # And a task for each VM + # Add a task for each VM my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); foreach my $VMKey (@$SortedKeys) { @@ -339,67 +420,12 @@ sub AddReconfigJob($$) $Task->Missions($Missions->[0]->{Statement}); } - # Save the build step so the others can reference it. - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined $ErrMessage) - { - Error "Failed to save the build step: $ErrMessage\n"; - return 0; - } - - if ($VMType eq "wine") - { - # Add steps to run WineTest on Wine - my $Tasks; - foreach my $VMKey (@$SortedKeys) - { - my $VM = $VMs->GetItem($VMKey); - # Move all the missions into separate tasks so we don't have one very - # long task hogging the VM forever. Note that this also ok because the - # WineTest tasks don't have to recompile Wine. - my $MissionStatement = SplitMissionStatementTasks($VM->Missions); - my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); - if (defined $ErrMessage) - { - Debug("$VMKey has an invalid mission statement: $!\n"); - next; - } - - foreach my $TaskMissions (@$Missions) - { - if (!$Tasks) - { - # Add a step to the job - my $TestStep = $Steps->Add(); - $TestStep->PreviousNo($BuildStep->No); - $TestStep->Type("suite"); - $TestStep->FileType("none"); - $Tasks = $TestStep->Tasks; - } - - Debug(" $VMKey $TaskMissions->{Statement}\n"); - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->Timeout(GetTestTimeout(undef, $TaskMissions)); - $Task->Missions($TaskMissions->{Statement}); - } - } - } - # Save it all - ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined $ErrMessage) - { - Error "Failed to save the Reconfig job: $ErrMessage\n"; - return 0; - } - - # Switch Status to staging to indicate we are done setting up the job $NewJob->Status("staging"); - ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { - Error "Failed to save the Reconfig job (staging): $ErrMessage\n"; + Error "Failed to save the Reconfig job: $ErrMessage\n"; return 0; } @@ -478,7 +504,13 @@ if (!defined $Usage) { if (!defined $OptVMKey) { - %OptTypes = %TaskTypes if (!%OptTypes); + # By default create all types of jobs except the winetest ones which will + # be created for each Wine VM by the corresponding winebuild task. + if (!%OptTypes) + { + %OptTypes = %TaskTypes; + delete $OptTypes{winetest}; + } } elsif ($OptVMKey =~ /^([a-zA-Z0-9_]+)$/) { @@ -492,7 +524,7 @@ if (!defined $Usage) elsif (!%OptTypes) { %OptTypes = $VM->Type eq "build" ? ("build" => 1) : - $VM->Type eq "wine" ? ("wine" => 1) : + $VM->Type eq "wine" ? ("winebuild" => 1) : $VM->Type eq "win32" ? ("base32" => 1) : ("base32" => 1, "all64" => 1); } @@ -522,7 +554,7 @@ if (defined $Usage) my $Rc = 0; if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{other32} or - $OptTypes{wine}) + $OptTypes{winebuild} or $OptTypes{winetest}) { my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, "exe32"); if ($Create < 0) @@ -538,7 +570,8 @@ if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{other32} or $Rc = 1 if ($OptTypes{base32} and !AddJob($OptVMKey, "base", $LatestBaseName, "exe32")); $Rc = 1 if ($OptTypes{other32} and !AddJob($OptVMKey, "other", $LatestBaseName, "exe32")); - $Rc = 1 if ($OptTypes{wine} and !AddReconfigJob($OptVMKey, "wine")); + $Rc = 1 if ($OptTypes{winebuild} and !AddReconfigJob($OptVMKey, "wine")); + $Rc = 1 if ($OptTypes{winetest} and !AddWineTestJob($OptVMKey)); } } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index d0baccc..b3c9508 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -479,6 +479,12 @@ if ($NewStatus eq 'completed') # problem will be noticed and that it will be taken offline. FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); } + + if ($VM->Type eq "wine" and + system("$BinDir/CheckForWinetestUpdate.pl", "--vm", $VM->Name, "--create", "winetest")) + { + Error("Could not create a job to run WineTest on the ". $VM->Name ." VM\n"); + } }

1 0

Francois Gouget : testbot/LibvirtTool: Check the VM state before putting it back online.
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: tools Branch: master Commit: de68e426859f08ccc0906adc9ee1c5ba5fea7fd4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=de68e426859f08ccc0906ad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 19 15:02:14 2019 +0200 testbot/LibvirtTool: Check the VM state before putting it back online. Normally GetSnapshotName() returns undef when the domain is busy reverting. But that's an undocumented feature and the the VM may end up in a state where GetSnapshotName() returns undef despite the VM being usable (e.g. powered off after a failed revert). So check the Libvirt domain state instead. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 46 ++++++++++---------------------- testbot/lib/WineTestBot/LibvirtDomain.pm | 21 +++++++++++++++ 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f15bab7..dca5a92 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -282,42 +282,24 @@ sub Monitor() return 0; } - my ($ErrMessage, $SnapshotName) = $VM->GetDomain()->GetSnapshotName(); - if (defined $ErrMessage) - { - Error "$ErrMessage\n"; - } - else + my $IsReady = $VM->GetDomain()->IsReady(); + if ($IsReady and $VM->GetDomain()->IsPoweredOn()) { - my $IsPoweredOn; - if (!defined $SnapshotName) - { - Debug("$VMKey has no snapshot (reverting?)\n"); - $IsPoweredOn = undef; - } - elsif (!defined $SnapshotName or $SnapshotName ne $VM->IdleSnapshot) - { - $IsPoweredOn = 0; - } - else - { - $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); - if ($IsPoweredOn) - { - $ErrMessage = $VM->GetDomain()->PowerOff(); - Error "$ErrMessage\n" if (defined $ErrMessage); - $IsPoweredOn = undef; - } - } - if (defined $IsPoweredOn) + my $ErrMessage = $VM->GetDomain()->PowerOff(); + if (defined $ErrMessage) { - return 1 if (ChangeStatus("offline", "off", "done")); - NotifyAdministrator("The $VMKey VM is working again", - "The $VMKey VM started working again after ". - PrettyElapsed($Start) ."."); - return 0; + Error "$ErrMessage\n"; + $IsReady = undef; } } + if ($IsReady) + { + return 1 if (ChangeStatus("offline", "off", "done")); + NotifyAdministrator("The $VMKey VM is working again", + "The $VMKey VM started working again after ". + PrettyElapsed($Start) ."."); + return 0; + } Debug(Elapsed($Start), " $VMKey is still unreachable\n"); sleep(60); diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 8d9b9df..f0a8c69 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -363,6 +363,27 @@ sub IsPoweredOn($) return ($State == Sys::Virt::Domain::STATE_RUNNING); } +sub IsReady($) +{ + my ($self) = @_; + + my ($ErrMessage, $Domain) = $self->_GetDomain(); + if (defined $ErrMessage) + { + $@ = $ErrMessage; + return undef; + } + + my ($State, $_Reason); + eval { ($State, $_Reason) = $Domain->get_state() }; + return $self->_Reset(undef) if ($@); + return ($State == Sys::Virt::Domain::STATE_RUNNING or + $State == Sys::Virt::Domain::STATE_SHUTOFF or + $State == Sys::Virt::Domain::STATE_CRASHED or + $State == Sys::Virt::Domain::STATE_PMSUSPENDED + ); +} + sub _GetStateName($) { my ($State) = @_;

1 0

Francois Gouget : testbot/Build: Only download TestLauncher*.exe after updates.
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: tools Branch: master Commit: 9f5a6cfc18d7b720fbf134b98c52997762fdd642 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9f5a6cfc18d7b720fbf134b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 19 15:08:36 2019 +0200 testbot/Build: Only download TestLauncher*.exe after updates. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 9 ++++++++- testbot/lib/Build/Utils.pm | 15 +++++++++++++++ testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index b3c9508..bef9a59 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -389,10 +389,11 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) } } +my $Summary; Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { - my $Summary = ParseTaskLog("$TaskDir/log"); + $Summary = ParseTaskLog("$TaskDir/log"); if ($Summary->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. @@ -435,6 +436,12 @@ if ($NewStatus eq "completed") "latest/wine-parentsrc.txt") { my $BaseName = basename($FileName); + if ($FileName !~ m~^latest/~ and !$Summary->{$BaseName} and + -f "$DataDir/latest/$BaseName") + { + # This file was not updated to there is no point redownloading it. + next; + } Debug(Elapsed($Start), " Retrieving '$TaskDir/$BaseName'\n"); if ($TA->GetFile($FileName, "$TaskDir/$BaseName")) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 57a5f4b..50d5735 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -33,6 +33,7 @@ our @EXPORT = qw(GetToolName InfoMsg LogMsg Error SetupWineEnvironment RunWine CreateWinePrefix); use Digest::SHA; +use File::Basename; use File::Path; use WineTestBot::Config; @@ -237,6 +238,13 @@ sub GetTestLauncher($) sub BuildTestLauncher() { + my %Files; + foreach my $Bits ("32", "64") + { + $Files{"Path$Bits"} = GetTestLauncher({Build => "win$Bits"}); + $Files{"Before$Bits"} = GetMTime($Files{"Path$Bits"}); + } + InfoMsg "\nRebuilding TestLauncher\n"; my $CPUCount = GetCPUCount(); system("cd '$::RootDir/src/TestLauncher' && set -x && ". @@ -247,6 +255,13 @@ sub BuildTestLauncher() return !1; } + foreach my $Bits ("32", "64") + { + if ($Files{"Before$Bits"} != GetMTime($Files{"Path$Bits"})) + { + LogMsg "Updated ". basename($Files{"Path$Bits"}) ."\n"; + } + } return 1; } diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index a18c463..3b1c356 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -107,6 +107,10 @@ sub ParseTaskLog($) $Summary->{Task} = "badpatch"; last; # Should be the last and most specific message } + elsif ($Line =~ /^Task: Updated ([a-zA-Z0-9.]+)$/) + { + $Summary->{$1} = "updated"; + } elsif ($Line =~ /^Task: / or _IsPerlError($Line)) { $Summary->{Task} = "failed";

1 0

Francois Gouget : testbot/web: Remove an unused variable in PageBase::Redirect().
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: tools Branch: master Commit: 0118a19c2273f34b586258ba2464f23611a77da3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0118a19c2273f34b586258b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 19 15:00:52 2019 +0200 testbot/web: Remove an unused variable in PageBase::Redirect(). The goal was probably to get the hostname through $Server->server_hostname but $Server is an Apache2-specific object while $ENV{"HTTP_HOST"} seems more generic and works fine. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 0eac6b1..d1442c1 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -408,7 +408,6 @@ sub Redirect($$$) $URI =~ s=^(.*)/[^/]*$=$1/=; $Location = $URI . $Location; } - my $Server = $self->{Request}->server; $Location = $Protocol . "://" . $ENV{"HTTP_HOST"} . $Location; } $self->{Request}->headers_out->set("Location", $Location);

1 0

Alexandre Julliard : ntdll: Fix usage of libunwind on x86-64 on non-macOS platforms.
by Alexandre Julliard 18 Sep '19

18 Sep '19

Module: wine Branch: master Commit: af4c7e6e6133bc3db911d88421fc131b998762d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af4c7e6e6133bc3db911d884… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 18 16:52:38 2019 +0200 ntdll: Fix usage of libunwind on x86-64 on non-macOS platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 224 ++++++++++++++++----------------------------- 1 file changed, 78 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af4c7e6e6133bc3db911…

1 0

Alexandre Julliard : ntdll: Don't send the first chance debug event twice.
by Alexandre Julliard 18 Sep '19

18 Sep '19

Module: wine Branch: master Commit: d299087d30b9b688a3ba25b5aca00610217453ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=d299087d30b9b688a3ba25b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 18 17:19:34 2019 +0200 ntdll: Don't send the first chance debug event twice. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index dc955f202f..fbb2daff90 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2604,7 +2604,7 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL */ static void raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { - NTSTATUS status = NtRaiseException( rec, context, TRUE ); + NTSTATUS status = raise_exception( rec, context, TRUE ); raise_status( status, rec ); }

1 0

Alexandre Julliard : ntdll: Send first chance debug event while on signal stack on i386.
by Alexandre Julliard 18 Sep '19

18 Sep '19

Module: wine Branch: master Commit: 7ee66b29cb52fd3fc18fe2314c720b3a0e348e43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ee66b29cb52fd3fc18fe231… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 18 18:09:11 2019 +0200 ntdll: Send first chance debug event while on signal stack on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f15b327624..534b05c717 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -724,18 +724,14 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f context->Ebp, context->Esp, context->SegCs, context->SegDs, context->SegEs, context->SegFs, context->SegGs, context->EFlags ); } - status = send_debug_event( rec, TRUE, context ); - if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) - return STATUS_SUCCESS; /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--; - if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) - return STATUS_SUCCESS; + if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) goto done; - if ((status = call_stack_handlers( rec, context )) != STATUS_UNHANDLED_EXCEPTION) - return status; + if ((status = call_stack_handlers( rec, context )) == STATUS_SUCCESS) goto done; + if (status != STATUS_UNHANDLED_EXCEPTION) return status; } /* last chance exception */ @@ -752,7 +748,8 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); } - return STATUS_SUCCESS; +done: + return NtSetContextThread( GetCurrentThread(), context ); } @@ -1860,7 +1857,7 @@ static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *cont { NTSTATUS status; - status = NtRaiseException( rec, context, TRUE ); + status = raise_exception( rec, context, TRUE ); raise_status( status, rec ); } @@ -1872,6 +1869,13 @@ static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *cont */ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout *stack ) { + NTSTATUS status = send_debug_event( &stack->rec, TRUE, &stack->context ); + + if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) + { + restore_context( &stack->context, sigcontext ); + return; + } ESP_sig(sigcontext) = (DWORD)stack; EIP_sig(sigcontext) = (DWORD)raise_generic_exception; /* clear single-step, direction, and align check flag */ @@ -2499,9 +2503,13 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16, */ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) { - NTSTATUS status = raise_exception( rec, context, first_chance ); - if (status == STATUS_SUCCESS) NtSetContextThread( GetCurrentThread(), context ); - return status; + if (first_chance) + { + NTSTATUS status = send_debug_event( rec, TRUE, context ); + if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) + NtSetContextThread( GetCurrentThread(), context ); + } + return raise_exception( rec, context, first_chance ); } @@ -2510,7 +2518,7 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL * * Raise an exception with the full CPU context. */ -void raise_exception_full_context( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) +void raise_exception_full_context( EXCEPTION_RECORD *rec, CONTEXT *context ) { save_fpu( context ); save_fpux( context ); @@ -2523,7 +2531,7 @@ void raise_exception_full_context( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL context->Dr7 = x86_thread_data()->dr7; context->ContextFlags |= CONTEXT_DEBUG_REGISTERS; - RtlRaiseStatus( NtRaiseException( rec, context, first_chance )); + RtlRaiseStatus( NtRaiseException( rec, context, TRUE )); } @@ -2545,7 +2553,6 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "leal 12(%ebp),%eax\n\t" "movl %eax,0xc4(%esp)\n\t" /* context->Esp */ "movl %esp,%eax\n\t" - "pushl $1\n\t" "pushl %eax\n\t" "pushl %ecx\n\t" "call " __ASM_NAME("raise_exception_full_context") "\n\t"

1 0

Alexandre Julliard : kernelbase: Don't round thread stack guaranteed size when it is zero.
by Alexandre Julliard 18 Sep '19

18 Sep '19

Module: wine Branch: master Commit: b1bb4f84e244d141f7f17cdb6497ce645fd56015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1bb4f84e244d141f7f17cdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 18 17:52:07 2019 +0200 kernelbase: Don't round thread stack guaranteed size when it is zero. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index e16062016a..30e9a2e09b 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -505,7 +505,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetThreadStackGuarantee( ULONG *size ) ULONG new_size = (*size + 4095) & ~4095; /* at least 2 pages on 64-bit */ - if (sizeof(void *) > sizeof(int)) new_size = max( new_size, 8192 ); + if (sizeof(void *) > sizeof(int) && new_size) new_size = max( new_size, 8192 ); *size = prev_size; if (new_size >= (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->DeallocationStack)

1 0

Zhiyi Zhang : kernelbase: Comment out DECLSPEC_HOTPATCH for GetThreadLocale.
by Alexandre Julliard 18 Sep '19

18 Sep '19

Module: wine Branch: master Commit: de6554a312a731db7d85440ce4eab44eeb53962a URL: https://source.winehq.org/git/wine.git/?a=commit;h=de6554a312a731db7d85440c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 18 23:22:29 2019 +0800 kernelbase: Comment out DECLSPEC_HOTPATCH for GetThreadLocale. Triggered by i686-w64-mingw32-gcc 8.3 with -Og. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 30e9a2e09b..f633dfa3de 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -253,7 +253,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetThreadId( HANDLE thread ) /*********************************************************************** * GetThreadLocale (kernelbase.@) */ -LCID WINAPI DECLSPEC_HOTPATCH GetThreadLocale(void) +LCID WINAPI /* DECLSPEC_HOTPATCH */ GetThreadLocale(void) { LCID ret = NtCurrentTeb()->CurrentLocale; if (!ret) NtCurrentTeb()->CurrentLocale = ret = GetUserDefaultLCID();

1 0