--- mstools/h/mmsystem.h 2018/08/09 18:21:13 1.1.1.2 +++ mstools/h/mmsystem.h 2018/08/09 18:23:10 1.1.1.3 @@ -47,6 +47,9 @@ Abstract: #ifndef _INC_MMSYSTEM #define _INC_MMSYSTEM +#ifdef __cplusplus +extern "C" { +#endif /* general constants */ #define MAXPNAMELEN 32 // max product name length (including NULL) @@ -220,12 +223,13 @@ typedef DRVCONFIGINFO *LPDRVCONFIG #define DRV_RESTART DRVCNF_RESTART // installable driver function prototypes -LRESULT APIENTRY DrvClose(HDRVR hDriver, LONG lParam1, LONG lParam2); -HDRVR APIENTRY DrvOpen( LPCWSTR szDriverName, LPCWSTR szSectionName, +LRESULT APIENTRY CloseDriver(HDRVR hDriver, LONG lParam1, LONG lParam2); +HDRVR APIENTRY OpenDriver( LPCWSTR szDriverName, LPCWSTR szSectionName, LONG lParam2); -LRESULT APIENTRY DrvSendMessage( HDRVR hDriver, UINT message, LONG lParam1, +LRESULT APIENTRY SendDriverMessage( HDRVR hDriver, UINT message, LONG lParam1, LONG lParam2); -HINSTANCE APIENTRY DrvGetModuleHandle( HDRVR hDriver ); +HMODULE APIENTRY DrvGetModuleHandle( HDRVR hDriver ); +HMODULE APIENTRY GetDriverModuleHandle( HDRVR hDriver ); #define DRV_MCI_FIRST DRV_RESERVED #define DRV_MCI_LAST (DRV_RESERVED + 0xFFF) @@ -312,9 +316,9 @@ UINT APIENTRY mmsystemGetVersion(VOID); BOOL APIENTRY sndPlaySoundA( LPCSTR lpszSoundName, UINT uFlags ); BOOL APIENTRY sndPlaySoundW( LPCWSTR lpszSoundName, UINT uFlags ); #ifdef UNICODE -#define sndPlaySound sndPlaySoundW +#define sndPlaySound sndPlaySoundW #else -#define sndPlaySound sndPlaySoundA +#define sndPlaySound sndPlaySoundA #endif // !UNICODE // flag values for uFlags parameter @@ -375,9 +379,9 @@ BOOL APIENTRY sndPlaySoundW( LPCWSTR lps BOOL APIENTRY PlaySoundA( LPCSTR lpszName, HANDLE hModule, DWORD dwFlags ); BOOL APIENTRY PlaySoundW( LPCWSTR lpszName, HANDLE hModule, DWORD dwFlags ); #ifdef UNICODE -#define PlaySound PlaySoundW +#define PlaySound PlaySoundW #else -#define PlaySound PlaySoundA +#define PlaySound PlaySoundA #endif // !UNICODE #ifndef MMNOWAVE @@ -463,31 +467,31 @@ typedef struct tagWAVEOUTCAPSW { DWORD dwSupport; // functionality supported by driver } WAVEOUTCAPSW; #ifdef UNICODE -#define WAVEOUTCAPS WAVEOUTCAPSW +typedef WAVEOUTCAPSW WAVEOUTCAPS; #else -#define WAVEOUTCAPS WAVEOUTCAPSA +typedef WAVEOUTCAPSA WAVEOUTCAPS; #endif // UNICODE typedef WAVEOUTCAPSA *PWAVEOUTCAPSA; typedef WAVEOUTCAPSW *PWAVEOUTCAPSW; #ifdef UNICODE -#define PWAVEOUTCAPS PWAVEOUTCAPSW +typedef PWAVEOUTCAPSW PWAVEOUTCAPS; #else -#define PWAVEOUTCAPS PWAVEOUTCAPSA +typedef PWAVEOUTCAPSA PWAVEOUTCAPS; #endif // UNICODE typedef WAVEOUTCAPSA *NPWAVEOUTCAPSA; typedef WAVEOUTCAPSW *NPWAVEOUTCAPSW; #ifdef UNICODE -#define NPWAVEOUTCAPS NPWAVEOUTCAPSW +typedef NPWAVEOUTCAPSW NPWAVEOUTCAPS; #else -#define NPWAVEOUTCAPS NPWAVEOUTCAPSA +typedef NPWAVEOUTCAPSA NPWAVEOUTCAPS; #endif // UNICODE typedef WAVEOUTCAPSA *LPWAVEOUTCAPSA; typedef WAVEOUTCAPSW *LPWAVEOUTCAPSW; #ifdef UNICODE -#define LPWAVEOUTCAPS LPWAVEOUTCAPSW +typedef LPWAVEOUTCAPSW LPWAVEOUTCAPS; #else -#define LPWAVEOUTCAPS LPWAVEOUTCAPSA +typedef LPWAVEOUTCAPSA LPWAVEOUTCAPS; #endif // UNICODE // flags for dwSupport field of WAVEOUTCAPS @@ -516,23 +520,23 @@ typedef struct tagWAVEINCAPSW { WORD wChannels; // number of channels supported } WAVEINCAPSW; #ifdef UNICODE -#define WAVEINCAPS WAVEINCAPSW +typedef WAVEINCAPSW WAVEINCAPS; #else -#define WAVEINCAPS WAVEINCAPSA +typedef WAVEINCAPSA WAVEINCAPS; #endif // UNICODE typedef WAVEINCAPSA *PWAVEINCAPSA; typedef WAVEINCAPSW *PWAVEINCAPSW; #ifdef UNICODE -#define PWAVEINCAPS PWAVEINCAPSW +typedef PWAVEINCAPSW PWAVEINCAPS; #else -#define PWAVEINCAPS PWAVEINCAPSA +typedef PWAVEINCAPSA PWAVEINCAPS; #endif // UNICODE typedef WAVEINCAPSA *LPWAVEINCAPSA; typedef WAVEINCAPSW *LPWAVEINCAPSW; #ifdef UNICODE -#define LPWAVEINCAPS LPWAVEINCAPSW +typedef LPWAVEINCAPSW LPWAVEINCAPS; #else -#define LPWAVEINCAPS LPWAVEINCAPSA +typedef LPWAVEINCAPSA LPWAVEINCAPS; #endif // UNICODE // defines for dwFormat field of WAVEINCAPS and WAVEOUTCAPS @@ -590,9 +594,9 @@ MMRESULT APIENTRY waveOutGetDevCapsA(UIN MMRESULT APIENTRY waveOutGetDevCapsW(UINT uDeviceID, LPWAVEOUTCAPSW lpCaps, UINT uSize); #ifdef UNICODE -#define waveOutGetDevCaps waveOutGetDevCapsW +#define waveOutGetDevCaps waveOutGetDevCapsW #else -#define waveOutGetDevCaps waveOutGetDevCapsA +#define waveOutGetDevCaps waveOutGetDevCapsA #endif // !UNICODE MMRESULT APIENTRY waveOutGetVolume(UINT uDeviceID, LPDWORD lpdwVolume); @@ -601,9 +605,9 @@ MMRESULT APIENTRY waveOutSetVolume(UINT MMRESULT APIENTRY waveOutGetErrorTextA(MMRESULT err, LPSTR lpText, UINT uSize); MMRESULT APIENTRY waveOutGetErrorTextW(MMRESULT err, LPWSTR lpText, UINT uSize); #ifdef UNICODE -#define waveOutGetErrorText waveOutGetErrorTextW +#define waveOutGetErrorText waveOutGetErrorTextW #else -#define waveOutGetErrorText waveOutGetErrorTextA +#define waveOutGetErrorText waveOutGetErrorTextA #endif // !UNICODE MMRESULT APIENTRY waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, @@ -634,17 +638,17 @@ MMRESULT APIENTRY waveInGetDevCapsA(UINT MMRESULT APIENTRY waveInGetDevCapsW(UINT uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSize); #ifdef UNICODE -#define waveInGetDevCaps waveInGetDevCapsW +#define waveInGetDevCaps waveInGetDevCapsW #else -#define waveInGetDevCaps waveInGetDevCapsA +#define waveInGetDevCaps waveInGetDevCapsA #endif // !UNICODE MMRESULT APIENTRY waveInGetErrorTextA(MMRESULT err, LPSTR lpText, UINT uSize); MMRESULT APIENTRY waveInGetErrorTextW(MMRESULT err, LPWSTR lpText, UINT uSize); #ifdef UNICODE -#define waveInGetErrorText waveInGetErrorTextW +#define waveInGetErrorText waveInGetErrorTextW #else -#define waveInGetErrorText waveInGetErrorTextA +#define waveInGetErrorText waveInGetErrorTextA #endif // !UNICODE MMRESULT APIENTRY waveInOpen(LPHWAVEIN lphWaveIn, UINT uDeviceID, @@ -744,30 +748,30 @@ typedef struct tagMIDIOUTCAPSW { DWORD dwSupport; // functionality supported by driver } MIDIOUTCAPSW; #ifdef UNICODE -#define MIDIOUTCAPS MIDIOUTCAPSW +typedef MIDIOUTCAPSW MIDIOUTCAPS; #else -#define MIDIOUTCAPS MIDIOUTCAPSA +typedef MIDIOUTCAPSA MIDIOUTCAPS; #endif // UNICODE typedef MIDIOUTCAPSA *PMIDIOUTCAPSA; typedef MIDIOUTCAPSW *PMIDIOUTCAPSW; #ifdef UNICODE -#define PMIDIOUTCAPS PMIDIOUTCAPSW +typedef PMIDIOUTCAPSW PMIDIOUTCAPS; #else -#define PMIDIOUTCAPS PMIDIOUTCAPSA +typedef PMIDIOUTCAPSA PMIDIOUTCAPS; #endif // UNICODE typedef MIDIOUTCAPSA *NPMIDIOUTCAPSA; typedef MIDIOUTCAPSW *NPMIDIOUTCAPSW; #ifdef UNICODE -#define NPMIDIOUTCAPS NPMIDIOUTCAPSW +typedef NPMIDIOUTCAPSW NPMIDIOUTCAPS; #else -#define NPMIDIOUTCAPS NPMIDIOUTCAPSA +typedef NPMIDIOUTCAPSA NPMIDIOUTCAPS; #endif // UNICODE typedef MIDIOUTCAPSA *LPMIDIOUTCAPSA; typedef MIDIOUTCAPSW *LPMIDIOUTCAPSW; #ifdef UNICODE -#define LPMIDIOUTCAPS LPMIDIOUTCAPSW +typedef LPMIDIOUTCAPSW LPMIDIOUTCAPS; #else -#define LPMIDIOUTCAPS LPMIDIOUTCAPSA +typedef LPMIDIOUTCAPSA LPMIDIOUTCAPS; #endif // UNICODE // flags for wTechnology field of MIDIOUTCAPS structure @@ -797,30 +801,30 @@ typedef struct tagMIDIINCAPSW { WCHAR szPname[MAXPNAMELEN]; // product name (NULL terminated string) } MIDIINCAPSW; #ifdef UNICODE -#define MIDIINCAPS MIDIINCAPSW +typedef MIDIINCAPSW MIDIINCAPS; #else -#define MIDIINCAPS MIDIINCAPSA +typedef MIDIINCAPSA MIDIINCAPS; #endif // UNICODE typedef MIDIINCAPSA *PMIDIINCAPSA; typedef MIDIINCAPSW *PMIDIINCAPSW; #ifdef UNICODE -#define PMIDIINCAPS PMIDIINCAPSW +typedef PMIDIINCAPSW PMIDIINCAPS; #else -#define PMIDIINCAPS PMIDIINCAPSA +typedef PMIDIINCAPSA PMIDIINCAPS; #endif // UNICODE typedef MIDIINCAPSA *NPMIDIINCAPSA; typedef MIDIINCAPSW *NPMIDIINCAPSW; #ifdef UNICODE -#define NPMIDIINCAPS NPMIDIINCAPSW +typedef NPMIDIINCAPSW NPMIDIINCAPS; #else -#define NPMIDIINCAPS NPMIDIINCAPSA +typedef NPMIDIINCAPSA NPMIDIINCAPS; #endif // UNICODE typedef MIDIINCAPSA *LPMIDIINCAPSA; typedef MIDIINCAPSW *LPMIDIINCAPSW; #ifdef UNICODE -#define LPMIDIINCAPS LPMIDIINCAPSW +typedef LPMIDIINCAPSW LPMIDIINCAPS; #else -#define LPMIDIINCAPS LPMIDIINCAPSA +typedef LPMIDIINCAPSA LPMIDIINCAPS; #endif // UNICODE // MIDI data block header @@ -851,9 +855,9 @@ MMRESULT APIENTRY midiOutGetDevCapsA(UIN MMRESULT APIENTRY midiOutGetDevCapsW(UINT uDeviceID, LPMIDIOUTCAPSW lpCaps, UINT uSize); #ifdef UNICODE -#define midiOutGetDevCaps midiOutGetDevCapsW +#define midiOutGetDevCaps midiOutGetDevCapsW #else -#define midiOutGetDevCaps midiOutGetDevCapsA +#define midiOutGetDevCaps midiOutGetDevCapsA #endif // !UNICODE MMRESULT APIENTRY midiOutGetVolume(UINT uDeviceID, LPDWORD lpdwVolume); @@ -862,9 +866,9 @@ MMRESULT APIENTRY midiOutSetVolume(UINT MMRESULT APIENTRY midiOutGetErrorTextA(MMRESULT err, LPSTR lpText, UINT uSize); MMRESULT APIENTRY midiOutGetErrorTextW(MMRESULT err, LPWSTR lpText, UINT uSize); #ifdef UNICODE -#define midiOutGetErrorText midiOutGetErrorTextW +#define midiOutGetErrorText midiOutGetErrorTextW #else -#define midiOutGetErrorText midiOutGetErrorTextA +#define midiOutGetErrorText midiOutGetErrorTextA #endif // !UNICODE MMRESULT APIENTRY midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, @@ -893,17 +897,17 @@ MMRESULT APIENTRY midiInGetDevCapsA(UINT MMRESULT APIENTRY midiInGetDevCapsW(UINT uDeviceID, LPMIDIINCAPSW lpCaps, UINT uSize); #ifdef UNICODE -#define midiInGetDevCaps midiInGetDevCapsW +#define midiInGetDevCaps midiInGetDevCapsW #else -#define midiInGetDevCaps midiInGetDevCapsA +#define midiInGetDevCaps midiInGetDevCapsA #endif // !UNICODE MMRESULT APIENTRY midiInGetErrorTextA(MMRESULT err, LPSTR lpText, UINT uSize); MMRESULT APIENTRY midiInGetErrorTextW(MMRESULT err, LPWSTR lpText, UINT uSize); #ifdef UNICODE -#define midiInGetErrorText midiInGetErrorTextW +#define midiInGetErrorText midiInGetErrorTextW #else -#define midiInGetErrorText midiInGetErrorTextA +#define midiInGetErrorText midiInGetErrorTextA #endif // !UNICODE MMRESULT APIENTRY midiInOpen(LPHMIDIIN lphMidiIn, UINT uDeviceID, @@ -954,30 +958,30 @@ typedef struct tagAUXCAPSW { DWORD dwSupport; // functionality supported by driver } AUXCAPSW; #ifdef UNICODE -#define AUXCAPS AUXCAPSW +typedef AUXCAPSW AUXCAPS; #else -#define AUXCAPS AUXCAPSA +typedef AUXCAPSA AUXCAPS; #endif // UNICODE typedef AUXCAPSA *PAUXCAPSA; typedef AUXCAPSW *PAUXCAPSW; #ifdef UNICODE -#define PAUXCAPS PAUXCAPSW +typedef PAUXCAPSW PAUXCAPS; #else -#define PAUXCAPS PAUXCAPSA +typedef PAUXCAPSA PAUXCAPS; #endif // UNICODE typedef AUXCAPSA *NPAUXCAPSA; typedef AUXCAPSW *NPAUXCAPSW; #ifdef UNICODE -#define NPAUXCAPS NPAUXCAPSW +typedef NPAUXCAPSW NPAUXCAPS; #else -#define NPAUXCAPS NPAUXCAPSA +typedef NPAUXCAPSA NPAUXCAPS; #endif // UNICODE typedef AUXCAPSA *LPAUXCAPSA; typedef AUXCAPSW *LPAUXCAPSW; #ifdef UNICODE -#define LPAUXCAPS LPAUXCAPSW +typedef LPAUXCAPSW LPAUXCAPS; #else -#define LPAUXCAPS LPAUXCAPSA +typedef LPAUXCAPSA LPAUXCAPS; #endif // UNICODE // flags for wTechnology field in AUXCAPS structure @@ -993,9 +997,9 @@ UINT APIENTRY auxGetNumDevs(VOID); MMRESULT APIENTRY auxGetDevCapsA(UINT uDeviceID, LPAUXCAPSA lpCaps, UINT uSize); MMRESULT APIENTRY auxGetDevCapsW(UINT uDeviceID, LPAUXCAPSW lpCaps, UINT uSize); #ifdef UNICODE -#define auxGetDevCaps auxGetDevCapsW +#define auxGetDevCaps auxGetDevCapsW #else -#define auxGetDevCaps auxGetDevCapsA +#define auxGetDevCaps auxGetDevCapsA #endif // !UNICODE MMRESULT APIENTRY auxSetVolume(UINT uDeviceID, DWORD dwVolume); @@ -1106,30 +1110,30 @@ typedef struct tagJOYCAPSW { UINT wPeriodMax; // maximum message period when captured } JOYCAPSW; #ifdef UNICODE -#define JOYCAPS JOYCAPSW +typedef JOYCAPSW JOYCAPS; #else -#define JOYCAPS JOYCAPSA +typedef JOYCAPSA JOYCAPS; #endif // UNICODE typedef JOYCAPSA *PJOYCAPSA; typedef JOYCAPSW *PJOYCAPSW; #ifdef UNICODE -#define PJOYCAPS PJOYCAPSW +typedef PJOYCAPSW PJOYCAPS; #else -#define PJOYCAPS PJOYCAPSA +typedef PJOYCAPSA PJOYCAPS; #endif // UNICODE typedef JOYCAPSA *NPJOYCAPSA; typedef JOYCAPSW *NPJOYCAPSW; #ifdef UNICODE -#define NPJOYCAPS NPJOYCAPSW +typedef NPJOYCAPSW NPJOYCAPS; #else -#define NPJOYCAPS NPJOYCAPSA +typedef NPJOYCAPSA NPJOYCAPS; #endif // UNICODE typedef JOYCAPSA *LPJOYCAPSA; typedef JOYCAPSW *LPJOYCAPSW; #ifdef UNICODE -#define LPJOYCAPS LPJOYCAPSW +typedef LPJOYCAPSW LPJOYCAPS; #else -#define LPJOYCAPS LPJOYCAPSA +typedef LPJOYCAPSA LPJOYCAPS; #endif // UNICODE // joystick information data structure @@ -1148,9 +1152,9 @@ MMRESULT APIENTRY joyGetDevCapsA(UINT id // joystick function prototypes MMRESULT APIENTRY joyGetDevCapsW(UINT id, LPJOYCAPSW lpCaps, UINT uSize); #ifdef UNICODE -#define joyGetDevCaps joyGetDevCapsW +#define joyGetDevCaps joyGetDevCapsW #else -#define joyGetDevCaps joyGetDevCapsA +#define joyGetDevCaps joyGetDevCapsA #endif // !UNICODE UINT APIENTRY joyGetNumDevs(VOID); @@ -1337,9 +1341,9 @@ typedef MMCKINFO *LPMMCKINFO; FOURCC APIENTRY mmioStringToFOURCCA(LPCSTR sz, UINT uFlags); FOURCC APIENTRY mmioStringToFOURCCW(LPCWSTR sz, UINT uFlags); #ifdef UNICODE -#define mmioStringToFOURCC mmioStringToFOURCCW +#define mmioStringToFOURCC mmioStringToFOURCCW #else -#define mmioStringToFOURCC mmioStringToFOURCCA +#define mmioStringToFOURCC mmioStringToFOURCCA #endif // !UNICODE LPMMIOPROC APIENTRY mmioInstallIOProcA( FOURCC fccIOProc, LPMMIOPROC pIOProc, @@ -1347,18 +1351,18 @@ LPMMIOPROC APIENTRY mmioInstallIOProcA( LPMMIOPROC APIENTRY mmioInstallIOProcW( FOURCC fccIOProc, LPMMIOPROC pIOProc, DWORD dwFlags); #ifdef UNICODE -#define mmioInstallIOProc mmioInstallIOProcW +#define mmioInstallIOProc mmioInstallIOProcW #else -#define mmioInstallIOProc mmioInstallIOProcA +#define mmioInstallIOProc mmioInstallIOProcA #endif // !UNICODE HMMIO APIENTRY mmioOpenA( LPSTR szFileName, LPMMIOINFO lpmmioinfo, DWORD dwOpenFlags); HMMIO APIENTRY mmioOpenW( LPWSTR szFileName, LPMMIOINFO lpmmioinfo, DWORD dwOpenFlags); #ifdef UNICODE -#define mmioOpen mmioOpenW +#define mmioOpen mmioOpenW #else -#define mmioOpen mmioOpenA +#define mmioOpen mmioOpenA #endif // !UNICODE MMRESULT APIENTRY mmioRenameA( LPCSTR szFileName, LPCSTR szNewFileName, @@ -1366,9 +1370,9 @@ MMRESULT APIENTRY mmioRenameA( LPCSTR sz MMRESULT APIENTRY mmioRenameW( LPCWSTR szFileName, LPCWSTR szNewFileName, LPMMIOINFO lpmmioinfo, DWORD dwRenameFlags); #ifdef UNICODE -#define mmioRename mmioRenameW +#define mmioRename mmioRenameW #else -#define mmioRename mmioRenameA +#define mmioRename mmioRenameA #endif // !UNICODE MMRESULT APIENTRY mmioClose(HMMIO hmmio, UINT uFlags); @@ -1428,9 +1432,9 @@ MCIERROR APIENTRY mciSendCommandW( DWORD dwParam1, DWORD dwParam2 ); #ifdef UNICODE -#define mciSendCommand mciSendCommandW +#define mciSendCommand mciSendCommandW #else -#define mciSendCommand mciSendCommandA +#define mciSendCommand mciSendCommandA #endif // !UNICODE /*--------------------------------------------------------------------*\ @@ -1450,9 +1454,9 @@ MCIERROR APIENTRY mciSendStringW( UINT uReturnLength, HANDLE hwndCallback ); #ifdef UNICODE -#define mciSendString mciSendStringW +#define mciSendString mciSendStringW #else -#define mciSendString mciSendStringA +#define mciSendString mciSendStringA #endif // !UNICODE /*--------------------------------------------------------------------*\ @@ -1473,9 +1477,9 @@ MCIDEVICEID APIENTRY mciGetDeviceIDA( MCIDEVICEID APIENTRY mciGetDeviceIDW( LPCWSTR lpstrName ); #ifdef UNICODE -#define mciGetDeviceID mciGetDeviceIDW +#define mciGetDeviceID mciGetDeviceIDW #else -#define mciGetDeviceID mciGetDeviceIDA +#define mciGetDeviceID mciGetDeviceIDA #endif // !UNICODE /*--------------------------------------------------------------------*\ @@ -1491,29 +1495,29 @@ MCIDEVICEID APIENTRY mciGetDeviceIDFromE DWORD dwElementID, LPCWSTR lpstrType ); #ifdef UNICODE -#define mciGetDeviceIDFromElementID mciGetDeviceIDFromElementIDW +#define mciGetDeviceIDFromElementID mciGetDeviceIDFromElementIDW #else -#define mciGetDeviceIDFromElementID mciGetDeviceIDFromElementIDA +#define mciGetDeviceIDFromElementID mciGetDeviceIDFromElementIDA #endif // !UNICODE /*--------------------------------------------------------------------*\ * mciGetErrorString \*--------------------------------------------------------------------*/ BOOL APIENTRY mciGetErrorStringA( - DWORD dwError, + DWORD dwError, // Should be type==MCIERROR... LPSTR lpstrBuffer, UINT uLength ); /*--------------------------------------------------------------------*\ * mciGetErrorString \*--------------------------------------------------------------------*/ BOOL APIENTRY mciGetErrorStringW( - DWORD dwError, + DWORD dwError, // Should be type==MCIERROR... LPWSTR lpstrBuffer, UINT uLength ); #ifdef UNICODE -#define mciGetErrorString mciGetErrorStringW +#define mciGetErrorString mciGetErrorStringW #else -#define mciGetErrorString mciGetErrorStringA +#define mciGetErrorString mciGetErrorStringA #endif // !UNICODE typedef UINT (*YIELDPROC) (MCIDEVICEID wDeviceID, DWORD dwYieldData); @@ -1675,7 +1679,7 @@ BOOL WINAPI mciExecute (LPCSTR lpstrComm -#define MCI_ALL_DEVICE_ID ((MCIDEVICEID)-1) // Device ids are 16 bits +#define MCI_ALL_DEVICE_ID ((MCIDEVICEID)-1) // Matches all MCI devices // constants for predefined MCI device types //#define MCI_DEVTYPE_VCR (MCI_STRING_OFFSET + 1) @@ -1906,23 +1910,23 @@ typedef struct tagMCI_OPEN_PARMSW { LPCWSTR lpstrAlias; } MCI_OPEN_PARMSW; #ifdef UNICODE -#define MCI_OPEN_PARMS MCI_OPEN_PARMSW +typedef MCI_OPEN_PARMSW MCI_OPEN_PARMS; #else -#define MCI_OPEN_PARMS MCI_OPEN_PARMSA +typedef MCI_OPEN_PARMSA MCI_OPEN_PARMS; #endif // UNICODE typedef MCI_OPEN_PARMSA *PMCI_OPEN_PARMSA; typedef MCI_OPEN_PARMSW *PMCI_OPEN_PARMSW; #ifdef UNICODE -#define PMCI_OPEN_PARMS PMCI_OPEN_PARMSW +typedef PMCI_OPEN_PARMSW PMCI_OPEN_PARMS; #else -#define PMCI_OPEN_PARMS PMCI_OPEN_PARMSA +typedef PMCI_OPEN_PARMSA PMCI_OPEN_PARMS; #endif // UNICODE typedef MCI_OPEN_PARMSA *LPMCI_OPEN_PARMSA; typedef MCI_OPEN_PARMSW *LPMCI_OPEN_PARMSW; #ifdef UNICODE -#define LPMCI_OPEN_PARMS LPMCI_OPEN_PARMSW +typedef LPMCI_OPEN_PARMSW LPMCI_OPEN_PARMS; #else -#define LPMCI_OPEN_PARMS LPMCI_OPEN_PARMSA +typedef LPMCI_OPEN_PARMSA LPMCI_OPEN_PARMS; #endif // UNICODE // parameter block for MCI_PLAY command message @@ -1965,23 +1969,23 @@ typedef struct tagMCI_INFO_PARMSW { DWORD dwRetSize; } MCI_INFO_PARMSW; #ifdef UNICODE -#define MCI_INFO_PARMS MCI_INFO_PARMSW +typedef MCI_INFO_PARMSW MCI_INFO_PARMS; #else -#define MCI_INFO_PARMS MCI_INFO_PARMSA +typedef MCI_INFO_PARMSA MCI_INFO_PARMS; #endif // UNICODE typedef MCI_INFO_PARMSA * PMCI_INFO_PARMSA; typedef MCI_INFO_PARMSW * PMCI_INFO_PARMSW; #ifdef UNICODE -#define PMCI_INFO_PARMS PMCI_INFO_PARMSW +typedef PMCI_INFO_PARMSW PMCI_INFO_PARMS; #else -#define PMCI_INFO_PARMS PMCI_INFO_PARMSA +typedef PMCI_INFO_PARMSA PMCI_INFO_PARMS; #endif // UNICODE typedef MCI_INFO_PARMSA * LPMCI_INFO_PARMSA; typedef MCI_INFO_PARMSW * LPMCI_INFO_PARMSW; #ifdef UNICODE -#define LPMCI_INFO_PARMS LPMCI_INFO_PARMSW +typedef LPMCI_INFO_PARMSW LPMCI_INFO_PARMS; #else -#define LPMCI_INFO_PARMS LPMCI_INFO_PARMSA +typedef LPMCI_INFO_PARMSA LPMCI_INFO_PARMS; #endif // UNICODE // parameter block for MCI_GETDEVCAPS command message @@ -2010,23 +2014,23 @@ typedef struct tagMCI_SYSINFO_PARMSW { UINT wDeviceType; } MCI_SYSINFO_PARMSW; #ifdef UNICODE -#define MCI_SYSINFO_PARMS MCI_SYSINFO_PARMSW +typedef MCI_SYSINFO_PARMSW MCI_SYSINFO_PARMS; #else -#define MCI_SYSINFO_PARMS MCI_SYSINFO_PARMSA +typedef MCI_SYSINFO_PARMSA MCI_SYSINFO_PARMS; #endif // UNICODE typedef MCI_SYSINFO_PARMSA *PMCI_SYSINFO_PARMSA; typedef MCI_SYSINFO_PARMSW *PMCI_SYSINFO_PARMSW; #ifdef UNICODE -#define PMCI_SYSINFO_PARMS PMCI_SYSINFO_PARMSW +typedef PMCI_SYSINFO_PARMSW PMCI_SYSINFO_PARMS; #else -#define PMCI_SYSINFO_PARMS PMCI_SYSINFO_PARMSA +typedef PMCI_SYSINFO_PARMSA PMCI_SYSINFO_PARMS; #endif // UNICODE typedef MCI_SYSINFO_PARMSA *LPMCI_SYSINFO_PARMSA; typedef MCI_SYSINFO_PARMSW *LPMCI_SYSINFO_PARMSW; #ifdef UNICODE -#define LPMCI_SYSINFO_PARMS LPMCI_SYSINFO_PARMSW +typedef LPMCI_SYSINFO_PARMSW LPMCI_SYSINFO_PARMS; #else -#define LPMCI_SYSINFO_PARMS LPMCI_SYSINFO_PARMSA +typedef LPMCI_SYSINFO_PARMSA LPMCI_SYSINFO_PARMS; #endif // UNICODE // parameter block for MCI_SET command message @@ -2058,23 +2062,23 @@ typedef struct tagMCI_SOUND_PARMSW { LPCWSTR lpstrSoundName; } MCI_SOUND_PARMSW; #ifdef UNICODE -#define MCI_SOUND_PARMS MCI_SOUND_PARMSW +typedef MCI_SOUND_PARMSW MCI_SOUND_PARMS; #else -#define MCI_SOUND_PARMS MCI_SOUND_PARMSA +typedef MCI_SOUND_PARMSA MCI_SOUND_PARMS; #endif // UNICODE typedef MCI_SOUND_PARMSA *PMCI_SOUND_PARMSA; typedef MCI_SOUND_PARMSW *PMCI_SOUND_PARMSW; #ifdef UNICODE -#define PMCI_SOUND_PARMS PMCI_SOUND_PARMSW +typedef PMCI_SOUND_PARMSW PMCI_SOUND_PARMS; #else -#define PMCI_SOUND_PARMS PMCI_SOUND_PARMSA +typedef PMCI_SOUND_PARMSA PMCI_SOUND_PARMS; #endif // UNICODE typedef MCI_SOUND_PARMSA *LPMCI_SOUND_PARMSA; typedef MCI_SOUND_PARMSW *LPMCI_SOUND_PARMSW; #ifdef UNICODE -#define LPMCI_SOUND_PARMS LPMCI_SOUND_PARMSW +typedef LPMCI_SOUND_PARMSW LPMCI_SOUND_PARMS; #else -#define LPMCI_SOUND_PARMS LPMCI_SOUND_PARMSA +typedef LPMCI_SOUND_PARMSA LPMCI_SOUND_PARMS; #endif // UNICODE // parameter block for MCI_SAVE command message @@ -2088,23 +2092,23 @@ typedef struct tagMCI_SAVE_PARMSW { LPCWSTR lpfilename; } MCI_SAVE_PARMSW; #ifdef UNICODE -#define MCI_SAVE_PARMS MCI_SAVE_PARMSW +typedef MCI_SAVE_PARMSW MCI_SAVE_PARMS; #else -#define MCI_SAVE_PARMS MCI_SAVE_PARMSA +typedef MCI_SAVE_PARMSA MCI_SAVE_PARMS; #endif // UNICODE typedef MCI_SAVE_PARMSA *PMCI_SAVE_PARMSA; typedef MCI_SAVE_PARMSW *PMCI_SAVE_PARMSW; #ifdef UNICODE -#define PMCI_SAVE_PARMS PMCI_SAVE_PARMSW +typedef PMCI_SAVE_PARMSW PMCI_SAVE_PARMS; #else -#define PMCI_SAVE_PARMS PMCI_SAVE_PARMSA +typedef PMCI_SAVE_PARMSA PMCI_SAVE_PARMS; #endif // UNICODE typedef MCI_SAVE_PARMSA *LPMCI_SAVE_PARMSA; typedef MCI_SAVE_PARMSW *LPMCI_SAVE_PARMSW; #ifdef UNICODE -#define LPMCI_SAVE_PARMS LPMCI_SAVE_PARMSW +typedef LPMCI_SAVE_PARMSW LPMCI_SAVE_PARMS; #else -#define LPMCI_SAVE_PARMS LPMCI_SAVE_PARMSA +typedef LPMCI_SAVE_PARMSA LPMCI_SAVE_PARMS; #endif // UNICODE // parameter block for MCI_LOAD command message @@ -2118,23 +2122,23 @@ typedef struct tagMCI_LOAD_PARMSW { LPCWSTR lpfilename; } MCI_LOAD_PARMSW; #ifdef UNICODE -#define MCI_LOAD_PARMS MCI_LOAD_PARMSW +typedef MCI_LOAD_PARMSW MCI_LOAD_PARMS; #else -#define MCI_LOAD_PARMS MCI_LOAD_PARMSA +typedef MCI_LOAD_PARMSA MCI_LOAD_PARMS; #endif // UNICODE typedef MCI_LOAD_PARMSA *PMCI_LOAD_PARMSA; typedef MCI_LOAD_PARMSW *PMCI_LOAD_PARMSW; #ifdef UNICODE -#define PMCI_LOAD_PARMS PMCI_LOAD_PARMSW +typedef PMCI_LOAD_PARMSW PMCI_LOAD_PARMS; #else -#define PMCI_LOAD_PARMS PMCI_LOAD_PARMSA +typedef PMCI_LOAD_PARMSA PMCI_LOAD_PARMS; #endif // UNICODE typedef MCI_LOAD_PARMSA *LPMCI_LOAD_PARMSA; typedef MCI_LOAD_PARMSW *LPMCI_LOAD_PARMSW; #ifdef UNICODE -#define LPMCI_LOAD_PARMS LPMCI_LOAD_PARMSW +typedef LPMCI_LOAD_PARMSW LPMCI_LOAD_PARMS; #else -#define LPMCI_LOAD_PARMS LPMCI_LOAD_PARMSA +typedef LPMCI_LOAD_PARMSA LPMCI_LOAD_PARMS; #endif // UNICODE // parameter block for MCI_RECORD command message @@ -2232,23 +2236,23 @@ typedef struct tagMCI_VD_ESCAPE_PARMSW { LPCWSTR lpstrCommand; } MCI_VD_ESCAPE_PARMSW; #ifdef UNICODE -#define MCI_VD_ESCAPE_PARMS MCI_VD_ESCAPE_PARMSW +typedef MCI_VD_ESCAPE_PARMSW MCI_VD_ESCAPE_PARMS; #else -#define MCI_VD_ESCAPE_PARMS MCI_VD_ESCAPE_PARMSA +typedef MCI_VD_ESCAPE_PARMSA MCI_VD_ESCAPE_PARMS; #endif // UNICODE typedef MCI_VD_ESCAPE_PARMSA *PMCI_VD_ESCAPE_PARMSA; typedef MCI_VD_ESCAPE_PARMSW *PMCI_VD_ESCAPE_PARMSW; #ifdef UNICODE -#define PMCI_VD_ESCAPE_PARMS PMCI_VD_ESCAPE_PARMSW +typedef PMCI_VD_ESCAPE_PARMSW PMCI_VD_ESCAPE_PARMS; #else -#define PMCI_VD_ESCAPE_PARMS PMCI_VD_ESCAPE_PARMSA +typedef PMCI_VD_ESCAPE_PARMSA PMCI_VD_ESCAPE_PARMS; #endif // UNICODE typedef MCI_VD_ESCAPE_PARMSA *LPMCI_VD_ESCAPE_PARMSA; typedef MCI_VD_ESCAPE_PARMSW *LPMCI_VD_ESCAPE_PARMSW; #ifdef UNICODE -#define LPMCI_VD_ESCAPE_PARMS LPMCI_VD_ESCAPE_PARMSW +typedef LPMCI_VD_ESCAPE_PARMSW LPMCI_VD_ESCAPE_PARMS; #else -#define LPMCI_VD_ESCAPE_PARMS LPMCI_VD_ESCAPE_PARMSA +typedef LPMCI_VD_ESCAPE_PARMSA LPMCI_VD_ESCAPE_PARMS; #endif // UNICODE /***************************************************************************** @@ -2309,23 +2313,23 @@ typedef struct tagMCI_WAVE_OPEN_PARMSW { DWORD dwBufferSeconds; } MCI_WAVE_OPEN_PARMSW; #ifdef UNICODE -#define MCI_WAVE_OPEN_PARMS MCI_WAVE_OPEN_PARMSW +typedef MCI_WAVE_OPEN_PARMSW MCI_WAVE_OPEN_PARMS; #else -#define MCI_WAVE_OPEN_PARMS MCI_WAVE_OPEN_PARMSA +typedef MCI_WAVE_OPEN_PARMSA MCI_WAVE_OPEN_PARMS; #endif // UNICODE typedef MCI_WAVE_OPEN_PARMSA *PMCI_WAVE_OPEN_PARMSA; typedef MCI_WAVE_OPEN_PARMSW *PMCI_WAVE_OPEN_PARMSW; #ifdef UNICODE -#define PMCI_WAVE_OPEN_PARMS PMCI_WAVE_OPEN_PARMSW +typedef PMCI_WAVE_OPEN_PARMSW PMCI_WAVE_OPEN_PARMS; #else -#define PMCI_WAVE_OPEN_PARMS PMCI_WAVE_OPEN_PARMSA +typedef PMCI_WAVE_OPEN_PARMSA PMCI_WAVE_OPEN_PARMS; #endif // UNICODE typedef MCI_WAVE_OPEN_PARMSA *LPMCI_WAVE_OPEN_PARMSA; typedef MCI_WAVE_OPEN_PARMSW *LPMCI_WAVE_OPEN_PARMSW; #ifdef UNICODE -#define LPMCI_WAVE_OPEN_PARMS LPMCI_WAVE_OPEN_PARMSW +typedef LPMCI_WAVE_OPEN_PARMSW LPMCI_WAVE_OPEN_PARMS; #else -#define LPMCI_WAVE_OPEN_PARMS LPMCI_WAVE_OPEN_PARMSA +typedef LPMCI_WAVE_OPEN_PARMSA LPMCI_WAVE_OPEN_PARMS; #endif // UNICODE // parameter block for MCI_DELETE command message @@ -2506,23 +2510,23 @@ typedef struct tagMCI_ANIM_OPEN_PARMSW { HWND hWndParent; } MCI_ANIM_OPEN_PARMSW; #ifdef UNICODE -#define MCI_ANIM_OPEN_PARMS MCI_ANIM_OPEN_PARMSW +typedef MCI_ANIM_OPEN_PARMSW MCI_ANIM_OPEN_PARMS; #else -#define MCI_ANIM_OPEN_PARMS MCI_ANIM_OPEN_PARMSA +typedef MCI_ANIM_OPEN_PARMSA MCI_ANIM_OPEN_PARMS; #endif // UNICODE typedef MCI_ANIM_OPEN_PARMSA *PMCI_ANIM_OPEN_PARMSA; typedef MCI_ANIM_OPEN_PARMSW *PMCI_ANIM_OPEN_PARMSW; #ifdef UNICODE -#define PMCI_ANIM_OPEN_PARMS PMCI_ANIM_OPEN_PARMSW +typedef PMCI_ANIM_OPEN_PARMSW PMCI_ANIM_OPEN_PARMS; #else -#define PMCI_ANIM_OPEN_PARMS PMCI_ANIM_OPEN_PARMSA +typedef PMCI_ANIM_OPEN_PARMSA PMCI_ANIM_OPEN_PARMS; #endif // UNICODE typedef MCI_ANIM_OPEN_PARMSA *LPMCI_ANIM_OPEN_PARMSA; typedef MCI_ANIM_OPEN_PARMSW *LPMCI_ANIM_OPEN_PARMSW; #ifdef UNICODE -#define LPMCI_ANIM_OPEN_PARMS LPMCI_ANIM_OPEN_PARMSW +typedef LPMCI_ANIM_OPEN_PARMSW LPMCI_ANIM_OPEN_PARMS; #else -#define LPMCI_ANIM_OPEN_PARMS LPMCI_ANIM_OPEN_PARMSA +typedef LPMCI_ANIM_OPEN_PARMSA LPMCI_ANIM_OPEN_PARMS; #endif // UNICODE // parameter block for MCI_PLAY command message @@ -2546,35 +2550,35 @@ typedef MCI_ANIM_STEP_PARMS *LPMCI_A // parameter block for MCI_WINDOW command message typedef struct tagMCI_ANIM_WINDOW_PARMSA { DWORD dwCallback; - DWORD hWnd; + HWND hWnd; UINT nCmdShow; LPCSTR lpstrText; } MCI_ANIM_WINDOW_PARMSA; // parameter block for MCI_WINDOW command message typedef struct tagMCI_ANIM_WINDOW_PARMSW { DWORD dwCallback; - DWORD hWnd; + HWND hWnd; UINT nCmdShow; LPCWSTR lpstrText; } MCI_ANIM_WINDOW_PARMSW; #ifdef UNICODE -#define MCI_ANIM_WINDOW_PARMS MCI_ANIM_WINDOW_PARMSW +typedef MCI_ANIM_WINDOW_PARMSW MCI_ANIM_WINDOW_PARMS; #else -#define MCI_ANIM_WINDOW_PARMS MCI_ANIM_WINDOW_PARMSA +typedef MCI_ANIM_WINDOW_PARMSA MCI_ANIM_WINDOW_PARMS; #endif // UNICODE typedef MCI_ANIM_WINDOW_PARMSA * PMCI_ANIM_WINDOW_PARMSA; typedef MCI_ANIM_WINDOW_PARMSW * PMCI_ANIM_WINDOW_PARMSW; #ifdef UNICODE -#define PMCI_ANIM_WINDOW_PARMS PMCI_ANIM_WINDOW_PARMSW +typedef PMCI_ANIM_WINDOW_PARMSW PMCI_ANIM_WINDOW_PARMS; #else -#define PMCI_ANIM_WINDOW_PARMS PMCI_ANIM_WINDOW_PARMSA +typedef PMCI_ANIM_WINDOW_PARMSA PMCI_ANIM_WINDOW_PARMS; #endif // UNICODE typedef MCI_ANIM_WINDOW_PARMSA * LPMCI_ANIM_WINDOW_PARMSA; typedef MCI_ANIM_WINDOW_PARMSW * LPMCI_ANIM_WINDOW_PARMSW; #ifdef UNICODE -#define LPMCI_ANIM_WINDOW_PARMS LPMCI_ANIM_WINDOW_PARMSW +typedef LPMCI_ANIM_WINDOW_PARMSW LPMCI_ANIM_WINDOW_PARMS; #else -#define LPMCI_ANIM_WINDOW_PARMS LPMCI_ANIM_WINDOW_PARMSA +typedef LPMCI_ANIM_WINDOW_PARMSA LPMCI_ANIM_WINDOW_PARMS; #endif // UNICODE // parameter block for MCI_PUT, MCI_UPDATE, MCI_WHERE command messages @@ -2668,23 +2672,23 @@ typedef struct tagMCI_OVLY_OPEN_PARMSW { HWND hWndParent; } MCI_OVLY_OPEN_PARMSW; #ifdef UNICODE -#define MCI_OVLY_OPEN_PARMS MCI_OVLY_OPEN_PARMSW +typedef MCI_OVLY_OPEN_PARMSW MCI_OVLY_OPEN_PARMS; #else -#define MCI_OVLY_OPEN_PARMS MCI_OVLY_OPEN_PARMSA +typedef MCI_OVLY_OPEN_PARMSA MCI_OVLY_OPEN_PARMS; #endif // UNICODE typedef MCI_OVLY_OPEN_PARMSA *PMCI_OVLY_OPEN_PARMSA; typedef MCI_OVLY_OPEN_PARMSW *PMCI_OVLY_OPEN_PARMSW; #ifdef UNICODE -#define PMCI_OVLY_OPEN_PARMS PMCI_OVLY_OPEN_PARMSW +typedef PMCI_OVLY_OPEN_PARMSW PMCI_OVLY_OPEN_PARMS; #else -#define PMCI_OVLY_OPEN_PARMS PMCI_OVLY_OPEN_PARMSA +typedef PMCI_OVLY_OPEN_PARMSA PMCI_OVLY_OPEN_PARMS; #endif // UNICODE typedef MCI_OVLY_OPEN_PARMSA *LPMCI_OVLY_OPEN_PARMSA; typedef MCI_OVLY_OPEN_PARMSW *LPMCI_OVLY_OPEN_PARMSW; #ifdef UNICODE -#define LPMCI_OVLY_OPEN_PARMS LPMCI_OVLY_OPEN_PARMSW +typedef LPMCI_OVLY_OPEN_PARMSW LPMCI_OVLY_OPEN_PARMS; #else -#define LPMCI_OVLY_OPEN_PARMS LPMCI_OVLY_OPEN_PARMSA +typedef LPMCI_OVLY_OPEN_PARMSA LPMCI_OVLY_OPEN_PARMS; #endif // UNICODE // parameter block for MCI_WINDOW command message @@ -2702,23 +2706,23 @@ typedef struct tagMCI_OVLY_WINDOW_PARMSW LPCWSTR lpstrText; } MCI_OVLY_WINDOW_PARMSW; #ifdef UNICODE -#define MCI_OVLY_WINDOW_PARMS MCI_OVLY_WINDOW_PARMSW +typedef MCI_OVLY_WINDOW_PARMSW MCI_OVLY_WINDOW_PARMS; #else -#define MCI_OVLY_WINDOW_PARMS MCI_OVLY_WINDOW_PARMSA +typedef MCI_OVLY_WINDOW_PARMSA MCI_OVLY_WINDOW_PARMS; #endif // UNICODE typedef MCI_OVLY_WINDOW_PARMSA * PMCI_OVLY_WINDOW_PARMSA; typedef MCI_OVLY_WINDOW_PARMSW * PMCI_OVLY_WINDOW_PARMSW; #ifdef UNICODE -#define PMCI_OVLY_WINDOW_PARMS PMCI_OVLY_WINDOW_PARMSW +typedef PMCI_OVLY_WINDOW_PARMSW PMCI_OVLY_WINDOW_PARMS; #else -#define PMCI_OVLY_WINDOW_PARMS PMCI_OVLY_WINDOW_PARMSA +typedef PMCI_OVLY_WINDOW_PARMSA PMCI_OVLY_WINDOW_PARMS; #endif // UNICODE typedef MCI_OVLY_WINDOW_PARMSA * LPMCI_OVLY_WINDOW_PARMSA; typedef MCI_OVLY_WINDOW_PARMSW * LPMCI_OVLY_WINDOW_PARMSW; #ifdef UNICODE -#define LPMCI_OVLY_WINDOW_PARMS LPMCI_OVLY_WINDOW_PARMSW +typedef LPMCI_OVLY_WINDOW_PARMSW LPMCI_OVLY_WINDOW_PARMS; #else -#define LPMCI_OVLY_WINDOW_PARMS LPMCI_OVLY_WINDOW_PARMSA +typedef LPMCI_OVLY_WINDOW_PARMSA LPMCI_OVLY_WINDOW_PARMS; #endif // UNICODE // parameter block for MCI_PUT, MCI_UPDATE, and MCI_WHERE command messages @@ -2747,23 +2751,23 @@ typedef struct tagMCI_OVLY_SAVE_PARMSW { RECT rc; } MCI_OVLY_SAVE_PARMSW; #ifdef UNICODE -#define MCI_OVLY_SAVE_PARMS MCI_OVLY_SAVE_PARMSW +typedef MCI_OVLY_SAVE_PARMSW MCI_OVLY_SAVE_PARMS; #else -#define MCI_OVLY_SAVE_PARMS MCI_OVLY_SAVE_PARMSA +typedef MCI_OVLY_SAVE_PARMSA MCI_OVLY_SAVE_PARMS; #endif // UNICODE typedef MCI_OVLY_SAVE_PARMSA * PMCI_OVLY_SAVE_PARMSA; typedef MCI_OVLY_SAVE_PARMSW * PMCI_OVLY_SAVE_PARMSW; #ifdef UNICODE -#define PMCI_OVLY_SAVE_PARMS PMCI_OVLY_SAVE_PARMSW +typedef PMCI_OVLY_SAVE_PARMSW PMCI_OVLY_SAVE_PARMS; #else -#define PMCI_OVLY_SAVE_PARMS PMCI_OVLY_SAVE_PARMSA +typedef PMCI_OVLY_SAVE_PARMSA PMCI_OVLY_SAVE_PARMS; #endif // UNICODE typedef MCI_OVLY_SAVE_PARMSA * LPMCI_OVLY_SAVE_PARMSA; typedef MCI_OVLY_SAVE_PARMSW * LPMCI_OVLY_SAVE_PARMSW; #ifdef UNICODE -#define LPMCI_OVLY_SAVE_PARMS LPMCI_OVLY_SAVE_PARMSW +typedef LPMCI_OVLY_SAVE_PARMSW LPMCI_OVLY_SAVE_PARMS; #else -#define LPMCI_OVLY_SAVE_PARMS LPMCI_OVLY_SAVE_PARMSA +typedef LPMCI_OVLY_SAVE_PARMSA LPMCI_OVLY_SAVE_PARMS; #endif // UNICODE // parameter block for MCI_LOAD command message @@ -2779,23 +2783,23 @@ typedef struct tagMCI_OVLY_LOAD_PARMSW { RECT rc; } MCI_OVLY_LOAD_PARMSW; #ifdef UNICODE -#define MCI_OVLY_LOAD_PARMS MCI_OVLY_LOAD_PARMSW +typedef MCI_OVLY_LOAD_PARMSW MCI_OVLY_LOAD_PARMS; #else -#define MCI_OVLY_LOAD_PARMS MCI_OVLY_LOAD_PARMSA +typedef MCI_OVLY_LOAD_PARMSA MCI_OVLY_LOAD_PARMS; #endif // UNICODE typedef MCI_OVLY_LOAD_PARMSA * PMCI_OVLY_LOAD_PARMSA; typedef MCI_OVLY_LOAD_PARMSW * PMCI_OVLY_LOAD_PARMSW; #ifdef UNICODE -#define PMCI_OVLY_LOAD_PARMS PMCI_OVLY_LOAD_PARMSW +typedef PMCI_OVLY_LOAD_PARMSW PMCI_OVLY_LOAD_PARMS; #else -#define PMCI_OVLY_LOAD_PARMS PMCI_OVLY_LOAD_PARMSA +typedef PMCI_OVLY_LOAD_PARMSA PMCI_OVLY_LOAD_PARMS; #endif // UNICODE typedef MCI_OVLY_LOAD_PARMSA * LPMCI_OVLY_LOAD_PARMSA; typedef MCI_OVLY_LOAD_PARMSW * LPMCI_OVLY_LOAD_PARMSW; #ifdef UNICODE -#define LPMCI_OVLY_LOAD_PARMS LPMCI_OVLY_LOAD_PARMSW +typedef LPMCI_OVLY_LOAD_PARMSW LPMCI_OVLY_LOAD_PARMS; #else -#define LPMCI_OVLY_LOAD_PARMS LPMCI_OVLY_LOAD_PARMSA +typedef LPMCI_OVLY_LOAD_PARMSA LPMCI_OVLY_LOAD_PARMS; #endif // UNICODE #endif //ifndef MMNOMCI @@ -2808,11 +2812,11 @@ typedef MCI_OVLY_LOAD_PARMSW * LPMCI ****************************************************************************/ #ifndef C1_TRANSPARENT - #define CAPS1 94 // other caps - #define C1_TRANSPARENT 0x0001 // new raster cap - #define NEWTRANSPARENT 3 // use with SetBkMode() +#define CAPS1 94 // other caps +#define C1_TRANSPARENT 0x0001 // new raster cap +#define NEWTRANSPARENT 3 // use with SetBkMode() - #define QUERYROPSUPPORT 40 // use to determine ROP support +#define QUERYROPSUPPORT 40 // use to determine ROP support #endif //ifndef C1_TRANSPARENT /**************************************************************************** @@ -2821,7 +2825,7 @@ typedef MCI_OVLY_LOAD_PARMSW * LPMCI ****************************************************************************/ -#define SELECTDIB 41 // DIB.DRV select dib escape +#define SELECTDIB 41 // DIB.DRV select dib escape #define DIBINDEX(n) MAKELONG((n),0x10FF) @@ -2837,8 +2841,12 @@ typedef MCI_OVLY_LOAD_PARMSW * LPMCI #ifndef SC_SCREENSAVE - #define SC_SCREENSAVE 0xF140 +#define SC_SCREENSAVE 0xF140 #endif //ifndef SC_SCREENSAVE +#ifdef __cplusplus +} +#endif + #endif // _INC_MMSYSTEM