From 7ad2ae7720f2fea782a57f2eebd13d6696b04530 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 25 Jan 2011 22:23:10 +0000 Subject: [PATCH] [FREELDR] Fix compilation on MSVC svn path=/branches/cmake-bringup/; revision=50496 --- boot/freeldr/freeldr/windows/winldr.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/boot/freeldr/freeldr/windows/winldr.c b/boot/freeldr/freeldr/windows/winldr.c index b213125c3f4..d4e6f11b271 100644 --- a/boot/freeldr/freeldr/windows/winldr.c +++ b/boot/freeldr/freeldr/windows/winldr.c @@ -39,6 +39,10 @@ extern BOOLEAN UseRealHeap; extern ULONG LoaderPagesSpanned; extern BOOLEAN AcpiPresent; +extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; +extern BOOLEAN WinLdrTerminalConnected; +extern void WinLdrSetupEms(IN PCHAR BootOptions); + BOOLEAN WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, IN PCH DllName, @@ -155,7 +159,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, ArcDiskInfo->ArcName = (PCHAR)PaToVa(ArcDiskInfo->ArcName); /* Mark partition table as valid */ - ArcDiskInfo->ValidPartitionTable = TRUE; + ArcDiskInfo->ValidPartitionTable = TRUE; /* Insert into the list */ InsertTailList(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead, @@ -203,11 +207,9 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, /* See KiRosFrldrLpbToNtLpb for details */ Extension->AcpiTable = (PVOID)1; } - + #ifndef _M_ARM /* Set headless block pointer */ - extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; - extern BOOLEAN WinLdrTerminalConnected; if (WinLdrTerminalConnected) { Extension->HeadlessLoaderBlock = MmHeapAlloc(sizeof(HEADLESS_LOADER_BLOCK)); @@ -535,10 +537,9 @@ LoadAndBootWindows(PCSTR OperatingSystemName, /* Allocate and minimalistic-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); - + #ifndef _M_ARM /* Setup redirection support */ - extern void WinLdrSetupEms(IN PCHAR BootOptions); WinLdrSetupEms(BootOptions); #endif /* Detect hardware */ -- 2.17.1