October 2019 - Wine-devel - list.winehq.org

[PATCH] gdi32: Collapse relative paths inside true type fonts file names in registry.
by Paul Gofman 16 Oct '19

16 Oct '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- The motivation under this patch is fixing the crash in Halo Online which originates from libcef.dll with Wine Staging. The crash scenario is the following. A staging patch puts a 'Times New Roman' font replacement to <datadir>/fonts/times.ttf. This is the only relevant difference introduced by Staging. When the font file is found there, gdi32 uses wine_get_data_dir() for a directory prefix to construct font file name. Later libcef.dll works with fonts through dwrite, and somehow gets confused by a "\\..\\" inside the font file name which it gets with IDWriteLocalFontFileLoader_GetFilePathFromKey() from system font file enumerator object. dlls/gdi32/freetype.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e3cff25b76..2f21ba40a0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3168,11 +3168,33 @@ static void update_reg_entries(void) HeapFree( GetProcessHeap(), 0, buffer ); if (path) - file = path; + { + len = GetFullPathNameW(path, 0, NULL, NULL); + if (!(file = HeapAlloc(GetProcessHeap(), 0, len * sizeof(*file)))) + { + HeapFree(GetProcessHeap(), 0, path); + HeapFree(GetProcessHeap(), 0, valueW); + continue; + } + if (GetFullPathNameW(path, len, file, NULL) != len - 1) + { + ERR("Could not get full path name, path %s.\n", debugstr_w(path)); + HeapFree(GetProcessHeap(), 0, file); + HeapFree(GetProcessHeap(), 0, path); + HeapFree(GetProcessHeap(), 0, valueW); + continue; + } + HeapFree(GetProcessHeap(), 0, path); + path = file; + } else if ((file = strrchrW(face->file, '/'))) + { file++; + } else + { file = face->file; + } len = strlenW(file) + 1; RegSetValueExW(winnt_key, valueW, 0, REG_SZ, (BYTE*)file, len * sizeof(WCHAR)); -- 2.21.0

3 3

[PATCH] msvcrt: Add overlapped memory move sprintf test.
by Piotr Caban 16 Oct '19

16 Oct '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/printf.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH] [msvcrt]: Implement %n and %t formats for strftime
by Vijay Kiran Kamuju 16 Oct '19

16 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/tests/time.c | 10 ++++++++++ dlls/msvcrt/time.c | 8 ++++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ 3 files changed, 26 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 7eea78367db..beba7963179 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -633,11 +633,21 @@ static void test_strftime(void) ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%n", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%R", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%t", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%T", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 6108ad17cce..78f46029720 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1225,6 +1225,11 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59)) return 0; break; +#if _MSVCR_VER>=140 + case 'n': + str[ret++] = '\n'; + break; +#endif case 'p': if(mstm->tm_hour<0 || mstm->tm_hour>23) goto einval_error; @@ -1247,6 +1252,9 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f return 0; break; #if _MSVCR_VER>=140 + case 't': + str[ret++] = '\t'; + break; case 'T': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 0d865fdcb8a..9747d8b21ab 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -942,6 +942,14 @@ static void test_strftime(void) retA = p_strftime(bufA, sizeof(bufA), "%h", &epoch); ok(retA == 3, "expected 3, got %d\n", (int)retA); ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%n", &epoch); + ok(retA == 1, "expected 1, got %d\n", (int)retA); + ok(!strcmp(bufA, "\n"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%t", &epoch); + ok(retA == 1, "expected 1, got %d\n", (int)retA); + ok(!strcmp(bufA, "\t"), "got %s\n", bufA); } static LONG* get_failures_counter(HANDLE *map) -- 2.21.0

3 2

[PATCH] msvcrt: Use memmove() instead of memcpy() puts_clbk_str()
by Felix Hädicke 16 Oct '19

16 Oct '19

memcpy() must not be used here, because results are undefined if the memory areas overlap. This can cause problems, particularly if particular compiler optimisations are enabled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47918 Signed-off-by: Felix Hädicke <felixhaedicke(a)web.de> --- dlls/msvcrt/printf.h | 4 ++-- dlls/msvcrt/wcs.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index a0d75401c4..346fb5ac5d 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -52,13 +52,13 @@ static int FUNC_NAME(puts_clbk_str)(void *ctx, int len, const APICHAR *str) return len; if(out->len < len) { - memcpy(out->buf, str, out->len*sizeof(APICHAR)); + memmove(out->buf, str, out->len*sizeof(APICHAR)); out->buf += out->len; out->len = 0; return -1; } - memcpy(out->buf, str, len*sizeof(APICHAR)); + memmove(out->buf, str, len*sizeof(APICHAR)); out->buf += len; out->len -= len; return len; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index f84963ce2e..3e5bb512ff 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -781,13 +781,13 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) return len; if(out->len < len) { - memcpy(out->buf, str, out->len); + memmove(out->buf, str, out->len); out->buf += out->len; out->len = 0; return len; } - memcpy(out->buf, str, len); + memmove(out->buf, str, len); out->buf += len; out->len -= len; return len; -- 2.23.0.162.g0b9fbb3734

2 1

[PATCH] winspool: Implement IsValidDevmodeW.
by Dmitry Timoshkov 16 Oct '19

