Commit ea99533e authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

mshtml: Added IHTMLObjectElement stub implementation.

parent cb65dbf3
...@@ -30,6 +30,7 @@ C_SRCS = \ ...@@ -30,6 +30,7 @@ C_SRCS = \
htmlinput.c \ htmlinput.c \
htmllocation.c \ htmllocation.c \
htmlnode.c \ htmlnode.c \
htmlobject.c \
htmloption.c \ htmloption.c \
htmlscreen.c \ htmlscreen.c \
htmlscript.c \ htmlscript.c \
......
...@@ -1659,6 +1659,7 @@ HTMLElement *HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL ...@@ -1659,6 +1659,7 @@ HTMLElement *HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL
static const WCHAR wszIFRAME[] = {'I','F','R','A','M','E',0}; static const WCHAR wszIFRAME[] = {'I','F','R','A','M','E',0};
static const WCHAR wszIMG[] = {'I','M','G',0}; static const WCHAR wszIMG[] = {'I','M','G',0};
static const WCHAR wszINPUT[] = {'I','N','P','U','T',0}; static const WCHAR wszINPUT[] = {'I','N','P','U','T',0};
static const WCHAR wszOBJECT[] = {'O','B','J','E','C','T',0};
static const WCHAR wszOPTION[] = {'O','P','T','I','O','N',0}; static const WCHAR wszOPTION[] = {'O','P','T','I','O','N',0};
static const WCHAR wszSCRIPT[] = {'S','C','R','I','P','T',0}; static const WCHAR wszSCRIPT[] = {'S','C','R','I','P','T',0};
static const WCHAR wszSELECT[] = {'S','E','L','E','C','T',0}; static const WCHAR wszSELECT[] = {'S','E','L','E','C','T',0};
...@@ -1689,6 +1690,8 @@ HTMLElement *HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL ...@@ -1689,6 +1690,8 @@ HTMLElement *HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL
ret = HTMLImgElement_Create(doc, nselem); ret = HTMLImgElement_Create(doc, nselem);
else if(!strcmpW(class_name, wszINPUT)) else if(!strcmpW(class_name, wszINPUT))
ret = HTMLInputElement_Create(doc, nselem); ret = HTMLInputElement_Create(doc, nselem);
else if(!strcmpW(class_name, wszOBJECT))
ret = HTMLObjectElement_Create(doc, nselem);
else if(!strcmpW(class_name, wszOPTION)) else if(!strcmpW(class_name, wszOPTION))
ret = HTMLOptionElement_Create(doc, nselem); ret = HTMLOptionElement_Create(doc, nselem);
else if(!strcmpW(class_name, wszSCRIPT)) else if(!strcmpW(class_name, wszSCRIPT))
......
...@@ -810,6 +810,7 @@ HTMLElement *HTMLFrameElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); ...@@ -810,6 +810,7 @@ HTMLElement *HTMLFrameElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*);
HTMLElement *HTMLIFrame_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLIFrame_Create(HTMLDocumentNode*,nsIDOMHTMLElement*);
HTMLElement *HTMLImgElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLImgElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*);
HTMLElement *HTMLInputElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLInputElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*);
HTMLElement *HTMLObjectElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*);
HTMLElement *HTMLOptionElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLOptionElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*);
HTMLElement *HTMLScriptElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLScriptElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*);
HTMLElement *HTMLSelectElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLSelectElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*);
......
...@@ -48,7 +48,7 @@ static const char elem_test_str[] = ...@@ -48,7 +48,7 @@ static const char elem_test_str[] =
"<textarea id=\"X\">text text</textarea>" "<textarea id=\"X\">text text</textarea>"
"<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td>td1 text</td><td>td2 text</td></tr></tbody></table>" "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td>td1 text</td><td>td2 text</td></tr></tbody></table>"
"<script id=\"sc\" type=\"text/javascript\"><!--\nfunction Testing() {}\n// -->\n</script>" "<script id=\"sc\" type=\"text/javascript\"><!--\nfunction Testing() {}\n// -->\n</script>"
"<test />" "<test /><object></object>"
"<img id=\"imgid\" name=\"WineImg\"/>" "<img id=\"imgid\" name=\"WineImg\"/>"
"<iframe src=\"about:blank\" id=\"ifr\"></iframe>" "<iframe src=\"about:blank\" id=\"ifr\"></iframe>"
"<form id=\"frm\"></form>" "<form id=\"frm\"></form>"
...@@ -100,7 +100,8 @@ typedef enum { ...@@ -100,7 +100,8 @@ typedef enum {
ET_TD, ET_TD,
ET_IFRAME, ET_IFRAME,
ET_FORM, ET_FORM,
ET_FRAME ET_FRAME,
ET_OBJECT
} elem_type_t; } elem_type_t;
static const IID * const none_iids[] = { static const IID * const none_iids[] = {
...@@ -324,6 +325,18 @@ static const IID * const frame_iids[] = { ...@@ -324,6 +325,18 @@ static const IID * const frame_iids[] = {
NULL NULL
}; };
static const IID * const object_iids[] = {
&IID_IHTMLDOMNode,
&IID_IHTMLDOMNode2,
&IID_IHTMLElement,
&IID_IHTMLElement2,
&IID_IHTMLElement3,
&IID_IHTMLObjectElement,
&IID_IDispatchEx,
/* FIXME: No IConnectionPointContainer */
NULL
};
static const IID * const iframe_iids[] = { static const IID * const iframe_iids[] = {
&IID_IHTMLDOMNode, &IID_IHTMLDOMNode,
&IID_IHTMLDOMNode2, &IID_IHTMLDOMNode2,
...@@ -421,7 +434,8 @@ static const elem_type_info_t elem_type_infos[] = { ...@@ -421,7 +434,8 @@ static const elem_type_info_t elem_type_infos[] = {
{"TD", td_iids, NULL}, {"TD", td_iids, NULL},
{"IFRAME", iframe_iids, &DIID_DispHTMLIFrame}, {"IFRAME", iframe_iids, &DIID_DispHTMLIFrame},
{"FORM", form_iids, &DIID_DispHTMLFormElement}, {"FORM", form_iids, &DIID_DispHTMLFormElement},
{"FRAME", frame_iids, &DIID_DispHTMLFrameElement} {"FRAME", frame_iids, &DIID_DispHTMLFrameElement},
{"OBJECT", object_iids, NULL}
}; };
static const char *dbgstr_guid(REFIID riid) static const char *dbgstr_guid(REFIID riid)
...@@ -5784,6 +5798,7 @@ static void test_elems(IHTMLDocument2 *doc) ...@@ -5784,6 +5798,7 @@ static void test_elems(IHTMLDocument2 *doc)
ET_TD, ET_TD,
ET_SCRIPT, ET_SCRIPT,
ET_TEST, ET_TEST,
ET_OBJECT,
ET_IMG, ET_IMG,
ET_IFRAME, ET_IFRAME,
ET_FORM ET_FORM
......
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