From: Rémi Bernon rbernon@codeweavers.com
--- dlls/dmime/performance.c | 6 +++--- dlls/dmime/tests/dmime.c | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 3fc5df80b58..83c2401c083 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1237,11 +1237,11 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, hr = segment_state_play(state, iface);
if (SUCCEEDED(hr)) - hr = performance_send_notification_pmsg(This, music_time + length, This->notification_segment, - GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGEND, (IUnknown *)state); + hr = performance_send_notification_pmsg(This, music_time + length - 1450, This->notification_segment, + GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state); if (SUCCEEDED(hr)) hr = performance_send_notification_pmsg(This, music_time + length, This->notification_segment, - GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state); + GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGEND, (IUnknown *)state); if (SUCCEEDED(hr)) hr = performance_send_pmsg(This, music_time + length, DMUS_PMSGF_TOOL_IMMEDIATE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 35a6fbc98f4..dc9e98aab0f 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3019,8 +3019,6 @@ static void check_dmus_notification_pmsg_(int line, DMUS_NOTIFICATION_PMSG *msg, "got dwType %#lx\n", msg->dwType); ok_(__FILE__, line)(IsEqualGUID(&msg->guidNotificationType, type), "got guidNotificationType %s\n", debugstr_guid(&msg->guidNotificationType)); - todo_wine_if(IsEqualGUID(type, &GUID_NOTIFICATION_SEGMENT) && - (option == DMUS_NOTIFICATION_SEGALMOSTEND || option == DMUS_NOTIFICATION_SEGEND)) ok_(__FILE__, line)(msg->dwNotificationOption == option, "got dwNotificationOption %#lx\n", msg->dwNotificationOption); ok_(__FILE__, line)(!msg->dwField1, "got dwField1 %lu\n", msg->dwField1);