November 2010 - Wine-commits

Nikolay Sivov : msxml3: Fix duplicated declarations after document :: get_xml().
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 99e3873f30acc20baed4275f5056ced5a835a47f URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e3873f30acc20baed4275f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 6 22:07:11 2010 +0300 msxml3: Fix duplicated declarations after document ::get_xml(). --- dlls/msxml3/domdoc.c | 50 ++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 2 +- dlls/msxml3/tests/domdoc.c | 46 +++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/saxreader.c | 1 + 5 files changed, 99 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 985d33a..bec6ed4 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -301,6 +301,11 @@ static void free_properties(domdoc_properties* properties) } } +static BOOL xmldoc_has_decl(xmlDocPtr doc) +{ + return doc->children && (xmlStrEqual(doc->children->name, (xmlChar*)"xml") == 1); +} + /* links a "<?xml" node as a first child */ void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node) { @@ -1282,10 +1287,53 @@ static HRESULT WINAPI domdoc_get_xml( BSTR* p) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); + xmlSaveCtxtPtr ctxt; + xmlBufferPtr buf; + int options; + long ret; TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, TRUE, TRUE, p); + if(!p) + return E_INVALIDARG; + + *p = NULL; + + buf = xmlBufferCreate(); + if(!buf) + return E_OUTOFMEMORY; + + options = xmldoc_has_decl(get_doc(This)) ? XML_SAVE_NO_DECL : 0; + options |= XML_SAVE_FORMAT; + ctxt = xmlSaveToBuffer(buf, "UTF-8", options); + if(!ctxt) + { + xmlBufferFree(buf); + return E_OUTOFMEMORY; + } + + ret = xmlSaveDoc(ctxt, get_doc(This)); + /* flushes on close */ + xmlSaveClose(ctxt); + + TRACE("%ld, len=%d\n", ret, xmlBufferLength(buf)); + if(ret != -1 && xmlBufferLength(buf) > 0) + { + BSTR content; + + content = bstr_from_xmlChar(xmlBufferContent(buf)); + content = EnsureCorrectEOL(content); + + *p = content; + } + else + { + *p = SysAllocStringLen(NULL, 0); + } + + xmlBufferFree(buf); + + return *p ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 1fd91b1..c2f80a0 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -204,6 +204,8 @@ 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); +extern BSTR EnsureCorrectEOL(BSTR); + static inline BSTR bstr_from_xmlChar(const xmlChar *str) { BSTR ret = NULL; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 3c6748b..f01c00e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -951,7 +951,7 @@ static HRESULT WINAPI xmlnode_put_dataType( return hr; } -static BSTR EnsureCorrectEOL(BSTR sInput) +BSTR EnsureCorrectEOL(BSTR sInput) { int nNum = 0; BSTR sNew; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e8f0102..aa7ea5b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7544,6 +7544,51 @@ static void test_put_nodeTypedValue(void) free_bstrs(); } +static void test_get_xml(void) +{ + static const char xmlA[] = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>\r\n<a>test</a>\r\n"; + IXMLDOMProcessingInstruction *pi; + IXMLDOMNode *first; + IXMLDOMDocument *doc; + VARIANT_BOOL b; + VARIANT v; + BSTR xml; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + b = VARIANT_TRUE; + hr = IXMLDOMDocument_loadXML( doc, _bstr_("<a>test</a>"), &b ); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok( b == VARIANT_TRUE, "got %d\n", b); + + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), + _bstr_("version=\"1.0\" encoding=\"UTF-16\""), &pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_firstChild(doc, &first); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_UNKNOWN(&v) = (IUnknown*)first; + V_VT(&v) = VT_UNKNOWN; + + hr = IXMLDOMDocument_insertBefore(doc, (IXMLDOMNode*)pi, v, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IXMLDOMProcessingInstruction_Release(pi); + IXMLDOMNode_Release(first); + + hr = IXMLDOMDocument_get_xml(doc, &xml); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ok(memcmp(xml, _bstr_(xmlA), sizeof(xmlA)*sizeof(WCHAR)) == 0, + "got %s, expected %s\n", wine_dbgstr_w(xml), xmlA); + SysFreeString(xml); + + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -7607,6 +7652,7 @@ START_TEST(domdoc) test_events(); test_createProcessingInstruction(); test_put_nodeTypedValue(); + test_get_xml(); CoUninitialize(); } diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 370f4b3..d2bf5c2 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -584,6 +584,7 @@ static void test_saxreader(void) } bstrData = SysAllocString(szSimpleXML); hr = IXMLDOMDocument_loadXML(domDocument, bstrData, &vBool); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)domDocument;

