[ros-diffs] [janderwald] 28929: - store setting BootCDRegtestActive - only show dbgprint when required

Author: janderwald
Date: Fri Sep  7 22:11:55 2007
New Revision: 28929

URL: http://svn.reactos.org/svn/reactos?rev=28929&view=rev
Log:
- store setting BootCDRegtestActive
- only show dbgprint when required

Modified:
    trunk/reactos/dll/win32/syssetup/globals.h
    trunk/reactos/dll/win32/syssetup/install.c
    trunk/reactos/dll/win32/syssetup/wizard.c

Modified: trunk/reactos/dll/win32/syssetup/globals.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/globals.h (original)
+++ trunk/reactos/dll/win32/syssetup/globals.h Fri Sep  7 22:11:55 2007
@@ -47,6 +47,7 @@
   TCHAR AdminPassword[15];				/* max. 14 characters */
   BOOL  UnattendSetup;
   BOOL  DisableVmwInst;
+  DWORD BootCDRegtestActive;
 
   SYSTEMTIME SystemTime;
   PTIMEZONE_ENTRY TimeZoneListHead;
@@ -59,6 +60,7 @@
 
 extern HINSTANCE hDllInstance;
 extern HINF hSysSetupInf;
+extern SETUPDATA SetupData;
 
 /* wizard.c */
 VOID InstallWizard (VOID);

Modified: trunk/reactos/dll/win32/syssetup/install.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/install.c (original)
+++ trunk/reactos/dll/win32/syssetup/install.c Fri Sep  7 22:11:55 2007
@@ -810,9 +810,12 @@
         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;

Modified: trunk/reactos/dll/win32/syssetup/wizard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/wizard.c (original)
+++ trunk/reactos/dll/win32/syssetup/wizard.c Fri Sep  7 22:11:55 2007
@@ -57,7 +57,7 @@
 
 /* GLOBALS ******************************************************************/
 
-static SETUPDATA SetupData;
+SETUPDATA SetupData;
 
 
 /* FUNCTIONS ****************************************************************/
@@ -2007,7 +2007,6 @@
   TCHAR szValue[MAX_PATH];
   DWORD LineLength;
   HKEY hKey;
-  DWORD BootCDRegtestActive = 0;
 
   if (!SetupFindFirstLine(hUnattendedInf,
               _T("Unattend"),
@@ -2111,7 +2110,7 @@
       }
     else if (!_tcscmp(szName, _T("BootCDRegTestActive")))
       {
-        BootCDRegtestActive = _ttoi(szValue);
+        SetupData.BootCDRegtestActive = _ttoi(szValue);
       }
 
   }
@@ -2164,8 +2163,7 @@
       }while(SetupFindNextLine(&InfContext, &InfContext));
    }
 
-  DPRINT("BootCDRegtestActive %d\n", BootCDRegtestActive);
-  if (BootCDRegtestActive)
+  if (SetupData.BootCDRegtestActive)
     {
       char szPath[MAX_PATH];
       FILE * file;