Skip to content

W
wine-cw
Commit 536fac7c authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

mshtml: Added IHTMLElement3 stub implementation.

parent c67952ae
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 0 deletions
dlls/mshtml/Makefile.in
View file @ 536fac7c
...@@ -21,6 +21,7 @@ C_SRCS = \ ...@@ -21,6 +21,7 @@ C_SRCS = \
htmldoc5.c \ htmldoc5.c \
htmlelem.c \ htmlelem.c \
htmlelem2.c \ htmlelem2.c \
htmlelem3.c \
htmlelemcol.c \ htmlelemcol.c \
htmlevent.c \ htmlevent.c \
htmlgeneric.c \ htmlgeneric.c \
......
dlls/mshtml/htmlelem.c
View file @ 536fac7c
...@@ -1339,6 +1339,9 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) ...@@ -1339,6 +1339,9 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
}else if(IsEqualGUID(&IID_IHTMLElement2, riid)) { }else if(IsEqualGUID(&IID_IHTMLElement2, riid)) {
TRACE("(%p)->(IID_IHTMLElement2 %p)\n", This, ppv); TRACE("(%p)->(IID_IHTMLElement2 %p)\n", This, ppv);
*ppv = HTMLELEM2(This); *ppv = HTMLELEM2(This);
}else if(IsEqualGUID(&IID_IHTMLElement3, riid)) {
TRACE("(%p)->(IID_IHTMLElement3 %p)\n", This, ppv);
*ppv = HTMLELEM3(This);
}else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) {
TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv);
*ppv = CONPTCONT(&This->cp_container); *ppv = CONPTCONT(&This->cp_container);
...@@ -1391,6 +1394,7 @@ void HTMLElement_Init(HTMLElement *This) ...@@ -1391,6 +1394,7 @@ void HTMLElement_Init(HTMLElement *This)
ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)HTMLELEM(This)); ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)HTMLELEM(This));
HTMLElement2_Init(This); HTMLElement2_Init(This);
HTMLElement3_Init(This);
if(!This->node.dispex.data) if(!This->node.dispex.data)
init_dispex(&This->node.dispex, (IUnknown*)HTMLELEM(This), &HTMLElement_dispex); init_dispex(&This->node.dispex, (IUnknown*)HTMLELEM(This), &HTMLElement_dispex);
......
dlls/mshtml/mshtml_private.h
View file @ 536fac7c
...@@ -381,6 +381,7 @@ typedef struct { ...@@ -381,6 +381,7 @@ typedef struct {
const IHTMLElementVtbl *lpHTMLElementVtbl; const IHTMLElementVtbl *lpHTMLElementVtbl;
const IHTMLElement2Vtbl *lpHTMLElement2Vtbl; const IHTMLElement2Vtbl *lpHTMLElement2Vtbl;
const IHTMLElement3Vtbl *lpHTMLElement3Vtbl;
nsIDOMHTMLElement *nselem; nsIDOMHTMLElement *nselem;
} HTMLElement; } HTMLElement;
...@@ -441,6 +442,7 @@ typedef struct { ...@@ -441,6 +442,7 @@ typedef struct {
#define HTMLELEM(x) ((IHTMLElement*) &(x)->lpHTMLElementVtbl) #define HTMLELEM(x) ((IHTMLElement*) &(x)->lpHTMLElementVtbl)
#define HTMLELEM2(x) ((IHTMLElement2*) &(x)->lpHTMLElement2Vtbl) #define HTMLELEM2(x) ((IHTMLElement2*) &(x)->lpHTMLElement2Vtbl)
#define HTMLELEM3(x) ((IHTMLElement3*) &(x)->lpHTMLElement3Vtbl)
#define HTMLDOMNODE(x) ((IHTMLDOMNode*) &(x)->lpHTMLDOMNodeVtbl) #define HTMLDOMNODE(x) ((IHTMLDOMNode*) &(x)->lpHTMLDOMNodeVtbl)
#define HTMLDOMNODE2(x) ((IHTMLDOMNode2*) &(x)->lpHTMLDOMNode2Vtbl) #define HTMLDOMNODE2(x) ((IHTMLDOMNode2*) &(x)->lpHTMLDOMNode2Vtbl)
...@@ -572,6 +574,7 @@ HTMLElement *HTMLGenericElement_Create(nsIDOMHTMLElement*); ...@@ -572,6 +574,7 @@ HTMLElement *HTMLGenericElement_Create(nsIDOMHTMLElement*);
void HTMLDOMNode_Init(HTMLDocument*,HTMLDOMNode*,nsIDOMNode*); void HTMLDOMNode_Init(HTMLDocument*,HTMLDOMNode*,nsIDOMNode*);
void HTMLElement_Init(HTMLElement*); void HTMLElement_Init(HTMLElement*);
void HTMLElement2_Init(HTMLElement*); void HTMLElement2_Init(HTMLElement*);
void HTMLElement3_Init(HTMLElement*);
void HTMLTextContainer_Init(HTMLTextContainer*); void HTMLTextContainer_Init(HTMLTextContainer*);
HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**); HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**);
......
dlls/mshtml/tests/dom.c
View file @ 536fac7c
...@@ -99,6 +99,7 @@ static const IID * const elem_iids[] = { ...@@ -99,6 +99,7 @@ static const IID * const elem_iids[] = {
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
&IID_IHTMLElement, &IID_IHTMLElement,
&IID_IHTMLElement2, &IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IDispatchEx, &IID_IDispatchEx,
&IID_IConnectionPointContainer, &IID_IConnectionPointContainer,
NULL NULL
...@@ -109,6 +110,7 @@ static const IID * const body_iids[] = { ...@@ -109,6 +110,7 @@ static const IID * const body_iids[] = {
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
&IID_IHTMLElement, &IID_IHTMLElement,
&IID_IHTMLElement2, &IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IHTMLTextContainer, &IID_IHTMLTextContainer,
&IID_IHTMLBodyElement, &IID_IHTMLBodyElement,
&IID_IDispatchEx, &IID_IDispatchEx,
...@@ -121,6 +123,7 @@ static const IID * const anchor_iids[] = { ...@@ -121,6 +123,7 @@ static const IID * const anchor_iids[] = {
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
&IID_IHTMLElement, &IID_IHTMLElement,
&IID_IHTMLElement2, &IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IHTMLAnchorElement, &IID_IHTMLAnchorElement,
&IID_IDispatchEx, &IID_IDispatchEx,
&IID_IConnectionPointContainer, &IID_IConnectionPointContainer,
...@@ -132,6 +135,7 @@ static const IID * const input_iids[] = { ...@@ -132,6 +135,7 @@ static const IID * const input_iids[] = {
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
&IID_IHTMLElement, &IID_IHTMLElement,
&IID_IHTMLElement2, &IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IHTMLInputElement, &IID_IHTMLInputElement,
&IID_IHTMLInputTextElement, &IID_IHTMLInputTextElement,
&IID_IDispatchEx, &IID_IDispatchEx,
...@@ -144,6 +148,7 @@ static const IID * const select_iids[] = { ...@@ -144,6 +148,7 @@ static const IID * const select_iids[] = {
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
&IID_IHTMLElement, &IID_IHTMLElement,
&IID_IHTMLElement2, &IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IHTMLSelectElement, &IID_IHTMLSelectElement,
&IID_IDispatchEx, &IID_IDispatchEx,
&IID_IConnectionPointContainer, &IID_IConnectionPointContainer,
...@@ -155,6 +160,7 @@ static const IID * const textarea_iids[] = { ...@@ -155,6 +160,7 @@ static const IID * const textarea_iids[] = {
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
&IID_IHTMLElement, &IID_IHTMLElement,
&IID_IHTMLElement2, &IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IHTMLTextAreaElement, &IID_IHTMLTextAreaElement,
&IID_IDispatchEx, &IID_IDispatchEx,
&IID_IConnectionPointContainer, &IID_IConnectionPointContainer,
...@@ -166,6 +172,7 @@ static const IID * const option_iids[] = { ...@@ -166,6 +172,7 @@ static const IID * const option_iids[] = {
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
&IID_IHTMLElement, &IID_IHTMLElement,
&IID_IHTMLElement2, &IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IHTMLOptionElement, &IID_IHTMLOptionElement,
&IID_IDispatchEx, &IID_IDispatchEx,
&IID_IConnectionPointContainer, &IID_IConnectionPointContainer,
...@@ -177,6 +184,7 @@ static const IID * const table_iids[] = { ...@@ -177,6 +184,7 @@ static const IID * const table_iids[] = {
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
&IID_IHTMLElement, &IID_IHTMLElement,
&IID_IHTMLElement2, &IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IHTMLTable, &IID_IHTMLTable,
&IID_IDispatchEx, &IID_IDispatchEx,
&IID_IConnectionPointContainer, &IID_IConnectionPointContainer,
...@@ -188,6 +196,7 @@ static const IID * const script_iids[] = { ...@@ -188,6 +196,7 @@ static const IID * const script_iids[] = {
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
&IID_IHTMLElement, &IID_IHTMLElement,
&IID_IHTMLElement2, &IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IHTMLScriptElement, &IID_IHTMLScriptElement,
&IID_IDispatchEx, &IID_IDispatchEx,
&IID_IConnectionPointContainer, &IID_IConnectionPointContainer,
...@@ -220,6 +229,7 @@ static const IID * const comment_iids[] = { ...@@ -220,6 +229,7 @@ static const IID * const comment_iids[] = {
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
&IID_IHTMLElement, &IID_IHTMLElement,
&IID_IHTMLElement2, &IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IHTMLCommentElement, &IID_IHTMLCommentElement,
&IID_IDispatchEx, &IID_IDispatchEx,
&IID_IConnectionPointContainer, &IID_IConnectionPointContainer,
...@@ -231,6 +241,7 @@ static const IID * const img_iids[] = { ...@@ -231,6 +241,7 @@ static const IID * const img_iids[] = {
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
&IID_IHTMLElement, &IID_IHTMLElement,
&IID_IHTMLElement2, &IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IDispatchEx, &IID_IDispatchEx,
&IID_IHTMLImgElement, &IID_IHTMLImgElement,
&IID_IConnectionPointContainer, &IID_IConnectionPointContainer,
...@@ -242,6 +253,7 @@ static const IID * const tr_iids[] = { ...@@ -242,6 +253,7 @@ static const IID * const tr_iids[] = {
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
&IID_IHTMLElement, &IID_IHTMLElement,
&IID_IHTMLElement2, &IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IDispatchEx, &IID_IDispatchEx,
&IID_IHTMLTableRow, &IID_IHTMLTableRow,
&IID_IConnectionPointContainer, &IID_IConnectionPointContainer,
...@@ -253,6 +265,7 @@ static const IID * const td_iids[] = { ...@@ -253,6 +265,7 @@ static const IID * const td_iids[] = {
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
&IID_IHTMLElement, &IID_IHTMLElement,
&IID_IHTMLElement2, &IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IDispatchEx, &IID_IDispatchEx,
&IID_IConnectionPointContainer, &IID_IConnectionPointContainer,
NULL NULL
...@@ -263,6 +276,7 @@ static const IID * const generic_iids[] = { ...@@ -263,6 +276,7 @@ static const IID * const generic_iids[] = {
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
&IID_IHTMLElement, &IID_IHTMLElement,
&IID_IHTMLElement2, &IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IHTMLGenericElement, &IID_IHTMLGenericElement,
&IID_IDispatchEx, &IID_IDispatchEx,
&IID_IConnectionPointContainer, &IID_IConnectionPointContainer,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment