niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implemented DefDriverProc32 from winmm.dll.

Browse source
This commit is contained in:
Turchanov Sergey 1998-10-18 11:22:36 +00:00 • committed by Alexandre Julliard
parent 92c8178a00
commit 86f5d82f2f
9 changed files with 39 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
if1632/user.spec
View file

@ -259,7 +259,7 @@ file user.exe
252 pascal16 OpenDriver(str str long) OpenDriver16 252 pascal16 OpenDriver(str str long) OpenDriver16
253 pascal CloseDriver(word long long) CloseDriver16 253 pascal CloseDriver(word long long) CloseDriver16
254 pascal16 GetDriverModuleHandle(word) GetDriverModuleHandle16 254 pascal16 GetDriverModuleHandle(word) GetDriverModuleHandle16
255 pascal DefDriverProc(long word word long long) DefDriverProc 255 pascal DefDriverProc(long word word long long) DefDriverProc16
256 pascal16 GetDriverInfo(word ptr) GetDriverInfo 256 pascal16 GetDriverInfo(word ptr) GetDriverInfo
257 pascal16 GetNextDriver(word long) GetNextDriver 257 pascal16 GetNextDriver(word long) GetNextDriver
258 pascal16 MapWindowPoints(word word ptr word) MapWindowPoints16 258 pascal16 MapWindowPoints(word word ptr word) MapWindowPoints16

7
include/driver.h
View file

@ -79,8 +79,11 @@ typedef struct tagDRIVERITEM32A {
DRIVERPROC32 driverproc; DRIVERPROC32 driverproc;
} DRIVERITEM32A,*LPDRIVERITEM32A; } DRIVERITEM32A,*LPDRIVERITEM32A;
LRESULT WINAPI DefDriverProc(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg,
LPARAM dwParam1, LPARAM dwParam2); LPARAM dwParam1, LPARAM dwParam2);
LRESULT WINAPI DefDriverProc32(DWORD dwDriverIdentifier, HDRVR32 hdrvr,
UINT32 Msg, LPARAM lParam1, LPARAM lParam2);
#define DefDriverProc WINELIB_NAME(DefDriverProc)
HDRVR16 WINAPI OpenDriver16(LPCSTR szDriverName, LPCSTR szSectionName, HDRVR16 WINAPI OpenDriver16(LPCSTR szDriverName, LPCSTR szSectionName,
LPARAM lParam2); LPARAM lParam2);
HDRVR32 WINAPI OpenDriver32A(LPCSTR szDriverName, LPCSTR szSectionName, HDRVR32 WINAPI OpenDriver32A(LPCSTR szDriverName, LPCSTR szSectionName,

4
multimedia/audio.c
View file

@ -1760,7 +1760,7 @@ LONG WAVE_DriverProc16(DWORD dwDevID, HDRVR16 hDriv, WORD wMsg,
case MCI_PASTE: return MMSYSERR_NOTSUPPORTED; case MCI_PASTE: return MMSYSERR_NOTSUPPORTED;
default: default:
return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); return DefDriverProc16(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
} }
return MMSYSERR_NOTENABLED; return MMSYSERR_NOTENABLED;
} }
@ -1817,7 +1817,7 @@ LONG WAVE_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
default: default:
FIXME(mciwave, "is probably wrong\n"); FIXME(mciwave, "is probably wrong\n");
return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); return DefDriverProc32(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
} }
return MMSYSERR_NOTENABLED; return MMSYSERR_NOTENABLED;
} }

4
multimedia/mcianim.c
View file

