Hugh McMaster : regedit: Close the registry key handle in the read function instead of the parser.

[Alexandre Julliard]

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

Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date:   Tue Oct 25 10:21:32 2016 +0000

regedit: Close the registry key handle in the read function instead of the parser.

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

---

 programs/regedit/regproc.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index 7f1475e..5e4c2d2 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -584,15 +584,6 @@ static void processSetValue(WCHAR* line, BOOL is_unicode)
  */
 static void processRegEntry(WCHAR* stdInput, BOOL isUnicode)
 {
-    /*
-     * We encountered the end of the file, make sure we
-     * close the opened key and exit
-     */
-    if (stdInput == NULL) {
-        closeKey();
-        return;
-    }
-
     if      ( stdInput[0] == '[')      /* We are reading a new key */
     {
         WCHAR* keyEnd;
@@ -735,7 +726,7 @@ static void processRegLinesA(FILE *in, char* first_chars)
             line = s_eol + 1;
         }
     }
-    processRegEntry(NULL, FALSE);
+    closeKey();
 
     HeapFree(GetProcessHeap(), 0, buf);
 }
@@ -851,7 +842,7 @@ static void processRegLinesW(FILE *in)
         }
     }
 
-    processRegEntry(NULL, TRUE);
+    closeKey();
 
     HeapFree(GetProcessHeap(), 0, buf);
 }