[ros-diffs] [reactos] 07/158: [WINESYNC] reg/tests: Always overwrite export test file during 'export' sequence.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70f06b31a910751fce31d8...

commit 70f06b31a910751fce31d838ada3a4ac345a10f5
Author:     winesync [e-mail]
AuthorDate: Sun Jan 16 14:51:45 2022 +0100
Commit:     Thomas Csovcsity [e-mail]
CommitDate: Sun Jun 19 13:06:27 2022 +0200

[WINESYNC] reg/tests: Always overwrite export test file during 'export' sequence.

Signed-off-by: Hugh McMaster [e-mail]
    Signed-off-by: Alexandre Julliard [e-mail]

wine commit id b51b969a011c3efbddbbf29a312e49d0b5877faf by Hugh McMaster [e-mail]
---
 modules/rostests/winetests/reg/reg.c | 16 ++++++++--------
 sdk/tools/winesync/reg.cfg           |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/rostests/winetests/reg/reg.c b/modules/rostests/winetests/reg/reg.c
index 429de8164e6..2afa5eb01fa 100644
--- a/modules/rostests/winetests/reg/reg.c
+++ b/modules/rostests/winetests/reg/reg.c
@@ -4511,7 +4511,7 @@ static void test_export(void)
     add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword));
     add_value(hkey, "String", REG_SZ, "Your text here...", 18);

-    run_reg_exe("reg export HKEY_CURRENT_USER\" KEY_BASE " file.reg", &r);
+    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", simple_test, 0), "compare_export() failed\n");

@@ -4549,7 +4549,7 @@ static void test_export(void)

RegCloseKey(hkey);

-    run_reg_exe("reg export HKEY_CURRENT_USER\" KEY_BASE " file.reg", &r);
+    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");

@@ -4563,7 +4563,7 @@ static void test_export(void)
     add_key(hkey, "Subkey1", &subkey);
     RegCloseKey(subkey);

-    run_reg_exe("reg export HKEY_CURRENT_USER\" KEY_BASE " file.reg", &r);
+    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");

@@ -4578,7 +4578,7 @@ static void test_export(void)

RegCloseKey(hkey);

-    run_reg_exe("reg export HKEY_CURRENT_USER\" KEY_BASE " file.reg", &r);
+    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");

@@ -4596,7 +4596,7 @@ static void test_export(void)
     add_value(hkey, "Wine1h", 0xabcd, NULL, 0);
     RegCloseKey(hkey);

-    run_reg_exe("reg export HKEY_CURRENT_USER\" KEY_BASE " file.reg", &r);
+    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");

@@ -4614,7 +4614,7 @@ static void test_export(void)
     verify_reg(hkey, "Wine2c", REG_DWORD, NULL, 0, 0);
     RegCloseKey(hkey);

-    run_reg_exe("reg export HKEY_CURRENT_USER\" KEY_BASE " file.reg", &r);
+    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");

@@ -4633,7 +4633,7 @@ static void test_export(void)
     verify_reg(hkey, "Wine3c", REG_DWORD, &dword, sizeof(dword), 0);
     RegCloseKey(hkey);

-    run_reg_exe("reg export HKEY_CURRENT_USER\" KEY_BASE " file.reg", &r);
+    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");

@@ -4671,7 +4671,7 @@ static void test_export(void)
     verify_reg(hkey, "Wine4h", REG_SZ, "abc\0def", 8, 0);
     RegCloseKey(hkey);

-    run_reg_exe("reg export HKEY_CURRENT_USER\" KEY_BASE " file.reg", &r);
+    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");

diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg
index 24654675142..e1dfdaf54ed 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: 597a12420be2bee4e69b9400a075ae4393863573
+  wine: b51b969a011c3efbddbbf29a312e49d0b5877faf