September 2008 - Wine-Commits

Maarten Lankhorst : quartz: Requeue in pullpin if request for data timed out.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 907bb7ae1fe44468f3051527978949b7c90f63ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=907bb7ae1fe44468f30515279… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Thu Sep 18 17:56:05 2008 +0200 quartz: Requeue in pullpin if request for data timed out. If the filter is paused, no additional data will be queued and VFW_E_TIMEOUT is legitimately returned. Don't make this a fatal error, but instead try again. If flushing the thing will still abort. --- dlls/quartz/pin.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 8f78fc3..5689015 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1526,6 +1526,7 @@ static void CALLBACK PullPin_Thread_Process(PullPin *This) TRACE("Process sample\n"); + pSample = NULL; hr = IAsyncReader_WaitForNext(This->pReader, 10000, &pSample, &dwUser); /* Return an empty sample on error to the implementation in case it does custom parsing, so it knows it's gone */ @@ -1537,6 +1538,12 @@ static void CALLBACK PullPin_Thread_Process(PullPin *This) { /* FIXME: This is not well handled yet! */ ERR("Processing error: %x\n", hr); + if (hr == VFW_E_TIMEOUT) + { + assert(!pSample); + hr = S_OK; + continue; + } } if (pSample)

1 0

Maarten Lankhorst : quartz: Return VFW_E_WRONG_STATE in file source if flushing.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: d458efe0726fc16b77bb3cd962322153ac4069be URL: http://source.winehq.org/git/wine.git/?a=commit;h=d458efe0726fc16b77bb3cd96… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Thu Sep 18 17:55:36 2008 +0200 quartz: Return VFW_E_WRONG_STATE in file source if flushing. --- dlls/quartz/filesource.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 2a063e2..d41899d 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1182,8 +1182,12 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw if (buffer >= This->samples) { if (buffer != This->samples) + { FIXME("Returned: %u (%08x)\n", buffer, GetLastError()); - hr = VFW_E_TIMEOUT; + hr = VFW_E_TIMEOUT; + } + else + hr = VFW_E_WRONG_STATE; buffer = ~0; } else

1 0

Maarten Lankhorst : quartz: Don' t abort starting for unconnected pin in avi splitter.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: c71ba1a141030a7c32f3809943b1dfaf0acbe10f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71ba1a141030a7c32f380994… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Mon Sep 15 19:48:08 2008 +0200 quartz: Don't abort starting for unconnected pin in avi splitter. --- dlls/quartz/avisplit.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index e93d1d1..b688717 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -447,10 +447,12 @@ static HRESULT AVISplitter_first_request(LPVOID iface) /* Could be an EOF instead */ have_sample = (hr == S_OK); - if (FAILED(hr)) - break; if (hr == S_FALSE) AVISplitter_SendEndOfFile(This, x); + + if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED) + break; + hr = S_OK; } /* FIXME: Don't do this for each pin that sent an EOF */

1 0

