Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-14 00:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set setup type to 0 before the end of 2nd stage in syssetup instead of winlogon

Browse source 
svn path=/trunk/; revision=28194
This commit is contained in:
Hervé Poussineau 2007-08-06 14:41:05 +00:00
parent e753659117
commit c88c4b4ad1
2 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
reactos/base/system/winlogon/setup.c
View file

@ -53,38 +53,6 @@ GetSetupType(VOID)
}
static BOOL
SetSetupType (DWORD dwSetupType)
{
DWORD dwError;
HKEY hKey;
dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
L"SYSTEM\\Setup", //TEXT("SYSTEM\\Setup"),
0,
KEY_SET_VALUE,
&hKey);
if (dwError != ERROR_SUCCESS)
{
return FALSE;
}
dwError = RegSetValueExW (hKey,
L"SetupType", //TEXT("SetupType"),
0,
REG_DWORD,
(LPBYTE)&dwSetupType,
sizeof(DWORD));
RegCloseKey (hKey);
if (dwError != ERROR_SUCCESS)
{
return FALSE;
}
return TRUE;
}
static DWORD WINAPI
RunSetupThreadProc (IN LPVOID lpParameter)
{
@ -173,11 +141,6 @@ RunSetupThreadProc (IN LPVOID lpParameter)
CloseHandle (ProcessInformation.hThread);
CloseHandle (ProcessInformation.hProcess);
if (dwExitCode == 0)
{
SetSetupType (0);
}
TRACE ("RunSetup() done.\n");
return TRUE;

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

@ -623,6 +623,35 @@ CreateShortcuts(VOID)
return TRUE;
}
static BOOL
SetSetupType(DWORD dwSetupType)
{
DWORD dwError;
HKEY hKey;
dwError = RegOpenKeyExW(
HKEY_LOCAL_MACHINE,
L"SYSTEM\\Setup",
0,
KEY_SET_VALUE,
&hKey);
if (dwError != ERROR_SUCCESS)
return FALSE;
dwError = RegSetValueExW(
hKey,
L"SetupType",
0,
REG_DWORD,
(LPBYTE)&dwSetupType,
sizeof(DWORD));
RegCloseKey(hKey);
if (dwError != ERROR_SUCCESS)
return FALSE;
return TRUE;
}
DWORD WINAPI
InstallReactOS(HINSTANCE hInstance)
{
@ -721,6 +750,7 @@ InstallReactOS(HINSTANCE hInstance)
InstallWizard();
SetupCloseInfFile(hSysSetupInf);
SetSetupType(0);
LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS done");
TerminateSetupActionLog();