2020-10-13 23:56:21 -07:00
|
|
|
From b38b826ee230339be27e83e42822a69afe13259f Mon Sep 17 00:00:00 2001
|
2020-08-31 19:54:02 -07:00
|
|
|
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
|
|
|
|
Date: Tue, 25 Aug 2020 19:07:58 +0200
|
2020-10-13 23:56:21 -07:00
|
|
|
Subject: [PATCH 1/4] windows.media.speech: Add stub dll.
|
2020-08-31 19:54:02 -07:00
|
|
|
|
|
|
|
---
|
2020-09-10 19:29:08 -07:00
|
|
|
configure.ac | 1 +
|
|
|
|
dlls/windows.media.speech.dll/Makefile.in | 5 +
|
|
|
|
.../windows.media.speech.spec | 3 +
|
2020-10-13 23:56:21 -07:00
|
|
|
.../windows.media.speech_main.c | 140 ++++++++++++++++++
|
2020-09-10 19:29:08 -07:00
|
|
|
loader/wine.inf.in | 1 +
|
2020-10-13 23:56:21 -07:00
|
|
|
5 files changed, 150 insertions(+)
|
2020-09-10 19:29:08 -07:00
|
|
|
create mode 100644 dlls/windows.media.speech.dll/Makefile.in
|
|
|
|
create mode 100644 dlls/windows.media.speech.dll/windows.media.speech.spec
|
|
|
|
create mode 100644 dlls/windows.media.speech.dll/windows.media.speech_main.c
|
2020-08-31 19:54:02 -07:00
|
|
|
|
2020-09-10 19:29:08 -07:00
|
|
|
diff --git a/configure.ac b/configure.ac
|
2020-10-13 23:56:21 -07:00
|
|
|
index a57697a0ddf..a8649a2e40b 100644
|
2020-09-10 19:29:08 -07:00
|
|
|
--- a/configure.ac
|
|
|
|
+++ b/configure.ac
|
2020-10-13 23:56:21 -07:00
|
|
|
@@ -3822,6 +3822,7 @@ WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16)
|
|
|
|
WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16)
|
2020-09-10 19:29:08 -07:00
|
|
|
WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16)
|
|
|
|
WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16)
|
|
|
|
+WINE_CONFIG_MAKEFILE(dlls/windows.media.speech.dll)
|
|
|
|
WINE_CONFIG_MAKEFILE(dlls/windowscodecs)
|
|
|
|
WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests)
|
|
|
|
WINE_CONFIG_MAKEFILE(dlls/windowscodecsext)
|
|
|
|
diff --git a/dlls/windows.media.speech.dll/Makefile.in b/dlls/windows.media.speech.dll/Makefile.in
|
|
|
|
new file mode 100644
|
2020-10-13 23:56:21 -07:00
|
|
|
index 00000000000..e1f4b3402bd
|
2020-09-10 19:29:08 -07:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/dlls/windows.media.speech.dll/Makefile.in
|
|
|
|
@@ -0,0 +1,5 @@
|
|
|
|
+MODULE = windows.media.speech.dll
|
2020-10-13 23:56:21 -07:00
|
|
|
+IMPORTS = combase uuid
|
2020-09-10 19:29:08 -07:00
|
|
|
+EXTRADLLFLAGS = -mno-cygwin
|
|
|
|
+C_SRCS = \
|
|
|
|
+ windows.media.speech_main.c
|
|
|
|
diff --git a/dlls/windows.media.speech.dll/windows.media.speech.spec b/dlls/windows.media.speech.dll/windows.media.speech.spec
|
|
|
|
new file mode 100644
|
|
|
|
index 00000000000..721493229c2
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/dlls/windows.media.speech.dll/windows.media.speech.spec
|
|
|
|
@@ -0,0 +1,3 @@
|
|
|
|
+1 stdcall -private DllCanUnloadNow()
|
|
|
|
+2 stdcall -private DllGetActivationFactory(ptr ptr)
|
|
|
|
+3 stdcall -private DllGetClassObject(ptr ptr ptr)
|
|
|
|
diff --git a/dlls/windows.media.speech.dll/windows.media.speech_main.c b/dlls/windows.media.speech.dll/windows.media.speech_main.c
|
|
|
|
new file mode 100644
|
2020-10-13 23:56:21 -07:00
|
|
|
index 00000000000..c7c14deef78
|
2020-09-10 19:29:08 -07:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/dlls/windows.media.speech.dll/windows.media.speech_main.c
|
2020-10-13 23:56:21 -07:00
|
|
|
@@ -0,0 +1,140 @@
|
2020-09-10 19:29:08 -07:00
|
|
|
+#include <stdarg.h>
|
|
|
|
+
|
|
|
|
+#define COBJMACROS
|
|
|
|
+#include "windef.h"
|
|
|
|
+#include "winbase.h"
|
|
|
|
+#include "winstring.h"
|
|
|
|
+#include "wine/debug.h"
|
|
|
|
+#include "objbase.h"
|
2020-10-13 23:56:21 -07:00
|
|
|
+
|
2020-09-10 19:29:08 -07:00
|
|
|
+#include "initguid.h"
|
2020-10-13 23:56:21 -07:00
|
|
|
+#include "activation.h"
|
2020-09-10 19:29:08 -07:00
|
|
|
+
|
2020-10-13 23:56:21 -07:00
|
|
|
+#include "windows.foundation.h"
|
|
|
|
+#include "windows.media.speechsynthesis.h"
|
2020-09-10 19:29:08 -07:00
|
|
|
+
|
2020-10-13 23:56:21 -07:00
|
|
|
+WINE_DEFAULT_DEBUG_CHANNEL(speech);
|
2020-09-10 19:29:08 -07:00
|
|
|
+
|
|
|
|
+static const char *debugstr_hstring(HSTRING hstr)
|
|
|
|
+{
|
|
|
|
+ const WCHAR *str;
|
|
|
|
+ UINT32 len;
|
|
|
|
+ if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)";
|
|
|
|
+ str = WindowsGetStringRawBuffer(hstr, &len);
|
|
|
|
+ return wine_dbgstr_wn(str, len);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+struct windows_media_speech
|
|
|
|
+{
|
|
|
|
+ IActivationFactory IActivationFactory_iface;
|
2020-10-13 23:56:21 -07:00
|
|
|
+ LONG ref;
|
2020-09-10 19:29:08 -07:00
|
|
|
+};
|
|
|
|
+
|
|
|
|
+static inline struct windows_media_speech *impl_from_IActivationFactory(IActivationFactory *iface)
|
|
|
|
+{
|
|
|
|
+ return CONTAINING_RECORD(iface, struct windows_media_speech, IActivationFactory_iface);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static HRESULT STDMETHODCALLTYPE windows_media_speech_QueryInterface(
|
2020-10-13 23:56:21 -07:00
|
|
|
+ IActivationFactory *iface, REFIID iid, void **out)
|
2020-09-10 19:29:08 -07:00
|
|
|
+{
|
|
|
|
+ struct windows_media_speech *impl = impl_from_IActivationFactory(iface);
|
2020-10-13 23:56:21 -07:00
|
|
|
+ TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out);
|
2020-09-10 19:29:08 -07:00
|
|
|
+
|
2020-10-13 23:56:21 -07:00
|
|
|
+ if (IsEqualGUID(iid, &IID_IUnknown) ||
|
|
|
|
+ IsEqualGUID(iid, &IID_IInspectable) ||
|
|
|
|
+ IsEqualGUID(iid, &IID_IActivationFactory))
|
2020-09-10 19:29:08 -07:00
|
|
|
+ {
|
|
|
|
+ IUnknown_AddRef(iface);
|
2020-10-13 23:56:21 -07:00
|
|
|
+ *out = &impl->IActivationFactory_iface;
|
2020-09-10 19:29:08 -07:00
|
|
|
+ return S_OK;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
|
2020-10-13 23:56:21 -07:00
|
|
|
+ *out = NULL;
|
2020-09-10 19:29:08 -07:00
|
|
|
+ return E_NOINTERFACE;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static ULONG STDMETHODCALLTYPE windows_media_speech_AddRef(
|
|
|
|
+ IActivationFactory *iface)
|
|
|
|
+{
|
|
|
|
+ struct windows_media_speech *impl = impl_from_IActivationFactory(iface);
|
2020-10-13 23:56:21 -07:00
|
|
|
+ ULONG ref = InterlockedIncrement(&impl->ref);
|
|
|
|
+ TRACE("iface %p, ref %u.\n", iface, ref);
|
|
|
|
+ return ref;
|
2020-09-10 19:29:08 -07:00
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static ULONG STDMETHODCALLTYPE windows_media_speech_Release(
|
|
|
|
+ IActivationFactory *iface)
|
|
|
|
+{
|
|
|
|
+ struct windows_media_speech *impl = impl_from_IActivationFactory(iface);
|
2020-10-13 23:56:21 -07:00
|
|
|
+ ULONG ref = InterlockedDecrement(&impl->ref);
|
|
|
|
+ TRACE("iface %p, ref %u.\n", iface, ref);
|
|
|
|
+ return ref;
|
2020-09-10 19:29:08 -07:00
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static HRESULT STDMETHODCALLTYPE windows_media_speech_GetIids(
|
|
|
|
+ IActivationFactory *iface, ULONG *iid_count, IID **iids)
|
|
|
|
+{
|
|
|
|
+ FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids);
|
|
|
|
+ return E_NOTIMPL;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static HRESULT STDMETHODCALLTYPE windows_media_speech_GetRuntimeClassName(
|
|
|
|
+ IActivationFactory *iface, HSTRING *class_name)
|
|
|
|
+{
|
|
|
|
+ FIXME("iface %p, class_name %p stub!\n", iface, class_name);
|
|
|
|
+ return E_NOTIMPL;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static HRESULT STDMETHODCALLTYPE windows_media_speech_GetTrustLevel(
|
|
|
|
+ IActivationFactory *iface, TrustLevel *trust_level)
|
|
|
|
+{
|
|
|
|
+ FIXME("iface %p, trust_level %p stub!\n", iface, trust_level);
|
|
|
|
+ return E_NOTIMPL;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static HRESULT STDMETHODCALLTYPE windows_media_speech_ActivateInstance(
|
|
|
|
+ IActivationFactory *iface, IInspectable **instance)
|
|
|
|
+{
|
|
|
|
+ FIXME("iface %p, instance %p stub!\n", iface, instance);
|
|
|
|
+ return E_NOTIMPL;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static const struct IActivationFactoryVtbl activation_factory_vtbl =
|
|
|
|
+{
|
|
|
|
+ windows_media_speech_QueryInterface,
|
|
|
|
+ windows_media_speech_AddRef,
|
|
|
|
+ windows_media_speech_Release,
|
|
|
|
+ /* IInspectable methods */
|
|
|
|
+ windows_media_speech_GetIids,
|
|
|
|
+ windows_media_speech_GetRuntimeClassName,
|
|
|
|
+ windows_media_speech_GetTrustLevel,
|
|
|
|
+ /* IActivationFactory methods */
|
|
|
|
+ windows_media_speech_ActivateInstance,
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+static struct windows_media_speech windows_media_speech =
|
|
|
|
+{
|
|
|
|
+ {&activation_factory_vtbl},
|
|
|
|
+ 0
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+HRESULT WINAPI DllCanUnloadNow(void)
|
|
|
|
+{
|
|
|
|
+ return S_FALSE;
|
|
|
|
+}
|
|
|
|
+
|
2020-10-13 23:56:21 -07:00
|
|
|
+HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out)
|
2020-09-10 19:29:08 -07:00
|
|
|
+{
|
2020-10-13 23:56:21 -07:00
|
|
|
+ FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out);
|
2020-09-10 19:29:08 -07:00
|
|
|
+ return CLASS_E_CLASSNOTAVAILABLE;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory)
|
|
|
|
+{
|
|
|
|
+ TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory);
|
|
|
|
+ *factory = &windows_media_speech.IActivationFactory_iface;
|
|
|
|
+ IUnknown_AddRef(*factory);
|
|
|
|
+ return S_OK;
|
|
|
|
+}
|
2020-08-31 19:54:02 -07:00
|
|
|
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
|
2020-10-13 23:56:21 -07:00
|
|
|
index ff9a221feaa..157b146a857 100644
|
2020-08-31 19:54:02 -07:00
|
|
|
--- a/loader/wine.inf.in
|
|
|
|
+++ b/loader/wine.inf.in
|
2020-10-13 23:56:21 -07:00
|
|
|
@@ -713,6 +713,7 @@ HKLM,%MciExtStr%,"wmx",,"MPEGVideo"
|
|
|
|
HKLM,%MciExtStr%,"wvx",,"MPEGVideo"
|
|
|
|
|
2020-08-31 19:54:02 -07:00
|
|
|
[Misc]
|
|
|
|
+HKLM,Software\Microsoft\WindowsRuntime\ActivatableClassId\Windows.Media.SpeechSynthesis.SpeechSynthesizer,"DllPath",2,"Windows.Media.Speech.dll"
|
|
|
|
HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,9000
|
|
|
|
HKLM,Software\Clients\Mail,,2,"Native Mail Client"
|
|
|
|
HKLM,Software\Clients\Mail\Native Mail Client,,2,"Native Mail Client"
|
|
|
|
--
|
|
|
|
2.28.0
|
|
|
|
|