Skip to content

W
wine-winehq
Commit beb7695d authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

avifil32: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c55079fe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 136 deletions
dlls/avifil32/Makefile.in
View file @ beb7695d
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = avifil32.dll MODULE = avifil32.dll
IMPORTLIB = avifil32 IMPORTLIB = avifil32
IMPORTS = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4 IMPORTS = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4
......
dlls/avifil32/acmstream.c
View file @ beb7695d
...@@ -157,7 +157,7 @@ static ULONG WINAPI ACMStream_fnAddRef(IAVIStream *iface) ...@@ -157,7 +157,7 @@ static ULONG WINAPI ACMStream_fnAddRef(IAVIStream *iface)
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) -> %d\n", iface, ref); TRACE("(%p) -> %ld\n", iface, ref);
/* also add reference to the nested stream */ /* also add reference to the nested stream */
if (This->pStream != NULL) if (This->pStream != NULL)
...@@ -171,7 +171,7 @@ static ULONG WINAPI ACMStream_fnRelease(IAVIStream* iface) ...@@ -171,7 +171,7 @@ static ULONG WINAPI ACMStream_fnRelease(IAVIStream* iface)
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) -> %d\n", iface, ref); TRACE("(%p) -> %ld\n", iface, ref);
if (ref == 0) { if (ref == 0) {
/* destruct */ /* destruct */
...@@ -219,7 +219,7 @@ static HRESULT WINAPI ACMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, ...@@ -219,7 +219,7 @@ static HRESULT WINAPI ACMStream_fnCreate(IAVIStream *iface, LPARAM lParam1,
{ {
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,0x%08lX,0x%08lX)\n", iface, lParam1, lParam2); TRACE("(%p,0x%08IX,0x%08IX)\n", iface, lParam1, lParam2);
/* check for swapped parameters */ /* check for swapped parameters */
if ((LPVOID)lParam1 != NULL && if ((LPVOID)lParam1 != NULL &&
...@@ -272,7 +272,7 @@ static HRESULT WINAPI ACMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, ...@@ -272,7 +272,7 @@ static HRESULT WINAPI ACMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi,
{ {
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%p,%d)\n", iface, psi, size); TRACE("(%p,%p,%ld)\n", iface, psi, size);
if (psi == NULL) if (psi == NULL)
return AVIERR_BADPARAM; return AVIERR_BADPARAM;
...@@ -299,7 +299,7 @@ static LONG WINAPI ACMStream_fnFindSample(IAVIStream *iface, LONG pos, ...@@ -299,7 +299,7 @@ static LONG WINAPI ACMStream_fnFindSample(IAVIStream *iface, LONG pos,
{ {
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%d,0x%08X)\n",iface,pos,flags); TRACE("(%p,%ld,0x%08lX)\n",iface,pos,flags);
if (flags & FIND_FROM_START) { if (flags & FIND_FROM_START) {
pos = This->sInfo.dwStart; pos = This->sInfo.dwStart;
...@@ -327,7 +327,7 @@ static HRESULT WINAPI ACMStream_fnReadFormat(IAVIStream *iface, LONG pos, ...@@ -327,7 +327,7 @@ static HRESULT WINAPI ACMStream_fnReadFormat(IAVIStream *iface, LONG pos,
{ {
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%d,%p,%p)\n", iface, pos, format, formatsize); TRACE("(%p,%ld,%p,%p)\n", iface, pos, format, formatsize);
if (formatsize == NULL) if (formatsize == NULL)
return AVIERR_BADPARAM; return AVIERR_BADPARAM;
...@@ -364,7 +364,7 @@ static HRESULT WINAPI ACMStream_fnSetFormat(IAVIStream *iface, LONG pos, ...@@ -364,7 +364,7 @@ static HRESULT WINAPI ACMStream_fnSetFormat(IAVIStream *iface, LONG pos,
HRESULT hr; HRESULT hr;
TRACE("(%p,%d,%p,%d)\n", iface, pos, format, formatsize); TRACE("(%p,%ld,%p,%ld)\n", iface, pos, format, formatsize);
/* check parameters */ /* check parameters */
if (format == NULL || formatsize <= 0) if (format == NULL || formatsize <= 0)
...@@ -412,7 +412,7 @@ static HRESULT WINAPI ACMStream_fnRead(IAVIStream *iface, LONG start, ...@@ -412,7 +412,7 @@ static HRESULT WINAPI ACMStream_fnRead(IAVIStream *iface, LONG start,
HRESULT hr; HRESULT hr;
DWORD size; DWORD size;
TRACE("(%p,%d,%d,%p,%d,%p,%p)\n", iface, start, samples, buffer, TRACE("(%p,%ld,%ld,%p,%ld,%p,%p)\n", iface, start, samples, buffer,
buffersize, bytesread, samplesread); buffersize, bytesread, samplesread);
/* clear return parameters if given */ /* clear return parameters if given */
...@@ -533,7 +533,7 @@ static HRESULT WINAPI ACMStream_fnWrite(IAVIStream *iface, LONG start, ...@@ -533,7 +533,7 @@ static HRESULT WINAPI ACMStream_fnWrite(IAVIStream *iface, LONG start,
HRESULT hr; HRESULT hr;
ULONG size; ULONG size;
TRACE("(%p,%d,%d,%p,%d,0x%08X,%p,%p)\n", iface, start, samples, TRACE("(%p,%ld,%ld,%p,%ld,0x%08lX,%p,%p)\n", iface, start, samples,
buffer, buffersize, flags, sampwritten, byteswritten); buffer, buffersize, flags, sampwritten, byteswritten);
/* clear return parameters if given */ /* clear return parameters if given */
...@@ -623,7 +623,7 @@ static HRESULT WINAPI ACMStream_fnDelete(IAVIStream *iface, LONG start, ...@@ -623,7 +623,7 @@ static HRESULT WINAPI ACMStream_fnDelete(IAVIStream *iface, LONG start,
{ {
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%d,%d)\n", iface, start, samples); TRACE("(%p,%ld,%ld)\n", iface, start, samples);
/* check parameters */ /* check parameters */
if (start < 0 || samples < 0) if (start < 0 || samples < 0)
...@@ -657,7 +657,7 @@ static HRESULT WINAPI ACMStream_fnReadData(IAVIStream *iface, DWORD fcc, ...@@ -657,7 +657,7 @@ static HRESULT WINAPI ACMStream_fnReadData(IAVIStream *iface, DWORD fcc,
{ {
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,0x%08X,%p,%p)\n", iface, fcc, lp, lpread); TRACE("(%p,0x%08lX,%p,%p)\n", iface, fcc, lp, lpread);
assert(This->pStream != NULL); assert(This->pStream != NULL);
...@@ -669,7 +669,7 @@ static HRESULT WINAPI ACMStream_fnWriteData(IAVIStream *iface, DWORD fcc, ...@@ -669,7 +669,7 @@ static HRESULT WINAPI ACMStream_fnWriteData(IAVIStream *iface, DWORD fcc,
{ {
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,0x%08x,%p,%d)\n", iface, fcc, lp, size); TRACE("(%p,0x%08lx,%p,%ld)\n", iface, fcc, lp, size);
assert(This->pStream != NULL); assert(This->pStream != NULL);
...@@ -679,7 +679,7 @@ static HRESULT WINAPI ACMStream_fnWriteData(IAVIStream *iface, DWORD fcc, ...@@ -679,7 +679,7 @@ static HRESULT WINAPI ACMStream_fnWriteData(IAVIStream *iface, DWORD fcc,
static HRESULT WINAPI ACMStream_fnSetInfo(IAVIStream *iface, static HRESULT WINAPI ACMStream_fnSetInfo(IAVIStream *iface,
LPAVISTREAMINFOW info, LONG infolen) LPAVISTREAMINFOW info, LONG infolen)
{ {
FIXME("(%p,%p,%d): stub\n", iface, info, infolen); FIXME("(%p,%p,%ld): stub\n", iface, info, infolen);
return E_FAIL; return E_FAIL;
} }
......
dlls/avifil32/api.c
View file @ beb7695d
...@@ -309,7 +309,7 @@ HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile, LPAVIFILEINFOA afi, LONG size) ...@@ -309,7 +309,7 @@ HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile, LPAVIFILEINFOA afi, LONG size)
AVIFILEINFOW afiw; AVIFILEINFOW afiw;
HRESULT hres; HRESULT hres;
TRACE("(%p,%p,%d)\n", pfile, afi, size); TRACE("(%p,%p,%ld)\n", pfile, afi, size);
if (pfile == NULL) if (pfile == NULL)
return AVIERR_BADHANDLE; return AVIERR_BADHANDLE;
...@@ -331,7 +331,7 @@ HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile, LPAVIFILEINFOA afi, LONG size) ...@@ -331,7 +331,7 @@ HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile, LPAVIFILEINFOA afi, LONG size)
*/ */
HRESULT WINAPI AVIFileInfoW(PAVIFILE pfile, LPAVIFILEINFOW afiw, LONG size) HRESULT WINAPI AVIFileInfoW(PAVIFILE pfile, LPAVIFILEINFOW afiw, LONG size)
{ {
TRACE("(%p,%p,%d)\n", pfile, afiw, size); TRACE("(%p,%p,%ld)\n", pfile, afiw, size);
if (pfile == NULL) if (pfile == NULL)
return AVIERR_BADHANDLE; return AVIERR_BADHANDLE;
...@@ -345,7 +345,7 @@ HRESULT WINAPI AVIFileInfoW(PAVIFILE pfile, LPAVIFILEINFOW afiw, LONG size) ...@@ -345,7 +345,7 @@ HRESULT WINAPI AVIFileInfoW(PAVIFILE pfile, LPAVIFILEINFOW afiw, LONG size)
HRESULT WINAPI AVIFileGetStream(PAVIFILE pfile, PAVISTREAM *avis, HRESULT WINAPI AVIFileGetStream(PAVIFILE pfile, PAVISTREAM *avis,
DWORD fccType, LONG lParam) DWORD fccType, LONG lParam)
{ {
TRACE("(%p,%p,'%4.4s',%d)\n", pfile, avis, (char*)&fccType, lParam); TRACE("(%p,%p,'%4.4s',%ld)\n", pfile, avis, (char*)&fccType, lParam);
if (pfile == NULL) if (pfile == NULL)
return AVIERR_BADHANDLE; return AVIERR_BADHANDLE;
...@@ -394,7 +394,7 @@ HRESULT WINAPI AVIFileCreateStreamW(PAVIFILE pfile, PAVISTREAM *avis, ...@@ -394,7 +394,7 @@ HRESULT WINAPI AVIFileCreateStreamW(PAVIFILE pfile, PAVISTREAM *avis,
*/ */
HRESULT WINAPI AVIFileWriteData(PAVIFILE pfile,DWORD fcc,LPVOID lp,LONG size) HRESULT WINAPI AVIFileWriteData(PAVIFILE pfile,DWORD fcc,LPVOID lp,LONG size)
{ {
TRACE("(%p,'%4.4s',%p,%d)\n", pfile, (char*)&fcc, lp, size); TRACE("(%p,'%4.4s',%p,%ld)\n", pfile, (char*)&fcc, lp, size);
if (pfile == NULL) if (pfile == NULL)
return AVIERR_BADHANDLE; return AVIERR_BADHANDLE;
...@@ -466,7 +466,7 @@ HRESULT WINAPI AVIStreamCreate(PAVISTREAM *ppavi, LONG lParam1, LONG lParam2, ...@@ -466,7 +466,7 @@ HRESULT WINAPI AVIStreamCreate(PAVISTREAM *ppavi, LONG lParam1, LONG lParam2,
{ {
HRESULT hr; HRESULT hr;
TRACE("(%p,0x%08X,0x%08X,%s)\n", ppavi, lParam1, lParam2, TRACE("(%p,0x%08lX,0x%08lX,%s)\n", ppavi, lParam1, lParam2,
debugstr_guid(pclsidHandler)); debugstr_guid(pclsidHandler));
if (ppavi == NULL) if (ppavi == NULL)
...@@ -499,7 +499,7 @@ HRESULT WINAPI AVIStreamInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi, ...@@ -499,7 +499,7 @@ HRESULT WINAPI AVIStreamInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi,
AVISTREAMINFOW asiw; AVISTREAMINFOW asiw;
HRESULT hres; HRESULT hres;
TRACE("(%p,%p,%d)\n", pstream, asi, size); TRACE("(%p,%p,%ld)\n", pstream, asi, size);
if (pstream == NULL) if (pstream == NULL)
return AVIERR_BADHANDLE; return AVIERR_BADHANDLE;
...@@ -522,7 +522,7 @@ HRESULT WINAPI AVIStreamInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi, ...@@ -522,7 +522,7 @@ HRESULT WINAPI AVIStreamInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi,
HRESULT WINAPI AVIStreamInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi, HRESULT WINAPI AVIStreamInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi,
LONG size) LONG size)
{ {
TRACE("(%p,%p,%d)\n", pstream, asi, size); TRACE("(%p,%p,%ld)\n", pstream, asi, size);
if (pstream == NULL) if (pstream == NULL)
return AVIERR_BADHANDLE; return AVIERR_BADHANDLE;
...@@ -535,7 +535,7 @@ HRESULT WINAPI AVIStreamInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi, ...@@ -535,7 +535,7 @@ HRESULT WINAPI AVIStreamInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi,
*/ */
LONG WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, LONG flags) LONG WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, LONG flags)
{ {
TRACE("(%p,%d,0x%X)\n", pstream, pos, flags); TRACE("(%p,%ld,0x%lX)\n", pstream, pos, flags);
if (pstream == NULL) if (pstream == NULL)
return -1; return -1;
...@@ -549,7 +549,7 @@ LONG WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, LONG flags) ...@@ -549,7 +549,7 @@ LONG WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, LONG flags)
HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM pstream, LONG pos, HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM pstream, LONG pos,
LPVOID format, LPLONG formatsize) LPVOID format, LPLONG formatsize)
{ {
TRACE("(%p,%d,%p,%p)\n", pstream, pos, format, formatsize); TRACE("(%p,%ld,%p,%p)\n", pstream, pos, format, formatsize);
if (pstream == NULL) if (pstream == NULL)
return AVIERR_BADHANDLE; return AVIERR_BADHANDLE;
...@@ -563,7 +563,7 @@ HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM pstream, LONG pos, ...@@ -563,7 +563,7 @@ HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM pstream, LONG pos,
HRESULT WINAPI AVIStreamSetFormat(PAVISTREAM pstream, LONG pos, HRESULT WINAPI AVIStreamSetFormat(PAVISTREAM pstream, LONG pos,
LPVOID format, LONG formatsize) LPVOID format, LONG formatsize)
{ {
TRACE("(%p,%d,%p,%d)\n", pstream, pos, format, formatsize); TRACE("(%p,%ld,%p,%ld)\n", pstream, pos, format, formatsize);
if (pstream == NULL) if (pstream == NULL)
return AVIERR_BADHANDLE; return AVIERR_BADHANDLE;
...@@ -578,7 +578,7 @@ HRESULT WINAPI AVIStreamRead(PAVISTREAM pstream, LONG start, LONG samples, ...@@ -578,7 +578,7 @@ HRESULT WINAPI AVIStreamRead(PAVISTREAM pstream, LONG start, LONG samples,
LPVOID buffer, LONG buffersize, LPVOID buffer, LONG buffersize,
LPLONG bytesread, LPLONG samplesread) LPLONG bytesread, LPLONG samplesread)
{ {
TRACE("(%p,%d,%d,%p,%d,%p,%p)\n", pstream, start, samples, buffer, TRACE("(%p,%ld,%ld,%p,%ld,%p,%p)\n", pstream, start, samples, buffer,
buffersize, bytesread, samplesread); buffersize, bytesread, samplesread);
if (pstream == NULL) if (pstream == NULL)
...@@ -595,7 +595,7 @@ HRESULT WINAPI AVIStreamWrite(PAVISTREAM pstream, LONG start, LONG samples, ...@@ -595,7 +595,7 @@ HRESULT WINAPI AVIStreamWrite(PAVISTREAM pstream, LONG start, LONG samples,
LPVOID buffer, LONG buffersize, DWORD flags, LPVOID buffer, LONG buffersize, DWORD flags,
LPLONG sampwritten, LPLONG byteswritten) LPLONG sampwritten, LPLONG byteswritten)
{ {
TRACE("(%p,%d,%d,%p,%d,0x%X,%p,%p)\n", pstream, start, samples, buffer, TRACE("(%p,%ld,%ld,%p,%ld,0x%lX,%p,%p)\n", pstream, start, samples, buffer,
buffersize, flags, sampwritten, byteswritten); buffersize, flags, sampwritten, byteswritten);
if (pstream == NULL) if (pstream == NULL)
...@@ -625,7 +625,7 @@ HRESULT WINAPI AVIStreamReadData(PAVISTREAM pstream, DWORD fcc, LPVOID lp, ...@@ -625,7 +625,7 @@ HRESULT WINAPI AVIStreamReadData(PAVISTREAM pstream, DWORD fcc, LPVOID lp,
HRESULT WINAPI AVIStreamWriteData(PAVISTREAM pstream, DWORD fcc, LPVOID lp, HRESULT WINAPI AVIStreamWriteData(PAVISTREAM pstream, DWORD fcc, LPVOID lp,
LONG size) LONG size)
{ {
TRACE("(%p,'%4.4s',%p,%d)\n", pstream, (char*)&fcc, lp, size); TRACE("(%p,'%4.4s',%p,%ld)\n", pstream, (char*)&fcc, lp, size);
if (pstream == NULL) if (pstream == NULL)
return AVIERR_BADHANDLE; return AVIERR_BADHANDLE;
...@@ -663,7 +663,7 @@ PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM pstream, ...@@ -663,7 +663,7 @@ PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM pstream,
*/ */
LPVOID WINAPI AVIStreamGetFrame(PGETFRAME pg, LONG pos) LPVOID WINAPI AVIStreamGetFrame(PGETFRAME pg, LONG pos)
{ {
TRACE("(%p,%d)\n", pg, pos); TRACE("(%p,%ld)\n", pg, pos);
if (pg == NULL) if (pg == NULL)
return NULL; return NULL;
...@@ -764,7 +764,7 @@ HRESULT WINAPI AVIStreamOpenFromFileA(PAVISTREAM *ppavi, LPCSTR szFile, ...@@ -764,7 +764,7 @@ HRESULT WINAPI AVIStreamOpenFromFileA(PAVISTREAM *ppavi, LPCSTR szFile,
PAVIFILE pfile = NULL; PAVIFILE pfile = NULL;
HRESULT hr; HRESULT hr;
TRACE("(%p,%s,'%4.4s',%d,0x%X,%s)\n", ppavi, debugstr_a(szFile), TRACE("(%p,%s,'%4.4s',%ld,0x%X,%s)\n", ppavi, debugstr_a(szFile),
(char*)&fccType, lParam, mode, debugstr_guid(pclsidHandler)); (char*)&fccType, lParam, mode, debugstr_guid(pclsidHandler));
if (ppavi == NULL || szFile == NULL) if (ppavi == NULL || szFile == NULL)
...@@ -792,7 +792,7 @@ HRESULT WINAPI AVIStreamOpenFromFileW(PAVISTREAM *ppavi, LPCWSTR szFile, ...@@ -792,7 +792,7 @@ HRESULT WINAPI AVIStreamOpenFromFileW(PAVISTREAM *ppavi, LPCWSTR szFile,
PAVIFILE pfile = NULL; PAVIFILE pfile = NULL;
HRESULT hr; HRESULT hr;
TRACE("(%p,%s,'%4.4s',%d,0x%X,%s)\n", ppavi, debugstr_w(szFile), TRACE("(%p,%s,'%4.4s',%ld,0x%X,%s)\n", ppavi, debugstr_w(szFile),
(char*)&fccType, lParam, mode, debugstr_guid(pclsidHandler)); (char*)&fccType, lParam, mode, debugstr_guid(pclsidHandler));
if (ppavi == NULL || szFile == NULL) if (ppavi == NULL || szFile == NULL)
...@@ -818,7 +818,7 @@ LONG WINAPI AVIStreamBeginStreaming(PAVISTREAM pavi, LONG lStart, LONG lEnd, LON ...@@ -818,7 +818,7 @@ LONG WINAPI AVIStreamBeginStreaming(PAVISTREAM pavi, LONG lStart, LONG lEnd, LON
IAVIStreaming* pstream = NULL; IAVIStreaming* pstream = NULL;
HRESULT hr; HRESULT hr;
TRACE("(%p,%d,%d,%d)\n", pavi, lStart, lEnd, lRate); TRACE("(%p,%ld,%ld,%ld)\n", pavi, lStart, lEnd, lRate);
if (pavi == NULL) if (pavi == NULL)
return AVIERR_BADHANDLE; return AVIERR_BADHANDLE;
...@@ -896,7 +896,7 @@ LONG WINAPI AVIStreamSampleToTime(PAVISTREAM pstream, LONG lSample) ...@@ -896,7 +896,7 @@ LONG WINAPI AVIStreamSampleToTime(PAVISTREAM pstream, LONG lSample)
AVISTREAMINFOW asiw; AVISTREAMINFOW asiw;
LONG time; LONG time;
TRACE("(%p,%d)\n", pstream, lSample); TRACE("(%p,%ld)\n", pstream, lSample);
if (pstream == NULL) if (pstream == NULL)
return -1; return -1;
...@@ -917,7 +917,7 @@ LONG WINAPI AVIStreamSampleToTime(PAVISTREAM pstream, LONG lSample) ...@@ -917,7 +917,7 @@ LONG WINAPI AVIStreamSampleToTime(PAVISTREAM pstream, LONG lSample)
else else
time = (LONG)(((float)lSample * asiw.dwScale * 1000 + (asiw.dwRate - 1)) / asiw.dwRate); time = (LONG)(((float)lSample * asiw.dwScale * 1000 + (asiw.dwRate - 1)) / asiw.dwRate);
TRACE(" -> %d\n",time); TRACE(" -> %ld\n",time);
return time; return time;
} }
...@@ -929,7 +929,7 @@ LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime) ...@@ -929,7 +929,7 @@ LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime)
AVISTREAMINFOW asiw; AVISTREAMINFOW asiw;
ULONG sample; ULONG sample;
TRACE("(%p,%d)\n", pstream, lTime); TRACE("(%p,%ld)\n", pstream, lTime);
if (pstream == NULL || lTime < 0) if (pstream == NULL || lTime < 0)
return -1; return -1;
...@@ -950,7 +950,7 @@ LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime) ...@@ -950,7 +950,7 @@ LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime)
if (sample > asiw.dwStart + asiw.dwLength) if (sample > asiw.dwStart + asiw.dwLength)
sample = asiw.dwStart + asiw.dwLength; sample = asiw.dwStart + asiw.dwLength;
TRACE(" -> %d\n", sample); TRACE(" -> %ld\n", sample);
return sample; return sample;
} }
...@@ -963,7 +963,7 @@ HRESULT WINAPI AVIBuildFilterA(LPSTR szFilter, LONG cbFilter, BOOL fSaving) ...@@ -963,7 +963,7 @@ HRESULT WINAPI AVIBuildFilterA(LPSTR szFilter, LONG cbFilter, BOOL fSaving)
LPWSTR wszFilter; LPWSTR wszFilter;
HRESULT hr; HRESULT hr;
TRACE("(%p,%d,%d)\n", szFilter, cbFilter, fSaving); TRACE("(%p,%ld,%d)\n", szFilter, cbFilter, fSaving);
/* check parameters */ /* check parameters */
if (szFilter == NULL) if (szFilter == NULL)
...@@ -1005,7 +1005,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) ...@@ -1005,7 +1005,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
LONG size; LONG size;
DWORD count = 0; DWORD count = 0;
TRACE("(%p,%d,%d)\n", szFilter, cbFilter, fSaving); TRACE("(%p,%ld,%d)\n", szFilter, cbFilter, fSaving);
/* check parameters */ /* check parameters */
if (szFilter == NULL) if (szFilter == NULL)
...@@ -1243,7 +1243,7 @@ static BOOL AVISaveOptionsFmtChoose(HWND hWnd) ...@@ -1243,7 +1243,7 @@ static BOOL AVISaveOptionsFmtChoose(HWND hWnd)
HeapFree(GetProcessHeap(), 0, afmtc.pwfxEnum); HeapFree(GetProcessHeap(), 0, afmtc.pwfxEnum);
return ret == S_OK; return ret == S_OK;
} else { } else {
ERR(": unknown streamtype 0x%08X\n", sInfo.fccType); ERR(": unknown streamtype 0x%08lX\n", sInfo.fccType);
return FALSE; return FALSE;
} }
} }
...@@ -1616,7 +1616,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler, ...@@ -1616,7 +1616,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler,
lFirstVideo = curStream; lFirstVideo = curStream;
} else if (!dwInterleave) { } else if (!dwInterleave) {
/* check if any non-video stream wants to be interleaved */ /* check if any non-video stream wants to be interleaved */
WARN("options.flags=0x%X options.dwInterleave=%u\n",plpOptions[curStream]->dwFlags,plpOptions[curStream]->dwInterleaveEvery); WARN("options.flags=0x%lX options.dwInterleave=%lu\n",plpOptions[curStream]->dwFlags,plpOptions[curStream]->dwInterleaveEvery);
if (plpOptions[curStream] != NULL && if (plpOptions[curStream] != NULL &&
plpOptions[curStream]->dwFlags & AVICOMPRESSF_INTERLEAVE) plpOptions[curStream]->dwFlags & AVICOMPRESSF_INTERLEAVE)
dwInterleave = plpOptions[curStream]->dwInterleaveEvery; dwInterleave = plpOptions[curStream]->dwInterleaveEvery;
...@@ -1794,7 +1794,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler, ...@@ -1794,7 +1794,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler,
} }
/* copy needed samples now */ /* copy needed samples now */
WARN("copy from stream %d samples %d to %d...\n",curStream, WARN("copy from stream %d samples %ld to %ld...\n",curStream,
lStart[curStream],lFirstVideo); lStart[curStream],lFirstVideo);
while (lFirstVideo > lStart[curStream]) { while (lFirstVideo > lStart[curStream]) {
DWORD flags = 0; DWORD flags = 0;
...@@ -2068,7 +2068,7 @@ HRESULT WINAPI EditStreamPaste(PAVISTREAM pDest, LONG *plStart, LONG *plLength, ...@@ -2068,7 +2068,7 @@ HRESULT WINAPI EditStreamPaste(PAVISTREAM pDest, LONG *plStart, LONG *plLength,
PAVIEDITSTREAM pEdit = NULL; PAVIEDITSTREAM pEdit = NULL;
HRESULT hr; HRESULT hr;
TRACE("(%p,%p,%p,%p,%d,%d)\n", pDest, plStart, plLength, TRACE("(%p,%p,%p,%p,%ld,%ld)\n", pDest, plStart, plLength,
pSource, lStart, lEnd); pSource, lStart, lEnd);
if (pDest == NULL || pSource == NULL) if (pDest == NULL || pSource == NULL)
...@@ -2095,7 +2095,7 @@ HRESULT WINAPI EditStreamSetInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi, ...@@ -2095,7 +2095,7 @@ HRESULT WINAPI EditStreamSetInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi,
{ {
AVISTREAMINFOW asiw; AVISTREAMINFOW asiw;
TRACE("(%p,%p,%d)\n", pstream, asi, size); TRACE("(%p,%p,%ld)\n", pstream, asi, size);
if (size >= 0 && size < sizeof(AVISTREAMINFOA)) if (size >= 0 && size < sizeof(AVISTREAMINFOA))
return AVIERR_BADSIZE; return AVIERR_BADSIZE;
...@@ -2115,7 +2115,7 @@ HRESULT WINAPI EditStreamSetInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi, ...@@ -2115,7 +2115,7 @@ HRESULT WINAPI EditStreamSetInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi,
PAVIEDITSTREAM pEdit = NULL; PAVIEDITSTREAM pEdit = NULL;
HRESULT hr; HRESULT hr;
TRACE("(%p,%p,%d)\n", pstream, asi, size); TRACE("(%p,%p,%ld)\n", pstream, asi, size);
if (size >= 0 && size < sizeof(AVISTREAMINFOA)) if (size >= 0 && size < sizeof(AVISTREAMINFOA))
return AVIERR_BADSIZE; return AVIERR_BADSIZE;
......
dlls/avifil32/editstream.c
View file @ beb7695d
...@@ -91,7 +91,7 @@ static HRESULT AVIFILE_FindStreamInTable(IAVIEditStreamImpl* const This, ...@@ -91,7 +91,7 @@ static HRESULT AVIFILE_FindStreamInTable(IAVIEditStreamImpl* const This,
{ {
DWORD n; DWORD n;
TRACE("(%p,%u,%p,%p,%p,%d)\n",This,pos,ppStream,streamPos, TRACE("(%p,%lu,%p,%p,%p,%d)\n",This,pos,ppStream,streamPos,
streamNr,bFindSample); streamNr,bFindSample);
if (pos < This->sInfo.dwStart) if (pos < This->sInfo.dwStart)
...@@ -115,7 +115,7 @@ static HRESULT AVIFILE_FindStreamInTable(IAVIEditStreamImpl* const This, ...@@ -115,7 +115,7 @@ static HRESULT AVIFILE_FindStreamInTable(IAVIEditStreamImpl* const This,
if (streamNr != NULL) if (streamNr != NULL)
*streamNr = n; *streamNr = n;
TRACE(" -- pos=0 && b=1 -> (%p,%u,%u)\n",*ppStream, *streamPos, n); TRACE(" -- pos=0 && b=1 -> (%p,%lu,%lu)\n",*ppStream, *streamPos, n);
return AVIERR_OK; return AVIERR_OK;
} else { } else {
*ppStream = NULL; *ppStream = NULL;
...@@ -133,7 +133,7 @@ static LPVOID AVIFILE_ReadFrame(IAVIEditStreamImpl* const This, ...@@ -133,7 +133,7 @@ static LPVOID AVIFILE_ReadFrame(IAVIEditStreamImpl* const This,
{ {
PGETFRAME pg; PGETFRAME pg;
TRACE("(%p,%p,%d)\n",This,pstream,pos); TRACE("(%p,%p,%ld)\n",This,pstream,pos);
if (pstream == NULL) if (pstream == NULL)
return NULL; return NULL;
...@@ -256,7 +256,7 @@ static ULONG WINAPI IAVIEditStream_fnAddRef(IAVIEditStream*iface) ...@@ -256,7 +256,7 @@ static ULONG WINAPI IAVIEditStream_fnAddRef(IAVIEditStream*iface)
IAVIEditStreamImpl *This = impl_from_IAVIEditStream(iface); IAVIEditStreamImpl *This = impl_from_IAVIEditStream(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) -> %d\n", iface, ref); TRACE("(%p) -> %ld\n", iface, ref);
return ref; return ref;
} }
...@@ -267,7 +267,7 @@ static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface) ...@@ -267,7 +267,7 @@ static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface)
DWORD i; DWORD i;
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) -> %d\n", iface, ref); TRACE("(%p) -> %ld\n", iface, ref);
if (!ref) { if (!ref) {
/* release memory */ /* release memory */
...@@ -425,7 +425,7 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart, ...@@ -425,7 +425,7 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart,
DWORD startPos, endPos, streamNr, nStreams; DWORD startPos, endPos, streamNr, nStreams;
ULONG n; ULONG n;
TRACE("(%p,%p,%p,%p,%d,%d)\n",iface,plStart,plLength, TRACE("(%p,%p,%p,%p,%ld,%ld)\n",iface,plStart,plLength,
pSource,lStart,lLength); pSource,lStart,lLength);
if (pSource == NULL) if (pSource == NULL)
...@@ -644,7 +644,7 @@ static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface, ...@@ -644,7 +644,7 @@ static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface,
{ {
IAVIEditStreamImpl *This = impl_from_IAVIEditStream(iface); IAVIEditStreamImpl *This = impl_from_IAVIEditStream(iface);
TRACE("(%p,%p,%d)\n",iface,asi,size); TRACE("(%p,%p,%ld)\n",iface,asi,size);
/* check parameters */ /* check parameters */
if (size >= 0 && size < sizeof(AVISTREAMINFOW)) if (size >= 0 && size < sizeof(AVISTREAMINFOW))
...@@ -724,7 +724,7 @@ static HRESULT WINAPI IEditAVIStream_fnInfo(IAVIStream*iface, ...@@ -724,7 +724,7 @@ static HRESULT WINAPI IEditAVIStream_fnInfo(IAVIStream*iface,
{ {
IAVIEditStreamImpl *This = impl_from_IAVIStream( iface ); IAVIEditStreamImpl *This = impl_from_IAVIStream( iface );
TRACE("(%p,%p,%d)\n",iface,psi,size); TRACE("(%p,%p,%ld)\n",iface,psi,size);
if (psi == NULL) if (psi == NULL)
return AVIERR_BADPARAM; return AVIERR_BADPARAM;
...@@ -748,7 +748,7 @@ static LONG WINAPI IEditAVIStream_fnFindSample(IAVIStream*iface,LONG pos, ...@@ -748,7 +748,7 @@ static LONG WINAPI IEditAVIStream_fnFindSample(IAVIStream*iface,LONG pos,
PAVISTREAM stream; PAVISTREAM stream;
DWORD streamPos, streamNr; DWORD streamPos, streamNr;
TRACE("(%p,%d,0x%08X)\n",iface,pos,flags); TRACE("(%p,%ld,0x%08lX)\n",iface,pos,flags);
if (flags & FIND_FROM_START) if (flags & FIND_FROM_START)
pos = (LONG)This->sInfo.dwStart; pos = (LONG)This->sInfo.dwStart;
...@@ -785,7 +785,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadFormat(IAVIStream*iface,LONG pos, ...@@ -785,7 +785,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,
DWORD n; DWORD n;
HRESULT hr; HRESULT hr;
TRACE("(%p,%d,%p,%p)\n",iface,pos,format,fmtsize); TRACE("(%p,%ld,%p,%p)\n",iface,pos,format,fmtsize);
if (fmtsize == NULL || pos < This->sInfo.dwStart || if (fmtsize == NULL || pos < This->sInfo.dwStart ||
This->sInfo.dwStart + This->sInfo.dwLength <= pos) This->sInfo.dwStart + This->sInfo.dwLength <= pos)
...@@ -819,7 +819,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadFormat(IAVIStream*iface,LONG pos, ...@@ -819,7 +819,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,
static HRESULT WINAPI IEditAVIStream_fnSetFormat(IAVIStream*iface,LONG pos, static HRESULT WINAPI IEditAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,
LPVOID format,LONG formatsize) LPVOID format,LONG formatsize)
{ {
TRACE("(%p,%d,%p,%d)\n",iface,pos,format,formatsize); TRACE("(%p,%ld,%p,%ld)\n",iface,pos,format,formatsize);
return AVIERR_UNSUPPORTED; return AVIERR_UNSUPPORTED;
} }
...@@ -835,7 +835,7 @@ static HRESULT WINAPI IEditAVIStream_fnRead(IAVIStream*iface,LONG start, ...@@ -835,7 +835,7 @@ static HRESULT WINAPI IEditAVIStream_fnRead(IAVIStream*iface,LONG start,
LONG readBytes, readSamples, count; LONG readBytes, readSamples, count;
HRESULT hr; HRESULT hr;
TRACE("(%p,%d,%d,%p,%d,%p,%p) -- 0x%08X\n",iface,start,samples, TRACE("(%p,%ld,%ld,%p,%ld,%p,%p) -- 0x%08lX\n",iface,start,samples,
buffer,buffersize,bytesread,samplesread,This->sInfo.fccType); buffer,buffersize,bytesread,samplesread,This->sInfo.fccType);
/* check parameters */ /* check parameters */
...@@ -925,7 +925,7 @@ static HRESULT WINAPI IEditAVIStream_fnWrite(IAVIStream*iface,LONG start, ...@@ -925,7 +925,7 @@ static HRESULT WINAPI IEditAVIStream_fnWrite(IAVIStream*iface,LONG start,
LONG buffersize,DWORD flags, LONG buffersize,DWORD flags,
LONG*sampwritten,LONG*byteswritten) LONG*sampwritten,LONG*byteswritten)
{ {
TRACE("(%p,%d,%d,%p,%d,0x%08X,%p,%p)\n",iface,start,samples,buffer, TRACE("(%p,%ld,%ld,%p,%ld,0x%08lX,%p,%p)\n",iface,start,samples,buffer,
buffersize,flags,sampwritten,byteswritten); buffersize,flags,sampwritten,byteswritten);
/* be sure return parameters have correct values */ /* be sure return parameters have correct values */
...@@ -942,7 +942,7 @@ static HRESULT WINAPI IEditAVIStream_fnDelete(IAVIStream*iface,LONG start, ...@@ -942,7 +942,7 @@ static HRESULT WINAPI IEditAVIStream_fnDelete(IAVIStream*iface,LONG start,
{ {
IAVIEditStreamImpl *This = impl_from_IAVIStream( iface ); IAVIEditStreamImpl *This = impl_from_IAVIStream( iface );
TRACE("(%p,%d,%d)\n",iface,start,samples); TRACE("(%p,%ld,%ld)\n",iface,start,samples);
return IAVIEditStream_Cut(&This->IAVIEditStream_iface,&start,&samples,NULL); return IAVIEditStream_Cut(&This->IAVIEditStream_iface,&start,&samples,NULL);
} }
...@@ -953,7 +953,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadData(IAVIStream*iface,DWORD fcc, ...@@ -953,7 +953,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,
IAVIEditStreamImpl *This = impl_from_IAVIStream( iface ); IAVIEditStreamImpl *This = impl_from_IAVIStream( iface );
DWORD n; DWORD n;
TRACE("(%p,0x%08X,%p,%p)\n",iface,fcc,lp,lpread); TRACE("(%p,0x%08lX,%p,%p)\n",iface,fcc,lp,lpread);
/* check parameters */ /* check parameters */
if (lp == NULL || lpread == NULL) if (lp == NULL || lpread == NULL)
...@@ -974,7 +974,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadData(IAVIStream*iface,DWORD fcc, ...@@ -974,7 +974,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,
static HRESULT WINAPI IEditAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc, static HRESULT WINAPI IEditAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,
LPVOID lp,LONG size) LPVOID lp,LONG size)
{ {
TRACE("(%p,0x%08X,%p,%d)\n",iface,fcc,lp,size); TRACE("(%p,0x%08lX,%p,%ld)\n",iface,fcc,lp,size);
return AVIERR_UNSUPPORTED; return AVIERR_UNSUPPORTED;
} }
...@@ -984,7 +984,7 @@ static HRESULT WINAPI IEditAVIStream_fnSetInfo(IAVIStream*iface, ...@@ -984,7 +984,7 @@ static HRESULT WINAPI IEditAVIStream_fnSetInfo(IAVIStream*iface,
{ {
IAVIEditStreamImpl *This = impl_from_IAVIStream( iface ); IAVIEditStreamImpl *This = impl_from_IAVIStream( iface );
TRACE("(%p,%p,%d)\n",iface,info,len); TRACE("(%p,%p,%ld)\n",iface,info,len);
return IAVIEditStream_SetInfo(&This->IAVIEditStream_iface,info,len); return IAVIEditStream_SetInfo(&This->IAVIEditStream_iface,info,len);
} }
......
dlls/avifil32/extrachunk.c
View file @ beb7695d
...@@ -152,7 +152,7 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck, ...@@ -152,7 +152,7 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck,
assert(hmmio != NULL); assert(hmmio != NULL);
assert(lpck != NULL); assert(lpck != NULL);
TRACE("({%p,%u},%p,%p,%p,0x%X)\n", extra->lp, extra->cb, hmmio, lpck, TRACE("({%p,%lu},%p,%p,%p,0x%X)\n", extra->lp, extra->cb, hmmio, lpck,
lpckParent, flags); lpckParent, flags);
/* what chunk id and form/list type should we search? */ /* what chunk id and form/list type should we search? */
...@@ -168,7 +168,7 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck, ...@@ -168,7 +168,7 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck,
} else } else
ckid = fccType = (FOURCC)-1; /* collect everything into extra! */ ckid = fccType = (FOURCC)-1; /* collect everything into extra! */
TRACE(": find ckid=0x%08X fccType=0x%08X\n", ckid, fccType); TRACE(": find ckid=0x%08lX fccType=0x%08lX\n", ckid, fccType);
for (;;) { for (;;) {
mmr = mmioDescend(hmmio, lpck, lpckParent, 0); mmr = mmioDescend(hmmio, lpck, lpckParent, 0);
......
dlls/avifil32/factory.c
View file @ beb7695d
...@@ -70,7 +70,7 @@ static ULONG WINAPI IClassFactory_fnAddRef(IClassFactory *iface) ...@@ -70,7 +70,7 @@ static ULONG WINAPI IClassFactory_fnAddRef(IClassFactory *iface)
IClassFactoryImpl *This = impl_from_IClassFactory(iface); IClassFactoryImpl *This = impl_from_IClassFactory(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref = %u\n", This, ref); TRACE("(%p) ref = %lu\n", This, ref);
return ref; return ref;
} }
...@@ -79,7 +79,7 @@ static ULONG WINAPI IClassFactory_fnRelease(IClassFactory *iface) ...@@ -79,7 +79,7 @@ static ULONG WINAPI IClassFactory_fnRelease(IClassFactory *iface)
IClassFactoryImpl *This = impl_from_IClassFactory(iface); IClassFactoryImpl *This = impl_from_IClassFactory(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref = %u\n", This, ref); TRACE("(%p) ref = %lu\n", This, ref);
if(!ref) if(!ref)
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -196,7 +196,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) ...@@ -196,7 +196,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv)
*/ */
BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved)
{ {
TRACE("(%p,%d,%p)\n", hInstDll, fdwReason, lpvReserved); TRACE("(%p,%ld,%p)\n", hInstDll, fdwReason, lpvReserved);
switch (fdwReason) { switch (fdwReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
......
dlls/avifil32/getframe.c
View file @ beb7695d
...@@ -146,7 +146,7 @@ static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos) ...@@ -146,7 +146,7 @@ static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos)
LONG readBytes; LONG readBytes;
LONG readSamples; LONG readSamples;
TRACE("(%p,%d)\n", iface, lPos); TRACE("(%p,%ld)\n", iface, lPos);
/* We don't want negative start values! -- marks invalid buffer content */ /* We don't want negative start values! -- marks invalid buffer content */
if (lPos < 0) if (lPos < 0)
...@@ -262,7 +262,7 @@ static HRESULT WINAPI IGetFrame_fnBegin(IGetFrame *iface, LONG lStart, ...@@ -262,7 +262,7 @@ static HRESULT WINAPI IGetFrame_fnBegin(IGetFrame *iface, LONG lStart,
{ {
IGetFrameImpl *This = impl_from_IGetFrame(iface); IGetFrameImpl *This = impl_from_IGetFrame(iface);
TRACE("(%p,%d,%d,%d)\n", iface, lStart, lEnd, lRate); TRACE("(%p,%ld,%ld,%ld)\n", iface, lStart, lEnd, lRate);
This->bFixedStream = TRUE; This->bFixedStream = TRUE;
......
dlls/avifil32/icmstream.c
View file @ beb7695d
...@@ -111,7 +111,7 @@ static ULONG WINAPI ICMStream_fnAddRef(IAVIStream *iface) ...@@ -111,7 +111,7 @@ static ULONG WINAPI ICMStream_fnAddRef(IAVIStream *iface)
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) -> %d\n", iface, ref); TRACE("(%p) -> %ld\n", iface, ref);
/* also add reference to the nested stream */ /* also add reference to the nested stream */
if (This->pStream != NULL) if (This->pStream != NULL)
...@@ -125,7 +125,7 @@ static ULONG WINAPI ICMStream_fnRelease(IAVIStream* iface) ...@@ -125,7 +125,7 @@ static ULONG WINAPI ICMStream_fnRelease(IAVIStream* iface)
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) -> %d\n", iface, ref); TRACE("(%p) -> %ld\n", iface, ref);
if (ref == 0) { if (ref == 0) {
/* destruct */ /* destruct */
...@@ -187,7 +187,7 @@ static HRESULT WINAPI ICMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, ...@@ -187,7 +187,7 @@ static HRESULT WINAPI ICMStream_fnCreate(IAVIStream *iface, LPARAM lParam1,
ICCOMPRESSFRAMES icFrames; ICCOMPRESSFRAMES icFrames;
LPAVICOMPRESSOPTIONS pco = (LPAVICOMPRESSOPTIONS)lParam2; LPAVICOMPRESSOPTIONS pco = (LPAVICOMPRESSOPTIONS)lParam2;
TRACE("(%p,0x%08lX,0x%08lX)\n", iface, lParam1, lParam2); TRACE("(%p,0x%08IX,0x%08IX)\n", iface, lParam1, lParam2);
/* check parameter */ /* check parameter */
if ((LPVOID)lParam1 == NULL) if ((LPVOID)lParam1 == NULL)
...@@ -272,7 +272,7 @@ static HRESULT WINAPI ICMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, ...@@ -272,7 +272,7 @@ static HRESULT WINAPI ICMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi,
{ {
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%p,%d)\n", iface, psi, size); TRACE("(%p,%p,%ld)\n", iface, psi, size);
if (psi == NULL) if (psi == NULL)
return AVIERR_BADPARAM; return AVIERR_BADPARAM;
...@@ -291,7 +291,7 @@ static LONG WINAPI ICMStream_fnFindSample(IAVIStream *iface, LONG pos, ...@@ -291,7 +291,7 @@ static LONG WINAPI ICMStream_fnFindSample(IAVIStream *iface, LONG pos,
{ {
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%d,0x%08X)\n",iface,pos,flags); TRACE("(%p,%ld,0x%08lX)\n",iface,pos,flags);
if (flags & FIND_FROM_START) { if (flags & FIND_FROM_START) {
pos = This->sInfo.dwStart; pos = This->sInfo.dwStart;
...@@ -331,7 +331,7 @@ static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream *iface, LONG pos, ...@@ -331,7 +331,7 @@ static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream *iface, LONG pos,
LPBITMAPINFOHEADER lpbi; LPBITMAPINFOHEADER lpbi;
HRESULT hr; HRESULT hr;
TRACE("(%p,%d,%p,%p)\n", iface, pos, format, formatsize); TRACE("(%p,%ld,%p,%p)\n", iface, pos, format, formatsize);
if (formatsize == NULL) if (formatsize == NULL)
return AVIERR_BADPARAM; return AVIERR_BADPARAM;
...@@ -379,7 +379,7 @@ static HRESULT WINAPI ICMStream_fnSetFormat(IAVIStream *iface, LONG pos, ...@@ -379,7 +379,7 @@ static HRESULT WINAPI ICMStream_fnSetFormat(IAVIStream *iface, LONG pos,
{ {
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%d,%p,%d)\n", iface, pos, format, formatsize); TRACE("(%p,%ld,%p,%ld)\n", iface, pos, format, formatsize);
/* check parameters */ /* check parameters */
if (format == NULL || formatsize <= 0) if (format == NULL || formatsize <= 0)
...@@ -533,7 +533,7 @@ static HRESULT WINAPI ICMStream_fnRead(IAVIStream *iface, LONG start, ...@@ -533,7 +533,7 @@ static HRESULT WINAPI ICMStream_fnRead(IAVIStream *iface, LONG start,
LPBITMAPINFOHEADER lpbi; LPBITMAPINFOHEADER lpbi;
TRACE("(%p,%d,%d,%p,%d,%p,%p)\n", iface, start, samples, buffer, TRACE("(%p,%ld,%ld,%p,%ld,%p,%p)\n", iface, start, samples, buffer,
buffersize, bytesread, samplesread); buffersize, bytesread, samplesread);
/* clear return parameters if given */ /* clear return parameters if given */
...@@ -627,7 +627,7 @@ static HRESULT WINAPI ICMStream_fnWrite(IAVIStream *iface, LONG start, ...@@ -627,7 +627,7 @@ static HRESULT WINAPI ICMStream_fnWrite(IAVIStream *iface, LONG start,
HRESULT hr; HRESULT hr;
TRACE("(%p,%d,%d,%p,%d,0x%08X,%p,%p)\n", iface, start, samples, TRACE("(%p,%ld,%ld,%p,%ld,0x%08lX,%p,%p)\n", iface, start, samples,
buffer, buffersize, flags, sampwritten, byteswritten); buffer, buffersize, flags, sampwritten, byteswritten);
/* clear return parameters if given */ /* clear return parameters if given */
...@@ -670,7 +670,7 @@ static HRESULT WINAPI ICMStream_fnDelete(IAVIStream *iface, LONG start, ...@@ -670,7 +670,7 @@ static HRESULT WINAPI ICMStream_fnDelete(IAVIStream *iface, LONG start,
{ {
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%d,%d)\n", iface, start, samples); TRACE("(%p,%ld,%ld)\n", iface, start, samples);
return IAVIStream_Delete(This->pStream, start, samples); return IAVIStream_Delete(This->pStream, start, samples);
} }
...@@ -680,7 +680,7 @@ static HRESULT WINAPI ICMStream_fnReadData(IAVIStream *iface, DWORD fcc, ...@@ -680,7 +680,7 @@ static HRESULT WINAPI ICMStream_fnReadData(IAVIStream *iface, DWORD fcc,
{ {
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,0x%08X,%p,%p)\n", iface, fcc, lp, lpread); TRACE("(%p,0x%08lX,%p,%p)\n", iface, fcc, lp, lpread);
assert(This->pStream != NULL); assert(This->pStream != NULL);
...@@ -692,7 +692,7 @@ static HRESULT WINAPI ICMStream_fnWriteData(IAVIStream *iface, DWORD fcc, ...@@ -692,7 +692,7 @@ static HRESULT WINAPI ICMStream_fnWriteData(IAVIStream *iface, DWORD fcc,
{ {
IAVIStreamImpl *This = impl_from_IAVIStream(iface); IAVIStreamImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,0x%08x,%p,%d)\n", iface, fcc, lp, size); TRACE("(%p,0x%08lx,%p,%ld)\n", iface, fcc, lp, size);
assert(This->pStream != NULL); assert(This->pStream != NULL);
...@@ -702,7 +702,7 @@ static HRESULT WINAPI ICMStream_fnWriteData(IAVIStream *iface, DWORD fcc, ...@@ -702,7 +702,7 @@ static HRESULT WINAPI ICMStream_fnWriteData(IAVIStream *iface, DWORD fcc,
static HRESULT WINAPI ICMStream_fnSetInfo(IAVIStream *iface, static HRESULT WINAPI ICMStream_fnSetInfo(IAVIStream *iface,
LPAVISTREAMINFOW info, LONG infolen) LPAVISTREAMINFOW info, LONG infolen)
{ {
FIXME("(%p,%p,%d): stub\n", iface, info, infolen); FIXME("(%p,%p,%ld): stub\n", iface, info, infolen);
return E_FAIL; return E_FAIL;
} }
...@@ -849,7 +849,7 @@ static HRESULT AVIFILE_EncodeFrame(IAVIStreamImpl *This, ...@@ -849,7 +849,7 @@ static HRESULT AVIFILE_EncodeFrame(IAVIStreamImpl *This,
if (bDecreasedQual || dwCurQual == This->dwLastQuality) if (bDecreasedQual || dwCurQual == This->dwLastQuality)
dwCurQual = (dwMinQual + dwMaxQual) / 2; dwCurQual = (dwMinQual + dwMaxQual) / 2;
else else
FIXME(": no new quality computed min=%u cur=%u max=%u last=%u\n", FIXME(": no new quality computed min=%lu cur=%lu max=%lu last=%lu\n",
dwMinQual, dwCurQual, dwMaxQual, This->dwLastQuality); dwMinQual, dwCurQual, dwMaxQual, This->dwLastQuality);
bDecreasedQual = TRUE; bDecreasedQual = TRUE;
......
dlls/avifil32/tmpfile.c
View file @ beb7695d
...@@ -70,7 +70,7 @@ static ULONG WINAPI ITmpFile_fnAddRef(IAVIFile *iface) ...@@ -70,7 +70,7 @@ static ULONG WINAPI ITmpFile_fnAddRef(IAVIFile *iface)
ITmpFileImpl *This = impl_from_IAVIFile(iface); ITmpFileImpl *This = impl_from_IAVIFile(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) -> %d\n", iface, ref); TRACE("(%p) -> %ld\n", iface, ref);
return ref; return ref;
} }
...@@ -80,7 +80,7 @@ static ULONG WINAPI ITmpFile_fnRelease(IAVIFile *iface) ...@@ -80,7 +80,7 @@ static ULONG WINAPI ITmpFile_fnRelease(IAVIFile *iface)
ITmpFileImpl *This = impl_from_IAVIFile(iface); ITmpFileImpl *This = impl_from_IAVIFile(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) -> %d\n", iface, ref); TRACE("(%p) -> %ld\n", iface, ref);
if (!ref) { if (!ref) {
unsigned int i; unsigned int i;
...@@ -104,7 +104,7 @@ static HRESULT WINAPI ITmpFile_fnInfo(IAVIFile *iface, ...@@ -104,7 +104,7 @@ static HRESULT WINAPI ITmpFile_fnInfo(IAVIFile *iface,
{ {
ITmpFileImpl *This = impl_from_IAVIFile(iface); ITmpFileImpl *This = impl_from_IAVIFile(iface);
TRACE("(%p,%p,%d)\n",iface,afi,size); TRACE("(%p,%p,%ld)\n",iface,afi,size);
if (afi == NULL) if (afi == NULL)
return AVIERR_BADPARAM; return AVIERR_BADPARAM;
...@@ -125,7 +125,7 @@ static HRESULT WINAPI ITmpFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis, ...@@ -125,7 +125,7 @@ static HRESULT WINAPI ITmpFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis,
ULONG nStream = (ULONG)-1; ULONG nStream = (ULONG)-1;
TRACE("(%p,%p,0x%08X,%d)\n", iface, avis, fccType, lParam); TRACE("(%p,%p,0x%08lX,%ld)\n", iface, avis, fccType, lParam);
if (avis == NULL || lParam < 0) if (avis == NULL || lParam < 0)
return AVIERR_BADPARAM; return AVIERR_BADPARAM;
...@@ -176,7 +176,7 @@ static HRESULT WINAPI ITmpFile_fnCreateStream(IAVIFile *iface,PAVISTREAM *avis, ...@@ -176,7 +176,7 @@ static HRESULT WINAPI ITmpFile_fnCreateStream(IAVIFile *iface,PAVISTREAM *avis,
static HRESULT WINAPI ITmpFile_fnWriteData(IAVIFile *iface, DWORD ckid, static HRESULT WINAPI ITmpFile_fnWriteData(IAVIFile *iface, DWORD ckid,
LPVOID lpData, LONG size) LPVOID lpData, LONG size)
{ {
TRACE("(%p,0x%08X,%p,%d)\n", iface, ckid, lpData, size); TRACE("(%p,0x%08lX,%p,%ld)\n", iface, ckid, lpData, size);
return AVIERR_UNSUPPORTED; return AVIERR_UNSUPPORTED;
} }
...@@ -184,7 +184,7 @@ static HRESULT WINAPI ITmpFile_fnWriteData(IAVIFile *iface, DWORD ckid, ...@@ -184,7 +184,7 @@ static HRESULT WINAPI ITmpFile_fnWriteData(IAVIFile *iface, DWORD ckid,
static HRESULT WINAPI ITmpFile_fnReadData(IAVIFile *iface, DWORD ckid, static HRESULT WINAPI ITmpFile_fnReadData(IAVIFile *iface, DWORD ckid,
LPVOID lpData, LONG *size) LPVOID lpData, LONG *size)
{ {
TRACE("(%p,0x%08X,%p,%p)\n", iface, ckid, lpData, size); TRACE("(%p,0x%08lX,%p,%p)\n", iface, ckid, lpData, size);
return AVIERR_UNSUPPORTED; return AVIERR_UNSUPPORTED;
} }
...@@ -199,7 +199,7 @@ static HRESULT WINAPI ITmpFile_fnEndRecord(IAVIFile *iface) ...@@ -199,7 +199,7 @@ static HRESULT WINAPI ITmpFile_fnEndRecord(IAVIFile *iface)
static HRESULT WINAPI ITmpFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, static HRESULT WINAPI ITmpFile_fnDeleteStream(IAVIFile *iface, DWORD fccType,
LONG lParam) LONG lParam)
{ {
TRACE("(%p,0x%08X,%d)\n", iface, fccType, lParam); TRACE("(%p,0x%08lX,%ld)\n", iface, fccType, lParam);
return AVIERR_UNSUPPORTED; return AVIERR_UNSUPPORTED;
} }
......
dlls/avifil32/wavfile.c
View file @ beb7695d
...@@ -152,7 +152,7 @@ static ULONG WINAPI IUnknown_fnAddRef(IUnknown *iface) ...@@ -152,7 +152,7 @@ static ULONG WINAPI IUnknown_fnAddRef(IUnknown *iface)
IAVIFileImpl *This = impl_from_IUnknown(iface); IAVIFileImpl *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -162,7 +162,7 @@ static ULONG WINAPI IUnknown_fnRelease(IUnknown *iface) ...@@ -162,7 +162,7 @@ static ULONG WINAPI IUnknown_fnRelease(IUnknown *iface)
IAVIFileImpl *This = impl_from_IUnknown(iface); IAVIFileImpl *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { if (!ref) {
/* need to write headers to file */ /* need to write headers to file */
...@@ -224,7 +224,7 @@ static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, AVIFILEINFOW *afi, LONG s ...@@ -224,7 +224,7 @@ static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile *iface, AVIFILEINFOW *afi, LONG s
{ {
IAVIFileImpl *This = impl_from_IAVIFile(iface); IAVIFileImpl *This = impl_from_IAVIFile(iface);
TRACE("(%p,%p,%d)\n",iface,afi,size); TRACE("(%p,%p,%ld)\n",iface,afi,size);
if (afi == NULL) if (afi == NULL)
return AVIERR_BADPARAM; return AVIERR_BADPARAM;
...@@ -258,7 +258,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, IAVIStream **avis, D ...@@ -258,7 +258,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, IAVIStream **avis, D
{ {
IAVIFileImpl *This = impl_from_IAVIFile(iface); IAVIFileImpl *This = impl_from_IAVIFile(iface);
TRACE("(%p,%p,0x%08X,%d)\n", iface, avis, fccType, lParam); TRACE("(%p,%p,0x%08lX,%ld)\n", iface, avis, fccType, lParam);
/* check parameter */ /* check parameter */
if (avis == NULL) if (avis == NULL)
...@@ -333,7 +333,7 @@ static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid, void *lp ...@@ -333,7 +333,7 @@ static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile *iface, DWORD ckid, void *lp
{ {
IAVIFileImpl *This = impl_from_IAVIFile(iface); IAVIFileImpl *This = impl_from_IAVIFile(iface);
TRACE("(%p,0x%08X,%p,%d)\n", iface, ckid, lpData, size); TRACE("(%p,0x%08lX,%p,%ld)\n", iface, ckid, lpData, size);
/* check parameters */ /* check parameters */
if (lpData == NULL) if (lpData == NULL)
...@@ -354,7 +354,7 @@ static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid, void *lpD ...@@ -354,7 +354,7 @@ static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile *iface, DWORD ckid, void *lpD
{ {
IAVIFileImpl *This = impl_from_IAVIFile(iface); IAVIFileImpl *This = impl_from_IAVIFile(iface);
TRACE("(%p,0x%08X,%p,%p)\n", iface, ckid, lpData, size); TRACE("(%p,0x%08lX,%p,%p)\n", iface, ckid, lpData, size);
return ReadExtraChunk(&This->extra, ckid, lpData, size); return ReadExtraChunk(&This->extra, ckid, lpData, size);
} }
...@@ -373,7 +373,7 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, LO ...@@ -373,7 +373,7 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, LO
{ {
IAVIFileImpl *This = impl_from_IAVIFile(iface); IAVIFileImpl *This = impl_from_IAVIFile(iface);
TRACE("(%p,0x%08X,%d)\n", iface, fccType, lParam); TRACE("(%p,0x%08lX,%ld)\n", iface, fccType, lParam);
/* check parameter */ /* check parameter */
if (lParam < 0) if (lParam < 0)
...@@ -479,7 +479,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface, LPCOLESTR pszFile ...@@ -479,7 +479,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface, LPCOLESTR pszFile
WCHAR wszStreamFmt[50]; WCHAR wszStreamFmt[50];
INT len; INT len;
TRACE("(%p,%s,0x%08X)\n", iface, debugstr_w(pszFileName), dwMode); TRACE("(%p,%s,0x%08lX)\n", iface, debugstr_w(pszFileName), dwMode);
/* check parameter */ /* check parameter */
if (pszFileName == NULL) if (pszFileName == NULL)
...@@ -623,7 +623,7 @@ static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface) ...@@ -623,7 +623,7 @@ static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface)
static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream *iface, LPARAM lParam1, static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream *iface, LPARAM lParam1,
LPARAM lParam2) LPARAM lParam2)
{ {
TRACE("(%p,0x%08lX,0x%08lX)\n", iface, lParam1, lParam2); TRACE("(%p,0x%08IX,0x%08IX)\n", iface, lParam1, lParam2);
/* This IAVIStream interface needs an WAVFile */ /* This IAVIStream interface needs an WAVFile */
return AVIERR_UNSUPPORTED; return AVIERR_UNSUPPORTED;
...@@ -633,7 +633,7 @@ static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream *iface, AVISTREAMINFOW *psi, ...@@ -633,7 +633,7 @@ static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream *iface, AVISTREAMINFOW *psi,
{ {
IAVIFileImpl *This = impl_from_IAVIStream(iface); IAVIFileImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%p,%d)\n", iface, psi, size); TRACE("(%p,%p,%ld)\n", iface, psi, size);
if (psi == NULL) if (psi == NULL)
return AVIERR_BADPARAM; return AVIERR_BADPARAM;
...@@ -651,7 +651,7 @@ static LONG WINAPI IAVIStream_fnFindSample(IAVIStream *iface, LONG pos, LONG fla ...@@ -651,7 +651,7 @@ static LONG WINAPI IAVIStream_fnFindSample(IAVIStream *iface, LONG pos, LONG fla
{ {
IAVIFileImpl *This = impl_from_IAVIStream(iface); IAVIFileImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%d,0x%08X)\n",iface,pos,flags); TRACE("(%p,%ld,0x%08lX)\n",iface,pos,flags);
/* Do we have data? */ /* Do we have data? */
if (This->lpFormat == NULL) if (This->lpFormat == NULL)
...@@ -688,7 +688,7 @@ static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos, void ...@@ -688,7 +688,7 @@ static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream *iface, LONG pos, void
{ {
IAVIFileImpl *This = impl_from_IAVIStream(iface); IAVIFileImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%d,%p,%p)\n", iface, pos, format, formatsize); TRACE("(%p,%ld,%p,%p)\n", iface, pos, format, formatsize);
if (formatsize == NULL) if (formatsize == NULL)
return AVIERR_BADPARAM; return AVIERR_BADPARAM;
...@@ -716,7 +716,7 @@ static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos, void * ...@@ -716,7 +716,7 @@ static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos, void *
{ {
IAVIFileImpl *This = impl_from_IAVIStream(iface); IAVIFileImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%d,%p,%d)\n", iface, pos, format, formatsize); TRACE("(%p,%ld,%p,%ld)\n", iface, pos, format, formatsize);
/* check parameters */ /* check parameters */
if (format == NULL || formatsize <= sizeof(PCMWAVEFORMAT)) if (format == NULL || formatsize <= sizeof(PCMWAVEFORMAT))
...@@ -771,7 +771,7 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, LONG samp ...@@ -771,7 +771,7 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, LONG samp
{ {
IAVIFileImpl *This = impl_from_IAVIStream(iface); IAVIFileImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%d,%d,%p,%d,%p,%p)\n", iface, start, samples, buffer, TRACE("(%p,%ld,%ld,%p,%ld,%p,%p)\n", iface, start, samples, buffer,
buffersize, bytesread, samplesread); buffersize, bytesread, samplesread);
/* clear return parameters if given */ /* clear return parameters if given */
...@@ -842,7 +842,7 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start, LONG sam ...@@ -842,7 +842,7 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start, LONG sam
{ {
IAVIFileImpl *This = impl_from_IAVIStream(iface); IAVIFileImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%d,%d,%p,%d,0x%08X,%p,%p)\n", iface, start, samples, TRACE("(%p,%ld,%ld,%p,%ld,0x%08lX,%p,%p)\n", iface, start, samples,
buffer, buffersize, flags, sampwritten, byteswritten); buffer, buffersize, flags, sampwritten, byteswritten);
/* clear return parameters if given */ /* clear return parameters if given */
...@@ -895,7 +895,7 @@ static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start, LONG sa ...@@ -895,7 +895,7 @@ static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream *iface, LONG start, LONG sa
{ {
IAVIFileImpl *This = impl_from_IAVIStream(iface); IAVIFileImpl *This = impl_from_IAVIStream(iface);
TRACE("(%p,%d,%d)\n", iface, start, samples); TRACE("(%p,%ld,%ld)\n", iface, start, samples);
/* check parameters */ /* check parameters */
if (start < 0 || samples < 0) if (start < 0 || samples < 0)
...@@ -953,7 +953,7 @@ static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc, void ...@@ -953,7 +953,7 @@ static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc, void
static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream *iface, static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream *iface,
LPAVISTREAMINFOW info, LONG infolen) LPAVISTREAMINFOW info, LONG infolen)
{ {
FIXME("(%p,%p,%d): stub\n", iface, info, infolen); FIXME("(%p,%p,%ld): stub\n", iface, info, infolen);
return E_FAIL; return E_FAIL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment