wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Nikolay Sivov : wbemprox: Handle __ProviderArchitecture in CreateKey().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: aa175834a56150797965b0b232dfce35bd9c32d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa175834a56150797965b0b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:54 2021 +0300 wbemprox: Handle __ProviderArchitecture in CreateKey(). 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/wbemprox/reg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 8cda101860f..c1c5f4a51f0 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -99,14 +99,14 @@ static unsigned int reg_get_access_mask( IWbemContext *context ) return 0; } -static HRESULT create_key( HKEY root, const WCHAR *subkey, VARIANT *retval ) +static HRESULT create_key( HKEY root, const WCHAR *subkey, IWbemContext *context, VARIANT *retval ) { LONG res; HKEY hkey; TRACE("%p, %s\n", root, debugstr_w(subkey)); - res = RegCreateKeyExW( root, subkey, 0, NULL, 0, 0, NULL, &hkey, NULL ); + res = RegCreateKeyExW( root, subkey, 0, NULL, 0, reg_get_access_mask( context ), NULL, &hkey, NULL ); set_variant( VT_UI4, res, NULL, retval ); if (!res) { @@ -145,7 +145,7 @@ HRESULT reg_create_key( IWbemClassObject *obj, IWbemContext *context, IWbemClass return hr; } } - hr = create_key( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), &retval ); + hr = create_key( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), context, &retval ); if (hr == S_OK && out_params) hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 );

1 0

