[PATCH] include: Fix numeric constants in mmsystem.h for LLP64 compilers.

Michael Stefaniuc mstefani at redhat.de
Fri Oct 28 09:25:54 CDT 2011


Fixup for 5439aede62e40511703784eca5d01b16678b680a
---
 include/mmsystem.h |  516 ++++++++++++++++++++++++++--------------------------
 1 files changed, 258 insertions(+), 258 deletions(-)

diff --git a/include/mmsystem.h b/include/mmsystem.h
index 5178bf0..60d93e3 100644
--- a/include/mmsystem.h
+++ b/include/mmsystem.h
@@ -177,13 +177,13 @@ typedef struct mmtime_tag {
 #define MMSYSERR_MOREDATA     (MMSYSERR_BASE + 21)
 #define MMSYSERR_LASTERROR    (MMSYSERR_BASE + 21)
 
-#define CALLBACK_TYPEMASK       0x00070000      /* callback type mask */
-#define CALLBACK_NULL           0x00000000      /* no callback */
-#define CALLBACK_WINDOW         0x00010000      /* dwCallback is a HWND */
-#define CALLBACK_TASK           0x00020000      /* dwCallback is a HTASK */
+#define CALLBACK_TYPEMASK       __MSABI_LONG(0x00070000)      /* callback type mask */
+#define CALLBACK_NULL           __MSABI_LONG(0x00000000)      /* no callback */
+#define CALLBACK_WINDOW         __MSABI_LONG(0x00010000)      /* dwCallback is a HWND */
+#define CALLBACK_TASK           __MSABI_LONG(0x00020000)      /* dwCallback is a HTASK */
 #define CALLBACK_THREAD		(CALLBACK_TASK)	/* dwCallback is a thread ID */
-#define CALLBACK_FUNCTION       0x00030000      /* dwCallback is a FARPROC */
-#define CALLBACK_EVENT          0x00050000      /* dwCallback is an EVENT Handler */
+#define CALLBACK_FUNCTION       __MSABI_LONG(0x00030000)      /* dwCallback is a FARPROC */
+#define CALLBACK_EVENT          __MSABI_LONG(0x00050000)      /* dwCallback is an EVENT Handler */
 
 #define DRV_LOAD                0x0001
 #define DRV_ENABLE              0x0002
@@ -279,13 +279,13 @@ BOOL 		WINAPI 	PlaySoundW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound);
 #define SND_LOOP            	0x0008  /* loop the sound until next sndPlaySound */
 #define SND_NOSTOP          	0x0010  /* don't stop any currently playing sound */
 
-#define SND_NOWAIT              0x00002000 /* don't wait if the driver is busy */
-#define SND_ALIAS               0x00010000 /* name is a registry alias */
-#define SND_ALIAS_ID            0x00110000 /* alias is a predefined ID */
-#define SND_FILENAME            0x00020000 /* name is file name */
-#define SND_RESOURCE            0x00040004 /* name is resource name or atom */
-#define SND_PURGE               0x00000040 /* purge all sounds */
-#define SND_APPLICATION         0x00000080 /* look for application specific association */
+#define SND_NOWAIT              __MSABI_LONG(0x00002000) /* don't wait if the driver is busy */
+#define SND_ALIAS               __MSABI_LONG(0x00010000) /* name is a registry alias */
+#define SND_ALIAS_ID            __MSABI_LONG(0x00110000) /* alias is a predefined ID */
+#define SND_FILENAME            __MSABI_LONG(0x00020000) /* name is file name */
+#define SND_RESOURCE            __MSABI_LONG(0x00040004) /* name is resource name or atom */
+#define SND_PURGE               __MSABI_LONG(0x00000040) /* purge all sounds */
+#define SND_APPLICATION         __MSABI_LONG(0x00000080) /* look for application specific association */
 
 #define SND_ALIAS_START         0
 
@@ -584,7 +584,7 @@ typedef WORD *LPKEYARRAY;
 #define MIDI_MAPPER    (-1)
 
 /* Only on Win95 and up */
-#define MIDI_IO_STATUS 0x00000020
+#define MIDI_IO_STATUS __MSABI_LONG(0x00000020)
 
 /* flags for wFlags parm of
 	midiOutCachePatches(),
@@ -758,9 +758,9 @@ typedef struct midievent_tag {
 #define MEVT_EVENTTYPE(x) ((BYTE) (((x)>>24)&0xFF))
 #define MEVT_EVENTPARM(x) ((DWORD) ((x)&0x00FFFFFF))
 
-#define MEVT_F_CALLBACK 0x40000000
-#define MEVT_F_LONG     0x80000000
-#define MEVT_F_SHORT    0x00000000
+#define MEVT_F_CALLBACK __MSABI_LONG(0x40000000)
+#define MEVT_F_LONG     __MSABI_LONG(0x80000000)
+#define MEVT_F_SHORT    __MSABI_LONG(0x00000000)
 #define	MEVT_COMMENT	((BYTE)0x82)
 #define	MEVT_LONGMSG	((BYTE)0x80)
 #define	MEVT_NOP	((BYTE)0x02)
@@ -1188,22 +1188,22 @@ DECL_WINELIB_TYPE_AW(LPMIXERCAPS2)
 #define	MIXERLINE_LINEF_SOURCE		0x80000000
 
 /* Mixer flags */
-#define MIXER_OBJECTF_HANDLE    0x80000000
-#define MIXER_OBJECTF_MIXER     0x00000000
+#define MIXER_OBJECTF_HANDLE    __MSABI_LONG(0x80000000)
+#define MIXER_OBJECTF_MIXER     __MSABI_LONG(0x00000000)
 #define MIXER_OBJECTF_HMIXER	(MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIXER)
-#define MIXER_OBJECTF_WAVEOUT   0x10000000
+#define MIXER_OBJECTF_WAVEOUT   __MSABI_LONG(0x10000000)
 #define MIXER_OBJECTF_HWAVEOUT	(MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_WAVEOUT)
-#define MIXER_OBJECTF_WAVEIN    0x20000000
+#define MIXER_OBJECTF_WAVEIN    __MSABI_LONG(0x20000000)
 #define MIXER_OBJECTF_HWAVEIN	(MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_WAVEIN)
