Skip to content

W
wine-winehq
Commit 411ef13e authored by Andrew Eikum's avatar Andrew Eikum Committed by Alexandre Julliard
Browse files
Options

mfplat: Simplify IMFByteStream async Read/Write methods.

Signed-off-by: 's avatarAndrew Eikum <aeikum@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 4c999efd
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 16 deletions
dlls/mfplat/main.c
View file @ 411ef13e
......@@ -4373,7 +4373,6 @@ static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IRtwqAsyncCallback
{
struct bytestream *stream = impl_from_read_callback_IRtwqAsyncCallback(iface);
struct async_stream_op *op;
LARGE_INTEGER position;
IUnknown *object;
HRESULT hr;
......@@ -4384,13 +4383,8 @@ static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IRtwqAsyncCallback
EnterCriticalSection(&stream->cs);
position.QuadPart = op->position;
if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL)))
{
if (SUCCEEDED(hr = IStream_Read(stream->stream, op->u.dest, op->requested_length, &op->actual_length)))
stream->position += op->actual_length;
}
hr = IMFByteStream_Read(&stream->IMFByteStream_iface, op->u.dest, op->requested_length, &op->actual_length);
if(FAILED(hr)) TRACE("Read failed: %#lx\n", hr);
IMFAsyncResult_SetStatus(op->caller, hr);
list_add_tail(&stream->pending, &op->entry);
......@@ -4405,7 +4399,6 @@ static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IRtwqAsyncCallback
{
struct bytestream *stream = impl_from_read_callback_IRtwqAsyncCallback(iface);
struct async_stream_op *op;
LARGE_INTEGER position;
IUnknown *object;
HRESULT hr;
......@@ -4416,13 +4409,8 @@ static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IRtwqAsyncCallback
EnterCriticalSection(&stream->cs);
position.QuadPart = op->position;
if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL)))
{
if (SUCCEEDED(hr = IStream_Write(stream->stream, op->u.src, op->requested_length, &op->actual_length)))
stream->position += op->actual_length;
}
hr = IMFByteStream_Write(&stream->IMFByteStream_iface, op->u.src, op->requested_length, &op->actual_length);
if(FAILED(hr)) TRACE("Write failed: %#lx\n", hr);
IMFAsyncResult_SetStatus(op->caller, hr);
list_add_tail(&stream->pending, &op->entry);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment