diff --git a/dlls/msacm32.drv/Makefile.in b/dlls/msacm32.drv/Makefile.in
index f3a4e0cf21d..dface4e765c 100644
--- a/dlls/msacm32.drv/Makefile.in
+++ b/dlls/msacm32.drv/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm32.drv
 IMPORTS   = msacm32 winmm user32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	wavemap.c
diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c
index 5b616f4fcca..d2738aa6df6 100644
--- a/dlls/msacm32.drv/wavemap.c
+++ b/dlls/msacm32.drv/wavemap.c
@@ -126,7 +126,7 @@ static	DWORD	wodOpenHelper(WAVEMAPDATA* wom, UINT idx,
 {
     DWORD	ret;
 
-    TRACE("(%p %04x %p %p %08lx)\n", wom, idx, lpDesc, lpwfx, dwFlags);
+    TRACE("(%p %04x %p %p %08x)\n", wom, idx, lpDesc, lpwfx, dwFlags);
 
     /* destination is always PCM, so the formulas below apply */
     lpwfx->nBlockAlign = (lpwfx->nChannels * lpwfx->wBitsPerSample) / 8;
@@ -144,7 +144,7 @@ static	DWORD	wodOpenHelper(WAVEMAPDATA* wom, UINT idx,
 	    wom->hAcmStream = 0;
 	}
     }
-    TRACE("ret = %08lx\n", ret);
+    TRACE("ret = %08x\n", ret);
     return ret;
 }
 
@@ -155,7 +155,7 @@ static	DWORD	wodOpen(LPDWORD lpdwUser, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
     WAVEMAPDATA*	wom = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEMAPDATA));
     DWORD               res;
 
-    TRACE("(%p %p %08lx)\n", lpdwUser, lpDesc, dwFlags);
+    TRACE("(%p %p %08x)\n", lpdwUser, lpDesc, dwFlags);
 
     if (!wom) {
         WARN("no memory\n");
@@ -287,7 +287,7 @@ error:
         WARN("ret = WAVERR_BADFORMAT\n");
         return WAVERR_BADFORMAT;
     }
-    WARN("ret = 0x%08lx\n", res);
+    WARN("ret = 0x%08x\n", res);
     return res;
 }
 
@@ -314,7 +314,7 @@ static	DWORD	wodWrite(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2)
     PACMSTREAMHEADER	ash;
     LPWAVEHDR		lpWaveHdrDst;
 
