Author: winesync Date: Mon Nov 13 17:51:39 2006 New Revision: 24746
URL: http://svn.reactos.org/svn/reactos?rev=24746&view=rev Log: Autosyncing with Wine HEAD
Modified: trunk/reactos/dll/win32/avifil32/acmstream.c trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/avifil32/avifile_De.rc trunk/reactos/dll/win32/avifil32/avifile_Ko.rc trunk/reactos/dll/win32/avifil32/avifile_Nl.rc trunk/reactos/dll/win32/avifil32/editstream.c trunk/reactos/dll/win32/avifil32/extrachunk.c trunk/reactos/dll/win32/avifil32/factory.c trunk/reactos/dll/win32/avifil32/getframe.c trunk/reactos/dll/win32/avifil32/icmstream.c trunk/reactos/dll/win32/avifil32/regsvr.c trunk/reactos/dll/win32/avifil32/tmpfile.c trunk/reactos/dll/win32/avifil32/wavfile.c
Modified: trunk/reactos/dll/win32/avifil32/acmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/acmstrea... ============================================================================== --- trunk/reactos/dll/win32/avifil32/acmstream.c (original) +++ trunk/reactos/dll/win32/avifil32/acmstream.c Mon Nov 13 17:51:39 2006 @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define COM_NO_WINDOWS_H #include <assert.h> #include <stdarg.h>
@@ -151,7 +150,7 @@ 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 +164,7 @@ 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 +265,7 @@ { 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 +292,7 @@ { 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 +320,7 @@ { 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 +357,7 @@
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 +405,7 @@ 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 +526,7 @@ 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 +616,7 @@ { 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 +650,7 @@ { 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 +662,7 @@ { 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 +672,7 @@ 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; }
Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?re... ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c (original) +++ trunk/reactos/dll/win32/avifil32/api.c Mon Nov 13 17:51:39 2006 @@ -21,7 +21,6 @@ #include <stdarg.h>
#define COBJMACROS -#define COM_NO_WINDOWS_H
#include "windef.h" #include "winbase.h" @@ -318,7 +317,7 @@ 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 +339,7 @@ */ 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 +354,7 @@ 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 +405,7 @@ */ 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 +482,7 @@ { 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 +516,7 @@ 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 +539,7 @@ 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 +553,7 @@ */ 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 +568,7 @@ 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 +583,7 @@ 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 +599,7 @@ 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 +617,7 @@ 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 +649,7 @@ 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 +689,7 @@ */ 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 +792,7 @@ 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 +820,7 @@ 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 +846,7 @@ 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 +927,7 @@ AVISTREAMINFOW asiw; LONG time;
- TRACE("(%p,%ld)\n", pstream, lSample); + TRACE("(%p,%d)\n", pstream, lSample);
if (pstream == NULL) return -1; @@ -949,7 +948,7 @@ 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 +961,7 @@ 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 +982,7 @@ if (sample > asiw.dwStart + asiw.dwLength) sample = asiw.dwStart + asiw.dwLength;
- TRACE(" -> %ld\n", sample); + TRACE(" -> %d\n", sample); return sample; }
@@ -997,7 +996,7 @@ 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 +1041,7 @@ 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 +1286,7 @@ 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 +1662,7 @@ 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 +1840,7 @@ }
/* 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 +2152,7 @@ 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 +2179,7 @@ { 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 +2202,7 @@ 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) {
Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile.... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.c (original) +++ trunk/reactos/dll/win32/avifil32/avifile.c Mon Nov 13 17:51:39 2006 @@ -30,7 +30,6 @@ * When index is missing it works, but index seems to be okay. */
-#define COM_NO_WINDOWS_H #include <assert.h> #include <stdarg.h>
@@ -283,7 +282,7 @@ 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 +293,7 @@ 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 +304,7 @@ 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 +343,7 @@ { 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 +366,7 @@
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 +445,7 @@ { 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 +467,7 @@ { 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 +520,7 @@
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 +613,7 @@
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 +737,7 @@ 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 +751,7 @@ 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 +773,7 @@ { 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 +794,7 @@
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 +892,7 @@ { 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 +918,7 @@
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 +933,7 @@
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 +1044,7 @@ 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 +1155,7 @@ 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 +1243,7 @@ { 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 +1282,7 @@ { 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 +1306,7 @@ { 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 +1352,7 @@ 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 +1624,7 @@ 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 +1632,7 @@
/* 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 +1810,7 @@ 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 +1968,7 @@
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 +2046,11 @@ /* 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; }
Modified: trunk/reactos/dll/win32/avifil32/avifile_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_De.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_De.rc Mon Nov 13 17:51:39 2006 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
Modified: trunk/reactos/dll/win32/avifil32/avifile_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ko.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ko.rc Mon Nov 13 17:51:39 2006 @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
Modified: trunk/reactos/dll/win32/avifil32/avifile_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Nl.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Nl.rc Mon Nov 13 17:51:39 2006 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
Modified: trunk/reactos/dll/win32/avifil32/editstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstre... ============================================================================== --- trunk/reactos/dll/win32/avifil32/editstream.c (original) +++ trunk/reactos/dll/win32/avifil32/editstream.c Mon Nov 13 17:51:39 2006 @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define COM_NO_WINDOWS_H #include <assert.h> #include <stdarg.h>
@@ -210,7 +209,7 @@ { 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 +233,7 @@ 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 +251,7 @@ { 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 +379,7 @@ 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 +390,7 @@ 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 +551,7 @@ 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 +773,7 @@ { 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 +859,7 @@ { 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 +885,7 @@ 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 +922,7 @@ 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 +956,7 @@ 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 +972,7 @@ 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 +1062,7 @@ 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 +1079,7 @@ { 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 +1090,7 @@ 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 +1111,7 @@ 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 +1121,7 @@ { 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); }
Modified: trunk/reactos/dll/win32/avifil32/extrachunk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrachu... ============================================================================== --- trunk/reactos/dll/win32/avifil32/extrachunk.c (original) +++ trunk/reactos/dll/win32/avifil32/extrachunk.c Mon Nov 13 17:51:39 2006 @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define COM_NO_WINDOWS_H #include <assert.h>
#include "extrachunk.h" @@ -155,7 +154,7 @@ 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 +170,7 @@ } 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);
Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory.... ============================================================================== --- trunk/reactos/dll/win32/avifil32/factory.c (original) +++ trunk/reactos/dll/win32/avifil32/factory.c Mon Nov 13 17:51:39 2006 @@ -20,7 +20,6 @@ #include <stdarg.h>
#define COBJMACROS -#define COM_NO_WINDOWS_H
#include "windef.h" #include "winbase.h" @@ -207,7 +206,7 @@ */ 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:
Modified: trunk/reactos/dll/win32/avifil32/getframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getframe... ============================================================================== --- trunk/reactos/dll/win32/avifil32/getframe.c (original) +++ trunk/reactos/dll/win32/avifil32/getframe.c Mon Nov 13 17:51:39 2006 @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define COM_NO_WINDOWS_H #include <assert.h> #include <stdarg.h>
@@ -187,7 +186,7 @@ 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 +302,7 @@ { 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;
Modified: trunk/reactos/dll/win32/avifil32/icmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/icmstrea... ============================================================================== --- trunk/reactos/dll/win32/avifil32/icmstream.c (original) +++ trunk/reactos/dll/win32/avifil32/icmstream.c Mon Nov 13 17:51:39 2006 @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define COM_NO_WINDOWS_H #include <assert.h> #include <stdarg.h>
@@ -164,7 +163,7 @@ 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 +177,7 @@ 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 +324,7 @@ { 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 +343,7 @@ { 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 +383,7 @@ 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 +431,7 @@ { 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 +585,7 @@
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 +679,7 @@
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 +722,7 @@ { 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 +732,7 @@ { 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 +744,7 @@ { 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 +754,7 @@ 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 +861,7 @@ 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;
Modified: trunk/reactos/dll/win32/avifil32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/regsvr.c... ============================================================================== --- trunk/reactos/dll/win32/avifil32/regsvr.c (original) +++ trunk/reactos/dll/win32/avifil32/regsvr.c Mon Nov 13 17:51:39 2006 @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define COM_NO_WINDOWS_H #include <stdarg.h> #include <string.h>
Modified: trunk/reactos/dll/win32/avifil32/tmpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/tmpfile.... ============================================================================== --- trunk/reactos/dll/win32/avifil32/tmpfile.c (original) +++ trunk/reactos/dll/win32/avifil32/tmpfile.c Mon Nov 13 17:51:39 2006 @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define COM_NO_WINDOWS_H #include <assert.h> #include <stdarg.h>
@@ -153,7 +152,7 @@ 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 +162,7 @@ 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 +187,7 @@ { 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 +208,7 @@
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 +259,7 @@ 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 +267,7 @@ 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 +282,7 @@ static HRESULT WINAPI ITmpFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, LONG lParam) { - TRACE("(%p,0x%08lX,%ld)\n", iface, fccType, lParam); - - return AVIERR_UNSUPPORTED; -} + TRACE("(%p,0x%08X,%d)\n", iface, fccType, lParam); + + return AVIERR_UNSUPPORTED; +}
Modified: trunk/reactos/dll/win32/avifil32/wavfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/wavfile.... ============================================================================== --- trunk/reactos/dll/win32/avifil32/wavfile.c (original) +++ trunk/reactos/dll/win32/avifil32/wavfile.c Mon Nov 13 17:51:39 2006 @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define COM_NO_WINDOWS_H #include <assert.h> #include <stdarg.h>
@@ -315,7 +314,7 @@ { 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 +348,7 @@ { 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 +424,7 @@ { 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 +446,7 @@ { 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 +466,7 @@ { 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 +564,7 @@ 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 +713,7 @@ { 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 +732,7 @@ { 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 +769,7 @@ { 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 +797,7 @@ { 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 +854,7 @@ { 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 +928,7 @@ { 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 +982,7 @@ { 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 +1044,7 @@ 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; }
-
winesync＠svn.reactos.org