March 2021 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/TestLauncher: Show the tool name in error messages.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: tools Branch: master Commit: 856584a4acfb31e14d3ce770114ce0395317405a URL: https://source.winehq.org/git/tools.git/?a=commit;h=856584a4acfb31e14d3ce77… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 16 12:14:03 2021 +0100 testbot/TestLauncher: Show the tool name in error messages. Format the error messages so that they are easily recognized as such. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 58 +++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 7b58c9a..5ff8060 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -27,6 +27,28 @@ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +/* + * Error handling + */ + +#ifdef __GNUC__ +# define FORMAT(fmt, arg1) __attribute__((format (printf, fmt, arg1) )) +#else +# define FORMAT(fmt, arg1) +#endif +void Error(const char* Format, ...) FORMAT(1,2); + +static const char *Name0; +void Error(const char* Format, ...) +{ + va_list valist; + fprintf(stderr, "%s:error: ", Name0); + va_start(valist, Format); + vfprintf(stderr, Format, valist); + va_end(valist); +} + + /* * Missing dll and entry point detection. */ @@ -112,12 +134,20 @@ int main(int argc, char *argv[]) const char *Suffix; char TestName[MAX_PATH]; int TestArg; - char *CommandLine; + char *CommandLine, *p; int CommandLen; STARTUPINFOA StartupInfo; PROCESS_INFORMATION ProcessInformation; DWORD ExitCode; + Name0 = p = argv[0]; + while (*p != '\0') + { + if (*p == '/' || *p == '\\') + Name0 = p + 1; + p++; + } + TimeOut = INFINITE; CommandLine = NULL; Arg = 1; @@ -134,8 +164,8 @@ int main(int argc, char *argv[]) TimeOut = (DWORD) strtoul(argv[Arg + 1], &EndPtr, 10) * 1000; if (*EndPtr != '\0') { - fprintf(stderr, "Invalid TimeOut value %s\n", argv[Arg + 1]); - exit(1); + Error("Invalid TimeOut value %s\n", argv[Arg + 1]); + return 1; } } else @@ -146,9 +176,9 @@ int main(int argc, char *argv[]) { if (GetFullPathNameA(argv[Arg], ARRAY_SIZE(TestExeFullName), TestExeFullName, &TestExeFileName) == 0) { - fprintf(stderr, "Can't determine full path of test executable %s, error %lu\n", + Error("Cauld not get the test executable full path %s (error %lu)\n", argv[Arg], GetLastError()); - exit(1); + return 1; } Suffix = strstr(TestExeFileName, "_test.exe"); if (Suffix == NULL) @@ -171,8 +201,8 @@ int main(int argc, char *argv[]) CommandLine = (char *) malloc(CommandLen); if (CommandLine == NULL) { - fprintf(stderr, "Unable to allocate memory for child command line\n"); - exit(1); + Error("Unable to allocate memory for child command line\n"); + return 1; } CommandLine[0] = '"'; @@ -193,7 +223,7 @@ int main(int argc, char *argv[]) if (UsageError) { fprintf(stderr, "Usage: %s [-t TimeOut] TestExecutable.exe [TestParameter...]\n", argv[0]); - exit(1); + return 1; } Start = GetTickCount(); @@ -214,8 +244,8 @@ int main(int argc, char *argv[]) */ if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) { - fprintf(stderr, "CreateProcess failed with error %lu\n", GetLastError()); - exit(1); + Error("CreateProcess failed (error %lu)\n", GetLastError()); + return 1; } CloseHandle(ProcessInformation.hThread); @@ -249,7 +279,7 @@ int main(int argc, char *argv[]) switch (ExitCode) { case WAIT_FAILED: - fprintf(stderr, "Wait for child failed, error %lu\n", GetLastError()); + Error("Wait for child failed (error %lu)\n", GetLastError()); break; case WAIT_TIMEOUT: @@ -257,15 +287,15 @@ int main(int argc, char *argv[]) break; default: - fprintf(stderr, "Unexpected return value %lu from wait for child\n", ExitCode); + Error("Unexpected return value %lu from wait for child\n", ExitCode); break; } if (!TerminateProcess(ProcessInformation.hProcess, 257)) - fprintf(stderr, "TerminateProcess failed, error %lu\n", GetLastError()); + Error("TerminateProcess failed (error %lu)\n", GetLastError()); } else if (!Skips && !GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) { - fprintf(stderr, "Can't get child exit code, error %lu\n", GetLastError()); + Error("Could not get the child exit code (error %lu)\n", GetLastError()); ExitCode = 259; } CloseHandle(ProcessInformation.hProcess);

