Hans Leidekker : wbemprox: Store the class name in the class object.
Alexandre Julliard
julliard at winehq.org
Mon Jul 30 14:18:52 CDT 2012
Module: wine
Branch: master
Commit: 12caddb4be1265811ecaff928eb35d1c6368a782
URL: http://source.winehq.org/git/wine.git/?a=commit;h=12caddb4be1265811ecaff928eb35d1c6368a782
Author: Hans Leidekker <hans at codeweavers.com>
Date: Mon Jul 30 15:04:30 2012 +0200
wbemprox: Store the class name in the class object.
---
dlls/wbemprox/class.c | 26 ++++++++++++++++----------
dlls/wbemprox/services.c | 2 +-
dlls/wbemprox/wbemprox_private.h | 3 ++-
3 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c
index 801a553..74e1c71 100644
--- a/dlls/wbemprox/class.c
+++ b/dlls/wbemprox/class.c
@@ -125,7 +125,7 @@ static HRESULT WINAPI enum_class_object_Next(
*puReturned = 0;
if (ec->index + uCount > view->count) return WBEM_S_FALSE;
- hr = WbemClassObject_create( NULL, iface, ec->index, (void **)apObjects );
+ hr = create_class_object( view->table->name, iface, ec->index, apObjects );
if (hr != S_OK) return hr;
ec->index++;
@@ -216,6 +216,7 @@ struct class_object
{
IWbemClassObject IWbemClassObject_iface;
LONG refs;
+ WCHAR *name;
IEnumWbemClassObject *iter;
UINT index;
};
@@ -242,6 +243,7 @@ static ULONG WINAPI class_object_Release(
{
TRACE("destroying %p\n", co);
if (co->iter) IEnumWbemClassObject_Release( co->iter );
+ heap_free( co->name );
heap_free( co );
}
return refs;
@@ -606,16 +608,14 @@ static HRESULT WINAPI class_object_GetMethod(
IWbemClassObject **ppOutSignature )
{
struct class_object *co = impl_from_IWbemClassObject( iface );
- struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter );
- struct view *view = ec->query->view;
HRESULT hr;
TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature);
- hr = create_signature( view->table->name, wszName, PARAM_IN, ppInSignature );
+ hr = create_signature( co->name, wszName, PARAM_IN, ppInSignature );
if (hr != S_OK) return hr;
- hr = create_signature( view->table->name, wszName, PARAM_OUT, ppOutSignature );
+ hr = create_signature( co->name, wszName, PARAM_OUT, ppOutSignature );
if (hr != S_OK) IWbemClassObject_Release( *ppInSignature );
return hr;
}
@@ -714,24 +714,30 @@ static const IWbemClassObjectVtbl class_object_vtbl =
class_object_GetMethodOrigin
};
-HRESULT WbemClassObject_create(
- IUnknown *pUnkOuter, IEnumWbemClassObject *iter, UINT index, LPVOID *ppObj )
+HRESULT create_class_object(
+ const WCHAR *name, IEnumWbemClassObject *iter, UINT index, IWbemClassObject **obj )
{
struct class_object *co;
- TRACE("%p, %p\n", pUnkOuter, ppObj);
+ TRACE("%s, %p\n", debugstr_w(name), obj);
co = heap_alloc( sizeof(*co) );
if (!co) return E_OUTOFMEMORY;
co->IWbemClassObject_iface.lpVtbl = &class_object_vtbl;
co->refs = 1;
+ co->name = heap_strdupW( name );
+ if (!co->name)
+ {
+ heap_free( co );
+ return E_OUTOFMEMORY;
+ }
co->iter = iter;
co->index = index;
if (iter) IEnumWbemClassObject_AddRef( iter );
- *ppObj = &co->IWbemClassObject_iface;
+ *obj = &co->IWbemClassObject_iface;
- TRACE("returning iface %p\n", *ppObj);
+ TRACE("returning iface %p\n", *obj);
return S_OK;
}
diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c
index 8c9c2f4..abd31c5 100644
--- a/dlls/wbemprox/services.c
+++ b/dlls/wbemprox/services.c
@@ -334,7 +334,7 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj )
free_path( path );
return hr;
}
- hr = WbemClassObject_create( NULL, iter, 0, (void **)obj );
+ hr = create_class_object( path->class, iter, 0, obj );
IEnumWbemClassObject_Release( iter );
free_path( path );
return hr;
diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h
index a5f0a42..34a3384 100644
--- a/dlls/wbemprox/wbemprox_private.h
+++ b/dlls/wbemprox/wbemprox_private.h
@@ -154,7 +154,8 @@ HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN;
HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN;
-HRESULT WbemClassObject_create(IUnknown *, IEnumWbemClassObject *, UINT, LPVOID *) DECLSPEC_HIDDEN;
+HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT,
+ IWbemClassObject **) DECLSPEC_HIDDEN;
HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPEC_HIDDEN;
static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
More information about the wine-cvs
mailing list