[PATCH v2 2/2] mfplat: Return HRESULT_FROM_WIN32(ERROR_HANDLE_EOF) when reading past the end of a file stream.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 dlls/mfplat/main.c         | 15 ++++++++++++++-
 dlls/mfplat/tests/mfplat.c |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index 7fd713261fc..fb55a8afb21 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -3843,7 +3843,7 @@ static HRESULT WINAPI bytestream_file_IsEndOfStream(IMFByteStream *iface, BOOL *
 static HRESULT WINAPI bytestream_file_Read(IMFByteStream *iface, BYTE *buffer, ULONG size, ULONG *read_len)
 {
     struct bytestream *stream = impl_from_IMFByteStream(iface);
-    LARGE_INTEGER position;
+    LARGE_INTEGER position, file_size;
     HRESULT hr = S_OK;
     BOOL ret;
 
@@ -3851,6 +3851,19 @@ static HRESULT WINAPI bytestream_file_Read(IMFByteStream *iface, BYTE *buffer, U
 
     EnterCriticalSection(&stream->cs);
 
+    if (!GetFileSizeEx(stream->hfile, &file_size))
+    {
+        LeaveCriticalSection(&stream->cs);
+        return HRESULT_FROM_WIN32(GetLastError());
+    }
+
+    if (stream->position > file_size.QuadPart)
+    {
+        LeaveCriticalSection(&stream->cs);
+        *read_len = 0;
+        return HRESULT_FROM_WIN32(ERROR_HANDLE_EOF);
+    }
+
     position.QuadPart = stream->position;
     if ((ret = SetFilePointerEx(stream->hfile, position, NULL, FILE_BEGIN)))
     {
diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index b9aa4bbb68d..1389975c2c2 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -2031,7 +2031,7 @@ static void test_file_stream(void)
 
     size = 0xdeadbeef;
     hr = IMFByteStream_Read(bytestream, data, sizeof(data), &size);
-    todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_HANDLE_EOF) || broken(hr == S_OK) /* win8 */,
+    ok(hr == HRESULT_FROM_WIN32(ERROR_HANDLE_EOF) || broken(hr == S_OK) /* win8 */,
             "Unexpected hr %#x.\n", hr);
     ok(!size || broken(size == 0xdeadbeef) /* win < 8 */, "Got size %u.\n", size);
 
-- 
2.33.0