1 0

Francois Gouget : testbot/LogUtils: Highlight the dll 'version' errors.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: tools Branch: master Commit: 72e55a7b302cdc878d4c986d94647d6641885a79 URL: https://source.winehq.org/git/tools.git/?a=commit;h=72e55a7b302cdc878d4c986… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 16 12:13:07 2021 +0100 testbot/LogUtils: Highlight the dll 'version' errors. WineTest replaces the dll version information with an error message when it cannot get that information, or if the dll is missing an entry point needed by the test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index eced000..840a552 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -325,7 +325,9 @@ sub GetReportLineCategory($) { return "skip"; } - if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or + if ($Line =~ /^ \w+=dll is (?:missing|native|a stub)/ or + $Line =~ /^ \w+=(?:load error|version error \d+|version not (?:found|present))$/ or + $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or $Line =~ /: this is the last test seen before the exception/) { return "info";

1 0

Francois Gouget : testbot/TestLauncher: Don't use an empty test unit name on skip lines.
by Alexandre Julliard March 16, 2021

March 16, 2021

Module: tools Branch: master Commit: c791e0234404ad15821b1f4cb751904f41cf37bb URL: https://source.winehq.org/git/tools.git/?a=commit;h=c791e0234404ad15821b1f4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 16 12:14:18 2021 +0100 testbot/TestLauncher: Don't use an empty test unit name on skip lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 5ff8060..dd34a76 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -109,7 +109,11 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) if (Reason) { Skips++; - printf("%s.c:0: Tests skipped: %s (details below)\n", Subtest, Reason); + /* An empty test unit name is allowed on the start, summary and done + * lines, but not on individual failure / skip lines. + */ + printf("%s.c:0: Tests skipped: %s (details below)\n", + (*Subtest ? Subtest : "testlauncher"), Reason); printf("| %s\n", Buffer); EnumChildWindows(TopWnd, DumpCriticalErrorDescription, (LPARAM)TopWnd); /* Leave the dialog open so it appears on screenshots */

1 0

