September 2020 - Wine-commits

Gijs Vermeulen : msxml3: Support retrieving more than one element in IEnumVARIANT::Next() for IXMLElementCollection.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: wine Branch: master Commit: 49eac508b59ca41fd9a10731c5038bd4b799015b URL: https://source.winehq.org/git/wine.git/?a=commit;h=49eac508b59ca41fd9a10731… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Sep 13 14:14:41 2020 +0200 msxml3: Support retrieving more than one element in IEnumVARIANT::Next() for IXMLElementCollection. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/xmldoc.c | 51 ++++++++++++++++++++++++++++++++++++++-------- dlls/msxml3/xmlelem.c | 24 +++++++++++++--------- 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 693af19571..8854e0e2fa 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -656,7 +656,7 @@ static void test_xmlelem_collection(void) WCHAR path[MAX_PATH]; LONG length, type; ULONG num_vars; - VARIANT var, dummy, vIndex, vName; + VARIANT var[3], dummy, vIndex, vName; BSTR url, str; static const CHAR szBankXML[] = "bank.xml"; static const WCHAR szNumber[] = {'N','U','M','B','E','R',0}; @@ -738,16 +738,16 @@ static void test_xmlelem_collection(void) IUnknown_Release(unk); /* <Number>1234</Number> */ - hr = IEnumVARIANT_Next(enumVar, 1, &var, &num_vars); + hr = IEnumVARIANT_Next(enumVar, 1, &var[0], &num_vars); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(V_VT(&var) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var)); + ok(V_VT(&var[0]) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var[0])); ok(num_vars == 1, "Expected 1, got %d\n", num_vars); - hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IXMLElement, (LPVOID *)&child); + hr = IDispatch_QueryInterface(V_DISPATCH(&var[0]), &IID_IXMLElement, (LPVOID *)&child); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(child != NULL, "Expected non-NULL child\n"); - VariantClear(&var); + VariantClear(&var[0]); hr = IXMLElement_get_type(child, &type); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -760,11 +760,13 @@ static void test_xmlelem_collection(void) IXMLElement_Release(child); /* <Name>Captain Ahab</Name> */ - hr = IEnumVARIANT_Next(enumVar, 1, &var, &num_vars); + hr = IEnumVARIANT_Next(enumVar, 1, &var[0], &num_vars); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(V_VT(&var) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var)); + ok(V_VT(&var[0]) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var[0])); ok(num_vars == 1, "Expected 1, got %d\n", num_vars); + VariantClear(&var[0]); + /* try advance further, no children left */ V_VT(&dummy) = VT_I4; hr = IEnumVARIANT_Next(enumVar, 1, &dummy, &num_vars); @@ -777,11 +779,42 @@ static void test_xmlelem_collection(void) ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); ok(V_VT(&dummy) == VT_EMPTY, "Expected 0, got %d\n", V_VT(&dummy)); - hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IXMLElement, (LPVOID *)&child); + hr = IEnumVARIANT_Reset(enumVar); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* retrieve multiple elements */ + hr = IEnumVARIANT_Next(enumVar, 2, var, &num_vars); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(V_VT(&var[0]) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var[0])); + ok(V_VT(&var[1]) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var[1])); + ok(num_vars == 2, "Expected 2, got %d\n", num_vars); + + V_VT(&dummy) = VT_I4; + hr = IEnumVARIANT_Next(enumVar, 1, &dummy, &num_vars); + ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + ok(V_VT(&dummy) == VT_EMPTY, "Expected 0, got %d\n", V_VT(&dummy)); + ok(num_vars == 0, "Expected 0, got %d\n", num_vars); + + hr = IEnumVARIANT_Reset(enumVar); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + VariantClear(&var[1]); + VariantClear(&var[0]); + + /* request more elements than available */ + hr = IEnumVARIANT_Next(enumVar, 3, var, &num_vars); + ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + ok(V_VT(&var[0]) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var[0])); + ok(V_VT(&var[1]) == VT_DISPATCH, "Expected VT_DISPATCH, got %d\n", V_VT(&var[1])); + ok(V_VT(&var[2]) == VT_EMPTY, "Expected 0, got %d\n", V_VT(&var[2])); + ok(num_vars == 2, "Expected 2, got %d\n", num_vars); + + hr = IDispatch_QueryInterface(V_DISPATCH(&var[1]), &IID_IXMLElement, (LPVOID *)&child); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(child != NULL, "Expected non-NULL child\n"); - VariantClear(&var); + VariantClear(&var[1]); + VariantClear(&var[0]); hr = IXMLElement_get_type(child, &type); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 96b2007ce3..3addcbd19b 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -753,28 +753,32 @@ static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Next( IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *fetched) { xmlelem_collection *This = impl_from_IEnumVARIANT(iface); - xmlNodePtr ptr = This->current; + HRESULT hr; TRACE("(%p)->(%d %p %p)\n", This, celt, rgVar, fetched); if (!rgVar) return E_INVALIDARG; - /* FIXME: handle celt */ - if (fetched) - *fetched = 1; + if (fetched) *fetched = 0; - if (This->current) - This->current = This->current->next; - else + if (!This->current) { V_VT(rgVar) = VT_EMPTY; - if (fetched) *fetched = 0; return S_FALSE; } - V_VT(rgVar) = VT_DISPATCH; - return XMLElement_create(ptr, (LPVOID *)&V_DISPATCH(rgVar), FALSE); + while (celt > 0 && This->current) + { + V_VT(rgVar) = VT_DISPATCH; + hr = XMLElement_create(This->current, (void **)&V_DISPATCH(rgVar), FALSE); + if (FAILED(hr)) return hr; + This->current = This->current->next; + if (--celt && This->current) ++rgVar; + if (fetched) ++*fetched; + } + + return celt == 0 ? S_OK : S_FALSE; } static HRESULT WINAPI xmlelem_collection_IEnumVARIANT_Skip(

