[3/5] wbemprox: Implement IWbemClassObject::SpawnInstance.
Hans Leidekker
hans at codeweavers.com
Thu Sep 6 07:03:50 CDT 2012
---
dlls/wbemprox/class.c | 56 ++++++++++++++++++++++++++++++++++----
dlls/wbemprox/services.c | 2 +-
dlls/wbemprox/wbemprox_private.h | 18 +++++++++++-
3 files changed, 69 insertions(+), 7 deletions(-)
diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c
index c0a8cd9..cc37b57 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 = create_class_object( view->table->name, iface, ec->index, apObjects );
+ hr = create_class_object( view->table->name, iface, ec->index, NULL, apObjects );
if (hr != S_OK) return hr;
ec->index++;
@@ -212,6 +212,40 @@ HRESULT EnumWbemClassObject_create(
return S_OK;
}
+static struct record *create_record( const struct column *columns, UINT num_cols )
+{
+ UINT i;
+ struct record *record;
+
+ if (!(record = heap_alloc( sizeof(struct record) ))) return NULL;
+ if (!(record->fields = heap_alloc( num_cols * sizeof(struct field) )))
+ {
+ heap_free( record );
+ return NULL;
+ }
+ for (i = 0; i < num_cols; i++)
+ {
+ record->fields[i].type = columns[i].type;
+ record->fields[i].u.ival = 0;
+ }
+ record->count = num_cols;
+ return record;
+}
+
+static void destroy_record( struct record *record )
+{
+ UINT i;
+
+ if (!record) return;
+ for (i = 0; i < record->count; i++)
+ {
+ if (record->fields[i].type == CIM_STRING || record->fields[i].type == CIM_DATETIME)
+ heap_free( record->fields[i].u.sval );
+ }
+ heap_free( record->fields );
+ heap_free( record );
+}
+
struct class_object
{
IWbemClassObject IWbemClassObject_iface;
@@ -221,6 +255,7 @@ struct class_object
UINT index;
UINT index_method;
UINT index_property;
+ struct record *record; /* uncommitted instance */
};
static inline struct class_object *impl_from_IWbemClassObject(
@@ -245,6 +280,7 @@ static ULONG WINAPI class_object_Release(
{
TRACE("destroying %p\n", co);
if (co->iter) IEnumWbemClassObject_Release( co->iter );
+ destroy_record( co->record );
heap_free( co->name );
heap_free( co );
}
@@ -495,8 +531,17 @@ static HRESULT WINAPI class_object_SpawnInstance(
LONG lFlags,
IWbemClassObject **ppNewInstance )
{
- FIXME("%p, %08x, %p\n", iface, lFlags, ppNewInstance);
- return E_NOTIMPL;
+ struct class_object *co = impl_from_IWbemClassObject( iface );
+ struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter );
+ struct view *view = ec->query->view;
+ struct record *record;
+
+ TRACE("%p, %08x, %p\n", iface, lFlags, ppNewInstance);
+
+ if (!(record = create_record( view->table->columns, view->table->num_cols )))
+ return E_OUTOFMEMORY;
+
+ return create_class_object( co->name, NULL, 0, record, ppNewInstance );
}
static HRESULT WINAPI class_object_CompareTo(
@@ -833,8 +878,8 @@ static const IWbemClassObjectVtbl class_object_vtbl =
class_object_GetMethodOrigin
};
-HRESULT create_class_object(
- const WCHAR *name, IEnumWbemClassObject *iter, UINT index, IWbemClassObject **obj )
+HRESULT create_class_object( const WCHAR *name, IEnumWbemClassObject *iter, UINT index,
+ struct record *record, IWbemClassObject **obj )
{
struct class_object *co;
@@ -855,6 +900,7 @@ HRESULT create_class_object(
co->index = index;
co->index_method = 0;
co->index_property = 0;
+ co->record = record;
if (iter) IEnumWbemClassObject_AddRef( iter );
*obj = &co->IWbemClassObject_iface;
diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c
index abd31c5..bf367c7 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 = create_class_object( path->class, iter, 0, obj );
+ hr = create_class_object( path->class, iter, 0, NULL, obj );
IEnumWbemClassObject_Release( iter );
free_path( path );
return hr;
diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h
index 69b04e7..e1f4d45 100644
--- a/dlls/wbemprox/wbemprox_private.h
+++ b/dlls/wbemprox/wbemprox_private.h
@@ -66,6 +66,22 @@ struct property
const struct property *next;
};
+struct field
+{
+ UINT type;
+ union
+ {
+ LONGLONG ival;
+ WCHAR *sval;
+ } u;
+};
+
+struct record
+{
+ UINT count;
+ struct field *fields;
+};
+
enum operator
{
OP_EQ = 1,
@@ -157,7 +173,7 @@ const WCHAR *get_property_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN;
HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN;
HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT,
- IWbemClassObject **) DECLSPEC_HIDDEN;
+ struct record *, IWbemClassObject **) DECLSPEC_HIDDEN;
HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPEC_HIDDEN;
static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
--
1.7.10.4
More information about the wine-patches
mailing list