fixed several serious bugs in info.c and added a couple undocumented compatibilities based on analysis of ms's version.dll's behavior. Removed 16-bit exe support from info.c b/c it was very wrong in most cases, and MSDN says 16-bit exe isn't supported anyways. This gets winzip further towards working.

svn path=/trunk/; revision=8782

reactos/lib/version/info.c

@@ -23,7 +23,7 @@
  *   o Verify VerQueryValue()
  */
 #include "config.h"
-#include "wine/port.h"
+//#include "wine/port.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
@@ -38,16 +38,61 @@
 #include "wine/debug.h"
 #include "wine/unicode.h"
 
-#ifdef __REACTOS__
+/*#ifdef __REACTOS__
 DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType,
                                     LPCSTR lpszResId, LPDWORD lpdwFileOffset );
 DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType,
                                 LPCSTR lpszResId, DWORD dwFileOffset,
                                 DWORD dwResLen, LPVOID lpvData )
-#endif
+#endif*/
 
 WINE_DEFAULT_DEBUG_CHANNEL(ver);
 
+static
+void
+VERSION_A2W ( LPWSTR wide_str, LPCSTR ansi_str, int len )
+{
+	MultiByteToWideChar ( CP_ACP, 0, ansi_str, -1, wide_str, len );
+}
+
+static
+void
+VERSION_W2A ( LPSTR ansi_str, LPCWSTR wide_str, int len )
+{
+	WideCharToMultiByte ( CP_ACP, 0, wide_str, -1, ansi_str, len, NULL, NULL );
+}
+
+static
+LPWSTR
+VERSION_AllocA2W ( LPCSTR ansi_str )
+{
+	int len = MultiByteToWideChar ( CP_ACP, 0, ansi_str, -1, NULL, 0 );
+	LPWSTR wide_str = HeapAlloc ( GetProcessHeap(), 0, len * sizeof(WCHAR) );
+	if ( !wide_str )
+		return NULL;
+	VERSION_A2W ( wide_str, ansi_str, len );
+	return wide_str;
+}
+
+static
+LPSTR
+VERSION_AllocW2A ( LPCWSTR wide_str )
+{
+	int len = WideCharToMultiByte ( CP_ACP, 0, wide_str, -1, NULL, 0, NULL, NULL );
+	LPSTR ansi_str = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char));
+	if (!ansi_str)
+		return NULL;
+	VERSION_W2A ( ansi_str, wide_str, len );
+	return ansi_str;
+}
+
+static
+void
+VERSION_Free ( LPVOID lpvoid )
+{
+	HeapFree ( GetProcessHeap(), 0, lpvoid );
+}
+
 
 /******************************************************************************
  *
@@ -57,7 +102,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ver);
  *      Added this function to clean up the code.
  *
  *****************************************************************************/
-static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
+static
+void
+print_vffi_debug(VS_FIXEDFILEINFO *vffi)
 {
 	TRACE(" structversion=%u.%u, fileversion=%u.%u.%u.%u, productversion=%u.%u.%u.%u, flagmask=0x%lx, flags=%s%s%s%s%s%s\n",
 		    HIWORD(vffi->dwStrucVersion),LOWORD(vffi->dwStrucVersion),
@@ -74,7 +121,7 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
 		    (vffi->dwFileFlags & VS_FF_SPECIALBUILD) ? "SPECIALBUILD," : ""
 		    );
 
-        TRACE("(");
+	TRACE("(");
 	TRACE(" OS=0x%x.0x%x ",
 		HIWORD(vffi->dwFileOS),
 		LOWORD(vffi->dwFileOS)
@@ -148,7 +195,7 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
 		}
 		break;
 	case VFT_FONT:
-                TRACE("filetype=FONT.");
+		TRACE("filetype=FONT.");
 		switch (vffi->dwFileSubtype) {
 		default:
 			TRACE("UNKNOWN(0x%lx)",vffi->dwFileSubtype);
@@ -161,7 +208,7 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
 	case VFT_VXD:TRACE("filetype=VXD");break;
 	case VFT_STATIC_LIB:TRACE("filetype=STATIC_LIB");break;
 	}
-        TRACE("\n");
+	TRACE("\n");
 	TRACE("  filedata=0x%lx.0x%lx\n",
 		    vffi->dwFileDateMS,vffi->dwFileDateLS);
 }
@@ -171,19 +218,6 @@ static void print_vffi_debug(VS_FIXEDFILEINFO *vffi)
  * Version Info Structure
  */
 
