wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Francois Gouget : ws2_32: Add a trailing '\n' to a FIXME() call.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 76039b37289215120ea3a1c986b2f3c72b7e253e URL: http://source.winehq.org/git/wine.git/?a=commit;h=76039b37289215120ea3a1c98… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 13:03:36 2010 +0100 ws2_32: Add a trailing '\n' to a FIXME() call. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c51ac35..cb58015 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1565,7 +1565,7 @@ static NTSTATUS WS2_async_accept( void *arg, IO_STATUS_BLOCK *iosb, NTSTATUS sta if (status == STATUS_INVALID_HANDLE) { - FIXME("AcceptEx accepting socket closed but request was not cancelled"); + FIXME("AcceptEx accepting socket closed but request was not cancelled\n"); status = STATUS_CANCELLED; } }

1 0

Francois Gouget : xcopy: Remove a space before a '\n' in the Korean translation.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 6159f516fcbacaa3bcf8757b40201afdbcbe2ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6159f516fcbacaa3bcf8757b4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 12:10:21 2010 +0100 xcopy: Remove a space before a '\n' in the Korean translation. --- programs/xcopy/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/Ko.rc b/programs/xcopy/Ko.rc index bb46a36..8a68ebe 100644 --- a/programs/xcopy/Ko.rc +++ b/programs/xcopy/Ko.rc @@ -56,7 +56,7 @@ XCOPY 원본 [대상] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \n\ Where:\n\ \n\ -[/I] 만약 대상이 존재하지 않는 경우 디렉토리로 가정하고 두개나 더 많은 파일을 \n\ +[/I] 만약 대상이 존재하지 않는 경우 디렉토리로 가정하고 두개나 더 많은 파일을\n\ \t복사\n\ [/S] 디렉토리하고 하위 디렉토리 복사\n\ [/E] 빈 디렉토리를 포함해서 디렉토리와 하위 디렉토리 복사\n\

1 0

Francois Gouget : msxml3/tests: Small spelling fix in a nonexistent resource.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: e71dac1ead9c9ba121356c9bf98d6cd34c3201ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71dac1ead9c9ba121356c9bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 11:50:11 2010 +0100 msxml3/tests: Small spelling fix in a nonexistent resource. --- dlls/msxml3/tests/domdoc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0965989..e009829 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6550,8 +6550,8 @@ static void test_XSLPattern(void) if (len) expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); - /* set prefix foo to some non-existant namespace */ - ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_("xmlns:foo='urn:non-existant-foo'"))); + /* set prefix foo to some nonexistent namespace */ + ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_("xmlns:foo='urn:nonexistent-foo'"))); /* the registered prefix takes precedence */ ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//foo:c"), &list));

1 0

Francois Gouget : msxml3/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 3e331731c940c97bbd515da1f47f3156707750cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e331731c940c97bbd515da1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 11:44:19 2010 +0100 msxml3/tests: Add a trailing '\n' to ok() calls. --- dlls/msxml3/tests/schema.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 2ca657a..b457f0e 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -383,15 +383,15 @@ static void test_collection_refs(void) length = -1; ole_check(IXMLDOMSchemaCollection_get_length(cache1, &length)); - ok(length == 1, "expected length 1, got %i", length); + ok(length == 1, "expected length 1, got %i\n", length); length = -1; ole_check(IXMLDOMSchemaCollection_get_length(cache2, &length)); - ok(length == 2, "expected length 2, got %i", length); + ok(length == 2, "expected length 2, got %i\n", length); length = -1; ole_check(IXMLDOMSchemaCollection_get_length(cache3, &length)); - ok(length == 3, "expected length 3, got %i", length); + ok(length == 3, "expected length 3, got %i\n", length); /* merging collections does not affect the ref count */

1 0

Francois Gouget : msxml3: Add a trailing '\n' to a FIXME() calls.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: a034694ccd3a0e66aa0e92579ea2372235eed570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a034694ccd3a0e66aa0e92579… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 11:43:39 2010 +0100 msxml3: Add a trailing '\n' to a FIXME() calls. --- dlls/msxml3/xslpattern.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/xslpattern.l b/dlls/msxml3/xslpattern.l index a4b8aa9..ae06c7a 100644 --- a/dlls/msxml3/xslpattern.l +++ b/dlls/msxml3/xslpattern.l @@ -147,7 +147,7 @@ ANY (.) "!" { SYM('!'); } {NCName} { STR(TOK_NCName); } {Number} { STR(TOK_Number); } -{ANY} { FIXME("Unexpected character '%s'.",yytext); } +{ANY} { FIXME("Unexpected character '%s'.\n",yytext); } %%

1 0

