ChangeSet ID: 21083 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard@winehq.org 2005/11/03 05:35:11
Modified files: include : winver.h dlls/version : ver16.c install.c info.c dlls/msi : msi.c appsearch.c action.c
Log message: Ivan Leo Puoti ivanleo@gmail.com Fix some wrong prototypes.
Patch: http://cvs.winehq.org/patch.py?id=21083
Old revision New revision Changes Path 1.18 1.19 +6 -6 wine/include/winver.h 1.9 1.10 +5 -6 wine/dlls/version/ver16.c 1.26 1.27 +9 -9 wine/dlls/version/install.c 1.63 1.64 +2 -2 wine/dlls/version/info.c 1.113 1.114 +1 -1 wine/dlls/msi/msi.c 1.11 1.12 +1 -1 wine/dlls/msi/appsearch.c 1.229 1.230 +1 -2 wine/dlls/msi/action.c
Index: wine/include/winver.h diff -u -p wine/include/winver.h:1.18 wine/include/winver.h:1.19 --- wine/include/winver.h:1.18 3 Nov 2005 11:35:11 -0000 +++ wine/include/winver.h 3 Nov 2005 11:35:11 -0000 @@ -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); Index: wine/dlls/version/ver16.c diff -u -p wine/dlls/version/ver16.c:1.9 wine/dlls/version/ver16.c:1.10 --- wine/dlls/version/ver16.c:1.9 3 Nov 2005 11:35:11 -0000 +++ wine/dlls/version/ver16.c 3 Nov 2005 11:35:11 -0000 @@ -53,8 +53,8 @@ DWORD WINAPI GetFileVersionInfo16( LPCST /************************************************************************* * 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 * 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 u /************************************************************************* * 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 spv
return retv; } - Index: wine/dlls/version/install.c diff -u -p wine/dlls/version/install.c:1.26 wine/dlls/version/install.c:1.27 --- wine/dlls/version/install.c:1.26 3 Nov 2005 11:35:11 -0000 +++ wine/dlls/version/install.c 3 Nov 2005 11:35:11 -0000 @@ -123,9 +123,9 @@ static int testFileExistenceW( const WCH */ 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; Index: wine/dlls/version/info.c diff -u -p wine/dlls/version/info.c:1.63 wine/dlls/version/info.c:1.64 --- wine/dlls/version/info.c:1.63 3 Nov 2005 11:35:11 -0000 +++ wine/dlls/version/info.c 3 Nov 2005 11:35:11 -0000 @@ -752,7 +752,7 @@ static BOOL WINAPI VersionInfo32_QueryVa /*********************************************************************** * 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 pBloc /*********************************************************************** * 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 }; Index: wine/dlls/msi/msi.c diff -u -p wine/dlls/msi/msi.c:1.113 wine/dlls/msi/msi.c:1.114 --- wine/dlls/msi/msi.c:1.113 3 Nov 2005 11:35:11 -0000 +++ wine/dlls/msi/msi.c 3 Nov 2005 11:35:11 -0000 @@ -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}; Index: wine/dlls/msi/appsearch.c diff -u -p wine/dlls/msi/appsearch.c:1.11 wine/dlls/msi/appsearch.c:1.12 --- wine/dlls/msi/appsearch.c:1.11 3 Nov 2005 11:35:11 -0000 +++ wine/dlls/msi/appsearch.c 3 Nov 2005 11:35:11 -0000 @@ -549,7 +549,7 @@ static UINT ACTION_FileVersionMatches(MS
if (buf) { - static const WCHAR rootW[] = { '\',0 }; + static WCHAR rootW[] = { '\',0 }; UINT versionLen; LPVOID subBlock = NULL;
Index: wine/dlls/msi/action.c diff -u -p wine/dlls/msi/action.c:1.229 wine/dlls/msi/action.c:1.230 --- wine/dlls/msi/action.c:1.229 3 Nov 2005 11:35:11 -0000 +++ wine/dlls/msi/action.c 3 Nov 2005 11:35:11 -0000 @@ -1881,8 +1881,7 @@ static UINT ACTION_CostFinalize(MSIPACKA 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];
-
Alexandre Julliard