Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-03 16:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:INBV]

Browse source 
- Initialize global variables to known default values.
- When Inbv initializes the display, reset the video mode *ONLY* if we do not have a custom boot logo (because otherwise we want to see our custom boot logo!). This also fixes the video mode used by ReactOS when booting it using Windows ntldr!

svn path=/trunk/; revision=70678
This commit is contained in:
Hermès Bélusca-Maïto 2016-02-02 23:28:45 +00:00
parent ecc5e30ce6
commit 4d428f4551
1 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
reactos/ntoskrnl/inbv/inbv.c
View file

@ -31,15 +31,15 @@
static KSPIN_LOCK BootDriverLock; static KSPIN_LOCK BootDriverLock;
static KIRQL InbvOldIrql; static KIRQL InbvOldIrql;
static INBV_DISPLAY_STATE InbvDisplayState; static INBV_DISPLAY_STATE InbvDisplayState = INBV_DISPLAY_STATE_DISABLED;
BOOLEAN InbvBootDriverInstalled = FALSE; BOOLEAN InbvBootDriverInstalled = FALSE;
static BOOLEAN InbvDisplayDebugStrings = FALSE; static BOOLEAN InbvDisplayDebugStrings = FALSE;
static INBV_DISPLAY_STRING_FILTER InbvDisplayFilter; static INBV_DISPLAY_STRING_FILTER InbvDisplayFilter = NULL;
static ULONG ProgressBarLeft, ProgressBarTop; static ULONG ProgressBarLeft = 0, ProgressBarTop = 0;
static BOOLEAN ShowProgressBar = FALSE; static BOOLEAN ShowProgressBar = FALSE;
static INBV_PROGRESS_STATE InbvProgressState; static INBV_PROGRESS_STATE InbvProgressState;
static BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; static BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0};
static INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters; static INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters = NULL;
static ULONG ResourceCount = 0; static ULONG ResourceCount = 0;
static PUCHAR ResourceList[1 + IDB_CLUSTER_SERVER]; // First entry == NULL, followed by 'ResourceCount' entries. static PUCHAR ResourceList[1 + IDB_CLUSTER_SERVER]; // First entry == NULL, followed by 'ResourceCount' entries.
@ -214,8 +214,8 @@ FindBitmapResource(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
InLoadOrderLinks); InLoadOrderLinks);
/* Check for a match */ /* Check for a match */
if ((RtlEqualUnicodeString(&LdrEntry->BaseDllName, &UpString, TRUE)) || if (RtlEqualUnicodeString(&LdrEntry->BaseDllName, &UpString, TRUE) ||
(RtlEqualUnicodeString(&LdrEntry->BaseDllName, &MpString, TRUE))) RtlEqualUnicodeString(&LdrEntry->BaseDllName, &MpString, TRUE))
{ {
/* Break out */ /* Break out */
break; break;
@ -226,7 +226,7 @@ FindBitmapResource(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
if (NextEntry != ListHead) if (NextEntry != ListHead)
{ {
/* Try to find the resource */ /* Try to find the resource */
ResourceInfo.Type = 2; //RT_BITMAP; ResourceInfo.Type = 2; // RT_BITMAP;
ResourceInfo.Name = ResourceId; ResourceInfo.Name = ResourceId;
ResourceInfo.Language = 0; ResourceInfo.Language = 0;
Status = LdrFindResource_U(LdrEntry->DllBase, Status = LdrFindResource_U(LdrEntry->DllBase,
@ -260,7 +260,7 @@ InbvDriverInitialize(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
IN ULONG Count) IN ULONG Count)
{ {
PCHAR CommandLine; PCHAR CommandLine;
BOOLEAN CustomLogo = FALSE; BOOLEAN ResetMode = FALSE; // By default do not reset the video mode
ULONG i; ULONG i;
/* Quit if we're already installed */ /* Quit if we're already installed */
@ -270,18 +270,15 @@ InbvDriverInitialize(IN PLOADER_PARAMETER_BLOCK LoaderBlock,
KeInitializeSpinLock(&BootDriverLock); KeInitializeSpinLock(&BootDriverLock);
if (InbvDisplayState == INBV_DISPLAY_STATE_OWNED) if (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)
{ {
/* Check if we have a custom boot logo */ /* Reset the video mode in case we do not have a custom boot logo */
CommandLine = (LoaderBlock->LoadOptions ? _strupr(LoaderBlock->LoadOptions) : NULL); CommandLine = (LoaderBlock->LoadOptions ? _strupr(LoaderBlock->LoadOptions) : NULL);
CustomLogo = (CommandLine && strstr(CommandLine, "BOOTLOGO") != NULL); ResetMode = (CommandLine == NULL) || (strstr(CommandLine, "BOOTLOGO") == NULL);
} }
/* Initialize the video */ /* Initialize the video */
InbvBootDriverInstalled = VidInitialize(FALSE); InbvBootDriverInstalled = VidInitialize(ResetMode);
if (InbvBootDriverInstalled) if (InbvBootDriverInstalled)
{ {
/* Now reset the display, but only if there's a custom boot logo */
VidResetDisplay(CustomLogo);
/* Find bitmap resources in the kernel */ /* Find bitmap resources in the kernel */
ResourceCount = min(Count, RTL_NUMBER_OF(ResourceList) - 1); ResourceCount = min(Count, RTL_NUMBER_OF(ResourceList) - 1);
for (i = 1; i <= ResourceCount; i++) for (i = 1; i <= ResourceCount; i++)