Kevin Puetz : widl: All VARDESC fields of TKIND_UNION should have oInst=0.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 44ccc4f638a3b216bddb1bebbe98cae9b3921197
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=44ccc4f638a3b216bddb1bebb...

Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com>
Date:   Thu Sep 17 18:24:18 2020 -0500

widl: All VARDESC fields of TKIND_UNION should have oInst=0.

Also fix uninitialized value in this field for TKIND_DISPATCH.

Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

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

diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c
index 7cfe9e146c..23d1dd8652 100644
--- a/tools/widl/write_msft.c
+++ b/tools/widl/write_msft.c
@@ -1746,11 +1746,12 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var)
         typeinfo->datawidth += var_datawidth;
         break;
     case TKIND_UNION:
-        typedata[4] = typeinfo->datawidth;
+        typedata[4] = 0;
         typeinfo->datawidth = max(typeinfo->datawidth, var_datawidth);
         break;
     case TKIND_DISPATCH:
         var_kind = 3; /* VAR_DISPATCH */
+        typedata[4] = 0;
         typeinfo->datawidth = pointer_size;
         break;
     default: