Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[cwittich] 69080: [XDK] add cpp security checks for RTL_NUMBER_OF_V2/ARRAYSIZE

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Sep 7 08:08:01 2015 New Revision: 69080 URL: http://svn.reactos.org/svn/reactos?rev=69080&view=rev Log: [XDK] add cpp security checks for RTL_NUMBER_OF_V2/ARRAYSIZE Modified: trunk/reactos/include/xdk/ntbasedef.h Modified: trunk/reactos/include/xdk/ntbasedef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntbasedef.h?re… ============================================================================== --- trunk/reactos/include/xdk/ntbasedef.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ntbasedef.h [iso-8859-1] Mon Sep 7 08:08:01 2015 @@ -680,8 +680,11 @@ #define RTL_NUMBER_OF_V2(A) \ (({ int _check_array_type[__builtin_types_compatible_p(typeof(A), typeof(&A[0])) ? -1 : 1]; (void)_check_array_type; }), \ RTL_NUMBER_OF_V1(A)) -#else - /// \todo implement security checks for cplusplus / MSVC +#elif defined(__cplusplus) + template <typename T, size_t N> + char (& SAFE_RTL_NUMBER_OF(T (&)[N]))[N]; + #define RTL_NUMBER_OF_V2(A) sizeof(SAFE_RTL_NUMBER_OF(A)) +#else #define RTL_NUMBER_OF_V2(A) RTL_NUMBER_OF_V1(A) #endif

9 years, 3 months

[cwittich] 69079: [MODE] use ARRAYSIZE, don't include windows.h, fix two possible out-of-bounds reads CID 1206872 CID 1206873

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Sep 7 07:05:33 2015 New Revision: 69079 URL: http://svn.reactos.org/svn/reactos?rev=69079&view=rev Log: [MODE] use ARRAYSIZE, don't include windows.h, fix two possible out-of-bounds reads CID 1206872 CID 1206873 Modified: trunk/reactos/base/applications/cmdutils/mode/mode.c Modified: trunk/reactos/base/applications/cmdutils/mode/mode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/mode.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/mode.c [iso-8859-1] Mon Sep 7 07:05:33 2015 @@ -20,14 +20,16 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <windows.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wincon.h> #include <stdio.h> #define MAX_PORTNAME_LEN 20 #define MAX_COMPORT_NUM 10 #define MAX_COMPARAM_LEN 20 -#define NUM_ELEMENTS(a) (sizeof(a)/sizeof(a[0])) #define ASSERT(a) const WCHAR* const usage_strings[] = @@ -63,7 +65,7 @@ int i; wprintf(L"\nConfigures system devices.\n\n"); - for (i = 0; i < NUM_ELEMENTS(usage_strings); i++) + for (i = 0; i < ARRAYSIZE(usage_strings); i++) { wprintf(L"%s\n", usage_strings[i]); } @@ -78,7 +80,7 @@ WCHAR* ptr = buffer; *ptr = L'\0'; - if (QueryDosDeviceW(NULL, buffer, NUM_ELEMENTS(buffer))) + if (QueryDosDeviceW(NULL, buffer, ARRAYSIZE(buffer))) { while (*ptr != L'\0') { @@ -117,7 +119,7 @@ swprintf(szPortName, L"LPT%d", nPortNum); wprintf(L"\nStatus for device LPT%d:\n", nPortNum); wprintf(L"-----------------------\n"); - if (QueryDosDeviceW(szPortName, buffer, NUM_ELEMENTS(buffer))) + if (QueryDosDeviceW(szPortName, buffer, ARRAYSIZE(buffer))) { WCHAR* ptr = wcsrchr(buffer, L'\\'); if (ptr != NULL) @@ -226,12 +228,12 @@ { return 1; } - if (dcb.Parity > NUM_ELEMENTS(parity_strings)) + if (dcb.Parity >= ARRAYSIZE(parity_strings)) { wprintf(L"ERROR: Invalid value for Parity Bits %d:\n", dcb.Parity); dcb.Parity = 0; } - if (dcb.StopBits > NUM_ELEMENTS(stopbit_strings)) + if (dcb.StopBits >= ARRAYSIZE(stopbit_strings)) { wprintf(L"ERROR: Invalid value for Stop Bits %d:\n", dcb.StopBits); dcb.StopBits = 0;

9 years, 3 months

[ion] 69078: [BOOTMGFW] - Fix text console bugs. It works now both when already at 80x25, as well as when using UEFI Shell to switch to 100x31 first. Tested with Virtual Box.

by ion＠svn.reactos.org

Author: ion Date: Mon Sep 7 06:00:37 2015 New Revision: 69078 URL: http://svn.reactos.org/svn/reactos?rev=69078&view=rev Log: [BOOTMGFW] - Fix text console bugs. It works now both when already at 80x25, as well as when using UEFI Shell to switch to 100x31 first. Tested with Virtual Box. Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/lib/bootlib.c trunk/reactos/boot/environ/lib/mm/heapalloc.c trunk/reactos/boot/environ/lib/mm/pagealloc.c trunk/reactos/boot/environ/lib/platform/display.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Mon Sep 7 06:00:37 2015 @@ -55,6 +55,7 @@ Status = BlInitializeLibrary(BootParameters, &LibraryParameters); EarlyPrint(L"ReactOS UEFI Boot Manager Exiting: %lx\n", Status); + EfiStall(3000000); return Status; } Modified: trunk/reactos/boot/environ/lib/bootlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/bootlib.c… ============================================================================== --- trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] Mon Sep 7 06:00:37 2015 @@ -347,7 +347,6 @@ Status = STATUS_SUCCESS; Quickie: - EarlyPrint(L"Exiting init: %lx\n", Status); return Status; } 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 06:00:37 2015 @@ -537,7 +537,6 @@ { /* The heap is ready! */ HapInitializationStatus = 1; - EarlyPrint(L"Heap Allocator Initialized!\n"); Status = STATUS_SUCCESS; } 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 06:00:37 2015 @@ -560,7 +560,6 @@ if (NT_SUCCESS(Status)) { /* The Page Allocator has initialized */ - EarlyPrint(L"Page Allocator initialized\n"); PapInitializationStatus = TRUE; Status = STATUS_SUCCESS; } 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 06:00:37 2015 @@ -147,7 +147,7 @@ BL_DISPLAY_MODE ConsoleTextResolutionList[1] = { - {80, 31, 80} + {80, 25, 80} }; NTSTATUS @@ -231,14 +231,15 @@ while (List != ListEnd) { /* Does this resolution match? */ - if ((Mode->HRes != List->HRes) || (Mode->VRes != List->VRes)) - { - /* Try another one*/ - List++; - } - - /* Yep -- we got a match */ - return TRUE; + if ((Mode->HRes == List->HRes) && (Mode->VRes == List->VRes)) + { + /* Yep -- we got a match */ + return TRUE; + + } + + /* Try another one*/ + List++; } /* No matches were found */ @@ -250,6 +251,7 @@ _In_ UINT32 Attributes ) { + /* Read the foreground color attribute and convert to CGA color index */ switch (Attributes & 0x0F) { case EFI_BLACK: @@ -293,6 +295,7 @@ _In_ UINT32 Attributes ) { + /* Read the background color attribute and convert to CGA color index */ switch (Attributes & 0xF0) { case EFI_BACKGROUND_MAGENTA: @@ -301,8 +304,8 @@ return Brown; case EFI_BACKGROUND_LIGHTGRAY: return White; + case EFI_BACKGROUND_BLACK: default: - case EFI_BACKGROUND_BLACK: return Black; case EFI_BACKGROUND_RED: return Red; @@ -320,6 +323,7 @@ _In_ BL_COLOR Color ) { + /* Convert the CGA color index into an EFI background attribute */ switch (Color) { case Blue: @@ -355,6 +359,7 @@ _In_ BL_COLOR Color ) { + /* Convert the CGA color index into an EFI foreground attribute */ switch (Color) { case Black: @@ -433,43 +438,49 @@ ULONG FgColor, BgColor, Attribute, XPos, YPos, TextHeight, TextWidth; BOOLEAN Visible; - Status = STATUS_SUCCESS; - + /* 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) { - if (FgColor >= 16) + /* Ignore invalid color */ + if (FgColor > White) { return STATUS_INVALID_PARAMETER; } - Attribute = ConsoleEfiTextGetAttribute(TextConsole->State.BgColor, FgColor); + /* 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) { - if (BgColor >= 16) + /* Ignore invalid color */ + if (BgColor > White) { return STATUS_INVALID_PARAMETER; } - Attribute = ConsoleEfiTextGetAttribute(BgColor, TextConsole->State.FgColor); + /* 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)) @@ -477,53 +488,63 @@ 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)) - { + 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 Status; + /* Return success */ + return STATUS_SUCCESS; } NTSTATUS @@ -560,6 +581,7 @@ } /* 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 */ @@ -570,10 +592,11 @@ &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; + MaxQueriedMode = Mode + 1; } } @@ -582,10 +605,11 @@ { /* Loop all the UEFI queried modes */ SupportedModeEntry = &SupportedModes[i]; - for (MatchingMode = 0; MatchingMode < MaxQueriedMode; MatchingMode) + 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)) { @@ -655,16 +679,19 @@ 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)) { @@ -773,7 +800,7 @@ VOID ) { - EarlyPrint(L"Disabling graphics\n"); + //EarlyPrint(L"Disabling graphics\n"); return TRUE; } @@ -796,6 +823,7 @@ Status = ConsoleFirmwareTextOpen(TextConsole); if (!NT_SUCCESS(Status)) { + EarlyPrint(L"Failed to activate console: %lx\n", Status); return Status; } } @@ -815,6 +843,7 @@ if (!NT_SUCCESS(Status)) { /* We failed, back down */ + EarlyPrint(L"Failed to set console state: %lx\n", Status); ConsoleFirmwareTextClose(TextConsole); return Status; } @@ -850,11 +879,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)

