Author: fireball Date: Fri Apr 24 22:17:22 2009 New Revision: 40682 URL: http://svn.reactos.org/svn/reactos?rev=40682&view=rev Log: - WINLDR: Use SystemRoot path as it is because after recent Herve's changes there is no need to do additional operations with it.
Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windows/winldr.c?rev=40682&r1=40681&r2=40682&view=diff ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Fri Apr 24 22:17:22 2009 @@ -75,7 +75,7 @@ VOID WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, PCHAR Options, - PCHAR SystemPath, + PCHAR SystemRoot, PCHAR BootPath, USHORT VersionToBoot) { @@ -86,7 +86,6 @@ //CHAR ArcBoot[] = "multi(0)disk(0)rdisk(0)partition(1)"; CHAR HalPath[] = "\\"; - CHAR SystemRoot[256]; CHAR ArcBoot[256]; CHAR MiscFiles[256]; ULONG i, PathSeparator; @@ -95,11 +94,9 @@ LoaderBlock->u.I386.CommonDataArea = NULL; // Force No ABIOS support /* Construct SystemRoot and ArcBoot from SystemPath */ - PathSeparator = strstr(SystemPath, "\\") - SystemPath; - strncpy(ArcBoot, SystemPath, PathSeparator); + PathSeparator = strstr(BootPath, "\\") - BootPath; + strncpy(ArcBoot, BootPath, PathSeparator); ArcBoot[PathSeparator] = 0; - strcpy(SystemRoot, &SystemPath[PathSeparator]); - strcat(SystemRoot, "\\"); DPRINTM(DPRINT_WINDOWS, "ArcBoot: %s\n", ArcBoot); DPRINTM(DPRINT_WINDOWS, "SystemRoot: %s\n", SystemRoot);