reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 20:59:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

version: Use the find_resource function instead of the 16-bit entry points to load 16-bit resources.

Browse Source
This commit is contained in:
Alexandre Julliard 2009-10-01 13:54:58 +02:00
parent e04b9984b6
commit e84c42d92a
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/version/info.c
View File

@ -30,6 +30,7 @@
#include "winbase.h"
#include "winver.h"
#include "winternl.h"
#include "lzexpand.h"
#include "wine/winuser16.h"
#include "wine/unicode.h"
#include "winerror.h"
@ -37,6 +38,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(ver);
extern DWORD find_resource( HFILE lzfd, LPCSTR type, LPCSTR id, DWORD *reslen, DWORD *offset );
/******************************************************************************
*
* This function will print via standard TRACE, debug info regarding
@ -344,23 +347,30 @@ static DWORD VERSION_GetFileVersionInfo_16( LPCSTR filename, DWORD datasize, LPV
}
/* first try without loading a 16-bit module */
if (is_builtin)
len = 0;
else
len = GetFileResourceSize16( filename,
MAKEINTRESOURCEA(VS_FILE_INFO),
MAKEINTRESOURCEA(VS_VERSION_INFO),
&offset );
if (len)
len = 0;
if (!is_builtin)
{
if (!data) return len;
OFSTRUCT ofs;
HFILE lzfd = LZOpenFileA( (LPSTR)filename, &ofs, OF_READ );
if (lzfd >= 0)
{
if (find_resource( lzfd, MAKEINTRESOURCEA(VS_FILE_INFO), MAKEINTRESOURCEA(VS_VERSION_INFO),
&len, &offset ))
{
if (data)
{
LZSeek( lzfd, offset, 0 /* SEEK_SET */ );
len = LZRead( lzfd, data, min( len, datasize ) );
}
}
LZClose( lzfd );
}
len = GetFileResource16( filename,
MAKEINTRESOURCEA(VS_FILE_INFO),
MAKEINTRESOURCEA(VS_VERSION_INFO),
offset, datasize, data );
if (len)
{
if (!data) return len;
vffi = (VS_FIXEDFILEINFO *)VersionInfo16_Value( (VS_VERSION_INFO_STRUCT16 *)data );
if ( vffi->dwSignature == VS_FFI_SIGNATURE )