ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-29 12:23:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WBEMDISP]

Browse Source 
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62928
This commit is contained in:
Amine Khaldi
2014-04-23 15:06:09 +00:00
parent a44595abda
commit 926fd03c31
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/wbemdisp/locator.c
+2 -2
View File
@@ -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;
reactos/dll/win32/wbemdisp/main.c
+3 -6
View File
@@ -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;
}
reactos/dll/win32/wbemdisp/wbemdisp_classes.idl
+2
View File
@@ -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),
reactos/dll/win32/wbemdisp/wbemdisp_private.h
+1 -1
View File
@@ -37,7 +37,7 @@
#include <wine/debug.h>
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 )
reactos/dll/win32/wbemdisp/wbemdisp_tlb.idl
+2
View File
@@ -18,4 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#pragma makedep regtypelib
#include "wbemdisp.idl"
reactos/media/doc/README.WINE
+1 -1
View File
@@ -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