February 2013 - Wine-commits

Jörg Höhle : winmm: More compatible waveIn/Out[Un ]Prepare WHDR_* flag handling.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: d4b2d48f249341208bf3c2f48303643308d86658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b2d48f249341208bf3c2f48… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jan 27 10:43:43 2013 +0100 winmm: More compatible waveIn/Out[Un]Prepare WHDR_* flag handling. --- dlls/winmm/tests/wave.c | 23 +++++++++++++++++++++++ dlls/winmm/waveform.c | 23 +++++++++++------------ 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 97849f5..9e59e2f 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -809,6 +809,29 @@ static void wave_out_test_deviceOut(int device, double duration, "waveOutUnprepareHeader(%s): rc=%s\n",dev_name(device), wave_out_error(rc)); } + + ok(frags[0].dwFlags==(interactive ? WHDR_DONE : 0), "dwFlags(%d)=%x\n",device,frags[0].dwFlags); + + frags[0].dwFlags |= WHDR_DONE; + rc=waveOutUnprepareHeader(wout, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, "waveOutUnprepareHeader(%d): rc=%s\n",device,wave_out_error(rc)); + ok(frags[0].dwFlags==WHDR_DONE, "dwFlags(%d)=%x\n",device,frags[0].dwFlags); + + frags[0].dwFlags |= WHDR_INQUEUE; + rc=waveOutPrepareHeader(wout, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, "waveOutPrepareHeader(%d): rc=%s\n",device,wave_out_error(rc)); + ok(frags[0].dwFlags==WHDR_PREPARED, "dwFlags(%d)=%x\n",device,frags[0].dwFlags); + + frags[0].dwFlags |= WHDR_INQUEUE; + rc=waveOutPrepareHeader(wout, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, "waveOutPrepareHeader(%d): rc=%s\n",device,wave_out_error(rc)); + ok(frags[0].dwFlags==(WHDR_PREPARED|WHDR_INQUEUE), "dwFlags(%d)=%x\n",device,frags[0].dwFlags); + + frags[0].dwFlags &= ~(WHDR_INQUEUE|WHDR_DONE); + rc=waveOutUnprepareHeader(wout, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, "waveOutUnprepareHeader(%d): rc=%s\n",device,wave_out_error(rc)); + ok(frags[0].dwFlags==0, "dwFlags(%d)=%x\n",device,frags[0].dwFlags); + rc=waveOutClose(wout); ok(rc==MMSYSERR_NOERROR,"waveOutClose(%s): rc=%s\n",dev_name(device), wave_out_error(rc)); diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index e6fe360..a5ffbc0 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1517,7 +1517,7 @@ static LRESULT WINMM_PrepareHeader(HWAVE hwave, WAVEHDR *header) LeaveCriticalSection(&device->lock); header->dwFlags |= WHDR_PREPARED; - header->dwFlags &= ~WHDR_DONE; + header->dwFlags &= ~(WHDR_DONE|WHDR_INQUEUE); /* flags cleared since w2k */ return MMSYSERR_NOERROR; } @@ -1542,7 +1542,6 @@ static LRESULT WINMM_UnprepareHeader(HWAVE hwave, WAVEHDR *header) LeaveCriticalSection(&device->lock); header->dwFlags &= ~WHDR_PREPARED; - header->dwFlags |= WHDR_DONE; return MMSYSERR_NOERROR; } @@ -2782,8 +2781,8 @@ UINT WINAPI waveOutPrepareHeader(HWAVEOUT hWaveOut, if(!lpWaveOutHdr || uSize < sizeof(WAVEHDR)) return MMSYSERR_INVALPARAM; - if(lpWaveOutHdr->dwFlags & WHDR_INQUEUE) - return WAVERR_STILLPLAYING; + if(lpWaveOutHdr->dwFlags & WHDR_PREPARED) + return MMSYSERR_NOERROR; return WINMM_PrepareHeader((HWAVE)hWaveOut, lpWaveOutHdr); } @@ -2798,13 +2797,13 @@ UINT WINAPI waveOutUnprepareHeader(HWAVEOUT hWaveOut, if(!lpWaveOutHdr || uSize < sizeof(WAVEHDR)) return MMSYSERR_INVALPARAM; - - if(!(lpWaveOutHdr->dwFlags & WHDR_PREPARED)) - return MMSYSERR_NOERROR; if(lpWaveOutHdr->dwFlags & WHDR_INQUEUE) return WAVERR_STILLPLAYING; + if(!(lpWaveOutHdr->dwFlags & WHDR_PREPARED)) + return MMSYSERR_NOERROR; + return WINMM_UnprepareHeader((HWAVE)hWaveOut, lpWaveOutHdr); } @@ -3412,8 +3411,8 @@ UINT WINAPI waveInPrepareHeader(HWAVEIN hWaveIn, WAVEHDR* lpWaveInHdr, if(!lpWaveInHdr || uSize < sizeof(WAVEHDR)) return MMSYSERR_INVALPARAM; - if(lpWaveInHdr->dwFlags & WHDR_INQUEUE) - return WAVERR_STILLPLAYING; + if(lpWaveInHdr->dwFlags & WHDR_PREPARED) + return MMSYSERR_NOERROR; return WINMM_PrepareHeader((HWAVE)hWaveIn, lpWaveInHdr); } @@ -3429,12 +3428,12 @@ UINT WINAPI waveInUnprepareHeader(HWAVEIN hWaveIn, WAVEHDR* lpWaveInHdr, if(!lpWaveInHdr || uSize < sizeof(WAVEHDR)) return MMSYSERR_INVALPARAM; - if(!(lpWaveInHdr->dwFlags & WHDR_PREPARED)) - return MMSYSERR_NOERROR; - if(lpWaveInHdr->dwFlags & WHDR_INQUEUE) return WAVERR_STILLPLAYING; + if(!(lpWaveInHdr->dwFlags & WHDR_PREPARED)) + return MMSYSERR_NOERROR; + return WINMM_UnprepareHeader((HWAVE)hWaveIn, lpWaveInHdr); }

