[PATCH] mfplat: Use current stream position when async request is made.

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/mfplat/main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index 83eaee9b97..c6cf4717ec 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -2013,6 +2013,7 @@ struct async_stream_op
         const BYTE *src;
         BYTE *dest;
     } u;
+    QWORD position;
     ULONG requested_length;
     ULONG actual_length;
     IMFAsyncResult *caller;
@@ -2087,6 +2088,7 @@ static HRESULT bytestream_create_io_request(struct bytestream *stream, enum asyn
     op->IUnknown_iface.lpVtbl = &async_stream_op_vtbl;
     op->refcount = 1;
     op->u.src = data;
+    op->position = stream->position;
     op->requested_length = size;
     op->type = type;
     if (FAILED(hr = MFCreateAsyncResult((IUnknown *)&stream->IMFByteStream_iface, callback, state, &op->caller)))
@@ -2645,7 +2647,7 @@ static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IMFAsyncCallback *i
 
     op = impl_async_stream_op_from_IUnknown(object);
 
-    position.QuadPart = stream->position;
+    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)))
@@ -2676,7 +2678,7 @@ static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IMFAsyncCallback *
 
     op = impl_async_stream_op_from_IUnknown(object);
 
-    position.QuadPart = stream->position;
+    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)))
-- 
2.20.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=50018

Your paranoid android.


=== debian9 (32 bit report) ===

mfplat:
mfplat.c:2417: Test failed: Unexpected refcount 1.
Unhandled exception: page fault on read access to 0x00000009 in 32-bit code (0x7e7a953a).

Report errors:
mfplat:mfplat crashed (c0000005)