October 2011 - Wine-Commits

Michael Mc Donnell : d3dx9/tests: Implemented CloneMesh test.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: da6363e377f8a727bdd7bdb42116c533a3a20bd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da6363e377f8a727bdd7bdb42… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Aug 17 12:51:03 2011 +0200 d3dx9/tests: Implemented CloneMesh test. --- dlls/d3dx9_36/tests/mesh.c | 1682 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 1678 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da6363e377f8a727bdd7b…

1 0

Matteo Bruni : d3d9: Limit VS/PS reported version.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 6e6a917617ab79a309e123a0207995b574bc59ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6a917617ab79a309e123a02… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:43 2011 +0200 d3d9: Limit VS/PS reported version. --- dlls/d3d9/directx.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 148b9b7..4099a99 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -381,6 +381,11 @@ void filter_caps(D3DCAPS9* pCaps) pCaps->MaxVertexShaderConst = min(D3D9_MAX_VERTEX_SHADER_CONSTANTF, pCaps->MaxVertexShaderConst); pCaps->NumSimultaneousRTs = min(D3D9_MAX_SIMULTANEOUS_RENDERTARGETS, pCaps->NumSimultaneousRTs); + + if (pCaps->PixelShaderVersion > D3DPS_VERSION(3,0)) + pCaps->PixelShaderVersion = D3DPS_VERSION(3,0); + if (pCaps->VertexShaderVersion > D3DVS_VERSION(3,0)) + pCaps->VertexShaderVersion = D3DVS_VERSION(3,0); } static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(IDirect3D9Ex *iface, UINT Adapter,

1 0

Matteo Bruni : wined3d: Return only the shader major version.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 7254f5e661598a148dd61d008338fd69c49a7ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7254f5e661598a148dd61d008… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:44 2011 +0200 wined3d: Return only the shader major version. --- dlls/d3d8/directx.c | 10 ++++++---- dlls/d3d9/directx.c | 18 +++++++++++++++--- dlls/wined3d/arb_program_shader.c | 12 ++++++------ dlls/wined3d/directx.c | 14 +++++++------- dlls/wined3d/glsl_shader.c | 16 ++++++++-------- 5 files changed, 42 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7254f5e661598a148dd61…

1 0

Alexandre Julliard : gdi32/tests: Add tests for path open/closed states.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: f44c1e653317ffaed2c752d1345df56153360eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44c1e653317ffaed2c752d13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 15:06:05 2011 +0200 gdi32/tests: Add tests for path open/closed states. --- dlls/gdi32/path.c | 4 +- dlls/gdi32/tests/path.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 235 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 277d167..2fc998e 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2240,7 +2240,7 @@ BOOL nulldrv_FlattenPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); - if (dc->path.state == PATH_Closed) + if (dc->path.state != PATH_Closed) { SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; @@ -2252,7 +2252,7 @@ BOOL nulldrv_WidenPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); - if (dc->path.state == PATH_Open) + if (dc->path.state != PATH_Closed) { SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 18dffa3..8399b19 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -33,6 +33,238 @@ #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +static void test_path_state(void) +{ + BYTE buffer[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bi = (BITMAPINFO *)buffer; + HDC hdc; + HBITMAP orig, dib; + void *bits; + BOOL ret; + + hdc = CreateCompatibleDC( 0 ); + memset( buffer, 0, sizeof(buffer) ); + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biHeight = 256; + bi->bmiHeader.biWidth = 256; + bi->bmiHeader.biBitCount = 32; + bi->bmiHeader.biPlanes = 1; + bi->bmiHeader.biCompression = BI_RGB; + dib = CreateDIBSection( 0, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0 ); + orig = SelectObject( hdc, dib ); + + BeginPath( hdc ); + LineTo( hdc, 100, 100 ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + + /* selecting another bitmap doesn't affect the path */ + SelectObject( hdc, orig ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + + SelectObject( hdc, dib ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + + ret = EndPath( hdc ); + ok( ret, "EndPath failed error %u\n", GetLastError() ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed error %u\n", GetLastError() ); + + SelectObject( hdc, orig ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed error %u\n", GetLastError() ); + + BeginPath( hdc ); + LineTo( hdc, 100, 100 ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + SaveDC( hdc ); + SelectObject( hdc, dib ); + ret = EndPath( hdc ); + ok( ret, "EndPath failed error %u\n", GetLastError() ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed error %u\n", GetLastError() ); + + /* path should be open again after RestoreDC */ + RestoreDC( hdc, -1 ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + ret = EndPath( hdc ); + ok( ret, "EndPath failed error %u\n", GetLastError() ); + + SaveDC( hdc ); + BeginPath( hdc ); + RestoreDC( hdc, -1 ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed error %u\n", GetLastError() ); + + /* test all functions with no path at all */ + AbortPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = FlattenPath( hdc ); + ok( !ret, "FlattenPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = StrokePath( hdc ); + ok( !ret, "StrokePath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = FillPath( hdc ); + ok( !ret, "FillPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = StrokeAndFillPath( hdc ); + ok( !ret, "StrokeAndFillPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SelectClipPath( hdc, RGN_OR ); + ok( !ret, "SelectClipPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = EndPath( hdc ); + ok( !ret, "SelectClipPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = CloseFigure( hdc ); + ok( !ret, "CloseFigure succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + /* test all functions with an open path */ + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = WidenPath( hdc ); + ok( !ret, "WidenPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = FlattenPath( hdc ); + ok( !ret, "FlattenPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = StrokePath( hdc ); + ok( !ret, "StrokePath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = FillPath( hdc ); + ok( !ret, "FillPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = StrokeAndFillPath( hdc ); + ok( !ret, "StrokeAndFillPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + Rectangle( hdc, 1, 1, 10, 10 ); /* region needs some contents */ + SetLastError( 0xdeadbeef ); + ret = SelectClipPath( hdc, RGN_OR ); + ok( !ret, "SelectClipPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + ret = CloseFigure( hdc ); + ok( ret, "CloseFigure failed\n" ); + + /* test all functions with a closed path */ + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = WidenPath( hdc ); + ok( ret, "WidenPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = FlattenPath( hdc ); + ok( ret, "FlattenPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = StrokePath( hdc ); + ok( ret, "StrokePath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = FillPath( hdc ); + ok( ret, "FillPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + ret = StrokeAndFillPath( hdc ); + ok( ret, "StrokeAndFillPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + Rectangle( hdc, 1, 1, 10, 10 ); /* region needs some contents */ + EndPath( hdc ); + ret = SelectClipPath( hdc, RGN_OR ); + ok( ret, "SelectClipPath failed\n" ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = CloseFigure( hdc ); + ok( !ret, "CloseFigure succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); + EndPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = EndPath( hdc ); + ok( !ret, "SelectClipPath succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + DeleteDC( hdc ); + DeleteObject( dib ); +} + static void test_widenpath(void) { HDC hdc = GetDC(0); @@ -504,6 +736,7 @@ static void test_linedda(void) START_TEST(path) { + test_path_state(); test_widenpath(); test_arcto(); test_anglearc();

1 0

Piotr Caban : msxml3: Fix attributes handling when msxml6 is used.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 685be40c332b88b5faaa1d3008a0b0c9dafe39d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=685be40c332b88b5faaa1d300… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 26 13:25:27 2011 +0200 msxml3: Fix attributes handling when msxml6 is used. --- dlls/msxml3/saxreader.c | 93 +++++++++++++++++++++++++++++++---------------- 1 files changed, 62 insertions(+), 31 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 344393a..29ab60e 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1088,13 +1088,16 @@ static const struct ISAXAttributesVtbl isaxattributes_vtbl = isaxattributes_getValueFromQName }; -static HRESULT SAXAttributes_create(saxattributes **attr, +static HRESULT SAXAttributes_create(saxattributes **attr, MSXML_VERSION version, int nb_namespaces, const xmlChar **xmlNamespaces, int nb_attributes, const xmlChar **xmlAttributes) { saxattributes *attributes; int index; static const xmlChar xmlns[] = "xmlns"; + static const WCHAR xmlnsW[] = { 'x','m','l','n','s',0 }; + static const WCHAR w3xmlns[] = { 'h','t','t','p',':','/','/', 'w','w','w','.','w','3','.', + 'o','r','g','/','2','0','0','0','/','x','m','l','n','s','/',0 }; attributes = heap_alloc(sizeof(*attributes)); if(!attributes) @@ -1124,23 +1127,26 @@ static HRESULT SAXAttributes_create(saxattributes **attr, for(index=0; index<nb_namespaces; index++) { - attributes->szLocalname[index] = SysAllocStringLen(NULL, 0); - attributes->szURI[index] = SysAllocStringLen(NULL, 0); - attributes->szValue[index] = bstr_from_xmlChar(xmlNamespaces[2*index+1]); - attributes->szQName[index] = QName_from_xmlChar(xmlns, xmlNamespaces[2*index]); + attributes->szLocalname[nb_attributes+index] = SysAllocStringLen(NULL, 0); + if(version >= MSXML6) + attributes->szURI[nb_attributes+index] = SysAllocString(w3xmlns); + else + attributes->szURI[nb_attributes+index] = SysAllocStringLen(NULL, 0); + attributes->szValue[nb_attributes+index] = bstr_from_xmlChar(xmlNamespaces[2*index+1]); + if(!xmlNamespaces[2*index]) + attributes->szQName[nb_attributes+index] = SysAllocString(xmlnsW); + else + attributes->szQName[nb_attributes+index] = QName_from_xmlChar(xmlns, xmlNamespaces[2*index]); } for(index=0; index<nb_attributes; index++) { - attributes->szLocalname[nb_namespaces+index] = - bstr_from_xmlChar(xmlAttributes[index*5]); - attributes->szURI[nb_namespaces+index] = - bstr_from_xmlChar(xmlAttributes[index*5+2]); - attributes->szValue[nb_namespaces+index] = - bstr_from_xmlCharN(xmlAttributes[index*5+3], - xmlAttributes[index*5+4]-xmlAttributes[index*5+3]); - attributes->szQName[nb_namespaces+index] = - QName_from_xmlChar(xmlAttributes[index*5+1], xmlAttributes[index*5]); + attributes->szLocalname[index] = bstr_from_xmlChar(xmlAttributes[index*5]); + attributes->szURI[index] = bstr_from_xmlChar(xmlAttributes[index*5+2]); + attributes->szValue[index] = bstr_from_xmlCharN(xmlAttributes[index*5+3], + xmlAttributes[index*5+4]-xmlAttributes[index*5+3]); + attributes->szQName[index] = QName_from_xmlChar(xmlAttributes[index*5+1], + xmlAttributes[index*5]); } *attr = attributes; @@ -1259,7 +1265,8 @@ static void libxmlStartElementNS( LocalName = pooled_bstr_from_xmlChar(&This->saxreader->pool, localname); QName = pooled_QName_from_xmlChar(&This->saxreader->pool, prefix, localname); - hr = SAXAttributes_create(&attr, nb_namespaces, namespaces, nb_attributes, attributes); + hr = SAXAttributes_create(&attr, This->saxreader->version, + nb_namespaces, namespaces, nb_attributes, attributes); if(hr == S_OK) { if(This->vbInterface) @@ -1326,25 +1333,49 @@ static void libxmlEndElementNS( return; } - for(index=This->pParserCtxt->nsNr-2; - index>=This->pParserCtxt->nsNr-nsNr*2; index-=2) + if(This->saxreader->version >= MSXML6) { - Prefix = pooled_bstr_from_xmlChar(&This->saxreader->pool, This->pParserCtxt->nsTab[index]); + for(index=This->pParserCtxt->nsNr-nsNr*2; + index<This->pParserCtxt->nsNr; index+=2) + { + Prefix = pooled_bstr_from_xmlChar(&This->saxreader->pool, This->pParserCtxt->nsTab[index]); - if(This->vbInterface) - hr = IVBSAXContentHandler_endPrefixMapping( - This->saxreader->vbcontentHandler, &Prefix); - else - hr = ISAXContentHandler_endPrefixMapping( - This->saxreader->contentHandler, - Prefix, SysStringLen(Prefix)); + if(This->vbInterface) + hr = IVBSAXContentHandler_endPrefixMapping( + This->saxreader->vbcontentHandler, &Prefix); + else + hr = ISAXContentHandler_endPrefixMapping( + This->saxreader->contentHandler, + Prefix, SysStringLen(Prefix)); - if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) - { - format_error_message_from_id(This, hr); - return; + if(FAILED(hr)) + { + format_error_message_from_id(This, hr); + return; + } } + } + else + { + for(index=This->pParserCtxt->nsNr-2; + index>=This->pParserCtxt->nsNr-nsNr*2; index-=2) + { + Prefix = pooled_bstr_from_xmlChar(&This->saxreader->pool, This->pParserCtxt->nsTab[index]); + if(This->vbInterface) + hr = IVBSAXContentHandler_endPrefixMapping( + This->saxreader->vbcontentHandler, &Prefix); + else + hr = ISAXContentHandler_endPrefixMapping( + This->saxreader->contentHandler, + Prefix, SysStringLen(Prefix)); + + if(hr != S_OK) + { + format_error_message_from_id(This, hr); + return; + } + } } }

1 0

Piotr Caban : msxml3/tests: Added element attributes tests when SAXXMLReader is used.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: df5d3e348a8036f3f8b536c9ccf4fb4ca964fb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5d3e348a8036f3f8b536c9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 26 13:25:52 2011 +0200 msxml3/tests: Added element attributes tests when SAXXMLReader is used. --- dlls/msxml3/tests/saxreader.c | 130 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 129 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ca9c4aa..973381b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -121,6 +121,11 @@ static const CHAR szTestXML[] = " <Name>Captain Ahab</Name>\n" "</BankAccount>\n"; +static const CHAR szTestAttributes[] = +"<?xml version=\"1.0\" ?>\n" +"<document xmlns:test=\"prefix_test\" xmlns=\"prefix\" test:arg1=\"arg1\" arg2=\"arg2\">\n" +"</document>\n"; + typedef struct _contenthandlercheck { CH id; int line; @@ -202,6 +207,34 @@ static content_handler_test contentHandlerTestCallbackResult6[] = { { CH_ENDTEST } }; +static content_handler_test contentHandlerTestAttributes[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, 1, 0 }, + { CH_STARTDOCUMENT, 0, 0, 1, 22 }, + { CH_STARTPREFIXMAPPING, 2, 80, 2, 79, "test", "prefix_test" }, + { CH_STARTPREFIXMAPPING, 2, 80, 2, 79, "", "prefix" }, + { CH_STARTELEMENT, 2, 80, 2, 79, "prefix", "document", "document" }, + { CH_CHARACTERS, 2, 80, 3, 1, "\n" }, + { CH_ENDELEMENT, 3, 3, 3, 11, "prefix", "document", "document" }, + { CH_ENDPREFIXMAPPING, 3, 3, 3, 11, "" }, + { CH_ENDPREFIXMAPPING, 3, 3, 3, 11, "test" }, + { CH_ENDDOCUMENT, 0, 0, 4, 0 }, + { CH_ENDTEST } +}; + +static content_handler_test contentHandlerTestAttributes6[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, 1, 0 }, + { CH_STARTDOCUMENT, 0, 0, 1, 22 }, + { CH_STARTPREFIXMAPPING, 2, 80, 2, 79, "test", "prefix_test" }, + { CH_STARTPREFIXMAPPING, 2, 80, 2, 79, "", "prefix" }, + { CH_STARTELEMENT, 2, 80, 2, 79, "prefix", "document", "document" }, + { CH_CHARACTERS, 2, 80, 3, 1, "\n" }, + { CH_ENDELEMENT, 3, 3, 3, 11, "prefix", "document", "document" }, + { CH_ENDPREFIXMAPPING, 3, 3, 3, 11, "test" }, + { CH_ENDPREFIXMAPPING, 3, 3, 3, 11, "" }, + { CH_ENDDOCUMENT, 0, 0, 4, 0 }, + { CH_ENDTEST } +}; + static content_handler_test *expectCall; static ISAXLocator *locator; int msxml_version; @@ -321,7 +354,7 @@ static HRESULT WINAPI contentHandler_startPrefixMapping( const WCHAR *pUri, int nUri) { - if(!test_expect_call(CH_ENDDOCUMENT)) + if(!test_expect_call(CH_STARTPREFIXMAPPING)) return E_FAIL; test_saxstr(__LINE__, pPrefix, nPrefix, expectCall->arg1); @@ -357,6 +390,9 @@ static HRESULT WINAPI contentHandler_startElement( int nQName, ISAXAttributes *pAttr) { + int len; + HRESULT hres; + if(!test_expect_call(CH_STARTELEMENT)) return E_FAIL; @@ -366,6 +402,79 @@ static HRESULT WINAPI contentHandler_startElement( test_locator(__LINE__, msxml_version>=6 ? expectCall->line_v6 : expectCall->line, msxml_version>=6 ? expectCall->column_v6 : expectCall->column); + if(expectCall == contentHandlerTestAttributes+4) { + int i; + /* msxml3 returns attributes and namespaces in the input order */ + hres = ISAXAttributes_getLength(pAttr, &len); + ok(hres == S_OK, "getLength returned %x\n", hres); + ok(len == 4, "Incorrect number of attributes: %d\n", len); + ok(msxml_version < 6, "wrong msxml_version: %d\n", msxml_version); + + for(i=0; i<len; i++) { + hres = ISAXAttributes_getName(pAttr, i, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + + if(nQName == 4) { + todo_wine ok(i==3, "Incorrect attributes order\n"); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, ""); + test_saxstr(__LINE__, pLocalName, nLocalName, "arg2"); + test_saxstr(__LINE__, pQName, nQName, "arg2"); + } else if(nQName == 5) { + todo_wine ok(i==1, "Incorrect attributes order\n"); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, ""); + test_saxstr(__LINE__, pLocalName, nLocalName, ""); + test_saxstr(__LINE__, pQName, nQName, "xmlns"); + } else if(nQName == 9) { + todo_wine ok(i==2, "Incorrect attributes order\n"); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, "prefix_test"); + test_saxstr(__LINE__, pLocalName, nLocalName, "arg1"); + test_saxstr(__LINE__, pQName, nQName, "test:arg1"); + } else if(nQName == 10) { + todo_wine ok(i==0, "Incorrect attributes order\n"); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, ""); + test_saxstr(__LINE__, pLocalName, nLocalName, ""); + test_saxstr(__LINE__, pQName, nQName, "xmlns:test"); + } else { + ok(0, "Unexpected attribute\n"); + } + } + } else if(expectCall == contentHandlerTestAttributes6+4) { + /* msxml6 returns attributes first and then namespaces */ + hres = ISAXAttributes_getLength(pAttr, &len); + ok(hres == S_OK, "getLength returned %x\n", hres); + ok(len == 4, "Incorrect number of attributes: %d\n", len); + ok(msxml_version >= 6, "wrong msxml_version: %d\n", msxml_version); + + hres = ISAXAttributes_getName(pAttr, 0, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, "prefix_test"); + test_saxstr(__LINE__, pLocalName, nLocalName, "arg1"); + test_saxstr(__LINE__, pQName, nQName, "test:arg1"); + + hres = ISAXAttributes_getName(pAttr, 1, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, ""); + test_saxstr(__LINE__, pLocalName, nLocalName, "arg2"); + test_saxstr(__LINE__, pQName, nQName, "arg2"); + + hres = ISAXAttributes_getName(pAttr, 2, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, "http://www.w3.org/2000/xmlns/"); + test_saxstr(__LINE__, pLocalName, nLocalName, ""); + test_saxstr(__LINE__, pQName, nQName, "xmlns:test"); + + hres = ISAXAttributes_getName(pAttr, 3, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, "http://www.w3.org/2000/xmlns/"); + test_saxstr(__LINE__, pLocalName, nLocalName, ""); + test_saxstr(__LINE__, pQName, nQName, "xmlns"); + } + return (expectCall++)->ret; } @@ -1182,6 +1291,25 @@ static void test_saxreader(int version) IStream_Release(iStream); + CreateStreamOnHGlobal(NULL, TRUE, &iStream); + liSize.QuadPart = strlen(szTestAttributes); + IStream_SetSize(iStream, liSize); + IStream_Write(iStream, szTestAttributes, strlen(szTestAttributes), &bytesWritten); + liPos.QuadPart = 0; + IStream_Seek(iStream, liPos, STREAM_SEEK_SET, NULL); + V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_UNKNOWN(&var) = (IUnknown*)iStream; + + if(version >= 6) + expectCall = contentHandlerTestAttributes6; + else + expectCall = contentHandlerTestAttributes; + hr = ISAXXMLReader_parse(reader, var); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + test_expect_call(CH_ENDTEST); + + IStream_Release(iStream); + V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(szCarriageRetTest);

1 0

Piotr Caban : msvcrt: Don' t search for LCID in _setmbcp_l if it was already done.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 698afdca98dd6e1525edaec73b78a60aebc1556b URL: http://source.winehq.org/git/wine.git/?a=commit;h=698afdca98dd6e1525edaec73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 26 14:10:22 2011 +0200 msvcrt: Don't search for LCID in _setmbcp_l if it was already done. --- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/mbcs.c | 13 +++++++++---- dlls/msvcrt/msvcrt.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index b196cee..017d358 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -842,7 +842,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } } - _setmbcp_l(loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage, loc->mbcinfo); + _setmbcp_l(loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage, lcid[MSVCRT_LC_CTYPE], loc->mbcinfo); if(lcid[MSVCRT_LC_MONETARY] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_MONETARY)) { if(update_threadlocinfo_category(lcid[MSVCRT_LC_MONETARY], loc, MSVCRT_LC_MONETARY)) { diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 737f690..e9adbd8 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -184,7 +184,7 @@ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) /********************************************************************* * INTERNAL: _setmbcp_l */ -int _setmbcp_l(int cp, MSVCRT_pthreadmbcinfo mbcinfo) +int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) { const char format[] = ".%d"; @@ -222,8 +222,13 @@ int _setmbcp_l(int cp, MSVCRT_pthreadmbcinfo mbcinfo) break; } - sprintf(bufA, format, newcp); - mbcinfo->mblcid = MSVCRT_locale_to_LCID(bufA); + if(lcid == -1) { + sprintf(bufA, format, newcp); + mbcinfo->mblcid = MSVCRT_locale_to_LCID(bufA); + } else { + mbcinfo->mblcid = lcid; + } + if(mbcinfo->mblcid == -1) { WARN("Can't assign LCID to codepage (%d)\n", mbcinfo->mblcid); @@ -347,7 +352,7 @@ int _setmbcp_l(int cp, MSVCRT_pthreadmbcinfo mbcinfo) */ int CDECL _setmbcp(int cp) { - return _setmbcp_l(cp, NULL); + return _setmbcp_l(cp, -1, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 14bf972..671eb5b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -888,7 +888,7 @@ MSVCRT_pthreadmbcinfo get_mbcinfo(void); void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); void free_locinfo(MSVCRT_pthreadlocinfo); void free_mbcinfo(MSVCRT_pthreadmbcinfo); -int _setmbcp_l(int, MSVCRT_pthreadmbcinfo); +int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo); #ifndef __WINE_MSVCRT_TEST int __cdecl MSVCRT__write(int,const void*,unsigned int);

1 0

Alexandre Julliard : gdi32: Always use a polygon to draw text strike-outs and underlines.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: ba2ea235748730d0cfe7fe9488272e1544859816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba2ea235748730d0cfe7fe948… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 18:14:04 2011 +0200 gdi32: Always use a polygon to draw text strike-outs and underlines. --- dlls/gdi32/font.c | 113 +++++++++++++++++----------------------------------- 1 files changed, 37 insertions(+), 76 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cda41dc..f9e690c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2094,6 +2094,11 @@ done: int underlineWidth, strikeoutWidth; UINT size = GetOutlineTextMetricsW(hdc, 0, NULL); OUTLINETEXTMETRICW* otm = NULL; + POINT pts[5]; + HPEN hpen = SelectObject(hdc, GetStockObject(NULL_PEN)); + HBRUSH hbrush = CreateSolidBrush(GetTextColor(hdc)); + + hbrush = SelectObject(hdc, hbrush); if(!size) { @@ -2113,86 +2118,42 @@ done: HeapFree(GetProcessHeap(), 0, otm); } - if (PATH_IsPathOpen(dc->path)) - { - POINT pts[5]; - HPEN hpen; - HBRUSH hbrush = CreateSolidBrush(GetTextColor(hdc)); - - hbrush = SelectObject(hdc, hbrush); - hpen = SelectObject(hdc, GetStockObject(NULL_PEN)); - - if (lf.lfUnderline) - { - pts[0].x = x - underlinePos * sinEsc; - pts[0].y = y - underlinePos * cosEsc; - pts[1].x = x + width.x - underlinePos * sinEsc; - pts[1].y = y + width.y - underlinePos * cosEsc; - pts[2].x = pts[1].x + underlineWidth * sinEsc; - pts[2].y = pts[1].y + underlineWidth * cosEsc; - pts[3].x = pts[0].x + underlineWidth * sinEsc; - pts[3].y = pts[0].y + underlineWidth * cosEsc; - pts[4].x = pts[0].x; - pts[4].y = pts[0].y; - DPtoLP(hdc, pts, 5); - Polygon(hdc, pts, 5); - } - - if (lf.lfStrikeOut) - { - pts[0].x = x - strikeoutPos * sinEsc; - pts[0].y = y - strikeoutPos * cosEsc; - pts[1].x = x + width.x - strikeoutPos * sinEsc; - pts[1].y = y + width.y - strikeoutPos * cosEsc; - pts[2].x = pts[1].x + strikeoutWidth * sinEsc; - pts[2].y = pts[1].y + strikeoutWidth * cosEsc; - pts[3].x = pts[0].x + strikeoutWidth * sinEsc; - pts[3].y = pts[0].y + strikeoutWidth * cosEsc; - pts[4].x = pts[0].x; - pts[4].y = pts[0].y; - DPtoLP(hdc, pts, 5); - Polygon(hdc, pts, 5); - } - SelectObject(hdc, hpen); - hbrush = SelectObject(hdc, hbrush); - DeleteObject(hbrush); - } - else + if (lf.lfUnderline) { - POINT pts[2], oldpt; - HPEN hpen; - - if (lf.lfUnderline) - { - hpen = CreatePen(PS_SOLID, underlineWidth, GetTextColor(hdc)); - hpen = SelectObject(hdc, hpen); - pts[0].x = x; - pts[0].y = y; - pts[1].x = x + width.x; - pts[1].y = y + width.y; - DPtoLP(hdc, pts, 2); - MoveToEx(hdc, pts[0].x - underlinePos * sinEsc, pts[0].y - underlinePos * cosEsc, &oldpt); - LineTo(hdc, pts[1].x - underlinePos * sinEsc, pts[1].y - underlinePos * cosEsc); - MoveToEx(hdc, oldpt.x, oldpt.y, NULL); - DeleteObject(SelectObject(hdc, hpen)); - } + pts[0].x = x - underlinePos * sinEsc; + pts[0].y = y - underlinePos * cosEsc; + pts[1].x = x + width.x - underlinePos * sinEsc; + pts[1].y = y + width.y - underlinePos * cosEsc; + pts[2].x = pts[1].x + underlineWidth * sinEsc; + pts[2].y = pts[1].y + underlineWidth * cosEsc; + pts[3].x = pts[0].x + underlineWidth * sinEsc; + pts[3].y = pts[0].y + underlineWidth * cosEsc; + pts[4].x = pts[0].x; + pts[4].y = pts[0].y; + DPtoLP(hdc, pts, 5); + Polygon(hdc, pts, 5); + } - if (lf.lfStrikeOut) - { - hpen = CreatePen(PS_SOLID, strikeoutWidth, GetTextColor(hdc)); - hpen = SelectObject(hdc, hpen); - pts[0].x = x; - pts[0].y = y; - pts[1].x = x + width.x; - pts[1].y = y + width.y; - DPtoLP(hdc, pts, 2); - MoveToEx(hdc, pts[0].x - strikeoutPos * sinEsc, pts[0].y - strikeoutPos * cosEsc, &oldpt); - LineTo(hdc, pts[1].x - strikeoutPos * sinEsc, pts[1].y - strikeoutPos * cosEsc); - MoveToEx(hdc, oldpt.x, oldpt.y, NULL); - DeleteObject(SelectObject(hdc, hpen)); - } + if (lf.lfStrikeOut) + { + pts[0].x = x - strikeoutPos * sinEsc; + pts[0].y = y - strikeoutPos * cosEsc; + pts[1].x = x + width.x - strikeoutPos * sinEsc; + pts[1].y = y + width.y - strikeoutPos * cosEsc; + pts[2].x = pts[1].x + strikeoutWidth * sinEsc; + pts[2].y = pts[1].y + strikeoutWidth * cosEsc; + pts[3].x = pts[0].x + strikeoutWidth * sinEsc; + pts[3].y = pts[0].y + strikeoutWidth * cosEsc; + pts[4].x = pts[0].x; + pts[4].y = pts[0].y; + DPtoLP(hdc, pts, 5); + Polygon(hdc, pts, 5); } + + SelectObject(hdc, hpen); + hbrush = SelectObject(hdc, hbrush); + DeleteObject(hbrush); } return ret;