9 years, 3 months

[ion] 69077: [BOOTMGFW] - Build fixes for GCC

by ion＠svn.reactos.org

Author: ion Date: Mon Sep 7 04:42:34 2015 New Revision: 69077 URL: http://svn.reactos.org/svn/reactos?rev=69077&view=rev Log: [BOOTMGFW] - Build fixes for GCC Modified: trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/bootlib.c trunk/reactos/boot/environ/lib/firmware/efi/firmware.c trunk/reactos/boot/environ/lib/platform/display.c Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Mon Sep 7 04:42:34 2015 @@ -620,8 +620,8 @@ EfiConOutQueryMode ( _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, _In_ ULONG Mode, - _In_ PULONG Columns, - _In_ PULONG Rows + _In_ UINTN* Columns, + _In_ UINTN* Rows ); NTSTATUS Modified: trunk/reactos/boot/environ/lib/bootlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/bootlib.c… ============================================================================== --- trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] Mon Sep 7 04:42:34 2015 @@ -190,7 +190,7 @@ InitializeListHead(&EnEventNotificationList); #endif - /* Initialize the I/O Manager */i + /* Initialize the I/O Manager */ Status = BlpIoInitialize(); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/… ============================================================================== --- trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] Mon Sep 7 04:42:34 2015 @@ -251,8 +251,8 @@ EfiConOutQueryMode ( _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, _In_ ULONG Mode, - _In_ PULONG Columns, - _In_ PULONG Rows + _In_ UINTN* Columns, + _In_ UINTN* Rows ) { BL_ARCH_MODE OldMode; @@ -407,7 +407,6 @@ ) { BL_ARCH_MODE OldMode; - EFI_STATUS EfiStatus; /* Are we in protected mode? */ OldMode = CurrentExecutionContext->Mode; Modified: trunk/reactos/boot/environ/lib/platform/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/platform/… ============================================================================== --- trunk/reactos/boot/environ/lib/platform/display.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/platform/display.c [iso-8859-1] Mon Sep 7 04:42:34 2015 @@ -535,7 +535,8 @@ ) { EFI_SIMPLE_TEXT_OUTPUT_MODE ModeInfo; - ULONG MaxMode, MaxQueriedMode, Mode, HRes, VRes, i, MatchingMode; + ULONG MaxMode, MaxQueriedMode, Mode, i, MatchingMode; + UINTN HRes, VRes; ULONGLONG ModeListSize; PBL_DISPLAY_MODE ModeEntry, ModeList, SupportedModeEntry; NTSTATUS Status; @@ -632,7 +633,8 @@ { BL_DISPLAY_MODE DisplayMode; EFI_SIMPLE_TEXT_OUTPUT_MODE CurrentMode, NewMode; - ULONG HRes, VRes, Mode; + UINTN HRes, VRes; + ULONG Mode; NTSTATUS Status; /* Read the current mode and its settings */ @@ -834,12 +836,12 @@ ) { BL_LIBRARY_PARAMETERS LibraryParameters = BlpLibraryParameters; - BOOLEAN NoGraphics, HighestMode; + BOOLEAN NoGraphics;// , HighestMode; NTSTATUS Status; PBL_DISPLAY_MODE DisplayMode; - ULONG GraphicsResolution; + //ULONG GraphicsResolution; PVOID GraphicsConsole; - PVOID RemoteConsole; + // PVOID RemoteConsole; PBL_TEXT_CONSOLE TextConsole; /* Initialize font data */ @@ -887,7 +889,7 @@ BcdLibraryInteger_GraphicsResolution, &GraphicsResolution); #else - GraphicsResolution = 0; + //GraphicsResolution = 0; Status = STATUS_NOT_FOUND; #endif if (NT_SUCCESS(Status)) @@ -902,7 +904,7 @@ BcdLibraryBoolean_GraphicsForceHighestMode, &HighestMode); #else - HighestMode = 0; + //HighestMode = 0; Status = STATUS_NOT_FOUND; #endif if (NT_SUCCESS(Status)) @@ -952,7 +954,7 @@ DspGraphicalConsole = NULL; /* If we don't have a text console, go get a remote console */ - RemoteConsole = NULL; + //RemoteConsole = NULL; if (!TextConsole) { EarlyPrint(L"Display path not handled\n");

9 years, 3 months

[ion] 69076: [BOOTMGFW] - Checkpoint commit of about 1000+ lines of text console support code. Right now, it's very disorganized and not tested. - Write out the rest of the initialization path. Alm...

by ion＠svn.reactos.org

