July 2018 - Wine-devel - list.winehq.org

[PATCH] po: Update Russian translation.
by Nikolay Sivov 12 Jul '18

12 Jul '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/po/ru.po b/po/ru.po index 156642be65..1947549bbe 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-06 09:17+0300\n" +"PO-Revision-Date: 2018-07-12 16:25+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -3442,18 +3442,16 @@ msgid "Connections" msgstr "Подключения" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Настройка Wine" +msgstr "Автонастройка" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Использовать WPAD" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Использовать PAC-скрипт" #: inetcpl.rc:128 inetcpl.rc:132 msgid "Address:" -- 2.18.0

1 0

[PATCH]: po: Update Lithuanian translation
by Aurimas Fišeras 12 Jul '18

12 Jul '18

1 0

[PATCH 1/2 v4] mscoree: add stub for CorIsLatestSvc to hint user at broken .NET installation
by Louis Lenders 12 Jul '18

12 Jul '18

v4: change channel to winediag The check for arguments is to make the test pass. Though not usefull, it doesnt harm either IMO Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 11 +++++++++++ dlls/mscoree/tests/mscoree.c | 7 ++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 3715b7c79d..ec4668bc3c 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -25,7 +25,7 @@ @ stub CorDllMainWorker @ stdcall CorExitProcess(long) @ stub CorGetSvc -@ stub CorIsLatestSvc +@ stdcall CorIsLatestSvc(ptr ptr) @ stub CorMarkThreadInThreadPool @ stub CorTickleSvc @ stdcall CreateConfigStream(wstr ptr) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 9561405608..c04126657d 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -49,6 +49,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static HINSTANCE MSCOREE_hInstance; @@ -309,6 +310,16 @@ HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) return ret; } +HRESULT WINAPI CorIsLatestSvc(int *unk1, int *unk2) +{ + ERR_(winediag)("%p, %p stub: If this function is called, it is likely the result of a broken .NET installation!\n", unk1, unk2); + + if (!unk1 || !unk2) + return E_POINTER; + + return S_OK; +} + HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWSTR pConfigurationFile, DWORD startupFlags, DWORD runtimeInfoFlags, LPWSTR pDirectory, DWORD dwDirectory, DWORD *dwDirectoryLength, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 63517dc79b..dd4724dc76 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -35,6 +35,7 @@ static const WCHAR v4_0[] = {'v','4','.','0','.','3','0','3','1','9',0}; static HMODULE hmscoree; static HRESULT (WINAPI *pGetCORVersion)(LPWSTR, DWORD, DWORD*); +static HRESULT (WINAPI *pCorIsLatestSvc)(INT*, INT*); static HRESULT (WINAPI *pGetCORSystemDirectory)(LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pGetRequestedRuntimeInfo)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD, DWORD*, LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE*); @@ -55,6 +56,7 @@ static BOOL init_functionpointers(void) } pGetCORVersion = (void *)GetProcAddress(hmscoree, "GetCORVersion"); + pCorIsLatestSvc = (void *)GetProcAddress(hmscoree, "CorIsLatestSvc"); pGetCORSystemDirectory = (void *)GetProcAddress(hmscoree, "GetCORSystemDirectory"); pGetRequestedRuntimeInfo = (void *)GetProcAddress(hmscoree, "GetRequestedRuntimeInfo"); pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim"); @@ -63,7 +65,7 @@ static BOOL init_functionpointers(void) pCLRCreateInstance = (void *)GetProcAddress(hmscoree, "CLRCreateInstance"); if (!pGetCORVersion || !pGetCORSystemDirectory || !pGetRequestedRuntimeInfo || !pLoadLibraryShim || - !pCreateInterface || !pCLRCreateInstance + !pCreateInterface || !pCLRCreateInstance || !pCorIsLatestSvc ) { win_skip("functions not available\n"); @@ -289,6 +291,9 @@ static void test_versioninfo(void) hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + + hr = pCorIsLatestSvc(NULL, NULL); + ok(hr == E_POINTER, "CorIsLatestSvc returned %08x\n", hr); } static void test_loadlibraryshim(void) -- 2.17.1

2 1

[PATCH] msadp32.acm: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc 12 Jul '18

