Zebediah Figura : quartz/filesource: Set the sample length in IAsyncReader_SyncReadAligned().

Alexandre Julliard julliard at winehq.org
Tue Feb 26 15:13:56 CST 2019


Module: wine
Branch: master
Commit: 3d24e7dea9470c77cb5da3a8ebe841261f1c8d6f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3d24e7dea9470c77cb5da3a8ebe841261f1c8d6f

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Mon Feb 25 21:39:44 2019 -0600

quartz/filesource: Set the sample length in IAsyncReader_SyncReadAligned().

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/quartz/filesource.c       | 5 +++++
 dlls/quartz/tests/filesource.c | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index 71724af..9e36057 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -1292,6 +1292,8 @@ static BOOL sync_read(HANDLE file, LONGLONG offset, LONG length, BYTE *buffer, D
     ovl.u.s.Offset = (DWORD)offset;
     ovl.u.s.OffsetHigh = offset >> 32;
 
+    *read_len = 0;
+
     ret = ReadFile(file, buffer, length, NULL, &ovl);
     if (ret || GetLastError() == ERROR_IO_PENDING)
         ret = GetOverlappedResult(file, &ovl, read_len, TRUE);
@@ -1331,6 +1333,9 @@ static HRESULT WINAPI FileAsyncReader_SyncReadAligned(IAsyncReader *iface, IMedi
             hr = HRESULT_FROM_WIN32(GetLastError());
     }
 
+    if (SUCCEEDED(hr))
+        IMediaSample_SetActualDataLength(sample, read_len);
+
     return hr;
 }
 
diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c
index 340d1c4..36a2539 100644
--- a/dlls/quartz/tests/filesource.c
+++ b/dlls/quartz/tests/filesource.c
@@ -687,7 +687,6 @@ static void test_sync_read_aligned(IAsyncReader *reader, IMemAllocator *allocato
     ok(hr == S_OK, "Got hr %#x.\n", hr);
 
     len = IMediaSample_GetActualDataLength(sample);
-todo_wine
     ok(len == 512, "Got length %d.\n", len);
 
     for (i = 0; i < 512; i++)
@@ -702,7 +701,6 @@ todo_wine
     ok(hr == S_FALSE, "Got hr %#x.\n", hr);
 
     len = IMediaSample_GetActualDataLength(sample);
-todo_wine
     ok(len == 88, "Got length %d.\n", len);
 
     for (i = 0; i < 88; i++)
@@ -717,7 +715,6 @@ todo_wine
     ok(hr == S_OK, "Got hr %#x.\n", hr);
 
     len = IMediaSample_GetActualDataLength(sample);
-todo_wine
     ok(len == 0, "Got length %d.\n", len);
 
     IMediaSample_Release(sample);




More information about the wine-cvs mailing list