shlwapi: Convert wvnsprintfA/W to use an MS ABI vararg list for x86_64.
This commit is contained in:
parent
fb7acdcb28
commit
b9f0ee96fb
|
@ -284,7 +284,7 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg,
|
||||||
* Success: The number of characters written.
|
* Success: The number of characters written.
|
||||||
* Failure: -1.
|
* 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;
|
WPRINTF_FORMAT format;
|
||||||
LPSTR p = buffer;
|
LPSTR p = buffer;
|
||||||
|
@ -389,7 +389,7 @@ INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, va_list args )
|
||||||
*
|
*
|
||||||
* See wvnsprintfA.
|
* 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;
|
WPRINTF_FORMAT format;
|
||||||
LPWSTR p = buffer;
|
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, ...)
|
int WINAPIV wnsprintfA(LPSTR lpOut, int cchLimitIn, LPCSTR lpFmt, ...)
|
||||||
{
|
{
|
||||||
va_list valist;
|
__ms_va_list valist;
|
||||||
INT res;
|
INT res;
|
||||||
|
|
||||||
va_start( valist, lpFmt );
|
__ms_va_start( valist, lpFmt );
|
||||||
res = wvnsprintfA( lpOut, cchLimitIn, lpFmt, valist );
|
res = wvnsprintfA( lpOut, cchLimitIn, lpFmt, valist );
|
||||||
va_end( valist );
|
__ms_va_end( valist );
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -521,11 +521,11 @@ int WINAPIV wnsprintfA(LPSTR lpOut, int cchLimitIn, LPCSTR lpFmt, ...)
|
||||||
*/
|
*/
|
||||||
int WINAPIV wnsprintfW(LPWSTR lpOut, int cchLimitIn, LPCWSTR lpFmt, ...)
|
int WINAPIV wnsprintfW(LPWSTR lpOut, int cchLimitIn, LPCWSTR lpFmt, ...)
|
||||||
{
|
{
|
||||||
va_list valist;
|
__ms_va_list valist;
|
||||||
INT res;
|
INT res;
|
||||||
|
|
||||||
va_start( valist, lpFmt );
|
__ms_va_start( valist, lpFmt );
|
||||||
res = wvnsprintfW( lpOut, cchLimitIn, lpFmt, valist );
|
res = wvnsprintfW( lpOut, cchLimitIn, lpFmt, valist );
|
||||||
va_end( valist );
|
__ms_va_end( valist );
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
|
@ -859,8 +859,8 @@ BOOL WINAPI StrTrimA(LPSTR,LPCSTR);
|
||||||
BOOL WINAPI StrTrimW(LPWSTR,LPCWSTR);
|
BOOL WINAPI StrTrimW(LPWSTR,LPCWSTR);
|
||||||
#define StrTrim WINELIB_NAME_AW(StrTrim)
|
#define StrTrim WINELIB_NAME_AW(StrTrim)
|
||||||
|
|
||||||
INT WINAPI wvnsprintfA(LPSTR,INT,LPCSTR,va_list);
|
INT WINAPI wvnsprintfA(LPSTR,INT,LPCSTR,__ms_va_list);
|
||||||
INT WINAPI wvnsprintfW(LPWSTR,INT,LPCWSTR,va_list);
|
INT WINAPI wvnsprintfW(LPWSTR,INT,LPCWSTR,__ms_va_list);
|
||||||
#define wvnsprintf WINELIB_NAME_AW(wvnsprintf)
|
#define wvnsprintf WINELIB_NAME_AW(wvnsprintf)
|
||||||
|
|
||||||
INT WINAPIV wnsprintfA(LPSTR,INT,LPCSTR, ...);
|
INT WINAPIV wnsprintfA(LPSTR,INT,LPCSTR, ...);
|
||||||
|
|
Loading…
Reference in New Issue