February 2020 - Wine-commits

Puetz Kevin A : atlbase.h: Fix some declarations on win64.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 3043ab3e62772ddef8e4e27674bf4178e0ee50c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3043ab3e62772ddef8e4e276… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Date: Mon Feb 3 22:06:49 2020 +0100 atlbase.h: Fix some declarations on win64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl.c | 2 +- dlls/atl/tests/module.c | 25 ++++++++++++++----------- include/atlbase.h | 8 ++++---- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 8829987c6a..358986d7a4 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -213,7 +213,7 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE while (pEntries[i].pFunc != 0) { - TRACE("Trying entry %i (%s %i %p)\n",i,debugstr_guid(pEntries[i].piid), + TRACE("Trying entry %i (%s %lx %p)\n",i,debugstr_guid(pEntries[i].piid), pEntries[i].dw, pEntries[i].pFunc); if (!pEntries[i].piid || IsEqualGUID(iid,pEntries[i].piid)) diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index 192b23ef1e..6250f9b2cb 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -113,9 +113,9 @@ static void test_winmodule(void) ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); } -static DWORD cb_val; +static DWORD_PTR cb_val; -static void WINAPI term_callback(DWORD dw) +static void WINAPI term_callback(DWORD_PTR dw) { cb_val = dw; } @@ -123,33 +123,36 @@ static void WINAPI term_callback(DWORD dw) static void test_term(void) { _ATL_MODULEW test; + ULONG_PTR ex; HRESULT hres; + ex = (ULONG_PTR)-37; + test.cbSize = sizeof(_ATL_MODULEW); hres = AtlModuleInit(&test, NULL, NULL); - ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", (int)hres); + ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", hres); - hres = AtlModuleAddTermFunc(&test, term_callback, 0x22); - ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", (int)hres); + hres = AtlModuleAddTermFunc(&test, term_callback, ex); + ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", hres); cb_val = 0xdeadbeef; hres = AtlModuleTerm(&test); - ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", (int)hres); - ok (cb_val == 0x22, "wrong callback value (0x%x).\n", (int)cb_val); + ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", hres); + ok (cb_val == ex, "wrong callback value (0x%lx).\n", cb_val); test.cbSize = FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer); hres = AtlModuleInit(&test, NULL, NULL); - ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", (int)hres); + ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", hres); hres = AtlModuleAddTermFunc(&test, term_callback, 0x23); - ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", (int)hres); + ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", hres); cb_val = 0xdeadbeef; hres = AtlModuleTerm(&test); - ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", (int)hres); - ok (cb_val == 0xdeadbeef, "wrong callback value (0x%x).\n", (int)cb_val); + ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", hres); + ok (cb_val == 0xdeadbeef, "wrong callback value (0x%lx).\n", cb_val); } START_TEST(module) diff --git a/include/atlbase.h b/include/atlbase.h index b8c4f65651..ebf1674805 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -37,12 +37,12 @@ #endif typedef HRESULT (WINAPI _ATL_CREATORFUNC)(void* pv, REFIID riid, LPVOID* ppv); -typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD dw); -typedef HRESULT (WINAPI _ATL_MODULEFUNC)(DWORD dw); +typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD_PTR dw); +typedef HRESULT (WINAPI _ATL_MODULEFUNC)(DWORD_PTR dw); typedef LPCSTR (WINAPI _ATL_DESCRIPTIONFUNCA)(void); typedef LPCWSTR (WINAPI _ATL_DESCRIPTIONFUNCW)(void); typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(void); -typedef void (WINAPI _ATL_TERMFUNC)(DWORD dw); +typedef void (WINAPI _ATL_TERMFUNC)(DWORD_PTR dw); typedef CRITICAL_SECTION CComCriticalSection; @@ -234,7 +234,7 @@ typedef _ATL_MODULEW _ATL_WIN_MODULE; typedef struct _ATL_INTMAP_ENTRY_TAG { const IID* piid; - DWORD dw; + DWORD_PTR dw; _ATL_CREATORARGFUNC* pFunc; } _ATL_INTMAP_ENTRY;

1 0

