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

[PATCH 4/4] setupapi: Set device SPDRP_CLASS registry property in create_device().
by Zhiyi Zhang 18 Nov '19

18 Nov '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 10 +++++++++- dlls/setupapi/tests/devinst.c | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 61ddade405..25d4040da0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -751,7 +751,9 @@ static struct device *create_device(struct DeviceInfoSet *set, { const DWORD one = 1; struct device *device; - WCHAR guidstr[39]; + WCHAR guidstr[MAX_GUID_STRING_LEN]; + WCHAR class_name[MAX_CLASS_NAME_LEN]; + DWORD size; TRACE("%p, %s, %s, %d\n", set, debugstr_guid(class), debugstr_w(instanceid), phantom); @@ -796,6 +798,12 @@ static struct device *create_device(struct DeviceInfoSet *set, SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASSGUID, (const BYTE *)guidstr, sizeof(guidstr)); + if (SetupDiClassNameFromGuidW(class, class_name, ARRAY_SIZE(class_name), NULL)) + { + size = (lstrlenW(class_name) + 1) * sizeof(WCHAR); + SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASS, (const BYTE *)class_name, size); + } + TRACE("Created new device %p.\n", device); return device; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 2f81a3abf5..68478b5d80 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1643,8 +1643,8 @@ todo_wine { /* Have SPDRP_CLASS property */ memset(buf, 0, sizeof(buf)); ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL); - todo_wine ok(ret, "Failed to get property, error %#x.\n", GetLastError()); - todo_wine ok(!lstrcmpA(buf, "Display"), "Got unexpected value %s.\n", buf); + ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + ok(!lstrcmpA(buf, "Display"), "Got unexpected value %s.\n", buf); SetupDiDestroyDeviceInfoList(set); } @@ -1803,8 +1803,8 @@ todo_wine { /* Have SPDRP_CLASS property */ memset(buf, 0, sizeof(buf)); ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL); - todo_wine ok(ret, "Failed to get property, error %#x.\n", GetLastError()); - todo_wine ok(!lstrcmpW(buf, L"Display"), "Got unexpected value %s.\n", wine_dbgstr_w(buf)); + ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + ok(!lstrcmpW(buf, L"Display"), "Got unexpected value %s.\n", wine_dbgstr_w(buf)); SetupDiDestroyDeviceInfoList(set); } -- 2.24.0

1 0

[PATCH 3/4] wine.inf: Add display and monitor classes.
by Zhiyi Zhang 18 Nov '19

18 Nov '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- loader/wine.inf.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c0f6e0a391..19c034d7fd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -510,6 +510,10 @@ HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"Locale",0x1 [ControlClass] HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},,,"Disk drives" HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},"Class",,"DiskDrive" +HKLM,System\CurrentControlSet\Control\Class\{4d36e968-e325-11ce-bfc1-08002be10318},,,"Display adapters" +HKLM,System\CurrentControlSet\Control\Class\{4d36e968-e325-11ce-bfc1-08002be10318},"Class",,"Display" +HKLM,System\CurrentControlSet\Control\Class\{4d36e96e-e325-11ce-bfc1-08002be10318},,,"Monitors" +HKLM,System\CurrentControlSet\Control\Class\{4d36e96e-e325-11ce-bfc1-08002be10318},"Class",,"Monitor" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},,,"Ports (COM & LPT)" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},,,"System devices" -- 2.24.0

1 0

[PATCH 2/4] setupapi/tests: Add default device registry property tests.
by Zhiyi Zhang 18 Nov '19

18 Nov '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/tests/devinst.c | 117 +++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 452a570c4f..2f81a3abf5 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -27,6 +27,7 @@ #include "winuser.h" #include "winreg.h" #include "initguid.h" +#include "devguid.h" #include "devpkey.h" #include "setupapi.h" #include "cfgmgr32.h" @@ -1496,7 +1497,7 @@ static void test_registry_property_a(void) { static const CHAR bogus[] = "System\\CurrentControlSet\\Enum\\Root\\LEGACY_BOGUS"; SP_DEVINFO_DATA device = {sizeof(device)}; - CHAR buf[6] = ""; + CHAR buf[64] = ""; DWORD size, type; HDEVINFO set; BOOL ret; @@ -1590,13 +1591,69 @@ todo_wine { res = RegOpenKeyA(HKEY_LOCAL_MACHINE, bogus, &key); ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); + + /* Test existing registry properties right after device creation */ + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + + /* Create device from a not registered class without device name */ + ret = SetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, NULL, DICD_GENERATE_ID, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* No SPDRP_DEVICEDESC property */ + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DEVICEDESC, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError()); + + /* No SPDRP_CLASS property */ + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError()); + + /* Have SPDRP_CLASSGUID property */ + memset(buf, 0, sizeof(buf)); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CLASSGUID, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + ok(!lstrcmpiA(buf, "{6a55b5a4-3f65-11db-b704-0011955c2bdb}"), "Got unexpected value %s.\n", buf); + + ret = SetupDiDeleteDeviceInfo(set, &device); + ok(ret, "Failed to delete device, error %#x.\n", GetLastError()); + + /* Create device from a not registered class with a device name */ + ret = SetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, "device_name", NULL, DICD_GENERATE_ID, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* Have SPDRP_DEVICEDESC property */ + memset(buf, 0, sizeof(buf)); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DEVICEDESC, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + ok(!lstrcmpA(buf, "device_name"), "Got unexpected value %s.\n", buf); + + SetupDiDestroyDeviceInfoList(set); + + /* Create device from a registered class */ + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "display", &GUID_DEVCLASS_DISPLAY, NULL, NULL, DICD_GENERATE_ID, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* Have SPDRP_CLASS property */ + memset(buf, 0, sizeof(buf)); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL); + todo_wine ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + todo_wine ok(!lstrcmpA(buf, "Display"), "Got unexpected value %s.\n", buf); + + SetupDiDestroyDeviceInfoList(set); } static void test_registry_property_w(void) { WCHAR friendly_name[] = {'B','o','g','u','s',0}; SP_DEVINFO_DATA device = {sizeof(device)}; - WCHAR buf[6] = {0}; + WCHAR buf[64] = {0}; DWORD size, type; HDEVINFO set; BOOL ret; @@ -1694,6 +1751,62 @@ todo_wine { res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key); ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); + + /* Test existing registry properties right after device creation */ + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + + /* Create device from a not registered class without device name */ + ret = SetupDiCreateDeviceInfoW(set, L"LEGACY_BOGUS", &guid, NULL, NULL, DICD_GENERATE_ID, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* No SPDRP_DEVICEDESC property */ + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_DEVICEDESC, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError()); + + /* No SPDRP_CLASS property */ + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "Got unexpected error %#x.\n", GetLastError()); + + /* Have SPDRP_CLASSGUID property */ + memset(buf, 0, sizeof(buf)); + ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_CLASSGUID, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + ok(!lstrcmpiW(buf, L"{6a55b5a4-3f65-11db-b704-0011955c2bdb}"), "Got unexpected value %s.\n", wine_dbgstr_w(buf)); + + ret = SetupDiDeleteDeviceInfo(set, &device); + ok(ret, "Failed to delete device, error %#x.\n", GetLastError()); + + /* Create device from a not registered class with a device name */ + ret = SetupDiCreateDeviceInfoW(set, L"LEGACY_BOGUS", &guid, L"device_name", NULL, DICD_GENERATE_ID, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* Have SPDRP_DEVICEDESC property */ + memset(buf, 0, sizeof(buf)); + ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_DEVICEDESC, NULL, (BYTE *)buf, sizeof(buf), NULL); + ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + ok(!lstrcmpW(buf, L"device_name"), "Got unexpected value %s.\n", wine_dbgstr_w(buf)); + + SetupDiDestroyDeviceInfoList(set); + + /* Create device from a registered class */ + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoW(set, L"display", &GUID_DEVCLASS_DISPLAY, NULL, NULL, DICD_GENERATE_ID, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + /* Have SPDRP_CLASS property */ + memset(buf, 0, sizeof(buf)); + ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_CLASS, NULL, (BYTE *)buf, sizeof(buf), NULL); + todo_wine ok(ret, "Failed to get property, error %#x.\n", GetLastError()); + todo_wine ok(!lstrcmpW(buf, L"Display"), "Got unexpected value %s.\n", wine_dbgstr_w(buf)); + + SetupDiDestroyDeviceInfoList(set); } static void test_get_inf_class(void) -- 2.24.0

