October 2011 - Wine-commits

Rico Schüller : d3dx9/tests: Fix typo.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 5b7834851fc885c6011395d441047a8a74e21cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7834851fc885c6011395d44… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 25 10:39:33 2011 +0200 d3dx9/tests: Fix typo. --- dlls/d3dx9_36/tests/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 8d82a68..d11a918 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -260,7 +260,7 @@ static void test_get_shader_constant_table_ex(void) /* No CTAB data */ hr = D3DXGetShaderConstantTableEx(simple_ps, 0, &constant_table); - ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DXERR_INVALIDDATA); + ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); /* With invalid CTAB data */ hr = D3DXGetShaderConstantTableEx(shader_with_invalid_ctab, 0, &constant_table);

1 0

Alexandre Julliard : gdi32: Implement GetCharABCWidths as a standard driver entry point.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: e5a0fa7089dfafd2e7a0fc6e5cc6856ecc3e8d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a0fa7089dfafd2e7a0fc6e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 21 11:33:04 2011 +0200 gdi32: Implement GetCharABCWidths as a standard driver entry point. --- dlls/gdi32/font.c | 11 ++++------- dlls/gdi32/freetype.c | 28 +++++++++++++--------------- dlls/gdi32/gdi_private.h | 2 -- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e1fc856..d12e73b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2382,8 +2382,9 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, LPABC abc ) { DC *dc = get_dc_ptr(hdc); + PHYSDEV dev; unsigned int i; - BOOL ret = FALSE; + BOOL ret; if (!dc) return FALSE; @@ -2393,11 +2394,8 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, return FALSE; } - if(dc->gdiFont) - ret = WineEngGetCharABCWidths( dc->gdiFont, firstChar, lastChar, abc ); - else - FIXME(": stub\n"); - + dev = GET_DC_PHYSDEV( dc, pGetCharABCWidths ); + ret = dev->funcs->pGetCharABCWidths( dev, firstChar, lastChar, abc ); if (ret) { /* convert device units to logical */ @@ -2406,7 +2404,6 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, abc->abcB = INTERNAL_XDSTOWS(dc, abc->abcB); abc->abcC = INTERNAL_XDSTOWS(dc, abc->abcC); } - ret = TRUE; } release_dc_ptr( dc ); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6fbfd0d..00ea0ec 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6348,28 +6348,33 @@ static BOOL freetype_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, L } /************************************************************* - * WineEngGetCharABCWidths - * + * freetype_GetCharABCWidths */ -BOOL WineEngGetCharABCWidths(GdiFont *font, UINT firstChar, UINT lastChar, - LPABC buffer) +static BOOL freetype_GetCharABCWidths( PHYSDEV dev, UINT firstChar, UINT lastChar, LPABC buffer ) { static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; UINT c; GLYPHMETRICS gm; FT_UInt glyph_index; GdiFont *linked_font; + struct freetype_physdev *physdev = get_freetype_dev( dev ); - TRACE("%p, %d, %d, %p\n", font, firstChar, lastChar, buffer); + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetCharABCWidths ); + return dev->funcs->pGetCharABCWidths( dev, firstChar, lastChar, buffer ); + } + + TRACE("%p, %d, %d, %p\n", physdev->font, firstChar, lastChar, buffer); - if(!FT_IS_SCALABLE(font->ft_face)) + if(!FT_IS_SCALABLE(physdev->font->ft_face)) return FALSE; GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); for(c = firstChar; c <= lastChar; c++) { - get_glyph_index_linked(font, c, &linked_font, &glyph_index); + get_glyph_index_linked(physdev->font, c, &linked_font, &glyph_index); get_glyph_outline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &identity); buffer[c - firstChar].abcA = FONT_GM(linked_font,glyph_index)->lsb; @@ -7088,7 +7093,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ - NULL, /* pGetCharABCWidths */ + freetype_GetCharABCWidths, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ freetype_GetCharWidth, /* pGetCharWidth */ NULL, /* pGetDeviceCaps */ @@ -7218,13 +7223,6 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, return 0; } -BOOL WineEngGetCharABCWidths(GdiFont *font, UINT firstChar, UINT lastChar, - LPABC buffer) -{ - ERR("called but we don't have FreeType\n"); - return FALSE; -} - BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT first, UINT last, LPABCFLOAT buffer) { ERR("called but we don't have FreeType\n"); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index efd3e56..413d61f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -292,8 +292,6 @@ typedef struct extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC_HIDDEN; extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; -extern BOOL WineEngGetCharABCWidths(GdiFont *font, UINT firstChar, - UINT lastChar, LPABC buffer) DECLSPEC_HIDDEN; extern BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT firstChar, UINT lastChar, LPABCFLOAT buffer) DECLSPEC_HIDDEN; extern BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar,

