From 163c8f31fd94599718029e118affeedfda660bff Mon Sep 17 00:00:00 2001
From: Hans Leidekker <hans@codeweavers.com>
Date: Fri, 28 Sep 2012 13:38:05 +0200
Subject: [PATCH] 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 54de2bb21aa..1d398967d68 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 6455efd70eb..3e26a6f4079 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 59b6da88566..5e9cec0ca89 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 65cdac48f86..4b19384bc7e 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; }