1 0

Nikolay Sivov : msxml3: Use defined error code for no error case.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 804c50fb6c47a39cb774ee6a79fa96f62e1bc558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=804c50fb6c47a39cb774ee6a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 7 22:22:29 2010 +0300 msxml3: Use defined error code for no error case. --- dlls/msxml3/saxreader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 7d8caf4..4f88ffb 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1856,14 +1856,14 @@ static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInt if(hr != S_OK) break; - if(xmlParseChunk(locator->pParserCtxt, data, dataRead, 0)) hr = E_FAIL; + if(xmlParseChunk(locator->pParserCtxt, data, dataRead, 0) != XML_ERR_OK) hr = E_FAIL; else hr = locator->ret; if(hr != S_OK) break; if(dataRead != sizeof(data)) { - if(xmlParseChunk(locator->pParserCtxt, data, 0, 1)) hr = E_FAIL; + if(xmlParseChunk(locator->pParserCtxt, data, 0, 1) != XML_ERR_OK) hr = E_FAIL; else hr = locator->ret; break;

1 0

Nikolay Sivov : msxml3: Trace DOM document reference counts.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: ec1ab037c82b121306ed1f205b9fe21e7e4f8a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1ab037c82b121306ed1f205… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 00:01:50 2010 +0300 msxml3: Trace DOM document reference counts. --- dlls/msxml3/domdoc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index bec6ed4..e7c15e3 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -864,8 +864,9 @@ static ULONG WINAPI domdoc_AddRef( IXMLDOMDocument3 *iface ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - TRACE("%p\n", This ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref ); + return ref; } @@ -873,11 +874,10 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - LONG ref; + LONG ref = InterlockedDecrement( &This->ref ); - TRACE("%p\n", This ); + TRACE("(%p)->(%d)\n", This, ref ); - ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { if(This->bsc) @@ -888,7 +888,7 @@ static ULONG WINAPI domdoc_Release( destroy_xmlnode(&This->node); if(This->schema) IXMLDOMSchemaCollection2_Release(This->schema); if (This->stream) IStream_Release(This->stream); - HeapFree( GetProcessHeap(), 0, This ); + heap_free(This); } return ref;

1 0

Nikolay Sivov : msxml3: Dump set node value.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 84aba12a28511013aaaa520e841a49a55c04e91b URL: http://source.winehq.org/git/wine.git/?a=commit;h=84aba12a28511013aaaa520e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 00:50:38 2010 +0300 msxml3: Dump set node value. --- dlls/msxml3/node.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f01c00e..221abc2 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -142,6 +142,7 @@ HRESULT node_set_content(xmlnode *This, LPCWSTR value) { xmlChar *str; + TRACE("(%p)->(%s)\n", This, debugstr_w(value)); str = xmlChar_from_wchar(value); if(!str) return E_OUTOFMEMORY; @@ -155,6 +156,7 @@ static HRESULT node_set_content_escaped(xmlnode *This, LPCWSTR value) { xmlChar *str, *escaped; + TRACE("(%p)->(%s)\n", This, debugstr_w(value)); str = xmlChar_from_wchar(value); if(!str) return E_OUTOFMEMORY;

1 0

Thomas Mullaly : urlmon: CoInternetCombineIUri uses pluggable protocols.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 5213135e18a27ad254fe27560df8b029327cd998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5213135e18a27ad254fe27560… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Nov 4 20:21:52 2010 -0400 urlmon: CoInternetCombineIUri uses pluggable protocols. --- dlls/urlmon/tests/uri.c | 231 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 21 ++++- 2 files changed, 248 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5213135e18a27ad254fe2…

1 0

Thomas Mullaly : urlmon: Make IUri implementation call functions through IUri_ macros instead of calling directly .
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: c067353c1837c8f58e59e6b99c3974b8858b943e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c067353c1837c8f58e59e6b99… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Nov 6 13:01:54 2010 -0400 urlmon: Make IUri implementation call functions through IUri_ macros instead of calling directly. --- dlls/urlmon/uri.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 5ba9ac9..97268a7 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4731,116 +4731,116 @@ static HRESULT WINAPI Uri_HasProperty(IUri *iface, Uri_PROPERTY uriProp, BOOL *p static HRESULT WINAPI Uri_GetAbsoluteUri(IUri *iface, BSTR *pstrAbsoluteUri) { TRACE("(%p)->(%p)\n", iface, pstrAbsoluteUri); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_ABSOLUTE_URI, pstrAbsoluteUri, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_ABSOLUTE_URI, pstrAbsoluteUri, 0); } static HRESULT WINAPI Uri_GetAuthority(IUri *iface, BSTR *pstrAuthority) { TRACE("(%p)->(%p)\n", iface, pstrAuthority); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_AUTHORITY, pstrAuthority, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_AUTHORITY, pstrAuthority, 0); } static HRESULT WINAPI Uri_GetDisplayUri(IUri *iface, BSTR *pstrDisplayUri) { TRACE("(%p)->(%p)\n", iface, pstrDisplayUri); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_DISPLAY_URI, pstrDisplayUri, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_DISPLAY_URI, pstrDisplayUri, 0); } static HRESULT WINAPI Uri_GetDomain(IUri *iface, BSTR *pstrDomain) { TRACE("(%p)->(%p)\n", iface, pstrDomain); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_DOMAIN, pstrDomain, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_DOMAIN, pstrDomain, 0); } static HRESULT WINAPI Uri_GetExtension(IUri *iface, BSTR *pstrExtension) { TRACE("(%p)->(%p)\n", iface, pstrExtension); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_EXTENSION, pstrExtension, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_EXTENSION, pstrExtension, 0); } static HRESULT WINAPI Uri_GetFragment(IUri *iface, BSTR *pstrFragment) { TRACE("(%p)->(%p)\n", iface, pstrFragment); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_FRAGMENT, pstrFragment, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_FRAGMENT, pstrFragment, 0); } static HRESULT WINAPI Uri_GetHost(IUri *iface, BSTR *pstrHost) { TRACE("(%p)->(%p)\n", iface, pstrHost); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_HOST, pstrHost, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_HOST, pstrHost, 0); } static HRESULT WINAPI Uri_GetPassword(IUri *iface, BSTR *pstrPassword) { TRACE("(%p)->(%p)\n", iface, pstrPassword); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_PASSWORD, pstrPassword, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_PASSWORD, pstrPassword, 0); } static HRESULT WINAPI Uri_GetPath(IUri *iface, BSTR *pstrPath) { TRACE("(%p)->(%p)\n", iface, pstrPath); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_PATH, pstrPath, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_PATH, pstrPath, 0); } static HRESULT WINAPI Uri_GetPathAndQuery(IUri *iface, BSTR *pstrPathAndQuery) { TRACE("(%p)->(%p)\n", iface, pstrPathAndQuery); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_PATH_AND_QUERY, pstrPathAndQuery, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_PATH_AND_QUERY, pstrPathAndQuery, 0); } static HRESULT WINAPI Uri_GetQuery(IUri *iface, BSTR *pstrQuery) { TRACE("(%p)->(%p)\n", iface, pstrQuery); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_QUERY, pstrQuery, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_QUERY, pstrQuery, 0); } static HRESULT WINAPI Uri_GetRawUri(IUri *iface, BSTR *pstrRawUri) { TRACE("(%p)->(%p)\n", iface, pstrRawUri); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_RAW_URI, pstrRawUri, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_RAW_URI, pstrRawUri, 0); } static HRESULT WINAPI Uri_GetSchemeName(IUri *iface, BSTR *pstrSchemeName) { TRACE("(%p)->(%p)\n", iface, pstrSchemeName); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_SCHEME_NAME, pstrSchemeName, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_SCHEME_NAME, pstrSchemeName, 0); } static HRESULT WINAPI Uri_GetUserInfo(IUri *iface, BSTR *pstrUserInfo) { TRACE("(%p)->(%p)\n", iface, pstrUserInfo); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_USER_INFO, pstrUserInfo, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_USER_INFO, pstrUserInfo, 0); } static HRESULT WINAPI Uri_GetUserName(IUri *iface, BSTR *pstrUserName) { TRACE("(%p)->(%p)\n", iface, pstrUserName); - return Uri_GetPropertyBSTR(iface, Uri_PROPERTY_USER_NAME, pstrUserName, 0); + return IUri_GetPropertyBSTR(iface, Uri_PROPERTY_USER_NAME, pstrUserName, 0); } static HRESULT WINAPI Uri_GetHostType(IUri *iface, DWORD *pdwHostType) { TRACE("(%p)->(%p)\n", iface, pdwHostType); - return Uri_GetPropertyDWORD(iface, Uri_PROPERTY_HOST_TYPE, pdwHostType, 0); + return IUri_GetPropertyDWORD(iface, Uri_PROPERTY_HOST_TYPE, pdwHostType, 0); } static HRESULT WINAPI Uri_GetPort(IUri *iface, DWORD *pdwPort) { TRACE("(%p)->(%p)\n", iface, pdwPort); - return Uri_GetPropertyDWORD(iface, Uri_PROPERTY_PORT, pdwPort, 0); + return IUri_GetPropertyDWORD(iface, Uri_PROPERTY_PORT, pdwPort, 0); } static HRESULT WINAPI Uri_GetScheme(IUri *iface, DWORD *pdwScheme) { Uri *This = URI_THIS(iface); TRACE("(%p)->(%p)\n", This, pdwScheme); - return Uri_GetPropertyDWORD(iface, Uri_PROPERTY_SCHEME, pdwScheme, 0); + return IUri_GetPropertyDWORD(iface, Uri_PROPERTY_SCHEME, pdwScheme, 0); } static HRESULT WINAPI Uri_GetZone(IUri *iface, DWORD *pdwZone) { TRACE("(%p)->(%p)\n", iface, pdwZone); - return Uri_GetPropertyDWORD(iface, Uri_PROPERTY_ZONE,pdwZone, 0); + return IUri_GetPropertyDWORD(iface, Uri_PROPERTY_ZONE,pdwZone, 0); } static HRESULT WINAPI Uri_GetProperties(IUri *iface, DWORD *pdwProperties)

