October 2010 - Wine-commits

Alexandre Julliard : Wine release 1.3.6
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: website Branch: master Commit: fcfd861b19e14487e0330e6b9cac34d1c753e965 URL: http://source.winehq.org/git/website.git/?a=commit;h=fcfd861b19e14487e0330e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 19:51:32 2010 +0200 Wine release 1.3.6 --- news/en/2010102901.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2010102901.xml b/news/en/2010102901.xml new file mode 100644 index 0000000..157d785 --- /dev/null +++ b/news/en/2010102901.xml @@ -0,0 +1,18 @@ +<news> +<date>October 29, 2010</date> +<title>Wine 1.3.6 Released</title> +<body> + The Wine development release 1.3.6 is now available. + <a href="{$root}/announce/1.3.6">What's new</a> in this release: +<ul> + <li>Support for GStreamer filters.</li> + <li>Mapping of standard cursors to native desktop cursors.</li> + <li>Improved support for installers with services.</li> + <li>Many MSXML improvements.</li> + <li>Decoder for TGA-format images.</li> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.6.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.6.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: f92537af93b606e8ff2a64a03bbee8203dfb35aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92537af93b606e8ff2a64a03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 19:42:36 2010 +0200 Release 1.3.6. --- ANNOUNCE | 1179 ++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 590 insertions(+), 609 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f92537af93b606e8ff2a6…

1 0

Tag wine-1.3.6 : Alexandre Julliard : Release 1.3.6
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: refs/tags/wine-1.3.6 Tag: 51dbc21aa50ec023bb0424cf0ef7d3198a0a3c4a URL: http://source.winehq.org/git/wine.git/?a=tag;h=51dbc21aa50ec023bb0424cf0ef7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 19:42:37 2010 +0200 Release 1.3.6

1 0

Paul Vriens : hhctrl.ocx: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 365e76d26a79633e37218d11522366cc3c06b6da URL: http://source.winehq.org/git/wine.git/?a=commit;h=365e76d26a79633e37218d115… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 29 16:03:40 2010 +0200 hhctrl.ocx: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/hhctrl.ocx/Makefile.in | 1 + dlls/hhctrl.ocx/Sr.rc | 100 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 58769c7..7e3ced1 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -33,6 +33,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sr.rc \ Sv.rc \ Tr.rc \ Uk.rc \ diff --git a/dlls/hhctrl.ocx/Sr.rc b/dlls/hhctrl.ocx/Sr.rc new file mode 100644 index 0000000..d0223ff --- /dev/null +++ b/dlls/hhctrl.ocx/Sr.rc @@ -0,0 +1,100 @@ +/* + * HTML Help Serbian resources + * + * Copyright 2005 James Hawkins + * Copyright 2010 Đorđe Vasiljević + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Садржај" + IDS_INDEX "&Попис" + IDS_SEARCH "&Претрага" + IDS_FAVORITES "&Омиљено" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Прикажи" + IDTB_CONTRACT "Сакриј" + IDTB_STOP "Заустави" + IDTB_REFRESH "Освежи" + IDTB_BACK "Назад" + IDTB_HOME "Почетна" + IDTB_SYNC "Усклади" + IDTB_PRINT "Штампај" + IDTB_OPTIONS "Опције" + IDTB_FORWARD "Проследи" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Прелаз 1" + IDTB_JUMP2 "Прелаз 2" + IDTB_CUSTOMIZE "Прилагоди" + IDTB_ZOOM "Увећај" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Sadržaj" + IDS_INDEX "&Popis" + IDS_SEARCH "&Pretraga" + IDS_FAVORITES "&Omiljeno" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Prikaži" + IDTB_CONTRACT "Sakrij" + IDTB_STOP "Zaustavi" + IDTB_REFRESH "Osveži" + IDTB_BACK "Nazad" + IDTB_HOME "Početna" + IDTB_SYNC "Uskladi" + IDTB_PRINT "Štampaj" + IDTB_OPTIONS "Opcije" + IDTB_FORWARD "Prosledi" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Prelaz 1" + IDTB_JUMP2 "Prelaz 2" + IDTB_CUSTOMIZE "Prilagodi" + IDTB_ZOOM "Uvećaj" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END

