October 2021 - Wine-Commits

Alexandre Julliard : shlwapi: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 56af82b16520993de9e347f37c1363d4407c86d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56af82b16520993de9e347f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:12:52 2021 +0200 shlwapi: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 22 +++++++++++----------- dlls/shlwapi/wsprintf.c | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 63945deaea3..f15dba14f21 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2363,7 +2363,7 @@ HRESULT WINAPI SHInvokeDefaultCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEM * * _SHPackDispParamsV */ -HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt, __ms_va_list valist) +HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt, va_list valist) { VARIANTARG *iter; @@ -2417,12 +2417,12 @@ HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt, */ HRESULT WINAPIV SHPackDispParams(DISPPARAMS *params, VARIANTARG *args, UINT cnt, ...) { - __ms_va_list valist; + va_list valist; HRESULT hres; - __ms_va_start(valist, cnt); + va_start(valist, cnt); hres = SHPackDispParamsV(params, args, cnt, valist); - __ms_va_end(valist); + va_end(valist); return hres; } @@ -2579,7 +2579,7 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam( IConnectionPoint *iCP; IConnectionPointContainer *iCPC; DISPPARAMS dispParams = {buffer, NULL, cParams, 0}; - __ms_va_list valist; + va_list valist; if (!container) return E_NOINTERFACE; @@ -2593,9 +2593,9 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam( if(FAILED(result)) return result; - __ms_va_start(valist, cParams); + va_start(valist, cParams); SHPackDispParamsV(&dispParams, buffer, cParams, valist); - __ms_va_end(valist); + va_end(valist); result = SHLWAPI_InvokeByIID(iCP, riid, dispId, &dispParams); IConnectionPoint_Release(iCP); @@ -4031,10 +4031,10 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, WCHAR *szText = NULL, szTitle[100]; LPCWSTR pszText, pszTitle = szTitle; LPWSTR pszTemp; - __ms_va_list args; + va_list args; int ret; - __ms_va_start(args, uType); + va_start(args, uType); TRACE("(%p,%p,%p,%p,%08x)\n", hInstance, hWnd, lpText, lpCaption, uType); @@ -4056,7 +4056,7 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, pszText = szText; if (!pszText) { WARN("Failed to load id %d\n", LOWORD(lpText)); - __ms_va_end(args); + va_end(args); return 0; } } @@ -4066,7 +4066,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); - __ms_va_end(args); + va_end(args); ret = MessageBoxW(hWnd, pszTemp, pszTitle, uType); diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c index dfc1488f634..fbd2a7e75bf 100644 --- a/dlls/shlwapi/wsprintf.c +++ b/dlls/shlwapi/wsprintf.c @@ -349,7 +349,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, __ms_va_list args ) +INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, va_list args ) { WPRINTF_FORMAT format; LPSTR p = buffer; @@ -471,7 +471,7 @@ INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, __ms_va_list args * * See wvnsprintfA. */ -INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list args ) +INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, va_list args ) { WPRINTF_FORMAT format; LPWSTR p = buffer; @@ -602,12 +602,12 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar */ int WINAPIV wnsprintfA(LPSTR lpOut, int cchLimitIn, LPCSTR lpFmt, ...) { - __ms_va_list valist; + va_list valist; INT res; - __ms_va_start( valist, lpFmt ); + va_start( valist, lpFmt ); res = wvnsprintfA( lpOut, cchLimitIn, lpFmt, valist ); - __ms_va_end( valist ); + va_end( valist ); return res; } @@ -619,11 +619,11 @@ int WINAPIV wnsprintfA(LPSTR lpOut, int cchLimitIn, LPCSTR lpFmt, ...) */ int WINAPIV wnsprintfW(LPWSTR lpOut, int cchLimitIn, LPCWSTR lpFmt, ...) { - __ms_va_list valist; + va_list valist; INT res; - __ms_va_start( valist, lpFmt ); + va_start( valist, lpFmt ); res = wvnsprintfW( lpOut, cchLimitIn, lpFmt, valist ); - __ms_va_end( valist ); + va_end( valist ); return res; }

1 0

Alexandre Julliard : avifil32: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 1303364fcba50b16f6531846d3df74fe4de914eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1303364fcba50b16f6531846… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:23 2021 +0200 avifil32: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/api.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 0494bfc59e4..e4fb64ff3ee 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -2233,7 +2233,7 @@ HRESULT WINAPI AVIPutFileOnClipboard(PAVIFILE pfile) HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { - __ms_va_list vl; + va_list vl; int i; HRESULT ret; PAVISTREAM *streams; @@ -2255,13 +2255,13 @@ HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK l streams[0] = pavi; options[0] = lpOptions; - __ms_va_start(vl, lpOptions); + va_start(vl, lpOptions); for (i = 1; i < nStreams; i++) { streams[i] = va_arg(vl, PAVISTREAM); options[i] = va_arg(vl, PAVICOMPRESSOPTIONS); } - __ms_va_end(vl); + va_end(vl); for (i = 0; i < nStreams; i++) TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]); @@ -2276,7 +2276,7 @@ error: HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { - __ms_va_list vl; + va_list vl; int i; HRESULT ret; PAVISTREAM *streams; @@ -2298,13 +2298,13 @@ HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK streams[0] = pavi; options[0] = lpOptions; - __ms_va_start(vl, lpOptions); + va_start(vl, lpOptions); for (i = 1; i < nStreams; i++) { streams[i] = va_arg(vl, PAVISTREAM); options[i] = va_arg(vl, PAVICOMPRESSOPTIONS); } - __ms_va_end(vl); + va_end(vl); for (i = 0; i < nStreams; i++) TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]);