-typedef struct
-{
-    WORD  wLength;
-    WORD  wValueLength;
-    CHAR  szKey[1];
-#if 0   /* variable length structure */
-    /* DWORD aligned */
-    BYTE  Value[];
-    /* DWORD aligned */
-    VS_VERSION_INFO_STRUCT16 Children[];
-#endif
-} VS_VERSION_INFO_STRUCT16;
-
 typedef struct
 {
     WORD  wLength;
@@ -197,99 +231,35 @@ typedef struct
     VS_VERSION_INFO_STRUCT32 Children[];
 #endif
 } VS_VERSION_INFO_STRUCT32;
-
+/*
 #define VersionInfoIs16( ver ) \
     ( ((VS_VERSION_INFO_STRUCT16 *)ver)->szKey[0] >= ' ' )
-
+*/
 #define DWORD_ALIGN( base, ptr ) \
     ( (LPBYTE)(base) + ((((LPBYTE)(ptr) - (LPBYTE)(base)) + 3) & ~3) )
-
+/*
 #define VersionInfo16_Value( ver )  \
     DWORD_ALIGN( (ver), (ver)->szKey + strlen((ver)->szKey) + 1 )
+*/
 #define VersionInfo32_Value( ver )  \
     DWORD_ALIGN( (ver), (ver)->szKey + strlenW((ver)->szKey) + 1 )
-
+/*
 #define VersionInfo16_Children( ver )  \
     (VS_VERSION_INFO_STRUCT16 *)( VersionInfo16_Value( ver ) + \
                            ( ( (ver)->wValueLength + 3 ) & ~3 ) )
+*/
 #define VersionInfo32_Children( ver )  \
     (VS_VERSION_INFO_STRUCT32 *)( VersionInfo32_Value( ver ) + \
                            ( ( (ver)->wValueLength * \
                                ((ver)->bText? 2 : 1) + 3 ) & ~3 ) )
 
+/*
 #define VersionInfo16_Next( ver ) \
     (VS_VERSION_INFO_STRUCT16 *)( (LPBYTE)ver + (((ver)->wLength + 3) & ~3) )
+*/
 #define VersionInfo32_Next( ver ) \
     (VS_VERSION_INFO_STRUCT32 *)( (LPBYTE)ver + (((ver)->wLength + 3) & ~3) )
 
-/***********************************************************************
- *           ConvertVersionInfo32To16        [internal]
- */
-void ConvertVersionInfo32To16( VS_VERSION_INFO_STRUCT32 *info32,
-                               VS_VERSION_INFO_STRUCT16 *info16 )
-{
-    /* Copy data onto local stack to prevent overwrites */
-    WORD wLength = info32->wLength;
-    WORD wValueLength = info32->wValueLength;
-    WORD bText = info32->bText;
-    LPBYTE lpValue = VersionInfo32_Value( info32 );
-    VS_VERSION_INFO_STRUCT32 *child32 = VersionInfo32_Children( info32 );
-    VS_VERSION_INFO_STRUCT16 *child16;
-
-    TRACE("Converting %p to %p\n", info32, info16 );
-    TRACE("wLength %d, wValueLength %d, bText %d, value %p, child %p\n",
-                wLength, wValueLength, bText, lpValue, child32 );
-
-    /* Convert key */
-    WideCharToMultiByte( CP_ACP, 0, info32->szKey, -1, info16->szKey, 0x7fffffff, NULL, NULL );
-
-    TRACE("Copied key from %p to %p: %s\n", info32->szKey, info16->szKey,
-                debugstr_a(info16->szKey) );
-
-    /* Convert value */
-    if ( wValueLength == 0 )
-    {
-        info16->wValueLength = 0;
-        TRACE("No value present\n" );
-    }
-    else if ( bText )
-    {
-        info16->wValueLength = WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)lpValue, -1, NULL, 0, NULL, NULL );
-        WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)lpValue, -1,
-                             VersionInfo16_Value( info16 ), info16->wValueLength, NULL, NULL );
-
-        TRACE("Copied value from %p to %p: %s\n", lpValue,
-                    VersionInfo16_Value( info16 ),
-                    debugstr_a(VersionInfo16_Value( info16 )) );
-    }
-    else
-    {
-        info16->wValueLength = wValueLength;
-        memmove( VersionInfo16_Value( info16 ), lpValue, wValueLength );
-
-        TRACE("Copied value from %p to %p: %d bytes\n", lpValue,
-                     VersionInfo16_Value( info16 ), wValueLength );
-    }
-
-    /* Convert children */
-    child16 = VersionInfo16_Children( info16 );
-    while ( (DWORD)child32 < (DWORD)info32 + wLength && child32->wLength != 0 )
-    {
-        VS_VERSION_INFO_STRUCT32 *nextChild = VersionInfo32_Next( child32 );
-
-        ConvertVersionInfo32To16( child32, child16 );
-
-        child16 = VersionInfo16_Next( child16 );
-        child32 = nextChild;
-    }
-
-    /* Fixup length */
-    info16->wLength = (DWORD)child16 - (DWORD)info16;
-
-    TRACE("Finished, length is %d (%p - %p)\n",
-                info16->wLength, info16, child16 );
-}
-
 /***********************************************************************
  *           VERSION_GetFileVersionInfo_PE             [internal]
  *
@@ -297,448 +267,277 @@ void ConvertVersionInfo32To16( VS_VERSION_INFO_STRUCT32 *info32,
  *    in the case if file exists, but VERSION_INFO not found.
  *    FIXME: handle is not used.
  */