-#define MIXER_OBJECTF_MIDIOUT   0x30000000
+#define MIXER_OBJECTF_MIDIOUT   __MSABI_LONG(0x30000000)
 #define MIXER_OBJECTF_HMIDIOUT	(MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIDIOUT)
-#define MIXER_OBJECTF_MIDIIN    0x40000000
+#define MIXER_OBJECTF_MIDIIN    __MSABI_LONG(0x40000000)
 #define MIXER_OBJECTF_HMIDIIN	(MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIDIIN)
-#define MIXER_OBJECTF_AUX       0x50000000
+#define MIXER_OBJECTF_AUX       __MSABI_LONG(0x50000000)
 
 /*  MIXERLINE.dwComponentType */
 /*  component types for destinations and sources */
-#define MIXERLINE_COMPONENTTYPE_DST_FIRST       0x00000000
+#define MIXERLINE_COMPONENTTYPE_DST_FIRST       __MSABI_LONG(0x00000000)
 #define	MIXERLINE_COMPONENTTYPE_DST_UNDEFINED	(MIXERLINE_COMPONENTTYPE_DST_FIRST + 0)
 #define	MIXERLINE_COMPONENTTYPE_DST_DIGITAL	(MIXERLINE_COMPONENTTYPE_DST_FIRST + 1)
 #define	MIXERLINE_COMPONENTTYPE_DST_LINE	(MIXERLINE_COMPONENTTYPE_DST_FIRST + 2)
@@ -1215,7 +1215,7 @@ DECL_WINELIB_TYPE_AW(LPMIXERCAPS2)
 #define	MIXERLINE_COMPONENTTYPE_DST_VOICEIN	(MIXERLINE_COMPONENTTYPE_DST_FIRST + 8)
 #define	MIXERLINE_COMPONENTTYPE_DST_LAST	(MIXERLINE_COMPONENTTYPE_DST_FIRST + 8)
 
-#define MIXERLINE_COMPONENTTYPE_SRC_FIRST       0x00001000
+#define MIXERLINE_COMPONENTTYPE_SRC_FIRST       __MSABI_LONG(0x00001000)
 #define	MIXERLINE_COMPONENTTYPE_SRC_UNDEFINED	(MIXERLINE_COMPONENTTYPE_SRC_FIRST + 0)
 #define	MIXERLINE_COMPONENTTYPE_SRC_DIGITAL	(MIXERLINE_COMPONENTTYPE_SRC_FIRST + 1)
 #define	MIXERLINE_COMPONENTTYPE_SRC_LINE	(MIXERLINE_COMPONENTTYPE_SRC_FIRST + 2)
@@ -1287,41 +1287,41 @@ DECL_WINELIB_TYPE_AW(MIXERLINE)
 DECL_WINELIB_TYPE_AW(LPMIXERLINE)
 
 /*  MIXERCONTROL.fdwControl */
-#define MIXERCONTROL_CONTROLF_UNIFORM           0x00000001
-#define MIXERCONTROL_CONTROLF_MULTIPLE          0x00000002
-#define MIXERCONTROL_CONTROLF_DISABLED          0x80000000
+#define MIXERCONTROL_CONTROLF_UNIFORM           __MSABI_LONG(0x00000001)
+#define MIXERCONTROL_CONTROLF_MULTIPLE          __MSABI_LONG(0x00000002)
+#define MIXERCONTROL_CONTROLF_DISABLED          __MSABI_LONG(0x80000000)
 
 /*  MIXERCONTROL_CONTROLTYPE_xxx building block defines */
-#define MIXERCONTROL_CT_CLASS_MASK              0xF0000000
-#define MIXERCONTROL_CT_CLASS_CUSTOM            0x00000000
-#define MIXERCONTROL_CT_CLASS_METER             0x10000000
-#define MIXERCONTROL_CT_CLASS_SWITCH            0x20000000
-#define MIXERCONTROL_CT_CLASS_NUMBER            0x30000000
-#define MIXERCONTROL_CT_CLASS_SLIDER            0x40000000
-#define MIXERCONTROL_CT_CLASS_FADER             0x50000000
-#define MIXERCONTROL_CT_CLASS_TIME              0x60000000
-#define MIXERCONTROL_CT_CLASS_LIST              0x70000000
+#define MIXERCONTROL_CT_CLASS_MASK              __MSABI_LONG(0xF0000000)
+#define MIXERCONTROL_CT_CLASS_CUSTOM            __MSABI_LONG(0x00000000)
+#define MIXERCONTROL_CT_CLASS_METER             __MSABI_LONG(0x10000000)
+#define MIXERCONTROL_CT_CLASS_SWITCH            __MSABI_LONG(0x20000000)
+#define MIXERCONTROL_CT_CLASS_NUMBER            __MSABI_LONG(0x30000000)
+#define MIXERCONTROL_CT_CLASS_SLIDER            __MSABI_LONG(0x40000000)
+#define MIXERCONTROL_CT_CLASS_FADER             __MSABI_LONG(0x50000000)
+#define MIXERCONTROL_CT_CLASS_TIME              __MSABI_LONG(0x60000000)
+#define MIXERCONTROL_CT_CLASS_LIST              __MSABI_LONG(0x70000000)
 
-#define MIXERCONTROL_CT_SUBCLASS_MASK           0x0F000000
+#define MIXERCONTROL_CT_SUBCLASS_MASK           __MSABI_LONG(0x0F000000)
 
-#define MIXERCONTROL_CT_SC_SWITCH_BOOLEAN       0x00000000
-#define MIXERCONTROL_CT_SC_SWITCH_BUTTON        0x01000000
+#define MIXERCONTROL_CT_SC_SWITCH_BOOLEAN       __MSABI_LONG(0x00000000)
+#define MIXERCONTROL_CT_SC_SWITCH_BUTTON        __MSABI_LONG(0x01000000)
 
-#define MIXERCONTROL_CT_SC_METER_POLLED         0x00000000
+#define MIXERCONTROL_CT_SC_METER_POLLED         __MSABI_LONG(0x00000000)
 
-#define MIXERCONTROL_CT_SC_TIME_MICROSECS       0x00000000
-#define MIXERCONTROL_CT_SC_TIME_MILLISECS       0x01000000
+#define MIXERCONTROL_CT_SC_TIME_MICROSECS       __MSABI_LONG(0x00000000)
+#define MIXERCONTROL_CT_SC_TIME_MILLISECS       __MSABI_LONG(0x01000000)
 