Alexandre Julliard : unicode: Store variable-length sequences also for the main decomposition table.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: dba4bd756a2f1b4cc08d1b39b0cc04fe8aea3c7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dba4bd756a2f1b4cc08d1b39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 10:10:53 2020 +0100 unicode: Store variable-length sequences also for the main decomposition table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/decompose.c | 1589 +++++++++++++++++++++--------------------- libs/port/decompose.c | 1606 +++++++++++++++++++++---------------------- tools/make_unicode | 148 +--- 3 files changed, 1624 insertions(+), 1719 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dba4bd756a2f1b4cc08d…

1 0

Alexandre Julliard : unicode: Store recursive decompositions directly in the tables.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: a646e4e6f2a0bde517e71b40c936806652421626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a646e4e6f2a0bde517e71b40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 10:14:28 2020 +0100 unicode: Store recursive decompositions directly in the tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/decompose.c | 1112 ++++++------ libs/port/decompose.c | 3894 ++++++++++++++++++++++++++----------------- tools/make_unicode | 113 +- 3 files changed, 2992 insertions(+), 2127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a646e4e6f2a0bde517e7…

1 0

Francois Gouget : testbot/web: Use a cryptographically secure random number generator.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: tools Branch: master Commit: 617f67bdeafa9e686c4378160ea912e8eaf2d00c URL: https://source.winehq.org/git/tools.git/?a=commit;h=617f67bdeafa9e686c43781… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 4 15:51:42 2020 +0100 testbot/web: Use a cryptographically secure random number generator. Session ids should really be hard to guess so a user cannot take over another's session. This also fixes a bug where the session id length could be less than 32 characters. Note: * This introduces a dependency on the Bytes::Random::Secure Perl module. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/INSTALL.txt | 1 + testbot/lib/WineTestBot/CGI/Sessions.pm | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 456ffe6..4d430d9 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -6,6 +6,7 @@ Dependencies: - MySQL - Perl DBD and DBI::mysql modules - Sendmail and Procmail +- Bytes::Random::Secure (libbytes-random-secure-perl) - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) - Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 380d4b8..0afe6c9 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -56,7 +56,9 @@ use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotCollection); our @EXPORT = qw(CreateSessions DeleteSessions NewSession); +use Bytes::Random::Secure; use CGI::Cookie; + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Users; @@ -123,11 +125,7 @@ sub NewSession($$$) my $Id; while (defined($Existing)) { - $Id = ""; - foreach my $i (1..8) - { - $Id .= sprintf("%lx", int(rand(2 ** 16))); - } + $Id = Bytes::Random::Secure::random_bytes_hex(16); $Existing = $self->GetItem($Id); } $Session->Id($Id);

1 0

Francois Gouget : testbot: Simplify and speed up GenerateRandomString().
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: tools Branch: master Commit: d14d2f504e8f0da4599ed388233734c10fbc4849 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d14d2f504e8f0da4599ed38… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 4 15:52:07 2020 +0100 testbot: Simplify and speed up GenerateRandomString(). Perl's rand() function can return random values greater than 2^16 nowadays. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index e8ba516..27b222f 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -201,8 +201,8 @@ sub GenerateRandomString($) my $RandomString = ""; while (length($RandomString) < $Len) { - my $Part = "0000" . sprintf("%lx", int(rand(2 ** 16))); - $RandomString .= substr($Part, -4); + $RandomString .= sprintf("%08x", int(rand(2 ** 32))); + } return substr($RandomString, 0, $Len);

1 0

Francois Gouget : testbot/web: Remove an unneeded import in Sessions.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: tools Branch: master Commit: be98e7c49bd2ad3a98074317e0d05cba8c7e0b53 URL: https://source.winehq.org/git/tools.git/?a=commit;h=be98e7c49bd2ad3a9807431… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 4 15:52:19 2020 +0100 testbot/web: Remove an unneeded import in Sessions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/Sessions.pm | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 0afe6c9..4ca62ba 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -31,8 +31,6 @@ WineTestBot::CGI::Session - A web user's session use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); -use WineTestBot::Utils; - sub InitializeNew($$) { my ($self, $Collection) = @_;

1 0