-static DWORD VERSION_GetFileVersionInfo_PE( LPCSTR filename, LPDWORD handle,
+static
-                                    DWORD datasize, LPVOID data )
+DWORD
+VERSION_GetFileVersionInfo_PE (
+	LPCWSTR filename, LPDWORD handle,
+	DWORD datasize, LPVOID data )
 {
-    VS_FIXEDFILEINFO *vffi;
+	VS_FIXEDFILEINFO *vffi;
-    DWORD len;
+	DWORD len;
-    BYTE *buf;
+	BYTE *buf;
-    HMODULE hModule;
+	HMODULE hModule;
-    HRSRC hRsrc;
+	HRSRC hRsrc;
-    HGLOBAL hMem;
+	HGLOBAL hMem;
 
-    TRACE("(%s,%p)\n", debugstr_a(filename), handle );
+	TRACE("(%s,%p)\n", debugstr_w(filename), handle );
 
-    hModule = GetModuleHandleA(filename);
+	hModule = GetModuleHandleW(filename);
-    if(!hModule)
+	if(!hModule)
-	hModule = LoadLibraryExA(filename, 0, LOAD_LIBRARY_AS_DATAFILE);
+		hModule = LoadLibraryExW(filename, 0, LOAD_LIBRARY_AS_DATAFILE);
-    else
-	hModule = LoadLibraryExA(filename, 0, 0);
-    if(!hModule)
-    {
-	WARN("Could not load %s\n", debugstr_a(filename));
-	return 0;
-    }
-    hRsrc = FindResourceW(hModule,
-			  MAKEINTRESOURCEW(VS_VERSION_INFO),
-			  MAKEINTRESOURCEW(VS_FILE_INFO));
-    if(!hRsrc)
-    {
-	WARN("Could not find VS_VERSION_INFO in %s\n", debugstr_a(filename));
-	FreeLibrary(hModule);
-	return 0xFFFFFFFF;
-    }
-    len = SizeofResource(hModule, hRsrc);
-    hMem = LoadResource(hModule, hRsrc);
-    if(!hMem)
-    {
-	WARN("Could not load VS_VERSION_INFO from %s\n", debugstr_a(filename));
-	FreeLibrary(hModule);
-	return 0xFFFFFFFF;
-    }
-    buf = LockResource(hMem);
-
-    vffi = (VS_FIXEDFILEINFO *)VersionInfo32_Value( (VS_VERSION_INFO_STRUCT32 *)buf );
-
-    if ( vffi->dwSignature != VS_FFI_SIGNATURE )
-    {
-        WARN("vffi->dwSignature is 0x%08lx, but not 0x%08lx!\n",
-                   vffi->dwSignature, VS_FFI_SIGNATURE );
-	len = 0xFFFFFFFF;
-	goto END;
-    }
-
-    if ( TRACE_ON(ver) )
-        print_vffi_debug( vffi );
-
-    if(data)
-    {
-	if(datasize < len)
-	    len = datasize; /* truncate data */
-	if(len)
-	    memcpy(data, buf, len);
 	else
-	    len = 0xFFFFFFFF;
+		hModule = LoadLibraryExW(filename, 0, 0);
-    }
+	if ( !hModule )
+	{
+		WARN("Could not load %s\n", debugstr_w(filename));
+		return 0;
+	}
+	hRsrc = FindResourceW(hModule,
+	                      MAKEINTRESOURCEW(VS_VERSION_INFO),
+	                      MAKEINTRESOURCEW(VS_FILE_INFO));
+	if ( !hRsrc )
+	{
+		WARN("Could not find VS_VERSION_INFO in %s\n", debugstr_w(filename));
+		FreeLibrary(hModule);
+		return 0xFFFFFFFF;
+	}
+	len = SizeofResource(hModule, hRsrc);
+	hMem = LoadResource(hModule, hRsrc);
+	if(!hMem)
+	{
+		WARN("Could not load VS_VERSION_INFO from %s\n", debugstr_a(filename));
+		FreeLibrary(hModule);
+		return 0xFFFFFFFF;
+	}
+	buf = LockResource(hMem);
+
+	vffi = (VS_FIXEDFILEINFO *)VersionInfo32_Value( (VS_VERSION_INFO_STRUCT32 *)buf );
+
+	if ( vffi->dwSignature != VS_FFI_SIGNATURE )
+	{
+		WARN("vffi->dwSignature is 0x%08lx, but not 0x%08lx!\n",
+		     vffi->dwSignature, VS_FFI_SIGNATURE );
+		len = 0xFFFFFFFF;
+		goto END;
+	}
+
+	if ( TRACE_ON(ver) )
+		print_vffi_debug( vffi );
+
+	if(data)
+	{
+		if(datasize < len)
+			len = datasize; /* truncate data */
+		if(len)
+			memcpy(data, buf, len);
+		else
+			len = 0xFFFFFFFF;
+	}
 END:
-    FreeResource(hMem);
+	FreeResource(hMem);
-    FreeLibrary(hModule);
+	FreeLibrary(hModule);
 
-    return len;
+	return len;
-}
-
-/***********************************************************************
- *           VERSION_GetFileVersionInfo_16             [internal]
- *
- *    NOTE: returns size of the 16-bit VERSION resource or 0xFFFFFFFF
- *    in the case if file exists, but VERSION_INFO not found.
- *    FIXME: handle is not used.
- */
-static DWORD VERSION_GetFileVersionInfo_16( LPCSTR filename, LPDWORD handle,
-                                    DWORD datasize, LPVOID data )
-{
-#ifndef __MINGW32__
-    VS_FIXEDFILEINFO *vffi;
-    DWORD len;
-    BYTE *buf;
-    HMODULE16 hModule;
-    HRSRC16 hRsrc;
-    HGLOBAL16 hMem;
-
-    TRACE("(%s,%p)\n", debugstr_a(filename), handle );
-
-    hModule = LoadLibrary16(filename);
-    if(hModule < 32)
-    {
-	WARN("Could not load %s\n", debugstr_a(filename));
-	return 0;
-    }
-    hRsrc = FindResource16(hModule,
-			  MAKEINTRESOURCEA(VS_VERSION_INFO),
-			  MAKEINTRESOURCEA(VS_FILE_INFO));
-    if(!hRsrc)
-    {
-	WARN("Could not find VS_VERSION_INFO in %s\n", debugstr_a(filename));
-	FreeLibrary16(hModule);
-	return 0xFFFFFFFF;
-    }
-    len = SizeofResource16(hModule, hRsrc);
-    hMem = LoadResource16(hModule, hRsrc);
-    if(!hMem)
-    {
-	WARN("Could not load VS_VERSION_INFO from %s\n", debugstr_a(filename));
-	FreeLibrary16(hModule);
-	return 0xFFFFFFFF;
-    }
-    buf = LockResource16(hMem);
-
-    if(!VersionInfoIs16(buf))
-	goto END;
-
-    vffi = (VS_FIXEDFILEINFO *)VersionInfo16_Value( (VS_VERSION_INFO_STRUCT16 *)buf );
-
-    if ( vffi->dwSignature != VS_FFI_SIGNATURE )
-    {
-        WARN("vffi->dwSignature is 0x%08lx, but not 0x%08lx!\n",
-                   vffi->dwSignature, VS_FFI_SIGNATURE );
-	len = 0xFFFFFFFF;
-	goto END;
-    }
-
-    if ( TRACE_ON(ver) )
-        print_vffi_debug( vffi );
-
-    if(data)
-    {
-	if(datasize < len)
-	    len = datasize; /* truncate data */
-	if(len)
-	    memcpy(data, buf, len);
-	else
-	    len = 0xFFFFFFFF;
-    }
-END:
-    FreeResource16(hMem);
-    FreeLibrary16(hModule);
-
-    return len;
-#else /* __MINGW32__ */
-FIXME("No Support for 16bit version information on ReactOS\n");
-return 0;
-#endif /* __MINGW32__ */
-}
-
-/***********************************************************************
- *           GetFileVersionInfoSizeA         [VERSION.@]
- */
-DWORD WINAPI GetFileVersionInfoSizeA( LPSTR filename, LPDWORD handle )
-{
-    VS_FIXEDFILEINFO *vffi;
-    DWORD len, ret, offset;
-    BYTE buf[144];
-
-    TRACE("(%s,%p)\n", debugstr_a(filename), handle );
-
-    len = VERSION_GetFileVersionInfo_PE(filename, handle, 0, NULL);
-    /* 0xFFFFFFFF means: file exists, but VERSION_INFO not found */
-    if(len == 0xFFFFFFFF)
-    {
-        SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND);
-        return 0;
-    }
-    if(len) return len;
-    len = VERSION_GetFileVersionInfo_16(filename, handle, 0, NULL);
-    /* 0xFFFFFFFF means: file exists, but VERSION_INFO not found */
-    if(len == 0xFFFFFFFF)
-    {
-        SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND);
-        return 0;
-    }
-    if(len) return len;
-
-    len = GetFileResourceSize16( filename,
-                                 MAKEINTRESOURCEA(VS_FILE_INFO),
-                                 MAKEINTRESOURCEA(VS_VERSION_INFO),
-                                 &offset );
-    if (!len) return 0;
-
-    ret = GetFileResource16( filename,
-                             MAKEINTRESOURCEA(VS_FILE_INFO),
-                             MAKEINTRESOURCEA(VS_VERSION_INFO),
-                             offset, sizeof( buf ), buf );
-    if (!ret) return 0;
-
-    if ( handle ) *handle = offset;
-
-    if ( VersionInfoIs16( buf ) )
-        vffi = (VS_FIXEDFILEINFO *)VersionInfo16_Value( (VS_VERSION_INFO_STRUCT16 *)buf );
-    else
-        vffi = (VS_FIXEDFILEINFO *)VersionInfo32_Value( (VS_VERSION_INFO_STRUCT32 *)buf );
-
-    if ( vffi->dwSignature != VS_FFI_SIGNATURE )
-    {
-        WARN("vffi->dwSignature is 0x%08lx, but not 0x%08lx!\n",
-                   vffi->dwSignature, VS_FFI_SIGNATURE );
-        return 0;
-    }
-
-    if ( ((VS_VERSION_INFO_STRUCT16 *)buf)->wLength < len )
-        len = ((VS_VERSION_INFO_STRUCT16 *)buf)->wLength;
-
-    if ( TRACE_ON(ver) )
-        print_vffi_debug( vffi );
-
-    return len;
 }
 
 /***********************************************************************
  *           GetFileVersionInfoSizeW         [VERSION.@]
  */