1 0

Alexandre Julliard : d3dcompiler: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: bb2d48627d98301fe24ed74bd6897d1146e8dc1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb2d48627d98301fe24ed74b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:28 2021 +0200 d3dcompiler: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/asmshader.y | 6 +++--- dlls/d3dcompiler_43/compiler.c | 20 ++++++++++---------- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- dlls/d3dcompiler_43/ppl.l | 10 +++++----- dlls/d3dcompiler_43/preproc.c | 6 +++--- dlls/d3dcompiler_43/utils.c | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index 9e0fec618cd..f33be2259d9 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -30,11 +30,11 @@ struct asm_parser asm_ctx; void WINAPIV asmparser_message(struct asm_parser *ctx, const char *fmt, ...) { - __ms_va_list args; + va_list args; - __ms_va_start(args, fmt); + va_start(args, fmt); compilation_message(&ctx->messages, fmt, args); - __ms_va_end(args); + va_end(args); } static void asmshader_error(char const *s) { diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index b75a1d0a6a5..112e82d6d44 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -83,7 +83,7 @@ static CRITICAL_SECTION_DEBUG wpp_mutex_debug = static CRITICAL_SECTION wpp_mutex = { &wpp_mutex_debug, -1, 0, 0, 0, 0 }; /* Preprocessor error reporting functions */ -static void wpp_write_message(const char *fmt, __ms_va_list args) +static void wpp_write_message(const char *fmt, va_list args) { char* newbuffer; int rc, newsize; @@ -125,37 +125,37 @@ static void wpp_write_message(const char *fmt, __ms_va_list args) static void WINAPIV PRINTF_ATTR(1,2) wpp_write_message_var(const char *fmt, ...) { - __ms_va_list args; + va_list args; - __ms_va_start(args, fmt); + va_start(args, fmt); wpp_write_message(fmt, args); - __ms_va_end(args); + va_end(args); } int WINAPIV ppy_error(const char *msg, ...) { - __ms_va_list ap; - __ms_va_start(ap, msg); + va_list ap; + va_start(ap, msg); wpp_write_message_var("%s:%d:%d: %s: ", pp_status.input ? pp_status.input : "'main file'", pp_status.line_number, pp_status.char_number, "Error"); wpp_write_message(msg, ap); wpp_write_message_var("\n"); - __ms_va_end(ap); + va_end(ap); pp_status.state = 1; return 1; } int WINAPIV ppy_warning(const char *msg, ...) { - __ms_va_list ap; - __ms_va_start(ap, msg); + va_list ap; + va_start(ap, msg); wpp_write_message_var("%s:%d:%d: %s: ", pp_status.input ? pp_status.input : "'main file'", pp_status.line_number, pp_status.char_number, "Warning"); wpp_write_message(msg, ap); wpp_write_message_var("\n"); - __ms_va_end(ap); + va_end(ap); return 0; } diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 49027d11851..713c900cee6 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -269,7 +269,7 @@ struct bwriter_shader *parse_asm_shader(char **messages) DECLSPEC_HIDDEN; #define PRINTF_ATTR(fmt,args) #endif -void compilation_message(struct compilation_messages *msg, const char *fmt, __ms_va_list args) DECLSPEC_HIDDEN; +void compilation_message(struct compilation_messages *msg, const char *fmt, va_list args) DECLSPEC_HIDDEN; void WINAPIV asmparser_message(struct asm_parser *ctx, const char *fmt, ...) PRINTF_ATTR(2,3) DECLSPEC_HIDDEN; static inline void set_parse_status(enum parse_status *current, enum parse_status update) { diff --git a/dlls/d3dcompiler_43/ppl.l b/dlls/d3dcompiler_43/ppl.l index 568ccb4e8df..1797b98eebf 100644 --- a/dlls/d3dcompiler_43/ppl.l +++ b/dlls/d3dcompiler_43/ppl.l @@ -287,7 +287,7 @@ includelogicentry_t *pp_includelogiclist = NULL; void WINAPIV pp_writestring(const char *format, ...) { - __ms_va_list valist; + va_list valist; int len; static char *buffer; static int buffercapacity; @@ -301,10 +301,10 @@ void WINAPIV pp_writestring(const char *format, ...) buffercapacity = BUFFERINITIALCAPACITY; } - __ms_va_start(valist, format); + va_start(valist, format); len = vsnprintf(buffer, buffercapacity, format, valist); - __ms_va_end(valist); + va_end(valist); /* If the string is longer than buffersize, vsnprintf returns * the string length with glibc >= 2.1, -1 with glibc < 2.1 */ while(len > buffercapacity || len < 0) @@ -318,10 +318,10 @@ void WINAPIV pp_writestring(const char *format, ...) if(new_buffer == NULL) return; buffer = new_buffer; - __ms_va_start(valist, format); + va_start(valist, format); len = vsnprintf(buffer, buffercapacity, format, valist); - __ms_va_end(valist); + va_end(valist); } wpp_write(buffer, len); diff --git a/dlls/d3dcompiler_43/preproc.c b/dlls/d3dcompiler_43/preproc.c index be98e6f4194..3ea05a00a26 100644 --- a/dlls/d3dcompiler_43/preproc.c +++ b/dlls/d3dcompiler_43/preproc.c @@ -437,11 +437,11 @@ int pp_get_if_depth(void) void WINAPIV pp_internal_error(const char *file, int line, const char *s, ...) { - __ms_va_list ap; - __ms_va_start(ap, s); + va_list ap; + va_start(ap, s); fprintf(stderr, "Internal error (please report) %s %d: ", file, line); vfprintf(stderr, s, ap); fprintf(stderr, "\n"); - __ms_va_end(ap); + va_end(ap); exit(3); } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 0d20a85458e..2c5c903106e 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -716,7 +716,7 @@ HRESULT dxbc_write_blob(struct dxbc *dxbc, ID3DBlob **blob) return S_OK; } -void compilation_message(struct compilation_messages *msg, const char *fmt, __ms_va_list args) +void compilation_message(struct compilation_messages *msg, const char *fmt, va_list args) { char* buffer; int rc, size;

1 0

Alexandre Julliard : dbgeng: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 922f9c85cf711a01eadd5e47bc66a45129035447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=922f9c85cf711a01eadd5e47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:34 2021 +0200 dbgeng: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index c857456b51c..014f723981b 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -2782,7 +2782,7 @@ static HRESULT STDMETHODVCALLTYPE debugcontrol_Output(IDebugControl2 *iface, ULO } static HRESULT STDMETHODCALLTYPE debugcontrol_OutputVaList(IDebugControl2 *iface, ULONG mask, const char *format, - __ms_va_list args) + va_list args) { FIXME("%p, %#x, %s stub.\n", iface, mask, debugstr_a(format)); @@ -2798,7 +2798,7 @@ static HRESULT STDMETHODVCALLTYPE debugcontrol_ControlledOutput(IDebugControl2 * } static HRESULT STDMETHODCALLTYPE debugcontrol_ControlledOutputVaList(IDebugControl2 *iface, ULONG output_control, - ULONG mask, const char *format, __ms_va_list args) + ULONG mask, const char *format, va_list args) { FIXME("%p, %u, %#x, %s stub.\n", iface, output_control, mask, debugstr_a(format)); @@ -2814,7 +2814,7 @@ static HRESULT STDMETHODVCALLTYPE debugcontrol_OutputPrompt(IDebugControl2 *ifac } static HRESULT STDMETHODCALLTYPE debugcontrol_OutputPromptVaList(IDebugControl2 *iface, ULONG output_control, - const char *format, __ms_va_list args) + const char *format, va_list args) { FIXME("%p, %u, %s stub.\n", iface, output_control, debugstr_a(format));

1 0

Alexandre Julliard : krnl386: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: b14447b137c526a8e337b21bab1ae1e5fc11039f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b14447b137c526a8e337b21b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:58 2021 +0200 krnl386: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/thunk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index c8a247299b4..3ae61e1fe96 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -2381,9 +2381,9 @@ INT WINAPI k32LoadStringA(HINSTANCE instance, UINT resource_id, /*********************************************************************** * k32wvsprintfA (KERNEL32.16) */ -INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, __ms_va_list args) +INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, va_list args) { - static INT (WINAPI *pwvsprintfA)(LPSTR, LPCSTR, __ms_va_list); + static INT (WINAPI *pwvsprintfA)(LPSTR, LPCSTR, va_list); if(!pwvsprintfA) pwvsprintfA = user32_proc_address("wvsprintfA"); return (*pwvsprintfA)(buffer, spec, args); @@ -2394,12 +2394,12 @@ INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, __ms_va_list args) */ INT WINAPIV k32wsprintfA(LPSTR buffer, LPCSTR spec, ...) { - __ms_va_list args; + va_list args; INT res; - __ms_va_start(args, spec); + va_start(args, spec); res = k32wvsprintfA(buffer, spec, args); - __ms_va_end(args); + va_end(args); return res; }

1 0

Alexandre Julliard : msi: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 523553512a580a885b1783c773699dfe0928e3b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=523553512a580a885b1783c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:12:04 2021 +0200 msi: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msiquery.c | 12 ++++++------ dlls/msi/tests/custom.c | 6 +++--- dlls/msi/tests/db.c | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 4ee9a973917..c217ee7c8f5 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -146,11 +146,11 @@ UINT WINAPIV MSI_OpenQuery( MSIDATABASE *db, MSIQUERY **view, LPCWSTR fmt, ... ) /* construct the string */ for (;;) { - __ms_va_list va; + va_list va; query = msi_alloc( size*sizeof(WCHAR) ); - __ms_va_start(va, fmt); + va_start(va, fmt); res = vswprintf(query, size, fmt, va); - __ms_va_end(va); + va_end(va); if (res == -1) size *= 2; else if (res >= size) size = res + 1; else break; @@ -211,11 +211,11 @@ MSIRECORD * WINAPIV MSI_QueryGetRecord( MSIDATABASE *db, LPCWSTR fmt, ... ) /* construct the string */ for (;;) { - __ms_va_list va; + va_list va; query = msi_alloc( size*sizeof(WCHAR) ); - __ms_va_start(va, fmt); + va_start(va, fmt); res = vswprintf(query, size, fmt, va); - __ms_va_end(va); + va_end(va); if (res == -1) size *= 2; else if (res >= size) size = res + 1; else break; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index d74d0a2d097..75e234c6583 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -38,11 +38,11 @@ static void WINAPIV ok_(MSIHANDLE hinst, int todo, const char *file, int line, i { static char buffer[2000]; MSIHANDLE record; - __ms_va_list valist; + va_list valist; - __ms_va_start(valist, msg); + va_start(valist, msg); vsprintf(buffer, msg, valist); - __ms_va_end(valist); + va_end(valist); record = MsiCreateRecord(5); MsiRecordSetInteger(record, 1, todo); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 4ffd30f0376..eedfcac486d 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -38,13 +38,13 @@ static const WCHAR msifile2W[] = L"winetst2-db.msi"; static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count, ...) { - __ms_va_list args; + va_list args; UINT i; ok_(__FILE__, line)(count == MsiRecordGetFieldCount(rec), "expected %u fields, got %u\n", count, MsiRecordGetFieldCount(rec)); - __ms_va_start(args, count); + va_start(args, count); for (i = 1; i <= count; ++i) { @@ -57,7 +57,7 @@ static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count, ...) "field %u: expected \"%s\", got \"%s\"\n", i, expect, buffer); } - __ms_va_end(args); + va_end(args); } #define check_record(rec, ...) check_record_(__LINE__, rec, __VA_ARGS__)

1 0

Alexandre Julliard : rpcrt4: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 348336b8cd6fe9f62bbf0886dbc70cbc59601afa URL: https://source.winehq.org/git/wine.git/?a=commit;h=348336b8cd6fe9f62bbf0886… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:12:41 2021 +0200 rpcrt4: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_es.c | 6 +++--- dlls/rpcrt4/ndr_stubless.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index 158bc7cda2a..a756b178c5d 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -407,7 +407,7 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu /* header for procedure string */ const NDR_PROC_HEADER *pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0]; const RPC_CLIENT_INTERFACE *client_interface; - __ms_va_list args; + va_list args; unsigned int number_of_params; ULONG_PTR arg_buffer[256]; @@ -474,9 +474,9 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu TRACE("MIDL stub version = 0x%x\n", pStubDesc->MIDLVersion); /* needed for conformance of top-level objects */ - __ms_va_start( args, pFormat ); + va_start( args, pFormat ); pEsMsg->StubMsg.StackTop = va_arg( args, unsigned char * ); - __ms_va_end( args ); + va_end( args ); pFormat = convert_old_args( &pEsMsg->StubMsg, pFormat, stack_size, FALSE, arg_buffer, sizeof(arg_buffer), &number_of_params ); diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 3e0c824c733..815b8ecce23 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1023,12 +1023,12 @@ __ASM_GLOBAL_FUNC( NdrClientCall2, */ CLIENT_CALL_RETURN WINAPIV NdrClientCall2( PMIDL_STUB_DESC desc, PFORMAT_STRING format, ... ) { - __ms_va_list args; + va_list args; LONG_PTR ret; - __ms_va_start( args, format ); + va_start( args, format ); ret = ndr_client_call( desc, format, va_arg( args, void ** ), NULL ); - __ms_va_end( args ); + va_end( args ); return *(CLIENT_CALL_RETURN *)&ret; } @@ -1923,12 +1923,12 @@ __ASM_GLOBAL_FUNC( NdrAsyncClientCall, */ CLIENT_CALL_RETURN WINAPIV NdrAsyncClientCall( PMIDL_STUB_DESC desc, PFORMAT_STRING format, ... ) { - __ms_va_list args; + va_list args; LONG_PTR ret; - __ms_va_start( args, format ); + va_start( args, format ); ret = ndr_async_client_call( desc, format, va_arg( args, void ** )); - __ms_va_end( args ); + va_end( args ); return *(CLIENT_CALL_RETURN *)&ret; } @@ -2263,12 +2263,12 @@ __ASM_GLOBAL_FUNC( NdrClientCall3, */ CLIENT_CALL_RETURN WINAPIV NdrClientCall3( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... ) { - __ms_va_list args; + va_list args; LONG_PTR ret; - __ms_va_start( args, retval ); + va_start( args, retval ); ret = ndr64_client_call( info, proc, retval, va_arg( args, void ** ), NULL ); - __ms_va_end( args ); + va_end( args ); return *(CLIENT_CALL_RETURN *)&ret; } @@ -2323,12 +2323,12 @@ __ASM_GLOBAL_FUNC( Ndr64AsyncClientCall, */ CLIENT_CALL_RETURN WINAPIV Ndr64AsyncClientCall( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... ) { - __ms_va_list args; + va_list args; LONG_PTR ret; - __ms_va_start( args, retval ); + va_start( args, retval ); ret = ndr64_async_client_call( info, proc, retval, va_arg( args, void ** ), NULL ); - __ms_va_end( args ); + va_end( args ); return *(CLIENT_CALL_RETURN *)&ret; }

1 0

Alexandre Julliard : shell32: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: bc909b1bd5607cc75094f8a808bfad5fa1545035 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc909b1bd5607cc75094f8a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:12:47 2021 +0200 shell32: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellord.c | 12 ++++++------ dlls/shell32/shlfileop.c | 2 +- dlls/shell32/tests/shlexec.c | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index c4b1b17d6b3..2c73ce18940 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -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); diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 50bbdd37261..87a445dd35c 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -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)); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 968953f9abb..e319dfb6fa7 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -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

