- Wine-Commits - list.winehq.org

Rémi Bernon : dmime: Support playing secondary and control segments.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 29940435fa8ad3f99de73e354823f0c699ee6db5 URL: https://gitlab.winehq.org/wine/wine/-/commit/29940435fa8ad3f99de73e354823f0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 13:21:14 2023 +0200 dmime: Support playing secondary and control segments. --- dlls/dmime/performance.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 17fbe772f5b..06d541efb7e 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -78,6 +78,7 @@ struct performance BOOL notification_segment; IDirectMusicSegment *primary_segment; + IDirectMusicSegment *control_segment; }; struct message @@ -346,6 +347,12 @@ static void performance_set_primary_segment(struct performance *This, IDirectMus if ((This->primary_segment = segment)) IDirectMusicSegment_AddRef(This->primary_segment); } +static void performance_set_control_segment(struct performance *This, IDirectMusicSegment *segment) +{ + if (This->control_segment) IDirectMusicSegment_Release(This->control_segment); + if ((This->control_segment = segment)) IDirectMusicSegment_AddRef(This->control_segment); +} + /* IDirectMusicPerformance8 IUnknown part: */ static HRESULT WINAPI performance_QueryInterface(IDirectMusicPerformance8 *iface, REFIID riid, void **ret_iface) { @@ -1221,6 +1228,7 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface) } performance_set_primary_segment(This, NULL); + performance_set_control_segment(This, NULL); if (This->master_clock) { @@ -1333,6 +1341,7 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, WCHAR *segment_name, IUnknown *transition, DWORD segment_flags, INT64 start_time, IDirectMusicSegmentState **segment_state, IUnknown *from, IUnknown *audio_path) { + BOOL primary = !(segment_flags & DMUS_SEGF_SECONDARY), control = (segment_flags & DMUS_SEGF_CONTROL); struct performance *This = impl_from_IDirectMusicPerformance8(iface); IDirectMusicSegmentState *state; IDirectMusicSegment *segment; @@ -1351,12 +1360,14 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, EnterCriticalSection(&This->safe); - performance_set_primary_segment(This, segment); + if (primary) performance_set_primary_segment(This, segment); + if (control) performance_set_control_segment(This, segment); if ((!(music_time = start_time) && FAILED(hr = IDirectMusicPerformance8_GetTime(iface, NULL, &music_time))) || FAILED(hr = segment_state_create(segment, music_time, iface, &state))) { - performance_set_primary_segment(This, NULL); + if (primary) performance_set_primary_segment(This, NULL); + if (control) performance_set_control_segment(This, NULL); LeaveCriticalSection(&This->safe); IDirectMusicSegment_Release(segment); @@ -1366,7 +1377,8 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, if (FAILED(hr = segment_state_play(state, iface))) { ERR("Failed to play segment state, hr %#lx\n", hr); - performance_set_primary_segment(This, NULL); + if (primary) performance_set_primary_segment(This, NULL); + if (control) performance_set_control_segment(This, NULL); } else if (segment_state) {

1 0