-#define MIXERCONTROL_CT_SC_LIST_SINGLE          0x00000000
-#define MIXERCONTROL_CT_SC_LIST_MULTIPLE        0x01000000
+#define MIXERCONTROL_CT_SC_LIST_SINGLE          __MSABI_LONG(0x00000000)
+#define MIXERCONTROL_CT_SC_LIST_MULTIPLE        __MSABI_LONG(0x01000000)
 
-#define MIXERCONTROL_CT_UNITS_MASK              0x00FF0000
-#define MIXERCONTROL_CT_UNITS_CUSTOM            0x00000000
-#define MIXERCONTROL_CT_UNITS_BOOLEAN           0x00010000
-#define MIXERCONTROL_CT_UNITS_SIGNED            0x00020000
-#define MIXERCONTROL_CT_UNITS_UNSIGNED          0x00030000
-#define MIXERCONTROL_CT_UNITS_DECIBELS          0x00040000 /* in 10ths */
-#define MIXERCONTROL_CT_UNITS_PERCENT           0x00050000 /* in 10ths */
+#define MIXERCONTROL_CT_UNITS_MASK              __MSABI_LONG(0x00FF0000)
+#define MIXERCONTROL_CT_UNITS_CUSTOM            __MSABI_LONG(0x00000000)
+#define MIXERCONTROL_CT_UNITS_BOOLEAN           __MSABI_LONG(0x00010000)
+#define MIXERCONTROL_CT_UNITS_SIGNED            __MSABI_LONG(0x00020000)
+#define MIXERCONTROL_CT_UNITS_UNSIGNED          __MSABI_LONG(0x00030000)
+#define MIXERCONTROL_CT_UNITS_DECIBELS          __MSABI_LONG(0x00040000) /* in 10ths */
+#define MIXERCONTROL_CT_UNITS_PERCENT           __MSABI_LONG(0x00050000) /* in 10ths */
 
 /*  Commonly used control types for specifying MIXERCONTROL.dwControlType */
 #define MIXERCONTROL_CONTROLTYPE_CUSTOM		(MIXERCONTROL_CT_CLASS_CUSTOM | MIXERCONTROL_CT_UNITS_CUSTOM)
@@ -1480,28 +1480,28 @@ typedef struct {
 } MIXERCONTROLDETAILS_UNSIGNED,*LPMIXERCONTROLDETAILS_UNSIGNED;
 
 /* bits passed to mixerGetLineInfo.fdwInfo */
-#define MIXER_GETLINEINFOF_DESTINATION          0x00000000
-#define MIXER_GETLINEINFOF_SOURCE               0x00000001
-#define MIXER_GETLINEINFOF_LINEID               0x00000002
-#define MIXER_GETLINEINFOF_COMPONENTTYPE        0x00000003
-#define MIXER_GETLINEINFOF_TARGETTYPE           0x00000004
-#define MIXER_GETLINEINFOF_QUERYMASK            0x0000000F
+#define MIXER_GETLINEINFOF_DESTINATION          __MSABI_LONG(0x00000000)
+#define MIXER_GETLINEINFOF_SOURCE               __MSABI_LONG(0x00000001)
+#define MIXER_GETLINEINFOF_LINEID               __MSABI_LONG(0x00000002)
+#define MIXER_GETLINEINFOF_COMPONENTTYPE        __MSABI_LONG(0x00000003)
+#define MIXER_GETLINEINFOF_TARGETTYPE           __MSABI_LONG(0x00000004)
+#define MIXER_GETLINEINFOF_QUERYMASK            __MSABI_LONG(0x0000000F)
 
 /* bitmask passed to mixerGetLineControl */
-#define MIXER_GETLINECONTROLSF_ALL              0x00000000
-#define MIXER_GETLINECONTROLSF_ONEBYID          0x00000001
-#define MIXER_GETLINECONTROLSF_ONEBYTYPE        0x00000002
-#define MIXER_GETLINECONTROLSF_QUERYMASK        0x0000000F
+#define MIXER_GETLINECONTROLSF_ALL              __MSABI_LONG(0x00000000)
+#define MIXER_GETLINECONTROLSF_ONEBYID          __MSABI_LONG(0x00000001)
+#define MIXER_GETLINECONTROLSF_ONEBYTYPE        __MSABI_LONG(0x00000002)
+#define MIXER_GETLINECONTROLSF_QUERYMASK        __MSABI_LONG(0x0000000F)
 
 /* bitmask passed to mixerGetControlDetails */
-#define MIXER_GETCONTROLDETAILSF_VALUE          0x00000000
-#define MIXER_GETCONTROLDETAILSF_LISTTEXT       0x00000001
-#define MIXER_GETCONTROLDETAILSF_QUERYMASK      0x0000000F
+#define MIXER_GETCONTROLDETAILSF_VALUE          __MSABI_LONG(0x00000000)
+#define MIXER_GETCONTROLDETAILSF_LISTTEXT       __MSABI_LONG(0x00000001)
+#define MIXER_GETCONTROLDETAILSF_QUERYMASK      __MSABI_LONG(0x0000000F)
 
 /* bitmask passed to mixerSetControlDetails */
-#define MIXER_SETCONTROLDETAILSF_VALUE          0x00000000
-#define MIXER_SETCONTROLDETAILSF_CUSTOM         0x00000001
-#define MIXER_SETCONTROLDETAILSF_QUERYMASK      0x0000000F
+#define MIXER_SETCONTROLDETAILSF_VALUE          __MSABI_LONG(0x00000000)
+#define MIXER_SETCONTROLDETAILSF_CUSTOM         __MSABI_LONG(0x00000001)
+#define MIXER_SETCONTROLDETAILSF_QUERYMASK      __MSABI_LONG(0x0000000F)
 
 UINT		WINAPI	mixerGetNumDevs(void);
 UINT           WINAPI  mixerOpen(LPHMIXER,UINT,DWORD_PTR,DWORD_PTR,DWORD);
@@ -1882,82 +1882,82 @@ YIELDPROC       WINAPI  mciGetYieldProc(MCIDEVICEID,DWORD*);
 #define MCI_NOTIFY_ABORTED              0x0004
 #define MCI_NOTIFY_FAILURE              0x0008
 
