From e5503f96c18d1ef7a67b33745f27d1e7aad73c8d Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Wed, 27 Jul 2005 15:14:33 +0000 Subject: [PATCH] Remove 32bit references/checks in VERSION_GetFileVersionInfo_16. --- dlls/version/info.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index ea66b8f6e2d..7e64382aed0 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -414,10 +414,7 @@ static DWORD VERSION_GetFileVersionInfo_16( LPCSTR filename, DWORD datasize, LPV offset, datasize, data ); if (len) { - if ( VersionInfoIs16( data ) ) - vffi = (VS_FIXEDFILEINFO *)VersionInfo16_Value( (VS_VERSION_INFO_STRUCT16 *)data ); - else - vffi = (VS_FIXEDFILEINFO *)VersionInfo32_Value( (VS_VERSION_INFO_STRUCT32 *)data ); + vffi = (VS_FIXEDFILEINFO *)VersionInfo16_Value( (VS_VERSION_INFO_STRUCT16 *)data ); if ( vffi->dwSignature == VS_FFI_SIGNATURE ) { @@ -427,14 +424,6 @@ static DWORD VERSION_GetFileVersionInfo_16( LPCSTR filename, DWORD datasize, LPV if ( TRACE_ON(ver) ) print_vffi_debug( vffi ); - 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 len; } } -- 2.11.4.GIT