From 5b22e4d6ef6dec219653cf21b0c1a98e2f03f304 Mon Sep 17 00:00:00 2001 From: Ivan Leo Puoti Date: Thu, 3 Nov 2005 11:35:11 +0000 Subject: [PATCH] Fix some wrong prototypes. --- dlls/msi/action.c | 3 +-- dlls/msi/appsearch.c | 2 +- dlls/msi/msi.c | 2 +- dlls/version/info.c | 4 ++-- dlls/version/install.c | 18 +++++++++--------- dlls/version/ver16.c | 11 +++++------ include/winver.h | 12 ++++++------ 7 files changed, 25 insertions(+), 27 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9a6d5d8dfb9..c90801618fe 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1881,8 +1881,7 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) DWORD versize; UINT sz; LPVOID version; - static const WCHAR name[] = - {'\\',0}; + static WCHAR name[] = {'\\',0}; static const WCHAR name_fmt[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; WCHAR filever[0x100]; diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 1da8bfeb706..d4de09f1427 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -549,7 +549,7 @@ static UINT ACTION_FileVersionMatches(MSISIGNATURE *sig, LPCWSTR filePath, if (buf) { - static const WCHAR rootW[] = { '\\',0 }; + static WCHAR rootW[] = { '\\',0 }; UINT versionLen; LPVOID subBlock = NULL; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 820f4c365cf..550cc02f0eb 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1185,7 +1185,7 @@ end: UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf, DWORD* pcchVersionBuf, LPWSTR lpLangBuf, DWORD* pcchLangBuf) { - static const WCHAR szVersionResource[] = {'\\',0}; + static WCHAR szVersionResource[] = {'\\',0}; static const WCHAR szVersionFormat[] = { '%','d','.','%','d','.','%','d','.','%','d',0}; static const WCHAR szLangFormat[] = {'%','d',0}; diff --git a/dlls/version/info.c b/dlls/version/info.c index 81c5a4a9f75..c0306e21e66 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -752,7 +752,7 @@ static BOOL WINAPI VersionInfo32_QueryValue( VS_VERSION_INFO_STRUCT32 *info, LPC /*********************************************************************** * VerQueryValueA [VERSION.@] */ -BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock, +BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) { static const char rootA[] = "\\"; @@ -799,7 +799,7 @@ BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock, /*********************************************************************** * VerQueryValueW [VERSION.@] */ -BOOL WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock, +BOOL WINAPI VerQueryValueW( LPVOID pBlock, LPWSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) { static const WCHAR rootW[] = { '\\', 0 }; diff --git a/dlls/version/install.c b/dlls/version/install.c index fb1fe3049b5..60b03159a91 100644 --- a/dlls/version/install.c +++ b/dlls/version/install.c @@ -123,9 +123,9 @@ static int testFileExistenceW( const WCHAR *path, const WCHAR *file, BOOL excl ) */ DWORD WINAPI VerFindFileA( UINT flags, - LPCSTR lpszFilename, - LPCSTR lpszWinDir, - LPCSTR lpszAppDir, + LPSTR lpszFilename, + LPSTR lpszWinDir, + LPSTR lpszAppDir, LPSTR lpszCurDir, UINT *lpuCurDirLen, LPSTR lpszDestDir, @@ -220,8 +220,8 @@ DWORD WINAPI VerFindFileA( /***************************************************************************** * VerFindFileW [VERSION.@] */ -DWORD WINAPI VerFindFileW( UINT flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir, - LPCWSTR lpszAppDir, LPWSTR lpszCurDir,UINT *lpuCurDirLen, +DWORD WINAPI VerFindFileW( UINT flags,LPWSTR lpszFilename,LPWSTR lpszWinDir, + LPWSTR lpszAppDir, LPWSTR lpszCurDir,UINT *lpuCurDirLen, LPWSTR lpszDestDir,UINT *lpuDestDirLen ) { static const WCHAR emptyW; @@ -361,8 +361,8 @@ _error2vif(DWORD error) { * VerInstallFileA [VERSION.@] */ DWORD WINAPI VerInstallFileA( - UINT flags,LPCSTR srcfilename,LPCSTR destfilename,LPCSTR srcdir, - LPCSTR destdir,LPCSTR curdir,LPSTR tmpfile,UINT *tmpfilelen ) + UINT flags,LPSTR srcfilename,LPSTR destfilename,LPSTR srcdir, + LPSTR destdir,LPSTR curdir,LPSTR tmpfile,UINT *tmpfilelen ) { LPCSTR pdest; char destfn[260],tmpfn[260],srcfn[260]; @@ -528,8 +528,8 @@ DWORD WINAPI VerInstallFileA( * VerInstallFileW [VERSION.@] */ DWORD WINAPI VerInstallFileW( - UINT flags,LPCWSTR srcfilename,LPCWSTR destfilename,LPCWSTR srcdir, - LPCWSTR destdir,LPCWSTR curdir,LPWSTR tmpfile,UINT *tmpfilelen ) + UINT flags,LPWSTR srcfilename,LPWSTR destfilename,LPWSTR srcdir, + LPWSTR destdir,LPWSTR curdir,LPWSTR tmpfile,UINT *tmpfilelen ) { LPSTR wsrcf = NULL, wsrcd = NULL, wdestf = NULL, wdestd = NULL, wtmpf = NULL, wcurd = NULL; DWORD ret; diff --git a/dlls/version/ver16.c b/dlls/version/ver16.c index ab9ff3deb12..3b0ca423b3d 100644 --- a/dlls/version/ver16.c +++ b/dlls/version/ver16.c @@ -53,8 +53,8 @@ DWORD WINAPI GetFileVersionInfo16( LPCSTR lpszFileName, DWORD handle, /************************************************************************* * VerFindFile [VER.8] */ -DWORD WINAPI VerFindFile16( UINT16 flags, LPCSTR lpszFilename, - LPCSTR lpszWinDir, LPCSTR lpszAppDir, +DWORD WINAPI VerFindFile16( UINT16 flags, LPSTR lpszFilename, + LPSTR lpszWinDir, LPSTR lpszAppDir, LPSTR lpszCurDir, UINT16 *lpuCurDirLen, LPSTR lpszDestDir, UINT16 *lpuDestDirLen ) { @@ -71,8 +71,8 @@ DWORD WINAPI VerFindFile16( UINT16 flags, LPCSTR lpszFilename, * VerInstallFile [VER.9] */ DWORD WINAPI VerInstallFile16( UINT16 flags, - LPCSTR lpszSrcFilename, LPCSTR lpszDestFilename, - LPCSTR lpszSrcDir, LPCSTR lpszDestDir, LPCSTR lpszCurDir, + LPSTR lpszSrcFilename, LPSTR lpszDestFilename, + LPSTR lpszSrcDir, LPSTR lpszDestDir, LPSTR lpszCurDir, LPSTR lpszTmpFile, UINT16 *lpwTmpFileLen ) { UINT filelen; @@ -95,7 +95,7 @@ DWORD WINAPI VerLanguageName16( UINT16 uLang, LPSTR lpszLang, UINT16 cbLang ) /************************************************************************* * VerQueryValue [VER.11] */ -DWORD WINAPI VerQueryValue16( SEGPTR spvBlock, LPCSTR lpszSubBlock, +DWORD WINAPI VerQueryValue16( SEGPTR spvBlock, LPSTR lpszSubBlock, SEGPTR *lpspBuffer, UINT16 *lpcb ) { LPVOID lpvBlock = MapSL( spvBlock ); @@ -121,4 +121,3 @@ DWORD WINAPI VerQueryValue16( SEGPTR spvBlock, LPCSTR lpszSubBlock, return retv; } - diff --git a/include/winver.h b/include/winver.h index fd9c45647a6..25d2d1eb426 100644 --- a/include/winver.h +++ b/include/winver.h @@ -150,17 +150,17 @@ typedef struct tagVS_FIXEDFILEINFO { /* function prototypes */ -DWORD WINAPI VerFindFileA(UINT,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT*,LPSTR,UINT*); -DWORD WINAPI VerFindFileW(UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT*,LPWSTR,UINT*); +DWORD WINAPI VerFindFileA(UINT,LPSTR,LPSTR,LPSTR,LPSTR,UINT*,LPSTR,UINT*); +DWORD WINAPI VerFindFileW(UINT,LPWSTR,LPWSTR,LPWSTR,LPWSTR,UINT*,LPWSTR,UINT*); #define VerFindFile WINELIB_NAME_AW(VerFindFile) -DWORD WINAPI VerInstallFileA(UINT,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT*); -DWORD WINAPI VerInstallFileW(UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT*); +DWORD WINAPI VerInstallFileA(UINT,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,UINT*); +DWORD WINAPI VerInstallFileW(UINT,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,UINT*); #define VerInstallFile WINELIB_NAME_AW(VerInstallFile) DWORD WINAPI VerLanguageNameA(UINT,LPSTR,UINT); DWORD WINAPI VerLanguageNameW(UINT,LPWSTR,UINT); #define VerLanguageName WINELIB_NAME_AW(VerLanguageName) -BOOL WINAPI VerQueryValueA(LPVOID,LPCSTR,LPVOID*,UINT*); -BOOL WINAPI VerQueryValueW(LPVOID,LPCWSTR,LPVOID*,UINT*); +BOOL WINAPI VerQueryValueA(LPVOID,LPSTR,LPVOID*,UINT*); +BOOL WINAPI VerQueryValueW(LPVOID,LPWSTR,LPVOID*,UINT*); #define VerQueryValue WINELIB_NAME_AW(VerQueryValue) DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,LPDWORD); DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD); -- 2.11.4.GIT