1 0

Alexandre Julliard : gdi32: Implement GetCharABCWidthsI as a standard driver entry point.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 27208a0ec5800277831e7764a97e42237fa1fffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=27208a0ec5800277831e7764a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 22:00:55 2011 +0200 gdi32: Implement GetCharABCWidthsI as a standard driver entry point. --- dlls/gdi32/font.c | 11 ++++------- dlls/gdi32/freetype.c | 26 ++++++++++++-------------- dlls/gdi32/gdi_private.h | 2 -- 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d12e73b..e8d10f1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2434,8 +2434,9 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count, LPWORD pgi, LPABC abc) { DC *dc = get_dc_ptr(hdc); + PHYSDEV dev; unsigned int i; - BOOL ret = FALSE; + BOOL ret; if (!dc) return FALSE; @@ -2445,11 +2446,8 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count, return FALSE; } - if(dc->gdiFont) - ret = WineEngGetCharABCWidthsI( dc->gdiFont, firstChar, count, pgi, abc ); - else - FIXME(": stub\n"); - + dev = GET_DC_PHYSDEV( dc, pGetCharABCWidthsI ); + ret = dev->funcs->pGetCharABCWidthsI( dev, firstChar, count, pgi, abc ); if (ret) { /* convert device units to logical */ @@ -2458,7 +2456,6 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count, abc->abcB = INTERNAL_XDSTOWS(dc, abc->abcB); abc->abcC = INTERNAL_XDSTOWS(dc, abc->abcC); } - ret = TRUE; } release_dc_ptr( dc ); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 00ea0ec..fa3f72b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6419,25 +6419,30 @@ BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT first, UINT last, LPABCFLO } /************************************************************* - * WineEngGetCharABCWidthsI - * + * freetype_GetCharABCWidthsI */ -BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD pgi, - LPABC buffer) +static BOOL freetype_GetCharABCWidthsI( PHYSDEV dev, UINT firstChar, UINT count, LPWORD pgi, LPABC buffer ) { static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; UINT c; GLYPHMETRICS gm; FT_UInt glyph_index; GdiFont *linked_font; + struct freetype_physdev *physdev = get_freetype_dev( dev ); + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetCharABCWidthsI ); + return dev->funcs->pGetCharABCWidthsI( dev, firstChar, count, pgi, buffer ); + } - if(!FT_HAS_HORIZONTAL(font->ft_face)) + if(!FT_HAS_HORIZONTAL(physdev->font->ft_face)) return FALSE; GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - get_glyph_index_linked(font, 'a', &linked_font, &glyph_index); + get_glyph_index_linked(physdev->font, 'a', &linked_font, &glyph_index); if (!pgi) for(c = firstChar; c < firstChar+count; c++) { get_glyph_outline(linked_font, c, GGO_METRICS | GGO_GLYPH_INDEX, @@ -7094,7 +7099,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ freetype_GetCharABCWidths, /* pGetCharABCWidths */ - NULL, /* pGetCharABCWidthsI */ + freetype_GetCharABCWidthsI, /* pGetCharABCWidthsI */ freetype_GetCharWidth, /* pGetCharWidth */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ @@ -7229,13 +7234,6 @@ BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT first, UINT last, LPABCFLO return FALSE; } -BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD pgi, - LPABC buffer) -{ - ERR("called but we don't have FreeType\n"); - return FALSE; -} - BOOL WineEngGetTextExtentExPointI(GdiFont *font, const WORD *indices, INT count, INT max_ext, LPINT nfit, LPINT dx, LPSIZE size) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 413d61f..fff72b1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -294,8 +294,6 @@ extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT firstChar, UINT lastChar, LPABCFLOAT buffer) DECLSPEC_HIDDEN; -extern BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, - UINT count, LPWORD pgi, LPABC buffer) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontUnicodeRanges(GdiFont *, LPGLYPHSET) DECLSPEC_HIDDEN; extern DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count,

1 0