Nikolay Sivov : wbemprox: Handle __ProviderArchitecture in GetStringValue().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 8bf540d67c5ca3cb36185aaed455624d2c7e9339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bf540d67c5ca3cb36185aae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:53 2021 +0300 wbemprox: Handle __ProviderArchitecture in GetStringValue(). 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/wbemprox/reg.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index cc65ef2c8d9..8cda101860f 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -384,22 +384,30 @@ done: return hr; } -static HRESULT get_stringvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, VARIANT *value, VARIANT *retval ) +static HRESULT get_stringvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, VARIANT *value, + IWbemContext *context, VARIANT *retval ) { + DWORD size, mask, flags = RRF_RT_REG_SZ; HRESULT hr = S_OK; BSTR str = NULL; - DWORD size; LONG res; TRACE("%p, %s, %s\n", root, debugstr_w(subkey), debugstr_w(name)); - if ((res = RegGetValueW( root, subkey, name, RRF_RT_REG_SZ, NULL, NULL, &size ))) goto done; + mask = reg_get_access_mask( context ); + + if (mask & KEY_WOW64_64KEY) + flags |= RRF_SUBKEY_WOW6464KEY; + else if (mask & KEY_WOW64_32KEY) + flags |= RRF_SUBKEY_WOW6432KEY; + + if ((res = RegGetValueW( root, subkey, name, flags, NULL, NULL, &size ))) goto done; if (!(str = SysAllocStringLen( NULL, size / sizeof(WCHAR) - 1 ))) { hr = E_OUTOFMEMORY; goto done; } - if (!(res = RegGetValueW( root, subkey, name, RRF_RT_REG_SZ, NULL, str, &size ))) + if (!(res = RegGetValueW( root, subkey, name, flags, NULL, str, &size ))) set_variant( VT_BSTR, 0, str, value ); done: @@ -442,7 +450,7 @@ HRESULT reg_get_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem } } VariantInit( &value ); - hr = get_stringvalue( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), V_BSTR(&name), &value, &retval ); + hr = get_stringvalue( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), V_BSTR(&name), &value, context, &retval ); if (hr != S_OK) goto done; if (out_params) {

1 0

Nikolay Sivov : wbemprox: Handle __ProviderArchitecture in DeleteKey().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 447d3e112791f4292528a6472aa954bb13d57082 URL: https://source.winehq.org/git/wine.git/?a=commit;h=447d3e112791f4292528a647… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:52 2021 +0300 wbemprox: Handle __ProviderArchitecture in DeleteKey(). 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/wbemprox/reg.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 41195e3e21e..cc65ef2c8d9 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -75,6 +75,30 @@ static HRESULT to_i4_array( DWORD *values, DWORD count, VARIANT *var ) return S_OK; } +static unsigned int reg_get_access_mask( IWbemContext *context ) +{ + VARIANT value; + + if (!context) return 0; + + V_VT( &value ) = VT_EMPTY; + if (FAILED(IWbemContext_GetValue( context, L"__ProviderArchitecture", 0, &value ))) + return 0; + + if (FAILED(VariantChangeType( &value, &value, 0, VT_I4 ))) + { + VariantClear( &value ); + return 0; + } + + if (V_I4( &value ) == 32) + return KEY_WOW64_32KEY; + else if (V_I4( &value ) == 64) + return KEY_WOW64_64KEY; + + return 0; +} + static HRESULT create_key( HKEY root, const WCHAR *subkey, VARIANT *retval ) { LONG res; @@ -569,13 +593,13 @@ HRESULT reg_set_dwordvalue( IWbemClassObject *obj, IWbemContext *context, IWbemC return hr; } -static void delete_key( HKEY root, const WCHAR *subkey, VARIANT *retval ) +static void delete_key( HKEY root, const WCHAR *subkey, IWbemContext *context, VARIANT *retval ) { LONG res; TRACE("%p, %s\n", root, debugstr_w(subkey)); - res = RegDeleteKeyExW( root, subkey, 0, 0 ); + res = RegDeleteKeyExW( root, subkey, reg_get_access_mask( context ), 0 ); set_variant( VT_UI4, res, NULL, retval ); } @@ -608,7 +632,7 @@ HRESULT reg_delete_key( IWbemClassObject *obj, IWbemContext *context, IWbemClass return hr; } } - delete_key( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), &retval ); + delete_key( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), context, &retval ); if (out_params) hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 );

1 0

Nikolay Sivov : wbemprox: Prioritize ExecMethod() context over services instance one.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 718ca769db6045a68b0d4ba51bf74add2ac5225d URL: https://source.winehq.org/git/wine.git/?a=commit;h=718ca769db6045a68b0d4ba5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:51 2021 +0300 wbemprox: Prioritize ExecMethod() context over services instance one. 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/wbemprox/services.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 5275dd348c7..faed31b79af 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -836,11 +836,12 @@ static HRESULT WINAPI wbem_services_ExecMethod( const BSTR strObjectPath, const BSTR strMethodName, LONG lFlags, - IWbemContext *pCtx, + IWbemContext *context, IWbemClassObject *pInParams, IWbemClassObject **ppOutParams, IWbemCallResult **ppCallResult ) { + struct wbem_services *services = impl_from_IWbemServices( iface ); IEnumWbemClassObject *result = NULL; IWbemClassObject *obj = NULL; struct query *query = NULL; @@ -851,7 +852,7 @@ static HRESULT WINAPI wbem_services_ExecMethod( HRESULT hr; TRACE("%p, %s, %s, %08x, %p, %p, %p, %p\n", iface, debugstr_w(strObjectPath), - debugstr_w(strMethodName), lFlags, pCtx, pInParams, ppOutParams, ppCallResult); + debugstr_w(strMethodName), lFlags, context, pInParams, ppOutParams, ppCallResult); if (lFlags) FIXME("flags %08x not supported\n", lFlags); @@ -882,7 +883,7 @@ static HRESULT WINAPI wbem_services_ExecMethod( hr = get_method( table, strMethodName, &func ); if (hr != S_OK) goto done; - hr = func( obj, NULL, pInParams, ppOutParams ); + hr = func( obj, context ? context : services->context, pInParams, ppOutParams ); done: if (result) IEnumWbemClassObject_Release( result );

1 0

Nikolay Sivov : wbemprox: Pass context object to the method.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 89f59a493a26cc86c6d37bb28166fb3345701339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89f59a493a26cc86c6d37bb2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:50 2021 +0300 wbemprox: Pass context object to the 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/wbemprox/process.c | 2 +- dlls/wbemprox/reg.c | 14 +++++++------- dlls/wbemprox/security.c | 4 ++-- dlls/wbemprox/service.c | 8 ++++---- dlls/wbemprox/services.c | 2 +- dlls/wbemprox/sysrestore.c | 10 +++++----- dlls/wbemprox/wbemprox_private.h | 41 ++++++++++++++++++++-------------------- 7 files changed, 41 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=89f59a493a26cc86c6d3…

1 0

Nikolay Sivov : wbemprox: Implement context object cloning.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 1be967df936b831018841119500aaa5fe546c49b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1be967df936b831018841119… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:49 2021 +0300 wbemprox: Implement context object cloning. 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/wbemprox/services.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 19e03fa152b..7de97dbae64 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -1039,9 +1039,32 @@ static HRESULT WINAPI wbem_context_Clone( IWbemContext *iface, IWbemContext **newcopy ) { - FIXME("%p, %p\n", iface, newcopy); + struct wbem_context *context = impl_from_IWbemContext( iface ); + struct wbem_context_value *value; + IWbemContext *cloned_context; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p\n", iface, newcopy); + + if (SUCCEEDED(hr = WbemContext_create( (void **)&cloned_context ))) + { + LIST_FOR_EACH_ENTRY( value, &context->values, struct wbem_context_value, entry ) + { + if (FAILED(hr = IWbemContext_SetValue( cloned_context, value->name, 0, &value->value ))) break; + } + } + + if (SUCCEEDED(hr)) + { + *newcopy = cloned_context; + } + else + { + *newcopy = NULL; + IWbemContext_Release( cloned_context ); + } + + return hr; } static HRESULT WINAPI wbem_context_GetNames(

1 0

Nikolay Sivov : wbemprox: Keep context object per services instance.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 4a97c6b03c68357c96fe9db6d7fcc69b8a44f3f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a97c6b03c68357c96fe9db6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:05:48 2021 +0300 wbemprox: Keep context object per services instance. 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/wbemprox/services.c | 12 ++++++++---- dlls/wbemprox/tests/services.c | 24 ++++++++++++++++++++++++ dlls/wbemprox/wbemlocator.c | 6 +++--- dlls/wbemprox/wbemprox_private.h | 2 +- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index eff5148ef29..19e03fa152b 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -210,6 +210,7 @@ struct wbem_services CRITICAL_SECTION cs; WCHAR *namespace; struct async_header *async; + IWbemContext *context; }; static inline struct wbem_services *impl_from_IWbemServices( IWbemServices *iface ) @@ -243,6 +244,8 @@ static ULONG WINAPI wbem_services_Release( } ws->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &ws->cs ); + if (ws->context) + IWbemContext_Release( ws->context ); heap_free( ws->namespace ); heap_free( ws ); } @@ -293,7 +296,7 @@ static HRESULT WINAPI wbem_services_OpenNamespace( if ((wcsicmp( strNamespace, L"cimv2" ) && wcsicmp( strNamespace, L"default" )) || ws->namespace) return WBEM_E_INVALID_NAMESPACE; - return WbemServices_create( L"cimv2", (void **)ppWorkingNamespace ); + return WbemServices_create( L"cimv2", NULL, (void **)ppWorkingNamespace ); } static HRESULT WINAPI wbem_services_CancelAsyncCall( @@ -933,21 +936,22 @@ static const IWbemServicesVtbl wbem_services_vtbl = wbem_services_ExecMethodAsync }; -HRESULT WbemServices_create( const WCHAR *namespace, LPVOID *ppObj ) +HRESULT WbemServices_create( const WCHAR *namespace, IWbemContext *context, LPVOID *ppObj ) { struct wbem_services *ws; TRACE("(%p)\n", ppObj); - ws = heap_alloc( sizeof(*ws) ); + ws = heap_alloc_zero( sizeof(*ws) ); if (!ws) return E_OUTOFMEMORY; ws->IWbemServices_iface.lpVtbl = &wbem_services_vtbl; ws->refs = 1; ws->namespace = heap_strdupW( namespace ); - ws->async = NULL; InitializeCriticalSection( &ws->cs ); ws->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": wbemprox_services.cs"); + if (context) + IWbemContext_Clone( context, &ws->context ); *ppObj = &ws->IWbemServices_iface; diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index ebbc766d6c5..da985de01fa 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -24,6 +24,15 @@ #include "wbemcli.h" #include "wine/test.h" +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static void test_IClientSecurity(void) { HRESULT hr; @@ -124,6 +133,7 @@ static void test_IWbemLocator(void) }; IWbemLocator *locator; IWbemServices *services; + IWbemContext *context; unsigned int i; HRESULT hr; BSTR resource; @@ -146,6 +156,20 @@ static void test_IWbemLocator(void) SysFreeString( resource ); if (hr == S_OK) IWbemServices_Release( services ); } + + hr = CoCreateInstance( &CLSID_WbemContext, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemContext, (void **)&context ); + ok(hr == S_OK, "Failed to create context object, hr %#x.\n", hr); + + EXPECT_REF(context, 1); + resource = SysAllocString( L"root\\default" ); + hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, context, &services ); + ok(hr == S_OK, "Failed to connect, hr %#x.\n", hr); + SysFreeString( resource ); + EXPECT_REF(context, 1); + IWbemServices_Release( services ); + + IWbemContext_Release( context ); + IWbemLocator_Release( locator ); } diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 9b6f2cbc741..5e86f2be86d 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -161,14 +161,14 @@ static HRESULT WINAPI wbem_locator_ConnectServer( const BSTR Locale, LONG SecurityFlags, const BSTR Authority, - IWbemContext *pCtx, + IWbemContext *context, IWbemServices **ppNamespace) { HRESULT hr; WCHAR *server, *namespace; TRACE("%p, %s, %s, %s, %s, 0x%08x, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User), - debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), pCtx, ppNamespace); + debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), context, ppNamespace); hr = parse_resource( NetworkResource, &server, &namespace ); if (hr != S_OK) return hr; @@ -187,7 +187,7 @@ static HRESULT WINAPI wbem_locator_ConnectServer( if (SecurityFlags) FIXME("unsupported flags\n"); - hr = WbemServices_create( namespace, (void **)ppNamespace ); + hr = WbemServices_create( namespace, context, (void **)ppNamespace ); heap_free( namespace ); heap_free( server ); if (SUCCEEDED( hr )) diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index bae4b5d20c5..7e1efe65874 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -236,7 +236,7 @@ HRESULT create_signature( const WCHAR *, const WCHAR *, enum param_direction, IWbemClassObject ** ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemServices_create(const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemServices_create(const WCHAR *, IWbemContext *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemContext_create(void **) DECLSPEC_HIDDEN; HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, struct record *, IWbemClassObject **) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : wbemdisp: Forward ISWbemNamedValueSet::Remove() to context object method.
by Alexandre Julliard 03 Mar '21

03 Mar '21

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

Nikolay Sivov : wbemdisp: Forward ISWbemNamedValueSet::DeleteAll() to context object.
by Alexandre Julliard 03 Mar '21

03 Mar '21

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

Nikolay Sivov : wbemdisp: Downgrade failing interface queries to warnings.
by Alexandre Julliard 03 Mar '21

03 Mar '21

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021