October 2023 - Wine-Commits

Nikolay Sivov : gdi32/tests: Add some tests for SetMiterLimit() argument validation.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: 3f304014952636e6ee78c2f7495ee6fb60604d0b URL: https://gitlab.winehq.org/wine/wine/-/commit/3f304014952636e6ee78c2f7495ee6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 7 18:11:41 2023 +0200 gdi32/tests: Add some tests for SetMiterLimit() argument validation. --- dlls/gdi32/tests/dc.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index e3d29ae9ca9..d8204acfc14 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -38,6 +38,8 @@ static void test_dc_values(void) HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); COLORREF color; int extra, attr; + float limit; + BOOL ret; ok( hdc != NULL, "CreateDC failed\n" ); color = SetBkColor( hdc, 0x12345678 ); @@ -91,6 +93,25 @@ static void test_dc_values(void) ok(!attr, "GetDeviceCaps rets %d\n", attr); ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %lu\n", GetLastError()); + /* Miter limit */ + limit = 123.0f; + ret = GetMiterLimit(hdc, &limit); + ok(ret, "Unexpected return value.\n"); + ok(limit == 10.0f, "Unexpected default miter limit %f.\n", limit); + + limit = 456.0; + ret = SetMiterLimit(hdc, 0.9f, &limit); + todo_wine + ok(!ret, "Unexpected return value.\n"); + todo_wine + ok(limit == 456.0f, "Unexpected default miter limit %f.\n", limit); + + limit = 0.0; + ret = SetMiterLimit(hdc, 1.0f, &limit); + ok(ret, "Unexpected return value.\n"); + todo_wine + ok(limit == 10.0f, "Unexpected default miter limit %f.\n", limit); + DeleteDC( hdc ); }

1 0

Piotr Caban : localspl: Add ResetPrinter implementation.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: b6b8d5f49c06394a5edffa392928a3a577db75ad URL: https://gitlab.winehq.org/wine/wine/-/commit/b6b8d5f49c06394a5edffa392928a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 5 14:56:34 2023 +0200 localspl: Add ResetPrinter implementation. --- dlls/localspl/provider.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 762f61dbf57..26e9c66bea0 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -2472,6 +2472,36 @@ static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMo return FALSE; } +static BOOL WINAPI fpResetPrinter(HANDLE hprinter, PRINTER_DEFAULTSW *def) +{ + printer_t *printer = (printer_t *)hprinter; + + if (!printer || printer->header.type != HANDLE_PRINTER) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!def) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + free(printer->datatype); + if (def->pDatatype) + printer->datatype = wcsdup(def->pDatatype); + else + printer->datatype = NULL; + + free(printer->devmode); + if (def->pDevMode) + printer->devmode = dup_devmode(def->pDevMode); + else + printer->devmode = NULL; + return TRUE; +} + /***************************************************************************** * fpDeletePort [exported through PRINTPROVIDOR] * @@ -4111,7 +4141,7 @@ static const PRINTPROVIDOR backend = { NULL, /* fpPrinterMessageBox */ fpAddMonitor, fpDeleteMonitor, - NULL, /* fpResetPrinter */ + fpResetPrinter, NULL, /* fpGetPrinterDriverEx */ NULL, /* fpFindFirstPrinterChangeNotification */ NULL, /* fpFindClosePrinterChangeNotification */

1 0

Rémi Bernon : dmime: Keep messages with the same time ordered.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: 299698140a7b7ce8e3868d934ab4553eb2219418 URL: https://gitlab.winehq.org/wine/wine/-/commit/299698140a7b7ce8e3868d934ab455… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 21 13:54:32 2023 +0200 dmime: Keep messages with the same time ordered. --- dlls/dmime/performance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 9f293358ca6..a5655f4b2df 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -497,7 +497,7 @@ static HRESULT WINAPI performance_SendPMsg(IDirectMusicPerformance8 *iface, DMUS } LIST_FOR_EACH_ENTRY(next, &This->messages, struct message, entry) - if (next->msg.rtTime >= message->msg.rtTime) break; + if (next->msg.rtTime > message->msg.rtTime) break; list_add_before(&next->entry, &message->entry); PostThreadMessageW(This->procThreadId, PROCESSMSG_ADD, 0, 0);

1 0

