[pkg-wine-party] [wine] 49/357: wine.inf: Set default Windows version to win7.
Michael Gilbert
mgilbert at moszumanska.debian.org
Sun Feb 19 21:50:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository wine.
commit 6737ac70d6233f6b10f397ee8f94cb23c3ea04fb
Author: Austin English <austinenglish at gmail.com>
Date: Tue Jan 31 12:59:44 2017 -0600
wine.inf: Set default Windows version to win7.
Signed-off-by: Austin English <austinenglish at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/version.c | 6 +-----
loader/wine.inf.in | 20 ++++++++++----------
programs/winecfg/appdefaults.c | 2 +-
3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index 06f9827..1fa40e0 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -489,16 +489,12 @@ void version_init( const WCHAR *appname )
{
static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0};
static const WCHAR appdefaultsW[] = {'A','p','p','D','e','f','a','u','l','t','s','\\',0};
- static const BOOL is_win64 = (sizeof(void *) > sizeof(int));
OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW;
HANDLE root, hkey, config_key;
BOOL got_win_ver = FALSE;
- if (is_win64 || is_wow64)
- current_version = &VersionData[WINXP64]; /* default if nothing else is specified */
- else
- current_version = &VersionData[WINXP];
+ current_version = &VersionData[WIN7];
RtlOpenCurrentUser( KEY_ALL_ACCESS, &root );
attr.Length = sizeof(attr);
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 9a55b38..5dfbd7f 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -3366,23 +3366,23 @@ HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16
HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16
[VersionInfo]
-HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1"
-HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 3"
-HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2600"
+HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1"
+HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1"
+HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601"
HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free"
-HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows XP"
+HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7"
HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT"
-HKLM,%Control%\Windows,"CSDVersion",0x10003,0x300
+HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100
HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"
[VersionInfo.ntamd64]
-HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.2"
-HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 2"
-HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"3790"
+HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1"
+HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1"
+HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601"
HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free"
-HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows XP"
+HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7"
HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT"
-HKLM,%Control%\Windows,"CSDVersion",0x10003,0x200
+HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100
HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"
[Wow64]
diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c
index f674824..d272d1c 100644
--- a/programs/winecfg/appdefaults.c
+++ b/programs/winecfg/appdefaults.c
@@ -146,7 +146,7 @@ static void update_comboboxes(HWND dialog)
return;
}
if (ver != -1) winver = strdupA( win_versions[ver].szVersion );
- else winver = strdupA("winxp");
+ else winver = strdupA("win7");
}
WINE_TRACE("winver is %s\n", winver);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git
More information about the pkg-wine-party
mailing list