1 0

Nikolay Sivov : combase: Manage per-thread call cancellation counter.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: wine Branch: master Commit: 609c311a81b87ed351a4cf02478552c737fab716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=609c311a81b87ed351a4cf02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 16 16:02:40 2020 +0300 combase: Manage per-thread call cancellation counter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 27 ++++++++++++++++--- dlls/combase/combase_private.h | 1 + dlls/ole32/compobj_private.h | 1 + dlls/ole32/tests/compobj.c | 59 ++++++++++++++++++++++++++++++++++++++++++ include/winerror.h | 1 + 5 files changed, 85 insertions(+), 4 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index c66f0bbf8e..7a85b95a19 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -3104,9 +3104,20 @@ HRESULT WINAPI CoRegisterChannelHook(REFGUID guidExtension, IChannelHook *channe */ HRESULT WINAPI CoDisableCallCancellation(void *reserved) { - FIXME("%p stub\n", reserved); + struct tlsdata *tlsdata; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p\n", reserved); + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + if (!tlsdata->cancelcount) + return CO_E_CANCEL_DISABLED; + + tlsdata->cancelcount--; + + return S_OK; } /*********************************************************************** @@ -3114,9 +3125,17 @@ HRESULT WINAPI CoDisableCallCancellation(void *reserved) */ HRESULT WINAPI CoEnableCallCancellation(void *reserved) { - FIXME("%p stub\n", reserved); + struct tlsdata *tlsdata; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p\n", reserved); + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + tlsdata->cancelcount++; + + return S_OK; } /*********************************************************************** diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 2c938e6ff4..55ce02d06f 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -84,6 +84,7 @@ struct tlsdata IUnknown *state; /* see CoSetState */ struct list spies; /* Spies installed with CoRegisterInitializeSpy */ DWORD spies_lock; + DWORD cancelcount; }; extern HRESULT WINAPI InternalTlsAllocData(struct tlsdata **data); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index f10b41907a..4ec22d51f4 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -62,6 +62,7 @@ struct oletls IUnknown *state; /* see CoSetState */ struct list spies; /* Spies installed with CoRegisterInitializeSpy */ DWORD spies_lock; + DWORD cancelcount; }; /* Global Interface Table Functions */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index e627521fa5..5ed3f9638b 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -4186,6 +4186,64 @@ todo_wine CoUninitialize(); } +static void test_call_cancellation(void) +{ + HRESULT hr; + + /* Cancellation is disabled initially. */ + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Counter is not affected by initialization. */ + hr = CoInitialize(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + CoUninitialize(); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); + + /* It's cumulative. */ + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoEnableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CoDisableCallCancellation(NULL); + ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); +} + START_TEST(compobj) { init_funcs(); @@ -4236,6 +4294,7 @@ START_TEST(compobj) test_CoGetCurrentProcess(); test_mta_usage(); test_CoCreateInstanceFromApp(); + test_call_cancellation(); DeleteFileA( testlib ); } diff --git a/include/winerror.h b/include/winerror.h index 4ebb48c124..86f7aace68 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2679,6 +2679,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define RPC_E_NO_CONTEXT _HRESULT_TYPEDEF_(0x8001011E) #define RPC_E_TIMEOUT _HRESULT_TYPEDEF_(0x8001011F) #define RPC_E_NO_SYNC _HRESULT_TYPEDEF_(0x80010120) +#define CO_E_CANCEL_DISABLED _HRESULT_TYPEDEF_(0x80010140) #define RPC_E_UNEXPECTED _HRESULT_TYPEDEF_(0x8001FFFF) #define DISP_E_UNKNOWNINTERFACE _HRESULT_TYPEDEF_(0x80020001)