16 Oct '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winspool.drv/info.c | 58 +++++++++++++++++++++++++--- dlls/winspool.drv/tests/info.c | 70 +++++++++++++++++++++++----------- include/winspool.h | 3 ++ 3 files changed, 102 insertions(+), 29 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 1ab5e43aef..0065801d90 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -104,6 +104,9 @@ #undef UnionRect #endif +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + #include "wine/library.h" #include "windef.h" #include "winbase.h" @@ -2449,7 +2452,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, * Validate a DEVMODE structure and fix errors if possible. * */ -BOOL WINAPI IsValidDevmodeA(PDEVMODEA *pDevMode, SIZE_T size) +BOOL WINAPI IsValidDevmodeA(PDEVMODEA pDevMode, SIZE_T size) { FIXME("(%p,%ld): stub\n", pDevMode, size); @@ -2465,12 +2468,55 @@ BOOL WINAPI IsValidDevmodeA(PDEVMODEA *pDevMode, SIZE_T size) * Validate a DEVMODE structure and fix errors if possible. * */ -BOOL WINAPI IsValidDevmodeW(PDEVMODEW *pDevMode, SIZE_T size) -{ - FIXME("(%p,%ld): stub\n", pDevMode, size); +BOOL WINAPI IsValidDevmodeW(PDEVMODEW dm, SIZE_T size) +{ + static const struct + { + DWORD flag; + SIZE_T size; + } map[] = + { +#define F_SIZE(field) FIELD_OFFSET(DEVMODEW, field) + sizeof(dm->field) + { DM_ORIENTATION, F_SIZE(u1.s1.dmOrientation) }, + { DM_PAPERSIZE, F_SIZE(u1.s1.dmPaperSize) }, + { DM_PAPERLENGTH, F_SIZE(u1.s1.dmPaperLength) }, + { DM_PAPERWIDTH, F_SIZE(u1.s1.dmPaperWidth) }, + { DM_SCALE, F_SIZE(u1.s1.dmScale) }, + { DM_COPIES, F_SIZE(u1.s1.dmCopies) }, + { DM_DEFAULTSOURCE, F_SIZE(u1.s1.dmDefaultSource) }, + { DM_PRINTQUALITY, F_SIZE(u1.s1.dmPrintQuality) }, + { DM_POSITION, F_SIZE(u1.s2.dmPosition) }, + { DM_DISPLAYORIENTATION, F_SIZE(u1.s2.dmDisplayOrientation) }, + { DM_DISPLAYFIXEDOUTPUT, F_SIZE(u1.s2.dmDisplayFixedOutput) }, + { DM_COLOR, F_SIZE(dmColor) }, + { DM_DUPLEX, F_SIZE(dmDuplex) }, + { DM_YRESOLUTION, F_SIZE(dmYResolution) }, + { DM_TTOPTION, F_SIZE(dmTTOption) }, + { DM_COLLATE, F_SIZE(dmCollate) }, + { DM_FORMNAME, F_SIZE(dmFormName) }, + { DM_LOGPIXELS, F_SIZE(dmLogPixels) }, + { DM_BITSPERPEL, F_SIZE(dmBitsPerPel) }, + { DM_PELSWIDTH, F_SIZE(dmPelsWidth) }, + { DM_PELSHEIGHT, F_SIZE(dmPelsHeight) }, + { DM_DISPLAYFLAGS, F_SIZE(u2.dmDisplayFlags) }, + { DM_NUP, F_SIZE(u2.dmNup) }, + { DM_DISPLAYFREQUENCY, F_SIZE(dmDisplayFrequency) }, + { DM_ICMMETHOD, F_SIZE(dmICMMethod) }, + { DM_ICMINTENT, F_SIZE(dmICMIntent) }, + { DM_MEDIATYPE, F_SIZE(dmMediaType) }, + { DM_DITHERTYPE, F_SIZE(dmDitherType) }, + { DM_PANNINGWIDTH, F_SIZE(dmPanningWidth) }, + { DM_PANNINGHEIGHT, F_SIZE(dmPanningHeight) } +#undef F_SIZE + }; + int i; - if(!pDevMode) - return FALSE; + if (!dm) return FALSE; + if (size < FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(dm->dmFields)) return FALSE; + + for (i = 0; i < ARRAY_SIZE(map); i++) + if ((dm->dmFields & map[i].flag) && size < map[i].size) + return FALSE; return TRUE; } diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 03a2e3cd32..f102bb11d9 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -75,8 +75,6 @@ static BOOL (WINAPI * pGetPrinterDriverW)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, static BOOL (WINAPI * pGetPrinterW)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD); static BOOL (WINAPI * pSetDefaultPrinterA)(LPCSTR); static DWORD (WINAPI * pXcvDataW)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD); -static BOOL (WINAPI * pIsValidDevmodeW)(PDEVMODEW, SIZE_T); - /* ################################ */ @@ -2905,26 +2903,6 @@ static void test_DeviceCapabilities(void) GlobalFree(prn_dlg.hDevNames); } -static void test_IsValidDevmodeW(void) -{ - BOOL br; - - if (!pIsValidDevmodeW) - { - win_skip("IsValidDevmodeW not implemented.\n"); - return; - } - - br = pIsValidDevmodeW(NULL, 0); - ok(br == FALSE, "Got %d\n", br); - - br = pIsValidDevmodeW(NULL, 1); - ok(br == FALSE, "Got %d\n", br); - - br = pIsValidDevmodeW(NULL, sizeof(DEVMODEW)); - ok(br == FALSE, "Got %d\n", br); -} - static void test_OpenPrinter_defaults(void) { HANDLE printer; @@ -3044,6 +3022,53 @@ todo_wine ClosePrinter( printer ); } +static void test_IsValidDevmodeW(void) +{ + static const struct + { + DWORD dmFields; + WORD dmSize; + BOOL ret; + } test[] = + { + { 0, FIELD_OFFSET(DEVMODEW, dmFields) + 0, FALSE }, + { 0, FIELD_OFFSET(DEVMODEW, dmFields) + 1, FALSE }, + { 0, FIELD_OFFSET(DEVMODEW, dmFields) + 2, FALSE }, + { 0, FIELD_OFFSET(DEVMODEW, dmFields) + 3, FALSE }, + { 0, FIELD_OFFSET(DEVMODEW, dmFields) + 4, TRUE }, + + { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, u1.s1.dmOrientation) + 0, FALSE }, + { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, u1.s1.dmOrientation) + 1, FALSE }, + { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, u1.s1.dmOrientation) + 2, TRUE }, + + { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 0, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 1, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 2, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 3, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 4, TRUE }, + + }; + DEVMODEW dm; + int i; + BOOL ret; + + ret = IsValidDevmodeW(NULL, 0); + ok(!ret, "got %d\n", ret); + + ret = IsValidDevmodeW(NULL, sizeof(DEVMODEW)); + ok(!ret, "got %d\n", ret); + + memset(&dm, 0, sizeof(dm)); + + for (i = 0; i < ARRAY_SIZE(test); i++) + { + dm.dmSize = test[i].dmSize; + dm.dmFields = test[i].dmFields; + ret = IsValidDevmodeW(&dm, dm.dmSize); + ok(ret == test[i].ret, "%d: got %d\n", i, ret); + } +} + START_TEST(info) { hwinspool = LoadLibraryA("winspool.drv"); @@ -3055,7 +3080,6 @@ START_TEST(info) pGetPrinterW = (void *) GetProcAddress(hwinspool, "GetPrinterW"); pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); pXcvDataW = (void *) GetProcAddress(hwinspool, "XcvDataW"); - pIsValidDevmodeW = (void *) GetProcAddress(hwinspool, "IsValidDevmodeW"); on_win9x = check_win9x(); if (on_win9x) diff --git a/include/winspool.h b/include/winspool.h index d9e8f404cd..4c170b861e 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -1761,6 +1761,9 @@ BOOL WINAPI XcvDataW(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded, PDWORD pdwStatus); +BOOL WINAPI IsValidDevmodeA(PDEVMODEA pDevMode, SIZE_T size); +BOOL WINAPI IsValidDevmodeW(PDEVMODEW pDevMode, SIZE_T size); + #ifdef __cplusplus } /* extern "C" */ #endif -- 2.20.1

