mirror of
https://github.com/reactos/reactos.git
synced 2024-10-02 07:26:47 +00:00
Load NLS files.
Add basic support for installing ReactOS from floppy disks. svn path=/trunk/; revision=4725
This commit is contained in:
Eric Kohl
parent
031f55682e
commit
e76752c103
|
|
@ -147,6 +147,7 @@ LoadSymbolFile(PCHAR szSystemRoot,
|
|||
return (TRUE);
|
||||
}
|
||||
|
||||
|
||||
static BOOL
|
||||
LoadDriver(PCHAR szFileName, int nPos)
|
||||
{
|
||||
|
|
@ -185,7 +186,6 @@ LoadDriver(PCHAR szFileName, int nPos)
|
|||
}
|
||||
|
||||
|
||||
#if 0
|
||||
static BOOL
|
||||
LoadNlsFile(PCHAR szFileName, PCHAR szModuleName)
|
||||
{
|
||||
|
|
@ -220,7 +220,6 @@ LoadNlsFile(PCHAR szFileName, PCHAR szModuleName)
|
|||
|
||||
return(TRUE);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
static VOID
|
||||
|
|
@ -327,7 +326,7 @@ LoadBootDrivers(PCHAR szSystemRoot, int nPos)
|
|||
nPos += 5;
|
||||
|
||||
LoadDriver(ImagePath, nPos);
|
||||
LoadSymbolFile(szSystemRoot, ImagePath, nPos);
|
||||
LoadSymbolFile(szSystemRoot, ImagePath, nPos);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -341,7 +340,7 @@ LoadBootDrivers(PCHAR szSystemRoot, int nPos)
|
|||
}
|
||||
}
|
||||
|
||||
#if 0
|
||||
|
||||
static BOOL
|
||||
LoadNlsFiles(PCHAR szSystemRoot)
|
||||
{
|
||||
|
|
@ -376,7 +375,8 @@ LoadNlsFiles(PCHAR szSystemRoot)
|
|||
strcpy(szFileName, szSystemRoot);
|
||||
strcat(szFileName, "system32\\");
|
||||
strcat(szFileName, szNameBuffer);
|
||||
if (!LoadNlsFile(szFileName, "ANSI.NLS"))
|
||||
DbgPrint((DPRINT_REACTOS, "ANSI file: %s\n", szFileName));
|
||||
if (!LoadNlsFile(szFileName, "ansi.nls"))
|
||||
return(FALSE);
|
||||
|
||||
|
||||
|
|
@ -395,7 +395,8 @@ LoadNlsFiles(PCHAR szSystemRoot)
|
|||
strcpy(szFileName, szSystemRoot);
|
||||
strcat(szFileName, "system32\\");
|
||||
strcat(szFileName, szNameBuffer);
|
||||
if (!LoadNlsFile(szFileName, "OEM.NLS"))
|
||||
DbgPrint((DPRINT_REACTOS, "Oem file: %s\n", szFileName));
|
||||
if (!LoadNlsFile(szFileName, "oem.nls"))
|
||||
return(FALSE);
|
||||
|
||||
|
||||
|
|
@ -422,12 +423,12 @@ LoadNlsFiles(PCHAR szSystemRoot)
|
|||
strcpy(szFileName, szSystemRoot);
|
||||
strcat(szFileName, "system32\\");
|
||||
strcat(szFileName, szNameBuffer);
|
||||
if (!LoadNlsFile(szFileName, "UNICASE.NLS"))
|
||||
DbgPrint((DPRINT_REACTOS, "Casemap file: %s\n", szFileName));
|
||||
if (!LoadNlsFile(szFileName, "casemap.nls"))
|
||||
return(FALSE);
|
||||
|
||||
return(TRUE);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
void
|
||||
|
|
@ -729,32 +730,34 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
|
|||
/*
|
||||
* Load NLS files
|
||||
*/
|
||||
#if 0
|
||||
if (!LoadNlsFiles(szBootPath))
|
||||
{
|
||||
UiMessageBox("Failed to load NLS files\n");
|
||||
UiMessageBox("Could not load the NLS files!\n");
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
LoadSymbolFile(szBootPath, szKernelName, 25);
|
||||
LoadSymbolFile(szBootPath, szHalName, 25);
|
||||
|
||||
UiDrawProgressBarCenter(25, 100, "Loading ReactOS...");
|
||||
|
||||
/*
|
||||
* Load symbol files
|
||||
*/
|
||||
LoadSymbolFile(szBootPath, szKernelName, 30);
|
||||
LoadSymbolFile(szBootPath, szHalName, 30);
|
||||
|
||||
UiDrawProgressBarCenter(30, 100, "Loading ReactOS...");
|
||||
|
||||
/*
|
||||
* Load boot drivers
|
||||
*/
|
||||
LoadBootDrivers(szBootPath, 25);
|
||||
LoadBootDrivers(szBootPath, 30);
|
||||
|
||||
|
||||
#if 0
|
||||
/*
|
||||
* Clear the screen and redraw the backdrop and status bar
|
||||
*/
|
||||
UiDrawBackdrop();
|
||||
UiDrawStatusText("Press any key to boot");
|
||||
|
||||
#if 0
|
||||
/*
|
||||
* Wait for user
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -27,23 +27,55 @@
|
|||
#include <fs.h>
|
||||
#include <multiboot.h>
|
||||
#include <mm.h>
|
||||
#include <ui.h>
|
||||
|
||||
#include "registry.h"
|
||||
|
||||
|
||||
//#define USE_UI
|
||||
|
||||
|
||||
static BOOL
|
||||
LoadKernel(PCHAR szFileName)
|
||||
LoadKernel(PCHAR szSourcePath, PCHAR szFileName)
|
||||
{
|
||||
CHAR szFullName[256];
|
||||
#ifdef USE_UI
|
||||
CHAR szBuffer[80];
|
||||
#endif
|
||||
PFILE FilePointer;
|
||||
PCHAR szShortName;
|
||||
|
||||
if (szSourcePath[0] != '\\')
|
||||
{
|
||||
strcpy(szFullName, "\\");
|
||||
strcat(szFullName, szSourcePath);
|
||||
}
|
||||
else
|
||||
{
|
||||
strcpy(szFullName, szSourcePath);
|
||||
}
|
||||
|
||||
if (szFullName[strlen(szFullName)] != '\\')
|
||||
{
|
||||
strcat(szFullName, "\\");
|
||||
}
|
||||
|
||||
if (szFileName[0] != '\\')
|
||||
{
|
||||
strcat(szFullName, szFileName);
|
||||
}
|
||||
else
|
||||
{
|
||||
strcat(szFullName, szFileName + 1);
|
||||
}
|
||||
|
||||
szShortName = strrchr(szFileName, '\\');
|
||||
if (szShortName == NULL)
|
||||
szShortName = szFileName;
|
||||
else
|
||||
szShortName = szShortName + 1;
|
||||
|
||||
FilePointer = FsOpenFile(szFileName);
|
||||
FilePointer = FsOpenFile(szFullName);
|
||||
if (FilePointer == NULL)
|
||||
{
|
||||
printf("Could not find %s\n", szShortName);
|
||||
|
|
@ -53,7 +85,12 @@ LoadKernel(PCHAR szFileName)
|
|||
/*
|
||||
* Update the status bar with the current file
|
||||
*/
|
||||
#ifdef USE_UI
|
||||
sprintf(szBuffer, "Reading %s", szShortName);
|
||||
UiDrawStatusText(szBuffer);
|
||||
#else
|
||||
printf("Reading %s\n", szShortName);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Load the kernel
|
||||
|
|
@ -65,11 +102,39 @@ LoadKernel(PCHAR szFileName)
|
|||
|
||||
|
||||
static BOOL
|
||||
LoadDriver(PCHAR szFileName)
|
||||
LoadDriver(PCHAR szSourcePath, PCHAR szFileName)
|
||||
{
|
||||
CHAR szFullName[256];
|
||||
#ifdef USE_UI
|
||||
CHAR szBuffer[80];
|
||||
#endif
|
||||
PFILE FilePointer;
|
||||
PCHAR szShortName;
|
||||
|
||||
if (szSourcePath[0] != '\\')
|
||||
{
|
||||
strcpy(szFullName, "\\");
|
||||
strcat(szFullName, szSourcePath);
|
||||
}
|
||||
else
|
||||
{
|
||||
strcpy(szFullName, szSourcePath);
|
||||
}
|
||||
|
||||
if (szFullName[strlen(szFullName)] != '\\')
|
||||
{
|
||||
strcat(szFullName, "\\");
|
||||
}
|
||||
|
||||
if (szFileName[0] != '\\')
|
||||
{
|
||||
strcat(szFullName, szFileName);
|
||||
}
|
||||
else
|
||||
{
|
||||
strcat(szFullName, szFileName + 1);
|
||||
}
|
||||
|
||||
szShortName = strrchr(szFileName, '\\');
|
||||
if (szShortName == NULL)
|
||||
szShortName = szFileName;
|
||||
|
|
@ -77,7 +142,7 @@ LoadDriver(PCHAR szFileName)
|
|||
szShortName = szShortName + 1;
|
||||
|
||||
|
||||
FilePointer = FsOpenFile(szFileName);
|
||||
FilePointer = FsOpenFile(szFullName);
|
||||
if (FilePointer == NULL)
|
||||
{
|
||||
printf("Could not find %s\n", szFileName);
|
||||
|
|
@ -87,7 +152,12 @@ LoadDriver(PCHAR szFileName)
|
|||
/*
|
||||
* Update the status bar with the current file
|
||||
*/
|
||||
#ifdef USE_UI
|
||||
sprintf(szBuffer, "Reading %s", szShortName);
|
||||
UiDrawStatusText(szBuffer);
|
||||
#else
|
||||
printf("Reading %s\n", szShortName);
|
||||
#endif
|
||||
|
||||
/* Load the driver */
|
||||
MultiBootLoadModule(FilePointer, szFileName, NULL);
|
||||
|
|
@ -96,10 +166,77 @@ LoadDriver(PCHAR szFileName)
|
|||
}
|
||||
|
||||
|
||||
static BOOL
|
||||
LoadNlsFile(PCHAR szSourcePath, PCHAR szFileName, PCHAR szModuleName)
|
||||
{
|
||||
CHAR szFullName[256];
|
||||
#ifdef USE_UI
|
||||
CHAR szBuffer[80];
|
||||
#endif
|
||||
PFILE FilePointer;
|
||||
PCHAR szShortName;
|
||||
|
||||
if (szSourcePath[0] != '\\')
|
||||
{
|
||||
strcpy(szFullName, "\\");
|
||||
strcat(szFullName, szSourcePath);
|
||||
}
|
||||
else
|
||||
{
|
||||
strcpy(szFullName, szSourcePath);
|
||||
}
|
||||
|
||||
if (szFullName[strlen(szFullName)] != '\\')
|
||||
{
|
||||
strcat(szFullName, "\\");
|
||||
}
|
||||
|
||||
if (szFileName[0] != '\\')
|
||||
{
|
||||
strcat(szFullName, szFileName);
|
||||
}
|
||||
else
|
||||
{
|
||||
strcat(szFullName, szFileName + 1);
|
||||
}
|
||||
|
||||
szShortName = strrchr(szFileName, '\\');
|
||||
if (szShortName == NULL)
|
||||
szShortName = szFileName;
|
||||
else
|
||||
szShortName = szShortName + 1;
|
||||
|
||||
|
||||
FilePointer = FsOpenFile(szFullName);
|
||||
if (FilePointer == NULL)
|
||||
{
|
||||
printf("Could not find %s\n", szFileName);
|
||||
return(FALSE);
|
||||
}
|
||||
|
||||
/*
|
||||
* Update the status bar with the current file
|
||||
*/
|
||||
#ifdef USE_UI
|
||||
sprintf(szBuffer, "Reading %s", szShortName);
|
||||
UiDrawStatusText(szBuffer);
|
||||
#else
|
||||
printf("Reading %s\n", szShortName);
|
||||
#endif
|
||||
|
||||
/* Load the driver */
|
||||
MultiBootLoadModule(FilePointer, szModuleName, NULL);
|
||||
|
||||
return(TRUE);
|
||||
}
|
||||
|
||||
|
||||
VOID RunLoader(VOID)
|
||||
{
|
||||
PVOID Base;
|
||||
U32 Size;
|
||||
char *SourcePath;
|
||||
char *LoadOptions;
|
||||
|
||||
/* Setup multiboot information structure */
|
||||
mb_info.flags = MB_INFO_FLAG_MEM_SIZE | MB_INFO_FLAG_BOOT_DEVICE | MB_INFO_FLAG_COMMAND_LINE | MB_INFO_FLAG_MODULES;
|
||||
|
|
@ -137,37 +274,72 @@ VOID RunLoader(VOID)
|
|||
getch();
|
||||
#endif
|
||||
|
||||
#ifdef USE_UI
|
||||
UiInitialize();
|
||||
UiDrawStatusText("");
|
||||
#endif
|
||||
|
||||
/* Initialize registry */
|
||||
RegInitializeRegistry();
|
||||
|
||||
/* Detect hardware */
|
||||
#ifdef USE_UI
|
||||
UiDrawStatusText("Detecting hardware...");
|
||||
#else
|
||||
printf("Detecting hardware...\n\n");
|
||||
#endif
|
||||
DetectHardware();
|
||||
#ifdef USE_UI
|
||||
UiDrawStatusText("");
|
||||
#endif
|
||||
|
||||
/* set boot drive and partition */
|
||||
((char *)(&mb_info.boot_device))[0] = (char)BootDrive;
|
||||
((char *)(&mb_info.boot_device))[1] = (char)BootPartition;
|
||||
|
||||
/* Copy ARC path into kernel command line */
|
||||
|
||||
/* Set load options */
|
||||
// LoadOptions = "/DEBUGPORT=COM1";
|
||||
LoadOptions = "/DEBUGPORT=SCREEN";
|
||||
|
||||
if (BootDrive < 0x80)
|
||||
{
|
||||
/* Boot from floppy disk */
|
||||
SourcePath = "\\";
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Boot from cdrom */
|
||||
SourcePath = "\\reactos";
|
||||
}
|
||||
|
||||
/* Set kernel command line */
|
||||
sprintf(multiboot_kernel_cmdline,
|
||||
// "multi(0)disk(0)cdrom(%u)\\reactos /DEBUGPORT=COM1",
|
||||
"multi(0)disk(0)cdrom(%u)\\reactos /DEBUGPORT=SCREEN",
|
||||
(unsigned int)BootDrive);
|
||||
"multi(0)disk(0)%s(%u)%s %s",
|
||||
(BootDrive < 0x80) ? "fdisk" : "cdrom",
|
||||
(unsigned int)BootDrive,
|
||||
SourcePath,
|
||||
LoadOptions);
|
||||
|
||||
|
||||
/* Open boot drive */
|
||||
if (!FsOpenVolume(BootDrive, BootPartition))
|
||||
{
|
||||
#ifdef USE_UI
|
||||
UiMessageBox("Failed to open boot drive.");
|
||||
#else
|
||||
printf("Failed to open boot drive.");
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
/* Load ntoskrnl.exe */
|
||||
if (!LoadKernel("\\reactos\\ntoskrnl.exe"))
|
||||
if (!LoadKernel(SourcePath, "ntoskrnl.exe"))
|
||||
return;
|
||||
|
||||
|
||||
/* Load hal.dll */
|
||||
if (!LoadDriver("\\reactos\\hal.dll"))
|
||||
if (!LoadDriver(SourcePath, "hal.dll"))
|
||||
return;
|
||||
|
||||
|
||||
|
|
@ -176,91 +348,154 @@ VOID RunLoader(VOID)
|
|||
RegExportBinaryHive ("\\Registry\\Machine\\HARDWARE", Base, &Size);
|
||||
MultiBootCloseModule (Base, Size);
|
||||
|
||||
#if 0
|
||||
printf("Base: %x\n", Base);
|
||||
printf("Size: %u\n", Size);
|
||||
#if 0
|
||||
printf("*** System stopped ***\n");
|
||||
for(;;);
|
||||
#endif
|
||||
|
||||
|
||||
/* Load NLS files */
|
||||
#if 0
|
||||
if (!LoadNlsFiles(szBootPath))
|
||||
/* Insert boot disk 2 */
|
||||
if (BootDrive < 0x80)
|
||||
{
|
||||
MessageBox("Failed to load NLS files\n");
|
||||
return;
|
||||
}
|
||||
#ifdef USE_UI
|
||||
UiMessageBox("Please insert \"ReactOS Boot Disk 2\" and press ENTER");
|
||||
#else
|
||||
printf("\n\n Please insert \"ReactOS Boot Disk 2\" and press ENTER\n");
|
||||
getch();
|
||||
#endif
|
||||
|
||||
/* Open boot drive */
|
||||
if (!FsOpenVolume(BootDrive, BootPartition))
|
||||
{
|
||||
#ifdef USE_UI
|
||||
UiMessageBox("Failed to open boot drive.");
|
||||
#else
|
||||
printf("Failed to open boot drive.");
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
/* FIXME: check volume label or disk marker file */
|
||||
}
|
||||
|
||||
|
||||
/* Load ANSI codepage file */
|
||||
if (!LoadNlsFile(SourcePath, "c_1252.nls", "ansi.nls"))
|
||||
{
|
||||
#ifdef USE_UI
|
||||
UiMessageBox("Failed to load the ANSI codepage file.");
|
||||
#else
|
||||
printf("Failed to load the ANSI codepage file.");
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
/* Load OEM codepage file */
|
||||
if (!LoadNlsFile(SourcePath, "c_437.nls", "oem.nls"))
|
||||
{
|
||||
#ifdef USE_UI
|
||||
UiMessageBox("Failed to load the OEM codepage file.");
|
||||
#else
|
||||
printf("Failed to load the OEM codepage file.");
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
/* Load Unicode casemap file */
|
||||
if (!LoadNlsFile(SourcePath, "l_intl.nls", "casemap.nls"))
|
||||
{
|
||||
#ifdef USE_UI
|
||||
UiMessageBox("Failed to load the Unicode casemap file.");
|
||||
#else
|
||||
printf("Failed to load the Unicode casemap file.");
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
/* Load drivers */
|
||||
if (BootDrive < 0x80)
|
||||
{
|
||||
/*
|
||||
* Load floppy.sys
|
||||
*/
|
||||
if (!LoadDriver(SourcePath, "floppy.sys"))
|
||||
return;
|
||||
|
||||
/*
|
||||
* Load vfatfs.sys (could be loaded by the setup prog!)
|
||||
*/
|
||||
if (!LoadDriver(SourcePath, "vfatfs.sys"))
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Load scsiport.sys
|
||||
*/
|
||||
if (!LoadDriver("\\reactos\\scsiport.sys"))
|
||||
if (!LoadDriver(SourcePath, "scsiport.sys"))
|
||||
return;
|
||||
|
||||
/*
|
||||
* Load atapi.sys (depends on hardware detection)
|
||||
*/
|
||||
if (!LoadDriver("\\reactos\\atapi.sys"))
|
||||
if (!LoadDriver(SourcePath, "atapi.sys"))
|
||||
return;
|
||||
|
||||
/*
|
||||
* Load class2.sys
|
||||
*/
|
||||
if (!LoadDriver("\\reactos\\class2.sys"))
|
||||
if (!LoadDriver(SourcePath, "class2.sys"))
|
||||
return;
|
||||
|
||||
/*
|
||||
* Load cdrom.sys
|
||||
*/
|
||||
if (!LoadDriver("\\reactos\\cdrom.sys"))
|
||||
if (!LoadDriver(SourcePath, "cdrom.sys"))
|
||||
return;
|
||||
|
||||
/*
|
||||
* Load cdfs.sys
|
||||
*/
|
||||
if (!LoadDriver("\\reactos\\cdfs.sys"))
|
||||
if (!LoadDriver(SourcePath, "cdfs.sys"))
|
||||
return;
|
||||
|
||||
/*
|
||||
* Load floppy.sys (only in case of a floppy disk setup!)
|
||||
*/
|
||||
// if (!LoadDriver("\\reactos\\floppy.sys"))
|
||||
// return;
|
||||
|
||||
/*
|
||||
* Load disk.sys
|
||||
*/
|
||||
if (!LoadDriver("\\reactos\\disk.sys"))
|
||||
if (!LoadDriver(SourcePath, "disk.sys"))
|
||||
return;
|
||||
|
||||
/*
|
||||
* Load vfatfs.sys (could be loaded by the setup prog!)
|
||||
*/
|
||||
if (!LoadDriver("\\reactos\\vfatfs.sys"))
|
||||
if (!LoadDriver(SourcePath, "vfatfs.sys"))
|
||||
return;
|
||||
|
||||
/*
|
||||
* Load keyboard driver
|
||||
*/
|
||||
if (!LoadDriver("\\reactos\\keyboard.sys"))
|
||||
return;
|
||||
|
||||
/*
|
||||
* Load screen driver
|
||||
*/
|
||||
if (!LoadDriver("\\reactos\\blue.sys"))
|
||||
return;
|
||||
|
||||
/*
|
||||
* Now boot the kernel
|
||||
*/
|
||||
DiskStopFloppyMotor();
|
||||
boot_reactos();
|
||||
}
|
||||
|
||||
|
||||
// printf("*** System stopped ***\n");
|
||||
// for(;;);
|
||||
/*
|
||||
* Load keyboard driver
|
||||
*/
|
||||
if (!LoadDriver(SourcePath, "keyboard.sys"))
|
||||
return;
|
||||
|
||||
/*
|
||||
* Load screen driver
|
||||
*/
|
||||
if (!LoadDriver(SourcePath, "blue.sys"))
|
||||
return;
|
||||
|
||||
#ifdef USE_UI
|
||||
UiUnInitialize("Booting ReactOS...");
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Now boot the kernel
|
||||
*/
|
||||
DiskStopFloppyMotor();
|
||||
boot_reactos();
|
||||
}
|
||||
|
||||
/* EOF */
|
||||
|
|
|
|||
Loading…
Reference in a new issue