Changeset 7573

Timestamp:

Dec 8, 2001, 1:01:28 PM (24 years ago)

Author:

sandervl

Message:

new version constants for ME & XP

Location:

trunk

Files:

• doc/Odin.ini.txt (modified) (2 diffs)
• include/versionos2.h (modified) (2 diffs)
• src/kernel32/version.cpp (modified) (7 diffs)

trunk/doc/Odin.ini.txt

@@ -1 @@
-/* $Id: Odin.ini.txt,v 1.9 2001-08-16 18:12:20 sandervl Exp $ */
+/* $Id: Odin.ini.txt,v 1.10 2001-12-08 12:01:10 sandervl Exp $ */
 
 Odin initialization file documentation
@@ -31 +31 @@
 
 [WinVersion]
-Version=Win98  (default = NT40)
+Version=Win98        -> Windows 98
+Version=WinME        -> Windows ME
+Version=NT4          -> Windows NT4  SP6 (default)
+Version=Win2000      -> Windows 2000 SP2
+Version=WinXP        -> Windows XP
 Used to override the version Odin reports to the application.
 

trunk/include/versionos2.h

@@ -1 @@
-/* $Id: versionos2.h,v 1.21 2001-08-16 21:34:41 sandervl Exp $ */
+/* $Id: versionos2.h,v 1.22 2001-12-08 12:00:50 sandervl Exp $ */
 
 #ifndef __VERSIONOS2__H__
@@ -62 +62 @@
 //profile key in odin.ini for windows version
 #define PROFILE_WINVERSION_SECTION  "WinVersion"
-#define PROFILE_WINVERSION_KEY          "Version"
+#define PROFILE_WINVERSION_KEY      "Version"
 #define PROFILE_WINVERSION_WIN98    "Win98"
+#define PROFILE_WINVERSION_WINME    "WinME"
 #define PROFILE_WINVERSION_NT40     "NT40"
 #define PROFILE_WINVERSION_WIN2000  "Win2000"
+#define PROFILE_WINVERSION_WINXP    "WinXP"
 
 #define WINVERSION_WIN98        0
-#define WINVERSION_NT40         1   //default
-#define WINVERSION_WIN2000      2
-#define WINVERSION_MAX          3
+#define WINVERSION_WINME        1
+#define WINVERSION_NT40         2   //default
+#define WINVERSION_WIN2000      3
+#define WINVERSION_WINXP        4
+#define WINVERSION_MAX          5
+
+//Override windows version reported by Odin
+void WIN32API OdinSetVersion(ULONG version);
 
 #endif

trunk/src/kernel32/version.cpp

@@ -1 @@
-/* $Id: version.cpp,v 1.4 2001-10-15 17:10:55 sandervl Exp $ */
+/* $Id: version.cpp,v 1.5 2001-12-08 12:01:28 sandervl Exp $ */
 
 /*
@@ -42 +42 @@
 typedef struct
 {
+    LONG           getVersion16;
     LONG           getVersion;
     OSVERSIONINFOA getVersionEx;
@@ -48 +49 @@
 static VERSION_DATA VersionData[WINVERSION_MAX] =
 {
-    // Win98
-    {
+    // Windows 98
+    {
+        0x070A5F03,
         0xC0000A04,
         {
@@ -56 +58 @@
         }
     },
-    // NT40
-    {
+    // Windows ME
+    {
+        0x07005F03, /* Assuming DOS 7 like the other Win9x */
+        0xC0005A04,
+        {
+            sizeof(OSVERSIONINFOA), 4, 90, 0x45A0BB8,
+            VER_PLATFORM_WIN32_WINDOWS, " "
+        }
+    },
+    // Windows NT 4.0 (SP6)
+    {
+        0x05000A03,
         ODINNT_VERSION,
         {
@@ -64 +76 @@
         }
     },
-    // Windows 2000 TODO!!!!!!!!!!!!!!!!!
-    {
-        ODINNT_VERSION,
-        {
-            sizeof(OSVERSIONINFOA), ODINNT_MAJOR_VERSION, ODINNT_MINOR_VERSION, 
-            ODINNT_BUILD_NR, VER_PLATFORM_WIN32_NT, ODINNT_CSDVERSION
+    // Windows 2000 (SP2)
+    {
+        0x05005F03,
+        0x08930005,
+        {
+            sizeof(OSVERSIONINFOA), 5, 0, 0x893,
+            VER_PLATFORM_WIN32_NT, "Service Pack 2"
+        }
+    },
+    // Windows XP
+    {
+        0x05005F03, /* Assuming DOS 5 like the other NT */
+        0x0A280105,
+        {
+            sizeof(OSVERSIONINFOA), 5, 1, 0xA28,
+            VER_PLATFORM_WIN32_NT, ""
         }
     }
@@ -77 +99 @@
 static int  winversion    = WINVERSION_NT40;
 
+//******************************************************************************
+//******************************************************************************
+void WIN32API OdinSetVersion(ULONG version) 
+{
+    switch(version) {
+    case WINVERSION_WIN98:
+    case WINVERSION_WINME:
+    case WINVERSION_NT40:
+    case WINVERSION_WIN2000:
+    case WINVERSION_WINXP:
+        break;
+    default: 
+        DebugInt3();
+        return;
+    }
+    winversion = version;
+}
 //******************************************************************************
 //******************************************************************************
@@ -90 +129 @@
         }
         else
+        if(!stricmp(szVersion, PROFILE_WINVERSION_WINME)) {
+                winversion = WINVERSION_WINME;
+        }
+        else
         if(!stricmp(szVersion, PROFILE_WINVERSION_WIN2000)) {
                 winversion = WINVERSION_WIN2000;
+        }
+        else
+        if(!stricmp(szVersion, PROFILE_WINVERSION_WINXP)) {
+                winversion = WINVERSION_WINXP;
         }
   }