From cd7328672ed61a805ba2856d282a385e5d06d1c0 Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Mon, 1 Dec 2003 22:38:19 +0000 Subject: [PATCH] Move usage of 16 bit specific functions (MapSL) in 16 bit code only. --- dlls/winmm/lolvldrv.c | 26 +++++++------------------- dlls/winmm/mmsystem.c | 8 ++++++-- dlls/winmm/winemm.h | 2 +- dlls/winmm/winmm.c | 6 +++--- 4 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 706dc597fcd..26e06fea038 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -461,25 +461,19 @@ LPWINE_MLD MMDRV_GetRelated(HANDLE hndl, UINT srcType, * MMDRV_PhysicalFeatures [internal] */ UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD dwParam1, - DWORD dwParam2, BOOL bFrom32) + DWORD dwParam2) { WINE_MM_DRIVER* lpDrv = &MMDrvs[mld->mmdIndex]; - TRACE("(%p, %04x, %08lx, %08lx, %d)\n", mld, uMsg, dwParam1, dwParam2, bFrom32); + TRACE("(%p, %04x, %08lx, %08lx)\n", mld, uMsg, dwParam1, dwParam2); /* all those function calls are undocumented */ switch (uMsg) { case DRV_QUERYDRVENTRY: - if (bFrom32) - lstrcpynA((LPSTR)dwParam1, lpDrv->drvname, LOWORD(dwParam2)); - else - lstrcpynA((LPSTR)MapSL(dwParam1), lpDrv->drvname, LOWORD(dwParam2)); + lstrcpynA((LPSTR)dwParam1, lpDrv->drvname, LOWORD(dwParam2)); break; case DRV_QUERYDEVNODE: - if (bFrom32) - *(LPDWORD)dwParam1 = 0L; /* should be DevNode */ - else - *(DWORD*)MapSL(dwParam1) = 0L; + *(LPDWORD)dwParam1 = 0L; /* should be DevNode */ break; case DRV_QUERYNAME: WARN("NIY QueryName\n"); @@ -496,18 +490,12 @@ UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD dwParam1, case DRVM_MAPPER_PREFERRED_GET: /* FIXME: get from registry someday */ - if (bFrom32) { - *((LPDWORD)dwParam1) = -1; /* No preferred device */ - break; - } - return MMSYSERR_INVALPARAM; + *((LPDWORD)dwParam1) = -1; /* No preferred device */ + break; case DRV_QUERYDEVICEINTERFACE: case DRV_QUERYDEVICEINTERFACESIZE: - if (bFrom32) - return MMDRV_Message(mld, uMsg, dwParam1, dwParam2, TRUE); - - return MMSYSERR_INVALPARAM; + return MMDRV_Message(mld, uMsg, dwParam1, dwParam2, TRUE); case DRV_QUERYDSOUNDIFACE: /* Wine-specific: Retrieve DirectSound interface */ case DRV_QUERYDSOUNDDESC: /* Wine-specific: Retrieve DirectSound driver description*/ diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 914d3409ffc..2b29519d555 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -1485,7 +1485,9 @@ DWORD WINAPI waveOutMessage16(HWAVEOUT16 hWaveOut, UINT16 uMessage, if ((wmld = MMDRV_Get(HWAVEOUT_32(hWaveOut), MMDRV_WAVEOUT, FALSE)) == NULL) { if ((wmld = MMDRV_Get(HWAVEOUT_32(hWaveOut), MMDRV_WAVEOUT, TRUE)) != NULL) { - return MMDRV_PhysicalFeatures(wmld, uMessage, dwParam1, dwParam2, FALSE); + if (uMessage == DRV_QUERYDRVENTRY || uMessage == DRV_QUERYDEVNODE) + dwParam1 = (DWORD)MapSL(dwParam1); + return MMDRV_PhysicalFeatures(wmld, uMessage, dwParam1, dwParam2); } return MMSYSERR_INVALHANDLE; } @@ -1726,7 +1728,9 @@ DWORD WINAPI waveInMessage16(HWAVEIN16 hWaveIn, UINT16 uMessage, if ((wmld = MMDRV_Get(HWAVEIN_32(hWaveIn), MMDRV_WAVEIN, FALSE)) == NULL) { if ((wmld = MMDRV_Get(HWAVEIN_32(hWaveIn), MMDRV_WAVEIN, TRUE)) != NULL) { - return MMDRV_PhysicalFeatures(wmld, uMessage, dwParam1, dwParam2, FALSE); + if (uMessage == DRV_QUERYDRVENTRY || uMessage == DRV_QUERYDEVNODE) + dwParam1 = (DWORD)MapSL(dwParam1); + return MMDRV_PhysicalFeatures(wmld, uMessage, dwParam1, dwParam2); } return MMSYSERR_INVALHANDLE; } diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index b721fa6a58b..5045c6a2e77 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -243,7 +243,7 @@ DWORD MMDRV_Close(LPWINE_MLD mld, UINT wMsg); LPWINE_MLD MMDRV_Get(HANDLE hndl, UINT type, BOOL bCanBeID); LPWINE_MLD MMDRV_GetRelated(HANDLE hndl, UINT srcType, BOOL bSrcCanBeID, UINT dstTyped); DWORD MMDRV_Message(LPWINE_MLD mld, WORD wMsg, DWORD dwParam1, DWORD dwParam2, BOOL bFrom32); -UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD dwParam1, DWORD dwParam2, BOOL bFrom32); +UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD dwParam1, DWORD dwParam2); BOOL MMDRV_Is32(unsigned int); void MMDRV_InstallMap(unsigned int, MMDRV_MAPFUNC, MMDRV_UNMAPFUNC, MMDRV_MAPFUNC, MMDRV_UNMAPFUNC, LPDRVCALLBACK); diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 6adf4cf5329..82b4df64aed 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1306,7 +1306,7 @@ UINT WINAPI midiOutMessage(HMIDIOUT hMidiOut, UINT uMessage, return 0; } if ((wmld = MMDRV_Get(hMidiOut, MMDRV_MIDIOUT, TRUE)) != NULL) { - return MMDRV_PhysicalFeatures(wmld, uMessage, dwParam1, dwParam2, TRUE); + return MMDRV_PhysicalFeatures(wmld, uMessage, dwParam1, dwParam2); } return MMSYSERR_INVALHANDLE; } @@ -2619,7 +2619,7 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, if ((wmld = MMDRV_Get(hWaveOut, MMDRV_WAVEOUT, FALSE)) == NULL) { if ((wmld = MMDRV_Get(hWaveOut, MMDRV_WAVEOUT, TRUE)) != NULL) { - return MMDRV_PhysicalFeatures(wmld, uMessage, dwParam1, dwParam2, TRUE); + return MMDRV_PhysicalFeatures(wmld, uMessage, dwParam1, dwParam2); } return MMSYSERR_INVALHANDLE; } @@ -2877,7 +2877,7 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, if ((wmld = MMDRV_Get(hWaveIn, MMDRV_WAVEIN, FALSE)) == NULL) { if ((wmld = MMDRV_Get(hWaveIn, MMDRV_WAVEIN, TRUE)) != NULL) { - return MMDRV_PhysicalFeatures(wmld, uMessage, dwParam1, dwParam2, TRUE); + return MMDRV_PhysicalFeatures(wmld, uMessage, dwParam1, dwParam2); } return MMSYSERR_INVALHANDLE; } -- 2.11.4.GIT