Author: ion Date: Mon Sep 7 04:37:01 2015 New Revision: 69076 URL: http://svn.reactos.org/svn/reactos?rev=69076&view=rev Log: [BOOTMGFW] - Checkpoint commit of about 1000+ lines of text console support code. Right now, it's very disorganized and not tested. - Write out the rest of the initialization path. Almost everything else is only for Boot Debugging, BitLocker, TPM, PXE... Added: trunk/reactos/boot/environ/lib/platform/display.c (with props) Modified: trunk/reactos/boot/environ/CMakeLists.txt trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/bootlib.c trunk/reactos/boot/environ/lib/firmware/efi/firmware.c 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 04:37:01 2015 @@ -22,7 +22,8 @@ lib/io/io.c lib/io/device.c lib/io/file.c - lib/io/fat.c) + lib/io/fat.c + lib/platform/display.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 04:37:01 2015 @@ -73,10 +73,12 @@ #define BL_MM_REMOVE_VIRTUAL_REGION_FLAG 0x80000000 +#define BL_LIBRARY_FLAG_NO_DISPLAY 0x01 #define BL_LIBRARY_FLAG_REINITIALIZE 0x02 #define BL_LIBRARY_FLAG_REINITIALIZE_ALL 0x04 #define BL_LIBRARY_FLAG_ZERO_HEAP_ALLOCATIONS_ON_FREE 0x10 #define BL_LIBRARY_FLAG_INITIALIZATION_COMPLETED 0x20 +#define BL_LIBRARY_FLAG_NO_GRAPHICS_CONSOLE 0x800 #define BL_FS_REGISTER_AT_HEAD_FLAG 1 @@ -595,6 +597,11 @@ VOID ); +NTSTATUS +BlpDisplayInitialize ( + _In_ ULONG Flags + ); + /* FIRMWARE ROUTINES *********************************************************/ NTSTATUS @@ -607,6 +614,45 @@ NTSTATUS EfiStall ( _In_ ULONG StallTime + ); + +NTSTATUS +EfiConOutQueryMode ( + _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, + _In_ ULONG Mode, + _In_ PULONG Columns, + _In_ PULONG Rows + ); + +NTSTATUS +EfiConOutSetMode ( + _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, + _In_ ULONG Mode + ); + +VOID +EfiConOutReadCurrentMode ( + _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, + _Out_ EFI_SIMPLE_TEXT_OUTPUT_MODE* Mode + ); + +NTSTATUS +EfiConOutSetAttribute ( + _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, + _In_ ULONG Attribute + ); + +NTSTATUS +EfiConOutSetCursorPosition ( + _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, + _In_ ULONG Column, + _In_ ULONG Row + ); + +NTSTATUS +EfiConOutEnableCursor ( + _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, + _In_ BOOLEAN Visible ); /* PLATFORM TIMER ROUTINES ***************************************************/ @@ -739,11 +785,21 @@ _In_ PVOID Buffer ); +/* DISPLAY ROUTINES **********************************************************/ + +VOID +BlDisplayGetTextCellResolution ( + _Out_ PULONG TextWidth, + _Out_ PULONG TextHeight + ); + extern ULONG MmDescriptorCallTreeCount; extern ULONG BlpApplicationFlags; extern BL_LIBRARY_PARAMETERS BlpLibraryParameters; extern BL_TRANSLATION_TYPE MmTranslationType; extern PBL_ARCH_CONTEXT CurrentExecutionContext; extern PBL_DEVICE_DESCRIPTOR BlpBootDevice; +extern BL_APPLICATION_ENTRY BlpApplicationEntry; +extern SIMPLE_TEXT_OUTPUT_INTERFACE *EfiConOut; #endif Modified: trunk/reactos/boot/environ/lib/bootlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/bootlib.c… ============================================================================== --- trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] Mon Sep 7 04:37:01 2015 @@ -18,8 +18,9 @@ PBOOT_APPLICATION_PARAMETER_BLOCK BlpApplicationParameters; BL_APPLICATION_ENTRY BlpApplicationEntry; BOOLEAN BlpLibraryParametersInitialized; -BOOLEAN EnSubsystemInitialized; -LIST_ENTRY EnEventNotificationList; + +ULONG PdPersistAllocations; +LIST_ENTRY BlBadpListHead; /* FUNCTIONS *****************************************************************/ @@ -178,34 +179,46 @@ return Status; } -#if 0 +#ifdef BL_TPM_SUPPORT /* Initialize support for Trusted Platform Module v1.2 */ BlpTpmInitialize(); #endif +#ifdef BL_TPM_SUPPORT /* Initialize the event manager */ EnSubsystemInitialized = 1; InitializeListHead(&EnEventNotificationList); - - /* Initialize the I/O Manager */ +#endif + + /* Initialize the I/O Manager */i Status = BlpIoInitialize(); if (!NT_SUCCESS(Status)) { /* Destroy memory manager in phase 1 and the event manager */ EarlyPrint(L"IO init failed\n"); - //if (EnSubsystemInitialized) BlpEnDestroy(); +#ifdef BL_TPM_SUPPORT + if (EnSubsystemInitialized) + { + BlpEnDestroy(); + } +#endif //BlpMmDestroy(1); return Status; } -#if 0 +#ifdef BL_NET_SUPPORT /* Initialize the network stack */ Status = BlNetInitialize(); if (!NT_SUCCESS(Status)) { /* Destroy the I/O, event, and memory managers in phase 1 */ BlpIoDestroy(); - if (EnSubsystemInitialized) BlpEnDestroy(); +#ifdef BL_TPM_SUPPORT + if (EnSubsystemInitialized) + { + BlpEnDestroy(); + } +#endif BlpMmDestroy(1); return Status; } @@ -216,16 +229,122 @@ if (!NT_SUCCESS(Status)) { /* Destroy the network, I/O, event, and memory managers in phase 1 */ - //BlNetDestroy(); +#ifdef BL_NET_SUPPORT + BlNetDestroy(); +#endif //BlpIoDestroy(); - //if (EnSubsystemInitialized) BlpEnDestroy(); +#ifdef BL_TPM_SUPPORT + if (EnSubsystemInitialized) + { + BlpEnDestroy(); + } +#endif //BlpMmDestroy(1); EarlyPrint(L"Util init failed\n"); return Status; } - EarlyPrint(L"TODO!\n"); - Status = STATUS_NOT_IMPLEMENTED; +#ifdef BL_KD_SUPPORT + /* Initialize PCI Platform Support */ + PltInitializePciConfiguration(); +#endif + +#ifdef BL_SECURE_BOOT_SUPPORT + /* Read the current SecureBoot Policy*/ + Status = BlSecureBootSetActivePolicyFromPersistedData(); + if (!NT_SUCCESS(Status)) + { + /* Destroy everything that we've currently set up */ +#ifdef BL_KD_SUPPORT + PltDestroyPciConfiguration(); +#endif +#ifdef BL_NET_SUPPORT + BlNetDestroy(); +#endif + BlpIoDestroy(); +#ifdef BL_TPM_SUPPORT + if (EnSubsystemInitialized) + { + BlpEnDestroy(); + } +#endif + BlpMmDestroy(1); + return Status; + } +#endif + +#ifdef BL_TPM_SUPPORT + /* Initialize phase 0 of the security subsystem */ + SipInitializePhase0(); +#endif + +#ifdef BL_KD_SUPPORT + /* Bring up the boot debugger, now that SecureBoot has been processed */ + BlBdInitialize(); +#endif + +#ifdef BL_ETW_SUPPORT + /* Initialize internal logging */ + BlpLogInitialize(); +#endif + + /* Are graphics enabled? */ + if (!(LibraryParameters->LibraryFlags & BL_LIBRARY_FLAG_NO_DISPLAY)) + { + /* Initialize the graphics library */ + BlpDisplayInitialize(LibraryParameters->LibraryFlags); + } + + /* Initialize the boot application persistent data */ + PdPersistAllocations = 0; + InitializeListHead(&BlBadpListHead); + +#ifdef BL_TPM_SUPPORT + /* Now setup the security subsystem in phase 1 */ + BlpSiInitialize(1); +#endif + +#if 0 + /* Setup the text, UI and font resources */ + Status = BlpResourceInitialize(); + if (!NT_SUCCESS(Status)) + { + /* Tear down everything if this failed */ + if (!(LibraryParameters->LibraryFlags & BL_LIBRARY_FLAG_TEXT_MODE)) + { +// BlpDisplayDestroy(); + } + //BlpBdDestroy(); +#ifdef BL_KD_SUPPORT + PltDestroyPciConfiguration(); +#endif +#ifdef BL_NET_SUPPORT + BlNetDestroy(); +#endif + //BlpIoDestroy(); +#ifdef BL_TPM_SUPPORT + if (EnSubsystemInitialized) + { + BlpEnDestroy(); + } +#endif + //BlpMmDestroy(1); + return Status; + } +#endif + +#if BL_BITLOCKER_SUPPORT + /* Setup the boot cryptography library */ + g_pEnvironmentData = &SymCryptEnvironmentWindowsBootLibrary; + if (SymCryptEnvWindowsBootLibInit) + { + SymCryptEnvWindowsBootLibInit(); + } +#endif + + /* We are fully initialized, remember this and exit with success */ + BlpLibraryParameters.LibraryFlags |= BL_LIBRARY_FLAG_INITIALIZATION_COMPLETED; + Status = STATUS_SUCCESS; Quickie: EarlyPrint(L"Exiting init: %lx\n", Status); 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 04:37:01 2015 @@ -245,6 +245,186 @@ /* Convert the error to an NTSTATUS */ return EfiGetNtStatusCode(EfiStatus); +} + +NTSTATUS +EfiConOutQueryMode ( + _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, + _In_ ULONG Mode, + _In_ PULONG Columns, + _In_ PULONG Rows + ) +{ + BL_ARCH_MODE OldMode; + EFI_STATUS EfiStatus; + + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return STATUS_NOT_IMPLEMENTED; + } + + /* Make the EFI call */ + EfiStatus = TextInterface->QueryMode(TextInterface, Mode, Columns, Rows); + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } + + /* Convert the error to an NTSTATUS */ + return EfiGetNtStatusCode(EfiStatus); +} + +NTSTATUS +EfiConOutSetMode ( + _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, + _In_ ULONG Mode + ) +{ + BL_ARCH_MODE OldMode; + EFI_STATUS EfiStatus; + + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return STATUS_NOT_IMPLEMENTED; + } + + /* Make the EFI call */ + EfiStatus = TextInterface->SetMode(TextInterface, Mode); + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } + + /* Convert the error to an NTSTATUS */ + return EfiGetNtStatusCode(EfiStatus); +} + +NTSTATUS +EfiConOutSetAttribute ( + _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, + _In_ ULONG Attribute + ) +{ + BL_ARCH_MODE OldMode; + EFI_STATUS EfiStatus; + + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return STATUS_NOT_IMPLEMENTED; + } + + /* Make the EFI call */ + EfiStatus = TextInterface->SetAttribute(TextInterface, Attribute); + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } + + /* Convert the error to an NTSTATUS */ + return EfiGetNtStatusCode(EfiStatus); +} + +NTSTATUS +EfiConOutSetCursorPosition ( + _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, + _In_ ULONG Column, + _In_ ULONG Row + ) +{ + BL_ARCH_MODE OldMode; + EFI_STATUS EfiStatus; + + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return STATUS_NOT_IMPLEMENTED; + } + + /* Make the EFI call */ + EfiStatus = TextInterface->SetCursorPosition(TextInterface, Column, Row); + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } + + /* Convert the error to an NTSTATUS */ + return EfiGetNtStatusCode(EfiStatus); +} + +NTSTATUS +EfiConOutEnableCursor ( + _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, + _In_ BOOLEAN Visible + ) +{ + BL_ARCH_MODE OldMode; + EFI_STATUS EfiStatus; + + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return STATUS_NOT_IMPLEMENTED; + } + + /* Make the EFI call */ + EfiStatus = TextInterface->EnableCursor(TextInterface, Visible); + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } + + /* Convert the error to an NTSTATUS */ + return EfiGetNtStatusCode(EfiStatus); +} + +VOID +EfiConOutReadCurrentMode ( + _In_ SIMPLE_TEXT_OUTPUT_INTERFACE *TextInterface, + _Out_ EFI_SIMPLE_TEXT_OUTPUT_MODE* Mode + ) +{ + BL_ARCH_MODE OldMode; + EFI_STATUS EfiStatus; + + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return; + } + + /* Make the EFI call */ + RtlCopyMemory(Mode, TextInterface->Mode, sizeof(*Mode)); + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } } NTSTATUS Added: 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 (added) +++ trunk/reactos/boot/environ/lib/platform/display.c [iso-8859-1] Mon Sep 7 04:37:01 2015 @@ -0,0 +1,1051 @@ +/* + * 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_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; + +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} +}; + +BL_DISPLAY_MODE ConsoleTextResolutionList[1] = +{ + {80, 31, 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 +}; + +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)) + { + /* Try another one*/ + List++; + } + + /* Yep -- we got a match */ + return TRUE; + } + + /* No matches were found */ + return FALSE; +} + +BL_COLOR +ConsoleEfiTextGetColorForeground ( + _In_ UINT32 Attributes + ) +{ + 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 + ) +{ + switch (Attributes & 0xF0) + { + case EFI_BACKGROUND_MAGENTA: + return Magenta; + case EFI_BACKGROUND_BROWN: + return Brown; + case EFI_BACKGROUND_LIGHTGRAY: + return White; + default: + case EFI_BACKGROUND_BLACK: + 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 + ) +{ + 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 + ) +{ + 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; + + Status = STATUS_SUCCESS; + + if (Mask & 1) + { + FgColor = State->FgColor; + + if (TextConsole->State.FgColor != FgColor) + { + if (FgColor >= 16) + { + return STATUS_INVALID_PARAMETER; + } + + Attribute = ConsoleEfiTextGetAttribute(TextConsole->State.BgColor, FgColor); + Status = EfiConOutSetAttribute(TextConsole->Protocol, Attribute); + + + if (!NT_SUCCESS(Status)) + { + return Status; + } + + TextConsole->State.FgColor = FgColor; + } + } + + if (Mask & 2) + { + BgColor = State->BgColor; + if (TextConsole->State.BgColor != BgColor) + { + if (BgColor >= 16) + { + return STATUS_INVALID_PARAMETER; + } + + Attribute = ConsoleEfiTextGetAttribute(BgColor, TextConsole->State.FgColor); + Status = EfiConOutSetAttribute(TextConsole->Protocol, Attribute); + + if (!NT_SUCCESS(Status)) + { + return Status; + } + + TextConsole->State.BgColor = BgColor; + } + } + + if (Mask & 4) + { + XPos = State->XPos; + YPos = State->YPos; + + if ((TextConsole->State.XPos != XPos) || (TextConsole->State.YPos != YPos)) + { + BlDisplayGetTextCellResolution(&TextWidth, &TextHeight); + Status = EfiConOutSetCursorPosition(TextConsole->Protocol, + XPos/ TextWidth, + YPos / TextHeight); + + if (!NT_SUCCESS(Status)) + { + return Status; + } + + TextConsole->State.XPos = XPos; + TextConsole->State.YPos = YPos; + } + } + + if (Mask & 8) + { + Visible = State->CursorVisible; + if (TextConsole->State.CursorVisible != Visible) + { + if (Visible >= 3) + { + return STATUS_INVALID_PARAMETER; + } + + Status = EfiConOutEnableCursor(TextConsole->Protocol, Visible); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + TextConsole->State.CursorVisible = Visible; + } + } + + return Status; +} + +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, HRes, VRes, i, MatchingMode; + 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 */ + 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 */ + ModeEntry->HRes = HRes; + ModeEntry->VRes = VRes; + ModeEntry->HRes2 = HRes; + MaxQueriedMode = Mode; + } + } + + /* 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]; + 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; + ULONG HRes, VRes, 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 */ + Status = ConsoleEfiTextFindModeFromAllowed(EfiConOut, + ConsoleTextResolutionList, + 1, + &Mode); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Set the new EFI 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 +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 TRUE; +} + +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)) + { + 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 */ + 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 +DsppInitialize ( + _In_ ULONG Flags + ) +{ + BL_LIBRARY_PARAMETERS LibraryParameters = BlpLibraryParameters; + BOOLEAN NoGraphics, HighestMode; + NTSTATUS Status; + PBL_DISPLAY_MODE DisplayMode; + ULONG GraphicsResolution; + PVOID GraphicsConsole; + PVOID RemoteConsole; + PBL_TEXT_CONSOLE TextConsole; + + /* 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)) + { + 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 |= 2; + } + + /* Do we need graphics mode after all? */ + if (!NoGraphics) + { + EarlyPrint(L"Display path not handled\n"); + return STATUS_NOT_SUPPORTED; + } + + /* 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 &= ~3; + } + + /* 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) + { + EarlyPrint(L"Display path not handled\n"); + return STATUS_NOT_SUPPORTED; + } + + /* Do we have a remote console? */ + if (!DspRemoteInputConsole) + { + /* 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/platform/display.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 3 months