1 0

hennr : www-unknown: fixes the link to the rss feed
by Jeremy Newman 09 Nov '10

09 Nov '10

Module: website Branch: master Commit: 4a3421b93a86ffdfccf5a01a20548a9138accdd9 URL: http://source.winehq.org/git/website.git/?a=commit;h=4a3421b93a86ffdfccf5a0… Author: hennr <hennr(a)hennr.name> Date: Wed Nov 3 10:54:16 2010 +0100 www-unknown: fixes the link to the rss feed Title says it all, also have a look at the bug report: http://bugs.winehq.org/show_bug.cgi?id=24865 Greetings Henner >From 8afa792bce0567209b1601b51ae98d1d87cc025c Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Peters <hennr(a)hennr.name> Date: Wed, 3 Nov 2010 10:28:23 +0100 Subject: fixes rss feed link --- include/html.php | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/html.php b/include/html.php index 5d4ef31..2785d5f 100644 --- a/include/html.php +++ b/include/html.php @@ -71,8 +71,7 @@ class html // rss link if ($this->rss_link) - $rss_link = '<link rel="alternate" title="'.$title.' RSS" href="'.$this->rss_link.'" type="application/xml">'; - + $rss_link = '<link rel="alternate" title="'.$title.'RSS" href="'.$this->rss_link.'" type="application/rss+xml">'; // display page based on view mode switch ($this->_view_mode) {

