Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[ion] 69100: [BOOTMGFW] - Forgot that SVN doesn't traverse up.
by ion＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: ion Date: Mon Sep 7 19:46:50 2015 New Revision: 69100 URL: http://svn.reactos.org/svn/reactos?rev=69100&view=rev Log: [BOOTMGFW] - Forgot that SVN doesn't traverse up. Modified: trunk/reactos/boot/environ/CMakeLists.txt trunk/reactos/boot/environ/include/bl.h Modified: trunk/reactos/boot/environ/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] Mon Sep 7 19:46:50 2015 @@ -23,7 +23,14 @@ lib/io/device.c lib/io/file.c lib/io/fat.c - lib/platform/display.c) + lib/io/display/display.c + lib/io/display/emscons.c + lib/io/display/guicons.c + lib/io/display/textcons.c + lib/io/display/efi/textcons.c + lib/io/display/efi/guicons.c + lib/io/display/efi/gop.c + lib/io/display/efi/uga.c) if(ARCH STREQUAL "i386") list(APPEND BOOTLIB_ASM_SOURCE Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Mon Sep 7 19:46:50 2015 @@ -75,11 +75,34 @@ #define BL_LIBRARY_FLAG_INITIALIZATION_COMPLETED 0x20 #define BL_LIBRARY_FLAG_NO_GRAPHICS_CONSOLE 0x800 +#define BL_DISPLAY_GRAPHICS_FORCED_VIDEO_MODE_FLAG 0x01 +#define BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG 0x02 + #define BL_FS_REGISTER_AT_HEAD_FLAG 1 #define BL_MEMORY_CLASS_SHIFT 28 /* ENUMERATIONS **************************************************************/ + +typedef enum _BL_COLOR +{ + Black, + Blue, + Green, + Cyan, + Red, + Magenta, + Brown, + LtGray, + Gray, + LtBlue, + LtGreen, + LtCyan, + LtRed, + LtMagenta, + Yellow, + White +} BL_COLOR, *PBL_COLOR; typedef enum _BL_MEMORY_DESCRIPTOR_TYPE { @@ -259,6 +282,65 @@ NTSTATUS (*PBL_FILE_DESTROY_CALLBACK) ( _In_ PVOID Entry + ); + +struct _BL_TEXT_CONSOLE; +struct _BL_DISPLAY_STATE; +typedef +NTSTATUS +(*PCONSOLE_DESTRUCT) ( + _In_ struct _BL_TEXT_CONSOLE* Console + ); + +typedef +NTSTATUS +(*PCONSOLE_REINITIALIZE) ( + _In_ struct _BL_TEXT_CONSOLE* Console + ); + +typedef +NTSTATUS +(*PCONSOLE_GET_TEXT_STATE) ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _Out_ struct _BL_DISPLAY_STATE* TextState + ); + +typedef +NTSTATUS +(*PCONSOLE_SET_TEXT_STATE) ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _In_ ULONG Flags, + _In_ struct _BL_DISPLAY_STATE* TextState + ); + +typedef +NTSTATUS +(*PCONSOLE_GET_TEXT_RESOLUTION) ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _Out_ PULONG TextResolution + ); + +typedef +NTSTATUS +(*PCONSOLE_SET_TEXT_RESOLUTION) ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _In_ ULONG NewTextResolution, + _Out_ PULONG OldTextResolution + ); + +typedef +NTSTATUS +(*PCONSOLE_CLEAR_TEXT) ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _In_ ULONG Attribute + ); + +typedef +NTSTATUS +(*PCONSOLE_WRITE_TEXT) ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _In_ PCHAR Text, + _In_ ULONG Attribute ); /* DATA STRUCTURES ***********************************************************/ @@ -509,6 +591,81 @@ PBL_FS_PURGE_CALLBACK Purge; } BL_FILE_SYSTEM_REGISTRATION_TABLE; +typedef struct _BL_DISPLAY_STATE +{ + ULONG BgColor; + ULONG FgColor; + ULONG XPos; + ULONG YPos; + ULONG CursorVisible; +} BL_DISPLAY_STATE, *PBL_DISPLAY_STATE; + +typedef struct _BL_DISPLAY_MODE +{ + ULONG HRes; + ULONG VRes; + ULONG HRes2; +} BL_DISPLAY_MODE, *PBL_DISPLAY_MODE; + +typedef struct _BL_TEXT_CONSOLE_VTABLE +{ + PCONSOLE_DESTRUCT Destruct; + PCONSOLE_REINITIALIZE Reinitialize; + PCONSOLE_GET_TEXT_STATE GetTextState; + PCONSOLE_SET_TEXT_STATE SetTextState; + PCONSOLE_GET_TEXT_RESOLUTION GetTextResolution; + PCONSOLE_SET_TEXT_RESOLUTION SetTextResolution; + PCONSOLE_CLEAR_TEXT ClearText; + PCONSOLE_WRITE_TEXT WriteText; +} BL_TEXT_CONSOLE_VTABLE, *PBL_TEXT_CONSOLE_VTABLE; + +typedef struct _BL_GRAPHICS_CONSOLE_VTABLE +{ + BL_TEXT_CONSOLE_VTABLE Text; + /// more for graphics /// +} BL_GRAPHICS_CONSOLE_VTABLE, *PBL_GRAPHICS_CONSOLE_VTABLE; + +typedef struct _BL_TEXT_CONSOLE +{ + PBL_TEXT_CONSOLE_VTABLE Callbacks; + BL_DISPLAY_STATE State; + BL_DISPLAY_MODE DisplayMode; + BOOLEAN Active; + EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL* Protocol; + ULONG Mode; + EFI_SIMPLE_TEXT_OUTPUT_MODE OldMode; +} BL_TEXT_CONSOLE, *PBL_TEXT_CONSOLE; + +typedef enum _BL_GRAPHICS_CONSOLE_TYPE +{ + BlGopConsole, + BlUgaConsole +} BL_GRAPHICS_CONSOLE_TYPE; + +typedef struct _BL_GRAPHICS_CONSOLE +{ + BL_TEXT_CONSOLE TextConsole; + BL_DISPLAY_MODE DisplayMode; + ULONG PixelDepth; + ULONG FgColor; + ULONG BgColor; + BL_DISPLAY_MODE OldDisplayMode; + ULONG OldPixelDepth; + EFI_HANDLE Handle; + BL_GRAPHICS_CONSOLE_TYPE Type; + EFI_GRAPHICS_OUTPUT_PROTOCOL* Protocol; + PVOID FrameBuffer; + ULONG FrameBufferSize; + ULONG PixelsPerScanLine; + ULONG Mode; + ULONG OldMode; +} BL_GRAPHICS_CONSOLE, *PBL_GRAPHICS_CONSOLE; + +typedef struct _BL_REMOTE_CONSOLE +{ + BL_TEXT_CONSOLE TextConsole; +} BL_REMOTE_CONSOLE, *PBL_REMOTE_CONSOLE; + /* INLINE ROUTINES ***********************************************************/ FORCEINLINE @@ -867,6 +1024,145 @@ BlDisplayGetTextCellResolution ( _Out_ PULONG TextWidth, _Out_ PULONG TextHeight + ); + +/* TExT CONSOLE ROUTINES *****************************************************/ + +NTSTATUS +ConsoleTextLocalDestruct ( + _In_ struct _BL_TEXT_CONSOLE* Console + ); + +NTSTATUS +ConsoleTextLocalReinitialize ( + _In_ struct _BL_TEXT_CONSOLE* Console + ); + +NTSTATUS +ConsoleTextBaseGetTextState ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _Out_ PBL_DISPLAY_STATE TextState + ); + +NTSTATUS +ConsoleTextLocalSetTextState ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _In_ ULONG Flags, + _In_ PBL_DISPLAY_STATE TextState + ); + +NTSTATUS +ConsoleTextBaseGetTextResolution ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _Out_ PULONG TextResolution + ); + +NTSTATUS +ConsoleTextLocalSetTextResolution ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _In_ ULONG NewTextResolution, + _Out_ PULONG OldTextResolution + ); + +NTSTATUS +ConsoleTextLocalClearText ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _In_ ULONG Attribute + ); + +NTSTATUS +ConsoleTextLocalWriteText ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _In_ PCHAR Text, + _In_ ULONG Attribute + ); + +NTSTATUS +ConsoleTextLocalConstruct ( + _In_ PBL_TEXT_CONSOLE TextConsole, + _In_ BOOLEAN Activate + ); + +BOOLEAN +ConsolepFindResolution ( + _In_ PBL_DISPLAY_MODE Mode, + _In_ PBL_DISPLAY_MODE List, + _In_ ULONG MaxIndex + ); + +VOID +ConsoleFirmwareTextClose ( + _In_ PBL_TEXT_CONSOLE TextConsole + ); + +NTSTATUS +ConsoleFirmwareTextOpen ( + _In_ PBL_TEXT_CONSOLE TextConsole + ); + +NTSTATUS +ConsoleFirmwareTextSetState ( + _In_ PBL_TEXT_CONSOLE TextConsole, + _In_ UCHAR Mask, + _In_ PBL_DISPLAY_STATE State + ); + +NTSTATUS +ConsoleGraphicalConstruct ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ); + +NTSTATUS +ConsoleCreateRemoteConsole ( + _In_ PBL_TEXT_CONSOLE* TextConsole + ); + +NTSTATUS +ConsoleEfiGraphicalOpenProtocol ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole, + _In_ BL_GRAPHICS_CONSOLE_TYPE Type + ); + +VOID +ConsoleFirmwareGraphicalClose ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ); + +NTSTATUS +ConsoleFirmwareGraphicalEnable ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ); + +NTSTATUS +ConsoleEfiUgaOpen ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ); + +VOID +ConsoleEfiUgaClose ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ); + +VOID +ConsoleEfiGopClose ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ); + +NTSTATUS +ConsoleEfiGopOpen ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ); + +NTSTATUS +ConsoleEfiGopEnable ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ); + +NTSTATUS +ConsoleEfiUgaSetResolution ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole, + _In_ PBL_DISPLAY_MODE DisplayMode, + _In_ ULONG DisplayModeCount ); extern ULONG MmDescriptorCallTreeCount; @@ -882,5 +1178,9 @@ extern EFI_GUID EfiLoadedImageProtocol; extern EFI_GUID EfiDevicePathProtocol; extern EFI_GUID EfiSimpleTextInputExProtocol; - +extern ULONG ConsoleGraphicalResolutionListFlags; +extern BL_DISPLAY_MODE ConsoleGraphicalResolutionList[]; +extern BL_DISPLAY_MODE ConsoleTextResolutionList[]; +extern ULONG ConsoleGraphicalResolutionListSize; +extern PVOID DspRemoteInputConsole; #endif

1 0