Jacek Caban : msvcrt/tests: Don't define structs types inside other struct declaration.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 2e02cee9c43c9a2e44547a926443ecf0e7bf88bb URL: https://gitlab.winehq.org/wine/wine/-/commit/2e02cee9c43c9a2e44547a926443ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 8 19:45:56 2023 +0100 msvcrt/tests: Don't define structs types inside other struct declaration. Fixes -Wincompatible-pointer-types clang warnings. --- dlls/msvcrt/tests/cpp.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index e5fa652ede2..2dec315ba68 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -891,33 +891,36 @@ static void test_rtti(void) DEFINE_RTTI_REF(void, object_locator); } *obj_locator; + struct _rtti_base_descriptor + { + DEFINE_RTTI_REF(type_info, type_descriptor); + int num_base_classes; + struct { + int this_offset; + int vbase_descr; + int vbase_offset; + } this_ptr_offsets; + unsigned int attributes; + }; + + struct _rtti_base_array { + DEFINE_RTTI_REF(struct _rtti_base_descriptor, bases[4]); + }; + + struct _rtti_object_hierarchy { + unsigned int signature; + unsigned int attributes; + int array_len; + DEFINE_RTTI_REF(struct _rtti_base_array, base_classes); + }; + struct rtti_data { type_info type_info[4]; - struct _rtti_base_descriptor - { - DEFINE_RTTI_REF(type_info, type_descriptor); - int num_base_classes; - struct { - int this_offset; - int vbase_descr; - int vbase_offset; - } this_ptr_offsets; - unsigned int attributes; - } base_descriptor[4]; - - struct _rtti_base_array { - DEFINE_RTTI_REF(struct _rtti_base_descriptor, bases[4]); - } base_array; - - struct _rtti_object_hierarchy { - unsigned int signature; - unsigned int attributes; - int array_len; - DEFINE_RTTI_REF(struct _rtti_base_array, base_classes); - } object_hierarchy; - + struct _rtti_base_descriptor base_descriptor[4]; + struct _rtti_base_array base_array; + struct _rtti_object_hierarchy object_hierarchy; struct _object_locator object_locator; } simple_class_rtti = { { {NULL, NULL, "simple_class"} },

1 0

Jacek Caban : msvcp60: Use char type for FROZEN macro.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 38d1002cec5319c890501c95abd66a41d5d82955 URL: https://gitlab.winehq.org/wine/wine/-/commit/38d1002cec5319c890501c95abd66a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 9 10:09:20 2023 +0100 msvcp60: Use char type for FROZEN macro. Fixes clang warning: string.c:370:25: warning: implicit conversion from 'int' to 'char' changes value from 255 to -1 [-Wconstant-conversion] --- dlls/msvcp60/string.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 45b7a57f961..253b13b7dbe 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -27,7 +27,8 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); -#define FROZEN 255 +#define FROZEN '\xff' +#define FROZENW L'\xff' /* _String_iterator<char> and _String_const_iterator<char> class */ typedef struct { @@ -282,7 +283,7 @@ void __thiscall basic_string_char__Tidy(basic_string_char *this, bool built) TRACE("(%p %d)\n", this, built); if(!built || !this->ptr); - else if(!this->ptr[-1] || (unsigned char)this->ptr[-1]==FROZEN) + else if(!this->ptr[-1] || this->ptr[-1]==FROZEN) MSVCP_allocator_char_deallocate(NULL, this->ptr-1, this->res+2); else this->ptr[-1]--; @@ -301,7 +302,7 @@ bool __thiscall basic_string_char__Grow(basic_string_char *this, size_t new_size else if(this->ptr) basic_string_char__Eos(this, 0); } else if(this->res<new_size || trim || - (this->ptr && this->ptr[-1] && (unsigned char)this->ptr[-1]!=FROZEN)) { + (this->ptr && this->ptr[-1] && this->ptr[-1]!=FROZEN)) { size_t new_res = new_size, len = this->size; char *ptr; @@ -346,7 +347,7 @@ void __thiscall basic_string_char__Split(basic_string_char *this) TRACE("(%p)\n", this); - if(!this->ptr || !this->ptr[-1] || (unsigned char)this->ptr[-1]==FROZEN) + if(!this->ptr || !this->ptr[-1] || this->ptr[-1]==FROZEN) return; ptr = this->ptr; @@ -1814,7 +1815,7 @@ void __thiscall basic_string_wchar__Tidy(basic_string_wchar *this, bool built) TRACE("(%p %d)\n", this, built); if(!built || !this->ptr); - else if(!this->ptr[-1] || (unsigned short)this->ptr[-1]==FROZEN) + else if(!this->ptr[-1] || this->ptr[-1]==FROZENW) MSVCP_allocator_wchar_deallocate(NULL, this->ptr-1, this->res+2); else this->ptr[-1]--; @@ -1833,7 +1834,7 @@ bool __thiscall basic_string_wchar__Grow(basic_string_wchar *this, size_t new_si else if(this->ptr) basic_string_wchar__Eos(this, 0); } else if(this->res<new_size || trim || - (this->ptr && this->ptr[-1] && (unsigned short)this->ptr[-1]!=FROZEN)) { + (this->ptr && this->ptr[-1] && this->ptr[-1]!=FROZENW)) { size_t new_res = new_size, len = this->size; wchar_t *ptr; @@ -1878,7 +1879,7 @@ void __thiscall basic_string_wchar__Split(basic_string_wchar *this) TRACE("(%p)\n", this); - if(!this->ptr || !this->ptr[-1] || (unsigned short)this->ptr[-1]==FROZEN) + if(!this->ptr || !this->ptr[-1] || this->ptr[-1]==FROZENW) return; ptr = this->ptr; @@ -1899,7 +1900,7 @@ void __thiscall basic_string_wchar__Freeze(basic_string_wchar *this) TRACE("(%p)\n", this); basic_string_wchar__Split(this); if(this->ptr) - this->ptr[-1] = FROZEN; + this->ptr[-1] = FROZENW; } /* ?_Copy@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AAEXI(a)Z */

1 0

Jacek Caban : kernel32/tests: Remove unused variable.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: f7cf428f9f9dad7866c0ddca5459adffc1631cf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7cf428f9f9dad7866c0ddca5459ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 9 10:40:40 2023 +0100 kernel32/tests: Remove unused variable. --- dlls/kernel32/tests/toolhelp.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index 70ca23c4b20..7fdf597d3a6 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -316,7 +316,6 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) HANDLE hSnapshot; THREADENTRY32 te; MODULEENTRY32 me; - int num = 0; unsigned curr_found = 0; unsigned sub_found = 0; @@ -333,7 +332,6 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) if (te.th32OwnerProcessID == sub_pcs_pid) sub_found++; if (winetest_debug > 1) trace("PID=%lx TID=%lx %ld\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri); - num++; } while (pThread32Next( hSnapshot, &te )); } ok(curr_found, "couldn't find self in thread list\n"); @@ -350,7 +348,6 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) if (te.th32OwnerProcessID == sub_pcs_pid) sub_found++; if (winetest_debug > 1) trace("PID=%lx TID=%lx %ld\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri); - num--; } while (pThread32Next( hSnapshot, &te )); } ok(curr_found, "couldn't find self in thread list\n");

1 0

Rémi Bernon : dmime: Better implement performance times with tempo track.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 18a81b3cb2fbf9a14a69ac30809f9265e274ab3a URL: https://gitlab.winehq.org/wine/wine/-/commit/18a81b3cb2fbf9a14a69ac30809f92… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 15:25:40 2023 +0200 dmime: Better implement performance times with tempo track. --- dlls/dmime/performance.c | 85 ++++++++++++++++++++++++++++++++++++++---------- dlls/dmime/tests/dmime.c | 18 +++++----- 2 files changed, 77 insertions(+), 26 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 06d541efb7e..94d7d8aeea3 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -21,6 +21,7 @@ #include "dmime_private.h" #include "dmusic_midi.h" #include "wine/rbtree.h" +#include <math.h> WINE_DEFAULT_DEBUG_CHANNEL(dmime); @@ -677,20 +678,39 @@ done: static HRESULT WINAPI performance_MusicToReferenceTime(IDirectMusicPerformance8 *iface, MUSIC_TIME music_time, REFERENCE_TIME *time) { - static int once; struct performance *This = impl_from_IDirectMusicPerformance8(iface); + MUSIC_TIME tempo_time, next = 0; + DMUS_TEMPO_PARAM param; + double tempo, duration; + HRESULT hr; - if (!once++) FIXME("(%p, %ld, %p): semi-stub\n", This, music_time, time); - else TRACE("(%p, %ld, %p)\n", This, music_time, time); + TRACE("(%p, %ld, %p)\n", This, music_time, time); if (!time) return E_POINTER; *time = 0; if (!This->master_clock) return DMUS_E_NO_MASTER_CLOCK; - /* FIXME: This should be (music_time * 60) / (DMUS_PPQ * tempo) - * but it gives innacurate results */ - *time = This->init_time + (music_time * 6510); + EnterCriticalSection(&This->safe); + + for (tempo = 120.0, duration = tempo_time = 0; music_time > 0; tempo_time += next) + { + if (FAILED(hr = IDirectMusicPerformance_GetParam(iface, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, + tempo_time, &next, &param))) + break; + + if (!next) next = music_time; + else next = min(next, music_time); + + if (param.mtTime <= 0) tempo = param.dblTempo; + duration += (600000000.0 * next) / (tempo * DMUS_PPQ); + music_time -= next; + } + + duration += (600000000.0 * music_time) / (tempo * DMUS_PPQ); + *time = This->init_time + duration; + + LeaveCriticalSection(&This->safe); return S_OK; } @@ -698,20 +718,38 @@ static HRESULT WINAPI performance_MusicToReferenceTime(IDirectMusicPerformance8 static HRESULT WINAPI performance_ReferenceToMusicTime(IDirectMusicPerformance8 *iface, REFERENCE_TIME time, MUSIC_TIME *music_time) { - static int once; struct performance *This = impl_from_IDirectMusicPerformance8(iface); + MUSIC_TIME tempo_time, next = 0; + double tempo, duration, step; + DMUS_TEMPO_PARAM param; + HRESULT hr; - if (!once++) FIXME("(%p, %I64d, %p): semi-stub\n", This, time, music_time); - else TRACE("(%p, %I64d, %p)\n", This, time, music_time); + TRACE("(%p, %I64d, %p)\n", This, time, music_time); if (!music_time) return E_POINTER; *music_time = 0; if (!This->master_clock) return DMUS_E_NO_MASTER_CLOCK; - /* FIXME: This should be (time * DMUS_PPQ * tempo) / 60 - * but it gives innacurate results */ - *music_time = (time - This->init_time) / 6510; + EnterCriticalSection(&This->safe); + + duration = time - This->init_time; + + for (tempo = 120.0, tempo_time = 0; duration > 0; tempo_time += next, duration -= step) + { + if (FAILED(hr = IDirectMusicPerformance_GetParam(iface, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, + tempo_time, &next, &param))) + break; + + if (param.mtTime <= 0) tempo = param.dblTempo; + step = (600000000.0 * next) / (tempo * DMUS_PPQ); + if (!next || duration < step) break; + *music_time = *music_time + next; + } + + *music_time = *music_time + round((duration * tempo * DMUS_PPQ) / 600000000.0); + + LeaveCriticalSection(&This->safe); return S_OK; } @@ -1085,13 +1123,26 @@ static HRESULT WINAPI performance_Invalidate(IDirectMusicPerformance8 *iface, MU return S_OK; } -static HRESULT WINAPI performance_GetParam(IDirectMusicPerformance8 *iface, REFGUID rguidType, - DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI performance_GetParam(IDirectMusicPerformance8 *iface, REFGUID type, + DWORD group, DWORD index, MUSIC_TIME music_time, MUSIC_TIME *next_time, void *param) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); + HRESULT hr; - FIXME("(%p, %s, %ld, %ld, %ld, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam); - return S_OK; + TRACE("(%p, %s, %ld, %ld, %ld, %p, %p)\n", This, debugstr_dmguid(type), group, index, music_time, next_time, param); + + if (next_time) *next_time = 0; + + if (!This->control_segment) hr = DMUS_E_NOT_FOUND; + else hr = IDirectMusicSegment_GetParam(This->control_segment, type, group, index, music_time, next_time, param); + + if (FAILED(hr)) + { + if (!This->primary_segment) hr = DMUS_E_NOT_FOUND; + else hr = IDirectMusicSegment_GetParam(This->primary_segment, type, group, index, music_time, next_time, param); + } + + return hr; } static HRESULT WINAPI performance_SetParam(IDirectMusicPerformance8 *iface, REFGUID rguidType, diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index a0c298fe994..7613b82c893 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -2735,11 +2735,11 @@ static void test_performance_time(void) time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 1000, &time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine check_music_time(time - init_time, scale_music_time(1000, 120)); + check_music_time(time - init_time, scale_music_time(1000, 120)); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 2000, &time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine check_music_time(time - init_time, scale_music_time(2000, 120)); + check_music_time(time - init_time, scale_music_time(2000, 120)); music_time = 0xdeadbeef; hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time, &music_time); @@ -4098,19 +4098,19 @@ static void test_tempo_track_play(void) time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 100, &time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine check_music_time(time - init_time, scale_music_time(100, 120)); + check_music_time(time - init_time, scale_music_time(100, 120)); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 150, &time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine check_music_time(time - init_time, scale_music_time(100, 120) + scale_music_time(50, 80)); + check_music_time(time - init_time, scale_music_time(100, 120) + scale_music_time(50, 80)); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 200, &time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine check_music_time(time - init_time, scale_music_time(100, 120) + scale_music_time(100, 80)); + check_music_time(time - init_time, scale_music_time(100, 120) + scale_music_time(100, 80)); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 400, &time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine check_music_time(time - init_time, scale_music_time(100, 120) + scale_music_time(200, 80) + scale_music_time(100, 20)); + check_music_time(time - init_time, scale_music_time(100, 120) + scale_music_time(200, 80) + scale_music_time(100, 20)); music_time = 0xdeadbeef; hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time, &music_time); @@ -4120,15 +4120,15 @@ static void test_tempo_track_play(void) time = scale_music_time(100, 120) + scale_music_time(50, 80); hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time + time, &music_time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(music_time == 150, "got %ld\n", music_time); + ok(music_time == 150, "got %ld\n", music_time); music_time = 0xdeadbeef; time = scale_music_time(100, 120) + scale_music_time(200, 80) + scale_music_time(100, 20); hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time + time, &music_time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(music_time == 400, "got %ld\n", music_time); + ok(music_time == 400, "got %ld\n", music_time); - ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&tempo); + ret = test_tool_wait_message(tool, 2000, (DMUS_PMSG **)&tempo); ok(!ret, "got %#lx\n", ret); todo_wine ok(tempo->dwType == DMUS_PMSGT_TEMPO, "got %#lx\n", tempo->dwType); if (tempo->dwType != DMUS_PMSGT_TEMPO) goto skip_tests;

1 0

Zhiyi Zhang : uxtheme: Fix a test failure.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: eb8eccbed424d2c0bb60543fcf3dea603e2741e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb8eccbed424d2c0bb60543fcf3dea… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 9 20:54:04 2023 +0800 uxtheme: Fix a test failure. pszAppName should not be changed as it's used in the loop to check if window application name is set. --- dlls/uxtheme/msstyles.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 4fc9a344661..76d2f760b58 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -1075,14 +1075,12 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U start = end+1; parse_app_class_name(buf, szAppName, szClassName); - if (szAppName[0]) - { - /* If the application class is already set then fail */ - if (pszAppName) return NULL; - pszAppName = szAppName; - } - cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); + /* If the window application name is set then fail */ + if (szAppName[0] && pszAppName) + return NULL; + + cls = MSSTYLES_FindClass(tfActiveTheme, szAppName[0] ? szAppName : pszAppName, szClassName); /* Fall back to default class if the specified subclass is not found */ if (!cls) cls = MSSTYLES_FindClass(tfActiveTheme, NULL, szClassName); @@ -1090,14 +1088,12 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U } if(!cls && *start) { parse_app_class_name(start, szAppName, szClassName); - if (szAppName[0]) - { - /* If the application class is already set then fail */ - if (pszAppName) return NULL; - pszAppName = szAppName; - } - cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); + /* If the window application name is set then fail */ + if (szAppName[0] && pszAppName) + return NULL; + + cls = MSSTYLES_FindClass(tfActiveTheme, szAppName[0] ? szAppName : pszAppName, szClassName); /* Fall back to default class if the specified subclass is not found */ if (!cls) cls = MSSTYLES_FindClass(tfActiveTheme, NULL, szClassName); }

1 0

Rémi Bernon : dmime: Implement IDirectMusicPerformance_GetSegmentState semi-stub.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: f13fa16f01d919d6fd10ef5acfe3887bbf99e2ad URL: https://gitlab.winehq.org/wine/wine/-/commit/f13fa16f01d919d6fd10ef5acfe388… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 24 23:27:57 2023 +0200 dmime: Implement IDirectMusicPerformance_GetSegmentState semi-stub. --- dlls/dmime/dmime_private.h | 1 + dlls/dmime/performance.c | 91 +++++++++++++++++++++++++++++++++++++++++++--- dlls/dmime/segmentstate.c | 6 +++ dlls/dmime/tests/dmime.c | 12 +++--- 4 files changed, 98 insertions(+), 12 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index e1a2374facf..3c7fc1e332b 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -77,6 +77,7 @@ extern HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME sta extern HRESULT segment_state_play(IDirectMusicSegmentState *iface, IDirectMusicPerformance8 *performance); extern HRESULT segment_state_tick(IDirectMusicSegmentState *iface, IDirectMusicPerformance8 *performance); extern HRESULT segment_state_end_play(IDirectMusicSegmentState *iface, IDirectMusicPerformance8 *performance); +extern BOOL segment_state_has_segment(IDirectMusicSegmentState *iface, IDirectMusicSegment *segment); extern HRESULT wave_track_create_from_chunk(IStream *stream, struct chunk_entry *parent, IDirectMusicTrack8 **ret_iface); diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a08c00502d9..17fbe772f5b 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -76,6 +76,8 @@ struct performance HANDLE notification_event; BOOL notification_performance; BOOL notification_segment; + + IDirectMusicSegment *primary_segment; }; struct message @@ -338,6 +340,12 @@ HRESULT performance_send_segment_end(IDirectMusicPerformance8 *iface, MUSIC_TIME return S_OK; } +static void performance_set_primary_segment(struct performance *This, IDirectMusicSegment *segment) +{ + if (This->primary_segment) IDirectMusicSegment_Release(This->primary_segment); + if ((This->primary_segment = segment)) IDirectMusicSegment_AddRef(This->primary_segment); +} + /* IDirectMusicPerformance8 IUnknown part: */ static HRESULT WINAPI performance_QueryInterface(IDirectMusicPerformance8 *iface, REFIID riid, void **ret_iface) { @@ -487,6 +495,42 @@ static HRESULT WINAPI performance_PlaySegment(IDirectMusicPerformance8 *iface, I segment_flags, start_time, ret_state, NULL, NULL); } +struct state_entry +{ + struct list entry; + IDirectMusicSegmentState *state; +}; + +static void state_entry_destroy(struct state_entry *entry) +{ + list_remove(&entry->entry); + IDirectMusicSegmentState_Release(entry->state); + free(entry); +} + +static void enum_segment_states(struct performance *This, IDirectMusicSegment *segment, struct list *list) +{ + struct state_entry *entry; + struct message *message; + + LIST_FOR_EACH_ENTRY(message, &This->messages, struct message, entry) + { + IDirectMusicSegmentState *message_state; + + if (message->msg.dwType != DMUS_PMSGT_INTERNAL_SEGMENT_TICK + && message->msg.dwType != DMUS_PMSGT_INTERNAL_SEGMENT_END) + continue; + + message_state = (IDirectMusicSegmentState *)message->msg.punkUser; + if (segment && !segment_state_has_segment(message_state, segment)) continue; + + if (!(entry = malloc(sizeof(*entry)))) return; + entry->state = message_state; + IDirectMusicSegmentState_AddRef(entry->state); + list_add_tail(list, &entry->entry); + } +} + static HRESULT WINAPI performance_Stop(IDirectMusicPerformance8 *iface, IDirectMusicSegment *pSegment, IDirectMusicSegmentState *pSegmentState, MUSIC_TIME mtTime, DWORD dwFlags) { @@ -497,12 +541,36 @@ static HRESULT WINAPI performance_Stop(IDirectMusicPerformance8 *iface, IDirectM } static HRESULT WINAPI performance_GetSegmentState(IDirectMusicPerformance8 *iface, - IDirectMusicSegmentState **ppSegmentState, MUSIC_TIME mtTime) + IDirectMusicSegmentState **state, MUSIC_TIME time) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct list *ptr, states = LIST_INIT(states); + struct state_entry *entry, *next; + HRESULT hr = S_OK; - FIXME("(%p,%p, %ld): stub\n", This, ppSegmentState, mtTime); - return S_OK; + TRACE("(%p, %p, %ld)\n", This, state, time); + + if (!state) return E_POINTER; + + EnterCriticalSection(&This->safe); + + enum_segment_states(This, This->primary_segment, &states); + + if (!(ptr = list_head(&states))) hr = DMUS_E_NOT_FOUND; + else + { + entry = LIST_ENTRY(ptr, struct state_entry, entry); + + *state = entry->state; + IDirectMusicSegmentState_AddRef(entry->state); + + LIST_FOR_EACH_ENTRY_SAFE(entry, next, &states, struct state_entry, entry) + state_entry_destroy(entry); + } + + LeaveCriticalSection(&This->safe); + + return hr; } static HRESULT WINAPI performance_SetPrepareTime(IDirectMusicPerformance8 *iface, DWORD dwMilliSeconds) @@ -1152,6 +1220,8 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface) WARN("Failed to free message %p, hr %#lx\n", message, hr); } + performance_set_primary_segment(This, NULL); + if (This->master_clock) { IReferenceClock_Release(This->master_clock); @@ -1278,17 +1348,26 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, if (FAILED(hr = IUnknown_QueryInterface(source, &IID_IDirectMusicSegment, (void **)&segment))) return hr; + + EnterCriticalSection(&This->safe); + + performance_set_primary_segment(This, segment); + if ((!(music_time = start_time) && FAILED(hr = IDirectMusicPerformance8_GetTime(iface, NULL, &music_time))) || FAILED(hr = segment_state_create(segment, music_time, iface, &state))) { + performance_set_primary_segment(This, NULL); + LeaveCriticalSection(&This->safe); + IDirectMusicSegment_Release(segment); return hr; } - EnterCriticalSection(&This->safe); - if (FAILED(hr = segment_state_play(state, iface))) + { ERR("Failed to play segment state, hr %#lx\n", hr); + performance_set_primary_segment(This, NULL); + } else if (segment_state) { *segment_state = state; diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index f2f895de881..3e13687254e 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -363,3 +363,9 @@ HRESULT segment_state_end_play(IDirectMusicSegmentState *iface, IDirectMusicPerf return S_OK; } + +BOOL segment_state_has_segment(IDirectMusicSegmentState *iface, IDirectMusicSegment *segment) +{ + struct segment_state *This = impl_from_IDirectMusicSegmentState8((IDirectMusicSegmentState8 *)iface); + return !segment || This->segment == segment; +} diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index b15c3a1ac37..7d2dd912237 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4054,9 +4054,9 @@ static void test_segment_state(void) check_track_state(track, playing, FALSE); hr = IDirectMusicPerformance_GetSegmentState(performance, NULL, 0); - todo_wine ok(hr == E_POINTER, "got %#lx\n", hr); + ok(hr == E_POINTER, "got %#lx\n", hr); hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 0); - todo_wine ok(hr == DMUS_E_NOT_FOUND, "got %#lx\n", hr); + ok(hr == DMUS_E_NOT_FOUND, "got %#lx\n", hr); tmp_state = state; @@ -4071,14 +4071,14 @@ static void test_segment_state(void) tmp_state = (void *)0xdeadbeef; hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 0); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(state == tmp_state, "got %p\n", state); - if (tmp_state != (void *)0xdeadbeef) IDirectMusicSegmentState_Release(tmp_state); + ok(state == tmp_state, "got %p\n", state); + IDirectMusicSegmentState_Release(tmp_state); tmp_state = (void *)0xdeadbeef; hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 69); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(state == tmp_state, "got %p\n", state); - if (tmp_state != (void *)0xdeadbeef) IDirectMusicSegmentState_Release(tmp_state); + ok(state == tmp_state, "got %p\n", state); + IDirectMusicSegmentState_Release(tmp_state); hr = IDirectMusicPerformance_GetSegmentState(performance, &tmp_state, 70); todo_wine ok(hr == DMUS_E_NOT_FOUND, "got %#lx\n", hr);

1 0

Rémi Bernon : dmime/tests: Test tempo track Play and DMUS_PMSGT_TEMPO messages.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 7a9e45ac137b7eba612f262953470fbd80058094 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a9e45ac137b7eba612f262953470f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 19:52:40 2023 +0200 dmime/tests: Test tempo track Play and DMUS_PMSGT_TEMPO messages. --- dlls/dmime/tests/dmime.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 7d2dd912237..344571d2801 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3888,6 +3888,179 @@ static void test_band_track_play(void) IDirectMusicTool_Release(tool); } +#define check_dmus_tempo_pmsg(a, b, c) check_dmus_tempo_pmsg_(__LINE__, a, b, c) +static void check_dmus_tempo_pmsg_(int line, DMUS_TEMPO_PMSG *msg, MUSIC_TIME time, double tempo) +{ + ok_(__FILE__, line)(msg->dwSize == sizeof(*msg), "got dwSize %lu\n", msg->dwSize); + ok_(__FILE__, line)(msg->rtTime != 0, "got rtTime %I64u\n", msg->rtTime); + ok_(__FILE__, line)(abs(msg->mtTime - time) < 10, "got mtTime %lu\n", msg->mtTime); + ok_(__FILE__, line)(!msg->dwPChannel, "got dwPChannel %lu\n", msg->dwPChannel); + ok_(__FILE__, line)(!!msg->dwVirtualTrackID, "got dwVirtualTrackID %lu\n", msg->dwVirtualTrackID); + ok_(__FILE__, line)(msg->dwType == DMUS_PMSGT_TEMPO, "got dwType %#lx\n", msg->dwType); + ok_(__FILE__, line)(!msg->dwVoiceID, "got dwVoiceID %lu\n", msg->dwVoiceID); + ok_(__FILE__, line)(msg->dwGroupID == -1, "got dwGroupID %lu\n", msg->dwGroupID); + ok_(__FILE__, line)(!msg->punkUser, "got punkUser %p\n", msg->punkUser); + ok_(__FILE__, line)(msg->dblTempo == tempo, "got tempo %f\n", msg->dblTempo); +} + +static void test_tempo_track_play(void) +{ + static const DWORD message_types[] = + { + DMUS_PMSGT_MIDI, + DMUS_PMSGT_NOTE, + DMUS_PMSGT_SYSEX, + DMUS_PMSGT_NOTIFICATION, + DMUS_PMSGT_TEMPO, + DMUS_PMSGT_CURVE, + DMUS_PMSGT_TIMESIG, + DMUS_PMSGT_PATCH, + DMUS_PMSGT_TRANSPOSE, + DMUS_PMSGT_CHANNEL_PRIORITY, + DMUS_PMSGT_STOP, + DMUS_PMSGT_DIRTY, + DMUS_PMSGT_WAVE, + DMUS_PMSGT_LYRIC, + DMUS_PMSGT_SCRIPTLYRIC, + DMUS_PMSGT_USER, + }; + static const LARGE_INTEGER zero = {0}; + DMUS_IO_TEMPO_ITEM tempo_items[] = + { + {.lTime = 100, .dblTempo = 80}, + {.lTime = 300, .dblTempo = 60}, + {.lTime = 200, .dblTempo = 20}, + {.lTime = 4000, .dblTempo = 50}, + }; + IDirectMusicPerformance *performance; + IDirectMusicSegment *segment; + IDirectMusicGraph *graph; + IDirectMusicTrack *track; + IPersistStream *persist; + IDirectMusicTool *tool; + DMUS_TEMPO_PMSG *tempo; + DMUS_TEMPO_PARAM param; + IStream *stream; + DMUS_PMSG *msg; + HRESULT hr; + DWORD ret; + + hr = test_tool_create(message_types, ARRAY_SIZE(message_types), &tool); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicPerformance, (void **)&performance); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicGraph, (void **)&graph); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicPerformance_SetGraph(performance, graph); + ok(hr == S_OK, "got %#lx\n", hr); + IDirectMusicGraph_Release(graph); + + + /* create a segment and load a simple RIFF stream */ + + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment, (void **)&segment); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = IDirectMusicSegment_QueryInterface(segment, &IID_IPersistStream, (void **)&persist); + ok(hr == S_OK, "got %#lx\n", hr); + hr = CreateStreamOnHGlobal(0, TRUE, &stream); + ok(hr == S_OK, "got %#lx\n", hr); + + CHUNK_RIFF(stream, "DMSG") + { + /* set a non-zero segment length, or nothing will be played */ + DMUS_IO_SEGMENT_HEADER head = {.mtLength = 1000}; + CHUNK_DATA(stream, "segh", head); + CHUNK_DATA(stream, "guid", CLSID_DirectMusicSegment); + } + CHUNK_END; + + hr = IStream_Seek(stream, zero, 0, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IPersistStream_Load(persist, stream); + ok(hr == S_OK, "got %#lx\n", hr); + IPersistStream_Release(persist); + IStream_Release(stream); + + + /* add a tempo track to our segment */ + + hr = CoCreateInstance(&CLSID_DirectMusicTempoTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack, (void **)&track); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = IDirectMusicSegment_QueryInterface(track, &IID_IPersistStream, (void **)&persist); + ok(hr == S_OK, "got %#lx\n", hr); + hr = CreateStreamOnHGlobal(0, TRUE, &stream); + ok(hr == S_OK, "got %#lx\n", hr); + CHUNK_ARRAY(stream, "tetr", tempo_items); + hr = IStream_Seek(stream, zero, 0, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IPersistStream_Load(persist, stream); + ok(hr == S_OK, "got %#lx\n", hr); + IPersistStream_Release(persist); + IStream_Release(stream); + + hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 0, NULL, &param); + ok(hr == DMUS_E_TRACK_NOT_FOUND, "got %#lx\n", hr); + + hr = IDirectMusicSegment_InsertTrack(segment, (IDirectMusicTrack *)track, 1); + ok(hr == S_OK, "got %#lx\n", hr); + IDirectMusicTrack_Release(track); + + + /* now play the segment, and check produced messages */ + + hr = IDirectMusicPerformance_Init(performance, NULL, 0, 0); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0x800, 0, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 500, &msg); + 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 **)&tempo); + ok(!ret, "got %#lx\n", ret); + todo_wine ok(tempo->dwType == DMUS_PMSGT_TEMPO, "got %#lx\n", tempo->dwType); + if (tempo->dwType != DMUS_PMSGT_TEMPO) goto skip_tests; + check_dmus_tempo_pmsg(tempo, 100, 80); + hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)tempo); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&tempo); + todo_wine ok(!ret, "got %#lx\n", ret); + check_dmus_tempo_pmsg(tempo, 300, 60); + hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)tempo); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 500, &msg); + todo_wine 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); + +skip_tests: + IDirectMusicSegment_Release(segment); + + + hr = IDirectMusicPerformance_CloseDown(performance); + ok(hr == S_OK, "got %#lx\n", hr); + + IDirectMusicPerformance_Release(performance); + IDirectMusicTool_Release(tool); +} + static void test_connect_to_collection(void) { IDirectMusicCollection *collection; @@ -4208,6 +4381,7 @@ START_TEST(dmime) test_wave_pmsg(); test_sequence_track(); test_band_track_play(); + test_tempo_track_play(); test_connect_to_collection(); test_segment_state();

