Alexandre Julliard : shlwapi: Convert wvnsprintfA/ W to use an MS ABI vararg list for x86_64.
Alexandre Julliard
julliard at winehq.org
Fri Jan 2 08:25:31 CST 2009
Module: wine
Branch: master
Commit: b9f0ee96fb67cfc6ce889dc78e9b5909ce234b1a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f0ee96fb67cfc6ce889dc78e9b5909ce234b1a
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Dec 31 20:46:44 2008 +0100
shlwapi: Convert wvnsprintfA/W to use an MS ABI vararg list for x86_64.
---
dlls/shlwapi/wsprintf.c | 16 ++++++++--------
include/shlwapi.h | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c
index d10881f..26bca5d 100644
--- a/dlls/shlwapi/wsprintf.c
+++ b/dlls/shlwapi/wsprintf.c
@@ -284,7 +284,7 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg,
* Success: The number of characters written.
* Failure: -1.
*/
-INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, va_list args )
+INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, __ms_va_list args )
{
WPRINTF_FORMAT format;
LPSTR p = buffer;
@@ -389,7 +389,7 @@ INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, va_list args )
*
* See wvnsprintfA.
*/
-INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, va_list args )
+INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list args )
{
WPRINTF_FORMAT format;
LPWSTR p = buffer;
@@ -504,12 +504,12 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, va_list args )
*/
int WINAPIV wnsprintfA(LPSTR lpOut, int cchLimitIn, LPCSTR lpFmt, ...)
{
- va_list valist;
+ __ms_va_list valist;
INT res;
- va_start( valist, lpFmt );
+ __ms_va_start( valist, lpFmt );
res = wvnsprintfA( lpOut, cchLimitIn, lpFmt, valist );
- va_end( valist );
+ __ms_va_end( valist );
return res;
}
@@ -521,11 +521,11 @@ int WINAPIV wnsprintfA(LPSTR lpOut, int cchLimitIn, LPCSTR lpFmt, ...)
*/
int WINAPIV wnsprintfW(LPWSTR lpOut, int cchLimitIn, LPCWSTR lpFmt, ...)
{
- va_list valist;
+ __ms_va_list valist;
INT res;
- va_start( valist, lpFmt );
+ __ms_va_start( valist, lpFmt );
res = wvnsprintfW( lpOut, cchLimitIn, lpFmt, valist );
- va_end( valist );
+ __ms_va_end( valist );
return res;
}
diff --git a/include/shlwapi.h b/include/shlwapi.h
index b723e54..eb36345 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -859,8 +859,8 @@ BOOL WINAPI StrTrimA(LPSTR,LPCSTR);
BOOL WINAPI StrTrimW(LPWSTR,LPCWSTR);
#define StrTrim WINELIB_NAME_AW(StrTrim)
-INT WINAPI wvnsprintfA(LPSTR,INT,LPCSTR,va_list);
-INT WINAPI wvnsprintfW(LPWSTR,INT,LPCWSTR,va_list);
+INT WINAPI wvnsprintfA(LPSTR,INT,LPCSTR,__ms_va_list);
+INT WINAPI wvnsprintfW(LPWSTR,INT,LPCWSTR,__ms_va_list);
#define wvnsprintf WINELIB_NAME_AW(wvnsprintf)
INT WINAPIV wnsprintfA(LPSTR,INT,LPCSTR, ...);
More information about the wine-cvs
mailing list