Hugh McMaster : reg: Do not allow combinations of /v, /ve or /va in the ' delete' function.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c59e3eae3b0e3440a0b9d1774b11040899fc5db9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c59e3eae3b0e3440a0b9d1774b11040899fc5db9

Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date:   Wed Feb 10 22:23:14 2016 +1100

reg: Do not allow combinations of /v, /ve or /va in the 'delete' function.

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

---

 programs/reg/reg.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index 04256bc..322fa90 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -395,13 +395,7 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
         return 1;
     }
 
-    if (value_name && value_empty)
-    {
-        output_message(STRING_INVALID_CMDLINE);
-        return 1;
-    }
-
-    if (value_empty && value_all)
+    if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all))
     {
         output_message(STRING_INVALID_CMDLINE);
         return 1;