February 2021 - Wine-Devel - list.winehq.org

[PATCH resend] user32/tests: Fix a test failure on w7u_2qxl TestBot VM.
by Zhiyi Zhang Feb. 22, 2021

Feb. 22, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Fix a test failure like in https://test.winehq.org/data/4de079bb7247c8b849558c0f27a280a9546c5570/win7_… dlls/user32/tests/monitor.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 58b3f0d5e0c..6b233970ace 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -743,17 +743,18 @@ static void test_ChangeDisplaySettingsEx(void) { dm.dmPosition = position; dm.dmFields |= DM_POSITION; - res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); /* Reattach detached non-primary adapters, otherwise ChangeDisplaySettingsExA with only CDS_RESET fails */ if (mode == 0 && device) { - todo_wine ok(res == DISP_CHANGE_FAILED, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d\n", - devices[device].name, mode, res); res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d\n", devices[device].name, mode, res); res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); } + else + { + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); + } ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* TestBots using VGA driver can't change to some modes */ -- 2.27.0

1 0

[PATCH v2] vkd3d-shader: Add a fall-through to default case in shader_sm4_read_param().
by Andrey Gusev Feb. 22, 2021

Feb. 22, 2021

Supersedes 200320. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- libs/vkd3d-shader/dxbc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index bfc3cce..d2cf87e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1551,6 +1551,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr default: FIXME("Skipping modifier 0x%08x.\n", m); + /* fall-through */ case VKD3D_SM4_REGISTER_MODIFIER_NONE: *modifier = VKD3DSPSM_NONE; break; -- 2.29.2

2 1

[PATCH] msado15: Add helper function to create CommandText interface
by Alistair Leslie-Hughes Feb. 22, 2021

Feb. 22, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/command.c | 1 + dlls/msado15/connection.c | 82 +++++++++++++++++++++------------- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 2 + dlls/msado15/stream.c | 1 + 5 files changed, 57 insertions(+), 30 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index d19108a1a25..9a56ced25ac 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -20,6 +20,7 @@ #include "winbase.h" #define COBJMACROS #include "objbase.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 500be033199..3d7054d073d 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -264,61 +264,89 @@ static HRESULT WINAPI connection_Close( _Connection *iface ) return S_OK; } -static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, - LONG options, _Recordset **record_set ) +HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) { - struct connection *connection = impl_from_Connection( iface ); HRESULT hr; IOpenRowset *openrowset; - IDBCreateCommand *create_command = NULL; - ICommand *cmd = NULL; - ICommandText *comand_text = NULL; - DBROWCOUNT affected; - IUnknown *rowset = NULL; - _Recordset *recordset = NULL; - ADORecordsetConstruction *construct; - - FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set ); - - if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + ICommandText *command_text; + ICommand *cmd; + IDBCreateCommand *create_command; - hr = IUnknown_QueryInterface(connection->session, &IID_IOpenRowset, (void**)&openrowset); + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); if (FAILED(hr)) return hr; hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); + IOpenRowset_Release(openrowset); if (FAILED(hr)) - goto done; + return hr; hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + IDBCreateCommand_Release(create_command); if (FAILED(hr)) - goto done; + return hr; - hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); + ICommand_Release(cmd); if (FAILED(hr)) { FIXME("Currently only ICommandText interface is support\n"); - goto done; + return hr; + } + + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, command); + if (FAILED(hr)) + { + ICommandText_Release(command_text); + return hr; } - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, command); + *cmd_text = command_text; + + return S_OK; +} + +static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, + LONG options, _Recordset **record_set ) +{ + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + ICommandText *comand_text = NULL; + DBROWCOUNT affected; + IUnknown *rowset = NULL; + _Recordset *recordset = NULL; + ADORecordsetConstruction *construct; + + FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set ); + + if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + hr = create_command_text(connection->session, command, &comand_text); if (FAILED(hr)) - goto done; + return hr; hr = ICommandText_Execute(comand_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + ICommandText_Release(comand_text); if (FAILED(hr)) - goto done; + return hr; hr = Recordset_create( (void**)&recordset); if (FAILED(hr)) - goto done; + { + return hr; + } hr = _Recordset_QueryInterface(recordset, &IID_ADORecordsetConstruction, (void**)&construct); if (FAILED(hr)) - goto done; + { + IUnknown_Release(rowset); + _Recordset_Release(recordset); + return hr; + } ADORecordsetConstruction_put_Rowset(construct, rowset); ADORecordsetConstruction_Release(construct); + IUnknown_Release(rowset); if (records_affected) { @@ -329,12 +357,6 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI _Recordset_put_CursorLocation(recordset, connection->location); *record_set = recordset; -done: - if (rowset) IUnknown_Release(rowset); - if (comand_text) ICommandText_Release(comand_text); - if (cmd) ICommand_Release(cmd); - if (create_command) IDBCreateCommand_Release(create_command); - if (openrowset) IOpenRowset_Release(openrowset); return hr; } diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 770a02fc59d..0b8de1f9117 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -22,6 +22,7 @@ #define COBJMACROS #include "objbase.h" #include "rpcproxy.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index f6c60f0304c..dd98c382e2b 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -26,6 +26,8 @@ HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; +HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) DECLSPEC_HIDDEN; + static inline void *heap_realloc_zero( void *mem, SIZE_T len ) { if (!mem) return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index c6add70b1bc..b40f664dcf1 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -21,6 +21,7 @@ #include "winbase.h" #define COBJMACROS #include "objbase.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" -- 2.30.0