1 0

Rémi Bernon : dmime: Fix tempo track GetParam with GUID_TempoParam implementation.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: 2d1f46c221bbf22a1d264992648878753fa52cc6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d1f46c221bbf22a1d264992648878… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 16:51:31 2023 +0200 dmime: Fix tempo track GetParam with GUID_TempoParam implementation. --- dlls/dmime/tempotrack.c | 46 ++++++++++++++++------------------------- dlls/dmime/tests/dmime.c | 54 ++++++++++++++++++++++++------------------------ 2 files changed, 45 insertions(+), 55 deletions(-) diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 07f410118fe..028ebc8879c 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -140,42 +140,32 @@ static HRESULT WINAPI tempo_track_Play(IDirectMusicTrack8 *iface, void *pStateDa return S_OK; } -static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, - MUSIC_TIME *next, void *param) +static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME music_time, + MUSIC_TIME *next_time, void *param) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - DMUS_TEMPO_PARAM *prm = param; - unsigned int i; - - TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + DMUS_IO_TEMPO_ITEM *item = This->items, *end = item + This->count; + DMUS_TEMPO_PARAM *tempo = param; - if (!param) - return E_POINTER; - if (!IsEqualGUID(type, &GUID_TempoParam)) - return DMUS_E_GET_UNSUPPORTED; + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), music_time, next_time, param); - FIXME("Partial support for GUID_TempoParam\n"); + if (!param) return E_POINTER; + if (!IsEqualGUID(type, &GUID_TempoParam)) return DMUS_E_GET_UNSUPPORTED; + if (item == end) return DMUS_E_NOT_FOUND; - if (next) - *next = 0; - prm->mtTime = 0; - prm->dblTempo = 0.123456; + tempo->mtTime = item->lTime - music_time; + tempo->dblTempo = item->dblTempo; - for (i = 0; i < This->count; i++) { - if (This->items[i].lTime <= time) { - MUSIC_TIME ofs = This->items[i].lTime - time; - if (ofs > prm->mtTime) { - prm->mtTime = ofs; - prm->dblTempo = This->items[i].dblTempo; - } - if (next && This->items[i].lTime > time && This->items[i].lTime < *next) - *next = This->items[i].lTime; - } + for (; item < end; item++) + { + MUSIC_TIME time = item->lTime - music_time; + if (next_time) *next_time = item->lTime - music_time; + if (time > 0) break; + tempo->mtTime = time; + tempo->dblTempo = item->dblTempo; } - if (0.123456 == prm->dblTempo) - return DMUS_E_NOT_FOUND; - + if (next_time && item == end) *next_time = 0; return S_OK; } diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 2f2592da6fe..8be73d93b54 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4019,45 +4019,45 @@ static void test_tempo_track_play(void) hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 0, NULL, NULL); ok(hr == E_POINTER, "got %#lx\n", hr); hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 0, NULL, &param); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&param, 0xcd, sizeof(param)); next_time = 0xdeadbeef; hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 0, &next_time, &param); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(next_time == 100, "got next_time %lu\n", next_time); - todo_wine ok(param.mtTime == 100, "got mtTime %ld\n", param.mtTime); - todo_wine ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); + ok(hr == S_OK, "got %#lx\n", hr); + ok(next_time == 100, "got next_time %lu\n", next_time); + ok(param.mtTime == 100, "got mtTime %ld\n", param.mtTime); + ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 100, &next_time, &param); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(next_time == 200, "got next_time %lu\n", next_time); + ok(hr == S_OK, "got %#lx\n", hr); + ok(next_time == 200, "got next_time %lu\n", next_time); ok(param.mtTime == 0, "got mtTime %ld\n", param.mtTime); - todo_wine ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); + ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 199, &next_time, &param); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(next_time == 101, "got next_time %lu\n", next_time); - todo_wine ok(param.mtTime == -99, "got mtTime %ld\n", param.mtTime); - todo_wine ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); + ok(hr == S_OK, "got %#lx\n", hr); + ok(next_time == 101, "got next_time %lu\n", next_time); + ok(param.mtTime == -99, "got mtTime %ld\n", param.mtTime); + ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 200, &next_time, &param); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(next_time == 100, "got next_time %lu\n", next_time); - todo_wine ok(param.mtTime == -100, "got mtTime %ld\n", param.mtTime); - todo_wine ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); + ok(hr == S_OK, "got %#lx\n", hr); + ok(next_time == 100, "got next_time %lu\n", next_time); + ok(param.mtTime == -100, "got mtTime %ld\n", param.mtTime); + ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 299, &next_time, &param); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(next_time == 1, "got next_time %lu\n", next_time); - todo_wine ok(param.mtTime == -199, "got mtTime %ld\n", param.mtTime); - todo_wine ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); + ok(hr == S_OK, "got %#lx\n", hr); + ok(next_time == 1, "got next_time %lu\n", next_time); + ok(param.mtTime == -199, "got mtTime %ld\n", param.mtTime); + ok(param.dblTempo == 80, "got dblTempo %f\n", param.dblTempo); hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 300, &next_time, &param); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(next_time == 3700, "got next_time %lu\n", next_time); - todo_wine ok(param.mtTime == -100, "got mtTime %ld\n", param.mtTime); - todo_wine ok(param.dblTempo == 20, "got dblTempo %f\n", param.dblTempo); + ok(hr == S_OK, "got %#lx\n", hr); + ok(next_time == 3700, "got next_time %lu\n", next_time); + ok(param.mtTime == -100, "got mtTime %ld\n", param.mtTime); + ok(param.dblTempo == 20, "got dblTempo %f\n", param.dblTempo); hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 5000, &next_time, &param); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(next_time == 0, "got next_time %lu\n", next_time); - todo_wine ok(param.mtTime == -1000, "got mtTime %ld\n", param.mtTime); - todo_wine ok(param.dblTempo == 50, "got dblTempo %f\n", param.dblTempo); + ok(param.mtTime == -1000, "got mtTime %ld\n", param.mtTime); + ok(param.dblTempo == 50, "got dblTempo %f\n", param.dblTempo); /* now play the segment, and check produced messages */