[ion] 69099: [BOOTMGFW] - Factor the display/console code into correct per-firmware/per-console-mode files. No code changes.
by ion＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: ion Date: Mon Sep 7 19:35:24 2015 New Revision: 69099 URL: http://svn.reactos.org/svn/reactos?rev=69099&view=rev Log: [BOOTMGFW] - Factor the display/console code into correct per-firmware/per-console-mode files. No code changes. Added: trunk/reactos/boot/environ/lib/io/display/ (with props) trunk/reactos/boot/environ/lib/io/display/display.c (with props) trunk/reactos/boot/environ/lib/io/display/efi/ (with props) trunk/reactos/boot/environ/lib/io/display/efi/gop.c (with props) trunk/reactos/boot/environ/lib/io/display/efi/guicons.c (with props) trunk/reactos/boot/environ/lib/io/display/efi/textcons.c (with props) trunk/reactos/boot/environ/lib/io/display/efi/uga.c (with props) trunk/reactos/boot/environ/lib/io/display/emscons.c (with props) trunk/reactos/boot/environ/lib/io/display/guicons.c (with props) trunk/reactos/boot/environ/lib/io/display/textcons.c (with props) Removed: trunk/reactos/boot/environ/lib/platform/display.c Modified: trunk/reactos/boot/environ/lib/io/fat.c Propchange: trunk/reactos/boot/environ/lib/io/display/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Sep 7 19:35:24 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/boot/environ/lib/io/display/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/boot/environ/lib/io/display/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/boot/environ/lib/io/display/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/boot/environ/lib/io/display/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/display.c (added) +++ trunk/reactos/boot/environ/lib/io/display/display.c [iso-8859-1] Mon Sep 7 19:35:24 2015 @@ -0,0 +1,288 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/platform/display.c + * PURPOSE: Boot Library Display Management Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" +#include <bcd.h> + +/* DATA VARIABLES ************************************************************/ + +PVOID BfiCachedStrikeData; +LIST_ENTRY BfiDeferredListHead; +LIST_ENTRY BfiFontFileListHead; +PVOID BfiGraphicsRectangle; + +ULONG ConsoleGraphicalResolutionListFlags; +BL_DISPLAY_MODE ConsoleGraphicalResolutionList[3] = +{ + {1024, 768, 1024}, + {800, 600, 800}, + {1024, 600, 1024} +}; +ULONG ConsoleGraphicalResolutionListSize = RTL_NUMBER_OF(ConsoleGraphicalResolutionList); + +BL_DISPLAY_MODE ConsoleTextResolutionList[1] = +{ + {80, 25, 80} +}; + +PVOID DspRemoteInputConsole; +PVOID DspTextConsole; +PVOID DspGraphicalConsole; + +/* FUNCTIONS *****************************************************************/ + +BOOLEAN +DsppGraphicsDisabledByBcd ( + VOID + ) +{ + //EarlyPrint(L"Disabling graphics\n"); + return FALSE; +} + +NTSTATUS +DsppInitialize ( + _In_ ULONG Flags + ) +{ + BL_LIBRARY_PARAMETERS LibraryParameters = BlpLibraryParameters; + BOOLEAN NoGraphics;// , HighestMode; + NTSTATUS Status; + PBL_DISPLAY_MODE DisplayMode; + //ULONG GraphicsResolution; + PBL_GRAPHICS_CONSOLE GraphicsConsole; + PBL_TEXT_CONSOLE TextConsole, RemoteConsole; + + /* Initialize font data */ + BfiCachedStrikeData = 0; + InitializeListHead(&BfiDeferredListHead); + InitializeListHead(&BfiFontFileListHead); + + /* Allocate the font rectangle */ + BfiGraphicsRectangle = BlMmAllocateHeap(0x5A); + if (!BfiGraphicsRectangle) + { + return STATUS_NO_MEMORY; + } + + /* Display re-initialization not yet handled */ + if (LibraryParameters.LibraryFlags & BL_LIBRARY_FLAG_REINITIALIZE_ALL) + { + EarlyPrint(L"Display path not handled\n"); + return STATUS_NOT_SUPPORTED; + } + + /* Check if no graphics console is needed */ + if ((Flags & BL_LIBRARY_FLAG_NO_GRAPHICS_CONSOLE) || + (DsppGraphicsDisabledByBcd())) + { + /* Remember this */ + NoGraphics = TRUE; + } + else + { + /* No graphics -- remember this */ + NoGraphics = FALSE; + } + + /* On first load, we always initialize a graphics display */ + GraphicsConsole = NULL; + if (!(Flags & BL_LIBRARY_FLAG_REINITIALIZE_ALL) || !(NoGraphics)) + { + /* Default to mode 0 (1024x768) */ + DisplayMode = &ConsoleGraphicalResolutionList[0]; + + /* Check what resolution to use*/ +#if 0 + Status = BlGetBootOptionInteger(BlpApplicationEntry.BcdData, + BcdLibraryInteger_GraphicsResolution, + &GraphicsResolution); +#else + //GraphicsResolution = 0; + Status = STATUS_NOT_FOUND; +#endif + if (NT_SUCCESS(Status)) + { + ConsoleGraphicalResolutionListFlags |= BL_DISPLAY_GRAPHICS_FORCED_VIDEO_MODE_FLAG; + EarlyPrint(L"Display selection not yet handled\n"); + return STATUS_NOT_IMPLEMENTED; + } + + /* Check if the highest mode should be forced */ +#if 0 + Status = BlGetBootOptionBoolean(BlpApplicationEntry.BcdData, + BcdLibraryBoolean_GraphicsForceHighestMode, + &HighestMode); +#else + //HighestMode = 0; + Status = STATUS_NOT_FOUND; +#endif + if (NT_SUCCESS(Status)) + { + ConsoleGraphicalResolutionListFlags |= BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG; + EarlyPrint(L"High res mode not yet handled\n"); + return STATUS_NOT_IMPLEMENTED; + } + + /* Do we need graphics mode after all? */ + if (!NoGraphics) + { + /* Yep -- go allocate it */ + GraphicsConsole = BlMmAllocateHeap(sizeof(*GraphicsConsole)); + if (GraphicsConsole) + { + /* Construct it */ + Status = ConsoleGraphicalConstruct(GraphicsConsole); + if (!NT_SUCCESS(Status)) + { + EarlyPrint(L"GFX FAILED: %lx\n", Status); + BlMmFreeHeap(GraphicsConsole); + GraphicsConsole = NULL; + } + else + { + /* TEST */ + RtlFillMemory(GraphicsConsole->FrameBuffer, GraphicsConsole->FrameBufferSize, 0x55); + } + } + } + + /* Are we using something else than the default mode? */ + if (DisplayMode != &ConsoleGraphicalResolutionList[0]) + { + EarlyPrint(L"Display path not handled\n"); + return STATUS_NOT_SUPPORTED; + } + + /* Mask out all the flags now */ + ConsoleGraphicalResolutionListFlags &= ~(BL_DISPLAY_GRAPHICS_FORCED_VIDEO_MODE_FLAG | + BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG); + } + + /* Do we have a graphics console? */ + TextConsole = NULL; + if (!GraphicsConsole) + { + /* Nope -- go allocate a text console */ + TextConsole = BlMmAllocateHeap(sizeof(*TextConsole)); + if (TextConsole) + { + /* Construct it */ + Status = ConsoleTextLocalConstruct(TextConsole, TRUE); + if (!NT_SUCCESS(Status)) + { + BlMmFreeHeap(TextConsole); + TextConsole = NULL; + } + } + } + + /* Initialize all globals to NULL */ + DspRemoteInputConsole = NULL; + DspTextConsole = NULL; + DspGraphicalConsole = NULL; + + /* If we don't have a text console, go get a remote console */ + RemoteConsole = NULL; + if (!TextConsole) + { + ConsoleCreateRemoteConsole(&RemoteConsole); + } + + /* Do we have a remote console? */ + if (!RemoteConsole) + { + /* Nope -- what about a graphical one? */ + if (GraphicsConsole) + { + /* Yes, use it for both graphics and text */ + DspGraphicalConsole = GraphicsConsole; + DspTextConsole = GraphicsConsole; + } + else if (TextConsole) + { + /* Nope, but we have a text console */ + DspTextConsole = TextConsole; + } + + /* Console has been setup */ + return STATUS_SUCCESS; + } + + /* We have a remote console -- have to figure out how to use it*/ + EarlyPrint(L"Display path not handled\n"); + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +BlpDisplayInitialize ( + _In_ ULONG Flags + ) +{ + NTSTATUS Status; + + /* Are we resetting or initializing? */ + if (Flags & BL_LIBRARY_FLAG_REINITIALIZE) + { + /* This is a reset */ + Status = STATUS_NOT_IMPLEMENTED; +#if 0 + Status = DsppReinitialize(Flags); + if (NT_SUCCESS(Status)) + { + Status = BlpDisplayReinitialize(); + } +#endif + } + else + { + /* Initialize the display */ + Status = DsppInitialize(Flags); + } + + /* Return display initailziation state */ + return Status; +} + +VOID +BlDisplayGetTextCellResolution ( + _Out_ PULONG TextWidth, + _Out_ PULONG TextHeight + ) +{ + NTSTATUS Status; + + /* If the caller doesn't want anything, bail out */ + if (!(TextWidth) || !(TextHeight)) + { + return; + } + + /* Do we have a text console? */ + Status = STATUS_UNSUCCESSFUL; + if (DspTextConsole) + { + /* Do we have a graphics console? */ + if (DspGraphicalConsole) + { + /* Yep -- query it */ + EarlyPrint(L"Not supported\n"); + Status = STATUS_NOT_IMPLEMENTED; + } + } + + /* Check if we failed to get it from the graphics console */ + if (!NT_SUCCESS(Status)) + { + /* Set default text size */ + *TextWidth = 8; + *TextHeight = 8; + } +} Propchange: trunk/reactos/boot/environ/lib/io/display/display.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/environ/lib/io/display/efi/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Sep 7 19:35:24 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/boot/environ/lib/io/display/efi/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/boot/environ/lib/io/display/efi/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/boot/environ/lib/io/display/efi/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/boot/environ/lib/io/display/efi/gop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/efi/gop.c (added) +++ trunk/reactos/boot/environ/lib/io/display/efi/gop.c [iso-8859-1] Mon Sep 7 19:35:24 2015 @@ -0,0 +1,280 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/io/display/efi/gop.c + * PURPOSE: Boot Library EFI GOP Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +ConsoleEfiGopGetGraphicalFormat ( + _In_ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *ModeInfo, + _Out_ PULONG PixelDepth + ) +{ + /* Convert the format to depth */ + if (ModeInfo->PixelFormat == PixelBlueGreenRedReserved8BitPerColor) + { + *PixelDepth = 32; + return STATUS_SUCCESS; + } + if (ModeInfo->PixelFormat == PixelBitMask) + { + *PixelDepth = 24; + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +BOOLEAN +ConsoleEfiGopIsPixelFormatSupported ( + _In_ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Mode + ) +{ + BOOLEAN Supported; + EFI_PIXEL_BITMASK PixelMask; + + Supported = FALSE; + + /* Check if it's simple BGR8 */ + if (Mode->PixelFormat == PixelBlueGreenRedReserved8BitPerColor) + { + Supported = TRUE; + } + else + { + /* Otherwise, we can check if it's a masked format */ + if (Mode->PixelFormat == PixelBitMask) + { + /* Check if the masked format is BGR8 */ + PixelMask.BlueMask = 0xFF; + PixelMask.GreenMask = 0xFF00; + PixelMask.RedMask = 0xFF0000; + PixelMask.ReservedMask = 0; + if (RtlEqualMemory(&Mode->PixelInformation, + &PixelMask, + sizeof(PixelMask))) + { + Supported = TRUE; + } + } + } + + /* Return if the format was supported */ + return Supported; +} + + +NTSTATUS +ConsoleEfiGopFindModeFromAllowed ( + _In_ EFI_GRAPHICS_OUTPUT_PROTOCOL *GopProtocol, + _In_ PBL_DISPLAY_MODE SupportedModes, + _In_ ULONG MaximumIndex, + _Out_ PULONG SupportedMode + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +ConsoleEfiGopEnable ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + PVOID FrameBuffer; + UINTN CurrentMode, Dummy; + ULONG Mode, PixelDepth; + UINTN FrameBufferSize; + EFI_GRAPHICS_OUTPUT_MODE_INFORMATION ModeInformation; + EFI_GRAPHICS_OUTPUT_PROTOCOL* Protocol; + NTSTATUS Status; + PHYSICAL_ADDRESS FrameBufferPhysical; + + /* Capture the current mode and protocol */ + Mode = GraphicsConsole->Mode; + Protocol = GraphicsConsole->Protocol; + + /* Get the current mode and its information */ + Status = EfiGopGetCurrentMode(Protocol, &CurrentMode, &ModeInformation); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Check if we're not in the mode we should be */ + if (CurrentMode != Mode) + { + /* Switch modes */ + Status = EfiGopSetMode(Protocol, Mode); + if (Status < 0) + { + return Status; + } + + /* Reset the OEM bitmap and get the new more information */ +// BlDisplayInvalidateOemBitmap(); + EfiGopGetCurrentMode(Protocol, &Dummy, &ModeInformation); + } + + /* Get the pixel depth for this mode */ + Status = ConsoleEfiGopGetGraphicalFormat(&ModeInformation, &PixelDepth); + if (NT_SUCCESS(Status)) + { + /* Get the framebuffer for this mode */ + EfiGopGetFrameBuffer(Protocol, &FrameBufferPhysical, &FrameBufferSize); + + /* Map the framebuffer, try as writeback first */ + FrameBuffer = NULL; + Status = BlMmMapPhysicalAddressEx(&FrameBuffer, + BlMemoryWriteBack, + FrameBufferSize, + FrameBufferPhysical); + if (!NT_SUCCESS(Status)) + { + /* That didn't work, so try uncached next */ + Status = BlMmMapPhysicalAddressEx(&FrameBuffer, + BlMemoryUncached, + FrameBufferSize, + FrameBufferPhysical); + } + } + + /* Check if getting all the required information worked out */ + if (NT_SUCCESS(Status)) + { + /* Capture the resolution, depth, and framebuffer information */ + GraphicsConsole->DisplayMode.HRes = ModeInformation.HorizontalResolution; + GraphicsConsole->DisplayMode.VRes = ModeInformation.VerticalResolution; + GraphicsConsole->DisplayMode.HRes2 = ModeInformation.PixelsPerScanLine; + GraphicsConsole->PixelDepth = PixelDepth; + GraphicsConsole->FrameBuffer = FrameBuffer; + GraphicsConsole->FrameBufferSize = FrameBufferSize; + GraphicsConsole->PixelsPerScanLine = ModeInformation.PixelsPerScanLine; + + /* All good */ + Status = STATUS_SUCCESS; + } + else if (CurrentMode != GraphicsConsole->Mode) + { + /* We failed seomewhere, reset the mode and the OEM bitmap back */ + EfiGopSetMode(Protocol, CurrentMode); + //BlDisplayInvalidateOemBitmap(); + } + + /* Return back to caller */ + return Status; +} + +VOID +ConsoleEfiGopClose ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + ULONG OldMode; + + /* Did we switch modes when we turned on the console? */ + OldMode = GraphicsConsole->OldMode; + if (GraphicsConsole->Mode != OldMode) + { + /* Restore the old mode and reset the OEM bitmap in ACPI */ + EfiGopSetMode(GraphicsConsole->Protocol, OldMode); + //BlDisplayInvalidateOemBitmap(); + } + + /* Close the GOP protocol */ + EfiCloseProtocol(GraphicsConsole->Handle, + &EfiGraphicsOutputProtocol); +} + +NTSTATUS +ConsoleEfiGopOpen ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + NTSTATUS Status; + EFI_GRAPHICS_OUTPUT_PROTOCOL *GopProtocol; + ULONG Mode, PixelDepth; + UINTN CurrentMode; + EFI_GRAPHICS_OUTPUT_MODE_INFORMATION ModeInformation; + BOOLEAN CurrentModeOk; + + /* Open a handle to GOP */ + Status = EfiOpenProtocol(GraphicsConsole->Handle, + &EfiGraphicsOutputProtocol, + (PVOID*)&GopProtocol); + if (!NT_SUCCESS(Status)) + { + EarlyPrint(L"GOP OPEN failed: %lx\n", Status); + return STATUS_NOT_SUPPORTED; + } + + /* Get the current mode */ + Status = EfiGopGetCurrentMode(GopProtocol, &CurrentMode, &ModeInformation); + if (!NT_SUCCESS(Status)) + { + EarlyPrint(L"GOP mode failed: %lx\n", Status); + goto Quickie; + } + + Mode = CurrentMode; + + /* Check if any custom BCD options were provided */ + if (ConsoleGraphicalResolutionListFlags & + (BL_DISPLAY_GRAPHICS_FORCED_VIDEO_MODE_FLAG | + BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG)) + { + /* We'll have to find a mode */ + CurrentModeOk = FALSE; + } + else + { + /* Then we should be in the default mode, check if the pixel format is OK */ + CurrentModeOk = ConsoleEfiGopIsPixelFormatSupported(&ModeInformation); + } + + /* Is the mode/format OK? */ + if (!CurrentModeOk) + { + /* Nope -- we'll have to go find one */ + Status = ConsoleEfiGopFindModeFromAllowed(GopProtocol, + ConsoleGraphicalResolutionList, + ConsoleGraphicalResolutionListSize, + &Mode); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + } + + /* Store mode information */ + GraphicsConsole->Protocol = GopProtocol; + GraphicsConsole->Mode = Mode; + GraphicsConsole->OldMode = CurrentMode; + + /* Get format information */ + Status = ConsoleEfiGopGetGraphicalFormat(&ModeInformation, &PixelDepth); + if (NT_SUCCESS(Status)) + { + /* Store it */ + GraphicsConsole->OldDisplayMode.HRes = ModeInformation.HorizontalResolution; + GraphicsConsole->OldDisplayMode.VRes = ModeInformation.VerticalResolution; + GraphicsConsole->OldDisplayMode.HRes2 = ModeInformation.PixelsPerScanLine; + GraphicsConsole->PixelDepth = PixelDepth; + return STATUS_SUCCESS; + } + +Quickie: + /* We failed, close the protocol and return the failure code */ + EarlyPrint(L"Get format failed: %lx\n", Status); + EfiCloseProtocol(GraphicsConsole->Handle, &EfiGraphicsOutputProtocol); + return Status; +} + Propchange: trunk/reactos/boot/environ/lib/io/display/efi/gop.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/environ/lib/io/display/efi/guicons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/efi/guicons.c (added) +++ trunk/reactos/boot/environ/lib/io/display/efi/guicons.c [iso-8859-1] Mon Sep 7 19:35:24 2015 @@ -0,0 +1,113 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/io/display/efi/guicons.c + * PURPOSE: Boot Library EFI GUI Console Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +VOID +ConsoleFirmwareGraphicalClose ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + /* Call the correct close routine based on the console mode */ + if (GraphicsConsole->Type == BlUgaConsole) + { + ConsoleEfiUgaClose(GraphicsConsole); + } + else + { + ConsoleEfiGopClose(GraphicsConsole); + } +} + +NTSTATUS +ConsoleEfiGraphicalOpenProtocol ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole, + _In_ BL_GRAPHICS_CONSOLE_TYPE Type + ) +{ + ULONG HandleIndex, HandleCount; + EFI_HANDLE* HandleArray; + EFI_HANDLE Handle; + NTSTATUS Status; + PVOID Interface; + + /* Find a device handle that implements either GOP or UGA */ + HandleCount = 0; + HandleArray = NULL; + Status = EfiLocateHandleBuffer(ByProtocol, + (Type == BlGopConsole) ? + &EfiGraphicsOutputProtocol : + &EfiUgaDrawProtocol, + &HandleCount, + &HandleArray); + if (!NT_SUCCESS(Status)) + { + /* Nothing supports this (no video card?) */ + EarlyPrint(L"Status: %lx Count: %d\n", Status, HandleCount); + return STATUS_UNSUCCESSFUL; + } + + /* Scan through the handles we received */ + for (HandleIndex = 0; HandleIndex < HandleCount; HandleIndex++) + { + /* Try to open each one */ + GraphicsConsole->Handle = HandleArray[HandleIndex]; + Handle = HandleArray[HandleIndex]; + Status = EfiOpenProtocol(Handle, &EfiDevicePathProtocol, &Interface); + if (NT_SUCCESS(Status)) + { + /* Test worked, close the protocol */ + EfiCloseProtocol(Handle, &EfiDevicePathProtocol); + + /* Now open the real protocol we want, either UGA or GOP */ + Status = Type ? ConsoleEfiUgaOpen(GraphicsConsole) : + ConsoleEfiGopOpen(GraphicsConsole); + if (NT_SUCCESS(Status)) + { + /* It worked -- store the type of console this is */ + GraphicsConsole->Type = Type; + return STATUS_SUCCESS; + } + } + } + + /* We failed to find a working GOP/UGA protocol provider */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +ConsoleFirmwareGraphicalEnable ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + NTSTATUS Status; + + /* Check what type of console this is */ + if (GraphicsConsole->Type == BlUgaConsole) + { + /* Handle UGA */ + Status = ConsoleEfiUgaSetResolution(GraphicsConsole, + &GraphicsConsole->DisplayMode, + 1); + } + else + { + /* Handle GOP */ + Status = ConsoleEfiGopEnable(GraphicsConsole); + } + + /* Return back to caller */ + return Status; +} + Propchange: trunk/reactos/boot/environ/lib/io/display/efi/guicons.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/environ/lib/io/display/efi/textcons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/efi/textcons.c (added) +++ trunk/reactos/boot/environ/lib/io/display/efi/textcons.c [iso-8859-1] Mon Sep 7 19:35:24 2015 @@ -0,0 +1,491 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/io/display/efi/textcons.c + * PURPOSE: Boot Library EFI Text Console Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +BL_COLOR +ConsoleEfiTextGetColorForeground ( + _In_ UINT32 Attributes + ) +{ + /* Read the foreground color attribute and convert to CGA color index */ + switch (Attributes & 0x0F) + { + case EFI_BLACK: + return Black; + case EFI_BLUE: + return Blue; + case EFI_GREEN: + return Green; + case EFI_RED: + return Red; + case EFI_CYAN: + return Cyan; + case EFI_MAGENTA: + return Magenta; + case EFI_BROWN: + return Brown; + case EFI_LIGHTGRAY: + return LtGray; + case EFI_DARKGRAY: + return Gray; + case EFI_LIGHTBLUE: + return LtBlue; + case EFI_LIGHTGREEN: + return LtGreen; + case EFI_LIGHTCYAN: + return LtCyan; + case EFI_LIGHTRED: + return LtRed; + case EFI_LIGHTMAGENTA: + return LtMagenta; + case EFI_YELLOW: + return Yellow; + case EFI_WHITE: + default: + return White; + } +} + +BL_COLOR +ConsoleEfiTextGetColorBackground ( + _In_ UINT32 Attributes + ) +{ + /* Read the background color attribute and convert to CGA color index */ + switch (Attributes & 0xF0) + { + case EFI_BACKGROUND_MAGENTA: + return Magenta; + case EFI_BACKGROUND_BROWN: + return Brown; + case EFI_BACKGROUND_LIGHTGRAY: + return White; + case EFI_BACKGROUND_BLACK: + default: + return Black; + case EFI_BACKGROUND_RED: + return Red; + case EFI_BACKGROUND_GREEN: + return Green; + case EFI_BACKGROUND_CYAN: + return Cyan; + case EFI_BACKGROUND_BLUE: + return Blue; + } +} + +ULONG +ConsoleEfiTextGetEfiColorBackground ( + _In_ BL_COLOR Color + ) +{ + /* Convert the CGA color index into an EFI background attribute */ + switch (Color) + { + case Blue: + case LtBlue: + return EFI_BACKGROUND_BLUE; + case Green: + case LtGreen: + return EFI_BACKGROUND_GREEN; + case Cyan: + case LtCyan: + return EFI_BACKGROUND_CYAN; + case Red: + case LtRed: + return EFI_BACKGROUND_RED; + case Magenta: + case LtMagenta: + return EFI_BACKGROUND_MAGENTA; + case Brown: + case Yellow: + return EFI_BACKGROUND_BROWN; + case LtGray: + case White: + return EFI_BACKGROUND_LIGHTGRAY; + case Black: + case Gray: + default: + return EFI_BACKGROUND_BLACK; + } +} + +ULONG +ConsoleEfiTextGetEfiColorForeground ( + _In_ BL_COLOR Color + ) +{ + /* Convert the CGA color index into an EFI foreground attribute */ + switch (Color) + { + case Black: + return EFI_BLACK; + case Blue: + return EFI_BLUE; + case Green: + return EFI_GREEN; + case Cyan: + return EFI_CYAN; + case Red: + return EFI_RED; + case Magenta: + return EFI_MAGENTA; + case Brown: + return EFI_BROWN; + case LtGray: + return EFI_LIGHTGRAY; + case Gray: + return EFI_DARKGRAY; + case LtBlue: + return EFI_LIGHTBLUE; + case LtGreen: + return EFI_LIGHTGREEN; + case LtCyan: + return EFI_LIGHTCYAN; + case LtRed: + return EFI_LIGHTRED; + case LtMagenta: + return EFI_LIGHTMAGENTA; + case Yellow: + return EFI_YELLOW; + case White: + default: + return EFI_WHITE; + } +} + +ULONG +ConsoleEfiTextGetAttribute ( + BL_COLOR BgColor, + BL_COLOR FgColor + ) +{ + /* Convert each part and OR into a single attribute */ + return ConsoleEfiTextGetEfiColorBackground(BgColor) | + ConsoleEfiTextGetEfiColorForeground(FgColor); +} + +VOID +ConsoleEfiTextGetStateFromMode ( + _In_ EFI_SIMPLE_TEXT_OUTPUT_MODE *Mode, + _Out_ PBL_DISPLAY_STATE State + ) +{ + ULONG TextWidth, TextHeight; + + /* Get all the EFI data and convert it into our own structure */ + BlDisplayGetTextCellResolution(&TextWidth, &TextHeight); + State->FgColor = ConsoleEfiTextGetColorForeground(Mode->Attribute); + State->BgColor = ConsoleEfiTextGetColorBackground(Mode->Attribute); + State->XPos = Mode->CursorColumn * TextWidth; + State->YPos = Mode->CursorRow * TextHeight; + State->CursorVisible = Mode->CursorVisible != FALSE; +} + +NTSTATUS +ConsoleFirmwareTextSetState ( + _In_ PBL_TEXT_CONSOLE TextConsole, + _In_ UCHAR Mask, + _In_ PBL_DISPLAY_STATE State + ) +{ + NTSTATUS Status; + ULONG FgColor, BgColor, Attribute, XPos, YPos, TextHeight, TextWidth; + BOOLEAN Visible; + + /* Check if foreground state is being set */ + if (Mask & 1) + { + /* Check if there's a difference from current */ + FgColor = State->FgColor; + if (TextConsole->State.FgColor != FgColor) + { + /* Ignore invalid color */ + if (FgColor > White) + { + return STATUS_INVALID_PARAMETER; + } + + /* Convert from NT/CGA format to EFI, and then set the attribute */ + Attribute = ConsoleEfiTextGetAttribute(TextConsole->State.BgColor, + FgColor); + Status = EfiConOutSetAttribute(TextConsole->Protocol, Attribute); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Update cached state */ + TextConsole->State.FgColor = FgColor; + } + } + + /* Check if background state is being set */ + if (Mask & 2) + { + /* Check if there's a difference from current */ + BgColor = State->BgColor; + if (TextConsole->State.BgColor != BgColor) + { + /* Ignore invalid color */ + if (BgColor > White) + { + return STATUS_INVALID_PARAMETER; + } + + /* Convert from NT/CGA format to EFI, and then set the attribute */ + Attribute = ConsoleEfiTextGetAttribute(BgColor, + TextConsole->State.FgColor); + Status = EfiConOutSetAttribute(TextConsole->Protocol, Attribute); + + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Update cached state */ + TextConsole->State.BgColor = BgColor; + } + } + + /* Check if position state is being set */ + if (Mask & 4) + { + /* Check if there's a difference from current */ + XPos = State->XPos; + YPos = State->YPos; + if ((TextConsole->State.XPos != XPos) || + (TextConsole->State.YPos != YPos)) + { + /* Set the new cursor position */ + BlDisplayGetTextCellResolution(&TextWidth, &TextHeight); + Status = EfiConOutSetCursorPosition(TextConsole->Protocol, + XPos/ TextWidth, + YPos / TextHeight); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Update cached state */ + TextConsole->State.XPos = XPos; + TextConsole->State.YPos = YPos; + } + } + + /* Check if cursor state is being set */ + if (Mask & 8) + { + /* Check if there's a difference from current */ + Visible = State->CursorVisible; + if (TextConsole->State.CursorVisible != Visible) + { + /* Ignore invalid state */ + if (Visible >= 3) + { + return STATUS_INVALID_PARAMETER; + } + + /* Set the new cursor state */ + Status = EfiConOutEnableCursor(TextConsole->Protocol, Visible); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Update cached status */ + TextConsole->State.CursorVisible = Visible; + } + } + + /* Return success */ + return STATUS_SUCCESS; +} + +NTSTATUS +ConsoleEfiTextFindModeFromAllowed ( + _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextProtocol, + _In_ PBL_DISPLAY_MODE SupportedModes, + _In_ ULONG MaxIndex, + _Out_ PULONG SupportedMode + ) +{ + EFI_SIMPLE_TEXT_OUTPUT_MODE ModeInfo; + ULONG MaxMode, MaxQueriedMode, Mode, i, MatchingMode; + UINTN HRes, VRes; + ULONGLONG ModeListSize; + PBL_DISPLAY_MODE ModeEntry, ModeList, SupportedModeEntry; + NTSTATUS Status; + + /* Read information on the current mode */ + EfiConOutReadCurrentMode(TextProtocol, &ModeInfo); + + /* Figure out the max mode, and how many modes we'll have to read */ + MaxMode = ModeInfo.MaxMode; + ModeListSize = sizeof(*ModeEntry) * ModeInfo.MaxMode; + if (ModeListSize > MAXULONG) + { + return STATUS_INTEGER_OVERFLOW; + } + + /* Allocate a list for all the supported EFI modes */ + ModeList = BlMmAllocateHeap(ModeListSize); + if (!ModeList) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Scan all the EFI modes */ + EarlyPrint(L"Scanning through %d modes\n", MaxMode); + for (MaxQueriedMode = 0, Mode = 0; Mode < MaxMode; Mode++) + { + /* Query information on this mode */ + ModeEntry = &ModeList[MaxQueriedMode]; + if (NT_SUCCESS(EfiConOutQueryMode(TextProtocol, + Mode, + &HRes, + &VRes))) + { + /* This mode was succesfully queried. Save the data */ + EarlyPrint(L"EFI Firmware Supported Mode %d is H: %d V: %d\n", Mode, HRes, VRes); + ModeEntry->HRes = HRes; + ModeEntry->VRes = VRes; + ModeEntry->HRes2 = HRes; + MaxQueriedMode = Mode + 1; + } + } + + /* Loop all the supported mode entries */ + for (i = 0; i < MaxIndex; i++) + { + /* Loop all the UEFI queried modes */ + SupportedModeEntry = &SupportedModes[i]; + for (MatchingMode = 0; MatchingMode < MaxQueriedMode; MatchingMode++) + { + /* Check if the UEFI mode is compatible with our supported mode */ + ModeEntry = &ModeList[MatchingMode]; + EarlyPrint(L"H1: %d V1: %d - H2: %d - V2: %d\n", ModeEntry->HRes, ModeEntry->VRes, SupportedModeEntry->HRes, SupportedModeEntry->VRes); + if ((ModeEntry->HRes == SupportedModeEntry->HRes) && + (ModeEntry->VRes == SupportedModeEntry->VRes)) + { + /* Yep -- free the mode list and return this mode */ + BlMmFreeHeap(ModeList); + *SupportedMode = MatchingMode; + return STATUS_SUCCESS; + } + } + } + + /* We can't do anything -- there are no matching modes */ + Status = STATUS_UNSUCCESSFUL; + BlMmFreeHeap(ModeList); + return Status; +} + +VOID +ConsoleFirmwareTextClose ( + _In_ PBL_TEXT_CONSOLE TextConsole + ) +{ + ULONG Mode; + BL_DISPLAY_STATE DisplayState; + + /* Read the original mode, and see if it's different than the one now */ + Mode = TextConsole->OldMode.Mode; + if (Mode != TextConsole->Mode) + { + /* Restore to the original mode */ + EfiConOutSetMode(TextConsole->Protocol, Mode); + } + + /* Read the EFI settings for the original mode */ + ConsoleEfiTextGetStateFromMode(&TextConsole->OldMode, &DisplayState); + + /* Set the original settings */ + ConsoleFirmwareTextSetState(TextConsole, 0xF, &DisplayState); +} + +NTSTATUS +ConsoleFirmwareTextOpen ( + _In_ PBL_TEXT_CONSOLE TextConsole + ) +{ + BL_DISPLAY_MODE DisplayMode; + EFI_SIMPLE_TEXT_OUTPUT_MODE CurrentMode, NewMode; + UINTN HRes, VRes; + ULONG Mode; + NTSTATUS Status; + + /* Read the current mode and its settings */ + EfiConOutReadCurrentMode(EfiConOut, &CurrentMode); + Status = EfiConOutQueryMode(EfiConOut, CurrentMode.Mode, &HRes, &VRes); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Save the current mode and its settings */ + NewMode = CurrentMode; + DisplayMode.VRes = VRes; + DisplayMode.HRes = HRes; + DisplayMode.HRes2 = HRes; + + /* Check if the current mode is compatible with one of our modes */ + if (!ConsolepFindResolution(&DisplayMode, ConsoleTextResolutionList, 1)) + { + /* It isn't -- find a matching EFI mode for what we need */ + EarlyPrint(L"In incorrect mode, scanning for right one\n"); + Status = ConsoleEfiTextFindModeFromAllowed(EfiConOut, + ConsoleTextResolutionList, + 1, + &Mode); + if (!NT_SUCCESS(Status)) + { + EarlyPrint(L"Failed to find mode: %lx\n", Status); + return Status; + } + + /* Set the new EFI mode */ + EarlyPrint(L"Setting new mode: %d\n", Mode); + Status = EfiConOutSetMode(EfiConOut, Mode); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Read the current mode and its settings */ + EfiConOutReadCurrentMode(EfiConOut, &NewMode); + Status = EfiConOutQueryMode(EfiConOut, Mode, &HRes, &VRes); + if (!NT_SUCCESS(Status)) + { + EfiConOutSetMode(EfiConOut, CurrentMode.Mode); + return Status; + } + + /* Save the current mode and its settings */ + DisplayMode.HRes = HRes; + DisplayMode.VRes = VRes; + DisplayMode.HRes2 = HRes; + } + + /* Capture all the current settings */ + ConsoleEfiTextGetStateFromMode(&NewMode, &TextConsole->State); + TextConsole->Mode = NewMode.Mode; + TextConsole->DisplayMode = DisplayMode; + TextConsole->Protocol = EfiConOut; + TextConsole->OldMode = CurrentMode; + return STATUS_SUCCESS; +} + Propchange: trunk/reactos/boot/environ/lib/io/display/efi/textcons.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/environ/lib/io/display/efi/uga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/efi/uga.c (added) +++ trunk/reactos/boot/environ/lib/io/display/efi/uga.c [iso-8859-1] Mon Sep 7 19:35:24 2015 @@ -0,0 +1,42 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/io/display/efi/uga.c + * PURPOSE: Boot Library EFI UGA Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +ConsoleEfiUgaOpen ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + EarlyPrint(L"UGA not implemented\n"); + return STATUS_NOT_IMPLEMENTED; +} + +VOID +ConsoleEfiUgaClose ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + return; +} + +NTSTATUS +ConsoleEfiUgaSetResolution ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole, + _In_ PBL_DISPLAY_MODE DisplayMode, + _In_ ULONG DisplayModeCount + ) +{ + return STATUS_NOT_IMPLEMENTED; +} Propchange: trunk/reactos/boot/environ/lib/io/display/efi/uga.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/environ/lib/io/display/emscons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/emscons.c (added) +++ trunk/reactos/boot/environ/lib/io/display/emscons.c [iso-8859-1] Mon Sep 7 19:35:24 2015 @@ -0,0 +1,58 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/io/display/emscons.c + * PURPOSE: Boot Library Remote Console Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +ConsoleRemoteConstruct ( + _In_ PBL_REMOTE_CONSOLE RemoteConsole + ) +{ +#ifdef BL_EMS_SUPPORT +#error Implement me +#else + /* We don't support EMS for now */ + return STATUS_NOT_IMPLEMENTED; +#endif +} + +NTSTATUS +ConsoleCreateRemoteConsole ( + _In_ PBL_TEXT_CONSOLE* TextConsole + ) +{ + PBL_REMOTE_CONSOLE RemoteConsole; + NTSTATUS Status; + + /* Allocate the remote console */ + RemoteConsole = BlMmAllocateHeap(sizeof(*RemoteConsole)); + if (!RemoteConsole) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Construct it */ + Status = ConsoleRemoteConstruct(RemoteConsole); + if (Status < 0) + { + /* Failed to construct it, delete it */ + BlMmFreeHeap(RemoteConsole); + return Status; + } + + /* Save the global pointer and return a pointer to the text console */ + DspRemoteInputConsole = RemoteConsole; + *TextConsole = &RemoteConsole->TextConsole; + return STATUS_SUCCESS; +} Propchange: trunk/reactos/boot/environ/lib/io/display/emscons.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/environ/lib/io/display/guicons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/guicons.c (added) +++ trunk/reactos/boot/environ/lib/io/display/guicons.c [iso-8859-1] Mon Sep 7 19:35:24 2015 @@ -0,0 +1,71 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/io/display/guicons.c + * PURPOSE: Boot Library GUI Console Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +BL_GRAPHICS_CONSOLE_VTABLE ConsoleGraphicalVtbl = +{ + { NULL }, +}; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +ConsoleGraphicalConstruct ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + NTSTATUS Status; + + /* Create a text console */ + Status = ConsoleTextLocalConstruct(&GraphicsConsole->TextConsole, FALSE); + if (!NT_SUCCESS(Status)) + { + EarlyPrint(L"Text failed: %lx\n", Status); + return Status; + } + + /* But overwrite its callbacks with ours */ + GraphicsConsole->TextConsole.Callbacks = &ConsoleGraphicalVtbl.Text; + + /* Try to create a GOP console */ + Status = ConsoleEfiGraphicalOpenProtocol(GraphicsConsole, BlGopConsole); + if (!NT_SUCCESS(Status)) + { + /* That failed, try an older EFI 1.02 UGA console */ + EarlyPrint(L"GOP open failed!\n", Status); + Status = ConsoleEfiGraphicalOpenProtocol(GraphicsConsole, BlUgaConsole); + if (!NT_SUCCESS(Status)) + { + /* That failed too, give up */ + EarlyPrint(L"UGA failed!\n", Status); + ConsoleTextLocalDestruct(&GraphicsConsole->TextConsole); + return STATUS_UNSUCCESSFUL; + } + } + + /* Enable the console */ + Status = ConsoleFirmwareGraphicalEnable(GraphicsConsole); + if (!NT_SUCCESS(Status)) + { + /* Failed to enable it, undo everything */ + EarlyPrint(L"Enable failed\n"); + ConsoleFirmwareGraphicalClose(GraphicsConsole); + ConsoleTextLocalDestruct(&GraphicsConsole->TextConsole); + return STATUS_UNSUCCESSFUL; + } + + /* Save the graphics text color from the text mode text color */ + GraphicsConsole->FgColor = GraphicsConsole->TextConsole.State.FgColor; + GraphicsConsole->BgColor = GraphicsConsole->TextConsole.State.BgColor; + return STATUS_SUCCESS; +} Propchange: trunk/reactos/boot/environ/lib/io/display/guicons.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/environ/lib/io/display/textcons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… ============================================================================== --- trunk/reactos/boot/environ/lib/io/display/textcons.c (added) +++ trunk/reactos/boot/environ/lib/io/display/textcons.c [iso-8859-1] Mon Sep 7 19:35:24 2015 @@ -0,0 +1,184 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/io/display/textcons.c + * PURPOSE: Boot Library Text Console Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +BL_TEXT_CONSOLE_VTABLE ConsoleTextLocalVtbl = +{ + ConsoleTextLocalDestruct, + ConsoleTextLocalReinitialize, + ConsoleTextBaseGetTextState, + ConsoleTextLocalSetTextState, + ConsoleTextBaseGetTextResolution, + ConsoleTextLocalSetTextResolution, + ConsoleTextLocalClearText, + ConsoleTextLocalWriteText +}; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +ConsoleTextLocalDestruct ( + _In_ struct _BL_TEXT_CONSOLE* Console + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +ConsoleTextLocalReinitialize ( + _In_ struct _BL_TEXT_CONSOLE* Console + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +ConsoleTextBaseGetTextState ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _Out_ PBL_DISPLAY_STATE TextState + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +ConsoleTextLocalSetTextState ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _In_ ULONG Flags, + _In_ PBL_DISPLAY_STATE TextState + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +ConsoleTextBaseGetTextResolution ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _Out_ PULONG TextResolution + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +ConsoleTextLocalSetTextResolution ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _In_ ULONG NewTextResolution, + _Out_ PULONG OldTextResolution + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +ConsoleTextLocalClearText ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _In_ ULONG Attribute + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +ConsoleTextLocalWriteText ( + _In_ struct _BL_TEXT_CONSOLE* Console, + _In_ PCHAR Text, + _In_ ULONG Attribute + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +ConsoleTextLocalConstruct ( + _In_ PBL_TEXT_CONSOLE TextConsole, + _In_ BOOLEAN Activate + ) +{ + NTSTATUS Status; + BL_DISPLAY_STATE TextState; + + /* Set our callbacks */ + TextConsole->Callbacks = &ConsoleTextLocalVtbl; + + /* Are we activating this console? */ + if (Activate) + { + /* Call firmware to activate it */ + Status = ConsoleFirmwareTextOpen(TextConsole); + if (!NT_SUCCESS(Status)) + { + EarlyPrint(L"Failed to activate console: %lx\n", Status); + return Status; + } + } + + /* Set default text state */ + TextState.BgColor = 0; + TextState.XPos = 0; + TextState.YPos = 0; + TextState.CursorVisible = FALSE; + TextState.FgColor = White; + + /* Are we activating? */ + if (Activate) + { + /* Call firmware to set it */ + Status = ConsoleFirmwareTextSetState(TextConsole, 0xF, &TextState); + if (!NT_SUCCESS(Status)) + { + /* We failed, back down */ + EarlyPrint(L"Failed to set console state: %lx\n", Status); + ConsoleFirmwareTextClose(TextConsole); + return Status; + } + } + else + { + /* Just save the state for now, someone else can activate later */ + TextConsole->State = TextState; + } + + /* Remember if we activated it */ + TextConsole->Active = Activate; + return STATUS_SUCCESS; +} + +BOOLEAN +ConsolepFindResolution ( + _In_ PBL_DISPLAY_MODE Mode, + _In_ PBL_DISPLAY_MODE List, + _In_ ULONG MaxIndex + ) +{ + PBL_DISPLAY_MODE ListEnd; + + /* Loop until we hit the maximum supported list index */ + ListEnd = &List[MaxIndex]; + while (List != ListEnd) + { + /* Does this resolution match? */ + if ((Mode->HRes == List->HRes) && (Mode->VRes == List->VRes)) + { + /* Yep -- we got a match */ + return TRUE; + + } + + /* Try another one*/ + List++; + } + + /* No matches were found */ + return FALSE; +} Propchange: trunk/reactos/boot/environ/lib/io/display/textcons.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/environ/lib/io/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/fat.c?… ============================================================================== --- trunk/reactos/boot/environ/lib/io/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/fat.c [iso-8859-1] Mon Sep 7 19:35:24 2015 @@ -1,10 +1,10 @@ /* -* COPYRIGHT: See COPYING.ARM in the top level directory -* PROJECT: ReactOS UEFI Boot Library -* FILE: boot/environ/lib/io/fat.c -* PURPOSE: Boot Library FAT File System Management Routines -* PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) -*/ + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/io/fat.c + * PURPOSE: Boot Library FAT File System Management Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ /* INCLUDES ******************************************************************/ Removed: trunk/reactos/boot/environ/lib/platform/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/platform/… ============================================================================== --- trunk/reactos/boot/environ/lib/platform/display.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/platform/display.c (removed) @@ -1,1626 +0,0 @@ -/* - * COPYRIGHT: See COPYING.ARM in the top level directory - * PROJECT: ReactOS UEFI Boot Library - * FILE: boot/environ/lib/platform/display.c - * PURPOSE: Boot Library Display Management Routines - * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include "bl.h" -#include <bcd.h> - -/* DATA VARIABLES ************************************************************/ - -typedef enum _BL_COLOR -{ - Black, - Blue, - Green, - Cyan, - Red, - Magenta, - Brown, - LtGray, - Gray, - LtBlue, - LtGreen, - LtCyan, - LtRed, - LtMagenta, - Yellow, - White -} BL_COLOR, *PBL_COLOR; - -typedef struct _BL_DISPLAY_STATE -{ - ULONG BgColor; - ULONG FgColor; - ULONG XPos; - ULONG YPos; - ULONG CursorVisible; -} BL_DISPLAY_STATE, *PBL_DISPLAY_STATE; - -typedef struct _BL_DISPLAY_MODE -{ - ULONG HRes; - ULONG VRes; - ULONG HRes2; -} BL_DISPLAY_MODE, *PBL_DISPLAY_MODE; - -struct _BL_TEXT_CONSOLE; -typedef -NTSTATUS -(*PCONSOLE_DESTRUCT) ( - _In_ struct _BL_TEXT_CONSOLE* Console - ); - -typedef -NTSTATUS -(*PCONSOLE_REINITIALIZE) ( - _In_ struct _BL_TEXT_CONSOLE* Console - ); - -typedef -NTSTATUS -(*PCONSOLE_GET_TEXT_STATE) ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _Out_ PBL_DISPLAY_STATE TextState - ); - -typedef -NTSTATUS -(*PCONSOLE_SET_TEXT_STATE) ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _In_ ULONG Flags, - _In_ PBL_DISPLAY_STATE TextState - ); - -typedef -NTSTATUS -(*PCONSOLE_GET_TEXT_RESOLUTION) ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _Out_ PULONG TextResolution - ); - -typedef -NTSTATUS -(*PCONSOLE_SET_TEXT_RESOLUTION) ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _In_ ULONG NewTextResolution, - _Out_ PULONG OldTextResolution - ); - -typedef -NTSTATUS -(*PCONSOLE_CLEAR_TEXT) ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _In_ ULONG Attribute - ); - - -typedef -NTSTATUS -(*PCONSOLE_WRITE_TEXT) ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _In_ PCHAR Text, - _In_ ULONG Attribute - ); - -typedef struct _BL_TEXT_CONSOLE_VTABLE -{ - PCONSOLE_DESTRUCT Destruct; - PCONSOLE_REINITIALIZE Reinitialize; - PCONSOLE_GET_TEXT_STATE GetTextState; - PCONSOLE_SET_TEXT_STATE SetTextState; - PCONSOLE_GET_TEXT_RESOLUTION GetTextResolution; - PCONSOLE_SET_TEXT_RESOLUTION SetTextResolution; - PCONSOLE_CLEAR_TEXT ClearText; - PCONSOLE_WRITE_TEXT WriteText; -} BL_TEXT_CONSOLE_VTABLE, *PBL_TEXT_CONSOLE_VTABLE; - -typedef struct _BL_GRAPHICS_CONSOLE_VTABLE -{ - BL_TEXT_CONSOLE_VTABLE Text; - /// more for graphics /// -} BL_GRAPHICS_CONSOLE_VTABLE, *PBL_GRAPHICS_CONSOLE_VTABLE; - -typedef struct _BL_TEXT_CONSOLE -{ - PBL_TEXT_CONSOLE_VTABLE Callbacks; - BL_DISPLAY_STATE State; - BL_DISPLAY_MODE DisplayMode; - BOOLEAN Active; - EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL* Protocol; - ULONG Mode; - EFI_SIMPLE_TEXT_OUTPUT_MODE OldMode; -} BL_TEXT_CONSOLE, *PBL_TEXT_CONSOLE; - -typedef enum _BL_GRAPHICS_CONSOLE_TYPE -{ - BlGopConsole, - BlUgaConsole -} BL_GRAPHICS_CONSOLE_TYPE; - -typedef struct _BL_GRAPHICS_CONSOLE -{ - BL_TEXT_CONSOLE TextConsole; - BL_DISPLAY_MODE DisplayMode; - ULONG PixelDepth; - ULONG FgColor; - ULONG BgColor; - BL_DISPLAY_MODE OldDisplayMode; - ULONG OldPixelDepth; - EFI_HANDLE Handle; - BL_GRAPHICS_CONSOLE_TYPE Type; - EFI_GRAPHICS_OUTPUT_PROTOCOL* Protocol; - PVOID FrameBuffer; - ULONG FrameBufferSize; - ULONG PixelsPerScanLine; - ULONG Mode; - ULONG OldMode; -} BL_GRAPHICS_CONSOLE, *PBL_GRAPHICS_CONSOLE; - -typedef struct _BL_REMOTE_CONSOLE -{ - BL_TEXT_CONSOLE TextConsole; -} BL_REMOTE_CONSOLE, *PBL_REMOTE_CONSOLE; - -PVOID BfiCachedStrikeData; -LIST_ENTRY BfiDeferredListHead; -LIST_ENTRY BfiFontFileListHead; - -PVOID BfiGraphicsRectangle; - -ULONG ConsoleGraphicalResolutionListFlags; -BL_DISPLAY_MODE ConsoleGraphicalResolutionList[3] = -{ - {1024, 768, 1024}, - {800, 600, 800}, - {1024, 600, 1024} -}; -ULONG ConsoleGraphicalResolutionListSize = RTL_NUMBER_OF(ConsoleGraphicalResolutionList); - -BL_DISPLAY_MODE ConsoleTextResolutionList[1] = -{ - {80, 25, 80} -}; - -NTSTATUS -ConsoleTextLocalDestruct ( - _In_ struct _BL_TEXT_CONSOLE* Console - ); - -NTSTATUS -ConsoleTextLocalReinitialize ( - _In_ struct _BL_TEXT_CONSOLE* Console - ); - -NTSTATUS -ConsoleTextBaseGetTextState ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _Out_ PBL_DISPLAY_STATE TextState - ); - -NTSTATUS -ConsoleTextLocalSetTextState ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _In_ ULONG Flags, - _In_ PBL_DISPLAY_STATE TextState - ); - -NTSTATUS -ConsoleTextBaseGetTextResolution ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _Out_ PULONG TextResolution - ); - -NTSTATUS -ConsoleTextLocalSetTextResolution ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _In_ ULONG NewTextResolution, - _Out_ PULONG OldTextResolution - ); - -NTSTATUS -ConsoleTextLocalClearText ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _In_ ULONG Attribute - ); - -NTSTATUS -ConsoleTextLocalWriteText ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _In_ PCHAR Text, - _In_ ULONG Attribute - ); - -BL_TEXT_CONSOLE_VTABLE ConsoleTextLocalVtbl = -{ - ConsoleTextLocalDestruct, - ConsoleTextLocalReinitialize, - ConsoleTextBaseGetTextState, - ConsoleTextLocalSetTextState, - ConsoleTextBaseGetTextResolution, - ConsoleTextLocalSetTextResolution, - ConsoleTextLocalClearText, - ConsoleTextLocalWriteText -}; - -BL_GRAPHICS_CONSOLE_VTABLE ConsoleGraphicalVtbl = -{ - {NULL}, -}; - -PVOID DspRemoteInputConsole; -PVOID DspTextConsole; -PVOID DspGraphicalConsole; - -/* FUNCTIONS *****************************************************************/ - -BOOLEAN -ConsolepFindResolution ( - _In_ PBL_DISPLAY_MODE Mode, - _In_ PBL_DISPLAY_MODE List, - _In_ ULONG MaxIndex - ) -{ - PBL_DISPLAY_MODE ListEnd; - - /* Loop until we hit the maximum supported list index */ - ListEnd = &List[MaxIndex]; - while (List != ListEnd) - { - /* Does this resolution match? */ - if ((Mode->HRes == List->HRes) && (Mode->VRes == List->VRes)) - { - /* Yep -- we got a match */ - return TRUE; - - } - - /* Try another one*/ - List++; - } - - /* No matches were found */ - return FALSE; -} - -BL_COLOR -ConsoleEfiTextGetColorForeground ( - _In_ UINT32 Attributes - ) -{ - /* Read the foreground color attribute and convert to CGA color index */ - switch (Attributes & 0x0F) - { - case EFI_BLACK: - return Black; - case EFI_BLUE: - return Blue; - case EFI_GREEN: - return Green; - case EFI_RED: - return Red; - case EFI_CYAN: - return Cyan; - case EFI_MAGENTA: - return Magenta; - case EFI_BROWN: - return Brown; - case EFI_LIGHTGRAY: - return LtGray; - case EFI_DARKGRAY: - return Gray; - case EFI_LIGHTBLUE: - return LtBlue; - case EFI_LIGHTGREEN: - return LtGreen; - case EFI_LIGHTCYAN: - return LtCyan; - case EFI_LIGHTRED: - return LtRed; - case EFI_LIGHTMAGENTA: - return LtMagenta; - case EFI_YELLOW: - return Yellow; - case EFI_WHITE: - default: - return White; - } -} - -BL_COLOR -ConsoleEfiTextGetColorBackground ( - _In_ UINT32 Attributes - ) -{ - /* Read the background color attribute and convert to CGA color index */ - switch (Attributes & 0xF0) - { - case EFI_BACKGROUND_MAGENTA: - return Magenta; - case EFI_BACKGROUND_BROWN: - return Brown; - case EFI_BACKGROUND_LIGHTGRAY: - return White; - case EFI_BACKGROUND_BLACK: - default: - return Black; - case EFI_BACKGROUND_RED: - return Red; - case EFI_BACKGROUND_GREEN: - return Green; - case EFI_BACKGROUND_CYAN: - return Cyan; - case EFI_BACKGROUND_BLUE: - return Blue; - } -} - -ULONG -ConsoleEfiTextGetEfiColorBackground ( - _In_ BL_COLOR Color - ) -{ - /* Convert the CGA color index into an EFI background attribute */ - switch (Color) - { - case Blue: - case LtBlue: - return EFI_BACKGROUND_BLUE; - case Green: - case LtGreen: - return EFI_BACKGROUND_GREEN; - case Cyan: - case LtCyan: - return EFI_BACKGROUND_CYAN; - case Red: - case LtRed: - return EFI_BACKGROUND_RED; - case Magenta: - case LtMagenta: - return EFI_BACKGROUND_MAGENTA; - case Brown: - case Yellow: - return EFI_BACKGROUND_BROWN; - case LtGray: - case White: - return EFI_BACKGROUND_LIGHTGRAY; - case Black: - case Gray: - default: - return EFI_BACKGROUND_BLACK; - } -} - -ULONG -ConsoleEfiTextGetEfiColorForeground ( - _In_ BL_COLOR Color - ) -{ - /* Convert the CGA color index into an EFI foreground attribute */ - switch (Color) - { - case Black: - return EFI_BLACK; - case Blue: - return EFI_BLUE; - case Green: - return EFI_GREEN; - case Cyan: - return EFI_CYAN; - case Red: - return EFI_RED; - case Magenta: - return EFI_MAGENTA; - case Brown: - return EFI_BROWN; - case LtGray: - return EFI_LIGHTGRAY; - case Gray: - return EFI_DARKGRAY; - case LtBlue: - return EFI_LIGHTBLUE; - case LtGreen: - return EFI_LIGHTGREEN; - case LtCyan: - return EFI_LIGHTCYAN; - case LtRed: - return EFI_LIGHTRED; - case LtMagenta: - return EFI_LIGHTMAGENTA; - case Yellow: - return EFI_YELLOW; - case White: - default: - return EFI_WHITE; - } -} - -ULONG -ConsoleEfiTextGetAttribute ( - BL_COLOR BgColor, - BL_COLOR FgColor - ) -{ - /* Convert each part and OR into a single attribute */ - return ConsoleEfiTextGetEfiColorBackground(BgColor) | - ConsoleEfiTextGetEfiColorForeground(FgColor); -} - -VOID -ConsoleEfiTextGetStateFromMode ( - _In_ EFI_SIMPLE_TEXT_OUTPUT_MODE *Mode, - _Out_ PBL_DISPLAY_STATE State - ) -{ - - ULONG TextWidth, TextHeight; - - /* Get all the EFI data and convert it into our own structure */ - BlDisplayGetTextCellResolution(&TextWidth, &TextHeight); - State->FgColor = ConsoleEfiTextGetColorForeground(Mode->Attribute); - State->BgColor = ConsoleEfiTextGetColorBackground(Mode->Attribute); - State->XPos = Mode->CursorColumn * TextWidth; - State->YPos = Mode->CursorRow * TextHeight; - State->CursorVisible = Mode->CursorVisible != FALSE; -} - -NTSTATUS -ConsoleFirmwareTextSetState ( - _In_ PBL_TEXT_CONSOLE TextConsole, - _In_ UCHAR Mask, - _In_ PBL_DISPLAY_STATE State - ) -{ - NTSTATUS Status; - ULONG FgColor, BgColor, Attribute, XPos, YPos, TextHeight, TextWidth; - BOOLEAN Visible; - - /* Check if foreground state is being set */ - if (Mask & 1) - { - /* Check if there's a difference from current */ - FgColor = State->FgColor; - if (TextConsole->State.FgColor != FgColor) - { - /* Ignore invalid color */ - if (FgColor > White) - { - return STATUS_INVALID_PARAMETER; - } - - /* Convert from NT/CGA format to EFI, and then set the attribute */ - Attribute = ConsoleEfiTextGetAttribute(TextConsole->State.BgColor, - FgColor); - Status = EfiConOutSetAttribute(TextConsole->Protocol, Attribute); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - /* Update cached state */ - TextConsole->State.FgColor = FgColor; - } - } - - /* Check if background state is being set */ - if (Mask & 2) - { - /* Check if there's a difference from current */ - BgColor = State->BgColor; - if (TextConsole->State.BgColor != BgColor) - { - /* Ignore invalid color */ - if (BgColor > White) - { - return STATUS_INVALID_PARAMETER; - } - - /* Convert from NT/CGA format to EFI, and then set the attribute */ - Attribute = ConsoleEfiTextGetAttribute(BgColor, - TextConsole->State.FgColor); - Status = EfiConOutSetAttribute(TextConsole->Protocol, Attribute); - - if (!NT_SUCCESS(Status)) - { - return Status; - } - - /* Update cached state */ - TextConsole->State.BgColor = BgColor; - } - } - - /* Check if position state is being set */ - if (Mask & 4) - { - /* Check if there's a difference from current */ - XPos = State->XPos; - YPos = State->YPos; - if ((TextConsole->State.XPos != XPos) || - (TextConsole->State.YPos != YPos)) - { - /* Set the new cursor position */ - BlDisplayGetTextCellResolution(&TextWidth, &TextHeight); - Status = EfiConOutSetCursorPosition(TextConsole->Protocol, - XPos/ TextWidth, - YPos / TextHeight); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - /* Update cached state */ - TextConsole->State.XPos = XPos; - TextConsole->State.YPos = YPos; - } - } - - /* Check if cursor state is being set */ - if (Mask & 8) - { - /* Check if there's a difference from current */ - Visible = State->CursorVisible; - if (TextConsole->State.CursorVisible != Visible) - { - /* Ignore invalid state */ - if (Visible >= 3) - { - return STATUS_INVALID_PARAMETER; - } - - /* Set the new cursor state */ - Status = EfiConOutEnableCursor(TextConsole->Protocol, Visible); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - /* Update cached status */ - TextConsole->State.CursorVisible = Visible; - } - } - - /* Return success */ - return STATUS_SUCCESS; -} - -NTSTATUS -ConsoleEfiTextFindModeFromAllowed ( - _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextProtocol, - _In_ PBL_DISPLAY_MODE SupportedModes, - _In_ ULONG MaxIndex, - _Out_ PULONG SupportedMode - ) -{ - EFI_SIMPLE_TEXT_OUTPUT_MODE ModeInfo; - ULONG MaxMode, MaxQueriedMode, Mode, i, MatchingMode; - UINTN HRes, VRes; - ULONGLONG ModeListSize; - PBL_DISPLAY_MODE ModeEntry, ModeList, SupportedModeEntry; - NTSTATUS Status; - - /* Read information on the current mode */ - EfiConOutReadCurrentMode(TextProtocol, &ModeInfo); - - /* Figure out the max mode, and how many modes we'll have to read */ - MaxMode = ModeInfo.MaxMode; - ModeListSize = sizeof(*ModeEntry) * ModeInfo.MaxMode; - if (ModeListSize > MAXULONG) - { - return STATUS_INTEGER_OVERFLOW; - } - - /* Allocate a list for all the supported EFI modes */ - ModeList = BlMmAllocateHeap(ModeListSize); - if (!ModeList) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Scan all the EFI modes */ - EarlyPrint(L"Scanning through %d modes\n", MaxMode); - for (MaxQueriedMode = 0, Mode = 0; Mode < MaxMode; Mode++) - { - /* Query information on this mode */ - ModeEntry = &ModeList[MaxQueriedMode]; - if (NT_SUCCESS(EfiConOutQueryMode(TextProtocol, - Mode, - &HRes, - &VRes))) - { - /* This mode was succesfully queried. Save the data */ - EarlyPrint(L"EFI Firmware Supported Mode %d is H: %d V: %d\n", Mode, HRes, VRes); - ModeEntry->HRes = HRes; - ModeEntry->VRes = VRes; - ModeEntry->HRes2 = HRes; - MaxQueriedMode = Mode + 1; - } - } - - /* Loop all the supported mode entries */ - for (i = 0; i < MaxIndex; i++) - { - /* Loop all the UEFI queried modes */ - SupportedModeEntry = &SupportedModes[i]; - for (MatchingMode = 0; MatchingMode < MaxQueriedMode; MatchingMode++) - { - /* Check if the UEFI mode is compatible with our supported mode */ - ModeEntry = &ModeList[MatchingMode]; - EarlyPrint(L"H1: %d V1: %d - H2: %d - V2: %d\n", ModeEntry->HRes, ModeEntry->VRes, SupportedModeEntry->HRes, SupportedModeEntry->VRes); - if ((ModeEntry->HRes == SupportedModeEntry->HRes) && - (ModeEntry->VRes == SupportedModeEntry->VRes)) - { - /* Yep -- free the mode list and return this mode */ - BlMmFreeHeap(ModeList); - *SupportedMode = MatchingMode; - return STATUS_SUCCESS; - } - } - } - - /* We can't do anything -- there are no matching modes */ - Status = STATUS_UNSUCCESSFUL; - BlMmFreeHeap(ModeList); - return Status; -} - -VOID -ConsoleFirmwareTextClose ( - _In_ PBL_TEXT_CONSOLE TextConsole - ) -{ - ULONG Mode; - BL_DISPLAY_STATE DisplayState; - - /* Read the original mode, and see if it's different than the one now */ - Mode = TextConsole->OldMode.Mode; - if (Mode != TextConsole->Mode) - { - /* Restore to the original mode */ - EfiConOutSetMode(TextConsole->Protocol, Mode); - } - - /* Read the EFI settings for the original mode */ - ConsoleEfiTextGetStateFromMode(&TextConsole->OldMode, &DisplayState); - - /* Set the original settings */ - ConsoleFirmwareTextSetState(TextConsole, 0xF, &DisplayState); -} - -NTSTATUS -ConsoleFirmwareTextOpen ( - _In_ PBL_TEXT_CONSOLE TextConsole - ) -{ - BL_DISPLAY_MODE DisplayMode; - EFI_SIMPLE_TEXT_OUTPUT_MODE CurrentMode, NewMode; - UINTN HRes, VRes; - ULONG Mode; - NTSTATUS Status; - - /* Read the current mode and its settings */ - EfiConOutReadCurrentMode(EfiConOut, &CurrentMode); - Status = EfiConOutQueryMode(EfiConOut, CurrentMode.Mode, &HRes, &VRes); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - /* Save the current mode and its settings */ - NewMode = CurrentMode; - DisplayMode.VRes = VRes; - DisplayMode.HRes = HRes; - DisplayMode.HRes2 = HRes; - - /* Check if the current mode is compatible with one of our modes */ - if (!ConsolepFindResolution(&DisplayMode, ConsoleTextResolutionList, 1)) - { - /* It isn't -- find a matching EFI mode for what we need */ - EarlyPrint(L"In incorrect mode, scanning for right one\n"); - Status = ConsoleEfiTextFindModeFromAllowed(EfiConOut, - ConsoleTextResolutionList, - 1, - &Mode); - if (!NT_SUCCESS(Status)) - { - EarlyPrint(L"Failed to find mode: %lx\n", Status); - return Status; - } - - /* Set the new EFI mode */ - EarlyPrint(L"Setting new mode: %d\n", Mode); - Status = EfiConOutSetMode(EfiConOut, Mode); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - /* Read the current mode and its settings */ - EfiConOutReadCurrentMode(EfiConOut, &NewMode); - Status = EfiConOutQueryMode(EfiConOut, Mode, &HRes, &VRes); - if (!NT_SUCCESS(Status)) - { - EfiConOutSetMode(EfiConOut, CurrentMode.Mode); - return Status; - } - - /* Save the current mode and its settings */ - DisplayMode.HRes = HRes; - DisplayMode.VRes = VRes; - DisplayMode.HRes2 = HRes; - } - - /* Capture all the current settings */ - ConsoleEfiTextGetStateFromMode(&NewMode, &TextConsole->State); - TextConsole->Mode = NewMode.Mode; - TextConsole->DisplayMode = DisplayMode; - TextConsole->Protocol = EfiConOut; - TextConsole->OldMode = CurrentMode; - return STATUS_SUCCESS; -} - -NTSTATUS -ConsoleEfiUgaOpen ( - _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole - ) -{ - EarlyPrint(L"UGA not implemented\n"); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -ConsoleEfiGopGetGraphicalFormat ( - _In_ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *ModeInfo, - _Out_ PULONG PixelDepth - ) -{ - /* Convert the format to depth */ - if (ModeInfo->PixelFormat == PixelBlueGreenRedReserved8BitPerColor) - { - *PixelDepth = 32; - return STATUS_SUCCESS; - } - if (ModeInfo->PixelFormat == PixelBitMask) - { - *PixelDepth = 24; - return STATUS_SUCCESS; - } - return STATUS_UNSUCCESSFUL; -} - -BOOLEAN -ConsoleEfiGopIsPixelFormatSupported ( - _In_ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Mode - ) -{ - BOOLEAN Supported; - EFI_PIXEL_BITMASK PixelMask; - - Supported = FALSE; - - /* Check if it's simple BGR8 */ - if (Mode->PixelFormat == PixelBlueGreenRedReserved8BitPerColor) - { - Supported = TRUE; - } - else - { - /* Otherwise, we can check if it's a masked format */ - if (Mode->PixelFormat == PixelBitMask) - { - /* Check if the masked format is BGR8 */ - PixelMask.BlueMask = 0xFF; - PixelMask.GreenMask = 0xFF00; - PixelMask.RedMask = 0xFF0000; - PixelMask.ReservedMask = 0; - if (RtlEqualMemory(&Mode->PixelInformation, - &PixelMask, - sizeof(PixelMask))) - { - Supported = TRUE; - } - } - } - - /* Return if the format was supported */ - return Supported; -} - -#define BL_DISPLAY_GRAPHICS_FORCED_VIDEO_MODE_FLAG 0x01 -#define BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG 0x02 - -NTSTATUS -ConsoleEfiGopFindModeFromAllowed ( - _In_ EFI_GRAPHICS_OUTPUT_PROTOCOL *GopProtocol, - _In_ PBL_DISPLAY_MODE SupportedModes, - _In_ ULONG MaximumIndex, - _Out_ PULONG SupportedMode - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -VOID -ConsoleEfiUgaClose ( - _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole - ) -{ - return; -} - -VOID -ConsoleEfiGopClose ( - _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole - ) -{ - ULONG OldMode; - - /* Did we switch modes when we turned on the console? */ - OldMode = GraphicsConsole->OldMode; - if (GraphicsConsole->Mode != OldMode) - { - /* Restore the old mode and reset the OEM bitmap in ACPI */ - EfiGopSetMode(GraphicsConsole->Protocol, OldMode); - //BlDisplayInvalidateOemBitmap(); - } - - /* Close the GOP protocol */ - EfiCloseProtocol(GraphicsConsole->Handle, - &EfiGraphicsOutputProtocol); -} - -VOID -ConsoleFirmwareGraphicalClose ( - _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole - ) -{ - /* Call the correct close routine based on the console mode */ - if (GraphicsConsole->Type == BlUgaConsole) - { - ConsoleEfiUgaClose(GraphicsConsole); - } - else - { - ConsoleEfiGopClose(GraphicsConsole); - } - -} -NTSTATUS -ConsoleEfiGopOpen ( - _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole - ) -{ - NTSTATUS Status; - EFI_GRAPHICS_OUTPUT_PROTOCOL *GopProtocol; - ULONG Mode, PixelDepth; - UINTN CurrentMode; - EFI_GRAPHICS_OUTPUT_MODE_INFORMATION ModeInformation; - BOOLEAN CurrentModeOk; - - /* Open a handle to GOP */ - Status = EfiOpenProtocol(GraphicsConsole->Handle, - &EfiGraphicsOutputProtocol, - (PVOID*)&GopProtocol); - if (!NT_SUCCESS(Status)) - { - EarlyPrint(L"GOP OPEN failed: %lx\n", Status); - return STATUS_NOT_SUPPORTED; - } - - /* Get the current mode */ - Status = EfiGopGetCurrentMode(GopProtocol, &CurrentMode, &ModeInformation); - if (!NT_SUCCESS(Status)) - { - EarlyPrint(L"GOP mode failed: %lx\n", Status); - goto Quickie; - } - - Mode = CurrentMode; - - /* Check if any custom BCD options were provided */ - if (ConsoleGraphicalResolutionListFlags & - (BL_DISPLAY_GRAPHICS_FORCED_VIDEO_MODE_FLAG | - BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG)) - { - /* We'll have to find a mode */ - CurrentModeOk = FALSE; - } - else - { - /* Then we should be in the default mode, check if the pixel format is OK */ - CurrentModeOk = ConsoleEfiGopIsPixelFormatSupported(&ModeInformation); - } - - /* Is the mode/format OK? */ - if (!CurrentModeOk) - { - /* Nope -- we'll have to go find one */ - Status = ConsoleEfiGopFindModeFromAllowed(GopProtocol, - ConsoleGraphicalResolutionList, - ConsoleGraphicalResolutionListSize, - &Mode); - if (!NT_SUCCESS(Status)) - { - goto Quickie; - } - } - - /* Store mode information */ - GraphicsConsole->Protocol = GopProtocol; - GraphicsConsole->Mode = Mode; - GraphicsConsole->OldMode = CurrentMode; - - /* Get format information */ - Status = ConsoleEfiGopGetGraphicalFormat(&ModeInformation, &PixelDepth); - if (NT_SUCCESS(Status)) - { - /* Store it */ - GraphicsConsole->OldDisplayMode.HRes = ModeInformation.HorizontalResolution; - GraphicsConsole->OldDisplayMode.VRes = ModeInformation.VerticalResolution; - GraphicsConsole->OldDisplayMode.HRes2 = ModeInformation.PixelsPerScanLine; - GraphicsConsole->PixelDepth = PixelDepth; - return STATUS_SUCCESS; - } - -Quickie: - /* We failed, close the protocol and return the failure code */ - EarlyPrint(L"Get format failed: %lx\n", Status); - EfiCloseProtocol(GraphicsConsole->Handle, &EfiGraphicsOutputProtocol); - return Status; -} - -NTSTATUS -ConsoleEfiGraphicalOpenProtocol ( - _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole, - _In_ BL_GRAPHICS_CONSOLE_TYPE Type - ) -{ - ULONG HandleIndex, HandleCount; - EFI_HANDLE* HandleArray; - EFI_HANDLE Handle; - NTSTATUS Status; - PVOID Interface; - - /* Find a device handle that implements either GOP or UGA */ - HandleCount = 0; - HandleArray = NULL; - Status = EfiLocateHandleBuffer(ByProtocol, - (Type == BlGopConsole) ? - &EfiGraphicsOutputProtocol : - &EfiUgaDrawProtocol, - &HandleCount, - &HandleArray); - if (!NT_SUCCESS(Status)) - { - /* Nothing supports this (no video card?) */ - EarlyPrint(L"Status: %lx Count: %d\n", Status, HandleCount); - return STATUS_UNSUCCESSFUL; - } - - /* Scan through the handles we received */ - for (HandleIndex = 0; HandleIndex < HandleCount; HandleIndex++) - { - /* Try to open each one */ - GraphicsConsole->Handle = HandleArray[HandleIndex]; - Handle = HandleArray[HandleIndex]; - Status = EfiOpenProtocol(Handle, &EfiDevicePathProtocol, &Interface); - if (NT_SUCCESS(Status)) - { - /* Test worked, close the protocol */ - EfiCloseProtocol(Handle, &EfiDevicePathProtocol); - - /* Now open the real protocol we want, either UGA or GOP */ - Status = Type ? ConsoleEfiUgaOpen(GraphicsConsole) : - ConsoleEfiGopOpen(GraphicsConsole); - if (NT_SUCCESS(Status)) - { - /* It worked -- store the type of console this is */ - GraphicsConsole->Type = Type; - return STATUS_SUCCESS; - } - } - } - - /* We failed to find a working GOP/UGA protocol provider */ - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -ConsoleTextLocalDestruct ( - _In_ struct _BL_TEXT_CONSOLE* Console - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -ConsoleTextLocalReinitialize ( - _In_ struct _BL_TEXT_CONSOLE* Console - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -ConsoleTextBaseGetTextState ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _Out_ PBL_DISPLAY_STATE TextState - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -ConsoleTextLocalSetTextState ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _In_ ULONG Flags, - _In_ PBL_DISPLAY_STATE TextState - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -ConsoleTextBaseGetTextResolution ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _Out_ PULONG TextResolution - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -ConsoleTextLocalSetTextResolution ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _In_ ULONG NewTextResolution, - _Out_ PULONG OldTextResolution - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -ConsoleTextLocalClearText ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _In_ ULONG Attribute - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -ConsoleTextLocalWriteText ( - _In_ struct _BL_TEXT_CONSOLE* Console, - _In_ PCHAR Text, - _In_ ULONG Attribute - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -BOOLEAN -DsppGraphicsDisabledByBcd ( - VOID - ) -{ - //EarlyPrint(L"Disabling graphics\n"); - return FALSE; -} - -NTSTATUS -ConsoleTextLocalConstruct ( - _In_ PBL_TEXT_CONSOLE TextConsole, - _In_ BOOLEAN Activate - ) -{ - NTSTATUS Status; - BL_DISPLAY_STATE TextState; - - /* Set our callbacks */ - TextConsole->Callbacks = &ConsoleTextLocalVtbl; - - /* Are we activating this console? */ - if (Activate) - { - /* Call firmware to activate it */ - Status = ConsoleFirmwareTextOpen(TextConsole); - if (!NT_SUCCESS(Status)) - { - EarlyPrint(L"Failed to activate console: %lx\n", Status); - return Status; - } - } - - /* Set default text state */ - TextState.BgColor = 0; - TextState.XPos = 0; - TextState.YPos = 0; - TextState.CursorVisible = FALSE; - TextState.FgColor = White; - - /* Are we activating? */ - if (Activate) - { - /* Call firmware to set it */ - Status = ConsoleFirmwareTextSetState(TextConsole, 0xF, &TextState); - if (!NT_SUCCESS(Status)) - { - /* We failed, back down */ - EarlyPrint(L"Failed to set console state: %lx\n", Status); - ConsoleFirmwareTextClose(TextConsole); - return Status; - } - } - else - { - /* Just save the state for now, someone else can activate later */ - TextConsole->State = TextState; - } - - /* Remember if we activated it */ - TextConsole->Active = Activate; - return STATUS_SUCCESS; -} - -NTSTATUS -ConsoleEfiUgaSetResolution ( - _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole, - _In_ PBL_DISPLAY_MODE DisplayMode, - _In_ ULONG DisplayModeCount - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -ConsoleEfiGopEnable ( - _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole - ) -{ - PVOID FrameBuffer; - UINTN CurrentMode, Dummy; - ULONG Mode, PixelDepth; - UINTN FrameBufferSize; - EFI_GRAPHICS_OUTPUT_MODE_INFORMATION ModeInformation; - EFI_GRAPHICS_OUTPUT_PROTOCOL* Protocol; - NTSTATUS Status; - PHYSICAL_ADDRESS FrameBufferPhysical; - - /* Capture the current mode and protocol */ - Mode = GraphicsConsole->Mode; - Protocol = GraphicsConsole->Protocol; - - /* Get the current mode and its information */ - Status = EfiGopGetCurrentMode(Protocol, &CurrentMode, &ModeInformation); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - /* Check if we're not in the mode we should be */ - if (CurrentMode != Mode) - { - /* Switch modes */ - Status = EfiGopSetMode(Protocol, Mode); - if (Status < 0) - { - return Status; - } - - /* Reset the OEM bitmap and get the new more information */ -// BlDisplayInvalidateOemBitmap(); - EfiGopGetCurrentMode(Protocol, &Dummy, &ModeInformation); - } - - /* Get the pixel depth for this mode */ - Status = ConsoleEfiGopGetGraphicalFormat(&ModeInformation, &PixelDepth); - if (NT_SUCCESS(Status)) - { - /* Get the framebuffer for this mode */ - EfiGopGetFrameBuffer(Protocol, &FrameBufferPhysical, &FrameBufferSize); - - /* Map the framebuffer, try as writeback first */ - FrameBuffer = NULL; - Status = BlMmMapPhysicalAddressEx(&FrameBuffer, - BlMemoryWriteBack, - FrameBufferSize, - FrameBufferPhysical); - if (!NT_SUCCESS(Status)) - { - /* That didn't work, so try uncached next */ - Status = BlMmMapPhysicalAddressEx(&FrameBuffer, - BlMemoryUncached, - FrameBufferSize, - FrameBufferPhysical); - } - } - - /* Check if getting all the required information worked out */ - if (NT_SUCCESS(Status)) - { - /* Capture the resolution, depth, and framebuffer information */ - GraphicsConsole->DisplayMode.HRes = ModeInformation.HorizontalResolution; - GraphicsConsole->DisplayMode.VRes = ModeInformation.VerticalResolution; - GraphicsConsole->DisplayMode.HRes2 = ModeInformation.PixelsPerScanLine; - GraphicsConsole->PixelDepth = PixelDepth; - GraphicsConsole->FrameBuffer = FrameBuffer; - GraphicsConsole->FrameBufferSize = FrameBufferSize; - GraphicsConsole->PixelsPerScanLine = ModeInformation.PixelsPerScanLine; - - /* All good */ - Status = STATUS_SUCCESS; - } - else if (CurrentMode != GraphicsConsole->Mode) - { - /* We failed seomewhere, reset the mode and the OEM bitmap back */ - EfiGopSetMode(Protocol, CurrentMode); - //BlDisplayInvalidateOemBitmap(); - } - - /* Return back to caller */ - return Status; -} - -NTSTATUS -ConsoleFirmwareGraphicalEnable ( - _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole - ) -{ - NTSTATUS Status; - - /* Check what type of console this is */ - if (GraphicsConsole->Type == BlUgaConsole) - { - /* Handle UGA */ - Status = ConsoleEfiUgaSetResolution(GraphicsConsole, - &GraphicsConsole->DisplayMode, - 1); - } - else - { - /* Handle GOP */ - Status = ConsoleEfiGopEnable(GraphicsConsole); - } - - /* Return back to caller */ - return Status; -} - -NTSTATUS -ConsoleGraphicalConstruct ( - _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole - ) -{ - NTSTATUS Status; - - /* Create a text console */ - Status = ConsoleTextLocalConstruct(&GraphicsConsole->TextConsole, FALSE); - if (!NT_SUCCESS(Status)) - { - EarlyPrint(L"Text failed: %lx\n", Status); - return Status; - } - - /* But overwrite its callbacks with ours */ - GraphicsConsole->TextConsole.Callbacks = &ConsoleGraphicalVtbl.Text; - - /* Try to create a GOP console */ - Status = ConsoleEfiGraphicalOpenProtocol(GraphicsConsole, BlGopConsole); - if (!NT_SUCCESS(Status)) - { - /* That failed, try an older EFI 1.02 UGA console */ - EarlyPrint(L"GOP open failed!\n", Status); - Status = ConsoleEfiGraphicalOpenProtocol(GraphicsConsole, BlUgaConsole); - if (!NT_SUCCESS(Status)) - { - /* That failed too, give up */ - EarlyPrint(L"UGA failed!\n", Status); - ConsoleTextLocalDestruct(&GraphicsConsole->TextConsole); - return STATUS_UNSUCCESSFUL; - } - } - - /* Enable the console */ - Status = ConsoleFirmwareGraphicalEnable(GraphicsConsole); - if (!NT_SUCCESS(Status)) - { - /* Failed to enable it, undo everything */ - EarlyPrint(L"Enable failed\n"); - ConsoleFirmwareGraphicalClose(GraphicsConsole); - ConsoleTextLocalDestruct(&GraphicsConsole->TextConsole); - return STATUS_UNSUCCESSFUL; - } - - /* Save the graphics text color from the text mode text color */ - GraphicsConsole->FgColor = GraphicsConsole->TextConsole.State.FgColor; - GraphicsConsole->BgColor = GraphicsConsole->TextConsole.State.BgColor; - return STATUS_SUCCESS; -} - -NTSTATUS -ConsoleRemoteConstruct ( - _In_ PBL_REMOTE_CONSOLE RemoteConsole - ) -{ -#ifdef BL_EMS_SUPPORT -#error Implement me -#else - /* We don't support EMS for now */ - return STATUS_NOT_IMPLEMENTED; -#endif -} - -NTSTATUS -ConsoleCreateRemoteConsole ( - _In_ PBL_TEXT_CONSOLE* TextConsole - ) -{ - PBL_REMOTE_CONSOLE RemoteConsole; - NTSTATUS Status; - - /* Allocate the remote console */ - RemoteConsole = BlMmAllocateHeap(sizeof(*RemoteConsole)); - if (!RemoteConsole) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Construct it */ - Status = ConsoleRemoteConstruct(RemoteConsole); - if (Status < 0) - { - /* Failed to construct it, delete it */ - BlMmFreeHeap(RemoteConsole); - return Status; - } - - /* Save the global pointer and return a pointer to the text console */ - DspRemoteInputConsole = RemoteConsole; - *TextConsole = &RemoteConsole->TextConsole; - return STATUS_SUCCESS; -} - -NTSTATUS -DsppInitialize ( - _In_ ULONG Flags - ) -{ - BL_LIBRARY_PARAMETERS LibraryParameters = BlpLibraryParameters; - BOOLEAN NoGraphics;// , HighestMode; - NTSTATUS Status; - PBL_DISPLAY_MODE DisplayMode; - //ULONG GraphicsResolution; - PBL_GRAPHICS_CONSOLE GraphicsConsole; - PBL_TEXT_CONSOLE TextConsole, RemoteConsole; - - /* Initialize font data */ - BfiCachedStrikeData = 0; - InitializeListHead(&BfiDeferredListHead); - InitializeListHead(&BfiFontFileListHead); - - /* Allocate the font rectangle */ - BfiGraphicsRectangle = BlMmAllocateHeap(0x5A); - if (!BfiGraphicsRectangle) - { - return STATUS_NO_MEMORY; - } - - /* Display re-initialization not yet handled */ - if (LibraryParameters.LibraryFlags & BL_LIBRARY_FLAG_REINITIALIZE_ALL) - { - EarlyPrint(L"Display path not handled\n"); - return STATUS_NOT_SUPPORTED; - } - - /* Check if no graphics console is needed */ - if ((Flags & BL_LIBRARY_FLAG_NO_GRAPHICS_CONSOLE) || - (DsppGraphicsDisabledByBcd())) - { - /* Remember this */ - NoGraphics = TRUE; - } - else - { - /* No graphics -- remember this */ - NoGraphics = FALSE; - } - - /* On first load, we always initialize a graphics display */ - GraphicsConsole = NULL; - if (!(Flags & BL_LIBRARY_FLAG_REINITIALIZE_ALL) || !(NoGraphics)) - { - /* Default to mode 0 (1024x768) */ - DisplayMode = &ConsoleGraphicalResolutionList[0]; - - /* Check what resolution to use*/ -#if 0 - Status = BlGetBootOptionInteger(BlpApplicationEntry.BcdData, - BcdLibraryInteger_GraphicsResolution, - &GraphicsResolution); -#else - //GraphicsResolution = 0; - Status = STATUS_NOT_FOUND; -#endif - if (NT_SUCCESS(Status)) - { - ConsoleGraphicalResolutionListFlags |= BL_DISPLAY_GRAPHICS_FORCED_VIDEO_MODE_FLAG; - EarlyPrint(L"Display selection not yet handled\n"); - return STATUS_NOT_IMPLEMENTED; - } - - /* Check if the highest mode should be forced */ -#if 0 - Status = BlGetBootOptionBoolean(BlpApplicationEntry.BcdData, - BcdLibraryBoolean_GraphicsForceHighestMode, - &HighestMode); -#else - //HighestMode = 0; - Status = STATUS_NOT_FOUND; -#endif - if (NT_SUCCESS(Status)) - { - ConsoleGraphicalResolutionListFlags |= BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG; - EarlyPrint(L"High res mode not yet handled\n"); - return STATUS_NOT_IMPLEMENTED; - } - - /* Do we need graphics mode after all? */ - if (!NoGraphics) - { - /* Yep -- go allocate it */ - GraphicsConsole = BlMmAllocateHeap(sizeof(*GraphicsConsole)); - if (GraphicsConsole) - { - /* Construct it */ - Status = ConsoleGraphicalConstruct(GraphicsConsole); - if (!NT_SUCCESS(Status)) - { - EarlyPrint(L"GFX FAILED: %lx\n", Status); - BlMmFreeHeap(GraphicsConsole); - GraphicsConsole = NULL; - } - else - { - /* TEST */ - RtlFillMemory(GraphicsConsole->FrameBuffer, GraphicsConsole->FrameBufferSize, 0x55); - } - } - } - - /* Are we using something else than the default mode? */ - if (DisplayMode != &ConsoleGraphicalResolutionList[0]) - { - EarlyPrint(L"Display path not handled\n"); - return STATUS_NOT_SUPPORTED; - } - - /* Mask out all the flags now */ - ConsoleGraphicalResolutionListFlags &= ~(BL_DISPLAY_GRAPHICS_FORCED_VIDEO_MODE_FLAG | - BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG); - } - - /* Do we have a graphics console? */ - TextConsole = NULL; - if (!GraphicsConsole) - { - /* Nope -- go allocate a text console */ - TextConsole = BlMmAllocateHeap(sizeof(*TextConsole)); - if (TextConsole) - { - /* Construct it */ - Status = ConsoleTextLocalConstruct(TextConsole, TRUE); - if (!NT_SUCCESS(Status)) - { - BlMmFreeHeap(TextConsole); - TextConsole = NULL; - } - } - } - - /* Initialize all globals to NULL */ - DspRemoteInputConsole = NULL; - DspTextConsole = NULL; - DspGraphicalConsole = NULL; - - /* If we don't have a text console, go get a remote console */ - RemoteConsole = NULL; - if (!TextConsole) - { - ConsoleCreateRemoteConsole(&RemoteConsole); - } - - /* Do we have a remote console? */ - if (!RemoteConsole) - { - /* Nope -- what about a graphical one? */ - if (GraphicsConsole) - { - /* Yes, use it for both graphics and text */ - DspGraphicalConsole = GraphicsConsole; - DspTextConsole = GraphicsConsole; - } - else if (TextConsole) - { - /* Nope, but we have a text console */ - DspTextConsole = TextConsole; - } - - /* Console has been setup */ - return STATUS_SUCCESS; - } - - /* We have a remote console -- have to figure out how to use it*/ - EarlyPrint(L"Display path not handled\n"); - return STATUS_NOT_SUPPORTED; -} - -NTSTATUS -BlpDisplayInitialize ( - _In_ ULONG Flags - ) -{ - NTSTATUS Status; - - /* Are we resetting or initializing? */ - if (Flags & BL_LIBRARY_FLAG_REINITIALIZE) - { - /* This is a reset */ - Status = STATUS_NOT_IMPLEMENTED; -#if 0 - Status = DsppReinitialize(Flags); - if (NT_SUCCESS(Status)) - { - Status = BlpDisplayReinitialize(); - } -#endif - } - else - { - /* Initialize the display */ - Status = DsppInitialize(Flags); - } - - /* Return display initailziation state */ - return Status; -} - -VOID -BlDisplayGetTextCellResolution ( - _Out_ PULONG TextWidth, - _Out_ PULONG TextHeight - ) -{ - NTSTATUS Status; - - /* If the caller doesn't want anything, bail out */ - if (!(TextWidth) || !(TextHeight)) - { - return; - } - - /* Do we have a text console? */ - Status = STATUS_UNSUCCESSFUL; - if (DspTextConsole) - { - /* Do we have a graphics console? */ - if (DspGraphicalConsole) - { - /* Yep -- query it */ - EarlyPrint(L"Not supported\n"); - Status = STATUS_NOT_IMPLEMENTED; - } - } - - /* Check if we failed to get it from the graphics console */ - if (!NT_SUCCESS(Status)) - { - /* Set default text size */ - *TextWidth = 8; - *TextHeight = 8; - } -}

