October 2017 - Wine-commits

Stefan Dösinger : msvcp: Implement the WCHAR version of _Unlink.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: wine Branch: master Commit: eea0f37a1a8cda59ebcec698356af0cc46f2107b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eea0f37a1a8cda59ebcec6983… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 10 17:09:43 2017 +0200 msvcp: Implement the WCHAR version of _Unlink. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/ios.c | 12 ++++++++++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index b3f2223..4d46be4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1768,8 +1768,8 @@ @ cdecl -arch=win64 ?_Tidy(a)ios_base@std@@AEAAXXZ(ptr) ios_base_Tidy @ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z(str) tr2_sys__Unlink @ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) tr2_sys__Unlink -@ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z -@ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z +@ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z(wstr) tr2_sys__Unlink_wchar +@ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z(wstr) tr2_sys__Unlink_wchar @ cdecl -arch=arm ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ(ptr) basic_streambuf_char__Unlock @ thiscall -arch=i386 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAEXXZ(ptr) basic_streambuf_char__Unlock @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UEAAXXZ(ptr) basic_streambuf_char__Unlock diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 4d4c88e..fd99058 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1768,8 +1768,8 @@ @ cdecl -arch=win64 ?_Tidy(a)ios_base@std@@AEAAXXZ(ptr) msvcp120.?_Tidy(a)ios_base@std@@AEAAXXZ @ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z(str) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z @ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z -@ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z -@ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z +@ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z(wstr) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z +@ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z(wstr) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z @ cdecl -arch=arm ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ(ptr) msvcp120.?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ @ thiscall -arch=i386 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAEXXZ(ptr) msvcp120.?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAEXXZ @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UEAAXXZ(ptr) msvcp120.?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UEAAXXZ diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 80840db..74ff305 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3737,7 +3737,7 @@ @ cdecl _Toupper(long ptr) _Toupper @ cdecl _Towlower(long ptr) _Towlower @ cdecl _Towupper(long ptr) _Towupper -@ stub _Unlink +@ cdecl _Unlink(wstr) tr2_sys__Unlink_wchar @ cdecl _Unlock_shared_ptr_spin_lock() @ stub _WStod @ stub _WStodx diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 28deae0..36e5067 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15060,6 +15060,18 @@ int __cdecl tr2_sys__Unlink(char const* path) return GetLastError(); } +/* ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z */ +/* ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z */ +/* _Unlink */ +int __cdecl tr2_sys__Unlink_wchar(WCHAR const* path) +{ + TRACE("(%s)\n", debugstr_w(path)); + + if(DeleteFileW(path)) + return ERROR_SUCCESS; + return GetLastError(); +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

Francois Gouget : testbot: Rename RevertVM.pl to LibvirtTool.pl to match LibvirtDomain.pm.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: tools Branch: master Commit: 702db480581c1ef33c53ce1e5e11b8a1ce442cf4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=702db480581c1ef33c53ce1e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 9 11:32:06 2017 +0200 testbot: Rename RevertVM.pl to LibvirtTool.pl to match LibvirtDomain.pm. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/{RevertVM.pl => LibvirtTool.pl} | 0 testbot/lib/WineTestBot/VMs.pm | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/LibvirtTool.pl similarity index 100% rename from testbot/bin/RevertVM.pl rename to testbot/bin/LibvirtTool.pl diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 5e4f951..4dd7cc9 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -276,8 +276,8 @@ sub RunRevert($) delete $ENV{ENV}; require WineTestBot::Log; WineTestBot::Log::SetupRedirects(); - exec("$BinDir/RevertVM.pl", $self->GetKey()) or - WineTestBot::Log::LogMsg("Unable to exec RevertVM.pl: $!\n"); + exec("$BinDir/LibvirtTool.pl", $self->GetKey()) or + WineTestBot::Log::LogMsg("Unable to exec LibvirtTool.pl: $!\n"); exit(1); }

1 0

Francois Gouget : testbot: Improve LibvirtTool.pl and make it more easily extensible.
by Alexandre Julliard 10 Oct '17

10 Oct '17

