[REACTOS]

Go fully to Win2k3 SP2 version reporting.
CORE-6611 #resolve #comment Fixed in r62140.

svn path=/trunk/; revision=62140

diff --git a/reactos/boot/bootdata/hivesys.inf b/reactos/boot/bootdata/hivesys.inf
index 010a2ba..1dcaef5 100644 (file)
--- a/reactos/boot/bootdata/hivesys.inf
+++ b/reactos/boot/bootdata/hivesys.inf
@@ -1143,8 +1143,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002
 ; ReactOS specific - by default we report ourselves as Server for the user,
 ; but we can also report as Workstation if some application needs it.
 HKLM,"SYSTEM\CurrentControlSet\Control\ReactOS\Settings\Version","ReportAsWorkstation",0x00010001,0x00000000
-; Some installers check for SP1
-HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000100
+; Some installers check for SP2
+HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000200
 
 HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders","SecurityProviders",2,"schannel.dll"
 HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders\SaslProfiles",,0x00000012

diff --git a/reactos/include/psdk/ntverp.h b/reactos/include/psdk/ntverp.h
index d52f29e..a3fd988 100644 (file)
--- a/reactos/include/psdk/ntverp.h
+++ b/reactos/include/psdk/ntverp.h
@@ -14,10 +14,10 @@
  */
 
 //
-// Windows NT Build 3790.1830
+// Windows NT Build 3790.3959
 //
 #define VER_PRODUCTBUILD                    3790
-#define VER_PRODUCTBUILD_QFE                1830
+#define VER_PRODUCTBUILD_QFE                3959
 
 //
 // Windows NT Version 5.2

diff --git a/reactos/ntoskrnl/ex/init.c b/reactos/ntoskrnl/ex/init.c
index 1d5b644..443c218 100644 (file)
--- a/reactos/ntoskrnl/ex/init.c
+++ b/reactos/ntoskrnl/ex/init.c
@@ -1072,12 +1072,12 @@ ExpInitializeExecutive(IN ULONG Cpu,
     /* Setup initial system settings */
     CmGetSystemControlValues(LoaderBlock->RegistryBase, CmControlVector);
 
-    /* Load static defaults for Service Pack 1 and add our SVN revision */
+    /* Load static defaults for Service Pack 2 and add our SVN revision */
     /* Format of CSD : SPMajor - SPMinor */
-    CmNtCSDVersion = 0x100 | (KERNEL_VERSION_BUILD_HEX << 16);
+    CmNtCSDVersion = 0x200 | (KERNEL_VERSION_BUILD_HEX << 16);
     CmNtCSDReleaseType = 0;
 
-    /* Set Service Pack data for Service Pack 1 */
+    /* Set Service Pack data for Service Pack 2 */
     CmNtSpBuildNumber = VER_PRODUCTBUILD_QFE;
     if (!(CmNtCSDVersion & 0xFFFF0000))
     {