July 2023 - Wine-commits - list.winehq.org

Shaun Ren : sapi: Implement ISpTTSEngineSite::Write.
by Alexandre Julliard 21 Jul '23

21 Jul '23

Module: wine Branch: master Commit: 0d09ab378e98b7b5da1ac78439fec09d1ce30994 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d09ab378e98b7b5da1ac78439fec0… Author: Shaun Ren <sren(a)codeweavers.com> Date: Thu Jul 13 19:51:16 2023 -0400 sapi: Implement ISpTTSEngineSite::Write. --- dlls/sapi/tests/tts.c | 14 +++++++++++++- dlls/sapi/tts.c | 10 ++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index c17e4f5b7c3..d2b98e6fbfb 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -206,12 +206,24 @@ static HRESULT WINAPI test_engine_Speak(ISpTTSEngine *iface, DWORD flags, REFGUI ISpTTSEngineSite *site) { struct test_engine *engine = impl_from_ISpTTSEngine(iface); + char *buf; + int i; + HRESULT hr; engine->flags = flags; engine->fmtid = *fmtid; copy_frag_list(frag_list, &engine->frag_list); engine->speak_called = TRUE; + buf = calloc(1, 22050 * 2 / 5); + for (i = 0; i < 5; i++) + { + hr = ISpTTSEngineSite_Write(site, buf, 22050 * 2 / 5, NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + Sleep(100); + } + free(buf); + return S_OK; } @@ -509,7 +521,7 @@ static void test_spvoice(void) ok(!wcsncmp(test_text, test_engine.frag_list->pTextStart, wcslen(test_text)), "got %s.\n", wine_dbgstr_w(test_engine.frag_list->pTextStart)); ok(stream_num == 1, "got %lu.\n", stream_num); - ok(duration < 500, "took %lu ms.\n", duration); + ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); reset_engine_params(&test_engine); stream_num = 0xdeadbeef; diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 9a022aca73c..acbef907646 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -27,6 +27,7 @@ #include "objbase.h" #include "sapiddk.h" +#include "sperror.h" #include "wine/debug.h" @@ -1211,9 +1212,14 @@ static DWORD WINAPI ttsenginesite_GetActions(ISpTTSEngineSite *iface) static HRESULT WINAPI ttsenginesite_Write(ISpTTSEngineSite *iface, const void *buf, ULONG cb, ULONG *cb_written) { - FIXME("(%p, %p, %ld, %p): stub.\n", iface, buf, cb, cb_written); + struct tts_engine_site *This = impl_from_ISpTTSEngineSite(iface); - return E_NOTIMPL; + TRACE("(%p, %p, %ld, %p).\n", iface, buf, cb, cb_written); + + if (!This->voice->output) + return SPERR_UNINITIALIZED; + + return ISpStreamFormat_Write(This->voice->output, buf, cb, cb_written); } static HRESULT WINAPI ttsenginesite_GetRate(ISpTTSEngineSite *iface, LONG *rate)

1 0

Shaun Ren : sapi: Implement ISpTTSEngineSite::GetActions/Rate/Volume.
by Alexandre Julliard 21 Jul '23

21 Jul '23

