July 2008 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Support ATI' s D3DFMT_ATI2N format.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: dc25a86cc5a34e89f65135482dc966ed5c85b00d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc25a86cc5a34e89f65135482… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 23 10:33:10 2008 -0500 wined3d: Support ATI's D3DFMT_ATI2N format. This is an ATI specific format designed for compressed normal maps, and quite a few games check for its existence. While it is an ATI-specific "extension" in d3d9, it is a core part of D3D10(DXGI_FORMAT_BC5), and supported on Geforce 8 cards. --- dlls/wined3d/arb_program_shader.c | 17 +++++++++++++++++ dlls/wined3d/device.c | 3 ++- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/glsl_shader.c | 20 ++++++++++++++++++++ dlls/wined3d/surface.c | 12 ++++++++---- dlls/wined3d/utils.c | 13 +++++++++++++ include/wine/wined3d_gl.h | 6 ++++++ include/wine/wined3d_types.h | 2 ++ 8 files changed, 78 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc25a86cc5a34e89f6513…

1 0

Stefan Dösinger : wined3d: Honor the texcoordindex when setting the texture matrix.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: 370b8299ab8d33664ffbb8bdbaafd04c8f566c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=370b8299ab8d33664ffbb8bdb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 22 13:56:07 2008 -0500 wined3d: Honor the texcoordindex when setting the texture matrix. --- dlls/wined3d/state.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9e29d78..a6903c6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3108,6 +3108,7 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W DWORD texUnit = state - STATE_TRANSFORM(WINED3DTS_TEXTURE0); DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[texUnit]; BOOL generated; + int coordIdx; /* Ignore this when a vertex shader is used, or if the streams aren't sorted out yet */ if(use_vs(stateblock->wineD3DDevice) || @@ -3130,13 +3131,14 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W return; } generated = (stateblock->textureState[texUnit][WINED3DTSS_TEXCOORDINDEX] & 0xFFFF0000) != WINED3DTSS_TCI_PASSTHRU; + coordIdx = min(stateblock->textureState[texUnit][WINED3DTSS_TEXCOORDINDEX & 0x0000FFFF], MAX_TEXTURES - 1); set_texture_matrix(&stateblock->transforms[WINED3DTS_TEXTURE0 + texUnit].u.m[0][0], stateblock->textureState[texUnit][WINED3DTSS_TEXTURETRANSFORMFLAGS], generated, context->last_was_rhw, - stateblock->wineD3DDevice->strided_streams.u.s.texCoords[texUnit].dwStride ? - stateblock->wineD3DDevice->strided_streams.u.s.texCoords[texUnit].dwType: + stateblock->wineD3DDevice->strided_streams.u.s.texCoords[coordIdx].dwStride ? + stateblock->wineD3DDevice->strided_streams.u.s.texCoords[coordIdx].dwType: WINED3DDECLTYPE_UNUSED); /* The sampler applying function calls us if this changes */

1 0