1 0

[ion] 69098: [BOOTMGFW] - Fix heap bugs, thanks to Thomas! - Now only the last heap operation shows corruption.
by ion＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: ion Date: Mon Sep 7 19:06:14 2015 New Revision: 69098 URL: http://svn.reactos.org/svn/reactos?rev=69098&view=rev Log: [BOOTMGFW] - Fix heap bugs, thanks to Thomas! - Now only the last heap operation shows corruption. Modified: trunk/reactos/boot/environ/lib/mm/blkalloc.c trunk/reactos/boot/environ/lib/mm/heapalloc.c Modified: trunk/reactos/boot/environ/lib/mm/blkalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/blkall… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/blkalloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/blkalloc.c [iso-8859-1] Mon Sep 7 19:06:14 2015 @@ -19,7 +19,7 @@ typedef struct _BL_BLOCK_DESCRIPTOR { LIST_ENTRY NextEntry; - UCHAR Unknown[50 - sizeof(LIST_ENTRY)]; + UCHAR Unknown[0x50 - sizeof(LIST_ENTRY)]; } BL_BLOCK_DESCRIPTOR, *PBL_BLOCK_DESCRIPTOR; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/boot/environ/lib/mm/heapalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/heapal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/heapalloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/heapalloc.c [iso-8859-1] Mon Sep 7 19:06:14 2015 @@ -83,6 +83,19 @@ return (ULONG_PTR)MmHapDecodeLink(Entry->BufferNext) - (ULONG_PTR)Entry; } +FORCEINLINE +ULONG +MmHapUserBufferSize ( + _In_ PVOID FreeEntry + ) +{ + PBL_FREE_HEAP_ENTRY Entry = FreeEntry; + + /* Get the size of the buffer as the user sees it */ + return MmHapBufferSize(Entry) - FIELD_OFFSET(BL_BUSY_HEAP_ENTRY, Buffer); +} + + /* FUNCTIONS *****************************************************************/ NTSTATUS @@ -97,7 +110,7 @@ /* Compute a new heap, and add 2 more pages for the free list */ HeapSize = ExtendSize + (2 * PAGE_SIZE); - if ((ExtendSize + (2 * PAGE_SIZE)) < ExtendSize) + if (HeapSize < ExtendSize) { return STATUS_INTEGER_OVERFLOW; } @@ -188,7 +201,10 @@ ULONG BucketIndex = 0; /* Use the last bucket if this is a large allocation */ - if (Size >= PAGE_SIZE) return 7; + if (Size >= PAGE_SIZE) + { + return 7; + } /* Otherwise, use a higher index for each new power of two */ while (Size >> BucketIndex) @@ -196,7 +212,7 @@ BucketIndex++; } - /* Allocations are at least 8 bytes (2^3 = 4th index) */ + /* Allocations are at least 16 bytes (2^4 = 5th index) */ return BucketIndex - 5; } @@ -347,7 +363,10 @@ /* Get the previous entry and check if it's free */ Prev = MmHapDecodeLink(FreeEntry->BufferPrevious); - if (!(Prev) || !(Prev->BufferNext.BufferFree)) return FreeEntry; + if (!(Prev) || !(Prev->BufferNext.BufferFree)) + { + return FreeEntry; + } /* It's free, so remove it */ Prev = MmHapRemoveBufferFromFreeList(Prev); @@ -391,7 +410,7 @@ !(Flags)) { /* Yep, zero it out */ - RtlZeroMemory(Entry->Buffer, MmHapBufferSize(Entry)); + RtlZeroMemory(Entry->Buffer, MmHapUserBufferSize(Entry)); } /* Now mark the entry as free */ @@ -560,8 +579,8 @@ } /* Align the buffer size to the minimum size required */ - BufferSize = ALIGN_UP(Size + sizeof(BL_BUSY_HEAP_ENTRY), - sizeof(BL_BUSY_HEAP_ENTRY)); + BufferSize = ALIGN_UP(Size + FIELD_OFFSET(BL_BUSY_HEAP_ENTRY, Buffer), + FIELD_OFFSET(BL_BUSY_HEAP_ENTRY, Buffer)); /* Watch out for overflow */ if (BufferSize <= Size) @@ -598,7 +617,8 @@ NextEntry = (PBL_BUSY_HEAP_ENTRY)((ULONG_PTR)FreeEntry + BufferSize); if ((NextEntry >= FreeEntry) && - ((ULONG_PTR)NextEntry <= Heap->HeapLimit - sizeof(BL_BUSY_HEAP_ENTRY))) + ((ULONG_PTR)NextEntry <= + Heap->HeapLimit - FIELD_OFFSET(BL_BUSY_HEAP_ENTRY, Buffer))) { /* Update the heap top pointer past this allocation */ Heap->HeapStart = NextEntry; @@ -607,7 +627,7 @@ FreeEntry->BufferNext.P = Heap->HeapStart; /* And make the free heap entry point back to us */ - Heap->HeapStart->BufferNext.P = FreeEntry; + Heap->HeapStart->BufferPrevious.P = FreeEntry; /* Mark the heap entry as being free and on the heap */ Heap->HeapStart->BufferNext.BufferFree = 1;

1 0

[ion] 69097: [BOOTMGFW] - Last round of display fixes. GOP works now -- fill out the frame buffer with gray as a test (tested in VirtualBox). - Now to fix the heap.
by ion＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: ion Date: Mon Sep 7 18:45:09 2015 New Revision: 69097 URL: http://svn.reactos.org/svn/reactos?rev=69097&view=rev Log: [BOOTMGFW] - Last round of display fixes. GOP works now -- fill out the frame buffer with gray as a test (tested in VirtualBox). - Now to fix the heap. Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c trunk/reactos/boot/environ/lib/mm/mm.c trunk/reactos/boot/environ/lib/platform/display.c Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Mon Sep 7 18:45:09 2015 @@ -770,18 +770,46 @@ VOID ) { + PBL_MEMORY_DESCRIPTOR Descriptor, OldDescriptor; ULONG Index = 0; + PLIST_ENTRY OldFlink, OldBlink; /* Make sure we're not int middle of a call using a descriptor */ + EarlyPrint(L"Call depth is %d\n", MmDescriptorCallTreeCount); if (MmDescriptorCallTreeCount != 1) { return; } /* Loop every current global descriptor */ + EarlyPrint(L"MmGlobalMemoryDescriptorsUsed: %d\n", MmGlobalMemoryDescriptorsUsed); while (Index < MmGlobalMemoryDescriptorsUsed) { - EarlyPrint(L"Global descriptors not yet supported\n"); + /* Does it have any valid pageS? */ + OldDescriptor = &MmGlobalMemoryDescriptors[Index]; + if (OldDescriptor->PageCount) + { + /* Allocate a copy of it */ + Descriptor = BlMmAllocateHeap(sizeof(*Descriptor)); + if (!Descriptor) + { + return; + } + + /* Save the links */ + OldFlink = OldDescriptor->ListEntry.Blink; + OldBlink = OldDescriptor->ListEntry.Flink; + + /* Make the copy */ + *Descriptor = *OldDescriptor; + + /* Fix the links */ + OldBlink->Flink = &Descriptor->ListEntry; + OldFlink->Blink = &Descriptor->ListEntry; + + /* Zero the descriptor */ + RtlZeroMemory(OldDescriptor, sizeof(*OldDescriptor)); + } /* Keep going */ Index++; Modified: trunk/reactos/boot/environ/lib/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/mm.c?r… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] Mon Sep 7 18:45:09 2015 @@ -304,7 +304,7 @@ /* Go back to static descriptors and kill the heap */ //MmMdpSwitchToStaticDescriptors(); //HapInitializationStatus = 0; - ++MmDescriptorCallTreeCount; + //++MmDescriptorCallTreeCount; /* Destroy the Phase 1 initialization */ //MmPaDestroy(0); @@ -315,7 +315,7 @@ Quickie: /* Free the memory descriptors and return the initialization state */ - //MmMdFreeGlobalDescriptors(); + MmMdFreeGlobalDescriptors(); --MmDescriptorCallTreeCount; return Status; } Modified: trunk/reactos/boot/environ/lib/platform/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/platform/… ============================================================================== --- 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 18:45:09 2015 @@ -146,17 +146,12 @@ typedef struct _BL_GRAPHICS_CONSOLE { BL_TEXT_CONSOLE TextConsole; - BL_DISPLAY_MODE DisplayMode; - ULONG PixelDepth; - ULONG FgColor; ULONG BgColor; - BL_DISPLAY_MODE OldDisplayMode; ULONG OldPixelDepth; - EFI_HANDLE Handle; BL_GRAPHICS_CONSOLE_TYPE Type; EFI_GRAPHICS_OUTPUT_PROTOCOL* Protocol; @@ -166,6 +161,11 @@ ULONG Mode; ULONG OldMode; } BL_GRAPHICS_CONSOLE, *PBL_GRAPHICS_CONSOLE; + +typedef struct _BL_REMOTE_CONSOLE +{ + BL_TEXT_CONSOLE TextConsole; +} BL_REMOTE_CONSOLE, *PBL_REMOTE_CONSOLE; PVOID BfiCachedStrikeData; LIST_ENTRY BfiDeferredListHead; @@ -1343,6 +1343,49 @@ } NTSTATUS +ConsoleRemoteConstruct ( + _In_ PBL_REMOTE_CONSOLE RemoteConsole + ) +{ +#ifdef BL_EMS_SUPPORT +#error Implement me +#else + /* We don't support EMS for now */ + return STATUS_NOT_IMPLEMENTED; +#endif +} + +NTSTATUS +ConsoleCreateRemoteConsole ( + _In_ PBL_TEXT_CONSOLE* TextConsole + ) +{ + PBL_REMOTE_CONSOLE RemoteConsole; + NTSTATUS Status; + + /* Allocate the remote console */ + RemoteConsole = BlMmAllocateHeap(sizeof(*RemoteConsole)); + if (!RemoteConsole) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Construct it */ + Status = ConsoleRemoteConstruct(RemoteConsole); + if (Status < 0) + { + /* Failed to construct it, delete it */ + BlMmFreeHeap(RemoteConsole); + return Status; + } + + /* Save the global pointer and return a pointer to the text console */ + DspRemoteInputConsole = RemoteConsole; + *TextConsole = &RemoteConsole->TextConsole; + return STATUS_SUCCESS; +} + +NTSTATUS DsppInitialize ( _In_ ULONG Flags ) @@ -1353,8 +1396,7 @@ PBL_DISPLAY_MODE DisplayMode; //ULONG GraphicsResolution; PBL_GRAPHICS_CONSOLE GraphicsConsole; - // PVOID RemoteConsole; - PBL_TEXT_CONSOLE TextConsole; + PBL_TEXT_CONSOLE TextConsole, RemoteConsole; /* Initialize font data */ BfiCachedStrikeData = 0; @@ -1362,11 +1404,11 @@ InitializeListHead(&BfiFontFileListHead); /* Allocate the font rectangle */ - // BfiGraphicsRectangle = BlMmAllocateHeap(0x5A); - //if (!BfiGraphicsRectangle) - //{ - //return STATUS_NO_MEMORY; - //} + BfiGraphicsRectangle = BlMmAllocateHeap(0x5A); + if (!BfiGraphicsRectangle) + { + return STATUS_NO_MEMORY; + } /* Display re-initialization not yet handled */ if (LibraryParameters.LibraryFlags & BL_LIBRARY_FLAG_REINITIALIZE_ALL) @@ -1406,6 +1448,7 @@ #endif if (NT_SUCCESS(Status)) { + ConsoleGraphicalResolutionListFlags |= BL_DISPLAY_GRAPHICS_FORCED_VIDEO_MODE_FLAG; EarlyPrint(L"Display selection not yet handled\n"); return STATUS_NOT_IMPLEMENTED; } @@ -1421,7 +1464,9 @@ #endif if (NT_SUCCESS(Status)) { - ConsoleGraphicalResolutionListFlags |= 2; + ConsoleGraphicalResolutionListFlags |= BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG; + EarlyPrint(L"High res mode not yet handled\n"); + return STATUS_NOT_IMPLEMENTED; } /* Do we need graphics mode after all? */ @@ -1433,12 +1478,17 @@ { /* Construct it */ Status = ConsoleGraphicalConstruct(GraphicsConsole); - EarlyPrint(L"GFX FAILED: %lx\n", Status); if (!NT_SUCCESS(Status)) { + EarlyPrint(L"GFX FAILED: %lx\n", Status); BlMmFreeHeap(GraphicsConsole); GraphicsConsole = NULL; } + else + { + /* TEST */ + RtlFillMemory(GraphicsConsole->FrameBuffer, GraphicsConsole->FrameBufferSize, 0x55); + } } } @@ -1450,7 +1500,8 @@ } /* Mask out all the flags now */ - ConsoleGraphicalResolutionListFlags &= ~3; + ConsoleGraphicalResolutionListFlags &= ~(BL_DISPLAY_GRAPHICS_FORCED_VIDEO_MODE_FLAG | + BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG); } /* Do we have a graphics console? */ @@ -1477,15 +1528,14 @@ 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"); - return STATUS_NOT_SUPPORTED; + ConsoleCreateRemoteConsole(&RemoteConsole); } /* Do we have a remote console? */ - if (!DspRemoteInputConsole) + if (!RemoteConsole) { /* Nope -- what about a graphical one? */ if (GraphicsConsole)

1 0

[pschweitzer] 69096: [WINLOGON] Fix a handle leak
by pschweitzer＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: pschweitzer Date: Mon Sep 7 18:11:30 2015 New Revision: 69096 URL: http://svn.reactos.org/svn/reactos?rev=69096&view=rev Log: [WINLOGON] Fix a handle leak Modified: trunk/reactos/base/system/winlogon/setup.c Modified: trunk/reactos/base/system/winlogon/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup… ============================================================================== --- trunk/reactos/base/system/winlogon/setup.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/setup.c [iso-8859-1] Mon Sep 7 18:11:30 2015 @@ -155,6 +155,8 @@ NULL, 0, NULL); + if (hThread != NULL) + CloseHandle(hThread); return hThread != NULL; }

1 0

[ion] 69095: [BOOTMGFW] - Fix GOP bugs
by ion＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: ion Date: Mon Sep 7 18:09:12 2015 New Revision: 69095 URL: http://svn.reactos.org/svn/reactos?rev=69095&view=rev Log: [BOOTMGFW] - Fix GOP bugs Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c trunk/reactos/boot/environ/lib/platform/display.c Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/… ============================================================================== --- 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 18:09:12 2015 @@ -536,7 +536,7 @@ /* Make the EFI call */ *Mode = GopInterface->Mode->Mode; - RtlCopyMemory(Information, GopInterface->Mode, sizeof(*Information)); + RtlCopyMemory(Information, GopInterface->Mode->Info, sizeof(*Information)); /* Switch back to protected mode if we came from there */ if (OldMode != BlRealMode) Modified: trunk/reactos/boot/environ/lib/platform/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/platform/… ============================================================================== --- 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 18:09:12 2015 @@ -908,6 +908,7 @@ (PVOID*)&GopProtocol); if (!NT_SUCCESS(Status)) { + EarlyPrint(L"GOP OPEN failed: %lx\n", Status); return STATUS_NOT_SUPPORTED; } @@ -915,6 +916,7 @@ Status = EfiGopGetCurrentMode(GopProtocol, &CurrentMode, &ModeInformation); if (!NT_SUCCESS(Status)) { + EarlyPrint(L"GOP mode failed: %lx\n", Status); goto Quickie; } @@ -967,6 +969,7 @@ Quickie: /* We failed, close the protocol and return the failure code */ + EarlyPrint(L"Get format failed: %lx\n", Status); EfiCloseProtocol(GraphicsConsole->Handle, &EfiGraphicsOutputProtocol); return Status; } @@ -995,18 +998,18 @@ if (!NT_SUCCESS(Status)) { /* Nothing supports this (no video card?) */ + EarlyPrint(L"Status: %lx Count: %d\n", Status, HandleCount); return STATUS_UNSUCCESSFUL; } /* Scan through the handles we received */ - for (HandleIndex = 0; HandleCount < HandleIndex; HandleIndex++) + for (HandleIndex = 0; HandleIndex < HandleCount; HandleIndex++) { /* Try to open each one */ GraphicsConsole->Handle = HandleArray[HandleIndex]; Handle = HandleArray[HandleIndex]; - if (NT_SUCCESS(EfiOpenProtocol(Handle, - &EfiDevicePathProtocol, - &Interface))) + Status = EfiOpenProtocol(Handle, &EfiDevicePathProtocol, &Interface); + if (NT_SUCCESS(Status)) { /* Test worked, close the protocol */ EfiCloseProtocol(Handle, &EfiDevicePathProtocol); @@ -1299,6 +1302,7 @@ Status = ConsoleTextLocalConstruct(&GraphicsConsole->TextConsole, FALSE); if (!NT_SUCCESS(Status)) { + EarlyPrint(L"Text failed: %lx\n", Status); return Status; } @@ -1310,10 +1314,12 @@ if (!NT_SUCCESS(Status)) { /* That failed, try an older EFI 1.02 UGA console */ + EarlyPrint(L"GOP open failed!\n", Status); Status = ConsoleEfiGraphicalOpenProtocol(GraphicsConsole, BlUgaConsole); if (!NT_SUCCESS(Status)) { /* That failed too, give up */ + EarlyPrint(L"UGA failed!\n", Status); ConsoleTextLocalDestruct(&GraphicsConsole->TextConsole); return STATUS_UNSUCCESSFUL; } @@ -1324,6 +1330,7 @@ if (!NT_SUCCESS(Status)) { /* Failed to enable it, undo everything */ + EarlyPrint(L"Enable failed\n"); ConsoleFirmwareGraphicalClose(GraphicsConsole); ConsoleTextLocalDestruct(&GraphicsConsole->TextConsole); return STATUS_UNSUCCESSFUL; @@ -1426,6 +1433,7 @@ { /* Construct it */ Status = ConsoleGraphicalConstruct(GraphicsConsole); + EarlyPrint(L"GFX FAILED: %lx\n", Status); if (!NT_SUCCESS(Status)) { BlMmFreeHeap(GraphicsConsole);

