mshtml: Use IUnknownVtbl in wrapper_vtbl.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mshtml: Use IUnknownVtbl in wrapper_vtbl.
ca2e0c5e · Jacek Caban · Alexandre Julliard · 80a222a8 · ca2e0c5e
Commit ca2e0c5e authored Sep 14, 2016 by Jacek Caban Committed by Alexandre Julliard Sep 14, 2016
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

ifacewrap.c dlls/mshtml/ifacewrap.c +9 -3

No files found.
--- a/dlls/mshtml/ifacewrap.c
+++ b/dlls/mshtml/ifacewrap.c
@@ -215,10 +215,15 @@ DEFINE_WRAPPER_FUNC(98, 392, 784)
 DEFINE_WRAPPER_FUNC(99, 396, 792)

 /* The size was found by testing when calls start crashing. It looks like MS wraps up to 100 functions. */
-static const void *wrapper_vtbl[] = {
+static const struct {
+    IUnknownVtbl unk_vtbl;
+    const void *wrappers[97];
+} wrapper_vtbl = {
+    {
        wrapper_QueryInterface,
        wrapper_AddRef,
-    wrapper_Release,
+        wrapper_Release
+    }, {
        wrapper_func_3,
        wrapper_func_4,
        wrapper_func_5,
@@ -316,6 +321,7 @@ static const void *wrapper_vtbl[] = {
        wrapper_func_97,
        wrapper_func_98,
        wrapper_func_99
+    }
 };

 HRESULT wrap_iface(IUnknown *iface, IUnknown *ref_unk, IUnknown **ret)
@@ -326,7 +332,7 @@ HRESULT wrap_iface(IUnknown *iface, IUnknown *ref_unk, IUnknown **ret)
    if(!wrapper)
        return E_OUTOFMEMORY;

-    wrapper->IUnknown_iface.lpVtbl = (const IUnknownVtbl*)wrapper_vtbl;
+    wrapper->IUnknown_iface.lpVtbl = &wrapper_vtbl.unk_vtbl;
    wrapper->ref = 1;

    IUnknown_AddRef(iface);