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

Compile the msacm dll with STRICT defined.

This commit is contained in:
Michael Stefaniuc 2002-10-22 00:46:23 +00:00 committed by Alexandre Julliard
parent 6ff1325128
commit 70e9a64c06
7 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/msacm/Makefile.in
View File

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@

6
dlls/msacm/driver.c
View File

@ -80,7 +80,7 @@ MMRESULT WINAPI acmDriverAddA(PHACMDRIVERID phadid, HINSTANCE hinstModule,
MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule, MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule,
LPARAM lParam, DWORD dwPriority, DWORD fdwAdd) LPARAM lParam, DWORD dwPriority, DWORD fdwAdd)
{ {
FIXME("(%p, 0x%08x, %ld, %ld, %ld): stub\n", FIXME("(%p, %p, %ld, %ld, %ld): stub\n",
phadid, hinstModule, lParam, dwPriority, fdwAdd); phadid, hinstModule, lParam, dwPriority, fdwAdd);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@ -252,7 +252,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe
PWINE_ACMDRIVER pad = NULL; PWINE_ACMDRIVER pad = NULL;
MMRESULT ret; MMRESULT ret;
TRACE("(%p, %x, %08lu)\n", phad, hadid, fdwOpen); TRACE("(%p, %p, %08lu)\n", phad, hadid, fdwOpen);
if (!phad) if (!phad)
return MMSYSERR_INVALPARAM; return MMSYSERR_INVALPARAM;
@ -371,7 +371,7 @@ MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fd
if (lError != ERROR_SUCCESS) if (lError != ERROR_SUCCESS)
break; break;
FIXME("(0x%08x, %ld, %ld): stub (partial)\n", FIXME("(%p, %ld, %ld): stub (partial)\n",
hadid, dwPriority, fdwPriority); hadid, dwPriority, fdwPriority);
break; break;
} }

8
dlls/msacm/filter.c
View File