-#define MCI_NOTIFY                      0x00000001
-#define MCI_WAIT                        0x00000002
-#define MCI_FROM                        0x00000004
-#define MCI_TO                          0x00000008
-#define MCI_TRACK                       0x00000010
-
-#define MCI_OPEN_SHAREABLE              0x00000100
-#define MCI_OPEN_ELEMENT                0x00000200
-#define MCI_OPEN_ALIAS                  0x00000400
-#define MCI_OPEN_ELEMENT_ID             0x00000800
-#define MCI_OPEN_TYPE_ID                0x00001000
-#define MCI_OPEN_TYPE                   0x00002000
-
-#define MCI_SEEK_TO_START               0x00000100
-#define MCI_SEEK_TO_END                 0x00000200
-
-#define MCI_STATUS_ITEM                 0x00000100
-#define MCI_STATUS_START                0x00000200
-
-#define MCI_STATUS_LENGTH               0x00000001
-#define MCI_STATUS_POSITION             0x00000002
-#define MCI_STATUS_NUMBER_OF_TRACKS     0x00000003
-#define MCI_STATUS_MODE                 0x00000004
-#define MCI_STATUS_MEDIA_PRESENT        0x00000005
-#define MCI_STATUS_TIME_FORMAT          0x00000006
-#define MCI_STATUS_READY                0x00000007
-#define MCI_STATUS_CURRENT_TRACK        0x00000008
-
-#define MCI_INFO_PRODUCT                0x00000100
-#define MCI_INFO_FILE                   0x00000200
-#define MCI_INFO_MEDIA_UPC              0x00000400
-#define MCI_INFO_MEDIA_IDENTITY         0x00000800
-#define MCI_INFO_NAME                   0x00001000
-#define MCI_INFO_COPYRIGHT              0x00002000
-
-#define MCI_GETDEVCAPS_ITEM             0x00000100
-
-#define MCI_GETDEVCAPS_CAN_RECORD       0x00000001
-#define MCI_GETDEVCAPS_HAS_AUDIO        0x00000002
-#define MCI_GETDEVCAPS_HAS_VIDEO        0x00000003
-#define MCI_GETDEVCAPS_DEVICE_TYPE      0x00000004
-#define MCI_GETDEVCAPS_USES_FILES       0x00000005
-#define MCI_GETDEVCAPS_COMPOUND_DEVICE  0x00000006
-#define MCI_GETDEVCAPS_CAN_EJECT        0x00000007
-#define MCI_GETDEVCAPS_CAN_PLAY         0x00000008
-#define MCI_GETDEVCAPS_CAN_SAVE         0x00000009
-
-#define MCI_SYSINFO_QUANTITY            0x00000100
-#define MCI_SYSINFO_OPEN                0x00000200
-#define MCI_SYSINFO_NAME                0x00000400
-#define MCI_SYSINFO_INSTALLNAME         0x00000800
-
-#define MCI_SET_DOOR_OPEN               0x00000100
-#define MCI_SET_DOOR_CLOSED             0x00000200
-#define MCI_SET_TIME_FORMAT             0x00000400
-#define MCI_SET_AUDIO                   0x00000800
-#define MCI_SET_VIDEO                   0x00001000
-#define MCI_SET_ON                      0x00002000
-#define MCI_SET_OFF                     0x00004000
-
-#define MCI_SET_AUDIO_ALL               0x00000000
-#define MCI_SET_AUDIO_LEFT              0x00000001
-#define MCI_SET_AUDIO_RIGHT             0x00000002
-
-#define MCI_BREAK_KEY                   0x00000100
-#define MCI_BREAK_HWND                  0x00000200
-#define MCI_BREAK_OFF                   0x00000400
-
-#define MCI_RECORD_INSERT               0x00000100
-#define MCI_RECORD_OVERWRITE            0x00000200
-
-#define MCI_SOUND_NAME                  0x00000100
-
-#define MCI_SAVE_FILE                   0x00000100
-
-#define MCI_LOAD_FILE                   0x00000100
+#define MCI_NOTIFY                      __MSABI_LONG(0x00000001)
+#define MCI_WAIT                        __MSABI_LONG(0x00000002)
+#define MCI_FROM                        __MSABI_LONG(0x00000004)
+#define MCI_TO                          __MSABI_LONG(0x00000008)
+#define MCI_TRACK                       __MSABI_LONG(0x00000010)
+
+#define MCI_OPEN_SHAREABLE              __MSABI_LONG(0x00000100)
+#define MCI_OPEN_ELEMENT                __MSABI_LONG(0x00000200)
+#define MCI_OPEN_ALIAS                  __MSABI_LONG(0x00000400)
+#define MCI_OPEN_ELEMENT_ID             __MSABI_LONG(0x00000800)
+#define MCI_OPEN_TYPE_ID                __MSABI_LONG(0x00001000)
+#define MCI_OPEN_TYPE                   __MSABI_LONG(0x00002000)
+
+#define MCI_SEEK_TO_START               __MSABI_LONG(0x00000100)
+#define MCI_SEEK_TO_END                 __MSABI_LONG(0x00000200)
+
+#define MCI_STATUS_ITEM                 __MSABI_LONG(0x00000100)
+#define MCI_STATUS_START                __MSABI_LONG(0x00000200)
+
+#define MCI_STATUS_LENGTH               __MSABI_LONG(0x00000001)
+#define MCI_STATUS_POSITION             __MSABI_LONG(0x00000002)
+#define MCI_STATUS_NUMBER_OF_TRACKS     __MSABI_LONG(0x00000003)
+#define MCI_STATUS_MODE                 __MSABI_LONG(0x00000004)
+#define MCI_STATUS_MEDIA_PRESENT        __MSABI_LONG(0x00000005)
+#define MCI_STATUS_TIME_FORMAT          __MSABI_LONG(0x00000006)
+#define MCI_STATUS_READY                __MSABI_LONG(0x00000007)
+#define MCI_STATUS_CURRENT_TRACK        __MSABI_LONG(0x00000008)
+
+#define MCI_INFO_PRODUCT                __MSABI_LONG(0x00000100)
+#define MCI_INFO_FILE                   __MSABI_LONG(0x00000200)
+#define MCI_INFO_MEDIA_UPC              __MSABI_LONG(0x00000400)
+#define MCI_INFO_MEDIA_IDENTITY         __MSABI_LONG(0x00000800)
+#define MCI_INFO_NAME                   __MSABI_LONG(0x00001000)
+#define MCI_INFO_COPYRIGHT              __MSABI_LONG(0x00002000)
+
+#define MCI_GETDEVCAPS_ITEM             __MSABI_LONG(0x00000100)
+
+#define MCI_GETDEVCAPS_CAN_RECORD       __MSABI_LONG(0x00000001)
+#define MCI_GETDEVCAPS_HAS_AUDIO        __MSABI_LONG(0x00000002)
+#define MCI_GETDEVCAPS_HAS_VIDEO        __MSABI_LONG(0x00000003)
+#define MCI_GETDEVCAPS_DEVICE_TYPE      __MSABI_LONG(0x00000004)
+#define MCI_GETDEVCAPS_USES_FILES       __MSABI_LONG(0x00000005)
+#define MCI_GETDEVCAPS_COMPOUND_DEVICE  __MSABI_LONG(0x00000006)
+#define MCI_GETDEVCAPS_CAN_EJECT        __MSABI_LONG(0x00000007)
+#define MCI_GETDEVCAPS_CAN_PLAY         __MSABI_LONG(0x00000008)
+#define MCI_GETDEVCAPS_CAN_SAVE         __MSABI_LONG(0x00000009)
+
+#define MCI_SYSINFO_QUANTITY            __MSABI_LONG(0x00000100)
+#define MCI_SYSINFO_OPEN                __MSABI_LONG(0x00000200)
+#define MCI_SYSINFO_NAME                __MSABI_LONG(0x00000400)
+#define MCI_SYSINFO_INSTALLNAME         __MSABI_LONG(0x00000800)
+
+#define MCI_SET_DOOR_OPEN               __MSABI_LONG(0x00000100)
+#define MCI_SET_DOOR_CLOSED             __MSABI_LONG(0x00000200)
+#define MCI_SET_TIME_FORMAT             __MSABI_LONG(0x00000400)
+#define MCI_SET_AUDIO                   __MSABI_LONG(0x00000800)
+#define MCI_SET_VIDEO                   __MSABI_LONG(0x00001000)
+#define MCI_SET_ON                      __MSABI_LONG(0x00002000)
+#define MCI_SET_OFF                     __MSABI_LONG(0x00004000)
+
+#define MCI_SET_AUDIO_ALL               __MSABI_LONG(0x00000000)
+#define MCI_SET_AUDIO_LEFT              __MSABI_LONG(0x00000001)
+#define MCI_SET_AUDIO_RIGHT             __MSABI_LONG(0x00000002)
+
+#define MCI_BREAK_KEY                   __MSABI_LONG(0x00000100)
+#define MCI_BREAK_HWND                  __MSABI_LONG(0x00000200)
+#define MCI_BREAK_OFF                   __MSABI_LONG(0x00000400)
+
+#define MCI_RECORD_INSERT               __MSABI_LONG(0x00000100)
+#define MCI_RECORD_OVERWRITE            __MSABI_LONG(0x00000200)
+
+#define MCI_SOUND_NAME                  __MSABI_LONG(0x00000100)
+
+#define MCI_SAVE_FILE                   __MSABI_LONG(0x00000100)
+
+#define MCI_LOAD_FILE                   __MSABI_LONG(0x00000100)
 
 typedef struct tagMCI_GENERIC_PARMS {
        DWORD_PTR dwCallback;
@@ -2111,35 +2111,35 @@ typedef struct tagMCI_RECORD_PARMS {
 
 #define MCI_VD_FORMAT_TRACK             0x4001
 
-#define MCI_VD_PLAY_REVERSE             0x00010000
-#define MCI_VD_PLAY_FAST                0x00020000
-#define MCI_VD_PLAY_SPEED               0x00040000
-#define MCI_VD_PLAY_SCAN                0x00080000
-#define MCI_VD_PLAY_SLOW                0x00100000
+#define MCI_VD_PLAY_REVERSE             __MSABI_LONG(0x00010000)
+#define MCI_VD_PLAY_FAST                __MSABI_LONG(0x00020000)
+#define MCI_VD_PLAY_SPEED               __MSABI_LONG(0x00040000)
+#define MCI_VD_PLAY_SCAN                __MSABI_LONG(0x00080000)
+#define MCI_VD_PLAY_SLOW                __MSABI_LONG(0x00100000)
 
-#define MCI_VD_SEEK_REVERSE             0x00010000
+#define MCI_VD_SEEK_REVERSE             __MSABI_LONG(0x00010000)
 
-#define MCI_VD_STATUS_SPEED             0x00004002
-#define MCI_VD_STATUS_FORWARD           0x00004003
-#define MCI_VD_STATUS_MEDIA_TYPE        0x00004004
-#define MCI_VD_STATUS_SIDE              0x00004005
-#define MCI_VD_STATUS_DISC_SIZE         0x00004006
+#define MCI_VD_STATUS_SPEED             __MSABI_LONG(0x00004002)
+#define MCI_VD_STATUS_FORWARD           __MSABI_LONG(0x00004003)
+#define MCI_VD_STATUS_MEDIA_TYPE        __MSABI_LONG(0x00004004)
+#define MCI_VD_STATUS_SIDE              __MSABI_LONG(0x00004005)
+#define MCI_VD_STATUS_DISC_SIZE         __MSABI_LONG(0x00004006)
 
-#define MCI_VD_GETDEVCAPS_CLV           0x00010000
-#define MCI_VD_GETDEVCAPS_CAV           0x00020000
+#define MCI_VD_GETDEVCAPS_CLV           __MSABI_LONG(0x00010000)
+#define MCI_VD_GETDEVCAPS_CAV           __MSABI_LONG(0x00020000)
 
-#define MCI_VD_SPIN_UP                  0x00010000
-#define MCI_VD_SPIN_DOWN                0x00020000
+#define MCI_VD_SPIN_UP                  __MSABI_LONG(0x00010000)
+#define MCI_VD_SPIN_DOWN                __MSABI_LONG(0x00020000)
 
-#define MCI_VD_GETDEVCAPS_CAN_REVERSE   0x00004002
-#define MCI_VD_GETDEVCAPS_FAST_RATE     0x00004003
-#define MCI_VD_GETDEVCAPS_SLOW_RATE     0x00004004
-#define MCI_VD_GETDEVCAPS_NORMAL_RATE   0x00004005
+#define MCI_VD_GETDEVCAPS_CAN_REVERSE   __MSABI_LONG(0x00004002)
+#define MCI_VD_GETDEVCAPS_FAST_RATE     __MSABI_LONG(0x00004003)
+#define MCI_VD_GETDEVCAPS_SLOW_RATE     __MSABI_LONG(0x00004004)
+#define MCI_VD_GETDEVCAPS_NORMAL_RATE   __MSABI_LONG(0x00004005)
 
-#define MCI_VD_STEP_FRAMES              0x00010000
-#define MCI_VD_STEP_REVERSE             0x00020000
+#define MCI_VD_STEP_FRAMES              __MSABI_LONG(0x00010000)
+#define MCI_VD_STEP_REVERSE             __MSABI_LONG(0x00020000)
 
-#define MCI_VD_ESCAPE_STRING            0x00000100
+#define MCI_VD_ESCAPE_STRING            __MSABI_LONG(0x00000100)
 
 typedef struct tagMCI_VD_PLAY_PARMS {
        DWORD_PTR dwCallback;
@@ -2166,31 +2166,31 @@ typedef struct tagMCI_VD_ESCAPE_PARMSW {
 DECL_WINELIB_TYPE_AW(MCI_VD_ESCAPE_PARMS)
 DECL_WINELIB_TYPE_AW(LPMCI_VD_ESCAPE_PARMS)
 
-#define MCI_WAVE_OPEN_BUFFER            0x00010000
+#define MCI_WAVE_OPEN_BUFFER            __MSABI_LONG(0x00010000)
 
-#define MCI_WAVE_SET_FORMATTAG          0x00010000
-#define MCI_WAVE_SET_CHANNELS           0x00020000
-#define MCI_WAVE_SET_SAMPLESPERSEC      0x00040000
-#define MCI_WAVE_SET_AVGBYTESPERSEC     0x00080000
-#define MCI_WAVE_SET_BLOCKALIGN         0x00100000
-#define MCI_WAVE_SET_BITSPERSAMPLE      0x00200000
+#define MCI_WAVE_SET_FORMATTAG          __MSABI_LONG(0x00010000)
+#define MCI_WAVE_SET_CHANNELS           __MSABI_LONG(0x00020000)
+#define MCI_WAVE_SET_SAMPLESPERSEC      __MSABI_LONG(0x00040000)
+#define MCI_WAVE_SET_AVGBYTESPERSEC     __MSABI_LONG(0x00080000)
+#define MCI_WAVE_SET_BLOCKALIGN         __MSABI_LONG(0x00100000)
+#define MCI_WAVE_SET_BITSPERSAMPLE      __MSABI_LONG(0x00200000)
 
-#define MCI_WAVE_INPUT                  0x00400000
-#define MCI_WAVE_OUTPUT                 0x00800000
+#define MCI_WAVE_INPUT                  __MSABI_LONG(0x00400000)
+#define MCI_WAVE_OUTPUT                 __MSABI_LONG(0x00800000)
 
-#define MCI_WAVE_STATUS_FORMATTAG       0x00004001
-#define MCI_WAVE_STATUS_CHANNELS        0x00004002
-#define MCI_WAVE_STATUS_SAMPLESPERSEC   0x00004003
-#define MCI_WAVE_STATUS_AVGBYTESPERSEC  0x00004004
-#define MCI_WAVE_STATUS_BLOCKALIGN      0x00004005
-#define MCI_WAVE_STATUS_BITSPERSAMPLE   0x00004006
-#define MCI_WAVE_STATUS_LEVEL           0x00004007
+#define MCI_WAVE_STATUS_FORMATTAG       __MSABI_LONG(0x00004001)
+#define MCI_WAVE_STATUS_CHANNELS        __MSABI_LONG(0x00004002)
+#define MCI_WAVE_STATUS_SAMPLESPERSEC   __MSABI_LONG(0x00004003)
+#define MCI_WAVE_STATUS_AVGBYTESPERSEC  __MSABI_LONG(0x00004004)
+#define MCI_WAVE_STATUS_BLOCKALIGN      __MSABI_LONG(0x00004005)
+#define MCI_WAVE_STATUS_BITSPERSAMPLE   __MSABI_LONG(0x00004006)
+#define MCI_WAVE_STATUS_LEVEL           __MSABI_LONG(0x00004007)
 
-#define MCI_WAVE_SET_ANYINPUT           0x04000000
-#define MCI_WAVE_SET_ANYOUTPUT          0x08000000
+#define MCI_WAVE_SET_ANYINPUT           __MSABI_LONG(0x04000000)
+#define MCI_WAVE_SET_ANYOUTPUT          __MSABI_LONG(0x08000000)
 
-#define MCI_WAVE_GETDEVCAPS_INPUTS      0x00004001
-#define MCI_WAVE_GETDEVCAPS_OUTPUTS     0x00004002
+#define MCI_WAVE_GETDEVCAPS_INPUTS      __MSABI_LONG(0x00004001)
+#define MCI_WAVE_GETDEVCAPS_OUTPUTS     __MSABI_LONG(0x00004002)
 
 typedef struct tagMCI_WAVE_OPEN_PARMSA {
        DWORD_PTR       dwCallback;
@@ -2246,18 +2246,18 @@ typedef struct tagMCI_WAVE_SET_PARMS {
 #define     MCI_SEQ_SMPTE               0x4004
 #define     MCI_SEQ_NONE                65533
 
-#define MCI_SEQ_STATUS_TEMPO            0x00004002
-#define MCI_SEQ_STATUS_PORT             0x00004003
-#define MCI_SEQ_STATUS_SLAVE            0x00004007
-#define MCI_SEQ_STATUS_MASTER           0x00004008
-#define MCI_SEQ_STATUS_OFFSET           0x00004009
-#define MCI_SEQ_STATUS_DIVTYPE          0x0000400A
+#define MCI_SEQ_STATUS_TEMPO            __MSABI_LONG(0x00004002)
+#define MCI_SEQ_STATUS_PORT             __MSABI_LONG(0x00004003)
+#define MCI_SEQ_STATUS_SLAVE            __MSABI_LONG(0x00004007)
+#define MCI_SEQ_STATUS_MASTER           __MSABI_LONG(0x00004008)
+#define MCI_SEQ_STATUS_OFFSET           __MSABI_LONG(0x00004009)
+#define MCI_SEQ_STATUS_DIVTYPE          __MSABI_LONG(0x0000400A)
 
-#define MCI_SEQ_SET_TEMPO               0x00010000
-#define MCI_SEQ_SET_PORT                0x00020000
-#define MCI_SEQ_SET_SLAVE               0x00040000
-#define MCI_SEQ_SET_MASTER              0x00080000
-#define MCI_SEQ_SET_OFFSET              0x01000000
+#define MCI_SEQ_SET_TEMPO               __MSABI_LONG(0x00010000)
+#define MCI_SEQ_SET_PORT                __MSABI_LONG(0x00020000)
+#define MCI_SEQ_SET_SLAVE               __MSABI_LONG(0x00040000)
+#define MCI_SEQ_SET_MASTER              __MSABI_LONG(0x00080000)
+#define MCI_SEQ_SET_OFFSET              __MSABI_LONG(0x01000000)
 
 typedef struct tagMCI_SEQ_SET_PARMS {
        DWORD_PTR dwCallback;
@@ -2270,54 +2270,54 @@ typedef struct tagMCI_SEQ_SET_PARMS {
 	DWORD   dwOffset;
 } MCI_SEQ_SET_PARMS, *LPMCI_SEQ_SET_PARMS;
 
-#define MCI_ANIM_OPEN_WS                0x00010000
-#define MCI_ANIM_OPEN_PARENT            0x00020000
-#define MCI_ANIM_OPEN_NOSTATIC          0x00040000
+#define MCI_ANIM_OPEN_WS                __MSABI_LONG(0x00010000)
+#define MCI_ANIM_OPEN_PARENT            __MSABI_LONG(0x00020000)
+#define MCI_ANIM_OPEN_NOSTATIC          __MSABI_LONG(0x00040000)
 
-#define MCI_ANIM_PLAY_SPEED             0x00010000
-#define MCI_ANIM_PLAY_REVERSE           0x00020000
-#define MCI_ANIM_PLAY_FAST              0x00040000
-#define MCI_ANIM_PLAY_SLOW              0x00080000
-#define MCI_ANIM_PLAY_SCAN              0x00100000
+#define MCI_ANIM_PLAY_SPEED             __MSABI_LONG(0x00010000)
+#define MCI_ANIM_PLAY_REVERSE           __MSABI_LONG(0x00020000)
+#define MCI_ANIM_PLAY_FAST              __MSABI_LONG(0x00040000)
+#define MCI_ANIM_PLAY_SLOW              __MSABI_LONG(0x00080000)
+#define MCI_ANIM_PLAY_SCAN              __MSABI_LONG(0x00100000)
 
-#define MCI_ANIM_STEP_REVERSE           0x00010000
-#define MCI_ANIM_STEP_FRAMES            0x00020000
+#define MCI_ANIM_STEP_REVERSE           __MSABI_LONG(0x00010000)
+#define MCI_ANIM_STEP_FRAMES            __MSABI_LONG(0x00020000)
 
-#define MCI_ANIM_STATUS_SPEED           0x00004001
-#define MCI_ANIM_STATUS_FORWARD         0x00004002
-#define MCI_ANIM_STATUS_HWND            0x00004003
-#define MCI_ANIM_STATUS_HPAL            0x00004004
-#define MCI_ANIM_STATUS_STRETCH         0x00004005
+#define MCI_ANIM_STATUS_SPEED           __MSABI_LONG(0x00004001)
+#define MCI_ANIM_STATUS_FORWARD         __MSABI_LONG(0x00004002)
+#define MCI_ANIM_STATUS_HWND            __MSABI_LONG(0x00004003)
+#define MCI_ANIM_STATUS_HPAL            __MSABI_LONG(0x00004004)
+#define MCI_ANIM_STATUS_STRETCH         __MSABI_LONG(0x00004005)
 
-#define MCI_ANIM_INFO_TEXT              0x00010000
+#define MCI_ANIM_INFO_TEXT              __MSABI_LONG(0x00010000)
 
-#define MCI_ANIM_GETDEVCAPS_CAN_REVERSE 0x00004001
-#define MCI_ANIM_GETDEVCAPS_FAST_RATE   0x00004002
-#define MCI_ANIM_GETDEVCAPS_SLOW_RATE   0x00004003
-#define MCI_ANIM_GETDEVCAPS_NORMAL_RATE 0x00004004
-#define MCI_ANIM_GETDEVCAPS_PALETTES    0x00004006
-#define MCI_ANIM_GETDEVCAPS_CAN_STRETCH 0x00004007
-#define MCI_ANIM_GETDEVCAPS_MAX_WINDOWS 0x00004008
+#define MCI_ANIM_GETDEVCAPS_CAN_REVERSE __MSABI_LONG(0x00004001)
+#define MCI_ANIM_GETDEVCAPS_FAST_RATE   __MSABI_LONG(0x00004002)
+#define MCI_ANIM_GETDEVCAPS_SLOW_RATE   __MSABI_LONG(0x00004003)
+#define MCI_ANIM_GETDEVCAPS_NORMAL_RATE __MSABI_LONG(0x00004004)
+#define MCI_ANIM_GETDEVCAPS_PALETTES    __MSABI_LONG(0x00004006)
+#define MCI_ANIM_GETDEVCAPS_CAN_STRETCH __MSABI_LONG(0x00004007)
+#define MCI_ANIM_GETDEVCAPS_MAX_WINDOWS __MSABI_LONG(0x00004008)
 
-#define MCI_ANIM_REALIZE_NORM           0x00010000
-#define MCI_ANIM_REALIZE_BKGD           0x00020000
+#define MCI_ANIM_REALIZE_NORM           __MSABI_LONG(0x00010000)
+#define MCI_ANIM_REALIZE_BKGD           __MSABI_LONG(0x00020000)
 
-#define MCI_ANIM_WINDOW_HWND            0x00010000
-#define MCI_ANIM_WINDOW_STATE           0x00040000
-#define MCI_ANIM_WINDOW_TEXT            0x00080000
-#define MCI_ANIM_WINDOW_ENABLE_STRETCH  0x00100000
-#define MCI_ANIM_WINDOW_DISABLE_STRETCH 0x00200000
+#define MCI_ANIM_WINDOW_HWND            __MSABI_LONG(0x00010000)
+#define MCI_ANIM_WINDOW_STATE           __MSABI_LONG(0x00040000)
+#define MCI_ANIM_WINDOW_TEXT            __MSABI_LONG(0x00080000)
+#define MCI_ANIM_WINDOW_ENABLE_STRETCH  __MSABI_LONG(0x00100000)
+#define MCI_ANIM_WINDOW_DISABLE_STRETCH __MSABI_LONG(0x00200000)
 
-#define MCI_ANIM_WINDOW_DEFAULT         0x00000000
+#define MCI_ANIM_WINDOW_DEFAULT         __MSABI_LONG(0x00000000)
 
-#define MCI_ANIM_RECT                   0x00010000
-#define MCI_ANIM_PUT_SOURCE             0x00020000
-#define MCI_ANIM_PUT_DESTINATION        0x00040000
+#define MCI_ANIM_RECT                   __MSABI_LONG(0x00010000)
+#define MCI_ANIM_PUT_SOURCE             __MSABI_LONG(0x00020000)
+#define MCI_ANIM_PUT_DESTINATION        __MSABI_LONG(0x00040000)
 
-#define MCI_ANIM_WHERE_SOURCE           0x00020000
-#define MCI_ANIM_WHERE_DESTINATION      0x00040000
+#define MCI_ANIM_WHERE_SOURCE           __MSABI_LONG(0x00020000)
+#define MCI_ANIM_WHERE_DESTINATION      __MSABI_LONG(0x00040000)
 
-#define MCI_ANIM_UPDATE_HDC             0x00020000
+#define MCI_ANIM_UPDATE_HDC             __MSABI_LONG(0x00020000)
 
 typedef struct tagMCI_ANIM_OPEN_PARMSA {
        DWORD_PTR       dwCallback;
@@ -2389,36 +2389,36 @@ typedef struct tagMCI_ANIM_UPDATE_PARMS {
 } MCI_ANIM_UPDATE_PARMS, *LPMCI_ANIM_UPDATE_PARMS;
 
 
-#define MCI_OVLY_OPEN_WS                0x00010000
-#define MCI_OVLY_OPEN_PARENT            0x00020000
+#define MCI_OVLY_OPEN_WS                __MSABI_LONG(0x00010000)
+#define MCI_OVLY_OPEN_PARENT            __MSABI_LONG(0x00020000)
 
-#define MCI_OVLY_STATUS_HWND            0x00004001
-#define MCI_OVLY_STATUS_STRETCH         0x00004002
+#define MCI_OVLY_STATUS_HWND            __MSABI_LONG(0x00004001)
+#define MCI_OVLY_STATUS_STRETCH         __MSABI_LONG(0x00004002)
 
-#define MCI_OVLY_INFO_TEXT              0x00010000
+#define MCI_OVLY_INFO_TEXT              __MSABI_LONG(0x00010000)
 
-#define MCI_OVLY_GETDEVCAPS_CAN_STRETCH 0x00004001
-#define MCI_OVLY_GETDEVCAPS_CAN_FREEZE  0x00004002
-#define MCI_OVLY_GETDEVCAPS_MAX_WINDOWS 0x00004003
+#define MCI_OVLY_GETDEVCAPS_CAN_STRETCH __MSABI_LONG(0x00004001)
+#define MCI_OVLY_GETDEVCAPS_CAN_FREEZE  __MSABI_LONG(0x00004002)
+#define MCI_OVLY_GETDEVCAPS_MAX_WINDOWS __MSABI_LONG(0x00004003)
 
-#define MCI_OVLY_WINDOW_HWND            0x00010000
-#define MCI_OVLY_WINDOW_STATE           0x00040000
-#define MCI_OVLY_WINDOW_TEXT            0x00080000
-#define MCI_OVLY_WINDOW_ENABLE_STRETCH  0x00100000
-#define MCI_OVLY_WINDOW_DISABLE_STRETCH 0x00200000
+#define MCI_OVLY_WINDOW_HWND            __MSABI_LONG(0x00010000)
+#define MCI_OVLY_WINDOW_STATE           __MSABI_LONG(0x00040000)
+#define MCI_OVLY_WINDOW_TEXT            __MSABI_LONG(0x00080000)
+#define MCI_OVLY_WINDOW_ENABLE_STRETCH  __MSABI_LONG(0x00100000)
+#define MCI_OVLY_WINDOW_DISABLE_STRETCH __MSABI_LONG(0x00200000)
 
-#define MCI_OVLY_WINDOW_DEFAULT         0x00000000
+#define MCI_OVLY_WINDOW_DEFAULT         __MSABI_LONG(0x00000000)
 
-#define MCI_OVLY_RECT                   0x00010000
-#define MCI_OVLY_PUT_SOURCE             0x00020000
-#define MCI_OVLY_PUT_DESTINATION        0x00040000
-#define MCI_OVLY_PUT_FRAME              0x00080000
-#define MCI_OVLY_PUT_VIDEO              0x00100000
+#define MCI_OVLY_RECT                   __MSABI_LONG(0x00010000)
+#define MCI_OVLY_PUT_SOURCE             __MSABI_LONG(0x00020000)
+#define MCI_OVLY_PUT_DESTINATION        __MSABI_LONG(0x00040000)
+#define MCI_OVLY_PUT_FRAME              __MSABI_LONG(0x00080000)
+#define MCI_OVLY_PUT_VIDEO              __MSABI_LONG(0x00100000)
 
-#define MCI_OVLY_WHERE_SOURCE           0x00020000
-#define MCI_OVLY_WHERE_DESTINATION      0x00040000
-#define MCI_OVLY_WHERE_FRAME            0x00080000
-#define MCI_OVLY_WHERE_VIDEO            0x00100000
+#define MCI_OVLY_WHERE_SOURCE           __MSABI_LONG(0x00020000)
+#define MCI_OVLY_WHERE_DESTINATION      __MSABI_LONG(0x00040000)
+#define MCI_OVLY_WHERE_FRAME            __MSABI_LONG(0x00080000)
+#define MCI_OVLY_WHERE_VIDEO            __MSABI_LONG(0x00100000)
 
 typedef struct tagMCI_OVLY_OPEN_PARMSA {
        DWORD_PTR       dwCallback;
-- 
1.7.6.4



More information about the wine-patches mailing list