Alexandre Julliard : gdi32: Don't return outline metrics for bitmap fonts.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 873bf81d3b2c5d6bb343cda11e5c79ba6a8107c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=873bf81d3b2c5d6bb343cda11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 23:34:05 2011 +0200 gdi32: Don't return outline metrics for bitmap fonts. --- dlls/gdi32/freetype.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a2b57eb..85afe48 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6240,6 +6240,8 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, TRACE("font=%p\n", font); + if (!FT_IS_SCALABLE( font->ft_face )) return 0; + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs );

1 0

Alexandre Julliard : gdi32: Implement EnumDeviceFonts as a standard driver entry point.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: cbd81d391c641083ba05ddbedde40ece4a161f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd81d391c641083ba05ddbed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 15:34:21 2011 +0200 gdi32: Implement EnumDeviceFonts as a standard driver entry point. --- dlls/gdi32/driver.c | 2 +- dlls/gdi32/font.c | 58 +++++++++++++++----------------------------- dlls/gdi32/freetype.c | 18 ++++--------- dlls/gdi32/gdi_private.h | 1 - dlls/wineps.drv/builtin.c | 18 +++++++------ dlls/winex11.drv/xfont.c | 20 ++++++++------- 6 files changed, 48 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbd81d391c641083ba05d…

1 0

Alexandre Julliard : gdi32: Rename the EnumDeviceFonts entry point to EnumFonts since it' s not limited to device fonts.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 2b1b11d6816cd98553f2199920e4b56810a2fea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1b11d6816cd98553f219992… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 15:37:10 2011 +0200 gdi32: Rename the EnumDeviceFonts entry point to EnumFonts since it's not limited to device fonts. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/freetype.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/wineps.drv/builtin.c | 8 ++++---- dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 3 +-- dlls/winex11.drv/xfont.c | 8 ++++---- dlls/winex11.drv/xrender.c | 2 +- include/wine/gdi_driver.h | 2 +- 14 files changed, 24 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b1b11d6816cd98553f21…

1 0

Alexandre Julliard : gdi32: Add driver entry points for a number of font functions.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: a8444d7fd18a05c06cc9f785a1c8780e68361e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8444d7fd18a05c06cc9f785a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 21:51:39 2011 +0200 gdi32: Add driver entry points for a number of font functions. --- dlls/gdi32/dibdrv/dc.c | 13 +++++++ dlls/gdi32/driver.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/init.c | 13 +++++++ dlls/gdi32/freetype.c | 13 +++++++ dlls/gdi32/mfdrv/init.c | 13 +++++++ dlls/wineps.drv/init.c | 13 +++++++ dlls/winex11.drv/init.c | 13 +++++++ dlls/winex11.drv/xrender.c | 13 +++++++ include/wine/gdi_driver.h | 15 ++++++++- 9 files changed, 185 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8444d7fd18a05c06cc9f…

1 0