2 1

[PATCH 1/6] regedit/tests: Check for elevated privileges before cleaning up the Windows 3.1 test key and running unit tests
by Hugh McMaster Feb. 22, 2021

Feb. 22, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/tests/regedit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 66b95624455..de4ddfa76a3 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1094,15 +1094,12 @@ static void test_basic_import_unicode(void) static void test_basic_import_31(void) { HKEY hkey; + DWORD dispos; LONG lr; - lr = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, - "RegDeleteKeyA failed: %d\n", lr); - /* Check if regedit.exe is running with elevated privileges */ lr = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ, NULL, &hkey, NULL); + KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos); if (lr == ERROR_ACCESS_DENIED) { win_skip("regedit.exe is not running with elevated privileges; " @@ -1110,6 +1107,9 @@ static void test_basic_import_31(void) return; } + if (dispos == REG_OPENED_EXISTING_KEY) + delete_value(hkey, NULL); + /* Test simple value */ exec_import_str("REGEDIT\r\n" "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value0\r\n"); -- 2.30.1

2 11

[PATCH] ntoskrnl.exe: Exclude large integer APIs from relay tracing.
by Zhiyi Zhang Feb. 22, 2021

Feb. 22, 2021

Similar to 8d7ec7968df1750c9c525817f1366b57fa72d839 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 22968913300..145ea3099d7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1527,16 +1527,16 @@ @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @ cdecl -private _abnormal_termination() -@ cdecl -arch=i386 -ret64 _alldiv(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _allmul(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() -@ cdecl -arch=i386 -ret64 _allrem(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _allrem(int64 int64) @ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long) -@ cdecl -arch=i386 -ret64 _aulldiv(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _aullrem(int64 int64) +@ cdecl -arch=i386 -norelay -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ cdecl -arch=i386 -norelay _chkstk() @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) -- 2.27.0

1 0

[PATCH v3] ddraw: HWTRANSFORMANDLIGHT is not set for software devices
by David Adam Feb. 22, 2021

Feb. 22, 2021

This patch is from Michael Muller

2 2

[PATCH v2 9/9] reg/tests: Add tests for forward and back slashes in key and value names
by Hugh McMaster Feb. 22, 2021

Feb. 22, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- v2: Use close_key() instead of RegCloseKey in final export test programs/reg/tests/reg.c | 89 ++++++++++++++++++++++++++++++++++------ 1 file changed, 77 insertions(+), 12 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index db02fc770e2..538a274d54f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -578,6 +578,19 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, 0); + /* Test forward and back slashes */ + run_reg_exe("reg add HKCU\\" KEY_BASE "\\https://winehq.org /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "https://winehq.org"); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v count/up /d one/two/three /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "count/up", REG_SZ, "one/two/three", 14, 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v \\foo\\bar /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "\\foo\\bar", REG_SZ, "", 1, 0); + close_key(hkey); /* Test duplicate switches */ @@ -615,7 +628,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid4 -", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } static void test_delete(void) @@ -681,6 +694,24 @@ static void test_delete(void) verify_reg_nonexist(hkey, "foo"); verify_key(hkey, "subkey"); + /* Test forward and back slashes */ + add_key(hkey, "https://winehq.org", &hsubkey); + close_key(hsubkey); + add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); + add_value(hkey, "\\foo\\bar", REG_SZ, "", 1); + + run_reg_exe("reg delete HKCU\\" KEY_BASE "\\https://winehq.org /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "https://winehq.org"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v count/up /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "count/up"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v \\foo\\bar /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "\\foo\\bar"); + close_key(hkey); run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); @@ -2385,9 +2416,20 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine70e"); todo_wine verify_reg_nonexist(hkey, "Wine70f"); + /* Test forward and back slashes */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"count/up\"=\"one/two/three\"\n" + "\"\\\\foo\\\\bar\"=\"\"\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "count/up", REG_SZ, "one/two/three", 14, 0); + verify_reg(hkey, "\\foo\\bar", REG_SZ, "", 1, 0); + verify_key(hkey, "https://winehq.org"); + close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } static void test_unicode_import(void) @@ -3923,9 +3965,20 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine70e"); todo_wine verify_reg_nonexist(hkey, "Wine70f"); + /* Test forward and back slashes */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"count/up\"=\"one/two/three\"\n" + "\"\\\\foo\\\\bar\"=\"\"\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "count/up", REG_SZ, "one/two/three", 14, 0); + verify_reg(hkey, "\\foo\\bar", REG_SZ, "", 1, 0); + verify_key(hkey, "https://winehq.org"); + close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } static void test_import_with_whitespace(void) @@ -4473,6 +4526,13 @@ static void test_export(void) "\"Wine4g\"=\"Value2\"\r\n" "\"Wine4h\"=\"abc\"\r\n\r\n"; + const char *slashes_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"count/up\"=\"one/two/three\"\r\n" + "\"\\\\foo\\\\bar\"=\"\"\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\r\n\r\n"; + delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); @@ -4579,9 +4639,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); - - err = delete_tree(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS, "delete_tree() failed: %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); /* Test the export order of registry keys */ add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); @@ -4593,7 +4651,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); - delete_key(hkey, "Subkey1"); delete_key(hkey, "Subkey2"); @@ -4607,7 +4664,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", value_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); /* Test registry export with empty hex data */ @@ -4625,7 +4681,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); /* Test registry export after importing alternative registry data types */ @@ -4643,7 +4698,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -4662,7 +4716,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); /* Test registry export with embedded null characters */ @@ -4700,8 +4753,20 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + + /* Test registry export with forward and back slashes */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_key(hkey, "https://winehq.org", &subkey); + close_key(subkey); + add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); + add_value(hkey, "\\foo\\bar", REG_SZ, "", 1); + close_key(hkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", slashes_test, TODO_REG_COMPARE), "compare_export() failed\n"); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } #define COPY_DEST KEY_WINE "\\reg_copy" -- 2.30.1

1 0

[PATCH 1/9] reg/tests: Check for elevated privileges before cleaning up the Windows 3.1 test key and running unit tests
by Hugh McMaster Feb. 22, 2021

Feb. 22, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/reg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index afba8424c1a..4be9e635ed7 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4204,14 +4204,11 @@ static void test_import_31(void) { LONG err; HKEY hkey; - DWORD r; - - err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); - ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", err); + DWORD dispos, r; /* Check if reg.exe is running with elevated privileges */ err = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_SET_VALUE, NULL, &hkey, NULL); + KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos); if (err == ERROR_ACCESS_DENIED) { win_skip("reg.exe is not running with elevated privileges; " @@ -4219,6 +4216,9 @@ static void test_import_31(void) return; } + if (dispos == REG_OPENED_EXISTING_KEY) + delete_value(hkey, NULL); + /* Test simple value */ test_import_str("REGEDIT\r\n" "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value0\r\n", &r); -- 2.30.1

1 8

[tools] testbot: Deduplicate matching errors in ParseWineTestReport().
by Francois Gouget Feb. 22, 2021

Feb. 22, 2021

Let ParseWineTestReport() populate the list of errors, and only use GetReportLineCategory() as a fallback. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 59 ++++++++++++++++++----------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index dae8292a7..267dcd9ec 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -368,6 +368,8 @@ sub _NewCurrentUnit($$) IsBroken => 0, Rc => undef, Pids => {}, + Group => undef, + GroupLineNo => 0, }; } @@ -462,6 +464,25 @@ sub _CloseTestUnit($$$) $LogInfo->{Failures} += $Cur->{LineFailures}; } +sub _AddReportError($$$$) +{ + my ($LogInfo, $Cur, $LineNo, $Line) = @_; + + # Make the timeout messages more user-friendly + my $ErrLine = $Line; + if ($ErrLine =~ /^[^:]+:([^:]*):[0-9a-f]+ done $258$/) + { + my $Unit = $1; + $ErrLine = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; + } + + if (!$Cur->{Group}) + { + $Cur->{Group} = _AddLogGroup($LogInfo, $Cur->{Dll}, $Cur->{GroupLineNo} || $LineNo); + } + _AddLogError($LogInfo, $Cur->{Group}, $ErrLine, $LineNo); +} + =pod =over 12 @@ -522,8 +543,6 @@ sub ParseWineTestReport($$$) } my $LineNo = 0; - my $CurGroupName = ""; - my ($CurGroup, $CurGroupLineNo); my $Cur = _NewCurrentUnit("", ""); foreach my $Line (<$LogFile>) { @@ -533,23 +552,6 @@ sub ParseWineTestReport($$$) chomp $Line; $Line =~ s/\r+$//; - if (GetReportLineCategory($Line) eq "error") - { - # Make the timeout messages more user-friendly - my $ErrLine = $Line; - if ($ErrLine =~ /^[^:]+:([^:]*):[0-9a-f]+ done $258$/) - { - my $Unit = $1; - $ErrLine = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; - } - - if (!$CurGroup) - { - $CurGroup = _AddLogGroup($LogInfo, $CurGroupName, $CurGroupLineNo || $LineNo); - } - _AddLogError($LogInfo, $CurGroup, $ErrLine, $LineNo); - } - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)$%) { my ($Dll, $Unit, $Type) = ($1, $2, $3); @@ -563,9 +565,8 @@ sub ParseWineTestReport($$$) $Cur->{Rc} = 0 if ($Type eq "skipped"); # The next error will be in a new error group - $CurGroupName = $Dll; - $CurGroupLineNo = $LineNo; - $CurGroup = undef; + $Cur->{GroupLineNo} = $LineNo; + $Cur->{Group} = undef; } elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) { @@ -586,6 +587,7 @@ sub ParseWineTestReport($$$) $Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): /) { _CheckUnit($LogInfo, $Cur, $1, "failure"); + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -614,6 +616,7 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures}++; $LogInfo->{IsWineTest} = 1; + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -629,6 +632,7 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures}++; } _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif ($Line =~ /Unhandled exception: .* in .* code /) @@ -636,6 +640,7 @@ sub ParseWineTestReport($$$) # This also replaces a test summary line. The pid is unknown so use 0. $Cur->{Pids}->{0} = 1; $Cur->{SummaryFailures}++; + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -650,6 +655,7 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures}++; } _CheckUnit($LogInfo, $Cur, $Unit, "child exception"); + _AddReportError($LogInfo, $Cur, $LineNo, $Line); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -704,6 +710,7 @@ sub ParseWineTestReport($$$) $LogInfo->{Failures}++; $Cur->{IsBroken} = 1; $LogInfo->{TimeoutCount}++; + _AddReportError($LogInfo, $Cur, $LineNo, $&); } elsif ((!$Pid and !%{$Cur->{Pids}}) or ($Pid and !$Cur->{Pids}->{$Pid} and !$Cur->{Pids}->{0})) @@ -729,6 +736,14 @@ sub ParseWineTestReport($$$) } $Cur->{Rc} = $Rc; } + elsif (GetReportLineCategory($Line) eq "error") + { + # This should only happen on very garbled lines, or if there is an + # inconsistency between GetReportLineCategory() and + # ParseWineTestReport(). + _AddReportError($LogInfo, $Cur, $LineNo, $Line); + } + } $Cur->{IsBroken} = 1 if ($LogInfo->{TaskTimedOut}); _CloseTestUnit($LogInfo, $Cur, 1); -- 2.20.1

1 0

[tools] testbot/TestWTBS: Check that no extra test units have been run.
by Francois Gouget Feb. 22, 2021

Feb. 22, 2021

TestUnits is now an exhaustive list of test units that are expected to be run. Any extra test unit is reported as a failure. To compensate one can now add a module name to accept any test unit from that module. This allows dealing with the test=module configurations. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 8a77b00de..1467c4b4e 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1038,11 +1038,15 @@ p win.HasTask 0 =item <tests.TestUnits> -Checks that the TestBot ran at least the test units mentioned in this -space-separated list on the VMs matching the specified category. +Checks that the TestBot ran the test units mentioned in this space-separated +list on the VMs matching the specified category. Each entry is either of the +form module:unit, or just module in which case it matches any test unit of the +specified module. Each entry in the list must match at least one test unit. +Two entries can match the same test unit(s). +This is useful when test=module, in which case the TestBot may run many tests. For instance: -p win.TestUnits cabinet:extract cabinet:fdi +p win.TestUnits cabinet:newunit cabinet =item <patch.Grep> =item <patch.GrepV> @@ -1168,11 +1172,31 @@ sub CheckJobTree($;$) my $MissionInfo = $TestInfo->{$MissionType}; next if (!CheckValue($MissionInfo->{TestUnits})); - foreach my $TestUnit (split / +/, $MissionInfo->{TestUnits}) + foreach my $TestGrep (split / +/, $MissionInfo->{TestUnits}) { - ok($TestUnits->{$MissionType}->{$TestUnit}, "Check that $TestUnit was tested by $MissionType VMs for job $JobId") + if ($TestGrep =~ /:/) + { + if (exists $TestUnits->{$MissionType}->{$TestGrep}) + { + $TestUnits->{$MissionType}->{$TestGrep} = 0; + next; + } + fail("Check that $MissionType VMs ran $TestGrep for job $JobId") + or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$MissionType}})); + } + my $Matched; + foreach my $TestUnit (keys %{$TestUnits->{$MissionType}}) + { + next if ($TestUnit !~/^\Q$TestGrep:\E/); + $TestUnits->{$MissionType}->{$TestUnit} = 0; + $Matched = 1; + } + ok($Matched, "Check that $MissionType VMs ran $TestGrep for job $JobId") or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$MissionType}})); } + my @ExtraUnits = grep { $TestUnits->{$MissionType}->{$_} } keys %{$TestUnits->{$MissionType}}; + ok(!@ExtraUnits, "Check that $MissionType VMs ran no extra test units") + or diag("Extraneous test runs=". join(" ", sort @ExtraUnits)); } } -- 2.20.1

1 0