-    TRACE("(%p %p %08lx)\n", wom, lpWaveHdrSrc, dwParam2);
+    TRACE("(%p %p %08x)\n", wom, lpWaveHdrSrc, dwParam2);
 
     if (!wom->hAcmStream) {
 	return waveOutWrite(wom->u.out.hInnerWave, lpWaveHdrSrc, dwParam2);
@@ -351,7 +351,7 @@ static	DWORD	wodPrepare(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2
     DWORD		dwRet;
     LPWAVEHDR		lpWaveHdrDst;
 
-    TRACE("(%p %p %08lx)\n", wom, lpWaveHdrSrc, dwParam2);
+    TRACE("(%p %p %08x)\n", wom, lpWaveHdrSrc, dwParam2);
 
     if (!wom->hAcmStream)
 	return waveOutPrepareHeader(wom->u.out.hInnerWave, lpWaveHdrSrc, dwParam2);
@@ -400,7 +400,7 @@ static	DWORD	wodPrepare(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2
     TRACE("=> (0)\n");
     return MMSYSERR_NOERROR;
 errCleanUp:
-    TRACE("=> (%ld)\n", dwRet);
+    TRACE("=> (%d)\n", dwRet);
     HeapFree(GetProcessHeap(), 0, ash);
     return dwRet;
 }
@@ -411,7 +411,7 @@ static	DWORD	wodUnprepare(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwPara
     LPWAVEHDR		lpWaveHdrDst;
     DWORD		dwRet1, dwRet2;
 
-    TRACE("(%p %p %08lx)\n", wom, lpWaveHdrSrc, dwParam2);
+    TRACE("(%p %p %08x)\n", wom, lpWaveHdrSrc, dwParam2);
 
     if (!wom->hAcmStream) {
 	return waveOutUnprepareHeader(wom->u.out.hInnerWave, lpWaveHdrSrc, dwParam2);
@@ -432,7 +432,7 @@ static	DWORD	wodGetPosition(WAVEMAPDATA* wom, LPMMTIME lpTime, DWORD dwParam2)
 {
     DWORD       val;
     MMTIME      timepos;
-    TRACE("(%p %p %08lx)\n", wom, lpTime, dwParam2);
+    TRACE("(%p %p %08x)\n", wom, lpTime, dwParam2);
 
     memcpy(&timepos, lpTime, sizeof(timepos));
 
@@ -494,7 +494,7 @@ static	DWORD	wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveC
 {
     static const WCHAR name[] = {'W','i','n','e',' ','w','a','v','e',' ','o','u','t',' ','m','a','p','p','e','r',0};
 
-    TRACE("(%04x %p %p %08lx)\n",wDevID, wom, lpWaveCaps, dwParam2);
+    TRACE("(%04x %p %p %08x)\n",wDevID, wom, lpWaveCaps, dwParam2);
 
     /* if opened low driver, forward message */
     if (WAVEMAP_IsData(wom))
@@ -538,7 +538,7 @@ static	DWORD	wodGetVolume(UINT wDevID, WAVEMAPDATA* wom, LPDWORD lpVol)
 
 static	DWORD	wodSetVolume(UINT wDevID, WAVEMAPDATA* wom, DWORD vol)
 {
-    TRACE("(%04x %p %08lx)\n",wDevID, wom, vol);
+    TRACE("(%04x %p %08x)\n",wDevID, wom, vol);
 
     if (WAVEMAP_IsData(wom))
 	return waveOutSetVolume(wom->u.out.hInnerWave, vol);
@@ -578,7 +578,7 @@ static  DWORD	wodMapperStatus(WAVEMAPDATA* wom, DWORD flags, LPVOID ptr)
     UINT	id;
     DWORD	ret = MMSYSERR_NOTSUPPORTED;
 
-    TRACE("(%p %08lx %p)\n",wom, flags, ptr);
+    TRACE("(%p %08x %p)\n",wom, flags, ptr);
 
     switch (flags) {
     case WAVEOUT_MAPPER_STATUS_DEVICE:
@@ -586,16 +586,16 @@ static  DWORD	wodMapperStatus(WAVEMAPDATA* wom, DWORD flags, LPVOID ptr)
 	*(LPDWORD)ptr = id;
 	break;
     case WAVEOUT_MAPPER_STATUS_MAPPED:
-	FIXME("Unsupported flag=%ld\n", flags);
+	FIXME("Unsupported flag=%d\n", flags);
 	*(LPDWORD)ptr = 0; /* FIXME ?? */
 	break;
     case WAVEOUT_MAPPER_STATUS_FORMAT:
-	FIXME("Unsupported flag=%ld\n", flags);
+	FIXME("Unsupported flag=%d\n", flags);
 	/* ptr points to a WAVEFORMATEX struct - before or after streaming ? */
 	*(LPDWORD)ptr = 0;
 	break;
     default:
-	FIXME("Unsupported flag=%ld\n", flags);
+	FIXME("Unsupported flag=%d\n", flags);
 	*(LPDWORD)ptr = 0;
 	break;
     }
@@ -604,7 +604,7 @@ static  DWORD	wodMapperStatus(WAVEMAPDATA* wom, DWORD flags, LPVOID ptr)
 
 static  DWORD   wodMapperReconfigure(WAVEMAPDATA* wom, DWORD dwParam1, DWORD dwParam2)
 {
-    FIXME("(%p %08lx %08lx) stub!\n", wom, dwParam1, dwParam2);
+    FIXME("(%p %08x %08x) stub!\n", wom, dwParam1, dwParam2);
 
     return MMSYSERR_NOERROR;
 }
@@ -615,7 +615,7 @@ static  DWORD   wodMapperReconfigure(WAVEMAPDATA* wom, DWORD dwParam1, DWORD dwP
 DWORD WINAPI WAVEMAP_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
 				DWORD dwParam1, DWORD dwParam2)
 {
-    TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n",
+    TRACE("(%u, %04X, %08X, %08X, %08X);\n",
 	  wDevID, wMsg, dwUser, dwParam1, dwParam2);
 
     switch (wMsg) {
@@ -664,7 +664,7 @@ static void	CALLBACK widCallback(HWAVEIN hWave, UINT uMsg, DWORD dwInstance,
 {
     WAVEMAPDATA*	wim = (WAVEMAPDATA*)dwInstance;
 
-    TRACE("(%p %u %ld %lx %lx);\n", hWave, uMsg, dwInstance, dwParam1, dwParam2);
+    TRACE("(%p %u %d %x %x);\n", hWave, uMsg, dwInstance, dwParam1, dwParam2);
 
     if (!WAVEMAP_IsData(wim)) {
 	ERR("Bad data\n");
@@ -690,7 +690,7 @@ static void	CALLBACK widCallback(HWAVEIN hWave, UINT uMsg, DWORD dwInstance,
 		ERR("ACM conversion failed\n");
 		return;
 	    } else {
-		TRACE("Converted %ld bytes into %ld\n", ash->cbSrcLengthUsed, ash->cbDstLengthUsed);
+		TRACE("Converted %d bytes into %d\n", ash->cbSrcLengthUsed, ash->cbDstLengthUsed);
 	    }
 	    /* and setup the wavehdr to return accordingly */
 	    lpWaveHdrDst->dwFlags &= ~WHDR_INQUEUE;
@@ -713,7 +713,7 @@ static	DWORD	widOpenHelper(WAVEMAPDATA* wim, UINT idx,
 {
     DWORD	ret;
 
-    TRACE("(%p %04x %p %p %08lx)\n", wim, idx, lpDesc, lpwfx, dwFlags);
+    TRACE("(%p %04x %p %p %08x)\n", wim, idx, lpDesc, lpwfx, dwFlags);
 
     /* source is always PCM, so the formulas below apply */
     lpwfx->nBlockAlign = (lpwfx->nChannels * lpwfx->wBitsPerSample) / 8;
@@ -731,7 +731,7 @@ static	DWORD	widOpenHelper(WAVEMAPDATA* wim, UINT idx,
 	    wim->hAcmStream = 0;
 	}
     }
-    TRACE("ret = %08lx\n", ret);
+    TRACE("ret = %08x\n", ret);
     return ret;
 }
 
@@ -742,7 +742,7 @@ static	DWORD	widOpen(LPDWORD lpdwUser, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
     WAVEMAPDATA*	wim = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEMAPDATA));
     DWORD               res;
 
-    TRACE("(%p %p %08lx)\n", lpdwUser, lpDesc, dwFlags);
+    TRACE("(%p %p %08x)\n", lpdwUser, lpDesc, dwFlags);
 
     if (!wim) {
         WARN("no memory\n");
@@ -849,7 +849,7 @@ found:
     } else {
 	*lpdwUser = (DWORD)wim;
     }
-    TRACE("Ok (stream=%08lx)\n", (DWORD)wim->hAcmStream);
+    TRACE("Ok (stream=%08x)\n", (DWORD)wim->hAcmStream);
     return MMSYSERR_NOERROR;
 error:
     HeapFree(GetProcessHeap(), 0, wim);
@@ -857,7 +857,7 @@ error:
         WARN("ret = WAVERR_BADFORMAT\n");
         return WAVERR_BADFORMAT;
     }
-    WARN("ret = 0x%08lx\n", res);
+    WARN("ret = 0x%08x\n", res);
     return res;
 }
 
@@ -884,7 +884,7 @@ static	DWORD	widAddBuffer(WAVEMAPDATA* wim, LPWAVEHDR lpWaveHdrDst, DWORD dwPara
     PACMSTREAMHEADER	ash;
     LPWAVEHDR		lpWaveHdrSrc;
 
-    TRACE("(%p %p %08lx)\n", wim, lpWaveHdrDst, dwParam2);
+    TRACE("(%p %p %08x)\n", wim, lpWaveHdrDst, dwParam2);
 
     if (!wim->hAcmStream) {
 	return waveInAddBuffer(wim->u.in.hInnerWave, lpWaveHdrDst, dwParam2);
@@ -904,7 +904,7 @@ static	DWORD	widPrepare(WAVEMAPDATA* wim, LPWAVEHDR lpWaveHdrDst, DWORD dwParam2
     DWORD		dwRet;
     LPWAVEHDR		lpWaveHdrSrc;
 
-    TRACE("(%p %p %08lx)\n", wim, lpWaveHdrDst, dwParam2);
+    TRACE("(%p %p %08x)\n", wim, lpWaveHdrDst, dwParam2);
 
     if (!wim->hAcmStream) {
 	return waveInPrepareHeader(wim->u.in.hInnerWave, lpWaveHdrDst, dwParam2);
@@ -954,7 +954,7 @@ static	DWORD	widPrepare(WAVEMAPDATA* wim, LPWAVEHDR lpWaveHdrDst, DWORD dwParam2
     TRACE("=> (0)\n");
     return MMSYSERR_NOERROR;
 errCleanUp:
-    TRACE("=> (%ld)\n", dwRet);
+    TRACE("=> (%d)\n", dwRet);
     HeapFree(GetProcessHeap(), 0, ash);
     return dwRet;
 }
@@ -965,7 +965,7 @@ static	DWORD	widUnprepare(WAVEMAPDATA* wim, LPWAVEHDR lpWaveHdrDst, DWORD dwPara
     LPWAVEHDR		lpWaveHdrSrc;
     DWORD		dwRet1, dwRet2;
 
-    TRACE("(%p %p %08lx)\n", wim, lpWaveHdrDst, dwParam2);
+    TRACE("(%p %p %08x)\n", wim, lpWaveHdrDst, dwParam2);
 
     if (!wim->hAcmStream) {
 	return waveInUnprepareHeader(wim->u.in.hInnerWave, lpWaveHdrDst, dwParam2);
@@ -986,7 +986,7 @@ static	DWORD	widGetPosition(WAVEMAPDATA* wim, LPMMTIME lpTime, DWORD dwParam2)
 {
     DWORD       val;
     MMTIME      timepos;
-    TRACE("(%p %p %08lx)\n", wim, lpTime, dwParam2);
+    TRACE("(%p %p %08x)\n", wim, lpTime, dwParam2);
 
     memcpy(&timepos, lpTime, sizeof(timepos));
 
@@ -1046,7 +1046,7 @@ static	DWORD	widGetPosition(WAVEMAPDATA* wim, LPMMTIME lpTime, DWORD dwParam2)
 
 static	DWORD	widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSW lpWaveCaps, DWORD dwParam2)
 {
-    TRACE("(%04x, %p %p %08lx)\n", wDevID, wim, lpWaveCaps, dwParam2);
+    TRACE("(%04x, %p %p %08x)\n", wDevID, wim, lpWaveCaps, dwParam2);
 
     /* if opened low driver, forward message */
     if (WAVEMAP_IsData(wim))
@@ -1105,7 +1105,7 @@ static  DWORD	widMapperStatus(WAVEMAPDATA* wim, DWORD flags, LPVOID ptr)
     UINT	id;
     DWORD	ret = MMSYSERR_NOTSUPPORTED;
 
-    TRACE("(%p %08lx %p)\n", wim, flags, ptr);
+    TRACE("(%p %08x %p)\n", wim, flags, ptr);
 
     switch (flags) {
     case WAVEIN_MAPPER_STATUS_DEVICE:
@@ -1113,16 +1113,16 @@ static  DWORD	widMapperStatus(WAVEMAPDATA* wim, DWORD flags, LPVOID ptr)
 	*(LPDWORD)ptr = id;
 	break;
     case WAVEIN_MAPPER_STATUS_MAPPED:
-	FIXME("Unsupported yet flag=%ld\n", flags);
+	FIXME("Unsupported yet flag=%d\n", flags);
 	*(LPDWORD)ptr = 0; /* FIXME ?? */
 	break;
     case WAVEIN_MAPPER_STATUS_FORMAT:
-	FIXME("Unsupported flag=%ld\n", flags);
+	FIXME("Unsupported flag=%d\n", flags);
 	/* ptr points to a WAVEFORMATEX struct  - before or after streaming ? */
 	*(LPDWORD)ptr = 0; /* FIXME ?? */
 	break;
     default:
-	FIXME("Unsupported flag=%ld\n", flags);
+	FIXME("Unsupported flag=%d\n", flags);
 	*(LPDWORD)ptr = 0;
 	break;
     }
@@ -1131,7 +1131,7 @@ static  DWORD	widMapperStatus(WAVEMAPDATA* wim, DWORD flags, LPVOID ptr)
 
 static  DWORD   widMapperReconfigure(WAVEMAPDATA* wim, DWORD dwParam1, DWORD dwParam2)
 {
-    FIXME("(%p %08lx %08lx) stub!\n", wim, dwParam1, dwParam2);
+    FIXME("(%p %08x %08x) stub!\n", wim, dwParam1, dwParam2);
 
     return MMSYSERR_NOERROR;
 }
@@ -1142,7 +1142,7 @@ static  DWORD   widMapperReconfigure(WAVEMAPDATA* wim, DWORD dwParam1, DWORD dwP
 DWORD WINAPI WAVEMAP_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
 				DWORD dwParam1, DWORD dwParam2)
 {
-    TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n",
+    TRACE("(%u, %04X, %08X, %08X, %08X);\n",
 	  wDevID, wMsg, dwUser, dwParam1, dwParam2);
 
     switch (wMsg) {