[WBEMDISP]

* Import from Wine 1.7.1.
[PSDK]
* Import wbemdisp.idl from Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=61225

reactos/dll/win32/CMakeLists.txt

@@ -214,6 +214,7 @@ add_subdirectory(uxtheme)
 add_subdirectory(vbscript)
 add_subdirectory(vdmdbg)
 add_subdirectory(version)
+add_subdirectory(wbemdisp)
 add_subdirectory(wbemprox)
 if(ARCH STREQUAL "i386")
     add_subdirectory(wdmaud.drv)

reactos/dll/win32/wbemdisp/CMakeLists.txt

@@ -0,0 +1,26 @@
+
+add_definitions(-D__WINESRC__)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+spec2def(wbemdisp.dll wbemdisp.spec)
+
+list(APPEND SOURCE
+    locator.c
+    main.c
+    ${CMAKE_CURRENT_BINARY_DIR}/wbemdisp.def)
+
+add_idl_headers(wbemdisp_idlheader wbemdisp_classes.idl)
+add_typelib(wbemdisp_tlb.idl)
+
+list(APPEND wbemdisp_rc_deps
+    ${CMAKE_CURRENT_SOURCE_DIR}/wbemdisp_classes.rgs
+    ${CMAKE_CURRENT_SOURCE_DIR}/wbemdisp_tlb.rgs
+    ${CMAKE_CURRENT_BINARY_DIR}/wbemdisp_tlb.tlb)
+
+set_source_files_properties(wbemdisp.rc PROPERTIES OBJECT_DEPENDS "${wbemdisp_rc_deps}")
+
+add_library(wbemdisp SHARED ${SOURCE} wbemdisp.rc)
+set_module_type(wbemdisp win32dll)
+target_link_libraries(wbemdisp wine)
+add_dependencies(wbemdisp wbemdisp_idlheader)
+add_importlibs(wbemdisp oleaut32 msvcrt kernel32 ntdll)
+add_cd_file(TARGET wbemdisp DESTINATION reactos/system32/wbem FOR all)

reactos/dll/win32/wbemdisp/locator.c