[sginsberg] 69075: - Fix the ASSERT in VdmSwapContext now that we are always setting up the trap frame correctly on debug build. - Fix the ASSERT in KeConnectInterrupt for debug single-processor bu...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Sep 6 22:29:10 2015 New Revision: 69075 URL: http://svn.reactos.org/svn/reactos?rev=69075&view=rev Log: - Fix the ASSERT in VdmSwapContext now that we are always setting up the trap frame correctly on debug build. - Fix the ASSERT in KeConnectInterrupt for debug single-processor builds (but keep the old one for multiprocessor build to make it less confusing if it is hit). Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/vdm/vdmexec.c Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Sun Sep 6 22:29:10 2015 @@ -447,8 +447,16 @@ /* The vector is shared and the interrupts are compatible */ Interrupt->Connected = Connected = TRUE; - /* FIXME */ - // ASSERT(Irql <= SYNCH_LEVEL); + /* + * Verify the IRQL for chained connect, + */ +#if defined(CONFIG_SMP) + ASSERT(Irql <= SYNCH_LEVEL); +#elif (NTDDI_VERSION >= NTDDI_WS03) + ASSERT(Irql <= (IPI_LEVEL - 2)); +#else + ASSERT(Irql <= (IPI_LEVEL - 1)); +#endif /* Check if this is the first chain */ if (Dispatch.Type != ChainConnect) Modified: trunk/reactos/ntoskrnl/vdm/vdmexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmexec.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmexec.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/vdm/vdmexec.c [iso-8859-1] Sun Sep 6 22:29:10 2015 @@ -50,7 +50,7 @@ /* Make sure that we're at APC_LEVEL and that this is a valid frame */ ASSERT(KeGetCurrentIrql() == APC_LEVEL); - //ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); + ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); /* Check if this is a V86 frame */ if (TrapFrame->EFlags & EFLAGS_V86_MASK)

9 years, 3 months

[pschweitzer] 69074: [NTOSKRNL] Fix a bug in HalpGetFullGeometry(): properly reset the event before reusing it. We may have waited on it previously.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Sep 6 22:10:53 2015 New Revision: 69074 URL: http://svn.reactos.org/svn/reactos?rev=69074&view=rev Log: [NTOSKRNL] Fix a bug in HalpGetFullGeometry(): properly reset the event before reusing it. We may have waited on it previously. Modified: trunk/reactos/ntoskrnl/fstub/disksup.c Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Sun Sep 6 22:10:53 2015 @@ -1009,6 +1009,9 @@ ExFreePoolWithTag(Event, TAG_FILE_SYSTEM); return STATUS_INSUFFICIENT_RESOURCES; } + + /* Reset event */ + KeResetEvent(Event); /* Call the driver and check if it's pending */ Status = IoCallDriver(DeviceObject, Irp);

9 years, 3 months

[ion] 69073: [BOOTMGFW] - I/O Library initialization. - A few more random initialization routines. Skip TPM, BitLocker, Network and non-FAT filesystems for now.

by ion＠svn.reactos.org

