diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
index b1c5688761b..37169e8a29f 100644
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@@ -6,7 +6,6 @@ MODULE    = avifil32.dll
 IMPORTLIB = libavifil32.$(IMPLIBEXT)
 IMPORTS   = msacm32 msvfw32 winmm ole32 user32 advapi32 kernel32
 EXTRALIBS = -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	acmstream.c \
diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c
index 19dc98150da..79f21e26175 100644
--- a/dlls/avifil32/acmstream.c
+++ b/dlls/avifil32/acmstream.c
@@ -151,7 +151,7 @@ static ULONG WINAPI ACMStream_fnAddRef(IAVIStream *iface)
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
   ULONG ref = InterlockedIncrement(&This->ref);
 
-  TRACE("(%p) -> %ld\n", iface, ref);
+  TRACE("(%p) -> %d\n", iface, ref);
 
   /* also add reference to the nested stream */
   if (This->pStream != NULL)
@@ -165,7 +165,7 @@ static ULONG WINAPI ACMStream_fnRelease(IAVIStream* iface)
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
   ULONG ref = InterlockedDecrement(&This->ref);
 
-  TRACE("(%p) -> %ld\n", iface, ref);
+  TRACE("(%p) -> %d\n", iface, ref);
 
   if (ref == 0) {
     /* destruct */
@@ -266,7 +266,7 @@ static HRESULT WINAPI ACMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,%p,%ld)\n", iface, psi, size);
+  TRACE("(%p,%p,%d)\n", iface, psi, size);
 
   if (psi == NULL)
     return AVIERR_BADPARAM;
