From f04c5e01f1c767f42e38e49d4ebd8a33c4d30252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Tue, 17 Mar 2015 03:04:20 +0000
Subject: [PATCH] [NTOS]: Addendum to r66735: move the code that prints our
 revision number in the SOS banner to a different place, in order to remain
 NT-compatible (that is, the CSDVersion string should only contain "Service
 Pack ###" or "Service Pack ###, v.###" according to the value of the
 CSDReleaseType registry value).

svn path=/trunk/; revision=66753
---
 reactos/ntoskrnl/ex/init.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/reactos/ntoskrnl/ex/init.c b/reactos/ntoskrnl/ex/init.c
index 2c701665862..5db7a968cc7 100644
--- a/reactos/ntoskrnl/ex/init.c
+++ b/reactos/ntoskrnl/ex/init.c
@@ -1217,13 +1217,10 @@ ExpInitializeExecutive(IN ULONG Cpu,
         }
 
         /* Add the version format string */
-        /* ReactOS specific: Append also the revision number */
         Status = RtlStringCbPrintfA(RcEnd,
                                     Remaining,
-                                    "v.%u"
-                                    " r%u",
-                                    (CmNtCSDVersion & 0xFFFF0000) >> 16,
-                                    KERNEL_VERSION_BUILD_HEX);
+                                    "v.%u",
+                                    (CmNtCSDVersion & 0xFFFF0000) >> 16);
         if (!NT_SUCCESS(Status))
         {
             /* Fail */
@@ -1429,12 +1426,15 @@ Phase1InitializationDiscard(IN PVOID Context)
     if (CmCSDVersionString.Length)
     {
         /* Print the version string */
+        /* ReactOS specific: Append also the revision number */
         Status = RtlStringCbPrintfExA(StringBuffer,
                                       Remaining,
                                       &EndBuffer,
                                       &Remaining,
                                       0,
+                                      " r%u"
                                       ": %wZ",
+                                      KERNEL_VERSION_BUILD_HEX,
                                       &CmCSDVersionString);
         if (!NT_SUCCESS(Status))
         {