Author: ion Date: Sun Sep 6 21:29:41 2015 New Revision: 69073 URL: http://svn.reactos.org/svn/reactos?rev=69073&view=rev Log: [BOOTMGFW] - I/O Library initialization. - A few more random initialization routines. Skip TPM, BitLocker, Network and non-FAT filesystems for now. Added: trunk/reactos/boot/environ/lib/io/device.c (with props) trunk/reactos/boot/environ/lib/io/fat.c (with props) trunk/reactos/boot/environ/lib/io/file.c (with props) trunk/reactos/boot/environ/lib/io/io.c (with props) Modified: trunk/reactos/boot/environ/CMakeLists.txt trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/bootlib.c trunk/reactos/boot/environ/lib/misc/util.c trunk/reactos/boot/environ/lib/platform/time.c 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] Sun Sep 6 21:29:41 2015 @@ -18,7 +18,11 @@ lib/mm/heapalloc.c lib/mm/blkalloc.c lib/mm/descriptor.c - lib/platform/time.c) + lib/platform/time.c + lib/io/io.c + lib/io/device.c + lib/io/file.c + lib/io/fat.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] Sun Sep 6 21:29:41 2015 @@ -77,6 +77,8 @@ #define BL_LIBRARY_FLAG_REINITIALIZE_ALL 0x04 #define BL_LIBRARY_FLAG_ZERO_HEAP_ALLOCATIONS_ON_FREE 0x10 #define BL_LIBRARY_FLAG_INITIALIZATION_COMPLETED 0x20 + +#define BL_FS_REGISTER_AT_HEAD_FLAG 1 #define BL_MEMORY_CLASS_SHIFT 28 @@ -200,6 +202,38 @@ BlMemoryRuntime = 0x1000000 } BL_MEMORY_ATTR; +/* CALLBACKS *****************************************************************/ + +typedef +NTSTATUS +(*PBL_FS_INIT_CALLBACK) ( + VOID + ); + +typedef +NTSTATUS +(*PBL_FS_DESTROY_CALLBACK) ( + VOID + ); + +typedef +NTSTATUS +(*PBL_FS_MOUNT_CALLBACK) ( + VOID + ); + +typedef +NTSTATUS +(*PBL_FS_PURGE_CALLBACK) ( + VOID + ); + +typedef +NTSTATUS +(*PBL_FILE_DESTROY_CALLBACK) ( + _In_ PVOID Entry + ); + /* DATA STRUCTURES ***********************************************************/ typedef struct _BL_LIBRARY_PARAMETERS @@ -419,6 +453,34 @@ ULONGLONG Minimum; ULONGLONG Maximum; } BL_ADDRESS_RANGE, *PBL_ADDRESS_RANGE; + +typedef struct _BL_FILE_ENTRY +{ + ULONG DeviceIndex; + PBL_FILE_DESTROY_CALLBACK DestroyCallback; +} BL_FILE_ENTRY, *PBL_FILE_ENTRY; + +typedef struct _BL_DEVICE_ENTRY +{ + ULONG ReferenceCount; +} BL_DEVICE_ENTRY, *PBL_DEVICE_ENTRY; + +typedef struct _BL_FILE_SYSTEM_ENTRY +{ + LIST_ENTRY ListEntry; + PBL_FS_INIT_CALLBACK InitCallback; + PBL_FS_DESTROY_CALLBACK DestroyCallback; + PBL_FS_MOUNT_CALLBACK MountCallback; + PBL_FS_PURGE_CALLBACK PurgeCallback; +} BL_FILE_SYSTEM_ENTRY, *PBL_FILE_SYSTEM_ENTRY; + +typedef struct _BL_FILE_SYSTEM_REGISTRATION_TABLE +{ + PBL_FS_INIT_CALLBACK Init; + PBL_FS_DESTROY_CALLBACK Destroy; + PBL_FS_MOUNT_CALLBACK Mount; + PBL_FS_PURGE_CALLBACK Purge; +} BL_FILE_SYSTEM_REGISTRATION_TABLE; /* INLINE ROUTINES ***********************************************************/ @@ -513,6 +575,26 @@ _In_ PBL_LIBRARY_PARAMETERS LibraryParameters ); +NTSTATUS +BlpDeviceInitialize ( + VOID + ); + +NTSTATUS +BlpIoInitialize ( + VOID + ); + +NTSTATUS +BlpFileInitialize ( + VOID + ); + +NTSTATUS +FatInitialize ( + VOID + ); + /* FIRMWARE ROUTINES *********************************************************/ NTSTATUS @@ -544,6 +626,11 @@ NTSTATUS EfiGetNtStatusCode ( _In_ EFI_STATUS EfiStatus + ); + +NTSTATUS +BlUtlInitialize ( + VOID ); /* BCD ROUTINES **************************************************************/ @@ -647,6 +734,11 @@ _In_ ULONG Size ); +NTSTATUS +BlMmFreeHeap ( + _In_ PVOID Buffer + ); + extern ULONG MmDescriptorCallTreeCount; extern ULONG BlpApplicationFlags; extern BL_LIBRARY_PARAMETERS BlpLibraryParameters; Modified: trunk/reactos/boot/environ/lib/bootlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/bootlib.c… ============================================================================== --- trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] Sun Sep 6 21:29:41 2015 @@ -18,6 +18,8 @@ PBOOT_APPLICATION_PARAMETER_BLOCK BlpApplicationParameters; BL_APPLICATION_ENTRY BlpApplicationEntry; BOOLEAN BlpLibraryParametersInitialized; +BOOLEAN EnSubsystemInitialized; +LIST_ENTRY EnEventNotificationList; /* FUNCTIONS *****************************************************************/ @@ -176,6 +178,52 @@ return Status; } +#if 0 + /* Initialize support for Trusted Platform Module v1.2 */ + BlpTpmInitialize(); +#endif + + /* Initialize the event manager */ + EnSubsystemInitialized = 1; + InitializeListHead(&EnEventNotificationList); + + /* Initialize the I/O Manager */ + Status = BlpIoInitialize(); + if (!NT_SUCCESS(Status)) + { + /* Destroy memory manager in phase 1 and the event manager */ + EarlyPrint(L"IO init failed\n"); + //if (EnSubsystemInitialized) BlpEnDestroy(); + //BlpMmDestroy(1); + return Status; + } + +#if 0 + /* Initialize the network stack */ + Status = BlNetInitialize(); + if (!NT_SUCCESS(Status)) + { + /* Destroy the I/O, event, and memory managers in phase 1 */ + BlpIoDestroy(); + if (EnSubsystemInitialized) BlpEnDestroy(); + BlpMmDestroy(1); + return Status; + } +#endif + + /* Initialize the utility library */ + Status = BlUtlInitialize(); + if (!NT_SUCCESS(Status)) + { + /* Destroy the network, I/O, event, and memory managers in phase 1 */ + //BlNetDestroy(); + //BlpIoDestroy(); + //if (EnSubsystemInitialized) BlpEnDestroy(); + //BlpMmDestroy(1); + EarlyPrint(L"Util init failed\n"); + return Status; + } + EarlyPrint(L"TODO!\n"); Status = STATUS_NOT_IMPLEMENTED; Added: trunk/reactos/boot/environ/lib/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/device… ============================================================================== --- trunk/reactos/boot/environ/lib/io/device.c (added) +++ trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] Sun Sep 6 21:29:41 2015 @@ -0,0 +1,72 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/io/device.c + * PURPOSE: Boot Library Device Management Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +typedef struct _BL_DEVICE_INFORMATION +{ + ULONG Unknown0; + ULONG Unknown1; + ULONG Unknown2; + ULONG Unknown3; +} BL_DEVICE_INFORMATION, *PBL_DEVICE_INFORMATION; + +LIST_ENTRY DmRegisteredDevices; +ULONG DmTableEntries; +LIST_ENTRY DmRegisteredDevices; +PVOID* DmDeviceTable; + +BL_DEVICE_INFORMATION DmDeviceIoInformation; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +BlpDeviceInitialize ( + VOID + ) +{ + NTSTATUS Status; + + /* Initialize the table count and list of devices */ + DmTableEntries = 8; + InitializeListHead(&DmRegisteredDevices); + + /* Initialize device information */ + DmDeviceIoInformation.Unknown0 = 0; + DmDeviceIoInformation.Unknown1 = 0; + DmDeviceIoInformation.Unknown2 = 0; + DmDeviceIoInformation.Unknown3 = 0; + + /* Allocate the device table */ + DmDeviceTable = BlMmAllocateHeap(DmTableEntries * sizeof(PVOID)); + if (DmDeviceTable) + { + /* Clear it */ + RtlZeroMemory(DmDeviceTable, DmTableEntries * sizeof(PVOID)); + +#if 0 + /* Initialize BitLocker support */ + Status = FvebInitialize(); +#else + Status = STATUS_SUCCESS; +#endif + } + else + { + /* No memory, we'll fail */ + Status = STATUS_NO_MEMORY; + } + + /* Return initialization state */ + return Status; +} + Propchange: trunk/reactos/boot/environ/lib/io/device.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/boot/environ/lib/io/fat.c [iso-8859-1] Sun Sep 6 21:29:41 2015 @@ -0,0 +1,51 @@ +/* +* 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 ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +PVOID* FatDeviceTable; +ULONG FatDeviceTableEntries; +PWCHAR FatpLongFileName; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +FatInitialize ( + VOID + ) +{ + NTSTATUS Status; + + /* Allocate the device table with 2 entries*/ + FatDeviceTableEntries = 2; + FatDeviceTable = BlMmAllocateHeap(sizeof(PBL_FILE_ENTRY) * + FatDeviceTableEntries); + if (FatDeviceTable) + { + /* Zero it out */ + RtlZeroMemory(FatDeviceTable, + sizeof(PBL_FILE_ENTRY) * FatDeviceTableEntries); + + /* Allocate a 512 byte buffer for long file name conversion */ + FatpLongFileName = BlMmAllocateHeap(512); + Status = FatpLongFileName != NULL ? STATUS_SUCCESS : STATUS_NO_MEMORY; + } + else + { + /* No memory, fail */ + Status = STATUS_NO_MEMORY; + } + + /* Return back to caller */ + return Status; +} + Propchange: trunk/reactos/boot/environ/lib/io/fat.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/environ/lib/io/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/file.c… ============================================================================== --- trunk/reactos/boot/environ/lib/io/file.c (added) +++ trunk/reactos/boot/environ/lib/io/file.c [iso-8859-1] Sun Sep 6 21:29:41 2015 @@ -0,0 +1,174 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/io/file.c + * PURPOSE: Boot Library File Management Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +PVOID* FileTable; +ULONG FileEntries; + +LIST_ENTRY RegisteredFileSystems; +BL_FILE_SYSTEM_REGISTRATION_TABLE FatRegisterFunctionTable = +{ + FatInitialize, +#if 0 + FatDestroy, + FatMount, + NULL +#endif +}; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +BlpFileRegisterFileSystem ( + _In_ PBL_FS_INIT_CALLBACK InitCallback, + _In_ PBL_FS_DESTROY_CALLBACK DestroyCallback, + _In_ PBL_FS_MOUNT_CALLBACK MountCallback, + _In_ PBL_FS_PURGE_CALLBACK PurgeCallback, + _In_ ULONG Flags + ) +{ + PBL_FILE_SYSTEM_ENTRY FsEntry; + NTSTATUS Status; + + FsEntry = BlMmAllocateHeap(sizeof(*FsEntry)); + if (!FsEntry) + { + return STATUS_NO_MEMORY; + } + + Status = InitCallback(); + if (NT_SUCCESS(Status)) + { + BlMmFreeHeap(FsEntry); + return Status; + } + + /* Register the callbacks */ + FsEntry->MountCallback = MountCallback; + FsEntry->DestroyCallback = DestroyCallback; + FsEntry->InitCallback = InitCallback; + FsEntry->PurgeCallback = PurgeCallback; + + /* Insert in the right location in the list */ + if (Flags & BL_FS_REGISTER_AT_HEAD_FLAG) + { + InsertHeadList(&RegisteredFileSystems, &FsEntry->ListEntry); + } + else + { + InsertTailList(&RegisteredFileSystems, &FsEntry->ListEntry); + } + + /* Return */ + return STATUS_SUCCESS; +} + +NTSTATUS +BlpFileInitialize ( + VOID + ) +{ + NTSTATUS Status; + + /* Allocate the file table */ + FileEntries = 16; + FileTable = BlMmAllocateHeap(sizeof(PBL_FILE_ENTRY) * FileEntries); + if (!FileTable) + { + return STATUS_INVALID_PARAMETER; + } + + /* Initialize it */ + RtlZeroMemory(FileTable, sizeof(PBL_FILE_ENTRY) * FileEntries); + InitializeListHead(&RegisteredFileSystems); + +#if 0 + /* Initialize the network file system */ + Status = BlpFileRegisterFileSystem(NetRegisterFunctionTable.Init, + NetRegisterFunctionTable.Destroy, + NetRegisterFunctionTable.Mount, + NetRegisterFunctionTable.Purge, + 1); + if (NT_SUCCESS(Status)) + { + /* Initialize NTFS */ + Status = BlpFileRegisterFileSystem(NtfsRegisterFunctionTable.Init, + NtfsRegisterFunctionTable.Destroy, + NtfsRegisterFunctionTable.Mount, + NtfsRegisterFunctionTable.Purge, + 0); + } + + if (NT_SUCCESS(Status)) +#endif + { + /* Initialize FAT */ + Status = BlpFileRegisterFileSystem(FatRegisterFunctionTable.Init, + FatRegisterFunctionTable.Destroy, + FatRegisterFunctionTable.Mount, + FatRegisterFunctionTable.Purge, + 0); + } + +#if 0 + if (NT_SUCCESS(Status)) + { + /* Initialize EXFAT (FatPlus) */ + Status = BlpFileRegisterFileSystem(FppRegisterFunctionTable.Init, + FppRegisterFunctionTable.Destroy, + FppRegisterFunctionTable.Mount, + FppRegisterFunctionTable.Purge, + 0); + } + + if (NT_SUCCESS(Status)) + { + /* Initialize WIM */ + Status = BlpFileRegisterFileSystem(WimRegisterFunctionTable.Init, + WimRegisterFunctionTable.Destroy, + WimRegisterFunctionTable.Mount, + WimRegisterFunctionTable.Purge, + 0); + } + + if (NT_SUCCESS(Status)) + { + /* Initialize UDFS */ + Status = BlpFileRegisterFileSystem(UdfsRegisterFunctionTable.Init, + UdfsRegisterFunctionTable.Destroy, + UdfsRegisterFunctionTable.Mount, + UdfsRegisterFunctionTable.Purge, + 0); + } + + if (NT_SUCCESS(Status)) + { + /* Initialize El-Torito CDFS */ + Status = BlpFileRegisterFileSystem(EtfsRegisterFunctionTable.Init, + EtfsRegisterFunctionTable.Destroy, + EtfsRegisterFunctionTable.Mount, + EtfsRegisterFunctionTable.Purge, + 0); + } +#endif + + /* Destroy the file manager if any of the file systems didn't initialize */ + if (!NT_SUCCESS(Status)) + { + if (FileTable) + { + //BlpFileDestroy(); + } + } + return Status; +} Propchange: trunk/reactos/boot/environ/lib/io/file.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/boot/environ/lib/io/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/io.c?r… ============================================================================== --- trunk/reactos/boot/environ/lib/io/io.c (added) +++ trunk/reactos/boot/environ/lib/io/io.c [iso-8859-1] Sun Sep 6 21:29:41 2015 @@ -0,0 +1,56 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/io/io.c + * PURPOSE: Boot Library I/O Management Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +ULONG IoMgrRoutineEntries; +PVOID* IoMgrDestroyRoutineTable; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +BlpIoInitialize ( + VOID + ) +{ + NTSTATUS Status; + ULONG Size; + + /* Allocate the I/O table */ + IoMgrRoutineEntries = 4; + Size = IoMgrRoutineEntries * sizeof(PVOID); + IoMgrDestroyRoutineTable = BlMmAllocateHeap(Size); + if (IoMgrDestroyRoutineTable) + { + /* Zero it out */ + RtlZeroMemory(IoMgrDestroyRoutineTable, Size); + + /* Initialize the device manager */ + Status = BlpDeviceInitialize(); + + /* Initialize the file manager */ + if (NT_SUCCESS(Status)) + { + Status = BlpFileInitialize(); + } + } + else + { + /* No memory */ + Status = STATUS_NO_MEMORY; + } + + /* Return initialization status */ + return Status; +} + + Propchange: trunk/reactos/boot/environ/lib/io/io.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/environ/lib/misc/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/util… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/util.c [iso-8859-1] Sun Sep 6 21:29:41 2015 @@ -9,6 +9,24 @@ /* INCLUDES ******************************************************************/ #include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +PVOID UtlRsdt; +PVOID UtlXsdt; + +PVOID UtlMcContext; +PVOID UtlMcDisplayMessageRoutine; +PVOID UtlMcUpdateMessageRoutine; + +PVOID UtlProgressRoutine; +PVOID UtlProgressContext; +PVOID UtlProgressInfoRoutine; +ULONG UtlProgressGranularity; +ULONG UtlCurrentPercentComplete; +ULONG UtlNextUpdatePercentage; +BOOLEAN UtlProgressNeedsInfoUpdate; +PVOID UtlProgressInfo; /* FUNCTIONS *****************************************************************/ @@ -146,3 +164,26 @@ } } +NTSTATUS +BlUtlInitialize ( + VOID + ) +{ + UtlRsdt = 0; + UtlXsdt = 0; + + UtlMcContext = 0; + UtlMcDisplayMessageRoutine = 0; + UtlMcUpdateMessageRoutine = 0; + + UtlProgressRoutine = 0; + UtlProgressContext = 0; + UtlProgressInfoRoutine = 0; + UtlProgressGranularity = 0; + UtlCurrentPercentComplete = 0; + UtlNextUpdatePercentage = 0; + UtlProgressNeedsInfoUpdate = 0; + UtlProgressInfo = 0; + + return STATUS_SUCCESS; +} Modified: trunk/reactos/boot/environ/lib/platform/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/platform/… ============================================================================== --- trunk/reactos/boot/environ/lib/platform/time.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/platform/time.c [iso-8859-1] Sun Sep 6 21:29:41 2015 @@ -13,6 +13,8 @@ /* DATA VARIABLES ************************************************************/ ULONGLONG BlpTimePerformanceFrequency; + +/* FUNCTIONS *****************************************************************/ NTSTATUS BlpTimeMeasureTscFrequency (

