September 2019 - Wine-devel

[PATCH] msvcrt: Fix _putws implementation.
by Piotr Caban 30 Sep '19

30 Sep '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47615 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)

1 0

[PATCH] wineps: Add version resource.
by Dmitry Timoshkov 30 Sep '19

30 Sep '19

Some WPF based applications depend on this, otherwise they treat missing DllGetClassObject() export as a failure. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wineps.drv/wineps.rc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wineps.drv/wineps.rc b/dlls/wineps.drv/wineps.rc index ed4ba8355a..7a657c833e 100644 --- a/dlls/wineps.drv/wineps.rc +++ b/dlls/wineps.drv/wineps.rc @@ -48,3 +48,11 @@ STRINGTABLE IDS_DPI "#msgctxt#unit: dots/inch#dpi" IDS_SETUP "Setup" } + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Wine PostScript Driver" +#define WINE_FILENAME_STR "wineps.drv" +#define WINE_FILEVERSION_STR "1.0" + +#include "wine/wine_common_ver.rc" -- 2.20.1

2 1

[PATCH] winspool: Add support for level 1 printer info to GetPrinter.
by Dmitry Timoshkov 30 Sep '19

30 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winspool.drv/info.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d7e2211102..1ab5e43aef 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4435,6 +4435,24 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, } switch(Level) { + case 1: + { + PRINTER_INFO_1W *pi1 = (PRINTER_INFO_1W *)pPrinter; + + size = sizeof(PRINTER_INFO_1W); + if (size <= cbBuf) { + ptr = pPrinter + size; + cbBuf -= size; + memset(pPrinter, 0, size); + } else { + pi1 = NULL; + cbBuf = 0; + } + ret = WINSPOOL_GetPrinter_1(hkeyPrinter, pi1, ptr, cbBuf, &needed); + needed += size; + break; + } + case 2: { PRINTER_INFO_2W *pi2 = (PRINTER_INFO_2W *)pPrinter; -- 2.20.1

2 1

[PATCH] winegcc: Add a missing break.
by Huw Davies 30 Sep '19

30 Sep '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- Note, completely untested on ARM. tools/winegcc/winegcc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0ca553318e..fa4407f913 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -737,6 +737,7 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-D__stdcall=__attribute__((pcs(\"aapcs-vfp\")))"); strarray_add(comp_args, "-D__cdecl=__stdcall"); strarray_add(comp_args, "-D__fastcall=__stdcall"); + break; case CPU_POWERPC: strarray_add(comp_args, "-D__stdcall="); strarray_add(comp_args, "-D__cdecl="); -- 2.23.0

2 1

[PATCH v2] msi/tests: Fix a test failure on Windows XP.
by Sven Baars 30 Sep '19

30 Sep '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- Using broken is not possible, because this package implements its own test methods like ok and todo_wine, so I can't easily obtain the platform from wine/test.h. v2: Add winxp comment. dlls/msi/tests/custom.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index f994ad4c18..65e5ab6d07 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1131,7 +1131,9 @@ static void test_invalid_functions(MSIHANDLE hinst) ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiCreateTransformSummaryInfoA(db, db, "bogus.mst", 0, 0); - todo_wine ok(hinst, r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, "got %u\n", r); + todo_wine ok(hinst, r == ERROR_INSTALL_PACKAGE_OPEN_FAILED || + r == ERROR_INSTALL_PACKAGE_INVALID /* winxp */, + "got %u\n", r); GetCurrentDirectoryA(sizeof(path), path); r = MsiDatabaseExportA(db, "Test", path, "bogus.idt"); -- 2.17.1

3 2

[PATCH] include: Allow building against dmusic.
by Alistair Leslie-Hughes 30 Sep '19

30 Sep '19

Correct the following error when building against dmusic. .../wine/windows/dmusici.h:370:14: error: use of enum ‘enumDMUS_STYLET_TYPES’ without previous declaration Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dls1.h | 71 ++++++++++++++++++---------------------------- include/dmplugin.h | 9 ++---- include/dmusici.h | 63 ++++++++++++++++------------------------ 3 files changed, 55 insertions(+), 88 deletions(-) diff --git a/include/dls1.h b/include/dls1.h index d980b2b9b4..24c49c1e52 100644 --- a/include/dls1.h +++ b/include/dls1.h @@ -99,104 +99,89 @@ /***************************************************************************** * Structures */ -/* typedef definitions */ -typedef struct _DLSID DLSID, *LPDLSID; -typedef struct _DLSVERSION DLSVERSION, *LPDLSVERSION; -typedef struct _CONNECTION CONNECTION, *LPCONNECTION; -typedef struct _CONNECTIONLIST CONNECTIONLIST, *LPCONNECTIONLIST; -typedef struct _RGNRANGE RGNRANGE, *LPRGNRANGE; -typedef struct _MIDILOCALE MIDILOCALE, *LPMIDILOCALE; -typedef struct _RGNHEADER RGNHEADER, *LPRGNHEADER; -typedef struct _INSTHEADER INSTHEADER, *LPINSTHEADER; -typedef struct _DLSHEADER DLSHEADER, *LPDLSHEADER; -typedef struct _WAVELINK WAVELINK, *LPWAVELINK; -typedef struct _POOLCUE POOLCUE, *LPPOOLCUE; -typedef struct _POOLTABLE POOLTABLE, *LPPOOLTABLE; -typedef struct _rwsmp WSMPL, *LPWSMPL; -typedef struct _rloop WLOOP, *LPWLOOP; /* actual structures */ -struct _DLSID { +typedef struct _DLSID { ULONG ulData1; USHORT usData2; USHORT usData3; BYTE abData4[8]; -}; +} DLSID, *LPDLSID; -struct _DLSVERSION { +typedef struct _DLSVERSION { DWORD dwVersionMS; DWORD dwVersionLS; -}; +} DLSVERSION, *LPDLSVERSION; -struct _CONNECTION { +typedef struct _CONNECTION { USHORT usSource; USHORT usControl; USHORT usDestination; USHORT usTransform; LONG lScale; -}; +} CONNECTION, *LPCONNECTION; -struct _CONNECTIONLIST { +typedef struct _CONNECTIONLIST { ULONG cbSize; ULONG cConnections; -}; +} CONNECTIONLIST, *LPCONNECTIONLIST; -struct _RGNRANGE { +typedef struct _RGNRANGE { USHORT usLow; USHORT usHigh; -}; +} RGNRANGE, *LPRGNRANGE; -struct _MIDILOCALE { +typedef struct _MIDILOCALE { ULONG ulBank; ULONG ulInstrument; -}; +} MIDILOCALE, *LPMIDILOCALE; -struct _RGNHEADER { +typedef struct _RGNHEADER { RGNRANGE RangeKey; RGNRANGE RangeVelocity; USHORT fusOptions; USHORT usKeyGroup; -}; +} RGNHEADER, *LPRGNHEADER; -struct _INSTHEADER { +typedef struct _INSTHEADER { ULONG cRegions; MIDILOCALE Locale; -}; +} INSTHEADER, *LPINSTHEADER; -struct _DLSHEADER { +typedef struct _DLSHEADER { ULONG cInstruments; -}; +} DLSHEADER, *LPDLSHEADER; -struct _WAVELINK { +typedef struct _WAVELINK { USHORT fusOptions; USHORT usPhaseGroup; ULONG ulChannel; ULONG ulTableIndex; -}; +} WAVELINK, *LPWAVELINK; -struct _POOLCUE { +typedef struct _POOLCUE { ULONG ulOffset; -}; +} POOLCUE, *LPPOOLCUE; -struct _POOLTABLE { +typedef struct _POOLTABLE { ULONG cbSize; ULONG cCues; -}; +} POOLTABLE, *LPPOOLTABLE; -struct _rwsmp { +typedef struct _rwsmp { ULONG cbSize; USHORT usUnityNote; SHORT sFineTune; LONG lAttenuation; ULONG fulOptions; ULONG cSampleLoops; -}; +} WSMPL, *LPWSMPL; -struct _rloop { +typedef struct _rloop { ULONG cbSize; ULONG ulType; ULONG ulStart; ULONG ulLength; -}; +} WLOOP, *LPWLOOP; #endif /* __WINE_INCLUDE_DLS1_H */ diff --git a/include/dmplugin.h b/include/dmplugin.h index ccd9f6bd36..88584e884d 100644 --- a/include/dmplugin.h +++ b/include/dmplugin.h @@ -101,11 +101,8 @@ typedef LONG MUSIC_TIME; /***************************************************************************** * Enumerations */ -/* typedef definitions */ -typedef enum enumDMUS_TRACKF_FLAGS DMUS_TRACKF_FLAGS; - -/* actual enumerations */ -enum enumDMUS_TRACKF_FLAGS { +typedef enum enumDMUS_TRACKF_FLAGS +{ DMUS_TRACKF_SEEK = 0x001, DMUS_TRACKF_LOOP = 0x002, DMUS_TRACKF_START = 0x004, @@ -117,7 +114,7 @@ enum enumDMUS_TRACKF_FLAGS { DMUS_TRACKF_STOP = 0x100, DMUS_TRACKF_RECOMPOSE = 0x200, DMUS_TRACKF_CLOCK = 0x400, -}; +} DMUS_TRACKF_FLAGS; /***************************************************************************** * IDirectMusicTool interface diff --git a/include/dmusici.h b/include/dmusici.h index 7e393eaf29..80e89a37d0 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -366,38 +366,23 @@ typedef WORD TRANSITION_TYPE, *LPTRANSITION_TYPE; /***************************************************************************** * Enumerations */ -/* typedef definitions */ -typedef enum enumDMUS_STYLET_TYPES DMUS_STYLET_TYPES; -typedef enum enumDMUS_COMMANDT_TYPES DMUS_COMMANDT_TYPES; -typedef enum enumDMUS_SHAPET_TYPES DMUS_SHAPET_TYPES; -typedef enum enumDMUS_COMPOSEF_FLAGS DMUS_COMPOSEF_FLAGS; -typedef enum enumDMUS_PMSGF_FLAGS DMUS_PMSGF_FLAGS; -typedef enum enumDMUS_PMSGT_TYPES DMUS_PMSGT_TYPES; -typedef enum enumDMUS_SEGF_FLAGS DMUS_SEGF_FLAGS; -typedef enum enumDMUS_TIME_RESOLVE_FLAGS DMUS_TIME_RESOLVE_FLAGS; -typedef enum enumDMUS_CHORDKEYF_FLAGS DMUS_CHORDKEYF_FLAGS; -typedef enum enumDMUS_NOTEF_FLAGS DMUS_NOTEF_FLAGS; -typedef enum enumDMUS_PLAYMODE_FLAGS DMUS_PLAYMODE_FLAGS; -typedef enum enumDMUS_CURVE_FLAGS DMUS_CURVE_FLAGS; - - /* actual enumerations */ -enum enumDMUS_STYLET_TYPES { +typedef enum enumDMUS_STYLET_TYPES { DMUS_STYLET_PATTERN = 0x0, DMUS_STYLET_MOTIF = 0x1, -}; +} DMUS_STYLET_TYPES; -enum enumDMUS_COMMANDT_TYPES { +typedef enum enumDMUS_COMMANDT_TYPES { DMUS_COMMANDT_GROOVE = 0x0, DMUS_COMMANDT_FILL = 0x1, DMUS_COMMANDT_INTRO = 0x2, DMUS_COMMANDT_BREAK = 0x3, DMUS_COMMANDT_END = 0x4, DMUS_COMMANDT_ENDANDINTRO = 0x5 -}; +} DMUS_COMMANDT_TYPES; -enum enumDMUS_SHAPET_TYPES { +typedef enum enumDMUS_SHAPET_TYPES { DMUS_SHAPET_FALLING = 0x0, DMUS_SHAPET_LEVEL = 0x1, DMUS_SHAPET_LOOPABLE = 0x2, @@ -407,9 +392,9 @@ enum enumDMUS_SHAPET_TYPES { DMUS_SHAPET_RANDOM = 0x6, DMUS_SHAPET_RISING = 0x7, DMUS_SHAPET_SONG = 0x8 -}; +} DMUS_SHAPET_TYPES; -enum enumDMUS_COMPOSEF_FLAGS { +typedef enum enumDMUS_COMPOSEF_FLAGS { DMUS_COMPOSEF_NONE = 0x000000, DMUS_COMPOSEF_ALIGN = 0x000001, DMUS_COMPOSEF_OVERLAP = 0x000002, @@ -434,9 +419,9 @@ enum enumDMUS_COMPOSEF_FLAGS { DMUS_COMPOSEF_NOINVALIDATE = 0x100000, DMUS_COMPOSEF_USE_AUDIOPATH = 0x200000, DMUS_COMPOSEF_INVALIDATE_PRI = 0x400000 -}; +} DMUS_COMPOSEF_FLAGS; -enum enumDMUS_PMSGF_FLAGS { +typedef enum enumDMUS_PMSGF_FLAGS { DMUS_PMSGF_REFTIME = 1, DMUS_PMSGF_MUSICTIME = 2, DMUS_PMSGF_TOOL_IMMEDIATE = 4, @@ -445,9 +430,9 @@ enum enumDMUS_PMSGF_FLAGS { DMUS_PMSGF_TOOL_FLUSH = 0x20, DMUS_PMSGF_LOCKTOREFTIME = 0x40, DMUS_PMSGF_DX8 = 0x80 -}; +} DMUS_PMSGF_FLAGS; -enum enumDMUS_PMSGT_TYPES { +typedef enum enumDMUS_PMSGT_TYPES { DMUS_PMSGT_MIDI = 0x00, DMUS_PMSGT_NOTE = 0x01, DMUS_PMSGT_SYSEX = 0x02, @@ -464,9 +449,9 @@ enum enumDMUS_PMSGT_TYPES { DMUS_PMSGT_LYRIC = 0x0D, DMUS_PMSGT_SCRIPTLYRIC = 0x0E, DMUS_PMSGT_USER = 0xFF -}; +} DMUS_PMSGT_TYPES; -enum enumDMUS_SEGF_FLAGS { +typedef enum enumDMUS_SEGF_FLAGS { DMUS_SEGF_REFTIME = 0x000040, DMUS_SEGF_SECONDARY = 0x000080, DMUS_SEGF_QUEUE = 0x000100, @@ -490,9 +475,9 @@ enum enumDMUS_SEGF_FLAGS { DMUS_SEGF_USE_AUDIOPATH = 0x04000000, DMUS_SEGF_VALID_START_MEASURE = 0x08000000, DMUS_SEGF_INVALIDATE_PRI = 0x10000000 -}; +} DMUS_SEGF_FLAGS; -enum enumDMUS_TIME_RESOLVE_FLAGS { +typedef enum enumDMUS_TIME_RESOLVE_FLAGS { DMUS_TIME_RESOLVE_AFTERPREPARETIME = DMUS_SEGF_AFTERPREPARETIME, DMUS_TIME_RESOLVE_AFTERQUEUETIME = DMUS_SEGF_AFTERQUEUETIME, DMUS_TIME_RESOLVE_AFTERLATENCYTIME = DMUS_SEGF_AFTERLATENCYTIME, @@ -501,33 +486,33 @@ enum enumDMUS_TIME_RESOLVE_FLAGS { DMUS_TIME_RESOLVE_MEASURE = DMUS_SEGF_MEASURE, DMUS_TIME_RESOLVE_MARKER = DMUS_SEGF_MARKER, DMUS_TIME_RESOLVE_SEGMENTEND = DMUS_SEGF_SEGMENTEND, -}; +} DMUS_TIME_RESOLVE_FLAGS; -enum enumDMUS_CHORDKEYF_FLAGS { +typedef enum enumDMUS_CHORDKEYF_FLAGS { DMUS_CHORDKEYF_SILENT = 0x1, -}; +} DMUS_CHORDKEYF_FLAGS; -enum enumDMUS_NOTEF_FLAGS { +typedef enum enumDMUS_NOTEF_FLAGS { DMUS_NOTEF_NOTEON = 0x01, /* DX8 */ DMUS_NOTEF_NOINVALIDATE = 0x02, DMUS_NOTEF_NOINVALIDATE_INSCALE = 0x04, DMUS_NOTEF_NOINVALIDATE_INCHORD = 0x08, DMUS_NOTEF_REGENERATE = 0x10, -}; +} DMUS_NOTEF_FLAGS; -enum enumDMUS_PLAYMODE_FLAGS { +typedef enum enumDMUS_PLAYMODE_FLAGS { DMUS_PLAYMODE_KEY_ROOT = 0x01, DMUS_PLAYMODE_CHORD_ROOT = 0x02, DMUS_PLAYMODE_SCALE_INTERVALS = 0x04, DMUS_PLAYMODE_CHORD_INTERVALS = 0x08, DMUS_PLAYMODE_NONE = 0x10, -}; +} DMUS_PLAYMODE_FLAGS; -enum enumDMUS_CURVE_FLAGS { +typedef enum enumDMUS_CURVE_FLAGS { DMUS_CURVE_RESET = 0x1, DMUS_CURVE_START_FROM_CURRENT = 0x2 -}; +} DMUS_CURVE_FLAGS; enum { DMUS_CURVES_LINEAR = 0x0, -- 2.17.1

1 0

[PATCH v2 1/6] strmbase: Set the filter debug info only if valid.
by Zebediah Figura 30 Sep '19

30 Sep '19

Fixes using binaries compiled with Wine's strmbase with Windows 8 and higher. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/filter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index b52a99d25b2..2de0a78f7a0 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -302,7 +302,8 @@ void strmbase_filter_init(struct strmbase_filter *filter, const IBaseFilterVtbl filter->refcount = 1; InitializeCriticalSection(&filter->csFilter); - filter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.csFilter"); + if (filter->csFilter.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + filter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.csFilter"); filter->clsid = *clsid; filter->pin_version = 1; filter->pFuncsTable = func_table; @@ -314,6 +315,5 @@ void strmbase_filter_cleanup(struct strmbase_filter *This) IReferenceClock_Release(This->pClock); This->IBaseFilter_iface.lpVtbl = NULL; - This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); } -- 2.23.0

2 10

[PATCH] testbot/WineRun*: Specify why a VM is put offline when it is off.
by Francois Gouget 30 Sep '19

30 Sep '19

The reason will appear in the Activity page, thus providing easily understandable diagnostic data. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 9 +++++---- testbot/bin/WineRunReconfig.pl | 9 +++++---- testbot/bin/WineRunTask.pl | 9 +++++---- testbot/bin/WineRunWineTest.pl | 9 +++++---- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index c4c136595..89582a103 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -192,11 +192,12 @@ sub LogTaskError($) umask($OldUMask); } -sub WrapUpAndExit($;$$) +sub WrapUpAndExit($;$$$) { - my ($Status, $Retry, $TimedOut) = @_; + my ($Status, $Retry, $TimedOut, $Reason) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; - my $VMResult = $Status eq "boterror" ? "boterror" : + my $VMResult = defined $Reason ? $Reason : + $Status eq "boterror" ? "boterror" : $Status eq "queued" ? "error" : $TimedOut ? "timeout" : ""; @@ -346,7 +347,7 @@ if (!$VM->GetDomain()->IsPoweredOn()) "The VM is not powered on despite its status being 'running'.\n". "The VM has been put offline and the TestBot will try to regain\n". "access to it."); - WrapUpAndExit('queued'); + WrapUpAndExit('queued', undef, undef, 'boterror vm off'); } if ($Step->Type ne "build") diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 91654ea94..5c7b46bb9 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -194,12 +194,13 @@ sub LogTaskError($) umask($OldUMask); } -sub WrapUpAndExit($;$$) +sub WrapUpAndExit($;$$$) { - my ($Status, $Retry, $TimedOut) = @_; + my ($Status, $Retry, $TimedOut, $Reason) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : $Status eq 'completed' ? 'idle' : 'dirty'; - my $VMResult = $Status eq "boterror" ? "boterror" : + my $VMResult = defined $Reason ? $Reason : + $Status eq "boterror" ? "boterror" : $Status eq "queued" ? "error" : $TimedOut ? "timeout" : ""; @@ -352,7 +353,7 @@ if (!$Domain->IsPoweredOn()) MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". "So the VM has been put offline and the TestBot will try to regain\n". "access to it."); - WrapUpAndExit('queued'); + WrapUpAndExit('queued', undef, undef, 'boterror vm off'); } if ($Step->Type ne "reconfig") diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 1ffd87537..81a2996bb 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -224,11 +224,12 @@ sub LogTaskError($) umask($OldUMask); } -sub WrapUpAndExit($;$$$) +sub WrapUpAndExit($;$$$$) { - my ($Status, $TestFailures, $Retry, $TimedOut) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut, $Reason) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; - my $VMResult = $Status eq "boterror" ? "boterror" : + my $VMResult = $Reason ? $Reason : + $Status eq "boterror" ? "boterror" : $Status eq "queued" ? "error" : $TimedOut ? "timeout" : ""; @@ -407,7 +408,7 @@ if (!$Domain->IsPoweredOn()) MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". "So the VM has been put offline and the TestBot will try to regain\n". "access to it."); - WrapUpAndExit('queued'); + WrapUpAndExit('queued', undef, undef, undef, 'boterror vm off'); } if ($Step->Type ne "single" and $Step->Type ne "suite") diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index c6770aa9d..beb050276 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -220,11 +220,12 @@ sub LogTaskError($) my $TaskMissions; -sub WrapUpAndExit($;$$$) +sub WrapUpAndExit($;$$$$) { - my ($Status, $TestFailures, $Retry, $TimedOut) = @_; + my ($Status, $TestFailures, $Retry, $TimedOut, $Reason) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; - my $VMResult = $Status eq "boterror" ? "boterror" : + my $VMResult = defined $Reason ? $Reason : + $Status eq "boterror" ? "boterror" : $Status eq "queued" ? "error" : $TimedOut ? "timeout" : ""; @@ -407,7 +408,7 @@ if (!$Domain->IsPoweredOn()) MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". "So the VM has been put offline and the TestBot will try to regain\n". "access to it."); - WrapUpAndExit('queued'); + WrapUpAndExit('queued', undef, undef, 'boterror vm off'); } if ($Step->Type ne "suite" and $Step->Type ne "single") -- 2.20.1

1 0

[PATCH] testbot/WineRun*: Cannot put the VM offline if its Status is wrong.
by Francois Gouget 30 Sep '19

30 Sep '19

These scripts should not modify a VM if its status is not 'running'. This includes not putting it offline. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 7 ++----- testbot/bin/WineRunReconfig.pl | 7 ++----- testbot/bin/WineRunTask.pl | 7 ++----- testbot/bin/WineRunWineTest.pl | 7 ++----- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 3a1b649e7..c4c136595 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -331,12 +331,9 @@ if ($VM->Type ne "build") if (!$Debug and $VM->Status ne "running") { # Maybe the administrator tinkered with the VM state? In any case the VM - # is not ours to use so requeue the task and abort. + # is not ours to use so requeue the task and abort. Note that the VM will + # not be put offline (again, not ours). Error("The VM is not ready for use (" . $VM->Status . ")\n"); - NotifyAdministrator("Putting the ". $VM->Name ." VM offline", - "The VM status should be 'running' but is '". $VM->Status ."' instead.\n". - "The VM has been put offline and the TestBot will try to regain\n". - "access to it."); WrapUpAndExit('queued'); } if (!$VM->GetDomain()->IsPoweredOn()) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 606027182..91654ea94 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -334,12 +334,9 @@ if ($VM->Type ne "build" and $VM->Type ne "wine") if (!$Debug and $VM->Status ne "running") { # Maybe the administrator tinkered with the VM state? In any case the VM - # is not ours to use so requeue the task and abort. + # is not ours to use so requeue the task and abort. Note that the VM will + # not be put offline (again, not ours). Error("The VM is not ready for use (" . $VM->Status . ")\n"); - NotifyAdministrator("Putting the ". $VM->Name ." VM offline", - "The VM status should be 'running' but is '". $VM->Status ."' instead.\n". - "The VM has been put offline and the TestBot will try to regain\n". - "access to it."); WrapUpAndExit('queued'); } my $Domain = $VM->GetDomain(); diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 53aa578a5..1ffd87537 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -389,12 +389,9 @@ if ($VM->Type ne "win32" and $VM->Type ne "win64") if (!$Debug and $VM->Status ne "running") { # Maybe the administrator tinkered with the VM state? In any case the VM - # is not ours to use so requeue the task and abort. + # is not ours to use so requeue the task and abort. Note that the VM will + # not be put offline (again, not ours). Error("The VM is not ready for use (" . $VM->Status . ")\n"); - NotifyAdministrator("Putting the ". $VM->Name ." VM offline", - "The VM status should be 'running' but is '". $VM->Status ."' instead.\n". - "The VM has been put offline and the TestBot will try to regain\n". - "access to it."); WrapUpAndExit('queued'); } my $Domain = $VM->GetDomain(); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index e3db27930..c6770aa9d 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -389,12 +389,9 @@ if ($VM->Type ne "wine") if (!$Debug and $VM->Status ne "running") { # Maybe the administrator tinkered with the VM state? In any case the VM - # is not ours to use so requeue the task and abort. + # is not ours to use so requeue the task and abort. Note that the VM will + # not be put offline (again, not ours). Error("The VM is not ready for use (" . $VM->Status . ")\n"); - NotifyAdministrator("Putting the ". $VM->Name ." VM offline", - "The VM status should be 'running' but is '". $VM->Status ."' instead.\n". - "The VM has been put offline and the TestBot will try to regain\n". - "access to it."); WrapUpAndExit('queued'); } my $Domain = $VM->GetDomain(); -- 2.20.1

1 0

[PATCH] testbot: Tweak the name of the Windows WineTest jobs.
by Francois Gouget 30 Sep '19

30 Sep '19

Better separate the bitness of the WineTest executable from the Windows bitness. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- testbot/lib/WineTestBot/SpecialJobs.pm | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index c3ec3a4d2..94d975071 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -400,7 +400,7 @@ if ($OptTypes{all64}) } elsif ($Create == 1) { - $Rc = 1 if ($OptTypes{all64} and !DoWindowsTest($OptVMKey, "exe64", "", $LatestBaseName)); + $Rc = 1 if ($OptTypes{all64} and !DoWindowsTest($OptVMKey, "exe64", "all", $LatestBaseName)); } } diff --git a/testbot/lib/WineTestBot/SpecialJobs.pm b/testbot/lib/WineTestBot/SpecialJobs.pm index 0371084ae..360e1ffe8 100644 --- a/testbot/lib/WineTestBot/SpecialJobs.pm +++ b/testbot/lib/WineTestBot/SpecialJobs.pm @@ -148,10 +148,9 @@ sub AddWindowsTestJob($$$$$) my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority(($BaseJob eq "base" and $Build eq "exe32") ? 8 : 9); - my $Remarks = defined $VMKey ? "$VMKey VM" : - $Build eq "exe64" ? "64 bit VMs" : - "$BaseJob VMs"; - $NewJob->Remarks("WineTest: $Remarks"); + my $Remarks = ($Build eq "exe32" ? "32" : "64") ." bit WineTest: ". + (defined $VMKey ? "$VMKey VM" : "$BaseJob VMs"); + $NewJob->Remarks($Remarks); # Add a task for each VM my $Tasks; -- 2.20.1

1 0