From a09c8c41ee05af1888ce6394b53fd0aa701faba8 Mon Sep 17 00:00:00 2001 From: winesync Date: Sun, 16 Jan 2022 20:09:36 +0100 Subject: [PATCH] [WINESYNC] reg/tests: Rename reg.c to add.c. Signed-off-by: Hugh McMaster Signed-off-by: Alexandre Julliard wine commit id 3c2db20f66806074b047b0b3c76aa86ad79e3175 by Hugh McMaster --- modules/rostests/winetests/reg/{reg.c => add.c} | 14 +++++++++++++- modules/rostests/winetests/reg/reg_test.h | 2 +- sdk/tools/winesync/reg.cfg | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) rename modules/rostests/winetests/reg/{reg.c => add.c} (99%) diff --git a/modules/rostests/winetests/reg/reg.c b/modules/rostests/winetests/reg/add.c similarity index 99% rename from modules/rostests/winetests/reg/reg.c rename to modules/rostests/winetests/reg/add.c index d1af7831f4d..bdfd429367c 100644 --- a/modules/rostests/winetests/reg/reg.c +++ b/modules/rostests/winetests/reg/add.c @@ -353,8 +353,10 @@ static void test_add(void) 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\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin2 /f /d x01", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin3 /f /d 01x", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); @@ -397,13 +399,17 @@ static void test_add(void) 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); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword1 /t REG_DWORD /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 dword2 /t REG_DWORD /d zzz /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword3 /t REG_DWORD /d deadbeef /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword4 /t REG_DWORD /d 123xyz /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -431,6 +437,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword9 /f /d -1", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + 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\n", r); @@ -503,14 +510,19 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi5 /s \"#randomgibberish\" /d \"three#little#strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi6 /s \"\\0\" /d \"three\\0little\\0strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi7 /s \"\" /d \"three#little#strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi8 /s \"#\" /d \"##\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi9 /s \"#\" /d \"two##strings\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi10 /s \"#\" /d \"#a\" /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); @@ -613,7 +625,7 @@ static void test_add(void) delete_tree(HKEY_CURRENT_USER, KEY_BASE); } -START_TEST(reg) +START_TEST(add) { DWORD r; diff --git a/modules/rostests/winetests/reg/reg_test.h b/modules/rostests/winetests/reg/reg_test.h index 73457f0ee37..2f4bdf36437 100644 --- a/modules/rostests/winetests/reg/reg_test.h +++ b/modules/rostests/winetests/reg/reg_test.h @@ -30,7 +30,7 @@ #define REG_EXIT_SUCCESS 0 #define REG_EXIT_FAILURE 1 -/* Helper functions */ +/* add.c */ #define run_reg_exe(c,r) run_reg_exe_(__LINE__,c,r) BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc); diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index f648b132853..df31712b669 100644 --- a/sdk/tools/winesync/reg.cfg +++ b/sdk/tools/winesync/reg.cfg @@ -4,4 +4,4 @@ directories: files: programs/reg/resource.h: base/applications/cmdutils/reg/resource.h tags: - wine: cc4cc7086faf087590d22b9b58b6c45386e181c8 + wine: 3c2db20f66806074b047b0b3c76aa86ad79e3175