[ros-diffs] [hbelusca] 66753: [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 ...

Author: hbelusca
Date: Tue Mar 17 03:04:20 2015
New Revision: 66753

URL: http://svn.reactos.org/svn/reactos?rev=66753&view=rev
Log:
[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).

Modified:
    trunk/reactos/ntoskrnl/ex/init.c

Modified: trunk/reactos/ntoskrnl/ex/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=667…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/init.c	[iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/init.c	[iso-8859-1] Tue Mar 17 03:04:20 2015
@@ -1217,13 +1217,10 @@
         }
 
         /* 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 @@
     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))
         {