winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
4 participants
1278 discussions
Start a n
N
ew thread
Jacek Caban : mshtml: Added get_firstChild implementation.
by Alexandre Julliard
24 Apr '08
24 Apr '08
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
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
0
Aric Stewart : comctl32: Fix an off-by-one error in toolbar TOOLBAR_SetHotItem.
by Alexandre Julliard
24 Apr '08
24 Apr '08
Module: wine Branch: master Commit: e1a0715b4a129db8eb2b6b04def4f2e8b3b390f1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e1a0715b4a129db8eb2b6b04d…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 24 10:34:01 2008 -0500 comctl32: Fix an off-by-one error in toolbar TOOLBAR_SetHotItem. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 7b2ef6e..9669a80 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4761,7 +4761,7 @@ TOOLBAR_SetHotItem (HWND hwnd, WPARAM wParam) TRACE("hwnd = %p, nHit = %d\n", hwnd, (INT)wParam); - if ((INT)wParam > infoPtr->nNumButtons) + if ((INT)wParam >= infoPtr->nNumButtons) return infoPtr->nHotItem; if ((INT)wParam < 0)
1
0
0
0
← Newer
1
...
23
24
25
26
27
28
29
...
128
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
Results per page:
10
25
50
100
200