Rémi Bernon : dmime: Send DMUS_PMSGT_DIRTY messages from the performance.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: 664caf6ed70a31c0e3f0a71e7523dece921a202c URL: https://gitlab.winehq.org/wine/wine/-/commit/664caf6ed70a31c0e3f0a71e7523de… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 22 18:49:16 2023 +0200 dmime: Send DMUS_PMSGT_DIRTY messages from the performance. --- dlls/dmime/performance.c | 37 ++++++++++++++++++++++-- dlls/dmime/tests/dmime.c | 73 +++++++++++++++++------------------------------- 2 files changed, 61 insertions(+), 49 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 5c3e1f17a97..0215b19a23c 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -204,6 +204,27 @@ static BOOL PostMessageToProcessMsgThread(struct performance *This, UINT iMsg) { return PostThreadMessageA(This->procThreadId, iMsg, 0, 0); } +static HRESULT performance_send_dirty_pmsg(struct performance *This, MUSIC_TIME music_time) +{ + IDirectMusicPerformance8 *performance = &This->IDirectMusicPerformance8_iface; + IDirectMusicGraph *graph = &This->IDirectMusicGraph_iface; + DMUS_PMSG *msg; + HRESULT hr; + + if (FAILED(hr = IDirectMusicPerformance8_AllocPMsg(performance, sizeof(*msg), &msg))) + return hr; + + msg->mtTime = music_time; + msg->dwFlags = DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_QUEUE; + msg->dwType = DMUS_PMSGT_DIRTY; + + if (FAILED(hr = IDirectMusicGraph_StampPMsg(graph, msg)) + || FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, msg))) + IDirectMusicPerformance8_FreePMsg(performance, msg); + + return hr; +} + static int pchannel_block_compare(const void *key, const struct wine_rb_entry *entry) { const struct pchannel_block *b = WINE_RB_ENTRY_VALUE(entry, const struct pchannel_block, entry); @@ -1082,20 +1103,32 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, struct performance *This = impl_from_IDirectMusicPerformance8(iface); IDirectMusicSegmentState *state; IDirectMusicSegment *segment; + MUSIC_TIME length; HRESULT hr; FIXME("(%p, %p, %s, %p, %#lx, %I64d, %p, %p, %p): stub\n", This, source, debugstr_w(segment_name), transition, segment_flags, start_time, segment_state, from, audio_path); + /* NOTE: The time is in music time unless the DMUS_SEGF_REFTIME flag is set. */ + if (segment_flags) FIXME("flags %#lx not implemented\n", segment_flags); + if (start_time) FIXME("start_time %I64d not implemented\n", start_time); + if (FAILED(hr = IUnknown_QueryInterface(source, &IID_IDirectMusicSegment, (void **)&segment))) return hr; - if (FAILED(hr = segment_state_create((IDirectMusicSegment *)segment, start_time, &state))) + if (FAILED(hr = segment_state_create(segment, start_time, &state))) { IDirectMusicSegment_Release(segment); return hr; } - if (segment_state) + hr = IDirectMusicSegment_GetLength(segment, &length); + if (SUCCEEDED(hr)) + hr = performance_send_dirty_pmsg(This, start_time); + + if (SUCCEEDED(hr)) + hr = performance_send_dirty_pmsg(This, start_time + length); + + if (SUCCEEDED(hr) && segment_state) { *segment_state = state; IDirectMusicSegmentState_AddRef(state); diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index c892f25c884..2b7f08eef7a 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3079,22 +3079,16 @@ static void test_notification_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %#lx\n", msg->dwType); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %#lx\n", msg->dwType); hr = IDirectMusicPerformance_FreePMsg(performance, msg); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - } + ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 100, &msg); ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); @@ -3114,22 +3108,22 @@ static void test_notification_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) + ok(!ret, "got %#lx\n", ret); + if (notif->dwType == DMUS_PMSGT_NOTIFICATION) { check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTARTED); + } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) + ok(!ret, "got %#lx\n", ret); + if (notif->dwType == DMUS_PMSGT_NOTIFICATION) { check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART); + } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, &msg); todo_wine ok(!ret, "got %#lx\n", ret); @@ -3251,13 +3245,13 @@ static void test_notification_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) + ok(!ret, "got %#lx\n", ret); + if (notif->dwType == DMUS_PMSGT_NOTIFICATION) { check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART); + } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr); - } hr = IDirectMusicPerformance_CloseDown(performance); ok(hr == S_OK, "got %#lx\n", hr); @@ -3333,22 +3327,16 @@ static void test_wave_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 100, &msg); ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); @@ -3364,17 +3352,14 @@ static void test_wave_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&wave); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) + ok(!ret, "got %#lx\n", ret); + if (wave->dwType == DMUS_PMSGT_WAVE) { ok(wave->dwType == DMUS_PMSGT_WAVE, "got %p\n", wave); ok(!!wave->punkUser, "got %p\n", wave->punkUser); @@ -3384,9 +3369,9 @@ static void test_wave_pmsg(void) ok(wave->lVolume == 0, "got %lu\n", wave->lVolume); ok(wave->lPitch == 0, "got %lu\n", wave->lPitch); ok(wave->bFlags == 0, "got %#x\n", wave->bFlags); + } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)wave); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, &msg); todo_wine ok(!ret, "got %#lx\n", ret); @@ -3555,22 +3540,19 @@ static void test_sequence_track(void) ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %#lx\n", msg->dwType); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&note); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) + ok(!ret, "got %#lx\n", ret); + if (note->dwType == DMUS_PMSGT_NOTE) { check_dmus_note_pmsg(note, 0, 0, 500, 60, 120); + } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)note); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&note); todo_wine ok(!ret, "got %#lx\n", ret); @@ -3821,22 +3803,19 @@ static void test_band_track_play(void) ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %#lx\n", msg->dwType); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&patch); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) + ok(!ret, "got %#lx\n", ret); + if (patch->dwType == DMUS_PMSGT_PATCH) { check_dmus_patch_pmsg(patch, 0, 1, 0, 1); + } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)patch); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&patch); todo_wine ok(!ret, "got %#lx\n", ret);