Module: tools Branch: master Commit: f8006d341c4ce1bd05226db613b2b9aeb1b4f769 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f8006d341c4ce1bd05226db6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 9 11:34:26 2017 +0200 testbot: Improve LibvirtTool.pl and make it more easily extensible. Always check the status field before changing it, and always report status change errors. Only notify the administrator that the VM is offline if changing the status to offline succeeded. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 238 +++++++++++++++++++++++++---------------- testbot/lib/WineTestBot/VMs.pm | 2 +- 2 files changed, 149 insertions(+), 91 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 5cbb0bf..aa256f3 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -1,12 +1,12 @@ #!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # -# Reverts a VM so that it is ready to run jobs. Note that in addition to the -# hypervisor revert operation this implies letting the VM settle down and -# checking that it responds to our commands. If this fails the administrator -# is notified and the VM is marked as offline. +# Reverts a VM so that it is ready to run jobs. +# This operation can take quite a bit of time, particularly in case of +# network trouble, and thus is best performed in a separate process. # # Copyright 2009 Ge van Geldorp +# Copyright 2012-2017 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -57,45 +57,41 @@ sub Error(@) LogMsg @_; } -sub FatalError($$) +sub NotifyAdministrator($$) { - my ($ErrMessage, $VM) = @_; - Error $ErrMessage; + my ($Subject, $Body) = @_; - # Get the up-to-date VM status and update it if nobody else changed it - my $VMKey = $VM->GetKey(); - $VM = CreateVMs()->GetItem($VMKey); - if ($VM->Status eq "reverting" or $VM->Status eq "sleeping") + if (open(my $fh, "|/usr/sbin/sendmail -oi -t -odq")) { - $VM->Status("offline"); - $VM->ChildPid(undef); - $VM->Save(); - } - - my $VMSnapshot = $VM->IdleSnapshot; - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); - print SENDMAIL <<"EOF"; + LogMsg "Notifying administrator: $Subject\n"; + print $fh <<"EOF"; From: $RobotEMail To: $AdminEMail -Subject: VM $VMKey offline - -Reverting $VMKey to $VMSnapshot failed: +Subject: $Subject -$ErrMessage - -The VM has been put offline. +$Body EOF - close(SENDMAIL); - - exit 1; + close($fh); + } + else + { + LogMsg "Could not send administrator notification: $!\n"; + LogMsg " Subject: $Subject\n"; + LogMsg " Body: $Body\n"; + } } + +# +# Setup and command line processing +# + $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; # Grab the command line options -my ($Usage, $VMKey); +my ($Usage, $Action, $VMKey); while (@ARGV) { my $Arg = shift @ARGV; @@ -103,6 +99,10 @@ while (@ARGV) { $Debug = 1; } + elsif ($Arg eq "revert") + { + $Action = $Arg; + } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; @@ -127,8 +127,14 @@ while (@ARGV) } # Check parameters +my $VM; if (!defined $Usage) { + if (!defined $Action) + { + Error "you must specify the action to perform\n"; + $Usage = 2; + } if (!defined $VMKey) { Error "you must specify the VM name\n"; @@ -137,92 +143,144 @@ if (!defined $Usage) elsif ($VMKey =~ /^([a-zA-Z0-9_]+)$/) { $VMKey = $1; + $VM = CreateVMs()->GetItem($VMKey); + if (!defined $VM) + { + Error "VM $VMKey does not exist\n"; + $Usage = 2; + } } else { Error "'$VMKey' is not a valid VM name\n"; $Usage = 2; } - } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--help] VMName\n"; - exit $Usage; + print "Usage: $Name0 [--debug] [--help] revert VMName\n"; + exit $Usage; } -my $VM = CreateVMs()->GetItem($VMKey); -if (!defined $VM) -{ - Error "VM $VMKey does not exist\n"; - exit 1; -} -if (!$Debug and $VM->Status ne "reverting") -{ - FatalError "The VM is not ready to be reverted (" . $VM->Status . ")\n", $VM; -} + +# +# Main +# + my $Start = Time(); -LogMsg "Reverting $VMKey to ", $VM->IdleSnapshot, "\n"; -# Some QEmu/KVM versions are buggy and cannot revert a running VM -Debug(Elapsed($Start), " Powering off the VM\n"); -my $Domain = $VM->GetDomain(); -my $ErrMessage = $Domain->PowerOff(1); -if (defined $ErrMessage) -{ - Error "$ErrMessage\n"; - LogMsg "Trying the revert anyway\n"; -} +my $CurrentStatus; -Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n"); -$ErrMessage = $Domain->RevertToSnapshot(); -if (defined($ErrMessage)) +sub FatalError($) { - FatalError "Could not revert $VMKey to " . $VM->IdleSnapshot . ": $ErrMessage\n", - $VM; + my ($ErrMessage) = @_; + Error $ErrMessage; + + # Put the VM offline if nobody else modified its status before us + $VM = CreateVMs()->GetItem($VMKey); + $VM->Status("offline") if ($VM->Status eq $CurrentStatus); + $VM->ChildPid(undef); + my ($ErrProperty, $SaveErrMessage) = $VM->Save(); + if (defined $SaveErrMessage) + { + LogMsg "Could not put the $VMKey VM offline: $SaveErrMessage ($ErrProperty)\n"; + } + elsif ($VM->Status eq "offline") + { + NotifyAdministrator("Putting the $VMKey VM offline", + "Could not perform the $Action operation on the $VMKey VM:\n". + "\n$ErrMessage\n". + "The VM has been put offline."); + } + exit 1; } -# Get the up-to-date VM status and exit if someone else changed it -$VM = CreateVMs()->GetItem($VMKey); -exit 1 if ($VM->Status ne "reverting"); -$VM->Status("sleeping"); -(my $ErrProperty, $ErrMessage) = $VM->Save(); -if (defined($ErrMessage)) +sub ChangeStatus($$;$) { - FatalError "Could not change status for VM $VMKey: $ErrMessage\n", $VM; + my ($From, $To, $Done) = @_; + + # Get the up-to-date VM status + $VM = CreateVMs()->GetItem($VMKey); + if (!$VM or (defined $From and $VM->Status ne $From)) + { + LogMsg "Not changing status\n"; + return undef; + } + + $VM->Status($To); + $VM->ChildPid(undef) if ($Done); + my ($ErrProperty, $ErrMessage) = $VM->Save(); + if (defined $ErrMessage) + { + FatalError("Could not change the $VMKey VM status: $ErrMessage\n"); + } + $CurrentStatus = $To; + return 1; } -Debug(Elapsed($Start), " Trying the TestAgent connection\n"); -LogMsg "Waiting for ", $VM->Name, " (up to ${WaitForToolsInVM}s per attempt)\n"; -my $TA = $VM->GetAgent(); -$TA->SetConnectTimeout($WaitForToolsInVM); -my $Success = $TA->Ping(); -$TA->Disconnect(); -if (!$Success) +sub Revert() { - $ErrMessage = $TA->GetLastError(); - FatalError "Tools in $VMKey not responding: $ErrMessage\n", $VM; + my $VM = CreateVMs()->GetItem($VMKey); + if (!$Debug and $VM->Status ne "reverting") + { + Error("The VM is not ready to be reverted (". $VM->Status .")\n"); + return 1; + } + $CurrentStatus = "reverting"; + + # Some QEmu/KVM versions are buggy and cannot revert a running VM + Debug(Elapsed($Start), " Powering off the VM\n"); + my $Domain = $VM->GetDomain(); + my $ErrMessage = $Domain->PowerOff(1); + if (defined $ErrMessage) + { + LogMsg "Could not power off $VMKey: $ErrMessage\n"; + LogMsg "Trying the revert anyway...\n"; + } + + Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n"); + $ErrMessage = $Domain->RevertToSnapshot(); + if (defined $ErrMessage) + { + FatalError("Could not revert $VMKey to ". $VM->IdleSnapshot .": $ErrMessage\n"); + } + + # The VM is now sleeping which may allow some tasks to run + return 1 if (!ChangeStatus("reverting", "sleeping")); + + Debug(Elapsed($Start), " Trying the TestAgent connection\n"); + LogMsg "Waiting for ". $VM->Name ." (up to ${WaitForToolsInVM}s per attempt)\n"; + my $TA = $VM->GetAgent(); + $TA->SetConnectTimeout($WaitForToolsInVM); + my $Success = $TA->Ping(); + $TA->Disconnect(); + if (!$Success) + { + $ErrMessage = $TA->GetLastError(); + FatalError("Cannot connect to the $VMKey TestAgent: $ErrMessage\n"); + } + + if ($SleepAfterRevert != 0) + { + Debug(Elapsed($Start), " Sleeping\n"); + LogMsg "Letting ". $VM->Name ." settle down for ${SleepAfterRevert}s\n"; + sleep($SleepAfterRevert); + } + + return ChangeStatus("sleeping", "idle", "done") ? 0 : 1; } -if ($SleepAfterRevert != 0) + +my $Rc; +if ($Action eq "revert") { - Debug(Elapsed($Start), " Sleeping\n"); - LogMsg "Letting ", $VM->Name, " settle for ${SleepAfterRevert}s\n"; - sleep($SleepAfterRevert); + $Rc = Revert(); } -Debug(Elapsed($Start), " Done\n"); - -# Get the up-to-date VM status and exit if someone else changed it -$VM = CreateVMs()->GetItem($VMKey); -exit 1 if ($VM->Status ne "sleeping"); -$VM->Status("idle"); -$VM->ChildPid(undef); -($ErrProperty, $ErrMessage) = $VM->Save(); -if (defined($ErrMessage)) +else { - FatalError "Could not change status for VM $VMKey: $ErrMessage\n", $VM; + Error("Unsupported action $Action!\n"); + $Rc = 1; } +LogMsg "$Action on $VMKey completed in ", Elapsed($Start), " s\n"; -LogMsg "Revert of $VMKey completed in ", Elapsed($Start), " s\n"; - -exit 0; +exit $Rc; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 4dd7cc9..1c6cdd7 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -276,7 +276,7 @@ sub RunRevert($) delete $ENV{ENV}; require WineTestBot::Log; WineTestBot::Log::SetupRedirects(); - exec("$BinDir/LibvirtTool.pl", $self->GetKey()) or + exec("$BinDir/LibvirtTool.pl", "revert", $self->GetKey()) or WineTestBot::Log::LogMsg("Unable to exec LibvirtTool.pl: $!\n"); exit(1); }

