[PATCH 1/2] mfplat: Use underlying stream access mode for bytestream capabilities.

[Nikolay Sivov]

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

diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index e4ade7f202..fc656678ca 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -2700,6 +2700,24 @@ static ULONG WINAPI bytestream_Release(IMFByteStream *iface)
     return refcount;
 }
 
+static HRESULT WINAPI bytestream_stream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities)
+{
+    struct bytestream *stream = impl_from_IMFByteStream(iface);
+    STATSTG stat;
+    HRESULT hr;
+
+    TRACE("%p, %p.\n", iface, capabilities);
+
+    if (FAILED(hr = IStream_Stat(stream->stream, &stat, STATFLAG_NONAME)))
+        return hr;
+
+    *capabilities = MFBYTESTREAM_IS_READABLE | MFBYTESTREAM_IS_SEEKABLE;
+    if (stat.grfMode & (STGM_WRITE | STGM_READWRITE))
+        *capabilities |= MFBYTESTREAM_IS_WRITABLE;
+
+    return S_OK;
+}
+
 static HRESULT WINAPI bytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities)
 {
     struct bytestream *stream = impl_from_IMFByteStream(iface);
@@ -3060,7 +3078,7 @@ static const IMFByteStreamVtbl bytestream_stream_vtbl =
     bytestream_QueryInterface,
     bytestream_AddRef,
     bytestream_Release,
-    bytestream_GetCapabilities,
+    bytestream_stream_GetCapabilities,
     bytestream_stream_GetLength,
     bytestream_stream_SetLength,
     bytestream_stream_GetCurrentPosition,
@@ -3252,7 +3270,6 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt
     IStream_AddRef(object->stream);
     position.QuadPart = 0;
     IStream_Seek(object->stream, position, STREAM_SEEK_SET, NULL);
-    object->capabilities = MFBYTESTREAM_IS_READABLE | MFBYTESTREAM_IS_SEEKABLE;
 
     *bytestream = &object->IMFByteStream_iface;
 
-- 
2.24.0

[PATCH 2/2] mfplat: Set origin name attribute for stream based bytestreams too.

[Nikolay Sivov]

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

diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index fc656678ca..910b923542 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -3245,6 +3245,7 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt
 {
     struct bytestream *object;
     LARGE_INTEGER position;
+    STATSTG stat;
     HRESULT hr;
 
     TRACE("%p, %p.\n", stream, bytestream);
@@ -3271,6 +3272,16 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt
     position.QuadPart = 0;
     IStream_Seek(object->stream, position, STREAM_SEEK_SET, NULL);
 
+    if (SUCCEEDED(IStream_Stat(object->stream, &stat, 0)))
+    {
+        if (stat.pwcsName)
+        {
+            IMFAttributes_SetString(&object->attributes.IMFAttributes_iface, &MF_BYTESTREAM_ORIGIN_NAME,
+                    stat.pwcsName);
+            CoTaskMemFree(stat.pwcsName);
+        }
+    }
+
     *bytestream = &object->IMFByteStream_iface;
 
     return S_OK;
-- 
2.24.0