April 2008 - Wine-Commits - list.winehq.org

Nikolay Sivov : gdiplus: Implemented GdipTransformMatrixPointsI.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 3aa94d33e488f4437de85d8abc386371caddc681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa94d33e488f4437de85d8ab… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 20:47:52 2008 +0400 gdiplus: Implemented GdipTransformMatrixPointsI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 27 +++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e301f57..14f600a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -604,7 +604,7 @@ @ stub GdipStringFormatGetGenericTypographic @ stub GdipTestControl @ stdcall GdipTransformMatrixPoints(ptr ptr long) -@ stub GdipTransformMatrixPointsI +@ stdcall GdipTransformMatrixPointsI(ptr ptr long) @ stdcall GdipTransformPath(ptr ptr) @ stub GdipTransformPoints @ stub GdipTransformPointsI diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index e80031f..e04e2cd 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -259,6 +259,33 @@ GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix *matrix, GpPointF *pts, return Ok; } +GpStatus WINGDIPAPI GdipTransformMatrixPointsI(GpMatrix *matrix, GpPoint *pts, INT count) +{ + GpPointF *ptsF; + GpStatus ret; + INT i; + + ptsF = GdipAlloc(sizeof(GpPointF) * count); + if(!ptsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + ptsF[i].X = (REAL)pts[i].X; + ptsF[i].Y = (REAL)pts[i].Y; + } + + ret = GdipTransformMatrixPoints(matrix, ptsF, count); + + if(ret == Ok) + for(i = 0; i < count; i++){ + pts[i].X = roundr(ptsF[i].X); + pts[i].Y = roundr(ptsF[i].Y); + } + GdipFree(ptsF); + + return ret; +} + GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix *matrix, REAL offsetX, REAL offsetY, GpMatrixOrder order) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5765795..ba2c6ee 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -229,6 +229,7 @@ GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetMatrixElements(GpMatrix*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT); +GpStatus WINGDIPAPI GdipTransformMatrixPointsI(GpMatrix*,GpPoint*,INT); GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix*,GpPointF*,INT); GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix*,GpPoint*,INT); GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);

1 0

Rob Shearman : widl: Create a list of statements in the whole IDL file, instead of just a list of interfaces.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: df0e38c0670a40eb5892e53ffb506bb1f4bc33ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=df0e38c0670a40eb5892e53ff… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 24 19:06:28 2008 +0100 widl: Create a list of statements in the whole IDL file, instead of just a list of interfaces. --- tools/widl/client.c | 75 ++++++++++------- tools/widl/header.c | 6 +- tools/widl/header.h | 6 +- tools/widl/parser.y | 211 +++++++++++++++++++++++++++++++++++++---------- tools/widl/proxy.c | 132 +++++++++++++++++++---------- tools/widl/server.c | 75 ++++++++++------- tools/widl/typegen.c | 117 +++++++++++++++++--------- tools/widl/typegen.h | 10 +- tools/widl/typelib.c | 14 +--- tools/widl/typelib.h | 2 +- tools/widl/widl.c | 4 +- tools/widl/widl.h | 8 +- tools/widl/widltypes.h | 31 +++++++ tools/widl/write_msft.c | 7 +- 14 files changed, 470 insertions(+), 228 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df0e38c0670a40eb5892e…

1 0