-DWORD WINAPI GetFileVersionInfoSizeW( LPWSTR filename, LPDWORD handle )
+DWORD
+WINAPI
+GetFileVersionInfoSizeW ( LPWSTR filename, LPDWORD handle )
 {
-    DWORD ret, len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL );
+	DWORD len;
-    LPSTR fn = HeapAlloc( GetProcessHeap(), 0, len );
+
-    WideCharToMultiByte( CP_ACP, 0, filename, -1, fn, len, NULL, NULL );
+	TRACE("(%s,%p)\n", debugstr_w(filename), handle );
-    ret = GetFileVersionInfoSizeA( fn, handle );
+	if ( handle ) *handle = 0; //offset;
-    HeapFree( GetProcessHeap(), 0, fn );
+
-    return ret;
+	len = VERSION_GetFileVersionInfo_PE ( filename, handle, 0, NULL );
+	/* 0xFFFFFFFF means: file exists, but VERSION_INFO not found */
+	if ( len == 0xFFFFFFFF )
+	{
+		SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND);
+		return 0;
+	}
+	if ( len ) return (len<<1) + 4; // This matches MS's version.dll behavior, from what I can tell
+
+	/* there used to be a bunch of 16-bit stuff here, but MS's docs say 16-bit not supported */
+
+	return 0;
 }
 
 /***********************************************************************
- *           GetFileVersionInfoA             [VERSION.@]
+ *           GetFileVersionInfoSizeA         [VERSION.@]
  */
