October 2011 - Wine-Commits

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

Oct. 24, 2011

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

Thomas Faber : riched20: Simplify ME_PrepareParagraphForWrapping.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: 791d000f966525ce0f3b9033ec2f0c462c5c54e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=791d000f966525ce0f3b9033e… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat Oct 22 20:30:13 2011 +0200 riched20: Simplify ME_PrepareParagraphForWrapping. --- dlls/riched20/wrap.c | 44 +++++++++++++++++--------------------------- 1 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index e06db72..cca2cb1 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -481,38 +481,28 @@ static int ME_GetParaLineSpace(ME_Context* c, ME_Paragraph* para) } static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) { - ME_DisplayItem *p, *pRow; + ME_DisplayItem *p; tp->member.para.nWidth = 0; - /* remove all items that will be reinserted by paragraph wrapper anyway */ + /* remove row start items as they will be reinserted by the + * paragraph wrapper anyway */ tp->member.para.nRows = 0; - for (p = tp->next; p!=tp->member.para.next_para; p = p->next) { - switch(p->type) { - case diStartRow: - pRow = p; - p = p->prev; - ME_Remove(pRow); - ME_DestroyDisplayItem(pRow); - break; - default: - break; + for (p = tp->next; p != tp->member.para.next_para; p = p->next) { + if (p->type == diStartRow) { + ME_DisplayItem *pRow = p; + p = p->prev; + ME_Remove(pRow); + ME_DestroyDisplayItem(pRow); } } - /* join runs that can be joined, set up flags */ - for (p = tp->next; p!=tp->member.para.next_para; p = p->next) { - switch(p->type) { - case diStartRow: assert(0); break; /* should have deleted it */ - case diRun: - while (p->next->type == diRun) { /* FIXME */ - if (ME_CanJoinRuns(&p->member.run, &p->next->member.run)) { - ME_JoinRuns(c->editor, p); - } - else - break; - } - break; - default: - break; + /* join runs that can be joined */ + for (p = tp->next; p != tp->member.para.next_para; p = p->next) { + assert(p->type != diStartRow); /* should have been deleted above */ + if (p->type == diRun) { + while (p->next->type == diRun && /* FIXME */ + ME_CanJoinRuns(&p->member.run, &p->next->member.run)) { + ME_JoinRuns(c->editor, p); + } } } }

1 0

Piotr Caban : msxml3: Don't report fatal errors many times.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

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

Piotr Caban : msxml3: Return parser result in detach_url.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

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

Marcus Meissner : winex11.drv: WORD and BYTE swapped in 555-> 1 bit converter (Coverity).
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

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

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: a65ef29151936fccd116932a260db19a319cb081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65ef29151936fccd116932a2… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Oct 21 19:26:54 2011 +0200 po: Update Italian translation. --- po/it.po | 38 +++++++++++++------------------------- 1 files changed, 13 insertions(+), 25 deletions(-) diff --git a/po/it.po b/po/it.po index 940f22b..8e49841 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-10-18 20:40+0200\n" +"PO-Revision-Date: 2011-10-21 19:24+0200\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -7701,9 +7701,8 @@ msgstr "" "\n" #: attrib.rc:28 -#, fuzzy msgid "%1: File Not Found\n" -msgstr "%s : File non trovato\n" +msgstr "%1 : File non trovato\n" #: attrib.rc:47 msgid "" @@ -8649,14 +8648,12 @@ msgstr "" "Dove 'servizio' è il nome del servizio da fermare.\n" #: net.rc:30 -#, fuzzy msgid "Stopping dependent service: %1\n" -msgstr "Interrompendo il servizio dipendente: %s\n" +msgstr "Interrompendo il servizio dipendente: %1\n" #: net.rc:31 -#, fuzzy msgid "Could not stop service %1\n" -msgstr "Impossibile interrompere il servizio %s\n" +msgstr "Impossibile interrompere il servizio %1\n" #: net.rc:32 msgid "Could not get handle to service control manager.\n" @@ -8668,34 +8665,28 @@ msgid "Could not get handle to service.\n" msgstr "Impossibile ottenere l'handle del servizio.\n" #: net.rc:34 -#, fuzzy msgid "The %1 service is starting.\n" -msgstr "Il servizio %s sarà avviato.\n" +msgstr "Il servizio %1 sarà avviato.\n" #: net.rc:35 -#, fuzzy msgid "The %1 service was started successfully.\n" -msgstr "Il servizio %s è stato avviato con successo.\n" +msgstr "Il servizio %1 è stato avviato con successo.\n" #: net.rc:36 -#, fuzzy msgid "The %1 service failed to start.\n" -msgstr "Impossibile avviare il servizio %s.\n" +msgstr "Impossibile avviare il servizio %1.\n" #: net.rc:37 -#, fuzzy msgid "The %1 service is stopping.\n" -msgstr "Il servizio %s sarà fermato.\n" +msgstr "Il servizio %1 sarà fermato.\n" #: net.rc:38 -#, fuzzy msgid "The %1 service was stopped successfully.\n" -msgstr "Il servizio %s è stato fermato con successo.\n" +msgstr "Il servizio %1 è stato fermato con successo.\n" #: net.rc:39 -#, fuzzy msgid "The %1 service failed to stop.\n" -msgstr "Impossibile fermare il servizio %s.\n" +msgstr "Impossibile fermare il servizio %1.\n" #: net.rc:41 msgid "There are no entries in the list.\n" @@ -8712,9 +8703,8 @@ msgstr "" "---------------------------------------------------------------\n" #: net.rc:43 -#, fuzzy msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%s %s %s Risorse aperte: %lu\n" +msgstr "%1 %2 %3 Risorse aperte: %4!u!\n" #: net.rc:44 msgid "OK" @@ -10771,9 +10761,8 @@ msgstr "" "finestra" #: wineconsole.rc:34 -#, fuzzy msgid "Each character is %1!u! pixels wide on %2!u! pixels high" -msgstr "Il carattere è largo %ld pixel e alto %ld pixel" +msgstr "Ogni carattere è largo %1!u! pixel e alto %2!u! pixel" #: wineconsole.rc:35 msgid "This is a test" @@ -10997,9 +10986,8 @@ msgid "Security" msgstr "Sicurezza" #: winefile.rc:120 -#, fuzzy msgid "%1 of %2 free" -msgstr "liberi %s di %s" +msgstr "liberi %1 di %2" #: winemine.rc:34 msgid "&Game"

1 0

Piotr Caban : msxml3/tests: Added saxreader error handling test.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

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

Piotr Caban : msxml3: Prefer to report msxml error over libxml parsing error.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

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

Jacek Caban : vbscript: Fixed local variable count calculation.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

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

Thomas Faber : riched20/tests: Test format rect adaption to window size and behavior with zero-sized windows .
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: 3ac36cb50f881ce83804132a8dcb83e4909ffdb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac36cb50f881ce83804132a8… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Oct 23 00:46:12 2011 +0200 riched20/tests: Test format rect adaption to window size and behavior with zero-sized windows. --- dlls/riched20/tests/editor.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index d8eefbb..827f35d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6364,6 +6364,49 @@ static void test_format_rect(void) rc.top, rc.left, rc.bottom, rc.right, expected.top, expected.left, expected.bottom, expected.right); + /* Reset to default rect and check how the format rect adjusts to window + * resize and how it copes with very small windows */ + SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)NULL); + + MoveWindow(hwnd, 0, 0, 100, 30, FALSE); + GetClientRect(hwnd, &clientRect); + + expected = clientRect; + expected.left += 1; + expected.right -= 1; + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + + MoveWindow(hwnd, 0, 0, 0, 30, FALSE); + GetClientRect(hwnd, &clientRect); + + expected = clientRect; + expected.left += 1; + expected.right -= 1; + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + + MoveWindow(hwnd, 0, 0, 100, 0, FALSE); + GetClientRect(hwnd, &clientRect); + + expected = clientRect; + expected.left += 1; + expected.right -= 1; + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + DestroyWindow(hwnd); /* The extended window style affects the formatting rectangle. */

1 0