wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Henri Verbeet : wined3d: Don' t print the context recreation FIXME for FBO ORM.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 66637ea35cceb4aed9e276e145ba24310f8a269d URL: http://source.winehq.org/git/wine.git/?a=commit;h=66637ea35cceb4aed9e276e14… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 12 19:51:17 2011 +0200 wined3d: Don't print the context recreation FIXME for FBO ORM. With FBOs we can just render offscreen to an appropriate depth/stencil buffer. --- dlls/wined3d/swapchain.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d8cc0c9..126a991 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1023,8 +1023,9 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, WINED3DSURFTY goto err; } - if (!present_parameters->EnableAutoDepthStencil - || swapchain->presentParms.AutoDepthStencilFormat != swapchain->ds_format->id) + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && (!present_parameters->EnableAutoDepthStencil + || swapchain->presentParms.AutoDepthStencilFormat != swapchain->ds_format->id)) { FIXME("Add OpenGL context recreation support to context_validate_onscreen_formats\n"); }

1 0

Henri Verbeet : ddraw: Get rid of some ERRs in PixelFormat_DD2WineD3D().
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: f2115004d551e337799b03b9739546536fa2619a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2115004d551e337799b03b97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 12 19:51:16 2011 +0200 ddraw: Get rid of some ERRs in PixelFormat_DD2WineD3D(). Most of these would just be the result of the application giving us invalid pixel formats. --- dlls/ddraw/utils.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index d2a4194..b341a78 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -426,7 +426,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat { return WINED3DFMT_B2G3R3A8_UNORM; } - ERR("16 bit RGB Pixel format does not match\n"); + WARN("16 bit RGB Pixel format does not match.\n"); return WINED3DFMT_UNKNOWN; case 24: @@ -445,10 +445,10 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat return WINED3DFMT_B8G8R8X8_UNORM; } - ERR("32 bit RGB pixel format does not match\n"); + WARN("32 bit RGB pixel format does not match.\n"); default: - ERR("Invalid dwRGBBitCount in Pixelformat structure\n"); + WARN("Invalid dwRGBBitCount in Pixelformat structure.\n"); return WINED3DFMT_UNKNOWN; } } @@ -460,12 +460,12 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat case 1: case 2: case 4: - ERR("Unsupported Alpha-Only bit depth 0x%x\n", DDPixelFormat->u1.dwAlphaBitDepth); + FIXME("Unsupported Alpha-Only bit depth 0x%x.\n", DDPixelFormat->u1.dwAlphaBitDepth); case 8: return WINED3DFMT_A8_UNORM; default: - ERR("Invalid AlphaBitDepth in Alpha-Only Pixelformat\n"); + WARN("Invalid AlphaBitDepth in Alpha-Only Pixelformat.\n"); return WINED3DFMT_UNKNOWN; } } @@ -480,17 +480,17 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat case 4: if(DDPixelFormat->u1.dwAlphaBitDepth == 4) return WINED3DFMT_L4A4_UNORM; - ERR("Unknown Alpha / Luminance bit depth combination\n"); + WARN("Unknown Alpha / Luminance bit depth combination.\n"); return WINED3DFMT_UNKNOWN; case 6: - ERR("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now!!\n"); + FIXME("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now.\n"); return WINED3DFMT_R5G5_SNORM_L6_UNORM; case 8: if(DDPixelFormat->u1.dwAlphaBitDepth == 8) return WINED3DFMT_L8A8_UNORM; - ERR("Unknown Alpha / Lumincase bit depth combination\n"); + WARN("Unknown Alpha / Lumincase bit depth combination.\n"); return WINED3DFMT_UNKNOWN; } } @@ -500,14 +500,14 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat switch(DDPixelFormat->u1.dwLuminanceBitCount) { case 6: - ERR("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now!!\n"); + FIXME("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now.\n"); return WINED3DFMT_R5G5_SNORM_L6_UNORM; case 8: return WINED3DFMT_L8_UNORM; default: - ERR("Unknown luminance-only bit depth 0x%x\n", DDPixelFormat->u1.dwLuminanceBitCount); + WARN("Unknown luminance-only bit depth 0x%x.\n", DDPixelFormat->u1.dwLuminanceBitCount); return WINED3DFMT_UNKNOWN; } } @@ -599,7 +599,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat } } - ERR("Unknown Pixelformat!\n"); + WARN("Unknown Pixelformat.\n"); return WINED3DFMT_UNKNOWN; }

1 0

