Hugh McMaster : reg: Handle data from REG_NONE.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Feb 15 09:41:50 CST 2016


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

Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date:   Mon Feb 15 23:15:31 2016 +1100

reg: Handle data from REG_NONE.

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

---

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

diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index e4289f3..bc0b261 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -228,6 +228,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r
 
     switch (reg_type)
     {
+        case REG_NONE:
         case REG_SZ:
         {
             *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR);
diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c
index 4534f7d..74284c7 100644
--- a/programs/reg/tests/reg.c
+++ b/programs/reg/tests/reg.c
@@ -149,7 +149,7 @@ static void test_add(void)
     /* REG_NONE */
     run_reg_exe("reg add HKCU\\" KEY_BASE " /v none0 /d deadbeef /t REG_NONE /f", &r);
     ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r);
-    verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, TODO_REG_SIZE);
+    verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, 0);
 
     /* REG_SZ */
     run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r);




More information about the wine-cvs mailing list