@ -570,7 +570,7 @@ LONG ANIM_DriverProc16(DWORD dwDevID, HDRVR16 hDriv, WORD wMsg,
case MCI_PAUSE: return ANIM_mciPause(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)PTR_SEG_TO_LIN(dwParam2)); case MCI_PAUSE: return ANIM_mciPause(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)PTR_SEG_TO_LIN(dwParam2));
case MCI_RESUME: return ANIM_mciResume(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)PTR_SEG_TO_LIN(dwParam2)); case MCI_RESUME: return ANIM_mciResume(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)PTR_SEG_TO_LIN(dwParam2));
case MCI_SEEK: return ANIM_mciSeek(dwDevID, dwParam1, (LPMCI_SEEK_PARMS)PTR_SEG_TO_LIN(dwParam2)); case MCI_SEEK: return ANIM_mciSeek(dwDevID, dwParam1, (LPMCI_SEEK_PARMS)PTR_SEG_TO_LIN(dwParam2));
default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); default: return DefDriverProc16(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
} }
} }
/************************************************************************** /**************************************************************************
@ -603,7 +603,7 @@ LONG ANIM_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
case MCI_PAUSE: return ANIM_mciPause(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); case MCI_PAUSE: return ANIM_mciPause(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2);
case MCI_RESUME: return ANIM_mciResume(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); case MCI_RESUME: return ANIM_mciResume(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2);
case MCI_SEEK: return ANIM_mciSeek(dwDevID, dwParam1, (LPMCI_SEEK_PARMS)dwParam2); case MCI_SEEK: return ANIM_mciSeek(dwDevID, dwParam1, (LPMCI_SEEK_PARMS)dwParam2);
default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); default: return DefDriverProc32(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
} }
} }

4
multimedia/mcicda.c
View file

@ -1075,7 +1075,7 @@ LONG CDAUDIO_DriverProc16(DWORD dwDevID, HDRVR16 hDriv, WORD wMsg,
CDADev[dwDevID].nTracks = 0; CDADev[dwDevID].nTracks = 0;
return 0; return 0;
default: default:
return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); return DefDriverProc16(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
} }
#else #else
return MCIERR_HARDWARE; return MCIERR_HARDWARE;
@ -1133,7 +1133,7 @@ LONG CDAUDIO_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
CDADev[dwDevID].nTracks = 0; CDADev[dwDevID].nTracks = 0;
return 0; return 0;
default: default:
return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); return DefDriverProc32(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
} }
#else #else
return MCIERR_HARDWARE; return MCIERR_HARDWARE;

4
multimedia/midi.c
View file

@ -2662,7 +2662,7 @@ LONG MIDI_DriverProc16(DWORD dwDevID, HDRVR16 hDriv, WORD wMsg,
case MCI_STATUS: return MIDI_mciStatus(dwDevID, dwParam1, (LPMCI_STATUS_PARMS)PTR_SEG_TO_LIN(dwParam2)); case MCI_STATUS: return MIDI_mciStatus(dwDevID, dwParam1, (LPMCI_STATUS_PARMS)PTR_SEG_TO_LIN(dwParam2));
case MCI_GETDEVCAPS: return MIDI_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)PTR_SEG_TO_LIN(dwParam2)); case MCI_GETDEVCAPS: return MIDI_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)PTR_SEG_TO_LIN(dwParam2));
case MCI_INFO: return MIDI_mciInfo(dwDevID, dwParam1, (LPMCI_INFO_PARMS16)PTR_SEG_TO_LIN(dwParam2)); case MCI_INFO: return MIDI_mciInfo(dwDevID, dwParam1, (LPMCI_INFO_PARMS16)PTR_SEG_TO_LIN(dwParam2));
default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); default: return DefDriverProc16(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
} }
} }
@ -2696,7 +2696,7 @@ LONG MIDI_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg,
case MCI_STATUS: return MIDI_mciStatus(dwDevID, dwParam1, (LPMCI_STATUS_PARMS)dwParam2); case MCI_STATUS: return MIDI_mciStatus(dwDevID, dwParam1, (LPMCI_STATUS_PARMS)dwParam2);
case MCI_GETDEVCAPS: return MIDI_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2); case MCI_GETDEVCAPS: return MIDI_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2);
case MCI_INFO: return MIDI_mciInfo(dwDevID, dwParam1, (LPMCI_INFO_PARMS16)dwParam2); case MCI_INFO: return MIDI_mciInfo(dwDevID, dwParam1, (LPMCI_INFO_PARMS16)dwParam2);
default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); default: return DefDriverProc32(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
} }
} }
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/

22
multimedia/mmsystem.c
View file

@ -4262,7 +4262,27 @@ HANDLE16 WINAPI DrvGetModuleHandle16(HDRVR16 hDrvr)
LRESULT WINAPI DrvDefDriverProc(DWORD dwDriverID, HDRVR16 hDriv, WORD wMsg, LRESULT WINAPI DrvDefDriverProc(DWORD dwDriverID, HDRVR16 hDriv, WORD wMsg,
DWORD dwParam1, DWORD dwParam2) DWORD dwParam1, DWORD dwParam2)
{ {
return DefDriverProc(dwDriverID, hDriv, wMsg, dwParam1, dwParam2); return DefDriverProc16(dwDriverID, hDriv, wMsg, dwParam1, dwParam2);
}
/**************************************************************************
* DefDriverProc32 [WINMM.5]
*/
LRESULT WINAPI DefDriverProc32(DWORD dwDriverIdentifier, HDRVR32 hdrvr,
UINT32 Msg, LPARAM lParam1, LPARAM lParam2)
{
switch (Msg) {
case DRV_LOAD:
case DRV_DISABLE:
case DRV_INSTALL:
return 0;
case DRV_ENABLE:
case DRV_FREE:
case DRV_REMOVE:
return 1;
default:
return 0;
}
} }
/************************************************************************** /**************************************************************************

2
relay32/winmm.spec
View file

@ -5,7 +5,7 @@ type win32
2 stdcall WINMM_2(ptr long long) PlaySound32A 2 stdcall WINMM_2(ptr long long) PlaySound32A
3 stub WINMM_3 3 stub WINMM_3
4 stub CloseDriver 4 stub CloseDriver
5 stdcall DefDriverProc(long long long long long) DefDriverProc 5 stdcall DefDriverProc(long long long long long) DefDriverProc32
6 stub DriverCallback 6 stub DriverCallback
7 stub DrvClose 7 stub DrvClose
8 stub DrvDefDriverProc 8 stub DrvDefDriverProc

6
windows/driver.c
View file

@ -335,10 +335,10 @@ HMODULE32 WINAPI GetDriverModuleHandle32(HDRVR32 hDrvr)
} }
/************************************************************************** /**************************************************************************
* DefDriverProc [USER.255] * DefDriverProc16 [USER.255]
*/ */
LRESULT WINAPI DefDriverProc(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg,
LPARAM lParam1, LPARAM lParam2) LPARAM lParam1, LPARAM lParam2)
{ {
switch(wMsg) switch(wMsg)
{ {