[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

svn path=/trunk/; revision=71504
This commit is contained in:
Hermès Bélusca-Maïto 2016-06-02 22:28:36 +00:00
parent add8172c71
commit 2d91f643ed
3 changed files with 14 additions and 4 deletions

View file

@ -1388,6 +1388,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows",,0x00000012
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,""

View file

@ -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 */

View file

@ -343,9 +343,11 @@ GetSystemVersionString(OUT PWSTR pwszzVersion,
/* 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 @@ GetSystemVersionString(OUT PWSTR pwszzVersion,
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 @@ GetSystemVersionString(OUT PWSTR pwszzVersion,
/* 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 */