Piotr Caban : msxml3: Make positions returned by ISAXLocator compatible with msxml6.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: e84c41028be1761c4123cb76b61ff761ab60a259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84c41028be1761c4123cb76b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 20:08:46 2011 +0200 msxml3: Make positions returned by ISAXLocator compatible with msxml6. --- dlls/msxml3/factory.c | 10 ++++++-- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/saxreader.c | 48 ++++++++++++++++++++++++++++++++++++------ 3 files changed, 49 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 0452ef7..1192780 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -81,7 +81,12 @@ static const struct clsid_version_t clsid_versions_table[] = { &CLSID_MXXMLWriter, MSXML_DEFAULT }, { &CLSID_MXXMLWriter30, MSXML3 }, { &CLSID_MXXMLWriter40, MSXML4 }, - { &CLSID_MXXMLWriter60, MSXML6 } + { &CLSID_MXXMLWriter60, MSXML6 }, + + { &CLSID_SAXXMLReader, MSXML_DEFAULT }, + { &CLSID_SAXXMLReader30, MSXML3 }, + { &CLSID_SAXXMLReader40, MSXML4 }, + { &CLSID_SAXXMLReader60, MSXML6 } }; static MSXML_VERSION get_msxml_version(const GUID *clsid) @@ -267,7 +272,6 @@ static HRESULT DOMClassFactory_Create(const GUID *clsid, REFIID riid, void **ppv } static ClassFactory xmldoccf = { { &ClassFactoryVtbl }, XMLDocument_create }; -static ClassFactory saxreadcf = { { &ClassFactoryVtbl }, SAXXMLReader_create }; static ClassFactory httpreqcf = { { &ClassFactoryVtbl }, XMLHTTPRequest_create }; static ClassFactory xsltemplatecf = { { &ClassFactoryVtbl }, XSLTemplate_create }; static ClassFactory mxnsmanagercf = { {&ClassFactoryVtbl }, MXNamespaceManager_create }; @@ -317,7 +321,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) IsEqualCLSID( rclsid, &CLSID_SAXXMLReader40 ) || IsEqualCLSID( rclsid, &CLSID_SAXXMLReader60 )) { - cf = &saxreadcf.IClassFactory_iface; + return DOMClassFactory_Create(rclsid, riid, ppv, SAXXMLReader_create); } else if( IsEqualCLSID( rclsid, &CLSID_XMLHTTPRequest ) || IsEqualCLSID( rclsid, &CLSID_XMLHTTP) || diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 3e057bb..2962a0e 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -433,7 +433,7 @@ extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, B extern HRESULT DOMDocument_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN; extern HRESULT SchemaCache_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN; extern HRESULT XMLDocument_create(IUnknown*, void**) DECLSPEC_HIDDEN; -extern HRESULT SAXXMLReader_create(IUnknown*, void**) DECLSPEC_HIDDEN; +extern HRESULT SAXXMLReader_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN; extern HRESULT XMLHTTPRequest_create(IUnknown*, void **) DECLSPEC_HIDDEN; extern HRESULT XSLTemplate_create(IUnknown*, void**) DECLSPEC_HIDDEN; extern HRESULT MXWriter_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 45f7e909..e43afce 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -92,6 +92,7 @@ typedef struct _saxreader BOOL isParsing; struct bstrpool pool; enum ReaderFeatures features; + MSXML_VERSION version; } saxreader; typedef struct _saxlocator @@ -1155,6 +1156,13 @@ static void libxmlStartDocument(void *ctx) saxlocator *This = ctx; HRESULT hr; + if(This->saxreader->version >= MSXML6) { + xmlChar *end = (xmlChar*)This->pParserCtxt->input->cur; + while(end>This->pParserCtxt->input->base && *end!='>') + end--; + update_position(This, end); + } + if(has_content_handler(This)) { if(This->vbInterface) @@ -1174,8 +1182,15 @@ static void libxmlEndDocument(void *ctx) saxlocator *This = ctx; HRESULT hr; - This->column = 0; - This->line = 0; + if(This->saxreader->version >= MSXML6) { + update_position(This, NULL); + if(This->column > 1) + This->line++; + This->column = 0; + } else { + This->column = 0; + This->line = 0; + } if(This->ret != S_OK) return; @@ -1208,7 +1223,9 @@ static void libxmlStartElementNS( saxattributes *attr; int index; - if(*(This->pParserCtxt->input->cur) == '/') + if(This->saxreader->version >= MSXML6) + update_position(This, NULL); + else if(*(This->pParserCtxt->input->cur) == '/') update_position(This, (xmlChar*)This->pParserCtxt->input->cur+2); else update_position(This, (xmlChar*)This->pParserCtxt->input->cur+1); @@ -1274,9 +1291,13 @@ static void libxmlEndElementNS( int nsNr, index; end = (xmlChar*)This->pParserCtxt->input->cur; - if(*(end-1) != '>' || *(end-2) != '/') + if(This->saxreader->version >= MSXML6) { + while(end>This->pParserCtxt->input->base && *end!='>') + end--; + } else if(*(end-1) != '>' || *(end-2) != '/') { while(end-2>=This->pParserCtxt->input->base && *(end-2)!='<' && *(end-1)!='/') end--; + } update_position(This, end); @@ -1362,6 +1383,18 @@ static void libxmlCharacters( if(!lastEvent) *end = '\n'; + if(This->saxreader->version >= MSXML6) { + update_position(This, end); + if(*end == '\n') { + This->line++; + This->column = 1; + } else + This->column++; + + if(!lastEvent) + This->column = 0; + } + Chars = pooled_bstr_from_xmlCharN(&This->saxreader->pool, cur, end-cur+1); if(This->vbInterface) hr = IVBSAXContentHandler_characters( @@ -1905,7 +1938,7 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, B locator->publicId = NULL; locator->systemId = NULL; locator->lastCur = NULL; - locator->line = 0; + locator->line = (reader->version>=MSXML6 ? 1 : 0); locator->column = 0; locator->ret = S_OK; locator->nsStackSize = 8; @@ -3046,7 +3079,7 @@ static const struct ISAXXMLReaderVtbl isaxreader_vtbl = isaxxmlreader_parseURL }; -HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT SAXXMLReader_create(MSXML_VERSION version, IUnknown *pUnkOuter, LPVOID *ppObj) { saxreader *reader; @@ -3072,6 +3105,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->pool.index = 0; reader->pool.len = 0; reader->features = Namespaces; + reader->version = version; memset(&reader->sax, 0, sizeof(xmlSAXHandler)); reader->sax.initialized = XML_SAX2_MAGIC; @@ -3095,7 +3129,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) #else -HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT SAXXMLReader_create(MSXML_VERSION version, IUnknown *pUnkOuter, LPVOID *ppObj) { MESSAGE("This program tried to use a SAX XML Reader object, but\n" "libxml2 support was not present at compile time.\n");

1 0

Piotr Caban : msxml3: Accept S_FALSE as a valid callback result when msxml6 is used.
by Alexandre Julliard 25 Oct '11

25 Oct '11

Module: wine Branch: master Commit: 2b671cad9637b8151bdf2c532cb9c9273e0bdf04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b671cad9637b8151bdf2c532… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 20:08:55 2011 +0200 msxml3: Accept S_FALSE as a valid callback result when msxml6 is used. --- dlls/msxml3/saxreader.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index e43afce..344393a 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1170,7 +1170,7 @@ static void libxmlStartDocument(void *ctx) else hr = ISAXContentHandler_startDocument(This->saxreader->contentHandler); - if(hr != S_OK) + if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) format_error_message_from_id(This, hr); } @@ -1201,7 +1201,7 @@ static void libxmlEndDocument(void *ctx) else hr = ISAXContentHandler_endDocument(This->saxreader->contentHandler); - if(hr != S_OK) + if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) format_error_message_from_id(This, hr); } } @@ -1248,7 +1248,7 @@ static void libxmlStartElementNS( Prefix, SysStringLen(Prefix), Uri, SysStringLen(Uri)); - if(hr != S_OK) + if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) { format_error_message_from_id(This, hr); return; @@ -1274,7 +1274,7 @@ static void libxmlStartElementNS( } } - if(hr != S_OK) + if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) format_error_message_from_id(This, hr); } @@ -1320,7 +1320,7 @@ static void libxmlEndElementNS( LocalName, SysStringLen(LocalName), QName, SysStringLen(QName)); - if(hr != S_OK) + if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) { format_error_message_from_id(This, hr); return; @@ -1339,7 +1339,7 @@ static void libxmlEndElementNS( This->saxreader->contentHandler, Prefix, SysStringLen(Prefix)); - if(hr != S_OK) + if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) { format_error_message_from_id(This, hr); return; @@ -1404,7 +1404,7 @@ static void libxmlCharacters( This->saxreader->contentHandler, Chars, SysStringLen(Chars)); - if(hr != S_OK) + if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) { format_error_message_from_id(This, hr); return;

1 0

André Hentschel : shell32: Use MAX_PATH for a DOS path .
by Alexandre Julliard 24 Oct '11

24 Oct '11

Module: wine Branch: master Commit: 3a9cfa544a6c5e3eca05b5230dd413123444ba2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9cfa544a6c5e3eca05b5230… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 24 19:18:16 2011 +0200 shell32: Use MAX_PATH for a DOS path. --- dlls/shell32/shfldr_unixfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 606fa84..2dc5920 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -369,7 +369,7 @@ static inline BOOL UNIXFS_is_pidl_of_type(LPCITEMIDLIST pIDL, SHCONTF fFilter) { static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) { char *pPathTail, *pElement, *pCanonicalTail, szPath[FILENAME_MAX], *pszUnixPath, has_failed = 0, mb_path[FILENAME_MAX]; - WCHAR wszDrive[] = { '?', ':', '\\', 0 }, dospath[PATH_MAX], *dospath_end; + WCHAR wszDrive[] = { '?', ':', '\\', 0 }, dospath[MAX_PATH], *dospath_end; int cDriveSymlinkLen; void *redir;

1 0