Zebediah Figura : devenum: Get rid of the union in struct moniker.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3ed689c0f28d41d0e68aa16c37df9ecc95480631
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3ed689c0f28d41d0e68aa16c3...

Author: Zebediah Figura 
Date:   Tue Apr 14 22:22:50 2020 -0500

devenum: Get rid of the union in struct moniker.

To avoid an invalid free in moniker_Release().

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/devenum/devenum_private.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h
index e0c693a2e9..43a5a0c50e 100644
--- a/dlls/devenum/devenum_private.h
+++ b/dlls/devenum/devenum_private.h
@@ -59,11 +59,8 @@ struct moniker
     CLSID class;
     BOOL has_class;
     enum device_type type;
-    union
-    {
-        WCHAR *name;    /* for filters and codecs */
-        CLSID clsid;    /* for DMOs */
-    };
+    WCHAR *name;    /* for filters and codecs */
+    CLSID clsid;    /* for DMOs */

IPropertyBag IPropertyBag_iface;
 };