winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
October 2011
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
783 discussions
Start a n
N
ew thread
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
0
0
Alexandre Julliard : gdi32: Implement GetTextMetrics as a standard driver entry point.
by Alexandre Julliard
24 Oct '11
24 Oct '11
Module: wine Branch: master Commit: 20070d0838e5b28a75a64a1a26ef3eef14eeb80d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=20070d0838e5b28a75a64a1a2…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 14:12:23 2011 +0200 gdi32: Implement GetTextMetrics as a standard driver entry point. --- dlls/gdi32/font.c | 10 +++------- dlls/gdi32/freetype.c | 22 +++++++++++----------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d08ba4b..9770f1e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1222,17 +1222,13 @@ BOOL WINAPI GetTextMetricsA( HDC hdc, TEXTMETRICA *metrics ) */ BOOL WINAPI GetTextMetricsW( HDC hdc, TEXTMETRICW *metrics ) { + PHYSDEV physdev; BOOL ret = FALSE; DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; - if (dc->gdiFont) - ret = WineEngGetTextMetrics(dc->gdiFont, metrics); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); - ret = physdev->funcs->pGetTextMetrics( physdev, metrics ); - } + physdev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); + ret = physdev->funcs->pGetTextMetrics( physdev, metrics ); if (ret) { diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ad20bf8..a2b57eb 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6209,16 +6209,22 @@ DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format, } /************************************************************* - * WineEngGetTextMetrics - * + * freetype_GetTextMetrics */ -BOOL WineEngGetTextMetrics(GdiFont *font, LPTEXTMETRICW ptm) +static BOOL freetype_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics ) { + struct freetype_physdev *physdev = get_freetype_dev( dev ); BOOL ret; + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetTextMetrics ); + return dev->funcs->pGetTextMetrics( dev, metrics ); + } + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - ret = get_text_metrics( font, ptm ); + ret = get_text_metrics( physdev->font, metrics ); LeaveCriticalSection( &freetype_cs ); return ret; } @@ -7089,7 +7095,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pGetPixelFormat */ NULL, /* pGetSystemPaletteEntries */ freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */ - NULL, /* pGetTextMetrics */ + freetype_GetTextMetrics, /* pGetTextMetrics */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ NULL, /* pLineTo */ @@ -7196,12 +7202,6 @@ DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format, return GDI_ERROR; } -BOOL WineEngGetTextMetrics(GdiFont *font, LPTEXTMETRICW ptm) -{ - ERR("called but we don't have FreeType\n"); - return FALSE; -} - UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, OUTLINETEXTMETRICW *potm) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ad7b049..51fbf2e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -312,7 +312,6 @@ extern UINT WineEngGetOutlineTextMetrics(GdiFont*, UINT, LPOUTLINETEXTMETRICW) D extern UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) DECLSPEC_HIDDEN; extern BOOL WineEngGetTextExtentExPointI(GdiFont*, const WORD *, INT, INT, LPINT, LPINT, LPSIZE) DECLSPEC_HIDDEN; extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR) DECLSPEC_HIDDEN; -extern BOOL WineEngGetTextMetrics(GdiFont*, LPTEXTMETRICW) DECLSPEC_HIDDEN; extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN; extern BOOL WineEngRealizationInfo(GdiFont*, realization_info_t*) DECLSPEC_HIDDEN;
1
0
0
0
Alexandre Julliard : gdi32: Add a few helper functions for computing font metrics.
by Alexandre Julliard
24 Oct '11
24 Oct '11
Module: wine Branch: master Commit: ca4177997c01d69795cabbc5a8dccb4122b08ec8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ca4177997c01d69795cabbc5a…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 14:09:33 2011 +0200 gdi32: Add a few helper functions for computing font metrics. --- dlls/gdi32/freetype.c | 192 ++++++++++++++++++++++++------------------------- 1 files changed, 95 insertions(+), 97 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca4177997c01d69795cab…
1
0
0
0
Marcus Meissner : winex11.drv: WORD and BYTE swapped in 555-> 1 bit converter (Coverity).
by Alexandre Julliard
24 Oct '11
24 Oct '11
Module: wine Branch: master Commit: 0101149c7a28f0863b3f5a8e0faa2913ccede6c2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0101149c7a28f0863b3f5a8e0…
Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 24 07:51:30 2011 +0200 winex11.drv: WORD and BYTE swapped in 555->1 bit converter (Coverity). --- dlls/winex11.drv/dib.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index a1ce9bb..b70dcfa 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -594,12 +594,13 @@ static void X11DRV_DIB_GetImageBits_1( int lines, BYTE *dstbits, } else if (bmpImage->blue_mask==0x7c00) { /* ==== bgr 555 bmp -> pal 1 dib ==== */ for (h=0; h<lines; h++) { - WORD dstval; + BYTE dstval; srcpixel=srcbits; dstbyte=dstbits; dstval=0; for (x=0; x<width; x++) { - BYTE srcval; + WORD srcval; + srcval=*srcpixel++; dstval|=(X11DRV_DIB_GetNearestIndex (colors, 2,
1
0
0
0
Piotr Caban : msxml3/tests: Added saxreader error handling test.
by Alexandre Julliard
24 Oct '11
24 Oct '11
Module: wine Branch: master Commit: 5eb6994dc2e3bf48f1b6d3b25feec430b4a27afc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5eb6994dc2e3bf48f1b6d3b25…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 12:55:22 2011 +0200 msxml3/tests: Added saxreader error handling test. --- dlls/msxml3/tests/saxreader.c | 70 +++++++++++++++++++++++++++------------- 1 files changed, 47 insertions(+), 23 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index c52e03b..e1c20cc 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -81,7 +81,10 @@ typedef enum _CH { CH_CHARACTERS, CH_IGNORABLEWHITESPACE, CH_PROCESSINGINSTRUCTION, - CH_SKIPPEDENTITY + CH_SKIPPEDENTITY, + EH_ERROR, + EH_FATALERROR, + EG_IGNORABLEWARNING } CH; static const WCHAR szSimpleXML[] = { @@ -125,6 +128,7 @@ typedef struct _contenthandlercheck { const char *arg1; const char *arg2; const char *arg3; + HRESULT ret; } content_handler_test; static content_handler_test contentHandlerTest1[] = { @@ -165,6 +169,19 @@ static content_handler_test contentHandlerTest2[] = { { CH_ENDTEST } }; +static content_handler_test contentHandlerTestError[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, NULL, NULL, NULL, E_FAIL }, + { EH_FATALERROR, 0, 0, NULL, NULL, NULL, E_FAIL }, + { CH_ENDTEST } +}; + +static content_handler_test contentHandlerTestCallbackResults[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, NULL, NULL, NULL, S_FALSE }, + { CH_STARTDOCUMENT, 0, 0, NULL, NULL, NULL, S_FALSE }, + { EH_FATALERROR, 0, 0, NULL, NULL, NULL, S_FALSE }, + { CH_ENDTEST } +}; + static content_handler_test *expectCall; static ISAXLocator *locator; @@ -248,8 +265,7 @@ static HRESULT WINAPI contentHandler_putDocumentLocator( locator = pLocator; test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_startDocument( @@ -260,8 +276,7 @@ static HRESULT WINAPI contentHandler_startDocument( test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_endDocument( @@ -272,8 +287,7 @@ static HRESULT WINAPI contentHandler_endDocument( test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_startPrefixMapping( @@ -290,8 +304,7 @@ static HRESULT WINAPI contentHandler_startPrefixMapping( test_saxstr(__LINE__, pUri, nUri, expectCall->arg2); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_endPrefixMapping( @@ -305,8 +318,7 @@ static HRESULT WINAPI contentHandler_endPrefixMapping( test_saxstr(__LINE__, pPrefix, nPrefix, expectCall->arg1); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_startElement( @@ -327,8 +339,7 @@ static HRESULT WINAPI contentHandler_startElement( test_saxstr(__LINE__, pQName, nQName, expectCall->arg3); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_endElement( @@ -348,8 +359,7 @@ static HRESULT WINAPI contentHandler_endElement( test_saxstr(__LINE__, pQName, nQName, expectCall->arg3); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_characters( @@ -363,8 +373,7 @@ static HRESULT WINAPI contentHandler_characters( test_saxstr(__LINE__, pChars, nChars, expectCall->arg1); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_ignorableWhitespace( @@ -378,8 +387,7 @@ static HRESULT WINAPI contentHandler_ignorableWhitespace( test_saxstr(__LINE__, pChars, nChars, expectCall->arg1); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_processingInstruction( @@ -396,8 +404,7 @@ static HRESULT WINAPI contentHandler_processingInstruction( test_saxstr(__LINE__, pData, nData, expectCall->arg2); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } static HRESULT WINAPI contentHandler_skippedEntity( @@ -411,8 +418,7 @@ static HRESULT WINAPI contentHandler_skippedEntity( test_saxstr(__LINE__, pName, nName, expectCall->arg1); test_locator(__LINE__, expectCall->line, expectCall->column); - expectCall++; - return S_OK; + return (expectCall++)->ret; } @@ -473,6 +479,7 @@ static HRESULT WINAPI isaxerrorHandler_error( const WCHAR *pErrorMessage, HRESULT hrErrorCode) { + ok(0, "unexpected call\n"); return S_OK; } @@ -482,6 +489,12 @@ static HRESULT WINAPI isaxerrorHandler_fatalError( const WCHAR *pErrorMessage, HRESULT hrErrorCode) { + if(!test_expect_call(EH_FATALERROR)) + return E_FAIL; + + ok(hrErrorCode == expectCall->ret, "hrErrorCode = %x, expected %x\n", hrErrorCode, expectCall->ret); + + expectCall++; return S_OK; } @@ -491,6 +504,7 @@ static HRESULT WINAPI isaxerrorHanddler_ignorableWarning( const WCHAR *pErrorMessage, HRESULT hrErrorCode) { + ok(0, "unexpected call\n"); return S_OK; } @@ -1141,6 +1155,16 @@ static void test_saxreader(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); test_expect_call(CH_ENDTEST); + expectCall = contentHandlerTestError; + hr = ISAXXMLReader_parseURL(reader, testXmlW); + ok(hr == E_FAIL, "Expected E_FAIL, got %08x\n", hr); + test_expect_call(CH_ENDTEST); + + expectCall = contentHandlerTestCallbackResults; + hr = ISAXXMLReader_parseURL(reader, testXmlW); + ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + test_expect_call(CH_ENDTEST); + DeleteFileA(testXmlA); hr = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER,
1
0
0
0
Piotr Caban : msxml3: Prefer to report msxml error over libxml parsing error.
by Alexandre Julliard
24 Oct '11
24 Oct '11
Module: wine Branch: master Commit: 6927a11eabe50c911d4d7ac943fda5c797be555d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6927a11eabe50c911d4d7ac94…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 12:55:13 2011 +0200 msxml3: Prefer to report msxml error over libxml parsing error. --- dlls/msxml3/saxreader.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index fe78375..45f7e909 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1458,8 +1458,10 @@ static void libxmlFatalError(void *ctx, const char *msg, ...) DWORD len; va_list args; - if(This->ret != S_OK) + if(This->ret != S_OK) { + xmlStopParser(This->pParserCtxt); return; + } va_start(args, msg); vsprintf(message, msg, args); @@ -1966,8 +1968,10 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz locator->pParserCtxt->userData = locator; This->isParsing = TRUE; - if(xmlParseDocument(locator->pParserCtxt) == -1) hr = E_FAIL; - else hr = locator->ret; + if(xmlParseDocument(locator->pParserCtxt)==-1 && locator->ret==S_OK) + hr = E_FAIL; + else + hr = locator->ret; This->isParsing = FALSE; if(locator->pParserCtxt) @@ -2010,7 +2014,7 @@ static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInt if(dataRead != sizeof(data)) { ret = xmlParseChunk(locator->pParserCtxt, data, 0, 1); - hr = ret != XML_ERR_OK ? E_FAIL : locator->ret; + hr = ret!=XML_ERR_OK && locator->ret==S_OK ? E_FAIL : locator->ret; } else { @@ -2021,14 +2025,14 @@ static HRESULT internal_parseStream(saxreader *This, IStream *stream, BOOL vbInt if (FAILED(hr)) break; ret = xmlParseChunk(locator->pParserCtxt, data, dataRead, 0); - hr = ret != XML_ERR_OK ? E_FAIL : locator->ret; + hr = ret!=XML_ERR_OK && locator->ret==S_OK ? E_FAIL : locator->ret; if (hr != S_OK) break; if (dataRead != sizeof(data)) { ret = xmlParseChunk(locator->pParserCtxt, data, 0, 1); - hr = ret != XML_ERR_OK ? E_FAIL : locator->ret; + hr = ret!=XML_ERR_OK && locator->ret==S_OK ? E_FAIL : locator->ret; break; } }
1
0
0
0
Piotr Caban : msxml3: Return parser result in detach_url.
by Alexandre Julliard
24 Oct '11
24 Oct '11
Module: wine Branch: master Commit: 41eba1c30ddd4050fa8064a205c84418a3d31859 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=41eba1c30ddd4050fa8064a20…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 12:55:00 2011 +0200 msxml3: Return parser result in detach_url. --- dlls/msxml3/bsc.c | 11 +++++++++-- dlls/msxml3/domdoc.c | 7 +++++-- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/saxreader.c | 4 +--- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index 9a8be97..a0b9022 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -53,6 +53,7 @@ struct bsc_t { IBinding *binding; IStream *memstream; + HRESULT hres; }; static inline bsc_t *impl_from_IBindStatusCallback( IBindStatusCallback *iface ) @@ -173,7 +174,7 @@ static HRESULT WINAPI bsc_OnStopBinding( DWORD len = GlobalSize(hglobal); char *ptr = GlobalLock(hglobal); - hr = This->onDataAvailable(This->obj, ptr, len); + This->hres = hr = This->onDataAvailable(This->obj, ptr, len); GlobalUnlock(hglobal); } @@ -281,6 +282,7 @@ HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), voi bsc->onDataAvailable = onDataAvailable; bsc->binding = NULL; bsc->memstream = NULL; + bsc->hres = S_OK; hr = RegisterBindStatusCallback(pbc, &bsc->IBindStatusCallback_iface, NULL, 0); if(SUCCEEDED(hr)) @@ -309,11 +311,16 @@ HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), voi return hr; } -void detach_bsc(bsc_t *bsc) +HRESULT detach_bsc(bsc_t *bsc) { + HRESULT hres; + if(bsc->binding) IBinding_Abort(bsc->binding); bsc->obj = NULL; + hres = bsc->hres; IBindStatusCallback_Release(&bsc->IBindStatusCallback_iface); + + return hres; } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 144648e..24df895 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2075,8 +2075,11 @@ static HRESULT doread( domdoc *This, LPWSTR filename ) if(FAILED(hr)) return hr; - if(This->bsc) - detach_bsc(This->bsc); + if(This->bsc) { + hr = detach_bsc(This->bsc); + if(FAILED(hr)) + return hr; + } This->bsc = bsc; return S_OK; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index b9ec423..3e057bb 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -467,7 +467,7 @@ static inline const CLSID* SchemaCache_version(MSXML_VERSION v) typedef struct bsc_t bsc_t; HRESULT bind_url(LPCWSTR, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; -void detach_bsc(bsc_t*) DECLSPEC_HIDDEN; +HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b2c3f25..fe78375 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2298,9 +2298,7 @@ static HRESULT internal_parseURL( if(FAILED(hr)) return hr; - detach_bsc(bsc); - - return S_OK; + return detach_bsc(bsc); } static HRESULT internal_putProperty(
1
0
0
0
Piotr Caban : msxml3: Don't report fatal errors many times.
by Alexandre Julliard
24 Oct '11
24 Oct '11
Module: wine Branch: master Commit: f8112cc548ec77719ac56e84ed25b6443645c649 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f8112cc548ec77719ac56e84e…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 12:54:47 2011 +0200 msxml3: Don't report fatal errors many times. --- dlls/msxml3/saxreader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0be595c..b2c3f25 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1458,6 +1458,9 @@ static void libxmlFatalError(void *ctx, const char *msg, ...) DWORD len; va_list args; + if(This->ret != S_OK) + return; + va_start(args, msg); vsprintf(message, msg, args); va_end(args);
1
0
0
0
Alexandre Julliard : mmdevapi/tests: Don't crash on test failure.
by Alexandre Julliard
24 Oct '11
24 Oct '11
Module: wine Branch: master Commit: 6c68319863ee68f97e113d291b1501d15b5d095a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6c68319863ee68f97e113d291…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 14:28:08 2011 +0200 mmdevapi/tests: Don't crash on test failure. --- dlls/mmdevapi/tests/render.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 494c00d..ff0aa62 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -719,6 +719,7 @@ static void test_session(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ses1_ac1); ok(hr == S_OK, "Activation failed with %08x\n", hr); + if (FAILED(hr)) return; hr = IAudioClient_GetMixFormat(ses1_ac1, &pwfx); ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); @@ -730,6 +731,11 @@ static void test_session(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ses1_ac2); ok(hr == S_OK, "Activation failed with %08x\n", hr); + if (FAILED(hr)) + { + IAudioClient_Release(ses1_ac1); + return; + } hr = IAudioClient_Initialize(ses1_ac2, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, &ses1_guid);
1
0
0
0
Jacek Caban : vbscript: Fixed local variable count calculation.
by Alexandre Julliard
24 Oct '11
24 Oct '11
Module: wine Branch: master Commit: 851856af67accf8cb901ec8252f83661b96290c4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=851856af67accf8cb901ec825…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 24 12:30:48 2011 +0200 vbscript: Fixed local variable count calculation. --- dlls/vbscript/compile.c | 2 +- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 153e9b0..9b3f3e6 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -746,6 +746,7 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) return E_FAIL; } + ctx->func->var_cnt++; if(!dim_decl->next) break; dim_decl = dim_decl->next; @@ -753,7 +754,6 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) dim_decl->next = ctx->dim_decls; ctx->dim_decls = stat->dim_decls; - ctx->func->var_cnt++; return S_OK; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index ec552b1..0025d69 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -470,6 +470,7 @@ Sub TestSubLocalVal x = false Call ok(not x, "local x is not false?") Dim x + Dim a,b, c End Sub x = true
1
0
0
0
← Newer
1
...
15
16
17
18
19
20
21
...
79
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
Results per page:
10
25
50
100
200