Author: ion Date: Mon Sep 7 04:42:34 2015 New Revision: 69077
URL: http://svn.reactos.org/svn/reactos?rev=69077&view=rev Log: [BOOTMGFW] - Build fixes for GCC
Modified: trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/bootlib.c trunk/reactos/boot/environ/lib/firmware/efi/firmware.c trunk/reactos/boot/environ/lib/platform/display.c
Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?r... ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Mon Sep 7 04:42:34 2015 @@ -620,8 +620,8 @@ EfiConOutQueryMode ( _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, _In_ ULONG Mode, - _In_ PULONG Columns, - _In_ PULONG Rows + _In_ UINTN* Columns, + _In_ UINTN* Rows );
NTSTATUS
Modified: trunk/reactos/boot/environ/lib/bootlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/bootlib.c?... ============================================================================== --- trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] Mon Sep 7 04:42:34 2015 @@ -190,7 +190,7 @@ InitializeListHead(&EnEventNotificationList); #endif
- /* Initialize the I/O Manager */i + /* Initialize the I/O Manager */ Status = BlpIoInitialize(); if (!NT_SUCCESS(Status)) {
Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/e... ============================================================================== --- trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] Mon Sep 7 04:42:34 2015 @@ -251,8 +251,8 @@ 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 @@ ) { BL_ARCH_MODE OldMode; - EFI_STATUS EfiStatus;
/* Are we in protected mode? */ OldMode = CurrentExecutionContext->Mode;
Modified: trunk/reactos/boot/environ/lib/platform/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/platform/d... ============================================================================== --- trunk/reactos/boot/environ/lib/platform/display.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/platform/display.c [iso-8859-1] Mon Sep 7 04:42:34 2015 @@ -535,7 +535,8 @@ ) { 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 @@ { 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 @@ ) { 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 @@ BcdLibraryInteger_GraphicsResolution, &GraphicsResolution); #else - GraphicsResolution = 0; + //GraphicsResolution = 0; Status = STATUS_NOT_FOUND; #endif if (NT_SUCCESS(Status)) @@ -902,7 +904,7 @@ BcdLibraryBoolean_GraphicsForceHighestMode, &HighestMode); #else - HighestMode = 0; + //HighestMode = 0; Status = STATUS_NOT_FOUND; #endif if (NT_SUCCESS(Status)) @@ -952,7 +954,7 @@ 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");