mshtml: IHTMLDocument2 iface handling clean up (for Etersoft code)

Conflicts:

	dlls/mshtml/oleobj.c
	dlls/mshtml/persist.c

diff --git a/dlls/mshtml/markup.c b/dlls/mshtml/markup.c
index 0119358de84eae128faebcffe8779c7a6bb3c414..4e094934e26e79d6c6ed2cb45085cb5262210cd6 100644 (file)
--- a/dlls/mshtml/markup.c
+++ b/dlls/mshtml/markup.c
@@ -51,21 +51,21 @@ static HRESULT WINAPI MarkupServices_QueryInterface(
         void **ppvObject)
 {
     HTMLDocument *This = MRKUPSRV_THIS(iface);
-    return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppvObject);
+    return htmldoc_query_interface(This, riid, ppvObject);
 }
 
 static ULONG WINAPI MarkupServices_AddRef(
         IMarkupServices* iface)
 {
     HTMLDocument *This = MRKUPSRV_THIS(iface);
-    return IHTMLDocument2_AddRef(HTMLDOC(This));
+    return htmldoc_addref(This);
 }
 
 static ULONG WINAPI MarkupServices_Release(
         IMarkupServices* iface)
 {
     HTMLDocument *This = MRKUPSRV_THIS(iface);
-    return IHTMLDocument2_Release(HTMLDOC(This));
+    return htmldoc_release(This);
 }
 
     /*** IMarkupServices methods ***/