Torge Matthies : winepulse.drv: Make timer delay more accurate.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 6dd96842fed8ef3b1627a41f58eaec4f897a3ae0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dd96842fed8ef3b1627a41f… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Sat Mar 6 02:27:14 2021 +0100 winepulse.drv: Make timer delay more accurate. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 4609b2851ed..10b01868a9d 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -38,6 +38,7 @@ #include "winbase.h" #include "winnls.h" #include "winreg.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" @@ -1021,14 +1022,14 @@ static void pulse_read(ACImpl *This) static DWORD WINAPI pulse_timer_cb(void *user) { - DWORD delay; + LARGE_INTEGER delay; UINT32 adv_bytes; ACImpl *This = user; int success; pa_operation *o; pthread_mutex_lock(&pulse_lock); - delay = This->mmdev_period_usec / 1000; + delay.QuadPart = -This->mmdev_period_usec * 10; pa_stream_get_time(This->stream, &This->last_time); pthread_mutex_unlock(&pulse_lock); @@ -1036,11 +1037,11 @@ static DWORD WINAPI pulse_timer_cb(void *user) pa_usec_t now, adv_usec = 0; int err; - Sleep(delay); + NtDelayExecution(FALSE, &delay); pthread_mutex_lock(&pulse_lock); - delay = This->mmdev_period_usec / 1000; + delay.QuadPart = -This->mmdev_period_usec * 10; o = pa_stream_update_timing_info(This->stream, pulse_op_cb, &success); if (o) @@ -1076,7 +1077,7 @@ static DWORD WINAPI pulse_timer_cb(void *user) else if(adjust < -((INT32)(This->mmdev_period_usec / 2))) adjust = -1 * This->mmdev_period_usec / 2; - delay = (This->mmdev_period_usec + adjust) / 1000; + delay.QuadPart = -(This->mmdev_period_usec + adjust) * 10; This->last_time += This->mmdev_period_usec; } @@ -1094,16 +1095,16 @@ static DWORD WINAPI pulse_timer_cb(void *user) } }else{ This->last_time = now; - delay = This->mmdev_period_usec / 1000; + delay.QuadPart = -This->mmdev_period_usec * 10; } } if (This->event) SetEvent(This->event); - TRACE("%p after update, adv usec: %d, held: %u, delay: %u\n", + TRACE("%p after update, adv usec: %d, held: %u, delay usec: %u\n", This, (int)adv_usec, - (int)(This->held_bytes/ pa_frame_size(&This->ss)), delay); + (int)(This->held_bytes/ pa_frame_size(&This->ss)), (unsigned int)(-delay.QuadPart / 10)); pthread_mutex_unlock(&pulse_lock); }

1 0

Rémi Bernon : ntdll/tests: Add InterruptTimeBias to fix spurious test failures.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 97d2802d1b265636afaab16efb463ff9dfb3c03e URL: https://source.winehq.org/git/wine.git/?a=commit;h=97d2802d1b265636afaab16e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 10 12:22:32 2021 +0100 ntdll/tests: Add InterruptTimeBias to fix spurious test failures. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 931bf765aa7..51d9115b87c 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -243,14 +243,13 @@ static void test_user_shared_data_time(void) do { pRtlQueryUnbiasedInterruptTime(&t1); - t2 = read_ksystem_time(&user_shared_data->InterruptTime); + t2 = read_ksystem_time(&user_shared_data->InterruptTime) - user_shared_data->InterruptTimeBias; pRtlQueryUnbiasedInterruptTime(&t3); } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ ok(t1 <= t2, "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", wine_dbgstr_longlong(t1), wine_dbgstr_longlong(t2)); - ok(t2 <= t3 || broken(t2 == t3 + 82410089070) /* w864 has some weird offset on testbot */, - "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", + ok(t2 <= t3, "USD InterruptTime / RtlQueryUnbiasedInterruptTime are out of order %s %s\n", wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t3)); } }

1 0

Jiangyi Chen : ws2_32: Add a missing break.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 37b7d573b2832c5415220acb2ab33f2c8ab26fc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b7d573b2832c5415220acb… Author: Jiangyi Chen <chenjiangyi(a)uniontech.com> Date: Mon Mar 15 11:24:02 2021 +0800 ws2_32: Add a missing break. Signed-off-by: Jiangyi Chen <chenjiangyi(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6e783f87ee7..28b14e71c9c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7484,6 +7484,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (!af) af = supported_protocols[i].iAddressFamily; if (!type) type = supported_protocols[i].iSocketType; if (!protocol) protocol = supported_protocols[i].iProtocol; + break; } }

1 0

Zebediah Figura : opencl: Generate the spec file and thunks from the official XML registry file.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: b3bd08d8ddba2f065db62ffeb228002fb42c2fe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3bd08d8ddba2f065db62ffe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 9 17:13:11 2021 -0600 opencl: Generate the spec file and thunks from the official XML registry file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/Makefile.in | 3 +- dlls/opencl/make_opencl | 299 +++++++++++++++++++ dlls/opencl/opencl.c | 670 +------------------------------------------ dlls/opencl/opencl.spec | 158 +++++----- dlls/opencl/opencl_private.h | 41 +++ dlls/opencl/opencl_thunks.c | 360 +++++++++++++++++++++++ 6 files changed, 768 insertions(+), 763 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b3bd08d8ddba2f065db6…