Stefan Dösinger : d3d: D3DDECLTYPE_UNUSED is not valid in vertex declarations.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: b554cdbb5a33965e906669c0f971bc4331d60a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b554cdbb5a33965e906669c0f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 17 18:00:21 2008 -0500 d3d: D3DDECLTYPE_UNUSED is not valid in vertex declarations. --- dlls/d3d9/tests/vertexdeclaration.c | 55 +++++++++++++++++++++++++++++++++++ dlls/wined3d/vertexdeclaration.c | 6 ++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index 292087f..ad7b873 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -786,6 +786,60 @@ static void test_vertex_declaration_alignment( } } +static void test_unused_type( + IDirect3DDevice9* device) { + + HRESULT hr; + IDirect3DVertexDeclaration9* result_decl = NULL; + int i; + + static const D3DVERTEXELEMENT9 test_elements[][3] = + { + { + { 0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0 }, + { 0, 16, D3DDECLTYPE_UNUSED, 0, D3DDECLUSAGE_COLOR , 0 }, + D3DDECL_END() + }, + { + { 0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0 }, + { 0, 16, D3DDECLTYPE_UNUSED, 0, D3DDECLUSAGE_TEXCOORD, 0 }, + D3DDECL_END() + }, + { + { 0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0 }, + { 0, 16, D3DDECLTYPE_UNUSED, 0, D3DDECLUSAGE_TEXCOORD, 1 }, + D3DDECL_END() + }, + { + { 0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0 }, + { 0, 16, D3DDECLTYPE_UNUSED, 0, D3DDECLUSAGE_TEXCOORD, 12}, + D3DDECL_END() + }, + { + { 0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0 }, + { 1, 16, D3DDECLTYPE_UNUSED, 0, D3DDECLUSAGE_TEXCOORD, 12}, + D3DDECL_END() + }, + { + { 0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0 }, + { 0, 16, D3DDECLTYPE_UNUSED, 0, D3DDECLUSAGE_NORMAL, 0 }, + D3DDECL_END() + }, + { + { 0, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0 }, + { 1, 16, D3DDECLTYPE_UNUSED, 0, D3DDECLUSAGE_NORMAL, 0 }, + D3DDECL_END() + }, + }; + + for(i = 0; i < sizeof(test_elements) / sizeof(test_elements[0]); i++) { + result_decl = NULL; + hr = IDirect3DDevice9_CreateVertexDeclaration(device, test_elements[i], &result_decl); + ok(hr == E_FAIL, "CreateVertexDeclaration for declaration %d returned %#x, expected E_FAIL(%#x)\n", + i, hr, E_FAIL); + if(result_decl) IDirect3DVertexDeclaration9_Release(result_decl); + } +} START_TEST(vertexdeclaration) { static D3DVERTEXELEMENT9 simple_decl[] = { @@ -821,4 +875,5 @@ START_TEST(vertexdeclaration) test_fvf_decl_conversion(device_ptr); test_fvf_decl_management(device_ptr); test_vertex_declaration_alignment(device_ptr); + test_unused_type(device_ptr); } diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 0802b1f..936ef57 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -159,6 +159,12 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte */ if(This->pDeclarationWine[i].Stream >= MAX_STREAMS) continue; + if(This->pDeclarationWine[i].Type == WINED3DDECLTYPE_UNUSED) { + WARN("The application tries to use WINED3DDECLTYPE_UNUSED, returning E_FAIL\n"); + /* The caller will release the vdecl, which will free This->pDeclarationWine */ + return E_FAIL; + } + if(This->pDeclarationWine[i].Offset & 0x3) { WARN("Declaration element %d is not 4 byte aligned(%d), returning E_FAIL\n", i, This->pDeclarationWine[i].Offset); HeapFree(GetProcessHeap(), 0, This->pDeclarationWine);

1 0

Nikolay Sivov : gdiplus: Fix swapped got-expected in brush test.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: b127647b9682eb6f166b21493b4c8ae10a9a92a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b127647b9682eb6f166b21493… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 24 03:23:22 2008 +0400 gdiplus: Fix swapped got-expected in brush test. --- dlls/gdiplus/tests/brush.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 5ef7fca..6711fe4 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -51,8 +51,8 @@ static void test_type(void) GdipCreateSolidFill((ARGB)0xdeadbeef, &brush); status = GdipGetBrushType((GpBrush*)brush, &bt); - expect(status, Ok); - expect(bt, BrushTypeSolidColor); + expect(Ok, status); + expect(BrushTypeSolidColor, bt); GdipDeleteBrush((GpBrush*) brush); }

1 0

H. Verbeet : d3d9: Use color_match() in test_vshader_input().
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: d1c835f890ca645a0b462d6039e2007149a12ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c835f890ca645a0b462d603… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jul 23 22:49:14 2008 +0200 d3d9: Use color_match() in test_vshader_input(). --- dlls/d3d9/tests/visual.c | 32 ++++++++++---------------------- 1 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a47b054..60b1fad 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1,5 +1,5 @@ /* - * Copyright 2005, 2007 Henri Verbeet + * Copyright 2005, 2007-2008 Henri Verbeet * Copyright (C) 2007-2008 Stefan D�singer(for CodeWeavers) * Copyright (C) 2008 Jason Green(for TransGaming) * @@ -5919,7 +5919,7 @@ void test_vshader_input(IDirect3DDevice9 *device) }; IDirect3DVertexShader9 *swapped_shader, *texcoord_color_shader, *color_color_shader; HRESULT hr; - DWORD color, r, g, b; + DWORD color; float quad1[] = { -1.0, -1.0, 0.1, 1.0, 0.0, 1.0, 0.0, 0.0, -1.0, 0.5, 0.0, 0.0, -1.0, 0.1, 1.0, 0.0, 1.0, 0.0, 0.0, -1.0, 0.5, 0.0, @@ -6094,7 +6094,7 @@ void test_vshader_input(IDirect3DDevice9 *device) if(i == 3 || i == 2) { color = getPixelColor(device, 160, 360); - ok(color == 0x00FFFF80 || color == 0x00FFFF7f || color == 0x00FFFF81, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x80), 1), "Input test: Quad 1(2crd) returned color 0x%08x, expected 0x00FFFF80\n", color); /* The last value of the read but undefined stream is used, it is 0x00. The defined input is vec4(1, 0, 0, 0) */ @@ -6103,20 +6103,20 @@ void test_vshader_input(IDirect3DDevice9 *device) "Input test: Quad 2(1crd) returned color 0x%08x, expected 0x00FFFF00\n", color); color = getPixelColor(device, 160, 120); /* Same as above, accept both the last used value and 0.0 for the undefined streams */ - ok(color == 0x00FF0080 || color == 0x00FF007f || color == 0x00FF0081 || color == 0x00FF0000, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x80), 1) || color == D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00), "Input test: Quad 3(2crd-wrongidx) returned color 0x%08x, expected 0x00FF0080\n", color); color = getPixelColor(device, 480, 160); ok(color == 0x00000000, "Input test: Quad 4(2crd-rightorder) returned color 0x%08x, expected 0x00000000\n", color); } else if(i == 1) { color = getPixelColor(device, 160, 360); - ok(color == 0x00FFFF80 || color == 0x00FFFF7f || color == 0x00FFFF81, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x80), 1), "Input test: Quad 1(2crd) returned color 0x%08x, expected 0x00FFFF80\n", color); color = getPixelColor(device, 480, 360); /* Accept the clear color as well in this case, since SW VP returns an error */ ok(color == 0x00FFFF00 || color == 0x00FF0000, "Input test: Quad 2(1crd) returned color 0x%08x, expected 0x00FFFF00\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x00FF0080 || color == 0x00FF0000 || color == 0x00FF007f || color == 0x00FF0081, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x80), 1) || color == D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00), "Input test: Quad 3(2crd-wrongidx) returned color 0x%08x, expected 0x00FF0080\n", color); color = getPixelColor(device, 480, 160); ok(color == 0x00000000, "Input test: Quad 4(2crd-rightorder) returned color 0x%08x, expected 0x00000000\n", color); @@ -6252,28 +6252,16 @@ void test_vshader_input(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); color = getPixelColor(device, 160, 360); - r = (color & 0x00ff0000) >> 16; - g = (color & 0x0000ff00) >> 8; - b = (color & 0x000000ff) >> 0; - ok(r >= 0xfe && r <= 0xff && g >= 0x7f && g <= 0x81 && b >= 0x3f && b <= 0x41, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0x80, 0x40), 1), "Input test: Quad 1(color-texcoord) returned color 0x%08x, expected 0x00ff8040\n", color); color = getPixelColor(device, 480, 360); - r = (color & 0x00ff0000) >> 16; - g = (color & 0x0000ff00) >> 8; - b = (color & 0x000000ff) >> 0; - ok(r >= 0x3f && r <= 0x41 && g >= 0x7f && g <= 0x81 && b >= 0xfe && b <= 0xff, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x40, 0x80, 0xff), 1), "Input test: Quad 2(color-ubyte) returned color 0x%08x, expected 0x004080ff\n", color); color = getPixelColor(device, 160, 120); - r = (color & 0x00ff0000) >> 16; - g = (color & 0x0000ff00) >> 8; - b = (color & 0x000000ff) >> 0; - ok(r >= 0xfe && r <= 0xff && g >= 0x7f && g <= 0x81 && b >= 0x3f && b <= 0x41, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0x80, 0x40), 1), "Input test: Quad 3(color-color) returned color 0x%08x, expected 0x00ff8040\n", color); color = getPixelColor(device, 480, 160); - r = (color & 0x00ff0000) >> 16; - g = (color & 0x0000ff00) >> 8; - b = (color & 0x000000ff) >> 0; - ok(r >= 0xfe && r <= 0xff && g >= 0xfe && g <= 0xff && b <= 0x01, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00), 1), "Input test: Quad 4(color-float) returned color 0x%08x, expected 0x00FFFF00\n", color); IDirect3DVertexShader9_Release(texcoord_color_shader);

1 0

Piotr Caban : msxml3: Fix for accessing uninitialized memory.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: 33e35025ec2d53ac24a5d3df4af883493c8aa68b URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e35025ec2d53ac24a5d3df4… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 23 16:39:51 2008 +0200 msxml3: Fix for accessing uninitialized memory. --- dlls/msxml3/saxreader.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index ef3c7e8..3b67d01 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1130,12 +1130,26 @@ static HRESULT WINAPI isaxxmlreader_parse( data = xmlChar_from_wchar(V_BSTR(&varInput)); xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); break; - case VT_ARRAY|VT_UI1: - hr = SafeArrayAccessData(V_ARRAY(&varInput), (void**)&data); + case VT_ARRAY|VT_UI1: { + void *pSAData; + LONG lBound, uBound; + ULONG dataRead; + + hr = SafeArrayGetLBound(V_ARRAY(&varInput), 1, &lBound); + if(hr != S_OK) break; + hr = SafeArrayGetUBound(V_ARRAY(&varInput), 1, &uBound); if(hr != S_OK) break; + dataRead = (uBound-lBound)*SafeArrayGetElemsize(V_ARRAY(&varInput)); + data = HeapAlloc(GetProcessHeap(), 0, dataRead+1); + if(!data) break; + hr = SafeArrayAccessData(V_ARRAY(&varInput), (void**)&pSAData); + if(hr != S_OK) break; + memcpy(data, pSAData, dataRead); + data[dataRead] = '\0'; xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); SafeArrayUnaccessData(V_ARRAY(&varInput)); break; + } case VT_UNKNOWN: case VT_DISPATCH: { IPersistStream *persistStream;

1 0

Piotr Caban : msxml3/tests: Add test for parsing document with '\r' characters.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: 68963c9fd093bea830b59630e307d243aaec4669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68963c9fd093bea830b59630e… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 23 16:39:43 2008 +0200 msxml3/tests: Add test for parsing document with '\r' characters. --- dlls/msxml3/tests/saxreader.c | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 9c71033..dd69e0f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -52,7 +52,15 @@ static const WCHAR szSimpleXML[] = { '<','/','B','a','n','k','A','c','c','o','u','n','t','>','\n','\0' }; -static CHAR szTestXML[] = +static const WCHAR szCarriageRetTest[] = { +'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','"','1','.','0','"','?','>','\r','\n', +'<','B','a','n','k','A','c','c','o','u','n','t','>','\r','\n', +'\t','<','N','u','m','b','e','r','>','1','2','3','4','<','/','N','u','m','b','e','r','>','\r','\n', +'\t','<','N','a','m','e','>','C','a','p','t','a','i','n',' ','A','h','a','b','<','/','N','a','m','e','>','\r','\n', +'<','/','B','a','n','k','A','c','c','o','u','n','t','>','\0' +}; + +static const CHAR szTestXML[] = "<?xml version=\"1.0\" ?>\n" "<BankAccount>\n" " <Number>1234</Number>\n" @@ -86,6 +94,26 @@ static content_handler_test contentHandlerTest1[] = { { CH_ENDTEST } }; +static content_handler_test contentHandlerTest2[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0 }, + { CH_STARTDOCUMENT, 0, 0 }, + { CH_STARTELEMENT, 2, 14, "", "BankAccount", "BankAccount" }, + { CH_CHARACTERS, 2, 14, "\n" }, + { CH_CHARACTERS, 2, 16, "\t" }, + { CH_STARTELEMENT, 3, 10, "", "Number", "Number" }, + { CH_CHARACTERS, 3, 10, "1234" }, + { CH_ENDELEMENT, 3, 16, "", "Number", "Number" }, + { CH_CHARACTERS, 3, 23, "\n" }, + { CH_CHARACTERS, 3, 25, "\t" }, + { CH_STARTELEMENT, 4, 8, "", "Name", "Name" }, + { CH_CHARACTERS, 4, 8, "Captain Ahab" }, + { CH_ENDELEMENT, 4, 22, "", "Name", "Name" }, + { CH_CHARACTERS, 4, 27, "\n" }, + { CH_ENDELEMENT, 5, 3, "", "BankAccount", "BankAccount" }, + { CH_ENDDOCUMENT, 0, 0 }, + { CH_ENDTEST } +}; + static content_handler_test *expectCall; static ISAXLocator *locator; @@ -525,6 +553,14 @@ static void test_saxreader(void) IStream_Release(iStream); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(szCarriageRetTest); + + expectCall = contentHandlerTest2; + hr = ISAXXMLReader_parse(reader, var); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + test_expect_call(CH_ENDTEST); + ISAXXMLReader_Release(reader); }