1 0

Dmitry Kislyuk : vbscript: Improve parsing of separators in loops and switches.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 56b31ba2e11ccc46584b0a1d96c27dd310d18eeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b31ba2e11ccc46584b0a1d9… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Fri Oct 6 16:27:44 2017 -0500 vbscript: Improve parsing of separators in loops and switches. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 6 ++++-- dlls/vbscript/tests/lang.vbs | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 6b303ee..beb4e4c 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -164,7 +164,7 @@ StatementsNl | StatementNl StatementsNl { $$ = link_statements($1, $2); } StatementNl - : Statement tNL { $$ = $1; } + : Statement tNL { $$ = $1; } Statement : ':' { $$ = NULL; } @@ -448,10 +448,12 @@ Identifier : tIdentifier { $$ = $1; } | tPROPERTY { $$ = propertyW; } -/* Some statements accept both new line and ':' as a separator */ +/* Most statements accept both new line and ':' as separators */ StSep : tNL | ':' + | tNL StSep + | ':' StSep %% diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 23402cd..7f7c835 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -330,6 +330,13 @@ WHILE x < 3 : x = x + 1 Wend Call ok(x = 3, "x not equal to 3") +z = 2 +while z > -4 : + + +z = z -2 +wend + x = false y = false do while not (x and y) @@ -353,6 +360,12 @@ Do While x < 2 : x = x + 1 Loop Call ok(x = 2, "x not equal to 2") +x = 0 +Do While x >= -2 : +x = x - 1 +Loop +Call ok(x = -3, "x not equal to -3") + x = false y = false do until x and y @@ -376,6 +389,14 @@ Do: :: x = x + 2 Loop Until x = 4 Call ok(x = 4, "x not equal to 4") +x = 5 +Do: : + +: x = x * 2 +Loop Until x = 40 +Call ok(x = 40, "x not equal to 40") + + x = false do if x then exit do @@ -495,6 +516,12 @@ for x = 1 to 100 Call ok(false, "exit for not escaped the loop?") next +for x = 1 to 5 : +: +: :exit for + Call ok(false, "exit for not escaped the loop?") +next + do while true for x = 1 to 100 exit do @@ -509,6 +536,14 @@ wend Call collectionObj.reset() y = 0 +for each x in collectionObj : + + :y = y + 3 +next +Call ok(y = 9, "y = " & y) + +Call collectionObj.reset() +y = 0 x = 10 z = 0 for each x in collectionObj : z = z + 2 @@ -611,6 +646,21 @@ select case 2: case 5,6,7: Call ok(false, "unexpected case") end select Call ok(x, "wrong case") +x = False +select case 1 : + + :case 3, 4 : + + + case 5 +: + Call ok(false, "unexpected case") : + Case Else: + + x = True +end select +Call ok(x, "wrong case") + if false then Sub testsub x = true

