Added missing initialization of the filesource output pin critical

section. Avoid indefinite wait when calling GetOverlappedResult. Fixed initial refcount of the IMemAllocator object. Improved some traces.

Added missing initialization of the filesource output pin critical
8b0ec725 · Christian Costa · Alexandre Julliard · 869e9caf · 8b0ec725 · 8b0ec725
Commit 8b0ec725 authored Aug 13, 2004 by Christian Costa Committed by Alexandre Julliard Aug 13, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

filesource.c dlls/quartz/filesource.c +2 -1

memallocator.c dlls/quartz/memallocator.c +3 -3

No files found.
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -882,6 +882,7 @@ static HRESULT FileAsyncReader_Construct(HANDLE hFile, IBaseFilter * pBaseFilter
        pPinImpl->hEvent = CreateEventW(NULL, 0, 0, NULL);
        pPinImpl->bFlushing = FALSE;
        pPinImpl->pHead = NULL;
+        InitializeCriticalSection(&pPinImpl->csList);

        *ppPin = (IPin *)(&pPinImpl->pin.pin.lpVtbl);
        return S_OK;
@@ -1092,7 +1093,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw
    {
        DWORD dwBytes;
        /* get any errors */
-        if (!GetOverlappedResult(This->hFile, &pDataRq->ovl, &dwBytes, TRUE))
+        if (!GetOverlappedResult(This->hFile, &pDataRq->ovl, &dwBytes, FALSE))
            hr = HRESULT_FROM_WIN32(GetLastError());
    }


--- a/dlls/quartz/memallocator.c
+++ b/dlls/quartz/memallocator.c
@@ -97,7 +97,7 @@ static HRESULT BaseMemAllocator_Init(HRESULT (* fnAlloc)(IMemAllocator *), HRESU

    pMemAlloc->lpVtbl = &BaseMemAllocator_VTable;

-    pMemAlloc->ref = 0;
+    pMemAlloc->ref = 1;
    pMemAlloc->pProps = NULL;
    list_init(&pMemAlloc->free_list);
    list_init(&pMemAlloc->used_list);
@@ -474,7 +474,7 @@ static ULONG WINAPI StdMediaSample2_AddRef(IMediaSample2 * iface)
 {
    ICOM_THIS(StdMediaSample2, iface);

-    TRACE("()\n");
+    TRACE("(%p)->() AddRef from %ld\n", iface, This->ref);

    return InterlockedIncrement(&This->ref);
 }
@@ -483,7 +483,7 @@ static ULONG WINAPI StdMediaSample2_Release(IMediaSample2 * iface)
 {
    ICOM_THIS(StdMediaSample2, iface);

-    TRACE("()\n");
+    TRACE("(%p)->() Release from %ld\n", iface, This->ref);

    if (!InterlockedDecrement(&This->ref))
    {