1 0

Eric Pouech : msvcrt: Correctly manage va_list:s in vf(w) printf ny using auto-grow buffer in prinf engine.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 4d86e491739ffa0611ce06b36fae35e0d245f4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d86e491739ffa0611ce06b36… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 7 19:11:43 2010 +0100 msvcrt: Correctly manage va_list:s in vf(w)printf ny using auto-grow buffer in prinf engine. --- dlls/msvcrt/file.c | 75 ++++++++++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 34 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f99a22d..329cdeb 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3333,25 +3333,31 @@ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) */ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list valist) { - char buf[2048], *mem = buf; - int written, resize = sizeof(buf), retval; - /* There are two conventions for vsnprintf failing: - * Return -1 if we truncated, or - * Return the number of bytes that would have been written - * The code below handles both cases - */ - while ((written = MSVCRT_vsnprintf(mem, resize, format, valist)) == -1 || - written > resize) - { - resize = (written == -1 ? resize * 2 : written + 1); - if (mem != buf) - MSVCRT_free (mem); - if (!(mem = MSVCRT_malloc(resize))) - return MSVCRT_EOF; - } - retval = MSVCRT_fwrite(mem, sizeof(*mem), written, file); - if (mem != buf) - MSVCRT_free (mem); + char buf[2048]; + LPWSTR formatW = NULL; + DWORD sz; + pf_output out; + int written, retval; + + out.unicode = FALSE; + out.buf.A = out.grow.A = buf; + out.used = 0; + out.len = sizeof(buf); + + sz = MultiByteToWideChar( CP_ACP, 0, format, -1, NULL, 0 ); + formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz ); + + if ((written = pf_vsnprintf( &out, formatW, NULL, FALSE, valist )) >= 0) + { + retval = MSVCRT_fwrite(out.buf.A, sizeof(*out.buf.A), written, file); + } + else retval = -1; + + HeapFree( GetProcessHeap(), 0, formatW ); + + if (out.buf.A != out.grow.A) + MSVCRT_free (out.buf.A); return retval; } @@ -3363,21 +3369,22 @@ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list va */ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) { - MSVCRT_wchar_t buf[2048], *mem = buf; - int written, resize = sizeof(buf) / sizeof(MSVCRT_wchar_t), retval; - /* See vfprintf comments */ - while ((written = MSVCRT_vsnwprintf(mem, resize, format, valist)) == -1 || - written > resize) - { - resize = (written == -1 ? resize * 2 : written + sizeof(MSVCRT_wchar_t)); - if (mem != buf) - MSVCRT_free (mem); - if (!(mem = MSVCRT_malloc(resize*sizeof(*mem)))) - return MSVCRT_EOF; - } - retval = MSVCRT_fwrite(mem, sizeof(*mem), written, file); - if (mem != buf) - MSVCRT_free (mem); + MSVCRT_wchar_t buf[2048]; + pf_output out; + int written, retval; + + out.unicode = TRUE; + out.buf.W = out.grow.W = buf; + out.used = 0; + out.len = sizeof(buf) / sizeof(buf[0]); + + if ((written = pf_vsnprintf( &out, format, NULL, FALSE, valist )) >= 0) + { + retval = MSVCRT_fwrite(out.buf.W, sizeof(*out.buf.W), written, file); + } + else retval = -1; + if (out.buf.W != out.grow.W) + MSVCRT_free (out.buf.W); return retval; }

