October 2021 - Wine-commits

Alexandre Julliard : riched20: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 22 Oct '21

22 Oct '21

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

Alexandre Julliard : rpcrt4: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 22 Oct '21

22 Oct '21

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 22 Oct '21

22 Oct '21

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 : shlwapi: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 22 Oct '21

22 Oct '21

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 : user32: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: 54796d65fc59ea4de58bb2fadf5cf1e0c91306c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54796d65fc59ea4de58bb2fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:12:57 2021 +0200 user32: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/wsprintf.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/wsprintf.c b/dlls/user32/wsprintf.c index 4c1c44365aa..1b396f0269c 100644 --- a/dlls/user32/wsprintf.c +++ b/dlls/user32/wsprintf.c @@ -336,7 +336,7 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg, /*********************************************************************** * wvsnprintfA (internal) */ -static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, __ms_va_list args ) +static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, va_list args ) { WPRINTF_FORMAT format; LPSTR p = buffer; @@ -456,7 +456,7 @@ static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, __ms_va_list arg /*********************************************************************** * wvsnprintfW (internal) */ -static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list args ) +static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, va_list args ) { WPRINTF_FORMAT format; LPWSTR p = buffer; @@ -574,7 +574,7 @@ static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list a /*********************************************************************** * wvsprintfA (USER32.@) */ -INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, __ms_va_list args ) +INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, va_list args ) { INT res = wvsnprintfA( buffer, 1024, spec, args ); return ( res == -1 ) ? 1024 : res; @@ -584,7 +584,7 @@ INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, __ms_va_list args ) /*********************************************************************** * wvsprintfW (USER32.@) */ -INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, __ms_va_list args ) +INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, va_list args ) { INT res = wvsnprintfW( buffer, 1024, spec, args ); return ( res == -1 ) ? 1024 : res; @@ -596,12 +596,12 @@ INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, __ms_va_list args ) */ INT WINAPIV wsprintfA( LPSTR buffer, LPCSTR spec, ... ) { - __ms_va_list valist; + va_list valist; INT res; - __ms_va_start( valist, spec ); + va_start( valist, spec ); res = wvsnprintfA( buffer, 1024, spec, valist ); - __ms_va_end( valist ); + va_end( valist ); return ( res == -1 ) ? 1024 : res; } @@ -611,11 +611,11 @@ INT WINAPIV wsprintfA( LPSTR buffer, LPCSTR spec, ... ) */ INT WINAPIV wsprintfW( LPWSTR buffer, LPCWSTR spec, ... ) { - __ms_va_list valist; + va_list valist; INT res; - __ms_va_start( valist, spec ); + va_start( valist, spec ); res = wvsnprintfW( buffer, 1024, spec, valist ); - __ms_va_end( valist ); + va_end( valist ); return ( res == -1 ) ? 1024 : res; }

1 0

