From: Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Date: Sat, 21 Feb 2015 01:25:47 +0000 (+0000)
Subject: [NTOS]
X-Git-Tag: ReactOS-0.3.17-CLT2015~368
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=695876f5d8bcb5a989438226ce6e25afb54c969c

[NTOS]
- 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
---

diff --git a/reactos/ntoskrnl/ex/init.c b/reactos/ntoskrnl/ex/init.c
index 1dccfbb2fbf..e2ef36e7e4e 100644
--- a/reactos/ntoskrnl/ex/init.c
+++ b/reactos/ntoskrnl/ex/init.c
@@ -526,7 +526,7 @@ ExpLoadInitialProcess(IN PINIT_BUFFER InitBuffer,
                               (USHORT)Size);
 
     /* Append the DLL path to it */
-    RtlAppendUnicodeToString(&Environment, L"Path=" );
+    RtlAppendUnicodeToString(&Environment, L"Path=");
     RtlAppendUnicodeStringToString(&Environment, &ProcessParams->DllPath);
     RtlAppendUnicodeStringToString(&Environment, &NullString);
 
@@ -1956,6 +1956,9 @@ Phase1InitializationDiscard(IN PVOID Context)
     /* Update progress bar */
     InbvUpdateProgressBar(100);
 
+    /* Clear the screen */
+    if (InbvBootDriverInstalled) FinalizeBootLogo();
+
     /* Allow strings to be displayed */
     InbvEnableDisplayString(TRUE);
 
@@ -1994,9 +1997,6 @@ Phase1InitializationDiscard(IN PVOID Context)
                         &Size,
                         MEM_RELEASE);
 
-    /* Clean the screen */
-    if (InbvBootDriverInstalled) FinalizeBootLogo();
-
     /* Increase init phase */
     ExpInitializationPhase++;
 
diff --git a/reactos/ntoskrnl/ke/config.c b/reactos/ntoskrnl/ke/config.c
index ae01ca87368..9c40183e8e5 100644
--- a/reactos/ntoskrnl/ke/config.c
+++ b/reactos/ntoskrnl/ke/config.c
@@ -122,6 +122,6 @@ KeFindConfigurationNextEntry(IN PCONFIGURATION_COMPONENT_DATA Child,
         Child = Child->Child;
     }
 
-    /* If we got here, nothign was found */
+    /* If we got here, nothing was found */
     return NULL;
 }
diff --git a/reactos/ntoskrnl/lpc/close.c b/reactos/ntoskrnl/lpc/close.c
index 74796d3350c..a8fb1ad1fc9 100644
--- a/reactos/ntoskrnl/lpc/close.c
+++ b/reactos/ntoskrnl/lpc/close.c
@@ -439,7 +439,7 @@ LpcpDeletePort(IN PVOID ObjectBody)
         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) &&
         (ConnectionPort->ServerProcess))
     {