1 0

Rémi Bernon : dmime/tests: Add helpers to scale and check music time with tempo.
by Alexandre Julliard Nov. 9, 2023

Nov. 9, 2023

Module: wine Branch: master Commit: c6eca9276bc62b34524409c9c13ea21108b43faa URL: https://gitlab.winehq.org/wine/wine/-/commit/c6eca9276bc62b34524409c9c13ea2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 19:51:49 2023 +0200 dmime/tests: Add helpers to scale and check music time with tempo. Be flexible on the comparison to ignore rounding errors. --- dlls/dmime/tests/dmime.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 8be73d93b54..91af7aec692 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -2671,6 +2671,17 @@ static void test_performance_graph(void) IDirectMusicTool_Release(tool); } +static double scale_music_time(MUSIC_TIME time, double tempo) +{ + return (600000000.0 * time) / (tempo * 768.0); +} + +#define check_music_time(a, b) check_music_time_(__LINE__, a, b) +static void check_music_time_(int line, MUSIC_TIME time, MUSIC_TIME expect) +{ + ok_(__FILE__, line)(abs(time - expect) <= 1, "got %ld, expected %ld\n", time, expect); +} + static void test_performance_time(void) { IDirectMusicPerformance *performance; @@ -2720,29 +2731,26 @@ static void test_performance_time(void) time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 1, &time); ok(hr == S_OK, "got %#lx\n", hr); - ok(time - init_time >= 6505, "got %I64d\n", time - init_time); - ok(time - init_time <= 6515, "got %I64d\n", time - init_time); + check_music_time(time - init_time, scale_music_time(1, 120)); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 1000, &time); ok(hr == S_OK, "got %#lx\n", hr); - ok(time - init_time >= 1000 * 6505, "got %I64d\n", time - init_time); - ok(time - init_time <= 1000 * 6515, "got %I64d\n", time - init_time); + todo_wine check_music_time(time - init_time, scale_music_time(1000, 120)); time = 0xdeadbeef; hr = IDirectMusicPerformance_MusicToReferenceTime(performance, 2000, &time); ok(hr == S_OK, "got %#lx\n", hr); - ok(time - init_time >= 2000 * 6505, "got %I64d\n", time - init_time); - ok(time - init_time <= 2000 * 6515, "got %I64d\n", time - init_time); + todo_wine check_music_time(time - init_time, scale_music_time(2000, 120)); music_time = 0xdeadbeef; hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time, &music_time); ok(hr == S_OK, "got %#lx\n", hr); ok(music_time == 0, "got %ld\n", music_time); music_time = 0xdeadbeef; - hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time + 1000 * 6510, &music_time); + hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time + scale_music_time(1000, 120), &music_time); ok(hr == S_OK, "got %#lx\n", hr); ok(music_time == 1000, "got %ld\n", music_time); music_time = 0xdeadbeef; - hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time + 2000 * 6510, &music_time); + hr = IDirectMusicPerformance_ReferenceToMusicTime(performance, init_time + scale_music_time(2000, 120), &music_time); ok(hr == S_OK, "got %#lx\n", hr); ok(music_time == 2000, "got %ld\n", music_time);

1 0