1 0

Rémi Bernon : dmime: Send DMUS_PMSGT_NOTIFICATION messages from the performance.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: 3de1bc035ede848b5661da7d4ad8af5220a5ae28 URL: https://gitlab.winehq.org/wine/wine/-/commit/3de1bc035ede848b5661da7d4ad8af… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Oct 7 10:48:36 2023 +0200 dmime: Send DMUS_PMSGT_NOTIFICATION messages from the performance. Keeping the segment state referenced until its playback ends. --- dlls/dmime/performance.c | 72 ++++++++++++++++++++++++++++++++++++++++++------ dlls/dmime/tests/dmime.c | 34 ++++------------------- 2 files changed, 69 insertions(+), 37 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 0215b19a23c..40a78bc40ce 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -66,6 +66,9 @@ struct performance IReferenceClock *master_clock; REFERENCE_TIME init_time; struct list messages; + + BOOL notification_performance; + BOOL notification_segment; }; struct message @@ -225,6 +228,32 @@ static HRESULT performance_send_dirty_pmsg(struct performance *This, MUSIC_TIME return hr; } +static HRESULT performance_send_notification_pmsg(struct performance *This, MUSIC_TIME music_time, BOOL stamp, + GUID type, DWORD option, IUnknown *object) +{ + IDirectMusicPerformance8 *performance = &This->IDirectMusicPerformance8_iface; + IDirectMusicGraph *graph = &This->IDirectMusicGraph_iface; + DMUS_NOTIFICATION_PMSG *msg; + HRESULT hr; + + if (FAILED(hr = IDirectMusicPerformance8_AllocPMsg(performance, sizeof(*msg), (DMUS_PMSG **)&msg))) + return hr; + + msg->mtTime = music_time; + msg->dwFlags = DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_QUEUE; + msg->dwType = DMUS_PMSGT_NOTIFICATION; + if ((msg->punkUser = object)) IUnknown_AddRef(object); + msg->guidNotificationType = type; + msg->dwNotificationOption = option; + + /* only stamp the message if notifications are enabled, otherwise send them directly to the output tool */ + if ((stamp && FAILED(hr = IDirectMusicGraph_StampPMsg(graph, (DMUS_PMSG *)msg))) + || FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, (DMUS_PMSG *)msg))) + IDirectMusicPerformance8_FreePMsg(performance, (DMUS_PMSG *)msg); + + return hr; +} + static int pchannel_block_compare(const void *key, const struct wine_rb_entry *entry) { const struct pchannel_block *b = WINE_RB_ENTRY_VALUE(entry, const struct pchannel_block, entry); @@ -703,20 +732,32 @@ static HRESULT WINAPI performance_GetNotificationPMsg(IDirectMusicPerformance8 * /*return S_OK;*/ } -static HRESULT WINAPI performance_AddNotificationType(IDirectMusicPerformance8 *iface, REFGUID rguidNotificationType) +static HRESULT WINAPI performance_AddNotificationType(IDirectMusicPerformance8 *iface, REFGUID type) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; + FIXME("(%p, %s): stub\n", This, debugstr_dmguid(type)); + + if (IsEqualGUID(type, &GUID_NOTIFICATION_PERFORMANCE)) + This->notification_performance = TRUE; + if (IsEqualGUID(type, &GUID_NOTIFICATION_SEGMENT)) + This->notification_segment = TRUE; + + return S_OK; } -static HRESULT WINAPI performance_RemoveNotificationType(IDirectMusicPerformance8 *iface, REFGUID rguidNotificationType) +static HRESULT WINAPI performance_RemoveNotificationType(IDirectMusicPerformance8 *iface, REFGUID type) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; + FIXME("(%p, %s): stub\n", This, debugstr_dmguid(type)); + + if (IsEqualGUID(type, &GUID_NOTIFICATION_PERFORMANCE)) + This->notification_performance = FALSE; + if (IsEqualGUID(type, &GUID_NOTIFICATION_SEGMENT)) + This->notification_segment = FALSE; + + return S_OK; } static HRESULT perf_dmport_create(struct performance *perf, DMUS_PORTPARAMS *params) @@ -1122,11 +1163,26 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, } hr = IDirectMusicSegment_GetLength(segment, &length); + if (SUCCEEDED(hr)) + hr = performance_send_notification_pmsg(This, start_time, This->notification_performance, + GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTARTED, NULL); + if (SUCCEEDED(hr)) + hr = performance_send_notification_pmsg(This, start_time, This->notification_segment, + GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART, (IUnknown *)state); if (SUCCEEDED(hr)) hr = performance_send_dirty_pmsg(This, start_time); + if (SUCCEEDED(hr)) + hr = performance_send_notification_pmsg(This, start_time + length, This->notification_segment, + GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGEND, (IUnknown *)state); + if (SUCCEEDED(hr)) + hr = performance_send_notification_pmsg(This, start_time + length, This->notification_segment, + GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state); if (SUCCEEDED(hr)) hr = performance_send_dirty_pmsg(This, start_time + length); + if (SUCCEEDED(hr)) + hr = performance_send_notification_pmsg(This, start_time + length, This->notification_performance, + GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTOPPED, NULL); if (SUCCEEDED(hr) && segment_state) { diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 2b7f08eef7a..c8c330860a8 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3109,66 +3109,45 @@ static void test_notification_pmsg(void) ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); ok(!ret, "got %#lx\n", ret); - if (notif->dwType == DMUS_PMSGT_NOTIFICATION) - { check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTARTED); - } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); ok(!ret, "got %#lx\n", ret); - if (notif->dwType == DMUS_PMSGT_NOTIFICATION) - { check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART); - } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %#lx\n", msg->dwType); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGEND); hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND); hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %#lx\n", msg->dwType); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTOPPED); hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr); - } ret = test_tool_wait_message(tool, 100, &msg); ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); @@ -3246,10 +3225,7 @@ static void test_notification_pmsg(void) ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); ok(!ret, "got %#lx\n", ret); - if (notif->dwType == DMUS_PMSGT_NOTIFICATION) - { check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART); - } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); ok(hr == S_OK, "got %#lx\n", hr);