1 0

Andrew Nguyen : winex11.drv: Ensure that the WGL context is removed from the context list in wglDeleteContext .
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: c4a8de92c4f49e281ad65b7213dff198869b3e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a8de92c4f49e281ad65b721… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Nov 7 01:14:44 2010 -0500 winex11.drv: Ensure that the WGL context is removed from the context list in wglDeleteContext. --- dlls/gdi32/opengl.c | 9 ++++++++- dlls/opengl32/tests/opengl.c | 11 +++++++++++ dlls/winex11.drv/opengl.c | 1 + 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 9193fc5..8f91ae1 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -135,11 +135,18 @@ BOOL WINAPI wglDeleteContext(HGLRC hglrc) TRACE("hglrc: (%p)\n", hglrc); if(ctx == NULL) + { + SetLastError(ERROR_INVALID_HANDLE); return FALSE; + } /* Retrieve the HDC associated with the context to access the display driver */ dc = get_dc_ptr(ctx->hdc); - if (!dc) return FALSE; + if (!dc) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } if (!dc->funcs->pwglDeleteContext) FIXME(" :stub\n"); else ret = dc->funcs->pwglDeleteContext(hglrc); diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index bf6269a..560efe1 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -609,6 +609,11 @@ static void test_deletecontext(HDC hdc) HANDLE thread_handle; DWORD res, tid; + SetLastError(0xdeadbeef); + res = wglDeleteContext(NULL); + ok(res == FALSE, "wglDeleteContext succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected last error to be ERROR_INVALID_HANDLE, got %u\n", GetLastError()); + if(!hglrc) { skip("wglCreateContext failed!\n"); @@ -639,6 +644,12 @@ static void test_deletecontext(HDC hdc) res = wglDeleteContext(hglrc); ok(res == TRUE, "wglDeleteContext failed\n"); + /* Attempting to delete the same context twice should fail. */ + SetLastError(0xdeadbeef); + res = wglDeleteContext(hglrc); + ok(res == FALSE, "wglDeleteContext succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected last error to be ERROR_INVALID_HANDLE, got %u\n", GetLastError()); + /* WGL makes a context not current when deleting it. This differs from GLX behavior where * deletion takes place when the thread becomes not current. */ hglrc = wglGetCurrentContext(); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 1191332..ce909e6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1807,6 +1807,7 @@ BOOL CDECL X11DRV_wglDeleteContext(HGLRC hglrc) wine_tsx11_unlock(); } + free_context(ctx); return TRUE; }

