From dae096f8e479303e7247f8ebccb0647d45cf7a3e Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Tue, 9 Feb 1999 14:18:57 +0000 Subject: [PATCH] NULL is a valid argument as handle for GetFileVersionInfoSize32A. --- dlls/version/info.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 146eead288a..3835eae3d99 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -264,7 +264,7 @@ void ConvertVersionInfo32To16( VS_VERSION_INFO32 *info32, DWORD WINAPI GetFileVersionInfoSize32A( LPCSTR filename, LPDWORD handle ) { VS_FIXEDFILEINFO *vffi; - DWORD len, ret; + DWORD len, ret, offset; BYTE buf[144]; TRACE( ver, "(%s,%p)\n", debugstr_a(filename), handle ); @@ -272,15 +272,16 @@ DWORD WINAPI GetFileVersionInfoSize32A( LPCSTR filename, LPDWORD handle ) len = GetFileResourceSize32( filename, MAKEINTRESOURCE32A(VS_FILE_INFO), MAKEINTRESOURCE32A(VS_VERSION_INFO), - handle ); + &offset ); if (!len) return 0; ret = GetFileResource32( filename, MAKEINTRESOURCE32A(VS_FILE_INFO), MAKEINTRESOURCE32A(VS_VERSION_INFO), - *handle, sizeof( buf ), buf ); + offset, sizeof( buf ), buf ); if (!ret) return 0; + if ( handle ) *handle = offset; if ( VersionInfoIs16( buf ) ) vffi = (VS_FIXEDFILEINFO *)VersionInfo16_Value( (VS_VERSION_INFO16 *)buf );