October 2019 - Wine-devel - list.winehq.org

[PATCH] testbot/WineRunBuild: Import WineTestBot::Utils for GetTaskURL().
by Francois Gouget 03 Oct '19

03 Oct '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- All the other WineRun* scripts were already importing WineTestBot::Utils but not this one. This is only an issue when the VM turns out to not be powered on, such as when I rebooted vm3 this afternoon. testbot/bin/WineRunBuild.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 71e7e39f4..ccbba3bbf 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -47,6 +47,7 @@ use WineTestBot::PatchUtils; use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; +use WineTestBot::Utils; use WineTestBot::Engine::Notify; -- 2.20.1

1 0

[PATCH] winhttp/tests: Fix more test failures.
by Hans Leidekker 03 Oct '19

03 Oct '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 552f6ce778..2cf6f6a87d 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3578,7 +3578,12 @@ static void test_passport_auth( int port ) ok( ret, "got %u\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret || broken(!ret && GetLastError() == ERROR_WINHTTP_LOGIN_FAILURE) /* winxp */, "got %u\n", GetLastError() ); + if (!ret && GetLastError() == ERROR_WINHTTP_LOGIN_FAILURE) + { + win_skip("no support for Passport redirects\n"); + goto cleanup; + } status = 0xdeadbeef; size = sizeof(status); @@ -3602,6 +3607,7 @@ static void test_passport_auth( int port ) ok( !lstrcmpW(headersW, buf), "got %s\n", wine_dbgstr_w(buf) ); } +cleanup: WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); -- 2.20.1

2 1

[v4 PATCH 2/2] msvcrt: Implement %e format for strftime
by Vijay Kiran Kamuju 03 Oct '19

