Announce Windows XP SP2 instead of Windows 95 OSR2.

It's time we move to 2010: Announce Windows XP SP2 to codecs instead of Win95
OSR2.

Note: We still don't support the *Ex fields in the version info struct
properly (we shouldn't really overwrite the structure size, but rather check
it to see if it's safe to fill the extra fields). No codec I've found seems
to care.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30927 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 15 insertions, 31 deletions

diff --git a/loader/win32.c b/loader/win32.c
index 826fa60d4e..b349ee91af 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -1807,47 +1807,31 @@ static long WINAPI expWideCharToMultiByte(long v1, long v2, short* s1, long siz1
 
 static long WINAPI expGetVersionExA(OSVERSIONINFOA* c)
 {
-    dbgprintf("GetVersionExA(0x%x) => 1\n");
+    dbgprintf("GetVersionExA(0x%x) => 1\n", c);
     c->dwOSVersionInfoSize=sizeof(*c);
-    c->dwMajorVersion=4;
-    c->dwMinorVersion=0;
-    c->dwBuildNumber=0x4000457;
-#if 1
-    // leave it here for testing win9x-only codecs
-    c->dwPlatformId=VER_PLATFORM_WIN32_WINDOWS;
-    strcpy(c->szCSDVersion, " B");
-#else
-    c->dwPlatformId=VER_PLATFORM_WIN32_NT; // let's not make DLL assume that it can read CR* registers
-    strcpy(c->szCSDVersion, "Service Pack 3");
-#endif
-    dbgprintf("  Major version: 4\n  Minor version: 0\n  Build number: 0x4000457\n"
-	      "  Platform Id: VER_PLATFORM_WIN32_NT\n Version string: 'Service Pack 3'\n");
+    c->dwMajorVersion=5;
+    c->dwMinorVersion=1;
+    c->dwBuildNumber=0x5010a28;
+    c->dwPlatformId=VER_PLATFORM_WIN32_NT;
+    strcpy(c->szCSDVersion, "Service Pack 2");
+    dbgprintf("  Major version: 5\n  Minor version: 1\n  Build number: 0x5010a28\n"
+	      "  Platform Id: VER_PLATFORM_WIN32_NT\n Version string: 'Service Pack 2'\n");
     return 1;
 }
 
 static long WINAPI expGetVersionExW(OSVERSIONINFOW* c)
 {
     char CSDVersion[128];
-    dbgprintf("GetVersionExW(0x%x) => 1\n");
+    dbgprintf("GetVersionExW(0x%x) => 1\n", c);
     c->dwOSVersionInfoSize=sizeof(*c);
     c->dwMajorVersion=5;
-    c->dwMinorVersion=0;
-    c->dwBuildNumber=0x5000457;
-#if 1
-    // leave it here for testing win9x-only codecs
-    c->dwPlatformId=VER_PLATFORM_WIN32_WINDOWS;
-    strcpy(CSDVersion, " B");
-#else
-    c->dwPlatformId=VER_PLATFORM_WIN32_NT; // let's not make DLL assume that it can read CR* registers
-    strcpy(CSDVersion, "Service Pack 3");
-#endif
+    c->dwMinorVersion=1;
+    c->dwBuildNumber=0x5010a28;
+    c->dwPlatformId=VER_PLATFORM_WIN32_NT;
+    strcpy(CSDVersion, "Service Pack 2");
     MultiByteToWideChar(65001, 0x0, CSDVersion, -1, c->szCSDVersion, 128);
-    dbgprintf("  Major version: %d\n  Minor version: %d\n  Build number: 0x%08x\n"
-              "  Platform Id: %s\n Version string: '%s'\n",
-              c->dwMajorVersion, c->dwMinorVersion, c->dwBuildNumber,
-              (c->dwPlatformId==VER_PLATFORM_WIN32_WINDOWS ? "VER_PLATFORM_WIN32_WINDOWS" :
-                  (c->dwPlatformId==VER_PLATFORM_WIN32_NT ? "VER_PLATFORM_WIN32_NT" : "Unknown")),
-              CSDVersion);
+    dbgprintf("  Major version: 5\n  Minor version: 1\n  Build number: 0x5010a28\n"
+	      "  Platform Id: VER_PLATFORM_WIN32_NT\n Version string: 'Service Pack 2'\n");
     return 1;
 }