Rebase against 8b1737c0fdf1d3d905bea281d9241f1f48f333e9.

This commit is contained in:
Sebastian Lackner
2017-04-10 07:36:39 +02:00
parent 25bd49ecb6
commit e4ac3ea735
12 changed files with 122 additions and 328 deletions

View File

@@ -1,4 +1,4 @@
From fe0a9fc45c18dc6dc76f963c9e904a754e1792d1 Mon Sep 17 00:00:00 2001
From ad8dcad06c9094763b2fe04f469d07701a74abeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 24 May 2015 03:56:52 +0200
Subject: wbemdisp: Add ISWbemSecurity stub interface.
@@ -8,7 +8,7 @@ Subject: wbemdisp: Add ISWbemSecurity stub interface.
1 file changed, 244 insertions(+), 5 deletions(-)
diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c
index 3465eb1..756205d 100644
index 6fdd608458..0a0b7d9d9b 100644
--- a/dlls/wbemdisp/locator.c
+++ b/dlls/wbemdisp/locator.c
@@ -37,6 +37,7 @@
@@ -19,25 +19,25 @@ index 3465eb1..756205d 100644
enum type_id
{
@@ -44,6 +45,7 @@ enum type_id
ISWbemObject_tid,
ISWbemObjectSet_tid,
@@ -46,6 +47,7 @@ enum type_id
ISWbemProperty_tid,
ISWbemPropertySet_tid,
ISWbemServices_tid,
+ ISWbemSecurity_tid,
last_tid
};
@@ -55,7 +57,8 @@ static REFIID wbemdisp_tid_id[] =
&IID_ISWbemLocator,
&IID_ISWbemObject,
@@ -59,7 +61,8 @@ static REFIID wbemdisp_tid_id[] =
&IID_ISWbemObjectSet,
&IID_ISWbemProperty,
&IID_ISWbemPropertySet,
- &IID_ISWbemServices
+ &IID_ISWbemServices,
+ &IID_ISWbemSecurity
};
static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret )
@@ -1146,8 +1149,12 @@ static HRESULT WINAPI services_get_Security_(
@@ -1872,8 +1875,12 @@ static HRESULT WINAPI services_get_Security_(
ISWbemServices *iface,
ISWbemSecurity **objWbemSecurity )
{
@@ -52,7 +52,7 @@ index 3465eb1..756205d 100644
}
static const ISWbemServicesVtbl services_vtbl =
@@ -1400,8 +1407,12 @@ static HRESULT WINAPI locator_get_Security_(
@@ -2127,8 +2134,12 @@ static HRESULT WINAPI locator_get_Security_(
ISWbemLocator *iface,
ISWbemSecurity **objWbemSecurity )
{
@@ -67,7 +67,7 @@ index 3465eb1..756205d 100644
}
static const ISWbemLocatorVtbl locator_vtbl =
@@ -1432,3 +1443,231 @@ HRESULT SWbemLocator_create( void **obj )
@@ -2159,3 +2170,231 @@ HRESULT SWbemLocator_create( void **obj )
TRACE( "returning iface %p\n", *obj );
return S_OK;
}
@@ -300,5 +300,5 @@ index 3465eb1..756205d 100644
+ return S_OK;
+}
--
2.4.0
2.11.0