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

Jacek Caban : mshtml: Added IDispatchEx support to text node.
by Alexandre Julliard 24 Apr '08

24 Apr '08

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.idl: Added DispHTMLDOMText declaration.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: f731140c91c08daa13125205b1b86c00651fa34d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f731140c91c08daa13125205b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:23:45 2008 +0200 mshtml.idl: Added DispHTMLDOMText declaration. --- include/mshtmdid.h | 14 ++++++ include/mshtml.idl | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 0e95245..e269091 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -91,6 +91,7 @@ #define DISPID_OMDOCUMENT DISPID_NORMAL_FIRST #define DISPID_SCREEN DISPID_NORMAL_FIRST #define DISPID_DOMATTRIBUTE DISPID_NORMAL_FIRST +#define DISPID_DOMTEXTNODE DISPID_NORMAL_FIRST #define DISPID_DOMIMPLEMENTATION DISPID_NORMAL_FIRST #define DISPID_COLLECTION (DISPID_NORMAL_FIRST+500) @@ -1706,6 +1707,19 @@ /* IHTMLDOMNode2 */ #define DISPID_IHTMLDOMNODE2_OWNERDOCUMENT DISPID_ELEMENT+113 +/* IHTMLDOMTextNode */ +#define DISPID_IHTMLDOMTEXTNODE_DATA DISPID_DOMTEXTNODE +#define DISPID_IHTMLDOMTEXTNODE_TOSTRING DISPID_DOMTEXTNODE+1 +#define DISPID_IHTMLDOMTEXTNODE_LENGTH DISPID_DOMTEXTNODE+2 +#define DISPID_IHTMLDOMTEXTNODE_SPLITTEXT DISPID_DOMTEXTNODE+3 + +/* IHTMLDOMTextNode2 */ +#define DISPID_IHTMLDOMTEXTNODE2_SUBSTRINGDATA DISPID_DOMTEXTNODE+4 +#define DISPID_IHTMLDOMTEXTNODE2_APPENDDATA DISPID_DOMTEXTNODE+5 +#define DISPID_IHTMLDOMTEXTNODE2_INSERTDATA DISPID_DOMTEXTNODE+6 +#define DISPID_IHTMLDOMTEXTNODE2_DELETEDATA DISPID_DOMTEXTNODE+7 +#define DISPID_IHTMLDOMTEXTNODE2_REPLACEDATA DISPID_DOMTEXTNODE+8 + /* IHTMLRenderStyle */ #define DISPID_IHTMLRENDERSTYLE_TEXTLINETHROUGHSTYLE DISPID_A_TEXTLINETHROUGHSTYLE #define DISPID_IHTMLRENDERSTYLE_TEXTUNDERLINESTYLE DISPID_A_TEXTUNDERLINESTYLE diff --git a/include/mshtml.idl b/include/mshtml.idl index e32e4a7..54ed902 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -1694,6 +1694,125 @@ interface IHTMLDOMImplementation : IDispatch [retval, out] VARIANT_BOOL *pfHasFeature); } +/***************************************************************************** + * DispHTMLDOMTextNode dispinterface + */ +[ + hidden, + uuid(3050f565-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLDOMTextNode +{ +properties: +methods: + [propput, id(DISPID_IHTMLDOMTEXTNODE_DATA)] + void data(BSTR v); + + [propget, id(DISPID_IHTMLDOMTEXTNODE_DATA)] + BSTR data(); + + [id(DISPID_IHTMLDOMTEXTNODE_TOSTRING)] + BSTR toString(); + + [propget, id(DISPID_IHTMLDOMTEXTNODE_LENGTH)] + long length(); + + [id(DISPID_IHTMLDOMTEXTNODE_SPLITTEXT)] + IHTMLDOMNode *splitText([in] long offset); + + [id(DISPID_IHTMLDOMTEXTNODE2_SUBSTRINGDATA)] + BSTR substringData( + [in] long offset, + [in] long Count); + + [id(DISPID_IHTMLDOMTEXTNODE2_APPENDDATA)] + void appendData([in] BSTR bstrstring); + + [id(DISPID_IHTMLDOMTEXTNODE2_INSERTDATA)] + void insertData( + [in] long offset, + [in] BSTR bstrstring); + + [id(DISPID_IHTMLDOMTEXTNODE2_DELETEDATA)] + void deleteData( + [in] long offset, + [in] long Count); + + [id(DISPID_IHTMLDOMTEXTNODE2_REPLACEDATA)] + void replaceData( + [in] long offset, + [in] long Count, + [in] BSTR bstrstring); + + [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] + long nodeType(); + + [propget, id(DISPID_IHTMLDOMNODE_PARENTNODE)] + IHTMLDOMNode *parentNode(); + + [id(DISPID_IHTMLDOMNODE_HASCHILDNODES)] + VARIANT_BOOL hasChildNodes(); + + [propget, id(DISPID_IHTMLDOMNODE_CHILDNODES)] + IDispatch *childNodes(); + + [propget, id(DISPID_IHTMLDOMNODE_ATTRIBUTES)] + IDispatch *attributes(); + + [id(DISPID_IHTMLDOMNODE_INSERTBEFORE)] + IHTMLDOMNode *insertBefore( + [in] IHTMLDOMNode *newChild, + [in, optional] VARIANT refChild); + + [id(DISPID_IHTMLDOMNODE_REMOVECHILD)] + IHTMLDOMNode *removeChild([in] IHTMLDOMNode *oldChild); + + [id(DISPID_IHTMLDOMNODE_REPLACECHILD)] + IHTMLDOMNode *replaceChild( + [in] IHTMLDOMNode *newChild, + [in] IHTMLDOMNode *oldChild); + + [id(DISPID_IHTMLDOMNODE_CLONENODE)] + IHTMLDOMNode* cloneNode([in] VARIANT_BOOL fDeep); + + [id(DISPID_IHTMLDOMNODE_REMOVENODE)] + IHTMLDOMNode *removeNode([in, defaultvalue(0)] VARIANT_BOOL fDeep); + + [id(DISPID_IHTMLDOMNODE_SWAPNODE)] + IHTMLDOMNode *swapNode([in] IHTMLDOMNode *otherNode); + + [id(DISPID_IHTMLDOMNODE_REPLACENODE)] + IHTMLDOMNode *replaceNode([in] IHTMLDOMNode *replacement); + + [id(DISPID_IHTMLDOMNODE_APPENDCHILD)] + IHTMLDOMNode *appendChild([in] IHTMLDOMNode *newChild); + + [propget, id(DISPID_IHTMLDOMNODE_NODENAME)] + BSTR nodeName(); + + [propput, id(DISPID_IHTMLDOMNODE_NODEVALUE)] + void nodeValue(VARIANT v); + + [propget, id(DISPID_IHTMLDOMNODE_NODEVALUE)] + VARIANT nodeValue(); + + [propget, id(DISPID_IHTMLDOMNODE_FIRSTCHILD)] + IHTMLDOMNode *firstChild(); + + [propget, id(DISPID_IHTMLDOMNODE_LASTCHILD)] + IHTMLDOMNode *lastChild(); + + [propget, id(DISPID_IHTMLDOMNODE_PREVIOUSSIBLING)] + IHTMLDOMNode *previousSibling(); + + [propget, id(DISPID_IHTMLDOMNODE_NEXTSIBLING)] + IHTMLDOMNode* nextSibling(); + + [propget, id(DISPID_IHTMLDOMNODE2_OWNERDOCUMENT)] + IDispatch *ownerDocument(); +} + + interface IHTMLElementCollection; /*****************************************************************************