12 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msadp32.acm/msadp32.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 24e0c6a72b..50ade3d9aa 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -83,9 +83,6 @@ static const Format ADPCM_Formats[] = {1, 4, 22050}, {2, 4, 22050}, {1, 4, 44100}, {2, 4, 44100}, }; -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) -#define NUM_ADPCM_FORMATS (sizeof(ADPCM_Formats) / sizeof(ADPCM_Formats[0])) - static int MS_Delta[] = { 230, 230, 230, 230, 307, 409, 512, 614, @@ -109,11 +106,11 @@ static DWORD ADPCM_GetFormatIndex(const WAVEFORMATEX* wfx) switch (wfx->wFormatTag) { case WAVE_FORMAT_PCM: - hi = NUM_PCM_FORMATS; + hi = ARRAY_SIZE(PCM_Formats); fmts = PCM_Formats; break; case WAVE_FORMAT_ADPCM: - hi = NUM_ADPCM_FORMATS; + hi = ARRAY_SIZE(ADPCM_Formats); fmts = ADPCM_Formats; break; default: @@ -441,13 +438,13 @@ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) case 0: aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); lstrcpyW(aftd->szFormatTag, szPcm); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_ADPCM; aftd->cbFormatSize = sizeof(ADPCMWAVEFORMAT) + (7 - 1) * sizeof(ADPCMCOEFSET); - aftd->cStandardFormats = NUM_ADPCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(ADPCM_Formats); lstrcpyW(aftd->szFormatTag, szMsAdPcm); break; } @@ -470,7 +467,7 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) switch (afd->dwFormatTag) { case WAVE_FORMAT_PCM: - if (afd->dwFormatIndex >= NUM_PCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(PCM_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = PCM_Formats[afd->dwFormatIndex].nBits; @@ -483,7 +480,7 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; case WAVE_FORMAT_ADPCM: - if (afd->dwFormatIndex >= NUM_ADPCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(ADPCM_Formats)) return ACMERR_NOTPOSSIBLE; if (afd->cbwfx < sizeof(ADPCMWAVEFORMAT) + (7 - 1) * sizeof(ADPCMCOEFSET)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = ADPCM_Formats[afd->dwFormatIndex].nChannels; -- 2.14.4

2 1

[PATCH] msg711.acm: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc 12 Jul '18

12 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msg711.acm/msg711.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index dc1661c7db..cb8b76240a 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -87,10 +87,6 @@ static const Format ULaw_Formats[] = {1, 8, 22050}, {2, 8, 22050}, {1, 8, 44100}, {2, 8, 44100}, }; -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) -#define NUM_ALAW_FORMATS (sizeof(ALaw_Formats) / sizeof(ALaw_Formats[0])) -#define NUM_ULAW_FORMATS (sizeof(ULaw_Formats) / sizeof(ULaw_Formats[0])) - /*********************************************************************** * G711_GetFormatIndex */ @@ -102,15 +98,15 @@ static DWORD G711_GetFormatIndex(const WAVEFORMATEX *wfx) switch (wfx->wFormatTag) { case WAVE_FORMAT_PCM: - hi = NUM_PCM_FORMATS; + hi = ARRAY_SIZE(PCM_Formats); fmts = PCM_Formats; break; case WAVE_FORMAT_ALAW: - hi = NUM_ALAW_FORMATS; + hi = ARRAY_SIZE(ALaw_Formats); fmts = ALaw_Formats; break; case WAVE_FORMAT_MULAW: - hi = NUM_ULAW_FORMATS; + hi = ARRAY_SIZE(ULaw_Formats); fmts = ULaw_Formats; break; default: @@ -716,19 +712,19 @@ static LRESULT G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) case 0: aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); lstrcpyW(aftd->szFormatTag, szPcm); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_ALAW; aftd->cbFormatSize = sizeof(WAVEFORMATEX); - aftd->cStandardFormats = NUM_ALAW_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(ALaw_Formats); lstrcpyW(aftd->szFormatTag, szALaw); break; case 2: aftd->dwFormatTag = WAVE_FORMAT_MULAW; aftd->cbFormatSize = sizeof(WAVEFORMATEX); - aftd->cStandardFormats = NUM_ULAW_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(ULaw_Formats); lstrcpyW(aftd->szFormatTag, szULaw); break; } @@ -751,7 +747,7 @@ static LRESULT G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) switch (afd->dwFormatTag) { case WAVE_FORMAT_PCM: - if (afd->dwFormatIndex >= NUM_PCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(PCM_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = PCM_Formats[afd->dwFormatIndex].nBits; @@ -759,7 +755,7 @@ static LRESULT G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nAvgBytesPerSec = afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; case WAVE_FORMAT_ALAW: - if (afd->dwFormatIndex >= NUM_ALAW_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(ALaw_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = ALaw_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = ALaw_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = ALaw_Formats[afd->dwFormatIndex].nBits; @@ -768,7 +764,7 @@ static LRESULT G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->cbSize = 0; break; case WAVE_FORMAT_MULAW: - if (afd->dwFormatIndex >= NUM_ULAW_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(ULaw_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = ULaw_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = ULaw_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = ULaw_Formats[afd->dwFormatIndex].nBits; -- 2.14.4