-BOOL WINAPI GetFileVersionInfoA( LPSTR filename, DWORD handle,
+DWORD
-                                    DWORD datasize, LPVOID data )
+WINAPI
+GetFileVersionInfoSizeA ( LPSTR filename, LPDWORD handle )
 {
-    DWORD len;
+	LPWSTR filenameW = VERSION_AllocA2W(filename);
-
+	DWORD ret = GetFileVersionInfoSizeW ( filenameW, handle );
-    TRACE("(%s,%ld,size=%ld,data=%p)\n",
+	VERSION_Free ( filenameW );
-                debugstr_a(filename), handle, datasize, data );
+	return ret;
-
-    len = VERSION_GetFileVersionInfo_PE(filename, &handle, datasize, data);
-    /* 0xFFFFFFFF means: file exists, but VERSION_INFO not found */
-    if(len == 0xFFFFFFFF) return FALSE;
-    if(len)
-	goto DO_CONVERT;
-    len = VERSION_GetFileVersionInfo_16(filename, &handle, datasize, data);
-    /* 0xFFFFFFFF means: file exists, but VERSION_INFO not found */
-    if(len == 0xFFFFFFFF) return FALSE;
-    if(len)
-	goto DO_CONVERT;
-
-    if ( !GetFileResource16( filename, MAKEINTRESOURCEA(VS_FILE_INFO),
-                                       MAKEINTRESOURCEA(VS_VERSION_INFO),
-                                       handle, datasize, data ) )
-        return FALSE;
-DO_CONVERT:
-    if (    datasize >= sizeof(VS_VERSION_INFO_STRUCT16)
-         && datasize >= ((VS_VERSION_INFO_STRUCT16 *)data)->wLength
-         && !VersionInfoIs16( data ) )
-    {
-        /* convert resource from PE format to NE format */
-        ConvertVersionInfo32To16( (VS_VERSION_INFO_STRUCT32 *)data,
-                                  (VS_VERSION_INFO_STRUCT16 *)data );
-    }
-
-    return TRUE;
 }
 
 /***********************************************************************
  *           GetFileVersionInfoW             [VERSION.@]
  */