1 0

[PATCH 1/4] setupapi/tests: Fix timeout on win10 1809+.
by Zhiyi Zhang 18 Nov '19

18 Nov '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/tests/devinst.c | 50 +++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 57adeeb27b..452a570c4f 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2065,12 +2065,6 @@ static void test_get_actual_section(void) ok(!strcasecmp(section, "section1"), "Got unexpected section %s.\n", section); ok(size == 9, "Got size %u.\n", size); - extptr = section; - ret = SetupDiGetActualSectionToInstallA(hinf, "section1", section, ARRAY_SIZE(section), NULL, &extptr); - ok(ret, "Failed to get section, error %#x.\n", GetLastError()); - ok(!strcasecmp(section, "section1"), "Got unexpected section %s.\n", section); - ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); - extptr = section; ret = SetupDiGetActualSectionToInstallA(hinf, "section2", section, ARRAY_SIZE(section), NULL, &extptr); ok(ret, "Failed to get section, error %#x.\n", GetLastError()); @@ -2101,24 +2095,6 @@ static void test_get_actual_section(void) ok(!strcasecmp(section, "section6.NT" MYEXT), "Got unexpected section %s.\n", section); ok(extptr == section + 8, "Got extension %s.\n", extptr); - extptr = section; - ret = SetupDiGetActualSectionToInstallA(hinf, "section7", section, ARRAY_SIZE(section), NULL, &extptr); - ok(ret, "Failed to get section, error %#x.\n", GetLastError()); - ok(!strcasecmp(section, "section7"), "Got unexpected section %s.\n", section); - ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); - - extptr = section; - ret = SetupDiGetActualSectionToInstallA(hinf, "section8", section, ARRAY_SIZE(section), NULL, &extptr); - ok(ret, "Failed to get section, error %#x.\n", GetLastError()); - ok(!strcasecmp(section, "section8"), "Got unexpected section %s.\n", section); - ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); - - extptr = section; - ret = SetupDiGetActualSectionToInstallA(hinf, "nonexistent", section, ARRAY_SIZE(section), NULL, &extptr); - ok(ret, "Failed to get section, error %#x.\n", GetLastError()); - ok(!strcasecmp(section, "nonexistent"), "Got unexpected section %s.\n", section); - ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); - extptr = section; ret = SetupDiGetActualSectionToInstallA(hinf, "section9", section, ARRAY_SIZE(section), NULL, &extptr); ok(ret, "Failed to get section, error %#x.\n", GetLastError()); @@ -2127,7 +2103,31 @@ static void test_get_actual_section(void) if (0) { - /* For some reason, this call hangs on Windows 10 1809. */ + /* For some reason, these calls hang on Windows 10 1809+. */ + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section1", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section1"), "Got unexpected section %s.\n", section); + ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section7", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section7"), "Got unexpected section %s.\n", section); + ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "section8", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "section8"), "Got unexpected section %s.\n", section); + ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); + + extptr = section; + ret = SetupDiGetActualSectionToInstallA(hinf, "nonexistent", section, ARRAY_SIZE(section), NULL, &extptr); + ok(ret, "Failed to get section, error %#x.\n", GetLastError()); + ok(!strcasecmp(section, "nonexistent"), "Got unexpected section %s.\n", section); + ok(!extptr || !*extptr /* Windows 10 1809 */, "Got extension %s.\n", extptr); + extptr = section; ret = SetupDiGetActualSectionToInstallA(hinf, "section10", section, ARRAY_SIZE(section), NULL, &extptr); ok(ret, "Failed to get section, error %#x.\n", GetLastError()); -- 2.24.0

1 0

[PATCH 1/5] msvcrt: Clean up strftime tests.
by Jeff Smith 18 Nov '19

18 Nov '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/msvcrt/tests/time.c | 209 ++++++++++++--------------------------- 1 file changed, 63 insertions(+), 146 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index cf79e5971e..c8acd848bf 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -588,13 +588,59 @@ static void test_daylight(void) static void test_strftime(void) { + const struct { + const char *format; + } tests_einval[] = { + {"%C"}, + {"%D"}, + {"%e"}, + {"%F"}, + {"%h"}, + {"%n"}, + {"%R"}, + {"%t"}, + {"%T"}, + {"%u"}, + }; + + const struct { + const char *format; + const char *ret; + struct tm tm; + BOOL todo; + } tests[] = { + {"e%#%e", "e%e", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%c", "01/01/70 00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%c", "02/30/70 00:00:00", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }, TRUE}, + {"%x", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%X", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%a", "Thu", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%A", "Thursday", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%b", "Jan", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%B", "January", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%d", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#d", "1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%H", "00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%I", "12", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%j", "001", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%m", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#M", "0", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%p", "AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%U", "00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%W", "00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%U", "01", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + {"%W", "00", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + {"%U", "53", { 0, 0, 0, 1, 0, 70, 0, 365, 0 }}, + {"%W", "52", { 0, 0, 0, 1, 0, 70, 0, 365, 0 }}, + }; + static const wchar_t cW[] = { '%','c',0 }; - static const char expected[] = "01/01/70 00:00:00"; time_t gmt; struct tm* gmt_tm; char buf[256], bufA[256]; WCHAR bufW[256]; long retA, retW; + int i; if (!p_strftime || !p_wcsftime || !p_gmtime) { @@ -608,55 +654,13 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); - errno = 0xdeadbeef; - retA = p_strftime(bufA, 256, "%C", 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, "%D", 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, "%e", 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, "%F", 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, "%h", 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, "%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); - ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); - - errno = 0xdeadbeef; - retA = p_strftime(bufA, 256, "%u", gmt_tm); - ok(retA == 0, "expected 0, got %ld\n", retA); - ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + for (i=0; i<ARRAY_SIZE(tests_einval); i++) + { + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, tests_einval[i].format, gmt_tm); + ok(retA == 0, "%d) ret = %ld\n", i, retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "%d) errno = %d\n", i, errno); + } errno = 0xdeadbeef; retA = p_strftime(NULL, 0, "copy", gmt_tm); @@ -691,14 +695,17 @@ static void test_strftime(void) ok(errno == EINVAL, "errno = %d\n", errno); } - retA = p_strftime(bufA, 256, "e%#%e", gmt_tm); - ok(retA == 3, "expected 3, got %ld\n", retA); - ok(!strcmp(bufA, "e%e"), "got %s\n", bufA); + for (i=0; i<ARRAY_SIZE(tests); i++) + { + retA = p_strftime(bufA, 256, tests[i].format, &tests[i].tm); + todo_wine_if(tests[i].todo) { + ok(retA == strlen(tests[i].ret), "%d) ret = %ld\n", i, retA); + ok(!strcmp(bufA, tests[i].ret), "%d) buf = \"%s\", expected \"%s\"\n", + i, bufA, tests[i].ret); + } + } retA = p_strftime(bufA, 256, "%c", gmt_tm); - ok(retA == 17, "expected 17, got %ld\n", retA); - ok(strcmp(bufA, expected) == 0, "expected %s, got %s\n", expected, bufA); - retW = p_wcsftime(bufW, 256, cW, gmt_tm); ok(retW == 17, "expected 17, got %ld\n", retW); ok(retA == retW, "expected %ld, got %ld\n", retA, retW); @@ -707,96 +714,6 @@ static void test_strftime(void) buf[retA] = 0; ok(strcmp(bufA, buf) == 0, "expected %s, got %s\n", bufA, buf); - retA = p_strftime(bufA, 256, "%x", gmt_tm); - ok(retA == 8, "expected 8, got %ld\n", retA); - ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%X", gmt_tm); - ok(retA == 8, "expected 8, got %ld\n", retA); - ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%a", gmt_tm); - ok(retA == 3, "expected 3, got %ld\n", retA); - ok(!strcmp(bufA, "Thu"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%A", gmt_tm); - ok(retA == 8, "expected 8, got %ld\n", retA); - ok(!strcmp(bufA, "Thursday"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%b", gmt_tm); - ok(retA == 3, "expected 3, got %ld\n", retA); - ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%B", gmt_tm); - ok(retA == 7, "expected 7, got %ld\n", retA); - ok(!strcmp(bufA, "January"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%d", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "01"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%#d", gmt_tm); - ok(retA == 1, "expected 1, got %ld\n", retA); - ok(!strcmp(bufA, "1"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%H", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "00"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%I", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "12"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%j", gmt_tm); - ok(retA == 3, "expected 3, got %ld\n", retA); - ok(!strcmp(bufA, "001"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%m", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "01"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%#M", gmt_tm); - ok(retA == 1, "expected 1, got %ld\n", retA); - ok(!strcmp(bufA, "0"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%p", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "AM"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%U", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "00"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%W", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "00"), "got %s\n", bufA); - - gmt_tm->tm_wday = 0; - retA = p_strftime(bufA, 256, "%U", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "01"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%W", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "00"), "got %s\n", bufA); - - gmt_tm->tm_yday = 365; - retA = p_strftime(bufA, 256, "%U", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "53"), "got %s\n", bufA); - - retA = p_strftime(bufA, 256, "%W", gmt_tm); - ok(retA == 2, "expected 2, got %ld\n", retA); - ok(!strcmp(bufA, "52"), "got %s\n", bufA); - - gmt_tm->tm_mon = 1; - gmt_tm->tm_mday = 30; - retA = p_strftime(bufA, 256, "%c", gmt_tm); - todo_wine { - ok(retA == 17, "expected 17, got %ld\n", retA); - ok(!strcmp(bufA, "02/30/70 00:00:00"), "got %s\n", bufA); - } - if(!setlocale(LC_ALL, "Japanese_Japan.932")) { win_skip("Japanese_Japan.932 locale not available\n"); return; -- 2.23.0

