Large-scale renaming of all Win32 functions and types to use the
standard Windows names.
diff --git a/include/msacm.h b/include/msacm.h
index 8ed6d3f..f0fc2aa 100644
--- a/include/msacm.h
+++ b/include/msacm.h
@@ -17,11 +17,11 @@
/* FIXME: Move to wintypes.h */
#define DECLARE_HANDLE(a) \
typedef HANDLE16 a##16; \
-typedef HANDLE32 a##32; \
+typedef HANDLE a; \
typedef a##16 *P##a##16; \
typedef a##16 *NP##a##16; \
typedef a##16 *LP##a##16; \
-typedef a##32 *P##a##32;
+typedef a *P##a;
DECLARE_HANDLE(HACMDRIVERID)
DECLARE_HANDLE(HACMDRIVER)
@@ -107,16 +107,16 @@
#define ACM_FILTERENUMF_DWFILTERTAG 0x00010000L
-#define ACMHELPMSGSTRING32A "acmchoose_help"
-#define ACMHELPMSGSTRING32W L"acmchoose_help"
+#define ACMHELPMSGSTRINGA "acmchoose_help"
+#define ACMHELPMSGSTRINGW L"acmchoose_help"
#define ACMHELPMSGSTRING16 "acmchoose_help"
-#define ACMHELPMSGCONTEXTMENU32A "acmchoose_contextmenu"
-#define ACMHELPMSGCONTEXTMENU32W L"acmchoose_contextmenu"
+#define ACMHELPMSGCONTEXTMENUA "acmchoose_contextmenu"
+#define ACMHELPMSGCONTEXTMENUW L"acmchoose_contextmenu"
#define ACMHELPMSGCONTEXTMENU16 "acmchoose_contextmenu"
-#define ACMHELPMSGCONTEXTHELP32A "acmchoose_contexthelp"
-#define ACMHELPMSGCONTEXTHELP32W L"acmchoose_contexthelp"
+#define ACMHELPMSGCONTEXTHELPA "acmchoose_contexthelp"
+#define ACMHELPMSGCONTEXTHELPW L"acmchoose_contexthelp"
#define ACMHELPMSGCONTEXTHELP16 "acmchoose_contexthelp"
#define MM_ACM_FORMATCHOOSE 0x8000
@@ -208,32 +208,32 @@
* Callbacks
*/
-typedef BOOL32 (CALLBACK *ACMDRIVERENUMCB32)(
- HACMDRIVERID32 hadid, DWORD dwInstance, DWORD fdwSupport
+typedef BOOL (CALLBACK *ACMDRIVERENUMCB)(
+ HACMDRIVERID hadid, DWORD dwInstance, DWORD fdwSupport
);
typedef BOOL16 (CALLBACK *ACMDRIVERENUMCB16)(
HACMDRIVERID16 hadid, DWORD dwInstance, DWORD fdwSupport
);
-typedef UINT32 (CALLBACK *ACMFILTERCHOOSEHOOKPROC32A)(
- HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam
+typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROCA)(
+ HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
);
-typedef UINT32 (CALLBACK *ACMFILTERCHOOSEHOOKPROC32W)(
- HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam
+typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROCW)(
+ HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
);
-typedef UINT32 (CALLBACK *ACMFILTERCHOOSEHOOKPROC16)(
- HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam
+typedef UINT (CALLBACK *ACMFILTERCHOOSEHOOKPROC16)(
+ HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
);
-typedef UINT32 (CALLBACK *ACMFORMATCHOOSEHOOKPROC32A)(
- HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam
+typedef UINT (CALLBACK *ACMFORMATCHOOSEHOOKPROCA)(
+ HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
);
-typedef UINT32 (CALLBACK *ACMFORMATCHOOSEHOOKPROC32W)(
- HWND32 hwnd, UINT32 uMsg, WPARAM32 wParam, LPARAM lParam
+typedef UINT (CALLBACK *ACMFORMATCHOOSEHOOKPROCW)(
+ HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
);
typedef UINT16 (CALLBACK *ACMFORMATCHOOSEHOOKPROC16)(
@@ -244,7 +244,7 @@
* Structures
*/
-typedef struct _ACMDRIVERDETAILS32A
+typedef struct _ACMDRIVERDETAILSA
{
DWORD cbStruct;
@@ -261,16 +261,16 @@
DWORD cFormatTags;
DWORD cFilterTags;
- HICON32 hicon;
+ 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];
-} ACMDRIVERDETAILS32A, *PACMDRIVERDETAILS32A;
+} ACMDRIVERDETAILSA, *PACMDRIVERDETAILSA;
-typedef struct _ACMDRIVERDETAILS32W
+typedef struct _ACMDRIVERDETAILSW
{
DWORD cbStruct;
@@ -287,14 +287,14 @@
DWORD cFormatTags;
DWORD cFilterTags;
- HICON32 hicon;
+ 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];
-} ACMDRIVERDETAILS32W, *PACMDRIVERDETAILS32W;
+} ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW;
typedef struct _ACMDRIVERDETAILS16
{
@@ -322,12 +322,12 @@
CHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
} ACMDRIVERDETAILS16, *NPACMDRIVERDETAILS16, *LPACMDRIVERDETAILS16;
-typedef struct _ACMFILTERCHOOSE32A
+typedef struct _ACMFILTERCHOOSEA
{
DWORD cbStruct;
DWORD fdwStyle;
- HWND32 hwndOwner;
+ HWND hwndOwner;
PWAVEFILTER pwfltr;
DWORD cbwfltr;
@@ -342,18 +342,18 @@
DWORD fdwEnum;
PWAVEFILTER pwfltrEnum;
- HINSTANCE32 hInstance;
+ HINSTANCE hInstance;
LPCSTR pszTemplateName;
LPARAM lCustData;
- ACMFILTERCHOOSEHOOKPROC32A pfnHook;
-} ACMFILTERCHOOSE32A, *PACMFILTERCHOOSE32A;
+ ACMFILTERCHOOSEHOOKPROCA pfnHook;
+} ACMFILTERCHOOSEA, *PACMFILTERCHOOSEA;
-typedef struct _ACMFILTERCHOOSE32W
+typedef struct _ACMFILTERCHOOSEW
{
DWORD cbStruct;
DWORD fdwStyle;
- HWND32 hwndOwner;
+ HWND hwndOwner;
PWAVEFILTER pwfltr;
DWORD cbwfltr;
@@ -368,11 +368,11 @@
DWORD fdwEnum;
PWAVEFILTER pwfltrEnum;
- HINSTANCE32 hInstance;
+ HINSTANCE hInstance;
LPCWSTR pszTemplateName;
LPARAM lCustData;
- ACMFILTERCHOOSEHOOKPROC32W pfnHook;
-} ACMFILTERCHOOSE32W, *PACMFILTERCHOOSE32W;
+ ACMFILTERCHOOSEHOOKPROCW pfnHook;
+} ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW;
typedef struct _ACMFILTERCHOOSE16
{
@@ -400,7 +400,7 @@
ACMFILTERCHOOSEHOOKPROC16 pfnHook;
} ACMFILTERCHOOSE16, *NPACMFILTERCHOOSE16, *LPACMFILTERCHOOSE16;
-typedef struct _ACMFILTERDETAILS32A
+typedef struct _ACMFILTERDETAILSA
{
DWORD cbStruct;
DWORD dwFilterIndex;
@@ -409,9 +409,9 @@
PWAVEFILTER pwfltr;
DWORD cbwfltr;
CHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS];
-} ACMFILTERDETAILS32A, *PACMFILTERDETAILS32A;
+} ACMFILTERDETAILSA, *PACMFILTERDETAILSA;
-typedef struct _ACMFILTERDETAILS32W
+typedef struct _ACMFILTERDETAILSW
{
DWORD cbStruct;
DWORD dwFilterIndex;
@@ -420,7 +420,7 @@
PWAVEFILTER pwfltr;
DWORD cbwfltr;
WCHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS];
-} ACMFILTERDETAILS32W, *PACMFILTERDETAILS32W;
+} ACMFILTERDETAILSW, *PACMFILTERDETAILSW;
typedef struct _ACMFILTERDETAILS16
{
@@ -433,7 +433,7 @@
CHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS];
} ACMFILTERDETAILS16, *NPACMFILTERDETAILS16, *LPACMFILTERDETAILS16;
-typedef struct _ACMFILTERTAGDETAILS32A
+typedef struct _ACMFILTERTAGDETAILSA
{
DWORD cbStruct;
DWORD dwFilterTagIndex;
@@ -442,9 +442,9 @@
DWORD fdwSupport;
DWORD cStandardFilters;
CHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
-} ACMFILTERTAGDETAILS32A, *PACMFILTERTAGDETAILS32A;
+} ACMFILTERTAGDETAILSA, *PACMFILTERTAGDETAILSA;
-typedef struct _ACMFILTERTAGDETAILS32W
+typedef struct _ACMFILTERTAGDETAILSW
{
DWORD cbStruct;
DWORD dwFilterTagIndex;
@@ -453,7 +453,7 @@
DWORD fdwSupport;
DWORD cStandardFilters;
WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
-} ACMFILTERTAGDETAILS32W, *PACMFILTERTAGDETAILS32W;
+} ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW;
typedef struct _ACMFILTERTAGDETAILS16
{
@@ -466,12 +466,12 @@
CHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
} ACMFILTERTAGDETAILS16, *NPACMFILTERTAGDETAILS16, *LPACMFILTERTAGDETAILS16;
-typedef struct _ACMFORMATCHOOSE32A
+typedef struct _ACMFORMATCHOOSEA
{
DWORD cbStruct;
DWORD fdwStyle;
- HWND32 hwndOwner;
+ HWND hwndOwner;
PWAVEFORMATEX pwfx;
DWORD cbwfx;
@@ -486,18 +486,18 @@
DWORD fdwEnum;
PWAVEFORMATEX pwfxEnum;
- HINSTANCE32 hInstance;
+ HINSTANCE hInstance;
LPCSTR pszTemplateName;
LPARAM lCustData;
- ACMFORMATCHOOSEHOOKPROC32A pfnHook;
-} ACMFORMATCHOOSE32A, *PACMFORMATCHOOSE32A;
+ ACMFORMATCHOOSEHOOKPROCA pfnHook;
+} ACMFORMATCHOOSEA, *PACMFORMATCHOOSEA;
-typedef struct _ACMFORMATCHOOSE32W
+typedef struct _ACMFORMATCHOOSEW
{
DWORD cbStruct;
DWORD fdwStyle;
- HWND32 hwndOwner;
+ HWND hwndOwner;
PWAVEFORMATEX pwfx;
DWORD cbwfx;
@@ -512,11 +512,11 @@
DWORD fdwEnum;
LPWAVEFORMATEX pwfxEnum;
- HINSTANCE32 hInstance;
+ HINSTANCE hInstance;
LPCWSTR pszTemplateName;
LPARAM lCustData;
- ACMFORMATCHOOSEHOOKPROC32W pfnHook;
-} ACMFORMATCHOOSE32W, *PACMFORMATCHOOSE32W;
+ ACMFORMATCHOOSEHOOKPROCW pfnHook;
+} ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW;
typedef struct _ACMFORMATCHOOSE16
{
@@ -544,7 +544,7 @@
ACMFORMATCHOOSEHOOKPROC16 pfnHook;
} ACMFORMATCHOOSE16, *NPACMFORMATCHOOSE16, *LPACMFORMATCHOOSE16;
-typedef struct _ACMFORMATDETAILS32A
+typedef struct _ACMFORMATDETAILSA
{
DWORD cbStruct;
DWORD dwFormatIndex;
@@ -553,9 +553,9 @@
PWAVEFORMATEX pwfx;
DWORD cbwfx;
CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
-} ACMFORMATDETAILS32A, *PACMFORMATDETAILS32A;
+} ACMFORMATDETAILSA, *PACMFORMATDETAILSA;
-typedef struct _ACMFORMATDETAILS32W
+typedef struct _ACMFORMATDETAILSW
{
DWORD cbStruct;
DWORD dwFormatIndex;
@@ -564,7 +564,7 @@
PWAVEFORMATEX pwfx;
DWORD cbwfx;
WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
-} ACMFORMATDETAILS32W, *PACMFORMATDETAILS32W;
+} ACMFORMATDETAILSW, *PACMFORMATDETAILSW;
typedef struct _ACMFORMATDETAILS16
{
@@ -577,7 +577,7 @@
CHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
} ACMFORMATDETAILS16, *NPACMFORMATDETAILS16, *LPACMFORMATDETAILS16;
-typedef struct _ACMFORMATTAGDETAILS32A
+typedef struct _ACMFORMATTAGDETAILSA
{
DWORD cbStruct;
DWORD dwFormatTagIndex;
@@ -586,9 +586,9 @@
DWORD fdwSupport;
DWORD cStandardFormats;
CHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
-} ACMFORMATTAGDETAILS32A, *PACMFORMATTAGDETAILS32A;
+} ACMFORMATTAGDETAILSA, *PACMFORMATTAGDETAILSA;
-typedef struct _ACMFORMATTAGDETAILS32W
+typedef struct _ACMFORMATTAGDETAILSW
{
DWORD cbStruct;
DWORD dwFormatTagIndex;
@@ -597,7 +597,7 @@
DWORD fdwSupport;
DWORD cStandardFormats;
WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
-} ACMFORMATTAGDETAILS32W, *PACMFORMATTAGDETAILS32W;
+} ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW;
typedef struct _ACMFORMATTAGDETAILS16
{
@@ -625,19 +625,19 @@
DWORD dwDstUser;
DWORD dwReservedDriver[10];
} ACMSTREAMHEADER16, *NPACMSTREAMHEADER16, *LPACMSTREAMHEADER16,
- ACMSTREAMHEADER32, *PACMSTREAMHEADER32;
+ ACMSTREAMHEADER, *PACMSTREAMHEADER;
/***********************************************************************
* Callbacks 2
*/
-typedef BOOL32 (CALLBACK *ACMFILTERENUMCB32A)(
- HACMDRIVERID32 hadid, PACMFILTERDETAILS32A pafd,
+typedef BOOL (CALLBACK *ACMFILTERENUMCBA)(
+ HACMDRIVERID hadid, PACMFILTERDETAILSA pafd,
DWORD dwInstance, DWORD fdwSupport
);
-typedef BOOL32 (CALLBACK *ACMFILTERENUMCB32W)(
- HACMDRIVERID32 hadid, PACMFILTERDETAILS32W pafd,
+typedef BOOL (CALLBACK *ACMFILTERENUMCBW)(
+ HACMDRIVERID hadid, PACMFILTERDETAILSW pafd,
DWORD dwInstance, DWORD fdwSupport
);
@@ -646,13 +646,13 @@
DWORD dwInstance, DWORD fdwSupport
);
-typedef BOOL32 (CALLBACK *ACMFILTERTAGENUMCB32A)(
- HACMDRIVERID32 hadid, PACMFILTERTAGDETAILS32A paftd,
+typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBA)(
+ HACMDRIVERID hadid, PACMFILTERTAGDETAILSA paftd,
DWORD dwInstance, DWORD fdwSupport
);
-typedef BOOL32 (CALLBACK *ACMFILTERTAGENUMCB32W)(
- HACMDRIVERID32 hadid, PACMFILTERTAGDETAILS32W paftd,
+typedef BOOL (CALLBACK *ACMFILTERTAGENUMCBW)(
+ HACMDRIVERID hadid, PACMFILTERTAGDETAILSW paftd,
DWORD dwInstance, DWORD fdwSupport
);
@@ -661,13 +661,13 @@
DWORD dwInstance, DWORD fdwSupport
);
-typedef BOOL32 (CALLBACK *ACMFORMATENUMCB32A)(
- HACMDRIVERID32 hadid, PACMFORMATDETAILS32A pafd,
+typedef BOOL (CALLBACK *ACMFORMATENUMCBA)(
+ HACMDRIVERID hadid, PACMFORMATDETAILSA pafd,
DWORD dwInstance, DWORD fdwSupport
);
-typedef BOOL32 (CALLBACK *ACMFORMATENUMCB32W)(
- HACMDRIVERID32 hadid, PACMFORMATDETAILS32W pafd,
+typedef BOOL (CALLBACK *ACMFORMATENUMCBW)(
+ HACMDRIVERID hadid, PACMFORMATDETAILSW pafd,
DWORD dwInstance, DWORD fdwSupport
);
@@ -676,13 +676,13 @@
DWORD dwInstance, DWORD fdwSupport
);
-typedef BOOL32 (CALLBACK *ACMFORMATTAGENUMCB32A)(
- HACMDRIVERID32 hadid, PACMFORMATTAGDETAILS32A paftd,
+typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBA)(
+ HACMDRIVERID hadid, PACMFORMATTAGDETAILSA paftd,
DWORD dwInstance, DWORD fdwSupport
);
-typedef BOOL32 (CALLBACK *ACMFORMATTAGENUMCB32W)(
- HACMDRIVERID32 hadid, PACMFORMATTAGDETAILS32W paftd,
+typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBW)(
+ HACMDRIVERID hadid, PACMFORMATTAGDETAILSW paftd,
DWORD dwInstance, DWORD fdwSupport
);
@@ -796,207 +796,207 @@
* Functions - Win32
*/
-MMRESULT32 WINAPI acmDriverAdd32A(
- PHACMDRIVERID32 phadid, HINSTANCE32 hinstModule,
+MMRESULT WINAPI acmDriverAddA(
+ PHACMDRIVERID phadid, HINSTANCE hinstModule,
LPARAM lParam, DWORD dwPriority, DWORD fdwAdd
);
-MMRESULT32 WINAPI acmDriverAdd32W(
- PHACMDRIVERID32 phadid, HINSTANCE32 hinstModule,
+MMRESULT WINAPI acmDriverAddW(
+ PHACMDRIVERID phadid, HINSTANCE hinstModule,
LPARAM lParam, DWORD dwPriority, DWORD fdwAdd
);
-MMRESULT32 WINAPI acmDriverClose32(
- HACMDRIVER32 had, DWORD fdwClose
+MMRESULT WINAPI acmDriverClose(
+ HACMDRIVER had, DWORD fdwClose
);
-MMRESULT32 WINAPI acmDriverDetails32A(
- HACMDRIVERID32 hadid, PACMDRIVERDETAILS32A padd, DWORD fdwDetails
+MMRESULT WINAPI acmDriverDetailsA(
+ HACMDRIVERID hadid, PACMDRIVERDETAILSA padd, DWORD fdwDetails
);
-MMRESULT32 WINAPI acmDriverDetails32W(
- HACMDRIVERID32 hadid, PACMDRIVERDETAILS32W padd, DWORD fdwDetails
+MMRESULT WINAPI acmDriverDetailsW(
+ HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, DWORD fdwDetails
);
-MMRESULT32 WINAPI acmDriverEnum32(
- ACMDRIVERENUMCB32 fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmDriverEnum(
+ ACMDRIVERENUMCB fnCallback, DWORD dwInstance, DWORD fdwEnum
);
-MMRESULT32 WINAPI acmDriverID32(
- HACMOBJ32 hao, PHACMDRIVERID32 phadid, DWORD fdwDriverID
+MMRESULT WINAPI acmDriverID(
+ HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID
);
-LRESULT WINAPI acmDriverMessage32(
- HACMDRIVER32 had, UINT32 uMsg, LPARAM lParam1, LPARAM lParam2
+LRESULT WINAPI acmDriverMessage(
+ HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARAM lParam2
);
-MMRESULT32 WINAPI acmDriverOpen32(
- PHACMDRIVER32 phad, HACMDRIVERID32 hadid, DWORD fdwOpen
+MMRESULT WINAPI acmDriverOpen(
+ PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpen
);
-MMRESULT32 WINAPI acmDriverPriority32(
- HACMDRIVERID32 hadid, DWORD dwPriority, DWORD fdwPriority
+MMRESULT WINAPI acmDriverPriority(
+ HACMDRIVERID hadid, DWORD dwPriority, DWORD fdwPriority
);
-MMRESULT32 WINAPI acmDriverRemove32(
- HACMDRIVERID32 hadid, DWORD fdwRemove
+MMRESULT WINAPI acmDriverRemove(
+ HACMDRIVERID hadid, DWORD fdwRemove
);
-MMRESULT32 WINAPI acmFilterChoose32A(
- PACMFILTERCHOOSE32A pafltrc
+MMRESULT WINAPI acmFilterChooseA(
+ PACMFILTERCHOOSEA pafltrc
);
-MMRESULT32 WINAPI acmFilterChoose32W(
- PACMFILTERCHOOSE32W pafltrc
+MMRESULT WINAPI acmFilterChooseW(
+ PACMFILTERCHOOSEW pafltrc
);
-MMRESULT32 WINAPI acmFilterDetails32A(
- HACMDRIVER32 had, PACMFILTERDETAILS32A pafd, DWORD fdwDetails
+MMRESULT WINAPI acmFilterDetailsA(
+ HACMDRIVER had, PACMFILTERDETAILSA pafd, DWORD fdwDetails
);
-MMRESULT32 WINAPI acmFilterDetails32W(
- HACMDRIVER32 had, PACMFILTERDETAILS32W pafd, DWORD fdwDetails
+MMRESULT WINAPI acmFilterDetailsW(
+ HACMDRIVER had, PACMFILTERDETAILSW pafd, DWORD fdwDetails
);
-MMRESULT32 WINAPI acmFilterEnum32A(
- HACMDRIVER32 had, PACMFILTERDETAILS32A pafd,
- ACMFILTERENUMCB32A fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFilterEnumA(
+ HACMDRIVER had, PACMFILTERDETAILSA pafd,
+ ACMFILTERENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum
);
-MMRESULT32 WINAPI acmFilterEnum32W(
- HACMDRIVER32 had, PACMFILTERDETAILS32W pafd,
- ACMFILTERENUMCB32W fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFilterEnumW(
+ HACMDRIVER had, PACMFILTERDETAILSW pafd,
+ ACMFILTERENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
);
-MMRESULT32 WINAPI acmFilterTagDetails32A(
- HACMDRIVER32 had, PACMFILTERTAGDETAILS32A paftd, DWORD fdwDetails
+MMRESULT WINAPI acmFilterTagDetailsA(
+ HACMDRIVER had, PACMFILTERTAGDETAILSA paftd, DWORD fdwDetails
);
-MMRESULT32 WINAPI acmFilterTagDetails32W(
- HACMDRIVER32 had, PACMFILTERTAGDETAILS32W paftd, DWORD fdwDetails
+MMRESULT WINAPI acmFilterTagDetailsW(
+ HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, DWORD fdwDetails
);
-MMRESULT32 WINAPI acmFilterTagEnum32A(
- HACMDRIVER32 had, PACMFILTERTAGDETAILS32A paftd,
- ACMFILTERTAGENUMCB32A fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFilterTagEnumA(
+ HACMDRIVER had, PACMFILTERTAGDETAILSA paftd,
+ ACMFILTERTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum
);
-MMRESULT32 WINAPI acmFilterTagEnum32W(
- HACMDRIVER32 had, PACMFILTERTAGDETAILS32W paftd,
- ACMFILTERTAGENUMCB32W fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFilterTagEnumW(
+ HACMDRIVER had, PACMFILTERTAGDETAILSW paftd,
+ ACMFILTERTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
);
-MMRESULT32 WINAPI acmFormatChoose32A(
- PACMFORMATCHOOSE32A pafmtc
+MMRESULT WINAPI acmFormatChooseA(
+ PACMFORMATCHOOSEA pafmtc
);
-MMRESULT32 WINAPI acmFormatChoose32W(
- PACMFORMATCHOOSE32W pafmtc
+MMRESULT WINAPI acmFormatChooseW(
+ PACMFORMATCHOOSEW pafmtc
);
-MMRESULT32 WINAPI acmFormatDetails32A(
- HACMDRIVER32 had, PACMFORMATDETAILS32A pafd, DWORD fdwDetails
+MMRESULT WINAPI acmFormatDetailsA(
+ HACMDRIVER had, PACMFORMATDETAILSA pafd, DWORD fdwDetails
);
-MMRESULT32 WINAPI acmFormatDetails32W(
- HACMDRIVER32 had, PACMFORMATDETAILS32W pafd, DWORD fdwDetails
+MMRESULT WINAPI acmFormatDetailsW(
+ HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD fdwDetails
);
-MMRESULT32 WINAPI acmFormatEnum32A(
- HACMDRIVER32 had, PACMFORMATDETAILS32A pafd,
- ACMFORMATENUMCB32A fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFormatEnumA(
+ HACMDRIVER had, PACMFORMATDETAILSA pafd,
+ ACMFORMATENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum
);
-MMRESULT32 WINAPI acmFormatEnum32W(
- HACMDRIVER32 had, PACMFORMATDETAILS32W pafd,
- ACMFORMATENUMCB32W fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFormatEnumW(
+ HACMDRIVER had, PACMFORMATDETAILSW pafd,
+ ACMFORMATENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
);
-MMRESULT32 WINAPI acmFormatSuggest32(
- HACMDRIVER32 had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst,
+MMRESULT WINAPI acmFormatSuggest(
+ HACMDRIVER had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst,
DWORD cbwfxDst, DWORD fdwSuggest
);
-MMRESULT32 WINAPI acmFormatTagDetails32A(
- HACMDRIVER32 had, PACMFORMATTAGDETAILS32A paftd, DWORD fdwDetails
+MMRESULT WINAPI acmFormatTagDetailsA(
+ HACMDRIVER had, PACMFORMATTAGDETAILSA paftd, DWORD fdwDetails
);
-MMRESULT32 WINAPI acmFormatTagDetails32W(
- HACMDRIVER32 had, PACMFORMATTAGDETAILS32W paftd, DWORD fdwDetails
+MMRESULT WINAPI acmFormatTagDetailsW(
+ HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, DWORD fdwDetails
);
-MMRESULT32 WINAPI acmFormatTagEnum32A(
- HACMDRIVER32 had, PACMFORMATTAGDETAILS32A paftd,
- ACMFORMATTAGENUMCB32A fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFormatTagEnumA(
+ HACMDRIVER had, PACMFORMATTAGDETAILSA paftd,
+ ACMFORMATTAGENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum
);
-MMRESULT32 WINAPI acmFormatTagEnum32W(
- HACMDRIVER32 had, PACMFORMATTAGDETAILS32W paftd,
- ACMFORMATTAGENUMCB32W fnCallback, DWORD dwInstance, DWORD fdwEnum
+MMRESULT WINAPI acmFormatTagEnumW(
+ HACMDRIVER had, PACMFORMATTAGDETAILSW paftd,
+ ACMFORMATTAGENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum
);
-DWORD WINAPI acmGetVersion32(
+DWORD WINAPI acmGetVersion(
);
-MMRESULT32 WINAPI acmMetrics32(
- HACMOBJ32 hao, UINT32 uMetric, LPVOID pMetric
+MMRESULT WINAPI acmMetrics(
+ HACMOBJ hao, UINT uMetric, LPVOID pMetric
);
-MMRESULT32 WINAPI acmStreamClose32(
- HACMSTREAM32 has, DWORD fdwClose
+MMRESULT WINAPI acmStreamClose(
+ HACMSTREAM has, DWORD fdwClose
);
-MMRESULT32 WINAPI acmStreamConvert32(
- HACMSTREAM32 has, PACMSTREAMHEADER32 pash, DWORD fdwConvert
+MMRESULT WINAPI acmStreamConvert(
+ HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwConvert
);
-MMRESULT32 WINAPI acmStreamMessage32(
- HACMSTREAM32 has, UINT32 uMsg, LPARAM lParam1, LPARAM lParam2
+MMRESULT WINAPI acmStreamMessage(
+ HACMSTREAM has, UINT uMsg, LPARAM lParam1, LPARAM lParam2
);
-MMRESULT32 WINAPI acmStreamOpen32(
- PHACMSTREAM32 phas, HACMDRIVER32 had, PWAVEFORMATEX pwfxSrc,
+MMRESULT WINAPI acmStreamOpen(
+ PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pwfxSrc,
PWAVEFORMATEX pwfxDst, PWAVEFILTER pwfltr, DWORD dwCallback,
DWORD dwInstance, DWORD fdwOpen
);
-MMRESULT32 WINAPI acmStreamPrepareHeader32(
- HACMSTREAM32 has, PACMSTREAMHEADER32 pash, DWORD fdwPrepare
+MMRESULT WINAPI acmStreamPrepareHeader(
+ HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwPrepare
);
-MMRESULT32 WINAPI acmStreamReset32(
- HACMSTREAM32 has, DWORD fdwReset
+MMRESULT WINAPI acmStreamReset(
+ HACMSTREAM has, DWORD fdwReset
);
-MMRESULT32 WINAPI acmStreamSize32(
- HACMSTREAM32 has, DWORD cbInput,
+MMRESULT WINAPI acmStreamSize(
+ HACMSTREAM has, DWORD cbInput,
LPDWORD pdwOutputBytes, DWORD fdwSize
);
-MMRESULT32 WINAPI acmStreamUnprepareHeader32(
- HACMSTREAM32 has, PACMSTREAMHEADER32 pash, DWORD fdwUnprepare
+MMRESULT WINAPI acmStreamUnprepareHeader(
+ HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwUnprepare
);
/***********************************************************************
* Wine specific - Win32
*/
-typedef struct _WINE_ACMBUILTINDRIVER32
+typedef struct _WINE_ACMBUILTINDRIVER
{
LPSTR pszDriverAlias;
- DRIVERPROC32 pfnDriverProc;
-} WINE_ACMBUILTINDRIVER32, *PWINE_ACMBUILTINDRIVER32;
+ DRIVERPROC pfnDriverProc;
+} WINE_ACMBUILTINDRIVER, *PWINE_ACMBUILTINDRIVER;
-typedef struct _WINE_ACMLOCALDRIVER32
+typedef struct _WINE_ACMLOCALDRIVER
{
- DRIVERPROC32 pfnDriverProc;
-} WINE_ACMLOCALDRIVER32, *PWINE_ACMLOCALDRIVER32;
+ DRIVERPROC pfnDriverProc;
+} WINE_ACMLOCALDRIVER, *PWINE_ACMLOCALDRIVER;
-typedef struct _WINE_ACMDRIVERID32 *PWINE_ACMDRIVERID32;
+typedef struct _WINE_ACMDRIVERID *PWINE_ACMDRIVERID;
-typedef struct _WINE_ACMOBJ32
+typedef struct _WINE_ACMOBJ
{
- PWINE_ACMDRIVERID32 pACMDriverID;
-} WINE_ACMOBJ32, *PWINE_ACMOBJ32;
+ PWINE_ACMDRIVERID pACMDriverID;
+} WINE_ACMOBJ, *PWINE_ACMOBJ;
-typedef struct _WINE_ACMDRIVER32
+typedef struct _WINE_ACMDRIVER
{
- WINE_ACMOBJ32 obj;
- HDRVR32 hDrvr;
-} WINE_ACMDRIVER32, *PWINE_ACMDRIVER32;
+ WINE_ACMOBJ obj;
+ HDRVR hDrvr;
+} WINE_ACMDRIVER, *PWINE_ACMDRIVER;
-typedef struct _WINE_ACMSTREAM32
+typedef struct _WINE_ACMSTREAM
{
- WINE_ACMOBJ32 obj;
+ WINE_ACMOBJ obj;
/* FIME: More fields needed */
-} WINE_ACMSTREAM32, *PWINE_ACMSTREAM32;
+} WINE_ACMSTREAM, *PWINE_ACMSTREAM;
-typedef struct _WINE_ACMDRIVERID32
+typedef struct _WINE_ACMDRIVERID
{
LPSTR pszDriverAlias;
LPSTR pszFileName;
- PWINE_ACMLOCALDRIVER32 pACMLocalDriver;
- BOOL32 bEnabled;
- PWINE_ACMDRIVER32 pACMDriver; /* NULL if not open */
- PWINE_ACMDRIVERID32 pNextACMDriverID;
- PWINE_ACMDRIVERID32 pPreviousACMDriverID;
-} WINE_ACMDRIVERID32;
+ PWINE_ACMLOCALDRIVER pACMLocalDriver;
+ BOOL bEnabled;
+ PWINE_ACMDRIVER pACMDriver; /* NULL if not open */
+ PWINE_ACMDRIVERID pNextACMDriverID;
+ PWINE_ACMDRIVERID pPreviousACMDriverID;
+} WINE_ACMDRIVERID;
/* From builtin.c */
-extern WINE_ACMBUILTINDRIVER32 MSACM_BuiltinDrivers32[];
+extern WINE_ACMBUILTINDRIVER MSACM_BuiltinDrivers[];
/* From interal.c */
-extern HANDLE32 MSACM_hHeap32;
-extern PWINE_ACMDRIVERID32 MSACM_pFirstACMDriverID32;
-extern PWINE_ACMDRIVERID32 MSACM_pLastACMDriverID32;
-PWINE_ACMDRIVERID32 MSACM_RegisterDriver32(
+extern HANDLE MSACM_hHeap;
+extern PWINE_ACMDRIVERID MSACM_pFirstACMDriverID;
+extern PWINE_ACMDRIVERID MSACM_pLastACMDriverID;
+PWINE_ACMDRIVERID MSACM_RegisterDriver(
LPSTR pszDriverAlias, LPSTR pszFileName,
- PWINE_ACMLOCALDRIVER32 pLocalDriver);
-void MSACM_RegisterAllDrivers32();
-PWINE_ACMDRIVERID32 MSACM_UnregisterDriver32(PWINE_ACMDRIVERID32 p);
-void MSACM_UnregisterAllDrivers32();
-PWINE_ACMDRIVERID32 MSACM_GetDriverID32(HACMDRIVERID32 hDriverID);
-PWINE_ACMDRIVER32 MSACM_GetDriver32(HACMDRIVER32 hDriver);
-PWINE_ACMOBJ32 MSACM_GetObj32(HACMOBJ32 hObj);
-HDRVR32 MSACM_OpenDriverProc32(DRIVERPROC32 pfnDriverProc);
+ PWINE_ACMLOCALDRIVER pLocalDriver);
+void MSACM_RegisterAllDrivers();
+PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p);
+void MSACM_UnregisterAllDrivers();
+PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID);
+PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver);
+PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj);
+HDRVR MSACM_OpenDriverProc(DRIVERPROC pfnDriverProc);
#endif /* __WINE_MSACM_H */
