Nikolay Sivov : mfreadwrite/writer: Create output stream if it wasn't provided.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4244b4b138b35ede1653731b4dc54a0edb091bbd
URL:    https://gitlab.winehq.org/wine/wine/-/commit/4244b4b138b35ede1653731b4dc54a0edb091bbd

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Thu Aug 11 16:03:39 2022 +0300

mfreadwrite/writer: Create output stream if it wasn't provided.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>

---

 dlls/mfreadwrite/tests/mfplat.c | 13 +++++++++++++
 dlls/mfreadwrite/writer.c       | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
index c36e1a7e04d..95f615767d5 100644
--- a/dlls/mfreadwrite/tests/mfplat.c
+++ b/dlls/mfreadwrite/tests/mfplat.c
@@ -1291,6 +1291,18 @@ done:
     DestroyWindow(window);
 }
 
+static void test_sink_writer(void)
+{
+    IMFSinkWriter *writer;
+    HRESULT hr;
+
+    hr = MFCreateSinkWriterFromURL(NULL, NULL, NULL, NULL);
+    ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
+
+    hr = MFCreateSinkWriterFromURL(NULL, NULL, NULL, &writer);
+    ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
+}
+
 START_TEST(mfplat)
 {
     HRESULT hr;
@@ -1304,6 +1316,7 @@ START_TEST(mfplat)
     test_source_reader();
     test_source_reader_from_media_source();
     test_reader_d3d9();
+    test_sink_writer();
 
     hr = MFShutdown();
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c
index a3f77c4415b..f4bd08b8cda 100644
--- a/dlls/mfreadwrite/writer.c
+++ b/dlls/mfreadwrite/writer.c
@@ -289,6 +289,9 @@ HRESULT create_sink_writer_from_url(const WCHAR *url, IMFByteStream *bytestream,
     CLSID clsid;
     HRESULT hr;
 
+    if (!url && !bytestream)
+        return E_INVALIDARG;
+
     if (FAILED(hr = sink_writer_get_sink_factory_class(url, attributes, &clsid))) return hr;
 
     if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFSinkClassFactory, (void **)&factory)))
@@ -297,8 +300,18 @@ HRESULT create_sink_writer_from_url(const WCHAR *url, IMFByteStream *bytestream,
         return hr;
     }
 
+    if (bytestream)
+        IMFByteStream_AddRef(bytestream);
+    else if (FAILED(hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_DELETE_IF_EXIST, 0, url, &bytestream)))
+    {
+        WARN("Failed to create output file stream, hr %#lx.\n", hr);
+        IMFSinkClassFactory_Release(factory);
+        return hr;
+    }
+
     hr = IMFSinkClassFactory_CreateMediaSink(factory, bytestream, NULL, NULL, &sink);
     IMFSinkClassFactory_Release(factory);
+    IMFByteStream_Release(bytestream);
     if (FAILED(hr))
     {
         WARN("Failed to create a sink, hr %#lx.\n", hr);