ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winecfg: Fix setting version to Vista.

This commit is contained in:
Paul Vriens 2008-03-11 14:25:05 +01:00 committed by Alexandre Julliard
parent acc1dd11cb
commit 863240b77b
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
programs/winecfg/appdefaults.c
View File

@ -70,11 +70,18 @@ static const char szKeyNT[] = "Software\\Microsoft\\Windows NT\\CurrentVersion";
static int get_registry_version(void) static int get_registry_version(void)
{ {
int i, best = -1, platform, major, minor = 0; int i, best = -1, platform, major, minor, build = 0;
char *p, *ver; char *p, *ver;
if ((ver = get_reg_key( HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL ))) if ((ver = get_reg_key( HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL )))
{
char *build_str;
platform = VER_PLATFORM_WIN32_NT; platform = VER_PLATFORM_WIN32_NT;
build_str = get_reg_key( HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL );
build = atoi(build_str);
}
else if ((ver = get_reg_key( HKEY_LOCAL_MACHINE, szKey9x, "VersionNumber", NULL ))) else if ((ver = get_reg_key( HKEY_LOCAL_MACHINE, szKey9x, "VersionNumber", NULL )))
platform = VER_PLATFORM_WIN32_WINDOWS; platform = VER_PLATFORM_WIN32_WINDOWS;
else else
@ -82,10 +89,15 @@ static int get_registry_version(void)
if ((p = strchr( ver, '.' ))) if ((p = strchr( ver, '.' )))
{ {
char *str = p; char *minor_str = p;
*str++ = 0; *minor_str++ = 0;
if ((p = strchr( str, '.' ))) *p = 0; if ((p = strchr( minor_str, '.' )))
minor = atoi(str); {
char *build_str = p;
*build_str++ = 0;
build = atoi(build_str);
}
minor = atoi(minor_str);
} }
major = atoi(ver); major = atoi(ver);
@ -94,7 +106,9 @@ static int get_registry_version(void)
if (win_versions[i].dwPlatformId != platform) continue; if (win_versions[i].dwPlatformId != platform) continue;
if (win_versions[i].dwMajorVersion != major) continue; if (win_versions[i].dwMajorVersion != major) continue;
best = i; best = i;
if (win_versions[i].dwMinorVersion == minor) return i; if ((win_versions[i].dwMinorVersion == minor) &&
(win_versions[i].dwBuildNumber == build))
return i;
} }
return best; return best;
} }