March 2024 - Wine-Commits - list.winehq.org

Tim Clem : win32u: Don't mask keyboard scan codes when processing them for IME.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: 0fb7c99c33507ac494c9c35e15fb6df8b000cdd2 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fb7c99c33507ac494c9c35e15fb6d… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Mar 1 13:10:26 2024 -0800 win32u: Don't mask keyboard scan codes when processing them for IME. Fixes missed key up events on older macOS versions, which could result in out-of-order input. Fix via Rémi Bernon <rbernon(a)codeweavers.com>. --- dlls/win32u/imm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c index d1dc1de8c55..4a9aca22360 100644 --- a/dlls/win32u/imm.c +++ b/dlls/win32u/imm.c @@ -583,7 +583,7 @@ LRESULT ime_driver_call( HWND hwnd, enum wine_ime_call call, WPARAM wparam, LPAR { struct imm_thread_data *data = get_imm_thread_data(); - data->ime_process_scan = HIWORD(lparam) & 0x1ff; + data->ime_process_scan = HIWORD(lparam); data->ime_process_vkey = LOWORD(wparam); res = user_driver->pImeProcessKey( params->himc, wparam, lparam, params->state ); data->ime_process_vkey = data->ime_process_scan = 0; @@ -597,7 +597,7 @@ LRESULT ime_driver_call( HWND hwnd, enum wine_ime_call call, WPARAM wparam, LPAR res = TRUE; } - TRACE( "processing scan %#x, vkey %#x -> %u\n", LOWORD(wparam), HIWORD(lparam) & 0x1ff, (UINT)res ); + TRACE( "processing scan %#x, vkey %#x -> %u\n", LOWORD(wparam), HIWORD(lparam), (UINT)res ); return res; } case WINE_IME_TO_ASCII_EX:

1 0

Michael Müller : wine.inf: Register the New menu as a directory background context menu handler.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: cfab11e16a0a9c51ef8b30f6a2ef355466f4b315 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfab11e16a0a9c51ef8b30f6a2ef35… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Mar 31 23:23:09 2016 +0200 wine.inf: Register the New menu as a directory background context menu handler. CDBurnerXP expects the ContextMenuHandlers key to exist, and apparently enumerates it until it receives ERROR_NO_MORE_ITEMS. If it fails to open the key, it will spin forever trying to call RegEnumKeyExW(NULL) and getting ERROR_INVALID_HANDLE. We could simply create an empty ContextMenuHandlers key here, but this will allow the New menu to work in the builtin explorer view once shellex handlers are implemented. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29523 --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 11c0e20b3ff..b1c0aad6821 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -284,6 +284,7 @@ HKCR,chm.file\shell\open\command,,2,"""%10%\hh.exe"" ""%1""" HKCR,cplfile,,2,"Control Panel Item" HKCR,cplfile\shell\cplopen,,2,"Open with Control Panel" HKCR,cplfile\shell\cplopen\command,,2,"rundll32.exe shell32.dll,Control_RunDLL ""%1"",%*" +HKCR,Directory\Background\shellex\ContextMenuHandlers\New,,,"{d969a300-e7ff-11d0-a93b-00a0c90f2719}" HKCR,DirectShow,,16 HKCR,exefile,,2,"Application" HKCR,exefile\DefaultIcon,,2,"%1"

1 0

Paul Gofman : winexinput.sys: Force debug info in critical sections.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: 7c387c0b0ec65410fc23d2ba133ccc97c452255c URL: https://gitlab.winehq.org/wine/wine/-/commit/7c387c0b0ec65410fc23d2ba133ccc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 29 20:54:13 2024 -0600 winexinput.sys: Force debug info in critical sections. --- dlls/winexinput.sys/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 26764fa78ef..5a5c6ca8f00 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -785,6 +785,8 @@ static NTSTATUS WINAPI fdo_pnp(DEVICE_OBJECT *device, IRP *irp) IoSkipCurrentIrpStackLocation(irp); status = IoCallDriver(fdo->bus_device, irp); IoDetachDevice(fdo->bus_device); + if (fdo->cs.DebugInfo) + fdo->cs.DebugInfo->Spare[0] = 0; RtlDeleteCriticalSection(&fdo->cs); HidP_FreeCollectionDescription(&fdo->device_desc); free(fdo->report_buf); @@ -871,7 +873,7 @@ static NTSTATUS WINAPI add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *bus_devi fdo->bus_device = bus_device; wcscpy(fdo->instance_id, instance_id); - RtlInitializeCriticalSection(&fdo->cs); + RtlInitializeCriticalSectionEx(&fdo->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); fdo->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": func_device.cs"); TRACE("device %p, bus_id %s, device_id %s, instance_id %s.\n", device, debugstr_w(bus_id),

1 0

Paul Gofman : comctl32: Force debug info in critical sections.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: a7d3d574c0a390789eb5759f53507cb4cf3fd7c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7d3d574c0a390789eb5759f53507c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 29 20:57:32 2024 -0600 comctl32: Force debug info in critical sections. --- dlls/comctl32/animate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 721379f329c..46e1e37b72d 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -813,7 +813,7 @@ static BOOL ANIMATE_Create(HWND hWnd, const CREATESTRUCTW *lpcs) TRACE("Animate style %#lx, parent %p\n", infoPtr->dwStyle, infoPtr->hwndNotify); - InitializeCriticalSection(&infoPtr->cs); + InitializeCriticalSectionEx(&infoPtr->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); infoPtr->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ANIMATE_INFO*->cs"); return TRUE;

1 0

Paul Gofman : ole32: Force debug info in critical sections.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: 6e1e52cbc3c85b4159fb3c4d5b98d7556b44d03a URL: https://gitlab.winehq.org/wine/wine/-/commit/6e1e52cbc3c85b4159fb3c4d5b98d7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 29 21:00:07 2024 -0600 ole32: Force debug info in critical sections. --- dlls/ole32/stg_prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 66b12f3ae9e..7481f0f3480 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2513,7 +2513,7 @@ static HRESULT PropertyStorage_BaseConstruct(IStream *stm, (*pps)->IPropertyStorage_iface.lpVtbl = &IPropertyStorage_Vtbl; (*pps)->ref = 1; - InitializeCriticalSection(&(*pps)->cs); + InitializeCriticalSectionEx(&(*pps)->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); (*pps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PropertyStorage_impl.cs"); (*pps)->stm = stm; (*pps)->fmtid = *rfmtid;

1 0

Esme Povirk : gdiplus: Fix use after free in GdipAddPathString.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: 3ca8204837ffa56064c61981fcb5128981f17196 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ca8204837ffa56064c61981fcb512… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Mar 1 18:54:33 2024 +0000 gdiplus: Fix use after free in GdipAddPathString. --- dlls/gdiplus/graphicspath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 23a9be25055..ea9c247b38c 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1141,7 +1141,6 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT } get_log_fontW(font, graphics, &lfw); - GdipDeleteGraphics(graphics); hfont = CreateFontIndirectW(&lfw); if (!hfont) @@ -1167,6 +1166,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT DeleteDC(dc); DeleteObject(hfont); GdipDeleteFont(font); + GdipDeleteGraphics(graphics); if (status != Ok) /* free backup */ {

1 0

Paul Gofman : mcicda: Force debug info in critical sections.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: e02b3379eb92d6a76669cfa4c7ce55225194b275 URL: https://gitlab.winehq.org/wine/wine/-/commit/e02b3379eb92d6a76669cfa4c7ce55… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 29 20:58:55 2024 -0600 mcicda: Force debug info in critical sections. --- dlls/mcicda/mcicda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 2f6eaaadc58..59acbcb6d4c 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -201,7 +201,7 @@ static DWORD MCICDA_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) mciSetDriverData(wmcda->wDevID, (DWORD_PTR)wmcda); modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE; modp->wType = MCI_DEVTYPE_CD_AUDIO; - InitializeCriticalSection(&wmcda->cs); + InitializeCriticalSectionEx(&wmcda->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); wmcda->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_MCICDAUDIO.cs"); return modp->wDeviceID; }

1 0

Paul Gofman : qcap: Force debug info in critical sections.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: 02b68a0ac118fcfe701e76d24b61bca9ece79b2f URL: https://gitlab.winehq.org/wine/wine/-/commit/02b68a0ac118fcfe701e76d24b61bc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 29 21:01:23 2024 -0600 qcap: Force debug info in critical sections. --- dlls/qcap/audiorecord.c | 2 +- dlls/qcap/capturegraph.c | 2 +- dlls/qcap/vfwcapture.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 775d942f8f8..b65d1c69f90 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -824,7 +824,7 @@ HRESULT audio_record_create(IUnknown *outer, IUnknown **out) object->state = State_Stopped; InitializeConditionVariable(&object->state_cv); - InitializeCriticalSection(&object->state_cs); + InitializeCriticalSectionEx(&object->state_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->state_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": audio_record.state_cs"); TRACE("Created audio recorder %p.\n", object); diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 45cef802ba2..d570ac334d3 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -62,7 +62,7 @@ HRESULT capture_graph_create(IUnknown *outer, IUnknown **out) object->ICaptureGraphBuilder_iface.lpVtbl = &builder_Vtbl; object->ref = 1; object->mygraph = NULL; - InitializeCriticalSection(&object->csFilter); + InitializeCriticalSectionEx(&object->csFilter, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CaptureGraphImpl.csFilter"); TRACE("Created capture graph builder %p.\n", object); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index a51b39c0a11..0899b228ec2 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -904,7 +904,7 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) object->state = State_Stopped; InitializeConditionVariable(&object->state_cv); - InitializeCriticalSection(&object->state_cs); + InitializeCriticalSectionEx(&object->state_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->state_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": vfw_capture.state_cs"); TRACE("Created VFW capture filter %p.\n", object);

1 0

Rémi Bernon : mfreadwrite/reader: Implement IMFSourceReaderEx_GetTransformForStream.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: 440edde5e1c674bf851e3681a6a20b39d422dac2 URL: https://gitlab.winehq.org/wine/wine/-/commit/440edde5e1c674bf851e3681a6a20b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 29 22:28:08 2024 +0100 mfreadwrite/reader: Implement IMFSourceReaderEx_GetTransformForStream. --- dlls/mfreadwrite/reader.c | 50 +++++++++++++++++++++++++++++++++++++++-- dlls/mfreadwrite/tests/mfplat.c | 20 ++++++++--------- 2 files changed, 58 insertions(+), 12 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 41becb2b159..58de40c772b 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -77,6 +77,7 @@ struct transform_entry IMFTransform *transform; unsigned int min_buffer_size; GUID category; + BOOL hidden; }; struct media_stream @@ -1998,6 +1999,15 @@ static HRESULT source_reader_create_decoder_for_stream(struct source_reader *rea { stream->transform_service = entry->transform; IMFTransform_AddRef(stream->transform_service); + + /* converters are hidden from the stream transforms */ + if (service != entry) + service->hidden = TRUE; + } + else + { + /* converters are hidden from the stream transforms */ + entry->hidden = TRUE; } } @@ -2432,12 +2442,48 @@ static HRESULT WINAPI src_reader_RemoveAllTransformsForStream(IMFSourceReaderEx return E_NOTIMPL; } +static struct transform_entry *get_transform_at_index(struct media_stream *stream, UINT index) +{ + struct transform_entry *entry; + + LIST_FOR_EACH_ENTRY(entry, &stream->transforms, struct transform_entry, entry) + if (!entry->hidden && !index--) + return entry; + + return NULL; +} + static HRESULT WINAPI src_reader_GetTransformForStream(IMFSourceReaderEx *iface, DWORD stream_index, DWORD transform_index, GUID *category, IMFTransform **transform) { - FIXME("%p, %#lx, %#lx, %p, %p.\n", iface, stream_index, transform_index, category, transform); + struct source_reader *reader = impl_from_IMFSourceReaderEx(iface); + struct transform_entry *entry; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %#lx, %#lx, %p, %p.\n", iface, stream_index, transform_index, category, transform); + + EnterCriticalSection(&reader->cs); + + if (stream_index == MF_SOURCE_READER_FIRST_VIDEO_STREAM) + stream_index = reader->first_video_stream_index; + else if (stream_index == MF_SOURCE_READER_FIRST_AUDIO_STREAM) + stream_index = reader->first_audio_stream_index; + + if (stream_index >= reader->stream_count) + hr = MF_E_INVALIDSTREAMNUMBER; + else if (!(entry = get_transform_at_index(&reader->streams[stream_index], transform_index))) + hr = MF_E_INVALIDINDEX; + else + { + *category = entry->category; + *transform = entry->transform; + IMFTransform_AddRef(*transform); + hr = S_OK; + } + + LeaveCriticalSection(&reader->cs); + + return hr; } static const IMFSourceReaderExVtbl srcreader_vtbl = diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 91f9641ccfc..aacd3c101b8 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -2011,9 +2011,9 @@ static void test_source_reader_transforms(BOOL enable_processing, BOOL enable_ad ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 0, &category, &transform); if (!enable_advanced) - todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr); + ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr); else - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr == S_OK) { hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); @@ -2030,7 +2030,7 @@ static void test_source_reader_transforms(BOOL enable_processing, BOOL enable_ad } hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 1, &category, &transform); - todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr); + ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr); IMFSourceReaderEx_Release(reader_ex); IMFSourceReader_Release(reader); @@ -2123,9 +2123,9 @@ static void test_source_reader_transforms(BOOL enable_processing, BOOL enable_ad ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 0, &category, &transform); if (!enable_processing && !enable_advanced) - todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr); + ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr); else - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr == S_OK) { hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); @@ -2144,9 +2144,9 @@ static void test_source_reader_transforms(BOOL enable_processing, BOOL enable_ad /* the video processor can be accessed at index 1 with MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING */ hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 1, &category, &transform); if (!enable_advanced) - todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr); + ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr); else - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr == S_OK) { hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); @@ -2163,7 +2163,7 @@ static void test_source_reader_transforms(BOOL enable_processing, BOOL enable_ad } hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 2, &category, &transform); - todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr); + ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr); IMFSourceReaderEx_Release(reader_ex); /* H264 -> NV12 conversion */ @@ -2212,7 +2212,7 @@ static void test_source_reader_transforms(BOOL enable_processing, BOOL enable_ad hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 0, &category, &transform); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (hr == S_OK) { hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); @@ -2242,7 +2242,7 @@ static void test_source_reader_transforms(BOOL enable_processing, BOOL enable_ad } hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 1, &category, &transform); - todo_wine ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr); + ok(hr == MF_E_INVALIDINDEX, "Unexpected hr %#lx.\n", hr); IMFSourceReaderEx_Release(reader_ex); skip_tests:

1 0

Yuxuan Shui : dmime: Implement setting TempoParam for tempotracks.
by Alexandre Julliard March 1, 2024

March 1, 2024

Module: wine Branch: master Commit: 1b1f216278bdfe20836f371000185444177bffa1 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b1f216278bdfe20836f3710001854… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Thu Feb 15 14:52:17 2024 +0000 dmime: Implement setting TempoParam for tempotracks. And add some tests. --- dlls/dmime/tempotrack.c | 19 +++++++++++++++++- dlls/dmime/tests/dmime.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index ca15dbf4438..2e44d8fda5f 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -203,9 +203,26 @@ static HRESULT WINAPI tempo_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty return S_OK; } if (IsEqualGUID(type, &GUID_TempoParam)) { + struct tempo_entry *item, *next_item; + DMUS_TEMPO_PARAM *tempo_param = param; + struct tempo_entry *entry; if (!param) return E_POINTER; - FIXME("GUID_TempoParam not handled yet\n"); + if (!(entry = calloc(1, sizeof(*entry)))) + return E_OUTOFMEMORY; + entry->item.lTime = time; + entry->item.dblTempo = tempo_param->dblTempo; + if (list_empty(&This->items)) + list_add_tail(&This->items, &entry->entry); + else + { + LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &This->items, struct tempo_entry, entry) + if (item->entry.next == &This->items || next_item->item.lTime > time) + { + list_add_after(&item->entry, &entry->entry); + break; + } + } return S_OK; } diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 97a6088936e..c1c768e4b1b 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4456,6 +4456,56 @@ static void check_dmus_tempo_pmsg_(int line, DMUS_TEMPO_PMSG *msg, MUSIC_TIME ti ok_(__FILE__, line)(msg->dblTempo == tempo, "got tempo %f\n", msg->dblTempo); } +static void test_tempo_track(void) +{ + HRESULT hr; + IDirectMusicTrack *track; + DMUS_TEMPO_PARAM param; + MUSIC_TIME next; + hr = CoCreateInstance(&CLSID_DirectMusicTempoTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack, (void **)&track); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = IDirectMusicTrack_GetParam(track, &GUID_TempoParam, 0, &next, &param); + ok(hr == DMUS_E_NOT_FOUND, "got %#lx\n", hr); + + param.dblTempo = 150; + param.mtTime = 10; + hr = IDirectMusicTrack_SetParam(track, &GUID_TempoParam, 10, &param); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = IDirectMusicTrack_GetParam(track, &GUID_TempoParam, 0, &next, &param); + ok(hr == S_OK, "got %#lx\n", hr); + ok(param.dblTempo == 150, "got %f, expected 150\n", param.dblTempo); + ok(param.mtTime == 10, "got %lu, expected 10\n", param.mtTime); + ok(next == 10, "got %lu, expected 10\n", next); + + hr = IDirectMusicTrack_GetParam(track, &GUID_TempoParam, 10, &next, &param); + ok(hr == S_OK, "got %#lx\n", hr); + ok(param.dblTempo == 150, "got %f, expected 150\n", param.dblTempo); + ok(param.mtTime == 0, "got %lu, expected 0\n", param.mtTime); + ok(next == 0, "got %lu, expected 0\n", next); + + hr = IDirectMusicTrack_GetParam(track, &GUID_TempoParam, 11, &next, &param); + ok(hr == S_OK, "got %#lx\n", hr); + ok(param.dblTempo == 150, "got %f, expected 150\n", param.dblTempo); + ok(param.mtTime == -1, "got %lu, expected 0\n", param.mtTime); + ok(next == 0, "got %lu, expected 0\n", next); + + param.dblTempo = 180; + param.mtTime = 20; + hr = IDirectMusicTrack_SetParam(track, &GUID_TempoParam, 20, &param); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = IDirectMusicTrack_GetParam(track, &GUID_TempoParam, 11, &next, &param); + ok(hr == S_OK, "got %#lx\n", hr); + ok(param.dblTempo == 150, "got %f, expected 150\n", param.dblTempo); + ok(param.mtTime == -1, "got %ld, expected -1\n", param.mtTime); + ok(next == 9, "got %lu, expected 9\n", next); + + IDirectMusicTrack_Release(track); +} + static void test_tempo_track_play(void) { static const DWORD message_types[] = @@ -5045,6 +5095,7 @@ START_TEST(dmime) test_wave_pmsg(0); test_wave_pmsg(10); test_sequence_track(); + test_tempo_track(); test_band_track_play(); test_tempo_track_play(); test_connect_to_collection();

1 0