1 0

Piotr Caban : msxml3/tests: Add test for parsing from IStream.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: c545852013fd15999112a0413e5c627c9ec9fa00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c545852013fd15999112a0413… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 23 16:39:33 2008 +0200 msxml3/tests: Add test for parsing from IStream. --- dlls/msxml3/tests/saxreader.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 26f232b..9c71033 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -444,6 +444,10 @@ static void test_saxreader(void) SAFEARRAY *pSA; SAFEARRAYBOUND SADim[1]; char *pSAData = NULL; + IStream *iStream; + ULARGE_INTEGER liSize; + LARGE_INTEGER liPos; + ULONG bytesWritten; hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (LPVOID*)&reader); @@ -505,6 +509,22 @@ static void test_saxreader(void) SafeArrayDestroy(pSA); + CreateStreamOnHGlobal(NULL, TRUE, &iStream); + liSize.QuadPart = strlen(szTestXML); + IStream_SetSize(iStream, liSize); + IStream_Write(iStream, (void const*)szTestXML, strlen(szTestXML), &bytesWritten); + liPos.QuadPart = 0; + IStream_Seek(iStream, liPos, STREAM_SEEK_SET, NULL); + V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_UNKNOWN(&var) = (IUnknown*)iStream; + + expectCall = contentHandlerTest1; + hr = ISAXXMLReader_parse(reader, var); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + test_expect_call(CH_ENDTEST); + + IStream_Release(iStream); + ISAXXMLReader_Release(reader); }

