From e78a6436ee619ce607a9cbb52ee240d35bb536b7 Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Fri, 24 Apr 2009 18:17:22 +0000
Subject: [PATCH] - WINLDR: Use SystemRoot path as it is because after recent
 Herve's changes there is no need to do additional operations with it.

svn path=/trunk/; revision=40682
---
 reactos/boot/freeldr/freeldr/windows/winldr.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/reactos/boot/freeldr/freeldr/windows/winldr.c b/reactos/boot/freeldr/freeldr/windows/winldr.c
index a90a51bc992..c6b3186d637 100644
--- a/reactos/boot/freeldr/freeldr/windows/winldr.c
+++ b/reactos/boot/freeldr/freeldr/windows/winldr.c
@@ -75,7 +75,7 @@ AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock)
 VOID
 WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
                        PCHAR Options,
-                       PCHAR SystemPath,
+                       PCHAR SystemRoot,
                        PCHAR BootPath,
                        USHORT VersionToBoot)
 {
@@ -86,7 +86,6 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
 	//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 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
 	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);