1 0

[ion] 69094: [BOOTMGFW] - Start GOP graphics console support. Checkpoint commit, currently WIP, untested. - Cleanup memory allocation/type/caching flags in a single unified enumeration. - Implement...
by ion＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: ion Date: Mon Sep 7 17:35:59 2015 New Revision: 69094 URL: http://svn.reactos.org/svn/reactos?rev=69094&view=rev Log: [BOOTMGFW] - Start GOP graphics console support. Checkpoint commit, currently WIP, untested. - Cleanup memory allocation/type/caching flags in a single unified enumeration. - Implement memory mapping functions for physical real mode only. Added: trunk/reactos/boot/environ/include/efi/GraphicsOutput.h (with props) trunk/reactos/boot/environ/include/efi/UgaDraw.h (with props) Modified: trunk/reactos/boot/environ/app/bootmgr/efiemu.c trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/firmware/efi/firmware.c trunk/reactos/boot/environ/lib/mm/descriptor.c trunk/reactos/boot/environ/lib/mm/heapalloc.c trunk/reactos/boot/environ/lib/mm/mm.c trunk/reactos/boot/environ/lib/mm/pagealloc.c trunk/reactos/boot/environ/lib/platform/display.c Modified: trunk/reactos/boot/environ/app/bootmgr/efiemu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/e… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/efiemu.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/efiemu.c [iso-8859-1] Mon Sep 7 17:35:59 2015 @@ -24,9 +24,6 @@ /* DATA VARIABLES ************************************************************/ ULONG BlpApplicationFlags; - -GUID EfiLoadedImageProtocol = EFI_LOADED_IMAGE_PROTOCOL_GUID; -GUID EfiDevicePathProtocol = EFI_DEVICE_PATH_PROTOCOL_GUID; BOOT_APPLICATION_PARAMETER_BLOCK_SCRATCH EfiInitScratch; Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Mon Sep 7 17:35:59 2015 @@ -26,6 +26,8 @@ #include <Uefi.h> #include <DevicePath.h> #include <LoadedImage.h> +#include <GraphicsOutput.h> +#include <UgaDraw.h> VOID EarlyPrint(_In_ PWCHAR Format, ...); @@ -60,13 +62,6 @@ #define BL_MM_ADD_DESCRIPTOR_NEVER_COALESCE_FLAG 0x10 #define BL_MM_ADD_DESCRIPTOR_NEVER_TRUNCATE_FLAG 0x20 #define BL_MM_ADD_DESCRIPTOR_UPDATE_LIST_POINTER_FLAG 0x2000 - -#define BL_MM_DESCRIPTOR_REQUIRES_FIXED_FLAG 0x40000 -#define BL_MM_DESCRIPTOR_REQUIRES_COALESCING_FLAG 0x2000000 -#define BL_MM_DESCRIPTOR_REQUIRES_UPDATING_FLAG 0x4000000 -#define BL_MM_DESCRIPTOR_NEVER_USE_FIRMWARE_FLAG 0x8000000 -#define BL_MM_DESCRIPTOR_SPECIAL_PAGES_FLAG 0x20000000 -#define BL_MM_DESCRIPTOR_CAME_FROM_FIRMWARE_FLAG 0x80000000 #define BL_MM_REQUEST_DEFAULT_TYPE 1 #define BL_MM_REQUEST_TOP_DOWN_TYPE 2 @@ -193,15 +188,45 @@ typedef enum _BL_MEMORY_ATTR { - BlMemoryUncached = 1, - BlMemoryWriteCombined = 2, - BlMemoryWriteThrough = 4, - BlMemoryWriteBack = 8, - BlMemoryUncachedExported = 0x10, - BlMemoryWriteProtected = 0x100, - BlMemoryReadProtected = 0x200, - BlMemoryExecuteProtected = 0x400, - BlMemoryRuntime = 0x1000000 + // + // Memory Caching Attributes + // + BlMemoryUncached = 0x00000001, + BlMemoryWriteCombined = 0x00000002, + BlMemoryWriteThrough = 0x00000004, + BlMemoryWriteBack = 0x00000008, + BlMemoryUncachedExported = 0x00000010, + BlMemoryValidCacheAttributes = BlMemoryUncached | BlMemoryWriteCombined | BlMemoryWriteThrough | BlMemoryWriteBack | BlMemoryUncachedExported, + BlMemoryValidCacheAttributeMask = 0x000000FF, + + // + // Memory Protection Attributes + // + BlMemoryWriteProtected = 0x00000100, + BlMemoryReadProtected = 0x00000200, + BlMemoryExecuteProtected = 0x00000400, + BlMemoryValidProtectionAttributes = BlMemoryWriteProtected | BlMemoryReadProtected | BlMemoryExecuteProtected, + BlMemoryValidProtectionAttributeMask = 0x0000FF00, + + // + // Memory Allocation Attributes + // + BlMemoryNonFixed = 0x00020000, + BlMemoryFixed = 0x00040000, + BlMemoryValidAllocationAttributes = BlMemoryNonFixed | BlMemoryFixed, + BlMemoryValidAllocationAttributeMask = 0x00FF0000, + + // + // Memory Type Attributes + // + BlMemoryRuntime = 0x01000000, + BlMemoryCoalesced = 0x02000000, + BlMemoryUpdate = 0x04000000, + BlMemoryNonFirmware = 0x08000000, + BlMemorySpecial = 0x20000000, + BlMemoryFirmware = 0x80000000, + BlMemoryValidTypeAttributes = BlMemoryRuntime | BlMemoryCoalesced | BlMemoryUpdate | BlMemoryNonFirmware | BlMemorySpecial | BlMemoryFirmware, + BlMemoryValidTypeAttributeMask = 0xFF000000, } BL_MEMORY_ATTR; /* CALLBACKS *****************************************************************/ @@ -655,6 +680,47 @@ _In_ BOOLEAN Visible ); +NTSTATUS +EfiLocateHandleBuffer ( + _In_ EFI_LOCATE_SEARCH_TYPE SearchType, + _In_ EFI_GUID *Protocol, + _Inout_ PULONG HandleCount, + _Inout_ EFI_HANDLE** Buffer + ); + +NTSTATUS +EfiOpenProtocol ( + _In_ EFI_HANDLE Handle, + _In_ EFI_GUID *Protocol, + _Out_ PVOID* Interface + ); + +NTSTATUS +EfiCloseProtocol ( + _In_ EFI_HANDLE Handle, + _In_ EFI_GUID *Protocol + ); + +NTSTATUS +EfiGopGetCurrentMode ( + _In_ EFI_GRAPHICS_OUTPUT_PROTOCOL *GopInterface, + _Out_ UINTN* Mode, + _Out_ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Information + ); + +NTSTATUS +EfiGopSetMode ( + _In_ EFI_GRAPHICS_OUTPUT_PROTOCOL *GopInterface, + _In_ ULONG Mode + ); + +VOID +EfiGopGetFrameBuffer ( + _In_ EFI_GRAPHICS_OUTPUT_PROTOCOL *GopInterface, + _Out_ PHYSICAL_ADDRESS* FrameBuffer, + _Out_ UINTN *FrameBufferSize + ); + /* PLATFORM TIMER ROUTINES ***************************************************/ NTSTATUS @@ -773,6 +839,16 @@ _In_ ULONG Flags ); +/* VIRTUAL MEMORY ROUTINES ***************************************************/ + +NTSTATUS +BlMmMapPhysicalAddressEx ( + _In_ PVOID* VirtualAddress, + _In_ ULONG Attributes, + _In_ ULONGLONG Size, + _In_ PHYSICAL_ADDRESS PhysicalAddress + ); + /* HEAP ALLOCATOR ROUTINES ***************************************************/ PVOID @@ -801,5 +877,10 @@ extern PBL_DEVICE_DESCRIPTOR BlpBootDevice; extern BL_APPLICATION_ENTRY BlpApplicationEntry; extern SIMPLE_TEXT_OUTPUT_INTERFACE *EfiConOut; +extern EFI_GUID EfiGraphicsOutputProtocol; +extern EFI_GUID EfiUgaDrawProtocol; +extern EFI_GUID EfiLoadedImageProtocol; +extern EFI_GUID EfiDevicePathProtocol; +extern EFI_GUID EfiSimpleTextInputExProtocol; #endif Added: trunk/reactos/boot/environ/include/efi/GraphicsOutput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/efi/G… ============================================================================== --- trunk/reactos/boot/environ/include/efi/GraphicsOutput.h (added) +++ trunk/reactos/boot/environ/include/efi/GraphicsOutput.h [iso-8859-1] Mon Sep 7 17:35:59 2015 @@ -0,0 +1,276 @@ +/** @file + Graphics Output Protocol from the UEFI 2.0 specification. + + Abstraction of a very simple graphics device. + + Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#ifndef __GRAPHICS_OUTPUT_H__ +#define __GRAPHICS_OUTPUT_H__ + +#define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID \ + { \ + 0x9042a9de, 0x23dc, 0x4a38, {0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a } \ + } + +typedef struct _EFI_GRAPHICS_OUTPUT_PROTOCOL EFI_GRAPHICS_OUTPUT_PROTOCOL; + +typedef struct { + UINT32 RedMask; + UINT32 GreenMask; + UINT32 BlueMask; + UINT32 ReservedMask; +} EFI_PIXEL_BITMASK; + +typedef enum { + /// + /// A pixel is 32-bits and byte zero represents red, byte one represents green, + /// byte two represents blue, and byte three is reserved. This is the definition + /// for the physical frame buffer. The byte values for the red, green, and blue + /// components represent the color intensity. This color intensity value range + /// from a minimum intensity of 0 to maximum intensity of 255. + /// + PixelRedGreenBlueReserved8BitPerColor, + /// + /// A pixel is 32-bits and byte zero represents blue, byte one represents green, + /// byte two represents red, and byte three is reserved. This is the definition + /// for the physical frame buffer. The byte values for the red, green, and blue + /// components represent the color intensity. This color intensity value range + /// from a minimum intensity of 0 to maximum intensity of 255. + /// + PixelBlueGreenRedReserved8BitPerColor, + /// + /// The Pixel definition of the physical frame buffer. + /// + PixelBitMask, + /// + /// This mode does not support a physical frame buffer. + /// + PixelBltOnly, + /// + /// Valid EFI_GRAPHICS_PIXEL_FORMAT enum values are less than this value. + /// + PixelFormatMax +} EFI_GRAPHICS_PIXEL_FORMAT; + +typedef struct { + /// + /// The version of this data structure. A value of zero represents the + /// EFI_GRAPHICS_OUTPUT_MODE_INFORMATION structure as defined in this specification. + /// + UINT32 Version; + /// + /// The size of video screen in pixels in the X dimension. + /// + UINT32 HorizontalResolution; + /// + /// The size of video screen in pixels in the Y dimension. + /// + UINT32 VerticalResolution; + /// + /// Enumeration that defines the physical format of the pixel. A value of PixelBltOnly + /// implies that a linear frame buffer is not available for this mode. + /// + EFI_GRAPHICS_PIXEL_FORMAT PixelFormat; + /// + /// This bit-mask is only valid if PixelFormat is set to PixelPixelBitMask. + /// A bit being set defines what bits are used for what purpose such as Red, Green, Blue, or Reserved. + /// + EFI_PIXEL_BITMASK PixelInformation; + /// + /// Defines the number of pixel elements per video memory line. + /// + UINT32 PixelsPerScanLine; +} EFI_GRAPHICS_OUTPUT_MODE_INFORMATION; + +/** + Returns information for an available graphics mode that the graphics device + and the set of active video output devices supports. + + @param This The EFI_GRAPHICS_OUTPUT_PROTOCOL instance. + @param ModeNumber The mode number to return information on. + @param SizeOfInfo A pointer to the size, in bytes, of the Info buffer. + @param Info A pointer to callee allocated buffer that returns information about ModeNumber. + + @retval EFI_SUCCESS Valid mode information was returned. + @retval EFI_DEVICE_ERROR A hardware error occurred trying to retrieve the video mode. + @retval EFI_INVALID_PARAMETER ModeNumber is not valid. + +**/ +typedef +EFI_STATUS +(EFIAPI *EFI_GRAPHICS_OUTPUT_PROTOCOL_QUERY_MODE)( + IN EFI_GRAPHICS_OUTPUT_PROTOCOL *This, + IN UINT32 ModeNumber, + OUT UINTN *SizeOfInfo, + OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION **Info + ); + +/** + Set the video device into the specified mode and clears the visible portions of + the output display to black. + + @param This The EFI_GRAPHICS_OUTPUT_PROTOCOL instance. + @param ModeNumber Abstraction that defines the current video mode. + + @retval EFI_SUCCESS The graphics mode specified by ModeNumber was selected. + @retval EFI_DEVICE_ERROR The device had an error and could not complete the request. + @retval EFI_UNSUPPORTED ModeNumber is not supported by this device. + +**/ +typedef +EFI_STATUS +(EFIAPI *EFI_GRAPHICS_OUTPUT_PROTOCOL_SET_MODE)( + IN EFI_GRAPHICS_OUTPUT_PROTOCOL *This, + IN UINT32 ModeNumber + ); + +typedef struct { + UINT8 Blue; + UINT8 Green; + UINT8 Red; + UINT8 Reserved; +} EFI_GRAPHICS_OUTPUT_BLT_PIXEL; + +typedef union { + EFI_GRAPHICS_OUTPUT_BLT_PIXEL Pixel; + UINT32 Raw; +} EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION; + +/// +/// actions for BltOperations +/// +typedef enum { + /// + /// Write data from the BltBuffer pixel (0, 0) + /// directly to every pixel of the video display rectangle + /// (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height). + /// Only one pixel will be used from the BltBuffer. Delta is NOT used. + /// + EfiBltVideoFill, + + /// + /// Read data from the video display rectangle + /// (SourceX, SourceY) (SourceX + Width, SourceY + Height) and place it in + /// the BltBuffer rectangle (DestinationX, DestinationY ) + /// (DestinationX + Width, DestinationY + Height). If DestinationX or + /// DestinationY is not zero then Delta must be set to the length in bytes + /// of a row in the BltBuffer. + /// + EfiBltVideoToBltBuffer, + + /// + /// Write data from the BltBuffer rectangle + /// (SourceX, SourceY) (SourceX + Width, SourceY + Height) directly to the + /// video display rectangle (DestinationX, DestinationY) + /// (DestinationX + Width, DestinationY + Height). If SourceX or SourceY is + /// not zero then Delta must be set to the length in bytes of a row in the + /// BltBuffer. + /// + EfiBltBufferToVideo, + + /// + /// Copy from the video display rectangle (SourceX, SourceY) + /// (SourceX + Width, SourceY + Height) to the video display rectangle + /// (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height). + /// The BltBuffer and Delta are not used in this mode. + /// + EfiBltVideoToVideo, + + EfiGraphicsOutputBltOperationMax +} EFI_GRAPHICS_OUTPUT_BLT_OPERATION; + +/** + Blt a rectangle of pixels on the graphics screen. Blt stands for BLock Transfer. + + @param This Protocol instance pointer. + @param BltBuffer The data to transfer to the graphics screen. + Size is at least Width*Height*sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL). + @param BltOperation The operation to perform when copying BltBuffer on to the graphics screen. + @param SourceX The X coordinate of source for the BltOperation. + @param SourceY The Y coordinate of source for the BltOperation. + @param DestinationX The X coordinate of destination for the BltOperation. + @param DestinationY The Y coordinate of destination for the BltOperation. + @param Width The width of a rectangle in the blt rectangle in pixels. + @param Height The height of a rectangle in the blt rectangle in pixels. + @param Delta Not used for EfiBltVideoFill or the EfiBltVideoToVideo operation. + If a Delta of zero is used, the entire BltBuffer is being operated on. + If a subrectangle of the BltBuffer is being used then Delta + represents the number of bytes in a row of the BltBuffer. + + @retval EFI_SUCCESS BltBuffer was drawn to the graphics screen. + @retval EFI_INVALID_PARAMETER BltOperation is not valid. + @retval EFI_DEVICE_ERROR The device had an error and could not complete the request. + +**/ +typedef +EFI_STATUS +(EFIAPI *EFI_GRAPHICS_OUTPUT_PROTOCOL_BLT)( + IN EFI_GRAPHICS_OUTPUT_PROTOCOL *This, + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer, OPTIONAL + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, + IN UINTN SourceX, + IN UINTN SourceY, + IN UINTN DestinationX, + IN UINTN DestinationY, + IN UINTN Width, + IN UINTN Height, + IN UINTN Delta OPTIONAL + ); + +typedef struct { + /// + /// The number of modes supported by QueryMode() and SetMode(). + /// + UINT32 MaxMode; + /// + /// Current Mode of the graphics device. Valid mode numbers are 0 to MaxMode -1. + /// + UINT32 Mode; + /// + /// Pointer to read-only EFI_GRAPHICS_OUTPUT_MODE_INFORMATION data. + /// + EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info; + /// + /// Size of Info structure in bytes. + /// + UINTN SizeOfInfo; + /// + /// Base address of graphics linear frame buffer. + /// Offset zero in FrameBufferBase represents the upper left pixel of the display. + /// + EFI_PHYSICAL_ADDRESS FrameBufferBase; + /// + /// Amount of frame buffer needed to support the active mode as defined by + /// PixelsPerScanLine xVerticalResolution x PixelElementSize. + /// + UINTN FrameBufferSize; +} EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE; + +/// +/// Provides a basic abstraction to set video modes and copy pixels to and from +/// the graphics controller's frame buffer. The linear address of the hardware +/// frame buffer is also exposed so software can write directly to the video hardware. +/// +struct _EFI_GRAPHICS_OUTPUT_PROTOCOL { + EFI_GRAPHICS_OUTPUT_PROTOCOL_QUERY_MODE QueryMode; + EFI_GRAPHICS_OUTPUT_PROTOCOL_SET_MODE SetMode; + EFI_GRAPHICS_OUTPUT_PROTOCOL_BLT Blt; + /// + /// Pointer to EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE data. + /// + EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Mode; +}; + +extern EFI_GUID gEfiGraphicsOutputProtocolGuid; + +#endif Propchange: trunk/reactos/boot/environ/include/efi/GraphicsOutput.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/environ/include/efi/UgaDraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/efi/U… ============================================================================== --- trunk/reactos/boot/environ/include/efi/UgaDraw.h (added) +++ trunk/reactos/boot/environ/include/efi/UgaDraw.h [iso-8859-1] Mon Sep 7 17:35:59 2015 @@ -0,0 +1,166 @@ +/** @file + UGA Draw protocol from the EFI 1.10 specification. + + Abstraction of a very simple graphics device. + + Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR> + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#ifndef __UGA_DRAW_H__ +#define __UGA_DRAW_H__ + + +#define EFI_UGA_DRAW_PROTOCOL_GUID \ + { \ + 0x982c298b, 0xf4fa, 0x41cb, {0xb8, 0x38, 0x77, 0xaa, 0x68, 0x8f, 0xb8, 0x39 } \ + } + +typedef struct _EFI_UGA_DRAW_PROTOCOL EFI_UGA_DRAW_PROTOCOL; + +/** + Return the current video mode information. + + @param This The EFI_UGA_DRAW_PROTOCOL instance. + @param HorizontalResolution The size of video screen in pixels in the X dimension. + @param VerticalResolution The size of video screen in pixels in the Y dimension. + @param ColorDepth Number of bits per pixel, currently defined to be 32. + @param RefreshRate The refresh rate of the monitor in Hertz. + + @retval EFI_SUCCESS Mode information returned. + @retval EFI_NOT_STARTED Video display is not initialized. Call SetMode () + @retval EFI_INVALID_PARAMETER One of the input args was NULL. + +**/ +typedef +EFI_STATUS +(EFIAPI *EFI_UGA_DRAW_PROTOCOL_GET_MODE)( + IN EFI_UGA_DRAW_PROTOCOL *This, + OUT UINT32 *HorizontalResolution, + OUT UINT32 *VerticalResolution, + OUT UINT32 *ColorDepth, + OUT UINT32 *RefreshRate + ); + +/** + Set the current video mode information. + + @param This The EFI_UGA_DRAW_PROTOCOL instance. + @param HorizontalResolution The size of video screen in pixels in the X dimension. + @param VerticalResolution The size of video screen in pixels in the Y dimension. + @param ColorDepth Number of bits per pixel, currently defined to be 32. + @param RefreshRate The refresh rate of the monitor in Hertz. + + @retval EFI_SUCCESS Mode information returned. + @retval EFI_NOT_STARTED Video display is not initialized. Call SetMode () + +**/ +typedef +EFI_STATUS +(EFIAPI *EFI_UGA_DRAW_PROTOCOL_SET_MODE)( + IN EFI_UGA_DRAW_PROTOCOL *This, + IN UINT32 HorizontalResolution, + IN UINT32 VerticalResolution, + IN UINT32 ColorDepth, + IN UINT32 RefreshRate + ); + +typedef struct { + UINT8 Blue; + UINT8 Green; + UINT8 Red; + UINT8 Reserved; +} EFI_UGA_PIXEL; + +typedef union { + EFI_UGA_PIXEL Pixel; + UINT32 Raw; +} EFI_UGA_PIXEL_UNION; + +/// +/// Enumration value for actions of Blt operations. +/// +typedef enum { + EfiUgaVideoFill, ///< Write data from the BltBuffer pixel (SourceX, SourceY) + ///< directly to every pixel of the video display rectangle + ///< (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height). + ///< Only one pixel will be used from the BltBuffer. Delta is NOT used. + + EfiUgaVideoToBltBuffer, ///< Read data from the video display rectangle + ///< (SourceX, SourceY) (SourceX + Width, SourceY + Height) and place it in + ///< the BltBuffer rectangle (DestinationX, DestinationY ) + ///< (DestinationX + Width, DestinationY + Height). If DestinationX or + ///< DestinationY is not zero then Delta must be set to the length in bytes + ///< of a row in the BltBuffer. + + EfiUgaBltBufferToVideo, ///< Write data from the BltBuffer rectangle + ///< (SourceX, SourceY) (SourceX + Width, SourceY + Height) directly to the + ///< video display rectangle (DestinationX, DestinationY) + ///< (DestinationX + Width, DestinationY + Height). If SourceX or SourceY is + ///< not zero then Delta must be set to the length in bytes of a row in the + ///< BltBuffer. + + EfiUgaVideoToVideo, ///< Copy from the video display rectangle (SourceX, SourceY) + ///< (SourceX + Width, SourceY + Height) .to the video display rectangle + ///< (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height). + ///< The BltBuffer and Delta are not used in this mode. + + EfiUgaBltMax ///< Maxmimum value for enumration value of Blt operation. If a Blt operation + ///< larger or equal to this enumration value, it is invalid. +} EFI_UGA_BLT_OPERATION; + +/** + Blt a rectangle of pixels on the graphics screen. + + @param[in] This - Protocol instance pointer. + @param[in] BltBuffer - Buffer containing data to blit into video buffer. This + buffer has a size of Width*Height*sizeof(EFI_UGA_PIXEL) + @param[in] BltOperation - Operation to perform on BlitBuffer and video memory + @param[in] SourceX - X coordinate of source for the BltBuffer. + @param[in] SourceY - Y coordinate of source for the BltBuffer. + @param[in] DestinationX - X coordinate of destination for the BltBuffer. + @param[in] DestinationY - Y coordinate of destination for the BltBuffer. + @param[in] Width - Width of rectangle in BltBuffer in pixels. + @param[in] Height - Hight of rectangle in BltBuffer in pixels. + @param[in] Delta - OPTIONAL + + @retval EFI_SUCCESS - The Blt operation completed. + @retval EFI_INVALID_PARAMETER - BltOperation is not valid. + @retval EFI_DEVICE_ERROR - A hardware error occured writting to the video buffer. + +**/ +typedef +EFI_STATUS +(EFIAPI *EFI_UGA_DRAW_PROTOCOL_BLT)( + IN EFI_UGA_DRAW_PROTOCOL * This, + IN EFI_UGA_PIXEL * BltBuffer, OPTIONAL + IN EFI_UGA_BLT_OPERATION BltOperation, + IN UINTN SourceX, + IN UINTN SourceY, + IN UINTN DestinationX, + IN UINTN DestinationY, + IN UINTN Width, + IN UINTN Height, + IN UINTN Delta OPTIONAL + ); + +/// +/// This protocol provides a basic abstraction to set video modes and +/// copy pixels to and from the graphics controller's frame buffer. +/// +struct _EFI_UGA_DRAW_PROTOCOL { + EFI_UGA_DRAW_PROTOCOL_GET_MODE GetMode; + EFI_UGA_DRAW_PROTOCOL_SET_MODE SetMode; + EFI_UGA_DRAW_PROTOCOL_BLT Blt; +}; + +extern EFI_GUID gEfiUgaDrawProtocolGuid; + +#endif Propchange: trunk/reactos/boot/environ/include/efi/UgaDraw.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/… ============================================================================== --- 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 17:35:59 2015 @@ -12,8 +12,6 @@ /* DATA VARIABLES ************************************************************/ -GUID EfiSimpleTextInputExProtocol = EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID; - PBL_FIRMWARE_DESCRIPTOR EfiFirmwareParameters; BL_FIRMWARE_DESCRIPTOR EfiFirmwareData; EFI_HANDLE EfiImageHandle; @@ -25,6 +23,12 @@ EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *EfiConOut; EFI_SIMPLE_TEXT_INPUT_PROTOCOL *EfiConIn; EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *EfiConInEx; + +EFI_GUID EfiGraphicsOutputProtocol = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID; +EFI_GUID EfiUgaDrawProtocol = EFI_UGA_DRAW_PROTOCOL_GUID; +EFI_GUID EfiLoadedImageProtocol = EFI_LOADED_IMAGE_PROTOCOL_GUID; +EFI_GUID EfiDevicePathProtocol = EFI_DEVICE_PATH_PROTOCOL_GUID; +EFI_GUID EfiSimpleTextInputExProtocol = EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID; /* FUNCTIONS *****************************************************************/ @@ -93,6 +97,65 @@ } NTSTATUS +EfiCloseProtocol ( + _In_ EFI_HANDLE Handle, + _In_ EFI_GUID *Protocol + ) +{ + EFI_STATUS EfiStatus; + NTSTATUS Status; + BL_ARCH_MODE OldMode; + + /* Are we using virtual memory/ */ + if (MmTranslationType != BlNone) + { + /* We need complex tracking to make this work */ + //Status = EfiVmOpenProtocol(Handle, Protocol, Interface); + Status = STATUS_NOT_SUPPORTED; + } + else + { + /* Are we on legacy 1.02? */ + if (EfiST->FirmwareRevision == EFI_1_02_SYSTEM_TABLE_REVISION) + { + /* Nothing to close */ + EfiStatus = STATUS_SUCCESS; + } + else + { + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return STATUS_NOT_IMPLEMENTED; + } + + /* Use the UEFI version */ + EfiStatus = EfiBS->CloseProtocol(Handle, Protocol, EfiImageHandle, NULL); + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } + + /* Normalize not found as success */ + if (EfiStatus == EFI_NOT_FOUND) + { + EfiStatus = EFI_SUCCESS; + } + } + + /* Convert the error to an NTSTATUS */ + Status = EfiGetNtStatusCode(EfiStatus); + } + + /* All done */ + return Status; +} + +NTSTATUS EfiConInExSetState ( _In_ EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *ConInEx, _In_ EFI_KEY_TOGGLE_STATE* KeyToggleState @@ -424,6 +487,187 @@ { BlpArchSwitchContext(OldMode); } +} + +VOID +EfiGopGetFrameBuffer ( + _In_ EFI_GRAPHICS_OUTPUT_PROTOCOL *GopInterface, + _Out_ PHYSICAL_ADDRESS* FrameBuffer, + _Out_ UINTN *FrameBufferSize + ) +{ + BL_ARCH_MODE OldMode; + + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return; + } + + /* Make the EFI call */ + FrameBuffer->QuadPart = GopInterface->Mode->FrameBufferBase; + *FrameBufferSize = GopInterface->Mode->FrameBufferSize; + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } +} + +NTSTATUS +EfiGopGetCurrentMode ( + _In_ EFI_GRAPHICS_OUTPUT_PROTOCOL *GopInterface, + _Out_ UINTN* Mode, + _Out_ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Information + ) +{ + BL_ARCH_MODE OldMode; + + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return STATUS_NOT_IMPLEMENTED; + } + + /* Make the EFI call */ + *Mode = GopInterface->Mode->Mode; + RtlCopyMemory(Information, GopInterface->Mode, sizeof(*Information)); + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } + + /* Return back */ + return STATUS_SUCCESS; +} + +NTSTATUS +EfiGopSetMode ( + _In_ EFI_GRAPHICS_OUTPUT_PROTOCOL *GopInterface, + _In_ ULONG Mode + ) +{ + BL_ARCH_MODE OldMode; + EFI_STATUS EfiStatus; + BOOLEAN ModeChanged; + NTSTATUS Status; + + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return STATUS_NOT_IMPLEMENTED; + } + + /* Make the EFI call */ + if (Mode == GopInterface->Mode->Mode) + { + EfiStatus = EFI_SUCCESS; + ModeChanged = FALSE; + } + { + EfiStatus = GopInterface->SetMode(GopInterface, Mode); + ModeChanged = TRUE; + } + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } + + /* Print out to the debugger if the mode was changed */ + Status = EfiGetNtStatusCode(EfiStatus); + if ((ModeChanged) && (NT_SUCCESS(Status))) + { + /* FIXME @TODO: Should be BlStatusPrint */ + EarlyPrint(L"Console video mode set to 0x%x\r\n", Mode); + } + + /* Convert the error to an NTSTATUS */ + return Status; +} + +NTSTATUS +EfiLocateHandleBuffer ( + _In_ EFI_LOCATE_SEARCH_TYPE SearchType, + _In_ EFI_GUID *Protocol, + _Inout_ PULONG HandleCount, + _Inout_ EFI_HANDLE** Buffer + ) +{ + BL_ARCH_MODE OldMode; + EFI_STATUS EfiStatus; + UINTN BufferSize; + + /* Bail out if we're missing parameters */ + if (!(Buffer) || !(HandleCount)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Check if a buffer was passed in*/ + if (*Buffer) + { + /* Then we should already have a buffer size*/ + BufferSize = sizeof(EFI_HANDLE) * *HandleCount; + } + else + { + /* Then no buffer size exists */ + BufferSize = 0; + } + + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return STATUS_NOT_IMPLEMENTED; + } + + /* Try the first time */ + EfiStatus = EfiBS->LocateHandle(SearchType, Protocol, NULL, &BufferSize, *Buffer); + if (EfiStatus == EFI_BUFFER_TOO_SMALL) + { + /* Did we have an existing buffer? */ + if (*Buffer) + { + /* Free it */ + BlMmFreeHeap(*Buffer); + } + + /* Allocate a new one */ + *Buffer = BlMmAllocateHeap(BufferSize); + if (!(*Buffer)) + { + /* No space, fail */ + return STATUS_NO_MEMORY; + } + + /* Try again */ + EfiStatus = EfiBS->LocateHandle(SearchType, Protocol, NULL, &BufferSize, *Buffer); + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } + } + + /* Return the number of handles */ + *HandleCount = BufferSize / sizeof(EFI_HANDLE); + + /* Convert the error to an NTSTATUS */ + return EfiGetNtStatusCode(EfiStatus); } NTSTATUS Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/descriptor.c [iso-8859-1] Mon Sep 7 17:35:59 2015 @@ -387,7 +387,7 @@ else { /* Coalesce if the descriptor requires it */ - if (MemoryDescriptor->Flags & BL_MM_DESCRIPTOR_REQUIRES_COALESCING_FLAG) + if (MemoryDescriptor->Flags & BlMemoryCoalesced) { Flags |= BL_MM_ADD_DESCRIPTOR_COALESCE_FLAG; } @@ -400,7 +400,7 @@ } /* Update the current list pointer if the descriptor requires it */ - if (MemoryDescriptor->Flags & BL_MM_DESCRIPTOR_REQUIRES_UPDATING_FLAG) + if (MemoryDescriptor->Flags & BlMemoryUpdate) { Flags |= BL_MM_ADD_DESCRIPTOR_UPDATE_LIST_POINTER_FLAG; } Modified: trunk/reactos/boot/environ/lib/mm/heapalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/heapal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/heapalloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/heapalloc.c [iso-8859-1] Mon Sep 7 17:35:59 2015 @@ -23,7 +23,7 @@ ULONG_PTR BufferFree : 1; ULONG_PTR BufferOnHeap : 1; ULONG_PTR NotUsed : 1; - ULONG_PTR BufferPointer : (sizeof(ULONG_PTR) - BL_HEAP_POINTER_FLAG_BITS); + ULONG_PTR BufferPointer : ((8 * sizeof(ULONG_PTR)) - BL_HEAP_POINTER_FLAG_BITS); }; PVOID P; }; Modified: trunk/reactos/boot/environ/lib/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/mm.c?r… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/mm.c [iso-8859-1] Mon Sep 7 17:35:59 2015 @@ -43,6 +43,168 @@ } NTSTATUS +MmSelectMappingAddress ( + _Out_ PVOID* MappingAddress, + _In_ ULONGLONG Size, + _In_ ULONG AllocationAttributes, + _In_ ULONG Flags, + _In_ PHYSICAL_ADDRESS PhysicalAddress + ) +{ + /* Are we in physical mode? */ + if (MmTranslationType == BlNone) + { + /* Just return the physical address as the mapping address */ + *MappingAddress = (PVOID)PhysicalAddress.LowPart; + return STATUS_SUCCESS; + } + + /* Have to allocate physical pages */ + EarlyPrint(L"VM Todo\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +MmMapPhysicalAddress ( + _Inout_ PPHYSICAL_ADDRESS PhysicalAddress, + _Out_ PVOID VirtualAddress, + _Inout_ PULONGLONG Size, + _In_ ULONG CacheAttributes + ) +{ + ULONGLONG MappingSize; + + /* Fail if any parameters are missing */ + if (!(PhysicalAddress) || !(VirtualAddress) || !(Size)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Fail if the size is over 32-bits */ + MappingSize = *Size; + if (MappingSize > 0xFFFFFFFF) + { + return STATUS_INVALID_PARAMETER; + } + + /* Nothing to do if we're in physical mode */ + if (MmTranslationType == BlNone) + { + return STATUS_SUCCESS; + } + + /* Can't use virtual memory in real mode */ + if (CurrentExecutionContext->Mode == BlRealMode) + { + return STATUS_UNSUCCESSFUL; + } + + EarlyPrint(L"VM todo\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BlMmMapPhysicalAddressEx ( + _In_ PVOID* VirtualAddress, + _In_ ULONG Flags, + _In_ ULONGLONG Size, + _In_ PHYSICAL_ADDRESS PhysicalAddress + ) +{ + NTSTATUS Status; + PVOID MappingAddress; + PHYSICAL_ADDRESS MappedAddress; + PVOID MappedBase; + ULONGLONG MapSize; + UCHAR CacheAttributes; + + /* Increase call depth */ + ++MmDescriptorCallTreeCount; + + /* Check if any parameters are missing */ + if (!(VirtualAddress) || !(Size)) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Check for fixed allocation without an actual address */ + if ((Flags & BlMemoryFixed) && + (PhysicalAddress.QuadPart == -1) && + !(*VirtualAddress)) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Check for invalid requirement flag, if one is present */ + if (((Flags & BlMemoryValidAllocationAttributes) != BlMemoryFixed) && + ((Flags & BlMemoryValidAllocationAttributes) != BlMemoryNonFixed) && + (Flags & BlMemoryValidAllocationAttributes)) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Check for invalid cache attribute flags */ + if (((Flags & BlMemoryValidCacheAttributeMask) - 1) & + (Flags & BlMemoryValidCacheAttributeMask)) + { + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* Select an address to map this at */ + Status = MmSelectMappingAddress(&MappingAddress, + Size, + Flags & BlMemoryValidAllocationAttributes, + Flags, + PhysicalAddress); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Map the selected address, using the appropriate caching attributes */ + MappedAddress = PhysicalAddress; + MapSize = Size; + CacheAttributes = ((Flags & BlMemoryValidCacheAttributeMask) != 0x20) ? + (Flags & BlMemoryValidCacheAttributeMask) : 0; + Status = MmMapPhysicalAddress(&MappedAddress, + &MappingAddress, + &MapSize, + CacheAttributes); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + /* Compute the final adress where the mapping was made */ + MappedBase = (PVOID)((ULONG_PTR)MappingAddress + + PhysicalAddress.LowPart - + MappedAddress.LowPart); + + /* Check if we're in physical or virtual mode */ + if (MmTranslationType != BlNone) + { + /* For virtual memory, there's more to do */ + EarlyPrint(L"VM not supported for mapping\n"); + Status = STATUS_NOT_IMPLEMENTED; + goto Quickie; + } + + /* Return the mapped virtual address */ + Status = STATUS_SUCCESS; + *VirtualAddress = MappedBase; + +Quickie: + /* Cleanup descriptors and reduce depth */ + MmMdFreeGlobalDescriptors(); + --MmDescriptorCallTreeCount; + return Status; +} + +NTSTATUS BlpMmInitialize ( _In_ PBL_MEMORY_DATA MemoryData, _In_ BL_TRANSLATION_TYPE TranslationType, Modified: trunk/reactos/boot/environ/lib/mm/pagealloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/pageal… ============================================================================== --- trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/mm/pagealloc.c [iso-8859-1] Mon Sep 7 17:35:59 2015 @@ -141,8 +141,8 @@ /* Are we using the physical memory list, and are we OK with using firmware? */ if ((CurrentList == &MmMdlUnmappedUnallocated) && - !((Request->Flags & BL_MM_DESCRIPTOR_NEVER_USE_FIRMWARE_FLAG) || - (LocalDescriptor.Flags & BL_MM_DESCRIPTOR_NEVER_USE_FIRMWARE_FLAG))) + !((Request->Flags & BlMemoryNonFirmware) || + (LocalDescriptor.Flags & BlMemoryNonFirmware))) { /* Allocate the requested address from EFI */ EfiAddress = LocalDescriptor.BasePage << PAGE_SHIFT; @@ -222,7 +222,7 @@ /* Remember if it came from EFI */ if (GotFwPages) { - FoundDescriptor->Flags |= BL_MM_DESCRIPTOR_CAME_FROM_FIRMWARE_FLAG; + FoundDescriptor->Flags |= BlMemoryFirmware; } /* Add the descriptor to the requested list */ @@ -253,7 +253,7 @@ /* Heap and page directory/table pages have a special flag */ if ((MemoryType >= BlLoaderHeap) && (MemoryType <= BlLoaderReferencePage)) { - Request->Flags |= BL_MM_DESCRIPTOR_SPECIAL_PAGES_FLAG; + Request->Flags |= BlMemorySpecial; } /* Try to find a free region of RAM matching this range and request */ @@ -334,7 +334,7 @@ Request.VirtualRange.Maximum = 0; /* Check if a fixed allocation was requested*/ - if (Attributes & BL_MM_DESCRIPTOR_REQUIRES_FIXED_FLAG) + if (Attributes & BlMemoryFixed) { /* Force the only available range to be the passed in address */ Request.BaseRange.Minimum = BaseAddress->QuadPart >> PAGE_SHIFT; @@ -425,8 +425,7 @@ else { /* Check if this is a fixed allocation */ - BaseAddress.QuadPart = (Attributes & BL_MM_DESCRIPTOR_REQUIRES_FIXED_FLAG) ? - *PhysicalAddress : 0; + BaseAddress.QuadPart = (Attributes & BlMemoryFixed) ? *PhysicalAddress : 0; /* Allocate the pages */ Status = MmPapAllocatePhysicalPagesInRange(&BaseAddress, Modified: trunk/reactos/boot/environ/lib/platform/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/platform/… ============================================================================== --- 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 17:35:59 2015 @@ -120,6 +120,12 @@ PCONSOLE_WRITE_TEXT WriteText; } BL_TEXT_CONSOLE_VTABLE, *PBL_TEXT_CONSOLE_VTABLE; +typedef struct _BL_GRAPHICS_CONSOLE_VTABLE +{ + BL_TEXT_CONSOLE_VTABLE Text; + /// more for graphics /// +} BL_GRAPHICS_CONSOLE_VTABLE, *PBL_GRAPHICS_CONSOLE_VTABLE; + typedef struct _BL_TEXT_CONSOLE { PBL_TEXT_CONSOLE_VTABLE Callbacks; @@ -131,6 +137,36 @@ EFI_SIMPLE_TEXT_OUTPUT_MODE OldMode; } BL_TEXT_CONSOLE, *PBL_TEXT_CONSOLE; +typedef enum _BL_GRAPHICS_CONSOLE_TYPE +{ + BlGopConsole, + BlUgaConsole +} BL_GRAPHICS_CONSOLE_TYPE; + +typedef struct _BL_GRAPHICS_CONSOLE +{ + BL_TEXT_CONSOLE TextConsole; + + BL_DISPLAY_MODE DisplayMode; + + ULONG PixelDepth; + + ULONG FgColor; + ULONG BgColor; + + BL_DISPLAY_MODE OldDisplayMode; + ULONG OldPixelDepth; + + EFI_HANDLE Handle; + BL_GRAPHICS_CONSOLE_TYPE Type; + EFI_GRAPHICS_OUTPUT_PROTOCOL* Protocol; + PVOID FrameBuffer; + ULONG FrameBufferSize; + ULONG PixelsPerScanLine; + ULONG Mode; + ULONG OldMode; +} BL_GRAPHICS_CONSOLE, *PBL_GRAPHICS_CONSOLE; + PVOID BfiCachedStrikeData; LIST_ENTRY BfiDeferredListHead; LIST_ENTRY BfiFontFileListHead; @@ -144,6 +180,7 @@ {800, 600, 800}, {1024, 600, 1024} }; +ULONG ConsoleGraphicalResolutionListSize = RTL_NUMBER_OF(ConsoleGraphicalResolutionList); BL_DISPLAY_MODE ConsoleTextResolutionList[1] = { @@ -209,6 +246,11 @@ ConsoleTextLocalSetTextResolution, ConsoleTextLocalClearText, ConsoleTextLocalWriteText +}; + +BL_GRAPHICS_CONSOLE_VTABLE ConsoleGraphicalVtbl = +{ + {NULL}, }; PVOID DspRemoteInputConsole; @@ -723,6 +765,269 @@ } NTSTATUS +ConsoleEfiUgaOpen ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + EarlyPrint(L"UGA not implemented\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +ConsoleEfiGopGetGraphicalFormat ( + _In_ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *ModeInfo, + _Out_ PULONG PixelDepth + ) +{ + /* Convert the format to depth */ + if (ModeInfo->PixelFormat == PixelBlueGreenRedReserved8BitPerColor) + { + *PixelDepth = 32; + return STATUS_SUCCESS; + } + if (ModeInfo->PixelFormat == PixelBitMask) + { + *PixelDepth = 24; + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +BOOLEAN +ConsoleEfiGopIsPixelFormatSupported ( + _In_ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Mode + ) +{ + BOOLEAN Supported; + EFI_PIXEL_BITMASK PixelMask; + + Supported = FALSE; + + /* Check if it's simple BGR8 */ + if (Mode->PixelFormat == PixelBlueGreenRedReserved8BitPerColor) + { + Supported = TRUE; + } + else + { + /* Otherwise, we can check if it's a masked format */ + if (Mode->PixelFormat == PixelBitMask) + { + /* Check if the masked format is BGR8 */ + PixelMask.BlueMask = 0xFF; + PixelMask.GreenMask = 0xFF00; + PixelMask.RedMask = 0xFF0000; + PixelMask.ReservedMask = 0; + if (RtlEqualMemory(&Mode->PixelInformation, + &PixelMask, + sizeof(PixelMask))) + { + Supported = TRUE; + } + } + } + + /* Return if the format was supported */ + return Supported; +} + +#define BL_DISPLAY_GRAPHICS_FORCED_VIDEO_MODE_FLAG 0x01 +#define BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG 0x02 + +NTSTATUS +ConsoleEfiGopFindModeFromAllowed ( + _In_ EFI_GRAPHICS_OUTPUT_PROTOCOL *GopProtocol, + _In_ PBL_DISPLAY_MODE SupportedModes, + _In_ ULONG MaximumIndex, + _Out_ PULONG SupportedMode + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +VOID +ConsoleEfiUgaClose ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + return; +} + +VOID +ConsoleEfiGopClose ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + ULONG OldMode; + + /* Did we switch modes when we turned on the console? */ + OldMode = GraphicsConsole->OldMode; + if (GraphicsConsole->Mode != OldMode) + { + /* Restore the old mode and reset the OEM bitmap in ACPI */ + EfiGopSetMode(GraphicsConsole->Protocol, OldMode); + //BlDisplayInvalidateOemBitmap(); + } + + /* Close the GOP protocol */ + EfiCloseProtocol(GraphicsConsole->Handle, + &EfiGraphicsOutputProtocol); +} + +VOID +ConsoleFirmwareGraphicalClose ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + /* Call the correct close routine based on the console mode */ + if (GraphicsConsole->Type == BlUgaConsole) + { + ConsoleEfiUgaClose(GraphicsConsole); + } + else + { + ConsoleEfiGopClose(GraphicsConsole); + } + +} +NTSTATUS +ConsoleEfiGopOpen ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + NTSTATUS Status; + EFI_GRAPHICS_OUTPUT_PROTOCOL *GopProtocol; + ULONG Mode, PixelDepth; + UINTN CurrentMode; + EFI_GRAPHICS_OUTPUT_MODE_INFORMATION ModeInformation; + BOOLEAN CurrentModeOk; + + /* Open a handle to GOP */ + Status = EfiOpenProtocol(GraphicsConsole->Handle, + &EfiGraphicsOutputProtocol, + (PVOID*)&GopProtocol); + if (!NT_SUCCESS(Status)) + { + return STATUS_NOT_SUPPORTED; + } + + /* Get the current mode */ + Status = EfiGopGetCurrentMode(GopProtocol, &CurrentMode, &ModeInformation); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + + Mode = CurrentMode; + + /* Check if any custom BCD options were provided */ + if (ConsoleGraphicalResolutionListFlags & + (BL_DISPLAY_GRAPHICS_FORCED_VIDEO_MODE_FLAG | + BL_DISPLAY_GRAPHICS_FORCED_HIGH_RES_MODE_FLAG)) + { + /* We'll have to find a mode */ + CurrentModeOk = FALSE; + } + else + { + /* Then we should be in the default mode, check if the pixel format is OK */ + CurrentModeOk = ConsoleEfiGopIsPixelFormatSupported(&ModeInformation); + } + + /* Is the mode/format OK? */ + if (!CurrentModeOk) + { + /* Nope -- we'll have to go find one */ + Status = ConsoleEfiGopFindModeFromAllowed(GopProtocol, + ConsoleGraphicalResolutionList, + ConsoleGraphicalResolutionListSize, + &Mode); + if (!NT_SUCCESS(Status)) + { + goto Quickie; + } + } + + /* Store mode information */ + GraphicsConsole->Protocol = GopProtocol; + GraphicsConsole->Mode = Mode; + GraphicsConsole->OldMode = CurrentMode; + + /* Get format information */ + Status = ConsoleEfiGopGetGraphicalFormat(&ModeInformation, &PixelDepth); + if (NT_SUCCESS(Status)) + { + /* Store it */ + GraphicsConsole->OldDisplayMode.HRes = ModeInformation.HorizontalResolution; + GraphicsConsole->OldDisplayMode.VRes = ModeInformation.VerticalResolution; + GraphicsConsole->OldDisplayMode.HRes2 = ModeInformation.PixelsPerScanLine; + GraphicsConsole->PixelDepth = PixelDepth; + return STATUS_SUCCESS; + } + +Quickie: + /* We failed, close the protocol and return the failure code */ + EfiCloseProtocol(GraphicsConsole->Handle, &EfiGraphicsOutputProtocol); + return Status; +} + +NTSTATUS +ConsoleEfiGraphicalOpenProtocol ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole, + _In_ BL_GRAPHICS_CONSOLE_TYPE Type + ) +{ + ULONG HandleIndex, HandleCount; + EFI_HANDLE* HandleArray; + EFI_HANDLE Handle; + NTSTATUS Status; + PVOID Interface; + + /* Find a device handle that implements either GOP or UGA */ + HandleCount = 0; + HandleArray = NULL; + Status = EfiLocateHandleBuffer(ByProtocol, + (Type == BlGopConsole) ? + &EfiGraphicsOutputProtocol : + &EfiUgaDrawProtocol, + &HandleCount, + &HandleArray); + if (!NT_SUCCESS(Status)) + { + /* Nothing supports this (no video card?) */ + return STATUS_UNSUCCESSFUL; + } + + /* Scan through the handles we received */ + for (HandleIndex = 0; HandleCount < HandleIndex; HandleIndex++) + { + /* Try to open each one */ + GraphicsConsole->Handle = HandleArray[HandleIndex]; + Handle = HandleArray[HandleIndex]; + if (NT_SUCCESS(EfiOpenProtocol(Handle, + &EfiDevicePathProtocol, + &Interface))) + { + /* Test worked, close the protocol */ + EfiCloseProtocol(Handle, &EfiDevicePathProtocol); + + /* Now open the real protocol we want, either UGA or GOP */ + Status = Type ? ConsoleEfiUgaOpen(GraphicsConsole) : + ConsoleEfiGopOpen(GraphicsConsole); + if (NT_SUCCESS(Status)) + { + /* It worked -- store the type of console this is */ + GraphicsConsole->Type = Type; + return STATUS_SUCCESS; + } + } + } + + /* We failed to find a working GOP/UGA protocol provider */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS ConsoleTextLocalDestruct ( _In_ struct _BL_TEXT_CONSOLE* Console ) @@ -801,7 +1106,7 @@ ) { //EarlyPrint(L"Disabling graphics\n"); - return TRUE; + return FALSE; } NTSTATUS @@ -860,6 +1165,177 @@ } NTSTATUS +ConsoleEfiUgaSetResolution ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole, + _In_ PBL_DISPLAY_MODE DisplayMode, + _In_ ULONG DisplayModeCount + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +ConsoleEfiGopEnable ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + PVOID FrameBuffer; + UINTN CurrentMode, Dummy; + ULONG Mode, PixelDepth; + UINTN FrameBufferSize; + EFI_GRAPHICS_OUTPUT_MODE_INFORMATION ModeInformation; + EFI_GRAPHICS_OUTPUT_PROTOCOL* Protocol; + NTSTATUS Status; + PHYSICAL_ADDRESS FrameBufferPhysical; + + /* Capture the current mode and protocol */ + Mode = GraphicsConsole->Mode; + Protocol = GraphicsConsole->Protocol; + + /* Get the current mode and its information */ + Status = EfiGopGetCurrentMode(Protocol, &CurrentMode, &ModeInformation); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Check if we're not in the mode we should be */ + if (CurrentMode != Mode) + { + /* Switch modes */ + Status = EfiGopSetMode(Protocol, Mode); + if (Status < 0) + { + return Status; + } + + /* Reset the OEM bitmap and get the new more information */ +// BlDisplayInvalidateOemBitmap(); + EfiGopGetCurrentMode(Protocol, &Dummy, &ModeInformation); + } + + /* Get the pixel depth for this mode */ + Status = ConsoleEfiGopGetGraphicalFormat(&ModeInformation, &PixelDepth); + if (NT_SUCCESS(Status)) + { + /* Get the framebuffer for this mode */ + EfiGopGetFrameBuffer(Protocol, &FrameBufferPhysical, &FrameBufferSize); + + /* Map the framebuffer, try as writeback first */ + FrameBuffer = NULL; + Status = BlMmMapPhysicalAddressEx(&FrameBuffer, + BlMemoryWriteBack, + FrameBufferSize, + FrameBufferPhysical); + if (!NT_SUCCESS(Status)) + { + /* That didn't work, so try uncached next */ + Status = BlMmMapPhysicalAddressEx(&FrameBuffer, + BlMemoryUncached, + FrameBufferSize, + FrameBufferPhysical); + } + } + + /* Check if getting all the required information worked out */ + if (NT_SUCCESS(Status)) + { + /* Capture the resolution, depth, and framebuffer information */ + GraphicsConsole->DisplayMode.HRes = ModeInformation.HorizontalResolution; + GraphicsConsole->DisplayMode.VRes = ModeInformation.VerticalResolution; + GraphicsConsole->DisplayMode.HRes2 = ModeInformation.PixelsPerScanLine; + GraphicsConsole->PixelDepth = PixelDepth; + GraphicsConsole->FrameBuffer = FrameBuffer; + GraphicsConsole->FrameBufferSize = FrameBufferSize; + GraphicsConsole->PixelsPerScanLine = ModeInformation.PixelsPerScanLine; + + /* All good */ + Status = STATUS_SUCCESS; + } + else if (CurrentMode != GraphicsConsole->Mode) + { + /* We failed seomewhere, reset the mode and the OEM bitmap back */ + EfiGopSetMode(Protocol, CurrentMode); + //BlDisplayInvalidateOemBitmap(); + } + + /* Return back to caller */ + return Status; +} + +NTSTATUS +ConsoleFirmwareGraphicalEnable ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + NTSTATUS Status; + + /* Check what type of console this is */ + if (GraphicsConsole->Type == BlUgaConsole) + { + /* Handle UGA */ + Status = ConsoleEfiUgaSetResolution(GraphicsConsole, + &GraphicsConsole->DisplayMode, + 1); + } + else + { + /* Handle GOP */ + Status = ConsoleEfiGopEnable(GraphicsConsole); + } + + /* Return back to caller */ + return Status; +} + +NTSTATUS +ConsoleGraphicalConstruct ( + _In_ PBL_GRAPHICS_CONSOLE GraphicsConsole + ) +{ + NTSTATUS Status; + + /* Create a text console */ + Status = ConsoleTextLocalConstruct(&GraphicsConsole->TextConsole, FALSE); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* But overwrite its callbacks with ours */ + GraphicsConsole->TextConsole.Callbacks = &ConsoleGraphicalVtbl.Text; + + /* Try to create a GOP console */ + Status = ConsoleEfiGraphicalOpenProtocol(GraphicsConsole, BlGopConsole); + if (!NT_SUCCESS(Status)) + { + /* That failed, try an older EFI 1.02 UGA console */ + Status = ConsoleEfiGraphicalOpenProtocol(GraphicsConsole, BlUgaConsole); + if (!NT_SUCCESS(Status)) + { + /* That failed too, give up */ + ConsoleTextLocalDestruct(&GraphicsConsole->TextConsole); + return STATUS_UNSUCCESSFUL; + } + } + + /* Enable the console */ + Status = ConsoleFirmwareGraphicalEnable(GraphicsConsole); + if (!NT_SUCCESS(Status)) + { + /* Failed to enable it, undo everything */ + ConsoleFirmwareGraphicalClose(GraphicsConsole); + ConsoleTextLocalDestruct(&GraphicsConsole->TextConsole); + return STATUS_UNSUCCESSFUL; + } + + /* Save the graphics text color from the text mode text color */ + GraphicsConsole->FgColor = GraphicsConsole->TextConsole.State.FgColor; + GraphicsConsole->BgColor = GraphicsConsole->TextConsole.State.BgColor; + return STATUS_SUCCESS; +} + +NTSTATUS DsppInitialize ( _In_ ULONG Flags ) @@ -869,7 +1345,7 @@ NTSTATUS Status; PBL_DISPLAY_MODE DisplayMode; //ULONG GraphicsResolution; - PVOID GraphicsConsole; + PBL_GRAPHICS_CONSOLE GraphicsConsole; // PVOID RemoteConsole; PBL_TEXT_CONSOLE TextConsole; @@ -944,8 +1420,18 @@ /* Do we need graphics mode after all? */ if (!NoGraphics) { - EarlyPrint(L"Display path not handled\n"); - return STATUS_NOT_SUPPORTED; + /* Yep -- go allocate it */ + GraphicsConsole = BlMmAllocateHeap(sizeof(*GraphicsConsole)); + if (GraphicsConsole) + { + /* Construct it */ + Status = ConsoleGraphicalConstruct(GraphicsConsole); + if (!NT_SUCCESS(Status)) + { + BlMmFreeHeap(GraphicsConsole); + GraphicsConsole = NULL; + } + } } /* Are we using something else than the default mode? */

