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

Shaun Ren : sapi: Implement ISpTTSEngineSite::Write.
by Alexandre Julliard July 21, 2023

July 21, 2023

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: Return wait status in async_wait_queue_empty.
by Alexandre Julliard July 21, 2023

July 21, 2023

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 ISpTTSEngineSite::GetActions/Rate/Volume.
by Alexandre Julliard July 21, 2023

July 21, 2023

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: Implement ISpVoice::WaitUntilDone.
by Alexandre Julliard July 21, 2023

July 21, 2023

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

Shaun Ren : sapi: Implement ISpVoice::Speak speak_proc.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 303bdc2e4bd9f6b0b1056a3607abc236aa63bbf0 URL: https://gitlab.winehq.org/wine/wine/-/commit/303bdc2e4bd9f6b0b1056a3607abc2… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Jul 19 13:28:21 2023 -0400 sapi: Implement ISpVoice::Speak speak_proc. --- dlls/sapi/tests/tts.c | 314 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/sapi/tts.c | 80 ++++++++++++- 2 files changed, 391 insertions(+), 3 deletions(-)

1 0

Alexandre Julliard : wintrust/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

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 : winspool.drv/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 30ee1d1080c20db5b6e6122d57c99b8dddc6546c URL: https://gitlab.winehq.org/wine/wine/-/commit/30ee1d1080c20db5b6e6122d57c99b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:37:45 2023 +0200 winspool.drv/tests: Use nameless unions/structs. --- dlls/winspool.drv/tests/info.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 52849277c4c..b231a07b9cf 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -21,9 +21,6 @@ #include <stdarg.h> #include <assert.h> -#define NONAMELESSSTRUCT -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -2934,7 +2931,7 @@ static void test_OpenPrinter_defaults(void) pi = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetPrinterA( printer, 2, (BYTE *)pi, needed, &needed ); ok( ret, "GetPrinterA() failed le=%ld\n", GetLastError() ); - default_size = pi->pDevMode->u1.s1.dmPaperSize; + default_size = pi->pDevMode->dmPaperSize; HeapFree( GetProcessHeap(), 0, pi ); needed = 0; @@ -2962,8 +2959,8 @@ static void test_OpenPrinter_defaults(void) todo_wine ok( job_info->pDevMode != NULL, "got NULL DEVMODEA\n"); if (job_info->pDevMode) - ok( job_info->pDevMode->u1.s1.dmPaperSize == default_size, "got %d default %d\n", - job_info->pDevMode->u1.s1.dmPaperSize, default_size ); + ok( job_info->pDevMode->dmPaperSize == default_size, "got %d default %d\n", + job_info->pDevMode->dmPaperSize, default_size ); HeapFree( GetProcessHeap(), 0, job_info ); ScheduleJob( printer, add_job->JobId ); /* remove the empty job */ @@ -2975,7 +2972,7 @@ static void test_OpenPrinter_defaults(void) memset( &my_dm, 0, sizeof(my_dm) ); my_dm.dmSize = sizeof(my_dm); my_dm.dmFields = DM_PAPERSIZE; - my_dm.u1.s1.dmPaperSize = (default_size == DMPAPER_A4) ? DMPAPER_LETTER : DMPAPER_A4; + my_dm.dmPaperSize = (default_size == DMPAPER_A4) ? DMPAPER_LETTER : DMPAPER_A4; prn_def.pDatatype = NULL; prn_def.pDevMode = &my_dm; @@ -2990,8 +2987,8 @@ static void test_OpenPrinter_defaults(void) pi = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetPrinterA( printer, 2, (BYTE *)pi, needed, &needed ); ok( ret, "GetPrinterA() failed le=%ld\n", GetLastError() ); - ok( pi->pDevMode->u1.s1.dmPaperSize == default_size, "got %d default %d\n", - pi->pDevMode->u1.s1.dmPaperSize, default_size ); + ok( pi->pDevMode->dmPaperSize == default_size, "got %d default %d\n", + pi->pDevMode->dmPaperSize, default_size ); HeapFree( GetProcessHeap(), 0, pi ); @@ -3010,9 +3007,9 @@ static void test_OpenPrinter_defaults(void) ok( job_info->pDevMode->dmFields == DM_PAPERSIZE, "got %08lx\n", job_info->pDevMode->dmFields ); - ok( job_info->pDevMode->u1.s1.dmPaperSize == my_dm.u1.s1.dmPaperSize, + ok( job_info->pDevMode->dmPaperSize == my_dm.dmPaperSize, "got %d new size %d\n", - job_info->pDevMode->u1.s1.dmPaperSize, my_dm.u1.s1.dmPaperSize ); + job_info->pDevMode->dmPaperSize, my_dm.dmPaperSize ); HeapFree( GetProcessHeap(), 0, job_info ); ScheduleJob( printer, add_job->JobId ); /* remove the empty job */ @@ -3035,15 +3032,15 @@ static void test_IsValidDevmodeW(void) { 0, FIELD_OFFSET(DEVMODEW, dmFields) + 3, FALSE }, { 0, FIELD_OFFSET(DEVMODEW, dmFields) + 4, TRUE }, - { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, u1.s1.dmOrientation) + 0, FALSE }, - { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, u1.s1.dmOrientation) + 1, FALSE }, - { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, u1.s1.dmOrientation) + 2, TRUE }, + { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, dmOrientation) + 0, FALSE }, + { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, dmOrientation) + 1, FALSE }, + { DM_ORIENTATION, FIELD_OFFSET(DEVMODEW, dmOrientation) + 2, TRUE }, - { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 0, FALSE }, - { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 1, FALSE }, - { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 2, FALSE }, - { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 3, FALSE }, - { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 4, TRUE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, dmNup) + 0, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, dmNup) + 1, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, dmNup) + 2, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, dmNup) + 3, FALSE }, + { DM_NUP, FIELD_OFFSET(DEVMODEW, dmNup) + 4, TRUE }, }; static const struct

