November 2010 - Wine-Commits

André Hentschel : winebuild: Add subsystem wince.
by Alexandre Julliard Nov. 9, 2010

Nov. 9, 2010

Module: wine Branch: master Commit: d5aa3d1cc960047cdc2e8714deac3e9adbcc79b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5aa3d1cc960047cdc2e8714d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 8 18:52:12 2010 +0100 winebuild: Add subsystem wince. --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 3 ++- tools/winebuild/winebuild.man.in | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index eec682f..b03b6b2 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -207,6 +207,7 @@ struct strarray #define IMAGE_SUBSYSTEM_NATIVE 1 #define IMAGE_SUBSYSTEM_WINDOWS_GUI 2 #define IMAGE_SUBSYSTEM_WINDOWS_CUI 3 +#define IMAGE_SUBSYSTEM_WINDOWS_CE_GUI 9 /* global functions */ diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 0fc351c..7c38e44 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -165,6 +165,7 @@ static void set_subsystem( const char *subsystem, DLLSPEC *spec ) if (!strcmp( str, "native" )) spec->subsystem = IMAGE_SUBSYSTEM_NATIVE; else if (!strcmp( str, "windows" )) spec->subsystem = IMAGE_SUBSYSTEM_WINDOWS_GUI; else if (!strcmp( str, "console" )) spec->subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; + else if (!strcmp( str, "wince" )) spec->subsystem = IMAGE_SUBSYSTEM_WINDOWS_CE_GUI; else if (!strcmp( str, "win16" )) spec->type = SPEC_WIN16; else fatal_error( "Invalid subsystem name '%s'\n", subsystem ); if (major) @@ -258,7 +259,7 @@ static const char usage_str[] = " -o, --output=NAME Set the output file name (default: stdout)\n" " -r, --res=RSRC.RES Load resources from RSRC.RES\n" " --save-temps Do not delete the generated intermediate files\n" -" --subsystem=SUBSYS Set the subsystem (one of native, windows, console)\n" +" --subsystem=SUBSYS Set the subsystem (one of native, windows, console, wince)\n" " -u, --undefined=SYMBOL Add an undefined reference to SYMBOL when linking\n" " -v, --verbose Display the programs invoked\n" " --version Print the version and exit\n" diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 2dcd3c0..479bb1f 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -203,7 +203,10 @@ for a command line executable, for a graphical executable, .br .B native -for a native-mode dll. +for a native-mode dll, +.br +.B wince +for a ce dll. .br The entry point of a command line executable is a normal C \fBmain\fR function. A \fBwmain\fR function can be used instead if you need the

1 0

Thomas Mullaly : urlmon: CoInternetCombineIUri uses pluggable protocols.
by Alexandre Julliard Nov. 9, 2010

Nov. 9, 2010

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

Vincent Povirk : d3dx9_36: Don' t check the image format in D3DXLoadSurfaceFromFileInMemory.
by Alexandre Julliard Nov. 9, 2010

Nov. 9, 2010