1 0

Rémi Bernon : dmime: Call IDirectMusicTrack_(Init|End)Play from the segment state.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: 3e19ca928e8479edce9f9484dc841d08edbdf5f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e19ca928e8479edce9f9484dc841d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 22 17:30:51 2023 +0200 dmime: Call IDirectMusicTrack_(Init|End)Play from the segment state. --- dlls/dmime/dmime_private.h | 4 +- dlls/dmime/performance.c | 21 +++++++++- dlls/dmime/segmentstate.c | 98 +++++++++++++++++++++++++++++++++++++++++++++- dlls/dmime/tests/dmime.c | 14 +++---- 4 files changed, 125 insertions(+), 12 deletions(-)

1 0

Rémi Bernon : dmime/tests: Tests interaction between CloseDown and notifications.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: b201cf1bcaa30cb0019023316607e72e8bd66ad2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b201cf1bcaa30cb0019023316607e7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 6 16:15:08 2023 +0200 dmime/tests: Tests interaction between CloseDown and notifications. --- dlls/dmime/tests/dmime.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 87d938a9015..c892f25c884 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3107,6 +3107,8 @@ static void test_notification_pmsg(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_AddNotificationType(performance, &GUID_NOTIFICATION_SEGMENT); ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicPerformance_AddNotificationType(performance, &GUID_NOTIFICATION_SEGMENT); + todo_wine ok(hr == S_FALSE, "got %#lx\n", hr); hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, NULL); ok(hr == S_OK, "got %#lx\n", hr); @@ -3178,8 +3180,6 @@ static void test_notification_pmsg(void) ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); ok(!msg, "got %p\n", msg); - IDirectMusicSegment_Release(segment); - hr = IDirectMusicPerformance_RemoveNotificationType(performance, &GUID_NOTIFICATION_PERFORMANCE); ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_RemoveNotificationType(performance, &GUID_NOTIFICATION_SEGMENT); @@ -3237,8 +3237,34 @@ static void test_notification_pmsg(void) ok(hr == S_FALSE, "got %#lx\n", hr); + /* RemoveNotificationType returns S_FALSE if already removed */ + + hr = IDirectMusicPerformance_RemoveNotificationType(performance, &GUID_NOTIFICATION_PERFORMANCE); + todo_wine ok(hr == S_FALSE, "got %#lx\n", hr); + + + /* CloseDown removes all notifications and notification messages */ + + hr = IDirectMusicPerformance_AddNotificationType(performance, &GUID_NOTIFICATION_SEGMENT); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&notif); + todo_wine ok(!ret, "got %#lx\n", ret); + if (!ret) + { + check_dmus_notification_pmsg(notif, &GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART); + hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)notif); + ok(hr == S_OK, "got %#lx\n", hr); + } + hr = IDirectMusicPerformance_CloseDown(performance); ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicPerformance_RemoveNotificationType(performance, &GUID_NOTIFICATION_SEGMENT); + todo_wine ok(hr == S_FALSE, "got %#lx\n", hr); + IDirectMusicSegment_Release(segment); + IDirectMusicPerformance_Release(performance); IDirectMusicTool_Release(tool);

