Nikolay Sivov : mfreadwrite: Add MFReadWriteClassFactory stub.
Alexandre Julliard
julliard at winehq.org
Thu Feb 21 14:50:11 CST 2019
Module: wine
Branch: master
Commit: b91fbb1c2822a513d671c73ccfdb56760819184c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b91fbb1c2822a513d671c73ccfdb56760819184c
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Feb 21 15:34:57 2019 +0300
mfreadwrite: Add MFReadWriteClassFactory stub.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mfreadwrite/main.c | 129 ++++++++++++++++++++++++++++++++++++++--
dlls/mfreadwrite/tests/mfplat.c | 18 ++++++
2 files changed, 141 insertions(+), 6 deletions(-)
diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c
index 666e5ae..77dbd7b 100644
--- a/dlls/mfreadwrite/main.c
+++ b/dlls/mfreadwrite/main.c
@@ -24,12 +24,15 @@
#include "windef.h"
#include "winbase.h"
+#include "initguid.h"
#include "ole2.h"
#include "rpcproxy.h"
#include "mfreadwrite.h"
#include "wine/debug.h"
+DEFINE_GUID(CLSID_MFReadWriteClassFactory, 0x48e2ed0f, 0x98c2, 0x4a37, 0xbe, 0xd5, 0x16, 0x63, 0x12, 0xdd, 0xd8, 0x3f);
+
WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
static HINSTANCE mfinstance;
@@ -58,12 +61,6 @@ HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAt
return E_NOTIMPL;
}
-HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv)
-{
- FIXME("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
- return CLASS_E_CLASSNOTAVAILABLE;
-}
-
HRESULT WINAPI DllCanUnloadNow(void)
{
return S_FALSE;
@@ -247,3 +244,123 @@ HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttr
*reader = &object->IMFSourceReader_iface;
return S_OK;
}
+
+static HRESULT WINAPI readwrite_factory_QueryInterface(IMFReadWriteClassFactory *iface, REFIID riid, void **out)
+{
+ if (IsEqualIID(riid, &IID_IMFReadWriteClassFactory) ||
+ IsEqualIID(riid, &IID_IUnknown))
+ {
+ *out = iface;
+ IMFReadWriteClassFactory_AddRef(iface);
+ return S_OK;
+ }
+
+ WARN("Unsupported interface %s.\n", debugstr_guid(riid));
+ *out = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI readwrite_factory_AddRef(IMFReadWriteClassFactory *iface)
+{
+ return 2;
+}
+
+static ULONG WINAPI readwrite_factory_Release(IMFReadWriteClassFactory *iface)
+{
+ return 1;
+}
+
+static HRESULT WINAPI readwrite_factory_CreateInstanceFromURL(IMFReadWriteClassFactory *iface, REFCLSID clsid,
+ const WCHAR *url, IMFAttributes *attributes, REFIID riid, void **out)
+{
+ FIXME("%s, %s, %p, %s, %p.\n", debugstr_guid(clsid), debugstr_w(url), attributes, debugstr_guid(riid), out);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI readwrite_factory_CreateInstanceFromObject(IMFReadWriteClassFactory *iface, REFCLSID clsid,
+ IUnknown *unk, IMFAttributes *attributes, REFIID riid, void **out)
+{
+ FIXME("%s, %p, %p, %s, %p.\n", debugstr_guid(clsid), unk, attributes, debugstr_guid(riid), out);
+
+ return E_NOTIMPL;
+}
+
+static const IMFReadWriteClassFactoryVtbl readwrite_factory_vtbl =
+{
+ readwrite_factory_QueryInterface,
+ readwrite_factory_AddRef,
+ readwrite_factory_Release,
+ readwrite_factory_CreateInstanceFromURL,
+ readwrite_factory_CreateInstanceFromObject,
+};
+
+static IMFReadWriteClassFactory readwrite_factory = { &readwrite_factory_vtbl };
+
+static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **out)
+{
+ TRACE("%s, %p.\n", debugstr_guid(riid), out);
+
+ if (IsEqualGUID(riid, &IID_IClassFactory) ||
+ IsEqualGUID(riid, &IID_IUnknown))
+ {
+ IClassFactory_AddRef(iface);
+ *out = iface;
+ return S_OK;
+ }
+
+ WARN("interface %s not implemented\n", debugstr_guid(riid));
+ *out = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI classfactory_AddRef(IClassFactory *iface)
+{
+ return 2;
+}
+
+static ULONG WINAPI classfactory_Release(IClassFactory *iface)
+{
+ return 1;
+}
+
+static HRESULT WINAPI classfactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **out)
+{
+ TRACE("%p, %s, %p.\n", outer, debugstr_guid(riid), out);
+
+ *out = NULL;
+
+ if (outer)
+ return CLASS_E_NOAGGREGATION;
+
+ return IMFReadWriteClassFactory_QueryInterface(&readwrite_factory, riid, out);
+}
+
+static HRESULT WINAPI classfactory_LockServer(IClassFactory *iface, BOOL dolock)
+{
+ FIXME("%d.\n", dolock);
+ return S_OK;
+}
+
+static const struct IClassFactoryVtbl classfactoryvtbl =
+{
+ classfactory_QueryInterface,
+ classfactory_AddRef,
+ classfactory_Release,
+ classfactory_CreateInstance,
+ classfactory_LockServer,
+};
+
+static IClassFactory classfactory = { &classfactoryvtbl };
+
+HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out)
+{
+ TRACE("%s, %s, %p.\n", debugstr_guid(clsid), debugstr_guid(riid), out);
+
+ if (IsEqualGUID(clsid, &CLSID_MFReadWriteClassFactory))
+ return IClassFactory_QueryInterface(&classfactory, riid, out);
+
+ WARN("Unsupported class %s.\n", debugstr_guid(clsid));
+ *out = NULL;
+ return CLASS_E_CLASSNOTAVAILABLE;
+}
diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
index 9f5cad6..de5f359 100644
--- a/dlls/mfreadwrite/tests/mfplat.c
+++ b/dlls/mfreadwrite/tests/mfplat.c
@@ -36,6 +36,7 @@
#include "initguid.h"
DEFINE_GUID(MF_READWRITE_MMCSS_PRIORITY_AUDIO,0x273db885, 0x2de2, 0x4db2, 0xa6, 0xa7, 0xfd, 0xb6, 0x6f, 0xb4, 0x0b, 0x61);
DEFINE_GUID(MF_READWRITE_MMCSS_CLASS_AUDIO, 0x430847da, 0x0890, 0x4b0e, 0x93, 0x8c, 0x05, 0x43, 0x32, 0xc5, 0x47, 0xe1);
+DEFINE_GUID(CLSID_MFReadWriteClassFactory, 0x48e2ed0f, 0x98c2, 0x4a37, 0xbe, 0xd5, 0x16, 0x63, 0x12, 0xdd, 0xd8, 0x3f);
static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream);
@@ -90,6 +91,22 @@ static void test_MFCreateSourceReaderFromByteStream(void)
IMFSourceReader_Release(source);
}
+static void test_factory(void)
+{
+ IMFReadWriteClassFactory *factory, *factory2;
+ HRESULT hr;
+
+ hr = CoCreateInstance(&CLSID_MFReadWriteClassFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IMFReadWriteClassFactory,
+ (void **)&factory);
+ ok(hr == S_OK, "Failed to create class factory, hr %#x.\n", hr);
+
+ hr = CoCreateInstance(&CLSID_MFReadWriteClassFactory, (IUnknown *)factory, CLSCTX_INPROC_SERVER, &IID_IMFReadWriteClassFactory,
+ (void **)&factory2);
+ ok(hr == CLASS_E_NOAGGREGATION, "Unexpected hr %#x.\n", hr);
+
+ IMFReadWriteClassFactory_Release(factory);
+}
+
START_TEST(mfplat)
{
HRESULT hr;
@@ -102,6 +119,7 @@ START_TEST(mfplat)
init_functions();
test_MFCreateSourceReaderFromByteStream();
+ test_factory();
MFShutdown();
More information about the wine-cvs
mailing list