September 2020 - Wine-Commits

Jacek Caban : server: Introduce console_connection object.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: 7364a4b07536c10331e6049bc098ca9dba9554e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7364a4b07536c10331e6049b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 20:38:37 2020 +0200 server: Introduce console_connection object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index c2328f9da9..108371080e 100644 --- a/server/console.c +++ b/server/console.c @@ -80,6 +80,7 @@ struct console_input static void console_input_dump( struct object *obj, int verbose ); static void console_input_destroy( struct object *obj ); static struct fd *console_input_get_fd( struct object *obj ); +static struct object *console_input_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static struct object *console_input_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); @@ -97,7 +98,7 @@ static const struct object_ops console_input_ops = default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ - no_lookup_name, /* lookup_name */ + console_input_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ console_input_open_file, /* open_file */ @@ -358,6 +359,39 @@ static const struct object_ops console_device_ops = no_destroy /* destroy */ }; +struct console_connection +{ + struct object obj; /* object header */ +}; + +static void console_connection_dump( struct object *obj, int verbose ); +static struct object *console_connection_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); +static int console_connection_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); + +static const struct object_ops console_connection_ops = +{ + sizeof(struct console_connection),/* size */ + console_connection_dump, /* dump */ + console_device_get_type, /* get_type */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + no_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_lookup_name, /* lookup_name */ + directory_link_name, /* link_name */ + default_unlink_name, /* unlink_name */ + console_connection_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + console_connection_close_handle, /* close_handle */ + no_destroy /* destroy */ +}; + static struct list screen_buffer_list = LIST_INIT(screen_buffer_list); static const char_info_t empty_char_info = { ' ', 0x000f }; /* white on black space */ @@ -1286,6 +1320,39 @@ static void console_input_destroy( struct object *obj ) free( console_in->history ); } +static struct object *create_console_connection( struct console_input *console ) +{ + struct console_connection *connection; + + if (current->process->console) + { + set_error( STATUS_ACCESS_DENIED ); + return NULL; + } + + if (!(connection = alloc_object( &console_connection_ops ))) return NULL; + + current->process->console = (struct console_input *)grab_object( console ); + console->num_proc++; + + return &connection->obj; +} + +static struct object *console_input_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +{ + struct console_input *console = (struct console_input *)obj; + static const WCHAR connectionW[] = {'C','o','n','n','e','c','t','i','o','n'}; + assert( obj->ops == &console_input_ops ); + + if (name->len == sizeof(connectionW) && !memcmp( name->str, connectionW, name->len )) + { + name->len = 0; + return create_console_connection( console ); + } + + return NULL; +} + static struct object *console_input_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ) { @@ -2209,6 +2276,23 @@ static int console_server_ioctl( struct fd *fd, ioctl_code_t code, struct async } } +static void console_connection_dump( struct object *obj, int verbose ) +{ + fputs( "console connection\n", stderr ); +} + +static struct object *console_connection_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + return grab_object( obj ); +} + +static int console_connection_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) +{ + free_console( process ); + return 1; +} + static struct object_type *console_device_get_type( struct object *obj ) { static const WCHAR name[] = {'D','e','v','i','c','e'};

1 0

Myah Caron : sapi: Fix MMAudioOut registry key location.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

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

Piotr Caban : msvcrt: Fix count parameter type in printf functions family.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

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 : msxml3: Support Reset() for IEnumVARIANTs created by create_enumvariant.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: 4ad0e7485de30176c5ffee79390fc7c4b636aac2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ad0e7485de30176c5ffee79… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Sep 13 14:14:40 2020 +0200 msxml3: Support Reset() for IEnumVARIANTs created by create_enumvariant. 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/selection.c | 6 ++++-- dlls/msxml3/tests/domdoc.c | 22 +++++----------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 3698d036d4..ede80627d7 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -543,8 +543,10 @@ static HRESULT WINAPI enumvariant_Skip( static HRESULT WINAPI enumvariant_Reset(IEnumVARIANT *iface) { enumvariant *This = impl_from_IEnumVARIANT( iface ); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + + TRACE("%p\n", This); + This->pos = 0; + return S_OK; } static HRESULT WINAPI enumvariant_Clone( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e0cb486b61..806d63bb1f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10236,7 +10236,6 @@ static void test_selection(void) SysFreeString(name); IXMLDOMNode_Release(node); VariantClear(&v[0]); - IEnumVARIANT_Release(enum1); hr = IXMLDOMSelection_nextNode(selection, &node); EXPECT_HR(hr, S_OK); @@ -10246,12 +10245,10 @@ static void test_selection(void) IXMLDOMNode_Release(node); SysFreeString(name); - /* getting multiple elements */ - enum1 = NULL; - hr = IXMLDOMSelection_get__newEnum(selection, (IUnknown**)&enum1); + hr = IEnumVARIANT_Reset(enum1); EXPECT_HR(hr, S_OK); - ok(enum1 != NULL, "got %p\n", enum1); + /* getting multiple elements */ V_VT(&v[1]) = VT_EMPTY; V_VT(&v[0]) = VT_EMPTY; hr = IEnumVARIANT_Next(enum1, 2, v, &ret); @@ -12154,12 +12151,8 @@ static void test_get_namespaces(void) ok(fetched == 0, "got %d, expected 0\n", fetched); ok(V_VT(&v[0]) == VT_EMPTY, "got %d\n", V_VT(&v[0])); - IEnumVARIANT_Release(enumv); - - enumv = (void*)0xdeadbeef; - hr = IXMLDOMSchemaCollection_get__newEnum(collection, (IUnknown**)&enumv); + hr = IEnumVARIANT_Reset(enumv); EXPECT_HR(hr, S_OK); - ok(enumv != NULL, "got %p\n", enumv); V_VT(&v[1]) = VT_EMPTY; V_VT(&v[0]) = VT_EMPTY; @@ -12284,12 +12277,8 @@ static void test_get_namespaces(void) EXPECT_HR(hr, S_FALSE); ok(V_VT(&v[0]) == VT_EMPTY, "got %d\n", V_VT(&v[0])); - IEnumVARIANT_Release(enumv); - - enumv = (void*)0xdeadbeef; - hr = IXMLDOMSchemaCollection_get__newEnum(collection, (IUnknown**)&enumv); + hr = IEnumVARIANT_Reset(enumv); EXPECT_HR(hr, S_OK); - ok(enumv != NULL, "got %p\n", enumv); V_VT(&v[1]) = VT_EMPTY; V_VT(&v[0]) = VT_EMPTY; @@ -12747,9 +12736,8 @@ static void test_namedmap_newenum(void) ok(!lstrcmpW(str, L"attr2"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(node); - IEnumVARIANT_Release(enum2); - hr = IXMLDOMNamedNodeMap__newEnum(map, (IUnknown**)&enum2); + hr = IEnumVARIANT_Reset(enum2); EXPECT_HR(hr, S_OK); V_VT(&v[1]) = VT_EMPTY;

1 0

Myah Caron : sapi: Add stubs for SpObjectToken.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

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

Gijs Vermeulen : msvcrt: Add _s[w|n]printf_c[_l].
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

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: Add _snprintf_s_l.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

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 Sept. 16, 2020

Sept. 16, 2020

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

Gijs Vermeulen : msxml3/tests: Add more iteration tests for IXMLDOMNamedNodeMap, IXMLDOMSchemaCollection and IXMLDOMNodeList.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: fa466d13a7cdbfeec03a080d65fe973e5b49fa82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa466d13a7cdbfeec03a080d… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Sep 13 14:14:39 2020 +0200 msxml3/tests: Add more iteration tests for IXMLDOMNamedNodeMap, IXMLDOMSchemaCollection and IXMLDOMNodeList. 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/domdoc.c | 239 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 193 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fa466d13a7cdbfeec03a…

1 0

Gijs Vermeulen : msxml3: Support retrieving more than one element in IEnumVARIANT::Next() for IXMLElementCollection.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

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