Rob Shearman : widl: Allow NULL to be used in expressions.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 58be89230e29689eedb84d5f97710b33f101bd06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58be89230e29689eedb84d5f9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 24 19:04:14 2008 +0100 widl: Allow NULL to be used in expressions. --- tools/widl/parser.l | 1 + tools/widl/parser.y | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 4e2a6f4..4ae37ef 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -191,6 +191,7 @@ struct keyword { static const struct keyword keywords[] = { {"FALSE", tFALSE}, + {"NULL", tNULL}, {"TRUE", tTRUE}, {"__cdecl", tCDECL}, {"__fastcall", tFASTCALL}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index f514701..0514d9c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -219,6 +219,7 @@ static void add_explicit_handle_if_necessary(func_t *func); %token tNONBROWSABLE %token tNONCREATABLE %token tNONEXTENSIBLE +%token tNULL %token tOBJECT tODL tOLEAUTOMATION %token tOPTIONAL %token tOUT @@ -624,6 +625,7 @@ expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | aHEXNUM { $$ = make_exprl(EXPR_HEXNUM, $1); } | aDOUBLE { $$ = make_exprd(EXPR_DOUBLE, $1); } | tFALSE { $$ = make_exprl(EXPR_TRUEFALSE, 0); } + | tNULL { $$ = make_exprl(EXPR_NUM, 0); } | tTRUE { $$ = make_exprl(EXPR_TRUEFALSE, 1); } | aIDENTIFIER { $$ = make_exprs(EXPR_IDENTIFIER, $1); } | expr '?' expr ':' expr { $$ = make_expr3(EXPR_COND, $1, $3, $5); }

1 0

Rob Shearman : widl: Construct the pointer chain while parsing pointers, rather than storing a ptr_level.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: ec81a78f017f169954d792dcbed62f87eb30c3d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec81a78f017f169954d792dcb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 24 19:03:50 2008 +0100 widl: Construct the pointer chain while parsing pointers, rather than storing a ptr_level. This method is more flexible and somewhat simpler. --- tools/widl/parser.y | 175 +++++++++++++++++++++++++---------------------- tools/widl/widltypes.h | 9 +-- 2 files changed, 95 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec81a78f017f169954d79…

1 0

Rob Shearman : widl: Implement lcid property on library declarations.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 02f5412a535315bfd3ef6ad57f1962dce0ef9775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f5412a535315bfd3ef6ad57… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 24 19:03:07 2008 +0100 widl: Implement lcid property on library declarations. --- tools/widl/parser.y | 2 ++ tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index bce194c..99be1f2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -493,6 +493,7 @@ attribute: { $$ = NULL; } | tIN { $$ = make_attr(ATTR_IN); } | tINPUTSYNC { $$ = make_attr(ATTR_INPUTSYNC); } | tLENGTHIS '(' m_exprs ')' { $$ = make_attrp(ATTR_LENGTHIS, $3); } + | tLCID '(' expr_const ')' { $$ = make_attrp(ATTR_LIBLCID, $3); } | tLOCAL { $$ = make_attr(ATTR_LOCAL); } | tNONBROWSABLE { $$ = make_attr(ATTR_NONBROWSABLE); } | tNONCREATABLE { $$ = make_attr(ATTR_NONCREATABLE); } @@ -2010,6 +2011,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_IN */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "in" }, /* ATTR_INPUTSYNC */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inputsync" }, /* ATTR_LENGTHIS */ { 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, "length_is" }, + /* ATTR_LIBLCID */ { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "lcid" }, /* ATTR_LOCAL */ { 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, "local" }, /* ATTR_NONBROWSABLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "nonbrowsable" }, /* ATTR_NONCREATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "noncreatable" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index fd8b8dd..bf28a01 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -104,6 +104,7 @@ enum attr_type ATTR_IN, ATTR_INPUTSYNC, ATTR_LENGTHIS, + ATTR_LIBLCID, ATTR_LOCAL, ATTR_NONBROWSABLE, ATTR_NONCREATABLE, diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 56bff46..accb648 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2322,8 +2322,8 @@ static void set_help_string_context(msft_typelib_t *typelib) static void set_lcid(msft_typelib_t *typelib) { - typelib->typelib_header.lcid2 = 0x0; - return; + const expr_t *lcid_expr = get_attrp( typelib->typelib->attrs, ATTR_LIBLCID ); + typelib->typelib_header.lcid2 = lcid_expr ? lcid_expr->cval : 0x0; } static void set_lib_flags(msft_typelib_t *typelib)

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLElementCollection object.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 989574510cdc8627b09b6ee94d1120ed1f334f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=989574510cdc8627b09b6ee94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:26:56 2008 +0200 mshtml: Added IDispatchEx support to HTMLElementCollection object. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlelem.c | 15 +++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 ++ 4 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index eb973b8..153d864 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -53,6 +53,7 @@ static REFIID tid_ids[] = { &IID_NULL, &DIID_DispHTMLDocument, &DIID_DispHTMLDOMTextNode, + &DIID_DispHTMLElementCollection, &DIID_DispHTMLUnknownElement, &DIID_DispHTMLWindow2, &IID_IHTMLDocument2, @@ -64,6 +65,7 @@ static REFIID tid_ids[] = { &IID_IHTMLDOMTextNode, &IID_IHTMLElement, &IID_IHTMLElement2, + &IID_IHTMLElementCollection, &IID_IHTMLWindow2, &IID_IHTMLWindow3, &IID_IOmNavigator diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 82acb53..c44e2e5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1363,6 +1363,7 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) } typedef struct { + DispatchEx dispex; const IHTMLElementCollectionVtbl *lpHTMLElementCollectionVtbl; IUnknown *ref_unk; @@ -1389,6 +1390,9 @@ static HRESULT WINAPI HTMLElementCollection_QueryInterface(IHTMLElementCollectio }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = HTMLELEMCOL(This); + }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = DISPATCHEX(&This->dispex); }else if(IsEqualGUID(&IID_IHTMLElementCollection, riid)) { TRACE("(%p)->(IID_IHTMLElementCollection %p)\n", This, ppv); *ppv = HTMLELEMCOL(This); @@ -1664,6 +1668,15 @@ static const IHTMLElementCollectionVtbl HTMLElementCollectionVtbl = { HTMLElementCollection_tags }; +static dispex_static_data_t HTMLElementCollection_dispex = { + DispHTMLElementCollection_tid, + NULL, + { + IHTMLElementCollection_tid, + 0 + } +}; + IHTMLElementCollection *create_all_collection(HTMLDOMNode *node) { elem_vector buf = {NULL, 0, 8}; @@ -1687,6 +1700,8 @@ static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, ret->elems = elems; ret->len = len; + init_dispex(&ret->dispex, (IUnknown*)HTMLELEMCOL(ret), &HTMLElementCollection_dispex); + IUnknown_AddRef(ref_unk); ret->ref_unk = ref_unk; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e6041a0..126bc2e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -63,6 +63,7 @@ typedef enum { NULL_tid, DispHTMLDocument_tid, DispHTMLDOMTextNode_tid, + DispHTMLElementCollection_tid, DispHTMLUnknownElement_tid, DispHTMLWindow2_tid, IHTMLDocument2_tid, @@ -74,6 +75,7 @@ typedef enum { IHTMLDOMTextNode_tid, IHTMLElement_tid, IHTMLElement2_tid, + IHTMLElementCollection_tid, IHTMLWindow2_tid, IHTMLWindow3_tid, IOmNavigator_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 620ad97..8c6f60f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -709,6 +709,8 @@ static void _test_elem_collection(unsigned line, IHTMLElementCollection *col, IDispatch *disp; HRESULT hres; + test_disp((IUnknown*)col, &DIID_DispHTMLElementCollection); + hres = IHTMLElementCollection_get_length(col, &len); ok_(__FILE__,line) (hres == S_OK, "get_length failed: %08x\n", hres); ok_(__FILE__,line) (len == exlen, "len=%ld, expected %ld\n", len, exlen);

1 0

Jacek Caban : mshtml.idl: Added DispHTMLElementCollection declaration.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 74c571a441545997796b790e55ccb2851c7c2aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c571a441545997796b790e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:26:37 2008 +0200 mshtml.idl: Added DispHTMLElementCollection declaration. --- include/mshtmdid.h | 6 ++++++ include/mshtml.idl | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index e269091..23ffe9c 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -986,6 +986,12 @@ #define DISPID_IHTMLELEMENTCOLLECTION__NEWENUM DISPID_NEWENUM #define DISPID_IHTMLELEMENTCOLLECTION_ITEM DISPID_VALUE +/* IHTMLElementCollection2 */ +#define DISPID_IHTMLELEMENTCOLLECTION2_URNS DISPID_COLLECTION+5 + +/* IHTMLElementCollection3 */ +#define DISPID_IHTMLELEMENTCOLLECTION3_NAMEDITEM DISPID_COLLECTION+6 + /* HTMLElementEvents */ #define DISPID_HTMLELEMENTEVENTS_ONHELP DISPID_EVMETH_ONHELP #define DISPID_HTMLELEMENTEVENTS_ONCLICK DISPID_EVMETH_ONCLICK diff --git a/include/mshtml.idl b/include/mshtml.idl index 4a30f0d..6eb4b5a 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -3378,6 +3378,45 @@ interface IHTMLElementCollection : IDispatch } /***************************************************************************** + * DispHTMLElementCollection dispinterface + */ +[ + hidden, + uuid(3050f56b-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLElementCollection +{ +properties: +methods: + [id(DISPID_IHTMLELEMENTCOLLECTION_TOSTRING)] + BSTR toString(); + + [propput, id(DISPID_IHTMLELEMENTCOLLECTION_LENGTH)] + void length(long v); + + [propget, id(DISPID_IHTMLELEMENTCOLLECTION_LENGTH)] + long length(); + + [propget, id(DISPID_IHTMLELEMENTCOLLECTION__NEWENUM), hidden, restricted] + IUnknown *_newEnum(); + + [id(DISPID_IHTMLELEMENTCOLLECTION_ITEM)] + IDispatch *item( + [in, optional] VARIANT name, + [in, optional] VARIANT index); + + [id(DISPID_IHTMLELEMENTCOLLECTION_TAGS)] + IDispatch *tags( + [in] VARIANT tagName); + + [id(DISPID_IHTMLELEMENTCOLLECTION2_URNS)] + IDispatch *urns([in] VARIANT urn); + + [id(DISPID_IHTMLELEMENTCOLLECTION3_NAMEDITEM)] + IDispatch *namedItem([in] BSTR name); +} + +/***************************************************************************** * IHTMLSelectElement interface */ [

1 0

Jacek Caban : mshtml: Added get_nodeType implementation.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: bb05803a2ac56c078393803503fc73400c51c9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb05803a2ac56c07839380350… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:26:18 2008 +0200 mshtml: Added get_nodeType implementation. --- dlls/mshtml/htmlnode.c | 26 ++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 26 ++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index ee0d727..7abf2ef 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -104,8 +104,30 @@ static HRESULT WINAPI HTMLDOMNode_Invoke(IHTMLDOMNode *iface, DISPID dispIdMembe static HRESULT WINAPI HTMLDOMNode_get_nodeType(IHTMLDOMNode *iface, long *p) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRUint16 type = -1; + + TRACE("(%p)->(%p)\n", This, p); + + nsIDOMNode_GetNodeType(This->nsnode, &type); + + switch(type) { + case ELEMENT_NODE: + *p = 1; + break; + case TEXT_NODE: + *p = 3; + break; + default: + /* + * FIXME: + * According to MSDN only ELEMENT_NODE and TEXT_NODE are supported. + * It needs more tests. + */ + FIXME("type %u\n", type); + *p = 0; + } + + return S_OK; } static HRESULT WINAPI HTMLDOMNode_get_parentNode(IHTMLDOMNode *iface, IHTMLDOMNode **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f91da86..620ad97 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -763,6 +763,24 @@ static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) return child; } +#define get_node_type(n) _get_node_type(__LINE__,n) +static long _get_node_type(unsigned line, IUnknown *unk) +{ + IHTMLDOMNode *node; + long type = -1; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&node); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode: %08x\n", hres); + + hres = IHTMLDOMNode_get_nodeType(node, &type); + ok(hres == S_OK, "get_nodeType failed: %08x\n", hres); + + IHTMLDOMNode_Release(node); + + return type; +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -1406,6 +1424,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement *elem; IHTMLDOMNode *node, *node2; IDispatch *disp; + long type; HRESULT hres; static const WCHAR xW[] = {'x',0}; @@ -1484,6 +1503,9 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(node); } + type = get_node_type((IUnknown*)select); + ok(type == 1, "type=%ld\n", type); + IHTMLSelectElement_Release(select); IHTMLElement_Release(elem); } @@ -1512,9 +1534,13 @@ static void test_elems(IHTMLDocument2 *doc) if(node) { test_ifaces((IUnknown*)node, text_iids); test_disp((IUnknown*)node, &DIID_DispHTMLDOMTextNode); + node2 = get_first_child((IUnknown*)node); ok(!node2, "node2 != NULL\n"); + type = get_node_type((IUnknown*)node); + ok(type == 3, "type=%ld\n", type); + IHTMLDOMNode_Release(node); }

1 0

Jacek Caban : mshtml: Added IDispatchEx support to text node.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: af271b3b45b195243a1798b4c111a94e41838877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af271b3b45b195243a1798b4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:25:51 2008 +0200 mshtml: Added IDispatchEx support to text node. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmltextnode.c | 13 +++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 1 + 4 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 949d7b8..eb973b8 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -52,6 +52,7 @@ static struct list dispex_data_list = LIST_INIT(dispex_data_list); static REFIID tid_ids[] = { &IID_NULL, &DIID_DispHTMLDocument, + &DIID_DispHTMLDOMTextNode, &DIID_DispHTMLUnknownElement, &DIID_DispHTMLWindow2, &IID_IHTMLDocument2, @@ -60,6 +61,7 @@ static REFIID tid_ids[] = { &IID_IHTMLDocument5, &IID_IHTMLDOMNode, &IID_IHTMLDOMNode2, + &IID_IHTMLDOMTextNode, &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLWindow2, diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 585d84f..fa6308e 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -185,6 +185,17 @@ static const NodeImplVtbl HTMLDOMTextNodeImplVtbl = { HTMLDOMTextNode_destructor }; +static dispex_static_data_t HTMLDOMTextNode_dispex = { + DispHTMLDOMTextNode_tid, + 0, + { + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLDOMTextNode_tid, + 0 + } +}; + HTMLDOMNode *HTMLDOMTextNode_Create(nsIDOMNode *nsnode) { HTMLDOMTextNode *ret ; @@ -193,5 +204,7 @@ HTMLDOMNode *HTMLDOMTextNode_Create(nsIDOMNode *nsnode) ret->node.vtbl = &HTMLDOMTextNodeImplVtbl; ret->lpIHTMLDOMTextNodeVtbl = &HTMLDOMTextNodeVtbl; + init_dispex(&ret->node.dispex, (IUnknown*)HTMLTEXT(ret), &HTMLDOMTextNode_dispex); + return &ret->node; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cf3cfba..e6041a0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -62,6 +62,7 @@ typedef struct event_target_t event_target_t; typedef enum { NULL_tid, DispHTMLDocument_tid, + DispHTMLDOMTextNode_tid, DispHTMLUnknownElement_tid, DispHTMLWindow2_tid, IHTMLDocument2_tid, @@ -70,6 +71,7 @@ typedef enum { IHTMLDocument5_tid, IHTMLDOMNode_tid, IHTMLDOMNode2_tid, + IHTMLDOMTextNode_tid, IHTMLElement_tid, IHTMLElement2_tid, IHTMLWindow2_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 346ee5d..f91da86 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1511,6 +1511,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(node != NULL, "node == NULL\n"); if(node) { test_ifaces((IUnknown*)node, text_iids); + test_disp((IUnknown*)node, &DIID_DispHTMLDOMTextNode); node2 = get_first_child((IUnknown*)node); ok(!node2, "node2 != NULL\n");

1 0

Jacek Caban : mshtml: Added get_firstChild implementation.
by Alexandre Julliard April 24, 2008

April 24, 2008

Module: wine Branch: master Commit: 6bf5ffbc3b26cb521b57b656c6b6f375cbab6c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf5ffbc3b26cb521b57b656c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:24:59 2008 +0200 mshtml: Added get_firstChild implementation. --- dlls/mshtml/htmlnode.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 25 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 9ee4513..b315e9d 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -246,8 +246,19 @@ static HRESULT WINAPI HTMLDOMNode_get_nodeValue(IHTMLDOMNode *iface, VARIANT *p) static HRESULT WINAPI HTMLDOMNode_get_firstChild(IHTMLDOMNode *iface, IHTMLDOMNode **p) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNode *nschild = NULL; + + TRACE("(%p)->(%p)\n", This, p); + + nsIDOMNode_GetFirstChild(This->nsnode, &nschild); + if(nschild) { + *p = HTMLDOMNODE(get_node(This->doc, nschild, TRUE)); + IHTMLDOMNode_AddRef(*p); + }else { + *p = NULL; + } + + return S_OK; } static HRESULT WINAPI HTMLDOMNode_get_lastChild(IHTMLDOMNode *iface, IHTMLDOMNode **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 83dc38f..1ad24dc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -738,6 +738,23 @@ static void _test_elem_collection(unsigned line, IHTMLElementCollection *col, ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); } +#define get_first_child(n) _get_first_child(__LINE__,n) +static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) +{ + IHTMLDOMNode *node, *child = NULL; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&node); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode: %08x\n", hres); + if(FAILED(hres)) + return NULL; + + hres = IHTMLDOMNode_get_firstChild(node, &child); + ok_(__FILE__,line) (hres == S_OK, "get_firstChild failed: %08x\n", hres); + + return child; +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -1379,6 +1396,7 @@ static void test_elems(IHTMLDocument2 *doc) { IHTMLElementCollection *col; IHTMLElement *elem; + IHTMLDOMNode *node; IDispatch *disp; HRESULT hres; @@ -1451,6 +1469,13 @@ static void test_elems(IHTMLDocument2 *doc) test_select_elem(select); + node = get_first_child((IUnknown*)select); + ok(node != NULL, "node == NULL\n"); + if(node) { + test_elem_type((IUnknown*)node, ET_OPTION); + IHTMLDOMNode_Release(node); + } + IHTMLSelectElement_Release(select); IHTMLElement_Release(elem); }

1 0