Erich Hoover : quartz: Do not assert when IAsyncReader:: WaitForNext returns VFW_E_TIMEOUT.
Alexandre Julliard
julliard at winehq.org
Mon Sep 12 11:43:01 CDT 2011
Module: wine
Branch: master
Commit: bc204370aeb7b1062ef89f2eef8fae46287c0ed6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc204370aeb7b1062ef89f2eef8fae46287c0ed6
Author: Erich Hoover <ehoover at 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)
More information about the wine-cvs
mailing list