1 0

Matteo Bruni : wined3d: Enable SM4 support in the GLSL shader backend when possible.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 5f2c6b3c8289bb71ad3baf62c66b56b776adb671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2c6b3c8289bb71ad3baf62c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:45 2011 +0200 wined3d: Enable SM4 support in the GLSL shader backend when possible. --- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/glsl_shader.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5d6eef9..f6228eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4750,7 +4750,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte * are the same among all shader models. So to avoid code duplication set the shader version * specific, but otherwise constant caps here */ - if (caps->VertexShaderVersion == 3) + if (caps->VertexShaderVersion >= 3) { /* Where possible set the caps based on OpenGL extensions and if they * aren't set (in case of software rendering) use the VS 3.0 from @@ -4787,7 +4787,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxVertexShader30InstructionSlots = 0; } - if (caps->PixelShaderVersion == 3) + if (caps->PixelShaderVersion >= 3) { /* Where possible set the caps based on OpenGL extensions and if they * aren't set (in case of software rendering) use the PS 3.0 from diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3092ce3..2c7cfe9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4913,9 +4913,15 @@ static void shader_glsl_context_destroyed(void *shader_priv, const struct wined3 static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) { + if (gl_info->supported[EXT_GPU_SHADER4] && gl_info->supported[ARB_GEOMETRY_SHADER4] + && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50)) + { + caps->VertexShaderVersion = 4; + caps->PixelShaderVersion = 4; + } /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 * texldd and texldl instructions. */ - if (gl_info->supported[ARB_SHADER_TEXTURE_LOD] || gl_info->supported[EXT_GPU_SHADER4]) + else if (gl_info->supported[ARB_SHADER_TEXTURE_LOD] || gl_info->supported[EXT_GPU_SHADER4]) { caps->VertexShaderVersion = 3; caps->PixelShaderVersion = 3;

1 0

Matteo Bruni : dxgi: Refuse to create a D3D10 wined3d device if it is not supported by the GPU.
by Alexandre Julliard Oct. 26, 2011

Oct. 26, 2011

Module: wine Branch: master Commit: 8af1c6ee19200d572f9c0311efb1bc41717ff112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8af1c6ee19200d572f9c0311e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:46 2011 +0200 dxgi: Refuse to create a D3D10 wined3d device if it is not supported by the GPU. --- dlls/dxgi/device.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 9c94434..6b20235 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -353,6 +353,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l struct wined3d *wined3d; void *layer_base; HRESULT hr; + WINED3DCAPS caps; device->IWineDXGIDevice_iface.lpVtbl = &dxgi_device_vtbl; device->refcount = 1; @@ -398,6 +399,16 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l wined3d_device_parent = IWineDXGIDeviceParent_get_wined3d_device_parent(dxgi_device_parent); FIXME("Ignoring adapter type.\n"); + + hr = wined3d_get_device_caps(wined3d, adapter_ordinal, WINED3DDEVTYPE_HAL, &caps); + if (FAILED(hr) || caps.VertexShaderVersion < 4 || caps.PixelShaderVersion < 4) + { + WARN("Direct3D 10 is not supported on this GPU with the current shader backend.\n"); + if (SUCCEEDED(hr)) + hr = E_FAIL; + goto fail; + } + EnterCriticalSection(&dxgi_cs); hr = wined3d_device_create(wined3d, adapter_ordinal, WINED3DDEVTYPE_HAL, NULL, 0, 4, wined3d_device_parent, &device->wined3d_device);

1 0