VerQueryValue returns BOOL not DWORD.
This commit is contained in:
parent
04b7382db9
commit
72fba73ada
|
@ -663,7 +663,7 @@ static VS_VERSION_INFO_STRUCT32 *VersionInfo32_FindChild( VS_VERSION_INFO_STRUCT
|
||||||
*
|
*
|
||||||
* Gets a value from a 16-bit NE resource
|
* Gets a value from a 16-bit NE resource
|
||||||
*/
|
*/
|
||||||
DWORD WINAPI VersionInfo16_QueryValue( VS_VERSION_INFO_STRUCT16 *info, LPCSTR lpSubBlock,
|
BOOL WINAPI VersionInfo16_QueryValue( VS_VERSION_INFO_STRUCT16 *info, LPCSTR lpSubBlock,
|
||||||
LPVOID *lplpBuffer, UINT *puLen )
|
LPVOID *lplpBuffer, UINT *puLen )
|
||||||
{
|
{
|
||||||
while ( *lpSubBlock )
|
while ( *lpSubBlock )
|
||||||
|
@ -700,7 +700,7 @@ DWORD WINAPI VersionInfo16_QueryValue( VS_VERSION_INFO_STRUCT16 *info, LPCSTR lp
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* VerQueryValueA [VERSION.@]
|
* VerQueryValueA [VERSION.@]
|
||||||
*/
|
*/
|
||||||
DWORD WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock,
|
BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock,
|
||||||
LPVOID *lplpBuffer, UINT *puLen )
|
LPVOID *lplpBuffer, UINT *puLen )
|
||||||
{
|
{
|
||||||
VS_VERSION_INFO_STRUCT16 *info = (VS_VERSION_INFO_STRUCT16 *)pBlock;
|
VS_VERSION_INFO_STRUCT16 *info = (VS_VERSION_INFO_STRUCT16 *)pBlock;
|
||||||
|
@ -722,7 +722,7 @@ DWORD WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock,
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* VerQueryValueW [VERSION.@]
|
* VerQueryValueW [VERSION.@]
|
||||||
*/
|
*/
|
||||||
DWORD WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock,
|
BOOL WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock,
|
||||||
LPVOID *lplpBuffer, UINT *puLen )
|
LPVOID *lplpBuffer, UINT *puLen )
|
||||||
{
|
{
|
||||||
VS_VERSION_INFO_STRUCT32 *info = (VS_VERSION_INFO_STRUCT32 *)pBlock;
|
VS_VERSION_INFO_STRUCT32 *info = (VS_VERSION_INFO_STRUCT32 *)pBlock;
|
||||||
|
@ -732,7 +732,7 @@ DWORD WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock,
|
||||||
|
|
||||||
if ( VersionInfoIs16( info ) )
|
if ( VersionInfoIs16( info ) )
|
||||||
{
|
{
|
||||||
DWORD ret;
|
BOOL ret;
|
||||||
int len = WideCharToMultiByte(CP_ACP, 0, lpSubBlock, -1, NULL, 0, NULL, NULL);
|
int len = WideCharToMultiByte(CP_ACP, 0, lpSubBlock, -1, NULL, 0, NULL, NULL);
|
||||||
LPSTR lpSubBlockA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char));
|
LPSTR lpSubBlockA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char));
|
||||||
if (!lpSubBlockA)
|
if (!lpSubBlockA)
|
||||||
|
|
|
@ -158,8 +158,8 @@ DWORD WINAPI VerInstallFileW(UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,
|
||||||
DWORD WINAPI VerLanguageNameA(UINT,LPSTR,UINT);
|
DWORD WINAPI VerLanguageNameA(UINT,LPSTR,UINT);
|
||||||
DWORD WINAPI VerLanguageNameW(UINT,LPWSTR,UINT);
|
DWORD WINAPI VerLanguageNameW(UINT,LPWSTR,UINT);
|
||||||
#define VerLanguageName WINELIB_NAME_AW(VerLanguageName)
|
#define VerLanguageName WINELIB_NAME_AW(VerLanguageName)
|
||||||
DWORD WINAPI VerQueryValueA(LPVOID,LPCSTR,LPVOID*,UINT*);
|
BOOL WINAPI VerQueryValueA(LPVOID,LPCSTR,LPVOID*,UINT*);
|
||||||
DWORD WINAPI VerQueryValueW(LPVOID,LPCWSTR,LPVOID*,UINT*);
|
BOOL WINAPI VerQueryValueW(LPVOID,LPCWSTR,LPVOID*,UINT*);
|
||||||
#define VerQueryValue WINELIB_NAME_AW(VerQueryValue)
|
#define VerQueryValue WINELIB_NAME_AW(VerQueryValue)
|
||||||
DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,LPDWORD);
|
DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,LPDWORD);
|
||||||
DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD);
|
DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD);
|
||||||
|
|
Loading…
Reference in New Issue