Thomas Faller : wine.inf: Set CurrentBuild always to the same value as CurrentBuildNumber.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 929778fc57ae14a3d2c40bb443f201e086a2622b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=929778fc57ae14a3d2c40bb443f201e086a2622b

Author: Thomas Faller <tfaller1 at gmx.de>
Date:   Wed Aug 29 00:14:17 2018 +0200

wine.inf: Set CurrentBuild always to the same value as CurrentBuildNumber.

Make that the registry entry

HKLM\Software\Microsoft\Windows NT\CurrentVersion\CurrentBuild

has always the same value as

HKLM\Software\Microsoft\Windows NT\CurrentVersion\CurrentBuildNumber

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42870
Signed-off-by: Thomas Faller <tfaller1 at gmx.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 6c1118994cc4c2ba8f24325099fdc7f76115fe4f)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 loader/wine.inf.in             | 2 ++
 programs/winecfg/appdefaults.c | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 7418aa0..58b873c 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -3402,6 +3402,7 @@ HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Ca
 [VersionInfo]
 HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1"
 HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1"
+HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601"
 HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601"
 HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free"
 HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7"
@@ -3412,6 +3413,7 @@ HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"
 [VersionInfo.ntamd64]
 HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1"
 HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1"
+HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601"
 HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601"
 HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free"
 HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7"
diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c
index a08542a..09d4d46 100644
--- a/programs/winecfg/appdefaults.c
+++ b/programs/winecfg/appdefaults.c
@@ -435,6 +435,7 @@ static void on_winver_change(HWND dialog)
 
             set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL);
             set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL);
+            set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", NULL);
             set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL);
             set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL);
             set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL);
@@ -449,6 +450,7 @@ static void on_winver_change(HWND dialog)
             set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", Buffer);
             set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", win_versions[selection].szCSDVersion);
             snprintf(Buffer, sizeof(Buffer), "%d", win_versions[selection].dwBuildNumber);
+            set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", Buffer);
             set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", Buffer);
             snprintf(Buffer, sizeof(Buffer), "Microsoft %s", win_versions[selection].szDescription);
             set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", Buffer);
@@ -467,6 +469,7 @@ static void on_winver_change(HWND dialog)
         case VER_PLATFORM_WIN32s:
             set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL);
             set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL);
+            set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", NULL);
             set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL);
             set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL);
             set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL);