system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 17:46:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

winegstreamer: Move open_stream / close_stream helpers around.

Browse source
This commit is contained in:
Rémi Bernon 2022-08-22 19:19:38 +02:00 committed by Alexandre Julliard
parent 5bc7ad1c34
commit b600c85dae
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
dlls/winegstreamer/wm_asyncreader.c
View file

@ -247,25 +247,7 @@ static DWORD WINAPI async_reader_callback_thread(void *arg)
return 0;
}
static HRESULT open_stream(struct async_reader *reader, IWMReaderCallback *callback, void *context)
{
IWMReaderCallback_AddRef((reader->callback = callback));
reader->context = context;
reader->running = true;
if (!(reader->callback_thread = CreateThread(NULL, 0, async_reader_callback_thread, reader, 0, NULL)))
{
IWMReaderCallback_Release(reader->callback);
reader->running = false;
reader->callback = NULL;
reader->context = NULL;
return E_OUTOFMEMORY;
}
return S_OK;
}
static void close_stream(struct async_reader *reader)
static void async_reader_close(struct async_reader *reader)
{
struct async_op *op, *next;
@ -283,6 +265,24 @@ static void close_stream(struct async_reader *reader)
}
}
static HRESULT async_reader_open(struct async_reader *reader, IWMReaderCallback *callback, void *context)
{
IWMReaderCallback_AddRef((reader->callback = callback));
reader->context = context;
reader->running = true;
if (!(reader->callback_thread = CreateThread(NULL, 0, async_reader_callback_thread, reader, 0, NULL)))
{
IWMReaderCallback_Release(reader->callback);
reader->running = false;
reader->callback = NULL;
reader->context = NULL;
return E_OUTOFMEMORY;
}
return S_OK;
}
static HRESULT async_reader_queue_op(struct async_reader *reader, enum async_op_type type, void *context)
{
struct async_op *op;
@ -345,7 +345,7 @@ static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url,
}
if (SUCCEEDED(hr = wm_reader_open_file(&reader->reader, url))
&& FAILED(hr = open_stream(reader, callback, context)))
&& FAILED(hr = async_reader_open(reader, callback, context)))
wm_reader_close(&reader->reader);
LeaveCriticalSection(&reader->reader.cs);
@ -362,7 +362,7 @@ static HRESULT WINAPI WMReader_Close(IWMReader *iface)
EnterCriticalSection(&reader->reader.cs);
async_reader_queue_op(reader, ASYNC_OP_CLOSE, NULL);
close_stream(reader);
async_reader_close(reader);
hr = wm_reader_close(&reader->reader);
if (reader->callback)
@ -825,7 +825,7 @@ static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface,
}
if (SUCCEEDED(hr = wm_reader_open_stream(&reader->reader, stream))
&& FAILED(hr = open_stream(reader, callback, context)))
&& FAILED(hr = async_reader_open(reader, callback, context)))
wm_reader_close(&reader->reader);
LeaveCriticalSection(&reader->reader.cs);
@ -1686,7 +1686,7 @@ static void async_reader_destroy(struct wm_reader *iface)
LeaveCriticalSection(&reader->callback_cs);
WakeConditionVariable(&reader->callback_cv);
close_stream(reader);
async_reader_close(reader);
reader->callback_cs.DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&reader->callback_cs);