Large-scale renaming of all Win32 functions and types to use the
standard Windows names.
diff --git a/include/msacmdrv.h b/include/msacmdrv.h
index 86dc34a..a756717 100644
--- a/include/msacmdrv.h
+++ b/include/msacmdrv.h
@@ -47,7 +47,7 @@
* Structures
*/
-typedef struct _ACMDRVOPENDESC32A
+typedef struct _ACMDRVOPENDESCA
{
DWORD cbStruct;
FOURCC fccType;
@@ -58,9 +58,9 @@
LPCSTR pszSectionName;
LPCSTR pszAliasName;
DWORD dnDevNode;
-} ACMDRVOPENDESC32A, *PACMDRVOPENDESC32A;
+} ACMDRVOPENDESCA, *PACMDRVOPENDESCA;
-typedef struct _ACMDRVOPENDESC32W
+typedef struct _ACMDRVOPENDESCW
{
DWORD cbStruct;
FOURCC fccType;
@@ -71,7 +71,7 @@
LPCWSTR pszSectionName;
LPCWSTR pszAliasName;
DWORD dnDevNode;
-} ACMDRVOPENDESC32W, *PACMDRVOPENDESC32W;
+} ACMDRVOPENDESCW, *PACMDRVOPENDESCW;
typedef struct _ACMDRVOPENDESC16
{
@@ -100,7 +100,7 @@
HACMSTREAM16 has;
} ACMDRVSTREAMINSTANCE16, *NPACMDRVSTREAMINSTANCE16, *LPACMDRVSTREAMINSTANCE16;
-typedef struct _ACMDRVSTREAMINSTANCE32
+typedef struct _ACMDRVSTREAMINSTANCE
{
DWORD cbStruct;
PWAVEFORMATEX pwfxSrc;
@@ -111,8 +111,8 @@
DWORD fdwOpen;
DWORD fdwDriver;
DWORD dwDriver;
- HACMSTREAM32 has;
-} ACMDRVSTREAMINSTANCE32, *PACMDRVSTREAMINSTANCE32;
+ HACMSTREAM has;
+} ACMDRVSTREAMINSTANCE, *PACMDRVSTREAMINSTANCE;
typedef struct _ACMDRVSTREAMHEADER16 *LPACMDRVSTREAMHEADER16;
@@ -143,8 +143,8 @@
DWORD cbPreparedDstLength;
} ACMDRVSTREAMHEADER16, *NPACMDRVSTREAMHEADER16;
-typedef struct _ACMDRVSTREAMHEADER32 *PACMDRVSTREAMHEADER32;
-typedef struct _ACMDRVSTREAMHEADER32 {
+typedef struct _ACMDRVSTREAMHEADER *PACMDRVSTREAMHEADER;
+typedef struct _ACMDRVSTREAMHEADER {
DWORD cbStruct;
DWORD fdwStatus;
DWORD dwUser;
@@ -158,7 +158,7 @@
DWORD dwDstUser;
DWORD fdwConvert;
- PACMDRVSTREAMHEADER32 *padshNext;
+ PACMDRVSTREAMHEADER *padshNext;
DWORD fdwDriver;
DWORD dwDriver;
@@ -169,7 +169,7 @@
DWORD cbPreparedSrcLength;
LPBYTE pbPreparedDst;
DWORD cbPreparedDstLength;
-} ACMDRVSTREAMHEADER32;
+} ACMDRVSTREAMHEADER;
typedef struct _ACMDRVSTREAMSIZE
{
@@ -178,7 +178,7 @@
DWORD cbSrcLength;
DWORD cbDstLength;
} ACMDRVSTREAMSIZE16, *NPACMDRVSTREAMSIZE16, *LPACMDRVSTREAMSIZE16,
- ACMDRVSTREAMSIZE32, *PACMDRVSTREAMSIZE;
+ ACMDRVSTREAMSIZE, *PACMDRVSTREAMSIZE;
typedef struct _ACMDRVFORMATSUGGEST16
{
@@ -190,7 +190,7 @@
DWORD cbwfxDst;
} ACMDRVFORMATSUGGEST16, *NPACMDRVFORMATSUGGEST, *LPACMDRVFORMATSUGGEST;
-typedef struct _ACMDRVFORMATSUGGEST32
+typedef struct _ACMDRVFORMATSUGGEST
{
DWORD cbStruct;
DWORD fdwSuggest;
@@ -198,6 +198,6 @@
DWORD cbwfxSrc;
PWAVEFORMATEX pwfxDst;
DWORD cbwfxDst;
-} ACMDRVFORMATSUGGEST32, *PACMDRVFORMATSUGGEST32;
+} ACMDRVFORMATSUGGEST, *PACMDRVFORMATSUGGEST;
#endif /* __WINE_MSACMDRV_H */