2 1

[PATCH] msgsm32.acm: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc 12 Jul '18

12 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msgsm32.acm/msgsm32.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index cce1303455..99eef9624e 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -199,7 +199,6 @@ static BOOL GSM_FormatValidate(const WAVEFORMATEX *wfx) } static const DWORD gsm_rates[] = { 8000, 11025, 22050, 44100, 48000, 96000 }; -#define NUM_RATES (sizeof(gsm_rates)/sizeof(*gsm_rates)) /*********************************************************************** * GSM_FormatTagDetails @@ -241,13 +240,13 @@ static LRESULT GSM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) case 0: aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); - aftd->cStandardFormats = NUM_RATES; + aftd->cStandardFormats = ARRAY_SIZE(gsm_rates); lstrcpyW(aftd->szFormatTag, szPcm); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_GSM610; aftd->cbFormatSize = sizeof(GSM610WAVEFORMAT); - aftd->cStandardFormats = NUM_RATES; + aftd->cStandardFormats = ARRAY_SIZE(gsm_rates); lstrcpyW(aftd->szFormatTag, szGsm); break; } @@ -270,7 +269,7 @@ static LRESULT GSM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) switch (afd->dwFormatTag) { case WAVE_FORMAT_PCM: - if (afd->dwFormatIndex >= NUM_RATES) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(gsm_rates)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = 1; afd->pwfx->nSamplesPerSec = gsm_rates[afd->dwFormatIndex]; afd->pwfx->wBitsPerSample = 16; @@ -278,7 +277,7 @@ static LRESULT GSM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nAvgBytesPerSec = afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; case WAVE_FORMAT_GSM610: - if (afd->dwFormatIndex >= NUM_RATES) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(gsm_rates)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = 1; afd->pwfx->nSamplesPerSec = gsm_rates[afd->dwFormatIndex]; afd->pwfx->wBitsPerSample = 0; -- 2.14.4

2 1

[PATCH v3 1/2] kernel32: resource: Changed QUEUEDUPDATES to match MS offset
by Jon Doron 12 Jul '18

12 Jul '18

The utility muirct.exe for some reason accesses the opaque HANDLE that is returned by BeginUpdateResource, it assumes a certain structure in which (on 32bit systems) there is a pointer to the wide repesentation of the file name in offset 0x18 (0x30 on 64bit). Refer to: muirct!BldToolsEndUpdateResourceW called from muirct!CopyChecksumToFile Sample execution: MUIRCT.EXE -c "ui.exe" -e "de-DE\ui.exe.mui" Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/kernel32/resource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 73f3cca363..59bc7a8cdc 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -635,7 +635,8 @@ DWORD WINAPI SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) typedef struct { - LPWSTR pFileName; + void *Reserved[6]; + LPWSTR pFileName; /* Must be in offset 0x18 on 32bit and 0x30 on 64bit */ BOOL bDeleteExistingResources; struct list root; } QUEUEDUPDATES; -- 2.17.1

2 2

[PATCH] testbot: Remove the patchdlls vs. patchprograms distinction.
by Francois Gouget 12 Jul '18

12 Jul '18