9 years, 3 months

[jimtabor] 69072: [Win32k] - Set flags when it is appropriate, should fix CORE-10101.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Sep 6 21:10:46 2015 New Revision: 69072 URL: http://svn.reactos.org/svn/reactos?rev=69072&view=rev Log: [Win32k] - Set flags when it is appropriate, should fix CORE-10101. Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/nonclient.c Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Sun Sep 6 21:10:46 2015 @@ -415,6 +415,7 @@ * RealUserDrawCaption in order to draw the classic caption when themes * are disabled but the themes service is enabled */ + TRACE("UDCB Flags %08x\n"); co_IntSendMessage(UserHMGetHandle(pWnd), WM_NCUAHDRAWCAPTION, Flags, 0); } else @@ -463,7 +464,7 @@ IntSetProp(pWnd, gpsi->atomIconSmProp, hIconSmall); if ((pWnd->style & WS_CAPTION ) == WS_CAPTION) - UserPaintCaption(pWnd, DC_CAPTION); + UserPaintCaption(pWnd, DC_ICON); return (LRESULT)hIconOld; } Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Sun Sep 6 21:10:46 2015 @@ -930,6 +930,8 @@ { TempRect = CurrentRect; + Flags |= DC_TEXT|DC_BUTTONS; // Icon will be checked if not already set. + if (UserSystemParametersInfo(SPI_GETGRADIENTCAPTIONS, 0, &Gradient, 0) && Gradient) { Flags |= DC_GRADIENT; @@ -1039,8 +1041,9 @@ { Active = (gpqForeground == pWnd->head.pti->MessageQueue); } - Flags = DC_NC; - } + } + + Flags = DC_NC; // Redraw everything! IntGetWindowRect(pWnd, &WindowRect); @@ -1112,14 +1115,6 @@ CurrentRect.top += UserGetSystemMetrics(SM_CYCAPTION); } - if (!(Flags & DC_ICON) && - (Style & WS_SYSMENU) && - !(Flags & DC_SMALLCAP) && - !(ExStyle & WS_EX_DLGMODALFRAME) && - !(ExStyle & WS_EX_TOOLWINDOW) ) - { - pIcon = NC_IconForWindow(pWnd); // Force redraw of caption with icon if DC_ICON not flaged.... - } UserDrawCaption(pWnd, hDC, &TempRect, NULL, pIcon ? UserHMGetHandle(pIcon) : NULL, NULL, Flags); /* Draw buttons */ @@ -1409,7 +1404,7 @@ } else { - Wnd->state &= ~(WNDS_ACTIVEFRAME|WNDS_HASCAPTION); + Wnd->state &= ~WNDS_ACTIVEFRAME; wParam = DC_CAPTION; }

