wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Francois Gouget : testbot: Put the 'Task: Updated' lines in the 'info' category.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: tools Branch: master Commit: de2c4fae4de207ae28227713b73e3f6996da27b2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=de2c4fae4de207ae2822771… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 20 17:45:15 2019 +0200 testbot: Put the 'Task: Updated' lines in the 'info' category. There is no need to put them front and center like build errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3b1c356..1946482 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -146,7 +146,7 @@ sub GetLogLineCategory($) $Line =~ /^\+ \S/ or $Line =~ /^LANG=/ or $Line =~ /^Running (?:the tests|WineTest) / or - $Line =~ /^Task: (?:ok|tests)/) + $Line =~ /^Task: (?:ok|tests|Updated)/) { return "info"; }

1 0

Francois Gouget : testbot/Engine: Put a VM offline if it repeatedly times out during revert.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: tools Branch: master Commit: 3f26a883efbff95dde8c25fd6bef67f35bd85e3e URL: https://source.winehq.org/git/tools.git/?a=commit;h=3f26a883efbff95dde8c25f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 20 15:04:53 2019 +0200 testbot/Engine: Put a VM offline if it repeatedly times out during revert. Putting it in maintenance mode makes it unusable until an administrator looks at it which could take a long time when quite often the timeout is just caused by high load on the host. Now that LibvirtTool 'rate-limits' how often it puts VMs that keep having errors back online, we can simply put such VMs offline and let LibvirtTool deal with them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 569dff7..e9a3ff9 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -270,31 +270,28 @@ sub _CheckAndClassifyVMs() { # The child process got stuck! $FoundVMErrors = 1; - my $NewStatus = "dirty"; if ($VM->Status eq "reverting" or $VM->Status eq "sleeping") { my $Errors = ($VM->Errors || 0) + 1; $VM->Errors($Errors); - if ($Errors >= $MaxVMErrors) - { - $NewStatus = "maintenance"; - NotifyAdministrator("Putting the $VMKey VM in maintenance mode", - "The last $Errors revert operations timed out.\n\n". - "No further operation will be attempted until an administrator has put\n". - "the VM back online."); - $Sched->{busyvms}->{$VMKey} = 1; - } + $VM->Status("offline"); + NotifyAdministrator("Putting the $VMKey VM offline", + "The last $Errors revert operations timed out.\n\n". + "This may be because of some transient load on the VM host but if not\n". + "an administrator should look into it. In any case the TestBot will try\n". + "to regain access to the VM."); + $Sched->{busyvms}->{$VMKey} = 1; } - $VM->Status($NewStatus); - $VM->KillChild(); - $VM->Save(); - $VM->RecordResult($Sched->{records}, "boterror stuck process"); - if ($NewStatus eq "dirty") + else { + $VM->Status("dirty"); $Sched->{lambvms}->{$VMKey} = 1; $Host->{dirty}++; $Host->{active}++; } + $VM->KillChild(); + $VM->Save(); + $VM->RecordResult($Sched->{records}, "boterror stuck process"); } elsif ($VM->Status =~ /^(?:dirty|running|reverting)$/) {

1 0

