[ros-diffs] [reactos] 71/158: [WINESYNC] reg/tests: Reorder failing 'query' tests.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b12d7980378f91954ed2e…

commit b12d7980378f91954ed2edd6155065f3c3e49021
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sun Jan 16 21:08:22 2022 +0100
Commit:     Thomas Csovcsity <thc.fr13nd(a)gmail.com>
CommitDate: Sun Jun 19 13:06:32 2022 +0200

    [WINESYNC] reg/tests: Reorder failing 'query' tests.
    
    Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 3d772fe408970f6a1aad02321f21706408dd92e9 by Hugh McMaster
<hugh.mcmaster(a)outlook.com>
---
 modules/rostests/winetests/reg/query.c | 34 +++++++++++++++++-----------------
 sdk/tools/winesync/reg.cfg             |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/rostests/winetests/reg/query.c
b/modules/rostests/winetests/reg/query.c
index e2b438f8c92..3ae79d05524 100644
--- a/modules/rostests/winetests/reg/query.c
+++ b/modules/rostests/winetests/reg/query.c
@@ -47,24 +47,33 @@ static void test_query(void)
 
     /* Create a test key */
     add_key(HKEY_CURRENT_USER, KEY_BASE, &key);
+    add_value(key, "Test", REG_SZ, hello, sizeof(hello));
+    add_value(key, "Wine", REG_DWORD, &dword1, sizeof(dword1));
+
+    run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r);
+    ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+    run_reg_exe("reg query HKCU\\" KEY_BASE " /v Missing", &r);
+    ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+    run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /v Wine",
&r);
+    ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+    run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /ve", &r);
+    ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+    run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r);
+    ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
 
     run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r);
     ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),
        "got exit code %d, expected 0\n", r);
 
-    add_value(key, "Test", REG_SZ, hello, sizeof(hello));
-    add_value(key, "Wine", REG_DWORD, &dword1, sizeof(dword1));
     add_value(key, NULL, REG_SZ, empty1, sizeof(empty1));
 
     run_reg_exe("reg query HKCU\\" KEY_BASE, &r);
     ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
 
-    run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r);
-    ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
-    run_reg_exe("reg query HKCU\\" KEY_BASE " /v Missing", &r);
-    ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
     run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test", &r);
     ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
 
@@ -74,12 +83,6 @@ static void test_query(void)
     run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r);
     ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
 
-    run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /v Wine",
&r);
-    ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
-    run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /ve", &r);
-    ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
     /* Create a test subkey */
     add_key(key, "Subkey", &subkey);
     add_value(subkey, "Test", REG_SZ, world, sizeof(world));
@@ -116,9 +119,6 @@ static void test_query(void)
     ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */,
        "got exit code %d, expected 0\n", r);
 
-    run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r);
-    ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
     /* Clean-up, then query */
     delete_key(key, "subkey");
     close_key(key);
diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg
index 6a3b21ef417..a688299b625 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: 2b900e1c38d9bed0901ea036488e896e6df0cbe9
+  wine: 3d772fe408970f6a1aad02321f21706408dd92e9