September 2019 - Wine-devel

[PATCH] kernelbase: Fix PathAllocCanonicalize handling segments that contain dots.
by Zhiyi Zhang 18 Sep '19

18 Sep '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47766 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/kernelbase/path.c | 168 ++++++++++++++++++++++------------- dlls/kernelbase/tests/path.c | 34 +++++++ 2 files changed, 138 insertions(+), 64 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 82708be544..e2cff64f5a 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -200,8 +200,9 @@ static const WCHAR *get_root_end(const WCHAR *path) HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **path_out) { - WCHAR *buffer, *dst; - const WCHAR *src; + WCHAR *buffer, *dst, *old_dst; + const WCHAR *src, *old_src; + const WCHAR *segment_start; const WCHAR *root_end; SIZE_T buffer_size, length; @@ -263,78 +264,89 @@ HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR ** dst += root_end - buffer + 1; } - while (*src) + /* If segment normalization is on, remove trailing dots in the root segment */ + if (!(flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS)) { - if (src[0] == '.') + old_src = src; + while (*src && *src == '.') + ++src; + + /* Not trailing dots, don't remove */ + if (*src) + { + src = old_src; + } + /* At least have one dot */ + else if (src > old_src) { - if (src[1] == '.') + /* If X:\ is incomplete, complete it */ + if (iswalpha(buffer[0]) && buffer[1] == ':' && buffer[2] != '\\') { - /* Keep one . after * */ - if (dst > buffer && dst[-1] == '*') - { - *dst++ = *src++; - continue; - } + root_end = buffer + 2; + dst = buffer + 3; + buffer[2] = '\\'; + /* If the next character is \, skip it to avoid duplicated \ */ + if (src[0] == '\\') + ++src; + } + } + } - /* Keep the . if one of the following is true: - * 1. PATHCCH_DO_NOT_NORMALIZE_SEGMENTS - * 2. in form of a..b - */ - if (dst > buffer - && (((flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS) && dst[-1] != '\\') - || (dst[-1] != '\\' && src[2] != '\\' && src[2]))) - { - *dst++ = *src++; - *dst++ = *src++; - continue; - } + /* Dots after X: are part of the root segment */ + if (iswalpha(buffer[0]) && buffer[1] == ':' && !buffer[2]) + { + while (*src && *src == '.') + *dst++ = *src++; + } - /* Remove the \ before .. if the \ is not part of root */ - if (dst > buffer && dst[-1] == '\\' && (!root_end || dst - 1 > root_end)) + while (*src) + { + /* .. up one level */ + if (src[0] == '.' && src[1] == '.' && (src[2] == '\\' || !src[2])) + { + /* Remove the \ before .. if the \ is not part of root */ + if (dst > buffer && dst[-1] == '\\' && (!root_end || dst - 1 > root_end)) + { + *--dst = 0; + /* Remove characters until a \ is encountered */ + while (dst > buffer) { - *--dst = '\0'; - /* Remove characters until a \ is encountered */ - while (dst > buffer) + if (dst[-1] == '\\') { - if (dst[-1] == '\\') - { - *--dst = 0; - break; - } - else - *--dst = 0; + *--dst = 0; + break; } + else + *--dst = 0; } - /* Remove the extra \ after .. if the \ before .. wasn't deleted */ - else if (src[2] == '\\') - src++; - - src += 2; } - else - { - /* Keep the . if one of the following is true: - * 1. PATHCCH_DO_NOT_NORMALIZE_SEGMENTS - * 2. in form of a.b, which is used in domain names - * 3. *. - */ - if (dst > buffer - && ((flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS && dst[-1] != '\\') - || (dst[-1] != '\\' && src[1] != '\\' && src[1]) || (dst[-1] == '*'))) - { - *dst++ = *src++; - continue; - } - - /* Remove the \ before . if the \ is not part of root */ - if (dst > buffer && dst[-1] == '\\' && (!root_end || dst - 1 > root_end)) dst--; - /* Remove the extra \ after . if the \ before . wasn't deleted */ - else if (src[1] == '\\') - src++; + /* Remove the extra \ after .. if the \ before .. wasn't deleted */ + else if (src[2] == '\\') + ++src; - src++; + src += 2; + /* If X:\ is not complete, then complete it */ + if (iswalpha(buffer[0]) && buffer[1] == ':' && buffer[2] != '\\') + { + root_end = buffer + 2; + dst = buffer + 3; + buffer[2] = '\\'; + /* If the next character is \, skip it to avoid duplicated \ */ + if (src[0] == '\\') + ++src; } - + } + /* . current level */ + else if (src[0] == '.' && (src[1] == '\\' || !src[1])) + { + /* Remove the \ before . if the \ is not part of root */ + if (dst > buffer && dst[-1] == '\\' && (!root_end || dst - 1 > root_end)) + *--dst = 0; + /* Remove the extra \ after . if the \ before . wasn't deleted */ + else if (src[1] == '\\') + ++src; + + ++src; /* If X:\ is not complete, then complete it */ if (iswalpha(buffer[0]) && buffer[1] == ':' && buffer[2] != '\\') { @@ -345,9 +357,37 @@ HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR ** if (src[0] == '\\') src++; } } - /* Copy over */ - else + /* *\.+ */ + else if (!(flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS) && src[0] == '*' && src[1] == '.') + { + /* Keep only one . after * */ *dst++ = *src++; + *dst++ = *src++; + while (*src == '.') + ++src; + } + /* Normal segments */ + else + { + segment_start = dst; + /* Copy the whole segment */ + while (*src && *src != '\\') + *dst++ = *src++; + + /* Remove trailing dots, aka segment normalization */ + if (!(flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS)) + { + old_dst = dst; + while (dst > segment_start && (dst[-1] == '.')) + --dst; + /* Not trailing dots, don't remove */ + if (dst == segment_start) + dst = old_dst; + } + + if (*src == '\\') + *dst++ = *src++; + } } /* End the path */ *dst = 0; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index b5da303629..d7492a1e9f 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -72,6 +72,7 @@ static const struct alloccanonicalize_test alloccanonicalize_tests[] = {"\\\\?C:a", "\\\\?C:a", 0, S_OK}, /* No . */ + {"*", "*", 0, S_OK}, {"", "\\", 0, S_OK}, {"C:", "C:", 0, S_OK}, {"C:\\", "C:\\", 0, S_OK}, @@ -85,17 +86,26 @@ static const struct alloccanonicalize_test alloccanonicalize_tests[] = {"*.", "*.", 0, S_OK}, {"*..", "*.", 0, S_OK}, {"*...", "*.", 0, S_OK}, + {"*....", "*.", 0, S_OK}, + {".a", ".a", 0, S_OK}, {"a.", "a", 0, S_OK}, + {".a.", ".a", 0, S_OK}, {"a.b", "a.b", 0, S_OK}, + {".a.b.", ".a.b", 0, S_OK}, {"a\\.", "a", 0, S_OK}, {"a\\.\\b", "a\\b", 0, S_OK}, + {":.", ":", 0, S_OK}, {"C:.", "C:\\", 0, S_OK}, + {"C:.\\", "C:.\\", 0, S_OK}, + {"C:.\\.", "C:\\", 0, S_OK}, {"C:\\.", "C:\\", 0, S_OK}, {"C:\\.\\", "C:\\", 0, S_OK}, {"C:\\a.", "C:\\a", 0, S_OK}, + {"C:\\.a", "C:\\.a", 0, S_OK}, {"C:\\a\\.", "C:\\a", 0, S_OK}, {"C:\\a\\\\.", "C:\\a\\", 0, S_OK}, {"C:\\a\\\\\\.", "C:\\a\\\\", 0, S_OK}, + {".\\", "\\", 0, S_OK}, {"\\.", "\\", 0, S_OK}, {"\\\\.", "\\\\", 0, S_OK}, {"\\\\.\\", "\\\\", 0, S_OK}, @@ -115,21 +125,42 @@ static const struct alloccanonicalize_test alloccanonicalize_tests[] = "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", 0, S_OK}, /* .. */ + {"..a", "..a", 0, S_OK}, + {"...a", "...a", 0, S_OK}, + {"....a", "....a", 0, S_OK}, {"a..", "a", 0, S_OK}, + {"a...", "a", 0, S_OK}, + {"a....", "a", 0, S_OK}, + {"..a..", "..a", 0, S_OK}, {"a..b", "a..b", 0, S_OK}, + {"..a..b..", "..a..b", 0, S_OK}, {"a\\..", "\\", 0, S_OK}, {"a\\..\\", "\\", 0, S_OK}, {"a\\..\\b", "\\b", 0, S_OK}, + {":..", ":", 0, S_OK}, {"C:..", "C:\\", 0, S_OK}, + {"C:...", "C:\\", 0, S_OK}, + {"C:..\\", "C:..\\", 0, S_OK}, + {"C:..\\\\", "C:..\\\\", 0, S_OK}, + {"C:...\\", "C:...\\", 0, S_OK}, {"C:\\..", "C:\\", 0, S_OK}, + {"C:\\..a", "C:\\..a", 0, S_OK}, + {"C:\\...a", "C:\\...a", 0, S_OK}, + {"C:\\....a", "C:\\....a", 0, S_OK}, + {"C:\\a..", "C:\\a", 0, S_OK}, {"C:\\\\..", "C:\\", 0, S_OK}, {"C:\\..\\", "C:\\", 0, S_OK}, + {"C:\\...\\", "C:\\...\\", 0, S_OK}, {"C:\\a\\..", "C:\\", 0, S_OK}, + {"C:\\a\\b..", "C:\\a\\b", 0, S_OK}, {"C:\\a\\\\..", "C:\\a", 0, S_OK}, {"C:\\a\\\\\\..", "C:\\a\\", 0, S_OK}, {"C:\\a\\..\\b", "C:\\b", 0, S_OK}, {"C:\\a\\..\\\\b", "C:\\\\b", 0, S_OK}, + {"..\\", "\\", 0, S_OK}, + {"...\\", "...\\", 0, S_OK}, {"\\..", "\\", 0, S_OK}, + {"\\...", "\\", 0, S_OK}, {"\\\\..", "\\\\", 0, S_OK}, {"\\\\\\..", "\\", 0, S_OK}, {"\\\\..\\", "\\\\", 0, S_OK}, @@ -249,6 +280,8 @@ static const struct alloccanonicalize_test alloccanonicalize_tests[] = /* PATHCCH_DO_NOT_NORMALIZE_SEGMENTS */ /* No effect for spaces */ + {"a ", "a ", 0, S_OK}, + {"C:\\a ", "C:\\a ", 0, S_OK}, {"C:\\a \\", "C:\\a \\", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"C:\\a\\ ", "C:\\a\\ ", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"C:\\a ", "C:\\a ", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, @@ -265,6 +298,7 @@ static const struct alloccanonicalize_test alloccanonicalize_tests[] = {"..", "\\", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"C:.", "C:.", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"C:..", "C:..", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"C:...", "C:...", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"C:\\a\\.", "C:\\a", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"C:\\a\\..", "C:\\", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"C:\\a.", "C:\\a.", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, -- 2.20.1

1 0

[PATCH] testbot/TestAgent: Modify and document the connection timeout handling.
by Francois Gouget 18 Sep '19

18 Sep '19

The new model better handles the case where we need to wait for the VM to boot before we can connect to the testagentd server. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 9 +- testbot/lib/WineTestBot/Config.pm | 15 ++- testbot/lib/WineTestBot/TestAgent.pm | 169 ++++++++++++++++++++++++--- testbot/lib/WineTestBot/VMs.pm | 8 +- testbot/scripts/SetWinLocale | 2 +- testbot/scripts/TestAgent | 30 +++-- 6 files changed, 181 insertions(+), 52 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 5c3906503..f15bab70b 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -408,12 +408,11 @@ sub Revert() # The VM is now sleeping which may allow some tasks to run return 1 if (ChangeStatus("reverting", "sleeping")); - # Check the TestAgent connection. Note that this may take some time - # if the VM needs to boot first. - Debug(Elapsed($Start), " Trying the TestAgent connection\n"); - LogMsg "Waiting for ". $VM->Name ." (up to ${WaitForToolsInVM}s per attempt)\n"; + # Verify that the TestAgent server accepts connections + Debug(Elapsed($Start), " Verifying the TestAgent server\n"); + LogMsg "Verifying the $VMKey TestAgent server\n"; my $TA = $VM->GetAgent(); - $TA->SetConnectTimeout($WaitForToolsInVM, undef, $WaitForToolsInVM); + $TA->SetConnectTimeout(undef, undef, $WaitForBoot); my $Success = $TA->Ping(); $TA->Disconnect(); if (!$Success) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 3d9214bae..3496c310e 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -28,7 +28,7 @@ WineTestBot::Config - Site-independent configuration settings use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir %RepoURLs $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs - $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM + $MaxVMsWhenIdle $SleepAfterRevert $WaitForBoot $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout @@ -44,7 +44,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir %RepoURLs $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs - $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM + $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForBoot $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout @@ -90,14 +90,13 @@ $MaxActiveVMs = 2; $MaxRunningVMs = 1; $MaxVMsWhenIdle = undef; -# How long to wait for each of the 3 connection attempts to the VM's TestAgent -# server after a revert (in seconds). If there are powered off snapshots this -# must be long enough for the VM to boot up first. -$WaitForToolsInVM = 30; -# How long to let the VM settle down after the revert before starting a task on +# How long to attempt to connect to the TestAgent while the VM is booting. +$WaitForBoot = 90; +# How long to let the VM settle down after a revert before starting a task on # it (in seconds). $SleepAfterRevert = 0; -# Take into account $WaitForToolsInVM and $SleepAfterRevert +# How long to wait before considering a VM operation is stuck. In particular +# for reverts this should take into account the time it may need to boot. $VMToolTimeout = 6 * 60; # After three consecutive failures to revert a VM, put it in maintenance mode. diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index d3d7137a5..8d7f456fd 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -101,9 +101,9 @@ sub new($$$;$) agenthost => $Hostname, agentport => $Port, connection => "$Hostname:$Port", - ctimeout => 20, - cattempts => 3, - cinterval => 0, + conetimeout => 20, + cminattempts => 2, + cmintimeout => 10, timeout => 0, fd => undef, deadline => undef, @@ -140,28 +140,103 @@ sub Disconnect($) $self->{agentversion} = undef; } +=pod +=over 12 + +=item C<SetConnectTimeout()> + +Configures how many times and for how long to attempt to connect to the server. + +=item OneTimeout + +OneTimeout specifies the timeout for one connection attempt in seconds. +Zero means there will be no timeout. Undef means the value is not changed. + +=item MinAttempts + +MinAttempts specifies the minimum number of connection attempts. It must be a +non-zero positive integer. Undef means the value is not changed. + +=item MinTimeout + +MinTimeout specifies the minimum period during which connection attempts should +be made in seconds. Zero means there will be no minimum timeout. Undef means +the value is not changed. + +This means connection attempts will be made until either one succeeds or +MinTimeout seconds have elapsed, even if each attempt fails quickly such that +more than $MinAttempts attempts are performed. Conversely, if each attempt +takes a long time such that more MinTimeout is reached before MinAttempt +connection attempts have been made, then attempts will continue until the +minimum number of attempts is reached. + +Thus the worst case connection timeout is: + + max($MinAttempts * $OneTimeout, $MinTimeout + $OneTimeout) + +=item Return value + +For each modified value (i.e. not undef), the old value is returned. + +=item Usage + +To perform a single connection attempt with a 20 second timeout: + + $TA->SetConnectionTimeout(20, 1, 0); + +For a bit more robustness in case one expects short network disruptions: + + $TA->SetConnectionTimeout(20, 2, 10); + +But if the server needs time to boot before accepting connections, then +MinTimeout should be set to the amount of time this is expected to take. It +would make sense to reset MinTimeout after the first RPC has completed since +then a reconnection would not have to wait for the server to boot again: + + my $OldMinTimeout = $TA->SetConnectionTimeout(undef, undef, 90); + + ... first RPC ... + + $TA->SetConnectionTimeout(undef, undef, $OldMinTimeout); + +=back +=cut + sub SetConnectTimeout($$;$$) { - my ($self, $Timeout, $Attempts, $Interval) = @_; + my ($self, $OneTimeout, $MinAttempts, $MinTimeout) = @_; my @Ret; - if (defined $Timeout) + if (defined $OneTimeout) { - push @Ret, $self->{ctimeout}; - $self->{ctimeout} = $Timeout; + push @Ret, $self->{conetimeout}; + $self->{conetimeout} = $OneTimeout; } - if (defined $Attempts) + if (defined $MinAttempts) { - push @Ret, $self->{cattempts}; - $self->{cattempts} = $Attempts; + push @Ret, $self->{cminattempts}; + $self->{cminattempts} = $MinAttempts; } - if (defined $Interval) + if (defined $MinTimeout) { - push @Ret, $self->{cinterval}; - $self->{cinterval} = $Interval; + push @Ret, $self->{cmintimeout}; + $self->{cmintimeout} = $MinTimeout; } return @Ret; } +=pod +=over 12 + +=item C<SetTimeout()> + +Configures how long an individual RPC can take to complete (in seconds). + +Note that some operations like Wait() and Wait2() involve multiple RPCs. These +have their own timeouts. + +=back +=cut + sub SetTimeout($$) { my ($self, $Timeout) = @_; @@ -857,14 +932,16 @@ sub _Connect($) my $OldRPC = $self->{rpc}; $self->{rpc} = ($self->{rpc} ? "$self->{rpc}/" : "") ."connect"; - my $Start = time(); - foreach my $Attempt (1..$self->{cattempts}) + my $Attempt = 1; + my $MinDeadline = $self->{cmintimeout} ? time() + $self->{cmintimeout} : 0; + while (1) { my $Step = "initializing"; eval { local $SIG{ALRM} = sub { die "timeout" }; - $self->{deadline} = $self->{ctimeout} ? time() + $self->{ctimeout} : undef; + my $OneDeadline = $self->{conetimeout} ? time() + $self->{conetimeout} : 0; + $self->{deadline} = ($OneDeadline < $MinDeadline) ? $MinDeadline : $OneDeadline; $self->_SetAlarm(); if ($self->{tunnel}) @@ -945,8 +1022,13 @@ sub _Connect($) last; } - my $Remaining = $Attempt * $self->{cinterval} - (time() - $Start); - sleep($Remaining) if ($Remaining > 0); + $Attempt++; + last if ($Attempt > $self->{cminattempts} and $MinDeadline <= time() + 1); + + # Wait at least 1 second between attempts so that if the error happens on + #the client-side (e.g. in case of an invalid ssh argument) we don't busy + # loop for $MinTimeout seconds. + sleep(1); } $self->{rpc} = $OldRPC; return undef; @@ -1023,6 +1105,19 @@ sub _SendStringOrFile($$$$$$) $self->_RecvList(''); } +=pod +=over 12 + +=item C<SendFile()> + +Sends the $LocalPathName file and saves it as the $ServerPathName file on the +server. If $Flags is set to $SENDFILE_EXE the file will be made executable. + +Note that the transfer must complete within the SetTimeout() limit. + +=back +=cut + sub SendFile($$$;$) { my ($self, $LocalPathName, $ServerPathName, $Flags) = @_; @@ -1039,6 +1134,19 @@ sub SendFile($$$;$) return undef; } +=pod +=over 12 + +=item C<SendFileFromString()> + +Sends the $Data string and saves it as the $ServerPathName file on the +server. If $Flags is set to $SENDFILE_EXE the file will be made executable. + +Note that the transfer must complete within the SetTimeout() limit. + +=back +=cut + sub SendFileFromString($$$;$) { my ($self, $Data, $ServerPathName, $Flags) = @_; @@ -1059,6 +1167,19 @@ sub _GetStringOrFile($$$) $self->_RecvString('String', 'd')); } +=pod +=over 12 + +=item C<GetFile()> + +Retrieves the $ServerPathName file from the server and saves it as +$LocalPathName. + +Note that the transfer must complete within the SetTimeout() limit. + +=back +=cut + sub GetFile($$$) { my ($self, $ServerPathName, $LocalPathName) = @_; @@ -1075,6 +1196,18 @@ sub GetFile($$$) return undef; } +=pod +=over 12 + +=item C<GetFileToString()> + +Retrieves the $ServerPathName file from the server returns it as a string. + +Note that the transfer must complete within the SetTimeout() limit. + +=back +=cut + sub GetFileToString($$) { my ($self, $ServerPathName) = @_; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2bf350435..d85df1d08 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -584,10 +584,10 @@ sub RunPowerOff($) Reverts the VM so that it is ready to run jobs. -Note that in addition to the hypervisor revert operation this implies checking -that it responds to our commands ($WaitForToolsInVM) and possibly letting the -VM settle down ($SleepAfterRevert). If this operation fails the administrator -is notified and the VM is marked as offline. +Note that in addition to the hypervisor revert operation this may imply waiting +for the VM to boot, checking that the TestAgent server is accessible, and +possibly letting the VM settle down ($SleepAfterRevert). If this operation +fails the administrator is notified and the VM is put offline. This operation can take a long time so it is performed in a separate process. diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale index 2690dbb1f..ca750b792 100755 --- a/testbot/scripts/SetWinLocale +++ b/testbot/scripts/SetWinLocale @@ -843,7 +843,7 @@ if ($OptRefresh) # Allow up to 10 minutes for the shutdown plus reboot. Debug(Elapsed($Start), " Waiting for Windows to boot\n"); - $TA->SetConnectTimeout(20, 30); + $TA->SetConnectTimeout(undef, undef, $WaitForBoot); if (!$DryRun and !$TA->Ping()) { FatalError("could not reconnect to $OptHostName after the reboot: ", $TA->GetLastError(), "\n"); diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 25fc0d426..b4ec582be 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -56,7 +56,7 @@ my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, $PropName, $PropValue, @Rm my (@Run, $RunIn, $RunOut, $RunErr, $WaitPid); my $SendFlags = 0; my $RunFlags = 0; -my ($Port, $ConnectTimeout, $ConnectAttempts, $ConnectInterval, $Timeout); +my ($Port, $ConnectOneTimeout, $ConnectMinAttempts, $ConnectMinTimeout, $Timeout); my ($Keepalive, $TunnelOpt); my $Usage; @@ -100,17 +100,17 @@ while (@ARGV) { $Port = check_opt_val($arg, $Port); } - elsif ($arg eq "--connect-timeout") + elsif ($arg eq "--connect-one-timeout") { - $ConnectTimeout = check_opt_val($arg, $ConnectTimeout); + $ConnectOneTimeout = check_opt_val($arg, $ConnectOneTimeout); } - elsif ($arg eq "--connect-attempts") + elsif ($arg eq "--connect-min-attempts") { - $ConnectAttempts = check_opt_val($arg, $ConnectAttempts); + $ConnectMinAttempts = check_opt_val($arg, $ConnectMinAttempts); } - elsif ($arg eq "--connect-interval") + elsif ($arg eq "--connect-min-timeout") { - $ConnectInterval = check_opt_val($arg, $ConnectInterval); + $ConnectMinTimeout = check_opt_val($arg, $ConnectMinTimeout); } elsif ($arg eq "--timeout") { @@ -361,11 +361,12 @@ if (defined $Usage) print " restarts it.\n"; print " <hostname> Is the hostname of the server.\n"; print " --port <port> Use the specified port number instead of the default one.\n"; - print " --connect-timeout <timeout> Use the specified timeout (in seconds) when\n"; - print " connecting instead of the default one.\n"; - print " --connect-attempts <count> How many connection attempts to perform.\n"; - print " --connect-interval <time> The minimum interval (in seconds) between failed\n"; - print " connection attempts.\n"; + print " --connect-one-timeout <time> Specifies the timeout for one connection\n"; + print " attempt (in seconds).\n"; + print " --connect-min-attempts <count> Specifies the minimum number of connection\n"; + print " attempts.\n"; + print " --connect-min-timeout <time> The minimum period (in seconds) during which\n"; + print " connection attempts should be made.\n"; print " --timeout <timeout> Use the specified timeout (in seconds) instead of the\n"; print " default one for the operation.\n"; print " --keepalive <keepalive> How often (in seconds) the run and wait operations\n"; @@ -389,10 +390,7 @@ if ($TunnelOpt and $TunnelOpt =~ /^ssh:/) } my $TA = TestAgent->new($Hostname, $AgentPort, $TunnelInfo); -if (defined $ConnectTimeout or defined $ConnectAttempts or defined $ConnectInterval) -{ - $TA->SetConnectTimeout($ConnectTimeout, $ConnectAttempts, $ConnectInterval); -} +$TA->SetConnectTimeout($ConnectOneTimeout, $ConnectMinAttempts, $ConnectMinTimeout); $TA->SetTimeout($Timeout) if (defined $Timeout); my $RC = 0; -- 2.20.1

1 0

[PATCH] testbot/CheckForWinetestUpdate: Allow restricting the jobs to a single VM.
by Francois Gouget 18 Sep '19

18 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 103 +++++++++++++++++++++----- 1 file changed, 83 insertions(+), 20 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index b4672a73b..eaff8923f 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -6,7 +6,7 @@ # runs the full test suite on the standard Windows test VMs. # # Copyright 2009 Ge van Geldorp -# Copyright 2018 Francois Gouget +# Copyright 2018-2019 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -167,32 +167,40 @@ sub UpdateWineTest($$) return (1, $LatestBaseName); } -sub AddJob($$$) +sub AddJob($$$$) { - my ($BaseJob, $LatestBaseName, $Build) = @_; + my ($VMKey, $BaseJob, $LatestBaseName, $Build) = @_; - my $Remarks = $Build eq "exe64" ? "64-bit" : $BaseJob; - $Remarks = "WineTest: $Remarks VMs"; + my $Remarks = defined $VMKey ? "$VMKey VM" : + $Build eq "exe64" ? "64 bit VMs" : + "$BaseJob VMs"; + $Remarks = "WineTest: $Remarks"; Debug("Creating the '$Remarks' job\n"); my $VMs = CreateVMs(); + $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); if ($Build eq "exe64") { $VMs->AddFilter("Type", ["win64"]); - $VMs->AddFilter("Role", ["base", "winetest"]); + $VMs->AddFilter("Role", ["base", "winetest"]) if (!defined $VMKey); } elsif ($BaseJob eq "base") { $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["base"]); + $VMs->AddFilter("Role", ["base"]) if (!defined $VMKey); } else { $VMs->AddFilter("Type", ["win32", "win64"]); - $VMs->AddFilter("Role", ["winetest"]); + $VMs->AddFilter("Role", ["winetest"]) if (!defined $VMKey); } if ($VMs->GetItemsCount() == 0) { + if (defined $VMKey) + { + Error "The $VMKey VM is not suitable for $Build WineTest jobs\n"; + return 0; + } # There is nothing to do Debug(" Found no VM\n"); return 1; @@ -267,18 +275,25 @@ sub AddJob($$$) return 1; } -sub AddReconfigJob($) +sub AddReconfigJob($$) { - my ($VMType) = @_; + my ($VMKey, $VMType) = @_; - my $Remarks = "Update the $VMType VMs"; + my $Remarks = defined $VMKey ? "$VMKey $VMType VM" : "$VMType VMs"; + $Remarks = "Update the $Remarks"; Debug("Creating the '$Remarks' job\n"); my $VMs = CreateVMs(); + $VMs->AddFilter("Name", [$VMKey]) if (defined $VMKey); $VMs->AddFilter("Type", [$VMType]); $VMs->FilterEnabledRole(); if ($VMs->GetItemsCount() == 0) { + if (defined $VMKey) + { + Error "The $VMKey VM is not a $VMType VM\n"; + return 0; + } # There is nothing to do Debug(" Found no VM\n"); return 1; @@ -396,7 +411,26 @@ sub AddReconfigJob($) # Command line processing # -my ($OptCreate, %OptTypes, $Usage); +my $Usage; +sub CheckValue($$) +{ + my ($Option, $Value)=@_; + + if (defined $Value) + { + Error "$Option can only be specified once\n"; + $Usage = 2; # but continue processing this option + } + if (!@ARGV) + { + Error "missing value for $Option\n"; + $Usage = 2; + return undef; + } + return shift @ARGV; +} + +my ($OptCreate, %OptTypes, $OptVMKey); while (@ARGV) { my $Arg = shift @ARGV; @@ -404,6 +438,10 @@ while (@ARGV) { $OptCreate = 1; } + elsif ($Arg eq "--vm") + { + $OptVMKey = CheckValue($Arg, $OptVMKey); + } elsif ($TaskTypes{$Arg}) { $OptTypes{$Arg} = 1; @@ -435,14 +473,39 @@ while (@ARGV) } } -# Check parameters +# Check and untaint parameters if (!defined $Usage) { - %OptTypes = %TaskTypes if (!%OptTypes); + if (!defined $OptVMKey) + { + %OptTypes = %TaskTypes if (!%OptTypes); + } + elsif ($OptVMKey =~ /^([a-zA-Z0-9_]+)$/) + { + $OptVMKey = $1; # untaint + my $VM = CreateVMs()->GetItem($OptVMKey); + if (!defined $VM) + { + Error "The $OptVMKey VM does not exist\n"; + $Usage = 2; + } + elsif (!%OptTypes) + { + %OptTypes = $VM->Type eq "build" ? ("build" => 1) : + $VM->Type eq "wine" ? ("wine" => 1) : + $VM->Type eq "win32" ? ("base32" => 1) : + ("base32" => 1, "all64" => 1); + } + } + else + { + Error "'$OptVMKey' is not a valid VM name\n"; + $Usage = 2; + } } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--log-only] [--help] [--create] [TASKTYPE] ...\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] [--create] [--vm VM] [TASKTYPE] ...\n"; print "\n"; print "Where TASKTYPE is one of:\n"; foreach my $TaskType (sort keys %TaskTypes) @@ -471,11 +534,11 @@ if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{other32} or # A new executable means there have been commits so update Wine. Create # this job first purely to make the WineTestBot job queue look nice, and # arbitrarily do it only for 32-bit executables to avoid redundant updates. - $Rc = 1 if ($OptTypes{build} and !AddReconfigJob("build")); - $Rc = 1 if ($OptTypes{base32} and !AddJob("base", $LatestBaseName, "exe32")); - $Rc = 1 if ($OptTypes{other32} and !AddJob("other", $LatestBaseName, "exe32")); + $Rc = 1 if ($OptTypes{build} and !AddReconfigJob($OptVMKey, "build")); + $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("wine")); + $Rc = 1 if ($OptTypes{wine} and !AddReconfigJob($OptVMKey, "wine")); } } @@ -493,7 +556,7 @@ if ($OptTypes{all64}) } elsif ($Create == 1) { - $Rc = 1 if ($OptTypes{all64} and !AddJob("", $LatestBaseName, "exe64")); + $Rc = 1 if ($OptTypes{all64} and !AddJob($OptVMKey, "", $LatestBaseName, "exe64")); } } -- 2.20.1

1 0

[PATCH] testbot/TestAgent: Return the server command line in the properties.
by Francois Gouget 18 Sep '19

18 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- testbot/src/testagentd/testagentd.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 8d7f456fd..3cd72b503 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1394,7 +1394,7 @@ sub GetProperties($;$) my $Property = $self->_RecvRawString("Prop$i.s", $Size); return undef if (!defined $Property); debug(" RecvProperty() -> '$Property'\n"); - if ($Property =~ s/^([a-zA-Z0-9.]+)=//) + if ($Property =~ s/^([a-zA-Z0-9.]+(?:\[[0-9]+\])?)=//) { $Properties->{$1} = $Property; } diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index fbc26ab0d..5fd136721 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -44,6 +44,7 @@ #define BLOCK_SIZE 65536 +static int server_argc; static char** server_argv; static const char *name0; static int opt_debug = 0; @@ -1006,18 +1007,26 @@ static void do_getproperties(SOCKET client) { const char* arch; char* buf = NULL; - int size = 0; + int i, size = 0; if (!expect_list_size(client, 0)) { send_error(client); return; } - send_list_size(client, 3); + send_list_size(client, server_argc + 4); format_msg(&buf, &size, "protocol.version=%s", PROTOCOL_VERSION); send_string(client, buf); + format_msg(&buf, &size, "server.argc=%d", server_argc); + send_string(client, buf); + for (i = 0; i < server_argc; i++) + { + format_msg(&buf, &size, "server.argv[%d]=%s", i, server_argv[i]); + send_string(client, buf); + } + #ifdef WIN32 arch = "win32"; #else @@ -1342,6 +1351,7 @@ int main(int argc, char** argv) SOCKET master; int on = 1; + server_argc = argc; server_argv = argv; name0 = p = argv[0]; while (*p != '\0') -- 2.20.1

1 0

[PATCH] testbot: Add a GetMTime() helper function.
by Francois Gouget 18 Sep '19

18 Sep '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 3 ++- testbot/lib/WineTestBot/Utils.pm | 8 +++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index eaff8923f..c677af2f4 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -118,7 +118,7 @@ sub UpdateWineTest($$) my $Request = HTTP::Request->new(GET => $WineTestUrls{$Build}); if (-r $LatestFileName) { - my $Since = gmtime((stat $LatestFileName)[9]); + my $Since = gmtime(GetMTime($LatestFileName)); $Request->header("If-Modified-Since" => "$Since GMT"); } Debug("Checking $WineTestUrls{$Build}\n"); diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index d96b14a7a..71be9cf00 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -37,6 +37,7 @@ our @EXPORT = qw(GetPatchImpacts LastPartSeparator UpdateWineData use List::Util qw(min max); use WineTestBot::Config; +use WineTestBot::Utils; # @@ -83,7 +84,7 @@ files and a hashtable of all the Wine files. sub _LoadWineFiles() { my $FileName = "$DataDir/latest/winefiles.txt"; - my $MTime = (stat($FileName))[9] || 0; + my $MTime = GetMTime($FileName); if ($_TestList and $_TimeStamp == $MTime) { diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 711917c7a..309fb19ce 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -28,7 +28,7 @@ WineTestBot::Utils - Utility functions use Exporter 'import'; our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString - OpenNewFile CreateNewFile CreateNewLink CreateNewDir + OpenNewFile CreateNewFile CreateNewLink CreateNewDir GetMTime DurationToString BuildEMailRecipient IsValidFileName BuildTag SanitizeTag LocaleName NotifyAdministrator BatchQuote ShQuote ShArgv2Cmd); @@ -255,6 +255,12 @@ sub CreateNewDir($$) } } +sub GetMTime($) +{ + my ($Filename) = @_; + return (stat($Filename))[9] || 0; +} + # # WineTest helpers -- 2.20.1

1 0

Ubuntu community process for 32-bit compatibility
by Jens Reyer 17 Sep '19

17 Sep '19

Hi all, Ubuntu is starting to plan how to support 32-bit till 20.04. They included the Debian packages wine and wine-development and their (build)dependencies. So the worst should be handled for this time. I suggest to take a look at their list and chime in if something, e.g. for staging, is missing. I still wonder what they'll be doing after 20.04. Greets jre -------- Forwarded Message -------- Subject: Community process for 32-bit compatibility Date: Tue, 17 Sep 2019 16:34:13 +0200 From: Steve Langasek <steve.langasek(a)ubuntu.com> Reply-To: ubuntu-devel-discuss(a)lists.ubuntu.com To: ubuntu-devel-announce(a)lists.ubuntu.com I have started a thread on the Ubuntu Discourse with a proposed set of packages to commit to support on 32-bit x86 through Ubuntu 20.04, based on an analysis of the software identified in previous discussions around this topic. https://discourse.ubuntu.com/t/community-process-for-32-bit-compatibility/1… Please review to make sure any libraries you require in support of 32-bit applications are included in this list. If you have a requirement for a package not in this list, please follow up on the Discourse. Thanks, -- Steve Langasek

1 0

[PATCH v2 1/4] vbscript: Add support for the SCRIPTTEXT_ISEXPRESSION flag in ParseScriptText.
by Gabriel Ivăncescu 17 Sep '19

17 Sep '19

To simplify the amount of special cases both in ParseScriptText and ParseProcedureText, add a new pseudo statement and opcode to return the expression and value at the top of the stack, respectively. Script texts that have this flag will be parsed specially as a single expression with such a statement at the end. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/compile.c | 22 ++++++++++++++++++++-- dlls/vbscript/interp.c | 26 ++++++++++++++++++++++++-- dlls/vbscript/lex.c | 6 ++++++ dlls/vbscript/parse.h | 10 ++++++++-- dlls/vbscript/parser.y | 31 ++++++++++++++++++++++++++++--- dlls/vbscript/vbscript.c | 14 +++++++------- dlls/vbscript/vbscript.h | 3 ++- 7 files changed, 95 insertions(+), 17 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 1f4a7d3..0527297 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1196,6 +1196,21 @@ static HRESULT compile_onerror_statement(compile_ctx_t *ctx, onerror_statement_t return push_instr_int(ctx, OP_errmode, stat->resume_next); } +static HRESULT compile_retval_statement(compile_ctx_t *ctx, retval_statement_t *stat) +{ + HRESULT hres; + + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + hres = push_instr(ctx, OP_retval); + if(FAILED(hres)) + return hres; + + return S_OK; +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_ctx_t *stat_ctx, statement_t *stat) { HRESULT hres; @@ -1267,6 +1282,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_ctx_t *stat_ctx, case STAT_WHILELOOP: hres = compile_while_statement(ctx, (while_statement_t*)stat); break; + case STAT_RETVAL: + hres = compile_retval_statement(ctx, (retval_statement_t*)stat); + break; default: FIXME("Unimplemented statement type %d\n", stat->type); hres = E_NOTIMPL; @@ -1795,7 +1813,7 @@ static void release_compiler(compile_ctx_t *ctx) release_vbscode(ctx->code); } -HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, vbscode_t **ret) +HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD flags, vbscode_t **ret) { function_t *new_func; function_decl_t *func_decl; @@ -1804,7 +1822,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli vbscode_t *code; HRESULT hres; - hres = parse_script(&ctx.parser, src, delimiter); + hres = parse_script(&ctx.parser, src, delimiter, flags); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 629e833..6b9fd60 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1258,6 +1258,30 @@ static HRESULT interp_ret(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_retval(exec_ctx_t *ctx) +{ + variant_val_t val; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + if(val.owned) { + VariantClear(&ctx->ret_val); + ctx->ret_val = *val.v; + } + else { + hres = VariantCopy(&ctx->ret_val, val.v); + if(FAILED(hres)) + return hres; + } + + return S_OK; +} + static HRESULT interp_stop(exec_ctx_t *ctx) { WARN("\n"); @@ -2179,8 +2203,6 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP } assert(!exec.top); - if(func->type != FUNC_FUNCTION && func->type != FUNC_PROPGET && func->type != FUNC_DEFGET) - assert(V_VT(&exec.ret_val) == VT_EMPTY); if(SUCCEEDED(hres) && res) { *res = exec.ret_val; diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 4bcf810..510ac09 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -493,6 +493,12 @@ int parser_lex(void *lval, parser_ctx_t *ctx) { int ret; + if (ctx->last_token == tEXPRESSION) + { + ctx->last_token = tNL; + return tEXPRESSION; + } + while(1) { ret = parse_next_token(lval, ctx); if(ret == '_') { diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 867d45f..659fefa 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -118,7 +118,8 @@ typedef enum { STAT_STOP, STAT_UNTIL, STAT_WHILE, - STAT_WHILELOOP + STAT_WHILELOOP, + STAT_RETVAL } statement_type_t; typedef struct _statement_t { @@ -248,6 +249,11 @@ typedef struct { case_clausule_t *case_clausules; } select_statement_t; +typedef struct { + statement_t stat; + expression_t *expr; +} retval_statement_t; + typedef struct { const WCHAR *code; const WCHAR *ptr; @@ -268,7 +274,7 @@ typedef struct { heap_pool_t heap; } parser_ctx_t; -HRESULT parse_script(parser_ctx_t*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; +HRESULT parse_script(parser_ctx_t*,const WCHAR*,const WCHAR*,DWORD) DECLSPEC_HIDDEN; void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; int parser_lex(void*,parser_ctx_t*) DECLSPEC_HIDDEN; void *parser_alloc(parser_ctx_t*,size_t) DECLSPEC_HIDDEN; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index d4f5eb3..8ecdf47 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -28,6 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static int parser_error(parser_ctx_t *,const char*); static void parse_complete(parser_ctx_t*,BOOL); +static void handle_isexpression_script(parser_ctx_t *ctx, expression_t *expr); static void source_add_statement(parser_ctx_t*,statement_t*); static void source_add_class(parser_ctx_t*,class_decl_t*); @@ -102,7 +103,7 @@ static statement_t *link_statements(statement_t*,statement_t*); double dbl; } -%token tEOF tNL tEMPTYBRACKETS +%token tEXPRESSION tEOF tNL tEMPTYBRACKETS %token tLTEQ tGTEQ tNEQ %token tSTOP tME tREM %token <string> tTRUE tFALSE @@ -123,7 +124,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %token <dbl> tDouble %type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt BodyStatements IfStatement Else_opt -%type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression +%type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression ExpressionNl_opt %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression %type <expression> ConstExpression NumericLiteralExpression @@ -145,6 +146,7 @@ static statement_t *link_statements(statement_t*,statement_t*); Program : OptionExplicit_opt SourceElements tEOF { parse_complete(ctx, $1); } + | tEXPRESSION ExpressionNl_opt tEOF { handle_isexpression_script(ctx, $2); } OptionExplicit_opt : /* empty */ { $$ = FALSE; } @@ -155,6 +157,10 @@ SourceElements | SourceElements StatementNl { source_add_statement(ctx, $2); } | SourceElements ClassDeclaration { source_add_class(ctx, $2); } +ExpressionNl_opt + : /* empty */ { $$ = NULL; } + | Expression tNL { $$ = $1; } + BodyStatements : /* empty */ { $$ = NULL; } | Statement { $$ = $1; } @@ -553,6 +559,22 @@ static void parse_complete(parser_ctx_t *ctx, BOOL option_explicit) ctx->option_explicit = option_explicit; } +static void handle_isexpression_script(parser_ctx_t *ctx, expression_t *expr) +{ + retval_statement_t *stat; + + ctx->parse_complete = TRUE; + if(!expr) + return; + + stat = new_statement(ctx, STAT_RETVAL, sizeof(*stat)); + if(!stat) + return; + + stat->expr = expr; + ctx->stats = &stat->stat; +} + static void *new_expression(parser_ctx_t *ctx, expression_type_t type, size_t size) { expression_t *expr; @@ -1033,7 +1055,7 @@ void *parser_alloc(parser_ctx_t *ctx, size_t size) return ret; } -HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter) +HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter, DWORD flags) { static const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; @@ -1052,6 +1074,9 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite ctx->option_explicit = FALSE; ctx->is_html = delimiter && !wcsicmp(delimiter, html_delimiterW); + if(flags & SCRIPTTEXT_ISEXPRESSION) + ctx->last_token = tEXPRESSION; + parser_parse(ctx); if(FAILED(ctx->hres)) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index aa90b94..aa768a5 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -76,14 +76,14 @@ static inline BOOL is_started(VBScript *This) || This->state == SCRIPTSTATE_DISCONNECTED; } -static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code) +static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res) { HRESULT hres; code->pending_exec = FALSE; IActiveScriptSite_OnEnterScript(ctx->site); - hres = exec_script(ctx, &code->main_code, NULL, NULL, NULL); + hres = exec_script(ctx, &code->main_code, NULL, NULL, res); IActiveScriptSite_OnLeaveScript(ctx->site); return hres; @@ -95,7 +95,7 @@ static void exec_queued_code(script_ctx_t *ctx) LIST_FOR_EACH_ENTRY(iter, &ctx->code_list, vbscode_t, entry) { if(iter->pending_exec) - exec_global_code(ctx, iter); + exec_global_code(ctx, iter, NULL); } } @@ -719,19 +719,19 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, } } - hres = compile_script(This->ctx, pstrCode, pstrDelimiter, &code); + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, dwFlags, &code); if(FAILED(hres)) return hres; if(context) IDispatch_AddRef(code->context = context); - if(!is_started(This)) { + if(!(dwFlags & SCRIPTTEXT_ISEXPRESSION) && !is_started(This)) { code->pending_exec = TRUE; return S_OK; } - return exec_global_code(This->ctx, code); + return exec_global_code(This->ctx, code, pvarResult); } static const IActiveScriptParseVtbl VBScriptParseVtbl = { @@ -782,7 +782,7 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, pstrDelimiter, &code); + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, dwFlags, &code); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 2d78d5a..c9018c4 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -270,6 +270,7 @@ typedef enum { X(or, 1, 0, 0) \ X(pop, 1, ARG_UINT, 0) \ X(ret, 0, 0, 0) \ + X(retval, 1, 0, 0) \ X(set_ident, 1, ARG_BSTR, ARG_UINT) \ X(set_member, 1, ARG_BSTR, ARG_UINT) \ X(step, 0, ARG_ADDR, ARG_BSTR) \ @@ -353,7 +354,7 @@ struct _vbscode_t { }; void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; -HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,vbscode_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; -- 2.21.0

2 7

[PATCH] windowscodecs: Avoid dead assignment (scan-build)
by Alex Henrie 17 Sep '19

17 Sep '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/windowscodecs/metadataquery.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 0a44c1e5c8..7934042754 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -242,7 +242,6 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc bstr = next_token.u.bstrVal; end++; - p = end; while (*end && *end != '}' && end - start < elem->len) { if (*end == '\\') end++; -- 2.23.0

