[ros-diffs] [janderwald] 24605: - implement FormatPartition settings - fix a few bugs in the unattend setup code

Author: janderwald
Date: Sun Oct 22 22:40:37 2006
New Revision: 24605

URL: http://svn.reactos.org/svn/reactos?rev=24605&view=rev
Log:
- implement FormatPartition settings
- fix a few bugs in the unattend setup code

Modified:
    trunk/reactos/base/setup/usetup/usetup.c

Modified: trunk/reactos/base/setup/usetup/usetup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.c…
==============================================================================
--- trunk/reactos/base/setup/usetup/usetup.c (original)
+++ trunk/reactos/base/setup/usetup/usetup.c Sun Oct 22 22:40:37 2006
@@ -77,6 +77,7 @@
 LONG UnattendDestinationDiskNumber;
 LONG UnattendDestinationPartitionNumber;
 LONG UnattendMBRInstallType = -1;
+LONG UnattendFormatPartition = 0;
 WCHAR UnattendInstallationDirectory[MAX_PATH];
 
 /* LOCALS *******************************************************************/
@@ -501,7 +502,7 @@
       SetupCloseInfFile(&UnattendInf);
       return;
     }
-  if (!SetupGetIntField(&Context, 0, &IntValue))
+  if (!SetupGetIntField(&Context, 1, &IntValue))
     {
       DPRINT("SetupGetIntField() failed for key
'DestinationDiskNumber'\n");
       SetupCloseInfFile(&UnattendInf);
@@ -516,7 +517,7 @@
       SetupCloseInfFile(UnattendInf);
       return;
     }
-  if (!SetupGetIntField(&Context, 0, &IntValue))
+  if (!SetupGetIntField(&Context, 1, &IntValue))
     {
       DPRINT("SetupGetIntField() failed for key
'DestinationPartitionNumber'\n");
       SetupCloseInfFile(UnattendInf);
@@ -544,19 +545,21 @@
   IsUnattendedSetup = TRUE;
 
   /* Search for 'MBRInstallType' in the 'Unattend' section */
-  if (!SetupFindFirstLineW(UnattendInf, L"Unattend",
L"MBRInstallType", &Context))
-    {
-      DPRINT("SetupFindFirstLine() failed for key
'MBRInstallType'\n");
-      SetupCloseInfFile(UnattendInf);
-      return;
-    }
-  if (!SetupGetIntField(&Context, 0, &IntValue))
-    {
-      DPRINT("SetupGetIntField() failed for key 'MBRInstallType'\n");
-      SetupCloseInfFile(UnattendInf);
-      return;
-    }
-  UnattendMBRInstallType = IntValue;
+  if (SetupFindFirstLineW(UnattendInf, L"Unattend",
L"MBRInstallType", &Context))
+    {
+      if (SetupGetIntField(&Context, 1, &IntValue))
+        {
+          UnattendMBRInstallType = IntValue;
+        }
+    }
+  /* Search for 'FormatPartition' in the 'Unattend' section */
+  if (!SetupFindFirstLineW(UnattendInf, L"Unattend",
L"FormatPartition", &Context))
+    {
+      if (SetupGetIntField(&Context, 1, &IntValue))
+        {
+          UnattendFormatPartition = IntValue;
+        }
+    }
 
   SetupCloseInfFile(UnattendInf);
 
@@ -2133,6 +2136,10 @@
 
   if (IsUnattendedSetup)
     {
+      if (UnattendFormatPartition)
+        {
+          return FORMAT_PARTITION_PAGE;
+        }
       return(CHECK_FILE_SYSTEM_PAGE);
     }
 
@@ -2216,7 +2223,10 @@
 
   while(TRUE)
     {
-      CONSOLE_ConInKey(Ir);
+      if (!IsUnattendedSetup)
+        {
+          CONSOLE_ConInKey(Ir);
+        }
 
       if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
 	  (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */
@@ -2227,7 +2237,7 @@
 	    }
 	  break;
 	}
-      else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */
+      else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN || IsUnattendedSetup)
/* ENTER */
 	{
 	  CONSOLE_SetStatusText ("   Please wait ...");