April 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : kernelbase: Compare against the correct constants in GetNativeSystemInfo().
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 1b7c292d625cc3675d187adddd6fef577644e1f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b7c292d625cc3675d187add… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 30 20:49:47 2021 +0200 kernelbase: Compare against the correct constants in GetNativeSystemInfo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51082 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 1969fd732b1..0cfce90a979 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -81,16 +81,16 @@ void WINAPI DECLSPEC_HOTPATCH GetNativeSystemInfo( SYSTEM_INFO *si ) if (!current_machine) return; switch (native_machine) { - case PROCESSOR_ARCHITECTURE_AMD64: + case IMAGE_FILE_MACHINE_AMD64: si->u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64; si->dwProcessorType = PROCESSOR_AMD_X8664; break; - case PROCESSOR_ARCHITECTURE_ARM64: + case IMAGE_FILE_MACHINE_ARM64: si->u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM64; si->dwProcessorType = 0; break; default: - FIXME( "Add the proper information for %d in wow64 mode\n", si->u.s.wProcessorArchitecture ); + FIXME( "Add the proper information for %x in wow64 mode\n", native_machine ); } }

1 0

Francois Gouget : kernel32/tests: Add a trailing linefeed to an ok() message.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 660b32b81e2d0989a46ca0fcdc4eed4e6aedddc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=660b32b81e2d0989a46ca0fc… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 30 14:35:48 2021 +0200 kernel32/tests: Add a trailing linefeed to an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b932a3c2a15..f960efb05a8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3857,7 +3857,7 @@ static void test_GetSystemCpuSetInformation(void) ok(ret && GetLastError() == 0xdeadbeef, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); ok(size == expected_size, "Got unexpected size %u.\n", size); - ok(!memcmp(info, info_nt, expected_size), "Info does not match NtQuerySystemInformationEx()."); + ok(!memcmp(info, info_nt, expected_size), "Info does not match NtQuerySystemInformationEx().\n"); heap_free(info_nt); heap_free(info);

1 0

Hugh McMaster : reg/tests: Add and amend tests adding a (Default) value.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 1aae492dcbb2a0a7725a9cff40edd6a355f7fc79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aae492dcbb2a0a7725a9cff… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:43 2021 +1000 reg/tests: Add and amend tests adding a (Default) value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 71 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 21 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index fdd09c885bc..3ac4ca800dd 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -404,6 +404,16 @@ static void test_reg_none(void) add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_NONE /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, NULL, REG_NONE, "\0", 2, 0); + + todo_wine delete_value(hkey, NULL); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_NONE /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_NONE, "\0", 2, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v none0 /d deadbeef /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, 0); @@ -412,10 +422,6 @@ static void test_reg_none(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, "none1", REG_NONE, "\0", 2, 0); - run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_NONE /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_NONE, "\0", 2, 0); - close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); } @@ -427,6 +433,10 @@ static void test_reg_sz(void) add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + todo_wine verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), "got exit code %d, expected 0\n", r); @@ -501,6 +511,16 @@ static void test_reg_expand_sz(void) add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + todo_wine verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, 0); + + todo_wine delete_value(hkey, NULL); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_EXPAND_SZ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, "expand0", REG_EXPAND_SZ, "dead%PATH%beef", 15, 0); @@ -521,10 +541,6 @@ static void test_reg_expand_sz(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, 0); - run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_EXPAND_SZ /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_EXPAND_SZ, "", 1, 0); - close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); } @@ -538,15 +554,25 @@ static void test_reg_binary(void) add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); - run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin0 /f", &r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "bin0", REG_BINARY, buffer, 0, 0); + todo_wine verify_reg(hkey, NULL, REG_BINARY, buffer, 0, 0); + + todo_wine delete_value(hkey, NULL); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_BINARY /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_BINARY, buffer, 0, 0); run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_BINARY /d deadbeef /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); dword = 0xefbeadde; verify_reg(hkey, "", REG_BINARY, &dword, sizeof(DWORD), 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin0 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "bin0", REG_BINARY, buffer, 0, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin1 /f /d 0xDeAdBeEf", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); @@ -579,10 +605,6 @@ static void test_reg_binary(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v bin6 /t REG_BINARY /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_BINARY /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_BINARY, buffer, 0, 0); - close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); } @@ -604,6 +626,9 @@ static void test_reg_dword(void) else win_skip("broken reg.exe detected\n"); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_DWORD /f", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword0 /t REG_DWORD /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -667,9 +692,6 @@ static void test_reg_dword(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword15 /t REG_DWORD /d 4294967296 /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); - run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_DWORD /f", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); - /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -705,6 +727,17 @@ static void test_reg_multi_sz(void) add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + buffer[0] = 0; + todo_wine verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, 0); + + todo_wine delete_value(hkey, NULL); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_MULTI_SZ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); memcpy(buffer, "three\0little\0strings\0", 22); @@ -786,10 +819,6 @@ static void test_reg_multi_sz(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, "multi21", REG_MULTI_SZ, "two\\0\\0strings\0", 16, 0); - run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_MULTI_SZ /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, 0); - close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); }