1 0

Piotr Caban : msxml3: Change ISAXXMLReader_characters implementation so it works correctly on files with '\r' characters.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: 3d4ad645bdbc1d1722171f99c3ef1a651575f7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d4ad645bdbc1d1722171f99c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 23 16:39:12 2008 +0200 msxml3: Change ISAXXMLReader_characters implementation so it works correctly on files with '\r' characters. --- dlls/msxml3/saxreader.c | 62 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 55 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 2c0873f..ef3c7e8 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -254,24 +254,72 @@ static void libxmlCharacters( saxlocator *This = ctx; HRESULT hr; xmlChar *end; + xmlChar *lastCurCopy; + xmlChar *chEnd; + int columnCopy; + int lineCopy; + + if(*(This->lastCur-1) != '>' && *(This->lastCur-1) != '/') return; if(*(This->lastCur-1) != '>') { end = (xmlChar*)This->pParserCtxt->input->cur-len; + while(*(end-1) != '>') end--; update_position(This, end); } + chEnd = This->lastCur+len; + while(*chEnd != '<') chEnd++; + + Chars = bstr_from_xmlChar(ch); + + lastCurCopy = This->lastCur; + columnCopy = This->column; + lineCopy = This->line; + end = This->lastCur; + if(This->saxreader->contentHandler) { - Chars = bstr_from_xmlChar(ch); - hr = ISAXContentHandler_characters(This->saxreader->contentHandler, Chars, len); - SysFreeString(Chars); + while(This->lastCur < chEnd) + { + end = This->lastCur; + while(end < chEnd-1) + { + if(*end == '\r') break; + end++; + } - if(hr != S_OK) - format_error_message_from_id(This, hr); - } + Chars = bstr_from_xmlChar(This->lastCur); - update_position(This, NULL); + if(*end == '\r' && *(end+1) == '\n') + { + memmove((WCHAR*)Chars+(end-This->lastCur), + (WCHAR*)Chars+(end-This->lastCur)+1, + (SysStringLen(Chars)-(end-This->lastCur))*sizeof(WCHAR)); + SysReAllocStringLen(&Chars, Chars, SysStringLen(Chars)-1); + } + else if(*end == '\r') Chars[end-This->lastCur] = '\n'; + + hr = ISAXContentHandler_characters(This->saxreader->contentHandler, Chars, end-This->lastCur+1); + SysFreeString(Chars); + if(hr != S_OK) + { + format_error_message_from_id(This, hr); + return; + } + + if(*(end+1) == '\n') end++; + if(end < chEnd) end++; + + This->column += end-This->lastCur; + This->lastCur = end; + } + + This->lastCur = lastCurCopy; + This->column = columnCopy; + This->line = lineCopy; + update_position(This, chEnd); + } } static void libxmlSetDocumentLocator(

1 0

Piotr Caban : msxml3: Change ISAXXMLReader_getLine and ISAXXMLReader_getColumn functions.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: bb849dc9c39b2f3647e957cb2951fbb5d2a8b6bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb849dc9c39b2f3647e957cb2… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 23 16:39:04 2008 +0200 msxml3: Change ISAXXMLReader_getLine and ISAXXMLReader_getColumn functions. --- dlls/msxml3/saxreader.c | 84 +++++++++++++++++++++++++++++------------------ 1 files changed, 52 insertions(+), 32 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 9ea2aa2..2c0873f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -64,8 +64,9 @@ typedef struct _saxlocator xmlParserCtxtPtr pParserCtxt; WCHAR *publicId; WCHAR *systemId; - int lastLine; - int lastColumn; + xmlChar *lastCur; + int line; + int column; } saxlocator; static inline saxreader *impl_from_IVBSAXXMLReader( IVBSAXXMLReader *iface ) @@ -83,6 +84,7 @@ static inline saxlocator *impl_from_ISAXLocator( ISAXLocator *iface ) return (saxlocator *)((char*)iface - FIELD_OFFSET(saxlocator, lpSAXLocatorVtbl)); } + static void format_error_message_from_id(saxlocator *This, HRESULT hr) { xmlStopParser(This->pParserCtxt); @@ -103,6 +105,35 @@ static void format_error_message_from_id(saxlocator *This, HRESULT hr) } } +static void update_position(saxlocator *This, xmlChar *end) +{ + if(This->lastCur == NULL) + { + This->lastCur = (xmlChar*)This->pParserCtxt->input->base; + This->line = 1; + This->column = 1; + } + + if(!end) end = (xmlChar*)This->pParserCtxt->input->cur; + + while(This->lastCur < end) + { + if(*(This->lastCur) == '\n') + { + This->line++; + This->column = 1; + } + else if(*(This->lastCur) == '\r' && (This->lastCur==This->pParserCtxt->input->end || *(This->lastCur+1)!='\n')) + { + This->line++; + This->column = 1; + } + else This->column++; + + This->lastCur++; + } +} + /*** LibXML callbacks ***/ static void libxmlStartDocument(void *ctx) { @@ -116,8 +147,7 @@ static void libxmlStartDocument(void *ctx) format_error_message_from_id(This, hr); } - This->lastColumn = xmlSAX2GetColumnNumber(This->pParserCtxt); - This->lastLine = xmlSAX2GetLineNumber(This->pParserCtxt); + update_position(This, NULL); } static void libxmlEndDocument(void *ctx) @@ -125,8 +155,8 @@ static void libxmlEndDocument(void *ctx) saxlocator *This = ctx; HRESULT hr; - This->lastColumn = 0; - This->lastLine = 0; + This->column = 0; + This->line = 0; if(This->ret != S_OK) return; @@ -155,8 +185,7 @@ static void libxmlStartElementNS( FIXME("Arguments processing not yet implemented.\n"); - This->lastColumn = xmlSAX2GetColumnNumber(This->pParserCtxt)+1; - This->lastLine = xmlSAX2GetLineNumber(This->pParserCtxt); + update_position(This, (xmlChar*)This->pParserCtxt->input->cur+1); if(This->saxreader->contentHandler) { @@ -189,9 +218,11 @@ static void libxmlEndElementNS( BSTR NamespaceUri, LocalName, QName; saxlocator *This = ctx; HRESULT hr; + xmlChar *end; - This->lastColumn = xmlSAX2GetColumnNumber(This->pParserCtxt); - This->lastLine = xmlSAX2GetLineNumber(This->pParserCtxt); + end = This->lastCur; + while(*end != '<' && *(end+1) != '/') end++; + update_position(This, end+2); if(This->saxreader->contentHandler) { @@ -221,28 +252,14 @@ static void libxmlCharacters( { BSTR Chars; saxlocator *This = ctx; - const xmlChar *cur; - int pos; HRESULT hr; + xmlChar *end; - This->lastColumn = 1; - This->lastLine = xmlSAX2GetLineNumber(This->pParserCtxt); - - cur = This->pParserCtxt->input->cur; - if(*cur != '<') + if(*(This->lastCur-1) != '>') { - for(pos=0; pos<len; pos++) - if(*(cur+pos) == '\n') This->lastLine--; - cur--; + end = (xmlChar*)This->pParserCtxt->input->cur-len; + update_position(This, end); } - else - { - for(pos=0; pos<len; pos++) - if(*(cur-pos-1) == '\n') This->lastLine--; - cur = cur-len-1; - } - for(; *cur!='\n' && cur!=This->pParserCtxt->input->base; cur--) - This->lastColumn++; if(This->saxreader->contentHandler) { @@ -253,6 +270,8 @@ static void libxmlCharacters( if(hr != S_OK) format_error_message_from_id(This, hr); } + + update_position(This, NULL); } static void libxmlSetDocumentLocator( @@ -366,7 +385,7 @@ static HRESULT WINAPI isaxlocator_getColumnNumber( { saxlocator *This = impl_from_ISAXLocator( iface ); - *pnColumn = This->lastColumn; + *pnColumn = This->column; return S_OK; } @@ -376,7 +395,7 @@ static HRESULT WINAPI isaxlocator_getLineNumber( { saxlocator *This = impl_from_ISAXLocator( iface ); - *pnLine = This->lastLine; + *pnLine = This->line; return S_OK; } @@ -452,8 +471,9 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator) locator->pParserCtxt = NULL; locator->publicId = NULL; locator->systemId = NULL; - locator->lastLine = 0; - locator->lastColumn = 0; + locator->lastCur = NULL; + locator->line = 0; + locator->column = 0; locator->ret = S_OK; *ppsaxlocator = locator;

1 0