1 0

André Hentschel : ntdll: Implement RtlUnwind for ARM.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: 22c39932263a32989d80c5efa145ba12d722d048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c39932263a32989d80c5efa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 13 16:36:41 2013 +0100 ntdll: Implement RtlUnwind for ARM. --- dlls/ntdll/signal_arm.c | 55 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 6abd76b..bf94b17 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -916,9 +916,60 @@ void __wine_enter_vm86( CONTEXT *context ) /*********************************************************************** * RtlUnwind (NTDLL.@) */ -void WINAPI RtlUnwind( PVOID pEndFrame, PVOID targetIp, PEXCEPTION_RECORD pRecord, PVOID retval ) +void WINAPI RtlUnwind( void *endframe, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) { - FIXME( "Not implemented on ARM\n" ); + CONTEXT context; + EXCEPTION_RECORD record; + EXCEPTION_REGISTRATION_RECORD *frame, *dispatch; + DWORD res; + + RtlCaptureContext( &context ); + context.R0 = (DWORD)retval; + + /* build an exception record, if we do not have one */ + if (!rec) + { + record.ExceptionCode = STATUS_UNWIND; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = (void *)context.Pc; + record.NumberParameters = 0; + rec = &record; + } + + rec->ExceptionFlags |= EH_UNWINDING | (endframe ? 0 : EH_EXIT_UNWIND); + + TRACE( "code=%x flags=%x\n", rec->ExceptionCode, rec->ExceptionFlags ); + + /* get chain of exception frames */ + frame = NtCurrentTeb()->Tib.ExceptionList; + while ((frame != (EXCEPTION_REGISTRATION_RECORD*)~0UL) && (frame != endframe)) + { + /* Check frame address */ + if (endframe && ((void*)frame > endframe)) + raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); + + if (!is_valid_frame( frame )) raise_status( STATUS_BAD_STACK, rec ); + + /* Call handler */ + TRACE( "calling handler at %p code=%x flags=%x\n", + frame->Handler, rec->ExceptionCode, rec->ExceptionFlags ); + res = frame->Handler(rec, frame, &context, &dispatch); + TRACE( "handler at %p returned %x\n", frame->Handler, res ); + + switch(res) + { + case ExceptionContinueSearch: + break; + case ExceptionCollidedUnwind: + frame = dispatch; + break; + default: + raise_status( STATUS_INVALID_DISPOSITION, rec ); + break; + } + frame = __wine_pop_frame( frame ); + } } /*******************************************************************

1 0

Jacek Caban : oleaut32: Don't free a string in SysFreeString if it' s already in cache.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: ed9d78d2b96dd4c97a6402ff0d30ada47a352a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9d78d2b96dd4c97a6402ff0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 13 18:57:21 2013 +0100 oleaut32: Don't free a string in SysFreeString if it's already in cache. --- dlls/oleaut32/oleaut.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 250a812..df9216b 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -90,14 +90,15 @@ typedef struct { } u; } bstr_t; +#define BUCKET_SIZE 16 +#define BUCKET_BUFFER_SIZE 6 + typedef struct { unsigned short head; unsigned short cnt; - bstr_t *buf[6]; + bstr_t *buf[BUCKET_BUFFER_SIZE]; } bstr_cache_entry_t; -#define BUCKET_SIZE 16 - #define ARENA_INUSE_FILLER 0x55 #define ARENA_TAIL_FILLER 0xab #define ARENA_FREE_FILLER 0xfeeefeee @@ -138,7 +139,7 @@ static bstr_t *alloc_bstr(size_t size) if(cache_entry) { ret = cache_entry->buf[cache_entry->head++]; - cache_entry->head %= sizeof(cache_entry->buf)/sizeof(*cache_entry->buf); + cache_entry->head %= BUCKET_BUFFER_SIZE; cache_entry->cnt--; } @@ -257,14 +258,26 @@ void WINAPI SysFreeString(BSTR str) bstr = bstr_from_str(str); cache_entry = get_cache_entry(bstr->size+sizeof(WCHAR)); if(cache_entry) { + unsigned i; + EnterCriticalSection(&cs_bstr_cache); + /* According to tests, freeing a string that's already in cache doesn't corrupt anything. + * For that to work we need to search the cache. */ + for(i=0; i < cache_entry->cnt; i++) { + if(cache_entry->buf[(cache_entry->head+cache_entry->cnt) % BUCKET_BUFFER_SIZE] == bstr) { + WARN_(heap)("String already is in cache!\n"); + LeaveCriticalSection(&cs_bstr_cache); + return; + } + } + if(cache_entry->cnt < sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)) { - cache_entry->buf[(cache_entry->head+cache_entry->cnt)%((sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)))] = bstr; + cache_entry->buf[(cache_entry->head+cache_entry->cnt) % BUCKET_BUFFER_SIZE] = bstr; cache_entry->cnt++; if(WARN_ON(heap)) { - unsigned i, n = bstr_alloc_size(bstr->size) / sizeof(DWORD) - 1; + unsigned n = bstr_alloc_size(bstr->size) / sizeof(DWORD) - 1; bstr->size = ARENA_FREE_FILLER; for(i=0; i<n; i++) bstr->u.dwptr[i] = ARENA_FREE_FILLER;

1 0

Andrew Talbot : mscoree: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 13 Feb '13

13 Feb '13

Module: wine Branch: master Commit: 14afcb8ccd72609973520937011b17205f89c724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14afcb8ccd726099735209370… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 12 22:20:14 2013 +0000 mscoree: Avoid signed-unsigned integer comparisons. --- dlls/mscoree/metahost.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 66dde5d..eb3bc93 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -871,7 +871,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) { struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); - int num_fetched = 0; + ULONG num_fetched = 0; HRESULT hr=S_OK; IUnknown *item; @@ -903,7 +903,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, static HRESULT WINAPI InstalledRuntimeEnum_Skip(IEnumUnknown *iface, ULONG celt) { struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); - int num_fetched = 0; + ULONG num_fetched = 0; HRESULT hr=S_OK; TRACE("(%p,%u)\n", iface, celt);