1 0

Hugh McMaster : reg/tests: Use string literals instead of a char buffer for REG_MULTI_SZ tests.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 1110421da93ebd6cc2648008fed874a49b8bbf28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1110421da93ebd6cc2648008… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:44 2021 +1000 reg/tests: Use string literals instead of a char buffer for REG_MULTI_SZ tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 3ac4ca800dd..d2d09e79ce6 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -723,37 +723,34 @@ static void test_reg_multi_sz(void) { HKEY hkey; DWORD r; - char buffer[22]; add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - buffer[0] = 0; - todo_wine verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, 0); + todo_wine verify_reg(hkey, NULL, REG_MULTI_SZ, "", 1, 0); todo_wine delete_value(hkey, NULL); run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_MULTI_SZ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, 0); + verify_reg(hkey, NULL, REG_MULTI_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - memcpy(buffer, "three\0little\0strings\0", 22); - verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, 0); + verify_reg(hkey, "multi0", REG_MULTI_SZ, "three\0little\0strings\0", 22, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi1 /s \"#\" /d \"three#little#strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, 0); + verify_reg(hkey, "multi1", REG_MULTI_SZ, "three\0little\0strings\0", 22, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi2 /d \"\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, 0); + verify_reg(hkey, "multi2", REG_MULTI_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi3 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, 0); + verify_reg(hkey, "multi3", REG_MULTI_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"threelittlestrings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -779,8 +776,7 @@ static void test_reg_multi_sz(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi11 /s \"#\" /d \"a#\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - buffer[0]='a'; buffer[1]=0; buffer[2]=0; - verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, 0); + verify_reg(hkey, "multi11", REG_MULTI_SZ, "a\0", 3, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi12 /t REG_MULTI_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -793,19 +789,18 @@ static void test_reg_multi_sz(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi15 /t REG_MULTI_SZ /d \"a\\0\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi15", REG_MULTI_SZ, buffer, 3, 0); + verify_reg(hkey, "multi15", REG_MULTI_SZ, "a\0", 3, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi16 /d \"two\\0\\0strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi17 /t REG_MULTI_SZ /s \"#\" /d \"#\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - buffer[0] = 0; buffer[1] = 0; - verify_reg(hkey, "multi17", REG_MULTI_SZ, buffer, 2, 0); + verify_reg(hkey, "multi17", REG_MULTI_SZ, "\0", 2, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi18 /t REG_MULTI_SZ /d \"\\0\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi18", REG_MULTI_SZ, buffer, 2, 0); + verify_reg(hkey, "multi18", REG_MULTI_SZ, "\0", 2, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi19 /t REG_MULTI_SZ /s \"#\" /d \"two\\0#strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r);

1 0

Hugh McMaster : reg/tests: Split the REG_DWORD_BIG_ENDIAN tests from the REG_DWORD tests.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 94b582b1a68cd07676618144537465bdf21d1847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94b582b1a68cd07676618144… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:45 2021 +1000 reg/tests: Split the REG_DWORD_BIG_ENDIAN tests from the REG_DWORD tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index d2d09e79ce6..f6a4a7fe576 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -698,22 +698,38 @@ static void test_reg_dword(void) dword = 456; verify_reg(hkey, "DWORD_LE", REG_DWORD_LITTLE_ENDIAN, &dword, sizeof(dword), 0); - /* REG_DWORD_BIG_ENDIAN */ - run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE /t REG_DWORD_BIG_ENDIAN /d 456 /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - dword = 456; - verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), 0); - /* REG_DWORD_BIG_ENDIAN is broken in every version of windows. It behaves like - * an ordinary REG_DWORD - that is little endian. GG */ - - run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE2 /t REG_DWORD_BIG_ENDIAN /f /d", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + close_key(hkey); + delete_key(HKEY_CURRENT_USER, KEY_BASE); +} - run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE3 /t REG_DWORD_BIG_ENDIAN /f", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); +/* REG_DWORD_BIG_ENDIAN is broken in every version of Windows. It behaves + * like an ordinary REG_DWORD, which is little endian. + */ +static void test_reg_dword_big_endian(void) +{ + HKEY hkey; + DWORD r, dword; run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_DWORD_BIG_ENDIAN /f", &r); - ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Test1 /t REG_DWORD_BIG_ENDIAN /f /d", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Test2 /t REG_DWORD_BIG_ENDIAN /f", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 1\n", r); + + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Test3 /t REG_DWORD_BIG_ENDIAN /d 456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 456; + verify_reg(hkey, "Test3", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Test4 /t REG_DWORD_BIG_ENDIAN /d 0x456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x456; + verify_reg(hkey, "Test4", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), 0); close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -835,5 +851,6 @@ START_TEST(add) test_reg_expand_sz(); test_reg_binary(); test_reg_dword(); + test_reg_dword_big_endian(); test_reg_multi_sz(); }