1 0

Rémi Bernon : windows.media.speech: Implement IInstalledVoicesStatic::AllVoices stub.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: af8b935892fe5da59f8183eff4a63a47fc550014 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af8b935892fe5da59f8183ef… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 12 12:31:11 2021 +0100 windows.media.speech: Implement IInstalledVoicesStatic::AllVoices stub. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/main.c | 125 +++++++++++++++++++++++++++++- dlls/windows.media.speech/tests/statics.c | 8 +- 2 files changed, 126 insertions(+), 7 deletions(-) diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index 0d1da641394..28b1c45c4fd 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -46,6 +46,125 @@ static const char *debugstr_hstring(HSTRING hstr) return wine_dbgstr_wn(str, len); } +struct voice_information_vector +{ + IVectorView_VoiceInformation IVectorView_VoiceInformation_iface; + LONG ref; +}; + +static inline struct voice_information_vector *impl_from_IVectorView_VoiceInformation(IVectorView_VoiceInformation *iface) +{ + return CONTAINING_RECORD(iface, struct voice_information_vector, IVectorView_VoiceInformation_iface); +} + +static HRESULT STDMETHODCALLTYPE vector_view_voice_information_QueryInterface( + IVectorView_VoiceInformation *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IVectorView_VoiceInformation)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE vector_view_voice_information_AddRef( + IVectorView_VoiceInformation *iface) +{ + struct voice_information_vector *impl = impl_from_IVectorView_VoiceInformation(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE vector_view_voice_information_Release( + IVectorView_VoiceInformation *iface) +{ + struct voice_information_vector *impl = impl_from_IVectorView_VoiceInformation(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetIids( + IVectorView_VoiceInformation *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetRuntimeClassName( + IVectorView_VoiceInformation *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetTrustLevel( + IVectorView_VoiceInformation *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetAt( + IVectorView_VoiceInformation *iface, ULONG index, IVoiceInformation **value) +{ + FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE vector_view_voice_information_get_Size( + IVectorView_VoiceInformation *iface, ULONG *value) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE vector_view_voice_information_IndexOf( + IVectorView_VoiceInformation *iface, IVoiceInformation *element, ULONG *index, BOOLEAN *value) +{ + FIXME("iface %p, element %p, index %p, value %p stub!\n", iface, element, index, value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetMany( + IVectorView_VoiceInformation *iface, ULONG start_index, IVoiceInformation **items, UINT *value) +{ + FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value); + return E_NOTIMPL; +} + +static const struct IVectorView_VoiceInformationVtbl vector_view_voice_information_vtbl = +{ + vector_view_voice_information_QueryInterface, + vector_view_voice_information_AddRef, + vector_view_voice_information_Release, + /* IInspectable methods */ + vector_view_voice_information_GetIids, + vector_view_voice_information_GetRuntimeClassName, + vector_view_voice_information_GetTrustLevel, + /* IVectorView<VoiceInformation> methods */ + vector_view_voice_information_GetAt, + vector_view_voice_information_get_Size, + vector_view_voice_information_IndexOf, + vector_view_voice_information_GetMany, +}; + +static struct voice_information_vector all_voices = +{ + {&vector_view_voice_information_vtbl}, + 0 +}; + struct windows_media_speech { IActivationFactory IActivationFactory_iface; @@ -196,8 +315,10 @@ static HRESULT STDMETHODCALLTYPE installed_voices_static_GetTrustLevel( static HRESULT STDMETHODCALLTYPE installed_voices_static_get_AllVoices( IInstalledVoicesStatic *iface, IVectorView_VoiceInformation **value) { - FIXME("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + TRACE("iface %p, value %p.\n", iface, value); + *value = &all_voices.IVectorView_VoiceInformation_iface; + IVectorView_VoiceInformation_AddRef(*value); + return S_OK; } static HRESULT STDMETHODCALLTYPE installed_voices_static_get_DefaultVoice( diff --git a/dlls/windows.media.speech/tests/statics.c b/dlls/windows.media.speech/tests/statics.c index 470b6d769c6..30994b3ac1d 100644 --- a/dlls/windows.media.speech/tests/statics.c +++ b/dlls/windows.media.speech/tests/statics.c @@ -88,8 +88,7 @@ static void test_SpeechSynthesizer(void) IAgileObject_Release(tmp_agile_object); hr = IInstalledVoicesStatic_get_AllVoices(voices_static, &voices); - todo_wine ok(SUCCEEDED(hr), "IInstalledVoicesStatic_get_AllVoices failed, hr %#x\n", hr); - if (FAILED(hr)) goto done; + ok(SUCCEEDED(hr), "IInstalledVoicesStatic_get_AllVoices failed, hr %#x\n", hr); hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IInspectable, (void **)&tmp_inspectable); ok(SUCCEEDED(hr), "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); @@ -101,13 +100,12 @@ static void test_SpeechSynthesizer(void) size = 0xdeadbeef; hr = IVectorView_VoiceInformation_get_Size(voices, &size); - ok(SUCCEEDED(hr), "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); - ok(size != 0 && size != 0xdeadbeef, "IVectorView_VoiceInformation_get_Size returned %u\n", size); + todo_wine ok(SUCCEEDED(hr), "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_VoiceInformation_get_Size returned %u\n", size); rc = IVectorView_VoiceInformation_Release(voices); ok(rc == 0, "IVectorView_VoiceInformation_Release returned unexpected refcount %d\n", rc); -done: rc = IInstalledVoicesStatic_Release(voices_static); ok(rc == 4, "IInstalledVoicesStatic_Release returned unexpected refcount %d\n", rc);

1 0

Rémi Bernon : ntdll/tests: Fix tick count read from user shared data.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 8591c2ac1a12f10a3447916999b1f61cf89ef197 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8591c2ac1a12f10a34479169… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 10 12:22:31 2021 +0100 ntdll/tests: Fix tick count read from user shared data. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index d756a8c839c..931bf765aa7 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -206,9 +206,9 @@ static void test_user_shared_data_time(void) { t1 = GetTickCount(); if (user_shared_data->NtMajorVersion <= 5 && user_shared_data->NtMinorVersion <= 1) - t2 = (*(volatile ULONG*)&user_shared_data->TickCountLowDeprecated * (ULONG64)user_shared_data->TickCountMultiplier) >> 24; + t2 = (DWORD)((*(volatile ULONG*)&user_shared_data->TickCountLowDeprecated * (ULONG64)user_shared_data->TickCountMultiplier) >> 24); else - t2 = (read_ksystem_time(&user_shared_data->u.TickCount) * user_shared_data->TickCountMultiplier) >> 24; + t2 = (DWORD)((read_ksystem_time(&user_shared_data->u.TickCount) * user_shared_data->TickCountMultiplier) >> 24); t3 = GetTickCount(); } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */

1 0

Francois Gouget : winetest: Simplify the 'dll is native' error message.
by Alexandre Julliard March 15, 2021

March 15, 2021

Module: wine Branch: master Commit: 21e9d51b366148d8bcc4e701dd1fa445315178da URL: https://source.winehq.org/git/wine.git/?a=commit;h=21e9d51b366148d8bcc4e701… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 15 19:28:40 2021 +0100 winetest: Simplify the 'dll is native' error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 408e1b3c706..b0b6ceff88b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -957,7 +957,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP } else if (is_native_dll(dll)) { - xprintf (" %s=load error Configured as native\n", dllname); + xprintf (" %s=dll is native\n", dllname); nr_native_dlls++; run = FALSE; }

1 0