1 0

Alexandre Julliard : wininet/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: e12e7a3a10a3890c6272520940098d3e8481a07a URL: https://gitlab.winehq.org/wine/wine/-/commit/e12e7a3a10a3890c6272520940098d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:37:16 2023 +0200 wininet/tests: Use nameless unions/structs. --- dlls/wininet/tests/urlcache.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 777fab18640..1f690183afe 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -409,8 +406,8 @@ static void test_urlcacheA(void) broken(lpCacheEntryInfo->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08lx\n", lpCacheEntryInfo->CacheEntryType); - ok(!U(*lpCacheEntryInfo).dwExemptDelta, "expected dwExemptDelta 0, got %ld\n", - U(*lpCacheEntryInfo).dwExemptDelta); + ok(!lpCacheEntryInfo->dwExemptDelta, "expected dwExemptDelta 0, got %ld\n", + lpCacheEntryInfo->dwExemptDelta); /* Make sure there is a notable change in timestamps */ Sleep(1000); @@ -699,9 +696,9 @@ static void test_urlcacheA(void) ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %ld (0x%08lx)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); - ok(U(*lpCacheEntryInfo).dwExemptDelta == 86400, + ok(lpCacheEntryInfo->dwExemptDelta == 86400, "expected dwExemptDelta 86400, got %ld\n", - U(*lpCacheEntryInfo).dwExemptDelta); + lpCacheEntryInfo->dwExemptDelta); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); if (pDeleteUrlCacheEntryA) { @@ -730,17 +727,17 @@ static void test_urlcacheA(void) ok(lpCacheEntryInfo->CacheEntryType & (NORMAL_CACHE_ENTRY|STICKY_CACHE_ENTRY), "expected cache entry type NORMAL_CACHE_ENTRY | STICKY_CACHE_ENTRY, got %ld (0x%08lx)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); - ok(U(*lpCacheEntryInfo).dwExemptDelta == 86400, + ok(lpCacheEntryInfo->dwExemptDelta == 86400, "expected dwExemptDelta 86400, got %ld\n", - U(*lpCacheEntryInfo).dwExemptDelta); - U(*lpCacheEntryInfo).dwExemptDelta = 0; + lpCacheEntryInfo->dwExemptDelta); + lpCacheEntryInfo->dwExemptDelta = 0; ret = SetUrlCacheEntryInfoA(test_url, lpCacheEntryInfo, CACHE_ENTRY_EXEMPT_DELTA_FC); ok(ret, "SetUrlCacheEntryInfo failed: %ld\n", GetLastError()); ret = GetUrlCacheEntryInfoA(test_url, lpCacheEntryInfo, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %ld\n", GetLastError()); - ok(!U(*lpCacheEntryInfo).dwExemptDelta, "expected dwExemptDelta 0, got %ld\n", - U(*lpCacheEntryInfo).dwExemptDelta); + ok(!lpCacheEntryInfo->dwExemptDelta, "expected dwExemptDelta 0, got %ld\n", + lpCacheEntryInfo->dwExemptDelta); /* See whether a sticky cache entry has the flag cleared once the exempt * delta is meaningless. */ @@ -749,7 +746,7 @@ static void test_urlcacheA(void) lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); /* Recommit of Url entry keeps dwExemptDelta */ - U(*lpCacheEntryInfo).dwExemptDelta = 8600; + lpCacheEntryInfo->dwExemptDelta = 8600; ret = SetUrlCacheEntryInfoA(test_url, lpCacheEntryInfo, CACHE_ENTRY_EXEMPT_DELTA_FC); ok(ret, "SetUrlCacheEntryInfo failed: %ld\n", GetLastError()); @@ -765,8 +762,8 @@ static void test_urlcacheA(void) ret = GetUrlCacheEntryInfoA(test_url, lpCacheEntryInfo, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %ld\n", GetLastError()); - ok(U(*lpCacheEntryInfo).dwExemptDelta == 8600 || (ie10_cache && U(*lpCacheEntryInfo).dwExemptDelta == 86400), - "expected dwExemptDelta 8600, got %ld\n", U(*lpCacheEntryInfo).dwExemptDelta); + ok(lpCacheEntryInfo->dwExemptDelta == 8600 || (ie10_cache && lpCacheEntryInfo->dwExemptDelta == 86400), + "expected dwExemptDelta 8600, got %ld\n", lpCacheEntryInfo->dwExemptDelta); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo);

1 0

Alexandre Julliard : windowscodecs/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: 091aeca774ce2036c1e2e43a8dea9f6afce85183 URL: https://gitlab.winehq.org/wine/wine/-/commit/091aeca774ce2036c1e2e43a8dea9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:36:42 2023 +0200 windowscodecs/tests: Use nameless unions/structs. --- dlls/windowscodecs/tests/converter.c | 4 +- dlls/windowscodecs/tests/metadata.c | 144 +++++++++++++++++------------------ 2 files changed, 74 insertions(+), 74 deletions(-)

1 0

Alexandre Julliard : winmm/tests: Use nameless unions/structs.
by Alexandre Julliard July 21, 2023

July 21, 2023

Module: wine Branch: master Commit: e7e43b45073dbf3388496917e39eade600ff5d48 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7e43b45073dbf3388496917e39ead… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 21 11:37:30 2023 +0200 winmm/tests: Use nameless unions/structs. --- dlls/winmm/tests/mixer.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-)

1 0