Francois Gouget : testbot/LibvirtTool: Don't put VMs in maintenance even after repeated errors.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: tools Branch: master Commit: 654623afdefa049d729ea47e8d852623afd0e3c3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=654623afdefa049d729ea47… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 20 15:04:37 2019 +0200 testbot/LibvirtTool: Don't put VMs in maintenance even after repeated errors. The VM may have gone offline simply because of repeated revert timeouts. This can happen if there is too much load on the host which is a transient issue. But the administrator may not be available right away to investigate and put the VM back online. So warn the administrator, keep monitoring the offline VM but space out the attempts to use the VM so the host can try running tasks on other VMs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 60e868e..0801c99 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -169,10 +169,6 @@ sub FatalError($) # Get the up-to-date VM status $VM = CreateVMs()->GetItem($VMKey); - # Put the VM offline or mark it for maintenance - my $Errors = ($VM->Errors || 0) + 1; - my $NewStatus = $Errors < $MaxVMErrors ? "offline" : "maintenance"; - if ($VM->Status eq "maintenance") { # Still proceed with changing the non-Status fields and notifying the @@ -185,10 +181,11 @@ sub FatalError($) } else { - $VM->Status($NewStatus); + $VM->Status("offline"); } $VM->ChildDeadline(undef); $VM->ChildPid(undef); + my $Errors = ($VM->Errors || 0) + 1; $VM->Errors($Errors); my ($ErrProperty, $SaveErrMessage) = $VM->Save(); @@ -196,19 +193,19 @@ sub FatalError($) { LogMsg "Could not put the $VMKey VM offline: $SaveErrMessage ($ErrProperty)\n"; } - elsif ($NewStatus eq "offline") + elsif ($Errors >= $MaxVMErrors) { - NotifyAdministrator("Putting the $VMKey VM offline", - "Could not perform the $Action operation on the $VMKey VM:\n". + NotifyAdministrator("The $VMKey VM needs maintenance", + "Got $Errors consecutive errors working on the $VMKey VM:\n". "\n$ErrMessage\n". - "The VM has been put offline and the TestBot will try to regain access to it."); + "It probably needs fixing to get back online."); } - elsif ($NewStatus eq "maintenance") + else { - NotifyAdministrator("The $VMKey VM needs maintenance", - "Got $Errors consecutive errors working on the $VMKey VM:\n". + NotifyAdministrator("Putting the $VMKey VM offline", + "Could not perform the $Action operation on the $VMKey VM:\n". "\n$ErrMessage\n". - "An administrator needs to look at it and to put it back online."); + "The VM has been put offline and the TestBot will try to regain access to it."); } exit 1; } @@ -259,6 +256,14 @@ sub ChangeStatus($$;$) sub Monitor() { + # Still try recovering the VM in case of repeated errors, but space out + # attempts to not keep the host busy with a broken VM. Note that after + # 1 hour the monitor process gets killed and replaced (to deal with stuck + # monitor processes) but even so the VM will be checked once per hour. + my $Interval = ($VM->Errors || 0) >= $MaxVMErrors ? 1860 : 60; + my $NextTry = time() + $Interval; + Debug(Elapsed($Start), " Checking $VMKey in ${Interval}s\n"); + $CurrentStatus = "offline"; while (1) { @@ -281,6 +286,14 @@ sub Monitor() "to ". $VM->Status ." after ". PrettyElapsed($Start) ."."); return 0; } + my $Sleep = $NextTry - time(); + if ($Sleep > 0) + { + # Check that the VM still needs monitoring at least once per minute. + $Sleep = 60 if ($Sleep > 60); + sleep($Sleep); + next; + } my $IsReady = $VM->GetDomain()->IsReady(); if ($IsReady and $VM->GetDomain()->IsPoweredOn()) @@ -301,8 +314,8 @@ sub Monitor() return 0; } - Debug(Elapsed($Start), " $VMKey is still unreachable\n"); - sleep(60); + Debug(Elapsed($Start), " $VMKey is still busy / unreachable, trying again in ${Interval}s\n"); + $NextTry = time() + $Interval; } }

1 0

Francois Gouget : testbot/LibvirtTool: Detect if a VM is booting after a revert.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: tools Branch: master Commit: 7efd44208f2686d9c3d168f021d40c3172804dcd URL: https://source.winehq.org/git/tools.git/?a=commit;h=7efd44208f2686d9c3d168f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 20 15:04:21 2019 +0200 testbot/LibvirtTool: Detect if a VM is booting after a revert. And adjust the TestAgent connection timeout accordingly. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 6 +++--- testbot/lib/WineTestBot/LibvirtDomain.pm | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index dca5a92..60e868e 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -366,7 +366,7 @@ sub Revert() # Revert the VM (and power it on if necessary) my $Domain = $VM->GetDomain(); Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n"); - my $ErrMessage = $Domain->RevertToSnapshot(); + my ($ErrMessage, $Booting) = $Domain->RevertToSnapshot(); if (defined $ErrMessage) { # Libvirt/QEmu is buggy and cannot revert a running VM from one hardware @@ -380,7 +380,7 @@ sub Revert() } Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "... again\n"); - $ErrMessage = $Domain->RevertToSnapshot(); + ($ErrMessage, $Booting) = $Domain->RevertToSnapshot(); } if (defined $ErrMessage) { @@ -394,7 +394,7 @@ sub Revert() Debug(Elapsed($Start), " Verifying the TestAgent server\n"); LogMsg "Verifying the $VMKey TestAgent server\n"; my $TA = $VM->GetAgent(); - $TA->SetConnectTimeout(undef, undef, $WaitForBoot); + $TA->SetConnectTimeout(undef, undef, $WaitForBoot) if ($Booting); my $Success = $TA->Ping(); $TA->Disconnect(); if (!$Success) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index f0a8c69..bb68bd0 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -313,11 +313,20 @@ sub RevertToSnapshot($) my $SnapshotName = $self->{VM}->IdleSnapshot; my ($ErrMessage, $Domain, $Snapshot) = $self->_GetSnapshot($SnapshotName); - return $ErrMessage if (defined $ErrMessage); + return ($ErrMessage, undef) if (defined $ErrMessage); # Note that if the snapshot was of a powered off domain, this boots it up eval { $Snapshot->revert_to(Sys::Virt::DomainSnapshot::REVERT_RUNNING) }; - return $@ ? $self->_Reset(_eval_err()) : undef; + return $self->_Reset(_eval_err(), undef) if ($@); + + my ($State, $Reason) = $Domain->get_state(); + if ($State != Sys::Virt::Domain::STATE_RUNNING) + { + return ($self->{VM}->Name ." is not running (". + _GetStateDescription($State, $Reason) + .") after revert to $SnapshotName", undef); + } + return (undef, $Reason != Sys::Virt::Domain::STATE_RUNNING_FROM_SNAPSHOT); } sub CreateSnapshot($)

