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

- store setting BootCDRegtestActive

Browse source 
- only show dbgprint when required

svn path=/trunk/; revision=28929
This commit is contained in:
Johannes Anderwald 2007-09-07 18:11:55 +00:00
parent 93818e712d
commit f7db2e960b
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/syssetup/globals.h
View file

@ -47,6 +47,7 @@ typedef struct _SETUPDATA
TCHAR AdminPassword[15]; /* max. 14 characters */ TCHAR AdminPassword[15]; /* max. 14 characters */
BOOL UnattendSetup; BOOL UnattendSetup;
BOOL DisableVmwInst; BOOL DisableVmwInst;
DWORD BootCDRegtestActive;
SYSTEMTIME SystemTime; SYSTEMTIME SystemTime;
PTIMEZONE_ENTRY TimeZoneListHead; PTIMEZONE_ENTRY TimeZoneListHead;
@ -59,6 +60,7 @@ typedef struct _SETUPDATA
extern HINSTANCE hDllInstance; extern HINSTANCE hDllInstance;
extern HINF hSysSetupInf; extern HINF hSysSetupInf;
extern SETUPDATA SetupData;
/* wizard.c */ /* wizard.c */
VOID InstallWizard (VOID); VOID InstallWizard (VOID);

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

@ -810,9 +810,12 @@ InstallReactOS(HINSTANCE hInstance)
return 0; return 0;
} }
/// THE FOLLOWING DPRINT IS FOR THE SYSTEM REGRESSION TOOL if (SetupData.BootCDRegtestActive)
/// DO NOT REMOVE!!! {
DbgPrint("SYSREG_CHECKPOINT:SYSSETUP_COMPLETE\n"); /// THE FOLLOWING DPRINT IS FOR THE SYSTEM REGRESSION TOOL
/// DO NOT REMOVE!!!
DbgPrint("SYSREG_CHECKPOINT:SYSSETUP_COMPLETE\n");
}
ExitWindowsEx(EWX_REBOOT, 0); ExitWindowsEx(EWX_REBOOT, 0);
return 0; return 0;

8
reactos/dll/win32/syssetup/wizard.c
View file

@ -57,7 +57,7 @@ typedef struct _REGISTRATIONDATA
/* GLOBALS ******************************************************************/ /* GLOBALS ******************************************************************/
static SETUPDATA SetupData; SETUPDATA SetupData;
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
@ -2007,7 +2007,6 @@ ProcessUnattendInf(HINF hUnattendedInf)
TCHAR szValue[MAX_PATH]; TCHAR szValue[MAX_PATH];
DWORD LineLength; DWORD LineLength;
HKEY hKey; HKEY hKey;
DWORD BootCDRegtestActive = 0;
if (!SetupFindFirstLine(hUnattendedInf, if (!SetupFindFirstLine(hUnattendedInf,
_T("Unattend"), _T("Unattend"),
@ -2111,7 +2110,7 @@ ProcessUnattendInf(HINF hUnattendedInf)
} }
else if (!_tcscmp(szName, _T("BootCDRegTestActive"))) else if (!_tcscmp(szName, _T("BootCDRegTestActive")))
{ {
BootCDRegtestActive = _ttoi(szValue); SetupData.BootCDRegtestActive = _ttoi(szValue);
} }
} }
@ -2164,8 +2163,7 @@ ProcessUnattendInf(HINF hUnattendedInf)
}while(SetupFindNextLine(&InfContext, &InfContext)); }while(SetupFindNextLine(&InfContext, &InfContext));
} }
DPRINT("BootCDRegtestActive %d\n", BootCDRegtestActive); if (SetupData.BootCDRegtestActive)
if (BootCDRegtestActive)
{ {
char szPath[MAX_PATH]; char szPath[MAX_PATH];
FILE * file; FILE * file;