1 4

[PATCH 1/5] sapi: Implement ISpeechVoice stub.
by Jactry Zeng 18 Nov '19

18 Nov '19

Superseded patch 173708. ChangeLog: - Fixing a typo in tests. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/sapi/Makefile.in | 3 +- dlls/sapi/main.c | 3 + dlls/sapi/sapi_classes.idl | 13 ++ dlls/sapi/sapi_private.h | 1 + dlls/sapi/tests/Makefile.in | 3 +- dlls/sapi/tests/tts.c | 71 +++++++ dlls/sapi/tts.c | 414 ++++++++++++++++++++++++++++++++++++ include/sapi.idl | 11 +- 8 files changed, 516 insertions(+), 3 deletions(-) create mode 100644 dlls/sapi/tests/tts.c create mode 100644 dlls/sapi/tts.c diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in index 94e21bdd52..640c56223d 100644 --- a/dlls/sapi/Makefile.in +++ b/dlls/sapi/Makefile.in @@ -5,7 +5,8 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c \ - token.c + token.c \ + tts.c IDL_SRCS = \ sapi_classes.idl \ diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c index f86fee25ca..ce51c37483 100644 --- a/dlls/sapi/main.c +++ b/dlls/sapi/main.c @@ -106,6 +106,7 @@ static const struct IClassFactoryVtbl class_factory_vtbl = }; static struct class_factory data_key_cf = { { &class_factory_vtbl }, data_key_create }; +static struct class_factory speech_voice_cf = { { &class_factory_vtbl }, speech_voice_create }; static struct class_factory token_category_cf = { { &class_factory_vtbl }, token_category_create }; static struct class_factory token_enum_cf = { { &class_factory_vtbl }, token_enum_create }; @@ -124,6 +125,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) cf = &token_category_cf.IClassFactory_iface; else if (IsEqualCLSID( clsid, &CLSID_SpObjectTokenEnum )) cf = &token_enum_cf.IClassFactory_iface; + else if (IsEqualCLSID( clsid, &CLSID_SpVoice )) + cf = &speech_voice_cf.IClassFactory_iface; if (!cf) return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/sapi/sapi_classes.idl b/dlls/sapi/sapi_classes.idl index 40886f5974..dbb08c9ae2 100644 --- a/dlls/sapi/sapi_classes.idl +++ b/dlls/sapi/sapi_classes.idl @@ -50,3 +50,16 @@ coclass SpObjectTokenEnum interface ISpObjectTokenEnumBuilder; [default] interface IEnumSpObjectTokens; } + +[ + uuid(96749377-3391-11d2-9ee3-00c04f797396), + helpstring("Speech Voice"), + progid("SAPI.SpVoice.1"), + vi_progid("SAPI.SpVoice"), + threading(both) +] +coclass SpVoice +{ + interface ISpVoice; + [default] interface ISpeechVoice; +} diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 1f89672242..8db4b47bbd 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -21,6 +21,7 @@ #include "wine/heap.h" HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; +HRESULT speech_voice_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; diff --git a/dlls/sapi/tests/Makefile.in b/dlls/sapi/tests/Makefile.in index bf924d7ed9..bb89e0d8e0 100644 --- a/dlls/sapi/tests/Makefile.in +++ b/dlls/sapi/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = sapi.dll IMPORTS = ole32 user32 advapi32 C_SRCS = \ - token.c + token.c \ + tts.c diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c new file mode 100644 index 0000000000..3b71e933a2 --- /dev/null +++ b/dlls/sapi/tests/tts.c @@ -0,0 +1,71 @@ +/* + * Speech API (SAPI) text-to-speech tests. + * + * Copyright 2019 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "sapiddk.h" +#include "sperror.h" + +#include "wine/test.h" + +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); +} + +static void test_interfaces(void) +{ + ISpeechVoice *speech_voice; + IDispatch *dispatch; + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_SpVoice, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpeechVoice, (void **)&speech_voice); + ok(hr == S_OK, "Failed to create ISpeechVoice interface: %#x.\n", hr); + EXPECT_REF(speech_voice, 1); + + hr = CoCreateInstance(&CLSID_SpVoice, NULL, CLSCTX_INPROC_SERVER, + &IID_IDispatch, (void **)&dispatch); + ok(hr == S_OK, "Failed to create IDispatch interface: %#x.\n", hr); + EXPECT_REF(dispatch, 1); + EXPECT_REF(speech_voice, 1); + IDispatch_Release(dispatch); + + hr = CoCreateInstance(&CLSID_SpVoice, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to create IUnknown interface: %#x.\n", hr); + EXPECT_REF(unk, 1); + EXPECT_REF(speech_voice, 1); + IUnknown_Release(unk); + + ISpeechVoice_Release(speech_voice); +} + +START_TEST(tts) +{ + CoInitialize(NULL); + test_interfaces(); + CoUninitialize(); +} diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c new file mode 100644 index 0000000000..4000db11f5 --- /dev/null +++ b/dlls/sapi/tts.c @@ -0,0 +1,414 @@ +/* + * Speech API (SAPI) text-to-speech implementation. + * + * Copyright 2019 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" + +#include "sapiddk.h" + +#include "wine/debug.h" + +#include "sapi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sapi); + +struct speech_voice +{ + ISpeechVoice ISpeechVoice_iface; + LONG ref; +}; + +static inline struct speech_voice *impl_from_ISpeechVoice(ISpeechVoice *iface) +{ + return CONTAINING_RECORD(iface, struct speech_voice, ISpeechVoice_iface); +} + +/* ISpeechVoice interface */ +static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID iid, void **obj) +{ + struct speech_voice *This = impl_from_ISpeechVoice(iface); + + TRACE("(%p, %s %p).\n", iface, debugstr_guid(iid), obj); + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_IDispatch) || + IsEqualIID(iid, &IID_ISpeechVoice)) + *obj = &This->ISpeechVoice_iface; + else + { + *obj = NULL; + FIXME("interface %s not implemented.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static ULONG WINAPI speech_voice_AddRef(ISpeechVoice *iface) +{ + struct speech_voice *This = impl_from_ISpeechVoice(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p): ref=%u.\n", iface, ref); + + return ref; +} + +static ULONG WINAPI speech_voice_Release(ISpeechVoice *iface) +{ + struct speech_voice *This = impl_from_ISpeechVoice(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p): ref=%u.\n", iface, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI speech_voice_GetTypeInfoCount(ISpeechVoice *iface, UINT *info) +{ + FIXME("(%p, %p): stub.\n", iface, info); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_GetTypeInfo(ISpeechVoice *iface, UINT info, LCID lcid, + ITypeInfo **type_info) +{ + FIXME("(%p, %u, %u, %p): stub.\n", iface, info, lcid, type_info); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_GetIDsOfNames(ISpeechVoice *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("(%p, %s, %p, %u, %u, %p): stub.\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_Invoke(ISpeechVoice *iface, DISPID dispid, REFIID riid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, + EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("(%p, %d, %s, %#x, %#x, %p, %p, %p, %p): stub.\n", iface, dispid, debugstr_guid(riid), + lcid, flags, params, result, excepinfo, argerr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_get_Status(ISpeechVoice *iface, ISpeechVoiceStatus **status) +{ + FIXME("(%p, %p): stub.\n", iface, status); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_get_Voice(ISpeechVoice *iface, ISpeechObjectToken **voice) +{ + FIXME("(%p, %p): stub.\n", iface, voice); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_putref_Voice(ISpeechVoice *iface, ISpeechObjectToken *voice) +{ + FIXME("(%p, %p): stub.\n", iface, voice); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_get_AudioOutput(ISpeechVoice *iface, ISpeechObjectToken **output) +{ + FIXME("(%p, %p): stub.\n", iface, output); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_putref_AudioOutput(ISpeechVoice *iface, ISpeechObjectToken *output) +{ + FIXME("(%p, %p): stub.\n", iface, output); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_get_AudioOutputStream(ISpeechVoice *iface, ISpeechBaseStream **output) +{ + FIXME("(%p, %p): stub.\n", iface, output); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_putref_AudioOutputStream(ISpeechVoice *iface, ISpeechBaseStream *output) +{ + FIXME("(%p, %p): stub.\n", iface, output); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_get_Rate(ISpeechVoice *iface, LONG *rate) +{ + FIXME("(%p, %p): stub.\n", iface, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_put_Rate(ISpeechVoice *iface, LONG rate) +{ + FIXME("(%p, %d): stub.\n", iface, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_get_Volume(ISpeechVoice *iface, LONG *volume) +{ + FIXME("(%p, %p): stub.\n", iface, volume); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_put_Volume(ISpeechVoice *iface, LONG volume) +{ + FIXME("(%p, %d): stub.\n", iface, volume); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_put_AllowAudioOutputFormatChangesOnNextSet(ISpeechVoice *iface, + VARIANT_BOOL allow) +{ + FIXME("(%p, %d): stub.\n", iface, allow); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_get_AllowAudioOutputFormatChangesOnNextSet(ISpeechVoice *iface, VARIANT_BOOL *allow) +{ + FIXME("(%p, %p): stub.\n", iface, allow); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_get_EventInterests(ISpeechVoice *iface, SpeechVoiceEvents *flags) +{ + FIXME("(%p, %p): stub.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_put_EventInterests(ISpeechVoice *iface, SpeechVoiceEvents flags) +{ + FIXME("(%p, %#x): stub.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_put_Priority(ISpeechVoice *iface, SpeechVoicePriority priority) +{ + FIXME("(%p, %d): stub.\n", iface, priority); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_get_Priority(ISpeechVoice *iface, SpeechVoicePriority *priority) +{ + FIXME("(%p, %p): stub.\n", iface, priority); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_put_AlertBoundary(ISpeechVoice *iface, SpeechVoiceEvents boundary) +{ + FIXME("(%p, %#x): stub.\n", iface, boundary); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_get_AlertBoundary(ISpeechVoice *iface, SpeechVoiceEvents *boundary) +{ + FIXME("(%p, %p): stub.\n", iface, boundary); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_put_SynchronousSpeakTimeout(ISpeechVoice *iface, LONG timeout) +{ + FIXME("(%p, %d): stub.\n", iface, timeout); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_get_SynchronousSpeakTimeout(ISpeechVoice *iface, LONG *timeout) +{ + FIXME("(%p, %p): stub.\n", iface, timeout); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_Speak(ISpeechVoice *iface, BSTR text, SpeechVoiceSpeakFlags flags, LONG *number) +{ + FIXME("(%p, %s, %#x, %p): stub.\n", iface, debugstr_w(text), flags, number); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_SpeakStream(ISpeechVoice *iface, ISpeechBaseStream *stream, + SpeechVoiceSpeakFlags flags, LONG *number) +{ + FIXME("(%p, %p, %#x, %p): stub.\n", iface, stream, flags, number); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_Pause(ISpeechVoice *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_Resume(ISpeechVoice *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_Skip(ISpeechVoice *iface, const BSTR type, LONG items, LONG *skipped) +{ + FIXME("(%p, %s, %d, %p): stub.\n", iface, debugstr_w(type), items, skipped); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_GetVoices(ISpeechVoice *iface, BSTR required, BSTR optional, + ISpeechObjectTokens **tokens) +{ + FIXME("(%p, %s, %s, %p): stub.\n", iface, debugstr_w(required), debugstr_w(optional), tokens); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_GetAudioOutputs(ISpeechVoice *iface, BSTR required, BSTR optional, + ISpeechObjectTokens **tokens) +{ + FIXME("(%p, %s, %s, %p): stub.\n", iface, debugstr_w(required), debugstr_w(optional), tokens); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_WaitUntilDone(ISpeechVoice *iface, LONG timeout, VARIANT_BOOL *done) +{ + FIXME("(%p, %d, %p): stub.\n", iface, timeout, done); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_SpeakCompleteEvent(ISpeechVoice *iface, LONG *handle) +{ + FIXME("(%p, %p): stub.\n", iface, handle); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_IsUISupported(ISpeechVoice *iface, const BSTR typeui, const VARIANT *data, + VARIANT_BOOL *supported) +{ + FIXME("(%p, %s, %p, %p): stub.\n", iface, debugstr_w(typeui), data, supported); + + return E_NOTIMPL; +} + +static HRESULT WINAPI speech_voice_DisplayUI(ISpeechVoice *iface, LONG hwnd, BSTR title, + const BSTR typeui, const VARIANT *data) +{ + FIXME("(%p, %d, %s, %s, %p): stub.\n", iface, hwnd, debugstr_w(title), debugstr_w(typeui), data); + + return E_NOTIMPL; +} + +static const ISpeechVoiceVtbl speech_voice_vtbl = +{ + speech_voice_QueryInterface, + speech_voice_AddRef, + speech_voice_Release, + speech_voice_GetTypeInfoCount, + speech_voice_GetTypeInfo, + speech_voice_GetIDsOfNames, + speech_voice_Invoke, + speech_voice_get_Status, + speech_voice_get_Voice, + speech_voice_putref_Voice, + speech_voice_get_AudioOutput, + speech_voice_putref_AudioOutput, + speech_voice_get_AudioOutputStream, + speech_voice_putref_AudioOutputStream, + speech_voice_get_Rate, + speech_voice_put_Rate, + speech_voice_get_Volume, + speech_voice_put_Volume, + speech_voice_put_AllowAudioOutputFormatChangesOnNextSet, + speech_voice_get_AllowAudioOutputFormatChangesOnNextSet, + speech_voice_get_EventInterests, + speech_voice_put_EventInterests, + speech_voice_put_Priority, + speech_voice_get_Priority, + speech_voice_put_AlertBoundary, + speech_voice_get_AlertBoundary, + speech_voice_put_SynchronousSpeakTimeout, + speech_voice_get_SynchronousSpeakTimeout, + speech_voice_Speak, + speech_voice_SpeakStream, + speech_voice_Pause, + speech_voice_Resume, + speech_voice_Skip, + speech_voice_GetVoices, + speech_voice_GetAudioOutputs, + speech_voice_WaitUntilDone, + speech_voice_SpeakCompleteEvent, + speech_voice_IsUISupported, + speech_voice_DisplayUI, +}; + +HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) +{ + struct speech_voice *This = heap_alloc(sizeof(*This)); + HRESULT hr; + + if (!This) return E_OUTOFMEMORY; + This->ISpeechVoice_iface.lpVtbl = &speech_voice_vtbl; + This->ref = 1; + + hr = ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj); + + ISpeechVoice_Release(&This->ISpeechVoice_iface); + return hr; +} diff --git a/include/sapi.idl b/include/sapi.idl index 365d594a20..e87478cac6 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -839,7 +839,7 @@ interface ISpVoice : ISpEventSource [out] SPVOICESTATUS *status, [out, string] WCHAR **bookmark); - HRESULT Skip([in,string] WCHAR* type, [in] long items, [out] ULONG *skipped); + HRESULT Skip([in,string] const WCHAR *type, [in] long items, [out] ULONG *skipped); HRESULT SetPriority([in] SPVPRIORITY priority); HRESULT GetPriority([out] SPVPRIORITY* priority); @@ -1047,4 +1047,13 @@ library SpeechLib /*[default] interface ISpeechRecognizer;*/ interface ISpRecognizer; }; + + [ + uuid(96749377-3391-11d2-9ee3-00c04f797396) + ] + coclass SpVoice + { + interface ISpVoice; + [default] interface ISpeechVoice; + }; } -- 2.24.0

