diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c
index 8b6a9d76db6..b3dbcb8020b 100644
--- a/dlls/mshtml/omnavigator.c
+++ b/dlls/mshtml/omnavigator.c
@@ -418,10 +418,8 @@ static ULONG WINAPI HTMLScreen_Release(IHTMLScreen *iface)
TRACE("(%p) ref=%ld\n", This, ref);
- if(!ref) {
+ if(!ref)
release_dispex(&This->dispex);
- free(This);
- }
return ref;
}
@@ -571,13 +569,28 @@ static const IHTMLScreenVtbl HTMLSreenVtbl = {
HTMLScreen_get_fontSmoothingEnabled
};
+static inline HTMLScreen *HTMLScreen_from_DispatchEx(DispatchEx *iface)
+{
+ return CONTAINING_RECORD(iface, HTMLScreen, dispex);
+}
+
+static void HTMLScreen_destructor(DispatchEx *dispex)
+{
+ HTMLScreen *This = HTMLScreen_from_DispatchEx(dispex);
+ free(This);
+}
+
+static const dispex_static_data_vtbl_t HTMLScreen_dispex_vtbl = {
+ HTMLScreen_destructor,
+};
+
static const tid_t HTMLScreen_iface_tids[] = {
IHTMLScreen_tid,
0
};
static dispex_static_data_t HTMLScreen_dispex = {
L"Screen",
- NULL,
+ &HTMLScreen_dispex_vtbl,
DispHTMLScreen_tid,
HTMLScreen_iface_tids
};