1 0

Francois Gouget : testbot/WineRun*: Add GetTaskURL() to link to the task website page.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: tools Branch: master Commit: d899fa2bce76600bae1b93a5d5032a7ee7f9ea95 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d899fa2bce76600bae1b93a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 20 13:56:37 2019 +0200 testbot/WineRun*: Add GetTaskURL() to link to the task website page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- testbot/lib/WineTestBot/Utils.pm | 12 +++++++++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index d987df7..df9fcad 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -467,8 +467,8 @@ elsif ($Step->Type eq "suite") $Script .= "$FileName "; if (defined($WebHostName)) { - my $StepTask = 100 * $StepNo + $TaskNo; - $Script .= "-u \"http://$WebHostName/JobDetails.pl?Key=$JobId&s$StepTask=1#k$StepTask\" "; + my $URL = GetTaskURL($JobId, $StepNo, $TaskNo, 1); + $Script .= "-u ". BatchQuote(MakeSecureURL($URL)) ." "; } my $Tag = $VM->Type ne "win64" ? "" : $Step->FileType eq "exe64" ? "64" : "32"; $Tag = BuildTag($VM->Name, $Tag); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 514c57c..79d7519 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -443,8 +443,8 @@ if ($Step->Type eq "suite") $Script .= "--winetest ". ShQuote($Task->Missions) ." $BaseTag "; if (defined $WebHostName) { - my $StepTask = 100 * $StepNo + $TaskNo; - $Script .= "-u \"http://$WebHostName/JobDetails.pl?Key=$JobId&s$StepTask=1#k$StepTask\" "; + my $URL = GetTaskURL($JobId, $StepNo, $TaskNo, 1); + $Script .= "-u ". ShQuote(MakeSecureURL($URL)) ." "; } my $Info = $VM->Description ? $VM->Description : ""; if ($VM->Details) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 63e8f53..e8ba516 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -27,7 +27,7 @@ WineTestBot::Utils - Utility functions =cut use Exporter 'import'; -our @EXPORT = qw(SecureConnection MakeSecureURL GenerateRandomString +our @EXPORT = qw(SecureConnection MakeSecureURL GetTaskURL GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir GetMTime DurationToString BuildEMailRecipient IsValidFileName BuildTag SanitizeTag LocaleName NotifyAdministrator @@ -55,6 +55,16 @@ sub MakeSecureURL($) return $Protocol . ($ENV{"HTTP_HOST"} || $WebHostName) . $URL; } +sub GetTaskURL($$$;$$) +{ + my ($JobId, $StepNo, $TaskNo, $ShowScreenshot, $ShowLog) = @_; + my $StepTask = 100 * $StepNo + $TaskNo; + my $URL = "/JobDetails.pl?Key=$JobId"; + $URL .= "&s$StepTask=1" if ($ShowScreenshot); + $URL .= "&f$StepTask=$ShowLog" if ($ShowLog); + return "$URL#k$StepTask"; +} + sub DurationToString($;$) { my ($Secs, $Raw) = @_;

1 0

Francois Gouget : testbot: Use $WebHostName as a fallback in MakeSecureURL().
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: tools Branch: master Commit: 0667c75b9014990ad33d54ea4435e243c6ddb500 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0667c75b9014990ad33d54e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 20 13:56:27 2019 +0200 testbot: Use $WebHostName as a fallback in MakeSecureURL(). This allows using MakeSecureURL() outside the CGI scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 25c60d5..63e8f53 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -51,13 +51,8 @@ sub MakeSecureURL($) { my ($URL) = @_; - my $Protocol = "http"; - if ($UseSSL || SecureConnection()) - { - $Protocol .= "s"; - } - - return $Protocol . "://" . $ENV{"HTTP_HOST"} . $URL; + my $Protocol = ($UseSSL || SecureConnection()) ? "https://" : "http://"; + return $Protocol . ($ENV{"HTTP_HOST"} || $WebHostName) . $URL; } sub DurationToString($;$)

1 0

Francois Gouget : testbot: Move SecureConnection() before its first use.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: tools Branch: master Commit: f1402e0dd5d19cc646bd78c02884e4993ebb5efb URL: https://source.winehq.org/git/tools.git/?a=commit;h=f1402e0dd5d19cc646bd78c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 20 13:55:45 2019 +0200 testbot: Move SecureConnection() before its first use. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 309fb19..25c60d5 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -27,7 +27,7 @@ WineTestBot::Utils - Utility functions =cut use Exporter 'import'; -our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString +our @EXPORT = qw(SecureConnection MakeSecureURL GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir GetMTime DurationToString BuildEMailRecipient IsValidFileName BuildTag SanitizeTag LocaleName NotifyAdministrator @@ -42,6 +42,11 @@ use WineTestBot::Config; # Web helpers # +sub SecureConnection() +{ + return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; +} + sub MakeSecureURL($) { my ($URL) = @_; @@ -55,11 +60,6 @@ sub MakeSecureURL($) return $Protocol . "://" . $ENV{"HTTP_HOST"} . $URL; } -sub SecureConnection() -{ - return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; -} - sub DurationToString($;$) { my ($Secs, $Raw) = @_;

1 0

Rémi Bernon : ntoskrnl.exe: Use case-insensitive driver name comparison.
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: wine Branch: master Commit: e6138a52a907fe4b9b03abe0b6cf6cfb9fbc886b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6138a52a907fe4b9b03abe0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 19 13:45:11 2019 +0200 ntoskrnl.exe: Use case-insensitive driver name comparison. For instance winebus driver is sometimes referred as WineBus, when loaded by winedevice.exe, and sometimes as winebus, when loaded from devices. This makes Wine try to load it twice and initializes the backend twice as well. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 18b17f89fd..009b0dda81 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -93,7 +93,7 @@ static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); const UNICODE_STRING *k = key; - return RtlCompareUnicodeString( k, &driver->driver_obj.DriverName, FALSE ); + return RtlCompareUnicodeString( k, &driver->driver_obj.DriverName, TRUE ); } static struct wine_rb_tree wine_drivers = { wine_drivers_rb_compare };