A patch could impact tests in both Wine folders. It's up to the build task to handle whatever the patch contains. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunTask.pl | 2 +- testbot/bin/WineRunWineTest.pl | 2 +- testbot/ddl/update39.sql | 11 +++++++++++ testbot/ddl/winetestbot.sql | 2 +- testbot/lib/WineTestBot/Patches.pm | 4 ++-- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/web/GetFile.pl | 4 ++-- testbot/web/Submit.pl | 18 +++++++++--------- 9 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 testbot/ddl/update39.sql diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 90b9f030a..10c098936 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -325,7 +325,7 @@ elsif (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } -if ($Step->FileType ne "patchdlls") +if ($Step->FileType ne "patch") { FatalError("Unexpected file type '". $Step->FileType ."' found\n"); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 0f2a093e1..974ff3b51 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -445,7 +445,7 @@ if ($Step->Type eq "single") # If the user gave us an executable there is no telling # if it is going going to follow the Wine test standards. $IsWineTest = (defined $Step->PreviousNo and - $Job->Steps->GetItem($Step->PreviousNo)->FileType eq "patchdlls"); + $Job->Steps->GetItem($Step->PreviousNo)->FileType eq "patch"); } elsif ($Step->Type eq "suite") { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 1e43f9a41..e7aa72ec9 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -383,7 +383,7 @@ elsif (!$VM->GetDomain()->IsPoweredOn()) } if (($Step->Type eq "suite" and $Step->FileType ne "none") or - ($Step->Type ne "suite" and $Step->FileType ne "patchdlls")) + ($Step->Type ne "suite" and $Step->FileType ne "patch")) { FatalError("Unexpected file type '". $Step->FileType ."' found\n"); } diff --git a/testbot/ddl/update39.sql b/testbot/ddl/update39.sql new file mode 100644 index 000000000..628e914ce --- /dev/null +++ b/testbot/ddl/update39.sql @@ -0,0 +1,11 @@ +USE winetestbot; + +ALTER TABLE Steps + MODIFY FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms', 'patch') NOT NULL; + +UPDATE Steps + SET FileType = 'patch' + WHERE FileType = 'patchdlls' OR FileType = 'patchprograms'; + +ALTER TABLE Steps + MODIFY FileType ENUM('none', 'exe32', 'exe64', 'patch') NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index a6adea820..96fcdcb22 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -133,7 +133,7 @@ CREATE TABLE Steps Type ENUM('suite', 'single', 'build', 'reconfig') NOT NULL, Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped') NOT NULL, FileName VARCHAR(100) NULL, - FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL, + FileType ENUM('none', 'exe32', 'exe64', 'patch') NOT NULL, DebugLevel INT(2) NOT NULL, ReportSuccessfulTests ENUM('Y', 'N') NOT NULL, PRIMARY KEY (JobId, No), diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 2d553fed3..87f211731 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -181,7 +181,7 @@ sub Submit($$$) # Create the Build Step my $BuildStep = $NewJob->Steps->Add(); $BuildStep->FileName("patch.diff"); - $BuildStep->FileType("patchdlls"); + $BuildStep->FileType("patch"); $BuildStep->Type("build"); $BuildStep->DebugLevel(0); @@ -245,7 +245,7 @@ sub Submit($$$) # Add a Wine step to the job my $NewStep = $NewJob->Steps->Add(); $NewStep->FileName("patch.diff"); - $NewStep->FileType("patchdlls"); + $NewStep->FileType("patch"); $NewStep->DebugLevel(0); # And a task for each VM diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index cb2c6eeb7..2f5bdb070 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -232,7 +232,7 @@ my @PropertyDescriptors = ( CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), - CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['none', 'exe32', 'exe64', 'patchdlls', 'patchprograms']), + CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['none', 'exe32', 'exe64', 'patch']), CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), CreateDetailrefPropertyDescriptor("Tasks", "Tasks", !1, !1, \&CreateTasks), diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index 1fe140788..a8699497b 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -86,8 +86,8 @@ sub GetFile($$$) $Request->headers_out->add("Pragma", "no-cache"); # Text or binary file - my $MIME = $Step->FileType eq "patchdlls" ? "text/plain" : - "application/octet-stream"; + my $MIME = $Step->FileType eq "patch" ? "text/plain" : + "application/octet-stream"; $Request->content_type($MIME); $Request->headers_out->add("Content-Disposition", 'attachment; filename="' . $Step->FileName . '"'); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index e207d78ba..926fcb7ea 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -119,7 +119,7 @@ sub GetPropertyDescriptors($) } elsif ($self->{Page} == 3) { - my $IsPatch = ($self->GetParam("FileType") eq "patchdlls"); + my $IsPatch = ($self->GetParam("FileType") eq "patch"); $self->{PropertyDescriptors3}[0]->{IsRequired} = $IsPatch; return $self->{PropertyDescriptors3}; } @@ -394,7 +394,7 @@ sub DisplayProperty($$) if ($self->{Page} == 3) { my $PropertyName = $PropertyDescriptor->GetName(); - if ($self->GetParam("FileType") eq "patchdlls") + if ($self->GetParam("FileType") eq "patch") { if ($PropertyName eq "Run64") { @@ -482,7 +482,7 @@ sub Validate($) } elsif ($self->{Page} == 3 && $self->GetParam("Page") == 3) { - if (($self->GetParam("FileType") eq "patchdlls" && + if (($self->GetParam("FileType") eq "patch" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || !IsValidFileName($self->GetParam("TestExecutable"))) { @@ -608,7 +608,7 @@ sub DetermineFileType($$) else { my $TestInfo = (values %{$Impacts->{Tests}})[0]; - $FileType = "patchdlls"; + $FileType = "patch"; $ExeBase = $TestInfo->{ExeBase}; $TestUnit = (keys %{$TestInfo->{Units}})[0]; } @@ -656,7 +656,7 @@ sub OnPage1Next($) $self->{ErrMessage} = $ErrMessage; return !1; } - if ($FileType !~ /^(?:exe32|exe64|patchdlls)$/) + if ($FileType !~ /^(?:exe32|exe64|patch)$/) { $self->{ErrField} = "File"; $self->{ErrMessage} = "Unrecognized file type"; @@ -781,7 +781,7 @@ sub OnSubmit($) { next if ($Bits eq "32" && $FileType eq "exe64"); next if ($Bits eq "64" && $FileType eq "exe32"); - next if ($Bits eq "64" && $FileType eq "patchdlls" && !defined($self->GetParam("Run64"))); + next if ($Bits eq "64" && $FileType eq "patch" && !defined($self->GetParam("Run64"))); my $Tasks; my $VMs = CreateVMs(); @@ -795,7 +795,7 @@ sub OnSubmit($) if (!$Tasks) { - if (!$BuildStep and $FileType eq "patchdlls") + if (!$BuildStep and $FileType eq "patch") { # This is a patch so add a build step... $BuildStep = $Steps->Add(); @@ -824,7 +824,7 @@ sub OnSubmit($) # Then create the test step my $TestStep = $Steps->Add(); - if ($FileType eq "patchdlls") + if ($FileType eq "patch") { $TestStep->PreviousNo($BuildStep->No); my $TestExe = basename($self->GetParam("TestExecutable")); @@ -850,7 +850,7 @@ sub OnSubmit($) } } - if ($FileType eq "patchdlls") + if ($FileType eq "patch") { my $Tasks; my $VMs = CreateVMs(); -- 2.18.0

