wine-commits March 2024

wine-commits@winehq.org

1 participants
775 discussions

Esme Povirk : gdiplus: Implement font linking in GdipAddPathString.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 55f71fd846423338e2029cdce3714903e601bb8e URL: https://gitlab.winehq.org/wine/wine/-/commit/55f71fd846423338e2029cdce37149… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Mar 1 19:27:30 2024 +0000 gdiplus: Implement font linking in GdipAddPathString. --- dlls/gdiplus/gdiplus_private.h | 4 ++++ dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/graphicspath.c | 25 +++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1ae03d7126e..0b302a405ea 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -127,6 +127,10 @@ extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, extern void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, REAL tension, REAL *x, REAL *y); +extern void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, + GDIPCONST GpStringFormat *format, HFONT *hfont, + LOGFONTW *lfw_return, GDIPCONST GpMatrix *matrix); + extern void free_installed_fonts(void); extern BOOL lengthen_path(GpPath *path, INT len); diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 85b25e1ac24..0727b63ed4f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2296,7 +2296,7 @@ void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) lstrcpyW(lf->lfFaceName, font->family->FamilyName); } -static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, +void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, GDIPCONST GpStringFormat *format, HFONT *hfont, LOGFONTW *lfw_return, GDIPCONST GpMatrix *matrix) { diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index ea9c247b38c..662e20071aa 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1001,6 +1001,9 @@ static GpStatus format_string_callback(struct gdip_format_string_info* info) { static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; struct format_string_args *args = info->user_data; + struct gdip_font_link_section *section = LIST_ENTRY(list_head(&info->font_link_info.sections), struct gdip_font_link_section, entry); + HFONT hfont = NULL, oldhfont = NULL; + int section_start = -1; GpPath *path = args->path; GpStatus status = Ok; float x = info->rect->X + (info->bounds->X - info->rect->X) * args->scale; @@ -1019,6 +1022,22 @@ static GpStatus format_string_callback(struct gdip_format_string_info* info) TTPOLYGONHEADER *ph = NULL, *origph; char *start; DWORD len, ofs = 0; + + while (i >= section->end) + section = LIST_ENTRY(list_next(&info->font_link_info.sections, &section->entry), struct gdip_font_link_section, entry); + + if (section_start != section->start) + { + if (hfont) + { + SelectObject(info->hdc, oldhfont); + DeleteObject(hfont); + } + get_font_hfont(info->graphics, section->font, NULL, &hfont, NULL, NULL); + oldhfont = SelectObject(info->hdc, hfont); + section_start = section->start; + } + len = GetGlyphOutlineW(info->hdc, info->string[i], GGO_BEZIER, &gm, 0, NULL, &identity); if (len == GDI_ERROR) { @@ -1085,6 +1104,12 @@ static GpStatus format_string_callback(struct gdip_format_string_info* info) break; } + if (hfont) + { + SelectObject(info->hdc, oldhfont); + DeleteObject(hfont); + } + return status; }

1 0

Esme Povirk : gdiplus: Fix use after free in GdipAddPathString.
by Alexandre Julliard 01 Mar '24

01 Mar '24

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 : qcap: Force debug info in critical sections.
by Alexandre Julliard 01 Mar '24

01 Mar '24

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

Paul Gofman : ole32: Force debug info in critical sections.
by Alexandre Julliard 01 Mar '24

01 Mar '24

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

Paul Gofman : mcicda: Force debug info in critical sections.
by Alexandre Julliard 01 Mar '24

01 Mar '24

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 : comctl32: Force debug info in critical sections.
by Alexandre Julliard 01 Mar '24

01 Mar '24

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 : winexinput.sys: Force debug info in critical sections.
by Alexandre Julliard 01 Mar '24

01 Mar '24

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

Michael Müller : wine.inf: Register the New menu as a directory background context menu handler.
by Alexandre Julliard 01 Mar '24

01 Mar '24

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