-BOOL WINAPI GetFileVersionInfoW( LPWSTR filename, DWORD handle,
+BOOL
-                                    DWORD datasize, LPVOID data )
+WINAPI
+GetFileVersionInfoW (
+	LPWSTR filename, DWORD handle,
+	DWORD datasize, LPVOID data )
 {
-    DWORD len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL );
+	DWORD len, extradata;
-    LPSTR fn = HeapAlloc( GetProcessHeap(), 0, len );
+	VS_VERSION_INFO_STRUCT32* vvis = (VS_VERSION_INFO_STRUCT32*)data;
-    DWORD retv = TRUE;
 
-    WideCharToMultiByte( CP_ACP, 0, filename, -1, fn, len, NULL, NULL );
+	TRACE("(%s,%ld,size=%ld,data=%p)\n",
+		debugstr_w(filename), handle, datasize, data );
 
-    TRACE("(%s,%ld,size=%ld,data=%p)\n",
+	len = VERSION_GetFileVersionInfo_PE(filename, &handle, datasize, data);
-                debugstr_w(filename), handle, datasize, data );
 
-    if(VERSION_GetFileVersionInfo_PE(fn, &handle, datasize, data))
+	if ( len == 0xFFFFFFFF )
-	goto END;
+		return FALSE;
-    if(VERSION_GetFileVersionInfo_16(fn, &handle, datasize, data))
-	goto END;
 
-    if ( !GetFileResource16( fn, MAKEINTRESOURCEA(VS_FILE_INFO),
+	extradata = datasize - vvis->wLength;
-                                 MAKEINTRESOURCEA(VS_VERSION_INFO),
+	memmove ( ((char*)(data))+vvis->wLength, "FE2X", extradata > 4 ? 4 : extradata );
-                                 handle, datasize, data ) )
-        retv = FALSE;
 
-    else if (    datasize >= sizeof(VS_VERSION_INFO_STRUCT16)
+	return TRUE;
-              && datasize >= ((VS_VERSION_INFO_STRUCT16 *)data)->wLength
-              && VersionInfoIs16( data ) )
-    {
-        ERR("Cannot access NE resource in %s\n", debugstr_a(fn) );
-        retv =  FALSE;
-    }
-END:
-    HeapFree( GetProcessHeap(), 0, fn );
-    return retv;
 }
 
