Fix some wrong prototypes.

This commit is contained in:
Ivan Leo Puoti 2005-11-03 11:35:11 +00:00 committed by Alexandre Julliard
parent af983e4d86
commit 5b22e4d6ef
7 changed files with 25 additions and 27 deletions

View File

@ -1881,8 +1881,7 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package)
DWORD versize; DWORD versize;
UINT sz; UINT sz;
LPVOID version; LPVOID version;
static const WCHAR name[] = static WCHAR name[] = {'\\',0};
{'\\',0};
static const WCHAR name_fmt[] = static const WCHAR name_fmt[] =
{'%','u','.','%','u','.','%','u','.','%','u',0}; {'%','u','.','%','u','.','%','u','.','%','u',0};
WCHAR filever[0x100]; WCHAR filever[0x100];

View File

@ -549,7 +549,7 @@ static UINT ACTION_FileVersionMatches(MSISIGNATURE *sig, LPCWSTR filePath,
if (buf) if (buf)
{ {
static const WCHAR rootW[] = { '\\',0 }; static WCHAR rootW[] = { '\\',0 };
UINT versionLen; UINT versionLen;
LPVOID subBlock = NULL; LPVOID subBlock = NULL;

View File

@ -1185,7 +1185,7 @@ end:
UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf,
DWORD* pcchVersionBuf, LPWSTR lpLangBuf, DWORD* pcchLangBuf) DWORD* pcchVersionBuf, LPWSTR lpLangBuf, DWORD* pcchLangBuf)
{ {
static const WCHAR szVersionResource[] = {'\\',0}; static WCHAR szVersionResource[] = {'\\',0};
static const WCHAR szVersionFormat[] = { static const WCHAR szVersionFormat[] = {
'%','d','.','%','d','.','%','d','.','%','d',0}; '%','d','.','%','d','.','%','d','.','%','d',0};
static const WCHAR szLangFormat[] = {'%','d',0}; static const WCHAR szLangFormat[] = {'%','d',0};

View File

@ -752,7 +752,7 @@ static BOOL WINAPI VersionInfo32_QueryValue( VS_VERSION_INFO_STRUCT32 *info, LPC
/*********************************************************************** /***********************************************************************
* VerQueryValueA [VERSION.@] * VerQueryValueA [VERSION.@]
*/ */
BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock, BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPSTR lpSubBlock,
LPVOID *lplpBuffer, UINT *puLen ) LPVOID *lplpBuffer, UINT *puLen )
{ {
static const char rootA[] = "\\"; static const char rootA[] = "\\";
@ -799,7 +799,7 @@ BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock,
/*********************************************************************** /***********************************************************************
* VerQueryValueW [VERSION.@] * VerQueryValueW [VERSION.@]
*/ */
BOOL WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock, BOOL WINAPI VerQueryValueW( LPVOID pBlock, LPWSTR lpSubBlock,
LPVOID *lplpBuffer, UINT *puLen ) LPVOID *lplpBuffer, UINT *puLen )
{ {
static const WCHAR rootW[] = { '\\', 0 }; static const WCHAR rootW[] = { '\\', 0 };

View File

@ -123,9 +123,9 @@ static int testFileExistenceW( const WCHAR *path, const WCHAR *file, BOOL excl )
*/ */
DWORD WINAPI VerFindFileA( DWORD WINAPI VerFindFileA(
UINT flags, UINT flags,
LPCSTR lpszFilename, LPSTR lpszFilename,
LPCSTR lpszWinDir, LPSTR lpszWinDir,
LPCSTR lpszAppDir, LPSTR lpszAppDir,
LPSTR lpszCurDir, LPSTR lpszCurDir,
UINT *lpuCurDirLen, UINT *lpuCurDirLen,
LPSTR lpszDestDir, LPSTR lpszDestDir,
@ -220,8 +220,8 @@ DWORD WINAPI VerFindFileA(
/***************************************************************************** /*****************************************************************************
* VerFindFileW [VERSION.@] * VerFindFileW [VERSION.@]
*/ */
DWORD WINAPI VerFindFileW( UINT flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir, DWORD WINAPI VerFindFileW( UINT flags,LPWSTR lpszFilename,LPWSTR lpszWinDir,
LPCWSTR lpszAppDir, LPWSTR lpszCurDir,UINT *lpuCurDirLen, LPWSTR lpszAppDir, LPWSTR lpszCurDir,UINT *lpuCurDirLen,
LPWSTR lpszDestDir,UINT *lpuDestDirLen ) LPWSTR lpszDestDir,UINT *lpuDestDirLen )
{ {
static const WCHAR emptyW; static const WCHAR emptyW;
@ -361,8 +361,8 @@ _error2vif(DWORD error) {
* VerInstallFileA [VERSION.@] * VerInstallFileA [VERSION.@]
*/ */
DWORD WINAPI VerInstallFileA( DWORD WINAPI VerInstallFileA(
UINT flags,LPCSTR srcfilename,LPCSTR destfilename,LPCSTR srcdir, UINT flags,LPSTR srcfilename,LPSTR destfilename,LPSTR srcdir,
LPCSTR destdir,LPCSTR curdir,LPSTR tmpfile,UINT *tmpfilelen ) LPSTR destdir,LPSTR curdir,LPSTR tmpfile,UINT *tmpfilelen )
{ {
LPCSTR pdest; LPCSTR pdest;
char destfn[260],tmpfn[260],srcfn[260]; char destfn[260],tmpfn[260],srcfn[260];
@ -528,8 +528,8 @@ DWORD WINAPI VerInstallFileA(
* VerInstallFileW [VERSION.@] * VerInstallFileW [VERSION.@]
*/ */
DWORD WINAPI VerInstallFileW( DWORD WINAPI VerInstallFileW(
UINT flags,LPCWSTR srcfilename,LPCWSTR destfilename,LPCWSTR srcdir, UINT flags,LPWSTR srcfilename,LPWSTR destfilename,LPWSTR srcdir,
LPCWSTR destdir,LPCWSTR curdir,LPWSTR tmpfile,UINT *tmpfilelen ) LPWSTR destdir,LPWSTR curdir,LPWSTR tmpfile,UINT *tmpfilelen )
{ {
LPSTR wsrcf = NULL, wsrcd = NULL, wdestf = NULL, wdestd = NULL, wtmpf = NULL, wcurd = NULL; LPSTR wsrcf = NULL, wsrcd = NULL, wdestf = NULL, wdestd = NULL, wtmpf = NULL, wcurd = NULL;
DWORD ret; DWORD ret;

View File

@ -53,8 +53,8 @@ DWORD WINAPI GetFileVersionInfo16( LPCSTR lpszFileName, DWORD handle,
/************************************************************************* /*************************************************************************
* VerFindFile [VER.8] * VerFindFile [VER.8]
*/ */
DWORD WINAPI VerFindFile16( UINT16 flags, LPCSTR lpszFilename, DWORD WINAPI VerFindFile16( UINT16 flags, LPSTR lpszFilename,
LPCSTR lpszWinDir, LPCSTR lpszAppDir, LPSTR lpszWinDir, LPSTR lpszAppDir,
LPSTR lpszCurDir, UINT16 *lpuCurDirLen, LPSTR lpszCurDir, UINT16 *lpuCurDirLen,
LPSTR lpszDestDir, UINT16 *lpuDestDirLen ) LPSTR lpszDestDir, UINT16 *lpuDestDirLen )
{ {
@ -71,8 +71,8 @@ DWORD WINAPI VerFindFile16( UINT16 flags, LPCSTR lpszFilename,
* VerInstallFile [VER.9] * VerInstallFile [VER.9]
*/ */
DWORD WINAPI VerInstallFile16( UINT16 flags, DWORD WINAPI VerInstallFile16( UINT16 flags,
LPCSTR lpszSrcFilename, LPCSTR lpszDestFilename, LPSTR lpszSrcFilename, LPSTR lpszDestFilename,
LPCSTR lpszSrcDir, LPCSTR lpszDestDir, LPCSTR lpszCurDir, LPSTR lpszSrcDir, LPSTR lpszDestDir, LPSTR lpszCurDir,
LPSTR lpszTmpFile, UINT16 *lpwTmpFileLen ) LPSTR lpszTmpFile, UINT16 *lpwTmpFileLen )
{ {
UINT filelen; UINT filelen;
@ -95,7 +95,7 @@ DWORD WINAPI VerLanguageName16( UINT16 uLang, LPSTR lpszLang, UINT16 cbLang )
/************************************************************************* /*************************************************************************
* VerQueryValue [VER.11] * VerQueryValue [VER.11]
*/ */
DWORD WINAPI VerQueryValue16( SEGPTR spvBlock, LPCSTR lpszSubBlock, DWORD WINAPI VerQueryValue16( SEGPTR spvBlock, LPSTR lpszSubBlock,
SEGPTR *lpspBuffer, UINT16 *lpcb ) SEGPTR *lpspBuffer, UINT16 *lpcb )
{ {
LPVOID lpvBlock = MapSL( spvBlock ); LPVOID lpvBlock = MapSL( spvBlock );
@ -121,4 +121,3 @@ DWORD WINAPI VerQueryValue16( SEGPTR spvBlock, LPCSTR lpszSubBlock,
return retv; return retv;
} }

View File

@ -150,17 +150,17 @@ typedef struct tagVS_FIXEDFILEINFO {
/* function prototypes */ /* function prototypes */
DWORD WINAPI VerFindFileA(UINT,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT*,LPSTR,UINT*); DWORD WINAPI VerFindFileA(UINT,LPSTR,LPSTR,LPSTR,LPSTR,UINT*,LPSTR,UINT*);
DWORD WINAPI VerFindFileW(UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT*,LPWSTR,UINT*); DWORD WINAPI VerFindFileW(UINT,LPWSTR,LPWSTR,LPWSTR,LPWSTR,UINT*,LPWSTR,UINT*);
#define VerFindFile WINELIB_NAME_AW(VerFindFile) #define VerFindFile WINELIB_NAME_AW(VerFindFile)
DWORD WINAPI VerInstallFileA(UINT,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT*); DWORD WINAPI VerInstallFileA(UINT,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,UINT*);
DWORD WINAPI VerInstallFileW(UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT*); DWORD WINAPI VerInstallFileW(UINT,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,UINT*);
#define VerInstallFile WINELIB_NAME_AW(VerInstallFile) #define VerInstallFile WINELIB_NAME_AW(VerInstallFile)
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)
BOOL WINAPI VerQueryValueA(LPVOID,LPCSTR,LPVOID*,UINT*); BOOL WINAPI VerQueryValueA(LPVOID,LPSTR,LPVOID*,UINT*);
BOOL WINAPI VerQueryValueW(LPVOID,LPCWSTR,LPVOID*,UINT*); BOOL WINAPI VerQueryValueW(LPVOID,LPWSTR,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);