- store setting BootCDRegtestActive

- only show dbgprint when required

svn path=/trunk/; revision=28929

reactos/dll/win32/syssetup/globals.h

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

reactos/dll/win32/syssetup/install.c

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

reactos/dll/win32/syssetup/wizard.c

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