21 Mar
2009
21 Mar
'09
11:07 a.m.
Author: sserapion
Date: Sat Mar 21 14:07:04 2009
New Revision: 40155
URL: http://svn.reactos.org/svn/reactos?rev=40155&view=rev
Log:
Remove wine/msacm.h it just duplicated the one with have in psdk/ but with extra incorrect
definitions.
Fix ACMDRVSTREAMINSTANCE, ACMDRVSTREAMHEADER, PORTALLOC, WAVEOPENDESC, MIDIOPENDESC,
MIXEROPENDESC structures.
Fix ACMFILTERENUMCBA/W, ACMFILTERTAGENUMCBA/W, ACMFORMATENUMCA/W, ACMFORMATTAGENUMCBA/W
callbacks.
Fix acmDriverEnum, acmFilterEnumA/W, acmFormatEnumA/W, acmFormatTagEnumA/W, acmStreamOpen,
CloseDriver, OpenDriver, SendDriverMessage, mmTaskSignal, mmGetCurrentTask
Removed:
branches/ros-amd64-bringup/reactos/include/reactos/wine/msacm.h
Modified:
branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h
branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h
branches/ros-amd64-bringup/reactos/include/psdk/msacm.h
branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h
branches/ros-amd64-bringup/reactos/include/reactos/wine/msacmdrv.h
Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h [iso-8859-1] Sat Mar 21
14:07:04 2009
@@ -381,8 +381,8 @@
#define MAKEMCIRESOURCE(wRet, wRes) MAKELRESULT((wRet), (wRes))
typedef struct {
- DWORD dwCallback;
- DWORD dwInstance;
+ DWORD_PTR dwCallback;
+ DWORD_PTR dwInstance;
HMIDIOUT hMidi;
DWORD dwFlags;
} PORTALLOC, *LPPORTALLOC;
@@ -393,7 +393,7 @@
DWORD_PTR dwCallback;
DWORD_PTR dwInstance;
UINT uMappedDeviceID;
- DWORD dnDevNode;
+ DWORD_PTR dnDevNode;
} WAVEOPENDESC, *LPWAVEOPENDESC;
typedef struct {
@@ -403,9 +403,9 @@
typedef struct {
HMIDI hMidi;
- DWORD dwCallback;
- DWORD dwInstance;
- DWORD dnDevNode;
+ DWORD_PTR dwCallback;
+ DWORD_PTR dwInstance;
+ DWORD_PTR dnDevNode;
DWORD cIds;
MIDIOPENSTRMID rgIds;
} MIDIOPENDESC, *LPMIDIOPENDESC;
@@ -413,9 +413,9 @@
typedef struct tMIXEROPENDESC
{
HMIXEROBJ hmx;
- LPVOID pReserved0;
- DWORD dwCallback;
- DWORD dwInstance;
+ LPVOID pReserved0;
+ DWORD_PTR dwCallback;
+ DWORD_PTR dwInstance;
} MIXEROPENDESC, *LPMIXEROPENDESC;
typedef struct {
@@ -433,7 +433,7 @@
} MCI_OPEN_DRIVER_PARMSW, *LPMCI_OPEN_DRIVER_PARMSW;
DWORD WINAPI mciGetDriverData(UINT uDeviceID);
-BOOL WINAPI mciSetDriverData(UINT uDeviceID, DWORD dwData);
+BOOL WINAPI mciSetDriverData(UINT uDeviceID, DWORD_PTR dwData);
UINT WINAPI mciDriverYield(UINT uDeviceID);
BOOL WINAPI mciDriverNotify(HWND hwndCallback, UINT uDeviceID,
UINT uStatus);
@@ -449,8 +449,8 @@
#define DCB_TYPEMASK 0x0007
#define DCB_NOSWITCH 0x0008 /* don't switch stacks for
callback */
-BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev,
- UINT wMsg, DWORD dwUser, DWORD dwParam1,
DWORD dwParam2);
+BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, UINT uFlags, HDRVR
hDev,
+ UINT wMsg, DWORD_PTR dwUser, DWORD_PTR
dwParam1, DWORD_PTR dwParam2);
typedef void (*LPTASKCALLBACK)(DWORD dwInst);
@@ -458,9 +458,9 @@
#define TASKERR_OUTOFMEMORY 2
MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK, HANDLE*, DWORD);
void WINAPI mmTaskBlock(HANDLE);
-BOOL WINAPI mmTaskSignal(HANDLE);
+BOOL WINAPI mmTaskSignal(DWORD);
void WINAPI mmTaskYield(void);
-HANDLE WINAPI mmGetCurrentTask(void);
+DWORD WINAPI mmGetCurrentTask(void);
#define WAVE_DIRECTSOUND 0x0080
Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] Sat Mar 21
14:07:04 2009
@@ -1452,7 +1452,7 @@
HPSTR pchEndWrite;
LONG lBufOffset;
LONG lDiskOffset;
- DWORD adwInfo[4];
+ DWORD adwInfo[3];
DWORD dwReserved1;
DWORD dwReserved2;
HMMIO hmmio;
@@ -1644,9 +1644,9 @@
WORD wReserved5;
} MCI_WAVE_SET_PARMS,*PMCI_WAVE_SET_PARMS,*LPMCI_WAVE_SET_PARMS;
-LRESULT WINAPI CloseDriver(HDRVR,LONG,LONG);
-HDRVR WINAPI OpenDriver(LPCWSTR,LPCWSTR,LONG);
-LRESULT WINAPI SendDriverMessage(HDRVR,UINT,LONG,LONG);
+LRESULT WINAPI CloseDriver(HDRVR,LPARAM,LPARAM);
+HDRVR WINAPI OpenDriver(LPCWSTR,LPCWSTR,LPARAM);
+LRESULT WINAPI SendDriverMessage(HDRVR,UINT,LPARAM,LPARAM);
HMODULE WINAPI DrvGetModuleHandle(HDRVR);
HMODULE WINAPI GetDriverModuleHandle(HDRVR);
LRESULT WINAPI DefDriverProc(DWORD_PTR,HDRVR,UINT,LPARAM,LPARAM);
@@ -1830,7 +1830,7 @@
BOOL WINAPI mciGetErrorStringA(MCIERROR,LPSTR,UINT);
BOOL WINAPI mciGetErrorStringW(MCIERROR,LPWSTR,UINT);
BOOL WINAPI mciSetYieldProc(MCIDEVICEID,YIELDPROC,DWORD);
-HTASK WINAPI mciGetCreatorTask(MCIDEVICEID);
+HANDLE WINAPI mciGetCreatorTask(MCIDEVICEID);
YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD);
typedef struct tagMCI_SEQ_SET_PARMS {
Modified: branches/ros-amd64-bringup/reactos/include/psdk/msacm.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/msacm.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/msacm.h [iso-8859-1] Sat Mar 21
14:07:04 2009
@@ -561,48 +561,48 @@
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 +633,7 @@
#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 +668,11 @@
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 +686,11 @@
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 +712,11 @@
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 +734,11 @@
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 +758,8 @@
);
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
Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1]
Sat Mar 21 14:07:04 2009
@@ -160,7 +160,7 @@
IN DWORD CapabilitiesSize);
/* This one is for those of us who don't care */
-DEFINE_GETCAPS_FUNCTYPE(MMGETCAPS_FUNC, DWORD_PTR);
+DEFINE_GETCAPS_FUNCTYPE(MMGETCAPS_FUNC, PVOID);
/* These are for those of us that do */
DEFINE_GETCAPS_FUNCTYPE(MMGETWAVEOUTCAPS_FUNC, LPWAVEOUTCAPS);
Removed: branches/ros-amd64-bringup/reactos/include/reactos/wine/msacm.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/wine/msacm.h [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/wine/msacm.h (removed)
@@ -1,823 +1,0 @@
-/*
- * Declarations for MSACM
- *
- * Copyright (C) the Wine project
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __WINE_MSACM_H
-#define __WINE_MSACM_H
-
-#include <mmreg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* defined(__cplusplus) */
-
-#define ACMAPI WINAPI
-
-/***********************************************************************
- * Defines/Enums
- */
-#define ACMERR_BASE 512
-#define ACMERR_NOTPOSSIBLE (ACMERR_BASE + 0)
-#define ACMERR_BUSY (ACMERR_BASE + 1)
-#define ACMERR_UNPREPARED (ACMERR_BASE + 2)
-#define ACMERR_CANCELED (ACMERR_BASE + 3)
-
-#define MM_ACM_OPEN MM_STREAM_OPEN
-#define MM_ACM_CLOSE MM_STREAM_CLOSE
-#define MM_ACM_DONE MM_STREAM_DONE
-
-#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 ACMDRIVERDETAILS_SHORTNAME_CHARS 32
-#define ACMDRIVERDETAILS_LONGNAME_CHARS 128
-#define ACMDRIVERDETAILS_COPYRIGHT_CHARS 80
-#define ACMDRIVERDETAILS_LICENSING_CHARS 128
-#define ACMDRIVERDETAILS_FEATURES_CHARS 512
-
-#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 ACM_DRIVERENUMF_NOLOCAL 0x40000000L
-#define ACM_DRIVERENUMF_DISABLED 0x80000000L
-
-#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 MM_ACM_FILTERCHOOSE 0x8000
-
-#define FILTERCHOOSE_MESSAGE 0
-#define FILTERCHOOSE_FILTERTAG_VERIFY (FILTERCHOOSE_MESSAGE+0)
-#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 ACMFILTERDETAILS_FILTER_CHARS 128
-
-#define ACM_FILTERDETAILSF_INDEX 0x00000000L
-#define ACM_FILTERDETAILSF_FILTER 0x00000001L
-#define ACM_FILTERDETAILSF_QUERYMASK 0x0000000FL
-
-#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_FILTERENUMF_DWFILTERTAG 0x00010000L
-
-#define ACMHELPMSGSTRINGA "acmchoose_help"
-#if defined(__GNUC__)
-# define ACMHELPMSGSTRINGW (const WCHAR []){ 'a','c','m', \
-
'c','h','o','o','s','e','_','h','e','l','p',0
}
-#elif defined(_MSC_VER)
-# define ACMHELPMSGSTRINGW L"acmchoose_help"
-#else
-static const WCHAR ACMHELPMSGSTRINGW[] = { 'a','c','m',
-
'c','h','o','o','s','e','_','h','e','l','p',0
};
-#endif
-#define ACMHELPMSGSTRING WINELIB_NAME_AW(ACMHELPMSGSTRING)
-
-#define ACMHELPMSGCONTEXTMENUA "acmchoose_contextmenu"
-#if defined(__GNUC__)
-# define ACMHELPMSGCONTEXTMENUW (const WCHAR []){ 'a','c','m', \
-
'c','h','o','o','s','e','_','c','o','n','t','e','x','t','m','e','n','u',0
}
-#elif defined(_MSC_VER)
-# define ACMHELPMSGCONTEXTMENUW L"acmchoose_contextmenu"
-#else
-static const WCHAR ACMHELPMSGCONTEXTMENUW[] = { 'a','c','m',
-
'c','h','o','o','s','e','_','c','o','n','t','e','x','t','m','e','n','u',0
};
-#endif
-#define ACMHELPMSGCONTEXTMENU WINELIB_NAME_AW(ACMHELPMSGCONTEXTMENU)
-
-#define ACMHELPMSGCONTEXTHELPA "acmchoose_contexthelp"
-#if defined(__GNUC__)
-# define ACMHELPMSGCONTEXTHELPW (const WCHAR []){ 'a','c','m', \
-
'c','h','o','o','s','e','_','c','o','n','t','e','x','t','h','e','l','p',0
}
-#elif defined(_MSC_VER)
-# define ACMHELPMSGCONTEXTHELPW L"acmchoose_contexthelp"
-#else
-static const WCHAR ACMHELPMSGCONTEXTHELPW[] = { 'a','c','m',
-
'c','h','o','o','s','e','_','c','o','n','t','e','x','t','h','e','l','p',0
};
-#endif
-#define ACMHELPMSGCONTEXTHELP WINELIB_NAME_AW(ACMHELPMSGCONTEXTHELP)
-
-#define MM_ACM_FORMATCHOOSE 0x8000
-
-#define FORMATCHOOSE_MESSAGE 0
-#define FORMATCHOOSE_FORMATTAG_VERIFY (FORMATCHOOSE_MESSAGE+0)
-#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 ACMFORMATDETAILS_FORMAT_CHARS 128
-
-#define ACM_FORMATDETAILSF_INDEX 0x00000000L
-#define ACM_FORMATDETAILSF_FORMAT 0x00000001L
-#define ACM_FORMATDETAILSF_QUERYMASK 0x0000000FL
-
-#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_FORMATSUGGESTF_WFORMATTAG 0x00010000L
-#define ACM_FORMATSUGGESTF_NCHANNELS 0x00020000L
-#define ACM_FORMATSUGGESTF_NSAMPLESPERSEC 0x00040000L
-#define ACM_FORMATSUGGESTF_WBITSPERSAMPLE 0x00080000L
-#define ACM_FORMATSUGGESTF_TYPEMASK 0x00FF0000L
-
-#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_METRIC_COUNT_DRIVERS 1
-#define ACM_METRIC_COUNT_CODECS 2
-#define ACM_METRIC_COUNT_CONVERTERS 3
-#define ACM_METRIC_COUNT_FILTERS 4
-#define ACM_METRIC_COUNT_DISABLED 5
-#define ACM_METRIC_COUNT_HARDWARE 6
-#define ACM_METRIC_COUNT_LOCAL_DRIVERS 20
-#define ACM_METRIC_COUNT_LOCAL_CODECS 21
-#define ACM_METRIC_COUNT_LOCAL_CONVERTERS 22
-#define ACM_METRIC_COUNT_LOCAL_FILTERS 23
-#define ACM_METRIC_COUNT_LOCAL_DISABLED 24
-#define ACM_METRIC_HARDWARE_WAVE_INPUT 30
-#define ACM_METRIC_HARDWARE_WAVE_OUTPUT 31
-#define ACM_METRIC_MAX_SIZE_FORMAT 50
-#define ACM_METRIC_MAX_SIZE_FILTER 51
-#define ACM_METRIC_DRIVER_SUPPORT 100
-#define ACM_METRIC_DRIVER_PRIORITY 101
-
-#define ACM_STREAMCONVERTF_BLOCKALIGN 0x00000004
-#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 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 ACMDM_USER (DRV_USER + 0x0000)
-#define ACMDM_RESERVED_LOW (DRV_USER + 0x2000)
-#define ACMDM_RESERVED_HIGH (DRV_USER + 0x2FFF)
-
-#define ACMDM_BASE ACMDM_RESERVED_LOW
-
-#define ACMDM_DRIVER_ABOUT (ACMDM_BASE + 11)
-
-/* handles */
-
-DECLARE_HANDLE(HACMDRIVERID);
-DECLARE_HANDLE(HACMDRIVER);
-DECLARE_HANDLE(HACMSTREAM);
-DECLARE_HANDLE(HACMOBJ);
-typedef HACMDRIVERID *PHACMDRIVERID, *LPHACMDRIVERID;
-typedef HACMDRIVER *PHACMDRIVER, *LPHACMDRIVER;
-typedef HACMSTREAM *PHACMSTREAM, *LPHACMSTREAM;
-typedef HACMOBJ *PHACMOBJ, *LPHACMOBJ;
-
-/***********************************************************************
- * Callbacks
- */
-
-typedef BOOL (CALLBACK *ACMDRIVERENUMCB)(
- HACMDRIVERID hadid, DWORD dwInstance, DWORD fdwSupport
-);
-
-typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROCA)(
- HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
-);
-
-typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROCW)(
- HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
-);
-#define ACMFILTERCHOOSEHOOKPROC WINELIB_NAME_AW(ACMFILTERCHOOSEHOOKPROC)
-
-typedef UINT (CALLBACK *ACMFORMATCHOOSEHOOKPROCA)(
- HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
-);
-
-typedef UINT (CALLBACK *ACMFORMATCHOOSEHOOKPROCW)(
- HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
-);
-#define ACMFORMATCHOOSEHOOKPROC WINELIB_NAME_AW(ACMFORMATCHOOSEHOOKPROC)
-
-/***********************************************************************
- * Structures
- */
-
-typedef struct _ACMDRIVERDETAILSA
-{
- DWORD cbStruct;
-
- FOURCC fccType;
- FOURCC fccComp;
-
- WORD wMid;
- WORD wPid;
-
- DWORD vdwACM;
- DWORD vdwDriver;
-
- DWORD fdwSupport;
- DWORD cFormatTags;
- DWORD cFilterTags;
-
- HICON hicon;
-
- CHAR szShortName[ACMDRIVERDETAILS_SHORTNAME_CHARS];
- CHAR szLongName[ACMDRIVERDETAILS_LONGNAME_CHARS];
- CHAR szCopyright[ACMDRIVERDETAILS_COPYRIGHT_CHARS];
- CHAR szLicensing[ACMDRIVERDETAILS_LICENSING_CHARS];
- CHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
-} ACMDRIVERDETAILSA, *PACMDRIVERDETAILSA, *LPACMDRIVERDETAILSA;
-
-typedef struct _ACMDRIVERDETAILSW
-{
- DWORD cbStruct;
-
- FOURCC fccType;
- FOURCC fccComp;
-
- WORD wMid;
- WORD wPid;
-
- DWORD vdwACM;
- DWORD vdwDriver;
-
- DWORD fdwSupport;
- DWORD cFormatTags;
- DWORD cFilterTags;
-
- HICON hicon;
-
- WCHAR szShortName[ACMDRIVERDETAILS_SHORTNAME_CHARS];
- WCHAR szLongName[ACMDRIVERDETAILS_LONGNAME_CHARS];
- WCHAR szCopyright[ACMDRIVERDETAILS_COPYRIGHT_CHARS];
- WCHAR szLicensing[ACMDRIVERDETAILS_LICENSING_CHARS];
- WCHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
-} ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW, *LPACMDRIVERDETAILSW;
-
-#if defined(UNICODE) || defined (_UNICODE)
-typedef struct ACMDRIVERDETAILSW ACMDRIVERDETAILS;
-typedef PACMDRIVERDETAILSW PACMDRIVERDETAILS;
-typedef LPACMDRIVERDETAILSW LPACMDRIVERDETAILS;
-#else
-typedef struct ACMDRIVERDETAILSA ACMDRIVERDETAILS;
-typedef PACMDRIVERDETAILSA PACMDRIVERDETAILS;
-typedef LPACMDRIVERDETAILSA LPACMDRIVERDETAILS;
-#endif
-
-typedef struct _ACMFILTERCHOOSEA
-{
- DWORD cbStruct;
- DWORD fdwStyle;
-
- HWND hwndOwner;
-
- PWAVEFILTER pwfltr;
- DWORD cbwfltr;
-
- LPCSTR pszTitle;
-
- CHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
- CHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS];
- LPSTR pszName;
- DWORD cchName;
-
- DWORD fdwEnum;
- PWAVEFILTER pwfltrEnum;
-
- HINSTANCE hInstance;
- LPCSTR pszTemplateName;
- LPARAM lCustData;
- ACMFILTERCHOOSEHOOKPROCA pfnHook;
-} ACMFILTERCHOOSEA, *PACMFILTERCHOOSEA, *LPACMFILTERCHOOSEA;
-
-typedef struct _ACMFILTERCHOOSEW
-{
- DWORD cbStruct;
- DWORD fdwStyle;
-
- HWND hwndOwner;
-
- PWAVEFILTER pwfltr;
- DWORD cbwfltr;
-
- LPCWSTR pszTitle;
-
- WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
- WCHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS];
- LPWSTR pszName;
- DWORD cchName;
-
- DWORD fdwEnum;
- PWAVEFILTER pwfltrEnum;
-
- HINSTANCE hInstance;
- LPCWSTR pszTemplateName;
- LPARAM lCustData;
- ACMFILTERCHOOSEHOOKPROCW pfnHook;
-} ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW, *LPACMFILTERCHOOSEW;
-
-#if defined(UNICODE) || defined (_UNICODE)
-typedef struct ACMFILTERCHOOSEW ACMFILTERCHOOSE;
-typedef PACMFILTERCHOOSEW PACMFILTERCHOOSE;
-typedef LPACMFILTERCHOOSEW LPACMFILTERCHOOSE;
-#else
-typedef struct ACMFILTERCHOOSEA ACMFILTERCHOOSE;
-typedef PACMFILTERCHOOSEA PACMFILTERCHOOSE;
-typedef LPACMFILTERCHOOSEA LPACMFILTERCHOOSE;
-#endif
-
-typedef struct _ACMFILTERDETAILSA
-{
- DWORD cbStruct;
- DWORD dwFilterIndex;
- DWORD dwFilterTag;
- DWORD fdwSupport;
- PWAVEFILTER pwfltr;
- DWORD cbwfltr;
- CHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS];
-} ACMFILTERDETAILSA, *PACMFILTERDETAILSA, *LPACMFILTERDETAILSA;
-
-typedef struct _ACMFILTERDETAILSW
-{
- DWORD cbStruct;
- DWORD dwFilterIndex;
- DWORD dwFilterTag;
- DWORD fdwSupport;
- PWAVEFILTER pwfltr;
- DWORD cbwfltr;
- WCHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS];
-} ACMFILTERDETAILSW, *PACMFILTERDETAILSW, *LPACMFILTERDETAILSW;
-
-#if defined(UNICODE) || defined (_UNICODE)
-typedef struct ACMFILTERDETAILSW ACMFILTERDETAILS;
-typedef PACMFILTERDETAILSW PACMFILTERDETAILS;
-typedef LPACMFILTERDETAILSW LPACMFILTERDETAILS;
-#else
-typedef struct ACMFILTERDETAILSA ACMFILTERDETAILS;
-typedef PACMFILTERDETAILSA PACMFILTERDETAILS;
-typedef LPACMFILTERDETAILSA LPACMFILTERDETAILS;
-#endif
-
-typedef struct _ACMFILTERTAGDETAILSA
-{
- DWORD cbStruct;
- DWORD dwFilterTagIndex;
- DWORD dwFilterTag;
- DWORD cbFilterSize;
- DWORD fdwSupport;
- DWORD cStandardFilters;
- CHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
-} ACMFILTERTAGDETAILSA, *PACMFILTERTAGDETAILSA, *LPACMFILTERTAGDETAILSA;
-
-typedef struct _ACMFILTERTAGDETAILSW
-{
- DWORD cbStruct;
- DWORD dwFilterTagIndex;
- DWORD dwFilterTag;
- DWORD cbFilterSize;
- DWORD fdwSupport;
- DWORD cStandardFilters;
- WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
-} ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW, *LPACMFILTERTAGDETAILSW;
-
-#if defined(UNICODE) || defined (_UNICODE)
-typedef struct ACMFILTERTAGDETAILSW ACMFILTERTAGDETAILS;
-typedef PACMFILTERTAGDETAILSW PACMFILTERTAGDETAILS;
-typedef LPACMFILTERTAGDETAILSW LPACMFILTERTAGDETAILS;
-#else
-typedef struct ACMFILTERTAGDETAILSA ACMFILTERTAGDETAILS;
-typedef PACMFILTERTAGDETAILSA PACMFILTERTAGDETAILS;
-typedef LPACMFILTERTAGDETAILSA LPACMFILTERTAGDETAILS;
-#endif
-
-typedef struct _ACMFORMATCHOOSEA
-{
- DWORD cbStruct;
- DWORD fdwStyle;
-
- HWND hwndOwner;
-
- PWAVEFORMATEX pwfx;
- DWORD cbwfx;
- LPCSTR pszTitle;
-
- CHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
- CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
-
- LPSTR pszName;
- DWORD cchName;
-
- DWORD fdwEnum;
- PWAVEFORMATEX pwfxEnum;
-
- HINSTANCE hInstance;
- LPCSTR pszTemplateName;
- LPARAM lCustData;
- ACMFORMATCHOOSEHOOKPROCA pfnHook;
-} ACMFORMATCHOOSEA, *PACMFORMATCHOOSEA, *LPACMFORMATCHOOSEA;
-
-typedef struct _ACMFORMATCHOOSEW
-{
- DWORD cbStruct;
- DWORD fdwStyle;
-
- HWND hwndOwner;
-
- PWAVEFORMATEX pwfx;
- DWORD cbwfx;
- LPCWSTR pszTitle;
-
- WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
- WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
-
- LPWSTR pszName;
- DWORD cchName;
-
- DWORD fdwEnum;
- LPWAVEFORMATEX pwfxEnum;
-
- HINSTANCE hInstance;
- LPCWSTR pszTemplateName;
- LPARAM lCustData;
- ACMFORMATCHOOSEHOOKPROCW pfnHook;
-} ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW, *LPACMFORMATCHOOSEW;
-
-#if defined(UNICODE) || defined (_UNICODE)
-typedef struct ACMFORMATCHOOSEW ACMFORMATCHOOSE;
-typedef PACMFORMATCHOOSEW PACMFORMATCHOOSE;
-typedef LPACMFORMATCHOOSEW LPACMFORMATCHOOSE;
-#else
-typedef struct ACMFORMATCHOOSEA ACMFORMATCHOOSE;
-typedef PACMFORMATCHOOSEA PACMFORMATCHOOSE;
-typedef LPACMFORMATCHOOSEA LPACMFORMATCHOOSE;
-#endif
-
-typedef struct _ACMFORMATDETAILSA
-{
- DWORD cbStruct;
- DWORD dwFormatIndex;
- DWORD dwFormatTag;
- DWORD fdwSupport;
- PWAVEFORMATEX pwfx;
- DWORD cbwfx;
- CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
-} ACMFORMATDETAILSA, *PACMFORMATDETAILSA, *LPACMFORMATDETAILSA;
-
-typedef struct _ACMFORMATDETAILSW
-{
- DWORD cbStruct;
- DWORD dwFormatIndex;
- DWORD dwFormatTag;
- DWORD fdwSupport;
- PWAVEFORMATEX pwfx;
- DWORD cbwfx;
- WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
-} ACMFORMATDETAILSW, *PACMFORMATDETAILSW, *LPACMFORMATDETAILSW;
-
-#if defined(UNICODE) || defined (_UNICODE)
-typedef struct ACMFORMATDETAILSW ACMFORMATDETAILS;
-typedef PACMFORMATDETAILSW PACMFORMATDETAILS;
-typedef LPACMFORMATDETAILSW LPACMFORMATDETAILS;
-#else
-typedef struct ACMFORMATDETAILSA ACMFORMATDETAILS;
-typedef PACMFORMATDETAILSA PACMFORMATDETAILS;
-typedef LPACMFORMATDETAILSA LPACMFORMATDETAILS;
-#endif
-
-typedef struct _ACMFORMATTAGDETAILSA
-{
- DWORD cbStruct;
- DWORD dwFormatTagIndex;
- DWORD dwFormatTag;
- DWORD cbFormatSize;
- DWORD fdwSupport;
- DWORD cStandardFormats;
- CHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
-} ACMFORMATTAGDETAILSA, *PACMFORMATTAGDETAILSA, *LPACMFORMATTAGDETAILSA;
-
-typedef struct _ACMFORMATTAGDETAILSW
-{
- DWORD cbStruct;
- DWORD dwFormatTagIndex;
- DWORD dwFormatTag;
- DWORD cbFormatSize;
- DWORD fdwSupport;
- DWORD cStandardFormats;
- WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
-} ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW, *LPACMFORMATTAGDETAILSW;
-
-#if defined(UNICODE) || defined (_UNICODE)
-typedef struct ACMFORMATTAGDETAILSW ACMFORMATTAGDETAILS;
-typedef PACMFORMATTAGDETAILSW PACMFORMATTAGDETAILS;
-typedef LPACMFORMATTAGDETAILSW LPACMFORMATTAGDETAILS;
-#else
-typedef struct ACMFORMATTAGDETAILSA ACMFORMATTAGDETAILS;
-typedef PACMFORMATTAGDETAILSA PACMFORMATTAGDETAILS;
-typedef LPACMFORMATTAGDETAILSA LPACMFORMATTAGDETAILS;
-#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];
-} ACMSTREAMHEADER, *PACMSTREAMHEADER, *LPACMSTREAMHEADER;
-
-/***********************************************************************
- * Callbacks 2
- */
-
-typedef BOOL (CALLBACK *ACMFILTERENUMCBA)(
- HACMDRIVERID hadid, PACMFILTERDETAILSA pafd,
- DWORD dwInstance, DWORD fdwSupport
-);
-
-typedef BOOL (CALLBACK *ACMFILTERENUMCBW)(
- HACMDRIVERID hadid, PACMFILTERDETAILSW pafd,
- DWORD dwInstance, DWORD fdwSupport
-);
-
-#define ACMFILTERENUMCB WINELIB_NAME_AW(ACMFILTERENUMCB)
-
-typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBA)(
- HACMDRIVERID hadid, PACMFILTERTAGDETAILSA paftd,
- DWORD dwInstance, DWORD fdwSupport
-);
-
-typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBW)(
- HACMDRIVERID hadid, PACMFILTERTAGDETAILSW paftd,
- DWORD dwInstance, DWORD fdwSupport
-);
-
-#define ACMFILTERTAGENUMCB WINELIB_NAME_AW(ACMFILTERTAGENUMCB)
-
-typedef BOOL (CALLBACK *ACMFORMATENUMCBA)(
- HACMDRIVERID hadid, PACMFORMATDETAILSA pafd,
- DWORD dwInstance, DWORD fdwSupport
-);
-
-typedef BOOL (CALLBACK *ACMFORMATENUMCBW)(
- HACMDRIVERID hadid, PACMFORMATDETAILSW pafd,
- DWORD dwInstance, DWORD fdwSupport
-);
-
-#define ACMFORMATENUMCB WINELIB_NAME_AW(ACMFORMATENUMCB)
-
-typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBA)(
- HACMDRIVERID hadid, PACMFORMATTAGDETAILSA paftd,
- DWORD dwInstance, DWORD fdwSupport
-);
-
-typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBW)(
- HACMDRIVERID hadid, PACMFORMATTAGDETAILSW paftd,
- DWORD dwInstance, DWORD fdwSupport
-);
-
-#define ACMFORMATTAGENUMCB WINELIB_NAME_AW(ACMFORMATTAGENUMCB)
-
-/***********************************************************************
- * Functions - Win32
- */
-
-MMRESULT WINAPI acmDriverAddA(
- PHACMDRIVERID phadid, HINSTANCE hinstModule,
- LPARAM lParam, DWORD dwPriority, DWORD fdwAdd
-);
-MMRESULT WINAPI acmDriverAddW(
- PHACMDRIVERID phadid, HINSTANCE hinstModule,
- LPARAM lParam, DWORD dwPriority, DWORD fdwAdd
-);
-#define acmDriverAdd WINELIB_NAME_AW(acmDriverAdd)
-
-MMRESULT WINAPI acmDriverClose(
- HACMDRIVER had, DWORD fdwClose
-);
-MMRESULT WINAPI acmDriverDetailsA(
- HACMDRIVERID hadid, PACMDRIVERDETAILSA padd, DWORD fdwDetails
-);
-MMRESULT WINAPI acmDriverDetailsW(
- HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, DWORD fdwDetails
-);
-#define acmDriverDetails WINELIB_NAME_AW(acmDriverDetails)
-
-MMRESULT WINAPI acmDriverEnum(
- ACMDRIVERENUMCB fnCallback, DWORD dwInstance, DWORD fdwEnum
-);
-MMRESULT WINAPI acmDriverID(
- HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID
-);
-LRESULT WINAPI acmDriverMessage(
- HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARAM lParam2
-);
-MMRESULT WINAPI acmDriverOpen(
- PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpen
-);
-MMRESULT WINAPI acmDriverPriority(
- HACMDRIVERID hadid, DWORD dwPriority, DWORD fdwPriority
-);
-MMRESULT WINAPI acmDriverRemove(
- HACMDRIVERID hadid, DWORD fdwRemove
-);
-MMRESULT WINAPI acmFilterChooseA(
- PACMFILTERCHOOSEA pafltrc
-);
-MMRESULT WINAPI acmFilterChooseW(
- PACMFILTERCHOOSEW pafltrc
-);
-#define acmFilterChoose WINELIB_NAME_AW(acmFilterChoose)
-
-MMRESULT WINAPI acmFilterDetailsA(
- HACMDRIVER had, PACMFILTERDETAILSA pafd, DWORD fdwDetails
-);
-MMRESULT WINAPI acmFilterDetailsW(
- HACMDRIVER had, PACMFILTERDETAILSW pafd, DWORD fdwDetails
-);
-#define acmFilterDetails WINELIB_NAME_AW(acmFilterDetails)
-
-MMRESULT WINAPI acmFilterEnumA(
- HACMDRIVER had, PACMFILTERDETAILSA pafd,
- ACMFILTERENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum
-);
-MMRESULT WINAPI acmFilterEnumW(
- HACMDRIVER had, PACMFILTERDETAILSW pafd,
- ACMFILTERENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
-);
-#define acmFilterEnum WINELIB_NAME_AW(acmFilterEnum)
-
-MMRESULT WINAPI acmFilterTagDetailsA(
- HACMDRIVER had, PACMFILTERTAGDETAILSA paftd, DWORD fdwDetails
-);
-MMRESULT WINAPI acmFilterTagDetailsW(
- HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, DWORD fdwDetails
-);
-#define acmFilterTagDetails WINELIB_NAME_AW(acmFilterTagDetails)
-
-MMRESULT WINAPI acmFilterTagEnumA(
- HACMDRIVER had, PACMFILTERTAGDETAILSA paftd,
- ACMFILTERTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum
-);
-MMRESULT WINAPI acmFilterTagEnumW(
- HACMDRIVER had, PACMFILTERTAGDETAILSW paftd,
- ACMFILTERTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
-);
-#define acmFilterTagEnum WINELIB_NAME_AW(acmFilterTagEnum)
-
-MMRESULT WINAPI acmFormatChooseA(
- PACMFORMATCHOOSEA pafmtc
-);
-MMRESULT WINAPI acmFormatChooseW(
- PACMFORMATCHOOSEW pafmtc
-);
-#define acmFormatChoose WINELIB_NAME_AW(acmFormatChoose)
-
-MMRESULT WINAPI acmFormatDetailsA(
- HACMDRIVER had, PACMFORMATDETAILSA pafd, DWORD fdwDetails
-);
-MMRESULT WINAPI acmFormatDetailsW(
- HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD fdwDetails
-);
-#define acmFormatDetails WINELIB_NAME_AW(acmFormatDetails)
-
-MMRESULT WINAPI acmFormatEnumA(
- HACMDRIVER had, PACMFORMATDETAILSA pafd,
- ACMFORMATENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum
-);
-MMRESULT WINAPI acmFormatEnumW(
- HACMDRIVER had, PACMFORMATDETAILSW pafd,
- ACMFORMATENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
-);
-#define acmFormatEnum WINELIB_NAME_AW(acmFormatEnum)
-
-MMRESULT WINAPI acmFormatSuggest(
- HACMDRIVER had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst,
- DWORD cbwfxDst, DWORD fdwSuggest
-);
-MMRESULT WINAPI acmFormatTagDetailsA(
- HACMDRIVER had, PACMFORMATTAGDETAILSA paftd, DWORD fdwDetails
-);
-MMRESULT WINAPI acmFormatTagDetailsW(
- HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, DWORD fdwDetails
-);
-#define acmFormatTagDetails WINELIB_NAME_AW(acmFormatTagDetails)
-
-MMRESULT WINAPI acmFormatTagEnumA(
- HACMDRIVER had, PACMFORMATTAGDETAILSA paftd,
- ACMFORMATTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum
-);
-MMRESULT WINAPI acmFormatTagEnumW(
- HACMDRIVER had, PACMFORMATTAGDETAILSW paftd,
- ACMFORMATTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
-);
-#define acmFormatTagEnum WINELIB_NAME_AW(acmFormatTagEnum)
-
-DWORD WINAPI acmGetVersion(void
-);
-MMRESULT WINAPI acmMetrics(
- HACMOBJ hao, UINT uMetric, LPVOID pMetric
-);
-MMRESULT WINAPI acmStreamClose(
- HACMSTREAM has, DWORD fdwClose
-);
-MMRESULT WINAPI acmStreamConvert(
- HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwConvert
-);
-MMRESULT WINAPI acmStreamMessage(
- HACMSTREAM has, UINT uMsg, LPARAM lParam1, LPARAM lParam2
-);
-MMRESULT WINAPI acmStreamOpen(
- PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pwfxSrc,
- PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback,
- DWORD dwInstance, DWORD fdwOpen
-);
-MMRESULT WINAPI acmStreamPrepareHeader(
- HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwPrepare
-);
-MMRESULT WINAPI acmStreamReset(
- HACMSTREAM has, DWORD fdwReset
-);
-MMRESULT WINAPI acmStreamSize(
- HACMSTREAM has, DWORD cbInput,
- LPDWORD pdwOutputBytes, DWORD fdwSize
-);
-MMRESULT WINAPI acmStreamUnprepareHeader(
- HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwUnprepare
-);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* defined(__cplusplus) */
-
-#endif /* __WINE_MSACM_H */
Modified: branches/ros-amd64-bringup/reactos/include/reactos/wine/msacmdrv.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/wine/msacmdrv.h [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/wine/msacmdrv.h [iso-8859-1] Sat
Mar 21 14:07:04 2009
@@ -38,7 +38,7 @@
*/
#define MAKE_ACM_VERSION(mjr, mnr, bld) \
- (((long)(mjr)<<24) | ((long)(mnr)<<16) | ((long)bld))
+ (((LONG)(mjr)<<24) | ((LONG)(mnr)<<16) | ((LONG)bld))
#define ACMDRVOPENDESC_SECTIONNAME_CHARS
@@ -100,40 +100,40 @@
PWAVEFORMATEX pwfxSrc;
PWAVEFORMATEX pwfxDst;
PWAVEFILTER pwfltr;
- DWORD dwCallback;
- DWORD dwInstance;
+ DWORD_PTR dwCallback;
+ DWORD_PTR dwInstance;
DWORD fdwOpen;
DWORD fdwDriver;
- DWORD dwDriver;
+ DWORD_PTR dwDriver;
HACMSTREAM has;
} ACMDRVSTREAMINSTANCE, *PACMDRVSTREAMINSTANCE;
typedef struct _ACMDRVSTREAMHEADER *PACMDRVSTREAMHEADER;
typedef struct _ACMDRVSTREAMHEADER {
- DWORD cbStruct;
- DWORD fdwStatus;
- DWORD dwUser;
- LPBYTE pbSrc;
- DWORD cbSrcLength;
- DWORD cbSrcLengthUsed;
- DWORD dwSrcUser;
- LPBYTE pbDst;
- DWORD cbDstLength;
- DWORD cbDstLengthUsed;
- DWORD dwDstUser;
+ 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 fdwConvert;
+ DWORD fdwConvert;
PACMDRVSTREAMHEADER *padshNext;
- DWORD fdwDriver;
- DWORD dwDriver;
+ DWORD fdwDriver;
+ DWORD_PTR dwDriver;
/* Internal fields for ACM */
- DWORD fdwPrepared;
- DWORD dwPrepared;
- LPBYTE pbPreparedSrc;
- DWORD cbPreparedSrcLength;
- LPBYTE pbPreparedDst;
- DWORD cbPreparedDstLength;
+ DWORD fdwPrepared;
+ DWORD_PTR dwPrepared;
+ LPBYTE pbPreparedSrc;
+ DWORD cbPreparedSrcLength;
+ LPBYTE pbPreparedDst;
+ DWORD cbPreparedDstLength;
} ACMDRVSTREAMHEADER;
typedef struct _ACMDRVSTREAMSIZE