3 2

[PATCH] wshom.ocx: Correct out parameter for _NewEnum
by Alistair Leslie-Hughes 16 Oct '19

16 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index d423856ce7..543d951ea0 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -698,7 +698,7 @@ static HRESULT WINAPI WshCollection_get_length(IWshCollection *iface, LONG *coun return E_NOTIMPL; } -static HRESULT WINAPI WshCollection__NewEnum(IWshCollection *iface, IUnknown *Enum) +static HRESULT WINAPI WshCollection__NewEnum(IWshCollection *iface, IUnknown **Enum) { WshCollection *This = impl_from_IWshCollection(iface); FIXME("(%p)->(%p): stub\n", This, Enum); diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index d936721589..8d4a8f03e1 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -383,7 +383,7 @@ library IWshRuntimeLibrary HRESULT length([out, retval] long *out_Count); [id(DISPID_NEWENUM)] - HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + HRESULT _NewEnum([out, retval] IUnknown **out_Enum); } [ -- 2.17.1

2 1

[PATCH] include: Add SpSharedRecognizer coclass and support interfaces
by Alistair Leslie-Hughes 16 Oct '19

16 Oct '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sapi.idl | 835 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 835 insertions(+) diff --git a/include/sapi.idl b/include/sapi.idl index e13843227e..d6f904f29a 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -27,6 +27,73 @@ import "ocidl.idl"; #define vi_progid(str) #endif +cpp_quote("#if 0") +typedef [restricted, hidden] struct WAVEFORMATEX +{ + WORD wFormatTag; + WORD nChannels; + DWORD nSamplesPerSec; + DWORD nAvgBytesPerSec; + WORD nBlockAlign; + WORD wBitsPerSample; + WORD cbSize; +} WAVEFORMATEX; +cpp_quote("#else") +cpp_quote("#include <mmsystem.h>") +cpp_quote("#endif") + +cpp_quote("#if defined(__cplusplus)") +cpp_quote("interface ISpNotifyCallback") +cpp_quote("{") +cpp_quote("virtual HRESULT STDMETHODCALLTYPE NotifyCallback(WPARAM wParam, LPARAM lParam) = 0;") +cpp_quote("};") +cpp_quote("#else") +typedef void * ISpNotifyCallback; +cpp_quote("#endif") + +cpp_quote("#if 0") +typedef void * SPNOTIFYCALLBACK; +typedef void * SPSTATEHANDLE; +cpp_quote("#endif") + +typedef [restricted, hidden] struct SPEVENT +{ + WORD eEventId; + WORD elParamType; + ULONG ulStreamNum; + ULONGLONG ullAudioStreamOffset; + WPARAM wParam; + LPARAM lParam; +} SPEVENT; + +cpp_quote("typedef void __stdcall SPNOTIFYCALLBACK(WPARAM wParam, LPARAM lParam);") +cpp_quote("DECLARE_HANDLE(SPSTATEHANDLE);") + +const ULONG SP_MAX_LANGIDS = 20; + +typedef [restricted, hidden] struct SPEVENTSOURCEINFO +{ + ULONGLONG ullEventInterest; + ULONGLONG ullQueuedInterest; + ULONG ulCount; +} SPEVENTSOURCEINFO; + +typedef [hidden] enum SPGRAMMARWORDTYPE +{ + SPWT_DISPLAY, + SPWT_LEXICAL, + SPWT_PRONUNCIATION, + SPWT_LEXICAL_NO_SPECIAL_CHARS +} SPGRAMMARWORDTYPE; + +typedef [hidden] struct tagSPPROPERTYINFO +{ + const WCHAR *pszName; + ULONG ulId; + const WCHAR *pszValue; + VARIANT vValue; +} SPPROPERTYINFO; + typedef [hidden] enum SPDATAKEYLOCATION { SPDKL_DefaultLocation = 0, @@ -35,6 +102,387 @@ typedef [hidden] enum SPDATAKEYLOCATION SPDKL_CurrentConfig = 5 } SPDATAKEYLOCATION; +typedef [hidden] enum SPLOADOPTIONS +{ + SPLO_STATIC, + SPLO_DYNAMIC +} SPLOADOPTIONS; + +typedef [hidden] enum SPRULESTATE +{ + SPRS_INACTIVE = 0, + SPRS_ACTIVE = 1, + SPRS_ACTIVE_WITH_AUTO_PAUSE = 3, + SPRS_ACTIVE_USER_DELIMITED = 4 +} SPRULESTATE; + +typedef [hidden] enum SPGRAMMARSTATE +{ + SPGS_DISABLED = 0, + SPGS_ENABLED = 1, + SPGS_EXCLUSIVE = 3 +} SPGRAMMARSTATE; + +typedef [hidden] struct SPBINARYGRAMMAR +{ + ULONG ulTotalSerializedSize; +} SPBINARYGRAMMAR; + +typedef [hidden] struct tagSPTEXTSELECTIONINFO +{ + ULONG ulStartActiveOffset; + ULONG cchActiveChars; + ULONG ulStartSelection; + ULONG cchSelection; +} SPTEXTSELECTIONINFO; + +typedef [hidden] enum SPWORDPRONOUNCEABLE +{ + SPWP_UNKNOWN_WORD_UNPRONOUNCEABLE, + SPWP_UNKNOWN_WORD_PRONOUNCEABLE, + SPWP_KNOWN_WORD_PRONOUNCEABLE +} SPWORDPRONOUNCEABLE; + +typedef [hidden] enum SPINTERFERENCE +{ + SPINTERFERENCE_NONE, + SPINTERFERENCE_NOISE, + SPINTERFERENCE_NOSIGNAL, + SPINTERFERENCE_TOOLOUD, + SPINTERFERENCE_TOOQUIET, + SPINTERFERENCE_TOOFAST, + SPINTERFERENCE_TOOSLOW +} SPINTERFERENCE; + +typedef [hidden] enum SPVISEMES +{ + SP_VISEME_0 = 0, + SP_VISEME_1, + SP_VISEME_2, + SP_VISEME_3, + SP_VISEME_4, + SP_VISEME_5, + SP_VISEME_6, + SP_VISEME_7, + SP_VISEME_8, + SP_VISEME_9, + SP_VISEME_10, + SP_VISEME_11, + SP_VISEME_12, + SP_VISEME_13, + SP_VISEME_14, + SP_VISEME_15, + SP_VISEME_16, + SP_VISEME_17, + SP_VISEME_18, + SP_VISEME_19, + SP_VISEME_20, + SP_VISEME_21, +} SPVISEMES; + +typedef [hidden] enum SPEVENTENUM +{ + SPEI_UNDEFINED = 0, + SPEI_START_INPUT_STREAM = 1, + SPEI_END_INPUT_STREAM = 2, + SPEI_VOICE_CHANGE = 3, + SPEI_TTS_BOOKMARK = 4, + SPEI_WORD_BOUNDARY = 5, + SPEI_PHONEME = 6, + SPEI_SENTENCE_BOUNDARY = 7, + SPEI_VISEME = 8, + SPEI_TTS_AUDIO_LEVEL = 9, + SPEI_TTS_PRIVATE = 15, + + SPEI_MIN_TTS = 1, + SPEI_MAX_TTS = 15, + + SPEI_END_SR_STREAM = 34, + SPEI_SOUND_START = 35, + SPEI_SOUND_END = 36, + SPEI_PHRASE_START = 37, + SPEI_RECOGNITION = 38, + SPEI_HYPOTHESIS = 39, + SPEI_SR_BOOKMARK = 40, + SPEI_PROPERTY_NUM_CHANGE = 41, + SPEI_PROPERTY_STRING_CHANGE = 42, + SPEI_FALSE_RECOGNITION = 43, + SPEI_INTERFERENCE = 44, + SPEI_REQUEST_UI = 45, + SPEI_RECO_STATE_CHANGE = 46, + SPEI_ADAPTATION = 47, + SPEI_START_SR_STREAM = 48, + SPEI_RECO_OTHER_CONTEXT = 49, + SPEI_SR_AUDIO_LEVEL = 50, + SPEI_SR_RETAINEDAUDIO = 51, + SPEI_SR_PRIVATE = 52, + SPEI_ACTIVE_CATEGORY_CHANGED = 53, + + SPEI_MIN_SR = 34, + SPEI_MAX_SR = 55, + + SPEI_RESERVED1 = 30, + SPEI_RESERVED2 = 33, + SPEI_RESERVED3 = 63 +} SPEVENTENUM; + +typedef [hidden] enum SPCONTEXTSTATE +{ + SPCS_DISABLED = 0, + SPCS_ENABLED = 1, +} SPCONTEXTSTATE; + +typedef [hidden] enum SPVPRIORITY +{ + SPVPRI_NORMAL = 0, + SPVPRI_ALERT = 1, + SPVPRI_OVER = 2 +} SPVPRIORITY; + +typedef [hidden] enum SPRECOSTATE +{ + SPRST_INACTIVE, + SPRST_ACTIVE, + SPRST_ACTIVE_ALWAYS, + SPRST_INACTIVE_WITH_PURGE, + SPRST_NUM_STATES +} SPRECOSTATE; + +typedef [hidden] enum SPWAVEFORMATTYPE +{ + SPWF_INPUT, + SPWF_SRENGINE +} SPSTREAMFORMATTYPE; + +typedef [restricted, hidden] struct SPRECOCONTEXTSTATUS +{ + SPINTERFERENCE eInterference; + WCHAR szRequestTypeOfUI[255]; + DWORD dwReserved1; + DWORD dwReserved2; +} SPRECOCONTEXTSTATUS; + +typedef [hidden] enum SPAUDIOOPTIONS +{ + SPAO_NONE, + SPAO_RETAIN_AUDIO +} SPAUDIOOPTIONS; + +typedef [hidden] struct SPSERIALIZEDRESULT +{ + ULONG ulSerializedSize; +} SPSERIALIZEDRESULT; + +typedef [hidden] enum SPDISPLYATTRIBUTES +{ + SPAF_ONE_TRAILING_SPACE = 0x02, + SPAF_TWO_TRAILING_SPACES = 0x04, + SPAF_CONSUME_LEADING_SPACES = 0x08, + SPAF_ALL = 0x0f +} SPDISPLAYATTRIBUTES; + +typedef [hidden] enum SPBOOKMARKOPTIONS +{ + SPBO_NONE, + SPBO_PAUSE +} SPBOOKMARKOPTIONS; + +typedef [hidden] enum _SPAUDIOSTATE +{ + SPAS_CLOSED, + SPAS_STOP, + SPAS_PAUSE, + SPAS_RUN +} SPAUDIOSTATE; + +typedef [hidden] enum SPRUNSTATE +{ + SPRS_DONE = (1L << 0), + SPRS_IS_SPEAKING = (1L << 1) +} SPRUNSTATE; + +typedef [hidden] enum SPEAKFLAGS +{ + SPF_DEFAULT = 0, + SPF_ASYNC = (1L << 0), + SPF_PURGEBEFORESPEAK = (1L << 1), + SPF_IS_FILENAME = (1L << 2), + SPF_IS_XML = (1L << 3), + SPF_IS_NOT_XML = (1L << 4), + SPF_PERSIST_XML = (1L << 5), + SPF_NLP_SPEAK_PUNC = (1L << 6), + SPF_PARSE_SAPI = (1L << 7), + SPF_PARSE_SSML = (1L << 8), + SPF_PARSE_AUTODETECT = 0, + SPF_NLP_MASK = (SPF_NLP_SPEAK_PUNC), + SPF_PARSE_MASK = (SPF_PARSE_SAPI|SPF_PARSE_SSML), + SPF_VOICE_MASK = (SPF_ASYNC|SPF_PURGEBEFORESPEAK|SPF_IS_FILENAME|SPF_IS_XML|SPF_IS_NOT_XML|SPF_NLP_MASK|SPF_PERSIST_XML|SPF_PARSE_MASK), + SPF_UNUSED_FLAGS = ~(SPF_VOICE_MASK) +} SPEAKFLAGS; + +typedef [hidden] enum SPCFGRULEATTRIBUTES +{ + SPRAF_TopLevel = (1 << 0), + SPRAF_Active = (1 << 1), + SPRAF_Export = (1 << 2), + SPRAF_Import = (1 << 3), + SPRAF_Interpreter = (1 << 4), + SPRAF_Dynamic = (1 << 5), + SPRAF_Root = (1 << 6), + SPRAF_AutoPause = (1 << 16), + SPRAF_UserDelimited = (1 << 17) +} SPCFGRULEATTRIBUTES; + +typedef [hidden] enum SPPHRASERNG +{ + SPPR_ALL_ELEMENTS = -1 +} SPPHRASERNG; + +typedef [hidden] enum SPVALUETYPE +{ + SPDF_PROPERTY = 0x00000001, + SPDF_REPLACEMENT = 0x00000002, + SPDF_RULE = 0x00000004, + SPDF_DISPLAYTEXT = 0x00000008, + SPDF_LEXICALFORM = 0x00000010, + SPDF_PRONUNCIATION = 0x00000020, + SPDF_AUDIO = 0x00000040, + SPDF_ALTERNATES = 0x00000080, + SPDF_ALL = 0x000000ff +} SPVALUETYPE; + +typedef unsigned short SPPHONEID; + +typedef [restricted, hidden] struct SPPHRASEELEMENT +{ + ULONG ulAudioTimeOffset; + ULONG ulAudioSizeTime; + ULONG ulAudioStreamOffset; + ULONG ulAudioSizeBytes; + ULONG ulRetainedStreamOffset; + ULONG ulRetainedSizeBytes; + const WCHAR *pszDisplayText; + const WCHAR *pszLexicalForm; + const SPPHONEID *pszPronunciation; + BYTE bDisplayAttributes; + signed char RequiredConfidence; + signed char ActualConfidence; + BYTE Reserved; + float SREngineConfidence; +} SPPHRASEELEMENT; + +typedef [restricted, hidden] struct SPVOICESTATUS +{ + ULONG ulCurrentStream; + ULONG ulLastStreamQueued; + HRESULT hrLastResult; + DWORD dwRunningState; + ULONG ulInputWordPos; + ULONG ulInputWordLen; + ULONG ulInputSentPos; + ULONG ulInputSentLen; + LONG lBookmarkId; + SPPHONEID PhonemeId; + SPVISEMES VisemeId; + DWORD dwReserved1; + DWORD dwReserved2; +} SPVOICESTATUS; + +typedef [restricted, hidden] struct SPAUDIOSTATUS +{ + long cbFreeBuffSpace; + ULONG cbNonBlockingIO; + SPAUDIOSTATE State; + ULONGLONG CurSeekPos; + ULONGLONG CurDevicePos; + DWORD dwAudioLevel; + DWORD dwReserved2; +} SPAUDIOSTATUS; + +typedef [restricted, hidden] struct SPRECOGNIZERSTATUS +{ + SPAUDIOSTATUS AudioStatus; + ULONGLONG ullRecognitionStreamPos; + ULONG ulStreamNumber; + ULONG ulNumActive; + CLSID clsidEngine; + ULONG cLangIDs; + LANGID aLangID[SP_MAX_LANGIDS]; + ULONGLONG ullRecognitionStreamTime; +} SPRECOGNIZERSTATUS; + +typedef [restricted, hidden] struct SPPHRASERULE SPPHRASERULE; + +struct SPPHRASERULE +{ + LPCWSTR pszName; + ULONG ulId; + ULONG ulFirstElement; + ULONG ulCountOfElements; + const SPPHRASERULE* pNextSibling; + const SPPHRASERULE* pFirstChild; + float SREngineConfidence; + signed char Confidence; +}; + +typedef [restricted, hidden] struct SPPHRASEPROPERTY SPPHRASEPROPERTY; + +struct SPPHRASEPROPERTY +{ + const WCHAR *pszName; + ULONG ulId; + const WCHAR *pszValue; + VARIANT vValue; + ULONG ulFirstElement; + ULONG ulCountOfElements; + const SPPHRASEPROPERTY *pNextSibling; + const SPPHRASEPROPERTY *pFirstChild; + float SREngineConfidence; + signed char Confidence; +}; + +typedef [restricted, hidden] struct SPPHRASEREPLACEMENT +{ + BYTE bDisplayAttributes; + const WCHAR *pszReplacementText; + ULONG ulFirstElement; + ULONG ulCountOfElements; +} SPPHRASEREPLACEMENT; + +typedef [restricted, hidden] struct SPPHRASE +{ + ULONG cbSize; + LANGID LangID; + WORD wReserved; + ULONGLONG ullGrammarID; + ULONGLONG ftStartTime; + ULONGLONG ullAudioStreamPosition; + ULONG ulAudioSizeBytes; + ULONG ulRetainedSizeBytes; + ULONG ulAudioSizeTime; + SPPHRASERULE Rule; + const SPPHRASEPROPERTY *pProperties; + const SPPHRASEELEMENT *pElements; + ULONG cReplacements; + const SPPHRASEREPLACEMENT *pReplacements; + GUID SREngineID; + ULONG ulSREnginePrivateDataSize; + const BYTE *pSREnginePrivateData; +} SPPHRASE; + +typedef [restricted, hidden] struct SPSERIALIZEDPHRASE +{ + ULONG ulSerializedSize; +} SPSERIALIZEDPHRASE; + +typedef [restricted, hidden] struct SPRECORESULTTIMES +{ + FILETIME ftStreamTime; + ULONGLONG ullLength; + DWORD dwTickCount; + ULONGLONG ullStart; +} SPRECORESULTTIMES; + 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 }") @@ -56,6 +504,10 @@ cpp_quote("static const WCHAR SPCAT_VOICES[] = {'H','K','E','Y','_','L','O','C', cpp_quote("#endif") interface IEnumSpObjectTokens; +interface ISpEventSource; +interface ISpRecoContext; +interface ISpRecognizer; +interface ISpStreamFormat; [ object, @@ -190,6 +642,380 @@ interface IEnumSpObjectTokens : IUnknown HRESULT GetCount([out] ULONG *pCount); } +[ + object, + uuid(1a5c0354-b621-4b5a-8791-d306ed379e53), + local, + pointer_default(unique), + restricted +] +interface ISpPhrase : IUnknown +{ + HRESULT GetPhrase([out] SPPHRASE **phrase); + HRESULT GetSerializedPhrase([out] SPSERIALIZEDPHRASE **phrase); + HRESULT GetText([in] ULONG start, [in] ULONG count, [in] BOOL replacements, + [out] WCHAR **text, [out] BYTE *attributes); + HRESULT Discard([in] DWORD types); +}; + +[ + object, + uuid(8fcebc98-4e49-4067-9c6c-d86a0e092e3d), + local, + pointer_default(unique), + restricted +] +interface ISpPhraseAlt : ISpPhrase +{ + HRESULT GetAltInfo(ISpPhrase **parent, ULONG *start, ULONG *count, + ULONG *elements); + HRESULT Commit(); +}; + +[ + object, + uuid(20b053be-e235-43cd-9a2a-8d17a48b7842), + pointer_default(unique), + local, + restricted +] +interface ISpRecoResult : ISpPhrase +{ + HRESULT GetResultTimes([out] SPRECORESULTTIMES *times); + + HRESULT GetAlternates( + [in] ULONG start, + [in] ULONG elements, + [in] ULONG count, + [out] ISpPhraseAlt **phrases, + [out] ULONG *returned); + + HRESULT GetAudio( + [in] ULONG start, + [in] ULONG elements, + [out] ISpStreamFormat **stream); + HRESULT SpeakAudio( + [in] ULONG start, + [in] ULONG elements, + [in] DWORD flags, + [out] ULONG *number); + + HRESULT Serialize([out] SPSERIALIZEDRESULT **result); + + HRESULT ScaleAudio([in] const GUID *format, [in] const WAVEFORMATEX *wave); + + HRESULT GetRecoContext([out] ISpRecoContext *context); +}; + +[ + object, + uuid(8137828f-591a-4a42-be58-49ea7ebaac68), + helpstring("ISpGrammarBuilder Interface"), + pointer_default(unique), + restricted, + local +] +interface ISpGrammarBuilder : IUnknown +{ + HRESULT ResetGrammar([in] LANGID language); + + HRESULT GetRule([in] const WCHAR *rule, + [in] DWORD id, + [in] DWORD attributes, + [in] BOOL should_create, + [out] SPSTATEHANDLE *state); + HRESULT ClearRule(SPSTATEHANDLE state); + + HRESULT CreateNewState( + [in] SPSTATEHANDLE instate, + [out] SPSTATEHANDLE *outstate); + + HRESULT AddWordTransition( + [in] SPSTATEHANDLE from_state, + [in] SPSTATEHANDLE to_state, + [in] const WCHAR *value, + [in] const WCHAR *separators, + [in] SPGRAMMARWORDTYPE type, + [in] float weight, + [in] const SPPROPERTYINFO *info); + + HRESULT AddRuleTransition( + [in] SPSTATEHANDLE from_state, + [in] SPSTATEHANDLE to_state, + [in] SPSTATEHANDLE rule, + [in] float weight, + [in] const SPPROPERTYINFO *info); + + HRESULT AddResource([in] SPSTATEHANDLE state, + [in] const WCHAR *name, + [in] const WCHAR *value); + + HRESULT Commit([in] DWORD reserved); +}; + +[ + object, + uuid(2177db29-7f45-47d0-8554-067e91c80502), + pointer_default(unique), + restricted, + local +] +interface ISpRecoGrammar : ISpGrammarBuilder +{ + HRESULT GetGrammarId([out] ULONGLONG *grammar); + HRESULT GetRecoContext([out] ISpRecoContext **context); + + HRESULT LoadCmdFromFile([in, string] const WCHAR * pszFileName, [in] SPLOADOPTIONS options); + HRESULT LoadCmdFromObject([in] REFCLSID rcid, [in, string] const WCHAR * pszGrammarName, [in] SPLOADOPTIONS options); + HRESULT LoadCmdFromResource([in] HMODULE hmod, + [in, string] const WCHAR *name, + [in, string] const WCHAR *type, + [in] WORD language, + [in] SPLOADOPTIONS options); + HRESULT LoadCmdFromMemory([in] const SPBINARYGRAMMAR *grammar, [in] SPLOADOPTIONS options); + HRESULT LoadCmdFromProprietaryGrammar( + [in] REFGUID guid, + [in, string] const WCHAR *param, + [in] const void *data, + [in] ULONG size, + [in] SPLOADOPTIONS options); + HRESULT SetRuleState([in, string] const WCHAR *name, [in] void *reserved, + [in] SPRULESTATE state); + HRESULT SetRuleIdState([in] ULONG rule, [in] SPRULESTATE state); + + HRESULT LoadDictation([in, string] const WCHAR *name, [in] SPLOADOPTIONS options); + HRESULT UnloadDictation(); + HRESULT SetDictationState([in] SPRULESTATE state); + + HRESULT SetWordSequenceData([in] const WCHAR *text, [in] ULONG count, [in] const SPTEXTSELECTIONINFO *info); + HRESULT SetTextSelection([in] const SPTEXTSELECTIONINFO *info); + + HRESULT IsPronounceable([in, string] const WCHAR *word, [out] SPWORDPRONOUNCEABLE *pronounceable); + + HRESULT SetGrammarState([in] SPGRAMMARSTATE state); + + HRESULT SaveCmd([in] IStream *stream, [out, optional] WCHAR **error); + + HRESULT GetGrammarState([out] SPGRAMMARSTATE *state); +}; + +[ + object, + uuid(259684dc-37c3-11d2-9603-00c04f8ee628), + pointer_default(unique), + restricted +] +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] 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), + pointer_default(unique), + restricted +] +interface ISpNotifySource : IUnknown +{ + HRESULT SetNotifySink([in] ISpNotifySink *sink); + [local] HRESULT SetNotifyWindowMessage( + [in] HWND hwnd, + [in] UINT msg, + [in] WPARAM wparam, + [in] LPARAM lparam); + [local] HRESULT SetNotifyCallbackFunction( + [in] SPNOTIFYCALLBACK *callback, + [in] WPARAM wparam, + [in] LPARAM lparam); + [local] HRESULT SetNotifyCallbackInterface( + [in] ISpNotifyCallback *callback, + [in] WPARAM wparam, + [in] LPARAM lparam); + [local] HRESULT SetNotifyWin32Event(void); + [local] HRESULT WaitForNotifyEvent([in] DWORD milliseconds); + [local] HANDLE GetNotifyEventHandle(); +} + +[ + object, + uuid(be7a9cce-5f9e-11d2-960f-00c04f8ee628), + pointer_default(unique), + local, + restricted +] +interface ISpEventSource : ISpNotifySource +{ + HRESULT SetInterest([in] ULONGLONG event, [in] ULONGLONG queued); + HRESULT GetEvents([in] ULONG count, + [out, size_is(count)] SPEVENT *array, + [out] ULONG *fetched); + HRESULT GetInfo([out] SPEVENTSOURCEINFO *info); +}; + +[ + object, + uuid(f740a62f-7c15-489e-8234-940a33d9272d), + pointer_default(unique), + local, + restricted +] +interface ISpRecoContext : ISpEventSource +{ + HRESULT GetRecognizer([out] ISpRecognizer **recognizer); + + HRESULT CreateGrammar([in] ULONGLONG grammar, [out] ISpRecoGrammar **spgrammar); + + HRESULT GetStatus([out] SPRECOCONTEXTSTATUS *status); + + HRESULT GetMaxAlternates([in] ULONG *alternates); + HRESULT SetMaxAlternates([in] ULONG alternates); + + HRESULT SetAudioOptions([in] SPAUDIOOPTIONS options, [in] const GUID *format, [in] const WAVEFORMATEX *wave); + HRESULT GetAudioOptions([in] SPAUDIOOPTIONS *options, [out] GUID *format, [out] WAVEFORMATEX **wave); + + HRESULT DeserializeResult([in] const SPSERIALIZEDRESULT *serialized, [out] ISpRecoResult **result); + + HRESULT Bookmark([in] SPBOOKMARKOPTIONS options, [in] ULONGLONG position, [in] LPARAM event); + + HRESULT SetAdaptationData([in, string] const WCHAR *data, [in] const ULONG count); + + HRESULT Pause(DWORD reserved); + HRESULT Resume(DWORD reserved); + + HRESULT SetVoice([in] ISpVoice *voice, [in] BOOL changes); + HRESULT GetVoice([out] ISpVoice **voice); + HRESULT SetVoicePurgeEvent([in] ULONGLONG interest); + HRESULT GetVoicePurgeEvent([out] ULONGLONG *interest); + + HRESULT SetContextState([in] SPCONTEXTSTATE state); + HRESULT GetContextState([in] SPCONTEXTSTATE *state); +}; + +[ + object, + uuid(bed530be-2606-4f4d-a1c0-54c5cda5566f), + pointer_default(unique), + restricted +] +interface ISpStreamFormat : IStream +{ + HRESULT GetFormat(GUID *format, WAVEFORMATEX **wave); +} + +[ + object, + uuid(5b4fb971-b115-4de1-ad97-e482e3bf6ee4), + pointer_default(unique), + local, + restricted +] +interface ISpProperties : IUnknown +{ + HRESULT SetPropertyNum([in] const WCHAR *name, [in] long value); + HRESULT GetPropertyNum([in] const WCHAR *name, [out] long *value); + HRESULT SetPropertyString([in] const WCHAR *name, [in] const WCHAR *value); + HRESULT GetPropertyString([in] const WCHAR *name, [out] WCHAR **value); +}; + +[ + object, + uuid(c2b5f241-daa0-4507-9e16-5a1eaa2b7a5c), + pointer_default(unique), + restricted +] +interface ISpRecognizer : ISpProperties +{ + HRESULT SetRecognizer([in] ISpObjectToken *recognizer); + HRESULT GetRecognizer([out] ISpObjectToken **recognizer); + + HRESULT SetInput([in] IUnknown *input, [in] BOOL changes); + HRESULT GetInputObjectToken([out] ISpObjectToken **token); + + HRESULT GetInputStream( [out] ISpStreamFormat **stream); + HRESULT CreateRecoContext([out] ISpRecoContext **cxt); + + HRESULT GetRecoProfile([out] ISpObjectToken **token); + HRESULT SetRecoProfile([in] ISpObjectToken *token); + + HRESULT IsSharedInstance(void); + + HRESULT GetRecoState([out] SPRECOSTATE *state); + HRESULT SetRecoState([in] SPRECOSTATE state); + + HRESULT GetStatus([out] SPRECOGNIZERSTATUS *status); + HRESULT GetFormat([in] SPSTREAMFORMATTYPE type, [out] GUID *format, [out] WAVEFORMATEX **wave); + + [local] HRESULT IsUISupported([in] const WCHAR *type, [in] void *extra, [in] ULONG count, + [out] BOOL *supported); + [local] HRESULT DisplayUI([in] HWND hwnd,[in] const WCHAR *title, [in] const WCHAR *type, + [in] void *extra, [in] ULONG cnt); + HRESULT EmulateRecognition([in] ISpPhrase *phrase); +}; + [ helpstring("Speech Object Library"), uuid(c866ca3a-32f7-11d2-9602-00c04f8ee628), @@ -210,4 +1036,13 @@ library SpeechLib { interface ISpObjectTokenCategory; } + + [ + uuid(3bee4890-4fe9-4a37-8c1e-5e7e12791c1f) + ] + coclass SpSharedRecognizer + { + /*[default] interface ISpeechRecognizer;*/ + interface ISpRecognizer; + }; } -- 2.17.1

1 0

[PATCH] winex11: Copy icon color table in 256-color mode (Valgrind)
by Alex Henrie 16 Oct '19

16 Oct '19

create_icon_pixmaps calls GetDIBits and create_pixmap_from_image, which calls get_dib_info_size. GetDIBits sets biClrUsed to 0, which is a special value meaning that the size of the color table is the maximum size possible given the bit depth. Without code to handle that case in get_dib_info_size, the color table is lost. gdi32's version of get_dib_info_size does not have to deal with biClrUsed being zero because bitmapinfo_from_user_bitmapinfo makes a copy of the bitmap info with biClrUsed set to a nonzero value. However, there is no reason to have anything that complicated in winex11. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Supersedes patch 171325 --- dlls/winex11.drv/bitblt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 4eec3288e2..973af40c33 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -924,13 +924,14 @@ static void free_ximage_bits( struct gdi_image_bits *bits ) XFree( bits->ptr ); } -/* only for use on sanitized BITMAPINFO structures */ static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) { if (info->bmiHeader.biCompression == BI_BITFIELDS) return sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD); if (coloruse == DIB_PAL_COLORS) return sizeof(BITMAPINFOHEADER) + info->bmiHeader.biClrUsed * sizeof(WORD); + if (!info->bmiHeader.biClrUsed && info->bmiHeader.biBitCount <= 8) + return FIELD_OFFSET( BITMAPINFO, bmiColors[1 << info->bmiHeader.biBitCount] ); return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] ); } -- 2.23.0

1 0

[PATCH 1/5] strmbase: Get rid of the unused BaseWindowImpl_GetDefaultRect() function.
by Zebediah Figura 15 Oct '19

15 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/window.c | 6 ------ include/wine/strmbase.h | 1 - 2 files changed, 7 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 7f4dd402484..a7c2201c64e 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -147,12 +147,6 @@ HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) return S_OK; } -RECT WINAPI BaseWindowImpl_GetDefaultRect(BaseWindow *This) -{ - static RECT defRect = {0, 0, 800, 600}; - return defRect; -} - BOOL WINAPI BaseControlWindowImpl_PossiblyEatMessage(BaseWindow *This, UINT uMsg, WPARAM wParam, LPARAM lParam) { BaseControlWindow* pControlWindow = impl_from_BaseWindow(This); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index de5c875105a..518db8de3f3 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -391,7 +391,6 @@ HRESULT WINAPI BaseWindow_Destroy(BaseWindow *pBaseWindow); HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This); HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This); -RECT WINAPI BaseWindowImpl_GetDefaultRect(BaseWindow *This); LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam); BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Height, LONG Width); -- 2.23.0