1 0

[tfaber] 69093: [NORMALIZ][KERNEL32_VISTA] - Add normaliz.dll to the build - Move the appropriate functions from kernel32_vista to normaliz - Import IsNormalizedString and NormalizeString stubs fro...
by tfaber＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: tfaber Date: Mon Sep 7 17:16:25 2015 New Revision: 69093 URL: http://svn.reactos.org/svn/reactos?rev=69093&view=rev Log: [NORMALIZ][KERNEL32_VISTA] - Add normaliz.dll to the build - Move the appropriate functions from kernel32_vista to normaliz - Import IsNormalizedString and NormalizeString stubs from Wine Now Scilab starts CORE-10124 #resolve Added: trunk/reactos/dll/nls/normaliz/IdnToAscii.c - copied unchanged from r69087, trunk/reactos/dll/win32/kernel32_vista/IdnToAscii.c trunk/reactos/dll/nls/normaliz/IdnToUnicode.c - copied unchanged from r69081, trunk/reactos/dll/win32/kernel32_vista/IdnToUnicode.c trunk/reactos/dll/nls/normaliz/nameprep.c - copied unchanged from r69081, trunk/reactos/dll/win32/kernel32_vista/nameprep.c trunk/reactos/dll/nls/normaliz/normalize.c (with props) Removed: trunk/reactos/dll/nls/normaliz/dummy.c trunk/reactos/dll/win32/kernel32_vista/IdnToAscii.c trunk/reactos/dll/win32/kernel32_vista/IdnToUnicode.c trunk/reactos/dll/win32/kernel32_vista/nameprep.c Modified: trunk/reactos/dll/CMakeLists.txt trunk/reactos/dll/nls/CMakeLists.txt trunk/reactos/dll/nls/normaliz/CMakeLists.txt trunk/reactos/dll/nls/normaliz/normaliz.spec trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec trunk/reactos/dll/win32/wininet/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/CMakeLists.txt?rev=690… Modified: trunk/reactos/dll/nls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/CMakeLists.txt?rev… Modified: trunk/reactos/dll/nls/normaliz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz/CMakeList… Removed: trunk/reactos/dll/nls/normaliz/dummy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz/dummy.c?r… Modified: trunk/reactos/dll/nls/normaliz/normaliz.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz/normaliz.… Added: trunk/reactos/dll/nls/normaliz/normalize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz/normalize… Modified: trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/C… Removed: trunk/reactos/dll/win32/kernel32_vista/IdnToAscii.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/I… Removed: trunk/reactos/dll/win32/kernel32_vista/IdnToUnicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/I… Modified: trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/k… Removed: trunk/reactos/dll/win32/kernel32_vista/nameprep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/n… Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/CMakeLis…

