Jacek Caban : inseng.idl: Added new IDL.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Wed Apr 22 15:47:59 2015 +0200

inseng.idl: Added new IDL.

---

dlls/inseng/Makefile.in             |  2 +-
 dlls/inseng/inseng_classes.idl      | 23 +++++++++++++++++++++++
 dlls/inseng/inseng_main.c           |  4 ++--
 include/Makefile.in                 |  1 +
 {dlls/inseng => include}/inseng.idl | 12 ++++++------
 5 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in
index a4b09de..652e06b 100644
--- a/dlls/inseng/Makefile.in
+++ b/dlls/inseng/Makefile.in
@@ -3,4 +3,4 @@ IMPORTS   = uuid ole32 advapi32

C_SRCS = inseng_main.c

-IDL_SRCS = inseng.idl
+IDL_SRCS = inseng_classes.idl
diff --git a/dlls/inseng/inseng_classes.idl b/dlls/inseng/inseng_classes.idl
new file mode 100644
index 0000000..edb7c4d
--- /dev/null
+++ b/dlls/inseng/inseng_classes.idl
@@ -0,0 +1,23 @@
+/*
+ * COM Classes for inseng
+ *
+ * Copyright 2010 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#pragma makedep register
+
+#include "inseng.idl"
diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c
index d264b99..e76c6e1 100644
--- a/dlls/inseng/inseng_main.c
+++ b/dlls/inseng/inseng_main.c
@@ -110,8 +110,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
  */
 HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
 {
-    if(IsEqualGUID(rclsid, &CLSID_ActiveSetupEng)) {
-        TRACE("(CLSID_ActiveSetupEng %s %p)\n", debugstr_guid(iid), ppv);
+    if(IsEqualGUID(rclsid, &CLSID_InstallEngine)) {
+        TRACE("(CLSID_InstallEngine %s %p)\n", debugstr_guid(iid), ppv);
         return IClassFactory_QueryInterface(&ActiveSetupEngCF, iid, ppv);
     }

diff --git a/include/Makefile.in b/include/Makefile.in
index e114f9f..ad87f47 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -59,6 +59,7 @@ PUBLIC_IDL_H_SRCS = \
    imnxport.idl \
    indexsrv.idl \
    inputscope.idl \
+	inseng.idl \
    mediaobj.idl \
    metahost.idl \
    mimeinfo.idl \
diff --git a/dlls/inseng/inseng.idl b/include/inseng.idl
similarity index 86%
rename from dlls/inseng/inseng.idl
rename to include/inseng.idl
index ba7a0f9..7b9d0e7 100644
--- a/dlls/inseng/inseng.idl
+++ b/include/inseng.idl
@@ -1,7 +1,5 @@
 /*
- * COM Classes for inseng
- *
- * Copyright 2010 Alexandre Julliard
+ * Copyright 2015 Jacek Caban for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,18 +16,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#pragma makedep register
+#ifndef __WIDL__
+#define threading(model)
+#endif

[
     helpstring("Microsoft Active Setup Engine"),
     threading(apartment),
     uuid(6e449686-c509-11cf-aafa-00aa00b6015c)
 ]
-coclass ActiveSetupEng { }
+coclass InstallEngine { }

[
     helpstring("Download Site Manager"),
     threading(apartment),
     uuid(bfc880f1-7484-11d0-8309-00aa00b6015c)
 ]
-coclass DLManager { }
+coclass DownloadSiteMgr { }