wine.inf: Set default Windows version to win7.

Signed-off-by: Austin English <austinenglish@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Austin English 2017-01-31 12:59:44 -06:00 committed by Alexandre Julliard
parent 258c5279df
commit 6737ac70d6
3 changed files with 12 additions and 16 deletions

View File

@ -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 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 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; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;
HANDLE root, hkey, config_key; HANDLE root, hkey, config_key;
BOOL got_win_ver = FALSE; BOOL got_win_ver = FALSE;
if (is_win64 || is_wow64) current_version = &VersionData[WIN7];
current_version = &VersionData[WINXP64]; /* default if nothing else is specified */
else
current_version = &VersionData[WINXP];
RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); RtlOpenCurrentUser( KEY_ALL_ACCESS, &root );
attr.Length = sizeof(attr); attr.Length = sizeof(attr);

View File

@ -3366,23 +3366,23 @@ HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16
HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16
[VersionInfo] [VersionInfo]
HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1" HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1"
HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 3" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1"
HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2600" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601"
HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" 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%\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" HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"
[VersionInfo.ntamd64] [VersionInfo.ntamd64]
HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.2" HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1"
HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 2" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1"
HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"3790" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601"
HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" 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%\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" HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"
[Wow64] [Wow64]

View File

@ -146,7 +146,7 @@ static void update_comboboxes(HWND dialog)
return; return;
} }
if (ver != -1) winver = strdupA( win_versions[ver].szVersion ); if (ver != -1) winver = strdupA( win_versions[ver].szVersion );
else winver = strdupA("winxp"); else winver = strdupA("win7");
} }
WINE_TRACE("winver is %s\n", winver); WINE_TRACE("winver is %s\n", winver);