May 2022 - Wine-commits - list.winehq.org

Fabian Maurer : kernel32/tests: Add a number of Unicode collation tests.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 64ba1b3245c14f74e5359a3595d8623bb974b1aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=64ba1b3245c14f74e5359a35… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon May 30 15:54:24 2022 +0200 kernel32/tests: Add a number of Unicode collation tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 369 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 369 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=64ba1b3245c14f74e535…

1 0

Alexandre Julliard : kernel32/tests: Add a few more sortkey tests.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 2756fec551a0ad74f23484c7c9508a77c8b91f59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2756fec551a0ad74f23484c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 16:06:36 2022 +0200 kernel32/tests: Add a few more sortkey tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9327a074179..e15626ec9ed 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2587,6 +2587,25 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f ok(ret == ret2, "%s lengths of sort keys must be equal\n", func_name); ok(!memcmp(p_buf, p_buf2, ret), "%s sort keys must be equal\n", func_name); + /* test contents with short buffer */ + memset( buf, 0xcc, sizeof(buf) ); + ret = func_ptr(LCMAP_SORTKEY, upper_case, -1, buf, ret - 1); + ok( !ret, "%s succeeded with %u\n", func_name, ret ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%s wrong error %lu\n", func_name, GetLastError() ); + ret = (char *)memchr( p_buf, 0xcc, sizeof(buf) ) - p_buf; + ok( ret, "%s buffer not filled\n", func_name ); + ok( p_buf[ret - 1] == 0x01, "%s buffer filled up to %02x\n", func_name, (BYTE)p_buf[ret - 1] ); + ok( !memcmp( p_buf, p_buf2, ret - 1 ), "%s buffers differ\n", func_name ); + + memset( buf, 0xcc, sizeof(buf) ); + ret = func_ptr(LCMAP_SORTKEY, upper_case, -1, buf, ret2 - 20); + ok( !ret, "%s succeeded with %u\n", func_name, ret ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%s wrong error %lu\n", func_name, GetLastError() ); + ret = (char *)memchr( p_buf, 0xcc, sizeof(buf) ) - p_buf; + ok( ret, "%s buffer not filled\n", func_name ); + ok( p_buf[ret - 1] == 0x01, "%s buffer filled up to %02x\n", func_name, (BYTE)p_buf[ret - 1] ); + ok( !memcmp( p_buf, p_buf2, ret - 1 ), "%s buffers differ\n", func_name ); + /* test LCMAP_SORTKEY | NORM_IGNORECASE */ ret = func_ptr(LCMAP_SORTKEY | NORM_IGNORECASE, upper_case, -1, buf, sizeof(buf)); @@ -3522,6 +3541,8 @@ static const struct sorting_test_entry unicode_sorting_tests[] = { L"en-US", -1, CSTR_LESS_THAN, NORM_IGNORECASE, L"\xffb7", L"\x3147" }, { L"en-US", -1, CSTR_LESS_THAN, NORM_IGNORECASE, L"\xffb6", L"\x3146" }, { L"en-US", 1, CSTR_GREATER_THAN, NORM_IGNORECASE, L"\x3145", L"\xffb5" }, + { L"en-US", 1, CSTR_GREATER_THAN, 0, L"\x3075\x30fc", L"\x30d5\x30fc" }, + { L"en-US", -1, CSTR_LESS_THAN, 0, L"\x30a1\x30fc", L"\x30a2\x30fc" }, /* Coptic < Japanese */ { L"en-US", -1, CSTR_LESS_THAN, NORM_IGNORECASE, L"\x2cff", L"\x30ba" }, { L"en-US", -1, CSTR_LESS_THAN, NORM_IGNORECASE, L"\x2cdb", L"\x32de" }, @@ -3537,6 +3558,7 @@ static const struct sorting_test_entry unicode_sorting_tests[] = { L"en-US", -1, CSTR_EQUAL, 0, L"\x0f75", L"\x0f71\x0f74" }, { L"en-US", -1, CSTR_EQUAL, 0, L"\xfc5e", L"\x064c\x0651" }, { L"en-US", -1, CSTR_EQUAL, 0, L"\xfb2b", L"\x05e9\x05c2" }, + { L"en-US", -1, CSTR_EQUAL, 0, L"\xfe71", L"\x0640\x064b" }, /* Japanese locale */ { L"ja-JP", -1, CSTR_LESS_THAN, 0, L"\x6df8", L"\x654b\x29e9" }, { L"ja-JP", -1, CSTR_LESS_THAN, 0, L"\x685d\x1239\x1b61", L"\x59b6\x6542\x2a62\x04a7" }, @@ -3593,6 +3615,16 @@ static const struct sorting_test_entry unicode_sorting_tests[] = { L"en-US", 1, CSTR_GREATER_THAN, 0, L"\xa042\x09bc", L"\xa042" }, { L"en-US", 1, CSTR_GREATER_THAN, 0, L"\xa063\x302b", L"\xa063" }, { L"en-US", 1, CSTR_GREATER_THAN, 0, L"\xa07e\x0c56", L"\xa07e" }, + /* Reversed diacritics */ + { L"en-US", -1, CSTR_LESS_THAN, 0, L"\x00e9\x00e8", L"\x00e8\x00e9" }, + { L"fr-FR", 1, CSTR_GREATER_THAN, 0, L"\x00e9\x00e8", L"\x00e8\x00e9" }, + /* Digit sort */ + { L"en-US", -1, CSTR_LESS_THAN, 0, L"1230", L"321" }, + { L"en-US", 1, CSTR_GREATER_THAN, SORT_DIGITSASNUMBERS, L"1230", L"321" }, + { L"en-US", 1, CSTR_GREATER_THAN, SORT_DIGITSASNUMBERS, L"\xc6f\xc6c\xc6a", L"\xc6f\xc6e" }, + /* Compressions */ + { L"en-US", -1, CSTR_LESS_THAN, 0, L"E\x0300", L"F" }, + { L"rm-CH", 1, CSTR_GREATER_THAN, 0, L"E\x0300", L"F" }, }; static void test_unicode_sorting(void)