@ -87,7 +87,7 @@ MMRESULT WINAPI acmFilterDetailsW(HACMDRIVER had, PACMFILTERDETAILSW pafd,
MMRESULT mmr; MMRESULT mmr;
ACMFILTERTAGDETAILSA aftd; ACMFILTERTAGDETAILSA aftd;
TRACE("(0x%08x, %p, %ld)\n", had, pafd, fdwDetails); TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails);
memset(&aftd, 0, sizeof(aftd)); memset(&aftd, 0, sizeof(aftd));
aftd.cbStruct = sizeof(aftd); aftd.cbStruct = sizeof(aftd);
@ -224,7 +224,7 @@ MMRESULT WINAPI acmFilterEnumW(HACMDRIVER had, PACMFILTERDETAILSW pafd,
PWINE_ACMDRIVERID padid; PWINE_ACMDRIVERID padid;
BOOL ret; BOOL ret;
TRACE("(0x%08x, %p, %p, %ld, %ld)\n", TRACE("(%p, %p, %p, %ld, %ld)\n",
had, pafd, fnCallback, dwInstance, fdwEnum); had, pafd, fnCallback, dwInstance, fdwEnum);
if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM;
@ -290,7 +290,7 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd
PWINE_ACMDRIVERID padid; PWINE_ACMDRIVERID padid;
MMRESULT mmr; MMRESULT mmr;
TRACE("(0x%08x, %p, %ld)\n", had, paftd, fdwDetails); TRACE("(%p, %p, %ld)\n", had, paftd, fdwDetails);
if (fdwDetails & ~(ACM_FILTERTAGDETAILSF_FILTERTAG|ACM_FILTERTAGDETAILSF_INDEX| if (fdwDetails & ~(ACM_FILTERTAGDETAILSF_FILTERTAG|ACM_FILTERTAGDETAILSF_INDEX|
ACM_FILTERTAGDETAILSF_LARGESTSIZE)) ACM_FILTERTAGDETAILSF_LARGESTSIZE))
@ -423,7 +423,7 @@ MMRESULT WINAPI acmFilterTagEnumW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd,
PWINE_ACMDRIVERID padid; PWINE_ACMDRIVERID padid;
int i; int i;
TRACE("(0x%08x, %p, %p, %ld, %ld)\n", TRACE("(%p, %p, %p, %ld, %ld)\n",
had, paftd, fnCallback, dwInstance, fdwEnum); had, paftd, fnCallback, dwInstance, fdwEnum);
if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM; if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM;

14
dlls/msacm/format.c
View File

@ -197,7 +197,7 @@ static BOOL WINAPI FormatChooseDlgProc(HWND hWnd, UINT msg,
WPARAM wParam, LPARAM lParam) WPARAM wParam, LPARAM lParam)
{ {
TRACE("hwnd=%i msg=%i 0x%08x 0x%08lx\n", hWnd, msg, wParam, lParam ); TRACE("hwnd=%p msg=%i 0x%08x 0x%08lx\n", hWnd, msg, wParam, lParam );
switch (msg) { switch (msg) {
case WM_INITDIALOG: case WM_INITDIALOG:
@ -257,7 +257,7 @@ static BOOL WINAPI FormatChooseDlgProc(HWND hWnd, UINT msg,
break; break;
#endif #endif
default: default:
TRACE("Dropped dlgMsg: hwnd=%i msg=%i 0x%08x 0x%08lx\n", TRACE("Dropped dlgMsg: hwnd=%p msg=%i 0x%08x 0x%08lx\n",
hWnd, msg, wParam, lParam ); hWnd, msg, wParam, lParam );
break; break;
} }
@ -319,7 +319,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD
static WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0}; static WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0};
ACMFORMATTAGDETAILSA aftd; ACMFORMATTAGDETAILSA aftd;
TRACE("(0x%08x, %p, %ld)\n", had, pafd, fdwDetails); TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails);
memset(&aftd, 0, sizeof(aftd)); memset(&aftd, 0, sizeof(aftd));
aftd.cbStruct = sizeof(aftd); aftd.cbStruct = sizeof(aftd);
@ -484,7 +484,7 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd,
WAVEFORMATEX wfxRef; WAVEFORMATEX wfxRef;
BOOL ret; BOOL ret;
TRACE("(0x%08x, %p, %p, %ld, %ld)\n", TRACE("(%p, %p, %p, %ld, %ld)\n",
had, pafd, fnCallback, dwInstance, fdwEnum); had, pafd, fnCallback, dwInstance, fdwEnum);
if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM;
@ -537,7 +537,7 @@ MMRESULT WINAPI acmFormatSuggest(HACMDRIVER had, PWAVEFORMATEX pwfxSrc,
ACMDRVFORMATSUGGEST adfg; ACMDRVFORMATSUGGEST adfg;
MMRESULT mmr; MMRESULT mmr;
TRACE("(0x%08x, %p, %p, %ld, %ld)\n", TRACE("(%p, %p, %p, %ld, %ld)\n",
had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest); had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest);
if (fdwSuggest & ~(ACM_FORMATSUGGESTF_NCHANNELS|ACM_FORMATSUGGESTF_NSAMPLESPERSEC| if (fdwSuggest & ~(ACM_FORMATSUGGESTF_NCHANNELS|ACM_FORMATSUGGESTF_NSAMPLESPERSEC|
@ -613,7 +613,7 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd
PWINE_ACMDRIVERID padid; PWINE_ACMDRIVERID padid;
MMRESULT mmr = ACMERR_NOTPOSSIBLE; MMRESULT mmr = ACMERR_NOTPOSSIBLE;
TRACE("(0x%08x, %p, %ld)\n", had, paftd, fdwDetails); TRACE("(%p, %p, %ld)\n", had, paftd, fdwDetails);
if (fdwDetails & ~(ACM_FORMATTAGDETAILSF_FORMATTAG|ACM_FORMATTAGDETAILSF_INDEX| if (fdwDetails & ~(ACM_FORMATTAGDETAILSF_FORMATTAG|ACM_FORMATTAGDETAILSF_INDEX|
ACM_FORMATTAGDETAILSF_LARGESTSIZE)) ACM_FORMATTAGDETAILSF_LARGESTSIZE))
@ -753,7 +753,7 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd,
int i; int i;
BOOL bPcmDone = FALSE; BOOL bPcmDone = FALSE;
TRACE("(0x%08x, %p, %p, %ld, %ld)\n", TRACE("(%p, %p, %p, %ld, %ld)\n",
had, paftd, fnCallback, dwInstance, fdwEnum); had, paftd, fnCallback, dwInstance, fdwEnum);
if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM; if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM;

2
dlls/msacm/internal.c
View File

@ -236,7 +236,7 @@ PWINE_ACMDRIVERID MSACM_RegisterDriver(LPSTR pszDriverAlias, LPSTR pszFileName,
{ {
PWINE_ACMDRIVERID padid; PWINE_ACMDRIVERID padid;
TRACE("('%s', '%s', 0x%08x)\n", pszDriverAlias, pszFileName, hinstModule); TRACE("('%s', '%s', %p)\n", pszDriverAlias, pszFileName, hinstModule);
padid = (PWINE_ACMDRIVERID) HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMDRIVERID)); padid = (PWINE_ACMDRIVERID) HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMDRIVERID));
padid->obj.dwType = WINE_ACMOBJ_DRIVERID; padid->obj.dwType = WINE_ACMOBJ_DRIVERID;

6
dlls/msacm/msacm32_main.c
View File

@ -40,7 +40,7 @@ HINSTANCE MSACM_hInstance32 = 0;
*/ */
BOOL WINAPI MSACM32_LibMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI MSACM32_LibMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
TRACE("0x%x 0x%lx %p\n", hInstDLL, fdwReason, lpvReserved); TRACE("%p 0x%lx %p\n", hInstDLL, fdwReason, lpvReserved);
switch (fdwReason) { switch (fdwReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
@ -109,7 +109,7 @@ MMRESULT WINAPI acmMetrics(HACMOBJ hao, UINT uMetric, LPVOID pMetric)
int i; int i;
MMRESULT mmr = MMSYSERR_NOERROR; MMRESULT mmr = MMSYSERR_NOERROR;
TRACE("(0x%08x, %d, %p);\n", hao, uMetric, pMetric); TRACE("(%p, %d, %p);\n", hao, uMetric, pMetric);
#define CheckLocal(padid) (!bLocal || ((padid)->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_LOCAL)) #define CheckLocal(padid) (!bLocal || ((padid)->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_LOCAL))
@ -213,7 +213,7 @@ MMRESULT WINAPI acmMetrics(HACMOBJ hao, UINT uMetric, LPVOID pMetric)
case ACM_METRIC_DRIVER_SUPPORT: case ACM_METRIC_DRIVER_SUPPORT:
case ACM_METRIC_DRIVER_PRIORITY: case ACM_METRIC_DRIVER_PRIORITY:
default: default:
FIXME("(0x%08x, %d, %p): stub\n", hao, uMetric, pMetric); FIXME("(%p, %d, %p): stub\n", hao, uMetric, pMetric);
mmr = MMSYSERR_NOTSUPPORTED; mmr = MMSYSERR_NOTSUPPORTED;
} }
return mmr; return mmr;

16
dlls/msacm/stream.c
View File

@ -53,7 +53,7 @@ MMRESULT WINAPI acmStreamClose(HACMSTREAM has, DWORD fdwClose)
PWINE_ACMSTREAM was; PWINE_ACMSTREAM was;
MMRESULT ret; MMRESULT ret;
TRACE("(0x%08x, %ld)\n", has, fdwClose); TRACE("(%p, %ld)\n", has, fdwClose);
if ((was = ACM_GetStream(has)) == NULL) { if ((was = ACM_GetStream(has)) == NULL) {
return MMSYSERR_INVALHANDLE; return MMSYSERR_INVALHANDLE;
@ -78,7 +78,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash,
MMRESULT ret = MMSYSERR_NOERROR; MMRESULT ret = MMSYSERR_NOERROR;
PACMDRVSTREAMHEADER padsh; PACMDRVSTREAMHEADER padsh;
TRACE("(0x%08x, %p, %ld)\n", has, pash, fdwConvert); TRACE("(%p, %p, %ld)\n", has, pash, fdwConvert);
if ((was = ACM_GetStream(has)) == NULL) if ((was = ACM_GetStream(has)) == NULL)
return MMSYSERR_INVALHANDLE; return MMSYSERR_INVALHANDLE;
@ -118,7 +118,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash,
MMRESULT WINAPI acmStreamMessage(HACMSTREAM has, UINT uMsg, LPARAM lParam1, MMRESULT WINAPI acmStreamMessage(HACMSTREAM has, UINT uMsg, LPARAM lParam1,
LPARAM lParam2) LPARAM lParam2)
{ {
FIXME("(0x%08x, %u, %ld, %ld): stub\n", has, uMsg, lParam1, lParam2); FIXME("(%p, %u, %ld, %ld): stub\n", has, uMsg, lParam1, lParam2);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
@ -136,7 +136,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pw
int wfxSrcSize; int wfxSrcSize;
int wfxDstSize; int wfxDstSize;
TRACE("(%p, 0x%08x, %p, %p, %p, %ld, %ld, %ld)\n", TRACE("(%p, %p, %p, %p, %p, %ld, %ld, %ld)\n",
phas, had, pwfxSrc, pwfxDst, pwfltr, dwCallback, dwInstance, fdwOpen); phas, had, pwfxSrc, pwfxDst, pwfltr, dwCallback, dwInstance, fdwOpen);
TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
@ -254,7 +254,7 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
MMRESULT ret = MMSYSERR_NOERROR; MMRESULT ret = MMSYSERR_NOERROR;
PACMDRVSTREAMHEADER padsh; PACMDRVSTREAMHEADER padsh;
TRACE("(0x%08x, %p, %ld)\n", has, pash, fdwPrepare); TRACE("(%p, %p, %ld)\n", has, pash, fdwPrepare);
if ((was = ACM_GetStream(has)) == NULL) if ((was = ACM_GetStream(has)) == NULL)
return MMSYSERR_INVALHANDLE; return MMSYSERR_INVALHANDLE;
@ -314,7 +314,7 @@ MMRESULT WINAPI acmStreamReset(HACMSTREAM has, DWORD fdwReset)
PWINE_ACMSTREAM was; PWINE_ACMSTREAM was;
MMRESULT ret = MMSYSERR_NOERROR; MMRESULT ret = MMSYSERR_NOERROR;
TRACE("(0x%08x, %ld)\n", has, fdwReset); TRACE("(%p, %ld)\n", has, fdwReset);
if (fdwReset) { if (fdwReset) {
ret = MMSYSERR_INVALFLAG; ret = MMSYSERR_INVALFLAG;
@ -337,7 +337,7 @@ MMRESULT WINAPI acmStreamSize(HACMSTREAM has, DWORD cbInput,
ACMDRVSTREAMSIZE adss; ACMDRVSTREAMSIZE adss;
MMRESULT ret; MMRESULT ret;
TRACE("(0x%08x, %ld, %p, %ld)\n", has, cbInput, pdwOutputBytes, fdwSize); TRACE("(%p, %ld, %p, %ld)\n", has, cbInput, pdwOutputBytes, fdwSize);
if ((was = ACM_GetStream(has)) == NULL) { if ((was = ACM_GetStream(has)) == NULL) {
return MMSYSERR_INVALHANDLE; return MMSYSERR_INVALHANDLE;
@ -389,7 +389,7 @@ MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
MMRESULT ret = MMSYSERR_NOERROR; MMRESULT ret = MMSYSERR_NOERROR;
PACMDRVSTREAMHEADER padsh; PACMDRVSTREAMHEADER padsh;
TRACE("(0x%08x, %p, %ld)\n", has, pash, fdwUnprepare); TRACE("(%p, %p, %ld)\n", has, pash, fdwUnprepare);
if ((was = ACM_GetStream(has)) == NULL) if ((was = ACM_GetStream(has)) == NULL)
return MMSYSERR_INVALHANDLE; return MMSYSERR_INVALHANDLE;