March 2021 - Wine-Commits - list.winehq.org

Nikolay Sivov : wbemdisp: Implement GetObjectText_().
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: 67f32df2ba7772f6379749eeb183e012682f92a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67f32df2ba7772f6379749ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:04:26 2021 +0300 wbemdisp: Implement GetObjectText_(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 0ef73bdbd56..dcec47faa6e 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1534,11 +1534,14 @@ static HRESULT WINAPI object_Clone_( static HRESULT WINAPI object_GetObjectText_( ISWbemObject *iface, - LONG iFlags, - BSTR *strObjectText ) + LONG flags, + BSTR *text ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct object *object = impl_from_ISWbemObject( iface ); + + TRACE( "%p, %#x, %p\n", object, flags, text ); + + return IWbemClassObject_GetObjectText( object->object, flags, text ); } static HRESULT WINAPI object_SpawnDerivedClass_(

1 0

Nikolay Sivov : wbemdisp: Downgrade failing interface queries to warnings.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: a0c624c2b16e150ef7ba12aa58c58608f8903ef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0c624c2b16e150ef7ba12aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:04:27 2021 +0300 wbemdisp: Downgrade failing interface queries to warnings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 24 ++++++++++++------------ dlls/wbemdisp/main.c | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index dcec47faa6e..ed6a13c2df8 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -181,7 +181,7 @@ static HRESULT WINAPI property_QueryInterface( ISWbemProperty *iface, REFIID rii } else { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + WARN( "interface %s not implemented\n", debugstr_guid(riid) ); return E_NOINTERFACE; } ISWbemProperty_AddRef( iface ); @@ -380,7 +380,7 @@ static HRESULT WINAPI propertyset_QueryInterface( ISWbemPropertySet *iface, } else { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + WARN( "interface %s not implemented\n", debugstr_guid(riid) ); return E_NOINTERFACE; } ISWbemPropertySet_AddRef( iface ); @@ -592,7 +592,7 @@ static HRESULT WINAPI method_QueryInterface( ISWbemMethod *iface, REFIID riid, v } else { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + WARN( "interface %s not implemented\n", debugstr_guid(riid) ); return E_NOINTERFACE; } ISWbemMethod_AddRef( iface ); @@ -816,7 +816,7 @@ static HRESULT WINAPI methodset_QueryInterface( ISWbemMethodSet *iface, REFIID r } else { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + WARN( "interface %s not implemented\n", debugstr_guid(riid) ); return E_NOINTERFACE; } ISWbemMethodSet_AddRef( iface ); @@ -1047,7 +1047,7 @@ static HRESULT WINAPI object_QueryInterface( } else { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + WARN( "interface %s not implemented\n", debugstr_guid(riid) ); return E_NOINTERFACE; } ISWbemObject_AddRef( iface ); @@ -1748,7 +1748,7 @@ static HRESULT WINAPI objectset_QueryInterface( } else { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + WARN( "interface %s not implemented\n", debugstr_guid(riid) ); return E_NOINTERFACE; } ISWbemObjectSet_AddRef( iface ); @@ -2015,7 +2015,7 @@ static HRESULT WINAPI enumvar_QueryInterface( } else { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + WARN( "interface %s not implemented\n", debugstr_guid(riid) ); return E_NOINTERFACE; } IEnumVARIANT_AddRef( iface ); @@ -2144,7 +2144,7 @@ static HRESULT WINAPI services_QueryInterface( } else { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + WARN( "interface %s not implemented\n", debugstr_guid(riid) ); return E_NOINTERFACE; } ISWbemServices_AddRef( iface ); @@ -2649,7 +2649,7 @@ static HRESULT WINAPI locator_QueryInterface( } else { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + WARN( "interface %s not implemented\n", debugstr_guid(riid) ); return E_NOINTERFACE; } ISWbemLocator_AddRef( iface ); @@ -2888,7 +2888,7 @@ static HRESULT WINAPI security_QueryInterface( } else { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + WARN( "interface %s not implemented\n", debugstr_guid(riid) ); return E_NOINTERFACE; } ISWbemSecurity_AddRef( iface ); @@ -3100,7 +3100,7 @@ static HRESULT WINAPI namedvalue_QueryInterface( } else { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + WARN( "interface %s not implemented\n", debugstr_guid(riid) ); return E_NOINTERFACE; } ISWbemNamedValue_AddRef( iface ); @@ -3277,7 +3277,7 @@ static HRESULT WINAPI namedvalueset_QueryInterface( } else { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + WARN( "interface %s not implemented\n", debugstr_guid(riid) ); return E_NOINTERFACE; } ISWbemNamedValueSet_AddRef( iface ); diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index 624017f5382..7e73d546531 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -211,7 +211,7 @@ static HRESULT WINAPI factory_QueryInterface( IClassFactory *iface, REFIID riid, *obj = iface; return S_OK; } - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + WARN( "interface %s not implemented\n", debugstr_guid(riid) ); return E_NOINTERFACE; }

1 0

Nikolay Sivov : wbemdisp: Forward ISWbemNamedValueSet::DeleteAll() to context object.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: b938f54b1e9af22640b310a07f66d91018f36ea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b938f54b1e9af22640b310a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:04:28 2021 +0300 wbemdisp: Forward ISWbemNamedValueSet::DeleteAll() to context object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index ed6a13c2df8..76312e72fc3 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -3467,9 +3467,11 @@ static HRESULT WINAPI namedvalueset_Clone( static HRESULT WINAPI namedvalueset_DeleteAll( ISWbemNamedValueSet *iface ) { - FIXME("\n"); + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); - return E_NOTIMPL; + TRACE("%p\n", set); + + return IWbemContext_DeleteAll( set->context ); } static const ISWbemNamedValueSetVtbl namedvalueset_vtbl =

1 0

Alexandre Julliard : ntdll: Fetch locale information from the Unix side in resource loading.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: 46fd718ec7f330793a7f142f326eabe311c8d70b URL: https://source.winehq.org/git/wine.git/?a=commit;h=46fd718ec7f330793a7f142f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 16:13:09 2021 +0100 ntdll: Fetch locale information from the Unix side in resource loading. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50769 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 2 -- dlls/ntdll/ntdll_misc.h | 3 --- dlls/ntdll/resource.c | 4 ++++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 19626a48b72..b3a225a30c3 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -100,8 +100,6 @@ struct norm_table /* WORD[] composition character sequences */ }; -LCID user_lcid = 0, system_lcid = 0; - static NLSTABLEINFO nls_info; static HMODULE kernel32_handle; static struct norm_table *norm_tables[16]; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 72340a171c9..b69ad762300 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -85,9 +85,6 @@ extern const struct unix_funcs *unix_funcs DECLSPEC_HIDDEN; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; -/* locale */ -extern LCID user_lcid, system_lcid; - extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_list args ) DECLSPEC_HIDDEN; extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 981c538a8e0..58a0fc7d2e2 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -175,6 +175,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( const IMAGE_RESOURCE_ static NTSTATUS find_entry( HMODULE hmod, const LDR_RESOURCE_INFO *info, ULONG level, const void **ret, int want_dir ) { + static LCID user_lcid, system_lcid; ULONG size; const void *root; const IMAGE_RESOURCE_DIRECTORY *resdirptr; @@ -212,6 +213,8 @@ static NTSTATUS find_entry( HMODULE hmod, const LDR_RESOURCE_INFO *info, /* user defaults, unless SYS_DEFAULT sublanguage specified */ if (SUBLANGID(info->Language) != SUBLANG_SYS_DEFAULT) { + if (!user_lcid) NtQueryDefaultLocale( TRUE, &user_lcid ); + /* 4. current thread locale language */ pos = push_language( list, pos, LANGIDFROMLCID(NtCurrentTeb()->CurrentLocale) ); @@ -223,6 +226,7 @@ static NTSTATUS find_entry( HMODULE hmod, const LDR_RESOURCE_INFO *info, } /* now system defaults */ + if (!system_lcid) NtQueryDefaultLocale( FALSE, &system_lcid ); /* 7. system locale language */ pos = push_language( list, pos, LANGIDFROMLCID( system_lcid ) );

1 0

Nikolay Sivov : wbemdisp: Forward ISWbemNamedValueSet::Remove() to context object method.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: wine Branch: master Commit: 2ed349488c4c93c68635004bd419fee3455d210f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ed349488c4c93c68635004b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:04:29 2021 +0300 wbemdisp: Forward ISWbemNamedValueSet::Remove() to context object method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 76312e72fc3..3e2566d5220 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -3450,9 +3450,11 @@ static HRESULT WINAPI namedvalueset_Remove( BSTR name, LONG flags ) { - FIXME("\n"); + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); - return E_NOTIMPL; + TRACE("%p, %s, %#x\n", set, debugstr_w(name), flags); + + return IWbemContext_DeleteValue( set->context, name, flags ); } static HRESULT WINAPI namedvalueset_Clone(

1 0

Hugh McMaster : winetest: Ensure sticky table header doesn't cover anchor-link target.
by Alexandre Julliard March 3, 2021

March 3, 2021

Module: tools Branch: master Commit: e9ca45c7f90e6baa5dec6f84a7d4a8e4c414ec02 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e9ca45c7f90e6baa5dec6f8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 3 19:57:10 2021 +1100 winetest: Ensure sticky table header doesn't cover anchor-link target. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/summary.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/winetest/summary.css b/winetest/summary.css index d01a227..2bc9b44 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -36,6 +36,12 @@ div.main, div.group { width: 100%; border: 1px solid #601919; } +div.main table.report td.test a { + scroll-margin-top: 4.25ex; +} +div.group table.report td.test a { + scroll-margin-top: 7.75ex; +} div.navbar { padding: 0; width: 100%;

1 0

Francois Gouget : conhost: Add a trailing linefeed to TRACE() and ERR() messages.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: e0d1bec91617b43623b5f7715f1eebe4c310cb7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0d1bec91617b43623b5f771… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 2 20:14:34 2021 +0100 conhost: Add a trailing linefeed to TRACE() and ERR() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 01917ee8b67..a665cbb84d4 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -285,7 +285,7 @@ static void save_registry_key( HKEY key, const struct console_config *config ) DWORD val, width, height, i; WCHAR color_name[13]; - TRACE( "%s", debugstr_config( config )); + TRACE( "%s\n", debugstr_config( config )); for (i = 0; i < ARRAY_SIZE(config->color_map); i++) { @@ -870,7 +870,7 @@ static void update_console_font( struct console *console, const WCHAR *font, EnumFontFamiliesW( console->window->mem_dc, NULL, get_first_font_enum, (LPARAM)&fc ); if (fc.done) return; } - ERR( "Couldn't find a decent font" ); + ERR( "Couldn't find a decent font\n" ); } /* get a cell from a relative coordinate in window (takes into account the scrolling) */

1 0

Francois Gouget : libwine: Use NULL instead of casting 0.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 0fd41648e3c0546916be4ae4f4fb3d9768b5ee99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fd41648e3c0546916be4ae4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 2 20:18:06 2021 +0100 libwine: Use NULL instead of casting 0. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/string.c b/libs/wine/string.c index d6fb88f8eca..16bb97bec8e 100644 --- a/libs/wine/string.c +++ b/libs/wine/string.c @@ -479,7 +479,7 @@ noconv: long int atolW( const WCHAR *str ) { - return strtolW( str, (WCHAR **)0, 10 ); + return strtolW( str, NULL, 10 ); } int atoiW( const WCHAR *str )

1 0

Francois Gouget : fsutil/tests: Add a trailing linefeed to an ok() message.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 63958c1345351ccc5631ddc1a9bf6dddd6c698f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63958c1345351ccc5631ddc1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 2 20:12:51 2021 +0100 fsutil/tests: Add a trailing linefeed to an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/fsutil/tests/fsutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/fsutil/tests/fsutil.c b/programs/fsutil/tests/fsutil.c index eff47a4f8ec..aa0d5d3884b 100644 --- a/programs/fsutil/tests/fsutil.c +++ b/programs/fsutil/tests/fsutil.c @@ -100,7 +100,7 @@ static void test_hardlink(void) ok(boolrc, "failed to get info about hardlink, error %#x\n", GetLastError()); CloseHandle(hfile); - ok(info.nNumberOfLinks == 2, "our link is not a hardlink"); + ok(info.nNumberOfLinks == 2, "our link is not a hardlink\n"); rc = runcmd("fsutil hardlink create link file"); ok(rc == 1, "fsutil didn't complain about already existing destination\n");

1 0

Francois Gouget : msado15: Fix the name of the command_text variable.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: d4631ba675c42975f98f99cb0b9473fbc29008f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4631ba675c42975f98f99cb… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 2 20:11:05 2021 +0100 msado15: Fix the name of the command_text variable. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 80297dcdc16..a3c9a450be6 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -339,7 +339,7 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI { struct connection *connection = impl_from_Connection( iface ); HRESULT hr; - ICommandText *comand_text; + ICommandText *command_text; DBROWCOUNT affected; IUnknown *rowset; _Recordset *recordset; @@ -349,12 +349,12 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); - hr = create_command_text(connection->session, command, &comand_text); + hr = create_command_text(connection->session, command, &command_text); if (FAILED(hr)) return hr; - hr = ICommandText_Execute(comand_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); - ICommandText_Release(comand_text); + hr = ICommandText_Execute(command_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + ICommandText_Release(command_text); if (FAILED(hr)) return hr;

1 0