1 0

[tfaber] 69092: [HAL] - Addendum to r69013: also fix the ACPI version of HalpDispatchPower. CORE-10105 CORE-10117
by tfaber＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: tfaber Date: Mon Sep 7 17:02:22 2015 New Revision: 69092 URL: http://svn.reactos.org/svn/reactos?rev=69092&view=rev Log: [HAL] - Addendum to r69013: also fix the ACPI version of HalpDispatchPower. CORE-10105 CORE-10117 Modified: trunk/reactos/hal/halx86/acpi/halpnpdd.c Modified: trunk/reactos/hal/halx86/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halpnpdd.c… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] Mon Sep 7 17:02:22 2015 @@ -822,8 +822,23 @@ HalpDispatchPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PFDO_EXTENSION FdoExtension; + DPRINT("HAL: PnP Driver Power!\n"); - return STATUS_SUCCESS; + FdoExtension = DeviceObject->DeviceExtension; + if (FdoExtension->ExtensionType == FdoExtensionType) + { + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(FdoExtension->AttachedDeviceObject, Irp); + } + else + { + PoStartNextPowerIrp(Irp); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } } NTSTATUS

1 0

[tfaber] 69091: [USER32] - Fix MSVC warning (C4305: '-=' : truncation from 'double' to 'float')
by tfaber＠svn.reactos.org 07 Sep '15

07 Sep '15

Author: tfaber Date: Mon Sep 7 16:11:59 2015 New Revision: 69091 URL: http://svn.reactos.org/svn/reactos?rev=69091&view=rev Log: [USER32] - Fix MSVC warning (C4305: '-=' : truncation from 'double' to 'float') Modified: trunk/reactos/win32ss/user/user32/controls/edit.c Modified: trunk/reactos/win32ss/user/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] Mon Sep 7 16:11:59 2015 @@ -649,7 +649,7 @@ prev = current_line->net_length - 1; w = current_line->net_length; d = (float)current_line->width/(float)fw; - if (d > 1.2) d -= 0.2; + if (d > 1.2f) d -= 0.2f; next = prev/d; if (next >= prev) next = prev-1; do {

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2015