Module: wine Branch: master Commit: 5f36d0239f494af0cb3a219aebde6803f66c534b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f36d0239f494af0cb3a219aeb...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Dec 31 20:52:42 2008 +0100
kernel32: Convert FormatMessageA/W to use an MS ABI vararg list for x86_64.
---
dlls/kernel32/format_msg.c | 4 ++-- dlls/ntdll/resource.c | 2 +- dlls/shell32/shellord.c | 12 ++++++------ dlls/shell32/shlfileop.c | 2 +- dlls/shlwapi/ordinal.c | 6 +++--- include/winbase.h | 4 ++-- include/winternl.h | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 0920d66..41a2317 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -135,7 +135,7 @@ DWORD WINAPI FormatMessageA( DWORD dwLanguageId, LPSTR lpBuffer, DWORD nSize, - va_list* _args ) + __ms_va_list* _args ) { LPDWORD args=(LPDWORD)_args; DWORD ret = 0; @@ -356,7 +356,7 @@ DWORD WINAPI FormatMessageW( DWORD dwLanguageId, LPWSTR lpBuffer, DWORD nSize, - va_list* _args ) + __ms_va_list* _args ) { LPDWORD args=(LPDWORD)_args; #if defined(__i386__) || defined(__sparc__) diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 4a8b260..5f3e845 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -438,7 +438,7 @@ NTSTATUS WINAPI RtlFindMessage( HMODULE hmod, ULONG type, ULONG lang, */ NTSTATUS WINAPI RtlFormatMessage( LPWSTR Message, UCHAR MaxWidth, BOOLEAN IgnoreInserts, BOOLEAN Ansi, - BOOLEAN ArgumentIsArray, va_list * Arguments, + BOOLEAN ArgumentIsArray, __ms_va_list * Arguments, LPWSTR Buffer, ULONG BufferSize ) { FIXME("(%s, %u, %s, %s, %s, %p, %p, %d)\n", debugstr_w(Message), diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index a945569..7893445 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -356,10 +356,10 @@ int WINAPIV ShellMessageBoxW( WCHAR szText[100],szTitle[100]; LPCWSTR pszText = szText, pszTitle = szTitle; LPWSTR pszTemp; - va_list args; + __ms_va_list args; int ret;
- va_start(args, uType); + __ms_va_start(args, uType); /* wvsprintfA(buf,fmt, args); */
TRACE("(%p,%p,%p,%p,%08x)\n", @@ -378,7 +378,7 @@ int WINAPIV ShellMessageBoxW( FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, pszText, 0, 0, (LPWSTR)&pszTemp, 0, &args);
- va_end(args); + __ms_va_end(args);
ret = MessageBoxW(hWnd,pszTemp,pszTitle,uType); LocalFree((HLOCAL)pszTemp); @@ -414,10 +414,10 @@ int WINAPIV ShellMessageBoxA( char szText[100],szTitle[100]; LPCSTR pszText = szText, pszTitle = szTitle; LPSTR pszTemp; - va_list args; + __ms_va_list args; int ret;
- va_start(args, uType); + __ms_va_start(args, uType); /* wvsprintfA(buf,fmt, args); */
TRACE("(%p,%p,%p,%p,%08x)\n", @@ -436,7 +436,7 @@ int WINAPIV ShellMessageBoxA( FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, pszText, 0, 0, (LPSTR)&pszTemp, 0, &args);
- va_end(args); + __ms_va_end(args);
ret = MessageBoxA(hWnd,pszTemp,pszTitle,uType); LocalFree((HLOCAL)pszTemp); diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 9176420..ec7ba54 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -291,7 +291,7 @@ static BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir, FI
args[0] = (DWORD_PTR)szDir; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)args); + szText, 0, 0, szBuffer, sizeof(szBuffer), (__ms_va_list*)args); hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id));
ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems); diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 5da2879..932f54f 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4309,10 +4309,10 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, WCHAR szText[100], szTitle[100]; LPCWSTR pszText = szText, pszTitle = szTitle; LPWSTR pszTemp; - va_list args; + __ms_va_list args; int ret;
- va_start(args, uType); + __ms_va_start(args, uType);
TRACE("(%p,%p,%p,%p,%08x)\n", hInstance, hWnd, lpText, lpCaption, uType);
@@ -4329,7 +4329,7 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, pszText, 0, 0, (LPWSTR)&pszTemp, 0, &args);
- va_end(args); + __ms_va_end(args);
ret = MessageBoxW(hWnd, pszTemp, pszTitle, uType); LocalFree(pszTemp); diff --git a/include/winbase.h b/include/winbase.h index f7bb9bf..d3b392c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1533,8 +1533,8 @@ WINBASEAPI BOOL WINAPI FlsSetValue(DWORD,PVOID); WINBASEAPI BOOL WINAPI FlushFileBuffers(HANDLE); WINBASEAPI BOOL WINAPI FlushInstructionCache(HANDLE,LPCVOID,SIZE_T); WINBASEAPI BOOL WINAPI FlushViewOfFile(LPCVOID,SIZE_T); -WINBASEAPI DWORD WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,DWORD,va_list*); -WINBASEAPI DWORD WINAPI FormatMessageW(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,DWORD,va_list*); +WINBASEAPI DWORD WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,DWORD,__ms_va_list*); +WINBASEAPI DWORD WINAPI FormatMessageW(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,DWORD,__ms_va_list*); #define FormatMessage WINELIB_NAME_AW(FormatMessage) WINBASEAPI BOOL WINAPI FreeEnvironmentStringsA(LPSTR); WINBASEAPI BOOL WINAPI FreeEnvironmentStringsW(LPWSTR); diff --git a/include/winternl.h b/include/winternl.h index ed93bbf..4704e1c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2331,7 +2331,7 @@ NTSYSAPI ULONG WINAPI RtlFindSetBitsAndClear(PRTL_BITMAP,ULONG,ULONG); NTSYSAPI ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlFirstFreeAce(PACL,PACE_HEADER *); NTSYSAPI NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(PUNICODE_STRING); -NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPWSTR,UCHAR,BOOLEAN,BOOLEAN,BOOLEAN,va_list *,LPWSTR,ULONG); +NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPWSTR,UCHAR,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG); NTSYSAPI void WINAPI RtlFreeAnsiString(PANSI_STRING); NTSYSAPI BOOLEAN WINAPI RtlFreeHandle(RTL_HANDLE_TABLE *,RTL_HANDLE *); NTSYSAPI BOOLEAN WINAPI RtlFreeHeap(HANDLE,ULONG,PVOID);