Alistair Leslie-Hughes : include: Fix compiling with C++.
Alexandre Julliard
julliard at winehq.org
Fri Sep 17 16:03:10 CDT 2021
Module: wine
Branch: master
Commit: 16e73be10d940c9c04101a47687a6f8a385c2b0f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=16e73be10d940c9c04101a47687a6f8a385c2b0f
Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Fri Sep 17 19:07:09 2021 +1000
include: Fix compiling with C++.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/sapi.idl | 127 ++++++++++++++++++++++++++++---------------------------
1 file changed, 64 insertions(+), 63 deletions(-)
diff --git a/include/sapi.idl b/include/sapi.idl
index 5120e379450..c90d5ec145b 100644
--- a/include/sapi.idl
+++ b/include/sapi.idl
@@ -517,6 +517,7 @@ interface ISpEventSource;
interface ISpRecoContext;
interface ISpRecognizer;
interface ISpStreamFormat;
+interface ISpVoice;
[
object,
@@ -837,69 +838,6 @@ interface ISpNotifySink : IUnknown
HRESULT Notify(void);
}
-[
- object,
- uuid(6c44df74-72b9-4992-a1ec-ef996e0422d4),
- pointer_default(unique),
- restricted
-]
-interface ISpVoice : ISpEventSource
-{
- HRESULT SetOutput([in] IUnknown *unk, [in] BOOL changes);
- HRESULT GetOutputObjectToken([out] ISpObjectToken **token);
- HRESULT GetOutputStream([out] ISpStreamFormat **stream);
-
- HRESULT Pause(void);
- HRESULT Resume(void);
-
- HRESULT SetVoice([in] ISpObjectToken *token);
- HRESULT GetVoice([out] ISpObjectToken **token);
-
- HRESULT Speak([in, string] const WCHAR *pwcs,
- [in] DWORD flags,
- [out] ULONG *number);
- HRESULT SpeakStream([in] IStream *stream,
- [in] DWORD flags,
- [out] ULONG *number);
-
- HRESULT GetStatus(
- [out] SPVOICESTATUS *status,
- [out, string] WCHAR **bookmark);
-
- HRESULT Skip([in,string] const WCHAR *type, [in] long items, [out] ULONG *skipped);
-
- HRESULT SetPriority([in] SPVPRIORITY priority);
- HRESULT GetPriority([out] SPVPRIORITY* priority);
-
- HRESULT SetAlertBoundary([in] SPEVENTENUM boundary);
- HRESULT GetAlertBoundary([out] SPEVENTENUM* boundary);
-
- HRESULT SetRate([in] long adjust);
- HRESULT GetRate([out] long *adjust);
-
- HRESULT SetVolume([in] USHORT volume);
- HRESULT GetVolume([out] USHORT *volume);
-
- HRESULT WaitUntilDone([in] ULONG timeout);
-
- HRESULT SetSyncSpeakTimeout([in] ULONG timeout);
- HRESULT GetSyncSpeakTimeout([out] ULONG *timeout);
-
- [local] HANDLE SpeakCompleteEvent();
-
- [local] HRESULT IsUISupported(
- [in] const WCHAR *type,
- [in] void * extra,
- [in] ULONG count,
- [out] BOOL *supported);
- [local] HRESULT DisplayUI(
- [in] HWND parent,
- [in] const WCHAR *title,
- [in] const WCHAR *type,
- [in] void *extra,
- [in] ULONG count);
-};
-
[
object,
uuid(5eff4aef-8487-11d2-961c-00c04f8ee628),
@@ -982,6 +920,69 @@ interface ISpRecoContext : ISpEventSource
HRESULT GetContextState([in] SPCONTEXTSTATE *state);
};
+[
+ object,
+ uuid(6c44df74-72b9-4992-a1ec-ef996e0422d4),
+ pointer_default(unique),
+ restricted
+]
+interface ISpVoice : ISpEventSource
+{
+ HRESULT SetOutput([in] IUnknown *unk, [in] BOOL changes);
+ HRESULT GetOutputObjectToken([out] ISpObjectToken **token);
+ HRESULT GetOutputStream([out] ISpStreamFormat **stream);
+
+ HRESULT Pause(void);
+ HRESULT Resume(void);
+
+ HRESULT SetVoice([in] ISpObjectToken *token);
+ HRESULT GetVoice([out] ISpObjectToken **token);
+
+ HRESULT Speak([in, string] const WCHAR *pwcs,
+ [in] DWORD flags,
+ [out] ULONG *number);
+ HRESULT SpeakStream([in] IStream *stream,
+ [in] DWORD flags,
+ [out] ULONG *number);
+
+ HRESULT GetStatus(
+ [out] SPVOICESTATUS *status,
+ [out, string] WCHAR **bookmark);
+
+ HRESULT Skip([in,string] const WCHAR *type, [in] long items, [out] ULONG *skipped);
+
+ HRESULT SetPriority([in] SPVPRIORITY priority);
+ HRESULT GetPriority([out] SPVPRIORITY* priority);
+
+ HRESULT SetAlertBoundary([in] SPEVENTENUM boundary);
+ HRESULT GetAlertBoundary([out] SPEVENTENUM* boundary);
+
+ HRESULT SetRate([in] long adjust);
+ HRESULT GetRate([out] long *adjust);
+
+ HRESULT SetVolume([in] USHORT volume);
+ HRESULT GetVolume([out] USHORT *volume);
+
+ HRESULT WaitUntilDone([in] ULONG timeout);
+
+ HRESULT SetSyncSpeakTimeout([in] ULONG timeout);
+ HRESULT GetSyncSpeakTimeout([out] ULONG *timeout);
+
+ [local] HANDLE SpeakCompleteEvent();
+
+ [local] HRESULT IsUISupported(
+ [in] const WCHAR *type,
+ [in] void * extra,
+ [in] ULONG count,
+ [out] BOOL *supported);
+ [local] HRESULT DisplayUI(
+ [in] HWND parent,
+ [in] const WCHAR *title,
+ [in] const WCHAR *type,
+ [in] void *extra,
+ [in] ULONG count);
+};
+
[
object,
uuid(bed530be-2606-4f4d-a1c0-54c5cda5566f),
More information about the wine-cvs
mailing list