1 0

Hugh McMaster : reg/tests: Fix a typo in a REG_DWORD test.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: a8e961ecacb845b3fc613401431ae9ca37bf9d4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8e961ecacb845b3fc613401… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:46 2021 +1000 reg/tests: Fix a typo in a REG_DWORD test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index f6a4a7fe576..6090b587f92 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -673,7 +673,7 @@ static void test_reg_dword(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword10 /f /d -0x1", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); - run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0x01ffffffff /f", &r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword11 /t REG_dword /d 0x01ffffffff /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword12 /t REG_DWORD /d 0xffffffff /f", &r);

1 0

Hugh McMaster : reg/tests: Add two REG_DWORD tests.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 357601a01b894ecdd0e26f5493914192d7ccae6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=357601a01b894ecdd0e26f54… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:47 2021 +1000 reg/tests: Add two REG_DWORD tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 6090b587f92..78519565b22 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -692,6 +692,16 @@ static void test_reg_dword(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword15 /t REG_DWORD /d 4294967296 /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword16 /t REG_DWORD /d 456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 456; + verify_reg(hkey, "dword16", REG_DWORD, &dword, sizeof(dword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword17 /t REG_DWORD /d 0x456 /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x456; + verify_reg(hkey, "dword17", REG_DWORD, &dword, sizeof(dword), 0); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Hugh McMaster : reg/tests: Update error messages.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 08786274e25461dc1af3684f0e46c896201b28cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=08786274e25461dc1af3684f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:48 2021 +1000 reg/tests: Update error messages. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 78519565b22..23d0115fd64 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -57,18 +57,18 @@ void verify_reg_(const char *file, unsigned line, HKEY hkey, const char *value, size = sizeof(data); memset(data, 0xdd, size); err = RegQueryValueExA(hkey, value, NULL, &type, data, &size); - lok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err); + lok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got error %d\n", err); if (err != ERROR_SUCCESS) return; todo_wine_if (todo & TODO_REG_TYPE) - lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); + lok(type == exp_type, "got registry type %d, expected %d\n", type, exp_type); todo_wine_if (todo & TODO_REG_SIZE) - lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); + lok(size == exp_size, "got data size %d, expected %d\n", size, exp_size); if (exp_data) { todo_wine_if (todo & TODO_REG_DATA) - lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); + lok(memcmp(data, exp_data, size) == 0, "registry data does not match\n"); } } @@ -87,7 +87,7 @@ void open_key_(const char *file, unsigned line, const HKEY base, const char *pat LONG err; err = RegOpenKeyExA(base, path, 0, KEY_READ|sam, hkey); - lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", err); + lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got error %d\n", err); } void close_key_(const char *file, unsigned line, HKEY hkey) @@ -95,7 +95,7 @@ void close_key_(const char *file, unsigned line, HKEY hkey) LONG err; err = RegCloseKey(hkey); - lok(err == ERROR_SUCCESS, "RegCloseKey failed: %d\n", err); + lok(err == ERROR_SUCCESS, "RegCloseKey failed: got error %d\n", err); } void verify_key_(const char *file, unsigned line, HKEY key_base, const char *subkey) @@ -104,7 +104,7 @@ void verify_key_(const char *file, unsigned line, HKEY key_base, const char *sub LONG err; err = RegOpenKeyExA(key_base, subkey, 0, KEY_READ, &hkey); - lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d\n", err); + lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got error %d\n", err); if (hkey) RegCloseKey(hkey); @@ -130,7 +130,7 @@ void add_key_(const char *file, unsigned line, const HKEY hkey, const char *path err = RegCreateKeyExA(hkey, path, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &new_key, NULL); - lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", err); + lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: got error %d\n", err); if (subkey) *subkey = new_key; @@ -145,7 +145,7 @@ void delete_key_(const char *file, unsigned line, const HKEY hkey, const char *p LONG err; err = RegDeleteKeyA(hkey, path); - lok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); + lok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got error %d\n", err); } } @@ -197,7 +197,7 @@ void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, LONG err; err = RegSetValueExA(hkey, name, 0, type, (const BYTE *)data, size); - lok(err == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", err); + lok(err == ERROR_SUCCESS, "RegSetValueExA failed: got error %d\n", err); } void delete_value_(const char *file, unsigned line, const HKEY hkey, const char *name) @@ -205,7 +205,7 @@ void delete_value_(const char *file, unsigned line, const HKEY hkey, const char LONG err; err = RegDeleteValueA(hkey, name); - lok(err == ERROR_SUCCESS, "RegDeleteValueA failed: %d\n", err); + lok(err == ERROR_SUCCESS, "RegDeleteValueA failed: got error %d\n", err); } /* Unit tests */

1 0

Hugh McMaster : reg: Replace the 'reg_count' variable name with context-specific names.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 2c73949a46c2dda10b544cef44c0f6c3623cc74e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c73949a46c2dda10b544cef… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Apr 30 22:39:49 2021 +1000 reg: Replace the 'reg_count' variable name with context-specific names. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index db909167f30..c3dec2d5b7f 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -48,11 +48,12 @@ static inline BYTE hexchar_to_byte(WCHAR ch) return -1; } -static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DWORD *reg_count) +static BYTE *get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DWORD *size_bytes) { static const WCHAR empty; LPBYTE out_data = NULL; - *reg_count = 0; + + *size_bytes = 0; if (!data) data = ∅ @@ -62,8 +63,8 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW case REG_SZ: case REG_EXPAND_SZ: { - *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR); - out_data = malloc(*reg_count); + *size_bytes = (lstrlenW(data) + 1) * sizeof(WCHAR); + out_data = malloc(*size_bytes); lstrcpyW((LPWSTR)out_data,data); break; } @@ -78,8 +79,8 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW output_message(STRING_MISSING_INTEGER); break; } - *reg_count = sizeof(DWORD); - out_data = malloc(*reg_count); + *size_bytes = sizeof(DWORD); + out_data = malloc(*size_bytes); ((LPDWORD)out_data)[0] = val; break; } @@ -87,8 +88,8 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW { BYTE hex0, hex1; int i = 0, destByteIndex = 0, datalen = lstrlenW(data); - *reg_count = ((datalen + datalen % 2) / 2) * sizeof(BYTE); - out_data = malloc(*reg_count); + *size_bytes = ((datalen + datalen % 2) / 2) * sizeof(BYTE); + out_data = malloc(*size_bytes); if(datalen % 2) { hex1 = hexchar_to_byte(data[i++]); @@ -139,7 +140,7 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW buffer[destindex] = 0; if (destindex && buffer[destindex - 1]) buffer[++destindex] = 0; - *reg_count = (destindex + 1) * sizeof(WCHAR); + *size_bytes = (destindex + 1) * sizeof(WCHAR); return (BYTE *)buffer; } default: @@ -164,7 +165,7 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, if (value_name || value_empty || data) { DWORD reg_type; - DWORD reg_count = 0; + DWORD data_size = 0; BYTE* reg_data = NULL; if (!force) @@ -194,13 +195,13 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, return 1; } - if (!(reg_data = get_regdata(data, reg_type, separator, &reg_count))) + if (!(reg_data = get_regdata(data, reg_type, separator, &data_size))) { RegCloseKey(hkey); return 1; } - RegSetValueExW(hkey, value_name, 0, reg_type, reg_data, reg_count); + RegSetValueExW(hkey, value_name, 0, reg_type, reg_data, data_size); free(reg_data); }

