Compile the msacm dll with STRICT defined.
This commit is contained in:
parent
6ff1325128
commit
70e9a64c06
|
@ -1,4 +1,3 @@
|
|||
EXTRADEFS = -DWINE_NO_STRICT
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ../..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
|
@ -80,7 +80,7 @@ MMRESULT WINAPI acmDriverAddA(PHACMDRIVERID phadid, HINSTANCE hinstModule,
|
|||
MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule,
|
||||
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);
|
||||
|
||||
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
|
@ -252,7 +252,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe
|
|||
PWINE_ACMDRIVER pad = NULL;
|
||||
MMRESULT ret;
|
||||
|
||||
TRACE("(%p, %x, %08lu)\n", phad, hadid, fdwOpen);
|
||||
TRACE("(%p, %p, %08lu)\n", phad, hadid, fdwOpen);
|
||||
|
||||
if (!phad)
|
||||
return MMSYSERR_INVALPARAM;
|
||||
|
@ -371,7 +371,7 @@ MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fd
|
|||
if (lError != ERROR_SUCCESS)
|
||||
break;
|
||||
|
||||
FIXME("(0x%08x, %ld, %ld): stub (partial)\n",
|
||||
FIXME("(%p, %ld, %ld): stub (partial)\n",
|
||||
hadid, dwPriority, fdwPriority);
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -87,7 +87,7 @@ MMRESULT WINAPI acmFilterDetailsW(HACMDRIVER had, PACMFILTERDETAILSW pafd,
|
|||
MMRESULT mmr;
|
||||
ACMFILTERTAGDETAILSA aftd;
|
||||
|
||||
TRACE("(0x%08x, %p, %ld)\n", had, pafd, fdwDetails);
|
||||
TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails);
|
||||
|
||||
memset(&aftd, 0, sizeof(aftd));
|
||||
aftd.cbStruct = sizeof(aftd);
|
||||
|
@ -224,7 +224,7 @@ MMRESULT WINAPI acmFilterEnumW(HACMDRIVER had, PACMFILTERDETAILSW pafd,
|
|||
PWINE_ACMDRIVERID padid;
|
||||
BOOL ret;
|
||||
|
||||
TRACE("(0x%08x, %p, %p, %ld, %ld)\n",
|
||||
TRACE("(%p, %p, %p, %ld, %ld)\n",
|
||||
had, pafd, fnCallback, dwInstance, fdwEnum);
|
||||
|
||||
if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM;
|
||||
|
@ -290,7 +290,7 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd
|
|||
PWINE_ACMDRIVERID padid;
|
||||
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|
|
||||
ACM_FILTERTAGDETAILSF_LARGESTSIZE))
|
||||
|
@ -423,7 +423,7 @@ MMRESULT WINAPI acmFilterTagEnumW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd,
|
|||
PWINE_ACMDRIVERID padid;
|
||||
int i;
|
||||
|
||||
TRACE("(0x%08x, %p, %p, %ld, %ld)\n",
|
||||
TRACE("(%p, %p, %p, %ld, %ld)\n",
|
||||
had, paftd, fnCallback, dwInstance, fdwEnum);
|
||||
|
||||
if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM;
|
||||
|
|
|
@ -197,7 +197,7 @@ static BOOL WINAPI FormatChooseDlgProc(HWND hWnd, UINT msg,
|
|||
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) {
|
||||
case WM_INITDIALOG:
|
||||
|
@ -257,7 +257,7 @@ static BOOL WINAPI FormatChooseDlgProc(HWND hWnd, UINT msg,
|
|||
break;
|
||||
#endif
|
||||
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 );
|
||||
break;
|
||||
}
|
||||
|
@ -319,7 +319,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD
|
|||
static WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0};
|
||||
ACMFORMATTAGDETAILSA aftd;
|
||||
|
||||
TRACE("(0x%08x, %p, %ld)\n", had, pafd, fdwDetails);
|
||||
TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails);
|
||||
|
||||
memset(&aftd, 0, sizeof(aftd));
|
||||
aftd.cbStruct = sizeof(aftd);
|
||||
|
@ -484,7 +484,7 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd,
|
|||
WAVEFORMATEX wfxRef;
|
||||
BOOL ret;
|
||||
|
||||
TRACE("(0x%08x, %p, %p, %ld, %ld)\n",
|
||||
TRACE("(%p, %p, %p, %ld, %ld)\n",
|
||||
had, pafd, fnCallback, dwInstance, fdwEnum);
|
||||
|
||||
if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM;
|
||||
|
@ -537,7 +537,7 @@ MMRESULT WINAPI acmFormatSuggest(HACMDRIVER had, PWAVEFORMATEX pwfxSrc,
|
|||
ACMDRVFORMATSUGGEST adfg;
|
||||
MMRESULT mmr;
|
||||
|
||||
TRACE("(0x%08x, %p, %p, %ld, %ld)\n",
|
||||
TRACE("(%p, %p, %p, %ld, %ld)\n",
|
||||
had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest);
|
||||
|
||||
if (fdwSuggest & ~(ACM_FORMATSUGGESTF_NCHANNELS|ACM_FORMATSUGGESTF_NSAMPLESPERSEC|
|
||||
|
@ -613,7 +613,7 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd
|
|||
PWINE_ACMDRIVERID padid;
|
||||
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|
|
||||
ACM_FORMATTAGDETAILSF_LARGESTSIZE))
|
||||
|
@ -753,7 +753,7 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd,
|
|||
int i;
|
||||
BOOL bPcmDone = FALSE;
|
||||
|
||||
TRACE("(0x%08x, %p, %p, %ld, %ld)\n",
|
||||
TRACE("(%p, %p, %p, %ld, %ld)\n",
|
||||
had, paftd, fnCallback, dwInstance, fdwEnum);
|
||||
|
||||
if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM;
|
||||
|
|
|
@ -236,7 +236,7 @@ PWINE_ACMDRIVERID MSACM_RegisterDriver(LPSTR pszDriverAlias, LPSTR pszFileName,
|
|||
{
|
||||
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->obj.dwType = WINE_ACMOBJ_DRIVERID;
|
||||
|
|
|
@ -40,7 +40,7 @@ HINSTANCE MSACM_hInstance32 = 0;
|
|||
*/
|
||||
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) {
|
||||
case DLL_PROCESS_ATTACH:
|
||||
|
@ -109,7 +109,7 @@ MMRESULT WINAPI acmMetrics(HACMOBJ hao, UINT uMetric, LPVOID pMetric)
|
|||
int i;
|
||||
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))
|
||||
|
||||
|
@ -213,7 +213,7 @@ MMRESULT WINAPI acmMetrics(HACMOBJ hao, UINT uMetric, LPVOID pMetric)
|
|||
case ACM_METRIC_DRIVER_SUPPORT:
|
||||
case ACM_METRIC_DRIVER_PRIORITY:
|
||||
default:
|
||||
FIXME("(0x%08x, %d, %p): stub\n", hao, uMetric, pMetric);
|
||||
FIXME("(%p, %d, %p): stub\n", hao, uMetric, pMetric);
|
||||
mmr = MMSYSERR_NOTSUPPORTED;
|
||||
}
|
||||
return mmr;
|
||||
|
|
|
@ -53,7 +53,7 @@ MMRESULT WINAPI acmStreamClose(HACMSTREAM has, DWORD fdwClose)
|
|||
PWINE_ACMSTREAM was;
|
||||
MMRESULT ret;
|
||||
|
||||
TRACE("(0x%08x, %ld)\n", has, fdwClose);
|
||||
TRACE("(%p, %ld)\n", has, fdwClose);
|
||||
|
||||
if ((was = ACM_GetStream(has)) == NULL) {
|
||||
return MMSYSERR_INVALHANDLE;
|
||||
|
@ -78,7 +78,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash,
|
|||
MMRESULT ret = MMSYSERR_NOERROR;
|
||||
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)
|
||||
return MMSYSERR_INVALHANDLE;
|
||||
|
@ -118,7 +118,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash,
|
|||
MMRESULT WINAPI acmStreamMessage(HACMSTREAM has, UINT uMsg, LPARAM lParam1,
|
||||
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);
|
||||
return MMSYSERR_ERROR;
|
||||
}
|
||||
|
@ -136,7 +136,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pw
|
|||
int wfxSrcSize;
|
||||
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);
|
||||
|
||||
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;
|
||||
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)
|
||||
return MMSYSERR_INVALHANDLE;
|
||||
|
@ -314,7 +314,7 @@ MMRESULT WINAPI acmStreamReset(HACMSTREAM has, DWORD fdwReset)
|
|||
PWINE_ACMSTREAM was;
|
||||
MMRESULT ret = MMSYSERR_NOERROR;
|
||||
|
||||
TRACE("(0x%08x, %ld)\n", has, fdwReset);
|
||||
TRACE("(%p, %ld)\n", has, fdwReset);
|
||||
|
||||
if (fdwReset) {
|
||||
ret = MMSYSERR_INVALFLAG;
|
||||
|
@ -337,7 +337,7 @@ MMRESULT WINAPI acmStreamSize(HACMSTREAM has, DWORD cbInput,
|
|||
ACMDRVSTREAMSIZE adss;
|
||||
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) {
|
||||
return MMSYSERR_INVALHANDLE;
|
||||
|
@ -389,7 +389,7 @@ MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
|
|||
MMRESULT ret = MMSYSERR_NOERROR;
|
||||
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)
|
||||
return MMSYSERR_INVALHANDLE;
|
||||
|
|
Loading…
Reference in New Issue