ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved msacmdrv.h to include directory to avoid inter-dll header 

dependencies.
This commit is contained in:
Alexandre Julliard 2004-01-20 21:55:28 +00:00
parent 5560d47539
commit 32b1e67ae5
6 changed files with 6 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msacm/imaadp32/imaadp32.c
View File

@ -30,7 +30,7 @@
#include "mmsystem.h" #include "mmsystem.h"
#include "mmreg.h" #include "mmreg.h"
#include "msacm.h" #include "msacm.h"
#include "../msacmdrv.h" #include "msacmdrv.h"
#include "wine/debug.h" #include "wine/debug.h"
/* see http://www.pcisys.net/~melanson/codecs/adpcm.txt for the details */ /* see http://www.pcisys.net/~melanson/codecs/adpcm.txt for the details */

2
dlls/msacm/msadp32/msadp32.c
View File

@ -30,7 +30,7 @@
#include "mmsystem.h" #include "mmsystem.h"
#include "mmreg.h" #include "mmreg.h"
#include "msacm.h" #include "msacm.h"
#include "../msacmdrv.h" #include "msacmdrv.h"
#include "wine/debug.h" #include "wine/debug.h"
/* see http://www.pcisys.net/~melanson/codecs/adpcm.txt for the details */ /* see http://www.pcisys.net/~melanson/codecs/adpcm.txt for the details */

2
dlls/msacm/msg711/msg711.c
View File

@ -30,7 +30,7 @@
#include "mmsystem.h" #include "mmsystem.h"
#include "mmreg.h" #include "mmreg.h"
#include "msacm.h" #include "msacm.h"
#include "../msacmdrv.h" #include "msacmdrv.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(g711); WINE_DEFAULT_DEBUG_CHANNEL(g711);

2
dlls/msacm/winemp3/mpegl3.c
View File

@ -30,7 +30,7 @@
#include "mmsystem.h" #include "mmsystem.h"
#include "mmreg.h" #include "mmreg.h"
#include "msacm.h" #include "msacm.h"
#include "../msacmdrv.h" #include "msacmdrv.h"
#include "mpg123.h" #include "mpg123.h"
#include "mpglib.h" #include "mpglib.h"

1
include/Makefile.in
View File

@ -119,6 +119,7 @@ WINDOWS_INCLUDES = \
mmsystem.h \ mmsystem.h \
msacm.h \ msacm.h \
msacmdlg.h \ msacmdlg.h \
msacmdrv.h \
msi.h \ msi.h \
msiquery.h \ msiquery.h \
mssip.h \ mssip.h \

69
dlls/msacm/msacmdrv.h → include/msacmdrv.h
View File

@ -25,7 +25,6 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "wine/windef16.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "mmreg.h" #include "mmreg.h"
#include "msacm.h" #include "msacm.h"
@ -95,33 +94,6 @@ typedef struct _ACMDRVOPENDESCW
DWORD dnDevNode; DWORD dnDevNode;
} ACMDRVOPENDESCW, *PACMDRVOPENDESCW; } 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 typedef struct _ACMDRVSTREAMINSTANCE
{ {
DWORD cbStruct; DWORD cbStruct;
@ -136,34 +108,6 @@ typedef struct _ACMDRVSTREAMINSTANCE
HACMSTREAM has; HACMSTREAM has;
} ACMDRVSTREAMINSTANCE, *PACMDRVSTREAMINSTANCE; } 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 *PACMDRVSTREAMHEADER;
typedef struct _ACMDRVSTREAMHEADER { typedef struct _ACMDRVSTREAMHEADER {
DWORD cbStruct; DWORD cbStruct;
@ -198,18 +142,7 @@ typedef struct _ACMDRVSTREAMSIZE
DWORD fdwSize; DWORD fdwSize;
DWORD cbSrcLength; DWORD cbSrcLength;
DWORD cbDstLength; DWORD cbDstLength;
} ACMDRVSTREAMSIZE16, *NPACMDRVSTREAMSIZE16, *LPACMDRVSTREAMSIZE16, } ACMDRVSTREAMSIZE, *PACMDRVSTREAMSIZE;
ACMDRVSTREAMSIZE, *PACMDRVSTREAMSIZE;
typedef struct _ACMDRVFORMATSUGGEST16
{
DWORD cbStruct;
DWORD fdwSuggest;
LPWAVEFORMATEX pwfxSrc;
DWORD cbwfxSrc;
LPWAVEFORMATEX pwfxDst;
DWORD cbwfxDst;
} ACMDRVFORMATSUGGEST16, *NPACMDRVFORMATSUGGEST, *LPACMDRVFORMATSUGGEST;
typedef struct _ACMDRVFORMATSUGGEST typedef struct _ACMDRVFORMATSUGGEST
{ {