Nikolay Sivov : mfplat: Return capabilities for file stream.
Alexandre Julliard
julliard at winehq.org
Tue Mar 26 16:43:13 CDT 2019
Module: wine
Branch: master
Commit: b00be28968d2be2d94018f22590646f51d02217d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b00be28968d2be2d94018f22590646f51d02217d
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Mar 26 08:09:41 2019 +0300
mfplat: Return capabilities for file stream.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mfplat/main.c | 5 +++++
dlls/mfplat/tests/mfplat.c | 1 -
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index 6aaa29d..83eaee9 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -2823,6 +2823,7 @@ static const IMFGetServiceVtbl bytestream_file_getservice_vtbl =
HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags,
LPCWSTR url, IMFByteStream **bytestream)
{
+ DWORD capabilities = MFBYTESTREAM_IS_SEEKABLE | MFBYTESTREAM_DOES_NOT_USE_NETWORK;
struct bytestream *object;
DWORD fileaccessmode = 0;
DWORD filesharemode = FILE_SHARE_READ;
@@ -2838,12 +2839,15 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open
{
case MF_ACCESSMODE_READ:
fileaccessmode = GENERIC_READ;
+ capabilities |= MFBYTESTREAM_IS_READABLE;
break;
case MF_ACCESSMODE_WRITE:
fileaccessmode = GENERIC_WRITE;
+ capabilities |= MFBYTESTREAM_IS_WRITABLE;
break;
case MF_ACCESSMODE_READWRITE:
fileaccessmode = GENERIC_READ | GENERIC_WRITE;
+ capabilities |= (MFBYTESTREAM_IS_READABLE | MFBYTESTREAM_IS_WRITABLE);
break;
}
@@ -2897,6 +2901,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open
object->write_callback.lpVtbl = &bytestream_file_write_callback_vtbl;
InitializeCriticalSection(&object->cs);
list_init(&object->pending);
+ object->capabilities = capabilities;
object->hfile = file;
if (GetFileTime(file, NULL, NULL, &writetime))
diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index f280a35..779a76a 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -1153,7 +1153,6 @@ static void test_file_stream(void)
ok(hr == S_OK, "Failed to get stream capabilities, hr %#x.\n", hr);
if (is_win8_plus)
{
-todo_wine
ok(caps == (MFBYTESTREAM_IS_READABLE | MFBYTESTREAM_IS_SEEKABLE | MFBYTESTREAM_DOES_NOT_USE_NETWORK),
"Unexpected caps %#x.\n", caps);
}
More information about the wine-cvs
mailing list