[MSIEXEC] Sync with Wine Staging 2.16. CORE-13762

[reactos.git] / base / system / winlogon / setup.c

diff --git a/base/system/winlogon/setup.c b/base/system/winlogon/setup.c
index 6927550..7cec968 100644 (file)
--- a/base/system/winlogon/setup.c
+++ b/base/system/winlogon/setup.c
@@ -10,8 +10,6 @@
 
 #include "winlogon.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(winlogon);
-
 /* FUNCTIONS ****************************************************************/
 
 DWORD
@@ -56,7 +54,8 @@ GetSetupType(VOID)
 static
 DWORD
 WINAPI
-RunSetupThreadProc(IN LPVOID lpParameter)
+RunSetupThreadProc(
+    IN LPVOID lpParameter)
 {
     PROCESS_INFORMATION ProcessInformation;
     STARTUPINFOW StartupInfo;
@@ -81,7 +80,7 @@ RunSetupThreadProc(IN LPVOID lpParameter)
         return FALSE;
 
     /* Read key */
-    dwSize = (sizeof(Shell) / sizeof(Shell[0])) - 1;
+    dwSize = sizeof(Shell);
     dwError = RegQueryValueExW(hKey,
                                L"CmdLine",
                                NULL,
@@ -156,6 +155,8 @@ RunSetup(VOID)
                            NULL,
                            0,
                            NULL);
+    if (hThread != NULL)
+        CloseHandle(hThread);
 
     return hThread != NULL;
 }