From f9c42a7d0a493bcf76d1ea3f503d5f7d443a8a23 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Thu, 3 Nov 2011 23:56:46 +0100 Subject: [PATCH] include: Make "long" numeric constants LP64/LLP64 proof (msacm.h). --- dlls/msacm32/driver.c | 2 +- include/msacm.h | 136 +++++++++++++++++++++--------------------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index d0b543c314e..3f3896106c0 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -168,7 +168,7 @@ MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule, } break; default: - ERR("invalid flag value 0x%08lx for fdwAdd\n", fdwAdd & ACM_DRIVERADDF_TYPEMASK); + ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd & ACM_DRIVERADDF_TYPEMASK); return MMSYSERR_INVALFLAG; } diff --git a/include/msacm.h b/include/msacm.h index 73788feab9a..eaa39d2c01b 100644 --- a/include/msacm.h +++ b/include/msacm.h @@ -42,12 +42,12 @@ extern "C" { #define MM_ACM_CLOSE MM_STREAM_CLOSE #define MM_ACM_DONE MM_STREAM_DONE -#define ACM_DRIVERADDF_NAME 0x00000001L -#define ACM_DRIVERADDF_FUNCTION 0x00000003L -#define ACM_DRIVERADDF_NOTIFYHWND 0x00000004L -#define ACM_DRIVERADDF_TYPEMASK 0x00000007L -#define ACM_DRIVERADDF_LOCAL 0x00000000L -#define ACM_DRIVERADDF_GLOBAL 0x00000008L +#define ACM_DRIVERADDF_NAME __MSABI_LONG(0x00000001) +#define ACM_DRIVERADDF_FUNCTION __MSABI_LONG(0x00000003) +#define ACM_DRIVERADDF_NOTIFYHWND __MSABI_LONG(0x00000004) +#define ACM_DRIVERADDF_TYPEMASK __MSABI_LONG(0x00000007) +#define ACM_DRIVERADDF_LOCAL __MSABI_LONG(0x00000000) +#define ACM_DRIVERADDF_GLOBAL __MSABI_LONG(0x00000008) #define ACMDRIVERDETAILS_SHORTNAME_CHARS 32 #define ACMDRIVERDETAILS_LONGNAME_CHARS 128 @@ -58,23 +58,23 @@ extern "C" { #define ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC mmioFOURCC('a', 'u', 'd', 'c') #define ACMDRIVERDETAILS_FCCCOMP_UNDEFINED mmioFOURCC('\0', '\0', '\0', '\0') -#define ACMDRIVERDETAILS_SUPPORTF_CODEC 0x00000001L -#define ACMDRIVERDETAILS_SUPPORTF_CONVERTER 0x00000002L -#define ACMDRIVERDETAILS_SUPPORTF_FILTER 0x00000004L -#define ACMDRIVERDETAILS_SUPPORTF_HARDWARE 0x00000008L -#define ACMDRIVERDETAILS_SUPPORTF_ASYNC 0x00000010L -#define ACMDRIVERDETAILS_SUPPORTF_LOCAL 0x40000000L -#define ACMDRIVERDETAILS_SUPPORTF_DISABLED 0x80000000L +#define ACMDRIVERDETAILS_SUPPORTF_CODEC __MSABI_LONG(0x00000001) +#define ACMDRIVERDETAILS_SUPPORTF_CONVERTER __MSABI_LONG(0x00000002) +#define ACMDRIVERDETAILS_SUPPORTF_FILTER __MSABI_LONG(0x00000004) +#define ACMDRIVERDETAILS_SUPPORTF_HARDWARE __MSABI_LONG(0x00000008) +#define ACMDRIVERDETAILS_SUPPORTF_ASYNC __MSABI_LONG(0x00000010) +#define ACMDRIVERDETAILS_SUPPORTF_LOCAL __MSABI_LONG(0x40000000) +#define ACMDRIVERDETAILS_SUPPORTF_DISABLED __MSABI_LONG(0x80000000) -#define ACM_DRIVERENUMF_NOLOCAL 0x40000000L -#define ACM_DRIVERENUMF_DISABLED 0x80000000L +#define ACM_DRIVERENUMF_NOLOCAL __MSABI_LONG(0x40000000) +#define ACM_DRIVERENUMF_DISABLED __MSABI_LONG(0x80000000) -#define ACM_DRIVERPRIORITYF_ENABLE 0x00000001L -#define ACM_DRIVERPRIORITYF_DISABLE 0x00000002L -#define ACM_DRIVERPRIORITYF_ABLEMASK 0x00000003L -#define ACM_DRIVERPRIORITYF_BEGIN 0x00010000L -#define ACM_DRIVERPRIORITYF_END 0x00020000L -#define ACM_DRIVERPRIORITYF_DEFERMASK 0x00030000L +#define ACM_DRIVERPRIORITYF_ENABLE __MSABI_LONG(0x00000001) +#define ACM_DRIVERPRIORITYF_DISABLE __MSABI_LONG(0x00000002) +#define ACM_DRIVERPRIORITYF_ABLEMASK __MSABI_LONG(0x00000003) +#define ACM_DRIVERPRIORITYF_BEGIN __MSABI_LONG(0x00010000) +#define ACM_DRIVERPRIORITYF_END __MSABI_LONG(0x00020000) +#define ACM_DRIVERPRIORITYF_DEFERMASK __MSABI_LONG(0x00030000) #define MM_ACM_FILTERCHOOSE 0x8000 @@ -83,27 +83,27 @@ extern "C" { #define FILTERCHOOSE_FILTER_VERIFY (FILTERCHOOSE_MESSAGE+1) #define FILTERCHOOSE_CUSTOM_VERIFY (FILTERCHOOSE_MESSAGE+2) -#define ACMFILTERCHOOSE_STYLEF_SHOWHELP 0x00000004L -#define ACMFILTERCHOOSE_STYLEF_ENABLEHOOK 0x00000008L -#define ACMFILTERCHOOSE_STYLEF_ENABLETEMPLATE 0x00000010L -#define ACMFILTERCHOOSE_STYLEF_ENABLETEMPLATEHANDLE 0x00000020L -#define ACMFILTERCHOOSE_STYLEF_INITTOFILTERSTRUCT 0x00000040L -#define ACMFILTERCHOOSE_STYLEF_CONTEXTHELP 0x00000080L +#define ACMFILTERCHOOSE_STYLEF_SHOWHELP __MSABI_LONG(0x00000004) +#define ACMFILTERCHOOSE_STYLEF_ENABLEHOOK __MSABI_LONG(0x00000008) +#define ACMFILTERCHOOSE_STYLEF_ENABLETEMPLATE __MSABI_LONG(0x00000010) +#define ACMFILTERCHOOSE_STYLEF_ENABLETEMPLATEHANDLE __MSABI_LONG(0x00000020) +#define ACMFILTERCHOOSE_STYLEF_INITTOFILTERSTRUCT __MSABI_LONG(0x00000040) +#define ACMFILTERCHOOSE_STYLEF_CONTEXTHELP __MSABI_LONG(0x00000080) #define ACMFILTERDETAILS_FILTER_CHARS 128 -#define ACM_FILTERDETAILSF_INDEX 0x00000000L -#define ACM_FILTERDETAILSF_FILTER 0x00000001L -#define ACM_FILTERDETAILSF_QUERYMASK 0x0000000FL +#define ACM_FILTERDETAILSF_INDEX __MSABI_LONG(0x00000000) +#define ACM_FILTERDETAILSF_FILTER __MSABI_LONG(0x00000001) +#define ACM_FILTERDETAILSF_QUERYMASK __MSABI_LONG(0x0000000F) #define ACMFILTERTAGDETAILS_FILTERTAG_CHARS 48 -#define ACM_FILTERTAGDETAILSF_INDEX 0x00000000L -#define ACM_FILTERTAGDETAILSF_FILTERTAG 0x00000001L -#define ACM_FILTERTAGDETAILSF_LARGESTSIZE 0x00000002L -#define ACM_FILTERTAGDETAILSF_QUERYMASK 0x0000000FL +#define ACM_FILTERTAGDETAILSF_INDEX __MSABI_LONG(0x00000000) +#define ACM_FILTERTAGDETAILSF_FILTERTAG __MSABI_LONG(0x00000001) +#define ACM_FILTERTAGDETAILSF_LARGESTSIZE __MSABI_LONG(0x00000002) +#define ACM_FILTERTAGDETAILSF_QUERYMASK __MSABI_LONG(0x0000000F) -#define ACM_FILTERENUMF_DWFILTERTAG 0x00010000L +#define ACM_FILTERENUMF_DWFILTERTAG __MSABI_LONG(0x00010000) #define ACMHELPMSGSTRINGA "acmchoose_help" #if defined(__GNUC__) @@ -148,41 +148,41 @@ static const WCHAR ACMHELPMSGCONTEXTHELPW[] = { 'a','c','m', #define FORMATCHOOSE_FORMAT_VERIFY (FORMATCHOOSE_MESSAGE+1) #define FORMATCHOOSE_CUSTOM_VERIFY (FORMATCHOOSE_MESSAGE+2) -#define ACMFORMATCHOOSE_STYLEF_SHOWHELP 0x00000004L -#define ACMFORMATCHOOSE_STYLEF_ENABLEHOOK 0x00000008L -#define ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE 0x00000010L -#define ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE 0x00000020L -#define ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT 0x00000040L -#define ACMFORMATCHOOSE_STYLEF_CONTEXTHELP 0x00000080L +#define ACMFORMATCHOOSE_STYLEF_SHOWHELP __MSABI_LONG(0x00000004) +#define ACMFORMATCHOOSE_STYLEF_ENABLEHOOK __MSABI_LONG(0x00000008) +#define ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE __MSABI_LONG(0x00000010) +#define ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE __MSABI_LONG(0x00000020) +#define ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT __MSABI_LONG(0x00000040) +#define ACMFORMATCHOOSE_STYLEF_CONTEXTHELP __MSABI_LONG(0x00000080) #define ACMFORMATDETAILS_FORMAT_CHARS 128 -#define ACM_FORMATDETAILSF_INDEX 0x00000000L -#define ACM_FORMATDETAILSF_FORMAT 0x00000001L -#define ACM_FORMATDETAILSF_QUERYMASK 0x0000000FL +#define ACM_FORMATDETAILSF_INDEX __MSABI_LONG(0x00000000) +#define ACM_FORMATDETAILSF_FORMAT __MSABI_LONG(0x00000001) +#define ACM_FORMATDETAILSF_QUERYMASK __MSABI_LONG(0x0000000F) -#define ACM_FORMATENUMF_WFORMATTAG 0x00010000L -#define ACM_FORMATENUMF_NCHANNELS 0x00020000L -#define ACM_FORMATENUMF_NSAMPLESPERSEC 0x00040000L -#define ACM_FORMATENUMF_WBITSPERSAMPLE 0x00080000L -#define ACM_FORMATENUMF_CONVERT 0x00100000L -#define ACM_FORMATENUMF_SUGGEST 0x00200000L -#define ACM_FORMATENUMF_HARDWARE 0x00400000L -#define ACM_FORMATENUMF_INPUT 0x00800000L -#define ACM_FORMATENUMF_OUTPUT 0x01000000L +#define ACM_FORMATENUMF_WFORMATTAG __MSABI_LONG(0x00010000) +#define ACM_FORMATENUMF_NCHANNELS __MSABI_LONG(0x00020000) +#define ACM_FORMATENUMF_NSAMPLESPERSEC __MSABI_LONG(0x00040000) +#define ACM_FORMATENUMF_WBITSPERSAMPLE __MSABI_LONG(0x00080000) +#define ACM_FORMATENUMF_CONVERT __MSABI_LONG(0x00100000) +#define ACM_FORMATENUMF_SUGGEST __MSABI_LONG(0x00200000) +#define ACM_FORMATENUMF_HARDWARE __MSABI_LONG(0x00400000) +#define ACM_FORMATENUMF_INPUT __MSABI_LONG(0x00800000) +#define ACM_FORMATENUMF_OUTPUT __MSABI_LONG(0x01000000) -#define ACM_FORMATSUGGESTF_WFORMATTAG 0x00010000L -#define ACM_FORMATSUGGESTF_NCHANNELS 0x00020000L -#define ACM_FORMATSUGGESTF_NSAMPLESPERSEC 0x00040000L -#define ACM_FORMATSUGGESTF_WBITSPERSAMPLE 0x00080000L -#define ACM_FORMATSUGGESTF_TYPEMASK 0x00FF0000L +#define ACM_FORMATSUGGESTF_WFORMATTAG __MSABI_LONG(0x00010000) +#define ACM_FORMATSUGGESTF_NCHANNELS __MSABI_LONG(0x00020000) +#define ACM_FORMATSUGGESTF_NSAMPLESPERSEC __MSABI_LONG(0x00040000) +#define ACM_FORMATSUGGESTF_WBITSPERSAMPLE __MSABI_LONG(0x00080000) +#define ACM_FORMATSUGGESTF_TYPEMASK __MSABI_LONG(0x00FF0000) #define ACMFORMATTAGDETAILS_FORMATTAG_CHARS 48 -#define ACM_FORMATTAGDETAILSF_INDEX 0x00000000L -#define ACM_FORMATTAGDETAILSF_FORMATTAG 0x00000001L -#define ACM_FORMATTAGDETAILSF_LARGESTSIZE 0x00000002L -#define ACM_FORMATTAGDETAILSF_QUERYMASK 0x0000000FL +#define ACM_FORMATTAGDETAILSF_INDEX __MSABI_LONG(0x00000000) +#define ACM_FORMATTAGDETAILSF_FORMATTAG __MSABI_LONG(0x00000001) +#define ACM_FORMATTAGDETAILSF_LARGESTSIZE __MSABI_LONG(0x00000002) +#define ACM_FORMATTAGDETAILSF_QUERYMASK __MSABI_LONG(0x0000000F) #define ACM_METRIC_COUNT_DRIVERS 1 #define ACM_METRIC_COUNT_CODECS 2 @@ -206,17 +206,17 @@ static const WCHAR ACMHELPMSGCONTEXTHELPW[] = { 'a','c','m', #define ACM_STREAMCONVERTF_START 0x00000010 #define ACM_STREAMCONVERTF_END 0x00000020 -#define ACMSTREAMHEADER_STATUSF_DONE 0x00010000L -#define ACMSTREAMHEADER_STATUSF_PREPARED 0x00020000L -#define ACMSTREAMHEADER_STATUSF_INQUEUE 0x00100000L +#define ACMSTREAMHEADER_STATUSF_DONE __MSABI_LONG(0x00010000) +#define ACMSTREAMHEADER_STATUSF_PREPARED __MSABI_LONG(0x00020000) +#define ACMSTREAMHEADER_STATUSF_INQUEUE __MSABI_LONG(0x00100000) #define ACM_STREAMOPENF_QUERY 0x00000001 #define ACM_STREAMOPENF_ASYNC 0x00000002 #define ACM_STREAMOPENF_NONREALTIME 0x00000004 -#define ACM_STREAMSIZEF_SOURCE 0x00000000L -#define ACM_STREAMSIZEF_DESTINATION 0x00000001L -#define ACM_STREAMSIZEF_QUERYMASK 0x0000000FL +#define ACM_STREAMSIZEF_SOURCE __MSABI_LONG(0x00000000) +#define ACM_STREAMSIZEF_DESTINATION __MSABI_LONG(0x00000001) +#define ACM_STREAMSIZEF_QUERYMASK __MSABI_LONG(0x0000000F) #define ACMDM_USER (DRV_USER + 0x0000) #define ACMDM_RESERVED_LOW (DRV_USER + 0x2000)