1 0

Hugh McMaster : reg/tests: Add REG_BINARY to the empty hex data import tests.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 6607065356381941e4ffbb7d07b5a8b78b7e93a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6607065356381941e4ffbb7d0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 9 11:46:58 2017 +0000 reg/tests: Add REG_BINARY to the empty hex data import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e93062b..3a3ff8d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2354,7 +2354,8 @@ static void test_import(void) "\"Wine68d\"=hex(4):\n" "\"Wine68e\"=hex(7):\n" "\"Wine68f\"=hex(100):\n" - "\"Wine68g\"=hex(abcd):\n\n", &r); + "\"Wine68g\"=hex(abcd):\n" + "\"Wine68h\"=hex:\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "Wine68a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); @@ -2363,6 +2364,7 @@ static void test_import(void) verify_reg(hkey, "Wine68e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine68f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine68g", 0xabcd, NULL, 0, 0); + verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3852,7 +3854,8 @@ static void test_unicode_import(void) "\"Wine68d\"=hex(4):\n" "\"Wine68e\"=hex(7):\n" "\"Wine68f\"=hex(100):\n" - "\"Wine68g\"=hex(abcd):\n\n", &r); + "\"Wine68g\"=hex(abcd):\n" + "\"Wine68h\"=hex:\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "Wine68a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); @@ -3861,6 +3864,7 @@ static void test_unicode_import(void) verify_reg(hkey, "Wine68e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine68f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine68g", 0xabcd, NULL, 0, 0); + verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : regedit/tests: Add REG_BINARY to the empty hex data import tests.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 1e6bf7d996c6013e0a0fa3baa104811605720527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6bf7d996c6013e0a0fa3baa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 9 11:46:58 2017 +0000 regedit/tests: Add REG_BINARY to the empty hex data import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 79640a5..3e949a5 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -652,7 +652,8 @@ static void test_basic_import(void) "\"Wine22d\"=hex(4):\n" "\"Wine22e\"=hex(7):\n" "\"Wine22f\"=hex(100):\n" - "\"Wine22g\"=hex(abcd):\n\n"); + "\"Wine22g\"=hex(abcd):\n" + "\"Wine22h\"=hex:\n\n"); verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); @@ -660,6 +661,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); + verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); RegCloseKey(hkey); @@ -1066,7 +1068,8 @@ static void test_basic_import_unicode(void) "\"Wine22d\"=hex(4):\n" "\"Wine22e\"=hex(7):\n" "\"Wine22f\"=hex(100):\n" - "\"Wine22g\"=hex(abcd):\n\n"); + "\"Wine22g\"=hex(abcd):\n" + "\"Wine22h\"=hex:\n\n"); verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); @@ -1074,6 +1077,7 @@ static void test_basic_import_unicode(void) verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); + verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); RegCloseKey(hkey);