1 0

Jacek Caban : mshtml: Added IHTMLEmbedElement stub implementation.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: d147ee1392a8e1e04379530414231c4a1abe1b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d147ee1392a8e1e0437953041… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 29 15:53:15 2010 +0200 mshtml: Added IHTMLEmbedElement stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/dispex.c | 2 + dlls/mshtml/htmlelem.c | 3 + dlls/mshtml/htmlembed.c | 278 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 21 +++- 6 files changed, 305 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d147ee1392a8e1e043795…

1 0

Jacek Caban : msxml3: Don't use xmlnode' s IXMLDOMNode iface in get_xml implementations.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 6241b9d6525f340233bf1578c44df4e88bd7d82e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6241b9d6525f340233bf1578c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 29 16:27:09 2010 +0200 msxml3: Don't use xmlnode's IXMLDOMNode iface in get_xml implementations. --- dlls/msxml3/attribute.c | 5 ++- dlls/msxml3/cdata.c | 5 ++- dlls/msxml3/comment.c | 5 ++- dlls/msxml3/docfrag.c | 5 ++- dlls/msxml3/domdoc.c | 7 +++- dlls/msxml3/element.c | 5 ++- dlls/msxml3/entityref.c | 5 ++- dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 75 +++++++++++++++++------------------------- dlls/msxml3/pi.c | 5 ++- dlls/msxml3/text.c | 5 ++- 11 files changed, 69 insertions(+), 55 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 724dec6..c63cf6e 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -446,7 +446,10 @@ static HRESULT WINAPI domattr_get_xml( BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_xml(&This->node, FALSE, FALSE, p); } static HRESULT WINAPI domattr_transformNode( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 84d631f..c346f1b 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -457,7 +457,10 @@ static HRESULT WINAPI domcdata_get_xml( BSTR* p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_xml(&This->node, FALSE, FALSE, p); } static HRESULT WINAPI domcdata_transformNode( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 3c80011..9f8c0e3 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -450,7 +450,10 @@ static HRESULT WINAPI domcomment_get_xml( BSTR* p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_xml(&This->node, FALSE, FALSE, p); } static HRESULT WINAPI domcomment_transformNode( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index f9c1ed5..ccc6744 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -454,7 +454,10 @@ static HRESULT WINAPI domfrag_get_xml( BSTR* p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_xml(&This->node, FALSE, FALSE, p); } static HRESULT WINAPI domfrag_transformNode( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8a21402..d62d02b 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1268,10 +1268,13 @@ static HRESULT WINAPI domdoc_put_dataType( static HRESULT WINAPI domdoc_get_xml( IXMLDOMDocument3 *iface, - BSTR* xmlString ) + BSTR* p) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), xmlString ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_xml(&This->node, TRUE, TRUE, p); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 396ca52..615499d 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -475,7 +475,10 @@ static HRESULT WINAPI domelem_get_xml( BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_xml(&This->node, TRUE, FALSE, p); } static HRESULT WINAPI domelem_transformNode( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 3460bd0..501ff62 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -448,7 +448,10 @@ static HRESULT WINAPI entityref_get_xml( BSTR* p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_xml(&This->node, FALSE, FALSE, p); } static HRESULT WINAPI entityref_transformNode( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 7fcfea7..310b9ad 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -106,6 +106,7 @@ BOOL dispex_query_interface(DispatchEx*,REFIID,void**); #include <libxml/parser.h> #endif + #include <libxml/xmlerror.h> /* constructors */ @@ -190,6 +191,7 @@ extern HRESULT node_get_next_sibling(xmlnode*,IXMLDOMNode**); extern HRESULT node_insert_before(xmlnode*,IXMLDOMNode*,const VARIANT*,IXMLDOMNode**); extern HRESULT node_replace_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode*,IXMLDOMNode**); extern HRESULT node_put_text(xmlnode*,BSTR); +extern HRESULT node_get_xml(xmlnode*,BOOL,BOOL,BSTR*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 0d12209..72e6be9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -978,63 +978,45 @@ static BSTR EnsureNoEncoding(BSTR sInput) * reproduce behaviour exactly. * */ -static HRESULT WINAPI xmlnode_get_xml( - IXMLDOMNode *iface, - BSTR* xmlString) +HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BOOL ensure_no_encoding, BSTR *ret) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - xmlBufferPtr pXmlBuf; + xmlBufferPtr xml_buf; xmlNodePtr xmldecl; - int nSize; + int size; - TRACE("(%p %d)->(%p)\n", This, This->node->type, xmlString); - - if(!xmlString) + if(!ret) return E_INVALIDARG; - *xmlString = NULL; + *ret = NULL; + + xml_buf = xmlBufferCreate(); + if(!xml_buf) + return E_OUTOFMEMORY; xmldecl = xmldoc_unlink_xmldecl( This->node->doc ); - pXmlBuf = xmlBufferCreate(); - if(pXmlBuf) - { - nSize = xmlNodeDump(pXmlBuf, This->node->doc, This->node, 0, 1); - if(nSize > 0) - { - const xmlChar *pContent; - BSTR bstrContent; + size = xmlNodeDump(xml_buf, This->node->doc, This->node, 0, 1); + if(size > 0) { + const xmlChar *buf_content; + BSTR content; - /* Attribute Nodes return a space in front of their name */ - pContent = xmlBufferContent(pXmlBuf); - if( ((const char*)pContent)[0] == ' ') - bstrContent = bstr_from_xmlChar(pContent+1); - else - bstrContent = bstr_from_xmlChar(pContent); + /* Attribute Nodes return a space in front of their name */ + buf_content = xmlBufferContent(xml_buf); - switch(This->node->type) - { - case XML_ELEMENT_NODE: - *xmlString = EnsureCorrectEOL(bstrContent); - break; - case XML_DOCUMENT_NODE: - *xmlString = EnsureCorrectEOL(bstrContent); - *xmlString = EnsureNoEncoding(*xmlString); - break; - default: - *xmlString = bstrContent; - } - } + content = bstr_from_xmlChar(buf_content + (buf_content[0] == ' ' ? 1 : 0)); + if(ensure_eol) + content = EnsureCorrectEOL(content); + if(ensure_no_encoding) + content = EnsureNoEncoding(content); - xmlBufferFree(pXmlBuf); + *ret = content; + }else { + *ret = SysAllocStringLen(NULL, 0); } + xmlBufferFree(xml_buf); xmldoc_link_xmldecl( This->node->doc, xmldecl ); - - /* Always returns a string. */ - if(*xmlString == NULL) *xmlString = SysAllocStringLen( NULL, 0 ); - - return S_OK; + return *ret ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI xmlnode_transformNode( @@ -1283,7 +1265,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = xmlnode_put_nodeTypedValue, NULL, xmlnode_put_dataType, - xmlnode_get_xml, + NULL, xmlnode_transformNode, xmlnode_selectNodes, xmlnode_selectSingleNode, @@ -1731,7 +1713,10 @@ static HRESULT WINAPI unknode_get_xml( BSTR* p) { unknode *This = impl_from_unkIXMLDOMNode( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); + + FIXME("(%p)->(%p)\n", This, p); + + return node_get_xml(&This->node, FALSE, FALSE, p); } static HRESULT WINAPI unknode_transformNode( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 4fee700..4ba7607 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -464,7 +464,10 @@ static HRESULT WINAPI dom_pi_get_xml( BSTR* p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_xml(&This->node, FALSE, FALSE, p); } static HRESULT WINAPI dom_pi_transformNode( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index a98b52c..38a44c3 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -463,7 +463,10 @@ static HRESULT WINAPI domtext_get_xml( BSTR* p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_xml( IXMLDOMNode_from_impl(&This->node), p ); + + TRACE("(%p)->(%p)\n", This, p); + + return node_get_xml(&This->node, FALSE, FALSE, p); } static HRESULT WINAPI domtext_transformNode(

1 0

Adam Martinson : msxml3: Fix XSLPattern namespace handling.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 77b7323b4f92ab2acc2048ea7cd1dec7b43cc760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b7323b4f92ab2acc2048ea7… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Thu Oct 28 20:14:58 2010 -0500 msxml3: Fix XSLPattern namespace handling. --- dlls/msxml3/queryresult.c | 6 +- dlls/msxml3/tests/domdoc.c | 45 +++++++---------- dlls/msxml3/xslpattern.h | 2 + dlls/msxml3/xslpattern.l | 3 +- dlls/msxml3/xslpattern.y | 116 ++++++++++++++++++++++++++------------------ 5 files changed, 93 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77b7323b4f92ab2acc204…

1 0

Adam Martinson : msxml3/tests: Add XSLPattern collection method tests.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: e7d8bbab44440e990374ddfb500f54cbb05072d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d8bbab44440e990374ddfb5… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Thu Oct 28 20:16:02 2010 -0500 msxml3/tests: Add XSLPattern collection method tests. --- dlls/msxml3/tests/domdoc.c | 215 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 214 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index cf7aa7c..a22975a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -249,7 +249,31 @@ static const CHAR szExampleXML[] = " </elem>\n" "</root>\n"; -static const CHAR szTransformXML[] = +static const CHAR szNodeTypesXML[] = +"<?xml version='1.0'?>" +"" +"<root id='0' depth='0'>" +" " +" text node 0" +" <x id='1' depth='1'>" +" <?foo value='PI for x'?>" +" " +" text node 1" +" <a id='3' depth='2'/>" +" " +" <c id='5' depth='2'/>" +" </x>" +" <y id='2' depth='1'>" +" <?bar value='PI for y'?>" +" " +" text node 2" +" <a id='6' depth='2'/>" +" " +" <c id='8' depth='2'/>" +" </y>" +"</root>"; + +static const CHAR szTransformXML[] = "<?xml version=\"1.0\"?>\n" "<greeting>\n" "Hello World\n" @@ -680,6 +704,12 @@ static void get_str_for_type(DOMNodeType type, char *buf) case NODE_TEXT: strcpy(buf, "T"); break; + case NODE_COMMENT: + strcpy(buf, "C"); + break; + case NODE_PROCESSING_INSTRUCTION: + strcpy(buf, "P"); + break; default: wsprintfA(buf, "[%d]", type); } @@ -6532,6 +6562,189 @@ static void test_XSLPattern(void) IXMLDOMNodeList_Release(list); IXMLDOMDocument2_Release(doc); + + doc = create_document(&IID_IXMLDOMDocument2); + if (!doc) return; + + ole_check(IXMLDOMDocument2_loadXML(doc, _bstr_(szNodeTypesXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + list = NULL; + + /* attribute() */ + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("attribute()"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len == 0, "expected empty list\n"); + if (len) + IXMLDOMNodeList_Release(list); + } + + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("attribute('depth')"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len == 0, "expected empty list\n"); + if (len) + IXMLDOMNodeList_Release(list); + } + + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root/attribute('depth')"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len != 0, "expected filled list\n"); + if (len) + todo_wine expect_list_and_release(list, "A'depth'.E3.D1"); + } + + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//x/attribute()"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len != 0, "expected filled list\n"); + if (len) + todo_wine expect_list_and_release(list, "A'id'.E3.E3.D1 A'depth'.E3.E3.D1"); + } + + list = NULL; + ole_expect(IXMLDOMDocument2_selectNodes(doc, _bstr_("//x//attribute(id)"), &list), E_FAIL); + if (list) + IXMLDOMNodeList_Release(list); + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//x//attribute('id')"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len != 0, "expected filled list\n"); + if (len) + todo_wine expect_list_and_release(list, "A'id'.E3.E3.D1 A'id'.E4.E3.E3.D1 A'id'.E5.E3.E3.D1 A'id'.E6.E3.E3.D1"); + } + + /* comment() */ + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("comment()"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + ok(len != 0, "expected filled list\n"); + if (len) + expect_list_and_release(list, "C2.D1"); + } + + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//comment()"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + ok(len != 0, "expected filled list\n"); + if (len) + expect_list_and_release(list, "C2.D1 C1.E3.D1 C2.E3.E3.D1 C2.E4.E3.D1"); + } + + /* element() */ + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("element()"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len != 0, "expected filled list\n"); + if (len) + todo_wine expect_list_and_release(list, "E3.D1"); + } + + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root/y/element()"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len != 0, "expected filled list\n"); + if (len) + todo_wine expect_list_and_release(list, "E4.E4.E3.D1 E5.E4.E3.D1 E6.E4.E3.D1"); + } + + list = NULL; + ole_expect(IXMLDOMDocument2_selectNodes(doc, _bstr_("//element(a)"), &list), E_FAIL); + if (list) + IXMLDOMNodeList_Release(list); + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//element('a')"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len != 0, "expected filled list\n"); + if (len) + todo_wine expect_list_and_release(list, "E4.E3.E3.D1 E4.E4.E3.D1"); + } + + /* node() */ + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("node()"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + ok(len != 0, "expected filled list\n"); + if (len) + expect_list_and_release(list, "P1.D1 C2.D1 E3.D1"); + } + + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//x/node()"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + ok(len != 0, "expected filled list\n"); + if (len) + expect_list_and_release(list, "P1.E3.E3.D1 C2.E3.E3.D1 T3.E3.E3.D1 E4.E3.E3.D1 E5.E3.E3.D1 E6.E3.E3.D1"); + } + + /* pi() */ + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("pi()"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len != 0, "expected filled list\n"); + if (len) + todo_wine expect_list_and_release(list, "P1.D1"); + } + + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//y/pi()"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len != 0, "expected filled list\n"); + if (len) + todo_wine expect_list_and_release(list, "P1.E4.E3.D1"); + } + + /* textnode() */ + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root/textnode()"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len != 0, "expected filled list\n"); + if (len) + todo_wine expect_list_and_release(list, "T2.E3.D1"); + } + + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root/element()/textnode()"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len != 0, "expected filled list\n"); + if (len) + todo_wine expect_list_and_release(list, "T3.E3.E3.D1 T3.E4.E3.D1"); + } + + IXMLDOMDocument2_Release(doc); free_bstrs(); }

1 0

Travis Athougies : d3dcompiler_43/tests: Added order of operations test to HLSL test suite.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 9f7ceec91f9cdad7e8b77941f85bb3ce831291f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f7ceec91f9cdad7e8b77941f… Author: Travis Athougies <iammisc(a)gmail.com> Date: Thu Oct 28 19:16:48 2010 -0700 d3dcompiler_43/tests: Added order of operations test to HLSL test suite. --- dlls/d3dcompiler_43/tests/hlsl.c | 44 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 08d0c09..e67d856 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -327,6 +327,49 @@ static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_ } } +static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, + IDirect3DVertexShader9 *vshader_passthru) +{ + /* Tests order of operations */ + static const float u = 2.5f, v = 0.3f, w = 0.2f, x = 0.7f, y = 0.1f, z = 1.5f; + + static struct hlsl_probe_info order_of_operations_probes[] = + { + {0, 0, {-12.4300f, 9.8333f, 1.6000f, 34.9999f}, 0.0001f, + "order of operations test failed"} + }; + + static const char *order_of_operations_shader = + "float4 test(uniform float u, uniform float v, uniform float w, uniform float x, \ + uniform float y, uniform float z): COLOR \ + { \ + return float4(x * y - z / w + --u / -v, \ + z * x / y + w / -v, \ + u + v - w, \ + x / y / w); \ + }"; + + ID3DXConstantTable *constants; + IDirect3DPixelShader9 *pshader; + + pshader = compile_pixel_shader9(device, order_of_operations_shader, "ps_2_0", &constants); + if (pshader != NULL) + { + ID3DXConstantTable_SetFloat(constants, device, "$u", u); + ID3DXConstantTable_SetFloat(constants, device, "$v", v); + ID3DXConstantTable_SetFloat(constants, device, "$w", w); + ID3DXConstantTable_SetFloat(constants, device, "$x", x); + ID3DXConstantTable_SetFloat(constants, device, "$y", y); + ID3DXConstantTable_SetFloat(constants, device, "$z", z); + + compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, + order_of_operations_probes, 1, 1, 1, __LINE__); + + IUnknown_Release(constants); + IUnknown_Release(pshader); + } +} + START_TEST(hlsl) { D3DCAPS9 caps; @@ -347,6 +390,7 @@ START_TEST(hlsl) todo_wine { test_swizzle(device, quad_geometry, vshader_passthru); + test_math(device, quad_geometry, vshader_passthru); } } else skip("no pixel shader support\n");

1 0

Travis Athougies : d3dcompiler_43/tests: Added tests for conditional expressions to HLSL test suite.
by Alexandre Julliard 29 Oct '10

29 Oct '10

Module: wine Branch: master Commit: 79f715c3ec66088860b777d5f508abe740f1813c URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f715c3ec66088860b777d5f… Author: Travis Athougies <iammisc(a)gmail.com> Date: Thu Oct 28 19:16:49 2010 -0700 d3dcompiler_43/tests: Added tests for conditional expressions to HLSL test suite. --- dlls/d3dcompiler_43/tests/hlsl.c | 65 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index e67d856..aeb0d4d 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -370,6 +370,70 @@ static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo } } +static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, + IDirect3DVertexShader9 *vshader_passthru) +{ + static struct hlsl_probe_info if_greater_probes[] = + { + { 0, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test failed"}, + { 5, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test failed"}, + {10, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test failed"}, + {15, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test failed"}, + {25, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test failed"}, + {30, 0, {0.1f, 0.2f, 0.3f, 0.4f}, 0.0001f, "if greater test failed"} + }; + + static const char *if_greater_shader = + "float4 test(float2 pos: TEXCOORD0): COLOR \ + { \ + if((pos.x * 32.0) > 20.0) \ + return float4(0.1, 0.2, 0.3, 0.4); \ + else \ + return float4(0.9, 0.8, 0.7, 0.6); \ + }"; + + static struct hlsl_probe_info ternary_operator_probes[] = + { + {0, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test failed"}, + {1, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test failed"}, + {2, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test failed"}, + {3, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test failed"}, + {4, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test failed"}, + {5, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test failed"}, + {6, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test failed"}, + {7, 0, {0.60f, 0.80f, 0.10f, 0.20f}, 0.00001f, "ternary operator test failed"} + }; + + static const char *ternary_operator_shader = + "float4 test(float2 pos: TEXCOORD0): COLOR \ + { \ + return (pos.x < 0.5?float4(0.5, 0.25, 0.5, 0.75):float4(0.6, 0.8, 0.1, 0.2)); \ + }"; + + ID3DXConstantTable *constants; + IDirect3DPixelShader9 *pshader; + + pshader = compile_pixel_shader9(device, if_greater_shader, "ps_2_0", &constants); + if (pshader != NULL) + { + compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, + if_greater_probes, 6, 32, 1, __LINE__); + + IUnknown_Release(constants); + IUnknown_Release(pshader); + } + + pshader = compile_pixel_shader9(device, ternary_operator_shader, "ps_2_0", &constants); + if (pshader != NULL) + { + compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, + ternary_operator_probes, 7, 8, 1, __LINE__); + + IUnknown_Release(constants); + IUnknown_Release(pshader); + } +} + START_TEST(hlsl) { D3DCAPS9 caps; @@ -391,6 +455,7 @@ START_TEST(hlsl) { test_swizzle(device, quad_geometry, vshader_passthru); test_math(device, quad_geometry, vshader_passthru); + test_conditionals(device, quad_geometry, vshader_passthru); } } else skip("no pixel shader support\n");

1 0