Module: wine Branch: master Commit: ee8c8f6533583f1603a292d0d33d939b815beb22 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee8c8f6533583f1603a292d0d33d93… Author: Shaun Ren <sren(a)codeweavers.com> Date: Thu Jul 13 19:51:36 2023 -0400 sapi: Implement ISpTTSEngineSite::GetActions/Rate/Volume. --- dlls/sapi/tests/tts.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- dlls/sapi/tts.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 87 insertions(+), 8 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index d2b98e6fbfb..86a9312a37b 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -112,6 +112,8 @@ struct test_engine DWORD flags; GUID fmtid; SPVTEXTFRAG *frag_list; + LONG rate; + USHORT volume; }; static void copy_frag_list(const SPVTEXTFRAG *frag_list, SPVTEXTFRAG **ret_frag_list) @@ -154,6 +156,8 @@ static void reset_engine_params(struct test_engine *engine) engine->speak_called = FALSE; engine->flags = 0xdeadbeef; memset(&engine->fmtid, 0xde, sizeof(engine->fmtid)); + engine->rate = 0xdeadbeef; + engine->volume = 0xbeef; for (frag = engine->frag_list; frag; frag = next) { @@ -206,6 +210,7 @@ static HRESULT WINAPI test_engine_Speak(ISpTTSEngine *iface, DWORD flags, REFGUI ISpTTSEngineSite *site) { struct test_engine *engine = impl_from_ISpTTSEngine(iface); + DWORD actions; char *buf; int i; HRESULT hr; @@ -215,11 +220,26 @@ static HRESULT WINAPI test_engine_Speak(ISpTTSEngine *iface, DWORD flags, REFGUI copy_frag_list(frag_list, &engine->frag_list); engine->speak_called = TRUE; + actions = ISpTTSEngineSite_GetActions(site); + ok(actions == (SPVES_CONTINUE | SPVES_RATE | SPVES_VOLUME), "got %#lx.\n", actions); + + hr = ISpTTSEngineSite_GetRate(site, &engine->rate); + ok(hr == S_OK, "got %#lx.\n", hr); + actions = ISpTTSEngineSite_GetActions(site); + ok(actions == (SPVES_CONTINUE | SPVES_VOLUME), "got %#lx.\n", actions); + + hr = ISpTTSEngineSite_GetVolume(site, &engine->volume); + ok(hr == S_OK, "got %#lx.\n", hr); + actions = ISpTTSEngineSite_GetActions(site); + ok(actions == SPVES_CONTINUE, "got %#lx.\n", actions); + buf = calloc(1, 22050 * 2 / 5); for (i = 0; i < 5; i++) { + if (ISpTTSEngineSite_GetActions(site) & SPVES_ABORT) + break; hr = ISpTTSEngineSite_Write(site, buf, 22050 * 2 / 5, NULL); - ok(hr == S_OK, "got %#lx.\n", hr); + ok(hr == S_OK || hr == SP_AUDIO_STOPPED, "got %#lx.\n", hr); Sleep(100); } free(buf); @@ -507,7 +527,10 @@ static void test_spvoice(void) ok(hr == S_OK, "got %#lx.\n", hr); ok(stream_num == 0xdeadbeef, "got %lu.\n", stream_num); - test_engine.speak_called = FALSE; + ISpVoice_SetRate(voice, 0); + ISpVoice_SetVolume(voice, 100); + + reset_engine_params(&test_engine); stream_num = 0xdeadbeef; start = GetTickCount(); hr = ISpVoice_Speak(voice, test_text, SPF_DEFAULT, &stream_num); @@ -520,6 +543,8 @@ static void test_spvoice(void) ok(test_engine.frag_list->ulTextLen == wcslen(test_text), "got %lu.\n", test_engine.frag_list->ulTextLen); ok(!wcsncmp(test_text, test_engine.frag_list->pTextStart, wcslen(test_text)), "got %s.\n", wine_dbgstr_w(test_engine.frag_list->pTextStart)); + ok(test_engine.rate == 0, "got %ld.\n", test_engine.rate); + ok(test_engine.volume == 100, "got %d.\n", test_engine.volume); ok(stream_num == 1, "got %lu.\n", stream_num); ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); @@ -540,6 +565,21 @@ static void test_spvoice(void) ok(test_engine.frag_list->ulTextLen == wcslen(test_text), "got %lu.\n", test_engine.frag_list->ulTextLen); ok(!wcsncmp(test_text, test_engine.frag_list->pTextStart, wcslen(test_text)), "got %s.\n", wine_dbgstr_w(test_engine.frag_list->pTextStart)); + ok(test_engine.rate == 0, "got %ld.\n", test_engine.rate); + ok(test_engine.volume == 100, "got %d.\n", test_engine.volume); + + Sleep(2000); + + reset_engine_params(&test_engine); + hr = ISpVoice_Speak(voice, test_text, SPF_DEFAULT | SPF_ASYNC, NULL); + ok(hr == S_OK, "got %#lx.\n", hr); + + Sleep(200); + start = GetTickCount(); + hr = ISpVoice_Speak(voice, NULL, SPF_PURGEBEFORESPEAK, NULL); + duration = GetTickCount() - start; + ok(hr == S_OK, "got %#lx.\n", hr); + ok(duration < 300, "took %lu ms.\n", duration); done: reset_engine_params(&test_engine); diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index acbef907646..432a021ea1c 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -45,6 +45,7 @@ struct speech_voice ISpStreamFormat *output; ISpTTSEngine *engine; LONG cur_stream_num; + DWORD actions; USHORT volume; LONG rate; struct async_queue queue; @@ -777,6 +778,13 @@ static void speak_proc(struct async_task *task) EnterCriticalSection(&This->cs); + if (This->actions & SPVES_ABORT) + { + LeaveCriticalSection(&This->cs); + hr = S_OK; + goto done; + } + if (FAILED(hr = set_output_format(This->output, This->engine, &fmtid, &wfx))) { LeaveCriticalSection(&This->cs); @@ -789,6 +797,8 @@ static void speak_proc(struct async_task *task) if (SUCCEEDED(ISpStreamFormat_QueryInterface(This->output, &IID_ISpAudio, (void **)&audio))) ISpAudio_SetState(audio, SPAS_RUN, 0); + This->actions = SPVES_RATE | SPVES_VOLUME; + LeaveCriticalSection(&This->cs); hr = ISpTTSEngine_Speak(engine, speak_task->flags, &fmtid, wfx, speak_task->frag_list, speak_task->site); @@ -847,6 +857,7 @@ static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWOR EnterCriticalSection(&This->cs); + This->actions = SPVES_ABORT; if (This->output && SUCCEEDED(ISpStreamFormat_QueryInterface(This->output, &IID_ISpAudio, (void **)&audio))) { ISpAudio_SetState(audio, SPAS_CLOSED, 0); @@ -857,6 +868,10 @@ static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWOR async_empty_queue(&This->queue); + EnterCriticalSection(&This->cs); + This->actions = SPVES_CONTINUE; + LeaveCriticalSection(&This->cs); + if (!contents || !*contents) return S_OK; } @@ -1007,6 +1022,7 @@ static HRESULT WINAPI spvoice_SetRate(ISpVoice *iface, LONG rate) EnterCriticalSection(&This->cs); This->rate = rate; + This->actions |= SPVES_RATE; LeaveCriticalSection(&This->cs); return S_OK; @@ -1036,6 +1052,7 @@ static HRESULT WINAPI spvoice_SetVolume(ISpVoice *iface, USHORT volume) EnterCriticalSection(&This->cs); This->volume = volume; + This->actions |= SPVES_VOLUME; LeaveCriticalSection(&This->cs); return S_OK; @@ -1205,9 +1222,16 @@ static HRESULT WINAPI ttsenginesite_GetEventInterest(ISpTTSEngineSite *iface, UL static DWORD WINAPI ttsenginesite_GetActions(ISpTTSEngineSite *iface) { - FIXME("(%p): stub.\n", iface); + struct tts_engine_site *This = impl_from_ISpTTSEngineSite(iface); + DWORD actions; + + TRACE("(%p).\n", iface); + + EnterCriticalSection(&This->voice->cs); + actions = This->voice->actions; + LeaveCriticalSection(&This->voice->cs); - return SPVES_CONTINUE; + return actions; } static HRESULT WINAPI ttsenginesite_Write(ISpTTSEngineSite *iface, const void *buf, ULONG cb, ULONG *cb_written) @@ -1224,16 +1248,30 @@ static HRESULT WINAPI ttsenginesite_Write(ISpTTSEngineSite *iface, const void *b static HRESULT WINAPI ttsenginesite_GetRate(ISpTTSEngineSite *iface, LONG *rate) { - FIXME("(%p, %p): stub.\n", iface, rate); + struct tts_engine_site *This = impl_from_ISpTTSEngineSite(iface); - return E_NOTIMPL; + TRACE("(%p, %p).\n", iface, rate); + + EnterCriticalSection(&This->voice->cs); + *rate = This->voice->rate; + This->voice->actions &= ~SPVES_RATE; + LeaveCriticalSection(&This->voice->cs); + + return S_OK; } static HRESULT WINAPI ttsenginesite_GetVolume(ISpTTSEngineSite *iface, USHORT *volume) { - FIXME("(%p, %p): stub.\n", iface, volume); + struct tts_engine_site *This = impl_from_ISpTTSEngineSite(iface); - return E_NOTIMPL; + TRACE("(%p, %p).\n", iface, volume); + + EnterCriticalSection(&This->voice->cs); + *volume = This->voice->volume; + This->voice->actions &= ~SPVES_VOLUME; + LeaveCriticalSection(&This->voice->cs); + + return S_OK; } static HRESULT WINAPI ttsenginesite_GetSkipInfo(ISpTTSEngineSite *iface, SPVSKIPTYPE *type, LONG *skip_count) @@ -1351,6 +1389,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) This->output = NULL; This->engine = NULL; This->cur_stream_num = 0; + This->actions = SPVES_CONTINUE; This->volume = 100; This->rate = 0; memset(&This->queue, 0, sizeof(This->queue));

1 0

Shaun Ren : sapi: Return wait status in async_wait_queue_empty.
by Alexandre Julliard 21 Jul '23

21 Jul '23

Module: wine Branch: master Commit: b89c5361bbf7cd14b2e62194da4242069ee7a8c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b89c5361bbf7cd14b2e62194da4242… Author: Shaun Ren <sren(a)codeweavers.com> Date: Thu Jul 20 17:24:56 2023 -0400 sapi: Return wait status in async_wait_queue_empty. --- dlls/sapi/async.c | 6 +++--- dlls/sapi/sapi_private.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/sapi/async.c b/dlls/sapi/async.c index 491ca657c1a..b02778ae7ba 100644 --- a/dlls/sapi/async.c +++ b/dlls/sapi/async.c @@ -171,8 +171,8 @@ HRESULT async_queue_task(struct async_queue *queue, struct async_task *task) return S_OK; } -void async_wait_queue_empty(struct async_queue *queue, DWORD timeout) +HRESULT async_wait_queue_empty(struct async_queue *queue, DWORD timeout) { - if (!queue->init) return; - WaitForSingleObject(queue->empty, timeout); + if (!queue->init) return WAIT_OBJECT_0; + return WaitForSingleObject(queue->empty, timeout); } diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 94046926b2e..3cdb59b36a8 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -42,7 +42,7 @@ HRESULT async_start_queue(struct async_queue *queue); void async_empty_queue(struct async_queue *queue); void async_cancel_queue(struct async_queue *queue); HRESULT async_queue_task(struct async_queue *queue, struct async_task *task); -void async_wait_queue_empty(struct async_queue *queue, DWORD timeout); +HRESULT async_wait_queue_empty(struct async_queue *queue, DWORD timeout); HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ); HRESULT file_stream_create( IUnknown *outer, REFIID iid, void **obj );

1 0

Shaun Ren : sapi: Implement ISpVoice::WaitUntilDone.
by Alexandre Julliard 21 Jul '23

21 Jul '23

Module: wine Branch: master Commit: 61ad9174e28530b9e31daf7683ce17dfa68287e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/61ad9174e28530b9e31daf7683ce17… Author: Shaun Ren <sren(a)codeweavers.com> Date: Thu Jul 20 17:27:12 2023 -0400 sapi: Implement ISpVoice::WaitUntilDone. --- dlls/sapi/tests/tts.c | 17 ++++++++++++++--- dlls/sapi/tts.c | 11 +++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 86a9312a37b..39f62ac551e 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -548,6 +548,12 @@ static void test_spvoice(void) ok(stream_num == 1, "got %lu.\n", stream_num); ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); + start = GetTickCount(); + hr = ISpVoice_WaitUntilDone(voice, INFINITE); + duration = GetTickCount() - start; + ok(hr == S_OK, "got %#lx.\n", hr); + ok(duration < 200, "took %lu ms.\n", duration); + reset_engine_params(&test_engine); stream_num = 0xdeadbeef; start = GetTickCount(); @@ -557,7 +563,14 @@ static void test_spvoice(void) todo_wine ok(stream_num == 1, "got %lu.\n", stream_num); ok(duration < 500, "took %lu ms.\n", duration); - Sleep(200); + hr = ISpVoice_WaitUntilDone(voice, 100); + ok(hr == S_FALSE, "got %#lx.\n", hr); + + hr = ISpVoice_WaitUntilDone(voice, INFINITE); + duration = GetTickCount() - start; + ok(hr == S_OK, "got %#lx.\n", hr); + ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); + ok(test_engine.speak_called, "ISpTTSEngine::Speak was not called.\n"); ok(test_engine.flags == SPF_NLP_SPEAK_PUNC, "got %#lx.\n", test_engine.flags); ok(test_engine.frag_list != NULL, "frag_list is NULL.\n"); @@ -568,8 +581,6 @@ static void test_spvoice(void) ok(test_engine.rate == 0, "got %ld.\n", test_engine.rate); ok(test_engine.volume == 100, "got %d.\n", test_engine.volume); - Sleep(2000); - reset_engine_params(&test_engine); hr = ISpVoice_Speak(voice, test_text, SPF_DEFAULT | SPF_ASYNC, NULL); ok(hr == S_OK, "got %#lx.\n", hr); diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 432a021ea1c..4763ef9f324 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -1073,9 +1073,16 @@ static HRESULT WINAPI spvoice_GetVolume(ISpVoice *iface, USHORT *volume) static HRESULT WINAPI spvoice_WaitUntilDone(ISpVoice *iface, ULONG timeout) { - FIXME("(%p, %ld): stub.\n", iface, timeout); + struct speech_voice *This = impl_from_ISpVoice(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %ld).\n", iface, timeout); + + hr = async_wait_queue_empty(&This->queue, timeout); + + if (hr == WAIT_OBJECT_0) return S_OK; + else if (hr == WAIT_TIMEOUT) return S_FALSE; + return hr; } static HRESULT WINAPI spvoice_SetSyncSpeakTimeout(ISpVoice *iface, ULONG timeout)

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.258.
by Alexandre Julliard 21 Jul '23

21 Jul '23

Module: wine Branch: master Commit: eb5be00eb005a30df1b7f828269e3c8f002e1e82 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb5be00eb005a30df1b7f828269e3c… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Jul 21 13:19:31 2023 +0200 winevulkan: Update to VK spec version 1.3.258. This does not enable VK_NV_device_generated_commands_compute because the extension will likely see an API breaking naming fix. --- dlls/winevulkan/loader_thunks.c | 62 ++++ dlls/winevulkan/loader_thunks.h | 42 +++ dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 689 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 10 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 235 ++++++++++++-- 7 files changed, 1019 insertions(+), 26 deletions(-)

1 0

Alexandre Julliard : wintrust/tests: Use nameless unions/structs.
by Alexandre Julliard 21 Jul '23

21 Jul '23

Module: wine Branch: master Commit: 42a861388a1a345684fb2ef12f638ad6fe1b4556 URL: https://gitlab.winehq.org/wine/wine/-/commit/42a861388a1a345684fb2ef12f638a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:38:07 2023 +0200 wintrust/tests: Use nameless unions/structs. --- dlls/wintrust/tests/asn.c | 46 +++++++++++++++++++++---------------------- dlls/wintrust/tests/softpub.c | 10 +++++----- 2 files changed, 28 insertions(+), 28 deletions(-)

1 0

Alexandre Julliard : oledb32/tests: Use nameless unions/structs.
by Alexandre Julliard 21 Jul '23

21 Jul '23

Module: wine Branch: master Commit: 86721b874bee78b4163ceb57d359d1c02b9aca4a URL: https://gitlab.winehq.org/wine/wine/-/commit/86721b874bee78b4163ceb57d359d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:34:19 2023 +0200 oledb32/tests: Use nameless unions/structs. --- dlls/oledb32/tests/convert.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index fe34657b779..a019ff4042e 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -20,9 +20,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "windef.h" #include "winbase.h" #include "ole2.h" @@ -464,7 +461,7 @@ static void test_converttoi1(void) dst_len = dst = 0x12; memset(src, 0, sizeof(DECIMAL)); - ((DECIMAL*)src)->u1.Lo64 = 0x43; + ((DECIMAL*)src)->Lo64 = 0x43; hr = IDataConvert_DataConvert(convert, DBTYPE_DECIMAL, DBTYPE_I1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08lx\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); @@ -775,7 +772,7 @@ static void test_converttoi2(void) dst_len = dst = 0x1234; memset(src, 0, sizeof(DECIMAL)); - ((DECIMAL*)src)->u1.Lo64 = 0x4321; + ((DECIMAL*)src)->Lo64 = 0x4321; hr = IDataConvert_DataConvert(convert, DBTYPE_DECIMAL, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08lx\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); @@ -1091,7 +1088,7 @@ static void test_converttoi4(void) i4 = 0x12345678; memset(src, 0, sizeof(DECIMAL)); - ((DECIMAL*)src)->u1.Lo64 = 0x1234; + ((DECIMAL*)src)->Lo64 = 0x1234; dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_DECIMAL, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08lx\n", hr); @@ -3016,7 +3013,7 @@ static void test_converttocy(void) ok(hr == S_OK, "got %08lx\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); ok(dst_len == sizeof(CY), "got %Id\n", dst_len); - ok(dst.int64 == 12340000, "got %ld\n", dst.s.Lo); + ok(dst.int64 == 12340000, "got %ld\n", dst.Lo); dst.int64 = 0xcc; ((CY*)src)->int64 = 1234; @@ -3025,7 +3022,7 @@ static void test_converttocy(void) ok(hr == S_OK, "got %08lx\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); ok(dst_len == sizeof(CY), "got %Id\n", dst_len); - ok(dst.int64 == 1234, "got %ld\n", dst.s.Lo); + ok(dst.int64 == 1234, "got %ld\n", dst.Lo); dst_len = 44; V_VT(&v) = VT_NULL; @@ -3784,8 +3781,8 @@ static void test_converttovar(void) ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); ok(dst_len == sizeof(dst), "got %Id\n", dst_len); ok(V_VT(&dst) == VT_DECIMAL, "got %d\n", V_VT(&dst)); - ok(S(U(V_DECIMAL(&dst))).scale == 0 && S(U(V_DECIMAL(&dst))).sign == 0 && - V_DECIMAL(&dst).Hi32 == 0 && U1(V_DECIMAL(&dst)).Lo64 == 12345, "Not Equal\n"); + ok(V_DECIMAL(&dst).scale == 0 && V_DECIMAL(&dst).sign == 0 && + V_DECIMAL(&dst).Hi32 == 0 && V_DECIMAL(&dst).Lo64 == 12345, "Not Equal\n"); V_VT(&dst) = VT_EMPTY; dst_len = 0; @@ -3853,8 +3850,8 @@ static void test_converttovar(void) V_VT(&dst) = VT_EMPTY; dst_len = 0; dst_status = DBSTATUS_S_DEFAULT; - S(cy).Lo = 1; - S(cy).Hi = 2; + cy.Lo = 1; + cy.Hi = 2; hr = IDataConvert_DataConvert(convert, DBTYPE_CY, DBTYPE_VARIANT, sizeof(cy), &dst_len, &cy, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08lx\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status); @@ -3862,7 +3859,7 @@ static void test_converttovar(void) ok(V_VT(&dst) == VT_CY, "got %d\n", V_VT(&dst)); cy2 = V_CY(&dst); - ok(S(cy2).Lo == S(cy).Lo && S(cy2).Hi == S(cy).Hi, "got %ld,%ld\n", S(cy2).Lo, S(cy2).Hi); + ok(cy2.Lo == cy.Lo && cy2.Hi == cy.Hi, "got %ld,%ld\n", cy2.Lo, cy2.Hi); dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_VARIANT, sizeof(byte_src), &dst_len, &byte_src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);

1 0

Alexandre Julliard : pdh/tests: Use nameless unions/structs.
by Alexandre Julliard 21 Jul '23

21 Jul '23

Module: wine Branch: master Commit: 679b57f1ceb7752bd3ad2784db9a1a00cfa2741e URL: https://gitlab.winehq.org/wine/wine/-/commit/679b57f1ceb7752bd3ad2784db9a1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:34:38 2023 +0200 pdh/tests: Use nameless unions/structs. --- dlls/pdh/tests/pdh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index e5d6fa8205e..5408e4cc3f3 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -884,7 +884,7 @@ static void test_PdhCollectQueryDataEx(void) status = PdhGetFormattedCounterValue( counter, PDH_FMT_LARGE, NULL, &value ); ok(status == ERROR_SUCCESS, "PdhGetFormattedCounterValue failed 0x%08lx\n", status); - trace( "uptime %s\n", wine_dbgstr_longlong(U(value).largeValue) ); + trace( "uptime %s\n", wine_dbgstr_longlong(value.largeValue) ); } }

1 0

Alexandre Julliard : quartz/tests: Use nameless unions/structs.
by Alexandre Julliard 21 Jul '23

21 Jul '23

Module: wine Branch: master Commit: 6474ceb31234978c2a815c55d7b92a67da34308e URL: https://gitlab.winehq.org/wine/wine/-/commit/6474ceb31234978c2a815c55d7b92a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:34:49 2023 +0200 quartz/tests: Use nameless unions/structs. --- dlls/quartz/tests/filtermapper.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 3c492845389..12b7f374659 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -139,8 +139,8 @@ static void test_fm2_enummatchingfilters(void) /* Test that a test renderer filter is returned when enumerating filters with bRender=FALSE */ rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S2(U(rgf2)).cPins2 = 1; - S2(U(rgf2)).rgPins2 = rgPins2; + rgf2.cPins2 = 1; + rgf2.rgPins2 = rgPins2; rgPins2[0].dwFlags = REG_PINFLAG_B_RENDERER; rgPins2[0].cInstances = 1; @@ -174,7 +174,7 @@ static void test_fm2_enummatchingfilters(void) rgPins2[1].lpMedium = NULL; rgPins2[1].clsPinCategory = NULL; - S2(U(rgf2)).cPins2 = 2; + rgf2.cPins2 = 2; hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter2, L"Testfilter2", NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); @@ -398,8 +398,8 @@ static void test_register_filter_with_null_clsMinorType(void) ZeroMemory(&rgf2, sizeof(rgf2)); rgf2.dwVersion = 1; rgf2.dwMerit = MERIT_UNLIKELY; - S1(U(rgf2)).cPins = 1; - S1(U(rgf2)).rgPins = &rgPins; + rgf2.cPins = 1; + rgf2.rgPins = &rgPins; rgPins.strName = wszPinName; rgPins.bRendered = 1; @@ -427,8 +427,8 @@ static void test_register_filter_with_null_clsMinorType(void) ZeroMemory(&rgf2, sizeof(rgf2)); rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S2(U(rgf2)).cPins2 = 1; - S2(U(rgf2)).rgPins2 = &rgPins2; + rgf2.cPins2 = 1; + rgf2.rgPins2 = &rgPins2; rgPins2.dwFlags = REG_PINFLAG_B_RENDERER; rgPins2.cInstances = 1;

1 0

Alexandre Julliard : rpcrt4/tests: Use nameless unions/structs.
by Alexandre Julliard 21 Jul '23

21 Jul '23

Module: wine Branch: master Commit: a345f985c0ef46aac6e2a7a01b6950f39ba08a6a URL: https://gitlab.winehq.org/wine/wine/-/commit/a345f985c0ef46aac6e2a7a01b6950… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:35:03 2023 +0200 rpcrt4/tests: Use nameless unions/structs. --- dlls/rpcrt4/tests/ndr_marshall.c | 84 ++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 52e432e6436..1c684cd6f53 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -2760,21 +2760,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %lu instead of 1\n", umi.InformationLevel); - ok( U1(umi).Level1.Buffer == buffer + 15, + ok( umi.Level1.Buffer == buffer + 15, "umi.Level1.Buffer was %p instead of %p\n", - U1(umi).Level1.Buffer, buffer); - ok( U1(umi).Level1.BufferSize == 1, + umi.Level1.Buffer, buffer); + ok( umi.Level1.BufferSize == 1, "umi.Level1.BufferSize was %lu instead of 1\n", - U1(umi).Level1.BufferSize); - ok( U1(umi).Level1.pfnAllocate == my_alloc, + umi.Level1.BufferSize); + ok( umi.Level1.pfnAllocate == my_alloc, "umi.Level1.pfnAllocate was %p instead of %p\n", - U1(umi).Level1.pfnAllocate, my_alloc); - ok( U1(umi).Level1.pfnFree == my_free, + umi.Level1.pfnAllocate, my_alloc); + ok( umi.Level1.pfnFree == my_free, "umi.Level1.pfnFree was %p instead of %p\n", - U1(umi).Level1.pfnFree, my_free); - ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + umi.Level1.pfnFree, my_free); + ok( umi.Level1.pRpcChannelBuffer == rpc_channel_buffer, "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", - U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); + umi.Level1.pRpcChannelBuffer, rpc_channel_buffer); /* buffer size */ @@ -2794,21 +2794,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %lu instead of 1\n", umi.InformationLevel); - ok( U1(umi).Level1.Buffer == NULL, + ok( umi.Level1.Buffer == NULL, "umi.Level1.Buffer was %p instead of NULL\n", - U1(umi).Level1.Buffer); - ok( U1(umi).Level1.BufferSize == 0, + umi.Level1.Buffer); + ok( umi.Level1.BufferSize == 0, "umi.Level1.BufferSize was %lu instead of 0\n", - U1(umi).Level1.BufferSize); - ok( U1(umi).Level1.pfnAllocate == my_alloc, + umi.Level1.BufferSize); + ok( umi.Level1.pfnAllocate == my_alloc, "umi.Level1.pfnAllocate was %p instead of %p\n", - U1(umi).Level1.pfnAllocate, my_alloc); - ok( U1(umi).Level1.pfnFree == my_free, + umi.Level1.pfnAllocate, my_alloc); + ok( umi.Level1.pfnFree == my_free, "umi.Level1.pfnFree was %p instead of %p\n", - U1(umi).Level1.pfnFree, my_free); - ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + umi.Level1.pfnFree, my_free); + ok( umi.Level1.pRpcChannelBuffer == rpc_channel_buffer, "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", - U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); + umi.Level1.pRpcChannelBuffer, rpc_channel_buffer); /* marshall */ @@ -2828,21 +2828,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %lu instead of 1\n", umi.InformationLevel); - ok( U1(umi).Level1.Buffer == buffer + 15, + ok( umi.Level1.Buffer == buffer + 15, "umi.Level1.Buffer was %p instead of %p\n", - U1(umi).Level1.Buffer, buffer); - ok( U1(umi).Level1.BufferSize == 1, + umi.Level1.Buffer, buffer); + ok( umi.Level1.BufferSize == 1, "umi.Level1.BufferSize was %lu instead of 1\n", - U1(umi).Level1.BufferSize); - ok( U1(umi).Level1.pfnAllocate == my_alloc, + umi.Level1.BufferSize); + ok( umi.Level1.pfnAllocate == my_alloc, "umi.Level1.pfnAllocate was %p instead of %p\n", - U1(umi).Level1.pfnAllocate, my_alloc); - ok( U1(umi).Level1.pfnFree == my_free, + umi.Level1.pfnAllocate, my_alloc); + ok( umi.Level1.pfnFree == my_free, "umi.Level1.pfnFree was %p instead of %p\n", - U1(umi).Level1.pfnFree, my_free); - ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + umi.Level1.pfnFree, my_free); + ok( umi.Level1.pRpcChannelBuffer == rpc_channel_buffer, "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", - U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); + umi.Level1.pRpcChannelBuffer, rpc_channel_buffer); /* free */ @@ -2862,21 +2862,21 @@ static void test_NdrGetUserMarshalInfo(void) ok( umi.InformationLevel == 1, "umi.InformationLevel was %lu instead of 1\n", umi.InformationLevel); - ok( U1(umi).Level1.Buffer == NULL, + ok( umi.Level1.Buffer == NULL, "umi.Level1.Buffer was %p instead of NULL\n", - U1(umi).Level1.Buffer); - ok( U1(umi).Level1.BufferSize == 0, + umi.Level1.Buffer); + ok( umi.Level1.BufferSize == 0, "umi.Level1.BufferSize was %lu instead of 0\n", - U1(umi).Level1.BufferSize); - ok( U1(umi).Level1.pfnAllocate == my_alloc, + umi.Level1.BufferSize); + ok( umi.Level1.pfnAllocate == my_alloc, "umi.Level1.pfnAllocate was %p instead of %p\n", - U1(umi).Level1.pfnAllocate, my_alloc); - ok( U1(umi).Level1.pfnFree == my_free, + umi.Level1.pfnAllocate, my_alloc); + ok( umi.Level1.pfnFree == my_free, "umi.Level1.pfnFree was %p instead of %p\n", - U1(umi).Level1.pfnFree, my_free); - ok( U1(umi).Level1.pRpcChannelBuffer == rpc_channel_buffer, + umi.Level1.pfnFree, my_free); + ok( umi.Level1.pRpcChannelBuffer == rpc_channel_buffer, "umi.Level1.pRpcChannelBuffer was %p instead of %p\n", - U1(umi).Level1.pRpcChannelBuffer, rpc_channel_buffer); + umi.Level1.pRpcChannelBuffer, rpc_channel_buffer); /* boundary test */ @@ -2891,9 +2891,9 @@ static void test_NdrGetUserMarshalInfo(void) status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %ld\n", status); - ok( U1(umi).Level1.BufferSize == 0, + ok( umi.Level1.BufferSize == 0, "umi.Level1.BufferSize was %lu instead of 0\n", - U1(umi).Level1.BufferSize); + umi.Level1.BufferSize); /* error conditions */

1 0