Huw Davies : inetcomm: Charset name comparison should be case insensitive.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: ed8b219c6853e04d315e4e3e7efcad94bb36abe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed8b219c6853e04d315e4e3e7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 22 10:50:06 2008 +0100 inetcomm: Charset name comparison should be case insensitive. --- dlls/inetcomm/mimeintl.c | 2 +- dlls/inetcomm/tests/mimeintl.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 262bdc5..0029af8 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -250,7 +250,7 @@ static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR LIST_FOR_EACH_ENTRY(charset, &This->charsets, charset_entry, entry) { - if(!strcmp(charset->cs_info.szName, pszCharset)) + if(!lstrcmpiA(charset->cs_info.szName, pszCharset)) { *phCharset = charset->cs_info.hCharset; hr = S_OK; diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c index e7cdd87..d82c191 100644 --- a/dlls/inetcomm/tests/mimeintl.c +++ b/dlls/inetcomm/tests/mimeintl.c @@ -149,6 +149,9 @@ static void test_charset(void) hr = IMimeInternational_FindCharset(internat, "windows-1252", &hcs); ok(hr == S_OK, "got %08x\n", hr); ok(hcs_windows_1252 == hcs, "got different hcharsets for the same name\n"); + hr = IMimeInternational_FindCharset(internat, "WiNdoWs-1252", &hcs); + ok(hr == S_OK, "got %08x\n", hr); + ok(hcs_windows_1252 == hcs, "got different hcharsets for the same name\n"); hr = IMimeInternational_FindCharset(internat, "windows-1251", &hcs_windows_1251); ok(hr == S_OK, "got %08x\n", hr);

1 0

Maarten Lankhorst : quartz: Add missing calls to EndFlush.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: fd966f8322321c7f918196b2116925564d0df685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd966f8322321c7f918196b21… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Mon Sep 15 19:47:44 2008 +0200 quartz: Add missing calls to EndFlush. --- dlls/quartz/parser.c | 2 ++ dlls/quartz/pin.c | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 7f25300..628eab6 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -231,6 +231,7 @@ HRESULT WINAPI Parser_Stop(IBaseFilter * iface) if (This->state == State_Stopped) { LeaveCriticalSection(&This->csFilter); + IAsyncReader_EndFlush(This->pInputPin->pReader); LeaveCriticalSection(&pin->thread_lock); return S_OK; } @@ -246,6 +247,7 @@ HRESULT WINAPI Parser_Stop(IBaseFilter * iface) PullPin_PauseProcessing(This->pInputPin); PullPin_WaitForStateChange(This->pInputPin, INFINITE); + IAsyncReader_EndFlush(This->pInputPin->pReader); LeaveCriticalSection(&pin->thread_lock); return S_OK; diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index bcf09a5..8f78fc3 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1790,6 +1790,10 @@ HRESULT WINAPI PullPin_EndFlush(IPin * iface) EnterCriticalSection(&This->thread_lock); { FILTER_STATE state; + + if (This->pReader) + IAsyncReader_EndFlush(This->pReader); + IBaseFilter_GetState(This->pin.pinInfo.pFilter, INFINITE, &state); if (state != State_Stopped)

1 0

Maarten Lankhorst : quartz: Implement IMediaPosition::put_CurrentPosition.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: f0f00d16259a39793927c2a6b7786a76e2313051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f00d16259a39793927c2a6b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Sep 11 12:45:57 2008 +0200 quartz: Implement IMediaPosition::put_CurrentPosition. --- dlls/quartz/filtergraph.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 9728c37..42b6da8 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2570,8 +2570,10 @@ static HRESULT WINAPI MediaPosition_get_Duration(IMediaPosition * iface, REFTIME } static HRESULT WINAPI MediaPosition_put_CurrentPosition(IMediaPosition * iface, REFTIME llTime){ - FIXME("(%p)->(%f) stub!\n", iface, llTime); - return E_NOTIMPL; + ICOM_THIS_MULTI(IFilterGraphImpl, IMediaPosition_vtbl, iface); + LONGLONG reftime = llTime; + + return IMediaSeeking_SetPositions((IMediaSeeking *)&This->IMediaSeeking_vtbl, &reftime, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); } static HRESULT WINAPI MediaPosition_get_CurrentPosition(IMediaPosition * iface, REFTIME *pllTime){

1 0

Huw Davies : inetcomm: Start of IMimeBody_SetOption.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 014fb479bc640d0e264a5037ec7546924e1e07b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=014fb479bc640d0e264a5037e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 22 10:48:55 2008 +0100 inetcomm: Start of IMimeBody_SetOption. --- dlls/inetcomm/mimeole.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index ebeab10..1c1161a 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -820,8 +820,26 @@ static HRESULT WINAPI MimeBody_SetOption( const TYPEDID oid, LPCPROPVARIANT pValue) { - FIXME("(%p)->(%08x, %p): stub\n", iface, oid, pValue); - return E_NOTIMPL; + HRESULT hr = E_NOTIMPL; + TRACE("(%p)->(%08x, %p)\n", iface, oid, pValue); + + if(pValue->vt != TYPEDID_TYPE(oid)) + { + WARN("Called with vartype %04x and oid %08x\n", pValue->vt, oid); + return E_INVALIDARG; + } + + switch(oid) + { + case OID_SECURITY_HWND_OWNER: + FIXME("OID_SECURITY_HWND_OWNER (value %08x): ignoring\n", pValue->u.ulVal); + hr = S_OK; + break; + default: + FIXME("Unhandled oid %08x\n", oid); + } + + return hr; } static HRESULT WINAPI MimeBody_GetOption(

1 0

Huw Davies : inetcomm: Start of IMimeMessage_SetOption.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 1b8e99f514c4b5837ebb7a9d58603c9a56a9561c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8e99f514c4b5837ebb7a9d5… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 22 10:47:38 2008 +0100 inetcomm: Start of IMimeMessage_SetOption. --- dlls/inetcomm/mimeole.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 617286c..ebeab10 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2172,8 +2172,30 @@ static HRESULT WINAPI MimeMessage_SetOption( const TYPEDID oid, LPCPROPVARIANT pValue) { - FIXME("(%p)->(%08x, %p)\n", iface, oid, pValue); - return E_NOTIMPL; + HRESULT hr = E_NOTIMPL; + TRACE("(%p)->(%08x, %p)\n", iface, oid, pValue); + + if(pValue->vt != TYPEDID_TYPE(oid)) + { + WARN("Called with vartype %04x and oid %08x\n", pValue->vt, oid); + return E_INVALIDARG; + } + + switch(oid) + { + case OID_HIDE_TNEF_ATTACHMENTS: + FIXME("OID_HIDE_TNEF_ATTACHMENTS (value %d): ignoring\n", pValue->u.boolVal); + hr = S_OK; + break; + case OID_SHOW_MACBINARY: + FIXME("OID_SHOW_MACBINARY (value %d): ignoring\n", pValue->u.boolVal); + hr = S_OK; + break; + default: + FIXME("Unhandled oid %08x\n", oid); + } + + return hr; } static HRESULT WINAPI MimeMessage_GetOption(

1 0

Vincent Povirk : shell32/tests: Accept delays in getting ABN_POSCHANGED notifications.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: d042d5ab28656a8c329086b530c643f21a344940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d042d5ab28656a8c329086b53… Author: Vincent Povirk <madewokherd+d41d(a)gmail.com> Date: Sun Sep 21 18:35:25 2008 -0500 shell32/tests: Accept delays in getting ABN_POSCHANGED notifications. --- dlls/shell32/tests/appbar.c | 329 +++++++++++++++++++++++-------------------- 1 files changed, 174 insertions(+), 155 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d042d5ab28656a8c32908…

1 0

Roderick Colenbrander : wined3d: UpdateSurface should take into account the offset from the source rectangle .
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 0362ee3d169a76a76bb81a6f63c9ecc76b899e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0362ee3d169a76a76bb81a6f6… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Sep 20 18:25:44 2008 +0000 wined3d: UpdateSurface should take into account the offset from the source rectangle. --- dlls/wined3d/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ff16f60..4887b9b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5970,6 +5970,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, } else { + const unsigned char* data =((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; glTexSubImage2D(glDescription->target ,glDescription->level ,destLeft @@ -5978,7 +5979,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, ,srcHeight ,glDescription->glFormat ,glDescription->glType - ,IWineD3DSurface_GetData(pSourceSurface) + ,data ); } }

1 0