Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-26 16:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- WINLDR: Use SystemRoot path as it is because after recent Herve's changes there is no need to do additional operations with it.

Browse source 
svn path=/trunk/; revision=40682
This commit is contained in:
Aleksey Bragin 2009-04-24 18:17:22 +00:00
parent 54d36c08b2
commit e78a6436ee
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/boot/freeldr/freeldr/windows/winldr.c
View file

@ -75,7 +75,7 @@ AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock)
VOID VOID
WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
PCHAR Options, PCHAR Options,
PCHAR SystemPath, PCHAR SystemRoot,
PCHAR BootPath, PCHAR BootPath,
USHORT VersionToBoot) USHORT VersionToBoot)
{ {
@ -86,7 +86,6 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
//CHAR ArcBoot[] = "multi(0)disk(0)rdisk(0)partition(1)"; //CHAR ArcBoot[] = "multi(0)disk(0)rdisk(0)partition(1)";
CHAR HalPath[] = "\\"; CHAR HalPath[] = "\\";
CHAR SystemRoot[256];
CHAR ArcBoot[256]; CHAR ArcBoot[256];
CHAR MiscFiles[256]; CHAR MiscFiles[256];
ULONG i, PathSeparator; ULONG i, PathSeparator;
@ -95,11 +94,9 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
LoaderBlock->u.I386.CommonDataArea = NULL; // Force No ABIOS support LoaderBlock->u.I386.CommonDataArea = NULL; // Force No ABIOS support
/* Construct SystemRoot and ArcBoot from SystemPath */ /* Construct SystemRoot and ArcBoot from SystemPath */
PathSeparator = strstr(SystemPath, "\\") - SystemPath; PathSeparator = strstr(BootPath, "\\") - BootPath;
strncpy(ArcBoot, SystemPath, PathSeparator); strncpy(ArcBoot, BootPath, PathSeparator);
ArcBoot[PathSeparator] = 0; ArcBoot[PathSeparator] = 0;
strcpy(SystemRoot, &SystemPath[PathSeparator]);
strcat(SystemRoot, "\\");
DPRINTM(DPRINT_WINDOWS, "ArcBoot: %s\n", ArcBoot); DPRINTM(DPRINT_WINDOWS, "ArcBoot: %s\n", ArcBoot);
DPRINTM(DPRINT_WINDOWS, "SystemRoot: %s\n", SystemRoot); DPRINTM(DPRINT_WINDOWS, "SystemRoot: %s\n", SystemRoot);