hnetcfg: Register netfx interfaces

[Alistair Leslie-Hughes]

Hi,


Changelog:
     hnetcfg: Register netfx interfaces


Best Regards
  Alistair Leslie-Hughes
-------------- next part --------------
>From 23bd516614bb65e1f77175968a4a03b8de866c5a Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Fri, 4 Apr 2014 09:17:40 +1100
Subject: [PATCH] Register netfx interfaces
To: wine-patches <wine-patches at winehq.org>

---
 dlls/hnetcfg/Makefile.in |  1 -
 dlls/hnetcfg/hnetcfg.idl | 37 -------------------------------------
 include/netfw.idl        | 21 ++++++++++++++++++---
 3 files changed, 18 insertions(+), 41 deletions(-)
 delete mode 100644 dlls/hnetcfg/hnetcfg.idl

diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in
index 3744368..6c22391 100644
--- a/dlls/hnetcfg/Makefile.in
+++ b/dlls/hnetcfg/Makefile.in
@@ -11,5 +11,4 @@ C_SRCS = \
 	service.c
 
 IDL_SRCS = \
-	hnetcfg.idl \
 	hnetcfg_tlb.idl
diff --git a/dlls/hnetcfg/hnetcfg.idl b/dlls/hnetcfg/hnetcfg.idl
deleted file mode 100644
index 0ba4be2..0000000
--- a/dlls/hnetcfg/hnetcfg.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * COM Classes for hnetcfg
- *
- * 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
-
-[
-    helpstring("HNetCfg.FwMgr"),
-    progid("HNetCfg.FwMgr"),
-    threading(both),
-    uuid(304ce942-6e39-40d8-943a-b913c40c9cd4)
-]
-coclass NetFwMgr { interface INetFwMgr; }
-
-[
-    helpstring("HNetCfg.FwAuthorizedApplication"),
-    progid("HNetCfg.FwAuthorizedApplication"),
-    threading(both),
-    uuid(ec9846b3-2762-4a6b-a214-6acb603462d2)
-]
-coclass NetFwAuthorizedApplication { interface INetFwAuthorizedApplications; }
diff --git a/include/netfw.idl b/include/netfw.idl
index 9158f8d..ff61c25 100644
--- a/include/netfw.idl
+++ b/include/netfw.idl
@@ -24,6 +24,12 @@
 import "icftypes.idl";
 import "oaidl.idl";
 
+#ifndef __WIDL__
+#define threading(model)
+#define progid(str)
+#define vi_progid(str)
+#endif
+
 [
    object,
    uuid(A6207B2E-7CDD-426A-951E-5E1CBC5AFEAD),
@@ -445,7 +451,10 @@ library NetFwPublicTypeLib
     interface INetFwMgr;
 
     [
-        uuid(0CA545C6-37AD-4A6C-BF92-9F7610067EF5)
+        helpstring("HNetCfg.FwOpenPort"),
+        uuid(0CA545C6-37AD-4A6C-BF92-9F7610067EF5),
+        vi_progid("HNetCfg.FwOpenPort"),
+        threading(both)
     ]
     coclass NetFwOpenPort
     {
@@ -453,7 +462,10 @@ library NetFwPublicTypeLib
     }
 
     [
-        uuid(EC9846B3-2762-4A6B-A214-6ACB603462D2)
+        helpstring("HNetCfg.FwAuthorizedApplication"),
+        progid("HNetCfg.FwAuthorizedApplication"),
+        threading(both),
+        uuid(ec9846b3-2762-4a6b-a214-6acb603462d2)
     ]
     coclass NetFwAuthorizedApplication
     {
@@ -461,7 +473,10 @@ library NetFwPublicTypeLib
     }
 
     [
-        uuid(304CE942-6E39-40D8-943A-B913C40C9CD4)
+        helpstring("HNetCfg.FwMgr"),
+        progid("HNetCfg.FwMgr"),
+        threading(both),
+        uuid(304ce942-6e39-40d8-943a-b913c40c9cd4)
     ]
     coclass NetFwMgr
     {
-- 
1.8.3.2