[ros-diffs] [akhaldi] 67514: [WBEMDISP] Sync with Wine Staging 1.7.37. CORE-9246

Author: akhaldi
Date: Sat May  2 19:38:14 2015
New Revision: 67514

URL: http://svn.reactos.org/svn/reactos?rev=67514&view=rev
Log:
[WBEMDISP] Sync with Wine Staging 1.7.37. CORE-9246

Modified:
    trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt
    trunk/reactos/dll/win32/wbemdisp/guid.c
    trunk/reactos/dll/win32/wbemdisp/locator.c
    trunk/reactos/dll/win32/wbemdisp/main.c
    trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt	[iso-8859-1] Sat May  2 19:38:14 2015
@@ -27,6 +27,6 @@
 set_module_type(wbemdisp win32dll)
 target_link_libraries(wbemdisp uuid wine)
 add_dependencies(wbemdisp stdole2 wbemdisp_idlheader)
-add_importlibs(wbemdisp oleaut32 msvcrt kernel32 ntdll)
+add_importlibs(wbemdisp oleaut32 ole32 msvcrt kernel32 ntdll)
 add_pch(wbemdisp wbemdisp_private.h SOURCE)
 add_cd_file(TARGET wbemdisp DESTINATION reactos/system32/wbem FOR all)

Modified: trunk/reactos/dll/win32/wbemdisp/guid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/guid.c?…
==============================================================================
--- trunk/reactos/dll/win32/wbemdisp/guid.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemdisp/guid.c	[iso-8859-1] Sat May  2 19:38:14 2015
@@ -12,5 +12,7 @@
 #include <initguid.h>
 #include <wbemdisp_classes.h>
 #include <wbemdisp.h>
+#include <wbemcli.h>
+#include <wmiutils.h>
 
 /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

Modified: trunk/reactos/dll/win32/wbemdisp/locator.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/locator…
==============================================================================
--- trunk/reactos/dll/win32/wbemdisp/locator.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemdisp/locator.c	[iso-8859-1] Sat May  2 19:38:14 2015
@@ -18,78 +18,16 @@
 
 #include "wbemdisp_private.h"
 
-#include <winnls.h>
-#include <oleauto.h>
-
-struct locator
-{
-    ISWbemLocator ISWbemLocator_iface;
-    LONG refs;
-};
-
-static inline struct locator *impl_from_ISWbemLocator( ISWbemLocator *iface )
-{
-    return CONTAINING_RECORD( iface, struct locator, ISWbemLocator_iface );
-}
-
-static ULONG WINAPI locator_AddRef(
-    ISWbemLocator *iface )
-{
-    struct locator *locator = impl_from_ISWbemLocator( iface );
-    return InterlockedIncrement( &locator->refs );
-}
-
-static ULONG WINAPI locator_Release(
-    ISWbemLocator *iface )
-{
-    struct locator *locator = impl_from_ISWbemLocator( iface );
-    LONG refs = InterlockedDecrement( &locator->refs );
-    if (!refs)
-    {
-        TRACE( "destroying %p\n", locator );
-        heap_free( locator );
-    }
-    return refs;
-}
-
-static HRESULT WINAPI locator_QueryInterface(
-    ISWbemLocator *iface,
-    REFIID riid,
-    void **ppvObject )
-{
-    struct locator *locator = impl_from_ISWbemLocator( iface );
-
-    TRACE( "%p, %s, %p\n", locator, debugstr_guid( riid ), ppvObject );
-
-    if (IsEqualGUID( riid, &IID_ISWbemLocator ) ||
-        IsEqualGUID( riid, &IID_IDispatch ) ||
-        IsEqualGUID( riid, &IID_IUnknown ))
-    {
-        *ppvObject = iface;
-    }
-    else
-    {
-        FIXME( "interface %s not implemented\n", debugstr_guid(riid) );
-        return E_NOINTERFACE;
-    }
-    ISWbemLocator_AddRef( iface );
-    return S_OK;
-}
-
-static HRESULT WINAPI locator_GetTypeInfoCount(
-    ISWbemLocator *iface,
-    UINT *count )
-{
-    struct locator *locator = impl_from_ISWbemLocator( iface );
-
-    TRACE( "%p, %p\n", locator, count );
-    *count = 1;
-    return S_OK;
-}
+#include <wbemcli.h>
+
+static HRESULT EnumVARIANT_create( IEnumWbemClassObject *, IEnumVARIANT ** );
 
 enum type_id
 {
     ISWbemLocator_tid,
+    ISWbemObject_tid,
+    ISWbemObjectSet_tid,
+    ISWbemServices_tid,
     last_tid
 };
 
@@ -98,7 +36,10 @@
 
 static REFIID wbemdisp_tid_id[] =
 {
-    &IID_ISWbemLocator
+    &IID_ISWbemLocator,
+    &IID_ISWbemObject,
+    &IID_ISWbemObjectSet,
+    &IID_ISWbemServices
 };
 
 static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret )
@@ -132,6 +73,1179 @@
             ITypeInfo_Release( typeinfo );
     }
     *ret = wbemdisp_typeinfo[tid];