Module: wine Branch: master Commit: 31682b3dbe2fb7549d19ce3f08a949cf77b84d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31682b3dbe2fb7549d19ce3f0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 8 12:57:45 2010 -0600 d3dx9_36: Don't check the image format in D3DXLoadSurfaceFromFileInMemory. If the format is not supported, D3DXGetImageInfoFromFileInMemory will fail. --- dlls/d3dx9_36/surface.c | 152 +++++++++++++++++++++------------------------- 1 files changed, 69 insertions(+), 83 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 221e5f7..afd0402 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -314,6 +314,15 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 pDestSurface, D3DXIMAGE_INFO imginfo; HRESULT hr; + IWICImagingFactory *factory; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *bitmapframe; + IWICStream *stream; + + const PixelFormatDesc *formatdesc; + WICRect wicrect; + RECT rect; + TRACE("(%p, %p, %p, %p, %d, %p, %d, %x, %p)\n", pDestSurface, pDestPalette, pDestRect, pSrcData, SrcDataSize, pSrcRect, dwFilter, Colorkey, pSrcInfo); @@ -325,109 +334,86 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 pDestSurface, if (FAILED(hr)) return hr; - switch (imginfo.ImageFileFormat) - { - case D3DXIFF_BMP: - case D3DXIFF_PNG: - case D3DXIFF_JPG: - { - IWICImagingFactory *factory; - IWICBitmapDecoder *decoder; - IWICBitmapFrameDecode *bitmapframe; - IWICStream *stream; + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - const PixelFormatDesc *formatdesc; - WICRect wicrect; - RECT rect; + if (FAILED(CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory))) + goto cleanup_err; - CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + if (FAILED(IWICImagingFactory_CreateStream(factory, &stream))) + { + IWICImagingFactory_Release(factory); + goto cleanup_err; + } - if (FAILED(CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory))) - goto cleanup_err; + IWICStream_InitializeFromMemory(stream, (BYTE*)pSrcData, SrcDataSize); - if (FAILED(IWICImagingFactory_CreateStream(factory, &stream))) - { - IWICImagingFactory_Release(factory); - goto cleanup_err; - } + hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream*)stream, NULL, 0, &decoder); - IWICStream_InitializeFromMemory(stream, (BYTE*)pSrcData, SrcDataSize); + IStream_Release(stream); + IWICImagingFactory_Release(factory); - hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream*)stream, NULL, 0, &decoder); + if (FAILED(hr)) + goto cleanup_err; - IStream_Release(stream); - IWICImagingFactory_Release(factory); + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &bitmapframe); - if (FAILED(hr)) - goto cleanup_err; + if (FAILED(hr)) + goto cleanup_bmp; - hr = IWICBitmapDecoder_GetFrame(decoder, 0, &bitmapframe); + if (pSrcRect) + { + wicrect.X = pSrcRect->left; + wicrect.Y = pSrcRect->top; + wicrect.Width = pSrcRect->right - pSrcRect->left; + wicrect.Height = pSrcRect->bottom - pSrcRect->top; + } + else + { + wicrect.X = 0; + wicrect.Y = 0; + wicrect.Width = imginfo.Width; + wicrect.Height = imginfo.Height; + } - if (FAILED(hr)) - goto cleanup_bmp; + SetRect(&rect, 0, 0, wicrect.Width, wicrect.Height); - if (pSrcRect) - { - wicrect.X = pSrcRect->left; - wicrect.Y = pSrcRect->top; - wicrect.Width = pSrcRect->right - pSrcRect->left; - wicrect.Height = pSrcRect->bottom - pSrcRect->top; - } - else - { - wicrect.X = 0; - wicrect.Y = 0; - wicrect.Width = imginfo.Width; - wicrect.Height = imginfo.Height; - } + formatdesc = get_format_info(imginfo.Format); - SetRect(&rect, 0, 0, wicrect.Width, wicrect.Height); + if (formatdesc->format == D3DFMT_UNKNOWN) + { + FIXME("Unsupported pixel format\n"); + hr = D3DXERR_INVALIDDATA; + } + else + { + BYTE *buffer; + DWORD pitch; - formatdesc = get_format_info(imginfo.Format); + pitch = formatdesc->bytes_per_pixel * wicrect.Width; + buffer = HeapAlloc(GetProcessHeap(), 0, pitch * wicrect.Height); - if (formatdesc->format == D3DFMT_UNKNOWN) - { - FIXME("Unsupported pixel format\n"); - hr = D3DXERR_INVALIDDATA; - } - else - { - BYTE *buffer; - DWORD pitch; - - pitch = formatdesc->bytes_per_pixel * wicrect.Width; - buffer = HeapAlloc(GetProcessHeap(), 0, pitch * wicrect.Height); - - hr = IWICBitmapFrameDecode_CopyPixels(bitmapframe, &wicrect, pitch, - pitch * wicrect.Height, buffer); - - if (SUCCEEDED(hr)) - { - hr = D3DXLoadSurfaceFromMemory(pDestSurface, pDestPalette, pDestRect, - buffer, imginfo.Format, pitch, - NULL, &rect, dwFilter, Colorkey); - } + hr = IWICBitmapFrameDecode_CopyPixels(bitmapframe, &wicrect, pitch, + pitch * wicrect.Height, buffer); - HeapFree(GetProcessHeap(), 0, buffer); - } + if (SUCCEEDED(hr)) + { + hr = D3DXLoadSurfaceFromMemory(pDestSurface, pDestPalette, pDestRect, + buffer, imginfo.Format, pitch, + NULL, &rect, dwFilter, Colorkey); + } + + HeapFree(GetProcessHeap(), 0, buffer); + } cleanup_bmp: - IWICBitmapFrameDecode_Release(bitmapframe); - IWICBitmapDecoder_Release(decoder); + IWICBitmapFrameDecode_Release(bitmapframe); + IWICBitmapDecoder_Release(decoder); cleanup_err: - CoUninitialize(); + CoUninitialize(); - if (FAILED(hr)) - return D3DXERR_INVALIDDATA; - - break; - } - - default: - FIXME("Unsupported image file format\n"); - return E_NOTIMPL; - } + if (FAILED(hr)) + return D3DXERR_INVALIDDATA; if (pSrcInfo) *pSrcInfo = imginfo;

