Moved msacmdrv.h to include directory to avoid inter-dll header
dependencies.
diff --git a/dlls/msacm/imaadp32/imaadp32.c b/dlls/msacm/imaadp32/imaadp32.c
index 37e6143..61d3d00 100644
--- a/dlls/msacm/imaadp32/imaadp32.c
+++ b/dlls/msacm/imaadp32/imaadp32.c
@@ -30,7 +30,7 @@
#include "mmsystem.h"
#include "mmreg.h"
#include "msacm.h"
-#include "../msacmdrv.h"
+#include "msacmdrv.h"
#include "wine/debug.h"
/* see http://www.pcisys.net/~melanson/codecs/adpcm.txt for the details */
diff --git a/dlls/msacm/msadp32/msadp32.c b/dlls/msacm/msadp32/msadp32.c
index f901bd2..dae681c 100644
--- a/dlls/msacm/msadp32/msadp32.c
+++ b/dlls/msacm/msadp32/msadp32.c
@@ -30,7 +30,7 @@
#include "mmsystem.h"
#include "mmreg.h"
#include "msacm.h"
-#include "../msacmdrv.h"
+#include "msacmdrv.h"
#include "wine/debug.h"
/* see http://www.pcisys.net/~melanson/codecs/adpcm.txt for the details */
diff --git a/dlls/msacm/msg711/msg711.c b/dlls/msacm/msg711/msg711.c
index d173917..1f04369 100644
--- a/dlls/msacm/msg711/msg711.c
+++ b/dlls/msacm/msg711/msg711.c
@@ -30,7 +30,7 @@
#include "mmsystem.h"
#include "mmreg.h"
#include "msacm.h"
-#include "../msacmdrv.h"
+#include "msacmdrv.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(g711);
diff --git a/dlls/msacm/winemp3/mpegl3.c b/dlls/msacm/winemp3/mpegl3.c
index 2d89117..466eeba 100644
--- a/dlls/msacm/winemp3/mpegl3.c
+++ b/dlls/msacm/winemp3/mpegl3.c
@@ -30,7 +30,7 @@
#include "mmsystem.h"
#include "mmreg.h"
#include "msacm.h"
-#include "../msacmdrv.h"
+#include "msacmdrv.h"
#include "mpg123.h"
#include "mpglib.h"
diff --git a/include/Makefile.in b/include/Makefile.in
index ad5201e..44b0bc8 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -119,6 +119,7 @@
mmsystem.h \
msacm.h \
msacmdlg.h \
+ msacmdrv.h \
msi.h \
msiquery.h \
mssip.h \
diff --git a/dlls/msacm/msacmdrv.h b/include/msacmdrv.h
similarity index 70%
rename from dlls/msacm/msacmdrv.h
rename to include/msacmdrv.h
index 91942e3..6d2668d 100644
--- a/dlls/msacm/msacmdrv.h
+++ b/include/msacmdrv.h
@@ -25,7 +25,6 @@
#include "windef.h"
#include "winbase.h"
-#include "wine/windef16.h"
#include "mmsystem.h"
#include "mmreg.h"
#include "msacm.h"
@@ -95,33 +94,6 @@
DWORD dnDevNode;
} ACMDRVOPENDESCW, *PACMDRVOPENDESCW;
-typedef struct _ACMDRVOPENDESC16
-{
- DWORD cbStruct;
- FOURCC fccType;
- FOURCC fccComp;
- DWORD dwVersion;
- DWORD dwFlags;
- DWORD dwError;
- LPCSTR pszSectionName;
- LPCSTR pszAliasName;
- DWORD dnDevNode;
-} ACMDRVOPENDESC16, *NPACMDRVOPENDESC16, *LPACMDRVOPENDESC16;
-
-typedef struct _ACMDRVSTREAMINSTANCE16
-{
- DWORD cbStruct;
- LPWAVEFORMATEX pwfxSrc;
- LPWAVEFORMATEX pwfxDst;
- LPWAVEFILTER pwfltr;
- DWORD dwCallback;
- DWORD dwInstance;
- DWORD fdwOpen;
- DWORD fdwDriver;
- DWORD dwDriver;
- HACMSTREAM16 has;
-} ACMDRVSTREAMINSTANCE16, *NPACMDRVSTREAMINSTANCE16, *LPACMDRVSTREAMINSTANCE16;
-
typedef struct _ACMDRVSTREAMINSTANCE
{
DWORD cbStruct;
@@ -136,34 +108,6 @@
HACMSTREAM has;
} ACMDRVSTREAMINSTANCE, *PACMDRVSTREAMINSTANCE;
-typedef struct _ACMDRVSTREAMHEADER16 *LPACMDRVSTREAMHEADER16;
-typedef struct _ACMDRVSTREAMHEADER16 {
- DWORD cbStruct;
- DWORD fdwStatus;
- DWORD dwUser;
- LPBYTE pbSrc;
- DWORD cbSrcLength;
- DWORD cbSrcLengthUsed;
- DWORD dwSrcUser;
- LPBYTE pbDst;
- DWORD cbDstLength;
- DWORD cbDstLengthUsed;
- DWORD dwDstUser;
-
- DWORD fdwConvert;
- LPACMDRVSTREAMHEADER16 *padshNext;
- DWORD fdwDriver;
- DWORD dwDriver;
-
- /* Internal fields for ACM */
- DWORD fdwPrepared;
- DWORD dwPrepared;
- LPBYTE pbPreparedSrc;
- DWORD cbPreparedSrcLength;
- LPBYTE pbPreparedDst;
- DWORD cbPreparedDstLength;
-} ACMDRVSTREAMHEADER16, *NPACMDRVSTREAMHEADER16;
-
typedef struct _ACMDRVSTREAMHEADER *PACMDRVSTREAMHEADER;
typedef struct _ACMDRVSTREAMHEADER {
DWORD cbStruct;
@@ -198,18 +142,7 @@
DWORD fdwSize;
DWORD cbSrcLength;
DWORD cbDstLength;
-} ACMDRVSTREAMSIZE16, *NPACMDRVSTREAMSIZE16, *LPACMDRVSTREAMSIZE16,
- ACMDRVSTREAMSIZE, *PACMDRVSTREAMSIZE;
-
-typedef struct _ACMDRVFORMATSUGGEST16
-{
- DWORD cbStruct;
- DWORD fdwSuggest;
- LPWAVEFORMATEX pwfxSrc;
- DWORD cbwfxSrc;
- LPWAVEFORMATEX pwfxDst;
- DWORD cbwfxDst;
-} ACMDRVFORMATSUGGEST16, *NPACMDRVFORMATSUGGEST, *LPACMDRVFORMATSUGGEST;
+} ACMDRVSTREAMSIZE, *PACMDRVSTREAMSIZE;
typedef struct _ACMDRVFORMATSUGGEST
{
