wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Adam Martinson : msxml3: Add schema parse/validate error callbacks.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 92bfadef7f27960c4e45a902f04f51e02e33b1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92bfadef7f27960c4e45a902f… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 22 20:59:40 2010 -0600 msxml3: Add schema parse/validate error callbacks. --- dlls/msxml3/schema.c | 146 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 93 insertions(+), 53 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index e602e29..17439a5 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -214,6 +214,87 @@ static const BYTE hash_assoc_values[] = 116, 116, 116, 116, 116, 116 }; +static void LIBXML2_LOG_CALLBACK parser_error(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_ERR(Schema_parse, msg, ap); + va_end(ap); +} + +static void LIBXML2_LOG_CALLBACK parser_warning(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_WARN(Schema_parse, msg, ap); + va_end(ap); +} + +#ifdef HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS +static void parser_serror(void* ctx, xmlErrorPtr err) +{ + LIBXML2_CALLBACK_SERROR(Schema_parse, err); +} +#endif + +static inline xmlSchemaPtr Schema_parse(xmlSchemaParserCtxtPtr spctx) +{ + TRACE("(%p)\n", spctx); + + xmlSchemaSetParserErrors(spctx, parser_error, parser_warning, NULL); +#ifdef HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS + xmlSchemaSetParserStructuredErrors(spctx, parser_serror, NULL); +#endif + + return xmlSchemaParse(spctx); +} + +static void LIBXML2_LOG_CALLBACK validate_error(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_ERR(Schema_validate_tree, msg, ap); + va_end(ap); +} + +static void LIBXML2_LOG_CALLBACK validate_warning(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_WARN(Schema_validate_tree, msg, ap); + va_end(ap); +} + +#ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS +static void validate_serror(void* ctx, xmlErrorPtr err) +{ + LIBXML2_CALLBACK_SERROR(Schema_validate_tree, err); +} +#endif + +static inline HRESULT Schema_validate_tree(xmlSchemaPtr schema, xmlNodePtr tree) +{ + xmlSchemaValidCtxtPtr svctx; + int err; + + TRACE("(%p, %p)\n", schema, tree); + /* TODO: if validateOnLoad property is false, + * we probably need to validate the schema here. */ + svctx = xmlSchemaNewValidCtxt(schema); + xmlSchemaSetValidErrors(svctx, validate_error, validate_warning, NULL); +#ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS + xmlSchemaSetValidStructuredErrors(svctx, validate_serror, NULL); +#endif + + if (tree->type == XML_DOCUMENT_NODE) + err = xmlSchemaValidateDoc(svctx, (xmlDocPtr)tree); + else + err = xmlSchemaValidateOneElement(svctx, tree); + + xmlSchemaFreeValidCtxt(svctx); + return err? S_FALSE : S_OK; +} + static DWORD dt_hash(xmlChar const* str, int len /* calculated if -1 */) { DWORD hval = (len == -1)? xmlStrlen(str) : len; @@ -491,14 +572,16 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) xmlDocPtr tmp_doc; xmlNodePtr node; xmlNsPtr ns; - xmlSchemaValidCtxtPtr svctx; - BOOL valid; + HRESULT hr; + + TRACE("(dt:%s, %s)\n", dt_to_str(dt), wine_dbgstr_a((char const*)content)); + if (!datatypes_schema) { xmlSchemaParserCtxtPtr spctx; assert(datatypes_src != NULL); spctx = xmlSchemaNewMemParserCtxt((char const*)datatypes_src, datatypes_len); - datatypes_schema = xmlSchemaParse(spctx); + datatypes_schema = Schema_parse(spctx); xmlSchemaFreeParserCtxt(spctx); } @@ -539,22 +622,20 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) assert(datatypes_schema != NULL); if (content && xmlStrlen(content)) { - svctx = xmlSchemaNewValidCtxt(datatypes_schema); tmp_doc = xmlNewDoc(NULL); node = xmlNewChild((xmlNodePtr)tmp_doc, NULL, dt_to_str(dt), content); ns = xmlNewNs(node, DT_nsURI, BAD_CAST "dt"); xmlSetNs(node, ns); xmlDocSetRootElement(tmp_doc, node); - valid = !xmlSchemaValidateDoc(svctx, tmp_doc); - xmlSchemaFreeValidCtxt(svctx); + hr = Schema_validate_tree(datatypes_schema, (xmlNodePtr)tmp_doc); xmlFreeDoc(tmp_doc); } else { /* probably the node is being created manually and has no content yet */ - valid = TRUE; + hr = S_OK; } - return valid? S_OK : S_FALSE; + return hr; break; default: FIXME("need to handle dt:%s\n", dt_to_str(dt)); @@ -745,7 +826,7 @@ static cache_entry* cache_entry_from_url(char const* url, xmlChar const* nsURI) entry->ref = 0; if (spctx) { - if((entry->schema = xmlSchemaParse(spctx))) + if((entry->schema = Schema_parse(spctx))) { /* TODO: if the nsURI is different from the default xmlns or targetNamespace, * do we need to do something special here? */ @@ -783,7 +864,7 @@ static cache_entry* cache_entry_from_xsd_doc(xmlDocPtr doc, xmlChar const* nsURI entry->ref = 0; spctx = xmlSchemaNewDocParserCtxt(new_doc); - if ((entry->schema = xmlSchemaParse(spctx))) + if ((entry->schema = Schema_parse(spctx))) { xmldoc_init(entry->schema->doc, &CLSID_DOMDocument40); entry->doc = entry->schema->doc; @@ -812,7 +893,7 @@ static cache_entry* cache_entry_from_xdr_doc(xmlDocPtr doc, xmlChar const* nsURI entry->ref = 0; spctx = xmlSchemaNewDocParserCtxt(xsd_doc); - if ((entry->schema = xmlSchemaParse(spctx))) + if ((entry->schema = Schema_parse(spctx))) { entry->doc = new_doc; xmldoc_init(entry->schema->doc, &CLSID_DOMDocument30); @@ -1257,29 +1338,6 @@ static inline xmlNodePtr lookup_schema_element(xmlSchemaPtr schema, xmlNodePtr n return (decl != NULL)? decl->node : NULL; } -static void LIBXML2_LOG_CALLBACK validate_error(void* ctx, char const* msg, ...) -{ - va_list ap; - va_start(ap, msg); - LIBXML2_CALLBACK_ERR(SchemaCache_validate_tree, msg, ap); - va_end(ap); -} - -static void LIBXML2_LOG_CALLBACK validate_warning(void* ctx, char const* msg, ...) -{ - va_list ap; - va_start(ap, msg); - LIBXML2_CALLBACK_WARN(SchemaCache_validate_tree, msg, ap); - va_end(ap); -} - -#ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS -static void validate_serror(void* ctx, xmlErrorPtr err) -{ - LIBXML2_CALLBACK_SERROR(SchemaCache_validate_tree, err); -} -#endif - HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); @@ -1297,25 +1355,7 @@ HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tr /* TODO: if the ns is not in the cache, and it's a URL, * do we try to load from that? */ if (schema) - { - xmlSchemaValidCtxtPtr svctx; - int err; - /* TODO: if validateOnLoad property is false, - * we probably need to validate the schema here. */ - svctx = xmlSchemaNewValidCtxt(schema); - xmlSchemaSetValidErrors(svctx, validate_error, validate_warning, NULL); -#ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS - xmlSchemaSetValidStructuredErrors(svctx, validate_serror, NULL); -#endif - - if ((xmlNodePtr)tree->doc == tree) - err = xmlSchemaValidateDoc(svctx, (xmlDocPtr)tree); - else - err = xmlSchemaValidateOneElement(svctx, tree); - - xmlSchemaFreeValidCtxt(svctx); - return err? S_FALSE : S_OK; - } + return Schema_validate_tree(schema, tree); return E_FAIL; }