1 0

Alistair Leslie-Hughes : msado15: Use Recordset_Open in Connection_Execute.
by Alexandre Julliard 30 Apr '21

30 Apr '21

Module: wine Branch: master Commit: 1b9c6227f3dc0746743f5f4e9865d6a18caa3976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b9c6227f3dc0746743f5f4e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 30 20:52:06 2021 +1000 msado15: Use Recordset_Open in Connection_Execute. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 78 +++++++++--------------------------------- dlls/msado15/msado15_private.h | 2 -- dlls/msado15/recordset.c | 42 +++++++++++++++++++++++ 3 files changed, 59 insertions(+), 63 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index a3c9a450be6..ce7750fef66 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -292,98 +292,54 @@ static HRESULT WINAPI connection_Close( _Connection *iface ) return S_OK; } -HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) -{ - HRESULT hr; - IOpenRowset *openrowset; - ICommandText *command_text; - ICommand *cmd; - IDBCreateCommand *create_command; - - 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)) - return hr; - - hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); - IDBCreateCommand_Release(create_command); - if (FAILED(hr)) - return hr; - - hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); - ICommand_Release(cmd); - if (FAILED(hr)) - { - FIXME("Currently only ICommandText interface is support\n"); - return hr; - } - - hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, command); - if (FAILED(hr)) - { - ICommandText_Release(command_text); - return hr; - } - - *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 *command_text; - DBROWCOUNT affected; - IUnknown *rowset; _Recordset *recordset; - ADORecordsetConstruction *construct; + VARIANT source, active; + IDispatch *dispatch; 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, &command_text); + hr = Recordset_create( (void**)&recordset); if (FAILED(hr)) + { return hr; + } - hr = ICommandText_Execute(command_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); - ICommandText_Release(command_text); - if (FAILED(hr)) - return hr; + _Recordset_put_CursorLocation(recordset, connection->location); - hr = Recordset_create( (void**)&recordset); + V_VT(&source) = VT_BSTR; + V_BSTR(&source) = command; + + hr = _Connection_QueryInterface(&connection->Connection_iface, &IID_IDispatch, (void**)&dispatch); if (FAILED(hr)) { - IUnknown_Release(rowset); + _Recordset_Release(recordset); return hr; } - hr = _Recordset_QueryInterface(recordset, &IID_ADORecordsetConstruction, (void**)&construct); + V_VT(&active) = VT_DISPATCH; + V_DISPATCH(&active) = dispatch; + + hr = _Recordset_Open(recordset, source, active, adOpenDynamic, adLockPessimistic, 0); + VariantClear(&active); if (FAILED(hr)) { - IUnknown_Release(rowset); _Recordset_Release(recordset); return hr; } - ADORecordsetConstruction_put_Rowset(construct, rowset); - ADORecordsetConstruction_Release(construct); - IUnknown_Release(rowset); - if (records_affected) { V_VT(records_affected) = VT_I4; - V_I4(records_affected) = affected; + _Recordset_get_RecordCount(recordset, &V_I4(records_affected)); } - _Recordset_put_CursorLocation(recordset, connection->location); *record_set = recordset; return hr; diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 600dcb90a97..bb55eaaa3aa 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -26,8 +26,6 @@ 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/recordset.c b/dlls/msado15/recordset.c index d71904193c9..2b32dc6cf94 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1417,6 +1417,48 @@ static HRESULT WINAPI recordset_MoveLast( _Recordset *iface ) return S_OK; } +static HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) +{ + HRESULT hr; + IOpenRowset *openrowset; + ICommandText *command_text; + ICommand *cmd; + IDBCreateCommand *create_command; + + 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)) + return hr; + + hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + IDBCreateCommand_Release(create_command); + if (FAILED(hr)) + return hr; + + hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); + ICommand_Release(cmd); + if (FAILED(hr)) + { + FIXME("Currently only ICommandText interface is support\n"); + return hr; + } + + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, command); + if (FAILED(hr)) + { + ICommandText_Release(command_text); + return hr; + } + + *cmd_text = command_text; + + return S_OK; +} + static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT active_connection, CursorTypeEnum cursor_type, LockTypeEnum lock_type, LONG options ) {

1 0