Henri Verbeet : ddraw: Get rid of an unused prototype.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: be32dd86d61c2bb9dace287e9cdf469619a7191e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be32dd86d61c2bb9dace287e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 12 19:51:15 2011 +0200 ddraw: Get rid of an unused prototype. --- dlls/ddraw/ddraw_private.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1daefbc..09e9aed 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -133,8 +133,6 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) DECLSPEC_ /* Utility functions */ void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS *pIn, DDSCAPS2 *pOut) DECLSPEC_HIDDEN; void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2 *pIn, DDDEVICEIDENTIFIER *pOut) DECLSPEC_HIDDEN; -HRESULT WINAPI ddraw_recreate_surfaces_cb(IDirectDrawSurface7 *surf, - DDSURFACEDESC2 *desc, void *Context) DECLSPEC_HIDDEN; struct wined3d_vertex_declaration *ddraw_find_decl(IDirectDrawImpl *This, DWORD fvf) DECLSPEC_HIDDEN; /* The default surface type */

1 0

Bernhard Loos : msi: Speed up WHERE statement evaluation by evaluating the condition as early as possible .
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 9b729bb1b348ac5485fe993fcedef870b59d88b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b729bb1b348ac5485fe993fc… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Fri Sep 9 11:25:58 2011 +0200 msi: Speed up WHERE statement evaluation by evaluating the condition as early as possible. --- dlls/msi/where.c | 208 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 145 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b729bb1b348ac5485fe9…

1 0

Bernhard Loos : msi: The underlying tables might have changed, so it' s not possible to cache the result of the execute.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: dc16dd135191bd68ea21130bd5e62d4a844f7ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc16dd135191bd68ea21130bd… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Fri Sep 9 11:25:51 2011 +0200 msi: The underlying tables might have changed, so it's not possible to cache the result of the execute. --- dlls/msi/tests/db.c | 24 +++++++++++++++++++++++- dlls/msi/where.c | 35 ++++++++++++++--------------------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index b581633..b915fa0 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -297,7 +297,7 @@ make_add_entry(binary, static void test_msiinsert(void) { - MSIHANDLE hdb = 0, hview = 0, hrec = 0; + MSIHANDLE hdb = 0, hview = 0, hview2 = 0, hrec = 0; UINT r; const char *query; char buf[80]; @@ -322,6 +322,14 @@ static void test_msiinsert(void) r = MsiCloseHandle(hview); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + query = "SELECT * FROM phone WHERE number = '8675309'"; + r = MsiDatabaseOpenView(hdb, query, &hview2); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview2, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview2, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "MsiViewFetch produced items\n"); + /* insert a value into it */ query = "INSERT INTO `phone` ( `id`, `name`, `number` )" "VALUES('1', 'Abe', '8675309')"; @@ -334,6 +342,20 @@ static void test_msiinsert(void) r = MsiCloseHandle(hview); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + r = MsiViewFetch(hview2, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "MsiViewFetch produced items\n"); + r = MsiViewExecute(hview2, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview2, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed: %u\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + r = MsiViewClose(hview2); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview2); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + query = "SELECT * FROM `phone` WHERE `id` = 1"; r = do_query(hdb, query, &hrec); ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 0e346d6..17b655b 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -73,27 +73,10 @@ typedef struct tagMSIWHEREVIEW struct expr *cond; UINT rec_index; MSIORDERINFO *order_info; - UINT error; } MSIWHEREVIEW; #define INITIAL_REORDER_SIZE 16 -static UINT init_reorder(MSIWHEREVIEW *wv) -{ - MSIROWENTRY **new = msi_alloc_zero(sizeof(MSIROWENTRY *) * INITIAL_REORDER_SIZE); - if (!new) - return ERROR_OUTOFMEMORY; - - if (wv->reorder) - msi_free(wv->reorder); - - wv->reorder = new; - wv->reorder_size = INITIAL_REORDER_SIZE; - wv->row_count = 0; - - return ERROR_SUCCESS; -} - static void free_reorder(MSIWHEREVIEW *wv) { UINT i; @@ -110,6 +93,20 @@ static void free_reorder(MSIWHEREVIEW *wv) wv->row_count = 0; } +static UINT init_reorder(MSIWHEREVIEW *wv) +{ + MSIROWENTRY **new = msi_alloc_zero(sizeof(MSIROWENTRY *) * INITIAL_REORDER_SIZE); + if (!new) + return ERROR_OUTOFMEMORY; + + free_reorder(wv); + + wv->reorder = new; + wv->reorder_size = INITIAL_REORDER_SIZE; + + return ERROR_SUCCESS; +} + static inline UINT find_row(MSIWHEREVIEW *wv, UINT row, UINT *(values[])) { if (row >= wv->row_count) @@ -618,9 +615,6 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if( !table ) return ERROR_FUNCTION_FAILED; - if (wv->reorder) - return wv->error; - r = init_reorder(wv); if (r != ERROR_SUCCESS) return r; @@ -654,7 +648,6 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) r = wv->order_info->error; msi_free( rows ); - wv->error = r; return r; }

