From: Gabriel Ivăncescu gabrielopcode@gmail.com
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com ---
It will be useful for far more objects later down the line. --- dlls/mshtml/dispex.c | 6 +++--- dlls/mshtml/htmlstyle.c | 5 +---- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/mutation.c | 6 +----- 4 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 54e54cfdc96..8e09eae9a26 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -125,6 +125,8 @@ PRIVATE_TID_LIST #undef XDIID };
+const tid_t no_iface_tids[1] = { 0 }; + static HRESULT load_typelib(void) { WCHAR module_path[MAX_PATH + 3]; @@ -1053,13 +1055,11 @@ static const dispex_static_data_vtbl_t function_dispex_vtbl = { .invoke = function_invoke };
-static const tid_t function_iface_tids[] = {0}; - static dispex_static_data_t function_dispex = { "Function", &function_dispex_vtbl, NULL_tid, - function_iface_tids + no_iface_tids };
static func_disp_t *create_func_disp(DispatchEx *obj, func_info_t *info) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index f1e30b6872d..c8aae897842 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -9764,14 +9764,11 @@ static const dispex_static_data_vtbl_t HTMLW3CComputedStyle_dispex_vtbl = { .unlink = CSSStyle_unlink };
-static const tid_t HTMLW3CComputedStyle_iface_tids[] = { - 0 -}; static dispex_static_data_t HTMLW3CComputedStyle_dispex = { "CSSStyleDeclaration", &HTMLW3CComputedStyle_dispex_vtbl, DispHTMLW3CComputedStyle_tid, - HTMLW3CComputedStyle_iface_tids, + no_iface_tids, CSSStyle_init_dispex_info };
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a7a6a2ed0a2..af26447e24a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -413,6 +413,8 @@ typedef struct { dispex_data_t *delayed_init_info; } dispex_static_data_t;
+extern const tid_t no_iface_tids[1]; + typedef HRESULT (*dispex_hook_invoke_t)(DispatchEx*,WORD,DISPPARAMS*,VARIANT*, EXCEPINFO*,IServiceProvider*);
diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 4e0276fd5f6..3c1fc945e92 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -1275,15 +1275,11 @@ static dispex_static_data_vtbl_t mutation_observer_ctor_dispex_vtbl = { .value = mutation_observer_ctor_value };
-static const tid_t mutation_observer_ctor_iface_tids[] = { - 0 -}; - static dispex_static_data_t mutation_observer_ctor_dispex = { "Function", &mutation_observer_ctor_dispex_vtbl, NULL_tid, - mutation_observer_ctor_iface_tids + no_iface_tids };
HRESULT create_mutation_observer_ctor(compat_mode_t compat_mode, IDispatch **ret)