[ros-diffs] [reactos] 79/158: [WINESYNC] reg/tests: Only try querying an invalid key once.

[winesync]

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

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

    [WINESYNC] reg/tests: Only try querying an invalid key once.
    
    Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 9752dfeea82c48e2230bacbf9db9564d5562de02 by Hugh McMaster
<hugh.mcmaster(a)outlook.com>
---
 modules/rostests/winetests/reg/query.c | 17 ++++++-----------
 sdk/tools/winesync/reg.cfg             |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/modules/rostests/winetests/reg/query.c
b/modules/rostests/winetests/reg/query.c
index c475d288fd8..3c87f76742e 100644
--- a/modules/rostests/winetests/reg/query.c
+++ b/modules/rostests/winetests/reg/query.c
@@ -167,6 +167,10 @@ static void test_query(void)
     run_reg_exe("reg query -H", &r);
     ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
 
+    /* Key not present */
+    run_reg_exe("reg query HKCU\\" KEY_BASE, &r);
+    ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
     /* Create a test key */
     add_key(HKEY_CURRENT_USER, KEY_BASE, &key);
     add_value(key, "Test1", REG_SZ, "Hello, World", 13);
@@ -245,6 +249,7 @@ static void test_query(void)
     add_value(key, NULL, REG_SZ, "Empty", 6);
     add_value(subkey, NULL, REG_SZ, "Empty", 6);
     close_key(subkey);
+    close_key(key);
 
     run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /ve", &r);
     ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
@@ -253,17 +258,7 @@ static void test_query(void)
     ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */,
        "got exit code %d, expected 0\n", r);
 
-    /* Clean-up, then query */
-    delete_key(key, "subkey");
-    close_key(key);
-
-    run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r);
-    ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
-    delete_key(HKEY_CURRENT_USER, KEY_BASE);
-
-    run_reg_exe("reg query HKCU\\" KEY_BASE, &r);
-    ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+    delete_tree(HKEY_CURRENT_USER, KEY_BASE);
 }
 
 START_TEST(query)
diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg
index 0ce4b38b11f..064c1fd6178 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: e9412a8ae020fe614d96d20f20355d53593048cc
+  wine: 9752dfeea82c48e2230bacbf9db9564d5562de02