1 0

Nikolay Sivov : msxml3: Fix duplicated declarations after document :: get_xml().
by Alexandre Julliard Nov. 9, 2010

Nov. 9, 2010

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 Nov. 9, 2010

Nov. 9, 2010

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 Nov. 9, 2010

Nov. 9, 2010

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

hennr : www-unknown: fixes the link to the rss feed
by Jeremy Newman Nov. 9, 2010

Nov. 9, 2010

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

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

Nov. 8, 2010

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

Alexandre Goujon : cmd: Add a space at the end of the first echo' ed batch line.
by Alexandre Julliard Nov. 8, 2010

Nov. 8, 2010

Module: wine Branch: master Commit: 4cd2a0e54239973c4205a114d4b347647a2150a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd2a0e54239973c4205a114d… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Fri Nov 5 22:15:45 2010 +0100 cmd: Add a space at the end of the first echo'ed batch line. --- programs/cmd/tests/batch.c | 53 +++++++++++++++++++++++++++-- programs/cmd/tests/test_builtins.cmd | 20 ++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 40 +++++++++++++++++++++- programs/cmd/wcmdmain.c | 3 ++ 4 files changed, 108 insertions(+), 8 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index cc8c020..0f01dbf 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -25,6 +25,36 @@ static char workdir[MAX_PATH]; static DWORD workdir_len; +/* Substitute escaped spaces with real ones */ +static const char* replace_escaped_spaces(const char *data, DWORD size, DWORD *new_size) +{ + static const char escaped_space[] = {'@','s','p','a','c','e','@','\0'}; + const char *a, *b; + char *new_data; + DWORD len_space = sizeof(escaped_space) -1; + + a = b = data; + *new_size = 0; + + new_data = HeapAlloc(GetProcessHeap(), 0, size*sizeof(char)); + ok(new_data != NULL, "HeapAlloc failed\n"); + if(!new_data) + return NULL; + + while( (b = strstr(a, escaped_space)) ) + { + strncpy(new_data + *new_size, a, b-a + 1); + *new_size += b-a + 1; + new_data[*new_size - 1] = ' '; + a = b + len_space; + } + + strncpy(new_data + *new_size, a, strlen(a) + 1); + *new_size += strlen(a); + + return new_data; +} + static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) { SECURITY_ATTRIBUTES sa = {sizeof(sa), 0, TRUE}; @@ -113,6 +143,7 @@ static const char *compare_line(const char *out_line, const char *out_end, const static const char pwd_cmd[] = {'@','p','w','d','@'}; static const char todo_space_cmd[] = {'@','t','o','d','o','_','s','p','a','c','e','@'}; + static const char space_cmd[] = {'@','s','p','a','c','e','@'}; static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; while(exp_ptr < exp_end) { @@ -135,6 +166,13 @@ static const char *compare_line(const char *out_line, const char *out_end, const if(out_ptr < out_end && *out_ptr == ' ') out_ptr++; continue; + }else if(exp_ptr+sizeof(space_cmd) <= exp_end + && !memcmp(exp_ptr, space_cmd, sizeof(space_cmd))) { + exp_ptr += sizeof(space_cmd); + ok(*out_ptr == ' ', "expected space\n"); + if(out_ptr < out_end && *out_ptr == ' ') + out_ptr++; + continue; }else if(exp_ptr+sizeof(or_broken_cmd) <= exp_end && !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) { exp_ptr = exp_end; @@ -199,11 +237,15 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, DWORD exp_size) { - const char *out_data; - DWORD out_size; + const char *out_data, *actual_cmd_data; + DWORD out_size, actual_cmd_size; - if(!run_cmd(cmd_data, cmd_size)) - return; + actual_cmd_data = replace_escaped_spaces(cmd_data, cmd_size, &actual_cmd_size); + if(!actual_cmd_size || !actual_cmd_data) + goto cleanup; + + if(!run_cmd(actual_cmd_data, actual_cmd_size)) + goto cleanup; out_size = map_file("test.out", &out_data); if(out_size) { @@ -212,6 +254,9 @@ static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, } DeleteFileA("test.out"); DeleteFileA("test.err"); + +cleanup: + HeapFree(GetProcessHeap(), 0, (LPVOID)actual_cmd_data); } static void run_from_file(char *file_name) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d9f5cf7..375b7a1 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1,7 +1,21 @@ echo Tests for cmd's builtin commands -(a)echo off -echo ------------ Testing 'echo' -------------- +(a)echo on +echo ------------ Testing 'echo' [ON] -------------- +echo word +echo 'singlequotedword' +echo "doublequotedword" +(a)echo at-echoed-word +echo "/?" +echo. +echo . +echo.word +echo .word +echo word(a)space@ +echo word(a)space@@space@ + +(a)echo off +echo ------------ Testing 'echo' [OFF] -------------- echo word echo 'singlequotedword' echo "doublequotedword" @@ -11,6 +25,8 @@ echo. echo . echo.word echo .word +echo word(a)space@ +echo word(a)space@@space@ echo ------------ Testing 'set' -------------- echo set "FOO=bar" should not include the quotes in the variable value diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8942cb3..dee2c5b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1,7 +1,41 @@ -(a)pwd@>echo Tests for cmd's builtin commands(a)todo_space@ +(a)pwd@>echo Tests for cmd's builtin commands(a)space@ Tests for cmd's builtin commands ------------- Testing 'echo' -------------- + +(a)pwd@>echo ------------ Testing 'echo' [ON] --------------(a)space@ +------------ Testing 'echo' [ON] -------------- + +(a)pwd@>echo word(a)space@ +word + +(a)pwd@>echo 'singlequotedword'@space@ +'singlequotedword' + +(a)pwd@>echo "doublequotedword"@space@ +"doublequotedword" +at-echoed-word + +(a)pwd@>echo "/?"@space@ +"/?" + +(a)pwd@>echo. + + +(a)pwd@>echo .(a)space@ +. + +(a)pwd@>echo.word +word + +(a)pwd@>echo .word(a)space@ +.word + +(a)pwd@>echo word(a)space@@space@ +word(a)space@ + +(a)pwd@>echo word(a)space@@space@@space@ +word(a)space@@space@ +------------ Testing 'echo' [OFF] -------------- word 'singlequotedword' "doublequotedword" @@ -11,6 +45,8 @@ at-echoed-word . word .word +word(a)space@ +word(a)space@@space@ ------------ Testing 'set' -------------- set "FOO=bar" should not include the quotes in the variable value bar diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b50512e..85f78b8 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1779,8 +1779,11 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); /* Show prompt before batch line IF echo is on and in batch program */ if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { + const WCHAR spc[]={' ','\0'}; WCMD_show_prompt(); WCMD_output_asis(extraSpace); + /* I don't know why Windows puts a space here but it does */ + WCMD_output_asis(spc); WCMD_output_asis(newline); }

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 Nov. 8, 2010

Nov. 8, 2010

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