Hello, License: LGPL, X11 Changelog: Michael Stefaniuc <mstefani@redhat.com> - Compile the msacm dll with STRICT defined bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani@redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart
Index: Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/msacm/Makefile.in,v
retrieving revision 1.21
diff -u -r1.21 Makefile.in
--- Makefile.in 18 Oct 2002 23:46:29 -0000 1.21
+++ Makefile.in 21 Oct 2002 23:15:35 -0000
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: driver.c
===================================================================
RCS file: /home/wine/wine/dlls/msacm/driver.c,v
retrieving revision 1.20
diff -u -r1.20 driver.c
--- driver.c 9 Aug 2002 01:02:25 -0000 1.20
+++ driver.c 21 Oct 2002 23:15:35 -0000
@@ -80,7 +80,7 @@
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 @@
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 @@
if (lError != ERROR_SUCCESS)
break;
- FIXME("(0x%08x, %ld, %ld): stub (partial)\n",
+ FIXME("(%p, %ld, %ld): stub (partial)\n",
hadid, dwPriority, fdwPriority);
break;
}
Index: filter.c
===================================================================
RCS file: /home/wine/wine/dlls/msacm/filter.c,v
retrieving revision 1.13
diff -u -r1.13 filter.c
--- filter.c 31 May 2002 23:25:48 -0000 1.13
+++ filter.c 21 Oct 2002 23:15:35 -0000
@@ -87,7 +87,7 @@
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 @@
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 @@
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 @@
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;
Index: format.c
===================================================================
RCS file: /home/wine/wine/dlls/msacm/format.c,v
retrieving revision 1.17
diff -u -r1.17 format.c
--- format.c 31 May 2002 23:25:48 -0000 1.17
+++ format.c 21 Oct 2002 23:15:35 -0000
@@ -197,7 +197,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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;
Index: internal.c
===================================================================
RCS file: /home/wine/wine/dlls/msacm/internal.c,v
retrieving revision 1.13
diff -u -r1.13 internal.c
--- internal.c 31 May 2002 23:25:48 -0000 1.13
+++ internal.c 21 Oct 2002 23:15:36 -0000
@@ -236,7 +236,7 @@
{
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;
Index: msacm32_main.c
===================================================================
RCS file: /home/wine/wine/dlls/msacm/msacm32_main.c,v
retrieving revision 1.11
diff -u -r1.11 msacm32_main.c
--- msacm32_main.c 31 May 2002 23:25:48 -0000 1.11
+++ msacm32_main.c 21 Oct 2002 23:15:36 -0000
@@ -40,7 +40,7 @@
*/
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 @@
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 @@
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;
Index: stream.c
===================================================================
RCS file: /home/wine/wine/dlls/msacm/stream.c,v
retrieving revision 1.10
diff -u -r1.10 stream.c
--- stream.c 31 May 2002 23:25:48 -0000 1.10
+++ stream.c 21 Oct 2002 23:15:36 -0000
@@ -53,7 +53,7 @@
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 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 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 @@
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 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 @@
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 @@
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 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;
Attachment:
pgp00063.pgp
Description: PGP signature