1 0

Alex Henrie : ntdll: Ensure that performance information is initialized (scan-build).
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: wine Branch: master Commit: eb699821d038409591d35a46b6810b2b459080fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb699821d038409591d35a46… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 11 21:05:31 2019 -0600 ntdll: Ensure that performance information is initialized (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 06f8f39b16..5afdf77986 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2439,7 +2439,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( if ((fp = fopen("/proc/meminfo", "r"))) { - unsigned long long totalram, freeram, totalswap, freeswap; + unsigned long long totalram = 0, freeram = 0, totalswap = 0, freeswap = 0; char line[64]; while (fgets(line, sizeof(line), fp)) {

1 0

Chip Davis : include: Pick up the ms_hook_prologue attribute for Clang, too.
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: wine Branch: master Commit: 6e10f8fad3e23f97a2be3b46f8038094284cd068 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e10f8fad3e23f97a2be3b46… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Sep 11 10:34:23 2019 -0500 include: Pick up the ms_hook_prologue attribute for Clang, too. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 67d33f0d78..9c4174f310 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -163,7 +163,11 @@ extern "C" { # define DECLSPEC_HIDDEN #endif -#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6))) && (defined(__i386__) || defined(__x86_64__)) +#ifndef __has_attribute +# define __has_attribute(x) 0 +#endif + +#if ((defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)))) || __has_attribute(ms_hook_prologue)) && (defined(__i386__) || defined(__x86_64__)) #define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__)) #else #define DECLSPEC_HOTPATCH

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2019