Hugh McMaster : reg: Fail if duplicate command-line switches are passed to 'reg query'.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2c84ec7ee04ab03883907691f115e01a7165b6e9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2c84ec7ee04ab03883907691f115e01a7165b6e9

Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date:   Fri Mar 26 23:30:05 2021 +1100

reg: Fail if duplicate command-line switches are passed to 'reg query'.

Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/reg/query.c       | 2 ++
 programs/reg/tests/query.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/programs/reg/query.c b/programs/reg/query.c
index 7ae99fad6d5..c8277cd7114 100644
--- a/programs/reg/query.c
+++ b/programs/reg/query.c
@@ -344,6 +344,7 @@ int reg_query(int argc, WCHAR *argvW[])
 
             if (!lstrcmpiW(str, L"ve"))
             {
+                if (value_empty) goto invalid;
                 value_empty = TRUE;
                 continue;
             }
@@ -357,6 +358,7 @@ int reg_query(int argc, WCHAR *argvW[])
                     goto invalid;
                 break;
             case 's':
+                if (recurse) goto invalid;
                 recurse = TRUE;
                 break;
             default:
diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c
index fcd43a4b195..e2b438f8c92 100644
--- a/programs/reg/tests/query.c
+++ b/programs/reg/tests/query.c
@@ -117,7 +117,7 @@ static void test_query(void)
        "got exit code %d, expected 0\n", r);
 
     run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r);
-    todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+    ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
 
     /* Clean-up, then query */
     delete_key(key, "subkey");