ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qcap: Avoid call LeaveCriticalSection() repeatedly. 

Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jactry Zeng 2017-02-07 22:20:29 +08:00 committed by Alexandre Julliard
parent 2253d1a9d3
commit 6530824ab3
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/qcap/v4l.c
View File

@ -604,7 +604,12 @@ static DWORD WINAPI ReadThread(LPVOID lParam)
hr = V4l_Prepare(capBox); hr = V4l_Prepare(capBox);
if (FAILED(hr)) if (FAILED(hr))
goto fail; {
ERR("Stop IFilterGraph: %x\n", hr);
capBox->thread = 0;
capBox->stopped = TRUE;
return 0;
}
pOutput = CoTaskMemAlloc(capBox->width * capBox->height * capBox->bitDepth / 8); pOutput = CoTaskMemAlloc(capBox->width * capBox->height * capBox->bitDepth / 8);
capBox->curframe = 0; capBox->curframe = 0;
@ -641,27 +646,19 @@ static DWORD WINAPI ReadThread(LPVOID lParam)
IMediaSample_Release(pSample); IMediaSample_Release(pSample);
V4l_FreeFrame(capBox); V4l_FreeFrame(capBox);
} }
LeaveCriticalSection(&capBox->CritSect);
if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED) if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED)
{ {
ERR("Received error: %x\n", hr); TRACE("Return %x, stop IFilterGraph\n", hr);
goto cfail; V4l_Unprepare(capBox);
capBox->thread = 0;
capBox->stopped = TRUE;
break;
} }
LeaveCriticalSection(&capBox->CritSect);
} }
LeaveCriticalSection(&capBox->CritSect); LeaveCriticalSection(&capBox->CritSect);
CoTaskMemFree(pOutput); CoTaskMemFree(pOutput);
return 0;
cfail:
CoTaskMemFree(pOutput);
V4l_Unprepare(capBox);
LeaveCriticalSection(&capBox->CritSect);
fail:
capBox->thread = 0;
capBox->stopped = TRUE;
FIXME("Stop IFilterGraph\n");
return 0; return 0;
} }