+    ITypeInfo_AddRef( *ret );
+    return S_OK;
+}
+
+#define DISPID_BASE 0x1800000
+
+struct member
+{
+    BSTR name;
+    DISPID dispid;
+};
+
+struct object
+{
+    ISWbemObject ISWbemObject_iface;
+    LONG refs;
+    IWbemClassObject *object;
+    struct member *members;
+    UINT nb_members;
+    DISPID last_dispid;
+};
+
+static inline struct object *impl_from_ISWbemObject(
+    ISWbemObject *iface )
+{
+    return CONTAINING_RECORD( iface, struct object, ISWbemObject_iface );
+}
+
+static ULONG WINAPI object_AddRef(
+    ISWbemObject *iface )
+{
+    struct object *object = impl_from_ISWbemObject( iface );
+    return InterlockedIncrement( &object->refs );
+}
+
+static ULONG WINAPI object_Release(
+    ISWbemObject *iface )
+{
+    struct object *object = impl_from_ISWbemObject( iface );
+    LONG refs = InterlockedDecrement( &object->refs );
+    if (!refs)
+    {
+        UINT i;
+
+        TRACE( "destroying %p\n", object );
+        IWbemClassObject_Release( object->object );
+        for (i = 0; i < object->nb_members; i++) SysFreeString(
object->members[i].name );
+        heap_free( object->members );
+        heap_free( object );
+    }
+    return refs;
+}
+
+static HRESULT WINAPI object_QueryInterface(
+    ISWbemObject *iface,
+    REFIID riid,
+    void **ppvObject )
+{
+    struct object *object = impl_from_ISWbemObject( iface );
+
+    TRACE( "%p %s %p\n", object, debugstr_guid(riid), ppvObject );
+
+    if (IsEqualGUID( riid, &IID_ISWbemObject ) ||
+        IsEqualGUID( riid, &IID_IDispatch ) ||
+        IsEqualGUID( riid, &IID_IUnknown ))
+    {
+        *ppvObject = object;
+    }
+    else
+    {
+        FIXME( "interface %s not implemented\n", debugstr_guid(riid) );
+        return E_NOINTERFACE;
+    }
+    ISWbemObject_AddRef( iface );
+    return S_OK;
+}
+
+static HRESULT WINAPI object_GetTypeInfoCount(
+    ISWbemObject *iface,
+    UINT *count )
+{
+    struct object *object = impl_from_ISWbemObject( iface );
+
+    TRACE( "%p, %p\n", object, count );
+    *count = 1;
+    return S_OK;
+}
+
+static HRESULT WINAPI object_GetTypeInfo(
+    ISWbemObject *iface,
+    UINT index,
+    LCID lcid,
+    ITypeInfo **info )
+{
+    struct object *object = impl_from_ISWbemObject( iface );
+    FIXME( "%p, %u, %u, %p\n", object, index, lcid, info );
+    return E_NOTIMPL;
+}
+
+#define DISPID_BASE 0x1800000
+
+static HRESULT init_members( struct object *object )
+{
+    LONG bound, i;
+    SAFEARRAY *sa;
+    HRESULT hr;
+
+    if (object->members) return S_OK;
+
+    hr = IWbemClassObject_GetNames( object->object, NULL, 0, NULL, &sa );
+    if (FAILED( hr )) return hr;
+    hr = SafeArrayGetUBound( sa, 1, &bound );
+    if (FAILED( hr ))
+    {
+        SafeArrayDestroy( sa );
+        return hr;
+    }
+    if (!(object->members = heap_alloc( sizeof(struct member) * (bound + 1) )))
+    {
+        SafeArrayDestroy( sa );
+        return E_OUTOFMEMORY;
+    }
+    for (i = 0; i <= bound; i++)
+    {
+        hr = SafeArrayGetElement( sa, &i, &object->members[i].name );
+        if (FAILED( hr ))
+        {
+            for (i--; i >= 0; i--) SysFreeString( object->members[i].name );
+            SafeArrayDestroy( sa );
+            heap_free( object->members );
+            object->members = NULL;
+            return E_OUTOFMEMORY;
+        }
+        object->members[i].dispid = 0;
+    }
+    object->nb_members = bound + 1;
+    SafeArrayDestroy( sa );
+    return S_OK;
+}
+
+static DISPID get_member_dispid( struct object *object, const WCHAR *name )
+{
+    UINT i;
+    for (i = 0; i < object->nb_members; i++)
+    {
+        if (!strcmpiW( object->members[i].name, name ))
+        {
+            if (!object->members[i].dispid) object->members[i].dispid =
++object->last_dispid;
+            return object->members[i].dispid;
+        }
+    }
+    return DISPID_UNKNOWN;
+}
+
+static HRESULT WINAPI object_GetIDsOfNames(
+    ISWbemObject *iface,
+    REFIID riid,
+    LPOLESTR *names,
+    UINT count,
+    LCID lcid,
+    DISPID *dispid )
+{
+    struct object *object = impl_from_ISWbemObject( iface );
+    HRESULT hr;
+    UINT i;
+
+    TRACE( "%p, %s, %p, %u, %u, %p\n", object, debugstr_guid(riid), names,
count, lcid, dispid );
+
+    if (!names || !count || !dispid) return E_INVALIDARG;
+
+    hr = init_members( object );
+    if (FAILED( hr )) return hr;
+
+    for (i = 0; i < count; i++)
+    {
+        if ((dispid[i] = get_member_dispid( object, names[i] )) == DISPID_UNKNOWN)
break;
+    }
+    if (i != count) return DISP_E_UNKNOWNNAME;
+    return S_OK;
+}
+
+static BSTR get_member_name( struct object *object, DISPID dispid )
+{
+    UINT i;
+    for (i = 0; i < object->nb_members; i++)
+    {
+        if (object->members[i].dispid == dispid) return object->members[i].name;
+    }
+    return NULL;
+}
+
+static HRESULT WINAPI object_Invoke(
+    ISWbemObject *iface,
+    DISPID member,
+    REFIID riid,
+    LCID lcid,
+    WORD flags,
+    DISPPARAMS *params,
+    VARIANT *result,
+    EXCEPINFO *excep_info,
+    UINT *arg_err )
+{
+    struct object *object = impl_from_ISWbemObject( iface );
+    BSTR name;
+
+    TRACE( "%p, %x, %s, %u, %x, %p, %p, %p, %p\n", object, member,
debugstr_guid(riid),
+           lcid, flags, params, result, excep_info, arg_err );
+
+    if (flags != (DISPATCH_METHOD|DISPATCH_PROPERTYGET))
+    {
+        FIXME( "flags %x not supported\n", flags );
+        return E_NOTIMPL;
+    }
+    if (!(name = get_member_name( object, member )))
+        return DISP_E_MEMBERNOTFOUND;
+
+    memset( params, 0, sizeof(*params) );
+    return IWbemClassObject_Get( object->object, name, 0, result, NULL, NULL );
+}
+
+static HRESULT WINAPI object_Put_(
+    ISWbemObject *iface,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    ISWbemObjectPath **objWbemObjectPath )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static const ISWbemObjectVtbl object_vtbl =
+{
+    object_QueryInterface,
+    object_AddRef,
+    object_Release,
+    object_GetTypeInfoCount,
+    object_GetTypeInfo,
+    object_GetIDsOfNames,
+    object_Invoke,
+    object_Put_
+};
+
+static HRESULT SWbemObject_create( IWbemClassObject *wbem_object, ISWbemObject **obj )
+{
+    struct object *object;
+
+    TRACE( "%p, %p\n", obj, wbem_object );
+
+    if (!(object = heap_alloc( sizeof(*object) ))) return E_OUTOFMEMORY;
+    object->ISWbemObject_iface.lpVtbl = &object_vtbl;
+    object->refs = 1;
+    object->object = wbem_object;
+    IWbemClassObject_AddRef( object->object );
+    object->members = NULL;
+    object->nb_members = 0;
+    object->last_dispid = DISPID_BASE;
+
+    *obj = &object->ISWbemObject_iface;
+    TRACE( "returning iface %p\n", *obj );
+    return S_OK;
+}
+
+struct objectset
+{
+    ISWbemObjectSet ISWbemObjectSet_iface;
+    LONG refs;
+    IEnumWbemClassObject *objectenum;
+};
+
+static inline struct objectset *impl_from_ISWbemObjectSet(
+    ISWbemObjectSet *iface )
+{
+    return CONTAINING_RECORD( iface, struct objectset, ISWbemObjectSet_iface );
+}
+
+static ULONG WINAPI objectset_AddRef(
+    ISWbemObjectSet *iface )
+{
+    struct objectset *objectset = impl_from_ISWbemObjectSet( iface );
+    return InterlockedIncrement( &objectset->refs );
+}
+
+static ULONG WINAPI objectset_Release(
+    ISWbemObjectSet *iface )
+{
+    struct objectset *objectset = impl_from_ISWbemObjectSet( iface );
+    LONG refs = InterlockedDecrement( &objectset->refs );
+    if (!refs)
+    {
+        TRACE( "destroying %p\n", objectset );
+        IEnumWbemClassObject_Release( objectset->objectenum );
+        heap_free( objectset );
+    }
+    return refs;
+}
+
+static HRESULT WINAPI objectset_QueryInterface(
+    ISWbemObjectSet *iface,
+    REFIID riid,
+    void **ppvObject )
+{
+    struct objectset *objectset = impl_from_ISWbemObjectSet( iface );
+
+    TRACE( "%p %s %p\n", objectset, debugstr_guid(riid), ppvObject );
+
+    if (IsEqualGUID( riid, &IID_ISWbemObjectSet ) ||
+        IsEqualGUID( riid, &IID_IDispatch ) ||
+        IsEqualGUID( riid, &IID_IUnknown ))
+    {
+        *ppvObject = objectset;
+    }
+    else
+    {
+        FIXME( "interface %s not implemented\n", debugstr_guid(riid) );
+        return E_NOINTERFACE;
+    }
+    ISWbemObjectSet_AddRef( iface );
+    return S_OK;
+}
+
+static HRESULT WINAPI objectset_GetTypeInfoCount(
+    ISWbemObjectSet *iface,
+    UINT *count )
+{
+    struct objectset *objectset = impl_from_ISWbemObjectSet( iface );
+    TRACE( "%p, %p\n", objectset, count );
+    *count = 1;
+    return S_OK;
+}
+
+static HRESULT WINAPI objectset_GetTypeInfo(
+    ISWbemObjectSet *iface,
+    UINT index,
+    LCID lcid,
+    ITypeInfo **info )
+{
+    struct objectset *objectset = impl_from_ISWbemObjectSet( iface );
+    TRACE( "%p, %u, %u, %p\n", objectset, index, lcid, info );
+
+    return get_typeinfo( ISWbemObjectSet_tid, info );
+}
+
+static HRESULT WINAPI objectset_GetIDsOfNames(
+    ISWbemObjectSet *iface,
+    REFIID riid,
+    LPOLESTR *names,
+    UINT count,
+    LCID lcid,
+    DISPID *dispid )
+{
+    struct objectset *objectset = impl_from_ISWbemObjectSet( iface );
+    ITypeInfo *typeinfo;
+    HRESULT hr;
+
+    TRACE( "%p, %s, %p, %u, %u, %p\n", objectset, debugstr_guid(riid), names,
count, lcid, dispid );
+
+    if (!names || !count || !dispid) return E_INVALIDARG;
+
+    hr = get_typeinfo( ISWbemObjectSet_tid, &typeinfo );
+    if (SUCCEEDED(hr))
+    {
+        hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid );
+        ITypeInfo_Release( typeinfo );
+    }
+    return hr;
+}
+
+static HRESULT WINAPI objectset_Invoke(
+    ISWbemObjectSet *iface,
+    DISPID member,
+    REFIID riid,
+    LCID lcid,
+    WORD flags,
+    DISPPARAMS *params,
+    VARIANT *result,
+    EXCEPINFO *excep_info,
+    UINT *arg_err )
+{
+    struct objectset *objectset = impl_from_ISWbemObjectSet( iface );
+    ITypeInfo *typeinfo;
+    HRESULT hr;
+
+    TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", objectset, member,
debugstr_guid(riid),
+           lcid, flags, params, result, excep_info, arg_err );
+
+    hr = get_typeinfo( ISWbemObjectSet_tid, &typeinfo );
+    if (SUCCEEDED(hr))
+    {
+        hr = ITypeInfo_Invoke( typeinfo, &objectset->ISWbemObjectSet_iface,
member, flags,
+                               params, result, excep_info, arg_err );
+        ITypeInfo_Release( typeinfo );
+    }
+    return hr;
+}
+
+static HRESULT WINAPI objectset_get__NewEnum(
+    ISWbemObjectSet *iface,
+    IUnknown **pUnk )
+{
+    struct objectset *objectset = impl_from_ISWbemObjectSet( iface );
+    IEnumWbemClassObject *objectenum;
+    HRESULT hr;
+
+    TRACE( "%p, %p\n", objectset, pUnk );
+
+    hr = IEnumWbemClassObject_Clone( objectset->objectenum, &objectenum );
+    if (FAILED( hr )) return hr;
+
+    hr = EnumVARIANT_create( objectenum, (IEnumVARIANT **)pUnk );
+    IEnumWbemClassObject_Release( objectenum );
+    return hr;
+}
+
+static HRESULT WINAPI objectset_Item(
+    ISWbemObjectSet *iface,
+    BSTR strObjectPath,
+    LONG iFlags,
+    ISWbemObject **objWbemObject )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI objectset_get_Count(
+    ISWbemObjectSet *iface,
+    LONG *iCount )
+{
+    struct objectset *objectset = impl_from_ISWbemObjectSet( iface );
+    LONG count = 0, total = 0;
+
+    TRACE( "%p, %p\n", objectset, iCount );
+
+    while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) ==
S_OK) count++;
+
+    IEnumWbemClassObject_Reset( objectset->objectenum );
+    while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) ==
S_OK) total++;
+
+    count = total - count;
+    IEnumWbemClassObject_Reset( objectset->objectenum );
+    while (count--) IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1
);
+
+    *iCount = total;
+    return S_OK;
+}
+
+static HRESULT WINAPI objectset_get_Security_(
+    ISWbemObjectSet *iface,
+    ISWbemSecurity **objWbemSecurity )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI objectset_ItemIndex(
+    ISWbemObjectSet *iface,
+    LONG lIndex,
+    ISWbemObject **objWbemObject )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static const ISWbemObjectSetVtbl objectset_vtbl =
+{
+    objectset_QueryInterface,
+    objectset_AddRef,
+    objectset_Release,
+    objectset_GetTypeInfoCount,
+    objectset_GetTypeInfo,
+    objectset_GetIDsOfNames,
+    objectset_Invoke,
+    objectset_get__NewEnum,
+    objectset_Item,
+    objectset_get_Count,
+    objectset_get_Security_,
+    objectset_ItemIndex
+};
+
+static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum,
ISWbemObjectSet **obj )
+{
+    struct objectset *objectset;
+
+    TRACE( "%p, %p\n", obj, wbem_objectenum );
+
+    if (!(objectset = heap_alloc( sizeof(*objectset) ))) return E_OUTOFMEMORY;
+    objectset->ISWbemObjectSet_iface.lpVtbl = &objectset_vtbl;
+    objectset->refs = 1;
+    objectset->objectenum = wbem_objectenum;
+    IEnumWbemClassObject_AddRef( objectset->objectenum );
+
+    *obj = &objectset->ISWbemObjectSet_iface;
+    TRACE( "returning iface %p\n", *obj );
+    return S_OK;
+}
+
+struct enumvar
+{
+    IEnumVARIANT IEnumVARIANT_iface;
+    LONG refs;
+    IEnumWbemClassObject *objectenum;
+};
+
+static inline struct enumvar *impl_from_IEnumVARIANT(
+    IEnumVARIANT *iface )
+{
+    return CONTAINING_RECORD( iface, struct enumvar, IEnumVARIANT_iface );
+}
+
+static ULONG WINAPI enumvar_AddRef(
+    IEnumVARIANT *iface )
+{
+    struct enumvar *enumvar = impl_from_IEnumVARIANT( iface );
+    return InterlockedIncrement( &enumvar->refs );
+}
+
+static ULONG WINAPI enumvar_Release(
+    IEnumVARIANT *iface )
+{
+    struct enumvar *enumvar = impl_from_IEnumVARIANT( iface );
+    LONG refs = InterlockedDecrement( &enumvar->refs );
+    if (!refs)
+    {
+        TRACE( "destroying %p\n", enumvar );
+        IEnumWbemClassObject_Release( enumvar->objectenum );
+        heap_free( enumvar );
+    }
+    return refs;
+}
+
+static HRESULT WINAPI enumvar_QueryInterface(
+    IEnumVARIANT *iface,
+    REFIID riid,
+    void **ppvObject )
+{
+    struct enumvar *enumvar = impl_from_IEnumVARIANT( iface );
+
+    TRACE( "%p %s %p\n", enumvar, debugstr_guid(riid), ppvObject );
+
+    if (IsEqualGUID( riid, &IID_IEnumVARIANT ) ||
+        IsEqualGUID( riid, &IID_IUnknown ))
+    {
+        *ppvObject = enumvar;
+    }
+    else
+    {
+        FIXME( "interface %s not implemented\n", debugstr_guid(riid) );
+        return E_NOINTERFACE;
+    }
+    IEnumVARIANT_AddRef( iface );
+    return S_OK;
+}
+
+static HRESULT WINAPI enumvar_Next( IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG
*fetched )
+{
+    struct enumvar *enumvar = impl_from_IEnumVARIANT( iface );
+    IWbemClassObject *obj;
+    ULONG count = 0;
+
+    TRACE( "%p, %u, %p, %p\n", iface, celt, var, fetched );
+
+    if (celt) IEnumWbemClassObject_Next( enumvar->objectenum, WBEM_INFINITE, 1,
&obj, &count );
+    if (count)
+    {
+        ISWbemObject *sobj;
+        HRESULT hr;
+
+        hr = SWbemObject_create( obj, &sobj );
+        IWbemClassObject_Release( obj );
+        if (FAILED( hr )) return hr;
+
+        V_VT( var ) = VT_DISPATCH;
+        V_DISPATCH( var ) = (IDispatch *)sobj;
+    }
+    if (fetched) *fetched = count;
+    return (count < celt) ? S_FALSE : S_OK;
+}
+
+static HRESULT WINAPI enumvar_Skip( IEnumVARIANT *iface, ULONG celt )
+{
+    struct enumvar *enumvar = impl_from_IEnumVARIANT( iface );
+
+    TRACE( "%p, %u\n", iface, celt );
+
+    return IEnumWbemClassObject_Skip( enumvar->objectenum, WBEM_INFINITE, celt );
+}
+
+static HRESULT WINAPI enumvar_Reset( IEnumVARIANT *iface )
+{
+    struct enumvar *enumvar = impl_from_IEnumVARIANT( iface );
+
+    TRACE( "%p\n", iface );
+
+    return IEnumWbemClassObject_Reset( enumvar->objectenum );
+}
+
+static HRESULT WINAPI enumvar_Clone( IEnumVARIANT *iface, IEnumVARIANT **penum )
+{
+    FIXME( "%p, %p\n", iface, penum );
+    return E_NOTIMPL;
+}
+
+static const struct IEnumVARIANTVtbl enumvar_vtbl =
+{
+    enumvar_QueryInterface,
+    enumvar_AddRef,
+    enumvar_Release,
+    enumvar_Next,
+    enumvar_Skip,
+    enumvar_Reset,
+    enumvar_Clone
+};
+
+static HRESULT EnumVARIANT_create( IEnumWbemClassObject *objectenum, IEnumVARIANT **obj
)
+{
+    struct enumvar *enumvar;
+
+    if (!(enumvar = heap_alloc( sizeof(*enumvar) ))) return E_OUTOFMEMORY;
+    enumvar->IEnumVARIANT_iface.lpVtbl = &enumvar_vtbl;
+    enumvar->refs = 1;
+    enumvar->objectenum = objectenum;
+    IEnumWbemClassObject_AddRef( enumvar->objectenum );
+
+    *obj = &enumvar->IEnumVARIANT_iface;
+    TRACE( "returning iface %p\n", *obj );
+    return S_OK;
+}
+
+struct services
+{
+    ISWbemServices ISWbemServices_iface;
+    LONG refs;
+    IWbemServices *services;
+};
+
+static inline struct services *impl_from_ISWbemServices(
+    ISWbemServices *iface )
+{
+    return CONTAINING_RECORD( iface, struct services, ISWbemServices_iface );
+}
+
+static ULONG WINAPI services_AddRef(
+    ISWbemServices *iface )
+{
+    struct services *services = impl_from_ISWbemServices( iface );
+    return InterlockedIncrement( &services->refs );
+}
+
+static ULONG WINAPI services_Release(
+    ISWbemServices *iface )
+{
+    struct services *services = impl_from_ISWbemServices( iface );
+    LONG refs = InterlockedDecrement( &services->refs );
+    if (!refs)
+    {
+        TRACE( "destroying %p\n", services );
+        IWbemServices_Release( services->services );
+        heap_free( services );
+    }
+    return refs;
+}
+
+static HRESULT WINAPI services_QueryInterface(
+    ISWbemServices *iface,
+    REFIID riid,
+    void **ppvObject )
+{
+    struct services *services = impl_from_ISWbemServices( iface );
+
+    TRACE( "%p %s %p\n", services, debugstr_guid(riid), ppvObject );
+
+    if (IsEqualGUID( riid, &IID_ISWbemServices ) ||
+        IsEqualGUID( riid, &IID_IDispatch ) ||
+        IsEqualGUID( riid, &IID_IUnknown ))
+    {
+        *ppvObject = services;
+    }
+    else
+    {
+        FIXME( "interface %s not implemented\n", debugstr_guid(riid) );
+        return E_NOINTERFACE;
+    }
+    ISWbemServices_AddRef( iface );
+    return S_OK;
+}
+
+static HRESULT WINAPI services_GetTypeInfoCount(
+    ISWbemServices *iface,
+    UINT *count )
+{
+    struct services *services = impl_from_ISWbemServices( iface );
+    TRACE( "%p, %p\n", services, count );
+
+    *count = 1;
+    return S_OK;
+}
+
+static HRESULT WINAPI services_GetTypeInfo(
+    ISWbemServices *iface,
+    UINT index,
+    LCID lcid,
+    ITypeInfo **info )
+{
+    struct services *services = impl_from_ISWbemServices( iface );
+    TRACE( "%p, %u, %u, %p\n", services, index, lcid, info );
+
+    return get_typeinfo( ISWbemServices_tid, info );
+}
+
+static HRESULT WINAPI services_GetIDsOfNames(
+    ISWbemServices *iface,
+    REFIID riid,
+    LPOLESTR *names,
+    UINT count,
+    LCID lcid,
+    DISPID *dispid )
+{
+    struct services *services = impl_from_ISWbemServices( iface );
+    ITypeInfo *typeinfo;
+    HRESULT hr;
+
+    TRACE( "%p, %s, %p, %u, %u, %p\n", services, debugstr_guid(riid), names,
count, lcid, dispid );
+
+    if (!names || !count || !dispid) return E_INVALIDARG;
+
+    hr = get_typeinfo( ISWbemServices_tid, &typeinfo );
+    if (SUCCEEDED(hr))
+    {
+        hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid );
+        ITypeInfo_Release( typeinfo );
+    }
+    return hr;
+}
+
+static HRESULT WINAPI services_Invoke(
+    ISWbemServices *iface,
+    DISPID member,
+    REFIID riid,
+    LCID lcid,
+    WORD flags,
+    DISPPARAMS *params,
+    VARIANT *result,
+    EXCEPINFO *excep_info,
+    UINT *arg_err )
+{
+    struct services *services = impl_from_ISWbemServices( iface );
+    ITypeInfo *typeinfo;
+    HRESULT hr;
+
+    TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", services, member,
debugstr_guid(riid),
+           lcid, flags, params, result, excep_info, arg_err );
+
+    hr = get_typeinfo( ISWbemServices_tid, &typeinfo );
+    if (SUCCEEDED(hr))
+    {
+        hr = ITypeInfo_Invoke( typeinfo, &services->ISWbemServices_iface, member,
flags,
+                               params, result, excep_info, arg_err );
+        ITypeInfo_Release( typeinfo );
+    }
+    return hr;
+}
+
+static HRESULT WINAPI services_Get(
+    ISWbemServices *iface,
+    BSTR strObjectPath,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    ISWbemObject **objWbemObject )
+{
+    struct services *services = impl_from_ISWbemServices( iface );
+    IWbemClassObject *obj;
+    HRESULT hr;
+
+    TRACE( "%p, %s, %d, %p, %p\n", iface, debugstr_w(strObjectPath), iFlags,
objWbemNamedValueSet,
+           objWbemObject );
+
+    if (objWbemNamedValueSet) FIXME( "ignoring context\n" );
+
+    hr = IWbemServices_GetObject( services->services, strObjectPath, iFlags, NULL,
&obj, NULL );
+    if (hr != S_OK) return hr;
+
+    hr = SWbemObject_create( obj, objWbemObject );
+    IWbemClassObject_Release( obj );
+    return hr;
+}
+
+static HRESULT WINAPI services_GetAsync(
+    ISWbemServices *iface,
+    IDispatch *objWbemSink,
+    BSTR strObjectPath,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    IDispatch *objWbemAsyncContext )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI services_Delete(
+    ISWbemServices *iface,
+    BSTR strObjectPath,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI services_DeleteAsync(
+    ISWbemServices* This,
+    IDispatch *objWbemSink,
+    BSTR strObjectPath,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    IDispatch *objWbemAsyncContext )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static BSTR build_query_string( const WCHAR *class )
+{
+    static const WCHAR selectW[] =
{'S','E','L','E','C','T','
','*',' ','F','R','O','M','
',0};
+    UINT len = strlenW(class) + sizeof(selectW) / sizeof(selectW[0]);
+    BSTR ret;
+
+    if (!(ret = SysAllocStringLen( NULL, len ))) return NULL;
+    strcpyW( ret, selectW );
+    strcatW( ret, class );
+    return ret;
+}
+
+static HRESULT WINAPI services_InstancesOf(
+    ISWbemServices *iface,
+    BSTR strClass,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    ISWbemObjectSet **objWbemObjectSet )
+{
+    static const WCHAR wqlW[] = {'W','Q','L',0};
+    BSTR query, wql = SysAllocString( wqlW );
+    HRESULT hr;
+
+    TRACE( "%p, %s, %x, %p, %p\n", iface, debugstr_w(strClass), iFlags,
objWbemNamedValueSet,
+           objWbemObjectSet );
+
+    if (!(query = build_query_string( strClass )))
+    {
+        SysFreeString( wql );
+        return E_OUTOFMEMORY;
+    }
+    hr = ISWbemServices_ExecQuery( iface, query, wql, iFlags, objWbemNamedValueSet,
objWbemObjectSet );
+    SysFreeString( wql );
+    SysFreeString( query );
+    return hr;
+}
+
+static HRESULT WINAPI services_InstancesOfAsync(
+    ISWbemServices *iface,
+    IDispatch *objWbemSink,
+    BSTR strClass,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    IDispatch *objWbemAsyncContext )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI services_SubclassesOf(
+    ISWbemServices *iface,
+    BSTR strSuperclass,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    ISWbemObjectSet **objWbemObjectSet )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI services_SubclassesOfAsync(
+    ISWbemServices *iface,
+    IDispatch *objWbemSink,
+    BSTR strSuperclass,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    IDispatch *objWbemAsyncContext )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI services_ExecQuery(
+    ISWbemServices *iface,
+    BSTR strQuery,
+    BSTR strQueryLanguage,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    ISWbemObjectSet **objWbemObjectSet )
+{
+    struct services *services = impl_from_ISWbemServices( iface );
+    IEnumWbemClassObject *iter;
+    HRESULT hr;
+
+    TRACE( "%p, %s, %s, %x, %p, %p\n", iface, debugstr_w(strQuery),
debugstr_w(strQueryLanguage),
+           iFlags, objWbemNamedValueSet, objWbemObjectSet );
+
+    if (objWbemNamedValueSet) FIXME( "ignoring context\n" );
+
+    hr = IWbemServices_ExecQuery( services->services, strQueryLanguage, strQuery,
iFlags, NULL, &iter );
+    if (hr != S_OK) return hr;
+
+    hr = SWbemObjectSet_create( iter, objWbemObjectSet );
+    IEnumWbemClassObject_Release( iter );
+    return hr;
+}
+
+static HRESULT WINAPI services_ExecQueryAsync(
+    ISWbemServices *iface,
+    IDispatch *objWbemSink,
+    BSTR strQuery,
+    BSTR strQueryLanguage,
+    LONG lFlags,
+    IDispatch *objWbemNamedValueSet,
+    IDispatch *objWbemAsyncContext )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI services_AssociatorsOf(
+    ISWbemServices *iface,
+    BSTR strObjectPath,
+    BSTR strAssocClass,
+    BSTR strResultClass,
+    BSTR strResultRole,
+    BSTR strRole,
+    VARIANT_BOOL bClassesOnly,
+    VARIANT_BOOL bSchemaOnly,
+    BSTR strRequiredAssocQualifier,
+    BSTR strRequiredQualifier,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    ISWbemObjectSet **objWbemObjectSet )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI services_AssociatorsOfAsync(
+    ISWbemServices *iface,
+    IDispatch *objWbemSink,
+    BSTR strObjectPath,
+    BSTR strAssocClass,
+    BSTR strResultClass,
+    BSTR strResultRole,
+    BSTR strRole,
+    VARIANT_BOOL bClassesOnly,
+    VARIANT_BOOL bSchemaOnly,
+    BSTR strRequiredAssocQualifier,
+    BSTR strRequiredQualifier,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    IDispatch *objWbemAsyncContext )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI services_ReferencesTo(
+    ISWbemServices *iface,
+    BSTR strObjectPath,
+    BSTR strResultClass,
+    BSTR strRole,
+    VARIANT_BOOL bClassesOnly,
+    VARIANT_BOOL bSchemaOnly,
+    BSTR strRequiredQualifier,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    ISWbemObjectSet **objWbemObjectSet )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI services_ReferencesToAsync(
+    ISWbemServices *iface,
+    IDispatch *objWbemSink,
+    BSTR strObjectPath,
+    BSTR strResultClass,
+    BSTR strRole,
+    VARIANT_BOOL bClassesOnly,
+    VARIANT_BOOL bSchemaOnly,
+    BSTR strRequiredQualifier,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    IDispatch *objWbemAsyncContext )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI services_ExecNotificationQuery(
+    ISWbemServices *iface,
+    BSTR strQuery,
+    BSTR strQueryLanguage,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    ISWbemEventSource **objWbemEventSource )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI services_ExecNotificationQueryAsync(
+    ISWbemServices *iface,
+    IDispatch *objWbemSink,
+    BSTR strQuery,
+    BSTR strQueryLanguage,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    IDispatch *objWbemAsyncContext )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI services_ExecMethod(
+    ISWbemServices *iface,
+    BSTR strObjectPath,
+    BSTR strMethodName,
+    IDispatch *objWbemInParameters,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    ISWbemObject **objWbemOutParameters )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI services_ExecMethodAsync(
+    ISWbemServices *iface,
+    IDispatch *objWbemSink,
+    BSTR strObjectPath,
+    BSTR strMethodName,
+    IDispatch *objWbemInParameters,
+    LONG iFlags,
+    IDispatch *objWbemNamedValueSet,
+    IDispatch *objWbemAsyncContext )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI services_get_Security_(
+        ISWbemServices *iface,
+        ISWbemSecurity **objWbemSecurity )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static const ISWbemServicesVtbl services_vtbl =
+{
+    services_QueryInterface,
+    services_AddRef,
+    services_Release,
+    services_GetTypeInfoCount,
+    services_GetTypeInfo,
+    services_GetIDsOfNames,
+    services_Invoke,
+    services_Get,
+    services_GetAsync,
+    services_Delete,
+    services_DeleteAsync,
+    services_InstancesOf,
+    services_InstancesOfAsync,
+    services_SubclassesOf,
+    services_SubclassesOfAsync,
+    services_ExecQuery,
+    services_ExecQueryAsync,
+    services_AssociatorsOf,
+    services_AssociatorsOfAsync,
+    services_ReferencesTo,
+    services_ReferencesToAsync,
+    services_ExecNotificationQuery,
+    services_ExecNotificationQueryAsync,
+    services_ExecMethod,
+    services_ExecMethodAsync,
+    services_get_Security_
+};
+
+static HRESULT SWbemServices_create( IWbemServices *wbem_services, ISWbemServices **obj
)
+{
+    struct services *services;
+
+    TRACE( "%p, %p\n", obj, wbem_services );
+
+    if (!(services = heap_alloc( sizeof(*services) ))) return E_OUTOFMEMORY;
+    services->ISWbemServices_iface.lpVtbl = &services_vtbl;
+    services->refs = 1;
+    services->services = wbem_services;
+    IWbemServices_AddRef( services->services );
+
+    *obj = &services->ISWbemServices_iface;
+    TRACE( "returning iface %p\n", *obj );
+    return S_OK;
+}
+
+struct locator
+{
+    ISWbemLocator ISWbemLocator_iface;
+    LONG refs;
+    IWbemLocator *locator;
+};
+
+static inline struct locator *impl_from_ISWbemLocator( ISWbemLocator *iface )
+{
+    return CONTAINING_RECORD( iface, struct locator, ISWbemLocator_iface );
+}
+
+static ULONG WINAPI locator_AddRef(
+    ISWbemLocator *iface )
+{
+    struct locator *locator = impl_from_ISWbemLocator( iface );
+    return InterlockedIncrement( &locator->refs );
+}
+
+static ULONG WINAPI locator_Release(
+    ISWbemLocator *iface )
+{
+    struct locator *locator = impl_from_ISWbemLocator( iface );
+    LONG refs = InterlockedDecrement( &locator->refs );
+    if (!refs)
+    {
+        TRACE( "destroying %p\n", locator );
+        IWbemLocator_Release( locator->locator );
+        heap_free( locator );
+    }
+    return refs;
+}
+
+static HRESULT WINAPI locator_QueryInterface(
+    ISWbemLocator *iface,
+    REFIID riid,
+    void **ppvObject )
+{
+    struct locator *locator = impl_from_ISWbemLocator( iface );
+
+    TRACE( "%p, %s, %p\n", locator, debugstr_guid( riid ), ppvObject );
+
+    if (IsEqualGUID( riid, &IID_ISWbemLocator ) ||
+        IsEqualGUID( riid, &IID_IDispatch ) ||
+        IsEqualGUID( riid, &IID_IUnknown ))
+    {
+        *ppvObject = iface;
+    }
+    else
+    {
+        FIXME( "interface %s not implemented\n", debugstr_guid(riid) );
+        return E_NOINTERFACE;
+    }
+    ISWbemLocator_AddRef( iface );
+    return S_OK;
+}
+
+static HRESULT WINAPI locator_GetTypeInfoCount(
+    ISWbemLocator *iface,
+    UINT *count )
+{
+    struct locator *locator = impl_from_ISWbemLocator( iface );
+
+    TRACE( "%p, %p\n", locator, count );
+    *count = 1;
     return S_OK;
 }
 
@@ -200,6 +1314,31 @@
     return hr;
 }
 
+static BSTR build_resource_string( BSTR server, BSTR namespace )
+{
+    static const WCHAR defaultW[] =
{'r','o','o','t','\\','d','e','f','a','u','l','t',0};
+    ULONG len, len_server = 0, len_namespace = 0;
+    BSTR ret;
+
+    if (server && *server) len_server = strlenW( server );
+    else len_server = 1;
+    if (namespace && *namespace) len_namespace = strlenW( namespace );
+    else len_namespace = sizeof(defaultW) / sizeof(defaultW[0]) - 1;
+
+    if (!(ret = SysAllocStringLen( NULL, 2 + len_server + 1 + len_namespace ))) return
NULL;
+
+    ret[0] = ret[1] = '\\';
+    if (server && *server) strcpyW( ret + 2, server );
+    else ret[2] = '.';
+
+    len = len_server + 2;
+    ret[len++] = '\\';
+
+    if (namespace && *namespace) strcpyW( ret + len, namespace );
+    else strcpyW( ret + len, defaultW );
+    return ret;
+}
+
 static HRESULT WINAPI locator_ConnectServer(
     ISWbemLocator *iface,
     BSTR strServer,
@@ -212,10 +1351,33 @@
     IDispatch *objWbemNamedValueSet,
     ISWbemServices **objWbemServices )
 {
-    FIXME( "%p, %s, %s, %s, %p, %s, %s, 0x%08x, %p, %p\n", iface,
debugstr_w(strServer),
+    struct locator *locator = impl_from_ISWbemLocator( iface );
+    IWbemServices *services;
+    BSTR resource;
+    HRESULT hr;
+
+    TRACE( "%p, %s, %s, %s, %p, %s, %s, 0x%08x, %p, %p\n", iface,
debugstr_w(strServer),
            debugstr_w(strNamespace), debugstr_w(strUser), strPassword,
debugstr_w(strLocale),
            debugstr_w(strAuthority), iSecurityFlags, objWbemNamedValueSet,
objWbemServices );
-    return E_NOTIMPL;
+
+    if (objWbemNamedValueSet) FIXME( "context not supported\n" );
+
+    if (!locator->locator)
+    {
+        hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER,
&IID_IWbemLocator,
+                               (void **)&locator->locator );
+        if (hr != S_OK) return hr;
+    }
+
+    if (!(resource = build_resource_string( strServer, strNamespace ))) return
E_OUTOFMEMORY;
+    hr = IWbemLocator_ConnectServer( locator->locator, resource, strUser, strPassword,
strLocale,
+                                     iSecurityFlags, strAuthority, NULL, &services
);
+    SysFreeString( resource );
+    if (hr != S_OK) return hr;
+
+    hr = SWbemServices_create( services, objWbemServices );
+    IWbemServices_Release( services );
+    return hr;
 }
 
 static HRESULT WINAPI locator_get_Security_(
@@ -248,6 +1410,7 @@
     if (!(locator = heap_alloc( sizeof(*locator) ))) return E_OUTOFMEMORY;
     locator->ISWbemLocator_iface.lpVtbl = &locator_vtbl;
     locator->refs = 1;
+    locator->locator = NULL;
 
     *obj = &locator->ISWbemLocator_iface;
     TRACE( "returning iface %p\n", *obj );

Modified: trunk/reactos/dll/win32/wbemdisp/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/main.c?…
==============================================================================
--- trunk/reactos/dll/win32/wbemdisp/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemdisp/main.c	[iso-8859-1] Sat May  2 19:38:14 2015
@@ -19,9 +19,252 @@
 #include "wbemdisp_private.h"
 
 #include <rpcproxy.h>
+#include <wmiutils.h>
 #include <wbemdisp_classes.h>
 
 static HINSTANCE instance;
+
+struct moniker
+{
+    IMoniker IMoniker_iface;
+    LONG refs;
+    IUnknown *obj;
+};
+
+static inline struct moniker *impl_from_IMoniker(
+    IMoniker *iface )
+{
+    return CONTAINING_RECORD( iface, struct moniker, IMoniker_iface );
+}
+
+static ULONG WINAPI moniker_AddRef(
+    IMoniker *iface )
+{
+    struct moniker *moniker = impl_from_IMoniker( iface );
+    return InterlockedIncrement( &moniker->refs );
+}
+
+static ULONG WINAPI moniker_Release(
+    IMoniker *iface )
+{
+    struct moniker *moniker = impl_from_IMoniker( iface );
+    LONG refs = InterlockedDecrement( &moniker->refs );
+    if (!refs)
+    {
+        TRACE( "destroying %p\n", moniker );
+        IUnknown_Release( moniker->obj );
+        heap_free( moniker );
+    }
+    return refs;
+}
+
+static HRESULT WINAPI moniker_QueryInterface(
+    IMoniker *iface, REFIID riid, void **ppvObject )
+{
+    struct moniker *moniker = impl_from_IMoniker( iface );
+
+    TRACE( "%p, %s, %p\n", moniker, debugstr_guid( riid ), ppvObject );
+
+    if (IsEqualGUID( riid, &IID_IMoniker ) ||
+        IsEqualGUID( riid, &IID_IUnknown ))
+    {
+        *ppvObject = iface;
+    }
+    else
+    {
+        FIXME( "interface %s not implemented\n", debugstr_guid(riid) );
+        return E_NOINTERFACE;
+    }
+    IMoniker_AddRef( iface );
+    return S_OK;
+}
+
+static HRESULT WINAPI moniker_GetClassID(
+    IMoniker *iface, CLSID *pClassID )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_IsDirty(
+    IMoniker *iface )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_Load(
+    IMoniker *iface, IStream *pStm )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_Save(
+    IMoniker *iface, IStream *pStm, BOOL fClearDirty )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_GetSizeMax(
+    IMoniker *iface, ULARGE_INTEGER *pcbSize )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_BindToObject(
+    IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riidResult, void
**ppvResult )
+{
+    struct moniker *moniker = impl_from_IMoniker( iface );
+
+    TRACE( "%p, %p, %p, %s, %p\n", iface, pbc, pmkToLeft,
debugstr_guid(riidResult), ppvResult );
+    return IUnknown_QueryInterface( moniker->obj, riidResult, ppvResult );
+}
+
+static HRESULT WINAPI moniker_BindToStorage(
+    IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, void **ppvObj )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_Reduce(
+    IMoniker *iface, IBindCtx *pbc, DWORD dwReduceHowFar, IMoniker **ppmkToLeft, IMoniker
**ppmkReduced )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_ComposeWith(
+    IMoniker *iface, IMoniker *pmkRight, BOOL fOnlyIfNotGeneric, IMoniker **ppmkComposite
)
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_Enum(
+    IMoniker *iface, BOOL fForward, IEnumMoniker **ppenumMoniker )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_IsEqual(
+    IMoniker *iface, IMoniker *pmkOtherMoniker )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_Hash(
+    IMoniker *iface, DWORD *pdwHash )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_IsRunning(
+    IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, IMoniker *pmkNewlyRunning )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_GetTimeOfLastChange(
+    IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, FILETIME *pFileTime )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_Inverse(
+    IMoniker *iface, IMoniker **ppmk )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_CommonPrefixWith(
+    IMoniker *iface, IMoniker *pmkOther, IMoniker **ppmkPrefix )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_RelativePathTo(
+    IMoniker *iface, IMoniker *pmkOther, IMoniker **ppmkRelPath )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_GetDisplayName(
+    IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_ParseDisplayName(
+    IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR pszDisplayName, ULONG
*pchEaten,
+    IMoniker **ppmkOut )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI moniker_IsSystemMoniker(
+    IMoniker *iface, DWORD *pdwMksys )
+{
+    FIXME( "\n" );
+    return E_NOTIMPL;
+}
+
+static const IMonikerVtbl moniker_vtbl =
+{
+    moniker_QueryInterface,
+    moniker_AddRef,
+    moniker_Release,
+    moniker_GetClassID,
+    moniker_IsDirty,
+    moniker_Load,
+    moniker_Save,
+    moniker_GetSizeMax,
+    moniker_BindToObject,
+    moniker_BindToStorage,
+    moniker_Reduce,
+    moniker_ComposeWith,
+    moniker_Enum,
+    moniker_IsEqual,
+    moniker_Hash,
+    moniker_IsRunning,
+    moniker_GetTimeOfLastChange,
+    moniker_Inverse,
+    moniker_CommonPrefixWith,
+    moniker_RelativePathTo,
+    moniker_GetDisplayName,
+    moniker_ParseDisplayName,
+    moniker_IsSystemMoniker
+};
+
+static HRESULT Moniker_create( IUnknown *unk, IMoniker **obj )
+{
+    struct moniker *moniker;
+
+    TRACE( "%p, %p\n", unk, obj );
+
+    if (!(moniker = heap_alloc( sizeof(*moniker) ))) return E_OUTOFMEMORY;
+    moniker->IMoniker_iface.lpVtbl = &moniker_vtbl;
+    moniker->refs = 1;
+    moniker->obj = unk;
+    IUnknown_AddRef( moniker->obj );
+
+    *obj = &moniker->IMoniker_iface;
+    TRACE( "returning iface %p\n", *obj );
+    return S_OK;
+}
 
 static HRESULT WINAPI WinMGMTS_QueryInterface(IParseDisplayName *iface, REFIID riid, void
**ppv)
 {
@@ -51,11 +294,118 @@
     return 1;
 }
 
+static HRESULT parse_path( const WCHAR *str, BSTR *server, BSTR *namespace, BSTR
*relative )
+{
+    IWbemPath *path;
+    ULONG len;
+    HRESULT hr;
+
+    *server = *namespace = *relative = NULL;
+
+    hr = CoCreateInstance( &CLSID_WbemDefPath, NULL, CLSCTX_INPROC_SERVER,
&IID_IWbemPath, (void **)&path );
+    if (hr != S_OK) return hr;
+
+    hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, str );
+    if (hr != S_OK) goto done;
+
+    len = 0;
+    hr = IWbemPath_GetServer( path, &len, NULL );
+    if (hr == S_OK)
+    {
+        if (!(*server = SysAllocStringLen( NULL, len )))
+        {
+            hr = E_OUTOFMEMORY;
+            goto done;
+        }
+        hr = IWbemPath_GetServer( path, &len, *server );
+        if (hr != S_OK) goto done;
+    }
+
+    len = 0;
+    hr = IWbemPath_GetText( path, WBEMPATH_GET_NAMESPACE_ONLY, &len, NULL );
+    if (hr == S_OK)
+    {
+        if (!(*namespace = SysAllocStringLen( NULL, len )))
+        {
+            hr = E_OUTOFMEMORY;
+            goto done;
+        }
+        hr = IWbemPath_GetText( path, WBEMPATH_GET_NAMESPACE_ONLY, &len, *namespace
);
+        if (hr != S_OK) goto done;
+    }
+    len = 0;
+    hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, NULL );
+    if (hr == S_OK)
+    {
+        if (!(*relative = SysAllocStringLen( NULL, len )))
+        {
+            hr = E_OUTOFMEMORY;
+            goto done;
+        }
+        hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, *relative );
+    }
+
+done:
+    IWbemPath_Release( path );
+    if (hr != S_OK)
+    {
+        SysFreeString( *server );
+        SysFreeString( *namespace );
+        SysFreeString( *relative );
+    }
+    return hr;
+}
+
 static HRESULT WINAPI WinMGMTS_ParseDisplayName(IParseDisplayName *iface, IBindCtx *pbc,
LPOLESTR pszDisplayName,
         ULONG *pchEaten, IMoniker **ppmkOut)
 {
-    FIXME("(%p %s %p %p)\n", pbc, debugstr_w(pszDisplayName), pchEaten,
ppmkOut);
-    return E_NOTIMPL;
+    static const WCHAR prefixW[] =
{'w','i','n','m','g','m','t','s',':',0};
+    const DWORD prefix_len = sizeof(prefixW) / sizeof(prefixW[0]) - 1;
+    ISWbemLocator *locator = NULL;
+    ISWbemServices *services = NULL;
+    ISWbemObject *obj = NULL;
+    BSTR server, namespace, relative;
+    WCHAR *p;
+    HRESULT hr;
+
+    TRACE( "%p, %p, %s, %p, %p\n", iface, pbc, debugstr_w(pszDisplayName),
pchEaten, ppmkOut );
+
+    if (strncmpiW( pszDisplayName, prefixW, prefix_len )) return MK_E_SYNTAX;
+
+    p = pszDisplayName + prefix_len;
+    if (*p == '{')
+    {
+        FIXME( "ignoring security settings\n" );
+        while (*p && *p != '}') p++;
+        if (*p == '}') p++;
+        if (*p == '!') p++;
+    }
+    hr = parse_path( p, &server, &namespace, &relative );
+    if (hr != S_OK) return hr;
+
+    hr = SWbemLocator_create( (void **)&locator );
+    if (hr != S_OK) goto done;
+
+    hr = ISWbemLocator_ConnectServer( locator, server, namespace, NULL, NULL, NULL, NULL,
0, NULL, &services );
+    if (hr != S_OK) goto done;
+
+    if (!relative || !*relative) Moniker_create( (IUnknown *)services, ppmkOut );
+    else
+    {
+        hr = ISWbemServices_Get( services, relative, 0, NULL, &obj );
+        if (hr != S_OK) goto done;
+        hr = Moniker_create( (IUnknown *)obj, ppmkOut );
+    }
+
+done:
+    if (obj) ISWbemObject_Release( obj );
+    if (services) ISWbemServices_Release( services );
+    if (locator) ISWbemLocator_Release( locator );
+    SysFreeString( server );
+    SysFreeString( namespace );
+    SysFreeString( relative );
+    if (hr == S_OK) *pchEaten = strlenW( pszDisplayName );
+    return hr;
 }
 
 static const IParseDisplayNameVtbl WinMGMTSVtbl = {

Modified: trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/wbemdis…
==============================================================================
--- trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h	[iso-8859-1] Sat May  2 19:38:14
2015
@@ -32,9 +32,12 @@
 #include <windef.h>
 #include <winbase.h>
 #include <objbase.h>
+#include <oleauto.h>
 #include <wbemdisp.h>
 
 #include <wine/debug.h>
+#include <wine/unicode.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp);
 
 HRESULT SWbemLocator_create(LPVOID *) DECLSPEC_HIDDEN;

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat May  2 19:38:14 2015
@@ -200,7 +200,7 @@
 reactos/dll/win32/uxtheme             # Forked
 reactos/dll/win32/vbscript            # Synced to WineStaging-1.7.37
 reactos/dll/win32/version             # Synced to WineStaging-1.7.37
-reactos/dll/win32/wbemdisp            # Synced to Wine-1.7.27
+reactos/dll/win32/wbemdisp            # Synced to WineStaging-1.7.37
 reactos/dll/win32/wbemprox            # Synced to WineStaging-1.7.37
 reactos/dll/win32/windowscodecs       # Synced to Wine-1.7.27
 reactos/dll/win32/windowscodecsext    # Synced to Wine-1.7.27