ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Use the standard va_list instead of __ms_va_list. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-10-22 11:12:47 +02:00
parent 348336b8cd
commit bc909b1bd5
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/shell32/shellord.c
View File

@ -422,10 +422,10 @@ int WINAPIV ShellMessageBoxW(
WCHAR szText[100],szTitle[100];
LPCWSTR pszText = szText, pszTitle = szTitle;
LPWSTR pszTemp;
__ms_va_list args;
va_list args;
int ret;
__ms_va_start(args, uType);
va_start(args, uType);
/* wvsprintfA(buf,fmt, args); */
TRACE("(%p,%p,%p,%p,%08x)\n",
@ -444,7 +444,7 @@ int WINAPIV ShellMessageBoxW(
FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING,
pszText, 0, 0, (LPWSTR)&pszTemp, 0, &args);
__ms_va_end(args);
va_end(args);
ret = MessageBoxW(hWnd,pszTemp,pszTitle,uType);
LocalFree(pszTemp);
@ -480,10 +480,10 @@ int WINAPIV ShellMessageBoxA(
char szText[100],szTitle[100];
LPCSTR pszText = szText, pszTitle = szTitle;
LPSTR pszTemp;
__ms_va_list args;
va_list args;
int ret;
__ms_va_start(args, uType);
va_start(args, uType);
/* wvsprintfA(buf,fmt, args); */
TRACE("(%p,%p,%p,%p,%08x)\n",
@ -502,7 +502,7 @@ int WINAPIV ShellMessageBoxA(
FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING,
pszText, 0, 0, (LPSTR)&pszTemp, 0, &args);
__ms_va_end(args);
va_end(args);
ret = MessageBoxA(hWnd,pszTemp,pszTitle,uType);
LocalFree(pszTemp);

2
dlls/shell32/shlfileop.c
View File

@ -287,7 +287,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, ARRAY_SIZE(szBuffer), (__ms_va_list*)args);
szText, 0, 0, szBuffer, ARRAY_SIZE(szBuffer), (va_list*)args);
hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id));

12
dlls/shell32/tests/shlexec.c
View File

@ -114,13 +114,13 @@ static char* decodeA(const char* str)
static void WINAPIV __WINE_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...)
{
__ms_va_list valist;
va_list valist;
char buffer[1024];
DWORD w;
__ms_va_start(valist, fmt);
va_start(valist, fmt);
vsprintf(buffer, fmt, valist);
__ms_va_end(valist);
va_end(valist);
WriteFile(h, buffer, strlen(buffer), &w, NULL);
}
@ -348,14 +348,14 @@ static void dump_child_(const char* file, int line)
static char shell_call[2048];
static void WINAPIV __WINE_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, ...)
{
__ms_va_list valist;
va_list valist;
char buffer[2048];
strcpy(buffer, shell_call);
strcat(buffer, " ");
__ms_va_start(valist, msg);
va_start(valist, msg);
vsprintf(buffer+strlen(buffer), msg, valist);
__ms_va_end(valist);
va_end(valist);
winetest_ok(condition, "%s", buffer);
}
#define okShell_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : _okShell