Skip to content

W
wine-winehq
Commit 8aeacc5f authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

include: Change some DWORD to DWORD_PTR in msacm.h.

The change is for Win64 compatibility and it matches the DDK.
parent 5804470f
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 66 deletions
dlls/msacm32/driver.c
View file @ 8aeacc5f
...@@ -312,12 +312,13 @@ MMRESULT WINAPI acmDriverDetailsW(HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, D ...@@ -312,12 +312,13 @@ MMRESULT WINAPI acmDriverDetailsW(HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, D
/*********************************************************************** /***********************************************************************
* acmDriverEnum (MSACM32.@) * acmDriverEnum (MSACM32.@)
*/ */
MMRESULT WINAPI acmDriverEnum(ACMDRIVERENUMCB fnCallback, DWORD dwInstance, DWORD fdwEnum) MMRESULT WINAPI acmDriverEnum(ACMDRIVERENUMCB fnCallback, DWORD_PTR dwInstance,
DWORD fdwEnum)
{ {
PWINE_ACMDRIVERID padid; PWINE_ACMDRIVERID padid;
DWORD fdwSupport; DWORD fdwSupport;
TRACE("(%p, %08x, %08x)\n", fnCallback, dwInstance, fdwEnum); TRACE("(%p, %08lx, %08x)\n", fnCallback, dwInstance, fdwEnum);
if (!fnCallback) { if (!fnCallback) {
WARN("invalid parameter\n"); WARN("invalid parameter\n");
......
dlls/msacm32/filter.c
View file @ 8aeacc5f
...@@ -144,7 +144,7 @@ struct MSACM_FilterEnumWtoA_Instance { ...@@ -144,7 +144,7 @@ struct MSACM_FilterEnumWtoA_Instance {
static BOOL CALLBACK MSACM_FilterEnumCallbackWtoA(HACMDRIVERID hadid, static BOOL CALLBACK MSACM_FilterEnumCallbackWtoA(HACMDRIVERID hadid,
PACMFILTERDETAILSW pafdw, PACMFILTERDETAILSW pafdw,
DWORD dwInstance, DWORD_PTR dwInstance,
DWORD fdwSupport) DWORD fdwSupport)
{ {
struct MSACM_FilterEnumWtoA_Instance* pafei; struct MSACM_FilterEnumWtoA_Instance* pafei;
...@@ -165,8 +165,8 @@ static BOOL CALLBACK MSACM_FilterEnumCallbackWtoA(HACMDRIVERID hadid, ...@@ -165,8 +165,8 @@ static BOOL CALLBACK MSACM_FilterEnumCallbackWtoA(HACMDRIVERID hadid,
* acmFilterEnumA (MSACM32.@) * acmFilterEnumA (MSACM32.@)
*/ */
MMRESULT WINAPI acmFilterEnumA(HACMDRIVER had, PACMFILTERDETAILSA pafda, MMRESULT WINAPI acmFilterEnumA(HACMDRIVER had, PACMFILTERDETAILSA pafda,
ACMFILTERENUMCBA fnCallback, DWORD dwInstance, ACMFILTERENUMCBA fnCallback,
DWORD fdwEnum) DWORD_PTR dwInstance, DWORD fdwEnum)
{ {
ACMFILTERDETAILSW afdw; ACMFILTERDETAILSW afdw;
struct MSACM_FilterEnumWtoA_Instance afei; struct MSACM_FilterEnumWtoA_Instance afei;
...@@ -222,13 +222,13 @@ static BOOL MSACM_FilterEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had, ...@@ -222,13 +222,13 @@ static BOOL MSACM_FilterEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had,
* acmFilterEnumW (MSACM32.@) * acmFilterEnumW (MSACM32.@)
*/ */
MMRESULT WINAPI acmFilterEnumW(HACMDRIVER had, PACMFILTERDETAILSW pafd, MMRESULT WINAPI acmFilterEnumW(HACMDRIVER had, PACMFILTERDETAILSW pafd,
ACMFILTERENUMCBW fnCallback, DWORD dwInstance, ACMFILTERENUMCBW fnCallback,
DWORD fdwEnum) DWORD_PTR dwInstance, DWORD fdwEnum)
{ {
PWINE_ACMDRIVERID padid; PWINE_ACMDRIVERID padid;
BOOL ret; BOOL ret;
TRACE("(%p, %p, %p, %d, %d)\n", TRACE("(%p, %p, %p, %ld, %d)\n",
had, pafd, fnCallback, dwInstance, fdwEnum); had, pafd, fnCallback, dwInstance, fdwEnum);
if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM;
...@@ -375,7 +375,7 @@ struct MSACM_FilterTagEnumWtoA_Instance { ...@@ -375,7 +375,7 @@ struct MSACM_FilterTagEnumWtoA_Instance {
static BOOL CALLBACK MSACM_FilterTagEnumCallbackWtoA(HACMDRIVERID hadid, static BOOL CALLBACK MSACM_FilterTagEnumCallbackWtoA(HACMDRIVERID hadid,
PACMFILTERTAGDETAILSW paftdw, PACMFILTERTAGDETAILSW paftdw,
DWORD dwInstance, DWORD_PTR dwInstance,
DWORD fdwSupport) DWORD fdwSupport)
{ {
struct MSACM_FilterTagEnumWtoA_Instance* paftei; struct MSACM_FilterTagEnumWtoA_Instance* paftei;
...@@ -398,8 +398,8 @@ static BOOL CALLBACK MSACM_FilterTagEnumCallbackWtoA(HACMDRIVERID hadid, ...@@ -398,8 +398,8 @@ static BOOL CALLBACK MSACM_FilterTagEnumCallbackWtoA(HACMDRIVERID hadid,
* acmFilterTagEnumA (MSACM32.@) * acmFilterTagEnumA (MSACM32.@)
*/ */
MMRESULT WINAPI acmFilterTagEnumA(HACMDRIVER had, PACMFILTERTAGDETAILSA paftda, MMRESULT WINAPI acmFilterTagEnumA(HACMDRIVER had, PACMFILTERTAGDETAILSA paftda,
ACMFILTERTAGENUMCBA fnCallback, DWORD dwInstance, ACMFILTERTAGENUMCBA fnCallback,
DWORD fdwEnum) DWORD_PTR dwInstance, DWORD fdwEnum)
{ {
ACMFILTERTAGDETAILSW aftdw; ACMFILTERTAGDETAILSW aftdw;
struct MSACM_FilterTagEnumWtoA_Instance aftei; struct MSACM_FilterTagEnumWtoA_Instance aftei;
...@@ -421,13 +421,13 @@ MMRESULT WINAPI acmFilterTagEnumA(HACMDRIVER had, PACMFILTERTAGDETAILSA paftda, ...@@ -421,13 +421,13 @@ MMRESULT WINAPI acmFilterTagEnumA(HACMDRIVER had, PACMFILTERTAGDETAILSA paftda,
* acmFilterTagEnumW (MSACM32.@) * acmFilterTagEnumW (MSACM32.@)
*/ */
MMRESULT WINAPI acmFilterTagEnumW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, MMRESULT WINAPI acmFilterTagEnumW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd,
ACMFILTERTAGENUMCBW fnCallback, DWORD dwInstance, ACMFILTERTAGENUMCBW fnCallback,
DWORD fdwEnum) DWORD_PTR dwInstance, DWORD fdwEnum)
{ {
PWINE_ACMDRIVERID padid; PWINE_ACMDRIVERID padid;
unsigned int i; unsigned int i;
TRACE("(%p, %p, %p, %d, %d)\n", TRACE("(%p, %p, %p, %ld, %d)\n",
had, paftd, fnCallback, dwInstance, fdwEnum); had, paftd, fnCallback, dwInstance, fdwEnum);
if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM; if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM;
......
dlls/msacm32/format.c
View file @ 8aeacc5f
...@@ -54,7 +54,8 @@ struct MSACM_FillFormatData { ...@@ -54,7 +54,8 @@ struct MSACM_FillFormatData {
static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid,
PACMFORMATTAGDETAILSA paftd, PACMFORMATTAGDETAILSA paftd,
DWORD dwInstance, DWORD fdwSupport) DWORD_PTR dwInstance,
DWORD fdwSupport)
{ {
struct MSACM_FillFormatData* affd = (struct MSACM_FillFormatData*)dwInstance; struct MSACM_FillFormatData* affd = (struct MSACM_FillFormatData*)dwInstance;
...@@ -383,7 +384,7 @@ struct MSACM_FormatEnumWtoA_Instance { ...@@ -383,7 +384,7 @@ struct MSACM_FormatEnumWtoA_Instance {
static BOOL CALLBACK MSACM_FormatEnumCallbackWtoA(HACMDRIVERID hadid, static BOOL CALLBACK MSACM_FormatEnumCallbackWtoA(HACMDRIVERID hadid,
PACMFORMATDETAILSW pafdw, PACMFORMATDETAILSW pafdw,
DWORD dwInstance, DWORD_PTR dwInstance,
DWORD fdwSupport) DWORD fdwSupport)
{ {
struct MSACM_FormatEnumWtoA_Instance* pafei; struct MSACM_FormatEnumWtoA_Instance* pafei;
...@@ -404,8 +405,8 @@ static BOOL CALLBACK MSACM_FormatEnumCallbackWtoA(HACMDRIVERID hadid, ...@@ -404,8 +405,8 @@ static BOOL CALLBACK MSACM_FormatEnumCallbackWtoA(HACMDRIVERID hadid,
* acmFormatEnumA (MSACM32.@) * acmFormatEnumA (MSACM32.@)
*/ */
MMRESULT WINAPI acmFormatEnumA(HACMDRIVER had, PACMFORMATDETAILSA pafda, MMRESULT WINAPI acmFormatEnumA(HACMDRIVER had, PACMFORMATDETAILSA pafda,
ACMFORMATENUMCBA fnCallback, DWORD dwInstance, ACMFORMATENUMCBA fnCallback,
DWORD fdwEnum) DWORD_PTR dwInstance, DWORD fdwEnum)
{ {
ACMFORMATDETAILSW afdw; ACMFORMATDETAILSW afdw;
struct MSACM_FormatEnumWtoA_Instance afei; struct MSACM_FormatEnumWtoA_Instance afei;
...@@ -484,14 +485,14 @@ static BOOL MSACM_FormatEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had, ...@@ -484,14 +485,14 @@ static BOOL MSACM_FormatEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had,
/**********************************************************************/ /**********************************************************************/
MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd,
ACMFORMATENUMCBW fnCallback, DWORD dwInstance, ACMFORMATENUMCBW fnCallback,
DWORD fdwEnum) DWORD_PTR dwInstance, DWORD fdwEnum)
{ {
PWINE_ACMDRIVERID padid; PWINE_ACMDRIVERID padid;
WAVEFORMATEX wfxRef; WAVEFORMATEX wfxRef;
BOOL ret; BOOL ret;
TRACE("(%p, %p, %p, %d, %d)\n", TRACE("(%p, %p, %p, %ld, %d)\n",
had, pafd, fnCallback, dwInstance, fdwEnum); had, pafd, fnCallback, dwInstance, fdwEnum);
if (!pafd) if (!pafd)
...@@ -711,7 +712,7 @@ struct MSACM_FormatTagEnumWtoA_Instance { ...@@ -711,7 +712,7 @@ struct MSACM_FormatTagEnumWtoA_Instance {
static BOOL CALLBACK MSACM_FormatTagEnumCallbackWtoA(HACMDRIVERID hadid, static BOOL CALLBACK MSACM_FormatTagEnumCallbackWtoA(HACMDRIVERID hadid,
PACMFORMATTAGDETAILSW paftdw, PACMFORMATTAGDETAILSW paftdw,
DWORD dwInstance, DWORD_PTR dwInstance,
DWORD fdwSupport) DWORD fdwSupport)
{ {
struct MSACM_FormatTagEnumWtoA_Instance* paftei; struct MSACM_FormatTagEnumWtoA_Instance* paftei;
...@@ -734,8 +735,8 @@ static BOOL CALLBACK MSACM_FormatTagEnumCallbackWtoA(HACMDRIVERID hadid, ...@@ -734,8 +735,8 @@ static BOOL CALLBACK MSACM_FormatTagEnumCallbackWtoA(HACMDRIVERID hadid,
* acmFormatTagEnumA (MSACM32.@) * acmFormatTagEnumA (MSACM32.@)
*/ */
MMRESULT WINAPI acmFormatTagEnumA(HACMDRIVER had, PACMFORMATTAGDETAILSA paftda, MMRESULT WINAPI acmFormatTagEnumA(HACMDRIVER had, PACMFORMATTAGDETAILSA paftda,
ACMFORMATTAGENUMCBA fnCallback, DWORD dwInstance, ACMFORMATTAGENUMCBA fnCallback,
DWORD fdwEnum) DWORD_PTR dwInstance, DWORD fdwEnum)
{ {
ACMFORMATTAGDETAILSW aftdw; ACMFORMATTAGDETAILSW aftdw;
struct MSACM_FormatTagEnumWtoA_Instance aftei; struct MSACM_FormatTagEnumWtoA_Instance aftei;
...@@ -766,14 +767,14 @@ MMRESULT WINAPI acmFormatTagEnumA(HACMDRIVER had, PACMFORMATTAGDETAILSA paftda, ...@@ -766,14 +767,14 @@ MMRESULT WINAPI acmFormatTagEnumA(HACMDRIVER had, PACMFORMATTAGDETAILSA paftda,
* acmFormatTagEnumW (MSACM32.@) * acmFormatTagEnumW (MSACM32.@)
*/ */
MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd,
ACMFORMATTAGENUMCBW fnCallback, DWORD dwInstance, ACMFORMATTAGENUMCBW fnCallback,
DWORD fdwEnum) DWORD_PTR dwInstance, DWORD fdwEnum)
{ {
PWINE_ACMDRIVERID padid; PWINE_ACMDRIVERID padid;
unsigned int i; unsigned int i;
BOOL bPcmDone = FALSE; BOOL bPcmDone = FALSE;
TRACE("(%p, %p, %p, %d, %d)\n", TRACE("(%p, %p, %p, %ld, %d)\n",
had, paftd, fnCallback, dwInstance, fdwEnum); had, paftd, fnCallback, dwInstance, fdwEnum);
if (!paftd) if (!paftd)
......
dlls/msacm32/stream.c
View file @ 8aeacc5f
...@@ -141,9 +141,10 @@ MMRESULT WINAPI acmStreamMessage(HACMSTREAM has, UINT uMsg, LPARAM lParam1, ...@@ -141,9 +141,10 @@ MMRESULT WINAPI acmStreamMessage(HACMSTREAM has, UINT uMsg, LPARAM lParam1,
/*********************************************************************** /***********************************************************************
* acmStreamOpen (MSACM32.@) * acmStreamOpen (MSACM32.@)
*/ */
MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pwfxSrc, MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had,
PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst,
DWORD dwInstance, DWORD fdwOpen) PWAVEFILTER pwfltr, DWORD_PTR dwCallback,
DWORD_PTR dwInstance, DWORD fdwOpen)
{ {
PWINE_ACMSTREAM was; PWINE_ACMSTREAM was;
PWINE_ACMDRIVER wad; PWINE_ACMDRIVER wad;
...@@ -152,7 +153,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pw ...@@ -152,7 +153,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pw
int wfxDstSize; int wfxDstSize;
WAVEFORMATEX wfxSrc, wfxDst; 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); phas, had, pwfxSrc, pwfxDst, pwfltr, dwCallback, dwInstance, fdwOpen);
/* NOTE: pwfxSrc and/or pwfxDst can point to a structure smaller than /* NOTE: pwfxSrc and/or pwfxDst can point to a structure smaller than
......
dlls/msacm32/tests/msacm.c
View file @ 8aeacc5f
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid,
PACMFORMATTAGDETAILS paftd, PACMFORMATTAGDETAILS paftd,
DWORD dwInstance, DWORD_PTR dwInstance,
DWORD fdwSupport) DWORD fdwSupport)
{ {
if (winetest_interactive) if (winetest_interactive)
...@@ -45,7 +45,7 @@ static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, ...@@ -45,7 +45,7 @@ static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid,
static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid, static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid,
LPACMFORMATDETAILS pafd, LPACMFORMATDETAILS pafd,
DWORD dwInstance, DWORD_PTR dwInstance,
DWORD fd) DWORD fd)
{ {
if (winetest_interactive) if (winetest_interactive)
...@@ -55,7 +55,7 @@ static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid, ...@@ -55,7 +55,7 @@ static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid,
} }
static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid,
DWORD dwInstance, DWORD_PTR dwInstance,
DWORD fdwSupport) DWORD fdwSupport)
{ {
MMRESULT rc; MMRESULT rc;
......
include/msacm.h
View file @ 8aeacc5f
...@@ -242,7 +242,7 @@ typedef HACMOBJ *PHACMOBJ, *LPHACMOBJ; ...@@ -242,7 +242,7 @@ typedef HACMOBJ *PHACMOBJ, *LPHACMOBJ;
*/ */
typedef BOOL (CALLBACK *ACMDRIVERENUMCB)( typedef BOOL (CALLBACK *ACMDRIVERENUMCB)(
HACMDRIVERID hadid, DWORD dwInstance, DWORD fdwSupport HACMDRIVERID hadid, DWORD_PTR dwInstance, DWORD fdwSupport
); );
typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROCA)( typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROCA)(
...@@ -539,70 +539,78 @@ DECL_WINELIB_TYPE_AW(ACMFORMATTAGDETAILS) ...@@ -539,70 +539,78 @@ DECL_WINELIB_TYPE_AW(ACMFORMATTAGDETAILS)
DECL_WINELIB_TYPE_AW(PACMFORMATTAGDETAILS) DECL_WINELIB_TYPE_AW(PACMFORMATTAGDETAILS)
DECL_WINELIB_TYPE_AW(LPACMFORMATTAGDETAILS) DECL_WINELIB_TYPE_AW(LPACMFORMATTAGDETAILS)
#ifdef _WIN64
# define _ACMSTREAMHEADERRESERVE 15
#else
# define _ACMSTREAMHEADERRESERVE 10
#endif
typedef struct _ACMSTREAMHEADER typedef struct _ACMSTREAMHEADER
{ {
DWORD cbStruct; DWORD cbStruct;
DWORD fdwStatus; DWORD fdwStatus;
DWORD dwUser; DWORD_PTR dwUser;
LPBYTE pbSrc; LPBYTE pbSrc;
DWORD cbSrcLength; DWORD cbSrcLength;
DWORD cbSrcLengthUsed; DWORD cbSrcLengthUsed;
DWORD dwSrcUser; DWORD_PTR dwSrcUser;
LPBYTE pbDst; LPBYTE pbDst;
DWORD cbDstLength; DWORD cbDstLength;
DWORD cbDstLengthUsed; DWORD cbDstLengthUsed;
DWORD dwDstUser; DWORD_PTR dwDstUser;
DWORD dwReservedDriver[10]; DWORD dwReservedDriver[_ACMSTREAMHEADERRESERVE];
} ACMSTREAMHEADER, *PACMSTREAMHEADER, *LPACMSTREAMHEADER; } ACMSTREAMHEADER, *PACMSTREAMHEADER, *LPACMSTREAMHEADER;
#undef _ACMSTREAMHEADERRESERVE
/*********************************************************************** /***********************************************************************
* Callbacks 2 * Callbacks 2
*/ */
typedef BOOL (CALLBACK *ACMFILTERENUMCBA)( typedef BOOL (CALLBACK *ACMFILTERENUMCBA)(
HACMDRIVERID hadid, PACMFILTERDETAILSA pafd, HACMDRIVERID hadid, PACMFILTERDETAILSA pafd,
DWORD dwInstance, DWORD fdwSupport DWORD_PTR dwInstance, DWORD fdwSupport
); );
typedef BOOL (CALLBACK *ACMFILTERENUMCBW)( typedef BOOL (CALLBACK *ACMFILTERENUMCBW)(
HACMDRIVERID hadid, PACMFILTERDETAILSW pafd, HACMDRIVERID hadid, PACMFILTERDETAILSW pafd,
DWORD dwInstance, DWORD fdwSupport DWORD_PTR dwInstance, DWORD fdwSupport
); );
#define ACMFILTERENUMCB WINELIB_NAME_AW(ACMFILTERENUMCB) #define ACMFILTERENUMCB WINELIB_NAME_AW(ACMFILTERENUMCB)
typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBA)( typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBA)(
HACMDRIVERID hadid, PACMFILTERTAGDETAILSA paftd, HACMDRIVERID hadid, PACMFILTERTAGDETAILSA paftd,
DWORD dwInstance, DWORD fdwSupport DWORD_PTR dwInstance, DWORD fdwSupport
); );
typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBW)( typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBW)(
HACMDRIVERID hadid, PACMFILTERTAGDETAILSW paftd, HACMDRIVERID hadid, PACMFILTERTAGDETAILSW paftd,
DWORD dwInstance, DWORD fdwSupport DWORD_PTR dwInstance, DWORD fdwSupport
); );
#define ACMFILTERTAGENUMCB WINELIB_NAME_AW(ACMFILTERTAGENUMCB) #define ACMFILTERTAGENUMCB WINELIB_NAME_AW(ACMFILTERTAGENUMCB)
typedef BOOL (CALLBACK *ACMFORMATENUMCBA)( typedef BOOL (CALLBACK *ACMFORMATENUMCBA)(
HACMDRIVERID hadid, PACMFORMATDETAILSA pafd, HACMDRIVERID hadid, PACMFORMATDETAILSA pafd,
DWORD dwInstance, DWORD fdwSupport DWORD_PTR dwInstance, DWORD fdwSupport
); );
typedef BOOL (CALLBACK *ACMFORMATENUMCBW)( typedef BOOL (CALLBACK *ACMFORMATENUMCBW)(
HACMDRIVERID hadid, PACMFORMATDETAILSW pafd, HACMDRIVERID hadid, PACMFORMATDETAILSW pafd,
DWORD dwInstance, DWORD fdwSupport DWORD_PTR dwInstance, DWORD fdwSupport
); );
#define ACMFORMATENUMCB WINELIB_NAME_AW(ACMFORMATENUMCB) #define ACMFORMATENUMCB WINELIB_NAME_AW(ACMFORMATENUMCB)
typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBA)( typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBA)(
HACMDRIVERID hadid, PACMFORMATTAGDETAILSA paftd, HACMDRIVERID hadid, PACMFORMATTAGDETAILSA paftd,
DWORD dwInstance, DWORD fdwSupport DWORD_PTR dwInstance, DWORD fdwSupport
); );
typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBW)( typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBW)(
HACMDRIVERID hadid, PACMFORMATTAGDETAILSW paftd, HACMDRIVERID hadid, PACMFORMATTAGDETAILSW paftd,
DWORD dwInstance, DWORD fdwSupport DWORD_PTR dwInstance, DWORD fdwSupport
); );
#define ACMFORMATTAGENUMCB WINELIB_NAME_AW(ACMFORMATTAGENUMCB) #define ACMFORMATTAGENUMCB WINELIB_NAME_AW(ACMFORMATTAGENUMCB)
...@@ -633,7 +641,7 @@ MMRESULT WINAPI acmDriverDetailsW( ...@@ -633,7 +641,7 @@ MMRESULT WINAPI acmDriverDetailsW(
#define acmDriverDetails WINELIB_NAME_AW(acmDriverDetails) #define acmDriverDetails WINELIB_NAME_AW(acmDriverDetails)
MMRESULT WINAPI acmDriverEnum( MMRESULT WINAPI acmDriverEnum(
ACMDRIVERENUMCB fnCallback, DWORD dwInstance, DWORD fdwEnum ACMDRIVERENUMCB fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum
); );
MMRESULT WINAPI acmDriverID( MMRESULT WINAPI acmDriverID(
HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID
...@@ -668,11 +676,11 @@ MMRESULT WINAPI acmFilterDetailsW( ...@@ -668,11 +676,11 @@ MMRESULT WINAPI acmFilterDetailsW(
MMRESULT WINAPI acmFilterEnumA( MMRESULT WINAPI acmFilterEnumA(
HACMDRIVER had, PACMFILTERDETAILSA pafd, HACMDRIVER had, PACMFILTERDETAILSA pafd,
ACMFILTERENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum ACMFILTERENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum
); );
MMRESULT WINAPI acmFilterEnumW( MMRESULT WINAPI acmFilterEnumW(
HACMDRIVER had, PACMFILTERDETAILSW pafd, HACMDRIVER had, PACMFILTERDETAILSW pafd,
ACMFILTERENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum ACMFILTERENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum
); );
#define acmFilterEnum WINELIB_NAME_AW(acmFilterEnum) #define acmFilterEnum WINELIB_NAME_AW(acmFilterEnum)
...@@ -686,11 +694,11 @@ MMRESULT WINAPI acmFilterTagDetailsW( ...@@ -686,11 +694,11 @@ MMRESULT WINAPI acmFilterTagDetailsW(
MMRESULT WINAPI acmFilterTagEnumA( MMRESULT WINAPI acmFilterTagEnumA(
HACMDRIVER had, PACMFILTERTAGDETAILSA paftd, HACMDRIVER had, PACMFILTERTAGDETAILSA paftd,
ACMFILTERTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum ACMFILTERTAGENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum
); );
MMRESULT WINAPI acmFilterTagEnumW( MMRESULT WINAPI acmFilterTagEnumW(
HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, HACMDRIVER had, PACMFILTERTAGDETAILSW paftd,
ACMFILTERTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum ACMFILTERTAGENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum
); );
#define acmFilterTagEnum WINELIB_NAME_AW(acmFilterTagEnum) #define acmFilterTagEnum WINELIB_NAME_AW(acmFilterTagEnum)
...@@ -712,11 +720,11 @@ MMRESULT WINAPI acmFormatDetailsW( ...@@ -712,11 +720,11 @@ MMRESULT WINAPI acmFormatDetailsW(
MMRESULT WINAPI acmFormatEnumA( MMRESULT WINAPI acmFormatEnumA(
HACMDRIVER had, PACMFORMATDETAILSA pafd, HACMDRIVER had, PACMFORMATDETAILSA pafd,
ACMFORMATENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum ACMFORMATENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum
); );
MMRESULT WINAPI acmFormatEnumW( MMRESULT WINAPI acmFormatEnumW(
HACMDRIVER had, PACMFORMATDETAILSW pafd, HACMDRIVER had, PACMFORMATDETAILSW pafd,
ACMFORMATENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum ACMFORMATENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum
); );
#define acmFormatEnum WINELIB_NAME_AW(acmFormatEnum) #define acmFormatEnum WINELIB_NAME_AW(acmFormatEnum)
...@@ -734,11 +742,11 @@ MMRESULT WINAPI acmFormatTagDetailsW( ...@@ -734,11 +742,11 @@ MMRESULT WINAPI acmFormatTagDetailsW(
MMRESULT WINAPI acmFormatTagEnumA( MMRESULT WINAPI acmFormatTagEnumA(
HACMDRIVER had, PACMFORMATTAGDETAILSA paftd, HACMDRIVER had, PACMFORMATTAGDETAILSA paftd,
ACMFORMATTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum ACMFORMATTAGENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum
); );
MMRESULT WINAPI acmFormatTagEnumW( MMRESULT WINAPI acmFormatTagEnumW(
HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, HACMDRIVER had, PACMFORMATTAGDETAILSW paftd,
ACMFORMATTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum ACMFORMATTAGENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum
); );
#define acmFormatTagEnum WINELIB_NAME_AW(acmFormatTagEnum) #define acmFormatTagEnum WINELIB_NAME_AW(acmFormatTagEnum)
...@@ -758,8 +766,8 @@ MMRESULT WINAPI acmStreamMessage( ...@@ -758,8 +766,8 @@ MMRESULT WINAPI acmStreamMessage(
); );
MMRESULT WINAPI acmStreamOpen( MMRESULT WINAPI acmStreamOpen(
PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pwfxSrc, PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pwfxSrc,
PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback, PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD_PTR dwCallback,
DWORD dwInstance, DWORD fdwOpen DWORD_PTR dwInstance, DWORD fdwOpen
); );
MMRESULT WINAPI acmStreamPrepareHeader( MMRESULT WINAPI acmStreamPrepareHeader(
HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwPrepare HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwPrepare
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment