Zebediah Figura : rpcrt4: Write type format strings for coclasses.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5d44b1d4bd21b6f36bc50bdef1e7afaa0f6d4b83
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5d44b1d4bd21b6f36bc50bdef...

Author: Zebediah Figura 
Date:   Wed Nov 14 08:47:59 2018 -0600

rpcrt4: Write type format strings for coclasses.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=19016
Signed-off-by: Zebediah Figura 
Signed-off-by: Huw Davies 
Signed-off-by: Alexandre Julliard

---

dlls/rpcrt4/ndr_typelib.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c
index 215ea7d..8a08ad9 100644
--- a/dlls/rpcrt4/ndr_typelib.c
+++ b/dlls/rpcrt4/ndr_typelib.c
@@ -324,6 +324,32 @@ static size_t write_ip_tfs(unsigned char *str, size_t *len, const GUID *iid)
     return off;
 }

+static void get_default_iface(ITypeInfo *typeinfo, WORD count, GUID *iid)
+{
+    ITypeInfo *refinfo;
+    HREFTYPE reftype;
+    TYPEATTR *attr;
+    int flags, i;
+
+    for (i = 0; i < count; ++i)
+    {
+        ITypeInfo_GetImplTypeFlags(typeinfo, i, &flags);
+        if (flags & IMPLTYPEFLAG_FDEFAULT)
+            break;
+    }
+
+    /* If no interface was explicitly marked default, choose the first one. */
+    if (i == count)
+        i = 0;
+
+    ITypeInfo_GetRefTypeOfImplType(typeinfo, i, &reftype);
+    ITypeInfo_GetRefTypeInfo(typeinfo, reftype, &refinfo);
+    ITypeInfo_GetTypeAttr(refinfo, &attr);
+    *iid = attr->guid;
+    ITypeInfo_ReleaseTypeAttr(refinfo, attr);
+    ITypeInfo_Release(refinfo);
+}
+
 static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str,
         size_t *len, TYPEDESC *desc, BOOL toplevel, BOOL onstack)
 {
@@ -331,6 +357,7 @@ static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str,
     size_t ref, off = *len;
     ITypeInfo *refinfo;
     TYPEATTR *attr;
+    GUID guid;

if (desc->vt == VT_USERDEFINED)
     {
@@ -358,6 +385,10 @@ static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str,
         case TKIND_DISPATCH:
             write_ip_tfs(str, len, &attr->guid);
             break;
+        case TKIND_COCLASS:
+            get_default_iface(refinfo, attr->cImplTypes, &guid);
+            write_ip_tfs(str, len, &guid);
+            break;
         case TKIND_ALIAS:
             off = write_pointer_tfs(refinfo, str, len, &attr->tdescAlias, toplevel, onstack);
             break;