[PATCH 1/2] mmsystem: Fix some MCI mappings.

Joerg-Cyril.Hoehle at t-systems.com Joerg-Cyril.Hoehle at t-systems.com
Thu May 26 03:32:10 CDT 2011


this merges past changes to 32bit MCI into the 16 bit mmsystem:

- MCI_OPEN conditionally copies the extra DGV or WAVE OPEN elements.
- string results are converted on success only.
- MCI_INFO counts dwRetSize in chars, not bytes.
- TRACE(MAP_MSGERROR) is already covered by a FIXME.
Furthermore, I partly reverted Damjan's changes on return from the
function. There's no need to update mdsp16->dwCallback, Item or Track.
They are input parameters, not output.

+            mip16->dwRetSize = mip32w->dwRetSize;
MCI_INFO's dwRetSize might be updated (MSDN documents this for the
VCR device only), but my past tests showed that an update happens only
since NT (not w9x), for some of the devices (wave, midi and mcicda IIRC,
see comment in their code).
Nevertheless I choose to let this layer update that slot (despite Wine's MCI
devices won't, so the original value will be written back).

	Jörg Höhle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-mmsystem-Fix-some-MCI-mappings.patch
Type: application/octet-stream
Size: 8488 bytes
Desc: 0001-mmsystem-Fix-some-MCI-mappings.patch
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20110526/481aa8c4/attachment.obj>

More information about the wine-patches mailing list