From: Eric Kohl <eric.kohl@reactos.org>
Date: Fri, 16 Nov 2001 20:25:37 +0000 (+0000)
Subject: Added loading the HAL.
X-Git-Tag: ReactOS-0.0.19~260
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=228ec52af6040e0f4039c3790884511db14b9d12

Added loading the HAL.

svn path=/trunk/; revision=2374
---

diff --git a/freeldr/freeldr/reactos.c b/freeldr/freeldr/reactos.c
index 4341c46790c..286e3afbb52 100644
--- a/freeldr/freeldr/reactos.c
+++ b/freeldr/freeldr/reactos.c
@@ -17,7 +17,6 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-	
 #include "freeldr.h"
 #include "asmcode.h"
 #include "reactos.h"
@@ -131,6 +130,15 @@ void LoadAndBootReactOS(PUCHAR OperatingSystemName)
 		return;
 	}
 
+	/*
+	 * Find the hal image name
+	 */
+	if(!ReadSectionSettingByName(SectionId, "Hal", value, 1024))
+	{
+		MessageBox("HAL image file not specified for selected operating system.");
+		return;
+	}
+
 	DrawBackdrop();
 
 	DrawStatusText(" Loading...");
@@ -146,7 +154,7 @@ void LoadAndBootReactOS(PUCHAR OperatingSystemName)
 	}
 
 	/*
-	 * Parse the ini file and count the kernel and drivers
+	 * Parse the ini file and count the kernel, hal and drivers
 	 */
 	for (i=1; i<=GetNumSectionItems(SectionId); i++)
 	{
@@ -154,7 +162,9 @@ void LoadAndBootReactOS(PUCHAR OperatingSystemName)
 		 * Read the setting and check if it's a driver
 		 */
 		ReadSectionSettingByNumber(SectionId, i, name, 1024, value, 1024);
-		if ((stricmp(name, "Kernel") == 0) || (stricmp(name, "Driver") == 0))
+		if ((stricmp(name, "Kernel") == 0) ||
+		    (stricmp(name, "Hal") == 0) ||
+		    (stricmp(name, "Driver") == 0))
 			nNumDriverFiles++;
 	}
 
@@ -197,6 +207,45 @@ void LoadAndBootReactOS(PUCHAR OperatingSystemName)
 		DrawProgressBar((nNumFilesLoaded * 100) / nNumDriverFiles);
 	}
 
+	/*
+	 * Find the HAL image name
+	 * and try to load the kernel off the disk
+	 */
+	if(ReadSectionSettingByName(SectionId, "Hal", value, 1024))
+	{
+		/*
+		 * Set the name and try to open the PE image
+		 */
+		//strcpy(szFileName, szBootPath);
+		//strcat(szFileName, value);
+		strcpy(szFileName, value);
+
+		FilePointer = OpenFile(szFileName);
+		if (FilePointer == NULL)
+		{
+			strcat(value, " not found.");
+			MessageBox(value);
+			return;
+		}
+
+		/*
+		 * Update the status bar with the current file
+		 */
+		strcpy(name, " Reading ");
+		strcat(name, value);
+		while (strlen(name) < 80)
+			strcat(name, " ");
+		DrawStatusText(name);
+
+		/*
+		 * Load the HAL image
+		 */
+		MultiBootLoadModule(FilePointer, szFileName);
+		
+		nNumFilesLoaded++;
+		DrawProgressBar((nNumFilesLoaded * 100) / nNumDriverFiles);
+	}
+
 	/*
 	 * Parse the ini file and load the kernel and
 	 * load all the drivers specified