Francois Gouget : testbot: Do cosmetic cleanups in the patch handling code.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: tools Branch: master Commit: 0ed47287f3f3d34f78a313363cd8851d87cd9591 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0ed47287f3f3d34f78a3133… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 4 03:22:19 2020 +0100 testbot: Do cosmetic cleanups in the patch handling code. Prefix unused variables with an underscore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 23 ++++++++--------------- testbot/lib/WineTestBot/PendingPatchSets.pm | 4 ++-- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index ca8d57f..46b17e5 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -212,7 +212,7 @@ sub Submit($$$) $BuildStep->DebugLevel(0); # Save the build step so the others can reference it. - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined($ErrMessage)) { $self->Disposition("Failed to submit build step"); @@ -308,7 +308,7 @@ sub Submit($$$) } # Save it all - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { $self->Disposition("Failed to submit job"); @@ -325,7 +325,7 @@ sub Submit($$$) # Switch Status to staging to indicate we are done setting up the job $NewJob->Status("staging"); $NewJob->Priority($Priority); - ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); + ($_ErrKey, $_ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined $ErrMessage) { $self->Disposition("Failed to submit job (staging)"); @@ -470,9 +470,7 @@ sub NewPatch($$$) if ($Subject =~ m/\d+\/\d+/) { $Patch->Disposition("Checking series"); - my $ErrKey; - my $ErrProperty; - ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); if (! defined($ErrMessage)) { @@ -482,9 +480,7 @@ sub NewPatch($$$) else { $Patch->Disposition("Checking patch"); - my $ErrKey; - my $ErrProperty; - ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); if (! defined($ErrMessage)) { @@ -505,14 +501,11 @@ sub NewPatch($$$) { $PatchBody->purge(); } - + if (! defined($ErrMessage)) { - my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); - if (defined($ErrMessage)) - { - return $ErrMessage; - } + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $self->Save(); + return $ErrMessage if (defined $ErrMessage); } return undef; diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 5be39e4..5339513 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -258,7 +258,7 @@ sub NewSubmission($$) $Part->Patch($Patch); - my ($ErrKey, $ErrProperty, $ErrMessage) = $self->Save(); + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $self->Save(); if (defined($ErrMessage)) { $Patch->Disposition("Error occurred during series processing"); @@ -280,7 +280,7 @@ sub NewSubmission($$) $ErrMessage = $Set->SubmitSubset($PartNo, $Part->Patch); if (!defined $ErrMessage) { - (my $ErrProperty, $ErrMessage) = $Part->Patch->Save(); + ($_ErrProperty, $ErrMessage) = $Part->Patch->Save(); } } else

1 0

Francois Gouget : testbot: Move reference logs to the task and prepare for having more than one.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: tools Branch: master Commit: a6a86fd439e014b0ab80713bfdb2532d0fe8587d URL: https://source.winehq.org/git/tools.git/?a=commit;h=a6a86fd439e014b0ab80713… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 4 03:50:07 2020 +0100 testbot: Move reference logs to the task and prepare for having more than one. The old reference report filename format was '<vmname>_<reportname>' which means there could only be one per report. Each job should only have one report of a given type per VM so add it to the reference filename. Also the use of an underscore as the separator made it hard to split the components apart as both <vmname> and <reportname> can contain underscores such as 'w1064v1809_fr' and 'win32_fr_FR.report'. Dashes are a better choice since they are not allowed in either the VM name or the report name. So the new refeence filename format is '<vmname>-job<jobid>-<reportname>'. Note: * After applying this patch run UpdateTaskLogs to move and rename the existing reference reports. * When downgrading to run code before this patch it's best to run UpdateTaskLogs --delete before downgrading and then UpdateTaskLogs after the downgrade. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 3 +- testbot/bin/UpdateTaskLogs | 113 ++++++++++++++++++++++++++++++---- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 5 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/web/JobDetails.pl | 4 +- 7 files changed, 110 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=a6a86fd439e014b0ab8…

1 0