1 0

[PATCH] testbot/web: Small formatting tweaks.
by Francois Gouget 12 Jul '18

12 Jul '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 28601d082..3fcec5db6 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -393,21 +393,16 @@ sub GenerateBody($) my $LogName = $MoreInfo->{Full} || $MoreInfo->{Logs}->[0] || "log"; my $ErrName = $LogName eq "log.old" ? "err.old" : "err"; - my ($EmptyDiag, $LogFirst); + my ($EmptyDiag, $LogFirst) = (undef, 1); if (open(my $LogFile, "<", "$TaskDir/$LogName")) { my $HasLogEntries; - my $CurrentDll = ""; - my $PrintedDll = ""; - $LogFirst = 1; + my ($CurrentDll, $PrintedDll) = ("", ""); foreach my $Line (<$LogFile>) { $HasLogEntries = 1; chomp $Line; - if ($Line =~ m/^([^:]+):[^ ]+ start [^ ]+ -\s*$/) - { - $CurrentDll = $1; - } + $CurrentDll = $1 if ($Line =~ m/^([_.a-z0-9-]+):[_a-z0-9]* start /); my $Html = $self->GetHtmlLine($MoreInfo->{Full}, $Line); next if (!defined $Html); -- 2.18.0

1 0

[PATCH] testbot: Use 'dir.exe' as the module name for programs.
by Francois Gouget 12 Jul '18

12 Jul '18

For programs one identifies test units as dir.exe:unit, So 'dir.exe' is what should be used for the Module field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 811c3b8b2..be5ce14d1 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -127,11 +127,12 @@ sub _LoadWineFiles() chomp $Line; $_WineFiles->{$Line} = 1; - if ($Line =~ m~^\w+/([^/]+)/tests/([^/]+)$~) + if ($Line =~ m~^(dlls|programs)/([^/]+)/tests/([^/]+)$~) { - my ($Module, $File) = ($1, $2); + my ($Root, $Module, $File) = ($1, $2, $3); next if ($File eq "testlist.c"); next if ($File !~ /\.(?:c|spec)$/); + $Module .= ".exe" if ($Root eq "programs"); $_TestList->{$Module}->{$File} = 1; } } @@ -156,19 +157,18 @@ sub _HandleFile($$$) if ($FilePath =~ m~^(dlls|programs)/([^/]+)/tests/([^/\s]+)$~) { - my ($Root, $Module, $File) = ($1, $2, $3); + my ($Root, $Dir, $File) = ($1, $2, $3); $Impacts->{IsWinePatch} = 1; $Impacts->{TestBuild} = 1; my $Tests = $Impacts->{Tests}; + my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; if (!$Tests->{$Module}) { - my $ExeBase = ($Root eq "programs") ? "${Module}.exe_test" : - "${Module}_test"; $Tests->{$Module} = { "Module" => $Module, - "Path" => "$Root/$Module/tests", - "ExeBase" => $ExeBase, + "Path" => "$Root/$Dir/tests", + "ExeBase" => "${Module}_test", }; } -- 2.18.0

1 0