[Wine-patches] [1/2] mshtml: Remove incorrect IHTMLBaseElement interface (reopen eterbugs #2517, 3168)
Konstantin Kondratyuk
=?iso-8859-1?q?kondratyuk_=CE=C1_etersoft=2Eru?=
Вт Апр 7 16:36:25 MSD 2009
--
Best regards,
Konstantin Kondratyuk.
----------- следующая часть -----------
From 2f2b82bd4fabd7ebb6fa9aefcf923b02befcf3fa Mon Sep 17 00:00:00 2001
From: Konstantin Kondratyuk <kondratyuk на etersoft.ru>
Date: Tue, 7 Apr 2009 15:36:26 +0400
Subject: [PATCH 1/2] mshtml: Remove incorrect IHTMLBaseElement interface
---
dlls/mshtml/Makefile.in | 1 -
dlls/mshtml/baseelement.c | 180 ------------------------------------------
dlls/mshtml/htmldoc.c | 1 -
dlls/mshtml/htmlnode.c | 4 -
dlls/mshtml/mshtml_private.h | 2 -
5 files changed, 0 insertions(+), 188 deletions(-)
delete mode 100644 dlls/mshtml/baseelement.c
diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in
index e72a3d1..892036d 100644
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -8,7 +8,6 @@ IMPORTS = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 ke
EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
- baseelement.c \
conpoint.c \
dispex.c \
editor.c \
diff --git a/dlls/mshtml/baseelement.c b/dlls/mshtml/baseelement.c
deleted file mode 100644
index 1b37d93..0000000
--- a/dlls/mshtml/baseelement.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright 2009 Konstantin Kondratyuk
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "config.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "ole2.h"
-
-#include "wine/debug.h"
-
-#include "mshtml_private.h"
-#include "htmlevent.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
-
-#define HTMLBASEELEM_THIS(iface) DEFINE_THIS(HTMLDocument, HTMLBaseElement, iface)
-
- /*** IUnknown methods ***/
-static HRESULT WINAPI HTMLBaseElement_QueryInterface(
- IHTMLBaseElement* iface,
- REFIID riid,
- void **ppvObject)
-/*
-{
- HTMLDocument *This = HTMLBASEELEM_THIS(iface);
- return IHTMLDocument2_QueryInterface(This, riid, ppvObject);
-}
-*/
-{
- FIXME("is not implemented\n");
- return E_NOTIMPL;
-}
-static ULONG WINAPI HTMLBaseElement_AddRef(
- IHTMLBaseElement* iface)
-{
- FIXME("is not implemented\n");
- return E_NOTIMPL;
-}
-/*
-{
- HTMLDocument *This = HTMLBASEELEM_THIS(iface);
- return IHTMLDocument2_AddRef(This);
-}
-*/
-
-static ULONG WINAPI HTMLBaseElement_Release(
- IHTMLBaseElement* iface)
-{
- FIXME("is not implemented\n");
- return E_NOTIMPL;
-}
-/*
-{
- HTMLDocument *This = HTMLBASEELEM_THIS(iface);
- return IHTMLDocument2_Release(This);
-}
-*/
-
- /*** IDispatch methods ***/
-static HRESULT WINAPI HTMLBaseElement_GetTypeInfoCount(
- IHTMLBaseElement* iface,
- UINT *pctinfo)
-{
- FIXME("is not implemented\n");
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI HTMLBaseElement_GetTypeInfo(
- IHTMLBaseElement* iface,
- UINT iTInfo,
- LCID lcid,
- ITypeInfo **ppTInfo)
-{
- FIXME("is not implemented\n");
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI HTMLBaseElement_GetIDsOfNames(
- IHTMLBaseElement* iface,
- REFIID riid,
- LPOLESTR *rgszNames,
- UINT cNames,
- LCID lcid,
- DISPID *rgDispId)
-{
- FIXME("is not implemented\n");
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI HTMLBaseElement_Invoke(
- IHTMLBaseElement* iface,
- DISPID dispIdMember,
- REFIID riid,
- LCID lcid,
- WORD wFlags,
- DISPPARAMS *pDispParams,
- VARIANT *pVarResult,
- EXCEPINFO *pExcepInfo,
- UINT *puArgErr)
-{
- FIXME("is not implemented\n");
- return E_NOTIMPL;
-}
-
- /*** IHTMLBaseElement methods ***/
-static HRESULT WINAPI HTMLBaseElement_put_href(
- IHTMLBaseElement* iface,
- BSTR v)
-{
- FIXME("is not implemented\n");
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI HTMLBaseElement_get_href(
- IHTMLBaseElement* iface,
- BSTR *p)
-{
- FIXME("is not implemented\n");
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI HTMLBaseElement_put_target(
- IHTMLBaseElement* iface,
- BSTR v)
-{
- FIXME("is not implemented\n");
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI HTMLBaseElement_get_target(
- IHTMLBaseElement* iface,
- BSTR *p)
-{
- FIXME("is not implemented\n");
- return E_NOTIMPL;
-}
-
-#undef HTMLBASEELEM_THIS
-
-static const IHTMLBaseElementVtbl HTMLBaseElementVtbl = {
- HTMLBaseElement_QueryInterface,
- HTMLBaseElement_AddRef,
- HTMLBaseElement_Release,
- HTMLBaseElement_GetTypeInfoCount,
- HTMLBaseElement_GetTypeInfo,
- HTMLBaseElement_GetIDsOfNames,
- HTMLBaseElement_Invoke,
- HTMLBaseElement_put_href,
- HTMLBaseElement_get_href,
- HTMLBaseElement_put_target,
- HTMLBaseElement_get_target,
-};
-
-
-void HTMLDocument_BaseElement_Init(HTMLDocument *This)
-{
- This->lpHTMLBaseElementVtbl = &HTMLBaseElementVtbl;
-}
diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index 5352756..341a1a0 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -1820,7 +1820,6 @@ static HRESULT alloc_doc(HTMLDocument **ret)
HTMLDocument_Service_Init(doc);
HTMLDocument_Hlink_Init(doc);
HTMLDocument_Markup_Init(doc);
- HTMLDocument_BaseElement_Init(doc);
ConnectionPointContainer_Init(&doc->cp_container, (IUnknown*)HTMLDOC(doc));
ConnectionPoint_Init(&doc->cp_propnotif, &doc->cp_container, &IID_IPropertyNotifySink);
diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c
index 159ef15..32b0801 100644
--- a/dlls/mshtml/htmlnode.c
+++ b/dlls/mshtml/htmlnode.c
@@ -842,10 +842,6 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv)
}else if(IsEqualGUID(&IID_IHTMLDOMNode2, riid)) {
TRACE("(%p)->(IID_IHTMLDOMNode2 %p)\n", This, ppv);
*ppv = HTMLDOMNODE2(This);
- }else if(IsEqualGUID(&IID_IHTMLBaseElement, riid)) {
- HTMLDocument* This2 = This->doc;
- FIXME("(%p)->(IID_IHTMLBaseElement %p)\n", This2, ppv);
- *ppv = HTMLBASEELEM(This2);
}else if(dispex_query_interface(&This->dispex, riid, ppv)) {
return *ppv ? S_OK : E_NOINTERFACE;
}
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index e0690b7..cf7d446 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -247,7 +247,6 @@ struct HTMLDocument {
const IPersistPropertyBagVtbl *lpPersistPropertyBagVtbl;
const IMarkupServicesVtbl *lpMarkupServicesVtbl;
const ISupportErrorInfoVtbl *lpSupportErrorInfoVtbl;
- const IHTMLBaseElementVtbl *lpHTMLBaseElementVtbl;
LONG ref;
@@ -479,7 +478,6 @@ typedef struct {
#define HTMLELEM3(x) ((IHTMLElement3*) &(x)->lpHTMLElement3Vtbl)
#define HTMLDOMNODE(x) ((IHTMLDOMNode*) &(x)->lpHTMLDOMNodeVtbl)
#define HTMLDOMNODE2(x) ((IHTMLDOMNode2*) &(x)->lpHTMLDOMNode2Vtbl)
-#define HTMLBASEELEM(x) ((IHTMLBaseElement*) &(x)->lpHTMLBaseElementVtbl)
#define HTMLTEXTCONT(x) ((IHTMLTextContainer*) &(x)->lpHTMLTextContainerVtbl)
--
1.6.1.3.GIT
Подробная информация о списке рассылки Wine-patches