Synchronize with trunk's revision r57629.

[reactos.git] / base / setup / usetup / registry.c

diff --git a/base/setup/usetup/registry.c b/base/setup/usetup/registry.c
index a808129..d93e707 100644 (file)
--- a/base/setup/usetup/registry.c
+++ b/base/setup/usetup/registry.c
@@ -306,7 +306,7 @@ do_reg_operation(HANDLE KeyHandle,
 
       if (Type == REG_DWORD)
         {
-          ULONG dw = Str ? wcstol (Str, NULL, 0) : 0;
+          ULONG dw = Str ? wcstoul (Str, NULL, 0) : 0;
 
           DPRINT("setting dword %wZ to %lx\n", ValueName, dw);
 
@@ -398,8 +398,7 @@ CreateNestedKey (PHANDLE KeyHandle,
   UNICODE_STRING LocalKeyName;
   ULONG Disposition;
   NTSTATUS Status;
-  ULONG FullNameLength;
-  ULONG Length;
+  USHORT FullNameLength;
   PWCHAR Ptr;
   HANDLE LocalKeyHandle;
 
@@ -421,7 +420,7 @@ CreateNestedKey (PHANDLE KeyHandle,
   RtlCreateUnicodeString (&LocalKeyName,
                           ObjectAttributes->ObjectName->Buffer);
   LocalObjectAttributes.ObjectName = &LocalKeyName;
-  FullNameLength = LocalKeyName.Length / sizeof(WCHAR);
+  FullNameLength = LocalKeyName.Length;
 
   /* Remove the last part of the key name and try to create the key again. */
   while (Status == STATUS_OBJECT_NAME_NOT_FOUND)
@@ -452,10 +451,9 @@ CreateNestedKey (PHANDLE KeyHandle,
     }
 
   /* Add removed parts of the key name and create them too. */
-  Length = wcslen (LocalKeyName.Buffer);
   while (TRUE)
     {
-      if (Length == FullNameLength)
+      if (LocalKeyName.Length == FullNameLength)
         {
           Status = STATUS_SUCCESS;
           *KeyHandle = LocalKeyHandle;
@@ -463,9 +461,8 @@ CreateNestedKey (PHANDLE KeyHandle,
         }
       NtClose (LocalKeyHandle);
 
-      LocalKeyName.Buffer[Length] = L'\\';
-      Length = wcslen (LocalKeyName.Buffer);
-      LocalKeyName.Length = Length * sizeof(WCHAR);
+      LocalKeyName.Buffer[LocalKeyName.Length / sizeof(WCHAR)] = L'\\';
+      LocalKeyName.Length = wcslen (LocalKeyName.Buffer) * sizeof(WCHAR);
 
       Status = NtCreateKey (&LocalKeyHandle,
                             KEY_ALL_ACCESS,
@@ -646,7 +643,7 @@ ImportRegistryFile(PWSTR Filename,
       DPRINT1("registry_callback() failed\n");
     }
 
-  SetupCloseInfFile (hInf);
+  InfCloseFile (hInf);
 
   return TRUE;
 }