2 2

[PATCH] kernel32: Handle GEOCLASS_ALL in EnumSystemGeoID().
by João Diogo Ferreira 18 Nov '19

18 Nov '19

Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/locale.c | 25 +++++++++++++++++++------ dlls/kernel32/tests/locale.c | 13 +++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 0f91728e84..db8bd8c883 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4206,16 +4206,28 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L /****************************************************************************** * EnumSystemGeoID (KERNEL32.@) * - * Call a users function for every location available on the system. + * Calls a user's function for every location available on the system. * * PARAMS - * geoclass [I] Type of information desired (SYSGEOTYPE enum from "winnls.h") - * parent [I] GEOID for the parent - * enumproc [I] Callback function to call for each location + * geoclass [I] Type of location desired (SYSGEOTYPE enum from "winnls.h") + * parent [I] GeoID for the parent + * enumproc [I] Callback function to call for each location (prototype in "winnls.h") * * RETURNS * Success: TRUE. * Failure: FALSE. Use GetLastError() to determine the cause. + * + * NOTES + * The enumproc function returns TRUE to continue enumerating + * or FALSE to interrupt the enumeration. + * + * On failure, GetLastError() returns one of the following values: + * - ERROR_INVALID_PARAMETER: no callback function was provided. + * - ERROR_INVALID_FLAGS: the location type was invalid. + * + * TODO + * On Windows 10, this function filters out those locations which + * simultaneously lack ISO and UN codes (e.g. Johnson Atoll). */ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumproc) { @@ -4228,7 +4240,7 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr return FALSE; } - if (geoclass != GEOCLASS_NATION && geoclass != GEOCLASS_REGION) { + if (geoclass != GEOCLASS_NATION && geoclass != GEOCLASS_REGION && geoclass != GEOCLASS_ALL) { SetLastError(ERROR_INVALID_FLAGS); return FALSE; } @@ -4236,9 +4248,10 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr for (i = 0; i < ARRAY_SIZE(geoinfodata); i++) { const struct geoinfo_t *ptr = &geoinfodata[i]; - if (geoclass == GEOCLASS_NATION && (ptr->kind == LOCATION_REGION)) + if (geoclass == GEOCLASS_NATION && (ptr->kind != LOCATION_NATION)) continue; + /* LOCATION_BOTH counts as region. */ if (geoclass == GEOCLASS_REGION && (ptr->kind == LOCATION_NATION)) continue; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 81e74531ea..458cd0b5ef 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4891,6 +4891,19 @@ static void test_EnumSystemGeoID(void) ret = pEnumSystemGeoID(GEOCLASS_REGION, 0, test_geoid_enumproc2); ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); } + + geoidenum_count = 0; + ret = pEnumSystemGeoID(GEOCLASS_ALL, 39070, test_geoid_enumproc2); + if (ret == 0) + win_skip("GEOCLASS_ALL is not supported in EnumSystemGeoID.\n"); + else + { + ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); + + geoidenum_count = 0; + ret = pEnumSystemGeoID(GEOCLASS_ALL, 0, test_geoid_enumproc2); + ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); + } } struct invariant_entry { -- 2.24.0

2 1

[PATCH 5/5] sapi: Implement ISpStream stub.
by Jactry Zeng 18 Nov '19

18 Nov '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/sapi/automation.c | 180 +++++++++++++++++++++++++++++++++++ dlls/sapi/tests/automation.c | 6 ++ 2 files changed, 186 insertions(+) diff --git a/dlls/sapi/automation.c b/dlls/sapi/automation.c index 429f2ed3a6..7a9fa17f8f 100644 --- a/dlls/sapi/automation.c +++ b/dlls/sapi/automation.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(sapi); struct file_stream { ISpeechFileStream ISpeechFileStream_iface; + ISpStream ISpStream_iface; LONG ref; }; @@ -45,6 +46,11 @@ static inline struct file_stream *impl_from_ISpeechFileStream(ISpeechFileStream return CONTAINING_RECORD(iface, struct file_stream, ISpeechFileStream_iface); } +static inline struct file_stream *impl_from_ISpStream(ISpStream *iface) +{ + return CONTAINING_RECORD(iface, struct file_stream, ISpStream_iface); +} + /* ISpeechFileStream interface */ static HRESULT WINAPI file_stream_QueryInterface(ISpeechFileStream *iface, REFIID iid, void **obj) { @@ -57,6 +63,8 @@ static HRESULT WINAPI file_stream_QueryInterface(ISpeechFileStream *iface, REFII IsEqualIID(iid, &IID_ISpeechBaseStream) || IsEqualIID(iid, &IID_ISpeechFileStream)) *obj = &This->ISpeechFileStream_iface; + else if (IsEqualIID(iid, &IID_ISpStream)) + *obj = &This->ISpStream_iface; else { *obj = NULL; @@ -194,6 +202,177 @@ const static ISpeechFileStreamVtbl file_stream_vtbl = file_stream_Close }; +/* ISpStream interface */ +static HRESULT WINAPI spstream_QueryInterface(ISpStream *iface, REFIID iid, void **obj) +{ + struct file_stream *This = impl_from_ISpStream(iface); + + TRACE("(%p, %s, %p).\n", iface, debugstr_guid(iid), obj); + + return ISpeechFileStream_QueryInterface(&This->ISpeechFileStream_iface, iid, obj); +} + +static ULONG WINAPI spstream_AddRef(ISpStream *iface) +{ + struct file_stream *This = impl_from_ISpStream(iface); + + TRACE("(%p).\n", iface); + + return ISpeechFileStream_AddRef(&This->ISpeechFileStream_iface); +} + +static ULONG WINAPI spstream_Release(ISpStream *iface) +{ + struct file_stream *This = impl_from_ISpStream(iface); + + TRACE("(%p).\n", iface); + + return ISpeechFileStream_Release(&This->ISpeechFileStream_iface); +} + +static HRESULT WINAPI spstream_Read(ISpStream *iface, void *pv, ULONG cb, ULONG *read) +{ + FIXME("(%p, %p, %d, %p): stub.\n", iface, pv, cb, read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Write(ISpStream *iface, const void *pv, ULONG cb, ULONG *written) +{ + FIXME("(%p, %p, %d, %p): stub.\n", iface, pv, cb, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Seek(ISpStream *iface, LARGE_INTEGER mode, DWORD origin, ULARGE_INTEGER *position) +{ + FIXME("(%p, %s, %d, %p): stub.\n", iface, wine_dbgstr_longlong(mode.QuadPart), origin, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_SetSize(ISpStream *iface, ULARGE_INTEGER size) +{ + FIXME("(%p, %s): stub.\n", iface, wine_dbgstr_longlong(size.QuadPart)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_CopyTo(ISpStream *iface, IStream *stream, ULARGE_INTEGER cb, + ULARGE_INTEGER *read, ULARGE_INTEGER *written) +{ + FIXME("(%p, %p, %s, %p, %p): stub.\n", iface, stream, wine_dbgstr_longlong(cb.QuadPart), + read, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Commit(ISpStream *iface, DWORD flag) +{ + FIXME("(%p, %d): stub.\n", iface, flag); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Revert(ISpStream *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_LockRegion(ISpStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD type) +{ + FIXME("(%p, %s, %s, %d): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), + wine_dbgstr_longlong(cb.QuadPart), type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_UnlockRegion(ISpStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD type) +{ + FIXME("(%p, %s, %s, %d): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), + wine_dbgstr_longlong(cb.QuadPart), type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Stat(ISpStream *iface, STATSTG *statstg, DWORD flag) +{ + FIXME("(%p, %p, %d): stub.\n", iface, statstg, flag); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Clone(ISpStream *iface, IStream **stream) +{ + FIXME("(%p, %p): stub.\n", iface, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_GetFormat(ISpStream *iface, GUID *format, WAVEFORMATEX **wave) +{ + FIXME("(%p, %p, %p): stub.\n", iface, format, wave); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_SetBaseStream(ISpStream *iface, IStream *stream, REFGUID format, + const WAVEFORMATEX *wave) +{ + FIXME("(%p, %p, %s, %p): stub.\n", iface, stream, debugstr_guid(format), wave); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_GetBaseStream(ISpStream *iface, IStream **stream) +{ + FIXME("(%p, %p): stub.\n", iface, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_BindToFile(ISpStream *iface, LPCWSTR filename, SPFILEMODE mode, + const GUID *format, const WAVEFORMATEX* wave, + ULONGLONG interest) +{ + FIXME("(%p, %s, %d, %s, %p, %s): stub.\n", iface, debugstr_w(filename), mode, debugstr_guid(format), + wave, wine_dbgstr_longlong(interest)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Close(ISpStream *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +const static ISpStreamVtbl spstream_vtbl = +{ + spstream_QueryInterface, + spstream_AddRef, + spstream_Release, + spstream_Read, + spstream_Write, + spstream_Seek, + spstream_SetSize, + spstream_CopyTo, + spstream_Commit, + spstream_Revert, + spstream_LockRegion, + spstream_UnlockRegion, + spstream_Stat, + spstream_Clone, + spstream_GetFormat, + spstream_SetBaseStream, + spstream_GetBaseStream, + spstream_BindToFile, + spstream_Close +}; + HRESULT file_stream_create(IUnknown *outer, REFIID iid, void **obj) { struct file_stream *This = heap_alloc(sizeof(*This)); @@ -201,6 +380,7 @@ HRESULT file_stream_create(IUnknown *outer, REFIID iid, void **obj) if (!This) return E_OUTOFMEMORY; This->ISpeechFileStream_iface.lpVtbl = &file_stream_vtbl; + This->ISpStream_iface.lpVtbl = &spstream_vtbl; This->ref = 1; hr = ISpeechFileStream_QueryInterface(&This->ISpeechFileStream_iface, iid, obj); diff --git a/dlls/sapi/tests/automation.c b/dlls/sapi/tests/automation.c index 57b6c7a375..c584b4ac2c 100644 --- a/dlls/sapi/tests/automation.c +++ b/dlls/sapi/tests/automation.c @@ -30,6 +30,7 @@ static void test_interfaces(void) ISpeechFileStream *filestream; ISpeechBaseStream *basestream; IDispatch *dispatch; + ISpStream *spstrem; IUnknown *unk; HRESULT hr; @@ -52,6 +53,11 @@ static void test_interfaces(void) ok(hr == S_OK, "Failed to create ISpeechBaseStream interface: %#x.\n", hr); ISpeechBaseStream_Release(basestream); + hr = CoCreateInstance(&CLSID_SpFileStream, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpStream, (void **)&spstrem); + ok(hr == S_OK, "Failed to create ISpStream interface: %#x.\n", hr); + + ISpStream_Release(spstrem); ISpeechFileStream_Release(filestream); } -- 2.24.0

2 1

[PATCH 4/5] sapi: Implement ISpeechFileStream stub.
by Jactry Zeng 18 Nov '19

18 Nov '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/sapi/Makefile.in | 1 + dlls/sapi/automation.c | 210 +++++++++++++++++++++++++++++++++++ dlls/sapi/main.c | 3 + dlls/sapi/sapi_classes.idl | 13 +++ dlls/sapi/sapi_private.h | 1 + dlls/sapi/tests/Makefile.in | 1 + dlls/sapi/tests/automation.c | 63 +++++++++++ include/sapi.idl | 34 ++++++ include/sapiaut.idl | 29 +++++ 9 files changed, 355 insertions(+) create mode 100644 dlls/sapi/automation.c create mode 100644 dlls/sapi/tests/automation.c diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in index 640c56223d..464a174caa 100644 --- a/dlls/sapi/Makefile.in +++ b/dlls/sapi/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = uuid ole32 user32 advapi32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + automation.c \ main.c \ token.c \ tts.c diff --git a/dlls/sapi/automation.c b/dlls/sapi/automation.c new file mode 100644 index 0000000000..429f2ed3a6 --- /dev/null +++ b/dlls/sapi/automation.c @@ -0,0 +1,210 @@ +/* + * Speech API (SAPI) automation implementation. + * + * Copyright 2019 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" + +#include "sapiddk.h" + +#include "wine/debug.h" + +#include "sapi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sapi); + +struct file_stream +{ + ISpeechFileStream ISpeechFileStream_iface; + LONG ref; +}; + +static inline struct file_stream *impl_from_ISpeechFileStream(ISpeechFileStream *iface) +{ + return CONTAINING_RECORD(iface, struct file_stream, ISpeechFileStream_iface); +} + +/* ISpeechFileStream interface */ +static HRESULT WINAPI file_stream_QueryInterface(ISpeechFileStream *iface, REFIID iid, void **obj) +{ + struct file_stream *This = impl_from_ISpeechFileStream(iface); + + TRACE("(%p, %s, %p).\n", iface, debugstr_guid(iid), obj); + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_IDispatch) || + IsEqualIID(iid, &IID_ISpeechBaseStream) || + IsEqualIID(iid, &IID_ISpeechFileStream)) + *obj = &This->ISpeechFileStream_iface; + else + { + *obj = NULL; + FIXME("interface %s not implemented.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static ULONG WINAPI file_stream_AddRef(ISpeechFileStream *iface) +{ + struct file_stream *This = impl_from_ISpeechFileStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p): ref=%u.\n", iface, ref); + + return ref; +} + +static ULONG WINAPI file_stream_Release(ISpeechFileStream *iface) +{ + struct file_stream *This = impl_from_ISpeechFileStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p): ref=%u.\n", iface, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI file_stream_GetTypeInfoCount(ISpeechFileStream *iface, UINT *info) +{ + FIXME("(%p, %p): stub.\n", iface, info); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_stream_GetTypeInfo(ISpeechFileStream *iface, UINT info, LCID lcid, + ITypeInfo **type_info) +{ + FIXME("(%p, %u, %u, %p): stub.\n", iface, info, lcid, type_info); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_stream_GetIDsOfNames(ISpeechFileStream *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("(%p, %s, %p, %u, %u, %p): stub.\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_stream_Invoke(ISpeechFileStream *iface, DISPID dispid, REFIID riid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, + EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("(%p, %d, %s, %#x, %#x, %p, %p, %p, %p): stub.\n", iface, dispid, debugstr_guid(riid), + lcid, flags, params, result, excepinfo, argerr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_stream_get_Format(ISpeechFileStream *iface, ISpeechAudioFormat **format) +{ + FIXME("(%p, %p): stub.\n", iface, format); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_stream_putref_Format(ISpeechFileStream *iface, ISpeechAudioFormat *format) +{ + FIXME("(%p, %p): stub.\n", iface, format); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_stream_Read(ISpeechFileStream *iface, VARIANT *buffer, LONG written, LONG *read) +{ + FIXME("(%p, %p, %d, %p): stub.\n", iface, buffer, written, read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_stream_Write(ISpeechFileStream *iface, VARIANT buffer, LONG *written) +{ + FIXME("(%p, %s, %p): stub.\n", iface, debugstr_variant(&buffer), written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_stream_Seek(ISpeechFileStream *iface, VARIANT position, SpeechStreamSeekPositionType origin, + VARIANT *pos) +{ + FIXME("(%p, %s, %d, %p): stub.\n", iface, debugstr_variant(&position), origin, pos); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_stream_Open(ISpeechFileStream *iface, BSTR filename, SpeechStreamFileMode mode, VARIANT_BOOL events) +{ + FIXME("(%p, %s, %d, %d): stub.\n", iface, debugstr_w(filename), mode, events); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_stream_Close(ISpeechFileStream *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +const static ISpeechFileStreamVtbl file_stream_vtbl = +{ + file_stream_QueryInterface, + file_stream_AddRef, + file_stream_Release, + file_stream_GetTypeInfoCount, + file_stream_GetTypeInfo, + file_stream_GetIDsOfNames, + file_stream_Invoke, + file_stream_get_Format, + file_stream_putref_Format, + file_stream_Read, + file_stream_Write, + file_stream_Seek, + file_stream_Open, + file_stream_Close +}; + +HRESULT file_stream_create(IUnknown *outer, REFIID iid, void **obj) +{ + struct file_stream *This = heap_alloc(sizeof(*This)); + HRESULT hr; + + if (!This) return E_OUTOFMEMORY; + This->ISpeechFileStream_iface.lpVtbl = &file_stream_vtbl; + This->ref = 1; + + hr = ISpeechFileStream_QueryInterface(&This->ISpeechFileStream_iface, iid, obj); + + ISpeechFileStream_Release(&This->ISpeechFileStream_iface); + return hr; +} diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c index ce51c37483..e8d4ae0158 100644 --- a/dlls/sapi/main.c +++ b/dlls/sapi/main.c @@ -106,6 +106,7 @@ static const struct IClassFactoryVtbl class_factory_vtbl = }; static struct class_factory data_key_cf = { { &class_factory_vtbl }, data_key_create }; +static struct class_factory file_stream_cf = { { &class_factory_vtbl }, file_stream_create }; static struct class_factory speech_voice_cf = { { &class_factory_vtbl }, speech_voice_create }; static struct class_factory token_category_cf = { { &class_factory_vtbl }, token_category_create }; static struct class_factory token_enum_cf = { { &class_factory_vtbl }, token_enum_create }; @@ -121,6 +122,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) if (IsEqualCLSID( clsid, &CLSID_SpDataKey )) cf = &data_key_cf.IClassFactory_iface; + else if (IsEqualCLSID( clsid, &CLSID_SpFileStream )) + cf = &file_stream_cf.IClassFactory_iface; else if (IsEqualCLSID( clsid, &CLSID_SpObjectTokenCategory )) cf = &token_category_cf.IClassFactory_iface; else if (IsEqualCLSID( clsid, &CLSID_SpObjectTokenEnum )) diff --git a/dlls/sapi/sapi_classes.idl b/dlls/sapi/sapi_classes.idl index dbb08c9ae2..ed86d166fc 100644 --- a/dlls/sapi/sapi_classes.idl +++ b/dlls/sapi/sapi_classes.idl @@ -63,3 +63,16 @@ coclass SpVoice interface ISpVoice; [default] interface ISpeechVoice; } + +[ + uuid(947812b3-2ae1-4644-ba86-9e90ded7ec91), + helpstring("SpFileStream"), + progid("SAPI.SpFileStream.1"), + vi_progid("SAPI.SpFileStream"), + threading(both) +] +coclass SpFileStream +{ + interface ISpStream; + [default] interface ISpeechFileStream; +} diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 8db4b47bbd..e9fed0ea44 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -21,6 +21,7 @@ #include "wine/heap.h" HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; +HRESULT file_stream_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT speech_voice_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; diff --git a/dlls/sapi/tests/Makefile.in b/dlls/sapi/tests/Makefile.in index bb89e0d8e0..d5d9755097 100644 --- a/dlls/sapi/tests/Makefile.in +++ b/dlls/sapi/tests/Makefile.in @@ -2,5 +2,6 @@ TESTDLL = sapi.dll IMPORTS = ole32 user32 advapi32 C_SRCS = \ + automation.c \ token.c \ tts.c diff --git a/dlls/sapi/tests/automation.c b/dlls/sapi/tests/automation.c new file mode 100644 index 0000000000..57b6c7a375 --- /dev/null +++ b/dlls/sapi/tests/automation.c @@ -0,0 +1,63 @@ +/* + * Speech API (SAPI) automation tests. + * + * Copyright 2019 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "sapiddk.h" +#include "sperror.h" + +#include "wine/test.h" + +static void test_interfaces(void) +{ + ISpeechFileStream *filestream; + ISpeechBaseStream *basestream; + IDispatch *dispatch; + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_SpFileStream, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpeechFileStream, (void **)&filestream); + ok(hr == S_OK, "Failed to create ISpeechFileStream interface: %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_SpFileStream, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to create IUnknown interface: %#x.\n", hr); + IUnknown_Release(unk); + + hr = CoCreateInstance(&CLSID_SpFileStream, NULL, CLSCTX_INPROC_SERVER, + &IID_IDispatch, (void **)&dispatch); + ok(hr == S_OK, "Failed to create IDispatch interface: %#x.\n", hr); + IDispatch_Release(dispatch); + + hr = CoCreateInstance(&CLSID_SpFileStream, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpeechBaseStream, (void **)&basestream); + ok(hr == S_OK, "Failed to create ISpeechBaseStream interface: %#x.\n", hr); + ISpeechBaseStream_Release(basestream); + + ISpeechFileStream_Release(filestream); +} + +START_TEST(automation) +{ + CoInitialize(NULL); + test_interfaces(); + CoUninitialize(); +} diff --git a/include/sapi.idl b/include/sapi.idl index e87478cac6..9e6ba5be5e 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -483,6 +483,15 @@ typedef [restricted, hidden] struct SPRECORESULTTIMES ULONGLONG ullStart; } SPRECORESULTTIMES; +typedef [hidden] enum SPFILEMODE +{ + SPFM_OPEN_READONLY, + SPFM_OPEN_READWRITE, + SPFM_CREATE, + SPFM_CREATE_ALWAYS, + SPFM_NUM_MODES +} SPFILEMODE; + 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 }") @@ -1016,6 +1025,22 @@ interface ISpRecognizer : ISpProperties HRESULT EmulateRecognition([in] ISpPhrase *phrase); }; +[ + object, + uuid(12e3cca9-7518-44c5-a5e7-ba5a79cb929e), + pointer_default(unique), + local, + restricted +] +interface ISpStream : ISpStreamFormat +{ + HRESULT SetBaseStream([in] IStream *stream, [in] REFGUID format, [in] const WAVEFORMATEX *wave); + HRESULT GetBaseStream([out] IStream **stream); + HRESULT BindToFile([in] LPCWSTR filename, [in] SPFILEMODE mode, [in] const GUID *format, + const WAVEFORMATEX *wave, [in] ULONGLONG interest); + HRESULT Close(); +} + [ helpstring("Speech Object Library"), uuid(c866ca3a-32f7-11d2-9602-00c04f8ee628), @@ -1056,4 +1081,13 @@ library SpeechLib interface ISpVoice; [default] interface ISpeechVoice; }; + + [ + uuid(947812b3-2ae1-4644-ba86-9e90ded7ec91), + ] + coclass SpFileStream + { + interface ISpStream; + [default] interface ISpeechFileStream; + }; } diff --git a/include/sapiaut.idl b/include/sapiaut.idl index 8f2b1f9a10..601ce56068 100644 --- a/include/sapiaut.idl +++ b/include/sapiaut.idl @@ -2005,3 +2005,32 @@ interface ISpeechRecognizer : IDispatch [out,retval] ISpeechObjectTokens **tokens); } + +typedef enum SpeechStreamFileMode +{ + SSFMOpenForRead = SPFM_OPEN_READONLY, + SSFMOpenReadWrite = SPFM_OPEN_READWRITE, + SSFMCreate = SPFM_CREATE, + SSFMCreateForWrite = SPFM_CREATE_ALWAYS, +} SpeechStreamFileMode; + +typedef [hidden] enum DISPID_SpeechFileStream +{ + DISPID_SFSOpen = 100, + DISPID_SFSClose +} DISPID_SpeechFileStream; + +[ + object, + uuid(af67f125-ab39-4e93-b4a2-cc2e66e182a7), + dual, + pointer_default(unique) +] +interface ISpeechFileStream : ISpeechBaseStream +{ + [id(DISPID_SFSOpen)] + HRESULT Open([in] BSTR filename, [in, defaultvalue(SSFMOpenForRead)] SpeechStreamFileMode mode, + [in, defaultvalue(0)] VARIANT_BOOL events); + [id(DISPID_SFSClose)] + HRESULT Close(void); +}; -- 2.24.0

2 1

[PATCH 3/5] sapi: Add IConnectionPointContainer stub for ISpVoice.
by Jactry Zeng 18 Nov '19

18 Nov '19

Superseded patch 173710. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/sapi/tests/tts.c | 8 ++++++ dlls/sapi/tts.c | 62 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index e4b4e79943..26d13ec96a 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -37,6 +37,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) static void test_interfaces(void) { ISpeechVoice *speech_voice, *speech_voice2; + IConnectionPointContainer *container; ISpVoice *spvoice, *spvoice2; IDispatch *dispatch; IUnknown *unk; @@ -82,6 +83,13 @@ static void test_interfaces(void) ISpVoice_Release(spvoice2); ISpVoice_Release(spvoice); + hr = ISpeechVoice_QueryInterface(speech_voice, &IID_IConnectionPointContainer, + (void **)&container); + ok(hr == S_OK, "ISpeechVoice_QueryInterface failed: %#x.\n", hr); + EXPECT_REF(speech_voice, 2); + EXPECT_REF(container, 2); + IConnectionPointContainer_Release(container); + ISpeechVoice_Release(speech_voice); } diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 8f1ecd1894..584c3d56b7 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -38,6 +38,7 @@ struct speech_voice { ISpeechVoice ISpeechVoice_iface; ISpVoice ISpVoice_iface; + IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; }; @@ -51,6 +52,11 @@ static inline struct speech_voice *impl_from_ISpVoice(ISpVoice *iface) return CONTAINING_RECORD(iface, struct speech_voice, ISpVoice_iface); } +static inline struct speech_voice *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return CONTAINING_RECORD(iface, struct speech_voice, IConnectionPointContainer_iface); +} + /* ISpeechVoice interface */ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID iid, void **obj) { @@ -64,6 +70,8 @@ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID ii *obj = &This->ISpeechVoice_iface; else if (IsEqualIID(iid, &IID_ISpVoice)) *obj = &This->ISpVoice_iface; + else if (IsEqualIID(iid, &IID_IConnectionPointContainer)) + *obj = &This->IConnectionPointContainer_iface; else { *obj = NULL; @@ -726,6 +734,59 @@ static const ISpVoiceVtbl spvoice_vtbl = spvoice_DisplayUI }; +/* IConnectionPointContainer interface */ +static HRESULT WINAPI container_QueryInterface(IConnectionPointContainer *iface, REFIID iid, void **obj) +{ + struct speech_voice *This = impl_from_IConnectionPointContainer(iface); + + TRACE("(%p, %s %p).\n", iface, debugstr_guid(iid), obj); + + return ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj); +} + +static ULONG WINAPI container_AddRef(IConnectionPointContainer *iface) +{ + struct speech_voice *This = impl_from_IConnectionPointContainer(iface); + + TRACE("(%p).\n", iface); + + return ISpeechVoice_AddRef(&This->ISpeechVoice_iface); +} + +static ULONG WINAPI container_Release(IConnectionPointContainer *iface) +{ + struct speech_voice *This = impl_from_IConnectionPointContainer(iface); + + TRACE("(%p).\n", iface); + + return ISpeechVoice_Release(&This->ISpeechVoice_iface); +} + +static HRESULT WINAPI container_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **enum_cp) +{ + FIXME("(%p, %p): stub.\n", iface, enum_cp); + + return E_NOTIMPL; +} + +static HRESULT WINAPI container_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid, + IConnectionPoint **cp) +{ + FIXME("(%p, %s, %p): stub.\n", iface, debugstr_guid(riid), cp); + + return E_NOTIMPL; +} + +const static IConnectionPointContainerVtbl container_vtbl = +{ + container_QueryInterface, + container_AddRef, + container_Release, + container_EnumConnectionPoints, + container_FindConnectionPoint +}; + HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) { struct speech_voice *This = heap_alloc(sizeof(*This)); @@ -734,6 +795,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) if (!This) return E_OUTOFMEMORY; This->ISpeechVoice_iface.lpVtbl = &speech_voice_vtbl; This->ISpVoice_iface.lpVtbl = &spvoice_vtbl; + This->IConnectionPointContainer_iface.lpVtbl = &container_vtbl; This->ref = 1; hr = ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj); -- 2.24.0

2 1