03 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 6 ++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ 3 files changed, 19 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 86799c900f7..9795c92baf8 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -618,6 +618,11 @@ static void test_strftime(void) ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%e", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%F", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b9fcde79789..ea06e23b806 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1177,6 +1177,12 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99)) return 0; break; + case 'e': + if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) + return 0; + if(!alternate && (str[ret-2] == '0')) + str[ret-2] = ' '; + break; case 'F': tmp = 1900+mstm->tm_year; if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 4, 0, 9999)) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 1ba4280a546..aecbc9dca52 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -907,6 +907,14 @@ static void test_strftime(void) ok(retA == 6, "expected 6, got %d\n", (int)retA); ok(!strcmp(bufA, "1/1/70"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%e", &epoch); + ok(retA == 2, "expected 2, got %d\n", (int)retA); + ok(!strcmp(bufA, " 1"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%#e", &epoch); + ok(retA == 1, "expected 1, got %d\n", (int)retA); + ok(!strcmp(bufA, "1"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%F", &epoch); ok(retA == 10, "expected 10, got %d\n", (int)retA); ok(!strcmp(bufA, "1970-01-01"), "got %s\n", bufA); -- 2.21.0

1 0

[PATCH 2/2] kernel32/tests: Test Get/SetUserGeoID, GetUserDefaultGeoName, SetUserGeoName.
by João Diogo Ferreira 03 Oct '19

03 Oct '19

This adds unit tests for these four functions: GetUserGeoID(); SetUserGeoID(); GetUserDefaultGeoName(); SetUserGeoName(). These are all functions I intend to improve and/or implement in the short future. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/tests/locale.c | 319 +++++++++++++++++++++++++++++++++++ 1 file changed, 319 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 81e74531ea..e3e46bfb53 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -108,6 +108,8 @@ static LANGID (WINAPI *pSetThreadUILanguage)(LANGID); static LANGID (WINAPI *pGetThreadUILanguage)(VOID); static INT (WINAPI *pNormalizeString)(NORM_FORM, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pFindStringOrdinal)(DWORD, LPCWSTR lpStringSource, INT, LPCWSTR, INT, BOOL); +static int (WINAPI *pGetUserDefaultGeoName)(LPWSTR, int); +static BOOL (WINAPI *pSetUserGeoName)(PWSTR); static void InitFunctionPointers(void) { @@ -145,6 +147,8 @@ static void InitFunctionPointers(void) X(GetThreadUILanguage); X(NormalizeString); X(FindStringOrdinal); + X(GetUserDefaultGeoName); + X(SetUserGeoName); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -4745,6 +4749,317 @@ static void test_CompareStringOrdinal(void) } } +static void test_GetUserGeoID(void) +{ + GEOID id; + todo_wine { + if (pGetUserDefaultGeoName && pSetUserGeoName) + { + ok(GEOID_NOT_AVAILABLE != GetUserGeoID(GEOCLASS_NATION), + "GEOCLASS_NATION: should never return GEOID_NOT_AVAILABLE when GeoName API is available.\n"); + ok(GEOID_NOT_AVAILABLE != GetUserGeoID(GEOCLASS_REGION), + "GEOCLASS_REGION: should never return GEOID_NOT_AVAILABLE when GeoName API is available.\n"); + } + else + win_skip("This platform allows GEOID_NOT_AVAILABLE to be returned.\n"); + } + + id = GetUserGeoID(GEOCLASS_ALL); + ok(id == GEOID_NOT_AVAILABLE, + "GEOCLASS_ALL: Expected GEOID_NOT_AVAILABLE, got %d.\n", id); + id = GetUserGeoID(12345); + ok(id == GEOID_NOT_AVAILABLE, + "Gibberish argument: Expected GEOID_NOT_AVAILABLE, got %d.\n", id); +} + +static void test_GetUserDefaultGeoName(void) +{ + todo_wine { + if (pGetUserDefaultGeoName && pSetUserGeoName) + { + WCHAR *name = malloc(sizeof(WCHAR) * 10); + int count = 0; + + if (!name) + { + trace("Couldn't allocate 20 bytes to store geo name. Aborting test!\n"); + return; + } + + SetLastError(ERROR_SUCCESS); + count = pGetUserDefaultGeoName(NULL, 10); + ok(count == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "Expected count == 0, got %d; and expected last error = ERROR_INVALID_PARAMETER (87), got %d\n", + count, GetLastError()); + + count = pGetUserDefaultGeoName(NULL, -1); + ok(count == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "Expected count == 0, got %d; and expected last error = ERROR_INVALID_PARAMETER (87), got %d\n", + count, GetLastError()); + + SetLastError(ERROR_SUCCESS); + count = pGetUserDefaultGeoName(name, 0); + ok(count > 0, "Expected character count > 0, got %d; last error was %d.\n", count, GetLastError()); + + count = pGetUserDefaultGeoName(name, 1); + ok(count == 0 && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "Expected count == 0, got %d; and expected last error = ERROR_INSUFFICIENT_BUFFER (122), got %d\n", + count, GetLastError()); + + count = pGetUserDefaultGeoName(name, -1); + ok(count == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "Expected count == 0, got %d; and expected last error = ERROR_INVALID_PARAMETER (87), got %d\n", + count, GetLastError()); + + free(name); + + SetLastError(ERROR_SUCCESS); + count = pGetUserDefaultGeoName(NULL, 0); + ok(count > 0, "Expected character count > 0, got %d; last error was %d.\n", count, GetLastError()); + if (count) + { + name = malloc(count * sizeof(WCHAR)); + if (name) + { + int result = pGetUserDefaultGeoName(name, count); + ok(result, + "Expected character count == %d, got %d; last error was %d.\n", + count, result, GetLastError()); + free(name); + } + else + trace("Couldn't allocate %d bytes to store geo name.\n", count); + } + } + else win_skip("GetUserDefaultGeoName: procedure not implemented on this platform.\n"); + } +} + +static void test_SetUserGeoID(void) +{ + BOOL status; + const int geoname_supported = (pGetUserDefaultGeoName && pSetUserGeoName); + + const GEOID original_nation = GetUserGeoID(GEOCLASS_NATION); + const GEOID original_region = GetUserGeoID(GEOCLASS_REGION); + int original_name_count = 0; /* We only need the char count. */ + + struct geopair { + GEOID id; + WCHAR name[4]; + }; + + struct testsuit { + const char *const stage; + struct geopair geo, geo_backup; + GEOCLASS geoclass; + }; + + struct testsuit const tests[] = { + {"GEOCLASS_NATION", {193, {'P','T',0}}, {56, {'C','U',0}}, GEOCLASS_NATION}, + {"GEOCLASS_REGION", {21206, {'0','5','7',0}}, {10039880, {'0','2','9',0}}, GEOCLASS_REGION} + }; + + struct testsuit const bad_args[] = { + {"invalid GEOID -1", {GEOID_NOT_AVAILABLE}}, + {"invalid GEOID 1", {1}} + }; + + if (geoname_supported) + original_name_count = pGetUserDefaultGeoName(NULL, 0); + + /* Invalid args */ + for (int i = 0; i < ARRAY_SIZE(bad_args); i++) + { + BOOL status; + + SetLastError(ERROR_SUCCESS); + + status = SetUserGeoID(bad_args[i].geo.id); + ok(!status && + (GetLastError() == ERROR_INVALID_PARAMETER || /* Vista+ */ + broken(GetLastError() == ERROR_SUCCESS)), /* WinXP */ + "Setting %s: got ret=%d (expected 0), error=%d (expected 87=ERROR_INVALID_PARAMETER)\n", + bad_args[i].stage, status, GetLastError()); + } + + for (int i = 0; i < ARRAY_SIZE(tests); i++) + { + const struct geopair *geo; + + if (original_nation != tests[i].geo.id) + geo = &tests[i].geo; + else + geo = &tests[i].geo_backup; + + SetLastError(ERROR_SUCCESS); + ok(status = SetUserGeoID(geo->id), + "%s: Setting to %d failed with last error: %d\n", tests[i].stage, geo->id, GetLastError()); + if (status) + { + const GEOID id = GetUserGeoID(tests[i].geoclass); + const int status = (id == geo->id); + ok(status, "%s: we just set it to %d but retrieved %d instead \n", tests[i].stage, geo->id, id); + + if (status) + { + todo_wine { + if (geoname_supported) + { + const int count = pGetUserDefaultGeoName(NULL, 0); + WCHAR *const name = malloc(count * sizeof(WCHAR)); + + if (name) + { + const int written = pGetUserDefaultGeoName(name, count); + const int status = (count == written); + + ok(status, + "%s: Failed to get geoname after setting ID to %d: got %d characters, expected %d\n", + tests[i].stage, id, written, count); + ok(!winetest_strcmpW(name, geo->name), + "%s: wrong geoname for ID %d: got %s, expected %s\n", + tests[i].stage, geo->id, wine_dbgstr_w(name), wine_dbgstr_w(geo->name)); + free(name); + } + else if (count > 0) + trace("Couldn't allocate memory to store geoname string! (Size = %lu bytes)\n", + count * sizeof(WCHAR)); + } + else + win_skip("%s: Can't check geoname: unsupported platform.\n", tests[i].stage); + } + } + } + } + + /* Best attempt at restoring original values */ + if (geoname_supported) + { + if (original_name_count <= 3) + { + SetUserGeoID(original_region); + SetUserGeoID(original_nation); + } + else + { + SetUserGeoID(original_nation); + SetUserGeoID(original_region); + } + } + else + { + const GEOID neutral = 39070; /* World */ + original_region != GEOID_NOT_AVAILABLE ? SetUserGeoID(original_region) : SetUserGeoID(neutral); + original_nation != GEOID_NOT_AVAILABLE ? SetUserGeoID(original_nation) : SetUserGeoID(neutral); + } +} + +static void test_SetUserGeoName(void) +{ + todo_wine + { + if (pGetUserDefaultGeoName && pSetUserGeoName) + { + struct geopair { + WCHAR *name; + GEOID id; + }; + + struct testsuit { + const char *stage; + BOOL exp_return; + int exp_error; + struct geopair geo, geo_backup; + GEOCLASS geoclass; + }; + + /* Known valid test nations and regions */ + struct geopair vietnam = {(WCHAR[]){'V','N',0}, 251}; + struct geopair brasil = {(WCHAR[]){'B','R',0}, 32}; + struct geopair west_europe = {(WCHAR[]){'1','5','5',0}, 10210824}; + struct geopair east_asia = {(WCHAR[]){'0','3','0',0}, 47600}; + + /* Invalid arguments */ + WCHAR too_long[] = {'w','e',' ','t','o','o',' ','l','o','n','g',0}; /* Names must have less than 3 chars */ + WCHAR too_short[] = {'P',0}; /* Names must be at least two characters */ + WCHAR wrong_un_m49[] = {'A','A','A',0}; /* UN M49 codes use numbers only */ + WCHAR wrong_iso_3166a2[] = {'1','2',0}; /* ISO 3166-1 alpha-2 country codes use the latin alphabet only */ + + const struct testsuit good_args[] = { + {"nation geoname", TRUE, ERROR_SUCCESS, vietnam, brasil, GEOCLASS_NATION}, + {"region geoname", TRUE, ERROR_SUCCESS, west_europe, east_asia, GEOCLASS_REGION} + }; + + const struct testsuit bad_args[] = { + {"too long geoname", FALSE, ERROR_INVALID_PARAMETER, {too_long}}, + {"too short geoname", FALSE, ERROR_INVALID_PARAMETER, {too_short}}, + {"invalid UN M49 code", FALSE, ERROR_INVALID_PARAMETER, {wrong_un_m49}}, + {"invalid ISO 3166 code", FALSE, ERROR_INVALID_PARAMETER, {wrong_iso_3166a2}} + }; + + const int original_count = pGetUserDefaultGeoName(NULL, 0); + WCHAR *const original_name = malloc(original_count * sizeof(WCHAR)); + const GEOID original_nation = GetUserGeoID(GEOCLASS_NATION); + const GEOID original_region = GetUserGeoID(GEOCLASS_REGION); + + /* Get current values before testing */ + if (original_name) + { + if (original_count != pGetUserDefaultGeoName(original_name, original_count)) + trace("Couldn't get original geo name; restoring is not possible.\n"); + } + else if (original_count) + trace("Couldn't allocate %lu bytes to store original name.\n", sizeof(WCHAR) * original_count); + + + for (int i = 0; i < ARRAY_SIZE(bad_args); i++) + { + BOOL status; + SetLastError(ERROR_SUCCESS); + + status = pSetUserGeoName(bad_args[i].geo.name); + ok((status == bad_args[i].exp_return) && (GetLastError() == bad_args[i].exp_error), + "Setting %s: Got ret=%d (expected %d) and lasterror=%d (expected %d).\n", + bad_args[i].stage, status, bad_args[i].exp_return, GetLastError(), bad_args[i].exp_error); + }; + + + for (int i = 0; i < ARRAY_SIZE(good_args); i++) + { + BOOL status; + const struct geopair *geo; + + if (winetest_strcmpW(original_name, good_args[i].geo.name)) + geo = &good_args[i].geo; + else + geo = &good_args[i].geo_backup; + + SetLastError(ERROR_SUCCESS); + + status = pSetUserGeoName(geo->name); + ok((status == good_args[i].exp_return) && (GetLastError() == good_args[i].exp_error), + "Setting geoname to %s: failed with ret=%d (expected %d) and lasterror=%d (expected %d).\n", + wine_dbgstr_w(geo->name), status, good_args[i].exp_return, GetLastError(), good_args[i].exp_error); + + if (status == good_args[i].exp_return) + { + const GEOID geoid = GetUserGeoID(good_args[i].geoclass); + + ok(geoid == geo->id, "%s (geoclass %d): Wrong GeoID for geoname %s: got %d (expected %d).\n", + good_args[i].stage, good_args[i].geoclass, wine_dbgstr_w(geo->name), geoid, geo->id); + } + } + + /* Best attempt at restoring original values */ + SetUserGeoID(original_region); + SetUserGeoID(original_nation); + pSetUserGeoName(original_name); + } + else win_skip("SetUserGeoName: procedure not implemented on this platform.\n"); + } +} + static void test_GetGeoInfo(void) { char buffA[20]; @@ -6058,6 +6373,10 @@ START_TEST(locale) test_SetThreadUILanguage(); test_NormalizeString(); test_SpecialCasing(); + test_GetUserGeoID(); + test_GetUserDefaultGeoName(); + test_SetUserGeoID(); + test_SetUserGeoName(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); } -- 2.23.0

3 3

Fwd: [PATCH] Implement DwmIsCompositionEnabled
by Anonymous Meerkat 03 Oct '19

03 Oct '19

(forwarding to wine-devel as I forgot to do so in the reply) ---------- Forwarded message --------- From: Joel Leclerc <meerkatanonymous(a)gmail.com> Date: Thu, 3 Oct 2019 at 04:18 Subject: Re: [PATCH] Implement DwmIsCompositionEnabled To: Dmitry Timoshkov <dmitry(a)baikal.ru> >For that particular bug report just making DwmIsCompositionEnabled() >return TRUE is enough according to the bug comments The problem is that doing this might break other applications, since DWM is currently not fully implemented in Wine. Adding a registry value that is disabled by default more closely mirrors the way Windows does it (Windows uses this registry value to determine whether to enable composition or not), and will hopefully prevent regressions as well. Even if it's enabled by default, I believe using a registry value would still allow greater flexibility for the end-user if an error results due to this being enabled. >Besides, reading a DWORD >value from the registry could be done in less lines of code and without >passing not initialzied values to the registry APIs. Unfortunately I'm not very familiar with Windows's API, and this is my first patch, so I'm not very familiar with Wine's codebase either. Could you share an example, or another function in Wine's code that implements this in a better way? Thanks for reviewing this. On Thu, 3 Oct 2019 at 03:36, Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > > Joel Leclerc <meerkatanonymous(a)gmail.com> wrote: > > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39469 > > For that particular bug report just making DwmIsCompositionEnabled() > return TRUE is enough according to the bug comments, reading the value > from registry doesn't add anything useful. Besides, reading a DWORD > value from the registry could be done in less lines of code and without > passing not initialzied values to the registry APIs. > > -- > Dmitry.

2 2

[PATCH] Implement DwmIsCompositionEnabled
by Joel Leclerc 03 Oct '19

03 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39469 Signed-off-by: Joel Leclerc <meerkatanonymous(a)gmail.com> --- dlls/dwmapi/Makefile.in | 1 + dlls/dwmapi/dwmapi_main.c | 41 ++++++++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in index 3a3691326f..ebdd3aae05 100644 --- a/dlls/dwmapi/Makefile.in +++ b/dlls/dwmapi/Makefile.in @@ -1,5 +1,6 @@ MODULE = dwmapi.dll IMPORTLIB = dwmapi +IMPORTS = advapi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6378a091f0..ede3c49420 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "dwmapi.h" #include "wine/debug.h" @@ -51,14 +52,40 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) { - static int once; - if (!once) - { - FIXME("%p\n", enabled); - once = 1; + static const WCHAR dwn_reg_keyW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'D','W','M','\0'}; + static const WCHAR compositionW[] = {'C','o','m','p','o','s','i','t','i','o','n','\0'}; + + HKEY hkey; + WCHAR buf[12]; + DWORD type, value, count = sizeof(buf); + + if (RegOpenKeyW(HKEY_CURRENT_USER, dwn_reg_keyW, &hkey) != ERROR_SUCCESS) { + goto fail; + } + + if (RegQueryValueExW(hkey, compositionW, NULL, &type, (BYTE *)buf, &count) != ERROR_SUCCESS) { + goto fail; + } + + if (type == REG_DWORD) { + memcpy(&value, buf, sizeof(value)); + } else { + FIXME("Software\\Microsoft\\Windows\\DWM\\Composition is not of type DWORD\n"); + goto fail; } - else - TRACE("%p\n", enabled); + + if (value == 1) { + TRACE("*%p = 1\n", enabled); + + *enabled = TRUE; + return S_OK; + } + + fail: + TRACE("*%p = 0\n", enabled); *enabled = FALSE; return S_OK; -- 2.23.0

2 1

[PATCHv2] msvcrt: Fix the layout of threadlocaleinfostruct for ucrt
by Martin Storsjo 03 Oct '19

03 Oct '19

In ucrt, this struct has a different layout, with only three fields exposed in headers (which can be used by inline functions). This fixes use of some ctype.h functions like e.g. _isdigit_l from applications that use ucrt (both with MSVC and mingw-w64). Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Removed the C++ style comments, as suggested by Piotr. --- dlls/msvcrt/msvcrt.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 552b48aa53..6e0e338a20 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -163,8 +163,16 @@ typedef struct { } MSVCRT___lc_time_data; typedef struct MSVCRT_threadlocaleinfostruct { +#if _MSVCR_VER >= 140 + unsigned short *pctype; + int mb_cur_max; + unsigned int lc_codepage; +#endif + int refcount; +#if _MSVCR_VER < 140 unsigned int lc_codepage; +#endif unsigned int lc_collate_cp; MSVCRT_ulong lc_handle[6]; MSVCRT_LC_ID lc_id[6]; @@ -175,14 +183,18 @@ typedef struct MSVCRT_threadlocaleinfostruct { int *wrefcount; } lc_category[6]; int lc_clike; +#if _MSVCR_VER < 140 int mb_cur_max; +#endif int *lconv_intl_refcount; int *lconv_num_refcount; int *lconv_mon_refcount; struct MSVCRT_lconv *lconv; int *ctype1_refcount; unsigned short *ctype1; +#if _MSVCR_VER < 140 unsigned short *pctype; +#endif unsigned char *pclmap; unsigned char *pcumap; MSVCRT___lc_time_data *lc_time_curr; -- 2.17.1

2 1

[PATCH v3] dmime/tests: Add a notification_type test
by Alistair Leslie-Hughes 03 Oct '19

03 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- Include timeout to fix failure on testbot. dlls/dmime/tests/performance.c | 116 +++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index c2ca4cdf28..382c39919a 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -366,6 +366,121 @@ static void test_COM(void) ok (refcount == 0, "refcount == %u, expected 0\n", refcount); } +static void test_notification_type(void) +{ + static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */ + "fmt \x10\x00\x00\x00\x01\x00\x20\x00\xAC\x44\x00\x00\x10\xB1\x02\x00\x04\x00\x10\x00" /* format segment: PCM, 2 chan, 44100 Hz, 16 bits */ + "data\x00\x01\x00\x00"; /* 256 byte data segment (silence) */ + + IDirectMusicPerformance8 *perf; + IDirectMusic *music = NULL; + IDirectMusicSegment8 *prime_segment8; + IDirectMusicSegment8 *segment8 = NULL; + IDirectMusicLoader8 *loader; + IDirectMusicAudioPath8 *path; + IDirectMusicSegmentState *state; + IDirectSound *dsound = NULL; + HRESULT hr; + DWORD result; + HANDLE messages; + DMUS_NOTIFICATION_PMSG *msg; + BOOL found_end = FALSE; + DMUS_OBJECTDESC desc = {0}; + + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, + CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&perf); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_InitAudio(perf, &music, &dsound, NULL, DMUS_APATH_DYNAMIC_STEREO, 64, DMUS_AUDIOF_ALL, NULL); + ok(music != NULL, "Didn't get IDirectMusic pointer\n"); + ok(dsound != NULL, "Didn't get IDirectSound pointer\n"); + + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicLoader8, (void**)&loader); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + messages = CreateEventA( NULL, FALSE, FALSE, NULL ); + + hr = IDirectMusicPerformance8_AddNotificationType(perf, &GUID_NOTIFICATION_SEGMENT); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_SetNotificationHandle(perf, messages, 0); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_GetDefaultAudioPath(perf, &path); + ok(hr == S_OK, "Failed: %08x\n", hr); + ok(path != NULL, "Didn't get IDirectMusicAudioPath pointer\n"); + + desc.dwSize = sizeof(DMUS_OBJECTDESC); + desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_MEMORY; + desc.guidClass = CLSID_DirectMusicSegment; + desc.pbMemData = rifffile; + desc.llMemLength = sizeof(rifffile); + hr = IDirectMusicLoader8_GetObject(loader, &desc, &IID_IDirectMusicSegment8, (void**)&prime_segment8); + ok(hr == S_OK, "Failed: %08x\n", hr); + ok(prime_segment8 != NULL, "Didn't get IDirectMusicSegment pointer\n"); + + hr = IDirectMusicSegment8_Download(prime_segment8, (IUnknown*)path); + ok(hr == S_OK, "Download failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_PlaySegmentEx(perf, (IUnknown*)prime_segment8, + NULL, NULL, DMUS_SEGF_SECONDARY, 0, &state, NULL, (IUnknown*)path); + ok(hr == S_OK, "PlaySegmentEx failed: %08x\n", hr); + ok(state != NULL, "Didn't get IDirectMusicSegmentState pointer\n"); + + while (!found_end) { + result = WaitForSingleObject(messages, 1000); + todo_wine ok(result == WAIT_OBJECT_0, "Failed: %d\n", result); + if (result != WAIT_OBJECT_0) + break; + + msg = NULL; + hr = IDirectMusicPerformance8_GetNotificationPMsg(perf, &msg); + ok(hr == S_OK, "Failed: %08x\n", hr); + ok(msg != NULL, "Unexpected NULL pointer\n"); + if (FAILED(hr) || !msg) + break; + + trace("Notification: %d\n", msg->dwNotificationOption); + + if (msg->dwNotificationOption == DMUS_NOTIFICATION_SEGEND) { + ok(msg->punkUser != NULL, "Unexpected NULL pointer\n"); + if (msg->punkUser) { + IDirectMusicSegmentState8 *segmentstate; + IDirectMusicSegment *segment; + + hr = IUnknown_QueryInterface(msg->punkUser, &IID_IDirectMusicSegmentState8, (void**)&segmentstate); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicSegmentState8_GetSegment(segmentstate, &segment); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicSegment_QueryInterface(segment, &IID_IDirectMusicSegment8, (void**)&segment8); + ok(hr == S_OK, "Failed: %08x\n", hr); + + found_end = TRUE; + + IDirectMusicSegment_Release(segment); + IDirectMusicSegmentState8_Release(segmentstate); + } + } + + IDirectMusicPerformance8_FreePMsg(perf, (DMUS_PMSG*)msg); + } + todo_wine ok(prime_segment8 == segment8, "Wrong end segment\n"); + todo_wine ok(found_end, "Didn't recieve DMUS_NOTIFICATION_SEGEND message\n"); + + CloseHandle(messages); + + if(segment8) + IDirectMusicSegment8_Release(segment8); + IDirectSound_Release(dsound); + IDirectMusicSegmentState_Release(state); + IDirectMusicAudioPath_Release(path); + IDirectMusicLoader8_Release(loader); + IDirectMusic_Release(music); + IDirectMusicPerformance8_Release(perf); +} + START_TEST( performance ) { HRESULT hr; @@ -384,6 +499,7 @@ START_TEST( performance ) test_COM(); test_createport(); + test_notification_type(); CoUninitialize(); } -- 2.17.1

3 4

[PATCH 1/5] mf: Subscribe to media stream events for current presentation.
by Nikolay Sivov 03 Oct '19

03 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 195 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 168 insertions(+), 27 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 02e24a2305..d007202b1f 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -75,6 +75,19 @@ enum session_state SESSION_STATE_SHUT_DOWN, }; +struct media_stream +{ + struct list entry; + IMFMediaStream *stream; +}; + +struct media_source +{ + struct list entry; + IMFMediaSource *source; + struct list streams; +}; + struct media_session { IMFMediaSession IMFMediaSession_iface; @@ -89,7 +102,11 @@ struct media_session IMFRateControl *clock_rate_control; IMFTopoLoader *topo_loader; IMFQualityManager *quality_manager; - IMFTopology *current_topology; + struct + { + IMFTopology *current_topology; + struct list sources; + } presentation; struct list topologies; enum session_state state; CRITICAL_SECTION cs; @@ -395,19 +412,48 @@ static IMFTopology *session_get_next_topology(struct media_session *session) { struct queued_topology *queued; - if (!session->current_topology) + if (!session->presentation.current_topology) { struct list *head = list_head(&session->topologies); if (!head) return NULL; queued = LIST_ENTRY(head, struct queued_topology, entry); - session->current_topology = queued->topology; + session->presentation.current_topology = queued->topology; list_remove(&queued->entry); heap_free(queued); } - return session->current_topology; + return session->presentation.current_topology; +} + +static void session_clear_presentation(struct media_session *session) +{ + struct media_source *source, *source2; + struct media_stream *stream, *stream2; + + if (session->presentation.current_topology) + { + IMFTopology_Release(session->presentation.current_topology); + session->presentation.current_topology = NULL; + } + + LIST_FOR_EACH_ENTRY_SAFE(source, source2, &session->presentation.sources, struct media_source, entry) + { + list_remove(&source->entry); + + LIST_FOR_EACH_ENTRY_SAFE(stream, stream2, &source->streams, struct media_stream, entry) + { + list_remove(&stream->entry); + if (stream->stream) + IMFMediaStream_Release(stream->stream); + heap_free(stream); + } + + if (source->source) + IMFMediaSource_Release(source->source); + heap_free(source); + } } static void session_start(struct media_session *session, const GUID *time_format, const PROPVARIANT *start_position) @@ -433,13 +479,17 @@ static void session_start(struct media_session *session, const GUID *time_format for (i = 0; i < count; ++i) { - if (SUCCEEDED(IMFCollection_GetElement(nodes, i, (IUnknown **)&node))) + if (SUCCEEDED(hr = IMFCollection_GetElement(nodes, i, (IUnknown **)&node))) { IMFPresentationDescriptor *pd = NULL; - IMFMediaSource *source = NULL; + struct media_source *source; - hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_SOURCE, &IID_IMFMediaSource, - (void **)&source); + if (!(source = heap_alloc_zero(sizeof(*source)))) + hr = E_OUTOFMEMORY; + + if (SUCCEEDED(hr)) + hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_SOURCE, &IID_IMFMediaSource, + (void **)&source->source); if (SUCCEEDED(hr)) hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, @@ -447,17 +497,26 @@ static void session_start(struct media_session *session, const GUID *time_format /* Subscribe to source events, start it. */ if (SUCCEEDED(hr)) - hr = IMFMediaSource_BeginGetEvent(source, &session->events_callback, NULL); + hr = IMFMediaSource_BeginGetEvent(source->source, &session->events_callback, + (IUnknown *)source->source); if (SUCCEEDED(hr)) - hr = IMFMediaSource_Start(source, pd, time_format, start_position); - - if (source) - IMFMediaSource_Release(source); + hr = IMFMediaSource_Start(source->source, pd, time_format, start_position); if (pd) IMFPresentationDescriptor_Release(pd); + if (SUCCEEDED(hr)) + { + list_add_tail(&session->presentation.sources, &source->entry); + } + else if (source) + { + if (source->source) + IMFMediaSource_Release(source->source); + heap_free(source); + } + IMFTopologyNode_Release(node); } } @@ -523,8 +582,7 @@ static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) if (!refcount) { session_clear_topologies(session); - if (session->current_topology) - IMFTopology_Release(session->current_topology); + session_clear_presentation(session); if (session->event_queue) IMFMediaEventQueue_Release(session->event_queue); if (session->clock) @@ -863,14 +921,10 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, if (flags & MFSESSION_SETTOPOLOGY_CLEAR_CURRENT) { EnterCriticalSection(&session->cs); - if ((topology && topology == session->current_topology) || !topology) + if ((topology && topology == session->presentation.current_topology) || !topology) { /* FIXME: stop current topology, queue next one. */ - if (session->current_topology) - { - IMFTopology_Release(session->current_topology); - session->current_topology = NULL; - } + session_clear_presentation(session); } else status = S_FALSE; @@ -907,11 +961,7 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, if (flags & MFSESSION_SETTOPOLOGY_IMMEDIATE) { session_clear_topologies(session); - if (session->current_topology) - { - IMFTopology_Release(session->current_topology); - session->current_topology = NULL; - } + session_clear_presentation(session); } queued_topology->topology = topology; @@ -1010,11 +1060,101 @@ static HRESULT WINAPI session_events_callback_GetParameters(IMFAsyncCallback *if return E_NOTIMPL; } -static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +static HRESULT session_add_media_stream(struct media_source *source, IMFMediaStream *stream) { + struct media_stream *media_stream; + + if (!(media_stream = heap_alloc_zero(sizeof(*media_stream)))) + return E_OUTOFMEMORY; + + media_stream->stream = stream; + IMFMediaStream_AddRef(media_stream->stream); + + list_add_tail(&source->streams, &media_stream->entry); + return S_OK; } +static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); + IMFMediaEventGenerator *event_source; + IMFMediaEvent *event = NULL; + MediaEventType event_type; + struct media_source *cur; + IMFMediaSource *source; + IMFMediaStream *stream; + PROPVARIANT value; + HRESULT hr; + + if (FAILED(hr = IMFAsyncResult_GetState(result, (IUnknown **)&event_source))) + return hr; + + if (FAILED(hr = IMFMediaEventGenerator_EndGetEvent(event_source, result, &event))) + { + WARN("Failed to get event from %p, hr %#x.\n", event_source, hr); + goto failed; + } + + if (FAILED(hr = IMFMediaEvent_GetType(event, &event_type))) + { + WARN("Failed to get event type, hr %#x.\n", hr); + goto failed; + } + + value.vt = VT_EMPTY; + if (FAILED(hr = IMFMediaEvent_GetValue(event, &value))) + { + WARN("Failed to get event value, hr %#x.\n", hr); + goto failed; + } + + switch (event_type) + { + case MENewStream: + stream = (IMFMediaStream *)value.punkVal; + + if (value.vt != VT_UNKNOWN || !stream) + { + WARN("Unexpected event value.\n"); + break; + } + + if (FAILED(hr = IMFMediaStream_GetMediaSource(stream, &source))) + break; + + EnterCriticalSection(&session->cs); + + LIST_FOR_EACH_ENTRY(cur, &session->presentation.sources, struct media_source, entry) + { + if (source == cur->source) + { + hr = session_add_media_stream(cur, stream); + + if (SUCCEEDED(hr)) + hr = IMFMediaStream_BeginGetEvent(stream, &session->events_callback, (IUnknown *)stream); + + break; + } + } + + LeaveCriticalSection(&session->cs); + + break; + default: + ; + } + + PropVariantClear(&value); + +failed: + if (event) + IMFMediaEvent_Release(event); + IMFMediaEventGenerator_Release(event_source); + + return hr; +} + static const IMFAsyncCallbackVtbl session_events_callback_vtbl = { session_events_callback_QueryInterface, @@ -1142,6 +1282,7 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses object->events_callback.lpVtbl = &session_events_callback_vtbl; object->refcount = 1; list_init(&object->topologies); + list_init(&object->presentation.sources); InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) -- 2.23.0

1 4

[PATCH] testbot/Submit: Let the user pick the Wine build and language to test.
by Francois Gouget 03 Oct '19

03 Oct '19

The Wine VMs are duplicated in the list, one entry per build, so the user can choose to test a patch or executable on one or all of the Wine builds. However the supported languages are presented in a drop-down list to keep the list size reasonable. So only one can be tested per Wine build. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Missions.pm | 34 ++- testbot/web/Submit.pl | 403 ++++++++++++++++++---------- 2 files changed, 300 insertions(+), 137 deletions(-) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 65d8d82d3..4f8387542 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -27,7 +27,7 @@ WineTestBot::Missions - Missions parser and helper functions use Exporter 'import'; our @EXPORT = qw(DumpMissions GetMissionBaseName GetTaskMissionDescription - ParseMissionStatement + GetMissionCaps ParseMissionStatement MergeMissionStatementTasks SplitMissionStatementTasks); use WineTestBot::Utils; @@ -142,6 +142,38 @@ sub GetTaskMissionDescription($$) return $Description; } +sub GetMissionCaps($) +{ + my ($MissionStatement) = @_; + my $Capabilities = { build => {}, lang => {} }; + + # Extract capabilities from the mission statement + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if ($Missions) + { + foreach my $TaskMissions (@$Missions) + { + foreach my $Mission (@{$TaskMissions->{Missions}}) + { + my $Build = $Mission->{Build}; + $Capabilities->{build}->{$Build} = 1; + if ($Build =~ /^(?:win32|wow32|wow64)$/) + { + my $Lang = $Mission->{lang}; + $Capabilities->{lang}->{$Lang || "en_US"} = 1 if (defined $Lang); + } + } + } + } + if (%{$Capabilities->{lang}}) + { + # en_US is the default for Wine VMs and must always be supported + $Capabilities->{lang}->{"en_US"} = 1; + } + + return ($ErrMessage, $Capabilities); +} + sub MergeMissionStatementTasks($) { my ($MissionStatement) = @_; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index dc3fdca3d..bd3dc9fe1 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -42,6 +42,7 @@ use WineTestBot::PatchUtils; use WineTestBot::Steps; use WineTestBot::Utils; use WineTestBot::VMs; +use WineTestBot::Log; # @@ -226,11 +227,28 @@ sub _ValidateVMSelection($;$) return undef if (!$self->_GetFileType()); my @Deselected; + $self->{HasExe32} = $self->{HasExe64} = 0; + $self->{ShowRun32} = $self->{ShowRun64} = 1; foreach my $VMRow (@{$self->{VMRows}}) { - if ($self->{FileType} eq "exe64" and $VMRow->{VM}->Type eq "win32") + my $Incompatible; + my $Caps = $VMRow->{Caps}; + if ($self->{FileType} eq "exe32" and + (($VMRow->{Build} eq "vm" and !$Caps->{build}->{exe32}) # Windows + or $VMRow->{Build} eq "wow64")) # Wine + { + # This VM cannot / has no mission to run 32 bit executables + $Incompatible = 1; + } + elsif ($self->{FileType} eq "exe64" and + (($VMRow->{Build} eq "vm" and !$Caps->{build}->{exe64}) # Windows + or $VMRow->{Build} eq "win32" or $VMRow->{Build} eq "wow32")) # Wine + { + # This VM cannot / has no mission to run 64 bit executables + $Incompatible = 1; + } + if ($Incompatible) { - # This VM cannot run 64 bit executables $VMRow->{Incompatible} = 1; if ($VMRow->{Checked}) { @@ -243,21 +261,36 @@ sub _ValidateVMSelection($;$) push @Deselected, $VMRow->{VM}->Name; } } + next; } - else - { - delete $VMRow->{Incompatible}; - } + delete $VMRow->{Incompatible}; + # For Windows VMs record whether they will run 32/64 bit tests + $VMRow->{Exe32} = ($Caps->{build}->{exe32} and $self->{FileType} =~ /^(?:patch|exe32)$/); + $VMRow->{Exe64} = ($Caps->{build}->{exe64} and $self->{FileType} =~ /^(?:patch|exe64)$/); if ($VMRow->{Checked}) { # Count VMs so we can provide defaults or issue an error when needed $self->{CheckedVMCount}++; - # Set ShowRun64 if page 3 should offer to run both the 32 and 64 bit - # version of a patch. - $self->{ShowRun64} = 1 if ($VMRow->{VM}->Type eq "win64"); + if ($VMRow->{Exe32}) + { + $self->{HasExe32} = 1; + # The user picked a VM that only supports this bitness + # so disabling it would make no sense. + $self->{ShowRun32} = 0 if (!$VMRow->{Exe64}); + } + if ($VMRow->{Exe64}) + { + $self->{HasExe64} = 1; + # The user picked a VM that only supports this bitness + # so disabling it would make no sense. + $self->{ShowRun64} = 0 if (!$VMRow->{Exe32}); + } } } + $self->{ShowRun32} = 0 if (!$self->{HasExe32} or $self->{FileType} ne "patch"); + $self->{ShowRun64} = 0 if (!$self->{HasExe64} or $self->{FileType} ne "patch"); + if (@Deselected) { $self->{ErrMessage} = "The following VMs are incompatible and have been deselected: @Deselected"; @@ -390,6 +423,15 @@ sub Validate($) { return undef if (!$self->_ValidateTestExecutable()); + if ($self->{FileType} eq "patch" and + !$self->{Run32} and $self->{ShowRun32} and + !$self->{Run64} and $self->{ShowRun64}) + { + # Don't set ErrField since Run32 and Run64 may be hidden + $self->{ErrMessage} = "You must at least pick one of the 32 or 64 bit tests to run on the selected Windows VMs."; + return undef; + } + if ($self->{CmdLineArg} eq "" and !$self->{NoCmdLineArgWarn}) { $self->{ErrMessage} = "You did not specify a command line argument. ". @@ -442,18 +484,42 @@ sub _initialize($$$) foreach my $VMKey (@$SortedKeys) { my $VM = $VMs->GetItem($VMKey); - my $VMRow = { - VM => $VM, - Field => "vm_". $self->CGI->escapeHTML($VMKey), - Extra => $VM->Role ne "base", - }; - $VMRow->{Checked} = $self->GetParam($VMRow->{Field}); - push @{$self->{VMRows}}, $VMRow; + my ($ErrMessage, $Caps) = GetMissionCaps($VM->Missions); + LogMsg "$ErrMessage\n" if (defined $ErrMessage); + + my @Builds = $VM->Type eq "wine" ? keys %{$Caps->{build}} : ("vm"); + my $LangNames; + if (%{$Caps->{lang}}) + { + # Which languages are available for this row? + foreach my $Locale (keys %{$Caps->{lang}}) + { + $LangNames->{LocaleName($Locale)} = $Locale; + } + } + + my $FieldBase = $self->CGI->escapeHTML($VMKey); + foreach my $Build (sort @Builds) + { + my $VMRow = { + VM => $VM, + Build => $Build, + LangNames => $LangNames, + Caps => $Caps, + Field => "${Build}_$FieldBase", + Extra => $VM->Role ne "base", + }; + $VMRow->{Checked} = $self->GetParam($VMRow->{Field}); + $VMRow->{Lang} = $self->GetParam("$VMRow->{Field}_lang"); + $VMRow->{Lang} ||= "en_US" if ($LangNames); + + push @{$self->{VMRows}}, $VMRow; + } } # Load the Page 3 parameters $self->_GetParams("TestExecutable", "CmdLineArg", "NoCmdLineArgWarn", - "Run64", "DebugLevel", "ReportSuccessfulTests"); + "Run32", "Run64", "DebugLevel", "ReportSuccessfulTests"); $self->{DebugLevel} = 1 if (!defined $self->{DebugLevel}); # Load the Page 4 parameters @@ -504,6 +570,10 @@ sub _GenerateStateFields($) { print "<input type='hidden' name='$VMRow->{Field}' value='on'>\n"; } + if ($VMRow->{Lang}) + { + print "<input type='hidden' name='$VMRow->{Field}_lang' value='$VMRow->{Lang}'>\n"; + } } } if ($self->{Page} != 3) @@ -512,6 +582,7 @@ sub _GenerateStateFields($) # so he gets warned again. $self->_GenerateStateField("TestExecutable"); $self->_GenerateStateField("CmdLineArg"); + $self->_GenerateStateField("Run32"); $self->_GenerateStateField("Run64"); $self->_GenerateStateField("DebugLevel"); $self->_GenerateStateField("ReportSuccessfulTests"); @@ -624,7 +695,8 @@ sub GetPropertyDescriptors($) } push @{$self->{PropertyDescriptors}}, CreateBasicPropertyDescriptor("CmdLineArg", "Command line arguments", !1, !1, "A", 50), - CreateBasicPropertyDescriptor("Run64", "Run 64-bit tests in addition to 32-bit tests", !1, 1, "B", 1), + CreateBasicPropertyDescriptor("Run32", "Run the 32 bit tests on Windows", !1, 1, "B", 1), + CreateBasicPropertyDescriptor("Run64", "Run the 64 bit tests on Windows", !1, 1, "B", 1), CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1); } @@ -709,6 +781,7 @@ sub GenerateFields($) next if ($VMRow->{Extra} and !$VMRow->{Checked} and !$self->{ShowAll}); # By default select the base VMs that are ready to run tasks + # and are impacted by the patch or executable if (!$self->{UserVMSelection} and !$VMRow->{Extra} and $VMRow->{VM}->Status !~ /^(?:offline|maintenance)$/ and ($VMRow->{VM}->Type eq "wine" or !$self->{Impacts} or @@ -739,6 +812,7 @@ document.write("<input type='checkbox' onchange='SetAllVMCBs(this);'$MasterCheck EOF print "</th>\n"; print "<th class='Record'>VM Name</th>\n"; + print "<th class='Record'>Options</th>\n"; print "<th class='Record'>Description</th>\n"; print "</thead><tbody>\n"; @@ -756,7 +830,36 @@ EOF print " checked='checked'" if ($VMRow->{Checked}); print "/></td>\n"; - print "<td>", $self->CGI->escapeHTML($VM->Name), "</td>\n"; + my $Name = $VM->Name; + $Name .= " ($VMRow->{Build})" if ($VM->Type eq "wine"); + print "<td>", $self->CGI->escapeHTML($Name), "</td>\n"; + + print "<td>"; + if ($VMRow->{Exe32} and $VMRow->{Exe64}) + { + print "32 & 64 bits"; + } + elsif ($VMRow->{Exe32}) + { + print "32 bits"; + } + elsif ($VMRow->{Exe64}) + { + print "64 bits"; + } + if ($VMRow->{LangNames}) + { + print "<select name='$VMRow->{Field}_lang'>\n"; + foreach my $LangName (sort keys %{$VMRow->{LangNames}}) + { + my $Locale = $VMRow->{LangNames}->{$LangName}; + my $Selected = $Locale eq $VMRow->{Lang} ? " selected" : ""; + print "<option value='$Locale'$Selected>$LangName</option>\n"; + } + print "</select>"; + } + print "</td>\n"; + print "<td><details><summary>", $self->CGI->escapeHTML($VM->Description || $VM->Name); print " [", $VM->Status ,"]" if ($VM->Status =~ /^(?:offline|maintenance)$/); @@ -786,6 +889,10 @@ EOF $self->_GenerateStateField("NoCmdLineArgWarn"); # Preserve these fields if they are not shown + if (!$self->{ShowRun32} or $self->{FileType} ne "patch") + { + $self->_GenerateStateField("Run32"); + } if (!$self->{ShowRun64} or $self->{FileType} ne "patch") { $self->_GenerateStateField("Run64"); @@ -837,6 +944,10 @@ sub DisplayProperty($$) if ($self->{Page} == 3) { my $PropertyName = $PropertyDescriptor->GetName(); + if ($PropertyName eq "Run32") + { + return "" if (!$self->{ShowRun32} or $self->{FileType} ne "patch"); + } if ($PropertyName eq "Run64") { return "" if (!$self->{ShowRun64} or $self->{FileType} ne "patch"); @@ -902,11 +1013,14 @@ sub OnPage1Next($) return undef; } - # Set defaults - if (!defined $self->{Run64}) + # Set defaults: whether we show them or not the Run* defaults are true + foreach my $Bits (32, 64) { - # Whether we show it or not the default is true - $self->{Run64} = 1; + if (!defined $self->{"Run$Bits"} and !$self->{"ShowRun$Bits"} and + $self->{"HasExe$Bits"}) + { + $self->{"Run$Bits"} = 1; + } } $self->_SetPage(2); @@ -952,6 +1066,7 @@ sub OnPage3Prev($) my ($self) = @_; # Set to 0 instead of undef to record the user preference + $self->{Run32} ||= 0; $self->{Run64} ||= 0; $self->{ReportSuccessfulTests} ||= 0; @@ -980,138 +1095,154 @@ sub _SubmitJob($$) my $Steps = $NewJob->Steps; # Add steps and tasks for the 32 and 64 bit tests - my $BuildStep; - foreach my $Bits ("32", "64") + my $Impacts; + $Impacts = GetPatchImpacts($Staging) if ($self->{FileType} eq "patch"); + + # Extract the list of VMs and missions from the VM rows + my ($ExeVMs, @WineVMs, %WineMissions); + foreach my $VMRow (@{$self->{VMRows}}) { - next if ($Bits eq "32" && $self->{FileType} eq "exe64"); - next if ($Bits eq "64" && $self->{FileType} eq "exe32"); - next if ($Bits eq "64" && $self->{FileType} eq "patch" && !defined $self->{Run64}); + next if (!$VMRow->{Checked}); + # If LoadVMSelection() marked a VM as checked it means we have a task for + # it. So there is no need to further check $VM->Type / $self->{FileType}. - my $Tasks; - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) + my $VM = $VMRow->{VM}; + if ($VM->Type eq "wine") { - my $VM = $VMs->GetItem($VMKey); - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - next if (!$self->GetParam($FieldName)); # skip unselected VMs - - if (!$Tasks) + if ($WineMissions{$VM}) { - if (!$BuildStep and $self->{FileType} eq "patch") - { - # This is a patch so add a build step... - $BuildStep = $Steps->Add(); - $BuildStep->FileName($self->{FileName}); - $BuildStep->FileType($self->{FileType}); - $BuildStep->Type("build"); - $BuildStep->DebugLevel(0); - - # ...with a build task - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", ["build"]); - $VMs->AddFilter("Role", ["base"]); - my $BuildVM = ${$VMs->GetItems()}[0]; - my $Task = $BuildStep->Tasks->Add(); - $Task->VM($BuildVM); - - my $MissionStatement = "exe32"; - $MissionStatement .= ":exe64" if (defined $self->{Run64}); - my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); - if (!defined $ErrMessage) - { - $Task->Timeout(GetBuildTimeout($self->{Impacts}, $Missions->[0])); - $Task->Missions($MissionStatement); - - # Save the build step so the others can reference it - (my $ErrKey, my $ErrProperty, $ErrMessage) = $Jobs->Save(); - } - if (defined $ErrMessage) - { - $self->{ErrMessage} = $ErrMessage; - return undef; - } - } - - # Then create the test step - my $TestStep = $Steps->Add(); - if ($self->{FileType} eq "patch") - { - $TestStep->PreviousNo($BuildStep->No); - my $TestExe = basename($self->{TestExecutable}); - $TestExe =~ s/_test\.exe$/_test64.exe/ if ($Bits eq "64"); - $TestStep->FileName($TestExe); - } - else - { - $TestStep->FileName($self->{FileName}); - } - $TestStep->FileType("exe$Bits"); - $TestStep->Type("single"); - $TestStep->DebugLevel($self->{DebugLevel}); - $TestStep->ReportSuccessfulTests(defined $self->{ReportSuccessfulTests}); - $Tasks = $TestStep->Tasks; + $WineMissions{$VM} .= ":$VMRow->{Build}"; + } + else + { + $WineMissions{$VM} = $VMRow->{Build}; + push @WineVMs, $VM; + } + if ($VMRow->{Lang} ne "en_US") + { + $WineMissions{$VM} .= ",lang=$VMRow->{Lang}"; + } + } + else + { + if ($VMRow->{Exe32} and ($self->{Run32} or !$self->{ShowRun32})) + { + push @{$ExeVMs->{32}}, $VM; + } + if ($VMRow->{Exe64} and ($self->{Run64} or !$self->{ShowRun64})) + { + push @{$ExeVMs->{64}}, $VM; } - - # Then add a task for this VM - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->Timeout($SingleTimeout); - $Task->Missions("exe$Bits"); - $Task->CmdLineArg($self->{CmdLineArg}); } } - my ($Tasks, $MissionStatement, $Timeout); - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", ["wine"]); - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) + if ($ExeVMs->{32} or $ExeVMs->{64}) { - my $VM = $VMs->GetItem($VMKey); - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - next if (!$self->GetParam($FieldName)); # skip unselected VMs + my $BuildStep; + if ($self->{FileType} eq "patch") + { + # This is a patch so add a build step... + $BuildStep = $Steps->Add(); + $BuildStep->FileName($self->{FileName}); + $BuildStep->FileType($self->{FileType}); + $BuildStep->Type("build"); + $BuildStep->DebugLevel(0); + + # ...with a build task + my $VMs = CreateVMs(); + $VMs->AddFilter("Type", ["build"]); + $VMs->AddFilter("Role", ["base"]); + my $BuildVM = ${$VMs->GetItems()}[0]; + my $Task = $BuildStep->Tasks->Add(); + $Task->VM($BuildVM); + + my @Builds; + push @Builds, "exe32" if ($ExeVMs->{32}); + push @Builds, "exe64" if ($ExeVMs->{64}); + my ($ErrMessage, $Missions) = ParseMissionStatement(join(":", @Builds)); + if (!defined $ErrMessage) + { + $Task->Timeout(GetBuildTimeout($Impacts, $Missions->[0])); + $Task->Missions($Missions->[0]->{Statement}); - if (!$Tasks) + # Save the build step so the others can reference it + (my $_ErrKey, my $_ErrProperty, $ErrMessage) = $Jobs->Save(); + } + if (defined $ErrMessage) + { + $self->{ErrMessage} = $ErrMessage; + return !1; + } + } + + foreach my $Bits (32, 64) { - # First create the Wine test step - my $WineStep = $Steps->Add(); - $WineStep->FileName($self->{FileName}); - $WineStep->FileType($self->{FileType}); - $WineStep->Type("single"); - $WineStep->DebugLevel($self->{DebugLevel}); - $WineStep->ReportSuccessfulTests(defined $self->GetParam("ReportSuccessfulTests")); - $Tasks = $WineStep->Tasks; - - $MissionStatement = ($self->{FileType} =~ /^(?:exe32|patch)$/) ? "win32" : ""; - if ($self->{FileType} eq "exe64" or - ($self->{FileType} eq "patch" and defined $self->{Run64})) + next if (!$ExeVMs->{$Bits}); + + # Create the test step + my $TestStep = $Steps->Add(); + if ($self->{FileType} eq "patch") + { + $TestStep->PreviousNo($BuildStep->No); + my $TestExe = $self->{TestExecutable}; + $TestExe =~ s/_test\.exe$/_test64.exe/ if ($Bits eq "64"); + $TestStep->FileName($TestExe); + } + else + { + $TestStep->FileName($self->{FileName}); + } + $TestStep->FileType("exe$Bits"); + $TestStep->Type("single"); + $TestStep->DebugLevel($self->{DebugLevel}); + $TestStep->ReportSuccessfulTests(defined $self->{ReportSuccessfulTests}); + my $Tasks = $TestStep->Tasks; + + # Add a task for each VM + foreach my $VM (@{$ExeVMs->{$Bits}}) { - $MissionStatement .= ":wow64"; + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->Timeout($SingleTimeout); + $Task->Missions("exe$Bits"); + $Task->CmdLineArg($self->{CmdLineArg}); } - $MissionStatement =~ s/^://; + } + } + + if (@WineVMs) + { + # Create the Wine test step + my $WineStep = $Steps->Add(); + $WineStep->FileName($self->{FileName}); + $WineStep->FileType($self->{FileType}); + $WineStep->Type("single"); + $WineStep->DebugLevel($self->{DebugLevel}); + $WineStep->ReportSuccessfulTests(defined $self->{ReportSuccessfulTests}); + my $Tasks = $WineStep->Tasks; - my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + # Add a task for each VM + foreach my $VM (@WineVMs) + { + my ($ErrMessage, $Missions) = ParseMissionStatement($WineMissions{$VM}); if (defined $ErrMessage) { $self->{ErrMessage} = $ErrMessage; - return undef; + return !1; } - $Missions = $Missions->[0]; - $Timeout = $self->{FileType} ne "patch" ? - $SingleTimeout : - GetBuildTimeout($self->{Impacts}, $Missions) + - GetTestTimeout($self->{Impacts}, $Missions); - } + my $Missions = $Missions->[0]; + my $Timeout = $self->{FileType} ne "patch" ? + $SingleTimeout : + GetBuildTimeout($Impacts, $Missions) + + GetTestTimeout($Impacts, $Missions); - # Then add a task for this VM - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->Timeout($Timeout); - $Task->Missions($MissionStatement); - my $Module = $self->{TestExecutables}->{$self->{TestExecutable}}; - $Task->CmdLineArg(($Module eq 1 ? "" : "$Module ") .$self->{CmdLineArg}); + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->Timeout($Timeout); + $Task->Missions($WineMissions{$VM}); + my $Module = $self->{TestExecutables}->{$self->{TestExecutable}}; + $Task->CmdLineArg(($Module eq 1 ? "" : "$Module ") .$self->{CmdLineArg}); + } } # Now save it all (or whatever's left to save) -- 2.20.1

1 0