X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=base%2Fsetup%2Fusetup%2Fsettings.c;h=ffc20ac286a44d99e95333ac858bc993555bb62a;hp=ef2e936a5b1f3d71ae23e53d118783829be15be4;hb=6024f1698832607ad866acb57da2fbb448d497c3;hpb=5f2d67cb359d16ef3713e96975e0416c07b00dd8

diff --git a/base/setup/usetup/settings.c b/base/setup/usetup/settings.c
index ef2e936a5b1..ffc20ac286a 100644
--- a/base/setup/usetup/settings.c
+++ b/base/setup/usetup/settings.c
@@ -683,15 +683,13 @@ ProcessLocaleRegistry(PGENERIC_LIST List)
                             REG_SZ,
                             (PVOID)(LanguageId + 4),
                             8 * sizeof(PWCHAR));
+    NtClose(KeyHandle);
     if (!NT_SUCCESS(Status))
     {
         DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status);
-        NtClose(KeyHandle);
         return FALSE;
     }
 
-    NtClose(KeyHandle);
-
     return TRUE;
 }
 
@@ -989,11 +987,11 @@ SetGeoID(PWCHAR Id)
                                    0,
                                    REG_SZ,
                                    (PVOID)Id,
-                                   (wcslen(Id) * sizeof(WCHAR)));
+                                   (wcslen(Id) + 1) * sizeof(WCHAR));
+    NtClose(KeyHandle);
     if (!NT_SUCCESS(Status))
     {
          DPRINT1("NtSetValueKey() failed (Status = %lx)\n", Status);
-         NtClose(KeyHandle);
          return FALSE;
     }