[reactos] 147/158: [WINESYNC] reg/tests: Split 'import' syntax tests into a separate function.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7beb1390e2fed089087632...

commit 7beb1390e2fed089087632fe927e7f27a0a59e91
Author:     winesync [e-mail]
AuthorDate: Mon Jan 17 18:47:37 2022 +0100
Commit:     Thomas Csovcsity [e-mail]
CommitDate: Sun Jun 19 13:06:38 2022 +0200

[WINESYNC] reg/tests: Split 'import' syntax tests into a separate function.

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

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

diff --git a/modules/rostests/winetests/reg/import.c b/modules/rostests/winetests/reg/import.c
index ace45cf5984..598319628dc 100644
--- a/modules/rostests/winetests/reg/import.c
+++ b/modules/rostests/winetests/reg/import.c
@@ -93,15 +93,9 @@ BOOL import_reg(const char *file, unsigned line, const char *contents, BOOL unic

/* Unit tests */

-static void test_import(void)
+static void test_command_syntax(void)
 {
-    DWORD r, dword = 0x123, type, size;
-    char buffer[24];
-    HKEY hkey, subkey = NULL;
-    LONG err;
-    BYTE hex[8];
-
-    delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0);
+    DWORD r;

run_reg_exe("reg import", &r);
     ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
@@ -120,6 +114,17 @@ static void test_import(void)

run_reg_exe("reg import a.reg b.reg", &r);
     ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+}
+
+static void test_import(void)
+{
+    DWORD r, dword = 0x123, type, size;
+    char buffer[24];
+    HKEY hkey, subkey = NULL;
+    LONG err;
+    BYTE hex[8];
+
+    delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0);

/* Test file contents */
     test_import_str("regedit\n", &r);
@@ -3602,6 +3607,7 @@ START_TEST(import)
         return;
     }

+    test_command_syntax();
     test_import();
     test_unicode_import();
     test_import_with_whitespace();
diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg
index 2bf8febe542..29deebe4a07 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: 8eef4a873513cca9ffea61fb225fa8a9c8ac784d
+  wine: e3d14e66f71193faeb532c28b5b5565d5ea9b12f