@@ -0,0 +1,266 @@
+/*
+ * Copyright 2013 Hans Leidekker for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define COBJMACROS
+
+#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "objbase.h"
+#include "wbemdisp.h"
+
+#include "wine/debug.h"
+#include "wine/unicode.h"
+#include "wbemdisp_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp);
+
+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;
+}
+
+enum type_id
+{
+    ISWbemLocator_tid,
+    last_tid
+};
+
+static ITypeLib *wbemdisp_typelib;
+static ITypeInfo *wbemdisp_typeinfo[last_tid];
+
+static REFIID wbemdisp_tid_id[] =
+{
+    &IID_ISWbemLocator
+};
+
+static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret )
+{
+    HRESULT hr;
+
+    if (!wbemdisp_typelib)
+    {
+        ITypeLib *typelib;
+
+        hr = LoadRegTypeLib( &LIBID_WbemScripting, 1, 2, LOCALE_SYSTEM_DEFAULT, &typelib );
+        if (FAILED( hr ))
+        {
+            ERR( "LoadRegTypeLib failed: %08x\n", hr );
+            return hr;
+        }
+        if (InterlockedCompareExchangePointer( (void **)&wbemdisp_typelib, typelib, NULL ))
+            ITypeLib_Release( typelib );
+    }
+    if (!wbemdisp_typeinfo[tid])
+    {
+        ITypeInfo *typeinfo;
+
+        hr = ITypeLib_GetTypeInfoOfGuid( wbemdisp_typelib, wbemdisp_tid_id[tid], &typeinfo );
+        if (FAILED( hr ))
+        {
+            ERR( "GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(wbemdisp_tid_id[tid]), hr );
+            return hr;
+        }
+        if (InterlockedCompareExchangePointer( (void **)(wbemdisp_typeinfo + tid), typeinfo, NULL ))
+            ITypeInfo_Release( typeinfo );
+    }
+    *ret = wbemdisp_typeinfo[tid];
+    return S_OK;
+}
+
+static HRESULT WINAPI locator_GetTypeInfo(
+    ISWbemLocator *iface,
+    UINT index,
+    LCID lcid,
+    ITypeInfo **info )
+{
+    struct locator *locator = impl_from_ISWbemLocator( iface );
+    TRACE( "%p, %u, %u, %p\n", locator, index, lcid, info );
+
+    return get_typeinfo( ISWbemLocator_tid, info );
+}
+
+static HRESULT WINAPI locator_GetIDsOfNames(
+    ISWbemLocator *iface,
+    REFIID riid,
+    LPOLESTR *names,
+    UINT count,
+    LCID lcid,
+    DISPID *dispid )
+{
+    struct locator *locator = impl_from_ISWbemLocator( iface );
+    ITypeInfo *typeinfo;
+    HRESULT hr;
+
+    TRACE( "%p, %s, %p, %u, %u, %p\n", locator, debugstr_guid(riid), names, count, lcid, dispid );
+
+    if (!names || !count || !dispid) return E_INVALIDARG;
+
+    hr = get_typeinfo( ISWbemLocator_tid, &typeinfo );
+    if (SUCCEEDED(hr))
+    {
+        hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid );
+        ITypeInfo_Release( typeinfo );
+    }
+    return hr;
+}
+
+static HRESULT WINAPI locator_Invoke(
+    ISWbemLocator *iface,
+    DISPID member,
+    REFIID riid,
+    LCID lcid,
+    WORD flags,
+    DISPPARAMS *params,
+    VARIANT *result,
+    EXCEPINFO *excep_info,
+    UINT *arg_err )
+{
+    struct locator *locator = impl_from_ISWbemLocator( iface );
+    ITypeInfo *typeinfo;
+    HRESULT hr;
+
+    TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", locator, member, debugstr_guid(riid),
+           lcid, flags, params, result, excep_info, arg_err );
+
+    hr = get_typeinfo( ISWbemLocator_tid, &typeinfo );
+    if (SUCCEEDED(hr))
+    {
+        hr = ITypeInfo_Invoke( typeinfo, &locator->ISWbemLocator_iface, member, flags,
+                               params, result, excep_info, arg_err );
+        ITypeInfo_Release( typeinfo );
+    }
+    return hr;
+}
+
+static HRESULT WINAPI locator_ConnectServer(
+    ISWbemLocator *iface,
+    BSTR strServer,
+    BSTR strNamespace,
+    BSTR strUser,
+    BSTR strPassword,
+    BSTR strLocale,
+    BSTR strAuthority,
+    LONG iSecurityFlags,
+    IDispatch *objWbemNamedValueSet,
+    ISWbemServices **objWbemServices )
+{
+    FIXME( "%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;
+}
+
+static HRESULT WINAPI locator_get_Security_(
+    ISWbemLocator *iface,
+    ISWbemSecurity **objWbemSecurity )
+{
+    FIXME( "%p, %p\n", iface, objWbemSecurity );
+    return E_NOTIMPL;
+}
+
+static const ISWbemLocatorVtbl locator_vtbl =
+{
+    locator_QueryInterface,
+    locator_AddRef,
+    locator_Release,
+    locator_GetTypeInfoCount,
+    locator_GetTypeInfo,
+    locator_GetIDsOfNames,
+    locator_Invoke,
+    locator_ConnectServer,
+    locator_get_Security_
+};
+
+HRESULT SWbemLocator_create( IUnknown *unk, void **obj )
+{
+    struct locator *locator;
+
+    TRACE( "%p, %p\n", unk, obj );
+
+    if (!(locator = heap_alloc( sizeof(*locator) ))) return E_OUTOFMEMORY;
+    locator->ISWbemLocator_iface.lpVtbl = &locator_vtbl;
+    locator->refs = 1;
+
+    *obj = &locator->ISWbemLocator_iface;
+    TRACE( "returning iface %p\n", *obj );
+    return S_OK;
+}

reactos/dll/win32/wbemdisp/main.c

@@ -0,0 +1,217 @@
+/*
+ * Copyright 2013 Hans Leidekker for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "initguid.h"
+#include "objbase.h"
+#include "wbemdisp.h"
+#include "rpcproxy.h"
+
+#include "wine/debug.h"
+#include "wbemdisp_private.h"
+#include "wbemdisp_classes.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp);
+
+static HINSTANCE instance;
+
+static HRESULT WINAPI WinMGMTS_QueryInterface(IParseDisplayName *iface, REFIID riid, void **ppv)
+{
+    if(IsEqualGUID(riid, &IID_IUnknown)) {
+        TRACE("(IID_IUnknown %p)\n", ppv);
+        *ppv = iface;
+    }else if(IsEqualGUID(riid, &IID_IParseDisplayName)) {
+        TRACE("(IID_IParseDisplayName %p)\n", ppv);
+        *ppv = iface;
+    }else {
+        WARN("Unsupported riid %s\n", debugstr_guid(riid));
+        *ppv = NULL;
+        return E_NOINTERFACE;
+    }
+
+    IUnknown_AddRef((IUnknown*)*ppv);
+    return S_OK;
+}
+
+static ULONG WINAPI WinMGMTS_AddRef(IParseDisplayName *iface)
+{
+    return 2;
+}
+
+static ULONG WINAPI WinMGMTS_Release(IParseDisplayName *iface)
+{
+    return 1;
+}
+
+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 IParseDisplayNameVtbl WinMGMTSVtbl = {
+    WinMGMTS_QueryInterface,
+    WinMGMTS_AddRef,
+    WinMGMTS_Release,
+    WinMGMTS_ParseDisplayName
+};
+
+static IParseDisplayName winmgmts = { &WinMGMTSVtbl };
+
+static HRESULT WinMGMTS_create(IUnknown *outer, void **ppv)
+{
+    *ppv = &winmgmts;
+    return S_OK;
+}
+
+struct factory
+{
+    IClassFactory IClassFactory_iface;
+    HRESULT (*fnCreateInstance)( IUnknown *, LPVOID * );
+};
+
+static inline struct factory *impl_from_IClassFactory( IClassFactory *iface )
+{
+    return CONTAINING_RECORD( iface, struct factory, IClassFactory_iface );
+}
+
+static HRESULT WINAPI factory_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *obj )
+{
+    if (IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IClassFactory ))
+    {
+        IClassFactory_AddRef( iface );
+        *obj = iface;
+        return S_OK;
+    }
+    FIXME( "interface %s not implemented\n", debugstr_guid(riid) );
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI factory_AddRef( IClassFactory *iface )
+{
+    return 2;
+}
+
+static ULONG WINAPI factory_Release( IClassFactory *iface )
+{
+    return 1;
+}
+
+static HRESULT WINAPI factory_CreateInstance( IClassFactory *iface, LPUNKNOWN outer, REFIID riid,
+                                              LPVOID *obj )
+{
+    struct factory *factory = impl_from_IClassFactory( iface );
+    IUnknown *unk;
+    HRESULT hr;
+
+    TRACE( "%p, %s, %p\n", outer, debugstr_guid(riid), obj );
+
+    *obj = NULL;
+    if (outer) return CLASS_E_NOAGGREGATION;
+
+    hr = factory->fnCreateInstance( outer, (LPVOID *)&unk );
+    if (FAILED( hr ))
+        return hr;
+
+    hr = IUnknown_QueryInterface( unk, riid, obj );
+    if (FAILED( hr ))
+        return hr;
+
+    IUnknown_Release( unk );
+    return hr;
+}
+
+static HRESULT WINAPI factory_LockServer( IClassFactory *iface, BOOL lock )
+{
+    FIXME( "%p, %d\n", iface, lock );
+    return S_OK;
+}
+
+static const struct IClassFactoryVtbl factory_vtbl =
+{
+    factory_QueryInterface,
+    factory_AddRef,
+    factory_Release,
+    factory_CreateInstance,
+    factory_LockServer
+};
+
+static struct factory swbem_locator_cf = { { &factory_vtbl }, SWbemLocator_create };
+static struct factory winmgmts_cf = { { &factory_vtbl }, WinMGMTS_create };
+
+BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
+{
+
+    switch (reason)
+    {
+        case DLL_WINE_PREATTACH:
+            return FALSE;    /* prefer native version */
+        case DLL_PROCESS_ATTACH:
+            instance = hinst;
+            DisableThreadLibraryCalls( hinst );
+            break;
+    }
+    return TRUE;
+}
+
+HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *obj )
+{
+    IClassFactory *cf = NULL;
+
+    TRACE( "%s, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(iid), obj );
+
+    if (IsEqualGUID( rclsid, &CLSID_SWbemLocator ))
+        cf = &swbem_locator_cf.IClassFactory_iface;
+    else if (IsEqualGUID( rclsid, &CLSID_WinMGMTS ))
+        cf = &winmgmts_cf.IClassFactory_iface;
+    else
+        return CLASS_E_CLASSNOTAVAILABLE;
+
+    return IClassFactory_QueryInterface( cf, iid, obj );
+}
+
+/***********************************************************************
+ *      DllCanUnloadNow (WBEMDISP.@)
+ */
+HRESULT WINAPI DllCanUnloadNow(void)
+{
+    return S_FALSE;
+}
+
+/***********************************************************************
+ *      DllRegisterServer (WBEMDISP.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+    return __wine_register_resources( instance );
+}
+
+/***********************************************************************
+ *      DllUnregisterServer (WBEMDISP.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+    return __wine_unregister_resources( instance );
+}

reactos/dll/win32/wbemdisp/wbemdisp.rc

@@ -0,0 +1,3 @@
+1 WINE_REGISTRY "wbemdisp_classes.rgs"
+2 WINE_REGISTRY "wbemdisp_tlb.rgs"
+1 TYPELIB "wbemdisp_tlb.tlb"

reactos/dll/win32/wbemdisp/wbemdisp.spec

@@ -0,0 +1,4 @@
+@ stdcall -private DllCanUnloadNow()
+@ stdcall -private DllGetClassObject(ptr ptr ptr)
+@ stdcall -private DllRegisterServer()
+@ stdcall -private DllUnregisterServer()

reactos/dll/win32/wbemdisp/wbemdisp_classes.idl

@@ -0,0 +1,27 @@
+/*
+ * COM Classes for wbemdisp
+ *
+ * Copyright 2013 Hans Leidekker for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+[
+    threading(apartment),
+    uuid(172bddf8-ceea-11d1-8b05-00600806d9b6),
+    progid("WINMGMTS.1"),
+    vi_progid("WINMGMTS")
+]
+coclass WinMGMTS { interface IParseDisplayName; }

reactos/dll/win32/wbemdisp/wbemdisp_classes.rgs

@@ -0,0 +1,24 @@
+HKCR
+{
+    NoRemove Interface
+    {
+    }
+    NoRemove CLSID
+    {
+        '{172BDDF8-CEEA-11D1-8B05-00600806D9B6}' = s 'WinMGMTS'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' }
+            ProgId = s 'WINMGMTS.1'
+            VersionIndependentProgId = s 'WINMGMTS'
+        }
+    }
+    'WINMGMTS.1' = s 'WinMGMTS'
+    {
+        CLSID = s '{172BDDF8-CEEA-11D1-8B05-00600806D9B6}'
+    }
+    'WINMGMTS' = s 'WinMGMTS'
+    {
+        CLSID = s '{172BDDF8-CEEA-11D1-8B05-00600806D9B6}'
+        CurVer = s 'WINMGMTS.1'
+    }
+}

reactos/dll/win32/wbemdisp/wbemdisp_private.h

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2013 Hans Leidekker for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+HRESULT SWbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
+
+static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
+static inline void *heap_alloc( size_t len )
+{
+    return HeapAlloc( GetProcessHeap(), 0, len );
+}
+
+static inline BOOL heap_free( void *mem )
+{
+    return HeapFree( GetProcessHeap(), 0, mem );
+}

reactos/dll/win32/wbemdisp/wbemdisp_tlb.idl

@@ -0,0 +1,21 @@
+/*
+ * Typelib for wbemdisp
+ *
+ * Copyright 2013 Hans Leidekker for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "wbemdisp.idl"

reactos/dll/win32/wbemdisp/wbemdisp_tlb.rgs

@@ -0,0 +1,139 @@
+HKCR
+{
+    NoRemove Typelib
+    {
+        NoRemove '{565783C6-CB41-11D1-8B02-00600806D9B6}'
+        {
+            '1.2' = s 'Microsoft WMI Scripting V1.2 Library'
+            {
+                '0' { win32 = s '%MODULE%' }
+                FLAGS = s '0'
+            }
+        }
+    }
+    NoRemove Interface
+    {
+        '{27D54D92-0EBE-11D2-8B22-00600806D9B6}' = s 'ISWbemEventSource'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{76A6415B-CB41-11D1-8B02-00600806D9B6}' = s 'ISWbemLocator'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{422E8E90-D955-11D1-8B09-00600806D9B6}' = s 'ISWbemMethod'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{C93BA292-D955-11D1-8B09-00600806D9B6}' = s 'ISWbemMethodSet'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{76A64164-CB41-11D1-8B02-00600806D9B6}' = s 'ISWbemNamedValue'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{CF2376EA-CE8C-11D1-8B05-00600806D9B6}' = s 'ISWbemNamedValueSet'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{76A6415A-CB41-11D1-8B02-00600806D9B6}' = s 'ISWbemObject'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{5791BC27-CE9C-11D1-97BF-0000F81E849C}' = s 'ISWbemObjectPath'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{76A6415F-CB41-11D1-8B02-00600806D9B6}' = s 'ISWbemObjectSet'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{26EE67BD-5804-11D2-8B4A-00600806D9B6}' = s 'ISWbemPrivilege'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{26EE67BF-5804-11D2-8B4A-00600806D9B6}' = s 'ISWbemPrivilegeSet'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{1A388F98-D4BA-11D1-8B09-00600806D9B6}' = s 'ISWbemProperty'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{DEA0A7B2-D4BA-11D1-8B09-00600806D9B6}' = s 'ISWbemPropertySet'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{79B05932-D3B7-11D1-8B06-00600806D9B6}' = s 'ISWbemQualifier'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{9B16ED16-D3DF-11D1-8B08-00600806D9B6}' = s 'ISWbemQualifierSet'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{B54D66E6-2287-11D2-8B33-00600806D9B6}' = s 'ISWbemSecurity'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+        '{76A6415C-CB41-11D1-8B02-00600806D9B6}' = s 'ISWbemServices'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}' { val Version = s '1.2' }
+        }
+    }
+    NoRemove CLSID
+    {
+        '{76A64158-CB41-11D1-8B02-00600806D9B6}' = s 'SWbemLocator'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' }
+            ProgId = s 'WbemScripting.SWbemLocator.1'
+            TypeLib = s '{565783C6-CB41-11D1-8B02-00600806D9B6}'
+            Version = s '1.2'
+            VersionIndependentProgId = s 'WbemScripting.SWbemLocator'
+        }
+    }
+    'WbemScripting.SWbemLocator.1' = s 'SWbemLocator'
+    {
+        CLSID = s '{76A64158-CB41-11D1-8B02-00600806D9B6}'
+    }
+    'WbemScripting.SWbemLocator' = s 'SWbemLocator'
+    {
+        CLSID = s '{76A64158-CB41-11D1-8B02-00600806D9B6}'
+        CurVer = s 'WbemScripting.SWbemLocator.1'
+    }
+}

reactos/include/psdk/CMakeLists.txt

@@ -113,6 +113,7 @@ list(APPEND SOURCE
     vmr9.idl
 #   vmrender.idl
     wbemcli.idl
+    wbemdisp.idl
     wbemprov.idl
     wia_lh.idl
     wia_xp.idl

reactos/media/doc/README.WINE

@@ -199,6 +199,7 @@ reactos/dll/win32/usp10            # Synced to Wine-1.7.1
 reactos/dll/win32/uxtheme          # Forked
 reactos/dll/win32/vbscript         # Synced to Wine-1.7.1
 reactos/dll/win32/version          # Synced to Wine-1.7.1
+reactos/dll/win32/wbemdisp         # Synced to Wine-1.7.1
 reactos/dll/win32/wbemprox         # Synced to Wine-1.7.2
 reactos/dll/win32/wer              # Autosync
 reactos/dll/win32/windowscodecs    # Synced to Wine-1.7.1

reactos/media/inf/syssetup.inf

@@ -101,6 +101,7 @@ AddReg=Classes
 11,,wininet.dll,2
 11,,wintrust.dll,1
 11,,wuapi.dll,1
+11,wbem,wbemdisp.dll,1
 11,wbem,wbemprox.dll,1
 
 [TypeLibraries]