9 years, 3 months

[ion] 69071: [BOOTMGFW] - Fix some heap bugs. It (works?) now, at least for one allocation. - Fix GCC support for Phase 1 Architectural Initialization. - Implement Time measurement for Hyper-V comp...

by ion＠svn.reactos.org

Author: ion Date: Sun Sep 6 20:55:50 2015 New Revision: 69071 URL: http://svn.reactos.org/svn/reactos?rev=69071&view=rev Log: [BOOTMGFW] - Fix some heap bugs. It (works?) now, at least for one allocation. - Fix GCC support for Phase 1 Architectural Initialization. - Implement Time measurement for Hyper-V compatible hypervisors (tested with Virtual Box 5.0!) as well as non-hypervisors (also tested) Added: trunk/reactos/boot/environ/lib/platform/time.c (with props) Modified: trunk/reactos/boot/environ/CMakeLists.txt trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/arch/i386/arch.c trunk/reactos/boot/environ/lib/bootlib.c trunk/reactos/boot/environ/lib/firmware/efi/firmware.c trunk/reactos/boot/environ/lib/mm/heapalloc.c 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] Sun Sep 6 20:55:50 2015 @@ -17,7 +17,8 @@ lib/mm/pagealloc.c lib/mm/heapalloc.c lib/mm/blkalloc.c - lib/mm/descriptor.c) + lib/mm/descriptor.c + lib/platform/time.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] Sun Sep 6 20:55:50 2015 @@ -522,6 +522,18 @@ _Inout_ EFI_PHYSICAL_ADDRESS* Memory ); +NTSTATUS +EfiStall ( + _In_ ULONG StallTime + ); + +/* PLATFORM TIMER ROUTINES ***************************************************/ + +NTSTATUS +BlpTimeCalibratePerformanceCounter ( + VOID + ); + /* UTILITY ROUTINES **********************************************************/ EFI_STATUS Modified: trunk/reactos/boot/environ/lib/arch/i386/arch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/arch/i386… ============================================================================== --- trunk/reactos/boot/environ/lib/arch/i386/arch.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/arch/i386/arch.c [iso-8859-1] Sun Sep 6 20:55:50 2015 @@ -19,13 +19,20 @@ /* FUNCTIONS *****************************************************************/ VOID -//__declspec(naked) fixme: gcc +DECLSPEC_NORETURN ArchTrapNoProcess ( VOID ) { /* Do nothing, this is an unsupported debugging interrupt */ - // _asm { iret } FIXME: GCC +#if defined(__GNUC__) + __asm__ __volatile__ ("iret"); +#elif defined (_MSC_VER) + _asm { iret }; +#else +#error wtf are you using +#endif + __assume(0); } VOID @@ -208,8 +215,13 @@ IdtBase = (PKIDTENTRY)Idtr.Base; /* Get the Code Segment */ - // _asm { mov CodeSegment, cs } FIXME: GCC - CodeSegment = 8; // fix fix +#if defined(__GNUC__) + __asm__ __volatile__ ("mov %%cs,%0\n\t" :"=r" (CodeSegment)); +#elif defined (_MSC_VER) + _asm { mov CodeSegment, cs }; +#else +#error wtf are you using +#endif /* Set up INT 3, ASSERT, and SECURITY_ASSERT to be no-op (for Rtl) */ IdtBase[3].Offset = (USHORT)(ULONG_PTR)ArchTrapNoProcess; @@ -230,7 +242,13 @@ __lidt(&Idtr); /* Reset FPU state */ - // __asm { fninit } FIXME: GCC +#if defined(__GNUC__) + __asm__ __volatile__ ("fninit"); +#elif defined (_MSC_VER) + _asm { fninit }; +#else +#error wtf are you using +#endif } else { Modified: trunk/reactos/boot/environ/lib/bootlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/bootlib.c… ============================================================================== --- trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] Sun Sep 6 20:55:50 2015 @@ -132,6 +132,50 @@ goto Quickie; } + /* Initialize firmware now that the heap, etc works */ + Status = BlpFwInitialize(1, FirmwareDescriptor); + if (!NT_SUCCESS(Status)) + { + /* Destroy memory manager in phase 1 */ + //BlpMmDestroy(1); + EarlyPrint(L"Firmware2 init failed!\n"); + return Status; + } + +#if 0 + /* Modern systems have an undocumented BCD system for the boot frequency */ + Status = BlGetBootOptionInteger(BlpApplicationEntry.BcdData, + 0x15000075, + &BootFrequency); + if (NT_SUCCESS(Status) && (BootFrequency)) + { + /* Use it if present */ + BlpTimePerformanceFrequency = BootFrequency; + } + else +#endif + { + /* Use the TSC for calibration */ + Status = BlpTimeCalibratePerformanceCounter(); + if (!NT_SUCCESS(Status)) + { + /* Destroy memory manager in phase 1 */ + EarlyPrint(L"TSC calibration failed\n"); + //BlpMmDestroy(1); + return Status; + } + } + + /* Now setup the rest of the architecture (IDT, etc) */ + Status = BlpArchInitialize(1); + if (!NT_SUCCESS(Status)) + { + /* Destroy memory manager in phase 1 */ + EarlyPrint(L"Arch2 init failed\n"); + //BlpMmDestroy(1); + return Status; + } + EarlyPrint(L"TODO!\n"); Status = STATUS_NOT_IMPLEMENTED; 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] Sun Sep 6 20:55:50 2015 @@ -207,6 +207,35 @@ /* Make the EFI call */ EfiStatus = EfiBS->FreePages(PhysicalAddress, Pages); + + /* Switch back to protected mode if we came from there */ + if (OldMode != BlRealMode) + { + BlpArchSwitchContext(OldMode); + } + + /* Convert the error to an NTSTATUS */ + return EfiGetNtStatusCode(EfiStatus); +} + +NTSTATUS +EfiStall ( + _In_ ULONG StallTime + ) +{ + BL_ARCH_MODE OldMode; + EFI_STATUS EfiStatus; + + /* Are we in protected mode? */ + OldMode = CurrentExecutionContext->Mode; + if (OldMode != BlRealMode) + { + /* FIXME: Not yet implemented */ + return STATUS_NOT_IMPLEMENTED; + } + + /* Make the EFI call */ + EfiStatus = EfiBS->Stall(StallTime); /* Switch back to protected mode if we came from there */ if (OldMode != BlRealMode) @@ -749,7 +778,7 @@ { /* Set the initial key toggle state */ KeyToggleState = EFI_TOGGLE_STATE_VALID | 40; - EfiConInExSetState(EfiST->ConsoleInHandle, &KeyToggleState); + EfiConInExSetState(EfiConInEx, &KeyToggleState); } /* Setup the watchdog timer */ 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] Sun Sep 6 20:55:50 2015 @@ -47,10 +47,10 @@ typedef struct _BL_HEAP_BOUNDARIES { LIST_ENTRY ListEntry; - ULONG_PTR HeapHigh; + ULONG_PTR HeapEnd; ULONG_PTR HeapLimit; - ULONG_PTR HeapBottom; - PBL_BUSY_HEAP_ENTRY HeapTop; + ULONG_PTR HeapBase; + PBL_BUSY_HEAP_ENTRY HeapStart; } BL_HEAP_BOUNDARIES, *PBL_HEAP_BOUNDARIES; ULONG HapInitializationStatus; @@ -125,7 +125,7 @@ /* Check if we have a page free above the heap */ HeapLimit = Heap->HeapLimit + PAGE_SIZE; - if (HeapLimit <= Heap->HeapHigh) + if (HeapLimit <= Heap->HeapEnd) { EarlyPrint(L"Heap extension TODO\n"); return STATUS_INSUFFICIENT_RESOURCES; @@ -147,32 +147,32 @@ /* Set the heap bottom, limit, and top */ NewHeap = (PBL_HEAP_BOUNDARIES)HeapBase->Buffer; - NewHeap->HeapBottom = (ULONG_PTR)HeapBase; + NewHeap->HeapBase = (ULONG_PTR)HeapBase; NewHeap->HeapLimit = (ULONG_PTR)HeapBase + AlignedSize; - NewHeap->HeapTop = (PBL_BUSY_HEAP_ENTRY)(NewHeap + 1); + NewHeap->HeapStart = (PBL_BUSY_HEAP_ENTRY)(NewHeap + 1); /* Set the buffer links */ HeapBase->BufferPrevious.P = NULL; - HeapBase->BufferNext.P = NewHeap->HeapTop; + HeapBase->BufferNext.P = NewHeap->HeapStart; /* Set the buffer at the top of the heap and mark it as being free */ - NewHeap->HeapTop->BufferPrevious.P = HeapBase; - NewHeap->HeapTop->BufferNext.P = NewHeap->HeapTop; - NewHeap->HeapTop->BufferNext.BufferFree = 1; - NewHeap->HeapTop->BufferNext.BufferOnHeap = 1; + NewHeap->HeapStart->BufferPrevious.P = HeapBase; + NewHeap->HeapStart->BufferNext.P = NewHeap->HeapStart; + NewHeap->HeapStart->BufferNext.BufferFree = 1; + NewHeap->HeapStart->BufferNext.BufferOnHeap = 1; /* Is this the first heap ever? */ if (IsListEmpty(&MmHeapBoundaries)) { /* We will host the free list at the top of the heap */ - MmFreeList = (PBL_FREE_HEAP_ENTRY*)((ULONG_PTR)NewHeap->HeapLimit - sizeof(BL_HEAP_BOUNDARIES)); + MmFreeList = (PBL_FREE_HEAP_ENTRY*)((ULONG_PTR)NewHeap->HeapLimit - 8 * sizeof(PBL_FREE_HEAP_ENTRY)); NewHeap->HeapLimit = (ULONG_PTR)MmFreeList; RtlZeroMemory(MmFreeList, 8 * sizeof(PBL_FREE_HEAP_ENTRY)); } /* Remove a page on top */ HeapLimit = NewHeap->HeapLimit; - NewHeap->HeapHigh = NewHeap->HeapLimit; + NewHeap->HeapEnd = NewHeap->HeapLimit; NewHeap->HeapLimit -= PAGE_SIZE; /* Add us into the heap list */ @@ -595,29 +595,24 @@ ListEntry); /* Check if we have space in the heap page for this allocation? */ - FreeEntry = Heap->HeapTop; + FreeEntry = Heap->HeapStart; NextEntry = (PBL_BUSY_HEAP_ENTRY)((ULONG_PTR)FreeEntry + BufferSize); - - EarlyPrint(L"Free Entry: %p Size: %lx Next: %p\n", FreeEntry, BufferSize, NextEntry); - - EarlyPrint(L"Heap Limit: %p\n", Heap->HeapLimit); - EarlyPrint(L"Minus one busy entry: %p\n", Heap->HeapLimit - sizeof(BL_BUSY_HEAP_ENTRY)); if ((NextEntry >= FreeEntry) && ((ULONG_PTR)NextEntry <= Heap->HeapLimit - sizeof(BL_BUSY_HEAP_ENTRY))) { /* Update the heap top pointer past this allocation */ - Heap->HeapTop = NextEntry; + Heap->HeapStart = NextEntry; /* Make this allocation point to the slot */ - FreeEntry->BufferNext.P = Heap->HeapTop; + FreeEntry->BufferNext.P = Heap->HeapStart; /* And make the free heap entry point back to us */ - Heap->HeapTop->BufferNext.P = FreeEntry; + Heap->HeapStart->BufferNext.P = FreeEntry; /* Mark the heap entry as being free and on the heap */ - Heap->HeapTop->BufferNext.BufferFree = 1; - Heap->HeapTop->BufferNext.BufferOnHeap = 1; + Heap->HeapStart->BufferNext.BufferFree = 1; + Heap->HeapStart->BufferNext.BufferOnHeap = 1; /* The previously freed entry on the heap page is now ours */ BusyEntry = FreeEntry; @@ -639,6 +634,7 @@ BusyEntry->BufferNext.P = MmHapDecodeLink(BusyEntry->BufferNext); /* Return the entry's data buffer */ + EarlyPrint(L"Returning buffer at 0x%p\n", &BusyEntry->Buffer); return &BusyEntry->Buffer; } @@ -668,8 +664,8 @@ Heap = CONTAINING_RECORD(NextEntry, BL_HEAP_BOUNDARIES, ListEntry); /* Is this entry part of this heap? */ - if (((ULONG_PTR)Heap->HeapBottom <= (ULONG_PTR)BusyEntry) && - ((ULONG_PTR)BusyEntry < (ULONG_PTR)Heap->HeapTop)) + if (((ULONG_PTR)Heap->HeapBase <= (ULONG_PTR)BusyEntry) && + ((ULONG_PTR)BusyEntry < (ULONG_PTR)Heap->HeapStart)) { /* Ignore double-free */ if (BusyEntry->BufferNext.BufferFree) Added: trunk/reactos/boot/environ/lib/platform/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/platform/… ============================================================================== --- trunk/reactos/boot/environ/lib/platform/time.c (added) +++ trunk/reactos/boot/environ/lib/platform/time.c [iso-8859-1] Sun Sep 6 20:55:50 2015 @@ -0,0 +1,88 @@ +/* + * COPYRIGHT: See COPYING.ARM in the top level directory + * PROJECT: ReactOS UEFI Boot Library + * FILE: boot/environ/lib/platform/time.c + * PURPOSE: Boot Library Time Management Routines + * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "bl.h" + +/* DATA VARIABLES ************************************************************/ + +ULONGLONG BlpTimePerformanceFrequency; + +NTSTATUS +BlpTimeMeasureTscFrequency ( + VOID + ) +{ + ULONG Count; + INT CpuInfo[4]; + ULONGLONG TimeStamp1, TimeStamp2, Delta; + + /* Check if the ISVM bit it set, meaning we're in a hypervisor */ + __cpuid(CpuInfo, 1); + Count = CpuInfo[2] & 0x80000000 ? 10 : 1; + + /* Loop trying to get an accurate TSC */ + do + { + /* Stall for 1us and get count 1 */ + EfiStall(1); + TimeStamp1 = __rdtsc(); + + /* Stall for 1000us and get count 2*/ + EfiStall(1000); + TimeStamp2 = __rdtsc(); + + /* Stall for 9000us and get the difference */ + EfiStall(9000); + Delta = __rdtsc() - TimeStamp2; + + /* Keep going as long as the TSC is fluctuating */ + --Count; + } while (((TimeStamp2 - TimeStamp1) > Delta) && (Count)); + + /* Set the frequency based on the two measurements we took */ + BlpTimePerformanceFrequency = 125 * (Delta - (TimeStamp2 - TimeStamp1)) & 0x1FFFFFFFFFFFFFF; + EarlyPrint(L"Computed frequency as: %I64d\n", BlpTimePerformanceFrequency); + return STATUS_SUCCESS; +} + +NTSTATUS +BlpTimeCalibratePerformanceCounter ( + VOID + ) +{ + INT CpuInfo[4]; + + /* Check if the ISVM bit it set, meaning we're in a hypervisor */ + __cpuid(CpuInfo, 1); + if (CpuInfo[2] & 0x80000000) + { + /* Get the Hypervisor Identification Leaf */ + __cpuid(CpuInfo, 0x40000001); + + /* Is this Hyper-V? */ + if (CpuInfo[0] == '1#vH') + { + /* Get the Hypervisor Feature Identification Leaf */ + __cpuid(CpuInfo, 0x40000003); + + /* Check if HV_X64_MSR_REFERENCE_TSC is present */ + if (CpuInfo[3] & 0x100) + { + /* Read the TSC frequency from the MSR */ + BlpTimePerformanceFrequency = __readmsr(0x40000022); + EarlyPrint(L"Using frequency as: %I64d\n", BlpTimePerformanceFrequency); + return STATUS_SUCCESS; + } + } + } + + /* On other systems, compute it */ + return BlpTimeMeasureTscFrequency(); +} Propchange: trunk/reactos/boot/environ/lib/platform/time.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 3 months

← Newer
1
...
32
33
34
35
36
37
38
...
54
Older →

Jump to page:

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