1 0

Andrey Gusev : hid/tests: Remove redundant comparison.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: d4ea289dc189520735f226cf8282dd1c1e0d3d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ea289dc189520735f226cf8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 9 15:10:22 2017 +0300 hid/tests: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index ef2f729..ce9b3a5 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -167,7 +167,7 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D { ULONG usage_length = 100; status = HidP_GetUsages(HidP_Input, i, 0, button_pages, &usage_length, ppd, data, data_length); - ok (status == HIDP_STATUS_SUCCESS || (status != HIDP_STATUS_SUCCESS && usage_length == 0), + ok (status == HIDP_STATUS_SUCCESS || usage_length == 0, "HidP_GetUsages failed (%x) but usage length still %i\n", status, usage_length); if (usage_length) {

1 0

Andrey Gusev : winspool.drv: Avoid bitwise operation.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: b7987c6b32bcad1e8f282adee5e2cbd4b5ccacda URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7987c6b32bcad1e8f282adee… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 9 16:03:05 2017 +0300 winspool.drv: Avoid bitwise operation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f09745d..9c24256 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -606,7 +606,7 @@ static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) res = AddPrinterDriverExW( NULL, 3, (LPBYTE)&di3, APD_COPY_NEW_FILES | APD_COPY_FROM_DIRECTORY ); TRACE("got %d and %d for %s (%s)\n", res, GetLastError(), debugstr_w(name), debugstr_w(di3.pEnvironment)); - if (!res & (GetLastError() != ERROR_PRINTER_DRIVER_ALREADY_INSTALLED)) + if (!res && (GetLastError() != ERROR_PRINTER_DRIVER_ALREADY_INSTALLED)) { ERR("failed with %u for %s (%s) %s\n", GetLastError(), debugstr_w(name), debugstr_w(di3.pEnvironment), debugstr_w(di3.pDriverPath));

1 0

Andrey Gusev : quartz: Remove redundant comparison.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 8273fc88c9a31728d910b6e6b281a30b0fc7c1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8273fc88c9a31728d910b6e6b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 9 14:45:13 2017 +0300 quartz: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index b6fd9f1..f3ecced 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1115,8 +1115,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, pos += sizeof(RIFFCHUNK) + list.cb; hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); } - while (hr == S_OK && (list.fcc != FOURCC_LIST || - (list.fcc == FOURCC_LIST && list.fccListType != listtypeAVIMOVIE))); + while (hr == S_OK && (list.fcc != FOURCC_LIST || list.fccListType != listtypeAVIMOVIE)); if (hr != S_OK) {

1 0

Huw Davies : ntdll: Add free list buckets for every arena size up to 0x100.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 2175852f5a45eebef5dcbbad9906509e736d596a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2175852f5a45eebef5dcbbad9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 9 13:15:52 2017 +0100 ntdll: Add free list buckets for every arena size up to 0x100. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index f928ebf..ca08f9d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -105,6 +105,7 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); /* minimum data size (without arenas) of an allocated block */ /* make sure that it's larger than a free list entry */ #define HEAP_MIN_DATA_SIZE ROUND_SIZE(2 * sizeof(struct list)) +#define HEAP_MIN_ARENA_SIZE (HEAP_MIN_DATA_SIZE + sizeof(ARENA_INUSE)) /* minimum size that must remain to shrink an allocated block */ #define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) /* minimum size to start allocating large blocks */ @@ -113,12 +114,17 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); #define HEAP_TAIL_EXTRA_SIZE(flags) \ ((flags & HEAP_TAIL_CHECKING_ENABLED) || RUNNING_ON_VALGRIND ? ALIGNMENT : 0) -/* Max size of the blocks on the free lists */ +/* There will be a free list bucket for every arena size up to and including this value */ +#define HEAP_MAX_SMALL_FREE_LIST 0x100 +C_ASSERT( HEAP_MAX_SMALL_FREE_LIST % ALIGNMENT == 0 ); +#define HEAP_NB_SMALL_FREE_LISTS (((HEAP_MAX_SMALL_FREE_LIST - HEAP_MIN_ARENA_SIZE) / ALIGNMENT) + 1) + +/* Max size of the blocks on the free lists above HEAP_MAX_SMALL_FREE_LIST */ static const SIZE_T HEAP_freeListSizes[] = { - 0x10, 0x20, 0x30, 0x40, 0x60, 0x80, 0x100, 0x200, 0x400, 0x1000, ~0UL + 0x200, 0x400, 0x1000, ~0UL }; -#define HEAP_NB_FREE_LISTS (sizeof(HEAP_freeListSizes)/sizeof(HEAP_freeListSizes[0])) +#define HEAP_NB_FREE_LISTS (sizeof(HEAP_freeListSizes) / sizeof(HEAP_freeListSizes[0]) + HEAP_NB_SMALL_FREE_LISTS) typedef union { @@ -303,8 +309,11 @@ static inline unsigned int get_freelist_index( SIZE_T size ) { unsigned int i; - size -= sizeof(ARENA_FREE); - for (i = 0; i < HEAP_NB_FREE_LISTS - 1; i++) if (size <= HEAP_freeListSizes[i]) break; + if (size <= HEAP_MAX_SMALL_FREE_LIST) + return (size - HEAP_MIN_ARENA_SIZE) / ALIGNMENT; + + for (i = HEAP_NB_SMALL_FREE_LISTS; i < HEAP_NB_FREE_LISTS - 1; i++) + if (size <= HEAP_freeListSizes[i - HEAP_NB_SMALL_FREE_LISTS]) break; return i; } @@ -338,7 +347,8 @@ static void HEAP_Dump( HEAP *heap ) DPRINTF( "\nFree lists:\n Block Stat Size Id\n" ); for (i = 0; i < HEAP_NB_FREE_LISTS; i++) DPRINTF( "%p free %08lx prev=%p next=%p\n", - &heap->freeList[i].arena, HEAP_freeListSizes[i], + &heap->freeList[i].arena, i < HEAP_NB_SMALL_FREE_LISTS ? + HEAP_MIN_ARENA_SIZE + i * ALIGNMENT : HEAP_freeListSizes[i - HEAP_NB_SMALL_FREE_LISTS], LIST_ENTRY( heap->freeList[i].arena.entry.prev, ARENA_FREE, entry ), LIST_ENTRY( heap->freeList[i].arena.entry.next, ARENA_FREE, entry ));

1 0