From c1db191d9b0fb6e38744cb72fcff1dd0964cb68d Mon Sep 17 00:00:00 2001
From: Huw Davies <huw@codeweavers.com>
Date: Tue, 25 Jan 2005 10:56:58 +0000
Subject: [PATCH] Add interface inheritance.

---
 tools/widl/write_msft.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c
index 0755854d7b4..13f764c6c3a 100644
--- a/tools/widl/write_msft.c
+++ b/tools/widl/write_msft.c
@@ -1502,6 +1502,18 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var)
     return S_OK;
 }
 
+static HRESULT add_impl_type(msft_typeinfo_t *typeinfo, type_t *ref)
+{
+    if(ref->typelib_idx == -1)
+        add_interface_typeinfo(typeinfo->typelib, ref);
+    if(ref->typelib_idx == -1)
+        error("add_impl_type: unable to add inherited interface\n");
+
+    typeinfo->typeinfo->datatype1 = typeinfo->typelib->typelib_typeinfo_offsets[ref->typelib_idx];
+    typeinfo->typeinfo->cImplTypes++;
+    return S_OK;
+}
+
 static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_kind kind,
                                              char *name, attr_t *attr, int idx)
 {
@@ -1603,6 +1615,9 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface)
                                          typelib->typelib_header.nrtypeinfos);
     msft_typeinfo->typeinfo->size = 4;
 
+    if(interface->ref)
+        add_impl_type(msft_typeinfo, interface->ref);
+
     while(NEXT_LINK(cur)) cur = NEXT_LINK(cur);
     while(cur) {
         if(add_func_desc(msft_typeinfo, cur, idx) == S_OK)