[PATCH 2/2] reg: Fail if REG_DWORD_BIG_ENDIAN is passed with no data argument

Hugh McMaster hugh.mcmaster at outlook.com
Thu Mar 3 19:59:28 CST 2016


Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 programs/reg/reg.c       | 2 +-
 programs/reg/tests/reg.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index 80bac24..164981d 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -404,7 +404,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
             output_message(STRING_UNSUPPORTED_TYPE, type);
             return 1;
         }
-        if (reg_type == REG_DWORD && !data)
+        if ((reg_type == REG_DWORD || reg_type == REG_DWORD_BIG_ENDIAN) && !data)
         {
              RegCloseKey(subkey);
              output_message(STRING_INVALID_CMDLINE);
diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c
index 2e2dd9b..4089367 100644
--- a/programs/reg/tests/reg.c
+++ b/programs/reg/tests/reg.c
@@ -351,12 +351,10 @@ static void test_add(void)
     ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r);
 
     run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE3 /t REG_DWORD_BIG_ENDIAN /f", &r);
-    todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */),
-        "got exit code %u\n", r);
+    ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r);
 
     run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_DWORD_BIG_ENDIAN /f", &r);
-    todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */),
-        "got exit code %u\n", r);
+    ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r);
 
     /* REG_MULTI_SZ */
     run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r);
-- 
1.9.1




More information about the wine-patches mailing list