1 0

Jacek Caban : mshtml.idl: Added IHTMLDOMTextNode declaration.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 1cb633a5ccdf4b3b359b7bf20e2264611e02f750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb633a5ccdf4b3b359b7bf20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:24:38 2008 +0200 mshtml.idl: Added IHTMLDOMTextNode declaration. --- include/mshtml.idl | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 54ed902..4a30f0d 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -1677,6 +1677,35 @@ interface IHTMLDOMAttribute : IDispatch } /***************************************************************************** + * IHTMLDOMTextNode interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f4b1-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLDOMTextNode : IDispatch +{ + [propput, id(DISPID_IHTMLDOMTEXTNODE_DATA)] + HRESULT data([in] BSTR v); + + [propget, id(DISPID_IHTMLDOMTEXTNODE_DATA)] + HRESULT data([out, retval] BSTR *p); + + [id(DISPID_IHTMLDOMTEXTNODE_TOSTRING)] + HRESULT toString([out, retval] BSTR *String); + + [propget, id(DISPID_IHTMLDOMTEXTNODE_LENGTH)] + HRESULT length([out, retval] long *p); + + [id(DISPID_IHTMLDOMTEXTNODE_SPLITTEXT)] + HRESULT splitText( + [in] long offset, + [out, retval] IHTMLDOMNode **pRetNode); +} + +/***************************************************************************** * IHTMLDOMImplementation interface */ [

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode2 to IDispatchEx support.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 5d024a6d1db60fb3d71cdeeb3aa110b64c75e467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d024a6d1db60fb3d71cdeeb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:23:17 2008 +0200 mshtml: Added IHTMLDOMNode2 to IDispatchEx support. --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmlelem.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index e42649c..949d7b8 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -59,6 +59,7 @@ static REFIID tid_ids[] = { &IID_IHTMLDocument4, &IID_IHTMLDocument5, &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLWindow2, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 67e19bd..82acb53 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1287,6 +1287,7 @@ static dispex_static_data_t HTMLElement_dispex = { NULL, { IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, IHTMLElement_tid, IHTMLElement2_tid, 0 diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 37e4c5f..ffb7bb1 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -69,6 +69,7 @@ typedef enum { IHTMLDocument4_tid, IHTMLDocument5_tid, IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, IHTMLElement_tid, IHTMLElement2_tid, IHTMLWindow2_tid,

1 0

Jacek Caban : mshtml: Return VT_NULL instead of empty string in getAttribute.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 872810e6419876c03d1d4c2a7dc69d77ab944338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872810e6419876c03d1d4c2a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:22:26 2008 +0200 mshtml: Return VT_NULL instead of empty string in getAttribute. --- dlls/mshtml/htmlelem.c | 4 ++-- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 748faf6..67e19bd 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -178,7 +178,7 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr WARN("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue); - VariantInit(AttributeValue); + V_VT(AttributeValue) = VT_NULL; nsAString_Init(&attr_str, strAttributeName); nsAString_Init(&value_str, NULL); @@ -206,7 +206,7 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr TRACE("attr_value=%s\n", debugstr_w(V_BSTR(AttributeValue))); } } - }else { + }else if(*value) { V_VT(AttributeValue) = VT_BSTR; V_BSTR(AttributeValue) = SysAllocString(value); TRACE("attr_value=%s\n", debugstr_w(V_BSTR(AttributeValue))); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 893a9c9..0bdeb16 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -58,6 +58,8 @@ static WCHAR wordW[] = {'w','o','r','d',0}; static const WCHAR text_javascriptW[] = {'t','e','x','t','/','j','a','v','a','s','c','r','i','p','t',0}; +static const WCHAR idW[] = {'i','d',0}; + typedef enum { ET_NONE, ET_HTML, @@ -364,6 +366,30 @@ static void _test_elem_type(unsigned line, IUnknown *unk, elem_type_t type) _test_disp(line, unk, elem_type_infos[type].dispiid); } +#define test_elem_attr(e,n,v) _test_elem_attr(__LINE__,e,n,v) +static void _test_elem_attr(unsigned line, IHTMLElement *elem, LPCWSTR name, LPCWSTR exval) +{ + VARIANT value; + BSTR tmp; + HRESULT hres; + + VariantInit(&value); + + tmp = SysAllocString(name); + hres = IHTMLElement_getAttribute(elem, tmp, 0, &value); + SysFreeString(tmp); + ok_(__FILE__,line) (hres == S_OK, "getAttribute failed: %08x\n", hres); + + if(exval) { + ok_(__FILE__,line) (V_VT(&value) == VT_BSTR, "vt=%d\n", V_VT(&value)); + ok_(__FILE__,line) (!lstrcmpW(exval, V_BSTR(&value)), "unexpected value %s\n", dbgstr_w(V_BSTR(&value))); + }else { + ok_(__FILE__,line) (V_VT(&value) == VT_NULL, "vt=%d\n", V_VT(&value)); + } + + VariantClear(&value); +} + static void test_doc_elem(IHTMLDocument2 *doc) { IHTMLElement *elem; @@ -1400,9 +1426,12 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_doc_elem_by_id(doc, sW); ok(elem != NULL, "elem == NULL\n"); - test_elem_type((IUnknown*)elem, ET_SELECT); - if(elem) + if(elem) { + test_elem_type((IUnknown*)elem, ET_SELECT); + test_elem_attr(elem, xxxW, NULL); + test_elem_attr(elem, idW, sW); IHTMLElement_Release(elem); + } elem = get_elem_by_id(doc, sW, TRUE); if(elem) {

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode2 stub implementation.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 8dc2cf0d3a7babb16cafef2f1b7636d414609597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc2cf0d3a7babb16cafef2f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:22:51 2008 +0200 mshtml: Added IHTMLDOMNode2 stub implementation. --- dlls/mshtml/htmlnode.c | 89 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 4 +- dlls/mshtml/tests/dom.c | 9 ++++ 3 files changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index d3a9b72..9ee4513 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -31,8 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -#define NSSUPPORTS(x) ((nsISupports*) &(x)->lpSupportsVtbl) - #define HTMLDOMNODE_THIS(iface) DEFINE_THIS(HTMLDOMNode, HTMLDOMNode, iface) static HRESULT WINAPI HTMLDOMNode_QueryInterface(IHTMLDOMNode *iface, @@ -273,6 +271,8 @@ static HRESULT WINAPI HTMLDOMNode_get_nextSibling(IHTMLDOMNode *iface, IHTMLDOMN return E_NOTIMPL; } +#undef HTMLDOMNODE_THIS + static const IHTMLDOMNodeVtbl HTMLDOMNodeVtbl = { HTMLDOMNode_QueryInterface, HTMLDOMNode_AddRef, @@ -303,6 +303,85 @@ static const IHTMLDOMNodeVtbl HTMLDOMNodeVtbl = { HTMLDOMNode_get_nextSibling }; +#define HTMLDOMNODE2_THIS(iface) DEFINE_THIS(HTMLDOMNode, HTMLDOMNode2, iface) + +static HRESULT WINAPI HTMLDOMNode2_QueryInterface(IHTMLDOMNode2 *iface, + REFIID riid, void **ppv) +{ + HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + + return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(This), riid, ppv); +} + +static ULONG WINAPI HTMLDOMNode2_AddRef(IHTMLDOMNode2 *iface) +{ + HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + + return IHTMLDOMNode_AddRef(HTMLDOMNODE(This)); +} + +static ULONG WINAPI HTMLDOMNode2_Release(IHTMLDOMNode2 *iface) +{ + HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + + return IHTMLDOMNode_Release(HTMLDOMNODE(This)); +} + +static HRESULT WINAPI HTMLDOMNode2_GetTypeInfoCount(IHTMLDOMNode2 *iface, UINT *pctinfo) +{ + HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode2_GetTypeInfo(IHTMLDOMNode2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode2_GetIDsOfNames(IHTMLDOMNode2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMNode2_Invoke(IHTMLDOMNode2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMNode *This = HTMLDOMNODE2_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 HTMLDOMNode2_get_ownerDocument(IHTMLDOMNode2 *iface, IDispatch **p) +{ + HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +#undef HTMLDOMNODE2_THIS + +static const IHTMLDOMNode2Vtbl HTMLDOMNode2Vtbl = { + HTMLDOMNode2_QueryInterface, + HTMLDOMNode2_AddRef, + HTMLDOMNode2_Release, + HTMLDOMNode2_GetTypeInfoCount, + HTMLDOMNode2_GetTypeInfo, + HTMLDOMNode2_GetIDsOfNames, + HTMLDOMNode2_Invoke, + HTMLDOMNode2_get_ownerDocument +}; + HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -324,6 +403,9 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLDOMNode, riid)) { TRACE("(%p)->(IID_IHTMLDOMNode %p)\n", This, ppv); *ppv = HTMLDOMNODE(This); + }else if(IsEqualGUID(&IID_IHTMLDOMNode2, riid)) { + TRACE("(%p)->(IID_IHTMLDOMNode2 %p)\n", This, ppv); + *ppv = HTMLDOMNODE2(This); } if(*ppv) { @@ -365,12 +447,15 @@ static HTMLDOMNode *create_node(HTMLDocument *doc, nsIDOMNode *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; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5fb37da..37e4c5f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -298,7 +298,8 @@ typedef struct { struct HTMLDOMNode { DispatchEx dispex; - const IHTMLDOMNodeVtbl *lpHTMLDOMNodeVtbl; + const IHTMLDOMNodeVtbl *lpHTMLDOMNodeVtbl; + const IHTMLDOMNode2Vtbl *lpHTMLDOMNode2Vtbl; const NodeImplVtbl *vtbl; LONG ref; @@ -377,6 +378,7 @@ typedef struct { #define HTMLELEM(x) ((IHTMLElement*) &(x)->lpHTMLElementVtbl) #define HTMLELEM2(x) ((IHTMLElement2*) &(x)->lpHTMLElement2Vtbl) #define HTMLDOMNODE(x) ((IHTMLDOMNode*) &(x)->lpHTMLDOMNodeVtbl) +#define HTMLDOMNODE2(x) ((IHTMLDOMNode2*) &(x)->lpHTMLDOMNode2Vtbl) #define HTMLTEXTCONT(x) ((IHTMLTextContainer*) &(x)->lpHTMLTextContainerVtbl) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 0bdeb16..83dc38f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -88,6 +88,7 @@ static REFIID const none_iids[] = { static REFIID const elem_iids[] = { &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IDispatchEx, @@ -97,6 +98,7 @@ static REFIID const elem_iids[] = { static REFIID const body_iids[] = { &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLTextContainer, @@ -108,6 +110,7 @@ static REFIID const body_iids[] = { static REFIID const anchor_iids[] = { &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLAnchorElement, @@ -118,6 +121,7 @@ static REFIID const anchor_iids[] = { static REFIID const input_iids[] = { &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLInputElement, @@ -129,6 +133,7 @@ static REFIID const input_iids[] = { static REFIID const select_iids[] = { &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLSelectElement, @@ -139,6 +144,7 @@ static REFIID const select_iids[] = { static REFIID const textarea_iids[] = { &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLTextAreaElement, @@ -149,6 +155,7 @@ static REFIID const textarea_iids[] = { static REFIID const option_iids[] = { &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLOptionElement, @@ -159,6 +166,7 @@ static REFIID const option_iids[] = { static REFIID const table_iids[] = { &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLTable, @@ -169,6 +177,7 @@ static REFIID const table_iids[] = { static REFIID const script_iids[] = { &IID_IHTMLDOMNode, + &IID_IHTMLDOMNode2, &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLScriptElement,

1 0

Jacek Caban : mshtml: Added more IDispatchEx tests.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 01f241c07df211f12e1fc00c7d9e5513f0f8e2c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01f241c07df211f12e1fc00c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:22:10 2008 +0200 mshtml: Added more IDispatchEx tests. --- dlls/mshtml/tests/dom.c | 56 +++++++++++++++++++++++++++++++---------------- 1 files changed, 37 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ae716d9..893a9c9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -45,6 +45,7 @@ static const char elem_test_str[] = "<textarea id=\"X\">text text</textarea>" "<table><tbody></tbody></table>" "<script id=\"sc\" type=\"text/javascript\"></script>" + "<test />" "</body></html>"; static const char indent_test_str[] = "<html><head><title>test</title></head><body>abc<br /><a href=\"about:blank\">123</a></body></html>"; @@ -74,7 +75,8 @@ typedef enum { ET_BR, ET_TABLE, ET_TBODY, - ET_SCRIPT + ET_SCRIPT, + ET_TEST } elem_type_t; static REFIID const none_iids[] = { @@ -86,6 +88,7 @@ static REFIID const elem_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLElement, &IID_IHTMLElement2, + &IID_IDispatchEx, &IID_IConnectionPointContainer, NULL }; @@ -96,6 +99,7 @@ static REFIID const body_iids[] = { &IID_IHTMLElement2, &IID_IHTMLTextContainer, &IID_IHTMLBodyElement, + &IID_IDispatchEx, &IID_IConnectionPointContainer, NULL }; @@ -105,6 +109,7 @@ static REFIID const anchor_iids[] = { &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLAnchorElement, + &IID_IDispatchEx, &IID_IConnectionPointContainer, NULL }; @@ -115,6 +120,7 @@ static REFIID const input_iids[] = { &IID_IHTMLElement2, &IID_IHTMLInputElement, &IID_IHTMLInputTextElement, + &IID_IDispatchEx, &IID_IConnectionPointContainer, NULL }; @@ -124,6 +130,7 @@ static REFIID const select_iids[] = { &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLSelectElement, + &IID_IDispatchEx, &IID_IConnectionPointContainer, NULL }; @@ -133,6 +140,7 @@ static REFIID const textarea_iids[] = { &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLTextAreaElement, + &IID_IDispatchEx, &IID_IConnectionPointContainer, NULL }; @@ -142,6 +150,7 @@ static REFIID const option_iids[] = { &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLOptionElement, + &IID_IDispatchEx, &IID_IConnectionPointContainer, NULL }; @@ -151,6 +160,7 @@ static REFIID const table_iids[] = { &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLTable, + &IID_IDispatchEx, &IID_IConnectionPointContainer, NULL }; @@ -160,6 +170,7 @@ static REFIID const script_iids[] = { &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLScriptElement, + &IID_IDispatchEx, &IID_IConnectionPointContainer, NULL }; @@ -174,32 +185,35 @@ static REFIID const window_iids[] = { &IID_IDispatch, &IID_IHTMLWindow2, &IID_IHTMLWindow3, + &IID_IDispatchEx, NULL }; typedef struct { const char *tag; REFIID *iids; + const IID *dispiid; } elem_type_info_t; static const elem_type_info_t elem_type_infos[] = { - {"", none_iids}, - {"HTML", elem_iids}, - {"HEAD", elem_iids}, - {"TITLE", elem_iids}, - {"BODY", body_iids}, - {"A", anchor_iids}, - {"INPUT", input_iids}, - {"SELECT", select_iids}, - {"TEXTAREA", textarea_iids}, - {"OPTION", option_iids}, - {"STYLE", elem_iids}, - {"BLOCKQUOTE",elem_iids}, - {"P", elem_iids}, - {"BR", elem_iids}, - {"TABLE", table_iids}, - {"TBODY", elem_iids}, - {"SCRIPT", script_iids} + {"", none_iids, NULL}, + {"HTML", elem_iids, NULL}, + {"HEAD", elem_iids, NULL}, + {"TITLE", elem_iids, NULL}, + {"BODY", body_iids, NULL}, + {"A", anchor_iids, NULL}, + {"INPUT", input_iids, NULL}, + {"SELECT", select_iids, NULL}, + {"TEXTAREA", textarea_iids, NULL}, + {"OPTION", option_iids, NULL}, + {"STYLE", elem_iids, NULL}, + {"BLOCKQUOTE",elem_iids, NULL}, + {"P", elem_iids, NULL}, + {"BR", elem_iids, NULL}, + {"TABLE", table_iids, NULL}, + {"TBODY", elem_iids, NULL}, + {"SCRIPT", script_iids, NULL}, + {"TEST", elem_iids, &DIID_DispHTMLUnknownElement} }; static const char *dbgstr_w(LPCWSTR str) @@ -345,6 +359,9 @@ static void _test_elem_type(unsigned line, IUnknown *unk, elem_type_t type) { _test_elem_tag(line, unk, elem_type_infos[type].tag); _test_ifaces(line, unk, elem_type_infos[type].iids); + + if(elem_type_infos[type].dispiid) + _test_disp(line, unk, elem_type_infos[type].dispiid); } static void test_doc_elem(IHTMLDocument2 *doc) @@ -1349,7 +1366,8 @@ static void test_elems(IHTMLDocument2 *doc) ET_TEXTAREA, ET_TABLE, ET_TBODY, - ET_SCRIPT + ET_SCRIPT, + ET_TEST }; static const elem_type_t item_types[] = {

1 0

Alexandre Julliard : makefiles: Add support for generating correct dependencies for tlb files.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: da19122f1448d78a27ba194ad046b40f8444638d URL: http://source.winehq.org/git/wine.git/?a=commit;h=da19122f1448d78a27ba194ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 22:13:57 2008 +0200 makefiles: Add support for generating correct dependencies for tlb files. --- Make.rules.in | 11 ++++++----- configure | 1 + configure.ac | 2 ++ tools/makedep.c | 42 +++++++++++++++++++++++++++--------------- 4 files changed, 36 insertions(+), 20 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 76a4d42..1d03841 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -207,10 +207,6 @@ filter: dummy dlldata.c: $(WIDL) Makefile.in $(WIDL) $(IDLFLAGS) --dlldata-only --dlldata=$@ $(IDL_P_SRCS) -# Rules for resources - -$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(IDL_TLB_SRCS:.idl=.tlb) - # Rule for linting $(MODULE).ln : $(LINTS) @@ -233,7 +229,10 @@ winapi_check:: dummy # Rules for dependencies -DEPEND_SRCS = $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) $(IDL_GEN_C_SRCS) $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_SRCS) +DEPEND_SRCS = $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) \ + $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) \ + $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) \ + $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_SRCS) $(SUBDIRS:%=%/__depend__): dummy @cd `dirname $@` && $(MAKE) depend @@ -323,6 +322,8 @@ $(MC_SRCS:.mc=.mc.rc): $(WMC) $(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL) +$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) + $(SUBDIRS): dummy @cd $@ && $(MAKE) diff --git a/configure b/configure index bfb0880..45c98c6 100755 --- a/configure +++ b/configure @@ -21436,6 +21436,7 @@ Makefile: dummy \$(OBJS): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) +\$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)" diff --git a/configure.ac b/configure.ac index 31bf9ce..da31303 100644 --- a/configure.ac +++ b/configure.ac @@ -1634,6 +1634,7 @@ Makefile: dummy\\ \\ \$(OBJS): \$(IDL_GEN_HEADERS)\\ \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)\\ +\$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb)\\ \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)\\ \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"], ["### Dependencies: @@ -1645,6 +1646,7 @@ Makefile: dummy \$(OBJS): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) +\$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"])) diff --git a/tools/makedep.c b/tools/makedep.c index 2a8c14d..e311058 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -791,7 +791,7 @@ static void output_include( FILE *file, INCL_FILE *pFile, /******************************************************************* * output_src */ -static void output_src( FILE *file, INCL_FILE *pFile, int *column ) +static int output_src( FILE *file, INCL_FILE *pFile, int *column ) { char *obj = xstrdup( pFile->name ); char *ext = get_extension( obj ); @@ -817,30 +817,42 @@ static void output_src( FILE *file, INCL_FILE *pFile, int *column ) else if (!strcmp( ext, "idl" )) /* IDL file */ { char *name; + int got_header = 0; + const char *suffix = "cips"; - *column += fprintf( file, "%s.h", obj ); - - name = strmake( "%s_c.c", obj ); - if (find_src_file( name )) *column += fprintf( file, " %s", name ); - free( name ); - name = strmake( "%s_i.c", obj ); - if (find_src_file( name )) *column += fprintf( file, " %s", name ); - free( name ); - name = strmake( "%s_p.c", obj ); - if (find_src_file( name )) *column += fprintf( file, " %s", name ); - free( name ); - name = strmake( "%s_s.c", obj ); - if (find_src_file( name )) *column += fprintf( file, " %s", name ); + name = strmake( "%s.tlb", obj ); + if (find_src_file( name )) *column += fprintf( file, "%s", name ); + else + { + got_header = 1; + *column += fprintf( file, "%s.h", obj ); + } free( name ); + while (*suffix) + { + name = strmake( "%s_%c.c", obj, *suffix ); + if (find_src_file( name )) + { + if (!got_header++) *column += fprintf( file, " %s.h", obj ); + *column += fprintf( file, " %s", name ); + } + free( name ); + suffix++; + } *column += fprintf( file, ": %s", pFile->filename ); } + else if (!strcmp( ext, "tlb" )) + { + return 0; /* nothing to do for typelib files */ + } else { *column += fprintf( file, "%s.o: %s", obj, pFile->filename ); } } free( obj ); + return 1; } @@ -875,7 +887,7 @@ static void output_dependencies(void) LIST_FOR_EACH_ENTRY( pFile, &sources, INCL_FILE, entry ) { column = 0; - output_src( file, pFile, &column ); + if (!output_src( file, pFile, &column )) continue; for (i = 0; i < MAX_INCLUDES; i++) if (pFile->files[i]) output_include( file, pFile->files[i], pFile, &column );

1 0

Alexandre Julliard : Add makedep magic comments for typelibs in resource files.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 8ebe988d2e8c8813ed91914fed9386e3cd86c5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ebe988d2e8c8813ed91914fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 22:14:21 2008 +0200 Add makedep magic comments for typelibs in resource files. --- dlls/mshtml.tlb/rsrc.rc | 1 + dlls/msi/msi.rc | 1 + dlls/msxml3/version.rc | 1 + dlls/oleaut32/tests/tmarshal.rc | 1 + dlls/shdocvw/shdocvw.rc | 2 ++ dlls/stdole2.tlb/rsrc.rc | 1 + dlls/stdole32.tlb/rsrc.rc | 1 + 7 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml.tlb/rsrc.rc b/dlls/mshtml.tlb/rsrc.rc index 2115860..7ffae35 100644 --- a/dlls/mshtml.tlb/rsrc.rc +++ b/dlls/mshtml.tlb/rsrc.rc @@ -20,4 +20,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: mshtml_tlb.tlb */ 1 TYPELIB LOADONCALL DISCARDABLE mshtml_tlb.tlb diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index 3df5ac3..121ae21 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -48,6 +48,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: msiserver.tlb */ 1 TYPELIB LOADONCALL DISCARDABLE msiserver.tlb /* @makedep: instadvert.bmp */ diff --git a/dlls/msxml3/version.rc b/dlls/msxml3/version.rc index 0d82c31..232f5ea 100644 --- a/dlls/msxml3/version.rc +++ b/dlls/msxml3/version.rc @@ -14,6 +14,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: msxml3_v1.tlb */ 1 TYPELIB LOADONCALL DISCARDABLE msxml3_v1.tlb #define WINE_OLESELFREGISTER diff --git a/dlls/oleaut32/tests/tmarshal.rc b/dlls/oleaut32/tests/tmarshal.rc index aabf611..30c2a9b 100644 --- a/dlls/oleaut32/tests/tmarshal.rc +++ b/dlls/oleaut32/tests/tmarshal.rc @@ -27,4 +27,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" +/* @makedep: tmarshal.tlb */ 1 TYPELIB LOADONCALL DISCARDABLE tmarshal.tlb diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index 4c618ae..47718c1 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -19,6 +19,8 @@ #include "version.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* @makedep: shdocvw_v1.tlb */ 1 TYPELIB LOADONCALL DISCARDABLE shdocvw_v1.tlb /* @makedep: shdocvw.inf */ diff --git a/dlls/stdole2.tlb/rsrc.rc b/dlls/stdole2.tlb/rsrc.rc index 35007d0..91b1f85 100644 --- a/dlls/stdole2.tlb/rsrc.rc +++ b/dlls/stdole2.tlb/rsrc.rc @@ -27,4 +27,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" +/* @makedep: std_ole_v2.tlb */ 1 TYPELIB LOADONCALL DISCARDABLE std_ole_v2.tlb diff --git a/dlls/stdole32.tlb/rsrc.rc b/dlls/stdole32.tlb/rsrc.rc index 75388ac..de50675 100644 --- a/dlls/stdole32.tlb/rsrc.rc +++ b/dlls/stdole32.tlb/rsrc.rc @@ -27,4 +27,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" +/* @makedep: std_ole_v1.tlb */ 1 TYPELIB LOADONCALL DISCARDABLE std_ole_v1.tlb

1 0

Alex Villacís Lasso : riched20: Reject RTF that is recognized as invalid.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 4f95cf707254653a3199caff3553fd0f732f23df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f95cf707254653a3199caff3… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Thu Apr 24 10:07:12 2008 -0500 riched20: Reject RTF that is recognized as invalid. --- dlls/riched20/editor.c | 6 +++--- dlls/riched20/tests/editor.c | 8 -------- dlls/riched32/tests/editor.c | 4 ---- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 04b0e80..e635e9f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1029,6 +1029,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre int from, to, to2, nUndoMode; int nEventMask = editor->nEventMask; ME_InStream inStream; + BOOL invalidRTF = FALSE; TRACE("stream==%p hWnd==%p format==0x%X\n", stream, editor->hWnd, format); editor->nEventMask = 0; @@ -1071,13 +1072,12 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if ((!editor->bEmulateVersion10 && strncmp(inStream.buffer, "{\\rtf", 5) && strncmp(inStream.buffer, "{\\urtf", 6)) || (editor->bEmulateVersion10 && *inStream.buffer != '{')) { - format &= ~SF_RTF; - format |= SF_TEXT; + invalidRTF = TRUE; } } } - if (!inStream.editstream->dwError) + if (!invalidRTF && !inStream.editstream->dwError) { if (format & SF_RTF) { /* setup the RTF parser */ diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1593d09..554d7ba 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2415,28 +2415,20 @@ static void test_EM_STREAMIN(void) (WPARAM)(SF_RTF), (LPARAM)&es); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - todo_wine { ok (result == 0, "EM_STREAMIN: Test 2 returned %ld, expected 0\n", result); - } - todo_wine { ok (strlen(buffer) == 0, "EM_STREAMIN: Test 2 set wrong text: Result: %s\n",buffer); - } es.dwCookie = (DWORD_PTR)&streamText3; SendMessage(hwndRichEdit, EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&es); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - todo_wine { ok (result == 0, "EM_STREAMIN: Test 3 returned %ld, expected 9\n", result); - } - todo_wine { ok (strlen(buffer) == 0, "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); - } DestroyWindow(hwndRichEdit); } diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 22dac0a..c8b7181 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -276,14 +276,10 @@ static void test_EM_STREAMIN(void) (WPARAM)(SF_RTF), (LPARAM)&es); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - todo_wine { ok (result == 0, "EM_STREAMIN: Test 3 returned %ld, expected 0\n", result); - } - todo_wine { ok (strlen(buffer) == 0, "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); - } DestroyWindow(hwndRichEdit); }

1 0