From 44ccc4f638a3b216bddb1bebbe98cae9b3921197 Mon Sep 17 00:00:00 2001 From: Kevin Puetz Date: Thu, 17 Sep 2020 18:24:18 -0500 Subject: [PATCH] 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 Signed-off-by: Alexandre Julliard --- 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 7cfe9e146c9..23d1dd86525 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: