[PATCH] ntdll,winecfg: Don't add pre-winxp versions for wine64
Maarten Lankhorst
m.b.lankhorst at gmail.com
Sat Dec 13 17:52:43 CST 2008
---
dlls/ntdll/version.c | 6 ++++++
programs/winecfg/appdefaults.c | 2 ++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index 09b338f..699b261 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*/
diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c
index 28ec4fe..a9ba9bf 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]))
--
1.5.6.5
--------------010905070203030601060205--
More information about the wine-patches
mailing list