[Git][wine/wine][master] 2 commits: midiseq: Reduce race window when closing sequencer.
Alexandre Julliard pushed to branch master at wine / wine Commits: 1f1a0bd3 by Eric Pouech at 2024-10-21T16:38:16+02:00 midiseq: Reduce race window when closing sequencer. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> - - - - - b7be37ac by Sebastian Krzyszkowiak at 2024-10-21T16:38:16+02:00 mciseq: Don't seek to the end of the root chunk in RMID files. Commit 9e1008f13735 added mmioSeek call that skips the whole data portion of the RMID chunk, breaking the handling of RMID (RIFF-based MIDI) files as it effectively skips the whole content of the RIFF file. Since mmioDescend expects the file position to be somewhere within the specified parent chunk, it's guaranteed to fail. $ WINEDEBUG=+mcimidi wine wintest.exe mcishell mci.c:178: Type your commands to the MCI, end with Ctrl-Z/^D open BOSSNOVA.RMI mci.c:188: command: open BOSSNOVA.RMI 0764:trace:mcimidi:MIDI_mciOpen (1, 00000200, 0051FB98) 0764:trace:mcimidi:MIDI_mciOpen wDevID=1 (lpParams->wDeviceID=1) 0764:trace:mcimidi:MIDI_mciOpen MCI_OPEN_ELEMENT L"bossnova.rmi"! 0764:trace:mcimidi:MIDI_mciOpen hFile=00000001 0764:trace:mcimidi:MIDI_mciOpen ParentChunk ckid=RIFF fccType=RMID cksize=000052DA mci.c:191: Test failed: mci open BOSSNOVA.RMI error: 296(40 MCIERR_INVALID_FILE) Its introduction seems unrelated to the rest of that commit and there's no reason given for placing it there, so let's remove the mmioSeek call to fix RMID file handling in MCI. Previous mmioDescend call will set the position to just after the chunk's form type, which is exactly where it should be when calling mmioDescend the second time to find the data chunk. Other parts of Wine code that deal with RIFF files don't seek in analogous situations either. Fixes: 9e1008f13735 ("Removed fixed size array to store specific data") Signed-off-by: Sebastian Krzyszkowiak <dos(a)dosowisko.net> - - - - - 1 changed file: - dlls/mciseq/mcimidi.c View it on GitLab: https://gitlab.winehq.org/wine/wine/-/compare/3f88cea4415de135a0d9486de5a32d... -- View it on GitLab: https://gitlab.winehq.org/wine/wine/-/compare/3f88cea4415de135a0d9486de5a32d... You're receiving this email because of your account on gitlab.winehq.org.
participants (1)
-
Alexandre Julliard (＠julliard)