Francois Gouget : wininet/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 9ca197261d1745d1c75c94b767b30c89d0a073e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca197261d1745d1c75c94b76… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 11:42:48 2010 +0100 wininet/tests: Add a trailing '\n' to ok() calls. --- dlls/wininet/tests/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 0a2079d..2ffecbc 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -343,7 +343,7 @@ static void test_crack_url(const crack_url_test_t *test) ok(!strcmp(scheme, test->exp_scheme), "[%s] Got wrong scheme, expected: %s, got: %s\n", test->url, test->exp_scheme, scheme); - ok(url.nScheme == test->scheme, "[%s] Got wrong nScheme, expected: %d, got: %d", + ok(url.nScheme == test->scheme, "[%s] Got wrong nScheme, expected: %d, got: %d\n", test->url, test->scheme, url.nScheme); ok(url.dwHostNameLength == strlen(test->exp_hostname), "[%s] Got wrong hostname length: %d\n", @@ -398,7 +398,7 @@ static void test_crack_url(const crack_url_test_t *test) ok(!lstrcmpW((WCHAR*)scheme, w_str_of(test->exp_scheme)), "[%s] Got wrong scheme, expected: %s, got: %s\n", test->url, test->exp_scheme, wine_dbgstr_w((WCHAR*)scheme)); - ok(urlw.nScheme == test->scheme, "[%s] Got wrong nScheme, expected: %d, got: %d", + ok(urlw.nScheme == test->scheme, "[%s] Got wrong nScheme, expected: %d, got: %d\n", test->url, test->scheme, urlw.nScheme); ok(urlw.dwHostNameLength == strlen(test->exp_hostname), "[%s] Got wrong hostname length: %d\n",

1 0

Francois Gouget : ddraw/tests: Remove a space before a '\n'.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 6fb3a0a032090b6b7e17d4d5bab91c83e2cf774f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb3a0a032090b6b7e17d4d5b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 11:42:26 2010 +0100 ddraw/tests: Remove a space before a '\n'. --- dlls/ddraw/tests/ddrawmodes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 3aecb63..b0b84d8 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -578,7 +578,7 @@ static void testcooperativelevels_normal(void) else { todo_wine ok(rc == DD_OK, "IDirectDraw_CreateSurface returned %08x\n", rc); - todo_wine ok(surface!=NULL, "Returned NULL surface pointer \n"); + todo_wine ok(surface!=NULL, "Returned NULL surface pointer\n"); } if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface);

1 0

Adam Martinson : msxml3: Add error code defines.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 5c7bcdadcffee1f3697e2382085ac081c9b9ee2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7bcdadcffee1f3697e23820… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 1 14:12:04 2010 -0500 msxml3: Add error code defines. --- dlls/msxml3/msxml_private.h | 15 +++++++++++++++ dlls/msxml3/tests/domdoc.c | 4 ++-- include/msxml2.idl | 7 +++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 9dd02cb..8af73a1 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -336,4 +336,19 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } +/* Error Codes - not defined anywhere in the public headers */ +#define E_XML_ELEMENT_UNDECLARED 0xC00CE00D +#define E_XML_ELEMENT_ID_NOT_FOUND 0xC00CE00E +/* ... */ +#define E_XML_EMPTY_NOT_ALLOWED 0xC00CE011 +#define E_XML_ELEMENT_NOT_COMPLETE 0xC00CE012 +#define E_XML_ROOT_NAME_MISMATCH 0xC00CE013 +#define E_XML_INVALID_CONTENT 0xC00CE014 +#define E_XML_ATTRIBUTE_NOT_DEFINED 0xC00CE015 +#define E_XML_ATTRIBUTE_FIXED 0xC00CE016 +#define E_XML_ATTRIBUTE_VALUE 0xC00CE017 +#define E_XML_ILLEGAL_TEXT 0xC00CE018 +/* ... */ +#define E_XML_REQUIRED_ATTRIBUTE_MISSING 0xC00CE020 + #endif /* __MSXML_PRIVATE__ */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index fb5c4ac..0965989 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3486,7 +3486,7 @@ static void test_IXMLDOMDocument2(void) res = 0; ole_check(IXMLDOMParseError_get_errorCode(err, &res)); /* XML_E_NOTWF */ - ok(res == 0xC00CE223, "got %08x\n", res); + ok(res == E_XML_NOTWF, "got %08x\n", res); IXMLDOMParseError_Release(err); } @@ -3507,7 +3507,7 @@ static void test_IXMLDOMDocument2(void) res = 0; ole_check(IXMLDOMParseError_get_errorCode(err, &res)); /* XML_E_NODTD */ - todo_wine ok(res == 0xC00CE224, "got %08x\n", res); + todo_wine ok(res == E_XML_NODTD, "got %08x\n", res); IXMLDOMParseError_Release(err); } diff --git a/include/msxml2.idl b/include/msxml2.idl index da520d2..9a5fe1d 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -2815,5 +2815,12 @@ coclass SAXAttributes40 interface ISAXAttributes; }; +/* + * Error Codes + */ +cpp_quote("#define E_XML_NOTWF 0xC00CE223") +cpp_quote("#define E_XML_NODTD 0xC00CE224") +cpp_quote("#define E_XML_INVALID 0xC00CE225") +cpp_quote("#define E_XML_BUFFERTOOSMALL 0xC00CE226") } /* Library MSXML */

1 0

Adam Martinson : msxml3: Add a function to validate a tree against a schema cache.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: bf11a93b05142e005f3e9e0909823c0d80cdcea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf11a93b05142e005f3e9e090… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 1 14:11:46 2010 -0500 msxml3: Add a function to validate a tree against a schema cache. --- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/schema.c | 79 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 3d7903c..9dd02cb 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -197,6 +197,7 @@ extern HRESULT node_get_prefix(xmlnode*,BSTR*); extern HRESULT node_get_base_name(xmlnode*,BSTR*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); +extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree); static inline BSTR bstr_from_xmlChar(const xmlChar *str) { diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 0120333..1ff4566 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -611,6 +611,85 @@ static const struct IXMLDOMSchemaCollection2Vtbl schema_cache_vtbl = schema_cache_getDeclaration }; +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); + cache_entry* entry; + xmlChar const* ns = NULL; + TRACE("(%p, %p)\n", This, tree); + + if (!tree) + return E_POINTER; + + if ((xmlNodePtr)tree->doc == tree) + { + xmlNodePtr root = xmlDocGetRootElement(tree->doc); + if (root && root->ns) + ns = root->ns->href; + } + else if (tree->ns) + { + ns = tree->ns->href; + } + + entry = xmlHashLookup(This->cache, ns); + /* TODO: if the ns is not in the cache, and it's a URL, + * do we try to load from that? */ + if (entry) + { + if (entry->type == SCHEMA_TYPE_XDR) + { + FIXME("partial stub: XDR schema support not implemented\n"); + return S_OK; + } + else if (entry->type == SCHEMA_TYPE_XSD) + { + xmlSchemaValidCtxtPtr svctx; + int err; + /* TODO: if validateOnLoad property is false, + * we probably need to validate the schema here. */ + svctx = xmlSchemaNewValidCtxt(entry->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 E_FAIL; +} + HRESULT SchemaCache_create(IUnknown* pUnkOuter, void** ppObj) { schema_cache* This = heap_alloc(sizeof(schema_cache));

1 0

Adam Martinson : configure: Add a check/ define for xmlSchemaSetValidStructuredErrors().
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: be4d0e9d0785d7c94882b086ba3e067a06a29f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be4d0e9d0785d7c94882b086b… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 1 14:11:16 2010 -0500 configure: Add a check/define for xmlSchemaSetValidStructuredErrors(). --- configure | 42 ++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ include/config.h.in | 3 +++ 3 files changed, 47 insertions(+), 0 deletions(-) diff --git a/configure b/configure index fe73100..20fff98 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 xmlSchemaSetValidStructuredErrors in -lxml2" >&5 +$as_echo_n "checking for xmlSchemaSetValidStructuredErrors in -lxml2... " >&6; } +if test "${ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors+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 xmlSchemaSetValidStructuredErrors (); +int +main () +{ +return xmlSchemaSetValidStructuredErrors (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors=yes +else + ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors=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_xmlSchemaSetValidStructuredErrors" >&5 +$as_echo "$ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors" >&6; } +if test "x$ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors" = x""yes; then : + +$as_echo "#define HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS 1" >>confdefs.h + +fi + fi diff --git a/configure.ac b/configure.ac index eb3285a..f38aca4 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, xmlSchemaSetValidStructuredErrors, + [AC_DEFINE(HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS,1,[Define if libxml2 has the xmlSchemaSetValidStructuredErrors function])],,$ac_xml_libs) ]) CPPFLAGS="$ac_save_CPPFLAGS" fi diff --git a/include/config.h.in b/include/config.h.in index 0bb6be2..1c82e75 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1111,6 +1111,9 @@ /* Define if libxml2 has the xmlReadMemory function */ #undef HAVE_XMLREADMEMORY +/* Define if libxml2 has the xmlSchemaSetValidStructuredErrors function */ +#undef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS + /* Define if Xrender has the XRenderSetPictureTransform function */ #undef HAVE_XRENDERSETPICTURETRANSFORM

1 0

← Newer
1
...
74
75
76
77
78
79
80
...
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