From 0e65648e36f9d722ce768143c86f3a54dd92eef8 Mon Sep 17 00:00:00 2001
From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
Date: Sun, 14 Dec 2008 00:52:43 +0100
Subject: [PATCH] ntdll,winecfg: Don't add pre-winxp versions for wine64

---
 dlls/ntdll/version.c           | 8 +++++++-
 programs/winecfg/appdefaults.c | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index 09b338f2fe2..c84b0f9ed8d 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -40,6 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ver);
 
 typedef enum
 {
+#ifndef _WIN64
     WIN20,   /* Windows 2.0 */
     WIN30,   /* Windows 3.0 */
     WIN31,   /* Windows 3.1 */
@@ -49,6 +50,7 @@ typedef enum
     NT351,   /* Windows NT 3.51 */
     NT40,    /* Windows NT 4.0 */
     NT2K,    /* Windows 2000 */
+#endif
     WINXP,   /* Windows XP */
     WIN2K3,  /* Windows 2003 */
     WINVISTA,/* Windows Vista */
@@ -61,6 +63,7 @@ typedef enum
  * can be found at www.mdgx.com/ver.htm */
 static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] =
 {
+#ifndef _WIN64
     /* WIN20 FIXME: verify values */
     {
         sizeof(RTL_OSVERSIONINFOEXW), 2, 0, 0, VER_PLATFORM_WIN32s,
@@ -125,6 +128,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] =
         {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','4',0},
         4, 0, 0, VER_NT_WORKSTATION, 30 /* FIXME: Great, a reserved field with a value! */
     },
+#endif
     /* WINXP */
     {
         sizeof(RTL_OSVERSIONINFOEXW), 5, 1, 0xA28, VER_PLATFORM_WIN32_NT,
@@ -153,6 +157,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] =
 
 static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] =
 { /* no spaces in here ! */
+#ifndef _WIN64
     "win20",                      /* WIN20 */
     "win30",                      /* WIN30 */
     "win31",                      /* WIN31 */
@@ -162,6 +167,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] =
     "nt351",                      /* NT351 */
     "nt40",                       /* NT40 */
     "win2000,win2k,nt2k,nt2000",  /* NT2K */
+#endif
     "winxp",                      /* WINXP */
     "win2003,win2k3",             /* WIN2K3 */
     "vista,winvista",             /* WINVISTA*/
@@ -449,7 +455,7 @@ void version_init( const WCHAR *appname )
     HANDLE root, hkey, config_key;
     BOOL got_win_ver = FALSE;
 
-    current_version = &VersionData[NT2K];  /* default if nothing else is specified */
+    current_version = &VersionData[WINXP];  /* default if nothing else is specified */
 
     RtlOpenCurrentUser( KEY_ALL_ACCESS, &root );
     attr.Length = sizeof(attr);
diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c
index 28ec4fe98de..a9ba9bf3672 100644
--- a/programs/winecfg/appdefaults.c
+++ b/programs/winecfg/appdefaults.c
@@ -52,6 +52,7 @@ static const struct
     { "vista",   "Windows Vista",  6,  0, 0x1770,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"},
     { "win2003", "Windows 2003",   5,  2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},
     { "winxp",   "Windows XP",     5,  1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"},
+#ifndef _WIN64
     { "win2k",   "Windows 2000",   5,  0, 0x893, VER_PLATFORM_WIN32_NT, "Service Pack 4", 4, 0, "WinNT"},
     { "winme",   "Windows ME",     4, 90, 0xBB8, VER_PLATFORM_WIN32_WINDOWS, " ", 0, 0, ""},
     { "win98",   "Windows 98",     4, 10, 0x8AE, VER_PLATFORM_WIN32_WINDOWS, " A ", 0, 0, ""},
@@ -61,6 +62,7 @@ static const struct
     { "win31",   "Windows 3.1",    2, 10,     0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""},
     { "win30",   "Windows 3.0",    3,  0,     0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""},
     { "win20",   "Windows 2.0",    2,  0,     0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}
+#endif
 };
 
 #define NB_VERSIONS (sizeof(win_versions)/sizeof(win_versions[0]))
-- 
2.11.4.GIT