Yuxuan Shui : dmime: Parse MIDI Set Tempo meta events and generate a tempotrack.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: f0fc4a0d89bca83c1536c1f38f8eb93b789ddc53 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0fc4a0d89bca83c1536c1f38f8eb9… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Thu Feb 15 14:59:29 2024 +0000 dmime: Parse MIDI Set Tempo meta events and generate a tempotrack. --- dlls/dmime/midi.c | 79 +++++++++++++++++++++++++++++++++++++++++++----- dlls/dmime/tests/dmime.c | 18 +++++++++-- 2 files changed, 87 insertions(+), 10 deletions(-) diff --git a/dlls/dmime/midi.c b/dlls/dmime/midi.c index 647ef1d123c..da64803600a 100644 --- a/dlls/dmime/midi.c +++ b/dlls/dmime/midi.c @@ -35,18 +35,49 @@ struct midi_event { MUSIC_TIME delta_time; BYTE status; - BYTE data[2]; + union + { + struct + { + BYTE data[2]; + }; + struct + { + BYTE meta_type; + ULONG tempo; + }; + }; }; struct midi_parser { IDirectMusicTrack *chordtrack; IDirectMusicTrack *bandtrack; + IDirectMusicTrack *tempotrack; MUSIC_TIME time; IStream *stream; DWORD division; }; +enum meta_event_type +{ + MIDI_META_SEQUENCE_NUMBER = 0x00, + MIDI_META_TEXT_EVENT = 0x01, + MIDI_META_COPYRIGHT_NOTICE = 0x02, + MIDI_META_TRACK_NAME = 0x03, + MIDI_META_INSTRUMENT_NAME = 0x04, + MIDI_META_LYRIC = 0x05, + MIDI_META_MARKER = 0x06, + MIDI_META_CUE_POINT = 0x07, + MIDI_META_CHANNEL_PREFIX_ASSIGNMENT = 0x20, + MIDI_META_END_OF_TRACK = 0x2f, + MIDI_META_SET_TEMPO = 0x51, + MIDI_META_SMPTE_OFFSET = 0x54, + MIDI_META_TIME_SIGNATURE = 0x58, + MIDI_META_KEY_SIGNATURE = 0x59, + MIDI_META_SEQUENCER_SPECIFIC = 0x7f, +}; + static HRESULT stream_read_at_most(IStream *stream, void *buffer, ULONG size, ULONG *bytes_left) { HRESULT hr; @@ -76,8 +107,9 @@ static HRESULT read_variable_length_number(IStream *stream, DWORD *out, ULONG *b static HRESULT read_midi_event(IStream *stream, struct midi_event *event, BYTE *last_status, ULONG *bytes_left) { - BYTE byte, status_type, meta_type; + BYTE byte, status_type; DWORD length; + BYTE data[3]; LARGE_INTEGER offset; HRESULT hr = S_OK; DWORD delta_time; @@ -96,21 +128,31 @@ static HRESULT read_midi_event(IStream *stream, struct midi_event *event, BYTE * if (event->status == MIDI_META) { - meta_type = byte; + event->meta_type = byte; if ((hr = read_variable_length_number(stream, &length, bytes_left)) != S_OK) return hr; - switch (meta_type) + switch (event->meta_type) { + case MIDI_META_SET_TEMPO: + if (length != 3) + { + ERR("Invalid MIDI meta event length %lu for set tempo event.\n", length); + return E_FAIL; + } + if (FAILED(hr = stream_read_at_most(stream, data, 3, bytes_left))) return hr; + event->tempo = (data[0] << 16) | (data[1] << 8) | data[2]; + break; default: if (*bytes_left < length) return S_FALSE; offset.QuadPart = length; if (FAILED(hr = IStream_Seek(stream, offset, STREAM_SEEK_CUR, NULL))) return hr; - FIXME("MIDI meta event type %#02x, length %lu, time +%lu. not supported\n", meta_type, - length, delta_time); + FIXME("MIDI meta event type %#02x, length %lu, time +%lu. not supported\n", + event->meta_type, length, delta_time); *bytes_left -= length; + event->tempo = 0; } - TRACE("MIDI meta event type %#02x, length %lu, time +%lu\n", meta_type, length, delta_time); + TRACE("MIDI meta event type %#02x, length %lu, time +%lu\n", event->meta_type, length, delta_time); return S_OK; } else if (event->status == MIDI_SYSEX1 || event->status == MIDI_SYSEX2) @@ -148,6 +190,22 @@ static HRESULT read_midi_event(IStream *stream, struct midi_event *event, BYTE * return S_OK; } +static HRESULT midi_parser_handle_set_tempo(struct midi_parser *parser, struct midi_event *event) +{ + DMUS_TEMPO_PARAM tempo; + MUSIC_TIME dmusic_time = (ULONGLONG)parser->time * DMUS_PPQ / parser->division; + HRESULT hr; + + if (!parser->tempotrack && FAILED(hr = CoCreateInstance(&CLSID_DirectMusicTempoTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack, (void **)&parser->tempotrack))) + return hr; + + tempo.mtTime = dmusic_time; + tempo.dblTempo = 60 * 1000000.0 / event->tempo; + TRACE("Adding tempo at time %lu, tempo %f\n", dmusic_time, tempo.dblTempo); + return IDirectMusicTrack_SetParam(parser->tempotrack, &GUID_TempoParam, dmusic_time, &tempo); +} + static HRESULT midi_parser_handle_program_change(struct midi_parser *parser, struct midi_event *event) { HRESULT hr; @@ -206,7 +264,9 @@ static HRESULT midi_parser_parse(struct midi_parser *parser, IDirectMusicSegment while ((hr = read_midi_event(parser->stream, &event, &last_status, &length)) == S_OK) { parser->time += event.delta_time; - if ((event.status & 0xf0) == MIDI_PROGRAM_CHANGE) + if (event.status == 0xff && event.meta_type == MIDI_META_SET_TEMPO) + hr = midi_parser_handle_set_tempo(parser, &event); + else if ((event.status & 0xf0) == MIDI_PROGRAM_CHANGE) hr = midi_parser_handle_program_change(parser, &event); if (FAILED(hr)) break; } @@ -223,6 +283,8 @@ static HRESULT midi_parser_parse(struct midi_parser *parser, IDirectMusicSegment if (SUCCEEDED(hr)) hr = IDirectMusicSegment8_SetLength(segment, music_length); if (SUCCEEDED(hr)) hr = IDirectMusicSegment8_InsertTrack(segment, parser->bandtrack, 0xffff); if (SUCCEEDED(hr)) hr = IDirectMusicSegment8_InsertTrack(segment, parser->chordtrack, 0xffff); + if (SUCCEEDED(hr) && parser->tempotrack) + hr = IDirectMusicSegment8_InsertTrack(segment, parser->tempotrack, 0xffff); return hr; } @@ -232,6 +294,7 @@ static void midi_parser_destroy(struct midi_parser *parser) IStream_Release(parser->stream); if (parser->bandtrack) IDirectMusicTrack_Release(parser->bandtrack); if (parser->chordtrack) IDirectMusicTrack_Release(parser->chordtrack); + if (parser->tempotrack) IDirectMusicTrack_Release(parser->tempotrack); free(parser); } diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index c1c768e4b1b..8a95c7f2c21 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -1646,8 +1646,10 @@ static void test_midi(void) WCHAR test_mid[MAX_PATH], bogus_mid[MAX_PATH]; HRESULT hr; ULONG ret; + MUSIC_TIME next; DMUS_PMSG *msg; DMUS_PATCH_PMSG *patch; + DMUS_TEMPO_PARAM tempo_param; #include <pshpack1.h> struct { @@ -1682,7 +1684,7 @@ static void test_midi(void) expect_track(segment, BandTrack, -1, 0); expect_track(segment, ChordTrack, -1, 1); - todo_wine expect_track(segment, TempoTrack, -1, 2); + expect_track(segment, TempoTrack, -1, 2); todo_wine expect_track(segment, TimeSigTrack, -1, 3); todo_wine expect_track(segment, SeqTrack, -1, 4); /* no more tracks */ @@ -1760,8 +1762,20 @@ static void test_midi(void) IStream_Release(stream); expect_track(segment, BandTrack, -1, 0); expect_track(segment, ChordTrack, -1, 1); - todo_wine expect_track(segment, TempoTrack, -1, 2); + expect_track(segment, TempoTrack, -1, 2); todo_wine expect_track(segment, SeqTrack, -1, 3); + + hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 0, &next, &tempo_param); + ok(hr == S_OK, "got %#lx\n", hr); + ok(next == 24, "got %ld, expected 24\n", next); + ok(tempo_param.mtTime == 24, "got %ld, expected 24\n", tempo_param.mtTime); + ok(tempo_param.dblTempo == 300.0, "got %f, expected 300.0\n", tempo_param.dblTempo); + + hr = IDirectMusicSegment_GetParam(segment, &GUID_TempoParam, -1, DMUS_SEG_ALLTRACKS, 26, &next, &tempo_param); + ok(hr == S_OK, "got %#lx\n", hr); + ok(next == 0, "got %ld, expected 24\n", next); + ok(tempo_param.mtTime == -2, "got %ld, expected -6\n", tempo_param.mtTime); + ok(tempo_param.dblTempo == 300.0, "got %f, expected 300.0\n", tempo_param.dblTempo); IDirectMusicSegment_Release(segment); /* parse MIDI file with a track with 0 length, but has an event. */

1 0

Yuxuan Shui : dmime: Implement setting TempoParam for tempotracks.
by Alexandre Julliard 01 Mar '24

01 Mar '24

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2024