-
 /***********************************************************************
- *           VersionInfo16_FindChild             [internal]
+ *           GetFileVersionInfoA             [VERSION.@]
  */
-static VS_VERSION_INFO_STRUCT16 *VersionInfo16_FindChild( VS_VERSION_INFO_STRUCT16 *info,
+BOOL
-                                            LPCSTR szKey, UINT cbKey )
+WINAPI
+GetFileVersionInfoA (
+	LPSTR filename, DWORD handle,
+	DWORD datasize, LPVOID data )
 {
-    VS_VERSION_INFO_STRUCT16 *child = VersionInfo16_Children( info );
+	LPWSTR filenameW = VERSION_AllocA2W ( filename );
-
+	BOOL ret = GetFileVersionInfoW ( filenameW, handle, datasize, data );
-    while ( (DWORD)child < (DWORD)info + info->wLength )
+	VERSION_Free ( filenameW );
-    {
+	return ret;
-        if ( !strncmp( child->szKey, szKey, cbKey ) )
-            return child;
-
-	if (!(child->wLength)) return NULL;
-        child = VersionInfo16_Next( child );
-    }
-
-    return NULL;
 }
 
 /***********************************************************************
  *           VersionInfo32_FindChild             [internal]
  */
-static VS_VERSION_INFO_STRUCT32 *VersionInfo32_FindChild( VS_VERSION_INFO_STRUCT32 *info,
+static
-                                            LPCWSTR szKey, UINT cbKey )
+VS_VERSION_INFO_STRUCT32*
+VersionInfo32_FindChild (
+	VS_VERSION_INFO_STRUCT32 *info,
+	LPCWSTR szKey, UINT cbKey )
 {
-    VS_VERSION_INFO_STRUCT32 *child = VersionInfo32_Children( info );
+	VS_VERSION_INFO_STRUCT32 *child = VersionInfo32_Children( info );
 
-    while ( (DWORD)child < (DWORD)info + info->wLength )
+	while ( (DWORD)child < (DWORD)info + info->wLength )
-    {
+	{
-        if ( !strncmpiW( child->szKey, szKey, cbKey ) )
+		if ( !strncmpiW( child->szKey, szKey, cbKey ) )
-            return child;
+			return child;
 
-        child = VersionInfo32_Next( child );
+		child = VersionInfo32_Next( child );
-    }
+	}
 
-    return NULL;
+	return NULL;
 }
 
-/***********************************************************************
+static
- *           VerQueryValueA              [VERSION.@]
+VS_VERSION_INFO_STRUCT32*
- */
+VERSION_VerQueryValue ( VS_VERSION_INFO_STRUCT32* info, LPCWSTR lpSubBlock )
-BOOL WINAPI VerQueryValueA( const LPVOID pBlock, LPSTR lpSubBlock,
-                               LPVOID *lplpBuffer, UINT *puLen )
 {
-    VS_VERSION_INFO_STRUCT16 *info = (VS_VERSION_INFO_STRUCT16 *)pBlock;
+	while ( *lpSubBlock )
-    if ( !VersionInfoIs16( info ) )
+	{
-    {
+		/* Find next path component */
-        INT len;
+		LPCWSTR lpNextSlash;
-        LPWSTR wide_str;
+		for ( lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++ )
-        DWORD give;
+		{
+			if ( *lpNextSlash == '\\' )
+				break;
+		}
 
-        /* <lawson_whitney@juno.com> Feb 2001 */
+		/* Skip empty components */
-        /* AOL 5.0 does this, expecting to get this: */
+		if ( lpNextSlash == lpSubBlock )
-        len = MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, NULL, 0);
+		{
-        wide_str = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
+			lpSubBlock++;
-        MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, wide_str, len);
+			continue;
+		}
 
-        give = VerQueryValueW(pBlock, wide_str, lplpBuffer, puLen);
+		/* We have a non-empty component: search info for key */
-        HeapFree(GetProcessHeap(), 0, wide_str);
+		info = VersionInfo32_FindChild ( info, lpSubBlock, lpNextSlash-lpSubBlock );
-        return give;
+		if ( !info ) return NULL;
-    }
 