2 1

[PATCH 1/5] winegstreamer: Set lSampleSize in amt_from_gst_caps_audio().
by Zebediah Figura 17 Sep '19

17 Sep '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 397af6ef555..9160d12a5a5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -140,7 +140,6 @@ static gboolean amt_from_gst_caps_audio(const GstCaps *caps, AM_MEDIA_TYPE *amt) amt->cbFormat = sizeof(*wfe); amt->bFixedSizeSamples = 0; amt->bTemporalCompression = 1; - amt->lSampleSize = 0; amt->pUnk = NULL; wfx->wFormatTag = WAVE_FORMAT_EXTENSIBLE; @@ -177,7 +176,7 @@ static gboolean amt_from_gst_caps_audio(const GstCaps *caps, AM_MEDIA_TYPE *amt) wfx->cbSize = 0; } } - wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample/8; + amt->lSampleSize = wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample/8; wfx->nAvgBytesPerSec = wfx->nSamplesPerSec * wfx->nBlockAlign; return TRUE; } -- 2.23.0

4 9

[PATCH v2 2/2] gdi32/tests: Add CreateDC tests.
by Zhiyi Zhang 17 Sep '19

17 Sep '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Use wide-char literals. dlls/gdi32/tests/dc.c | 62 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 49ee708688..288642ecc9 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -545,6 +545,67 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale SetBoundsRect( ref_dc, NULL, DCB_RESET | DCB_DISABLE ); } +static void test_CreateDC(void) +{ + DISPLAY_DEVICEW display_device = {sizeof(display_device)}; + WCHAR adapter_name[CCHDEVICENAME]; + DWORD i, j; + HDC hdc; + + hdc = CreateDCW( NULL, NULL, NULL, NULL ); + ok( !hdc, "CreateDC succeeded\n" ); + + hdc = CreateDCW( NULL, L"display", NULL, NULL ); + todo_wine ok( !hdc, "CreateDC succeeded\n" ); + + hdc = CreateDCW( L"display", NULL, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + hdc = CreateDCW( L"display", L"deadbeef", NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + for (i = 0; EnumDisplayDevicesW( NULL, i, &display_device, 0 ); ++i) + { + if (!(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + { + hdc = CreateDCW( display_device.DeviceName, NULL, NULL, NULL ); + todo_wine ok( !hdc, "CreateDC succeeded\n" ); + + hdc = CreateDCW( NULL, display_device.DeviceName, NULL, NULL ); + todo_wine ok( !hdc, "CreateDC succeeded\n" ); + continue; + } + + hdc = CreateDCW( display_device.DeviceName, NULL, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed %s\n", wine_dbgstr_w( display_device.DeviceName ) ); + DeleteDC( hdc ); + + hdc = CreateDCW( NULL, display_device.DeviceName, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + hdc = CreateDCW( display_device.DeviceName, display_device.DeviceName, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + hdc = CreateDCW( display_device.DeviceName, L"deadbeef", NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + lstrcpyW( adapter_name, display_device.DeviceName ); + for (j = 0; EnumDisplayDevicesW( adapter_name, j, &display_device, 0 ); ++j) + { + hdc = CreateDCW( display_device.DeviceName, NULL, NULL, NULL ); + ok( !hdc, "CreateDC succeeded\n" ); + + hdc = CreateDCW( NULL, display_device.DeviceName, NULL, NULL ); + ok( !hdc, "CreateDC succeeded\n" ); + } + } +} + static void test_CreateCompatibleDC(void) { BOOL bRet; @@ -1495,6 +1556,7 @@ START_TEST(dc) test_savedc(); test_savedc_2(); test_GdiConvertToDevmodeW(); + test_CreateDC(); test_CreateCompatibleDC(); test_DC_bitmap(); test_DeleteDC(); -- 2.23.0

1 0