diff --git a/reactos/dll/win32/wbemdisp/locator.c b/reactos/dll/win32/wbemdisp/locator.c index 2c49430ce1e..a6704c6bb90 100644 --- a/reactos/dll/win32/wbemdisp/locator.c +++ b/reactos/dll/win32/wbemdisp/locator.c @@ -239,11 +239,11 @@ static const ISWbemLocatorVtbl locator_vtbl = locator_get_Security_ }; -HRESULT SWbemLocator_create( IUnknown *unk, void **obj ) +HRESULT SWbemLocator_create( void **obj ) { struct locator *locator; - TRACE( "%p, %p\n", unk, obj ); + TRACE( "%p\n", obj ); if (!(locator = heap_alloc( sizeof(*locator) ))) return E_OUTOFMEMORY; locator->ISWbemLocator_iface.lpVtbl = &locator_vtbl; diff --git a/reactos/dll/win32/wbemdisp/main.c b/reactos/dll/win32/wbemdisp/main.c index aef7ecf409a..577425812c4 100644 --- a/reactos/dll/win32/wbemdisp/main.c +++ b/reactos/dll/win32/wbemdisp/main.c @@ -67,7 +67,7 @@ static const IParseDisplayNameVtbl WinMGMTSVtbl = { static IParseDisplayName winmgmts = { &WinMGMTSVtbl }; -static HRESULT WinMGMTS_create(IUnknown *outer, void **ppv) +static HRESULT WinMGMTS_create(void **ppv) { *ppv = &winmgmts; return S_OK; @@ -76,7 +76,7 @@ static HRESULT WinMGMTS_create(IUnknown *outer, void **ppv) struct factory { IClassFactory IClassFactory_iface; - HRESULT (*fnCreateInstance)( IUnknown *, LPVOID * ); + HRESULT (*fnCreateInstance)( LPVOID * ); }; static inline struct factory *impl_from_IClassFactory( IClassFactory *iface ) @@ -118,14 +118,11 @@ static HRESULT WINAPI factory_CreateInstance( IClassFactory *iface, LPUNKNOWN ou *obj = NULL; if (outer) return CLASS_E_NOAGGREGATION; - hr = factory->fnCreateInstance( outer, (LPVOID *)&unk ); + hr = factory->fnCreateInstance( (LPVOID *)&unk ); if (FAILED( hr )) return hr; hr = IUnknown_QueryInterface( unk, riid, obj ); - if (FAILED( hr )) - return hr; - IUnknown_Release( unk ); return hr; } diff --git a/reactos/dll/win32/wbemdisp/wbemdisp_classes.idl b/reactos/dll/win32/wbemdisp/wbemdisp_classes.idl index 4fdedb00932..0cea2c8b895 100644 --- a/reactos/dll/win32/wbemdisp/wbemdisp_classes.idl +++ b/reactos/dll/win32/wbemdisp/wbemdisp_classes.idl @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep register + [ threading(apartment), uuid(172bddf8-ceea-11d1-8b05-00600806d9b6), diff --git a/reactos/dll/win32/wbemdisp/wbemdisp_private.h b/reactos/dll/win32/wbemdisp/wbemdisp_private.h index b7fbb533a5f..9d68d07c80c 100644 --- a/reactos/dll/win32/wbemdisp/wbemdisp_private.h +++ b/reactos/dll/win32/wbemdisp/wbemdisp_private.h @@ -37,7 +37,7 @@ #include WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); -HRESULT SWbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT SWbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc( size_t len ) diff --git a/reactos/dll/win32/wbemdisp/wbemdisp_tlb.idl b/reactos/dll/win32/wbemdisp/wbemdisp_tlb.idl index f42f7b4cbd9..9174a2ca6cc 100644 --- a/reactos/dll/win32/wbemdisp/wbemdisp_tlb.idl +++ b/reactos/dll/win32/wbemdisp/wbemdisp_tlb.idl @@ -18,4 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep regtypelib + #include "wbemdisp.idl" diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 2a02093e960..487bfa324c3 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -200,7 +200,7 @@ reactos/dll/win32/usp10 # Synced to Wine-1.7.17 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/wbemdisp # Synced to Wine-1.7.17 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