[PATCH 2/2] include: Register interface proxies for IUPnPNAT

[Alistair Leslie-Hughes]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34711
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
 include/natupnp.idl | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/include/natupnp.idl b/include/natupnp.idl
index 83b48a3..0ba546f 100644
--- a/include/natupnp.idl
+++ b/include/natupnp.idl
@@ -26,7 +26,7 @@ import "ocidl.idl";
 
 [
     object,
-    uuid(6F10711F-729B-41E5-93B8-F21D0F818DF1),
+    uuid(6f10711f-729b-41e5-93b8-f21d0f818df1),
     dual,
     pointer_default(unique)
 ]
@@ -93,7 +93,7 @@ interface IStaticPortMappingCollection : IDispatch
 
 [
     object,
-    uuid(4FC80282-23B6-4378-9A27-CD8F17C9400C),
+    uuid(4fc80282-23b6-4378-9a27-cd8f17c9400c),
     dual,
     pointer_default(unique)
 ]
@@ -185,24 +185,6 @@ interface INATEventManager : IDispatch
 };
 
 [
-    object,
-    uuid(b171c812-cc76-485a-94d8-b6b3a2794e99),
-    dual,
-    pointer_default(unique)
-]
-interface IUPnPNAT : IDispatch
-{
-    [propget, id(1)]
-    HRESULT StaticPortMappingCollection ([out, retval] IStaticPortMappingCollection **collection);
-
-    [propget, id(2)]
-    HRESULT DynamicPortMappingCollection ([out, retval] IDynamicPortMappingCollection **collection);
-
-    [propget, id(3)]
-    HRESULT NATEventManager ([out, retval] INATEventManager **manager);
-};
-
-[
     id(2),
     uuid(1c565858-f302-471e-b409-f180aa4abec6),
     version(1.0)
@@ -212,6 +194,25 @@ library NATUPNPLib
     importlib("stdole2.tlb");
 
     [
+        object,
+        uuid(b171c812-cc76-485a-94d8-b6b3a2794e99),
+        dual,
+        oleautomation,
+        pointer_default(unique)
+    ]
+    interface IUPnPNAT : IDispatch
+    {
+        [propget, id(1)]
+        HRESULT StaticPortMappingCollection ([out, retval] IStaticPortMappingCollection **collection);
+
+        [propget, id(2)]
+        HRESULT DynamicPortMappingCollection ([out, retval] IDynamicPortMappingCollection **collection);
+
+        [propget, id(3)]
+        HRESULT NATEventManager ([out, retval] INATEventManager **manager);
+    };
+
+    [
         vi_progid("HNetCfg.NATUPnP"),
         progid("HNetCfg.NATUPnP.1"),
         threading(apartment),
-- 
1.9.1

[Zebediah Figura]

On 16/10/18 23:06, Alistair Leslie-Hughes wrote:
> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34711
> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
> ---
>  include/natupnp.idl | 41 +++++++++++++++++++++--------------------
>  1 file changed, 21 insertions(+), 20 deletions(-)

I don't think this is the right solution to this problem. On Windows
only the coclass declaration is inside the library declaration, so I
think we should fix widl to also register dependent interfaces.