1 0

Huw Davies : riched20: Move run extent calculation to wrap.c.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: c07212b3d080cf7df18c5bdb4c0e61c37bac618d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c07212b3d080cf7df18c5bdb4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 12 15:48:14 2013 +0000 riched20: Move run extent calculation to wrap.c. --- dlls/riched20/editor.h | 3 ++- dlls/riched20/run.c | 26 ++------------------------ dlls/riched20/wrap.c | 29 +++++++++++++++++++++++------ 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 4401498..5383f82 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -147,7 +147,8 @@ int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) DECLSPEC_HIDDEN; ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; -void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run) DECLSPEC_HIDDEN; +SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, + int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx) DECLSPEC_HIDDEN; void ME_CursorFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_Cursor *pCursor) DECLSPEC_HIDDEN; void ME_RunOfsFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_DisplayItem **ppPara, ME_DisplayItem **ppRun, int *pOfs) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 6f9d5b5..37445a1 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -530,8 +530,8 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) * Finds width, height, ascent and descent of a run, up to given character * (nLen). */ -static SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, - int startx, int *pAscent, int *pDescent) +SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, + int startx, int *pAscent, int *pDescent) { SIZE size; int nMaxLen = run->len; @@ -615,28 +615,6 @@ SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, } /****************************************************************************** - * ME_CalcRunExtent - * - * Updates the size of the run (fills width, ascent and descent). The height - * is calculated based on whole row's ascent and descent anyway, so no need - * to use it here. - */ -void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run) -{ - if (run->nFlags & MERF_HIDDEN) - run->nWidth = 0; - else - { - int nEnd = run->len; - SIZE size = ME_GetRunSizeCommon(c, para, run, nEnd, startx, - &run->nAscent, &run->nDescent); - run->nWidth = size.cx; - if (!size.cx) - WARN("size.cx == 0\n"); - } -} - -/****************************************************************************** * ME_SetSelectionCharFormat * * Applies a style change, either to a current selection, or to insert cursor diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 0531c97..aed04806 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -33,6 +33,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); */ /****************************************************************************** + * calc_run_extent + * + * Updates the size of the run (fills width, ascent and descent). The height + * is calculated based on whole row's ascent and descent anyway, so no need + * to use it here. + */ +static void calc_run_extent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run) +{ + if (run->nFlags & MERF_HIDDEN) run->nWidth = 0; + else + { + SIZE size = ME_GetRunSizeCommon( c, para, run, run->len, startx, &run->nAscent, &run->nDescent ); + run->nWidth = size.cx; + } +} + +/****************************************************************************** * split_run_extents * * Splits a run into two in a given place. It also updates the screen position @@ -62,7 +79,7 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite run2 = &cursor.pRun->member.run; - ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); + calc_run_extent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); run2->pt.x = run->pt.x+run->nWidth; run2->pt.y = run->pt.y; @@ -296,8 +313,8 @@ static void ME_WrapSizeRun(ME_WrapContext *wc, ME_DisplayItem *p) ME_UpdateRunFlags(wc->context->editor, &p->member.run); - ME_CalcRunExtent(wc->context, &wc->pPara->member.para, - wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, &p->member.run); + calc_run_extent(wc->context, &wc->pPara->member.para, + wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, &p->member.run); } @@ -488,9 +505,9 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) if (black) { wc->bOverflown = FALSE; pp = split_run_extents(wc, p, black); - ME_CalcRunExtent(wc->context, &wc->pPara->member.para, - wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, - &pp->member.run); + calc_run_extent(wc->context, &wc->pPara->member.para, + wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, + &pp->member.run); ME_InsertRowStart(wc, pp); return pp; }

1 0

Jacek Caban : urlmon: Clean up handling tested URLs.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: c8a4ce89d0b5e67c37a70a48c75db2027e596869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a4ce89d0b5e67c37a70a48c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 17:17:02 2013 +0100 urlmon: Clean up handling tested URLs. --- dlls/urlmon/tests/url.c | 142 ++++++++++++++++++++++------------------------- 1 files changed, 67 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8a4ce89d0b5e67c37a70…

1 0

Jacek Caban : urlmon: Fixed QueryInfo tests during BINDSTATUS_PROXYDETECTING notification.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: 76997f1a38ec7157890c07154e40d00d8fcb3cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76997f1a38ec7157890c07154… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 17:17:47 2013 +0100 urlmon: Fixed QueryInfo tests during BINDSTATUS_PROXYDETECTING notification. --- dlls/urlmon/tests/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 11d04c3..a7d0603 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1463,8 +1463,8 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) size = sizeof(DWORD); hres = IWinInetHttpInfo_QueryInfo(http_info, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL, NULL); - ok(hres == expect || (progress == BINDSTATUS_COOKIE_SENT && hres == S_FALSE), - "hres = %x, expected %x\n", hres, expect); + ok(hres == expect || ((progress == BINDSTATUS_COOKIE_SENT || progress == BINDSTATUS_PROXYDETECTING) && hres == S_FALSE), + "progress %u: hres = %x, expected %x\n", progress, hres, expect); if(hres == S_OK) { if(download_state==BEFORE_DOWNLOAD && progress!=BINDSTATUS_MIMETYPEAVAILABLE) ok(status == 0, "status = %d\n", status);

1 0

Jacek Caban : urlmon: Skip reported_url tests when binding to object.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: c1a15b75aa7ee783e1ae3a6c817710004ae0c145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a15b75aa7ee783e1ae3a6c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 17:21:16 2013 +0100 urlmon: Skip reported_url tests when binding to object. This limits the scope of http://source.winehq.org/git/wine.git/commitdiff/259cd7933612abdef0f88f4465… to fix random test failures. This makes the original test questionable, so if we ever see it failing again, we should simply revert it. --- dlls/urlmon/tests/url.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index a7d0603..d00ebfe 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -933,7 +933,9 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, CHECK_EXPECT(Continue); ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); - ok(reported_url && !lstrcmpW(reported_url, current_url), "wrong url %s\n", wine_dbgstr_w(reported_url)); + + if(!bind_to_object) + ok(reported_url && !lstrcmpW(reported_url, current_url), "wrong url %s\n", wine_dbgstr_w(reported_url)); ok(pProtocolData != NULL, "pProtocolData == NULL\n"); if(!pProtocolData)

1 0

Jacek Caban : urlmon: Fixed tests on IEs that report BINDSTATUS_DECODING.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: abf8d628881281716924cddb0fa31deb50be6786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf8d628881281716924cddb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 17:22:15 2013 +0100 urlmon: Fixed tests on IEs that report BINDSTATUS_DECODING. This seems to happen on some IE versions that decode gzip streams in urlmon (as opposed to wininet). --- dlls/urlmon/tests/url.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index d00ebfe..a31a8a0 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1468,10 +1468,10 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) ok(hres == expect || ((progress == BINDSTATUS_COOKIE_SENT || progress == BINDSTATUS_PROXYDETECTING) && hres == S_FALSE), "progress %u: hres = %x, expected %x\n", progress, hres, expect); if(hres == S_OK) { - if(download_state==BEFORE_DOWNLOAD && progress!=BINDSTATUS_MIMETYPEAVAILABLE) - ok(status == 0, "status = %d\n", status); + if(download_state == BEFORE_DOWNLOAD && progress != BINDSTATUS_MIMETYPEAVAILABLE && progress != BINDSTATUS_DECODING) + ok(status == 0, "progress %u: status = %d\n", progress, status); else - ok(status == HTTP_STATUS_OK, "status = %d\n", status); + ok(status == HTTP_STATUS_OK, "progress %u: status = %d\n", progress, status); ok(size == sizeof(DWORD), "size = %d\n", size); } @@ -1816,6 +1816,9 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u case BINDSTATUS_COOKIE_SENT: trace("BINDSTATUS_COOKIE_SENT\n"); break; + case BINDSTATUS_DECODING: + trace("BINDSTATUS_DECODING\n"); + break; default: ok(0, "unexpected code %d\n", ulStatusCode); };

1 0

Hans Leidekker : wininet/tests: Fix a test failure.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: c68bb8da7fad5d519a363b640254500d7deefb80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68bb8da7fad5d519a363b640… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 12 17:42:40 2013 +0100 wininet/tests: Fix a test failure. --- dlls/wininet/tests/ftp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 7fbbe41..9d0cf3e 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -257,10 +257,8 @@ static void test_getfile(HINTERNET hFtp, HINTERNET hConnect) "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* Zero attributes */ - SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_existing_non_deadbeef", FALSE, 0, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == TRUE, "Expected FtpGetFileA to succeed\n"); - ok (GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok (GetFileAttributesA("should_be_existing_non_deadbeef") != INVALID_FILE_ATTRIBUTES, "Local file should have been created\n"); DeleteFileA("should_be_existing_non_deadbeef");

1 0