-    TRACE("(%p,%s,%p,%p)\n",
+		/* Skip path component */
-                pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen );
+		lpSubBlock = lpNextSlash;
-
+	}
-    while ( *lpSubBlock )
+	return info;
-    {
-        /* Find next path component */
-        LPSTR lpNextSlash;
-        for ( lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++ )
-            if ( *lpNextSlash == '\\' )
-                break;
-
-        /* Skip empty components */
-        if ( lpNextSlash == lpSubBlock )
-        {
-            lpSubBlock++;
-            continue;
-        }
-
-        /* We have a non-empty component: search info for key */
-        info = VersionInfo16_FindChild( info, lpSubBlock, lpNextSlash-lpSubBlock );
-        if ( !info ) return FALSE;
-
-        /* Skip path component */
-        lpSubBlock = lpNextSlash;
-    }
-
-    /* Return value */
-    *lplpBuffer = VersionInfo16_Value( info );
-    *puLen = info->wValueLength;
-
-    return TRUE;
 }
 
 /***********************************************************************
  *           VerQueryValueW              [VERSION.@]
  */
-BOOL WINAPI VerQueryValueW( const LPVOID pBlock, LPWSTR lpSubBlock,
+BOOL
-                               LPVOID *lplpBuffer, UINT *puLen )
+WINAPI
+VerQueryValueW (
+	const LPVOID pBlock,
+	LPWSTR lpSubBlock,
+	LPVOID *lplpBuffer,
+	UINT *puLen )
 {
-    VS_VERSION_INFO_STRUCT32 *info = (VS_VERSION_INFO_STRUCT32 *)pBlock;
+	VS_VERSION_INFO_STRUCT32 *info = (VS_VERSION_INFO_STRUCT32 *)pBlock;
-    if ( VersionInfoIs16( info ) )
-    {
-        ERR("called on NE resource!\n" );
-        return FALSE;
-    }
 
-    TRACE("(%p,%s,%p,%p)\n",
+	TRACE("(%p,%s,%p,%p)\n",
-                pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen );
+		pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen );
 
-    while ( *lpSubBlock )
+	info = VERSION_VerQueryValue ( info, lpSubBlock );
-    {
+	if ( !info )
-        /* Find next path component */
+	{
-        LPWSTR lpNextSlash;
+		// FIXME: what should SetLastError be set to???
-        for ( lpNextSlash = lpSubBlock; *lpNextSlash; lpNextSlash++ )
+		return FALSE;
-            if ( *lpNextSlash == '\\' )
+	}
-                break;
 
-        /* Skip empty components */
+	*lplpBuffer = VersionInfo32_Value ( info );
-        if ( lpNextSlash == lpSubBlock )
+	*puLen = info->wValueLength;
-        {
-            lpSubBlock++;
-            continue;
-        }
 
-        /* We have a non-empty component: search info for key */
+	return TRUE;
-        info = VersionInfo32_FindChild( info, lpSubBlock, lpNextSlash-lpSubBlock );
+}
-        if ( !info ) return FALSE;
+
-
+/***********************************************************************
-        /* Skip path component */
+ *           VerQueryValueA              [VERSION.@]
-        lpSubBlock = lpNextSlash;
+ */
-    }
+BOOL
-
+WINAPI
-    /* Return value */
+VerQueryValueA (
-    *lplpBuffer = VersionInfo32_Value( info );
+	LPVOID pBlock,
-    *puLen = info->wValueLength;
+	LPSTR lpSubBlockA,
-
+	LPVOID *lplpBuffer,
-    return TRUE;
+	UINT *puLen )
+{
+	VS_VERSION_INFO_STRUCT32 *info = (VS_VERSION_INFO_STRUCT32 *)pBlock;
+	LPWSTR lpSubBlockW = VERSION_AllocA2W ( lpSubBlockA );
+
+	TRACE("(%p,%s,%p,%p)\n",
+		pBlock, debugstr_a(lpSubBlockA), lplpBuffer, puLen );
+
+	info = VERSION_VerQueryValue ( info, lpSubBlockW );
+
+	VERSION_Free ( lpSubBlockW );
+
+	if ( !info )
+	{
+		// FIXME: what should SetLastError be set to???
+		return FALSE;
+	}
+
+	*lplpBuffer = VersionInfo32_Value ( info );
+	*puLen = info->wValueLength;
+
+	if ( info->bText )
+	{
+		LPSTR str = VERSION_AllocW2A ( *lplpBuffer );
+		memmove ( *lplpBuffer, str, info->wValueLength + 1 );
+		VERSION_Free ( str );
+	}
+
+	return TRUE;
 }