From 8aeacc5fb5b0baf916ebd4930045e87ff1e29ede Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Thu, 5 Feb 2009 09:52:31 +0100 Subject: [PATCH] include: Change some DWORD to DWORD_PTR in msacm.h. The change is for Win64 compatibility and it matches the DDK. --- dlls/msacm32/driver.c | 5 ++-- dlls/msacm32/filter.c | 24 ++++++++-------- dlls/msacm32/format.c | 27 ++++++++--------- dlls/msacm32/stream.c | 9 +++--- dlls/msacm32/tests/msacm.c | 6 ++-- include/msacm.h | 72 +++++++++++++++++++++++++--------------------- 6 files changed, 77 insertions(+), 66 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index 0287ebe1cca..e481d688e2f 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -312,12 +312,13 @@ MMRESULT WINAPI acmDriverDetailsW(HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, D /*********************************************************************** * acmDriverEnum (MSACM32.@) */ -MMRESULT WINAPI acmDriverEnum(ACMDRIVERENUMCB fnCallback, DWORD dwInstance, DWORD fdwEnum) +MMRESULT WINAPI acmDriverEnum(ACMDRIVERENUMCB fnCallback, DWORD_PTR dwInstance, + DWORD fdwEnum) { PWINE_ACMDRIVERID padid; DWORD fdwSupport; - TRACE("(%p, %08x, %08x)\n", fnCallback, dwInstance, fdwEnum); + TRACE("(%p, %08lx, %08x)\n", fnCallback, dwInstance, fdwEnum); if (!fnCallback) { WARN("invalid parameter\n"); diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c index 89ffc3547e2..37b807ee247 100644 --- a/dlls/msacm32/filter.c +++ b/dlls/msacm32/filter.c @@ -144,7 +144,7 @@ struct MSACM_FilterEnumWtoA_Instance { static BOOL CALLBACK MSACM_FilterEnumCallbackWtoA(HACMDRIVERID hadid, PACMFILTERDETAILSW pafdw, - DWORD dwInstance, + DWORD_PTR dwInstance, DWORD fdwSupport) { struct MSACM_FilterEnumWtoA_Instance* pafei; @@ -165,8 +165,8 @@ static BOOL CALLBACK MSACM_FilterEnumCallbackWtoA(HACMDRIVERID hadid, * acmFilterEnumA (MSACM32.@) */ MMRESULT WINAPI acmFilterEnumA(HACMDRIVER had, PACMFILTERDETAILSA pafda, - ACMFILTERENUMCBA fnCallback, DWORD dwInstance, - DWORD fdwEnum) + ACMFILTERENUMCBA fnCallback, + DWORD_PTR dwInstance, DWORD fdwEnum) { ACMFILTERDETAILSW afdw; struct MSACM_FilterEnumWtoA_Instance afei; @@ -222,13 +222,13 @@ static BOOL MSACM_FilterEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had, * acmFilterEnumW (MSACM32.@) */ MMRESULT WINAPI acmFilterEnumW(HACMDRIVER had, PACMFILTERDETAILSW pafd, - ACMFILTERENUMCBW fnCallback, DWORD dwInstance, - DWORD fdwEnum) + ACMFILTERENUMCBW fnCallback, + DWORD_PTR dwInstance, DWORD fdwEnum) { PWINE_ACMDRIVERID padid; BOOL ret; - TRACE("(%p, %p, %p, %d, %d)\n", + TRACE("(%p, %p, %p, %ld, %d)\n", had, pafd, fnCallback, dwInstance, fdwEnum); if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; @@ -375,7 +375,7 @@ struct MSACM_FilterTagEnumWtoA_Instance { static BOOL CALLBACK MSACM_FilterTagEnumCallbackWtoA(HACMDRIVERID hadid, PACMFILTERTAGDETAILSW paftdw, - DWORD dwInstance, + DWORD_PTR dwInstance, DWORD fdwSupport) { struct MSACM_FilterTagEnumWtoA_Instance* paftei; @@ -398,8 +398,8 @@ static BOOL CALLBACK MSACM_FilterTagEnumCallbackWtoA(HACMDRIVERID hadid, * acmFilterTagEnumA (MSACM32.@) */ MMRESULT WINAPI acmFilterTagEnumA(HACMDRIVER had, PACMFILTERTAGDETAILSA paftda, - ACMFILTERTAGENUMCBA fnCallback, DWORD dwInstance, - DWORD fdwEnum) + ACMFILTERTAGENUMCBA fnCallback, + DWORD_PTR dwInstance, DWORD fdwEnum) { ACMFILTERTAGDETAILSW aftdw; struct MSACM_FilterTagEnumWtoA_Instance aftei; @@ -421,13 +421,13 @@ MMRESULT WINAPI acmFilterTagEnumA(HACMDRIVER had, PACMFILTERTAGDETAILSA paftda, * acmFilterTagEnumW (MSACM32.@) */ MMRESULT WINAPI acmFilterTagEnumW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, - ACMFILTERTAGENUMCBW fnCallback, DWORD dwInstance, - DWORD fdwEnum) + ACMFILTERTAGENUMCBW fnCallback, + DWORD_PTR dwInstance, DWORD fdwEnum) { PWINE_ACMDRIVERID padid; unsigned int i; - TRACE("(%p, %p, %p, %d, %d)\n", + TRACE("(%p, %p, %p, %ld, %d)\n", had, paftd, fnCallback, dwInstance, fdwEnum); if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM; diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 66f3b3ceecc..31e0c551310 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -54,7 +54,8 @@ struct MSACM_FillFormatData { static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, PACMFORMATTAGDETAILSA paftd, - DWORD dwInstance, DWORD fdwSupport) + DWORD_PTR dwInstance, + DWORD fdwSupport) { struct MSACM_FillFormatData* affd = (struct MSACM_FillFormatData*)dwInstance; @@ -383,7 +384,7 @@ struct MSACM_FormatEnumWtoA_Instance { static BOOL CALLBACK MSACM_FormatEnumCallbackWtoA(HACMDRIVERID hadid, PACMFORMATDETAILSW pafdw, - DWORD dwInstance, + DWORD_PTR dwInstance, DWORD fdwSupport) { struct MSACM_FormatEnumWtoA_Instance* pafei; @@ -404,8 +405,8 @@ static BOOL CALLBACK MSACM_FormatEnumCallbackWtoA(HACMDRIVERID hadid, * acmFormatEnumA (MSACM32.@) */ MMRESULT WINAPI acmFormatEnumA(HACMDRIVER had, PACMFORMATDETAILSA pafda, - ACMFORMATENUMCBA fnCallback, DWORD dwInstance, - DWORD fdwEnum) + ACMFORMATENUMCBA fnCallback, + DWORD_PTR dwInstance, DWORD fdwEnum) { ACMFORMATDETAILSW afdw; struct MSACM_FormatEnumWtoA_Instance afei; @@ -484,14 +485,14 @@ static BOOL MSACM_FormatEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had, /**********************************************************************/ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, - ACMFORMATENUMCBW fnCallback, DWORD dwInstance, - DWORD fdwEnum) + ACMFORMATENUMCBW fnCallback, + DWORD_PTR dwInstance, DWORD fdwEnum) { PWINE_ACMDRIVERID padid; WAVEFORMATEX wfxRef; BOOL ret; - TRACE("(%p, %p, %p, %d, %d)\n", + TRACE("(%p, %p, %p, %ld, %d)\n", had, pafd, fnCallback, dwInstance, fdwEnum); if (!pafd) @@ -711,7 +712,7 @@ struct MSACM_FormatTagEnumWtoA_Instance { static BOOL CALLBACK MSACM_FormatTagEnumCallbackWtoA(HACMDRIVERID hadid, PACMFORMATTAGDETAILSW paftdw, - DWORD dwInstance, + DWORD_PTR dwInstance, DWORD fdwSupport) { struct MSACM_FormatTagEnumWtoA_Instance* paftei; @@ -734,8 +735,8 @@ static BOOL CALLBACK MSACM_FormatTagEnumCallbackWtoA(HACMDRIVERID hadid, * acmFormatTagEnumA (MSACM32.@) */ MMRESULT WINAPI acmFormatTagEnumA(HACMDRIVER had, PACMFORMATTAGDETAILSA paftda, - ACMFORMATTAGENUMCBA fnCallback, DWORD dwInstance, - DWORD fdwEnum) + ACMFORMATTAGENUMCBA fnCallback, + DWORD_PTR dwInstance, DWORD fdwEnum) { ACMFORMATTAGDETAILSW aftdw; struct MSACM_FormatTagEnumWtoA_Instance aftei; @@ -766,14 +767,14 @@ MMRESULT WINAPI acmFormatTagEnumA(HACMDRIVER had, PACMFORMATTAGDETAILSA paftda, * acmFormatTagEnumW (MSACM32.@) */ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, - ACMFORMATTAGENUMCBW fnCallback, DWORD dwInstance, - DWORD fdwEnum) + ACMFORMATTAGENUMCBW fnCallback, + DWORD_PTR dwInstance, DWORD fdwEnum) { PWINE_ACMDRIVERID padid; unsigned int i; BOOL bPcmDone = FALSE; - TRACE("(%p, %p, %p, %d, %d)\n", + TRACE("(%p, %p, %p, %ld, %d)\n", had, paftd, fnCallback, dwInstance, fdwEnum); if (!paftd) diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index b05948d6719..a2065f392ab 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -141,9 +141,10 @@ MMRESULT WINAPI acmStreamMessage(HACMSTREAM has, UINT uMsg, LPARAM lParam1, /*********************************************************************** * acmStreamOpen (MSACM32.@) */ -MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pwfxSrc, - PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback, - DWORD dwInstance, DWORD fdwOpen) +MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, + PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst, + PWAVEFILTER pwfltr, DWORD_PTR dwCallback, + DWORD_PTR dwInstance, DWORD fdwOpen) { PWINE_ACMSTREAM was; PWINE_ACMDRIVER wad; @@ -152,7 +153,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pw int wfxDstSize; WAVEFORMATEX wfxSrc, wfxDst; - TRACE("(%p, %p, %p, %p, %p, %d, %d, %d)\n", + TRACE("(%p, %p, %p, %p, %p, %ld, %ld, %d)\n", phas, had, pwfxSrc, pwfxDst, pwfltr, dwCallback, dwInstance, fdwOpen); /* NOTE: pwfxSrc and/or pwfxDst can point to a structure smaller than diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 6efcb84b9d0..956b78554bd 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -34,7 +34,7 @@ static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, PACMFORMATTAGDETAILS paftd, - DWORD dwInstance, + DWORD_PTR dwInstance, DWORD fdwSupport) { if (winetest_interactive) @@ -45,7 +45,7 @@ static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid, LPACMFORMATDETAILS pafd, - DWORD dwInstance, + DWORD_PTR dwInstance, DWORD fd) { if (winetest_interactive) @@ -55,7 +55,7 @@ static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid, } static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, - DWORD dwInstance, + DWORD_PTR dwInstance, DWORD fdwSupport) { MMRESULT rc; diff --git a/include/msacm.h b/include/msacm.h index c4da171719f..73788feab9a 100644 --- a/include/msacm.h +++ b/include/msacm.h @@ -242,7 +242,7 @@ typedef HACMOBJ *PHACMOBJ, *LPHACMOBJ; */ typedef BOOL (CALLBACK *ACMDRIVERENUMCB)( - HACMDRIVERID hadid, DWORD dwInstance, DWORD fdwSupport + HACMDRIVERID hadid, DWORD_PTR dwInstance, DWORD fdwSupport ); typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROCA)( @@ -539,70 +539,78 @@ DECL_WINELIB_TYPE_AW(ACMFORMATTAGDETAILS) DECL_WINELIB_TYPE_AW(PACMFORMATTAGDETAILS) DECL_WINELIB_TYPE_AW(LPACMFORMATTAGDETAILS) +#ifdef _WIN64 +# define _ACMSTREAMHEADERRESERVE 15 +#else +# define _ACMSTREAMHEADERRESERVE 10 +#endif + typedef struct _ACMSTREAMHEADER { - DWORD cbStruct; - DWORD fdwStatus; - DWORD dwUser; - LPBYTE pbSrc; - DWORD cbSrcLength; - DWORD cbSrcLengthUsed; - DWORD dwSrcUser; - LPBYTE pbDst; - DWORD cbDstLength; - DWORD cbDstLengthUsed; - DWORD dwDstUser; - DWORD dwReservedDriver[10]; + DWORD cbStruct; + DWORD fdwStatus; + DWORD_PTR dwUser; + LPBYTE pbSrc; + DWORD cbSrcLength; + DWORD cbSrcLengthUsed; + DWORD_PTR dwSrcUser; + LPBYTE pbDst; + DWORD cbDstLength; + DWORD cbDstLengthUsed; + DWORD_PTR dwDstUser; + DWORD dwReservedDriver[_ACMSTREAMHEADERRESERVE]; } ACMSTREAMHEADER, *PACMSTREAMHEADER, *LPACMSTREAMHEADER; +#undef _ACMSTREAMHEADERRESERVE + /*********************************************************************** * Callbacks 2 */ typedef BOOL (CALLBACK *ACMFILTERENUMCBA)( HACMDRIVERID hadid, PACMFILTERDETAILSA pafd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); typedef BOOL (CALLBACK *ACMFILTERENUMCBW)( HACMDRIVERID hadid, PACMFILTERDETAILSW pafd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); #define ACMFILTERENUMCB WINELIB_NAME_AW(ACMFILTERENUMCB) typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBA)( HACMDRIVERID hadid, PACMFILTERTAGDETAILSA paftd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBW)( HACMDRIVERID hadid, PACMFILTERTAGDETAILSW paftd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); #define ACMFILTERTAGENUMCB WINELIB_NAME_AW(ACMFILTERTAGENUMCB) typedef BOOL (CALLBACK *ACMFORMATENUMCBA)( HACMDRIVERID hadid, PACMFORMATDETAILSA pafd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); typedef BOOL (CALLBACK *ACMFORMATENUMCBW)( HACMDRIVERID hadid, PACMFORMATDETAILSW pafd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); #define ACMFORMATENUMCB WINELIB_NAME_AW(ACMFORMATENUMCB) typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBA)( HACMDRIVERID hadid, PACMFORMATTAGDETAILSA paftd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBW)( HACMDRIVERID hadid, PACMFORMATTAGDETAILSW paftd, - DWORD dwInstance, DWORD fdwSupport + DWORD_PTR dwInstance, DWORD fdwSupport ); #define ACMFORMATTAGENUMCB WINELIB_NAME_AW(ACMFORMATTAGENUMCB) @@ -633,7 +641,7 @@ MMRESULT WINAPI acmDriverDetailsW( #define acmDriverDetails WINELIB_NAME_AW(acmDriverDetails) MMRESULT WINAPI acmDriverEnum( - ACMDRIVERENUMCB fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMDRIVERENUMCB fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); MMRESULT WINAPI acmDriverID( HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID @@ -668,11 +676,11 @@ MMRESULT WINAPI acmFilterDetailsW( MMRESULT WINAPI acmFilterEnumA( HACMDRIVER had, PACMFILTERDETAILSA pafd, - ACMFILTERENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFILTERENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); MMRESULT WINAPI acmFilterEnumW( HACMDRIVER had, PACMFILTERDETAILSW pafd, - ACMFILTERENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFILTERENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); #define acmFilterEnum WINELIB_NAME_AW(acmFilterEnum) @@ -686,11 +694,11 @@ MMRESULT WINAPI acmFilterTagDetailsW( MMRESULT WINAPI acmFilterTagEnumA( HACMDRIVER had, PACMFILTERTAGDETAILSA paftd, - ACMFILTERTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFILTERTAGENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); MMRESULT WINAPI acmFilterTagEnumW( HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, - ACMFILTERTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFILTERTAGENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); #define acmFilterTagEnum WINELIB_NAME_AW(acmFilterTagEnum) @@ -712,11 +720,11 @@ MMRESULT WINAPI acmFormatDetailsW( MMRESULT WINAPI acmFormatEnumA( HACMDRIVER had, PACMFORMATDETAILSA pafd, - ACMFORMATENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFORMATENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); MMRESULT WINAPI acmFormatEnumW( HACMDRIVER had, PACMFORMATDETAILSW pafd, - ACMFORMATENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFORMATENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); #define acmFormatEnum WINELIB_NAME_AW(acmFormatEnum) @@ -734,11 +742,11 @@ MMRESULT WINAPI acmFormatTagDetailsW( MMRESULT WINAPI acmFormatTagEnumA( HACMDRIVER had, PACMFORMATTAGDETAILSA paftd, - ACMFORMATTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFORMATTAGENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); MMRESULT WINAPI acmFormatTagEnumW( HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, - ACMFORMATTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum + ACMFORMATTAGENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum ); #define acmFormatTagEnum WINELIB_NAME_AW(acmFormatTagEnum) @@ -758,8 +766,8 @@ MMRESULT WINAPI acmStreamMessage( ); MMRESULT WINAPI acmStreamOpen( PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pwfxSrc, - PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback, - DWORD dwInstance, DWORD fdwOpen + PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD_PTR dwCallback, + DWORD_PTR dwInstance, DWORD fdwOpen ); MMRESULT WINAPI acmStreamPrepareHeader( HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwPrepare -- 2.11.4.GIT