Francois Gouget : testbot: Separate the per-task task and testbot logs.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: tools Branch: master Commit: c6ea1c622ac67d66f1c157b3aec8f7320036c242 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c6ea1c622ac67d66f1c157b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 4 03:50:16 2020 +0100 testbot: Separate the per-task task and testbot logs. Each task has pairs of xxx.report and xxx.report.err files where the .err file contains extra errors detected while parsing xxx.report and can thus be rebuilt from the report files. They also have log and log.err files but log.err is completely independent from the log file: * log contains the traces printed by the script running on the VM, typically the build log or batch file commands. * log.err contains errors that occurred on the TestBot-server side, such as perl errors in the WineRun* scripts, or messages when the TestBot had to kill a stuck task. So rename log to task.log and log.err to testbot.log. This way their purpose is clearer and log.err does not run the risk of being confused with the other .err files. Note: * After applying this patch run UpdateTaskLogs to move and rename the existing reference reports. * It is not necessary to run UpdateTaskLogs when downgrading to run code just before this patch. However one can use the following commands to rename the task and testbot logs: find jobs -name task.log | while read f;do echo mv "$f" `dirname "$f"`/log;done find jobs -name testbot.log | while read f;do mv "$f" `dirname "$f"`/log.err;done Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 20 ++++++++++++++++++++ testbot/bin/WineRunBuild.pl | 8 ++++---- testbot/bin/WineRunReconfig.pl | 8 ++++---- testbot/bin/WineRunTask.pl | 6 +++--- testbot/bin/WineRunWineTest.pl | 8 ++++---- testbot/lib/WineTestBot/LogUtils.pm | 22 ++++++++++++---------- testbot/lib/WineTestBot/Tasks.pm | 10 +++++----- 7 files changed, 52 insertions(+), 30 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 11dd6d3..4ba383f 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -342,6 +342,26 @@ sub ProcessTaskLogs($$$) } $Rc += Delete($StepReportPath, "unneeded"); } + + my %LogMap = ( + "log" => "task.log", + "log.err" => "testbot.log", + "old_log" => "old_task.log", + "old_log.err" => "old_testbot.log"); + while (my ($OldName, $NewName) = each %LogMap) + { + if (-f "$TaskDir/$OldName" and !-f "$TaskDir/$NewName" and + !rename("$TaskDir/$OldName", "$TaskDir/$NewName")) + { + Error TaskKeyStr($Task) .": Could not rename $OldName because $NewName already exists\n"; + $Rc = 1; + } + } + + # testbot.log is the only log which we expect to be empty. + # There is not much point keeping it if that's the case. + my $TestBotLog = "$TaskDir/testbot.log"; + $Rc += Delete($TestBotLog) if (-z $TestBotLog); } if (($OptDelete or $OptRebuild) and !$CollectOnly) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 6b68c0d..45288af 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -181,14 +181,14 @@ sub LogTaskError($) Debug("$Name0:error: ", $ErrMessage); my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/log.err")) + if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'log.err' for writing: $!\n"; + Error "Unable to open 'testbot.log' for writing: $!\n"; } umask($OldUMask); } @@ -417,9 +417,9 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) } Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); -if ($TA->GetFile("Build.log", "$TaskDir/log")) +if ($TA->GetFile("Build.log", "$TaskDir/task.log")) { - my $LogInfo = ParseTaskLog("$TaskDir/log"); + my $LogInfo = ParseTaskLog("$TaskDir/task.log"); if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 04c0e26..3005ba7 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -182,14 +182,14 @@ sub LogTaskError($) Debug("$Name0:error: ", $ErrMessage); my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/log.err")) + if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'log.err' for writing: $!\n"; + Error "Unable to open 'testbot.log' for writing: $!\n"; } umask($OldUMask); } @@ -418,9 +418,9 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) my $LogInfo; Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); -if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) +if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) { - $LogInfo = ParseTaskLog("$TaskDir/log"); + $LogInfo = ParseTaskLog("$TaskDir/task.log"); if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 2b54048..59975c3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -210,14 +210,14 @@ sub LogTaskError($) Debug("$Name0:error: ", $ErrMessage); my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/log.err")) + if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'log.err' for writing: $!\n"; + Error "Unable to open 'testbot.log' for writing: $!\n"; } umask($OldUMask); } @@ -534,7 +534,7 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) } Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); -if (!$TA->GetFile("Task.log", "$TaskDir/log") and !defined $TAError) +if (!$TA->GetFile("Task.log", "$TaskDir/task.log") and !defined $TAError) { $TAError = "An error occurred while retrieving the task log: ". $TA->GetLastError(); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 9a0a4eb..9d54745 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -206,14 +206,14 @@ sub LogTaskError($) my ($ErrMessage) = @_; Debug("$Name0:error: ", $ErrMessage); - if (open(my $ErrFile, ">>", "$TaskDir/log.err")) + if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) { print $ErrFile $ErrMessage; close($ErrFile); } else { - Error "Unable to open 'log.err' for writing: $!\n"; + Error "Unable to open 'testbot.log' for writing: $!\n"; } } @@ -506,9 +506,9 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) } Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); -if ($TA->GetFile("Task.log", "$TaskDir/log")) +if ($TA->GetFile("Task.log", "$TaskDir/task.log")) { - my $LogInfo = ParseTaskLog("$TaskDir/log"); + my $LogInfo = ParseTaskLog("$TaskDir/task.log"); if ($LogInfo->{Task} eq "ok") { # We must have gotten the full log and the task completed successfully diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 36f3674..0a98a5a 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -622,8 +622,8 @@ sub GetLogFileNames($;$) win32.report win32_*.report wow32.report wow32_*.report wow64.report wow64_*.report - log); - push @Globs, "old_log" if ($IncludeOld); + task.log testbot.log); + push @Globs, ("old_task.log", "old_testbot.log") if ($IncludeOld); my (@Logs, %Seen); foreach my $Glob (@Globs) @@ -637,7 +637,7 @@ sub GetLogFileNames($;$) { $LogName = $1; # untaint } - elsif ($LogName eq $Glob) # log and old_log cases + elsif ($LogName eq $Glob) # (old_) task.log and testbot.log cases { $LogName = $Glob; # untaint } @@ -659,13 +659,15 @@ sub GetLogFileNames($;$) } my %_LogFileLabels = ( - "exe32.report" => '32 bit%s report', - "exe64.report" => '64 bit%s report', - "win32.report" => '32 bit%s report', - "wow32.report" => '32 bit%s WoW report', - "wow64.report" => '64 bit%s WoW report', - "log" => 'task%s log', - "old_log" => 'old%s logs', + "exe32.report" => '32 bit%s report', + "exe64.report" => '64 bit%s report', + "win32.report" => '32 bit%s report', + "wow32.report" => '32 bit%s WoW report', + "wow64.report" => '64 bit%s WoW report', + "task.log" => 'task%s log', + "testbot.log" => 'testbot%s log', + "old_task.log" => 'old%s task logs', + "old_testbot.log" => 'old%s testbot logs', ); =pod diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 7b9ac9b..541b555 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -153,7 +153,7 @@ sub _SetupTask($$) if (-d $Dir) { mkpath("$Dir.new", 0, 0775); - foreach my $Filename ("log", "log.err") + foreach my $Filename ("task.log", "testbot.log") { if (-f "$Dir/old_$Filename") { @@ -178,9 +178,9 @@ sub _SetupTask($$) rename("$Dir.new", $Dir); } - # Capture Perl errors in the task's generic error log + # Capture Perl errors in the per-task TestBot log my $TaskDir = $self->CreateDir(); - if (open(STDERR, ">>", "$TaskDir/log.err")) + if (open(STDERR, ">>", "$TaskDir/testbot.log")) { # Make sure stderr still flushes after each print my $tmp=select(STDERR); @@ -190,7 +190,7 @@ sub _SetupTask($$) else { require WineTestBot::Log; - WineTestBot::Log::LogMsg("unable to redirect stderr to '$TaskDir/log.err': $!\n"); + WineTestBot::Log::LogMsg("unable to redirect stderr to '$TaskDir/testbot.log': $!\n"); } } @@ -253,7 +253,7 @@ sub UpdateStatus($$) my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $OldUMask = umask(002); my $TaskDir = $self->CreateDir(); - if (open TASKLOG, ">>$TaskDir/log.err") + if (open TASKLOG, ">>$TaskDir/testbot.log") { print TASKLOG "TestBot process got stuck or died unexpectedly\n"; close TASKLOG;