1 0

Alexandre Julliard : wldap32: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 5d78033a90b8c92e7f0b558bc0786c7f735be84d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d78033a90b8c92e7f0b558b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:13:06 2021 +0200 wldap32: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/ber.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index ca5bbc305c5..7d37471c5c4 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -318,12 +318,12 @@ ULONG CDECL ber_skip_tag( BerElement *ber, ULONG *len ) */ int WINAPIV ber_printf( BerElement *ber, char *fmt, ... ) { - __ms_va_list list; + va_list list; int ret = 0; char new_fmt[2]; new_fmt[1] = 0; - __ms_va_start( list, fmt ); + va_start( list, fmt ); while (*fmt) { new_fmt[0] = *fmt++; @@ -392,7 +392,7 @@ int WINAPIV ber_printf( BerElement *ber, char *fmt, ... ) } if (ret == -1) break; } - __ms_va_end( list ); + va_end( list ); return ret; } @@ -417,12 +417,12 @@ int WINAPIV ber_printf( BerElement *ber, char *fmt, ... ) */ ULONG WINAPIV ber_scanf( BerElement *ber, char *fmt, ... ) { - __ms_va_list list; + va_list list; int ret = 0; char new_fmt[2]; new_fmt[1] = 0; - __ms_va_start( list, fmt ); + va_start( list, fmt ); while (*fmt) { new_fmt[0] = *fmt++; @@ -508,6 +508,6 @@ ULONG WINAPIV ber_scanf( BerElement *ber, char *fmt, ... ) } if (ret == -1) break; } - __ms_va_end( list ); + va_end( list ); return ret; }

1 0

Alexandre Julliard : riched20: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 5b15bf33255bd373cbf26ec373d16a8234ec6b1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b15bf33255bd373cbf26ec3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:12:29 2021 +0200 riched20: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 7c7e648f107..d6c687daab9 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -125,11 +125,11 @@ ME_StreamOutPrint(ME_OutStream *pStream, const char *format, ...) { char string[STREAMOUT_BUFFER_SIZE]; /* This is going to be enough */ int len; - __ms_va_list valist; + va_list valist; - __ms_va_start(valist, format); + va_start(valist, format); len = vsnprintf(string, sizeof(string), format, valist); - __ms_va_end(valist); + va_end(valist); return ME_StreamOutMove(pStream, string, len); }

1 0