1 0

Myah Caron : sapi: Fix MMAudioOut registry key location.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: wine Branch: master Commit: 0e53f6bfa10255400b4fdc37eec8941ac5bf7fbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e53f6bfa10255400b4fdc37… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Wed Sep 16 06:21:28 2020 +0000 sapi: Fix MMAudioOut registry key location. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/sapi.rgs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/sapi.rgs b/dlls/sapi/sapi.rgs index 8c5f862d6b..331e115ae7 100644 --- a/dlls/sapi/sapi.rgs +++ b/dlls/sapi/sapi.rgs @@ -9,9 +9,12 @@ HKLM NoRemove AudioOutput { val DefaultDefaultTokenId = s 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Speech\AudioOutput\TokenEnums\MMAudioOut\' - NoRemove MMAudioOut + NoRemove TokenEnums { - val CLSID = s '{AB1890A0-E91F-11D2-BB91-00C04F8EE6C0}' + NoRemove MMAudioOut + { + val CLSID = s '{AB1890A0-E91F-11D2-BB91-00C04F8EE6C0}' + } } } NoRemove Voices

1 0

Myah Caron : sapi: Add stubs for SpObjectToken.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: wine Branch: master Commit: 64808e17b2bb341ec2901c4f36e1a7b20ad207b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64808e17b2bb341ec2901c4f… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Wed Sep 16 06:22:59 2020 +0000 sapi: Add stubs for SpObjectToken. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/main.c | 3 + dlls/sapi/sapi_classes.idl | 13 +++ dlls/sapi/sapi_private.h | 1 + dlls/sapi/tests/token.c | 125 ++++++++++++++++++++ dlls/sapi/token.c | 276 +++++++++++++++++++++++++++++++++++++++++++++ include/sapi.idl | 13 +++ 6 files changed, 431 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=64808e17b2bb341ec290…

1 0

Myah Caron : sapi: Improve stub for ISpObjectToken::SetId.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: wine Branch: master Commit: 5d49d3348368bcde6b55df157b2e79f62fa6ad98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d49d3348368bcde6b55df15… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Wed Sep 16 06:23:40 2020 +0000 sapi: Improve stub for ISpObjectToken::SetId. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/token.c | 16 ++++++++-------- dlls/sapi/token.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 887539778a..1ca49398ad 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -202,23 +202,23 @@ static void test_object_token(void) ok( cat == (LPVOID)0xdeadbeef, "got %p\n", cat ); hr = ISpObjectToken_SetId( token, NULL, NULL, FALSE ); - todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, L"bogus", NULL, FALSE ); - todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"bogus", FALSE ); - todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE\\winetest bogus", FALSE ); - todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); /* SetId succeeds even if the key is invalid, but exists */ hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE", FALSE ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, NULL, FALSE ); - todo_wine ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"bogus", FALSE ); - todo_wine ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); hr = ISpObjectToken_GetId( token, NULL ); todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); @@ -265,7 +265,7 @@ static void test_object_token(void) /* NULL appears to auto-detect the category */ hr = ISpObjectToken_SetId( token, NULL, token_id, FALSE ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); tempW = NULL; hr = ISpObjectToken_GetId( token, &tempW ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index f7a00d73f0..b4a318b4ad 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -781,6 +781,8 @@ struct object_token { ISpObjectToken ISpObjectToken_iface; LONG ref; + + HKEY token_key; }; static struct object_token *impl_from_ISpObjectToken( ISpObjectToken *iface ) @@ -827,6 +829,7 @@ static ULONG WINAPI token_Release( ISpObjectToken *iface ) if (!ref) { + if (This->token_key) RegCloseKey( This->token_key ); heap_free( This ); } @@ -923,8 +926,28 @@ static HRESULT WINAPI token_SetId( ISpObjectToken *iface, LPCWSTR category_id, LPCWSTR token_id, BOOL create ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct object_token *This = impl_from_ISpObjectToken( iface ); + BOOL res; + HRESULT hr; + HKEY root, key; + const WCHAR *subkey; + + FIXME( "(%p)->(%s %s %d): semi-stub\n", This, debugstr_w( category_id ), + debugstr_w(token_id), create ); + + if (This->token_key) return SPERR_ALREADY_INITIALIZED; + + if (!token_id) return E_POINTER; + + hr = parse_cat_id( token_id, &root, &subkey ); + if (hr != S_OK) return SPERR_NOT_FOUND; + + res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); + if (res) return SPERR_NOT_FOUND; + + This->token_key = key; + + return S_OK; } static HRESULT WINAPI token_GetId( ISpObjectToken *iface, @@ -1047,6 +1070,8 @@ HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) This->ISpObjectToken_iface.lpVtbl = &token_vtbl; This->ref = 1; + This->token_key = NULL; + hr = ISpObjectToken_QueryInterface( &This->ISpObjectToken_iface, iid, obj ); ISpObjectToken_Release( &This->ISpObjectToken_iface );

