June 2008 - Wine-commits - list.winehq.org

Andrew Talbot : setupapi: Constify a variable.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: 581a0e091cc87e027e48b835011b024a34506854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=581a0e091cc87e027e48b8350… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jun 19 22:52:02 2008 +0100 setupapi: Constify a variable. --- dlls/setupapi/devinst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7613814..af4f4d3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3052,7 +3052,7 @@ struct PropertyMapEntry LPCWSTR nameW; }; -static struct PropertyMapEntry PropertyMap[] = { +static const struct PropertyMapEntry PropertyMap[] = { { REG_SZ, "DeviceDesc", DeviceDesc }, { REG_MULTI_SZ, "HardwareId", HardwareId }, { REG_MULTI_SZ, "CompatibleIDs", CompatibleIDs },

1 0

Andrew Talbot : riched20: Constify some variables.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: 11f59093682e3f4f7a431544ad089d78fe862329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f59093682e3f4f7a431544a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jun 19 22:52:00 2008 +0100 riched20: Constify some variables. --- dlls/riched20/paint.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index df2eda8..88576f6 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -288,7 +288,7 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa } } -static struct {unsigned width_num : 4, width_den : 4, pen_style : 4, dble : 1;} border_details[] = { +static const struct {unsigned width_num : 4, width_den : 4, pen_style : 4, dble : 1;} border_details[] = { /* none */ {0, 1, PS_SOLID, FALSE}, /* 3/4 */ {3, 4, PS_SOLID, FALSE}, /* 1 1/2 */ {3, 2, PS_SOLID, FALSE}, @@ -303,7 +303,7 @@ static struct {unsigned width_num : 4, width_den : 4, pen_style : 4, dble : 1;} /* 1 1/2 dashed */ {3, 2, PS_DASH, FALSE}, }; -static COLORREF pen_colors[16] = { +static const COLORREF pen_colors[16] = { /* Black */ RGB(0x00, 0x00, 0x00), /* Blue */ RGB(0x00, 0x00, 0xFF), /* Cyan */ RGB(0x00, 0xFF, 0xFF), /* Green */ RGB(0x00, 0xFF, 0x00), /* Magenta */ RGB(0xFF, 0x00, 0xFF), /* Red */ RGB(0xFF, 0x00, 0x00),

1 0

Andrew Talbot : shell32: Constify a variable.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: eaa58a34be3d8d45ae2521f99f2f37f9f3a4055b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa58a34be3d8d45ae2521f99… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jun 19 22:52:06 2008 +0100 shell32: Constify a variable. --- dlls/shell32/shfldr_netplaces.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index a4acfba..fd6b235 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -73,7 +73,7 @@ static const IPersistFolder2Vtbl vt_NP_PersistFolder2; #define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) #define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2) -static shvheader NetworkPlacesSFHeader[] = { +static const shvheader NetworkPlacesSFHeader[] = { {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10} };

1 0

Andrew Talbot : qmgr: Constify some variables.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: e9d1d5d087a524c2ab65f7529a397ce94081a6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d1d5d087a524c2ab65f7529… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jun 19 22:51:55 2008 +0100 qmgr: Constify some variables. --- dlls/qmgr/file.c | 2 +- dlls/qmgr/service.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 1ca1bf3..622f7a2 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -368,7 +368,7 @@ static DLBindStatusCallback *DLBindStatusCallbackConstructor( BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) { - static WCHAR prefix[] = {'B','I','T', 0}; + static const WCHAR prefix[] = {'B','I','T', 0}; IBindStatusCallback *callbackObj; WCHAR tmpDir[MAX_PATH]; WCHAR tmpName[MAX_PATH]; diff --git a/dlls/qmgr/service.c b/dlls/qmgr/service.c index 50d5156..b00a922 100644 --- a/dlls/qmgr/service.c +++ b/dlls/qmgr/service.c @@ -30,7 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); HANDLE stop_event = NULL; -static WCHAR qmgr_nameW[] = {'B','I','T','S',0}; static SERVICE_STATUS_HANDLE status_handle; static SERVICE_STATUS status; @@ -110,6 +109,7 @@ VOID WINAPI ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) { HANDLE fileTxThread; + static const WCHAR qmgr_nameW[] = {'B','I','T','S',0}; DWORD threadId; TRACE("\n");

1 0

Jacek Caban : mshtml: Added IHTMLGenericElement implementation.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: d9cb62e37f3ef2008793e871b2c26c71b3e062ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9cb62e37f3ef2008793e871b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 16:14:57 2008 -0500 mshtml: Added IHTMLGenericElement implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 4 +- dlls/mshtml/htmlgeneric.c | 172 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +- 6 files changed, 180 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 9878bea..2a7b1fa 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -21,6 +21,7 @@ C_SRCS = \ htmlelem.c \ htmlelem2.c \ htmlevent.c \ + htmlgeneric.c \ htmlimg.c \ htmlinput.c \ htmllocation.c \ diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 189ea43..3a457cb 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -897,7 +897,7 @@ static HRESULT WINAPI HTMLDocument_createElement(IHTMLDocument2 *iface, BSTR eTa return E_FAIL; } - elem = HTMLElement_Create(This, (nsIDOMNode*)nselem); + elem = HTMLElement_Create(This, (nsIDOMNode*)nselem, TRUE); nsIDOMElement_Release(nselem); *newElem = HTMLELEM(elem); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b06d6c3..d4e1d4d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1388,7 +1388,7 @@ void HTMLElement_Init(HTMLElement *This) init_dispex(&This->node.dispex, (IUnknown*)HTMLELEM(This), &HTMLElement_dispex); } -HTMLElement *HTMLElement_Create(HTMLDocument *doc, nsIDOMNode *nsnode) +HTMLElement *HTMLElement_Create(HTMLDocument *doc, nsIDOMNode *nsnode, BOOL use_generic) { nsIDOMHTMLElement *nselem; HTMLElement *ret = NULL; @@ -1433,6 +1433,8 @@ HTMLElement *HTMLElement_Create(HTMLDocument *doc, nsIDOMNode *nsnode) ret = HTMLTable_Create(nselem); else if(!strcmpW(class_name, wszTEXTAREA)) ret = HTMLTextAreaElement_Create(nselem); + else if(use_generic) + ret = HTMLGenericElement_Create(nselem); if(!ret) { ret = heap_alloc_zero(sizeof(HTMLElement)); diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c new file mode 100644 index 0000000..71f434d --- /dev/null +++ b/dlls/mshtml/htmlgeneric.c @@ -0,0 +1,172 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * 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 <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "wine/debug.h" + +#include "mshtml_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +typedef struct { + HTMLElement element; + + const IHTMLGenericElementVtbl *lpHTMLGenericElementVtbl; +} HTMLGenericElement; + +#define HTMLGENERIC(x) ((IHTMLGenericElement*) &(x)->lpHTMLGenericElementVtbl) + +#define HTMLGENERIC_THIS(iface) DEFINE_THIS(HTMLGenericElement, HTMLGenericElement, iface) + +static HRESULT WINAPI HTMLGenericElement_QueryInterface(IHTMLGenericElement *iface, REFIID riid, void **ppv) +{ + HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + + return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->element.node), riid, ppv); +} + +static ULONG WINAPI HTMLGenericElement_AddRef(IHTMLGenericElement *iface) +{ + HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); +} + +static ULONG WINAPI HTMLGenericElement_Release(IHTMLGenericElement *iface) +{ + HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); +} + +static HRESULT WINAPI HTMLGenericElement_GetTypeInfoCount(IHTMLGenericElement *iface, UINT *pctinfo) +{ + HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLGenericElement_GetTypeInfo(IHTMLGenericElement *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLGenericElement_GetIDsOfNames(IHTMLGenericElement *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLGenericElement_Invoke(IHTMLGenericElement *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLGenericElement_get_recordset(IHTMLGenericElement *iface, IDispatch **p) +{ + HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLGenericElement_namedRecordset(IHTMLGenericElement *iface, + BSTR dataMember, VARIANT *hierarchy, IDispatch **ppRecordset) +{ + HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(dataMember), hierarchy, ppRecordset); + return E_NOTIMPL; +} + +static const IHTMLGenericElementVtbl HTMLGenericElementVtbl = { + HTMLGenericElement_QueryInterface, + HTMLGenericElement_AddRef, + HTMLGenericElement_Release, + HTMLGenericElement_GetTypeInfoCount, + HTMLGenericElement_GetTypeInfo, + HTMLGenericElement_GetIDsOfNames, + HTMLGenericElement_Invoke, + HTMLGenericElement_get_recordset, + HTMLGenericElement_namedRecordset +}; + +#define HTMLGENERIC_NODE_THIS(iface) DEFINE_THIS2(HTMLGenericElement, element.node, iface) + +static HRESULT HTMLGenericElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) +{ + HTMLGenericElement *This = HTMLGENERIC_NODE_THIS(iface); + + *ppv = NULL; + + if(IsEqualGUID(&IID_IHTMLGenericElement, riid)) { + TRACE("(%p)->(IID_IHTMLGenericElement %p)\n", This, ppv); + *ppv = HTMLGENERIC(This); + }else { + return HTMLElement_QI(&This->element.node, riid, ppv); + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static void HTMLGenericElement_destructor(HTMLDOMNode *iface) +{ + HTMLGenericElement *This = HTMLGENERIC_NODE_THIS(iface); + + HTMLElement_destructor(&This->element.node); +} + +#undef HTMLGENERIC_NODE_THIS + +static const NodeImplVtbl HTMLGenericElementImplVtbl = { + HTMLGenericElement_QI, + HTMLGenericElement_destructor +}; + +HTMLElement *HTMLGenericElement_Create(nsIDOMHTMLElement *nselem) +{ + HTMLGenericElement *ret; + + ret = heap_alloc_zero(sizeof(HTMLGenericElement)); + + ret->lpHTMLGenericElementVtbl = &HTMLGenericElementVtbl; + ret->element.node.vtbl = &HTMLGenericElementImplVtbl; + + HTMLElement_Init(&ret->element); + + return &ret->element; +} diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index b18b09d..afcf363 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -728,7 +728,7 @@ static HTMLDOMNode *create_node(HTMLDocument *doc, nsIDOMNode *nsnode) switch(node_type) { case ELEMENT_NODE: - ret = &HTMLElement_Create(doc, nsnode)->node; + ret = &HTMLElement_Create(doc, nsnode, FALSE)->node; break; case TEXT_NODE: ret = HTMLDOMTextNode_Create(doc, nsnode); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 099f1c3..e14d946 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -521,7 +521,7 @@ void detach_ranges(HTMLDocument*); HTMLDOMNode *HTMLDOMTextNode_Create(HTMLDocument*,nsIDOMNode*); -HTMLElement *HTMLElement_Create(HTMLDocument*,nsIDOMNode*); +HTMLElement *HTMLElement_Create(HTMLDocument*,nsIDOMNode*,BOOL); HTMLElement *HTMLCommentElement_Create(HTMLDocument*,nsIDOMNode*); HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement*); HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement*); @@ -532,6 +532,7 @@ HTMLElement *HTMLScriptElement_Create(nsIDOMHTMLElement*); HTMLElement *HTMLSelectElement_Create(nsIDOMHTMLElement*); HTMLElement *HTMLTable_Create(nsIDOMHTMLElement*); HTMLElement *HTMLTextAreaElement_Create(nsIDOMHTMLElement*); +HTMLElement *HTMLGenericElement_Create(nsIDOMHTMLElement*); void HTMLDOMNode_Init(HTMLDocument*,HTMLDOMNode*,nsIDOMNode*); void HTMLElement_Init(HTMLElement*);

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLGenericElement.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: d0568d8c5bd3de7cbec2a06505303ae9e116c262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0568d8c5bd3de7cbec2a0650… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 16:15:37 2008 -0500 mshtml: Added IDispatchEx support to HTMLGenericElement. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlgeneric.c | 18 ++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index e308f3a..25f6214 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -70,6 +70,7 @@ static REFIID tid_ids[] = { &DIID_DispHTMLDocument, &DIID_DispHTMLDOMTextNode, &DIID_DispHTMLElementCollection, + &DIID_DispHTMLGenericElement, &DIID_DispHTMLImg, &DIID_DispHTMLInputElement, &DIID_DispHTMLOptionElement, @@ -89,6 +90,7 @@ static REFIID tid_ids[] = { &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLElementCollection, + &IID_IHTMLGenericElement, &IID_IHTMLImgElement, &IID_IHTMLInputElement, &IID_IHTMLOptionElement, diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 71f434d..816c4ae 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -157,6 +157,23 @@ static const NodeImplVtbl HTMLGenericElementImplVtbl = { HTMLGenericElement_destructor }; +static const tid_t HTMLGenericElement_iface_tids[] = { + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLElement_tid, + IHTMLElement2_tid, + IHTMLElement2_tid, + IHTMLGenericElement_tid, + 0 +}; + +static dispex_static_data_t HTMLGenericElement_dispex = { + NULL, + DispHTMLGenericElement_tid, + NULL, + HTMLGenericElement_iface_tids +}; + HTMLElement *HTMLGenericElement_Create(nsIDOMHTMLElement *nselem) { HTMLGenericElement *ret; @@ -166,6 +183,7 @@ HTMLElement *HTMLGenericElement_Create(nsIDOMHTMLElement *nselem) ret->lpHTMLGenericElementVtbl = &HTMLGenericElementVtbl; ret->element.node.vtbl = &HTMLGenericElementImplVtbl; + init_dispex(&ret->element.node.dispex, (IUnknown*)HTMLGENERIC(ret), &HTMLGenericElement_dispex); HTMLElement_Init(&ret->element); return &ret->element; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e14d946..c42eb6a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -66,6 +66,7 @@ typedef enum { DispHTMLDocument_tid, DispHTMLDOMTextNode_tid, DispHTMLElementCollection_tid, + DispHTMLGenericElement_tid, DispHTMLImg_tid, DispHTMLInputElement_tid, DispHTMLOptionElement_tid, @@ -85,6 +86,7 @@ typedef enum { IHTMLElement_tid, IHTMLElement2_tid, IHTMLElementCollection_tid, + IHTMLGenericElement_tid, IHTMLImgElement_tid, IHTMLInputElement_tid, IHTMLOptionElement_tid,

1 0

Jacek Caban : mshtml: Added createElement test.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: eb4e098c2c431610f50c9c73e22b76097e4fc480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4e098c2c431610f50c9c73e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 16:16:25 2008 -0500 mshtml: Added createElement test. --- dlls/mshtml/tests/dom.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8bc3861..8611a41 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -82,6 +82,7 @@ typedef enum { ET_TBODY, ET_SCRIPT, ET_TEST, + ET_TESTG, ET_COMMENT, ET_IMG } elem_type_t; @@ -234,6 +235,17 @@ static REFIID const img_iids[] = { NULL }; +static REFIID const generic_iids[] = { + &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, + &IID_IHTMLElement, + &IID_IHTMLElement2, + &IID_IHTMLGenericElement, + &IID_IDispatchEx, + &IID_IConnectionPointContainer, + NULL +}; + typedef struct { const char *tag; REFIID *iids; @@ -259,6 +271,7 @@ static const elem_type_info_t elem_type_infos[] = { {"TBODY", elem_iids, NULL}, {"SCRIPT", script_iids, NULL}, {"TEST", elem_iids, &DIID_DispHTMLUnknownElement}, + {"TEST", generic_iids, &DIID_DispHTMLGenericElement}, {"!", comment_iids, &DIID_DispHTMLCommentElement}, {"IMG", img_iids, &DIID_DispHTMLImg} }; @@ -1007,6 +1020,21 @@ static void _test_elem_client_size(unsigned line, IUnknown *unk) IHTMLElement2_Release(elem); } +#define test_create_elem(d,t) _test_create_elem(__LINE__,d,t) +static IHTMLElement *_test_create_elem(unsigned line, IHTMLDocument2 *doc, const char *tag) +{ + IHTMLElement *elem = NULL; + BSTR tmp; + HRESULT hres; + + tmp = a2bstr(tag); + hres = IHTMLDocument2_createElement(doc, tmp, &elem); + ok_(__FILE__,line) (hres == S_OK, "createElement failed: %08x\n", hres); + ok_(__FILE__,line) (elem != NULL, "elem == NULL\n"); + + return elem; +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -1849,6 +1877,21 @@ static void test_elems(IHTMLDocument2 *doc) test_create_option_elem(doc); } +static void test_create_elems(IHTMLDocument2 *doc) +{ + IHTMLElement *elem; + long type; + + elem = test_create_elem(doc, "TEST"); + test_elem_tag((IUnknown*)elem, "TEST"); + type = get_node_type((IUnknown*)elem); + ok(type == 1, "type=%ld\n", type); + test_ifaces((IUnknown*)elem, elem_iids); + test_disp((IUnknown*)elem, &DIID_DispHTMLGenericElement); + + IHTMLElement_Release(elem); +} + static void test_exec(IUnknown *unk, const GUID *grpid, DWORD cmdid, VARIANT *in, VARIANT *out) { IOleCommandTarget *cmdtrg; @@ -2082,6 +2125,7 @@ START_TEST(dom) run_domtest(range_test_str, test_txtrange); run_domtest(range_test2_str, test_txtrange2); run_domtest(elem_test_str, test_elems); + run_domtest(doc_blank, test_create_elems); run_domtest(doc_blank, test_defaults); run_domtest(indent_test_str, test_indent);

1 0

Jacek Caban : mshtml: Initialize node object from child node's constructors .
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: fdf676ac17d6c90978486aa62706e29fa86cd1a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf676ac17d6c90978486aa62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 16:13:16 2008 -0500 mshtml: Initialize node object from child node's constructors. --- dlls/mshtml/htmlcomment.c | 3 ++- dlls/mshtml/htmlelem.c | 7 +++++-- dlls/mshtml/htmlnode.c | 38 ++++++++++++++++++++------------------ dlls/mshtml/htmltextnode.c | 3 ++- dlls/mshtml/mshtml_private.h | 7 ++++--- 5 files changed, 33 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 5e7fa1e..63db382 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -190,7 +190,7 @@ static dispex_static_data_t HTMLCommentElement_dispex = { HTMLCommentElement_iface_tids }; -HTMLElement *HTMLCommentElement_Create(nsIDOMNode *nsnode) +HTMLElement *HTMLCommentElement_Create(HTMLDocument *doc, nsIDOMNode *nsnode) { HTMLCommentElement *ret = heap_alloc_zero(sizeof(*ret)); @@ -199,6 +199,7 @@ HTMLElement *HTMLCommentElement_Create(nsIDOMNode *nsnode) init_dispex(&ret->element.node.dispex, (IUnknown*)HTMLCOMMENT(ret), &HTMLCommentElement_dispex); HTMLElement_Init(&ret->element); + HTMLDOMNode_Init(doc, &ret->element.node, nsnode); return &ret->element; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8a3d3bc..b06d6c3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1388,7 +1388,7 @@ void HTMLElement_Init(HTMLElement *This) init_dispex(&This->node.dispex, (IUnknown*)HTMLELEM(This), &HTMLElement_dispex); } -HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) +HTMLElement *HTMLElement_Create(HTMLDocument *doc, nsIDOMNode *nsnode) { nsIDOMHTMLElement *nselem; HTMLElement *ret = NULL; @@ -1438,11 +1438,14 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) ret = heap_alloc_zero(sizeof(HTMLElement)); HTMLElement_Init(ret); ret->node.vtbl = &HTMLElementImplVtbl; - } + } + + TRACE("%s ret %p\n", debugstr_w(class_name), ret); nsAString_Finish(&class_name_str); ret->nselem = nselem; + HTMLDOMNode_Init(doc, &ret->node, (nsIDOMNode*)nselem); return ret; } diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 2f37c54..b18b09d 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -705,6 +705,20 @@ static const NodeImplVtbl HTMLDOMNodeImplVtbl = { HTMLDOMNode_destructor }; +void HTMLDOMNode_Init(HTMLDocument *doc, HTMLDOMNode *node, nsIDOMNode *nsnode) +{ + node->lpHTMLDOMNodeVtbl = &HTMLDOMNodeVtbl; + node->lpHTMLDOMNode2Vtbl = &HTMLDOMNode2Vtbl; + node->ref = 1; + node->doc = doc; + + nsIDOMNode_AddRef(nsnode); + node->nsnode = nsnode; + + node->next = doc->nodes; + doc->nodes = node; +} + static HTMLDOMNode *create_node(HTMLDocument *doc, nsIDOMNode *nsnode) { HTMLDOMNode *ret; @@ -714,27 +728,20 @@ static HTMLDOMNode *create_node(HTMLDocument *doc, nsIDOMNode *nsnode) switch(node_type) { case ELEMENT_NODE: - ret = &HTMLElement_Create(nsnode)->node; + ret = &HTMLElement_Create(doc, nsnode)->node; break; case TEXT_NODE: - ret = HTMLDOMTextNode_Create(nsnode); + ret = HTMLDOMTextNode_Create(doc, nsnode); break; case COMMENT_NODE: - ret = &HTMLCommentElement_Create(nsnode)->node; + ret = &HTMLCommentElement_Create(doc, nsnode)->node; break; default: ret = heap_alloc_zero(sizeof(HTMLDOMNode)); ret->vtbl = &HTMLDOMNodeImplVtbl; + HTMLDOMNode_Init(doc, ret, nsnode); } - ret->lpHTMLDOMNodeVtbl = &HTMLDOMNodeVtbl; - ret->lpHTMLDOMNode2Vtbl = &HTMLDOMNode2Vtbl; - ret->ref = 1; - ret->doc = doc; - - nsIDOMNode_AddRef(nsnode); - ret->nsnode = nsnode; - TRACE("type %d ret %p\n", node_type, ret); return ret; @@ -748,7 +755,7 @@ static HTMLDOMNode *create_node(HTMLDocument *doc, nsIDOMNode *nsnode) HTMLDOMNode *get_node(HTMLDocument *This, nsIDOMNode *nsnode, BOOL create) { - HTMLDOMNode *iter = This->nodes, *ret; + HTMLDOMNode *iter = This->nodes; while(iter) { if(iter->nsnode == nsnode) @@ -759,12 +766,7 @@ HTMLDOMNode *get_node(HTMLDocument *This, nsIDOMNode *nsnode, BOOL create) if(iter || !create) return iter; - ret = create_node(This, nsnode); - - ret->next = This->nodes; - This->nodes = ret; - - return ret; + return create_node(This, nsnode); } void release_nodes(HTMLDocument *This) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 1911b18..69c287d 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -198,7 +198,7 @@ static dispex_static_data_t HTMLDOMTextNode_dispex = { HTMLDOMTextNode_iface_tids }; -HTMLDOMNode *HTMLDOMTextNode_Create(nsIDOMNode *nsnode) +HTMLDOMNode *HTMLDOMTextNode_Create(HTMLDocument *doc, nsIDOMNode *nsnode) { HTMLDOMTextNode *ret ; @@ -207,6 +207,7 @@ HTMLDOMNode *HTMLDOMTextNode_Create(nsIDOMNode *nsnode) ret->lpIHTMLDOMTextNodeVtbl = &HTMLDOMTextNodeVtbl; init_dispex(&ret->node.dispex, (IUnknown*)HTMLTEXT(ret), &HTMLDOMTextNode_dispex); + HTMLDOMNode_Init(doc, &ret->node, nsnode); return &ret->node; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e92681f..099f1c3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -519,10 +519,10 @@ IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetLis void detach_selection(HTMLDocument*); void detach_ranges(HTMLDocument*); -HTMLDOMNode *HTMLDOMTextNode_Create(nsIDOMNode*); +HTMLDOMNode *HTMLDOMTextNode_Create(HTMLDocument*,nsIDOMNode*); -HTMLElement *HTMLElement_Create(nsIDOMNode*); -HTMLElement *HTMLCommentElement_Create(nsIDOMNode*); +HTMLElement *HTMLElement_Create(HTMLDocument*,nsIDOMNode*); +HTMLElement *HTMLCommentElement_Create(HTMLDocument*,nsIDOMNode*); HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement*); HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement*); HTMLElement *HTMLImgElement_Create(nsIDOMHTMLElement*); @@ -533,6 +533,7 @@ HTMLElement *HTMLSelectElement_Create(nsIDOMHTMLElement*); HTMLElement *HTMLTable_Create(nsIDOMHTMLElement*); HTMLElement *HTMLTextAreaElement_Create(nsIDOMHTMLElement*); +void HTMLDOMNode_Init(HTMLDocument*,HTMLDOMNode*,nsIDOMNode*); void HTMLElement_Init(HTMLElement*); void HTMLElement2_Init(HTMLElement*); void HTMLTextContainer_Init(HTMLTextContainer*);

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::createElement implementation.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: f13c5685b5789e2cff5fe3b6501123c64ae181e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13c5685b5789e2cff5fe3b65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 16:14:03 2008 -0500 mshtml: Added IHTMLDocument2::createElement implementation. --- dlls/mshtml/htmldoc.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index fa9e16f..189ea43 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -878,8 +878,31 @@ static HRESULT WINAPI HTMLDocument_createElement(IHTMLDocument2 *iface, BSTR eTa IHTMLElement **newElem) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(eTag), newElem); - return E_NOTIMPL; + nsIDOMDocument *nsdoc; + nsIDOMElement *nselem; + HTMLElement *elem; + nsAString tag_str; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(eTag), newElem); + + nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + + nsAString_Init(&tag_str, eTag); + nsres = nsIDOMDocument_CreateElement(nsdoc, &tag_str, &nselem); + nsAString_Finish(&tag_str); + nsIDOMDocument_Release(nsdoc); + if(NS_FAILED(nsres)) { + ERR("CreateElement failed: %08x\n", nsres); + return E_FAIL; + } + + elem = HTMLElement_Create(This, (nsIDOMNode*)nselem); + nsIDOMElement_Release(nselem); + + *newElem = HTMLELEM(elem); + IHTMLElement_AddRef(HTMLELEM(elem)); + return S_OK; } static HRESULT WINAPI HTMLDocument_put_onhelp(IHTMLDocument2 *iface, VARIANT v)

1 0

Jacek Caban : mshtml.idl: Added IHTMLGenericElement declaration.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: bb1190a8325141702ed274f743c370f187798fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb1190a8325141702ed274f74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 16:12:18 2008 -0500 mshtml.idl: Added IHTMLGenericElement declaration. --- include/mshtml.idl | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index bc76ad8..594c996 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -3358,6 +3358,27 @@ interface IHTMLElement2 : IDispatch } /***************************************************************************** + * IHTMLGenericElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f4b7-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLGenericElement : IDispatch +{ + [propget, id(DISPID_IHTMLGENERICELEMENT_RECORDSET), hidden] + HRESULT recordset([out, retval] IDispatch **p); + + [id(DISPID_IHTMLGENERICELEMENT_NAMEDRECORDSET)] + HRESULT namedRecordset( + [in] BSTR dataMember, + [in, optional] VARIANT *hierarchy, + [out, retval] IDispatch **ppRecordset); +} + +/***************************************************************************** * DispHTMLGenericElement dispinterface */ [

1 0