1 0

Adam Martinson : configure: Add a check for xmlSchemaSetParserStructuredErrors().
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 6ee2231d2bd74623791b578de000fd8182b054b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee2231d2bd74623791b578de… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 22 20:54:54 2010 -0600 configure: Add a check for xmlSchemaSetParserStructuredErrors(). --- configure | 42 ++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ include/config.h.in | 3 +++ 3 files changed, 47 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 11e9d71..b9ff5e1 100755 --- a/configure +++ b/configure @@ -9202,6 +9202,48 @@ $as_echo "#define HAVE_XMLNEWDOCPI 1" >>confdefs.h fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetParserStructuredErrors in -lxml2" >&5 +$as_echo_n "checking for xmlSchemaSetParserStructuredErrors in -lxml2... " >&6; } +if test "${ac_cv_lib_xml2_xmlSchemaSetParserStructuredErrors+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxml2 $ac_xml_libs $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char xmlSchemaSetParserStructuredErrors (); +int +main () +{ +return xmlSchemaSetParserStructuredErrors (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_xml2_xmlSchemaSetParserStructuredErrors=yes +else + ac_cv_lib_xml2_xmlSchemaSetParserStructuredErrors=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlSchemaSetParserStructuredErrors" >&5 +$as_echo "$ac_cv_lib_xml2_xmlSchemaSetParserStructuredErrors" >&6; } +if test "x$ac_cv_lib_xml2_xmlSchemaSetParserStructuredErrors" = x""yes; then : + +$as_echo "#define HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS 1" >>confdefs.h + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetValidStructuredErrors in -lxml2" >&5 $as_echo_n "checking for xmlSchemaSetValidStructuredErrors in -lxml2... " >&6; } if test "${ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors+set}" = set; then : diff --git a/configure.ac b/configure.ac index ce708eb..6ad4532 100644 --- a/configure.ac +++ b/configure.ac @@ -1119,6 +1119,8 @@ then [AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs) AC_CHECK_LIB(xml2, xmlNewDocPI, [AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs) + AC_CHECK_LIB(xml2, xmlSchemaSetParserStructuredErrors, + [AC_DEFINE(HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS,1,[Define if libxml2 has the xmlSchemaSetParserStructuredErrors function])],,$ac_xml_libs) AC_CHECK_LIB(xml2, xmlSchemaSetValidStructuredErrors, [AC_DEFINE(HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS,1,[Define if libxml2 has the xmlSchemaSetValidStructuredErrors function])],,$ac_xml_libs) AC_CHECK_LIB(xml2, xmlFirstElementChild, diff --git a/include/config.h.in b/include/config.h.in index 3117f69..2643e99 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1117,6 +1117,9 @@ /* Define if libxml2 has the xmlReadMemory function */ #undef HAVE_XMLREADMEMORY +/* Define if libxml2 has the xmlSchemaSetParserStructuredErrors function */ +#undef HAVE_XMLSCHEMASSETPARSERSTRUCTUREDERRORS + /* Define if libxml2 has the xmlSchemaSetValidStructuredErrors function */ #undef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS

1 0

Adam Martinson : msxml3: Fix domdoc_getElementsByTagName()/ domelem_getElementsByTagName().
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: f3678ec193edec1911c0dfecc1e0cd44339368ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3678ec193edec1911c0dfecc… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 22 20:59:20 2010 -0600 msxml3: Fix domdoc_getElementsByTagName()/domelem_getElementsByTagName(). --- dlls/msxml3/domdoc.c | 85 ++++++++++++++++++++++++++++--------------- dlls/msxml3/element.c | 42 +++++----------------- dlls/msxml3/msxml_private.h | 6 +++- dlls/msxml3/node.c | 8 ++++- dlls/msxml3/queryresult.c | 22 ++++------- dlls/msxml3/tests/domdoc.c | 7 ++-- 6 files changed, 87 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3678ec193edec1911c0d…

1 0

Adam Martinson : msxml3: Implement domtext dt-related functions.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 6f537c4df11b70d2cb8338035557e694ac8f8cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f537c4df11b70d2cb8338035… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 22 20:57:58 2010 -0600 msxml3: Implement domtext dt-related functions. These should always be handled by the parent node. --- dlls/msxml3/node.c | 2 +- dlls/msxml3/text.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 88 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index c135f20..2db7115 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -852,7 +852,7 @@ static HRESULT WINAPI xmlnode_get_nodeTypedValue( V_VT(typedValue) = VT_NULL; - if (This->node->type == XML_TEXT_NODE || This->node->type == XML_ENTITY_REF_NODE) + if (This->node->type == XML_ENTITY_REF_NODE) { VariantInit(&type); hres = IXMLDOMNode_get_dataType(This->iface, &type); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 9b25008..76d81c2 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -435,7 +435,29 @@ static HRESULT WINAPI domtext_get_nodeTypedValue( VARIANT* var1) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); + IXMLDOMNode* parent = NULL; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, var1); + + if (!var1) + return E_INVALIDARG; + + hr = domtext_get_parentNode(iface, &parent); + + if (hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(parent, var1); + IXMLDOMNode_Release(parent); + } + else + { + V_VT(var1) = VT_NULL; + V_BSTR(var1) = NULL; + hr = S_FALSE; + } + + return hr; } static HRESULT WINAPI domtext_put_nodeTypedValue( @@ -443,24 +465,82 @@ static HRESULT WINAPI domtext_put_nodeTypedValue( VARIANT var1) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); + IXMLDOMNode* parent = NULL; + HRESULT hr; + + TRACE("(%p)->(VARIANT)\n", This); + + hr = domtext_get_parentNode(iface, &parent); + + if (hr == S_OK) + { + hr = IXMLDOMNode_put_nodeTypedValue(parent, var1); + IXMLDOMNode_Release(parent); + } + else + { + hr = S_FALSE; + } + + return hr; } static HRESULT WINAPI domtext_get_dataType( IXMLDOMText *iface, - VARIANT* typename) + VARIANT* dtName) { domtext *This = impl_from_IXMLDOMText( iface ); - TRACE("(%p)->(%p)\n", This, typename); - return return_null_var( typename ); + IXMLDOMNode* parent = NULL; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, dtName); + + if (!dtName) + return E_INVALIDARG; + + hr = domtext_get_parentNode(iface, &parent); + + if (hr == S_OK) + { + hr = IXMLDOMNode_get_dataType(parent, dtName); + IXMLDOMNode_Release(parent); + } + else + { + V_VT(dtName) = VT_NULL; + V_BSTR(dtName) = NULL; + hr = S_FALSE; + } + + return hr; } static HRESULT WINAPI domtext_put_dataType( IXMLDOMText *iface, - BSTR p) + BSTR dtName) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_put_dataType( IXMLDOMNode_from_impl(&This->node), p ); + IXMLDOMNode* parent = NULL; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, dtName); + + if (!dtName) + return E_INVALIDARG; + + hr = domtext_get_parentNode(iface, &parent); + + if (hr == S_OK) + { + hr = IXMLDOMNode_put_dataType(parent, dtName); + IXMLDOMNode_Release(parent); + } + else + { + hr = S_FALSE; + } + + return hr; } static HRESULT WINAPI domtext_get_xml(

1 0

Adam Martinson : msxml3: Validate node content in domelem_put_dataType().
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 643cbafabc0535fece63ef0a9f51de164df8e5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=643cbafabc0535fece63ef0a9… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 22 20:57:29 2010 -0600 msxml3: Validate node content in domelem_put_dataType(). --- dlls/msxml3/element.c | 89 +++++++++++++++++++++++++++++++++++++++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 71 +++----------------------------- dlls/msxml3/schema.c | 94 ++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 182 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=643cbafabc0535fece63e…

1 0

Adam Martinson : msxml3: Add BSTR versions of the XDR_DT <-> string functions.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: f090ddfe13eefe3e271e2ab6ca41f6640f114010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f090ddfe13eefe3e271e2ab6c… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 22 20:56:31 2010 -0600 msxml3: Add BSTR versions of the XDR_DT <-> string functions. --- dlls/msxml3/element.c | 10 +- dlls/msxml3/msxml_private.h | 6 +- dlls/msxml3/schema.c | 233 ++++++++++++++++++++++++++++++++++-------- 3 files changed, 197 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f090ddfe13eefe3e271e2…

1 0

Adam Martinson : msxml3: Use the associated schema for domelem_get_dataType ().
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: c19fa9b04b03b78778d48e88f80d9253168c7edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19fa9b04b03b78778d48e88f… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 22 20:55:54 2010 -0600 msxml3: Use the associated schema for domelem_get_dataType(). --- dlls/msxml3/element.c | 345 +++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 25 ++-- dlls/msxml3/tests/domdoc.c | 321 +++++++++++++++++++++++++++++++++------- 4 files changed, 619 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c19fa9b04b03b78778d48…

1 0

André Hentschel : patches: Mention that there must be the full name.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: tools Branch: master Commit: 9526152b008ddba4825904d9cf1d6dae9912ed82 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9526152b008ddba4825904d9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 23 21:17:13 2010 +0100 patches: Mention that there must be the full name. --- patches/update | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/patches/update b/patches/update index ef24a7f..70d05e3 100755 --- a/patches/update +++ b/patches/update @@ -64,7 +64,7 @@ my @legend = [ "buildfail", "<ul><li>Syntax error or other compile problem.</li>" . "<li>You forgot to include some changes or new files required for compilation.</li>" . "<li>The patch causes compiler warnings (maintainer mode implies -Werror).</li></ul>" ], - [ "formatting", "<ul><li>The patch author's name or email address are incorrect or missing.</li>" . + [ "formatting", "<ul><li>The patch author's full name or email address are incorrect or missing.</li>" . "<li>Whitespace got mangled in transit.</li>" . "<li>Indentation is messed up (usually from editing with a non-standard tab size).</li>" . "<li>8-bit chars got mangled in transit (usually when sending patches to resource files).</li>" .

1 0

Alexandre Julliard : winetest: Properly format the new URL field.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: tools Branch: master Commit: f675b2738fb9a0d215d02d9cfd035cb8e83f13ff URL: http://source.winehq.org/git/tools.git/?a=commit;h=f675b2738fb9a0d215d02d9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 23 17:46:07 2010 +0100 winetest: Properly format the new URL field. --- winetest/dissect | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 83254fe..00edcc5 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -129,7 +129,11 @@ my ($wine, $wine_build, $version, $major, $minor, $plid, $product); $box->{data} .= "<h2>Operating system version</h2>\n"; $box->{data} .= "<table class=\"output\">\n"; while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { - $box->{data} .= sprintf "<tr><td>$1</td><td>%s</td></tr>\n", escapeHTML($2); + if ($1 eq "URL") { + $box->{data} .= sprintf "<tr><td>$1</td><td><a href=\"%s\">%s</a></td></tr>\n", escapeHTML($2), escapeHTML($2); + } else { + $box->{data} .= sprintf "<tr><td>$1</td><td>%s</td></tr>\n", escapeHTML($2); + } if ($1 eq "bRunningUnderWine") { $wine = $2; } elsif ($1 eq "dwMajorVersion") {

1 0

Michael Stefaniuc : d3dx9_36: Move 'static' to the beginning of the declaration.
by Alexandre Julliard 23 Nov '10

23 Nov '10

Module: wine Branch: master Commit: b6a19519250e17d07738935ebb0ccc344d143250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a19519250e17d07738935eb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 23 14:22:15 2010 +0100 d3dx9_36: Move 'static' to the beginning of the declaration. --- dlls/d3dx9_36/texture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index c6e2273..f107bbf 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1075,7 +1075,7 @@ HRESULT WINAPI D3DXFillCubeTexture(LPDIRECT3DCUBETEXTURE9 texture, BYTE *data, *pos; BYTE byte, mask; float comp_value; - const static enum cube_coord coordmap[6][3] = + static const enum cube_coord coordmap[6][3] = { {ONE, YCOORDINV, XCOORDINV}, {ZERO, YCOORDINV, XCOORD},

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2010