1 0

Piotr Caban : msvcrt: Fix count parameter type in printf functions family.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: wine Branch: master Commit: 68ca61a555b3118836dbf7b666686e1de3d988b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68ca61a555b3118836dbf7b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 16 18:41:48 2020 +0200 msvcrt: Fix count parameter type in printf functions family. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 4 ++-- dlls/msvcrt/wcs.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 6feb6c873f..86938c8cc0 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1117,9 +1117,9 @@ int WINAPIV MSVCRT_fwprintf(MSVCRT_FILE *file, const MSVCRT_wchar_t * int __cdecl MSVCRT_vsnprintf(char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist); int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist ); -int WINAPIV MSVCRT__snwprintf(MSVCRT_wchar_t*, unsigned int, const MSVCRT_wchar_t*, ...); +int WINAPIV MSVCRT__snwprintf(MSVCRT_wchar_t*, MSVCRT_size_t, const MSVCRT_wchar_t*, ...); int WINAPIV MSVCRT_sprintf(char*,const char*,...); -int WINAPIV MSVCRT__snprintf(char*,unsigned int,const char*,...); +int WINAPIV MSVCRT__snprintf(char*,MSVCRT_size_t,const char*,...); int WINAPIV MSVCRT__scprintf(const char*,...); int __cdecl MSVCRT_raise(int sig); int __cdecl MSVCRT__set_printf_count_output(int); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 7ceaa5c741..866c18538c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1152,7 +1152,7 @@ int CDECL MSVCRT__vscprintf_p(const char *format, __ms_va_list argptr) /********************************************************************* * _snprintf (MSVCRT.@) */ -int WINAPIV MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) +int WINAPIV MSVCRT__snprintf(char *str, MSVCRT_size_t len, const char *format, ...) { int retval; __ms_va_list valist; @@ -1165,7 +1165,7 @@ int WINAPIV MSVCRT__snprintf(char *str, unsigned int len, const char *format, .. /********************************************************************* * _snprintf_l (MSVCRT.@) */ -int WINAPIV MSVCRT__snprintf_l(char *str, unsigned int count, MSVCRT__locale_t locale, +int WINAPIV MSVCRT__snprintf_l(char *str, MSVCRT_size_t count, MSVCRT__locale_t locale, const char *format, ...) { int retval; @@ -1179,7 +1179,7 @@ int WINAPIV MSVCRT__snprintf_l(char *str, unsigned int count, MSVCRT__locale_t l /********************************************************************* * _snprintf_s (MSVCRT.@) */ -int WINAPIV MSVCRT__snprintf_s(char *str, unsigned int len, unsigned int count, +int WINAPIV MSVCRT__snprintf_s(char *str, MSVCRT_size_t len, MSVCRT_size_t count, const char *format, ...) { int retval; @@ -1339,7 +1339,7 @@ int CDECL MSVCRT_vsnwprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, /********************************************************************* * _snwprintf (MSVCRT.@) */ -int WINAPIV MSVCRT__snwprintf( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT_wchar_t *format, ...) +int WINAPIV MSVCRT__snwprintf( MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, ...) { int retval; __ms_va_list valist; @@ -1352,7 +1352,7 @@ int WINAPIV MSVCRT__snwprintf( MSVCRT_wchar_t *str, unsigned int len, const MSVC /********************************************************************* * _snwprintf_l (MSVCRT.@) */ -int WINAPIV MSVCRT__snwprintf_l( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT_wchar_t *format, +int WINAPIV MSVCRT__snwprintf_l( MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ...) { int retval; @@ -1366,7 +1366,7 @@ int WINAPIV MSVCRT__snwprintf_l( MSVCRT_wchar_t *str, unsigned int len, const MS /********************************************************************* * _snwprintf_s (MSVCRT.@) */ -int WINAPIV MSVCRT__snwprintf_s( MSVCRT_wchar_t *str, unsigned int len, unsigned int count, +int WINAPIV MSVCRT__snwprintf_s( MSVCRT_wchar_t *str, MSVCRT_size_t len, MSVCRT_size_t count, const MSVCRT_wchar_t *format, ...) { int retval; @@ -1380,7 +1380,7 @@ int WINAPIV MSVCRT__snwprintf_s( MSVCRT_wchar_t *str, unsigned int len, unsigned /********************************************************************* * _snwprintf_s_l (MSVCRT.@) */ -int WINAPIV MSVCRT__snwprintf_s_l( MSVCRT_wchar_t *str, unsigned int len, unsigned int count, +int WINAPIV MSVCRT__snwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t len, MSVCRT_size_t count, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ... ) { int retval;

1 0

Gijs Vermeulen : msvcrt: Add _s[w|n]printf_c[_l].
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: wine Branch: master Commit: b4ab5d3accf932659b7ee16aef1f3752e3d9f058 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4ab5d3accf932659b7ee16a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Sep 16 18:41:54 2020 +0200 msvcrt: Add _s[w|n]printf_c[_l]. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49765 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 8 ++--- dlls/msvcr110/msvcr110.spec | 8 ++--- dlls/msvcr120/msvcr120.spec | 8 ++--- dlls/msvcr120_app/msvcr120_app.spec | 8 ++--- dlls/msvcr80/msvcr80.spec | 7 +++-- dlls/msvcr90/msvcr90.spec | 8 ++--- dlls/msvcrt/msvcrt.spec | 8 ++--- dlls/msvcrt/wcs.c | 59 +++++++++++++++++++++++++++++++++++++ 8 files changed, 87 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b4ab5d3accf932659b7e…

1 0

Gijs Vermeulen : msvcrt: Fix _snprintf_l function signature.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: wine Branch: master Commit: 6a81e9a436facc8e074f30992a0217680422865f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a81e9a436facc8e074f3099… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Sep 16 18:42:00 2020 +0200 msvcrt: Fix _snprintf_l function signature. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 8d558e4ab8..e6051762d1 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1165,12 +1165,12 @@ int WINAPIV MSVCRT__snprintf(char *str, MSVCRT_size_t len, const char *format, . /********************************************************************* * _snprintf_l (MSVCRT.@) */ -int WINAPIV MSVCRT__snprintf_l(char *str, MSVCRT_size_t count, MSVCRT__locale_t locale, - const char *format, ...) +int WINAPIV MSVCRT__snprintf_l(char *str, MSVCRT_size_t count, const char *format, + MSVCRT__locale_t locale, ...) { int retval; __ms_va_list valist; - __ms_va_start(valist, format); + __ms_va_start(valist, locale); retval = MSVCRT_vsnprintf_l(str, count, format, locale, valist); __ms_va_end(valist); return retval;

1 0

Gijs Vermeulen : msvcrt: Add _snprintf_s_l.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: wine Branch: master Commit: 390b885c7457dd67ddc63b7b05aece02c10ae8a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=390b885c7457dd67ddc63b7b… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Sep 16 18:42:07 2020 +0200 msvcrt: Add _snprintf_s_l. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 8 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4e6041e81e..577fb69b5a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1297,7 +1297,7 @@ @ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s -@ stub _snprintf_s_l +@ varargs _snprintf_s_l(ptr long long str ptr) MSVCRT_snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf @ varargs _snscanf_l(str long str ptr) MSVCRT__snscanf_l @ varargs _snscanf_s(str long str) MSVCRT__snscanf_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d8e6ffac2c..97edbec6a7 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1654,7 +1654,7 @@ @ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s -@ stub _snprintf_s_l +@ varargs _snprintf_s_l(ptr long long str ptr) MSVCRT_snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf @ varargs _snscanf_l(str long str ptr) MSVCRT__snscanf_l @ varargs _snscanf_s(str long str) MSVCRT__snscanf_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 168ac8b332..1aa63de64a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1665,7 +1665,7 @@ @ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s -@ stub _snprintf_s_l +@ varargs _snprintf_s_l(ptr long long str ptr) MSVCRT_snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf @ varargs _snscanf_l(str long str ptr) MSVCRT__snscanf_l @ varargs _snscanf_s(str long str) MSVCRT__snscanf_s diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index be0d87776d..2013b06cc7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1384,7 +1384,7 @@ @ varargs _snprintf_c_l(ptr long str ptr) msvcr120._snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) msvcr120._snprintf_l @ varargs _snprintf_s(ptr long long str) msvcr120._snprintf_s -@ stub _snprintf_s_l +@ varargs _snprintf_s_l(ptr long long str ptr) msvcr120._snprintf_s_l @ varargs _snscanf(str long str) msvcr120._snscanf @ varargs _snscanf_l(str long str ptr) msvcr120._snscanf_l @ varargs _snscanf_s(str long str) msvcr120._snscanf_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 539c548aff..a31943e4d7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -977,7 +977,7 @@ @ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s -@ stub _snprintf_s_l +@ varargs _snprintf_s_l(ptr long long str ptr) MSVCRT_snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf @ varargs _snscanf_l(str long str ptr) MSVCRT__snscanf_l @ varargs _snscanf_s(str long str) MSVCRT__snscanf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 1a7964a415..ff58757cb8 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -952,7 +952,7 @@ @ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s -@ stub _snprintf_s_l +@ varargs _snprintf_s_l(ptr long long str ptr) MSVCRT_snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf @ varargs _snscanf_l(str long str ptr) MSVCRT__snscanf_l @ varargs _snscanf_s(str long str) MSVCRT__snscanf_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6710c14245..6da32d025d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -913,7 +913,7 @@ @ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l @ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s -# stub _snprintf_s_l(ptr long long str ptr) +@ varargs _snprintf_s_l(ptr long long str ptr) MSVCRT_snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf @ varargs _snscanf_l(str long str ptr) MSVCRT__snscanf_l @ varargs _snscanf_s(str long str) MSVCRT__snscanf_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e6051762d1..797c18e00a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1203,6 +1203,20 @@ int WINAPIV MSVCRT_snprintf_c(char *str, MSVCRT_size_t count, const char *format return retval; } +/********************************************************************* + * _snprintf_s_l (MSVCRT.@) + */ +int WINAPIV MSVCRT_snprintf_s_l(char *str, MSVCRT_size_t len, MSVCRT_size_t count, + const char *format, MSVCRT__locale_t locale, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, locale); + retval = MSVCRT_vsnprintf_s_l(str, len, count, format, locale, valist); + __ms_va_end(valist); + return retval; +} + /********************************************************************* * _snprintf_s (MSVCRT.@) */

1 0

Piotr Caban : msvcirt: Set error when file can't be opened in ifstream_open_ctor.
by Alexandre Julliard 16 Sep '20

16 Sep '20

Module: wine Branch: master Commit: a6223249b4ec5ce466dec4e1238f06067da27b56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6223249b4ec5ce466dec4e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 16 18:52:50 2020 +0200 msvcirt: Set error when file can't be opened in ifstream_open_ctor. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 99ce1d929c..3443261934 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4213,12 +4213,13 @@ istream* __thiscall ifstream_open_ctor(istream *this, const char *name, ios_open filebuf_ctor(fb); istream_sb_ctor(this, &fb->base, virt_init); - filebuf_open(fb, name, mode|OPENMODE_in, protection); base = istream_get_ios(this); base->vtable = &MSVCP_ifstream_vtable; base->delbuf = 1; + if (!filebuf_open(fb, name, mode|OPENMODE_in, protection)) + base->state |= IOSTATE_failbit; return this; }

1 0