[PATCH 0/2] MR2709: include: Add ISpTTSEngineSite and ISpTTSEngine interfaces.

[PATCH 1/2] include: Add more sapi structs and enums.

[Shaun Ren]

From: Shaun Ren

---
 include/sapi.idl | 53 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/include/sapi.idl b/include/sapi.idl
index cd5d6044bdf..92a2881501c 100644
--- a/include/sapi.idl
+++ b/include/sapi.idl
@@ -574,6 +574,59 @@ typedef [restricted, hidden] struct SPAUDIOBUFFERINFO
     ULONG ulMsEventBias;
 } SPAUDIOBUFFERINFO;

+typedef [hidden] enum SPPARTOFSPEECH
+{
+    SPPS_NotOverriden  = -1,
+    SPPS_Unknown       = 0,
+    SPPS_Noun          = 0x1000,
+    SPPS_Verb          = 0x2000,
+    SPPS_Modifier      = 0x3000,
+    SPPS_Function      = 0x4000,
+    SPPS_Interjection  = 0x5000,
+    SPPS_Noncontent    = 0x6000,
+    SPPS_LMA           = 0x7000,
+    SPPS_SuppressWord  = 0xF000
+} SPPARTOFSPEECH;
+
+typedef [restricted, hidden] struct SPVPITCH
+{
+    long MiddleAdj;
+    long RangeAdj;
+} SPVPITCH;
+
+typedef [hidden] enum SPVACTIONS
+{
+    SPVA_Speak = 0,
+    SPVA_Silence,
+    SPVA_Pronounce,
+    SPVA_Bookmark,
+    SPVA_SpellOut,
+    SPVA_Section,
+    SPVA_ParseUnknownTag
+} SPVACTIONS;
+
+typedef [restricted, hidden] struct SPVCONTEXT
+{
+    LPCWSTR pCategory;
+    LPCWSTR pBefore;
+    LPCWSTR pAfter;
+} SPVCONTEXT;
+
+typedef [restricted, hidden] struct SPVSTATE
+{
+    SPVACTIONS      eAction;
+    LANGID          LangID;
+    WORD            wReserved;
+    long            EmphAdj;
+    long            RateAdj;
+    ULONG           Volume;
+    SPVPITCH        PitchAdj;
+    ULONG           SilenceMSecs;
+    SPPHONEID      *pPhoneIds;
+    SPPARTOFSPEECH  ePartOfSpeech;
+    SPVCONTEXT      Context;
+} SPVSTATE;
+
 cpp_quote("#if defined(__GNUC__)")

cpp_quote("#define SPCAT_AUDIOOUT (const WCHAR []){ 'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\','S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','S','p','e','e','c','h','\\','A','u','d','i','o','O','u','t','p','u','t',0 }")

[PATCH 2/2] include: Add ISpTTSEngineSite and ISpTTSEngine interfaces.

[Shaun Ren]

From: Shaun Ren

---
 include/sapiddk.idl | 63 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/include/sapiddk.idl b/include/sapiddk.idl
index 670b8c0dce5..ad28de34ff5 100644
--- a/include/sapiddk.idl
+++ b/include/sapiddk.idl
@@ -49,6 +49,69 @@ interface ISpObjectTokenEnumBuilder : IEnumSpObjectTokens
     HRESULT Sort([in] LPCWSTR pszTokenIdToListFirst);
 }

+typedef enum SPVSKIPTYPE
+{
+    SPVST_SENTENCE  = (1L << 0)           // Skip sentences
+} SPVSKIPTYPE;
+
+typedef enum SPVESACTIONS
+{
+    SPVES_CONTINUE = 0,
+    SPVES_ABORT    = ( 1L << 0 ),
+    SPVES_SKIP     = ( 1L << 1 ),
+    SPVES_RATE     = ( 1L << 2 ),
+    SPVES_VOLUME   = ( 1L << 3 )
+} SPVESACTIONS;
+
+[
+    object,
+    uuid(9880499b-cce9-11d2-b503-00c04f797396),
+    helpstring("ISpTTSEngineSite"),
+    pointer_default(unique),
+    local
+]
+interface ISpTTSEngineSite : ISpEventSink
+{
+    HRESULT GetActions();
+    HRESULT Write([in] const void *pBuff,
+                  [in] ULONG cb,
+                  [out] ULONG *pcbWritten);
+    HRESULT GetRate([out] long *pRateAdjust);
+    HRESULT GetVolume([out] USHORT *pusVolume);
+    HRESULT GetSkipInfo([out] SPVSKIPTYPE *peType,
+                        [out] long *plNumItems);
+    HRESULT CompleteSkip([in] long lNumSkipped);
+};
+
+typedef struct SPVTEXTFRAG
+{
+    struct SPVTEXTFRAG* pNext;
+    SPVSTATE  State;
+    LPCWSTR  pTextStart;
+    ULONG     ulTextLen;
+    ULONG     ulTextSrcOffset;
+} SPVTEXTFRAG;
+
+[
+    object,
+    uuid(a74d7c8e-4cc5-4f2f-a6eb-804dee18500e),
+    helpstring("ISpTTSEngine"),
+    pointer_default(unique),
+    local
+]
+interface ISpTTSEngine : IUnknown
+{
+    HRESULT Speak([in] DWORD dwSpeakFlags,
+                  [in] REFGUID rguidFormatId,
+                  [in] const WAVEFORMATEX *pWaveFormatEx,
+                  [in] const SPVTEXTFRAG *pTextFragList,
+                  [in] ISpTTSEngineSite *pOutputSite);
+    HRESULT GetOutputFormat([in] const GUID *pTargetFmtId,
+                            [in] const WAVEFORMATEX *pTargetWaveFormatEx,
+                            [out] GUID *pOutputFormatId,
+                            [out] WAVEFORMATEX **ppCoMemOutputWaveFormatEx);
+};
+
 [
     helpstring("Speech Object DDK Library"),
     uuid(9903f14c-12ce-4c99-9986-2ee3d7d588a8),

[Huw Davies (＠huw)]

Huw Davies (@huw) commented about include/sapiddk.idl:
> - HRESULT GetActions();
> - HRESULT Write([in] const void *pBuff,
> -
>              [in] ULONG cb,
> -
>              [out] ULONG *pcbWritten);
> - HRESULT GetRate([out] long *pRateAdjust);
> - HRESULT GetVolume([out] USHORT *pusVolume);
> - HRESULT GetSkipInfo([out] SPVSKIPTYPE *peType,
> -
>                    [out] long *plNumItems);
> - HRESULT CompleteSkip([in] long lNumSkipped);
>
> +};
> -
>
> +typedef struct SPVTEXTFRAG
> +{
> - struct SPVTEXTFRAG* pNext;
> - SPVSTATE  State;
> - LPCWSTR  pTextStart;

The alignment of the 'p' looks a bit odd - I'd suggest an extra space.

[PATCH 0/2] MR2709: include: Add ISpTTSEngineSite and ISpTTSEngine interfaces. - closed

[Shaun Ren (＠shaunren)]

This merge request was closed by Shaun Ren.