Hans Leidekker : wbemprox: Add support for WbemAdministrativeLocator.
Alexandre Julliard
julliard at winehq.org
Fri Sep 28 11:39:04 CDT 2012
Module: wine
Branch: master
Commit: 163c8f31fd94599718029e118affeedfda660bff
URL: http://source.winehq.org/git/wine.git/?a=commit;h=163c8f31fd94599718029e118affeedfda660bff
Author: Hans Leidekker <hans at codeweavers.com>
Date: Fri Sep 28 13:38:05 2012 +0200
wbemprox: Add support for WbemAdministrativeLocator.
---
dlls/wbemprox/builtin.c | 3 ++-
dlls/wbemprox/main.c | 4 +++-
dlls/wbemprox/services.c | 1 -
dlls/wbemprox/wbemprox.idl | 7 +++++++
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 54de2bb..1d39896 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -27,11 +27,12 @@
#define WIN32_NO_STATUS
#include "windef.h"
#include "winbase.h"
+#include "initguid.h"
#include "wbemcli.h"
+#include "wbemprov.h"
#include "winsock2.h"
#include "iphlpapi.h"
#include "tlhelp32.h"
-#include "initguid.h"
#include "d3d10.h"
#include "winternl.h"
#include "winioctl.h"
diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c
index 6455efd..3e26a6f 100644
--- a/dlls/wbemprox/main.c
+++ b/dlls/wbemprox/main.c
@@ -27,6 +27,7 @@
#include "winbase.h"
#include "objbase.h"
#include "wbemcli.h"
+#include "wbemprov.h"
#include "rpcproxy.h"
#include "wbemprox_private.h"
@@ -140,7 +141,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv )
TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv);
- if (IsEqualGUID( rclsid, &CLSID_WbemLocator ))
+ if (IsEqualGUID( rclsid, &CLSID_WbemLocator ) ||
+ IsEqualGUID( rclsid, &CLSID_WbemAdministrativeLocator ))
{
cf = &wbem_locator_cf.IClassFactory_iface;
}
diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c
index 59b6da8..5e9cec0 100644
--- a/dlls/wbemprox/services.c
+++ b/dlls/wbemprox/services.c
@@ -23,7 +23,6 @@
#include "windef.h"
#include "winbase.h"
-#include "initguid.h"
#include "objbase.h"
#include "wbemcli.h"
diff --git a/dlls/wbemprox/wbemprox.idl b/dlls/wbemprox/wbemprox.idl
index 65cdac4..4b19384 100644
--- a/dlls/wbemprox/wbemprox.idl
+++ b/dlls/wbemprox/wbemprox.idl
@@ -24,3 +24,10 @@
uuid(4590f811-1d3a-11d0-891f-00aa004b2e24)
]
coclass WbemLocator { interface IWbemLocator; }
+
+[
+ helpstring("WBEM Administrative Locator"),
+ threading(both),
+ uuid(cb8555cc-9128-11d1-ad9b-00c04fd8fdff)
+]
+coclass WbemAdministrativeLocator { interface IWbemLocator; }
More information about the wine-cvs
mailing list