1 4

[PATCH] winex11: Initialize biCompression in create_icon_pixmaps (Valgrind)
by Alex Henrie 15 Oct '19

15 Oct '19

create_icon_pixmaps calls GetDIBits, which checks biCompression and returns early if the value is incorrect. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winex11.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99ae6393bb..407d06fd3e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -546,6 +546,7 @@ static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, Pixmap *icon_ret info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biBitCount = 0; + info->bmiHeader.biCompression = BI_RGB; if (!(lines = GetDIBits( hdc, icon->hbmColor, 0, 0, NULL, info, DIB_RGB_COLORS ))) goto failed; if (!(bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto failed; if (!GetDIBits( hdc, icon->hbmColor, 0, lines, bits.ptr, info, DIB_RGB_COLORS )) goto failed; @@ -557,6 +558,7 @@ static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, Pixmap *icon_ret info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biBitCount = 0; + info->bmiHeader.biCompression = BI_RGB; if (!(lines = GetDIBits( hdc, icon->hbmMask, 0, 0, NULL, info, DIB_RGB_COLORS ))) goto failed; if (!(bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto failed; if (!GetDIBits( hdc, icon->hbmMask, 0, lines, bits.ptr, info, DIB_RGB_COLORS )) goto failed; -- 2.23.0

3 5