widl: Correctly set the import library offset for all imported types.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47031Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

widl: Correctly set the import library offset for all imported types.
6c64d021 · Zebediah Figura · Alexandre Julliard · 5b6bf621 · 6c64d021 · 6c64d021
Commit 6c64d021 authored Apr 17, 2019 by Zebediah Figura Committed by Alexandre Julliard Apr 18, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

widltypes.h tools/widl/widltypes.h +1 -0

write_msft.c tools/widl/write_msft.c +3 -3

No files found.
--- a/tools/widl/widltypes.h
+++ b/tools/widl/widltypes.h
@@ -497,6 +497,7 @@ struct _importinfo_t {
 };

 struct _importlib_t {
+    int offset;
    char *name;

    int version;

--- a/tools/widl/write_msft.c
+++ b/tools/widl/write_msft.c
@@ -702,15 +702,15 @@ static void alloc_importinfo(msft_typelib_t *typelib, importinfo_t *importinfo)

        guid_idx = ctl2_alloc_guid(typelib, &guid);

-        alloc_importfile(typelib, guid_idx, importlib->version&0xffff,
-                         importlib->version>>16, importlib->name);
+        importlib->offset = alloc_importfile(typelib, guid_idx, importlib->version & 0xffff,
+                importlib->version >> 16, importlib->name);
    }

    if(importinfo->offset == -1 || !(importinfo->flags & MSFT_IMPINFO_OFFSET_IS_GUID)) {
        MSFT_ImpInfo impinfo;

        impinfo.flags = importinfo->flags;
-        impinfo.oImpFile = 0;
+        impinfo.oImpFile = importlib->offset;

        if(importinfo->flags & MSFT_IMPINFO_OFFSET_IS_GUID) {
            MSFT_GuidEntry guid;