mirror of
https://github.com/reactos/reactos.git
synced 2025-02-22 16:36:33 +00:00
- Fix warnings
svn path=/trunk/; revision=16787
This commit is contained in:
parent
d6e5f3f636
commit
3028ef48f1
3 changed files with 7 additions and 7 deletions
|
@ -2635,7 +2635,7 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package)
|
||||||
version = HeapAlloc(GetProcessHeap(),0,versize);
|
version = HeapAlloc(GetProcessHeap(),0,versize);
|
||||||
GetFileVersionInfoW(file->TargetPath, 0, versize, version);
|
GetFileVersionInfoW(file->TargetPath, 0, versize, version);
|
||||||
|
|
||||||
VerQueryValueW(version, name, (LPVOID*)&lpVer, &sz);
|
VerQueryValueW(version, (LPWSTR)name, (LPVOID*)&lpVer, &sz);
|
||||||
|
|
||||||
sprintfW(filever,name_fmt,
|
sprintfW(filever,name_fmt,
|
||||||
HIWORD(lpVer->dwFileVersionMS),
|
HIWORD(lpVer->dwFileVersionMS),
|
||||||
|
|
|
@ -538,7 +538,7 @@ static UINT ACTION_FileVersionMatches(MSISIGNATURE *sig, LPCWSTR filePath,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
DWORD zero, size = GetFileVersionInfoSizeW(filePath, &zero);
|
DWORD zero, size = GetFileVersionInfoSizeW((LPWSTR)filePath, &zero);
|
||||||
|
|
||||||
if (size)
|
if (size)
|
||||||
{
|
{
|
||||||
|
@ -550,8 +550,8 @@ static UINT ACTION_FileVersionMatches(MSISIGNATURE *sig, LPCWSTR filePath,
|
||||||
UINT versionLen;
|
UINT versionLen;
|
||||||
LPVOID subBlock = NULL;
|
LPVOID subBlock = NULL;
|
||||||
|
|
||||||
if (GetFileVersionInfoW(filePath, 0, size, buf))
|
if (GetFileVersionInfoW((LPWSTR)filePath, 0, size, buf))
|
||||||
VerQueryValueW(buf, rootW, &subBlock, &versionLen);
|
VerQueryValueW(buf, (LPWSTR)rootW, &subBlock, &versionLen);
|
||||||
if (subBlock)
|
if (subBlock)
|
||||||
{
|
{
|
||||||
VS_FIXEDFILEINFO *info =
|
VS_FIXEDFILEINFO *info =
|
||||||
|
|
|
@ -1195,7 +1195,7 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf,
|
||||||
lpVersionBuf, pcchVersionBuf?*pcchVersionBuf:0,
|
lpVersionBuf, pcchVersionBuf?*pcchVersionBuf:0,
|
||||||
lpLangBuf, pcchLangBuf?*pcchLangBuf:0);
|
lpLangBuf, pcchLangBuf?*pcchLangBuf:0);
|
||||||
|
|
||||||
dwVerLen = GetFileVersionInfoSizeW(szFilePath, NULL);
|
dwVerLen = GetFileVersionInfoSizeW((LPWSTR)szFilePath, NULL);
|
||||||
if( !dwVerLen )
|
if( !dwVerLen )
|
||||||
return GetLastError();
|
return GetLastError();
|
||||||
|
|
||||||
|
@ -1206,14 +1206,14 @@ UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf,
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !GetFileVersionInfoW(szFilePath, 0, dwVerLen, lpVer) )
|
if( !GetFileVersionInfoW((LPWSTR)szFilePath, 0, dwVerLen, lpVer) )
|
||||||
{
|
{
|
||||||
ret = GetLastError();
|
ret = GetLastError();
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
if( lpVersionBuf && pcchVersionBuf && *pcchVersionBuf )
|
if( lpVersionBuf && pcchVersionBuf && *pcchVersionBuf )
|
||||||
{
|
{
|
||||||
if( VerQueryValueW(lpVer, szVersionResource, (LPVOID*)&ffi, &puLen) &&
|
if( VerQueryValueW(lpVer, (LPWSTR)szVersionResource, (LPVOID*)&ffi, &puLen) &&
|
||||||
(puLen > 0) )
|
(puLen > 0) )
|
||||||
{
|
{
|
||||||
wsprintfW(tmp, szVersionFormat,
|
wsprintfW(tmp, szVersionFormat,
|
||||||
|
|
Loading…
Reference in a new issue