1 0

Erich Hoover : quartz: Fix converting between the media time and REFTIME.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 09f134cb69209a94ca1a61da8841ea39d470f2a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f134cb69209a94ca1a61da8… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Sep 11 14:11:10 2011 -0600 quartz: Fix converting between the media time and REFTIME. --- dlls/quartz/filtergraph.c | 67 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 58 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 1becf11..c154f92 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2621,21 +2621,62 @@ static HRESULT WINAPI MediaPosition_Invoke(IMediaPosition* iface, DISPID dispIdM return E_NOTIMPL; } +static HRESULT ConvertFromREFTIME(IMediaSeeking *seek, REFTIME time_in, LONGLONG *time_out) +{ + GUID time_format; + HRESULT hr; + + hr = MediaSeeking_GetTimeFormat(seek, &time_format); + if (FAILED(hr)) + return hr; + if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, &time_format)) + { + FIXME("Unsupported time format.\n"); + return E_NOTIMPL; + } + + *time_out = (LONGLONG) (time_in * 10000000); /* convert from 1 second intervals to 100 ns intervals */ + return S_OK; +} + +static HRESULT ConvertToREFTIME(IMediaSeeking *seek, LONGLONG time_in, REFTIME *time_out) +{ + GUID time_format; + HRESULT hr; + + hr = MediaSeeking_GetTimeFormat(seek, &time_format); + if (FAILED(hr)) + return hr; + if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, &time_format)) + { + FIXME("Unsupported time format.\n"); + return E_NOTIMPL; + } + + *time_out = (REFTIME)time_in / 10000000; /* convert from 100 ns intervals to 1 second intervals */ + return S_OK; +} + /*** IMediaPosition methods ***/ static HRESULT WINAPI MediaPosition_get_Duration(IMediaPosition * iface, REFTIME *plength) { LONGLONG duration; IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); HRESULT hr = IMediaSeeking_GetDuration(&This->IMediaSeeking_iface, &duration); - if (SUCCEEDED(hr)) *plength = duration; - return hr; + if (FAILED(hr)) + return hr; + return ConvertToREFTIME(&This->IMediaSeeking_iface, duration, plength); } static HRESULT WINAPI MediaPosition_put_CurrentPosition(IMediaPosition * iface, REFTIME llTime) { IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); - LONGLONG reftime = llTime; + LONGLONG reftime; + HRESULT hr; + hr = ConvertFromREFTIME(&This->IMediaSeeking_iface, llTime, &reftime); + if (FAILED(hr)) + return hr; return IMediaSeeking_SetPositions(&This->IMediaSeeking_iface, &reftime, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); } @@ -2644,9 +2685,12 @@ static HRESULT WINAPI MediaPosition_get_CurrentPosition(IMediaPosition * iface, { IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); LONGLONG pos; - HRESULT hr = IMediaSeeking_GetCurrentPosition(&This->IMediaSeeking_iface, &pos); - if (SUCCEEDED(hr)) *pllTime = pos; - return hr; + HRESULT hr; + + hr = IMediaSeeking_GetCurrentPosition(&This->IMediaSeeking_iface, &pos); + if (FAILED(hr)) + return hr; + return ConvertToREFTIME(&This->IMediaSeeking_iface, pos, pllTime); } static HRESULT WINAPI MediaPosition_get_StopTime(IMediaPosition * iface, REFTIME *pllTime) @@ -2654,15 +2698,20 @@ static HRESULT WINAPI MediaPosition_get_StopTime(IMediaPosition * iface, REFTIME IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); LONGLONG pos; HRESULT hr = IMediaSeeking_GetStopPosition(&This->IMediaSeeking_iface, &pos); - if (SUCCEEDED(hr)) *pllTime = pos; - return hr; + if (FAILED(hr)) + return hr; + return ConvertToREFTIME(&This->IMediaSeeking_iface, pos, pllTime); } static HRESULT WINAPI MediaPosition_put_StopTime(IMediaPosition * iface, REFTIME llTime) { IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); - LONGLONG reftime = llTime; + LONGLONG reftime; + HRESULT hr; + hr = ConvertFromREFTIME(&This->IMediaSeeking_iface, llTime, &reftime); + if (FAILED(hr)) + return hr; return IMediaSeeking_SetPositions(&This->IMediaSeeking_iface, NULL, AM_SEEKING_NoPositioning, &reftime, AM_SEEKING_AbsolutePositioning); }

