quartz: Requeue in pullpin if request for data timed out.
authorMaarten Lankhorst <maarten@codeweavers.com>
Thu, 18 Sep 2008 15:56:05 +0000 (17:56 +0200)
committerAlexandre Julliard <julliard@winehq.org>
Mon, 22 Sep 2008 11:46:22 +0000 (13:46 +0200)
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

index 8f78fc3..5689015 100644 (file)
@@ -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)