Alexandre Julliard : vcomp: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: 8839ec313039c543e492abe0b7304505f3c67496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8839ec313039c543e492abe0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:13:01 2021 +0200 vcomp: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 30bc2c63501..bd97e444d81 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -94,7 +94,7 @@ struct vcomp_team_data /* callback arguments */ int nargs; void *wrapper; - __ms_va_list valist; + va_list valist; /* barrier */ unsigned int barrier; @@ -120,12 +120,12 @@ struct vcomp_task_data unsigned int dynamic_chunksize; }; -static void **ptr_from_va_list(__ms_va_list valist) +static void **ptr_from_va_list(va_list valist) { return *(void ***)&valist; } -static void copy_va_list_data(void **args, __ms_va_list valist, int args_count) +static void copy_va_list_data(void **args, va_list valist, int args_count) { unsigned int i; @@ -1474,7 +1474,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) team_data.finished_threads = 0; team_data.nargs = nargs; team_data.wrapper = wrapper; - __ms_va_start(team_data.valist, wrapper); + va_start(team_data.valist, wrapper); team_data.barrier = 0; team_data.barrier_count = 0; @@ -1572,7 +1572,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) assert(list_empty(&thread_data.entry)); } - __ms_va_end(team_data.valist); + va_end(team_data.valist); } static CRITICAL_SECTION *alloc_critsect(void) @@ -1687,7 +1687,7 @@ static unsigned int get_step_count(int start, int end, int range_offset, int ste } static void CDECL c2vectparallel_wrapper(int start, int end, int step, int end_included, BOOL dynamic_distribution, - int volatile *dynamic_start, void *function, int nargs, __ms_va_list valist) + int volatile *dynamic_start, void *function, int nargs, va_list valist) { void *wrapper_args[MAX_VECT_PARALLEL_CALLBACK_ARGS]; unsigned int step_count, steps_per_call, remainder; @@ -1779,7 +1779,7 @@ void WINAPIV C2VectParallel(int start, int end, int step, BOOL end_included, int struct vcomp_thread_data *thread_data; int volatile dynamic_start; int prev_thread_count; - __ms_va_list valist; + va_list valist; TRACE("start %d, end %d, step %d, end_included %d, thread_count %d, dynamic_distribution %#x," " function %p, nargs %d.\n", start, end, step, end_included, thread_count, @@ -1793,7 +1793,7 @@ void WINAPIV C2VectParallel(int start, int end, int step, BOOL end_included, int return; } - __ms_va_start(valist, nargs); + va_start(valist, nargs); /* This expression can result in integer overflow. According to the tests, * native vcomp runs the function as a single thread both for empty range @@ -1807,7 +1807,7 @@ void WINAPIV C2VectParallel(int start, int end, int step, BOOL end_included, int wrapper_args[1] = (void *)(ULONG_PTR)end; copy_va_list_data(&wrapper_args[2], valist, nargs - 2); _vcomp_fork_call_wrapper(function, nargs, wrapper_args); - __ms_va_end(valist); + va_end(valist); return; } @@ -1821,7 +1821,7 @@ void WINAPIV C2VectParallel(int start, int end, int step, BOOL end_included, int &dynamic_start, function, nargs, valist); thread_data->fork_threads = prev_thread_count; - __ms_va_end(valist); + va_end(valist); } BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)

1 0

Alexandre Julliard : wldap32: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 22 Oct '21

22 Oct '21

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

Daniel Lehman : msxml3/tests: Add some processing instruction tests.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: 3186df70cc9730a18052d4264f3494ea336115a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3186df70cc9730a18052d426… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Fri Oct 22 16:41:25 2021 +0300 msxml3/tests: Add some processing instruction tests. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9e9789ebd9a..d98a87f6d9c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8594,6 +8594,31 @@ static void test_createProcessingInstruction(void) hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"windows-1252\" dummy=\"value\""), &pi); todo_wine ok(hr == XML_E_UNEXPECTED_ATTRIBUTE, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, NULL, _bstr_("version=\"1.0\" encoding=\"UTF-8\""), &pi); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), NULL, &pi); +todo_wine + ok(hr == XML_E_XMLDECLSYNTAX, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=UTF-8"), &pi); +todo_wine + ok(hr == XML_E_MISSINGQUOTE, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8\""), &pi); +todo_wine + ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"UTF-8"), &pi); +todo_wine + ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8'"), &pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMProcessingInstruction_QueryInterface(pi, &IID_IXMLDOMNode, (void **)&node); + node_map = NULL; + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMNode_get_attributes(node, &node_map); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + if (node_map) IXMLDOMNamedNodeMap_Release(node_map); + IXMLDOMNode_Release(node); + IXMLDOMProcessingInstruction_Release(pi); /* test for BSTR handling, pass broken BSTR */ memcpy(&buff[2], L"test", 5 * sizeof(WCHAR));

1 0

Nikolay Sivov : mfplay: Do not clear media item when playback ends.
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: c6c3d6f9635bfa1aae8934b70f3ae9c7e549fe26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6c3d6f9635bfa1aae8934b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 22 08:22:58 2021 +0300 mfplay: Do not clear media item when playback ends. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index f7832598ae6..42b40b99ea1 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1860,21 +1860,6 @@ static void media_player_create_forward_event(struct media_player *player, HRESU LeaveCriticalSection(&player->cs); } -static void media_player_create_playback_ended_event(struct media_player *player, HRESULT event_status, - struct media_event **event) -{ - EnterCriticalSection(&player->cs); - - if (SUCCEEDED(media_event_create(player, MFP_EVENT_TYPE_PLAYBACK_ENDED, event_status, player->item, event))) - { - if (player->item) - IMFPMediaItem_Release(player->item); - player->item = NULL; - } - - LeaveCriticalSection(&player->cs); -} - static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { @@ -1936,7 +1921,7 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba if (SUCCEEDED(IMFMediaEvent_GetUINT32(session_event, &MF_EVENT_TOPOLOGY_STATUS, &status)) && status == MF_TOPOSTATUS_ENDED) { - media_player_create_playback_ended_event(player, event_status, &event); + media_event_create(player, MFP_EVENT_TYPE_PLAYBACK_ENDED, event_status, player->item, &event); } break;

1 0

Nikolay Sivov : mfplay: Handle NULL item in SetMediaItem().
by Alexandre Julliard 22 Oct '21

22 Oct '21

Module: wine Branch: master Commit: 66948f8934b8aaca70cd0d2faafb81bfc51e67c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66948f8934b8aaca70cd0d2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 22 08:22:59 2021 +0300 mfplay: Handle NULL item in SetMediaItem(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 6 +++++- dlls/mfplay/tests/mfplay.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 42b40b99ea1..28226f92962 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1224,12 +1224,16 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me static HRESULT WINAPI media_player_SetMediaItem(IMFPMediaPlayer *iface, IMFPMediaItem *item_iface) { struct media_player *player = impl_from_IMFPMediaPlayer(iface); - struct media_item *item = unsafe_impl_from_IMFPMediaItem(item_iface); + struct media_item *item; IMFTopology *topology; HRESULT hr; TRACE("%p, %p.\n", iface, item_iface); + if (!item_iface) + return E_POINTER; + + item = unsafe_impl_from_IMFPMediaItem(item_iface); if (item->player != iface) return E_INVALIDARG; diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index a2d6da54f3e..438d636daa2 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -198,8 +198,23 @@ static void test_shutdown(void) IMFPMediaPlayer_Release(player); } +static void test_media_item(void) +{ + IMFPMediaPlayer *player; + HRESULT hr; + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetMediaItem(player, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + IMFPMediaPlayer_Release(player); +} + START_TEST(mfplay) { test_create_player(); test_shutdown(); + test_media_item(); }

1 0