- Mispelling + whitespace fixes.
- Move the finalization of the boot logo display *before* we enable strings to be displayed (as on Windows), but *after* having increased the progress bar to 100% (contrary to Windows), so that we can display the progress bar at 100% without any problem and then do the correct transition:
  * either GUI splash-screen --> text-mode emulation console with product name in console header + footer (aka. SOS mode)
  * or SOS mode --> text-mode emulation without any graphics.
  Since it is done before starting SMSS, we can correctly display the strings it may output (or start other native apps) without fearing that after 5 seconds, the screen clears up in front of you.
CORE-9112 #resolve #comment Fixed in r66378, thanks for reporting!

svn path=/trunk/; revision=66378
This commit is contained in:
Hermès Bélusca-Maïto 2015-02-21 01:25:47 +00:00
parent b52759fd26
commit 695876f5d8
3 changed files with 6 additions and 6 deletions

View file

@ -526,7 +526,7 @@ ExpLoadInitialProcess(IN PINIT_BUFFER InitBuffer,
(USHORT)Size); (USHORT)Size);
/* Append the DLL path to it */ /* Append the DLL path to it */
RtlAppendUnicodeToString(&Environment, L"Path=" ); RtlAppendUnicodeToString(&Environment, L"Path=");
RtlAppendUnicodeStringToString(&Environment, &ProcessParams->DllPath); RtlAppendUnicodeStringToString(&Environment, &ProcessParams->DllPath);
RtlAppendUnicodeStringToString(&Environment, &NullString); RtlAppendUnicodeStringToString(&Environment, &NullString);
@ -1956,6 +1956,9 @@ Phase1InitializationDiscard(IN PVOID Context)
/* Update progress bar */ /* Update progress bar */
InbvUpdateProgressBar(100); InbvUpdateProgressBar(100);
/* Clear the screen */
if (InbvBootDriverInstalled) FinalizeBootLogo();
/* Allow strings to be displayed */ /* Allow strings to be displayed */
InbvEnableDisplayString(TRUE); InbvEnableDisplayString(TRUE);
@ -1994,9 +1997,6 @@ Phase1InitializationDiscard(IN PVOID Context)
&Size, &Size,
MEM_RELEASE); MEM_RELEASE);
/* Clean the screen */
if (InbvBootDriverInstalled) FinalizeBootLogo();
/* Increase init phase */ /* Increase init phase */
ExpInitializationPhase++; ExpInitializationPhase++;

View file

@ -122,6 +122,6 @@ KeFindConfigurationNextEntry(IN PCONFIGURATION_COMPONENT_DATA Child,
Child = Child->Child; Child = Child->Child;
} }
/* If we got here, nothign was found */ /* If we got here, nothing was found */
return NULL; return NULL;
} }

View file

@ -439,7 +439,7 @@ LpcpDeletePort(IN PVOID ObjectBody)
KeReleaseGuardedMutex(&LpcpLock); KeReleaseGuardedMutex(&LpcpLock);
} }
/* Check if this is a connection port with a server process*/ /* Check if this is a connection port with a server process */
if (((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT) && if (((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_CONNECTION_PORT) &&
(ConnectionPort->ServerProcess)) (ConnectionPort->ServerProcess))
{ {