@@ -293,7 +293,7 @@ static LONG WINAPI ACMStream_fnFindSample(IAVIStream *iface, LONG pos,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,%ld,0x%08lX)\n",iface,pos,flags);
+  TRACE("(%p,%d,0x%08X)\n",iface,pos,flags);
 
   if (flags & FIND_FROM_START) {
     pos = This->sInfo.dwStart;
@@ -321,7 +321,7 @@ static HRESULT WINAPI ACMStream_fnReadFormat(IAVIStream *iface, LONG pos,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,%ld,%p,%p)\n", iface, pos, format, formatsize);
+  TRACE("(%p,%d,%p,%p)\n", iface, pos, format, formatsize);
 
   if (formatsize == NULL)
     return AVIERR_BADPARAM;
@@ -358,7 +358,7 @@ static HRESULT WINAPI ACMStream_fnSetFormat(IAVIStream *iface, LONG pos,
 
   HRESULT hr;
 
-  TRACE("(%p,%ld,%p,%ld)\n", iface, pos, format, formatsize);
+  TRACE("(%p,%d,%p,%d)\n", iface, pos, format, formatsize);
 
   /* check parameters */
   if (format == NULL || formatsize <= 0)
@@ -406,7 +406,7 @@ static HRESULT WINAPI ACMStream_fnRead(IAVIStream *iface, LONG start,
   HRESULT hr;
   DWORD   size;
 
-  TRACE("(%p,%ld,%ld,%p,%ld,%p,%p)\n", iface, start, samples, buffer,
+  TRACE("(%p,%d,%d,%p,%d,%p,%p)\n", iface, start, samples, buffer,
  	buffersize, bytesread, samplesread);
 
   /* clear return parameters if given */
@@ -527,7 +527,7 @@ static HRESULT WINAPI ACMStream_fnWrite(IAVIStream *iface, LONG start,
   HRESULT hr;
   ULONG   size;
 
-  TRACE("(%p,%ld,%ld,%p,%ld,0x%08lX,%p,%p)\n", iface, start, samples,
+  TRACE("(%p,%d,%d,%p,%d,0x%08X,%p,%p)\n", iface, start, samples,
 	buffer, buffersize, flags, sampwritten, byteswritten);
 
   /* clear return parameters if given */
@@ -617,7 +617,7 @@ static HRESULT WINAPI ACMStream_fnDelete(IAVIStream *iface, LONG start,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,%ld,%ld)\n", iface, start, samples);
+  TRACE("(%p,%d,%d)\n", iface, start, samples);
 
   /* check parameters */
   if (start < 0 || samples < 0)
@@ -651,7 +651,7 @@ static HRESULT WINAPI ACMStream_fnReadData(IAVIStream *iface, DWORD fcc,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,0x%08lX,%p,%p)\n", iface, fcc, lp, lpread);
+  TRACE("(%p,0x%08X,%p,%p)\n", iface, fcc, lp, lpread);
 
   assert(This->pStream != NULL);
 
@@ -663,7 +663,7 @@ static HRESULT WINAPI ACMStream_fnWriteData(IAVIStream *iface, DWORD fcc,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,0x%08lx,%p,%ld)\n", iface, fcc, lp, size);
+  TRACE("(%p,0x%08x,%p,%d)\n", iface, fcc, lp, size);
 
   assert(This->pStream != NULL);
 
@@ -673,7 +673,7 @@ static HRESULT WINAPI ACMStream_fnWriteData(IAVIStream *iface, DWORD fcc,
 static HRESULT WINAPI ACMStream_fnSetInfo(IAVIStream *iface,
 					   LPAVISTREAMINFOW info, LONG infolen)
 {
-  FIXME("(%p,%p,%ld): stub\n", iface, info, infolen);
+  FIXME("(%p,%p,%d): stub\n", iface, info, infolen);
 
   return E_FAIL;
 }
diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c
index 182e72fea3e..dacd5a73520 100644
--- a/dlls/avifil32/api.c
+++ b/dlls/avifil32/api.c
@@ -318,7 +318,7 @@ HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile, LPAVIFILEINFOA afi, LONG size)
   AVIFILEINFOW afiw;
   HRESULT      hres;
 
-  TRACE("(%p,%p,%ld)\n", pfile, afi, size);
+  TRACE("(%p,%p,%d)\n", pfile, afi, size);
 
   if (pfile == NULL)
     return AVIERR_BADHANDLE;
@@ -340,7 +340,7 @@ HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile, LPAVIFILEINFOA afi, LONG size)
  */
 HRESULT WINAPI AVIFileInfoW(PAVIFILE pfile, LPAVIFILEINFOW afiw, LONG size)
 {
-  TRACE("(%p,%p,%ld)\n", pfile, afiw, size);
+  TRACE("(%p,%p,%d)\n", pfile, afiw, size);
 
   if (pfile == NULL)
     return AVIERR_BADHANDLE;
@@ -355,7 +355,7 @@ HRESULT WINAPI AVIFileInfoW(PAVIFILE pfile, LPAVIFILEINFOW afiw, LONG size)
 HRESULT WINAPI AVIFileGetStream(PAVIFILE pfile, PAVISTREAM *avis,
 				DWORD fccType, LONG lParam)
 {
-  TRACE("(%p,%p,'%4.4s',%ld)\n", pfile, avis, (char*)&fccType, lParam);
+  TRACE("(%p,%p,'%4.4s',%d)\n", pfile, avis, (char*)&fccType, lParam);
 
   if (pfile == NULL)
     return AVIERR_BADHANDLE;
@@ -406,7 +406,7 @@ HRESULT WINAPI AVIFileCreateStreamW(PAVIFILE pfile, PAVISTREAM *avis,
  */
 HRESULT WINAPI AVIFileWriteData(PAVIFILE pfile,DWORD fcc,LPVOID lp,LONG size)
 {
-  TRACE("(%p,'%4.4s',%p,%ld)\n", pfile, (char*)&fcc, lp, size);
+  TRACE("(%p,'%4.4s',%p,%d)\n", pfile, (char*)&fcc, lp, size);
 
   if (pfile == NULL)
     return AVIERR_BADHANDLE;
@@ -483,7 +483,7 @@ HRESULT WINAPI AVIStreamCreate(PAVISTREAM *ppavi, LONG lParam1, LONG lParam2,
 {
   HRESULT hr;
 
-  TRACE("(%p,0x%08lX,0x%08lX,%s)\n", ppavi, lParam1, lParam2,
+  TRACE("(%p,0x%08X,0x%08X,%s)\n", ppavi, lParam1, lParam2,
 	debugstr_guid(pclsidHandler));
 
   if (ppavi == NULL)
@@ -517,7 +517,7 @@ HRESULT WINAPI AVIStreamInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi,
   AVISTREAMINFOW asiw;
   HRESULT	 hres;
 
-  TRACE("(%p,%p,%ld)\n", pstream, asi, size);
+  TRACE("(%p,%p,%d)\n", pstream, asi, size);
 
   if (pstream == NULL)
     return AVIERR_BADHANDLE;
@@ -540,7 +540,7 @@ HRESULT WINAPI AVIStreamInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi,
 HRESULT WINAPI AVIStreamInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi,
 			      LONG size)
 {
-  TRACE("(%p,%p,%ld)\n", pstream, asi, size);
+  TRACE("(%p,%p,%d)\n", pstream, asi, size);
 
   if (pstream == NULL)
     return AVIERR_BADHANDLE;
@@ -554,7 +554,7 @@ HRESULT WINAPI AVIStreamInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi,
  */
 HRESULT WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, DWORD flags)
 {
-  TRACE("(%p,%ld,0x%lX)\n", pstream, pos, flags);
+  TRACE("(%p,%d,0x%X)\n", pstream, pos, flags);
 
   if (pstream == NULL)
     return -1;
@@ -569,7 +569,7 @@ HRESULT WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, DWORD flags)
 HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM pstream, LONG pos,
 				   LPVOID format, LPLONG formatsize)
 {
-  TRACE("(%p,%ld,%p,%p)\n", pstream, pos, format, formatsize);
+  TRACE("(%p,%d,%p,%p)\n", pstream, pos, format, formatsize);
 
   if (pstream == NULL)
     return AVIERR_BADHANDLE;
@@ -584,7 +584,7 @@ HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM pstream, LONG pos,
 HRESULT WINAPI AVIStreamSetFormat(PAVISTREAM pstream, LONG pos,
 				  LPVOID format, LONG formatsize)
 {
-  TRACE("(%p,%ld,%p,%ld)\n", pstream, pos, format, formatsize);
+  TRACE("(%p,%d,%p,%d)\n", pstream, pos, format, formatsize);
 
   if (pstream == NULL)
     return AVIERR_BADHANDLE;
@@ -600,7 +600,7 @@ HRESULT WINAPI AVIStreamRead(PAVISTREAM pstream, LONG start, LONG samples,
 			     LPVOID buffer, LONG buffersize,
 			     LPLONG bytesread, LPLONG samplesread)
 {
-  TRACE("(%p,%ld,%ld,%p,%ld,%p,%p)\n", pstream, start, samples, buffer,
+  TRACE("(%p,%d,%d,%p,%d,%p,%p)\n", pstream, start, samples, buffer,
 	buffersize, bytesread, samplesread);
 
   if (pstream == NULL)
@@ -618,7 +618,7 @@ HRESULT WINAPI AVIStreamWrite(PAVISTREAM pstream, LONG start, LONG samples,
 			      LPVOID buffer, LONG buffersize, DWORD flags,
 			      LPLONG sampwritten, LPLONG byteswritten)
 {
-  TRACE("(%p,%ld,%ld,%p,%ld,0x%lX,%p,%p)\n", pstream, start, samples, buffer,
+  TRACE("(%p,%d,%d,%p,%d,0x%X,%p,%p)\n", pstream, start, samples, buffer,
 	buffersize, flags, sampwritten, byteswritten);
 
   if (pstream == NULL)
@@ -650,7 +650,7 @@ HRESULT WINAPI AVIStreamReadData(PAVISTREAM pstream, DWORD fcc, LPVOID lp,
 HRESULT WINAPI AVIStreamWriteData(PAVISTREAM pstream, DWORD fcc, LPVOID lp,
 				  LONG size)
 {
-  TRACE("(%p,'%4.4s',%p,%ld)\n", pstream, (char*)&fcc, lp, size);
+  TRACE("(%p,'%4.4s',%p,%d)\n", pstream, (char*)&fcc, lp, size);
 
   if (pstream == NULL)
     return AVIERR_BADHANDLE;
@@ -690,7 +690,7 @@ PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM pstream,
  */
 LPVOID WINAPI AVIStreamGetFrame(PGETFRAME pg, LONG pos)
 {
-  TRACE("(%p,%ld)\n", pg, pos);
+  TRACE("(%p,%d)\n", pg, pos);
 
   if (pg == NULL)
     return NULL;
@@ -793,7 +793,7 @@ HRESULT WINAPI AVIStreamOpenFromFileA(PAVISTREAM *ppavi, LPCSTR szFile,
   PAVIFILE pfile = NULL;
   HRESULT  hr;
 
-  TRACE("(%p,%s,'%4.4s',%ld,0x%X,%s)\n", ppavi, debugstr_a(szFile),
+  TRACE("(%p,%s,'%4.4s',%d,0x%X,%s)\n", ppavi, debugstr_a(szFile),
 	(char*)&fccType, lParam, mode, debugstr_guid(pclsidHandler));
 
   if (ppavi == NULL || szFile == NULL)
@@ -821,7 +821,7 @@ HRESULT WINAPI AVIStreamOpenFromFileW(PAVISTREAM *ppavi, LPCWSTR szFile,
   PAVIFILE pfile = NULL;
   HRESULT  hr;
 
-  TRACE("(%p,%s,'%4.4s',%ld,0x%X,%s)\n", ppavi, debugstr_w(szFile),
+  TRACE("(%p,%s,'%4.4s',%d,0x%X,%s)\n", ppavi, debugstr_w(szFile),
 	(char*)&fccType, lParam, mode, debugstr_guid(pclsidHandler));
 
   if (ppavi == NULL || szFile == NULL)
@@ -847,7 +847,7 @@ LONG WINAPI AVIStreamBeginStreaming(PAVISTREAM pavi, LONG lStart, LONG lEnd, LON
   IAVIStreaming* pstream = NULL;
   HRESULT hr;
 
-  TRACE("(%p,%ld,%ld,%ld)\n", pavi, lStart, lEnd, lRate);
+  TRACE("(%p,%d,%d,%d)\n", pavi, lStart, lEnd, lRate);
 
   if (pavi == NULL)
     return AVIERR_BADHANDLE;
@@ -928,7 +928,7 @@ LONG WINAPI AVIStreamSampleToTime(PAVISTREAM pstream, LONG lSample)
   AVISTREAMINFOW asiw;
   LONG time;
 
-  TRACE("(%p,%ld)\n", pstream, lSample);
+  TRACE("(%p,%d)\n", pstream, lSample);
 
   if (pstream == NULL)
     return -1;
@@ -949,7 +949,7 @@ LONG WINAPI AVIStreamSampleToTime(PAVISTREAM pstream, LONG lSample)
   else
     time = (LONG)(((float)lSample * asiw.dwScale * 1000 + (asiw.dwRate - 1)) / asiw.dwRate);
 
-  TRACE(" -> %ld\n",time);
+  TRACE(" -> %d\n",time);
   return time;
 }
 
@@ -962,7 +962,7 @@ LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime)
   AVISTREAMINFOW asiw;
   ULONG sample;
 
-  TRACE("(%p,%ld)\n", pstream, lTime);
+  TRACE("(%p,%d)\n", pstream, lTime);
 
   if (pstream == NULL || lTime < 0)
     return -1;
@@ -983,7 +983,7 @@ LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime)
   if (sample > asiw.dwStart + asiw.dwLength)
     sample = asiw.dwStart + asiw.dwLength;
 
-  TRACE(" -> %ld\n", sample);
+  TRACE(" -> %d\n", sample);
   return sample;
 }
 
@@ -997,7 +997,7 @@ HRESULT WINAPI AVIBuildFilterA(LPSTR szFilter, LONG cbFilter, BOOL fSaving)
   LPWSTR  wszFilter;
   HRESULT hr;
 
-  TRACE("(%p,%ld,%d)\n", szFilter, cbFilter, fSaving);
+  TRACE("(%p,%d,%d)\n", szFilter, cbFilter, fSaving);
 
   /* check parameters */
   if (szFilter == NULL)
@@ -1042,7 +1042,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
   LONG       size;
   DWORD      count = 0;
 
-  TRACE("(%p,%ld,%d)\n", szFilter, cbFilter, fSaving);
+  TRACE("(%p,%d,%d)\n", szFilter, cbFilter, fSaving);
 
   /* check parameters */
   if (szFilter == NULL)
@@ -1287,7 +1287,7 @@ static BOOL AVISaveOptionsFmtChoose(HWND hWnd)
     HeapFree(GetProcessHeap(), 0, afmtc.pwfxEnum);
     return (ret == S_OK ? TRUE : FALSE);
   } else {
-    ERR(": unknown streamtype 0x%08lX\n", sInfo.fccType);
+    ERR(": unknown streamtype 0x%08X\n", sInfo.fccType);
     return FALSE;
   }
 }
@@ -1663,7 +1663,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler,
 	lFirstVideo = curStream;
     } else if (!dwInterleave && plpOptions != NULL) {
       /* check if any non-video stream wants to be interleaved */
-      WARN("options.flags=0x%lX options.dwInterleave=%lu\n",plpOptions[curStream]->dwFlags,plpOptions[curStream]->dwInterleaveEvery);
+      WARN("options.flags=0x%X options.dwInterleave=%u\n",plpOptions[curStream]->dwFlags,plpOptions[curStream]->dwInterleaveEvery);
       if (plpOptions[curStream] != NULL &&
 	  plpOptions[curStream]->dwFlags & AVICOMPRESSF_INTERLEAVE)
 	dwInterleave = plpOptions[curStream]->dwInterleaveEvery;
@@ -1841,7 +1841,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler,
 	}
 
 	/* copy needed samples now */
-	WARN("copy from stream %d samples %ld to %ld...\n",curStream,
+	WARN("copy from stream %d samples %d to %d...\n",curStream,
 	      lStart[curStream],lFirstVideo);
 	while (lFirstVideo > lStart[curStream]) {
 	  DWORD flags = 0;
@@ -2153,7 +2153,7 @@ HRESULT WINAPI EditStreamPaste(PAVISTREAM pDest, LONG *plStart, LONG *plLength,
   PAVIEDITSTREAM pEdit = NULL;
   HRESULT        hr;
 
-  TRACE("(%p,%p,%p,%p,%ld,%ld)\n", pDest, plStart, plLength,
+  TRACE("(%p,%p,%p,%p,%d,%d)\n", pDest, plStart, plLength,
 	pSource, lStart, lEnd);
 
   if (pDest == NULL || pSource == NULL)
@@ -2180,7 +2180,7 @@ HRESULT WINAPI EditStreamSetInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi,
 {
   AVISTREAMINFOW asiw;
 
-  TRACE("(%p,%p,%ld)\n", pstream, asi, size);
+  TRACE("(%p,%p,%d)\n", pstream, asi, size);
 
   if (pstream == NULL)
     return AVIERR_BADHANDLE;
@@ -2203,7 +2203,7 @@ HRESULT WINAPI EditStreamSetInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi,
   PAVIEDITSTREAM pEdit = NULL;
   HRESULT        hr;
 
-  TRACE("(%p,%p,%ld)\n", pstream, asi, size);
+  TRACE("(%p,%p,%d)\n", pstream, asi, size);
 
   hr = IAVIStream_QueryInterface(pstream, &IID_IAVIEditStream,(LPVOID*)&pEdit);
   if (SUCCEEDED(hr) && pEdit != NULL) {
diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
index 180562349db..861aa597fc4 100644
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -283,7 +283,7 @@ static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile *iface)
   IAVIFileImpl *This = (IAVIFileImpl *)iface;
   ULONG ref = InterlockedIncrement(&This->ref);
 
-  TRACE("(%p) -> %ld\n", iface, ref);
+  TRACE("(%p) -> %d\n", iface, ref);
 
   return ref;
 }
@@ -294,7 +294,7 @@ static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface)
   UINT i;
   ULONG ref = InterlockedDecrement(&This->ref);
 
-  TRACE("(%p) -> %ld\n", iface, ref);
+  TRACE("(%p) -> %d\n", iface, ref);
 
   if (!ref) {
     if (This->fDirty) {
@@ -305,7 +305,7 @@ static ULONG WINAPI IAVIFile_fnRelease(IAVIFile *iface)
     for (i = 0; i < This->fInfo.dwStreams; i++) {
       if (This->ppStreams[i] != NULL) {
 	if (This->ppStreams[i]->ref != 0) {
-	  ERR(": someone has still %lu reference to stream %u (%p)!\n",
+          ERR(": someone has still %u reference to stream %u (%p)!\n",
 	       This->ppStreams[i]->ref, i, This->ppStreams[i]);
 	}
 	AVIFILE_DestructAVIStream(This->ppStreams[i]);
@@ -344,7 +344,7 @@ static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, LPAVIFILEINFOW afi,
 {
   IAVIFileImpl *This = (IAVIFileImpl *)iface;
 
-  TRACE("(%p,%p,%ld)\n",iface,afi,size);
+  TRACE("(%p,%p,%d)\n",iface,afi,size);
 
   if (afi == NULL)
     return AVIERR_BADPARAM;
@@ -367,7 +367,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis,
 
   ULONG nStream;
 
-  TRACE("(%p,%p,0x%08lX,%ld)\n", iface, avis, fccType, lParam);
+  TRACE("(%p,%p,0x%08X,%d)\n", iface, avis, fccType, lParam);
 
   if (avis == NULL || lParam < 0)
     return AVIERR_BADPARAM;
@@ -446,7 +446,7 @@ static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid,
 {
   IAVIFileImpl *This = (IAVIFileImpl *)iface;
 
-  TRACE("(%p,0x%08lX,%p,%ld)\n", iface, ckid, lpData, size);
+  TRACE("(%p,0x%08X,%p,%d)\n", iface, ckid, lpData, size);
 
   /* check parameters */
   if (lpData == NULL)
@@ -468,7 +468,7 @@ static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid,
 {
   IAVIFileImpl *This = (IAVIFileImpl *)iface;
 
-  TRACE("(%p,0x%08lX,%p,%p)\n", iface, ckid, lpData, size);
+  TRACE("(%p,0x%08X,%p,%p)\n", iface, ckid, lpData, size);
 
   return ReadExtraChunk(&This->fileextra, ckid, lpData, size);
 }
@@ -521,7 +521,7 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType,
 
   ULONG nStream;
 
-  TRACE("(%p,0x%08lX,%ld)\n", iface, fccType, lParam);
+  TRACE("(%p,0x%08X,%d)\n", iface, fccType, lParam);
 
   /* check parameter */
   if (lParam < 0)
@@ -614,7 +614,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface,
 
   int len;
 
-  TRACE("(%p,%s,0x%08lX)\n", iface, debugstr_w(pszFileName), dwMode);
+  TRACE("(%p,%s,0x%08X)\n", iface, debugstr_w(pszFileName), dwMode);
 
   /* check parameter */
   if (pszFileName == NULL)
@@ -738,7 +738,7 @@ static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface)
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
   ULONG ref = InterlockedIncrement(&This->ref);
 
-  TRACE("(%p) -> %ld\n", iface, ref);
+  TRACE("(%p) -> %d\n", iface, ref);
 
   /* also add ref to parent, so that it doesn't kill us */
   if (This->paf != NULL)
@@ -752,7 +752,7 @@ static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface)
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
   ULONG ref = InterlockedDecrement(&This->ref);
 
-  TRACE("(%p) -> %ld\n", iface, ref);
+  TRACE("(%p) -> %d\n", iface, ref);
 
   if (This->paf != NULL)
     IAVIFile_Release((PAVIFILE)This->paf);
@@ -774,7 +774,7 @@ static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,%p,%ld)\n", iface, psi, size);
+  TRACE("(%p,%p,%d)\n", iface, psi, size);
 
   if (psi == NULL)
     return AVIERR_BADPARAM;
@@ -795,7 +795,7 @@ static LONG WINAPI IAVIStream_fnFindSample(IAVIStream *iface, LONG pos,
 
   LONG offset = 0;
 
-  TRACE("(%p,%ld,0x%08lX)\n",iface,pos,flags);
+  TRACE("(%p,%d,0x%08X)\n",iface,pos,flags);
 
   if (flags & FIND_FROM_START) {
     pos = This->sInfo.dwStart;
@@ -893,7 +893,7 @@ static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,%ld,%p,%p)\n", iface, pos, format, formatsize);
+  TRACE("(%p,%d,%p,%p)\n", iface, pos, format, formatsize);
 
   if (formatsize == NULL)
     return AVIERR_BADPARAM;
@@ -919,7 +919,7 @@ static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos,
 
     lLastFmt = IAVIStream_fnFindSample(iface, pos, FIND_FORMAT|FIND_PREV);
     if (lLastFmt > 0) {
-      FIXME(": need to read formatchange for %ld -- unimplemented!\n",lLastFmt);
+      FIXME(": need to read formatchange for %d -- unimplemented!\n",lLastFmt);
     }
   }
 
@@ -934,7 +934,7 @@ static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos,
 
   LPBITMAPINFOHEADER lpbiNew = (LPBITMAPINFOHEADER)format;
 
-  TRACE("(%p,%ld,%p,%ld)\n", iface, pos, format, formatsize);
+  TRACE("(%p,%d,%p,%d)\n", iface, pos, format, formatsize);
 
   /* check parameters */
   if (format == NULL || formatsize <= 0)
@@ -1045,7 +1045,7 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start,
   DWORD    size;
   HRESULT  hr;
 
-  TRACE("(%p,%ld,%ld,%p,%ld,%p,%p)\n", iface, start, samples, buffer,
+  TRACE("(%p,%d,%d,%p,%d,%p,%p)\n", iface, start, samples, buffer,
  	buffersize, bytesread, samplesread);
 
   /* clear return parameters if given */
@@ -1156,7 +1156,7 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start,
   FOURCC  ckid;
   HRESULT hr;
 
-  TRACE("(%p,%ld,%ld,%p,%ld,0x%08lX,%p,%p)\n", iface, start, samples,
+  TRACE("(%p,%d,%d,%p,%d,0x%08X,%p,%p)\n", iface, start, samples,
 	buffer, buffersize, flags, sampwritten, byteswritten);
 
   /* clear return parameters if given */
@@ -1244,7 +1244,7 @@ static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  FIXME("(%p,%ld,%ld): stub\n", iface, start, samples);
+  FIXME("(%p,%d,%d): stub\n", iface, start, samples);
 
   /* check parameters */
   if (start < 0 || samples < 0)
@@ -1283,7 +1283,7 @@ static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream *iface, DWORD fcc,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,0x%08lX,%p,%p)\n", iface, fcc, lp, lpread);
+  TRACE("(%p,0x%08X,%p,%p)\n", iface, fcc, lp, lpread);
 
   if (fcc == ckidSTREAMHANDLERDATA) {
     if (This->lpHandlerData != NULL && This->cbHandlerData > 0) {
@@ -1307,7 +1307,7 @@ static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,0x%08lx,%p,%ld)\n", iface, fcc, lp, size);
+  TRACE("(%p,0x%08x,%p,%d)\n", iface, fcc, lp, size);
 
   /* check parameters */
   if (lp == NULL)
@@ -1353,7 +1353,7 @@ static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc,
 static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream *iface,
 					   LPAVISTREAMINFOW info, LONG infolen)
 {
-  FIXME("(%p,%p,%ld): stub\n", iface, info, infolen);
+  FIXME("(%p,%p,%d): stub\n", iface, info, infolen);
 
   return E_FAIL;
 }
@@ -1625,7 +1625,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This)
     return hr;
 
   if (ck.cksize != sizeof(MainAVIHdr)) {
-    ERR(": invalid size of %ld for MainAVIHeader!\n", ck.cksize);
+    ERR(": invalid size of %d for MainAVIHeader!\n", ck.cksize);
     return AVIERR_BADFORMAT;
   }
   if (mmioRead(This->hmmio, (HPSTR)&MainAVIHdr, ck.cksize) != ck.cksize)
@@ -1633,7 +1633,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This)
 
   /* check for MAX_AVISTREAMS limit */
   if (MainAVIHdr.dwStreams > MAX_AVISTREAMS) {
-    WARN("file contains %lu streams, but only supports %d -- change MAX_AVISTREAMS!\n", MainAVIHdr.dwStreams, MAX_AVISTREAMS);
+    WARN("file contains %u streams, but only supports %d -- change MAX_AVISTREAMS!\n", MainAVIHdr.dwStreams, MAX_AVISTREAMS);
     return AVIERR_UNSUPPORTED;
   }
 
@@ -1811,7 +1811,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This)
 	case mmioFOURCC('p','a','d','d'):
 	  break;
 	default:
-	  WARN(": found extra chunk 0x%08lX\n", ck.ckid);
+          WARN(": found extra chunk 0x%08X\n", ck.ckid);
 	  hr = ReadChunkIntoExtra(&pStream->extra, This->hmmio, &ck);
 	  if (FAILED(hr))
 	    return hr;
@@ -1969,7 +1969,7 @@ static HRESULT AVIFILE_LoadIndex(IAVIFileImpl *This, DWORD size, DWORD offset)
 
     if (pStream->sInfo.dwSampleSize == 0 &&
 	pStream->sInfo.dwLength != pStream->lLastFrame+1)
-      ERR("stream %lu length mismatch: dwLength=%lu found=%ld\n",
+      ERR("stream %u length mismatch: dwLength=%u found=%d\n",
 	   n, pStream->sInfo.dwLength, pStream->lLastFrame);
   }
 
@@ -2047,11 +2047,11 @@ static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD pos,
     /* check if it was the correct block which we have read */
     if (This->lpBuffer[0] != This->idxFrames[pos].ckid ||
 	This->lpBuffer[1] != This->idxFrames[pos].dwChunkLength) {
-      ERR(": block %ld not found at 0x%08lX\n", pos, This->idxFrames[pos].dwChunkOffset);
-      ERR(": Index says: '%4.4s'(0x%08lX) size 0x%08lX\n",
+      ERR(": block %d not found at 0x%08X\n", pos, This->idxFrames[pos].dwChunkOffset);
+      ERR(": Index says: '%4.4s'(0x%08X) size 0x%08X\n",
 	  (char*)&This->idxFrames[pos].ckid, This->idxFrames[pos].ckid,
 	  This->idxFrames[pos].dwChunkLength);
-      ERR(": Data  says: '%4.4s'(0x%08lX) size 0x%08lX\n",
+      ERR(": Data  says: '%4.4s'(0x%08X) size 0x%08X\n",
 	  (char*)&This->lpBuffer[0], This->lpBuffer[0], This->lpBuffer[1]);
       return AVIERR_FILEREAD;
     }
diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c
index 899014f6863..53c6b9439a3 100644
--- a/dlls/avifil32/editstream.c
+++ b/dlls/avifil32/editstream.c
@@ -210,7 +210,7 @@ static HRESULT AVIFILE_FindStreamInTable(IAVIEditStreamImpl* const This,
 {
   DWORD n;
 
-  TRACE("(%p,%lu,%p,%p,%p,%d)\n",This,pos,ppStream,streamPos,
+  TRACE("(%p,%u,%p,%p,%p,%d)\n",This,pos,ppStream,streamPos,
         streamNr,bFindSample);
 
   if (pos < This->sInfo.dwStart)
@@ -234,7 +234,7 @@ static HRESULT AVIFILE_FindStreamInTable(IAVIEditStreamImpl* const This,
     if (streamNr != NULL)
       *streamNr = n;
 
-    TRACE(" -- pos=0 && b=1 -> (%p,%lu,%lu)\n",*ppStream, *streamPos, n);
+    TRACE(" -- pos=0 && b=1 -> (%p,%u,%u)\n",*ppStream, *streamPos, n);
     return AVIERR_OK;
   } else {
     *ppStream = NULL;
@@ -252,7 +252,7 @@ static LPVOID AVIFILE_ReadFrame(IAVIEditStreamImpl* const This,
 {
   PGETFRAME pg;
 
-  TRACE("(%p,%p,%ld)\n",This,pstream,pos);
+  TRACE("(%p,%p,%d)\n",This,pstream,pos);
 
   if (pstream == NULL)
     return NULL;
@@ -380,7 +380,7 @@ static ULONG   WINAPI IAVIEditStream_fnAddRef(IAVIEditStream*iface)
   IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface;
   ULONG ref = InterlockedIncrement(&This->ref);
 
-  TRACE("(%p) -> %ld\n", iface, ref);
+  TRACE("(%p) -> %d\n", iface, ref);
 
   return ref;
 }
@@ -391,7 +391,7 @@ static ULONG   WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface)
   DWORD i;
   ULONG ref = InterlockedDecrement(&This->ref);
 
-  TRACE("(%p) -> %ld\n", iface, ref);
+  TRACE("(%p) -> %d\n", iface, ref);
 
   if (!ref) {
     /* release memory */
@@ -552,7 +552,7 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart,
   DWORD               startPos, endPos, streamNr, nStreams;
   ULONG               n;
 
-  TRACE("(%p,%p,%p,%p,%ld,%ld)\n",iface,plStart,plLength,
+  TRACE("(%p,%p,%p,%p,%d,%d)\n",iface,plStart,plLength,
 	pSource,lStart,lLength);
 
   if (pSource == NULL)
@@ -774,7 +774,7 @@ static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface,
 {
   IAVIEditStreamImpl *This = (IAVIEditStreamImpl *)iface;
 
-  TRACE("(%p,%p,%ld)\n",iface,asi,size);
+  TRACE("(%p,%p,%d)\n",iface,asi,size);
 
   /* check parameters */
   if (asi == NULL)
@@ -860,7 +860,7 @@ static HRESULT WINAPI IEditAVIStream_fnInfo(IAVIStream*iface,
 {
   IEditAVIStreamImpl *This = (IEditAVIStreamImpl *)iface;
 
-  TRACE("(%p,%p,%ld)\n",iface,psi,size);
+  TRACE("(%p,%p,%d)\n",iface,psi,size);
 
   assert(This->pae != NULL);
 
@@ -886,7 +886,7 @@ static LONG    WINAPI IEditAVIStream_fnFindSample(IAVIStream*iface,LONG pos,
   PAVISTREAM stream;
   DWORD      streamPos, streamNr;
 
-  TRACE("(%p,%ld,0x%08lX)\n",iface,pos,flags);
+  TRACE("(%p,%d,0x%08X)\n",iface,pos,flags);
 
   if (flags & FIND_FROM_START)
     pos = (LONG)This->sInfo.dwStart;
@@ -923,7 +923,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,
   DWORD               n;
   HRESULT             hr;
 
-  TRACE("(%p,%ld,%p,%p)\n",iface,pos,format,fmtsize);
+  TRACE("(%p,%d,%p,%p)\n",iface,pos,format,fmtsize);
 
   if (fmtsize == NULL || pos < This->sInfo.dwStart ||
       This->sInfo.dwStart + This->sInfo.dwLength <= pos)
@@ -957,7 +957,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,
 static HRESULT WINAPI IEditAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,
                                                  LPVOID format,LONG formatsize)
 {
-  TRACE("(%p,%ld,%p,%ld)\n",iface,pos,format,formatsize);
+  TRACE("(%p,%d,%p,%d)\n",iface,pos,format,formatsize);
 
   return AVIERR_UNSUPPORTED;
 }
@@ -973,7 +973,7 @@ static HRESULT WINAPI IEditAVIStream_fnRead(IAVIStream*iface,LONG start,
   LONG    readBytes, readSamples, count;
   HRESULT hr;
 
-  TRACE("(%p,%ld,%ld,%p,%ld,%p,%p) -- 0x%08lX\n",iface,start,samples,
+  TRACE("(%p,%d,%d,%p,%d,%p,%p) -- 0x%08X\n",iface,start,samples,
         buffer,buffersize,bytesread,samplesread,This->sInfo.fccType);
 
   /* check parameters */
@@ -1063,7 +1063,7 @@ static HRESULT WINAPI IEditAVIStream_fnWrite(IAVIStream*iface,LONG start,
                                              LONG buffersize,DWORD flags,
                                              LONG*sampwritten,LONG*byteswritten)
 {
-  TRACE("(%p,%ld,%ld,%p,%ld,0x%08lX,%p,%p)\n",iface,start,samples,buffer,
+  TRACE("(%p,%d,%d,%p,%d,0x%08X,%p,%p)\n",iface,start,samples,buffer,
         buffersize,flags,sampwritten,byteswritten);
 
   /* be sure return parameters have correct values */
@@ -1080,7 +1080,7 @@ static HRESULT WINAPI IEditAVIStream_fnDelete(IAVIStream*iface,LONG start,
 {
   IEditAVIStreamImpl *This = (IEditAVIStreamImpl *)iface;
 
-  TRACE("(%p,%ld,%ld)\n",iface,start,samples);
+  TRACE("(%p,%d,%d)\n",iface,start,samples);
 
   return IAVIEditStream_Cut((IAVIEditStream*)This->pae,&start,&samples,NULL);
 }
@@ -1091,7 +1091,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,
   IAVIEditStreamImpl* const This = ((IEditAVIStreamImpl* const)iface)->pae;
   DWORD n;
 
-  TRACE("(%p,0x%08lX,%p,%p)\n",iface,fcc,lp,lpread);
+  TRACE("(%p,0x%08X,%p,%p)\n",iface,fcc,lp,lpread);
 
   /* check parameters */
   if (lp == NULL || lpread == NULL)
@@ -1112,7 +1112,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,
 static HRESULT WINAPI IEditAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,
                                                  LPVOID lp,LONG size)
 {
-  TRACE("(%p,0x%08lX,%p,%ld)\n",iface,fcc,lp,size);
+  TRACE("(%p,0x%08X,%p,%d)\n",iface,fcc,lp,size);
 
   return AVIERR_UNSUPPORTED;
 }
@@ -1122,7 +1122,7 @@ static HRESULT WINAPI IEditAVIStream_fnSetInfo(IAVIStream*iface,
 {
   IEditAVIStreamImpl *This = (IEditAVIStreamImpl *)iface;
 
-  TRACE("(%p,%p,%ld)\n",iface,info,len);
+  TRACE("(%p,%p,%d)\n",iface,info,len);
 
   return IAVIEditStream_SetInfo((IAVIEditStream*)This->pae,info,len);
 }
diff --git a/dlls/avifil32/extrachunk.c b/dlls/avifil32/extrachunk.c
index 573dda3116d..ec7ba7036e5 100644
--- a/dlls/avifil32/extrachunk.c
+++ b/dlls/avifil32/extrachunk.c
@@ -155,7 +155,7 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck,
   assert(hmmio != NULL);
   assert(lpck  != NULL);
 
-  TRACE("({%p,%lu},%p,%p,%p,0x%X)\n", extra->lp, extra->cb, hmmio, lpck,
+  TRACE("({%p,%u},%p,%p,%p,0x%X)\n", extra->lp, extra->cb, hmmio, lpck,
 	lpckParent, flags);
 
   /* what chunk id and form/list type should we search? */
@@ -171,7 +171,7 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck,
   } else
     ckid = fccType = (FOURCC)-1; /* collect everything into extra! */
 
-  TRACE(": find ckid=0x%08lX fccType=0x%08lX\n", ckid, fccType);
+  TRACE(": find ckid=0x%08X fccType=0x%08X\n", ckid, fccType);
 
   for (;;) {
     hr = mmioDescend(hmmio, lpck, lpckParent, 0);
diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c
index 817c79af003..6b426fe0a69 100644
--- a/dlls/avifil32/factory.c
+++ b/dlls/avifil32/factory.c
@@ -207,7 +207,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
  */
 BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved)
 {
-  TRACE("(%p,%ld,%p)\n", hInstDll, fdwReason, lpvReserved);
+  TRACE("(%p,%d,%p)\n", hInstDll, fdwReason, lpvReserved);
 
   switch (fdwReason) {
   case DLL_PROCESS_ATTACH:
diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c
index 172a0b08c2c..42838cd2311 100644
--- a/dlls/avifil32/getframe.c
+++ b/dlls/avifil32/getframe.c
@@ -187,7 +187,7 @@ static LPVOID  WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos)
   LONG readBytes;
   LONG readSamples;
 
-  TRACE("(%p,%ld)\n", iface, lPos);
+  TRACE("(%p,%d)\n", iface, lPos);
 
   /* We don't want negative start values! -- marks invalid buffer content */
   if (lPos < 0)
@@ -303,7 +303,7 @@ static HRESULT WINAPI IGetFrame_fnBegin(IGetFrame *iface, LONG lStart,
 {
   IGetFrameImpl *This = (IGetFrameImpl *)iface;
 
-  TRACE("(%p,%ld,%ld,%ld)\n", iface, lStart, lEnd, lRate);
+  TRACE("(%p,%d,%d,%d)\n", iface, lStart, lEnd, lRate);
 
   This->bFixedStream = TRUE;
 
diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c
index af71fc43d08..6065c554381 100644
--- a/dlls/avifil32/icmstream.c
+++ b/dlls/avifil32/icmstream.c
@@ -164,7 +164,7 @@ static ULONG WINAPI ICMStream_fnAddRef(IAVIStream *iface)
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
   ULONG ref = InterlockedIncrement(&This->ref);
 
-  TRACE("(%p) -> %ld\n", iface, ref);
+  TRACE("(%p) -> %d\n", iface, ref);
 
   /* also add reference to the nested stream */
   if (This->pStream != NULL)
@@ -178,7 +178,7 @@ static ULONG WINAPI ICMStream_fnRelease(IAVIStream* iface)
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
   ULONG ref = InterlockedDecrement(&This->ref);
 
-  TRACE("(%p) -> %ld\n", iface, ref);
+  TRACE("(%p) -> %d\n", iface, ref);
 
   if (ref == 0) {
     /* destruct */
@@ -325,7 +325,7 @@ static HRESULT WINAPI ICMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,%p,%ld)\n", iface, psi, size);
+  TRACE("(%p,%p,%d)\n", iface, psi, size);
 
   if (psi == NULL)
     return AVIERR_BADPARAM;
@@ -344,7 +344,7 @@ static LONG WINAPI ICMStream_fnFindSample(IAVIStream *iface, LONG pos,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,%ld,0x%08lX)\n",iface,pos,flags);
+  TRACE("(%p,%d,0x%08X)\n",iface,pos,flags);
 
   if (flags & FIND_FROM_START) {
     pos = This->sInfo.dwStart;
@@ -384,7 +384,7 @@ static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream *iface, LONG pos,
   LPBITMAPINFOHEADER lpbi;
   HRESULT            hr;
 
-  TRACE("(%p,%ld,%p,%p)\n", iface, pos, format, formatsize);
+  TRACE("(%p,%d,%p,%p)\n", iface, pos, format, formatsize);
 
   if (formatsize == NULL)
     return AVIERR_BADPARAM;
@@ -432,7 +432,7 @@ static HRESULT WINAPI ICMStream_fnSetFormat(IAVIStream *iface, LONG pos,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,%ld,%p,%ld)\n", iface, pos, format, formatsize);
+  TRACE("(%p,%d,%p,%d)\n", iface, pos, format, formatsize);
 
   /* check parameters */
   if (format == NULL || formatsize <= 0)
@@ -586,7 +586,7 @@ static HRESULT WINAPI ICMStream_fnRead(IAVIStream *iface, LONG start,
 
   LPBITMAPINFOHEADER lpbi;
 
-  TRACE("(%p,%ld,%ld,%p,%ld,%p,%p)\n", iface, start, samples, buffer,
+  TRACE("(%p,%d,%d,%p,%d,%p,%p)\n", iface, start, samples, buffer,
  	buffersize, bytesread, samplesread);
 
   /* clear return parameters if given */
@@ -680,7 +680,7 @@ static HRESULT WINAPI ICMStream_fnWrite(IAVIStream *iface, LONG start,
 
   HRESULT hr;
 
-  TRACE("(%p,%ld,%ld,%p,%ld,0x%08lX,%p,%p)\n", iface, start, samples,
+  TRACE("(%p,%d,%d,%p,%d,0x%08X,%p,%p)\n", iface, start, samples,
 	buffer, buffersize, flags, sampwritten, byteswritten);
 
   /* clear return parameters if given */
@@ -723,7 +723,7 @@ static HRESULT WINAPI ICMStream_fnDelete(IAVIStream *iface, LONG start,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,%ld,%ld)\n", iface, start, samples);
+  TRACE("(%p,%d,%d)\n", iface, start, samples);
 
   return IAVIStream_Delete(This->pStream, start, samples);
 }
@@ -733,7 +733,7 @@ static HRESULT WINAPI ICMStream_fnReadData(IAVIStream *iface, DWORD fcc,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,0x%08lX,%p,%p)\n", iface, fcc, lp, lpread);
+  TRACE("(%p,0x%08X,%p,%p)\n", iface, fcc, lp, lpread);
 
   assert(This->pStream != NULL);
 
@@ -745,7 +745,7 @@ static HRESULT WINAPI ICMStream_fnWriteData(IAVIStream *iface, DWORD fcc,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,0x%08lx,%p,%ld)\n", iface, fcc, lp, size);
+  TRACE("(%p,0x%08x,%p,%d)\n", iface, fcc, lp, size);
 
   assert(This->pStream != NULL);
 
@@ -755,7 +755,7 @@ static HRESULT WINAPI ICMStream_fnWriteData(IAVIStream *iface, DWORD fcc,
 static HRESULT WINAPI ICMStream_fnSetInfo(IAVIStream *iface,
 					   LPAVISTREAMINFOW info, LONG infolen)
 {
-  FIXME("(%p,%p,%ld): stub\n", iface, info, infolen);
+  FIXME("(%p,%p,%d): stub\n", iface, info, infolen);
 
   return E_FAIL;
 }
@@ -862,7 +862,7 @@ static HRESULT AVIFILE_EncodeFrame(IAVIStreamImpl *This,
       if (bDecreasedQual || dwCurQual == This->dwLastQuality)
 	dwCurQual = (dwMinQual + dwMaxQual) / 2;
       else
-	FIXME(": no new quality computed min=%lu cur=%lu max=%lu last=%lu\n",
+	FIXME(": no new quality computed min=%u cur=%u max=%u last=%u\n",
 	      dwMinQual, dwCurQual, dwMaxQual, This->dwLastQuality);
 
       bDecreasedQual = TRUE;
diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c
index 1bac19e2fc5..ddfdc59422f 100644
--- a/dlls/avifil32/tmpfile.c
+++ b/dlls/avifil32/tmpfile.c
@@ -153,7 +153,7 @@ static ULONG   WINAPI ITmpFile_fnAddRef(IAVIFile *iface)
   ITmpFileImpl *This = (ITmpFileImpl *)iface;
   ULONG ref = InterlockedIncrement(&This->ref);
 
-  TRACE("(%p) -> %ld\n", iface, ref);
+  TRACE("(%p) -> %d\n", iface, ref);
 
   return ref;
 }
@@ -163,7 +163,7 @@ static ULONG   WINAPI ITmpFile_fnRelease(IAVIFile *iface)
   ITmpFileImpl *This = (ITmpFileImpl *)iface;
   ULONG ref = InterlockedDecrement(&This->ref);
 
-  TRACE("(%p) -> %ld\n", iface, ref);
+  TRACE("(%p) -> %d\n", iface, ref);
 
   if (!ref) {
     unsigned int i;
@@ -188,7 +188,7 @@ static HRESULT WINAPI ITmpFile_fnInfo(IAVIFile *iface,
 {
   ITmpFileImpl *This = (ITmpFileImpl *)iface;
 
-  TRACE("(%p,%p,%ld)\n",iface,afi,size);
+  TRACE("(%p,%p,%d)\n",iface,afi,size);
 
   if (afi == NULL)
     return AVIERR_BADPARAM;
@@ -209,7 +209,7 @@ static HRESULT WINAPI ITmpFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis,
 
   ULONG nStream = (ULONG)-1;
 
-  TRACE("(%p,%p,0x%08lX,%ld)\n", iface, avis, fccType, lParam);
+  TRACE("(%p,%p,0x%08X,%d)\n", iface, avis, fccType, lParam);
 
   if (avis == NULL || lParam < 0)
     return AVIERR_BADPARAM;
@@ -260,7 +260,7 @@ static HRESULT WINAPI ITmpFile_fnCreateStream(IAVIFile *iface,PAVISTREAM *avis,
 static HRESULT WINAPI ITmpFile_fnWriteData(IAVIFile *iface, DWORD ckid,
 					   LPVOID lpData, LONG size)
 {
-  TRACE("(%p,0x%08lX,%p,%ld)\n", iface, ckid, lpData, size);
+  TRACE("(%p,0x%08X,%p,%d)\n", iface, ckid, lpData, size);
 
   return AVIERR_UNSUPPORTED;
 }
@@ -268,7 +268,7 @@ static HRESULT WINAPI ITmpFile_fnWriteData(IAVIFile *iface, DWORD ckid,
 static HRESULT WINAPI ITmpFile_fnReadData(IAVIFile *iface, DWORD ckid,
 					  LPVOID lpData, LONG *size)
 {
-  TRACE("(%p,0x%08lX,%p,%p)\n", iface, ckid, lpData, size);
+  TRACE("(%p,0x%08X,%p,%p)\n", iface, ckid, lpData, size);
 
   return AVIERR_UNSUPPORTED;
 }
@@ -283,7 +283,7 @@ static HRESULT WINAPI ITmpFile_fnEndRecord(IAVIFile *iface)
 static HRESULT WINAPI ITmpFile_fnDeleteStream(IAVIFile *iface, DWORD fccType,
 					      LONG lParam)
 {
-  TRACE("(%p,0x%08lX,%ld)\n", iface, fccType, lParam);
+  TRACE("(%p,0x%08X,%d)\n", iface, fccType, lParam);
 
   return AVIERR_UNSUPPORTED;
 }
diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c
index 8a0f6ab3792..4784c0b3c80 100644
--- a/dlls/avifil32/wavfile.c
+++ b/dlls/avifil32/wavfile.c
@@ -315,7 +315,7 @@ static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, LPAVIFILEINFOW afi,
 {
   IAVIFileImpl *This = (IAVIFileImpl *)iface;
 
-  TRACE("(%p,%p,%ld)\n",iface,afi,size);
+  TRACE("(%p,%p,%d)\n",iface,afi,size);
 
   if (afi == NULL)
     return AVIERR_BADPARAM;
@@ -349,7 +349,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis,
 {
   IAVIFileImpl *This = (IAVIFileImpl *)iface;
 
-  TRACE("(%p,%p,0x%08lX,%ld)\n", iface, avis, fccType, lParam);
+  TRACE("(%p,%p,0x%08X,%d)\n", iface, avis, fccType, lParam);
 
   /* check parameter */
   if (avis == NULL)
@@ -425,7 +425,7 @@ static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid,
 {
   IAVIFileImpl *This = (IAVIFileImpl *)iface;
 
-  TRACE("(%p,0x%08lX,%p,%ld)\n", iface, ckid, lpData, size);
+  TRACE("(%p,0x%08X,%p,%d)\n", iface, ckid, lpData, size);
 
   /* check parameters */
   if (lpData == NULL)
@@ -447,7 +447,7 @@ static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid,
 {
   IAVIFileImpl *This = (IAVIFileImpl *)iface;
 
-  TRACE("(%p,0x%08lX,%p,%p)\n", iface, ckid, lpData, size);
+  TRACE("(%p,0x%08X,%p,%p)\n", iface, ckid, lpData, size);
 
   return ReadExtraChunk(&This->extra, ckid, lpData, size);
 }
@@ -467,7 +467,7 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType,
 {
   IAVIFileImpl *This = (IAVIFileImpl *)iface;
 
-  TRACE("(%p,0x%08lX,%ld)\n", iface, fccType, lParam);
+  TRACE("(%p,0x%08X,%d)\n", iface, fccType, lParam);
 
   /* check parameter */
   if (lParam < 0)
@@ -565,7 +565,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface,
   WCHAR wszStreamFmt[50];
   INT   len;
 
-  TRACE("(%p,%s,0x%08lX)\n", iface, debugstr_w(pszFileName), dwMode);
+  TRACE("(%p,%s,0x%08X)\n", iface, debugstr_w(pszFileName), dwMode);
 
   /* check parameter */
   if (pszFileName == NULL)
@@ -714,7 +714,7 @@ static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,%p,%ld)\n", iface, psi, size);
+  TRACE("(%p,%p,%d)\n", iface, psi, size);
 
   if (psi == NULL)
     return AVIERR_BADPARAM;
@@ -733,7 +733,7 @@ static LONG WINAPI IAVIStream_fnFindSample(IAVIStream *iface, LONG pos,
 {
   IAVIFileImpl *This = ((IAVIStreamImpl*)iface)->paf;
 
-  TRACE("(%p,%ld,0x%08lX)\n",iface,pos,flags);
+  TRACE("(%p,%d,0x%08X)\n",iface,pos,flags);
 
   /* Do we have data? */
   if (This->lpFormat == NULL)
@@ -770,7 +770,7 @@ static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos,
 {
   IAVIStreamImpl *This = (IAVIStreamImpl *)iface;
 
-  TRACE("(%p,%ld,%p,%p)\n", iface, pos, format, formatsize);
+  TRACE("(%p,%d,%p,%p)\n", iface, pos, format, formatsize);
 
   if (formatsize == NULL)
     return AVIERR_BADPARAM;
@@ -798,7 +798,7 @@ static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos,
 {
   IAVIFileImpl *This = ((IAVIStreamImpl*)iface)->paf;
 
-  TRACE("(%p,%ld,%p,%ld)\n", iface, pos, format, formatsize);
+  TRACE("(%p,%d,%p,%d)\n", iface, pos, format, formatsize);
 
   /* check parameters */
   if (format == NULL || formatsize <= sizeof(PCMWAVEFORMAT))
@@ -855,7 +855,7 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start,
 {
   IAVIFileImpl *This = ((IAVIStreamImpl*)iface)->paf;
 
-  TRACE("(%p,%ld,%ld,%p,%ld,%p,%p)\n", iface, start, samples, buffer,
+  TRACE("(%p,%d,%d,%p,%d,%p,%p)\n", iface, start, samples, buffer,
 	buffersize, bytesread, samplesread);
 
   /* clear return parameters if given */
@@ -929,7 +929,7 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start,
 {
   IAVIFileImpl *This = ((IAVIStreamImpl*)iface)->paf;
 
-  TRACE("(%p,%ld,%ld,%p,%ld,0x%08lX,%p,%p)\n", iface, start, samples,
+  TRACE("(%p,%d,%d,%p,%d,0x%08X,%p,%p)\n", iface, start, samples,
 	buffer, buffersize, flags, sampwritten, byteswritten);
 
   /* clear return parameters if given */
@@ -983,7 +983,7 @@ static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start,
 {
   IAVIFileImpl *This = ((IAVIStreamImpl*)iface)->paf;
 
-  TRACE("(%p,%ld,%ld)\n", iface, start, samples);
+  TRACE("(%p,%d,%d)\n", iface, start, samples);
 
   /* check parameters */
   if (start < 0 || samples < 0)
@@ -1045,7 +1045,7 @@ static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc,
 static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream *iface,
 					   LPAVISTREAMINFOW info, LONG infolen)
 {
-  FIXME("(%p,%p,%ld): stub\n", iface, info, infolen);
+  FIXME("(%p,%p,%d): stub\n", iface, info, infolen);
 
   return E_FAIL;
 }