1 0

Rémi Bernon : dmime: Free all pending messages after CloseDown.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: ac832b97aeb639d178fdea4986a83c7f935fd9b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac832b97aeb639d178fdea4986a83c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 6 15:28:05 2023 +0200 dmime: Free all pending messages after CloseDown. --- dlls/dmime/performance.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a5655f4b2df..5c3e1f17a97 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -948,6 +948,8 @@ static HRESULT WINAPI performance_AdjustTime(IDirectMusicPerformance8 *iface, RE static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface) { struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct message *message, *next; + HRESULT hr; FIXME("(%p): semi-stub\n", This); @@ -956,6 +958,16 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface) This->procThreadTicStarted = FALSE; CloseHandle(This->procThread); } + + LIST_FOR_EACH_ENTRY_SAFE(message, next, &This->messages, struct message, entry) + { + list_remove(&message->entry); + list_init(&message->entry); + + if (FAILED(hr = IDirectMusicPerformance8_FreePMsg(iface, &message->msg))) + WARN("Failed to free message %p, hr %#lx\n", message, hr); + } + if (This->master_clock) { IReferenceClock_Release(This->master_clock);

1 0

Rémi Bernon : dmime: Implement IDirectMusicPerformance_GetNotificationPMsg.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: 7a678903fbe9b384e97b23bc8cb73c9239616054 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a678903fbe9b384e97b23bc8cb73c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 6 15:55:13 2023 +0200 dmime: Implement IDirectMusicPerformance_GetNotificationPMsg. --- dlls/dmime/performance.c | 108 +++++++++++++++++++++++++++++++++++++---------- dlls/dmime/tests/dmime.c | 31 ++++---------- 2 files changed, 93 insertions(+), 46 deletions(-)

1 0

Daniel Lehman : advapi32/tests: Add ReadEventLogA tests for EventlogStarted.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: d2a606bc92fa919e078665c7546e07a7fe6ee544 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2a606bc92fa919e078665c7546e07… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Oct 2 23:39:16 2023 -0700 advapi32/tests: Add ReadEventLogA tests for EventlogStarted. --- dlls/advapi32/tests/eventlog.c | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 57ead1078f5..e2334c692e5 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -1324,7 +1324,9 @@ static void test_eventlog_start(void) EVENTLOGRECORD *record; DWORD size, read, needed; WCHAR *sourcename, *computername, *localcomputer; + char *sourcenameA, *computernameA, *localcomputerA; + /* ReadEventLogW */ size = MAX_COMPUTERNAME_LENGTH + 1; localcomputer = malloc(size * sizeof(WCHAR)); GetComputerNameW(localcomputer, &size); @@ -1392,6 +1394,70 @@ static void test_eventlog_start(void) todo_wine ok(found, "EventlogStarted event not found\n"); CloseEventLog(handle); free(localcomputer); + + /* ReadEventLogA */ + size = MAX_COMPUTERNAME_LENGTH + 1; + localcomputerA = malloc(size); + GetComputerNameA(localcomputerA, &size); + + handle = OpenEventLogA(0, "System"); + handle2 = OpenEventLogA(0, "SYSTEM"); + todo_wine ok(handle != handle2, "Expected different handle\n"); + CloseEventLog(handle2); + + ret = TRUE; + found = FALSE; + while (!found && ret) + { + read = needed = 0; + record = malloc(sizeof(EVENTLOGRECORD)); + if (!(ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_BACKWARDS_READ, + 0, record, sizeof(EVENTLOGRECORD), &read, &needed)) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + record = realloc(record, needed); + ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_BACKWARDS_READ, + 0, record, needed, &read, &needed); + ok(needed == 0, "Expected 0, got %ld\n", needed); + } + if (ret && record->EventID == EVENT_EventlogStarted) + { + ok(record->Length == read, "Expected %ld, got %ld\n", read, record->Length); + ok(record->Reserved == 0x654c664c, "Expected 0x654c664c, got %ld\n", record->Reserved); + ok(record->RecordNumber > 0, "Expected 1 or higher, got %ld\n", record->RecordNumber); + ok(record->TimeGenerated == record->TimeWritten, "Expected time values to be the same\n"); + ok(record->EventType == EVENTLOG_INFORMATION_TYPE, + "Expected %d, got %d\n", EVENTLOG_INFORMATION_TYPE, record->EventType); + ok(record->NumStrings == 0, "Expected 0, got %d\n", record->NumStrings); + ok(record->EventCategory == 0, "Expected 0, got %d\n", record->EventCategory); + ok(record->ReservedFlags == 0, "Expected 0, got %d\n", record->ReservedFlags); + ok(record->ClosingRecordNumber == 0, "Expected 0, got %ld\n", record->ClosingRecordNumber); + ok(record->StringOffset == record->UserSidOffset, "Expected offsets to be the same\n"); + ok(record->UserSidLength == 0, "Expected 0, got %ld\n", record->UserSidLength); + ok(record->DataLength == 24, "Expected 24, got %ld\n", record->DataLength); + ok(record->DataOffset == record->UserSidOffset, "Expected offsets to be the same\n"); + + sourcenameA = (char *)(record + 1); + ok(!strcmp(sourcenameA, "EventLog"), + "Expected 'EventLog', got '%s'\n", sourcenameA); + + computernameA = sourcenameA + sizeof("EventLog"); + ok(!_stricmp(computernameA, localcomputerA), "Expected '%s', got '%s'\n", + localcomputerA, computernameA); + + size = sizeof(EVENTLOGRECORD) + sizeof("EventLog") + strlen(computernameA) + 1; + size = (size + 7) & ~7; + ok(record->DataOffset == size || + broken(record->DataOffset == size - 1), /* win8 */ + "Expected %ld, got %ld\n", size, record->DataOffset); + + found = TRUE; + } + free(record); + } + todo_wine ok(found, "EventlogStarted event not found\n"); + CloseEventLog(handle); + free(localcomputerA); } START_TEST(eventlog)

1 0