October 2009 - Wine-commits

Christian Costa : d3dxof: Properly initialize nb_childs.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: b9561c9cf90f20f3bb32981fc3ba9c8e8bd21094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9561c9cf90f20f3bb32981fc… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Oct 23 08:40:48 2009 +0200 d3dxof: Properly initialize nb_childs. --- dlls/d3dxof/parsing.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index dc7b473..fb5ab4e 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1174,6 +1174,8 @@ static BOOL parse_object_members_list(parse_buffer * buf) static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) { + buf->pxo->nb_childs = 0; + if (!parse_object_members_list(buf)) return FALSE;

1 0

Eric Pouech : winmm: Move the 16bit management of midi stream ( for midi out driver type) to the new 16=>32 thunking scheme.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 2d235de320f8a42a7756f371eccdc5bca614d3d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d235de320f8a42a7756f371e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:10:12 2009 +0200 winmm: Move the 16bit management of midi stream (for midi out driver type) to the new 16=>32 thunking scheme. --- dlls/winmm/message16.c | 5 +++++ dlls/winmm/mmsystem.c | 33 +++++++++++++++++++++++++-------- dlls/winmm/winemm.h | 3 --- dlls/winmm/winmm.c | 21 +++++---------------- 4 files changed, 35 insertions(+), 27 deletions(-) diff --git a/dlls/winmm/message16.c b/dlls/winmm/message16.c index fc455b4..f2c32e6 100644 --- a/dlls/winmm/message16.c +++ b/dlls/winmm/message16.c @@ -762,6 +762,11 @@ static void MMSYSTDRV_MidiOut_MapCB(UINT uMsg, DWORD_PTR* dwUser, DWORD_PTR* dw mh16->dwOffset = mh32->dwOffset; } break; + case MOM_POSITIONCB: + FIXME("NIY\n"); + /* FIXME: would require to recreate a 16bit MIDIHDR here */ + *dwParam1 = *dwParam2 = 0; + break; default: ERR("Unknown msg %u\n", uMsg); } diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 00a1859..9fd6a84 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -946,7 +946,10 @@ DWORD WINAPI midiInMessage16(HMIDIIN16 hMidiIn, UINT16 uMessage, */ MMRESULT16 WINAPI midiStreamClose16(HMIDISTRM16 hMidiStrm) { - return midiStreamClose(HMIDISTRM_32(hMidiStrm)); + UINT ret = midiStreamClose(HMIDISTRM_32(hMidiStrm)); + if (ret == MMSYSERR_NOERROR) + MMSYSTDRV_CloseHandle((void*)HMIDISTRM_32(hMidiStrm)); + return ret; } /************************************************************************** @@ -956,17 +959,31 @@ MMRESULT16 WINAPI midiStreamOpen16(HMIDISTRM16* phMidiStrm, LPUINT16 devid, DWORD cMidi, DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen) { - HMIDISTRM hMidiStrm32; - MMRESULT ret; - UINT devid32; + HMIDISTRM hMidiStrm32; + MMRESULT ret; + UINT devid32; + struct mmsystdrv_thunk* thunk; if (!phMidiStrm || !devid) return MMSYSERR_INVALPARAM; devid32 = *devid; - ret = MIDI_StreamOpen(&hMidiStrm32, &devid32, cMidi, dwCallback, - dwInstance, fdwOpen, FALSE); - *phMidiStrm = HMIDISTRM_16(hMidiStrm32); - *devid = devid32; + + if (!(thunk = MMSYSTDRV_AddThunk(dwCallback, MMSYSTDRV_MIDIOUT))) + { + return MMSYSERR_NOMEM; + } + if ((fdwOpen & CALLBACK_TYPEMASK) == CALLBACK_FUNCTION) + { + dwCallback = (DWORD)thunk; + } + ret = midiStreamOpen(&hMidiStrm32, &devid32, cMidi, dwCallback, dwInstance, fdwOpen); + if (ret == MMSYSERR_NOERROR) + { + *phMidiStrm = HMIDISTRM_16(hMidiStrm32); + *devid = devid32; + MMSYSTDRV_SetHandle(thunk, hMidiStrm32); + } + else MMSYSTDRV_DeleteThunk(thunk); return ret; } diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 82139c5..4b9621f 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -203,9 +203,6 @@ LPSTR MCI_strdupWtoA(LPCWSTR str); BOOL WINMM_CheckForMMSystem(void); const char* WINMM_ErrorToString(MMRESULT error); -MMRESULT MIDI_StreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, - DWORD cMidi, DWORD_PTR dwCallback, - DWORD_PTR dwInstance, DWORD fdwOpen, BOOL bFrom32); UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType, LPCWAVEFORMATEX lpFormat, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags, BOOL bFrom32); diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 00d25b6..26d0807 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1780,11 +1780,11 @@ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) } /************************************************************************** - * MMSYSTEM_MidiStream_Open [internal] + * midiStreamOpen [WINMM.@] */ -MMRESULT MIDI_StreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, DWORD cMidi, - DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD fdwOpen, - BOOL bFrom32) +MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, + DWORD cMidi, DWORD_PTR dwCallback, + DWORD_PTR dwInstance, DWORD fdwOpen) { WINE_MIDIStream* lpMidiStrm; MMRESULT ret; @@ -1809,7 +1809,7 @@ MMRESULT MIDI_StreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, DWORD cMidi mosm.dwStreamID = (DWORD)lpMidiStrm; /* FIXME: the correct value is not allocated yet for MAPPER */ mosm.wDeviceID = *lpuDeviceID; - lpwm = MIDI_OutAlloc(&hMidiOut, &dwCallback, &dwInstance, &fdwOpen, 1, &mosm, bFrom32); + lpwm = MIDI_OutAlloc(&hMidiOut, &dwCallback, &dwInstance, &fdwOpen, 1, &mosm, TRUE); lpMidiStrm->hDevice = hMidiOut; if (lphMidiStrm) *lphMidiStrm = (HMIDISTRM)hMidiOut; @@ -1848,17 +1848,6 @@ MMRESULT MIDI_StreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, DWORD cMidi } /************************************************************************** - * midiStreamOpen [WINMM.@] - */ -MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, - DWORD cMidi, DWORD_PTR dwCallback, - DWORD_PTR dwInstance, DWORD fdwOpen) -{ - return MIDI_StreamOpen(lphMidiStrm, lpuDeviceID, cMidi, dwCallback, - dwInstance, fdwOpen, TRUE); -} - -/************************************************************************** * midiStreamOut [WINMM.@] */ MMRESULT WINAPI midiStreamOut(HMIDISTRM hMidiStrm, LPMIDIHDR lpMidiHdr,

1 0

Eric Pouech : winmm: Move the 16bit management of wave in driver type to the new 16=> 32 thunking scheme.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 739f3304c8b3b25dc00c64cb0db05cf2749fe39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=739f3304c8b3b25dc00c64cb0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:10:18 2009 +0200 winmm: Move the 16bit management of wave in driver type to the new 16=>32 thunking scheme. --- dlls/winmm/message16.c | 68 ++++++++++++++++++++++++++++++++++------------- dlls/winmm/mmsystem.c | 66 ++++++++++++++++++++++------------------------ 2 files changed, 81 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=739f3304c8b3b25dc00c6…

1 0

Eric Pouech : winmm: Move the 16bit management of wave out driver type to the new 16=> 32 thunking scheme.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 32c170344ae69d53f0446adf8eb660f2bff0b133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c170344ae69d53f0446adf8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:10:25 2009 +0200 winmm: Move the 16bit management of wave out driver type to the new 16=>32 thunking scheme. --- dlls/winmm/message16.c | 67 ++++++++++++++++++++++++++++++++++------------- dlls/winmm/mmsystem.c | 67 +++++++++++++++++++++++------------------------- dlls/winmm/winemm.h | 4 --- dlls/winmm/winmm.c | 20 +++++++------- 4 files changed, 90 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32c170344ae69d53f0446…

1 0

Eric Pouech : winmm: Get rid of the bFrom32 parameter in MMDRV_Alloc and MMDRV_Message.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 69c963c3d162e32f8f07bb3c0383f6c417afba1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=69c963c3d162e32f8f07bb3c0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:10:32 2009 +0200 winmm: Get rid of the bFrom32 parameter in MMDRV_Alloc and MMDRV_Message. --- dlls/winmm/lolvldrv.c | 118 ++++++++++++++++------------------------------ dlls/winmm/message16.c | 56 ++++------------------ dlls/winmm/winemm.h | 5 +- dlls/winmm/winmm.c | 122 +++++++++++++++++++++++------------------------ 4 files changed, 111 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69c963c3d162e32f8f07b…

1 0

Eric Pouech : winmm: Get rid to 16=>32 mappers in winmm (they' re now in mmsystem).
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: c997bd846098fbb3312de44cbe6a6cc95556303f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c997bd846098fbb3312de44cb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:10:41 2009 +0200 winmm: Get rid to 16=>32 mappers in winmm (they're now in mmsystem). --- dlls/winmm/lolvldrv.c | 21 ++++++++------------- dlls/winmm/message16.c | 37 ------------------------------------- dlls/winmm/winemm.h | 3 +-- 3 files changed, 9 insertions(+), 52 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 9540441..ae95c91 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -44,10 +44,8 @@ typedef struct tagWINE_LLTYPE { /* those attributes depend on the specification of the type */ LPCSTR typestr; /* name (for debugging) */ BOOL bSupportMapper; /* if type is allowed to support mapper */ - MMDRV_MAPFUNC Map16To32A; /* those are function pointers to handle */ - MMDRV_UNMAPFUNC UnMap16To32A; /* the parameter conversion (16 vs 32 bit) */ - MMDRV_MAPFUNC Map32ATo16; /* when hi-func (in mmsystem or winmm) and */ - MMDRV_UNMAPFUNC UnMap32ATo16; /* low-func (in .drv) do not match */ + MMDRV_MAPFUNC Map32WTo16; /* when hi-func (in mmsystem or winmm) and */ + MMDRV_UNMAPFUNC UnMap32WTo16; /* low-func (in .drv) do not match */ LPDRVCALLBACK Callback; /* handles callback for a specified type */ /* those attributes reflect the loaded/current situation for the type */ UINT wMaxId; /* number of loaded devices (sum across all loaded drivers) */ @@ -60,7 +58,7 @@ static WINE_MM_DRIVER MMDrvs[8]; static LPWINE_MLD MM_MLDrvs[40]; #define MAX_MM_MLDRVS (sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0])) -#define A(_x,_y) {#_y, _x, NULL, NULL, NULL, NULL, NULL, 0, NULL, -1} +#define A(_x,_y) {#_y, _x, NULL, NULL, NULL, 0, NULL, -1} /* Note: the indices of this array must match the definitions * of the MMDRV_???? manifest constants */ @@ -79,16 +77,13 @@ static WINE_LLTYPE llTypes[MMDRV_MAX] = { * * */ -void MMDRV_InstallMap(unsigned int drv, - MMDRV_MAPFUNC mp1632, MMDRV_UNMAPFUNC um1632, +void MMDRV_InstallMap(unsigned int drv, MMDRV_MAPFUNC mp3216, MMDRV_UNMAPFUNC um3216, LPDRVCALLBACK cb) { assert(drv < MMDRV_MAX); - llTypes[drv].Map16To32A = mp1632; - llTypes[drv].UnMap16To32A = um1632; - llTypes[drv].Map32ATo16 = mp3216; - llTypes[drv].UnMap32ATo16 = um3216; + llTypes[drv].Map32WTo16 = mp3216; + llTypes[drv].UnMap32WTo16 = um3216; llTypes[drv].Callback = cb; } @@ -165,7 +160,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, } else { assert(part->u.fnMessage16 && pFnCallMMDrvFunc16); - map = llType->Map32ATo16(wMsg, &mld->dwDriverInstance, &dwParam1, &dwParam2); + map = llType->Map32WTo16(wMsg, &mld->dwDriverInstance, &dwParam1, &dwParam2); switch (map) { case WINMM_MAP_NOMEM: ret = MMSYSERR_NOMEM; @@ -182,7 +177,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, mld->dwDriverInstance, dwParam1, dwParam2); TRACE("=> %s\n", WINMM_ErrorToString(ret)); if (map == WINMM_MAP_OKMEM) - llType->UnMap32ATo16(wMsg, &mld->dwDriverInstance, &dwParam1, &dwParam2, ret); + llType->UnMap32WTo16(wMsg, &mld->dwDriverInstance, &dwParam1, &dwParam2, ret); break; default: FIXME("NIY\n"); diff --git a/dlls/winmm/message16.c b/dlls/winmm/message16.c index 4692398..d13190e 100644 --- a/dlls/winmm/message16.c +++ b/dlls/winmm/message16.c @@ -67,22 +67,6 @@ static void MMDRV_Callback(LPWINE_MLD mld, HDRVR hDev, UINT uMsg, DWORD_PTR dwP * ================================= */ /************************************************************************** - * MMDRV_Aux_Map16To32W [internal] - */ -static WINMM_MapType MMDRV_Aux_Map16To32W (UINT wMsg, DWORD_PTR *lpdwUser, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) -{ - return WINMM_MAP_MSGERROR; -} - -/************************************************************************** - * MMDRV_Aux_UnMap16To32W [internal] - */ -static WINMM_MapType MMDRV_Aux_UnMap16To32W(UINT wMsg, DWORD_PTR *lpdwUser, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) -{ - return WINMM_MAP_MSGERROR; -} - -/************************************************************************** * MMDRV_Aux_Map32WTo16 [internal] */ static WINMM_MapType MMDRV_Aux_Map32WTo16 (UINT wMsg, DWORD_PTR *lpdwUser, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) @@ -2615,30 +2599,9 @@ static WINMM_MapType MCI_UnMapMsg32WTo16(WORD uDevType, WORD wMsg, DWORD dwFlag return MCI_MsgMapper32WTo16_Destroy((void*)lParam, size, map, kept); } -/* temporary hack */ -static WINMM_MapType MMDRV_Map16To32W (UINT wMsg, DWORD_PTR *lpdwUser, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) -{ - return WINMM_MAP_MSGERROR; -} -static WINMM_MapType MMDRV_UnMap16To32W(UINT wMsg, DWORD_PTR *lpdwUser, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) -{ - return WINMM_MAP_MSGERROR; -} -#define MMDRV_Mixer_Map16To32W MMDRV_Map16To32W -#define MMDRV_Mixer_UnMap16To32W MMDRV_UnMap16To32W -#define MMDRV_MidiIn_Map16To32W MMDRV_Map16To32W -#define MMDRV_MidiIn_UnMap16To32W MMDRV_UnMap16To32W -#define MMDRV_MidiOut_Map16To32W MMDRV_Map16To32W -#define MMDRV_MidiOut_UnMap16To32W MMDRV_UnMap16To32W -#define MMDRV_WaveIn_Map16To32W MMDRV_Map16To32W -#define MMDRV_WaveIn_UnMap16To32W MMDRV_UnMap16To32W -#define MMDRV_WaveOut_Map16To32W MMDRV_Map16To32W -#define MMDRV_WaveOut_UnMap16To32W MMDRV_UnMap16To32W - void MMDRV_Init16(void) { #define A(_x,_y) MMDRV_InstallMap(_x, \ -MMDRV_##_y##_Map16To32W, MMDRV_##_y##_UnMap16To32W, \ MMDRV_##_y##_Map32WTo16, MMDRV_##_y##_UnMap32WTo16, \ MMDRV_##_y##_Callback) A(MMDRV_AUX, Aux); diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 1a2a0c6..8bf2cae 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -191,8 +191,7 @@ LPWINE_MLD MMDRV_GetRelated(HANDLE hndl, UINT srcType, BOOL bSrcCanBeID, UINT ds DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); BOOL MMDRV_Is32(unsigned int); -void MMDRV_InstallMap(unsigned int, MMDRV_MAPFUNC, MMDRV_UNMAPFUNC, - MMDRV_MAPFUNC, MMDRV_UNMAPFUNC, LPDRVCALLBACK); +void MMDRV_InstallMap(unsigned int, MMDRV_MAPFUNC, MMDRV_UNMAPFUNC, LPDRVCALLBACK); const char* MCI_MessageToString(UINT wMsg); DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2);

1 0

Hans Leidekker : msi: Fix calculation of required buffer size in MsiSummaryInfoGetPropertyW.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: e58ebbf3e0e446375399558d93b7120082f34f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58ebbf3e0e446375399558d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 23 10:49:44 2009 +0200 msi: Fix calculation of required buffer size in MsiSummaryInfoGetPropertyW. --- dlls/msi/suminfo.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index d3db44a..df35c4d 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -607,9 +607,8 @@ static UINT get_prop( MSIHANDLE handle, UINT uiProperty, UINT *puiDataType, if( str->unicode ) { - len = MultiByteToWideChar( CP_ACP, 0, prop->u.pszVal, -1, - str->str.w, *pcchValueBuf ); - len--; + len = MultiByteToWideChar( CP_ACP, 0, prop->u.pszVal, -1, NULL, 0 ) - 1; + MultiByteToWideChar( CP_ACP, 0, prop->u.pszVal, -1, str->str.w, *pcchValueBuf ); } else {

1 0

Eric Pouech : winmm: Added partial infrastructure for driver management in mmsystem.c.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 60b652cd4e8d5d9083fc0219edf6ac1ac4c33f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b652cd4e8d5d9083fc0219e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:09:39 2009 +0200 winmm: Added partial infrastructure for driver management in mmsystem.c. --- dlls/winmm/message16.c | 215 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/winmm/mmsystem.c | 4 +- dlls/winmm/winemm16.h | 18 ++++ 3 files changed, 234 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60b652cd4e8d5d9083fc0…

1 0

Eric Pouech : winmm: Use the new 16=>32 thunks for Aux driver type.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: beeac4159572b563c1c27ca31d8fae59f7db53f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beeac4159572b563c1c27ca31… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:09:46 2009 +0200 winmm: Use the new 16=>32 thunks for Aux driver type. --- dlls/winmm/mmsystem.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 4007d46..1549553 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -443,6 +443,11 @@ DWORD WINAPI mixerMessage16(HMIXER16 hmix, UINT16 uMsg, DWORD dwParam1, return mixerMessage(HMIXER_32(hmix), uMsg, dwParam1, dwParam2); } +/* ################################################### + * # AUX # + * ################################################### + */ + /************************************************************************** * auxGetNumDevs [MMSYSTEM.350] */ @@ -451,11 +456,6 @@ UINT16 WINAPI auxGetNumDevs16(void) return auxGetNumDevs(); } -/* ################################################### - * # AUX # - * ################################################### - */ - /************************************************************************** * auxGetDevCaps [MMSYSTEM.351] */ @@ -509,7 +509,7 @@ DWORD WINAPI auxOutMessage16(UINT16 uDeviceID, UINT16 uMessage, DWORD dw1, DWORD /* no argument conversion needed */ break; case AUXDM_GETVOLUME: - return auxGetVolume16(uDeviceID, MapSL(dw1)); + return auxGetVolume(uDeviceID, MapSL(dw1)); case AUXDM_GETDEVCAPS: return auxGetDevCaps16(uDeviceID, MapSL(dw1), dw2); default:

1 0

Eric Pouech : winmm: Move the 16bit management of mixer driver type to the new 16=> 32 thunking scheme.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 8aa64672de41dfb4703901bf7a7ba8149289ddbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa64672de41dfb4703901bf7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:09:52 2009 +0200 winmm: Move the 16bit management of mixer driver type to the new 16=>32 thunking scheme. --- dlls/winmm/message16.c | 33 +++++++++++++++++++++++++++------ dlls/winmm/mmsystem.c | 29 ++++++++++++++++++++++++----- dlls/winmm/winemm.h | 2 -- dlls/winmm/winmm.c | 18 ++++++------------ 4 files changed, 57 insertions(+), 25 deletions(-) diff --git a/dlls/winmm/message16.c b/dlls/winmm/message16.c index fe9e3b6..4bba708 100644 --- a/dlls/winmm/message16.c +++ b/dlls/winmm/message16.c @@ -123,17 +123,17 @@ static void CALLBACK MMDRV_Aux_Callback(HDRVR hDev, UINT uMsg, DWORD_PTR dwInst * ================================= */ /************************************************************************** - * xMMDRV_Mixer_Map16To32W [internal] + * MMSYSTDRV_Mixer_Map16To32W [internal] */ -static WINMM_MapType MMDRV_Mixer_Map16To32W (UINT wMsg, DWORD_PTR *lpdwUser, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) +static MMSYSTEM_MapType MMSYSTDRV_Mixer_Map16To32W (UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) { - return WINMM_MAP_MSGERROR; + return MMSYSTEM_MAP_MSGERROR; } /************************************************************************** - * MMDRV_Mixer_UnMap16To32W [internal] + * MMSYSTDRV_Mixer_UnMap16To32W [internal] */ -static WINMM_MapType MMDRV_Mixer_UnMap16To32W(UINT wMsg, DWORD_PTR *lpdwUser, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) +static MMSYSTEM_MapType MMSYSTDRV_Mixer_UnMap16To32W(UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) { #if 0 MIXERCAPSA micA; @@ -149,7 +149,7 @@ static WINMM_MapType MMDRV_Mixer_UnMap16To32W(UINT wMsg, DWORD_PTR *lpdwUser, D } return ret; #endif - return WINMM_MAP_MSGERROR; + return MMSYSTEM_MAP_MSGERROR; } /************************************************************************** @@ -179,6 +179,14 @@ static void CALLBACK MMDRV_Mixer_Callback(HDRVR hDev, UINT uMsg, DWORD_PTR dwIn MMDRV_Callback(mld, hDev, uMsg, dwParam1, dwParam2); } +/************************************************************************** + * MMSYSTDRV_Mixer_MapCB + */ +static void MMSYSTDRV_Mixer_MapCB(DWORD uMsg, DWORD_PTR* dwUser, DWORD_PTR* dwParam1, DWORD_PTR* dwParam2) +{ + FIXME("NIY\n"); +} + /* ================================= * M I D I I N M A P P E R S * ================================= */ @@ -2525,6 +2533,18 @@ static WINMM_MapType MCI_UnMapMsg32WTo16(WORD uDevType, WORD wMsg, DWORD dwFlag return MCI_MsgMapper32WTo16_Destroy((void*)lParam, size, map, kept); } +/* temporary hack */ +static WINMM_MapType MMDRV_Map16To32W (UINT wMsg, DWORD_PTR *lpdwUser, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2) +{ + return WINMM_MAP_MSGERROR; +} +static WINMM_MapType MMDRV_UnMap16To32W(UINT wMsg, DWORD_PTR *lpdwUser, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret) +{ + return WINMM_MAP_MSGERROR; +} +#define MMDRV_Mixer_Map16To32W MMDRV_Map16To32W +#define MMDRV_Mixer_UnMap16To32W MMDRV_UnMap16To32W + void MMDRV_Init16(void) { #define A(_x,_y) MMDRV_InstallMap(_x, \ @@ -2579,6 +2599,7 @@ static struct MMSYSTDRV_Type MMSYSTDRV_MAPCB mapcb; } MMSYSTEM_DriversType[MMSYSTDRV_MAX] = { + {MMSYSTDRV_Mixer_Map16To32W, MMSYSTDRV_Mixer_UnMap16To32W, MMSYSTDRV_Mixer_MapCB}, }; /****************************************************************** diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 1549553..5c58065 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -248,11 +248,26 @@ UINT16 WINAPI mixerGetDevCaps16(UINT16 uDeviceID, LPMIXERCAPS16 lpCaps, UINT16 WINAPI mixerOpen16(LPHMIXER16 lphmix, UINT16 uDeviceID, DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen) { - HMIXER hmix; - UINT ret; + HMIXER hmix; + UINT ret; + struct mmsystdrv_thunk* thunk; + + if (!(thunk = MMSYSTDRV_AddThunk(dwCallback, MMSYSTDRV_MIXER))) + { + return MMSYSERR_NOMEM; + } + if ((fdwOpen & CALLBACK_TYPEMASK) == CALLBACK_FUNCTION) + { + dwCallback = (DWORD)thunk; + } - ret = MIXER_Open(&hmix, uDeviceID, dwCallback, dwInstance, fdwOpen, FALSE); - if (lphmix) *lphmix = HMIXER_16(hmix); + ret = mixerOpen(&hmix, uDeviceID, dwCallback, dwInstance, fdwOpen); + if (ret == MMSYSERR_NOERROR) + { + if (lphmix) *lphmix = HMIXER_16(hmix); + if (thunk) MMSYSTDRV_SetHandle(thunk, hmix); + } + else MMSYSTDRV_DeleteThunk(thunk); return ret; } @@ -261,7 +276,11 @@ UINT16 WINAPI mixerOpen16(LPHMIXER16 lphmix, UINT16 uDeviceID, DWORD dwCallback, */ UINT16 WINAPI mixerClose16(HMIXER16 hMix) { - return mixerClose(HMIXER_32(hMix)); + UINT ret = mixerClose(HMIXER_32(hMix)); + + if (ret == MMSYSERR_NOERROR) + MMSYSTDRV_CloseHandle((void*)HMIXER_32(hMix)); + return ret; } /************************************************************************** diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 6af5f01..985c03b 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -203,8 +203,6 @@ LPSTR MCI_strdupWtoA(LPCWSTR str); BOOL WINMM_CheckForMMSystem(void); const char* WINMM_ErrorToString(MMRESULT error); -UINT MIXER_Open(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, - DWORD_PTR dwInstance, DWORD fdwOpen, BOOL bFrom32); UINT MIDI_OutOpen(HMIDIOUT* lphMidiOut, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags, BOOL bFrom32); UINT MIDI_InOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, DWORD_PTR dwCallback, diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 0e42df7..f481941 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -325,8 +325,11 @@ static void CALLBACK MIXER_WCallback(HMIXEROBJ hmx, UINT uMsg, DWORD_PTR dwInsta PostMessageW(hWnd, uMsg, (WPARAM)hmx, (LPARAM)dwParam); } -UINT MIXER_Open(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, - DWORD_PTR dwInstance, DWORD fdwOpen, BOOL bFrom32) +/************************************************************************** + * mixerOpen [WINMM.@] + */ +UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, + DWORD_PTR dwInstance, DWORD fdwOpen) { HANDLE hMix; LPWINE_MLD wmld; @@ -361,7 +364,7 @@ UINT MIXER_Open(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, } wmld = MMDRV_Alloc(sizeof(WINE_MIXER), MMDRV_MIXER, &hMix, &fdwOpen, - &dwCallback, &dwInstance, bFrom32); + &dwCallback, &dwInstance, TRUE); wmld->uDeviceID = uDeviceID; mod.hmx = hMix; @@ -378,15 +381,6 @@ UINT MIXER_Open(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, } /************************************************************************** - * mixerOpen [WINMM.@] - */ -UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, - DWORD_PTR dwInstance, DWORD fdwOpen) -{ - return MIXER_Open(lphMix, uDeviceID, dwCallback, dwInstance, fdwOpen, TRUE); -} - -/************************************************************************** * mixerClose [WINMM.@] */ UINT WINAPI mixerClose(HMIXER hMix)

1 0