1 0

Jacek Caban : vbscript: Don't convert hex literals ending with '&' to short in parse_hex_literal.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: 8def4dfa0ee9c2d70fd4c98daa50447b6a15ad3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8def4dfa0ee9c2d70fd4c98d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 19:57:03 2020 +0100 vbscript: Don't convert hex literals ending with '&' to short in parse_hex_literal. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 6 +++--- dlls/vbscript/lex.c | 8 +++++--- dlls/vbscript/tests/lang.vbs | 7 ++++++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index d42091990b..a4442960d9 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2793,7 +2793,7 @@ static const builtin_prop_t global_props[] = { {L"vbFormFeed", NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbFormFeed}, {L"vbFriday", NULL, BP_GET, VT_I2, 6}, {L"vbGeneralDate", NULL, BP_GET, VT_I2, 0}, - {L"vbGreen", NULL, BP_GET, VT_I4, (INT16)0x00ff00}, + {L"vbGreen", NULL, BP_GET, VT_I4, 0x00ff00}, {L"vbIgnore", NULL, BP_GET, VT_I2, IDIGNORE}, {L"vbInformation", NULL, BP_GET, VT_I2, MB_ICONASTERISK}, {L"vbInteger", NULL, BP_GET, VT_I2, VT_I2}, @@ -2840,7 +2840,7 @@ static const builtin_prop_t global_props[] = { {L"vbVerticalTab", NULL, BP_GET, VT_BSTR, (UINT_PTR)&vbVerticalTab}, {L"vbWednesday", NULL, BP_GET, VT_I2, 4}, {L"vbWhite", NULL, BP_GET, VT_I4, 0xffffff}, - {L"vbYellow", NULL, BP_GET, VT_I4, (INT16)0x00ffff}, + {L"vbYellow", NULL, BP_GET, VT_I4, 0x00ffff}, {L"vbYes", NULL, BP_GET, VT_I2, IDYES}, {L"vbYesNo", NULL, BP_GET, VT_I2, MB_YESNO}, {L"vbYesNoCancel", NULL, BP_GET, VT_I2, MB_YESNOCANCEL}, @@ -2945,7 +2945,7 @@ static HRESULT Err_Raise(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VA if(SUCCEEDED(hres)) { script_ctx_t *ctx = This->ctx; - error = (code == (INT16)code) ? MAKE_VBSERROR((UINT16)code) : map_hres(code); + error = (code & ~0xffff) ? map_hres(code) : MAKE_VBSERROR(code); if(source) { SysFreeString(ctx->ei.bstrSource); diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index f6070134f4..5b93739d02 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -320,10 +320,12 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) return 0; } - if(*ctx->ptr == '&') + if(*ctx->ptr == '&') { ctx->ptr++; - - *ret = l == (UINT16)l ? (INT16)l : l; + *ret = l; + }else { + *ret = l == (UINT16)l ? (INT16)l : l; + } return tInt; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 04e3cbfe91..c50b8bbe59 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -55,6 +55,9 @@ Call ok(&hff = 255, "&hff <> 255") Call ok(&Hff = 255, "&Hff <> 255") Call ok(&hffff = -1, "&hffff <> -1") Call ok(&hfffe = -2, "&hfffe <> -2") +Call ok(&hffff& = 65535, "&hffff& <> -1") +Call ok(&hfffe& = 65534, "&hfffe& <> -2") +Call ok(&hffffffff& = -1, "&hffffffff& <> -1") W = 5 Call ok(W = 5, "W = " & W & " expected " & 5) @@ -90,7 +93,9 @@ Call ok(getVT(&h10&) = "VT_I2", "getVT(&h10&) is not VT_I2") Call ok(getVT(&h10000&) = "VT_I4", "getVT(&h10000&) is not VT_I4") Call ok(getVT(&H10000&) = "VT_I4", "getVT(&H10000&) is not VT_I4") Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") -Call ok(getVT(&hffFFffFE&) = "VT_I2", "getVT(&hffFFffFE &) is not VT_I2") +Call ok(getVT(&hffFFffFE&) = "VT_I2", "getVT(&hffFFffFE &) is not VT_I2") +Call ok(getVT(&hffF&) = "VT_I2", "getVT(&hffFF&) is not VT_I2") +Call ok(getVT(&hffFF&) = "VT_I4", "getVT(&hffFF&) is not VT_I4") Call ok(getVT(1e2) = "VT_R8", "getVT(1e2) is not VT_R8") Call ok(getVT(1e0) = "VT_R8", "getVT(1e0) is not VT_R8") Call ok(getVT(0.1e2) = "VT_R8", "getVT(0.1e2) is not VT_R8")

1 0