Jacek Caban : wbemdisp: Use wbemdisp.idl to register SWbemLocator.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 686de978c002a20964724c3586c2070152ee1054
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=686de978c002a20964724c3586c2070152ee1054

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Aug 28 12:14:20 2013 +0200

wbemdisp: Use wbemdisp.idl to register SWbemLocator.

---

 dlls/wbemdisp/wbemdisp_classes.idl |    8 --------
 include/wbemdisp.idl               |   11 ++++++++++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/dlls/wbemdisp/wbemdisp_classes.idl b/dlls/wbemdisp/wbemdisp_classes.idl
index 1d468ec..4fdedb0 100644
--- a/dlls/wbemdisp/wbemdisp_classes.idl
+++ b/dlls/wbemdisp/wbemdisp_classes.idl
@@ -20,14 +20,6 @@
 
 [
     threading(apartment),
-    uuid(76a64158-cb41-11d1-8b02-00600806d9b6),
-    progid("WbemScripting.SWbemLocator.1"),
-    vi_progid("WbemScripting.SWbemLocator")
-]
-coclass SWbemLocator { interface ISWbemLocator; }
-
-[
-    threading(apartment),
     uuid(172bddf8-ceea-11d1-8b05-00600806d9b6),
     progid("WINMGMTS.1"),
     vi_progid("WINMGMTS")
diff --git a/include/wbemdisp.idl b/include/wbemdisp.idl
index 62cc0e4..a3a9b68 100644
--- a/include/wbemdisp.idl
+++ b/include/wbemdisp.idl
@@ -18,6 +18,12 @@
 
 import "dispex.idl";
 
+#ifndef __WIDL__
+#define threading(model)
+#define progid(str)
+#define vi_progid(str)
+#endif
+
 [
     uuid(565783c6-cb41-11d1-8b02-00600806d9b6),
     helpstring("Microsoft WMI Scripting V1.2 Library"),
@@ -1102,7 +1108,10 @@ interface ISWbemServices : IDispatch
 };
 
 [
-    uuid(76a64158-cb41-11d1-8b02-00600806d9b6)
+    threading(apartment),
+    uuid(76a64158-cb41-11d1-8b02-00600806d9b6),
+    progid("WbemScripting.SWbemLocator.1"),
+    vi_progid("WbemScripting.SWbemLocator")
 ]
 coclass SWbemLocator
 {