[MPlayer-cvslog] r30900 - trunk/loader/win32.c

[Diego Biurrun]

On Mon, Mar 15, 2010 at 01:54:54PM +0100, sesse wrote:
> 
> --- trunk/loader/win32.c	Mon Mar 15 13:05:56 2010	(r30899)
> +++ trunk/loader/win32.c	Mon Mar 15 13:54:54 2010	(r30900)
> @@ -1817,6 +1830,33 @@ static long WINAPI expGetVersionExA(OSVE
> +
> +static long WINAPI expGetVersionExW(OSVERSIONINFOW* c)
> +{
> +    char CSDVersion[128];
> +    dbgprintf("GetVersionExW(0x%x) => 1\n");
> +    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

Ugh, do we need to keep such ugly debug code?

> +    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);

The indentation of this function call is .. interesting.

Diego