1 0

Erich Hoover : quartz: Add support for EndOfStream in PullPin.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: b7bc6dcfaeb1aa18c559d5e93b4163210d4d6f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bc6dcfaeb1aa18c559d5e93… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Sep 11 14:11:04 2011 -0600 quartz: Add support for EndOfStream in PullPin. --- dlls/quartz/pin.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 15d5f4b..500d7d3 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -726,9 +726,17 @@ HRESULT WINAPI PullPin_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) HRESULT WINAPI PullPin_EndOfStream(IPin * iface) { - FIXME("(%p)->() stub\n", iface); + PullPin *This = (PullPin *)iface; + HRESULT hr = S_FALSE; + + TRACE("(%p)->()\n", iface); + + EnterCriticalSection(This->pin.pCritSec); + hr = SendFurther( iface, deliver_endofstream, NULL, NULL ); + SetEvent(This->hEventStateChanged); + LeaveCriticalSection(This->pin.pCritSec); - return SendFurther( iface, deliver_endofstream, NULL, NULL ); + return hr; } HRESULT WINAPI PullPin_BeginFlush(IPin * iface)

1 0

Erich Hoover : quartz: Add missing release.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 9f7ef3786ad4c6b7e18247cfecdbeba6e72e2448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f7ef3786ad4c6b7e18247cfe… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Sep 11 14:10:54 2011 -0600 quartz: Add missing release. --- dlls/quartz/pin.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 4c6a84d..15d5f4b 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -134,6 +134,8 @@ static HRESULT SendFurther( IPin *from, SendPinFunc fnMiddle, LPVOID arg, SendPi } out: + if (enumpins) + IEnumPins_Release( enumpins ); if (pin_info.pFilter) IBaseFilter_Release( pin_info.pFilter ); return hr;

1 0

Erich Hoover : quartz: Samples should be freed when IAsyncReader:: Request fails.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: cd4ee69ef3c7ea94bae78dd9ee29be93d5fe0dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4ee69ef3c7ea94bae78dd9e… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Sep 11 14:10:42 2011 -0600 quartz: Samples should be freed when IAsyncReader::Request fails. --- dlls/quartz/mpegsplit.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index c556b78..6043f69 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -217,9 +217,14 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample) IMediaSample_SetPreroll(sample, 0); IMediaSample_SetDiscontinuity(sample, 0); IMediaSample_SetSyncPoint(sample, 1); - pin->rtCurrent = rtSampleStart; - pin->rtNext = rtSampleStop; hr = IAsyncReader_Request(pin->pReader, sample, 0); + if (SUCCEEDED(hr)) + { + pin->rtCurrent = rtSampleStart; + pin->rtNext = rtSampleStop; + } + else + IMediaSample_Release(sample); } if (FAILED(hr)) FIXME("o_Ox%08x\n", hr); @@ -754,15 +759,19 @@ static HRESULT MPEGSplitter_first_request(LPVOID iface) hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - pin->rtCurrent = pin->rtNext; - pin->rtNext = rtSampleStop; - IMediaSample_SetPreroll(sample, FALSE); IMediaSample_SetDiscontinuity(sample, TRUE); IMediaSample_SetSyncPoint(sample, 1); This->seek = 0; hr = IAsyncReader_Request(pin->pReader, sample, 0); + if (SUCCEEDED(hr)) + { + pin->rtCurrent = pin->rtNext; + pin->rtNext = rtSampleStop; + } + else + IMediaSample_Release(sample); } if (FAILED(hr)) ERR("Horsemen of the apocalypse came to bring error 0x%08x\n", hr);

1 0

Erich Hoover : quartz: Do not assert when IAsyncReader:: WaitForNext returns VFW_E_TIMEOUT.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: bc204370aeb7b1062ef89f2eef8fae46287c0ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc204370aeb7b1062ef89f2ee… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Sep 11 14:10:19 2011 -0600 quartz: Do not assert when IAsyncReader::WaitForNext returns VFW_E_TIMEOUT. --- dlls/quartz/pin.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index af26a6b..4c6a84d 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -478,14 +478,15 @@ static void PullPin_Thread_Process(PullPin *This) } else { - /* FIXME: This is not well handled yet! */ - ERR("Processing error: %x\n", hr); if (hr == VFW_E_TIMEOUT) { - assert(!pSample); + if (pSample != NULL) + WARN("Non-NULL sample returned with VFW_E_TIMEOUT.\n"); hr = S_OK; - continue; } + /* FIXME: Errors are not well handled yet! */ + else + ERR("Processing error: %x\n", hr); } if (pSample)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011