Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 07:56:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SYSSETUP]

Browse source 
- Close opened handles
- Improve code a bit

svn path=/trunk/; revision=54427
This commit is contained in:
Rafal Harabien 2011-11-19 00:24:58 +00:00
parent a31cce0995
commit 2eb96d5afb
1 changed files with 182 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

348
reactos/dll/win32/syssetup/install.c
View file

@ -44,57 +44,64 @@ HINF hSysSetupInf = INVALID_HANDLE_VALUE;
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
static VOID static VOID
DebugPrint(char* fmt,...) FatalError(char *pszFmt,...)
{ {
char buffer[512]; char szBuffer[512];
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, pszFmt);
vsprintf(buffer, fmt, ap); vsprintf(szBuffer, pszFmt, ap);
va_end(ap); va_end(ap);
LogItem(SYSSETUP_SEVERITY_FATAL_ERROR, L"Failed"); LogItem(SYSSETUP_SEVERITY_FATAL_ERROR, L"Failed");
strcat(buffer, "\nRebooting now!"); strcat(szBuffer, "\nRebooting now!");
MessageBoxA(NULL, MessageBoxA(NULL,
buffer, szBuffer,
"ReactOS Setup", "ReactOS Setup",
MB_OK); MB_OK);
} }
static HRESULT
HRESULT CreateShellLink(LPCTSTR linkPath, LPCTSTR cmd, LPCTSTR arg, LPCTSTR dir, LPCTSTR iconPath, int icon_nr, LPCTSTR comment) CreateShellLink(
LPCTSTR pszLinkPath,
LPCTSTR pszCmd,
LPCTSTR pszArg,
LPCTSTR pszDir,
LPCTSTR pszIconPath,
int iIconNr,
LPCTSTR pszComment)
{ {
IShellLink* psl; IShellLink *psl;
IPersistFile* ppf; IPersistFile *ppf;
#ifndef _UNICODE #ifndef _UNICODE
WCHAR buffer[MAX_PATH]; WCHAR wszBuf[MAX_PATH];
#endif /* _UNICODE */ #endif /* _UNICODE */
HRESULT hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLink, (LPVOID*)&psl); HRESULT hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLink, (LPVOID*)&psl);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
hr = psl->lpVtbl->SetPath(psl, cmd); hr = psl->lpVtbl->SetPath(psl, pszCmd);
if (arg) if (pszArg)
{ {
hr = psl->lpVtbl->SetArguments(psl, arg); hr = psl->lpVtbl->SetArguments(psl, pszArg);
} }
if (dir) if (pszDir)
{ {
hr = psl->lpVtbl->SetWorkingDirectory(psl, dir); hr = psl->lpVtbl->SetWorkingDirectory(psl, pszDir);
} }
if (iconPath) if (pszIconPath)
{ {
hr = psl->lpVtbl->SetIconLocation(psl, iconPath, icon_nr); hr = psl->lpVtbl->SetIconLocation(psl, pszIconPath, iIconNr);
} }
if (comment) if (pszComment)
{ {
hr = psl->lpVtbl->SetDescription(psl, comment); hr = psl->lpVtbl->SetDescription(psl, pszComment);
} }
hr = psl->lpVtbl->QueryInterface(psl, &IID_IPersistFile, (LPVOID*)&ppf); hr = psl->lpVtbl->QueryInterface(psl, &IID_IPersistFile, (LPVOID*)&ppf);
@ -102,11 +109,11 @@ HRESULT CreateShellLink(LPCTSTR linkPath, LPCTSTR cmd, LPCTSTR arg, LPCTSTR dir,
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
#ifdef _UNICODE #ifdef _UNICODE
hr = ppf->lpVtbl->Save(ppf, linkPath, TRUE); hr = ppf->lpVtbl->Save(ppf, pszLinkPath, TRUE);
#else /* _UNICODE */ #else /* _UNICODE */
MultiByteToWideChar(CP_ACP, 0, linkPath, -1, buffer, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, pszLinkPath, -1, wszBuf, MAX_PATH);
hr = ppf->lpVtbl->Save(ppf, buffer, TRUE); hr = ppf->lpVtbl->Save(ppf, wszBuf, TRUE);
#endif /* _UNICODE */ #endif /* _UNICODE */
ppf->lpVtbl->Release(ppf); ppf->lpVtbl->Release(ppf);
@ -120,102 +127,106 @@ HRESULT CreateShellLink(LPCTSTR linkPath, LPCTSTR cmd, LPCTSTR arg, LPCTSTR dir,
static BOOL static BOOL
CreateShortcut(int csidl, LPCTSTR folder, UINT nIdName, LPCTSTR command, UINT nIdTitle, BOOL bCheckExistence, INT iIconNr) CreateShortcut(
int csidl,
LPCTSTR pszFolder,
UINT nIdName,
LPCTSTR pszCommand,
UINT nIdTitle,
BOOL bCheckExistence,
INT iIconNr)
{ {
TCHAR path[MAX_PATH]; TCHAR szPath[MAX_PATH];
TCHAR exeName[MAX_PATH]; TCHAR szExeName[MAX_PATH];
TCHAR title[256]; TCHAR szTitle[256];
TCHAR name[256]; TCHAR szName[256];
LPTSTR p = path; LPTSTR Ptr = szPath;
TCHAR szWorkingDir[MAX_PATH]; TCHAR szWorkingDirBuf[MAX_PATH];
LPTSTR lpWorkingDir = NULL; LPTSTR pszWorkingDir = NULL;
LPTSTR lpFilePart; LPTSTR lpFilePart;
DWORD dwLen; DWORD dwLen;
if (ExpandEnvironmentStrings(command, if (ExpandEnvironmentStrings(pszCommand,
path, szPath,
sizeof(path) / sizeof(path[0])) == 0) sizeof(szPath) / sizeof(szPath[0])) == 0)
{ {
_tcscpy(path, _tcscpy(szPath, pszCommand);
command);
} }
if (bCheckExistence) if (bCheckExistence)
{ {
if ((_taccess(path, 0 )) == -1) if ((_taccess(szPath, 0 )) == -1)
/* Expected error, don't return FALSE */ /* Expected error, don't return FALSE */
return TRUE; return TRUE;
} }
dwLen = GetFullPathName(path, dwLen = GetFullPathName(szPath,
sizeof(szWorkingDir) / sizeof(szWorkingDir[0]), sizeof(szWorkingDirBuf) / sizeof(szWorkingDirBuf[0]),
szWorkingDir, szWorkingDirBuf,
&lpFilePart); &lpFilePart);
if (dwLen != 0 && dwLen <= sizeof(szWorkingDir) / sizeof(szWorkingDir[0])) if (dwLen != 0 && dwLen <= sizeof(szWorkingDirBuf) / sizeof(szWorkingDirBuf[0]))
{ {
/* Since those should only be called with (.exe) files, /* Since those should only be called with (.exe) files,
lpFilePart has not to be NULL */ lpFilePart has not to be NULL */
ASSERT(lpFilePart != NULL); ASSERT(lpFilePart != NULL);
/* Save the file name */ /* Save the file name */
_tcscpy(exeName, lpFilePart); _tcscpy(szExeName, lpFilePart);
/* We're only interested in the path. Cut the file name off. /* We're only interested in the path. Cut the file name off.
Also remove the trailing backslash unless the working directory Also remove the trailing backslash unless the working directory
is only going to be a drive, ie. C:\ */ is only going to be a drive, ie. C:\ */
*(lpFilePart--) = _T('\0'); *(lpFilePart--) = _T('\0');
if (!(lpFilePart - szWorkingDir == 2 && szWorkingDir[1] == _T(':') && if (!(lpFilePart - szWorkingDirBuf == 2 && szWorkingDirBuf[1] == _T(':') &&
szWorkingDir[2] == _T('\\'))) szWorkingDirBuf[2] == _T('\\')))
{ {
*lpFilePart = _T('\0'); *lpFilePart = _T('\0');
} }
lpWorkingDir = szWorkingDir; pszWorkingDir = szWorkingDirBuf;
} }
if (!SHGetSpecialFolderPath(0, path, csidl, TRUE)) if (!SHGetSpecialFolderPath(0, szPath, csidl, TRUE))
return FALSE; return FALSE;
if (folder) if (pszFolder)
{ {
p = PathAddBackslash(p); Ptr = PathAddBackslash(Ptr);
_tcscpy(p, folder); _tcscpy(Ptr, pszFolder);
} }
p = PathAddBackslash(p); Ptr = PathAddBackslash(Ptr);
if (!LoadString(hDllInstance, nIdName, name, sizeof(name)/sizeof(name[0]))) if (!LoadString(hDllInstance, nIdName, szName, sizeof(szName)/sizeof(szName[0])))
return FALSE; return FALSE;
_tcscpy(p, name); _tcscpy(Ptr, szName);
if (!LoadString(hDllInstance, nIdTitle, title, sizeof(title)/sizeof(title[0]))) if (!LoadString(hDllInstance, nIdTitle, szTitle, sizeof(szTitle)/sizeof(szTitle[0])))
return FALSE; return FALSE;
// FIXME: we should pass 'command' straight in here, but shell32 doesn't expand it // FIXME: we should pass 'command' straight in here, but shell32 doesn't expand it
return SUCCEEDED(CreateShellLink(path, exeName, _T(""), lpWorkingDir, exeName, iIconNr, title)); return SUCCEEDED(CreateShellLink(szPath, szExeName, _T(""), pszWorkingDir, szExeName, iIconNr, szTitle));
} }
static BOOL static BOOL
CreateShortcutFolder(int csidl, UINT nID, LPTSTR name, int nameLen) CreateShortcutFolder(int csidl, UINT nID, LPTSTR pszName, int cchNameLen)
{ {
TCHAR path[MAX_PATH]; TCHAR szPath[MAX_PATH];
LPTSTR p; LPTSTR p;
if (!SHGetSpecialFolderPath(0, path, csidl, TRUE)) if (!SHGetSpecialFolderPath(0, szPath, csidl, TRUE))
return FALSE; return FALSE;
if (!LoadString(hDllInstance, nID, name, nameLen)) if (!LoadString(hDllInstance, nID, pszName, cchNameLen))
return FALSE; return FALSE;
p = PathAddBackslash(path); p = PathAddBackslash(szPath);
_tcscpy(p, name); _tcscpy(p, pszName);
return CreateDirectory(path, NULL) || GetLastError()==ERROR_ALREADY_EXISTS; return CreateDirectory(szPath, NULL) || GetLastError()==ERROR_ALREADY_EXISTS;
} }
static BOOL static BOOL
CreateRandomSid( CreateRandomSid(
OUT PSID *Sid) OUT PSID *Sid)
@ -243,7 +254,6 @@ CreateRandomSid(
return NT_SUCCESS(Status); return NT_SUCCESS(Status);
} }
static VOID static VOID
AppendRidToSid( AppendRidToSid(
OUT PSID *Dst, OUT PSID *Dst,
@ -279,7 +289,6 @@ AppendRidToSid(
Dst); Dst);
} }
static VOID static VOID
CreateTempDir( CreateTempDir(
IN LPCWSTR VarName) IN LPCWSTR VarName)
@ -293,9 +302,9 @@ CreateTempDir(
L"SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment", L"SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment",
0, 0,
KEY_QUERY_VALUE, KEY_QUERY_VALUE,
&hKey)) &hKey) != ERROR_SUCCESS)
{ {
DebugPrint("Error: %lu\n", GetLastError()); FatalError("Error: %lu\n", GetLastError());
return; return;
} }
@ -306,11 +315,10 @@ CreateTempDir(
NULL, NULL,
NULL, NULL,
(LPBYTE)szBuffer, (LPBYTE)szBuffer,
&dwLength)) &dwLength) != ERROR_SUCCESS)
{ {
DebugPrint("Error: %lu\n", GetLastError()); FatalError("Error: %lu\n", GetLastError());
RegCloseKey(hKey); goto cleanup;
return;
} }
/* Expand it */ /* Expand it */
@ -318,9 +326,8 @@ CreateTempDir(
szTempDir, szTempDir,
MAX_PATH)) MAX_PATH))
{ {
DebugPrint("Error: %lu\n", GetLastError()); FatalError("Error: %lu\n", GetLastError());
RegCloseKey(hKey); goto cleanup;
return;
} }
/* Create profiles directory */ /* Create profiles directory */
@ -328,22 +335,21 @@ CreateTempDir(
{ {
if (GetLastError() != ERROR_ALREADY_EXISTS) if (GetLastError() != ERROR_ALREADY_EXISTS)
{ {
DebugPrint("Error: %lu\n", GetLastError()); FatalError("Error: %lu\n", GetLastError());
RegCloseKey(hKey); goto cleanup;
return;
} }
} }
cleanup:
RegCloseKey(hKey); RegCloseKey(hKey);
} }
static BOOL
BOOL
InstallSysSetupInfDevices(VOID) InstallSysSetupInfDevices(VOID)
{ {
INFCONTEXT InfContext; INFCONTEXT InfContext;
WCHAR LineBuffer[256]; WCHAR szLineBuffer[256];
DWORD LineLength; DWORD dwLineLength;
if (!SetupFindFirstLineW(hSysSetupInf, if (!SetupFindFirstLineW(hSysSetupInf,
L"DeviceInfsToInstall", L"DeviceInfsToInstall",
@ -357,14 +363,14 @@ InstallSysSetupInfDevices(VOID)
{ {
if (!SetupGetStringFieldW(&InfContext, if (!SetupGetStringFieldW(&InfContext,
0, 0,
LineBuffer, szLineBuffer,
sizeof(LineBuffer)/sizeof(LineBuffer[0]), sizeof(szLineBuffer)/sizeof(szLineBuffer[0]),
&LineLength)) &dwLineLength))
{ {
return FALSE; return FALSE;
} }
if (!SetupDiInstallClassW(NULL, LineBuffer, DI_QUIETINSTALL, NULL)) if (!SetupDiInstallClassW(NULL, szLineBuffer, DI_QUIETINSTALL, NULL))
{ {
return FALSE; return FALSE;
} }
@ -373,12 +379,13 @@ InstallSysSetupInfDevices(VOID)
return TRUE; return TRUE;
} }
BOOL
static BOOL
InstallSysSetupInfComponents(VOID) InstallSysSetupInfComponents(VOID)
{ {
INFCONTEXT InfContext; INFCONTEXT InfContext;
WCHAR NameBuffer[256]; WCHAR szNameBuffer[256];
WCHAR SectionBuffer[256]; WCHAR szSectionBuffer[256];
HINF hComponentInf = INVALID_HANDLE_VALUE; HINF hComponentInf = INVALID_HANDLE_VALUE;
if (!SetupFindFirstLineW(hSysSetupInf, if (!SetupFindFirstLineW(hSysSetupInf,
@ -394,40 +401,40 @@ InstallSysSetupInfComponents(VOID)
{ {
if (!SetupGetStringFieldW(&InfContext, if (!SetupGetStringFieldW(&InfContext,
1, // Get the component name 1, // Get the component name
NameBuffer, szNameBuffer,
sizeof(NameBuffer)/sizeof(NameBuffer[0]), sizeof(szNameBuffer)/sizeof(szNameBuffer[0]),
NULL)) NULL))
{ {
DebugPrint("Error while trying to get component name \n"); FatalError("Error while trying to get component name \n");
return FALSE; return FALSE;
} }
if (!SetupGetStringFieldW(&InfContext, if (!SetupGetStringFieldW(&InfContext,
2, // Get the component install section 2, // Get the component install section
SectionBuffer, szSectionBuffer,
sizeof(SectionBuffer)/sizeof(SectionBuffer[0]), sizeof(szSectionBuffer)/sizeof(szSectionBuffer[0]),
NULL)) NULL))
{ {
DebugPrint("Error while trying to get component install section \n"); FatalError("Error while trying to get component install section \n");
return FALSE; return FALSE;
} }
DPRINT("Trying to execute install section '%S' from '%S' \n", SectionBuffer , NameBuffer); DPRINT("Trying to execute install section '%S' from '%S' \n", szSectionBuffer, szNameBuffer);
hComponentInf = SetupOpenInfFileW(NameBuffer, hComponentInf = SetupOpenInfFileW(szNameBuffer,
NULL, NULL,
INF_STYLE_WIN4, INF_STYLE_WIN4,
NULL); NULL);
if (hComponentInf == INVALID_HANDLE_VALUE) if (hComponentInf == INVALID_HANDLE_VALUE)
{ {
DebugPrint("SetupOpenInfFileW() failed to open '%S' (Error: %lu)\n", NameBuffer ,GetLastError()); FatalError("SetupOpenInfFileW() failed to open '%S' (Error: %lu)\n", szNameBuffer, GetLastError());
return FALSE; return FALSE;
} }
if (!SetupInstallFromInfSectionW(NULL, if (!SetupInstallFromInfSectionW(NULL,
hComponentInf, hComponentInf,
SectionBuffer, szSectionBuffer,
SPINST_ALL, SPINST_ALL,
NULL, NULL,
NULL, NULL,
@ -437,7 +444,7 @@ InstallSysSetupInfComponents(VOID)
NULL, NULL,
NULL)) NULL))
{ {
DebugPrint("Error while trying to install : %S (Error: %lu)\n", NameBuffer, GetLastError()); FatalError("Error while trying to install : %S (Error: %lu)\n", szNameBuffer, GetLastError());
SetupCloseInfFile(hComponentInf); SetupCloseInfFile(hComponentInf);
return FALSE; return FALSE;
} }
@ -455,7 +462,7 @@ EnableUserModePnpManager(VOID)
{ {
SC_HANDLE hSCManager = NULL; SC_HANDLE hSCManager = NULL;
SC_HANDLE hService = NULL; SC_HANDLE hService = NULL;
BOOL ret = FALSE; BOOL bRet = FALSE;
hSCManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE); hSCManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE);
if (hSCManager == NULL) if (hSCManager == NULL)
@ -474,36 +481,35 @@ EnableUserModePnpManager(VOID)
goto cleanup; goto cleanup;
} }
ret = ChangeServiceConfigW(hService, bRet = ChangeServiceConfigW(hService,
SERVICE_NO_CHANGE, SERVICE_NO_CHANGE,
SERVICE_AUTO_START, SERVICE_AUTO_START,
SERVICE_NO_CHANGE, SERVICE_NO_CHANGE,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL);
if (!ret) if (!bRet)
{ {
DPRINT1("Unable to change the service configuration\n"); DPRINT1("Unable to change the service configuration\n");
goto cleanup; goto cleanup;
} }
ret = StartServiceW(hService, 0, NULL); bRet = StartServiceW(hService, 0, NULL);
if ((!ret) && (GetLastError() != ERROR_SERVICE_ALREADY_RUNNING)) if (!bRet && (GetLastError() != ERROR_SERVICE_ALREADY_RUNNING))
{ {
DPRINT1("Unable to start service\n"); DPRINT1("Unable to start service\n");
goto cleanup; goto cleanup;
} }
ret = TRUE; bRet = TRUE;
cleanup: cleanup:
if (hSCManager != NULL) if (hSCManager != NULL)
CloseServiceHandle(hSCManager); CloseServiceHandle(hSCManager);
if (hService != NULL) if (hService != NULL)
CloseServiceHandle(hService); CloseServiceHandle(hService);
return ret; return bRet;
} }
static INT_PTR CALLBACK static INT_PTR CALLBACK
StatusMessageWindowProc( StatusMessageWindowProc(
IN HWND hwndDlg, IN HWND hwndDlg,
@ -528,7 +534,6 @@ StatusMessageWindowProc(
return FALSE; return FALSE;
} }
static DWORD WINAPI static DWORD WINAPI
ShowStatusMessageThread( ShowStatusMessageThread(
IN LPVOID lpParameter) IN LPVOID lpParameter)
@ -568,7 +573,7 @@ ReadRegSzKey(
LONG rc; LONG rc;
DWORD dwType; DWORD dwType;
DWORD cbData = 0; DWORD cbData = 0;
LPWSTR Value; LPWSTR pwszValue;
if (!pValue) if (!pValue)
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
@ -579,29 +584,29 @@ ReadRegSzKey(
return rc; return rc;
if (dwType != REG_SZ) if (dwType != REG_SZ)
return ERROR_FILE_NOT_FOUND; return ERROR_FILE_NOT_FOUND;
Value = HeapAlloc(GetProcessHeap(), 0, cbData + sizeof(WCHAR)); pwszValue = HeapAlloc(GetProcessHeap(), 0, cbData + sizeof(WCHAR));
if (!Value) if (!pwszValue)
return ERROR_NOT_ENOUGH_MEMORY; return ERROR_NOT_ENOUGH_MEMORY;
rc = RegQueryValueExW(hKey, pszKey, NULL, NULL, (LPBYTE)Value, &cbData); rc = RegQueryValueExW(hKey, pszKey, NULL, NULL, (LPBYTE)pwszValue, &cbData);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
{ {
HeapFree(GetProcessHeap(), 0, Value); HeapFree(GetProcessHeap(), 0, pwszValue);
return rc; return rc;
} }
/* NULL-terminate the string */ /* NULL-terminate the string */
Value[cbData / sizeof(WCHAR)] = '\0'; pwszValue[cbData / sizeof(WCHAR)] = '\0';
*pValue = Value; *pValue = pwszValue;
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
static BOOL static BOOL
IsConsoleBoot(VOID) IsConsoleBoot(VOID)
{ {
HKEY ControlKey = NULL; HKEY hControlKey = NULL;
LPWSTR SystemStartOptions = NULL; LPWSTR pwszSystemStartOptions = NULL;
LPWSTR CurrentOption, NextOption; /* Pointers into SystemStartOptions */ LPWSTR pwszCurrentOption, pwszNextOption; /* Pointers into SystemStartOptions */
BOOL ConsoleBoot = FALSE; BOOL bConsoleBoot = FALSE;
LONG rc; LONG rc;
rc = RegOpenKeyExW( rc = RegOpenKeyExW(
@ -609,33 +614,36 @@ IsConsoleBoot(VOID)
L"SYSTEM\\CurrentControlSet\\Control", L"SYSTEM\\CurrentControlSet\\Control",
0, 0,
KEY_QUERY_VALUE, KEY_QUERY_VALUE,
&ControlKey); &hControlKey);
if (rc != ERROR_SUCCESS)
goto cleanup;
rc = ReadRegSzKey(ControlKey, L"SystemStartOptions", &SystemStartOptions); rc = ReadRegSzKey(hControlKey, L"SystemStartOptions", &pwszSystemStartOptions);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
goto cleanup; goto cleanup;
/* Check for CMDCONS in SystemStartOptions */ /* Check for CMDCONS in SystemStartOptions */
CurrentOption = SystemStartOptions; pwszCurrentOption = pwszSystemStartOptions;
while (CurrentOption) while (pwszCurrentOption)
{ {
NextOption = wcschr(CurrentOption, L' '); pwszNextOption = wcschr(pwszCurrentOption, L' ');
if (NextOption) if (pwszNextOption)
*NextOption = L'\0'; *pwszNextOption = L'\0';
if (wcsicmp(CurrentOption, L"CONSOLE") == 0) if (wcsicmp(pwszCurrentOption, L"CONSOLE") == 0)
{ {
DPRINT("Found %S. Switching to console boot\n", CurrentOption); DPRINT("Found %S. Switching to console boot\n", pwszCurrentOption);
ConsoleBoot = TRUE; bConsoleBoot = TRUE;
goto cleanup; goto cleanup;
} }
CurrentOption = NextOption ? NextOption + 1 : NULL; pwszCurrentOption = pwszNextOption ? pwszNextOption + 1 : NULL;
} }
cleanup: cleanup:
if (ControlKey != NULL) if (hControlKey != NULL)
RegCloseKey(ControlKey); RegCloseKey(hControlKey);
HeapFree(GetProcessHeap(), 0, SystemStartOptions); if (pwszSystemStartOptions)
return ConsoleBoot; HeapFree(GetProcessHeap(), 0, pwszSystemStartOptions);
return bConsoleBoot;
} }
static BOOL static BOOL
@ -650,53 +658,58 @@ CommonInstall(VOID)
NULL); NULL);
if (hSysSetupInf == INVALID_HANDLE_VALUE) if (hSysSetupInf == INVALID_HANDLE_VALUE)
{ {
DebugPrint("SetupOpenInfFileW() failed to open 'syssetup.inf' (Error: %lu)\n", GetLastError()); FatalError("SetupOpenInfFileW() failed to open 'syssetup.inf' (Error: %lu)\n", GetLastError());
return FALSE; return FALSE;
} }
if (!InstallSysSetupInfDevices()) if (!InstallSysSetupInfDevices())
{ {
DebugPrint("InstallSysSetupInfDevices() failed!\n"); FatalError("InstallSysSetupInfDevices() failed!\n");
SetupCloseInfFile(hSysSetupInf); goto error;
return FALSE;
} }
if(!InstallSysSetupInfComponents()) if(!InstallSysSetupInfComponents())
{ {
DebugPrint("InstallSysSetupInfComponents() failed!\n"); FatalError("InstallSysSetupInfComponents() failed!\n");
SetupCloseInfFile(hSysSetupInf); goto error;
return FALSE;
} }
if (!IsConsoleBoot()) if (!IsConsoleBoot())
{ {
CreateThread( HANDLE hThread;
hThread = CreateThread(
NULL, NULL,
0, 0,
ShowStatusMessageThread, ShowStatusMessageThread,
(LPVOID)&hWnd, (LPVOID)&hWnd,
0, 0,
NULL); NULL);
if (hThread)
CloseHandle(hThread);
} }
if (!EnableUserModePnpManager()) if (!EnableUserModePnpManager())
{ {
DebugPrint("EnableUserModePnpManager() failed!\n"); FatalError("EnableUserModePnpManager() failed!\n");
SetupCloseInfFile(hSysSetupInf); goto error;
EndDialog(hWnd, 0);
return FALSE;
} }
if (CMP_WaitNoPendingInstallEvents(INFINITE) != WAIT_OBJECT_0) if (CMP_WaitNoPendingInstallEvents(INFINITE) != WAIT_OBJECT_0)
{ {
DebugPrint("CMP_WaitNoPendingInstallEvents() failed!\n"); FatalError("CMP_WaitNoPendingInstallEvents() failed!\n");
SetupCloseInfFile(hSysSetupInf); goto error;
EndDialog(hWnd, 0);
return FALSE;
} }
EndDialog(hWnd, 0); EndDialog(hWnd, 0);
return TRUE; return TRUE;
error:
if (hWnd)
EndDialog(hWnd, 0);
SetupCloseInfFile(hSysSetupInf);
return FALSE;
} }
DWORD WINAPI DWORD WINAPI
@ -704,10 +717,10 @@ InstallLiveCD(IN HINSTANCE hInstance)
{ {
STARTUPINFOW StartupInfo; STARTUPINFOW StartupInfo;
PROCESS_INFORMATION ProcessInformation; PROCESS_INFORMATION ProcessInformation;
BOOL res; BOOL bRes;
if (!CommonInstall()) if (!CommonInstall())
goto cleanup; goto error;
SetupCloseInfFile(hSysSetupInf); SetupCloseInfFile(hSysSetupInf);
/* Run the shell */ /* Run the shell */
@ -718,7 +731,7 @@ InstallLiveCD(IN HINSTANCE hInstance)
StartupInfo.dwFlags = 0; StartupInfo.dwFlags = 0;
StartupInfo.cbReserved2 = 0; StartupInfo.cbReserved2 = 0;
StartupInfo.lpReserved2 = 0; StartupInfo.lpReserved2 = 0;
res = CreateProcessW( bRes = CreateProcessW(
L"userinit.exe", L"userinit.exe",
NULL, NULL,
NULL, NULL,
@ -729,12 +742,15 @@ InstallLiveCD(IN HINSTANCE hInstance)
NULL, NULL,
&StartupInfo, &StartupInfo,
&ProcessInformation); &ProcessInformation);
if (!res) if (!bRes)
goto cleanup; goto error;
CloseHandle(ProcessInformation.hThread);
CloseHandle(ProcessInformation.hProcess);
return 0; return 0;
cleanup: error:
MessageBoxW( MessageBoxW(
NULL, NULL,
L"Failed to load LiveCD! You can shutdown your computer, or press ENTER to reboot.", L"Failed to load LiveCD! You can shutdown your computer, or press ENTER to reboot.",
@ -855,34 +871,34 @@ InstallReactOS(HINSTANCE hInstance)
if (!InitializeProfiles()) if (!InitializeProfiles())
{ {
DebugPrint("InitializeProfiles() failed"); FatalError("InitializeProfiles() failed");
return 0; return 0;
} }
if (!CreateShortcuts()) if (!CreateShortcuts())
{ {
DebugPrint("InitializeProfiles() failed"); FatalError("InitializeProfiles() failed");
return 0; return 0;
} }
/* Initialize the Security Account Manager (SAM) */ /* Initialize the Security Account Manager (SAM) */
if (!SamInitializeSAM()) if (!SamInitializeSAM())
{ {
DebugPrint("SamInitializeSAM() failed!"); FatalError("SamInitializeSAM() failed!");
return 0; return 0;
} }
/* Create the semi-random Domain-SID */ /* Create the semi-random Domain-SID */
if (!CreateRandomSid(&DomainSid)) if (!CreateRandomSid(&DomainSid))
{ {
DebugPrint("Domain-SID creation failed!"); FatalError("Domain-SID creation failed!");
return 0; return 0;
} }
/* Set the Domain SID (aka Computer SID) */ /* Set the Domain SID (aka Computer SID) */
if (!SamSetDomainSid(DomainSid)) if (!SamSetDomainSid(DomainSid))
{ {
DebugPrint("SamSetDomainSid() failed!"); FatalError("SamSetDomainSid() failed!");
RtlFreeSid(DomainSid); RtlFreeSid(DomainSid);
return 0; return 0;
} }
@ -939,7 +955,7 @@ InstallReactOS(HINSTANCE hInstance)
LastError = GetLastError(); LastError = GetLastError();
if (LastError != ERROR_USER_EXISTS) if (LastError != ERROR_USER_EXISTS)
{ {
DebugPrint("SamCreateUser() failed!"); FatalError("SamCreateUser() failed!");
RtlFreeSid(AdminSid); RtlFreeSid(AdminSid);
RtlFreeSid(DomainSid); RtlFreeSid(DomainSid);
return 0; return 0;
@ -962,7 +978,7 @@ InstallReactOS(HINSTANCE hInstance)
ret = LogonUserW(L"Administrator", L"", L"", LOGON32_LOGON_NETWORK, LOGON32_PROVIDER_DEFAULT, &hToken); ret = LogonUserW(L"Administrator", L"", L"", LOGON32_LOGON_NETWORK, LOGON32_PROVIDER_DEFAULT, &hToken);
if (!ret) if (!ret)
{ {
DebugPrint("LogonUserW() failed!"); FatalError("LogonUserW() failed!");
return 0; return 0;
} }
ZeroMemory(&ProfileInfo, sizeof(PROFILEINFOW)); ZeroMemory(&ProfileInfo, sizeof(PROFILEINFOW));
@ -988,7 +1004,7 @@ InstallReactOS(HINSTANCE hInstance)
/* Get shutdown privilege */ /* Get shutdown privilege */
if (! OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) if (! OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token))
{ {
DebugPrint("OpenProcessToken() failed!"); FatalError("OpenProcessToken() failed!");
return 0; return 0;
} }
if (!LookupPrivilegeValue( if (!LookupPrivilegeValue(
@ -996,7 +1012,7 @@ InstallReactOS(HINSTANCE hInstance)
SE_SHUTDOWN_NAME, SE_SHUTDOWN_NAME,
&privs.Privileges[0].Luid)) &privs.Privileges[0].Luid))
{ {
DebugPrint("LookupPrivilegeValue() failed!"); FatalError("LookupPrivilegeValue() failed!");
return 0; return 0;
} }
privs.PrivilegeCount = 1; privs.PrivilegeCount = 1;
@ -1009,7 +1025,7 @@ InstallReactOS(HINSTANCE hInstance)
(PTOKEN_PRIVILEGES)NULL, (PTOKEN_PRIVILEGES)NULL,
NULL) == 0) NULL) == 0)
{ {
DebugPrint("AdjustTokenPrivileges() failed!"); FatalError("AdjustTokenPrivileges() failed!");
return 0; return 0;
} }