Hugh McMaster : regedit: Export value names from the export_data() function.

[Alexandre Julliard]

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

Author: Hugh McMaster 
Date:   Wed Jul 19 05:29:22 2017 +0000

regedit: Export value names from the export_data() function.

Signed-off-by: Hugh McMaster 
Signed-off-by: Alexandre Julliard

---

programs/regedit/regproc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index d3a1f6d..57be5da 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -1311,9 +1311,11 @@ static void export_newline(FILE *fp, BOOL unicode)
     REGPROC_write_line(fp, newline, unicode);
 }

-static void export_data(FILE *fp, DWORD type, size_t line_len, void *data, size_t size, BOOL unicode)
+static void export_data(FILE *fp, WCHAR *value_name, DWORD value_len, DWORD type,
+                        void *data, size_t size, BOOL unicode)
 {
     WCHAR *buf = NULL;
+    size_t line_len = export_value_name(fp, value_name, value_len, unicode);

switch (type)
     {
@@ -1385,8 +1387,7 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode)
         rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size);
         if (rc == ERROR_SUCCESS)
         {
-            size_t line_len = export_value_name(fp, value_name, value_len, unicode);
-            export_data(fp, type, line_len, data, data_size, unicode);
+            export_data(fp, value_name, value_len, type, data, data_size, unicode);
             i++;
         }
         else if (rc == ERROR_MORE_DATA)