[hbelusca] 71504: [WIN32K][BUILDNO] Add the compiler ID and version to the ROS version desktop watermark. Idea of encoded & learn_more, thanks :) [BOOTDATA] Enable the ROS version desktop watermark...

Author: hbelusca
Date: Thu Jun  2 22:28:36 2016
New Revision: 71504

URL: http://svn.reactos.org/svn/reactos?rev=71504&view=rev
Log:
[WIN32K][BUILDNO]
Add the compiler ID and version to the ROS version desktop watermark. Idea of encoded & learn_more, thanks :)

[BOOTDATA]
Enable the ROS version desktop watermark on our daily builds.

CORE-11349

Modified:
    trunk/reactos/boot/bootdata/hivesft.inf
    trunk/reactos/sdk/include/reactos/buildno.h.cmake
    trunk/reactos/win32ss/user/ntuser/desktop.c

Modified: trunk/reactos/boot/bootdata/hivesft.inf
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?r...
==============================================================================
--- trunk/reactos/boot/bootdata/hivesft.inf	[iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesft.inf	[iso-8859-1] Thu Jun  2 22:28:36 2016
@@ -1388,6 +1388,7 @@
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","AppInit_DLLs",0x00000000,""
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DesktopHeapLogging",0x00010001,0x1
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DeviceNotSelectedTimeout",0x00000000,"15"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","DisplayVersion",0x00010001,0x1
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","GDIProcessHandleQuota",0x00010001,0x2710
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","Spooler",0x00000000,"yes"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows","swapdisk",0x00000000,""

Modified: trunk/reactos/sdk/include/reactos/buildno.h.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/buildno...
==============================================================================
--- trunk/reactos/sdk/include/reactos/buildno.h.cmake	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/reactos/buildno.h.cmake	[iso-8859-1] Thu Jun  2 22:28:36 2016
@@ -14,5 +14,8 @@
 #define REACTOS_DLL_VERSION_RC      "@DLL_VERSION_STR@\0"
 #define REACTOS_DLL_VERSION_STR     "@DLL_VERSION_STR@"

+#define REACTOS_COMPILER_NAME       "@CMAKE_C_COMPILER_ID@"
+#define REACTOS_COMPILER_VERSION    "@CMAKE_C_COMPILER_VERSION@"
+
 #endif
 /* EOF */

Modified: trunk/reactos/win32ss/user/ntuser/desktop.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/desktop...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/desktop.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/desktop.c	[iso-8859-1] Thu Jun  2 22:28:36 2016
@@ -343,9 +343,11 @@
         /* String for Safe Mode */
         Status = RtlStringCchPrintfW(pwszzVersion,
                                      cchDest,
-                                     L"ReactOS Version %S %S (NT %u.%u Build %u%s)\n",
+                                     L"ReactOS Version %S %S.%S_%S (NT %u.%u Build %u%s)\n",
                                      KERNEL_VERSION_STR,
                                      KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry
+                                     REACTOS_COMPILER_NAME,
+                                     REACTOS_COMPILER_VERSION,
                                      SharedUserData->NtMajorVersion,
                                      SharedUserData->NtMinorVersion,
                                      (VerInfo.dwBuildNumber & 0xFFFF),
@@ -384,10 +386,12 @@
         Status = RtlStringCchPrintfW(pwszzVersion,
                                      cchDest,
                                      L"ReactOS Version %S\n"
-                                     L"Build %S\n"
+                                     L"Build %S.%S_%S\n"
                                      L"Reporting NT %u.%u (Build %u%s)\n",
                                      KERNEL_VERSION_STR,
                                      KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry
+                                     REACTOS_COMPILER_NAME,
+                                     REACTOS_COMPILER_VERSION,
                                      SharedUserData->NtMajorVersion,
                                      SharedUserData->NtMinorVersion,
                                      (VerInfo.dwBuildNumber & 0xFFFF),
@@ -416,9 +420,11 @@
         /* Fall-back string */
         Status = RtlStringCchPrintfW(pwszzVersion,
                                      cchDest,
-                                     L"ReactOS Version %S %S\n",
+                                     L"ReactOS Version %S %S.%S_%S\n",
                                      KERNEL_VERSION_STR,
-                                     KERNEL_VERSION_BUILD_STR);
+                                     KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry
+                                     REACTOS_COMPILER_NAME,
+                                     REACTOS_COMPILER_VERSION);
         if (!NT_SUCCESS(Status))
         {
             /* General failure, NULL-terminate the string */