1 0

Alexandre Julliard : kernel32/tests: Add an option to generate sortkeys from an input file.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: d8bea38f96034b77ed1f5318f70ee7f072bf32b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8bea38f96034b77ed1f5318… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 13:15:56 2022 +0200 kernel32/tests: Add an option to generate sortkeys from an input file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e15626ec9ed..75e9104ba03 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -8116,10 +8116,78 @@ static void test_EnumCalendarInfoExW(void) } } +/* Generate sort keys for a list of Unicode code points. + * Possible source files: + * The Unicode collation test suite: https://www.unicode.org/Public/UCA/latest/CollationTest.zip + * The list of supported char compressions: winedump nls/sortdefault.nls | grep \\-\> + */ +static void dump_sortkeys( char *argv[] ) +{ + WCHAR data[128]; + WCHAR locale[LOCALE_NAME_MAX_LENGTH]; + BYTE key[256]; + unsigned int i, val, pos, res, flags = 0; + char *p, *end, buffer[1024]; + FILE *f = fopen( argv[1], "r" ); + + locale[0] = 0; + if (argv[2]) + { + MultiByteToWideChar( CP_ACP, 0, argv[2], -1, locale, LOCALE_NAME_MAX_LENGTH ); + if (argv[3]) flags = strtoul( argv[3], NULL, 0 ); + } + + if (!f) + { + fprintf( stderr, "cannot open %s\n", argv[1] ); + return; + } + while (fgets( buffer, sizeof(buffer), f )) + { + if (buffer[0] && buffer[strlen(buffer)-1] == '\n') buffer[strlen(buffer)-1] = 0; + p = buffer; + while (*p == ' ' || *p == '\t') p++; + if (*p == '#') continue; + pos = 0; + while (*p && *p != ';' && *p != '-') + { + val = strtoul( p, &end, 16 ); + if (end == p) break; + if (val >= 0x10000) + { + data[pos++] = 0xd800 | (val >> 10); + data[pos++] = 0xdc00 | (val & 0x3ff); + } + else data[pos++] = val; + p = end; + while (*p == ' ' || *p == '\t') p++; + } + *p = 0; + res = LCMapStringEx( locale, flags | LCMAP_SORTKEY, data, pos, + (WCHAR *)key, sizeof(key), NULL, NULL, 0 ); + printf( "%s:", buffer ); + for (i = 0; i < res; i++) printf( " %02x", key[i] ); + printf( "\n" ); + } + fclose( f ); +} + START_TEST(locale) { + char **argv; + int argc = winetest_get_mainargs( &argv ); + InitFunctionPointers(); + if (argc >= 4) + { + if (!strcmp( argv[2], "sortkeys" )) + { + dump_sortkeys( argv + 2 ); + return; + } + } + test_EnumTimeFormatsA(); test_EnumTimeFormatsW(); test_EnumDateFormatsA();

1 0

Robert Wilhelm : scrrun: Check for null arguments in MoveFile.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: e5ae7a4026f46181d6a45a2026e78a4e177ba279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5ae7a4026f46181d6a45a20… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Wed May 25 14:53:11 2022 +0200 scrrun: Check for null arguments in MoveFile. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 3 +++ dlls/scrrun/tests/filesystem.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d7ad255e517..35b43e2f124 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3758,6 +3758,9 @@ static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR source, BSTR de { TRACE("%p %s %s\n", iface, debugstr_w(source), debugstr_w(destination)); + if(!source || !destination) + return E_INVALIDARG; + return MoveFileW(source, destination) ? S_OK : create_error(GetLastError()); } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 79af87591ff..1ba0e81a2d1 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2591,6 +2591,13 @@ static void test_MoveFile(void) hr = IFileSystem3_DeleteFile(fs3, str, VARIANT_TRUE); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SysFreeString(str); + + str = SysAllocString(L"null.txt"); + hr = IFileSystem3_MoveFile(fs3, str, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + hr = IFileSystem3_MoveFile(fs3, NULL, str); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + SysFreeString(str); } static void test_DoOpenPipeStream(void)

1 0

Hugh McMaster : conhost: Save console settings as global defaults on first run.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 37bcbe6bcace68ddc56bd2757ca993e2c82e4e7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=37bcbe6bcace68ddc56bd275… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 27 19:57:34 2022 +1000 conhost: Save console settings as global defaults on first run. On Windows, HKCU\Console holds global default settings, while subkeys hold any app-specific settings that differ from the defaults. Wine's conhost.exe implementation currently saves all console settings to an app-specific subkey on the first run, while global defaults are only saved to HKCU\Console if the user selects 'Set Defaults' from the pop-up menu and saves new settings. This is the opposite of console behaviour on Windows. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 5e8c3e15a4f..019925789fd 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -850,7 +850,7 @@ static void set_first_font( struct console *console, struct console_config *conf if (fc.pass > 5) ERR("Unable to find a valid console font\n"); - /* Save font configuration to the registry */ + /* Update active configuration */ config->cell_width = console->active->font.width; config->cell_height = console->active->font.height; config->font_pitch_family = console->active->font.pitch_family; @@ -858,7 +858,8 @@ static void set_first_font( struct console *console, struct console_config *conf console->active->font.face_len * sizeof(WCHAR) ); config->face_name[console->active->font.face_len] = 0; - save_config( console->window->config_key, config ); + /* Save default console configuration to the registry */ + save_config( NULL, config ); } /* Sets the font specified in the LOGFONT as the new console font */

1 0

Hugh McMaster : conhost: Only save app-specific settings that differ from the defaults.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: bb2b1d0ed16081e3a76f5b7119035a5c01680410 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb2b1d0ed16081e3a76f5b71… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 27 19:57:35 2022 +1000 conhost: Only save app-specific settings that differ from the defaults. On Windows, app-specific subkeys of HKCU\Console only hold console settings that differ from the global defaults. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 140 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 99 insertions(+), 41 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 019925789fd..d5aa01dca65 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -280,69 +280,128 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) TRACE( "%s\n", debugstr_config( config )); } -static void save_registry_key( HKEY key, const struct console_config *config ) +static void save_registry_key( HKEY key, const struct console_config *config, BOOL save_all ) { + struct console_config default_config; DWORD val, width, height, i; WCHAR color_name[13]; TRACE( "%s\n", debugstr_config( config )); + if (!save_all) + load_config( NULL, &default_config ); + for (i = 0; i < ARRAY_SIZE(config->color_map); i++) { - wsprintfW( color_name, L"ColorTable%02d", i ); - val = config->color_map[i]; - RegSetValueExW( key, color_name, 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->color_map[i] != default_config.color_map[i]) + { + wsprintfW( color_name, L"ColorTable%02d", i ); + val = config->color_map[i]; + RegSetValueExW( key, color_name, 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } } - val = config->cursor_size; - RegSetValueExW( key, L"CursorSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->cursor_size != default_config.cursor_size) + { + val = config->cursor_size; + RegSetValueExW( key, L"CursorSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } - val = config->cursor_visible; - RegSetValueExW( key, L"CursorVisible", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->cursor_visible != default_config.cursor_visible) + { + val = config->cursor_visible; + RegSetValueExW( key, L"CursorVisible", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } - val = config->edition_mode; - RegSetValueExW( key, L"EditionMode", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->edition_mode != default_config.edition_mode) + { + val = config->edition_mode; + RegSetValueExW( key, L"EditionMode", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } - RegSetValueExW( key, L"FaceName", 0, REG_SZ, (BYTE *)&config->face_name, - (lstrlenW(config->face_name) + 1) * sizeof(WCHAR) ); + if (save_all || lstrcmpW( config->face_name, default_config.face_name )) + { + RegSetValueExW( key, L"FaceName", 0, REG_SZ, (BYTE *)&config->face_name, + (lstrlenW(config->face_name) + 1) * sizeof(WCHAR) ); + } - val = config->font_pitch_family; - RegSetValueExW( key, L"FontPitchFamily", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->font_pitch_family != default_config.font_pitch_family) + { + val = config->font_pitch_family; + RegSetValueExW( key, L"FontPitchFamily", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } - width = MulDiv( config->cell_width, USER_DEFAULT_SCREEN_DPI, GetDpiForSystem() ); - height = MulDiv( config->cell_height, USER_DEFAULT_SCREEN_DPI, GetDpiForSystem() ); - val = MAKELONG( width, height ); - RegSetValueExW( key, L"FontSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->cell_height != default_config.cell_height || + config->cell_width != default_config.cell_width) + { + width = MulDiv( config->cell_width, USER_DEFAULT_SCREEN_DPI, GetDpiForSystem() ); + height = MulDiv( config->cell_height, USER_DEFAULT_SCREEN_DPI, GetDpiForSystem() ); + val = MAKELONG( width, height ); - val = config->font_weight; - RegSetValueExW( key, L"FontWeight", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + RegSetValueExW( key, L"FontSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } - val = config->history_size; - RegSetValueExW( key, L"HistoryBufferSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->font_weight != default_config.font_weight) + { + val = config->font_weight; + RegSetValueExW( key, L"FontWeight", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } - val = config->history_mode; - RegSetValueExW( key, L"HistoryNoDup", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->history_size != default_config.history_size) + { + val = config->history_size; + RegSetValueExW( key, L"HistoryBufferSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } - val = config->insert_mode; - RegSetValueExW( key, L"InsertMode", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->history_mode != default_config.history_mode) + { + val = config->history_mode; + RegSetValueExW( key, L"HistoryNoDup", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } - val = config->menu_mask; - RegSetValueExW( key, L"MenuMask", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->insert_mode != default_config.insert_mode) + { + val = config->insert_mode; + RegSetValueExW( key, L"InsertMode", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } - val = config->popup_attr; - RegSetValueExW( key, L"PopupColors", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->menu_mask != default_config.menu_mask) + { + val = config->menu_mask; + RegSetValueExW( key, L"MenuMask", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } + + if (save_all || config->popup_attr != default_config.popup_attr) + { + val = config->popup_attr; + RegSetValueExW( key, L"PopupColors", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } - val = config->quick_edit; - RegSetValueExW( key, L"QuickEdit", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->quick_edit != default_config.quick_edit) + { + val = config->quick_edit; + RegSetValueExW( key, L"QuickEdit", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } - val = MAKELONG(config->sb_width, config->sb_height); - RegSetValueExW( key, L"ScreenBufferSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->sb_width != default_config.sb_width || + config->sb_height != default_config.sb_height) + { + val = MAKELONG(config->sb_width, config->sb_height); + RegSetValueExW( key, L"ScreenBufferSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } - val = config->attr; - RegSetValueExW( key, L"ScreenColors", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->attr != default_config.attr) + { + val = config->attr; + RegSetValueExW( key, L"ScreenColors", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } - val = MAKELONG( config->win_width, config->win_height ); - RegSetValueExW( key, L"WindowSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + if (save_all || config->win_width != default_config.win_width || + config->win_height != default_config.win_height) + { + val = MAKELONG( config->win_width, config->win_height ); + RegSetValueExW( key, L"WindowSize", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); + } } static void save_config( const WCHAR *key_name, const struct console_config *config ) @@ -365,12 +424,11 @@ static void save_config( const WCHAR *key_name, const struct console_config *con } else { - /* FIXME: maybe only save the values different from the default value ? */ - save_registry_key( app_key, config ); + save_registry_key( app_key, config, FALSE ); RegCloseKey( app_key ); } } - else save_registry_key( key, config ); + else save_registry_key( key, config, TRUE ); RegCloseKey(key); }

1 0

Francois Gouget : testbot/scripts: Add a script to create the initial administrator account.
by Alexandre Julliard 30 May '22

30 May '22

Module: tools Branch: master Commit: ea19f51d1f170918b87fd1d5d7325fcc60cf96d4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ea19f51d1f170918b87fd1d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 30 17:36:58 2022 +0200 testbot/scripts: Add a script to create the initial administrator account. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/INSTALL.txt | 18 ++---- testbot/scripts/CreateAdmin | 147 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 13 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 7565d6b..46edeea 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -52,19 +52,11 @@ General setup for the web site: - Copy lib/WineTestBot/ConfigLocalTemplate.pl to ConfigLocal.pl in TestBot's root directory and fill in the options for your site. - Restart Apache, you should now be able to browse to the home page. -- Register a new account for yourself. -- Using the mysql client, set the ResetCode in your Users entry to a - known value, e.g. - mysql> update Users set ResetCode = 'a' where Name = '<username>'; -- Browse to http://server.name/ResetPassword.pl and enter your username, - the resetcode you just updated and a new password. -- Make yourself admin by adding a row to UserRoles: - mysql> insert into UserRoles values('<username>', 'admin'); -- If you want to be able to submit jobs from the same account you will likely - need to also give it the 'wine-devel' role: - mysql> insert into UserRoles values('<username>', wine-devel); -- When you refresh the home page, you should now have an "Admin" menu - in the sidebar. +- Run the script below to create an administrator account for yourself. Once + you have followed the script's instructions you should have an "Admin" menu + on the home page sidebar. + + $HOME/tools/testbot/scripts/CreateAdmin <your-admin-account> Janitorial tasks: - Run the Janitor.pl script once per day to perform the janitorial diff --git a/testbot/scripts/CreateAdmin b/testbot/scripts/CreateAdmin new file mode 100755 index 0000000..163b445 --- /dev/null +++ b/testbot/scripts/CreateAdmin @@ -0,0 +1,147 @@ +#!/usr/bin/perl -Tw +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# +# Creates an administrator user for the initial setup. +# +# Copyright 2022 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +sub BEGIN +{ + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } +} +my $Name0 = $0; +$Name0 =~ s+^.*/++; + + +use WineTestBot::Roles; +use WineTestBot::Users; +use WineTestBot::Log; +use WineTestBot::Utils; + + +# +# Logging and error handling helpers +# + +sub Error(@) +{ + print STDERR "$Name0:error: ", @_; + LogMsg @_; +} + + +# +# Setup and command line processing +# + +my ($OptUserName, $Usage); +while (@ARGV) +{ + my $Arg = shift @ARGV; + if ($Arg =~ /^(?:-\?|-h|--help)$/) + { + $Usage = 0; + last; + } + elsif ($Arg =~ /^-/) + { + Error "unknown option '$Arg'\n"; + $Usage = 2; + last; + } + elsif (!defined $OptUserName) + { + $OptUserName = $Arg; + } + else + { + Error "unexpected argument '$Arg'\n"; + $Usage = 2; + last; + } +} + +# Check parameters +if (!defined $Usage) +{ + if (!defined $OptUserName) + { + Error "You must specify the user name\n"; + $Usage = 2; + } +} +if (defined $Usage) +{ + print "Usage: $Name0 [--help] USERNAME\n"; + print "\n"; + print "Creates an administrator account. Instructions for logging in will be provided on stdout.\n"; + print "\n"; + print "Where:\n"; + print " USERNAME The administrator account name.\n"; + print " --help Shows this usage message.\n"; + exit $Usage; +} + + +# +# Create the administrator +# + +my $Users = CreateUsers(); +my $User = $Users->Add(); +$User->Name($OptUserName); +$User->EMail("$OptUserName\@localhost"); +my $ResetCode = GenerateRandomString(32); +$User->ResetCode($ResetCode); +$User->AddDefaultRoles(); +$User->AddRole(CreateRoles()->GetItem("admin")); + +NotifyAdministrator("Creating an administrator account for $OptUserName", + "Creating an administrator account for $OptUserName.\n"); + +my ($_ErrKey, $ErrProperty, $ErrMessage) = $Users->Save(); +if (defined $ErrMessage) +{ + Error "Could not create the $OptUserName user: $ErrMessage\n"; + exit 1; +} + + +my $URL = MakeOfficialURL("/ResetPassword.pl"); +print <<EOF; +You can now log in using the following information +URL: $URL +Username: $OptUserName +ResetCode: $ResetCode + +Then use your fresh administrator powers to set your email address, +your real name, and adjust your roles as appropriate. +EOF + +exit 0;

1 0

Francois Gouget : testbot: Unify the Job cancel and restart actions.
by Alexandre Julliard 30 May '22

30 May '22

Module: tools Branch: master Commit: 9925dc0c1389bc3c99430de5a6ad6e381300cfed URL: https://source.winehq.org/git/tools.git/?a=commit;h=9925dc0c1389bc3c99430de… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 30 18:04:07 2022 +0200 testbot: Unify the Job cancel and restart actions. Most of the code can be shared and this simplifies expanding the set of job control actions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 42 ++++-------- testbot/lib/WineTestBot/Engine/Notify.pm | 29 ++------- testbot/web/JobDetails.pl | 107 ++++++++----------------------- 3 files changed, 43 insertions(+), 135 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 7880b8e..da72ffb 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -329,50 +329,31 @@ sub HandleJobStatusChange($$$) return "1OK"; } -sub HandleJobCancel($) +sub HandleJobControl($) { - my ($JobKey) = @_; + my ($Action, $JobKey) = @_; - my $Job = CreateJobs()->GetItem($JobKey); - if (! $Job) + if ($Action !~ /^(cancel|restart)$/) { - LogMsg "JobCancel for nonexistent job $JobKey\n"; - return "0Job $JobKey not found"; + LogMsg "Invalid $Action JobControl command\n"; + return "0Invalid $Action JobControl command"; } - # We've already determined that JobKey is valid, untaint it - $JobKey =~ m/^(.*)$/; - $JobKey = $1; - - my $ErrMessage = $Job->Cancel(); - if (defined($ErrMessage)) - { - LogMsg "Cancel problem: $ErrMessage\n"; - return "0$ErrMessage"; - } - - ScheduleJobs(); - - return "1OK"; -} - -sub HandleJobRestart($) -{ - my ($JobKey) = @_; + $Action = $1; my $Job = CreateJobs()->GetItem($JobKey); - if (! $Job) + if (!$Job) { - LogMsg "JobRestart for nonexistent job $JobKey\n"; + LogMsg "$Action JobControl for nonexistent job $JobKey\n"; return "0Job $JobKey not found"; } # We've already determined that JobKey is valid, untaint it $JobKey =~ m/^(.*)$/; $JobKey = $1; - my $ErrMessage = $Job->Restart(); + my $ErrMessage = $Action eq "cancel" ? $Job->Cancel() : $Job->Restart(); if (defined($ErrMessage)) { - LogMsg "Restart problem: $ErrMessage\n"; + LogMsg "$Action problem: $ErrMessage\n"; return "0$ErrMessage"; } @@ -567,8 +548,7 @@ sub HandleGetScreenshot($) my %Handlers=( "getscreenshot" => \&HandleGetScreenshot, - "jobcancel" => \&HandleJobCancel, - "jobrestart" => \&HandleJobRestart, + "jobcontrol" => \&HandleJobControl, "jobstatuschange" => \&HandleJobStatusChange, "ping" => \&HandlePing, "shutdown" => \&HandleShutdown, diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index de73425..82221c9 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -29,8 +29,8 @@ WineTestBot::Engine::Notify - Engine notification use Exporter 'import'; our $RunningInEngine; -our @EXPORT = qw(Shutdown PingEngine JobStatusChange JobCancel - JobRestart RescheduleJobs VMStatusChange +our @EXPORT = qw(Shutdown PingEngine JobStatusChange JobControl + RescheduleJobs VMStatusChange WinePatchMLSubmission WinePatchWebSubmission GetScreenshot); our @EXPORT_OK = qw($RunningInEngine); @@ -115,31 +115,14 @@ sub JobStatusChange($$$) return substr($Reply, 1); } -sub JobCancel($) +sub JobControl($$) { - my ($JobKey) = @_; + my ($Action, $JobKey) = @_; - my $Reply = SendCmdReceiveReply("jobcancel $JobKey\n"); + my $Reply = SendCmdReceiveReply("jobcontrol $Action $JobKey\n"); if (length($Reply) < 1) { - return "The Engine did not acknowledge the JobCancel command"; - } - if (substr($Reply, 0, 1) eq "1") - { - return undef; - } - - return substr($Reply, 1); -} - -sub JobRestart($) -{ - my ($JobKey) = @_; - - my $Reply = SendCmdReceiveReply("jobrestart $JobKey\n"); - if (length($Reply) < 1) - { - return "The Engine did not acknowledge the JobRestart command"; + return "The Engine did not acknowledge the $Action JobControl command"; } if (substr($Reply, 0, 1) eq "1") { diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 99c68bc..87a5694 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -158,73 +158,33 @@ sub GetItemActions($) # Actions handling # -sub GetActions($) +sub CanDoJobControl($$) { - my ($self) = @_; - - # These are mutually exclusive - return ["Cancel job"] if (!defined $self->CanCancel()); - return ["Restart job"] if (!defined $self->CanRestart()); - return []; -} - -sub CanCancel($) -{ - my ($self) = @_; + my ($self, $Action) = @_; my $Job = $self->{EnclosingPage}->GetJob(); - my $Status = $Job->Status; - if ($Status ne "queued" && $Status ne "running") - { - return "Job already $Status"; - } - my $Session = $self->{EnclosingPage}->GetCurrentSession(); - if (! defined($Session)) + my $CurrentUser = $Session->User if (defined $Session); + if (!$CurrentUser or + (!$CurrentUser->HasRole("admin") and + $Job->User->GetKey() ne $CurrentUser->GetKey())) { - return "You are not authorized to cancel this job"; - } - my $CurrentUser = $Session->User; - if (! $CurrentUser->HasRole("admin") && - $Job->User->GetKey() ne $CurrentUser->GetKey()) - { - return "You are not authorized to cancel this job"; + return "You are not authorized to $Action this job"; } - return undef; + my %AllowedStatus = ( + "cancel" => {"queued" => 1, "running" => 1}, + "restart" => {"boterror" => 1, "canceled" => 1}, + ); + return $AllowedStatus{$Action}->{$Job->Status} ? undef : + "Cannot $Action a ". $Job->Status ." job"; } -sub CanRestart($) +sub OnJobControl($$) { - my ($self) = @_; - - my $Job = $self->{EnclosingPage}->GetJob(); - my $Status = $Job->Status; - if ($Status ne "boterror" && $Status ne "canceled") - { - return "Not a failed / canceled Job"; - } - - my $Session = $self->{EnclosingPage}->GetCurrentSession(); - if (! defined($Session)) - { - return "You are not authorized to restart this job"; - } - my $CurrentUser = $Session->User; - if (! $CurrentUser->HasRole("admin") && - $Job->User->GetKey() ne $CurrentUser->GetKey()) # FIXME: Admin only? - { - return "You are not authorized to restart this job"; - } - - return undef; -} - -sub OnCancel($) -{ - my ($self) = @_; + my ($self, $Action) = @_; - my $ErrMessage = $self->CanCancel(); + my $ErrMessage = $self->CanDoJobControl($Action); if (defined $ErrMessage) { $self->{EnclosingPage}->SetError(undef, $ErrMessage); @@ -232,7 +192,7 @@ sub OnCancel($) } my $JobId = $self->{EnclosingPage}->GetJob()->Id; - $ErrMessage = JobCancel($JobId); + $ErrMessage = JobControl($Action, $JobId); if (defined $ErrMessage) { $self->{EnclosingPage}->SetError(undef, $ErrMessage); @@ -240,43 +200,28 @@ sub OnCancel($) } # Ideally this would use something like GetMoreInfoLink() to rebuild a Get - # URL to preserve which logs and screenshots have been expanded. But the - # anchor would likely be lost anyway. + # URL to preserve which logs and screenshots have been expanded. But if the + # job got restarted those would be gone anyway. # So just do a basic reload to refresh the tasks' status. exit($self->{EnclosingPage}->Redirect($ENV{"SCRIPT_NAME"} ."?Key=$JobId")); } -sub OnRestart($) +sub GetActions($) { my ($self) = @_; - my $ErrMessage = $self->CanRestart(); - if (defined $ErrMessage) - { - $self->{EnclosingPage}->SetError(undef, $ErrMessage); - return !1; - } - - my $JobId = $self->{EnclosingPage}->GetJob()->Id; - $ErrMessage = JobRestart($JobId); - if (defined $ErrMessage) - { - $self->{EnclosingPage}->SetError(undef, $ErrMessage); - return !1; - } - - # Reload to refresh the tasks' status. Note that all logs and screenshots - # have been cleared so there is no point specifying which one to open or - # adding an anchor. - exit($self->{EnclosingPage}->Redirect($ENV{"SCRIPT_NAME"} ."?Key=$JobId")); + # These are mutually exclusive + return ["Cancel job"] if (!defined $self->CanDoJobControl("cancel")); + return ["Restart job"] if (!defined $self->CanDoJobControl("restart")); + return []; } sub OnAction($$) { my ($self, $Action) = @_; - return $Action eq "Cancel job" ? $self->OnCancel() : - $Action eq "Restart job" ? $self->OnRestart() : + return $Action eq "Cancel job" ? $self->OnJobControl("cancel") : + $Action eq "Restart job" ? $self->OnJobControl("restart") : $self->SUPER::OnAction($Action); }

1 0

Francois Gouget : testbot: Allow resuming jobs after stopping them.
by Alexandre Julliard 30 May '22

30 May '22

Module: tools Branch: master Commit: d673d98e959adce6795541b413ab9a4638d49106 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d673d98e959adce6795541b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 30 18:07:29 2022 +0200 testbot: Allow resuming jobs after stopping them. This renames the 'cancel' action to 'stop' since it's reversible now. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 6 ++-- testbot/lib/WineTestBot/Jobs.pm | 65 ++++++++++++++++++++++++++++++++++++++--- testbot/web/JobDetails.pl | 15 ++++++---- 3 files changed, 74 insertions(+), 12 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index da72ffb..8885273 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -333,7 +333,7 @@ sub HandleJobControl($) { my ($Action, $JobKey) = @_; - if ($Action !~ /^(cancel|restart)$/) + if ($Action !~ /^(stop|resume|restart)$/) { LogMsg "Invalid $Action JobControl command\n"; return "0Invalid $Action JobControl command"; @@ -350,7 +350,9 @@ sub HandleJobControl($) $JobKey =~ m/^(.*)$/; $JobKey = $1; - my $ErrMessage = $Action eq "cancel" ? $Job->Cancel() : $Job->Restart(); + my $ErrMessage = $Action eq "stop" ? $Job->Stop() : + $Action eq "resume" ? $Job->Resume() : + $Job->Restart(); if (defined($ErrMessage)) { LogMsg "$Action problem: $ErrMessage\n"; diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index c082a36..82cac66 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -75,7 +75,7 @@ Once all the Steps have completed the Job's Status is updated to reflect the overall result: completed, badpatch, etc. =item * -If the Job is canceled by the user, then the Status field is set to canceled. +If the Job is stopped by the user, then the Status field is set to canceled. =back @@ -280,9 +280,9 @@ sub UpdateStatus($) =pod =over 12 -=item C<Cancel()> +=item C<Stop()> -Cancels the Job, preserving existing results. +Stops the Job, preserving existing results. More precisely, goes through all of that Job's 'queued' and 'running' tasks, killing all the running ones and marking them, and all the queued tasks, as @@ -294,7 +294,7 @@ Returns undef if successful, the error message otherwise. =back =cut -sub Cancel($) +sub Stop($) { my ($self) = @_; my $ErrMessage; @@ -339,6 +339,63 @@ sub Cancel($) =pod =over 12 +=item C<Resume()> + +Resume running the Job. + +More precisely, marks the 'skipped' and 'canceled' tasks as 'queued' +again and updates the job status accordingly. This preserves existing +results unlike Restart(). + +Returns undef if successful, the error message otherwise. + +=back +=cut + +sub Resume($) +{ + my ($self) = @_; + + if ($self->Status ne "canceled") + { + return "The job has not been stopped and is currently ". $self->Status; + } + + my $Steps = $self->Steps; + $Steps->AddFilter("Status", ["canceled", "skipped"]); + foreach my $Step (@{$Steps->GetSortedItems()}) + { + if ($Step->PreviousNo) + { + my $PrevStatus = $Steps->GetItem($Step->PreviousNo)->Status; + if ($PrevStatus ne "queued" && $PrevStatus ne "running" && + $PrevStatus ne "completed") + { + # The previous step was supposed to provide binaries but it failed. + # So this one cannot resume. + continue; + } + } + + my $Tasks = $Step->Tasks; + $Tasks->AddFilter("Status", ["canceled", "skipped"]); + foreach my $Task (@{$Tasks->GetItems()}) + { + $Task->Status("queued"); + $Task->Started(undef); + } + $Step->Status("queued"); + } + # Mark the job as queued and let UpdateStatus() set it to running if + # appropriate. + $self->Status("queued"); + $self->UpdateStatus(); + return undef; +} + +=pod +=over 12 + =item C<Restart()> Restarts the Job from scratch. diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 87a5694..329ab15 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -173,7 +173,8 @@ sub CanDoJobControl($$) } my %AllowedStatus = ( - "cancel" => {"queued" => 1, "running" => 1}, + "stop" => {"queued" => 1, "running" => 1}, + "resume" => {"canceled" => 1}, "restart" => {"boterror" => 1, "canceled" => 1}, ); return $AllowedStatus{$Action}->{$Job->Status} ? undef : @@ -210,17 +211,19 @@ sub GetActions($) { my ($self) = @_; - # These are mutually exclusive - return ["Cancel job"] if (!defined $self->CanDoJobControl("cancel")); - return ["Restart job"] if (!defined $self->CanDoJobControl("restart")); - return []; + my @Actions; + push @Actions, "Stop job" if (!$self->CanDoJobControl("stop")); + push @Actions, "Resume job" if (!$self->CanDoJobControl("resume")); + push @Actions, "Restart job" if (!$self->CanDoJobControl("restart")); + return \@Actions; } sub OnAction($$) { my ($self, $Action) = @_; - return $Action eq "Cancel job" ? $self->OnJobControl("cancel") : + return $Action eq "Stop job" ? $self->OnJobControl("stop") : + $Action eq "Resume job" ? $self->OnJobControl("resume") : $Action eq "Restart job" ? $self->OnJobControl("restart") : $self->SUPER::OnAction($Action); }

1 0

Francois Gouget : testbot: Use GetSortedItems() to sort the Steps.
by Alexandre Julliard 30 May '22

30 May '22

Module: tools Branch: master Commit: 068575b74b9d655869a1e43473f01b0b34ba588f URL: https://source.winehq.org/git/tools.git/?a=commit;h=068575b74b9d655869a1e43… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 30 18:44:06 2022 +0200 testbot: Use GetSortedItems() to sort the Steps. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 82cac66..778a0f4 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -218,8 +218,7 @@ sub UpdateStatus($) my %Has; my $Steps = $self->Steps->Clone(); - my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; - foreach my $Step (@SortedSteps) + foreach my $Step (@{$Steps->GetSortedItems()}) { my $Skip; if ($Step->PreviousNo) @@ -419,8 +418,7 @@ sub Restart($) } my $Steps = $self->Steps; - my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; - foreach my $Step (@SortedSteps) + foreach my $Step (@{$Steps->GetSortedItems()}) { my $Tasks = $Step->Tasks; foreach my $Task (@{$Tasks->GetItems()})

1 0