1 0

Andrew Nguyen : winex11.drv: Set last error to ERROR_BUSY when attempting to delete a cross-thread context in wglDeleteContext .
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 1579ab0e01b7639aab7d991c4864d6c4a9dd312f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1579ab0e01b7639aab7d991c4… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Nov 7 01:15:01 2010 -0500 winex11.drv: Set last error to ERROR_BUSY when attempting to delete a cross-thread context in wglDeleteContext. --- dlls/opengl32/tests/opengl.c | 4 ++++ dlls/winex11.drv/opengl.c | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 560efe1..65df28b 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -590,13 +590,16 @@ struct wgl_thread_param HANDLE test_finished; HGLRC hglrc; BOOL hglrc_deleted; + DWORD last_error; }; static DWORD WINAPI wgl_thread(void *param) { struct wgl_thread_param *p = param; + SetLastError(0xdeadbeef); p->hglrc_deleted = wglDeleteContext(p->hglrc); + p->last_error = GetLastError(); SetEvent(p->test_finished); return 0; @@ -638,6 +641,7 @@ static void test_deletecontext(HDC hdc) { WaitForSingleObject(thread_handle, INFINITE); ok(thread_params.hglrc_deleted == FALSE, "Attempt to delete WGL context from another thread passed but should fail!\n"); + ok(thread_params.last_error == ERROR_BUSY, "Expected last error to be ERROR_BUSY, got %u\n", thread_params.last_error); } CloseHandle(thread_params.test_finished); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ce909e6..8ea7ddb 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1793,6 +1793,7 @@ BOOL CDECL X11DRV_wglDeleteContext(HGLRC hglrc) if (ctx->tid != 0 && ctx->tid != GetCurrentThreadId()) { TRACE("Cannot delete context=%p because it is current in another thread.\n", ctx); + SetLastError(ERROR_BUSY); return FALSE; }

1 0