From 626d85d853a8617814f69045f85918342f81cbae Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Mon, 7 Sep 2015 04:42:34 +0000
Subject: [PATCH] [BOOTMGFW] - Build fixes for GCC

svn path=/trunk/; revision=69077
---
 reactos/boot/environ/include/bl.h              |  4 ++--
 reactos/boot/environ/lib/bootlib.c             |  2 +-
 .../boot/environ/lib/firmware/efi/firmware.c   |  5 ++---
 reactos/boot/environ/lib/platform/display.c    | 18 ++++++++++--------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/reactos/boot/environ/include/bl.h b/reactos/boot/environ/include/bl.h
index 17bf2a6d9fc..da0456bb299 100644
--- a/reactos/boot/environ/include/bl.h
+++ b/reactos/boot/environ/include/bl.h
@@ -620,8 +620,8 @@ NTSTATUS
 EfiConOutQueryMode (
     _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface,
     _In_ ULONG Mode,
-    _In_ PULONG Columns,
-    _In_ PULONG Rows
+    _In_ UINTN* Columns,
+    _In_ UINTN* Rows
     );
 
 NTSTATUS
diff --git a/reactos/boot/environ/lib/bootlib.c b/reactos/boot/environ/lib/bootlib.c
index d58a2548356..58eebf77bd9 100644
--- a/reactos/boot/environ/lib/bootlib.c
+++ b/reactos/boot/environ/lib/bootlib.c
@@ -190,7 +190,7 @@ InitializeLibrary (
     InitializeListHead(&EnEventNotificationList);
 #endif
 
-    /* Initialize the I/O Manager */i
+    /* Initialize the I/O Manager */
     Status = BlpIoInitialize();
     if (!NT_SUCCESS(Status))
     {
diff --git a/reactos/boot/environ/lib/firmware/efi/firmware.c b/reactos/boot/environ/lib/firmware/efi/firmware.c
index 3a8d657edbb..37a8e1b00c2 100644
--- a/reactos/boot/environ/lib/firmware/efi/firmware.c
+++ b/reactos/boot/environ/lib/firmware/efi/firmware.c
@@ -251,8 +251,8 @@ NTSTATUS
 EfiConOutQueryMode (
     _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface,
     _In_ ULONG Mode,
-    _In_ PULONG Columns,
-    _In_ PULONG Rows
+    _In_ UINTN* Columns,
+    _In_ UINTN* Rows
     )
 {
     BL_ARCH_MODE OldMode;
@@ -407,7 +407,6 @@ EfiConOutReadCurrentMode (
     )
 {
     BL_ARCH_MODE OldMode;
-    EFI_STATUS EfiStatus;
 
     /* Are we in protected mode? */
     OldMode = CurrentExecutionContext->Mode;
diff --git a/reactos/boot/environ/lib/platform/display.c b/reactos/boot/environ/lib/platform/display.c
index 92b9b3fe49a..37024575eee 100644
--- a/reactos/boot/environ/lib/platform/display.c
+++ b/reactos/boot/environ/lib/platform/display.c
@@ -535,7 +535,8 @@ ConsoleEfiTextFindModeFromAllowed (
     )
 {
     EFI_SIMPLE_TEXT_OUTPUT_MODE ModeInfo;
-    ULONG MaxMode, MaxQueriedMode, Mode, HRes, VRes, i, MatchingMode;
+    ULONG MaxMode, MaxQueriedMode, Mode, i, MatchingMode;
+    UINTN HRes, VRes;
     ULONGLONG ModeListSize;
     PBL_DISPLAY_MODE ModeEntry, ModeList, SupportedModeEntry;
     NTSTATUS Status;
@@ -632,7 +633,8 @@ ConsoleFirmwareTextOpen (
 {
     BL_DISPLAY_MODE DisplayMode;
     EFI_SIMPLE_TEXT_OUTPUT_MODE CurrentMode, NewMode;
-    ULONG HRes, VRes, Mode;
+    UINTN HRes, VRes;
+    ULONG Mode;
     NTSTATUS Status;
 
     /* Read the current mode and its settings */
@@ -834,12 +836,12 @@ DsppInitialize (
     )
 {
     BL_LIBRARY_PARAMETERS LibraryParameters = BlpLibraryParameters;
-    BOOLEAN NoGraphics, HighestMode;
+    BOOLEAN NoGraphics;// , HighestMode;
     NTSTATUS Status;
     PBL_DISPLAY_MODE DisplayMode;
-    ULONG GraphicsResolution;
+    //ULONG GraphicsResolution;
     PVOID GraphicsConsole;
-    PVOID RemoteConsole;
+   // PVOID RemoteConsole;
     PBL_TEXT_CONSOLE TextConsole;
 
     /* Initialize font data */
@@ -887,7 +889,7 @@ DsppInitialize (
                                         BcdLibraryInteger_GraphicsResolution,
                                         &GraphicsResolution);
 #else
-        GraphicsResolution = 0;
+        //GraphicsResolution = 0;
         Status = STATUS_NOT_FOUND;
 #endif
         if (NT_SUCCESS(Status))
@@ -902,7 +904,7 @@ DsppInitialize (
                                         BcdLibraryBoolean_GraphicsForceHighestMode,
                                         &HighestMode);
 #else
-        HighestMode = 0;
+        //HighestMode = 0;
         Status = STATUS_NOT_FOUND;
 #endif
         if (NT_SUCCESS(Status))
@@ -952,7 +954,7 @@ DsppInitialize (
     DspGraphicalConsole = NULL;
 
     /* If we don't have a text console, go get a remote console */
-    RemoteConsole = NULL;
+    //RemoteConsole = NULL;
     if (!TextConsole)
     {
         EarlyPrint(L"Display path not handled\n");
-- 
2.17.1