Ros-diffs November 2006

ros-diffs@reactos.org

16 participants
324 discussions

[winesync] 24747: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Mon Nov 13 18:20:30 2006 New Revision: 24747 URL: http://svn.reactos.org/svn/reactos?rev=24747&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c trunk/reactos/dll/win32/cabinet/fdi.c Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet_main.c (original) +++ trunk/reactos/dll/win32/cabinet/cabinet_main.c Mon Nov 13 18:20:30 2006 @@ -219,7 +219,7 @@ if ((pDestination->flags & EXTRACT_EXTRACTFILES) || file_in_list(pDestination->filterlist, pfdin->psz1)) { - /* skip this file it it's not in the file list */ + /* skip this file if it is not in the file list */ if (!file_in_list(pDestination->filelist, pfdin->psz1)) return 0; Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c Mon Nov 13 18:20:30 2006 @@ -945,7 +945,7 @@ /********************************************************* * fdi_Ziphuft_build (internal) */ -static cab_LONG fdi_Ziphuft_build(cab_ULONG *b, cab_ULONG n, cab_ULONG s, cab_UWORD *d, cab_UWORD *e, +static cab_LONG fdi_Ziphuft_build(cab_ULONG *b, cab_ULONG n, cab_ULONG s, const cab_UWORD *d, const cab_UWORD *e, struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state) { cab_ULONG a; /* counter for codes of length k */ @@ -1125,7 +1125,7 @@ /********************************************************* * fdi_Zipinflate_codes (internal) */ -cab_LONG fdi_Zipinflate_codes(struct Ziphuft *tl, struct Ziphuft *td, +static cab_LONG fdi_Zipinflate_codes(struct Ziphuft *tl, struct Ziphuft *td, cab_LONG bl, cab_LONG bd, fdi_decomp_state *decomp_state) { register cab_ULONG e; /* table entry flag/number of extra bits */ @@ -1272,16 +1272,14 @@ for(; i < 288; i++) /* make a complete, but wrong code set */ l[i] = 8; fixed_bl = 7; - if((i = fdi_Ziphuft_build(l, 288, 257, (cab_UWORD *) Zipcplens, - (cab_UWORD *) Zipcplext, &fixed_tl, &fixed_bl, decomp_state))) + if((i = fdi_Ziphuft_build(l, 288, 257, Zipcplens, Zipcplext, &fixed_tl, &fixed_bl, decomp_state))) return i; /* distance table */ for(i = 0; i < 30; i++) /* make an incomplete code set */ l[i] = 5; fixed_bd = 5; - if((i = fdi_Ziphuft_build(l, 30, 0, (cab_UWORD *) Zipcpdist, (cab_UWORD *) Zipcpdext, - &fixed_td, &fixed_bd, decomp_state)) > 1) + if((i = fdi_Ziphuft_build(l, 30, 0, Zipcpdist, Zipcpdext, &fixed_td, &fixed_bd, decomp_state)) > 1) { fdi_Ziphuft_free(CAB(hfdi), fixed_tl); return i; @@ -1409,16 +1407,14 @@ /* build the decoding tables for literal/length and distance codes */ bl = ZIPLBITS; - if((i = fdi_Ziphuft_build(ll, nl, 257, (cab_UWORD *) Zipcplens, (cab_UWORD *) Zipcplext, - &tl, &bl, decomp_state)) != 0) + if((i = fdi_Ziphuft_build(ll, nl, 257, Zipcplens, Zipcplext, &tl, &bl, decomp_state)) != 0) { if(i == 1) fdi_Ziphuft_free(CAB(hfdi), tl); return i; /* incomplete code set */ } bd = ZIPDBITS; - fdi_Ziphuft_build(ll + nl, nd, 0, (cab_UWORD *) Zipcpdist, (cab_UWORD *) Zipcpdext, - &td, &bd, decomp_state); + fdi_Ziphuft_build(ll + nl, nd, 0, Zipcpdist, Zipcpdext, &td, &bd, decomp_state); /* decompress until an end-of-block code */ if(fdi_Zipinflate_codes(tl, td, bl, bd, decomp_state))

18 years, 1 month

[winesync] 24746: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

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/acmstre… ============================================================================== --- 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?r… ============================================================================== --- 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/editstr… ============================================================================== --- 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/extrach… ============================================================================== --- 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/getfram… ============================================================================== --- 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/icmstre… ============================================================================== --- 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.… ============================================================================== --- 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; }

18 years, 1 month

[fireball] 24745: Merge r24744 from trunk ("flushing cache" hanging / inability to reboot fix).

by fireball＠svn.reactos.org

Author: fireball Date: Mon Nov 13 15:50:53 2006 New Revision: 24745 URL: http://svn.reactos.org/svn/reactos?rev=24745&view=rev Log: Merge r24744 from trunk ("flushing cache" hanging / inability to reboot fix). Modified: branches/ros-branch-0_3_1/reactos/drivers/input/i8042prt/i8042prt.c Modified: branches/ros-branch-0_3_1/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/driver… ============================================================================== --- branches/ros-branch-0_3_1/reactos/drivers/input/i8042prt/i8042prt.c (original) +++ branches/ros-branch-0_3_1/reactos/drivers/input/i8042prt/i8042prt.c Mon Nov 13 15:50:53 2006 @@ -599,6 +599,7 @@ static NTSTATUS STDCALL I8042Initialize(PDEVICE_EXTENSION DevExt) { NTSTATUS Status; + UCHAR Value = 0; Status = I8042BasicDetect(DevExt); if (!NT_SUCCESS(Status)) { @@ -630,6 +631,32 @@ if (DevExt->MouseExists) { DPRINT("Mouse detected\n"); I8042MouseEnable(DevExt); + } + + /* + * Some machines do not reboot if SF is not set. + */ + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_READ_MODE)) { + DPRINT1("Can't read i8042 mode\n"); + return Status; + } + + Status = I8042ReadDataWait(DevExt, &Value); + if (!NT_SUCCESS(Status)) { + DPRINT1("No response after read i8042 mode\n"); + return Status; + } + + Value |= CCB_SYSTEM_FLAG; + + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_WRITE_MODE)) { + DPRINT1("Can't set i8042 mode\n"); + return Status; + } + + if (!I8042Write(DevExt, I8042_DATA_PORT, Value)) { + DPRINT1("Can't send i8042 mode\n"); + return Status; } return STATUS_SUCCESS;

18 years, 1 month

[fireball] 24744: Dmitry G. Gorbachev: After kbd controller init, the System Flag should be set to 1. Fixes rebooting on real hardware (famous "Flushing cache" hang). See issue #1842 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Nov 13 15:40:02 2006 New Revision: 24744 URL: http://svn.reactos.org/svn/reactos?rev=24744&view=rev Log: Dmitry G. Gorbachev: After kbd controller init, the System Flag should be set to 1. Fixes rebooting on real hardware (famous "Flushing cache" hang). See issue #1842 for more details. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c Mon Nov 13 15:40:02 2006 @@ -599,6 +599,7 @@ static NTSTATUS STDCALL I8042Initialize(PDEVICE_EXTENSION DevExt) { NTSTATUS Status; + UCHAR Value = 0; Status = I8042BasicDetect(DevExt); if (!NT_SUCCESS(Status)) { @@ -630,6 +631,32 @@ if (DevExt->MouseExists) { DPRINT("Mouse detected\n"); I8042MouseEnable(DevExt); + } + + /* + * Some machines do not reboot if SF is not set. + */ + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_READ_MODE)) { + DPRINT1("Can't read i8042 mode\n"); + return Status; + } + + Status = I8042ReadDataWait(DevExt, &Value); + if (!NT_SUCCESS(Status)) { + DPRINT1("No response after read i8042 mode\n"); + return Status; + } + + Value |= CCB_SYSTEM_FLAG; + + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_WRITE_MODE)) { + DPRINT1("Can't set i8042 mode\n"); + return Status; + } + + if (!I8042Write(DevExt, I8042_DATA_PORT, Value)) { + DPRINT1("Can't send i8042 mode\n"); + return Status; } return STATUS_SUCCESS;

18 years, 1 month

[fireball] 24743: Delete unneeded files

by fireball＠svn.reactos.org

Author: fireball Date: Mon Nov 13 13:14:08 2006 New Revision: 24743 URL: http://svn.reactos.org/svn/reactos?rev=24743&view=rev Log: Delete unneeded files Removed: trunk/reactos/drivers/base/bootvid/ntbootvid.h trunk/reactos/drivers/base/bootvid/pixelsup_i386.S Removed: trunk/reactos/drivers/base/bootvid/ntbootvid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/ntboo… ============================================================================== (empty) Removed: trunk/reactos/drivers/base/bootvid/pixelsup_i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/pixel… ============================================================================== (empty)

18 years, 1 month

[ion] 24742: - Make HalMakeBeep a bit nicer by making the PUCHAR typedef part of the TIMER constants.

by ion＠svn.reactos.org

Author: ion Date: Mon Nov 13 07:34:57 2006 New Revision: 24742 URL: http://svn.reactos.org/svn/reactos?rev=24742&view=rev Log: - Make HalMakeBeep a bit nicer by making the PUCHAR typedef part of the TIMER constants. Modified: trunk/reactos/hal/halx86/generic/beep.c Modified: trunk/reactos/hal/halx86/generic/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/beep.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/beep.c (original) +++ trunk/reactos/hal/halx86/generic/beep.c Mon Nov 13 07:34:57 2006 @@ -1,77 +1,68 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/beep.c - * PURPOSE: Speaker function (it's only one) - * PROGRAMMER: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) - * UPDATE HISTORY: - * Created 31/01/99 - */ +* PROJECT: ReactOS HAL +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/hal/x86/beep.c +* PURPOSE: Speak support (beeping) +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +* Eric Kohl (ekohl(a)abo.rhein-zeitung.de) +*/ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include <hal.h> #define NDEBUG #include <debug.h> - /* CONSTANTS *****************************************************************/ -#define TIMER2 0x42 -#define TIMER3 0x43 -#define PORT_B 0x61 -#define CLOCKFREQ 1193167 - +#define TIMER2 (PUCHAR)0x42 +#define TIMER3 (PUCHAR)0x43 +#define PORT_B (PUCHAR)0x61 +#define CLOCKFREQ 1193167 /* FUNCTIONS *****************************************************************/ -/* - * FUNCTION: Beeps the speaker. - * ARGUMENTS: - * Frequency = If 0, the speaker will be switched off, otherwise - * the speaker beeps with the specified frequency. - */ BOOLEAN -STDCALL -HalMakeBeep ( - ULONG Frequency - ) +NTAPI +HalMakeBeep(IN ULONG Frequency) { - UCHAR b; - ULONG flags; - - /* save flags and disable interrupts */ - Ki386SaveFlags(flags); - Ki386DisableInterrupts(); + UCHAR Data; + ULONG Divider; + BOOLEAN Result = TRUE; - /* speaker off */ - b = READ_PORT_UCHAR((PUCHAR)PORT_B); - WRITE_PORT_UCHAR((PUCHAR)PORT_B, (UCHAR)(b & 0xFC)); + /* FIXME: Acquire CMOS Lock */ + /* Turn the register off */ + Data = READ_PORT_UCHAR(PORT_B); + WRITE_PORT_UCHAR(PORT_B, Data & 0xFC); + + /* Check if we have a frequency */ if (Frequency) { - ULONG Divider = CLOCKFREQ / Frequency; + /* Set the divider */ + Divider = CLOCKFREQ / Frequency; + /* Check if it's too large */ if (Divider > 0x10000) { - /* restore flags */ - Ki386RestoreFlags(flags); - - return FALSE; + /* Fail */ + Result = FALSE; + goto Cleanup; } - /* set timer divider */ - WRITE_PORT_UCHAR((PUCHAR)TIMER3, 0xB6); - WRITE_PORT_UCHAR((PUCHAR)TIMER2, (UCHAR)(Divider & 0xFF)); - WRITE_PORT_UCHAR((PUCHAR)TIMER2, (UCHAR)((Divider>>8) & 0xFF)); + /* Set timer divider */ + WRITE_PORT_UCHAR(TIMER3, 0xB6); + WRITE_PORT_UCHAR(TIMER2, (UCHAR)(Divider & 0xFF)); + WRITE_PORT_UCHAR(TIMER2, (UCHAR)((Divider>>8) & 0xFF)); - /* speaker on */ - WRITE_PORT_UCHAR((PUCHAR)PORT_B, (UCHAR)(READ_PORT_UCHAR((PUCHAR)PORT_B) | 0x03)); + /* Turn speaker on */ + WRITE_PORT_UCHAR(PORT_B, READ_PORT_UCHAR(PORT_B) | 0x03); } - /* restore flags */ - Ki386RestoreFlags(flags); +Cleanup: + /* FIXME: Release hardware lock */ - return TRUE; + /* Return result */ + return Result; }

18 years, 1 month

[ion] 24741: - Add some more descriptive comments to HalpReboot (and rename it from HalReboot) since some of the operations lacked comments. - Stall the CPU after each I/O command to simulate I/O delay. - Flush write buffers before rebooting. - Refactor sending the reset command since it's not always a matter of using the keyboard port. - HalReturnToFirmware does a HalpReboot no matter what parameter is sent.

by ion＠svn.reactos.org

Author: ion Date: Mon Nov 13 07:33:45 2006 New Revision: 24741 URL: http://svn.reactos.org/svn/reactos?rev=24741&view=rev Log: - Add some more descriptive comments to HalpReboot (and rename it from HalReboot) since some of the operations lacked comments. - Stall the CPU after each I/O command to simulate I/O delay. - Flush write buffers before rebooting. - Refactor sending the reset command since it's not always a matter of using the keyboard port. - HalReturnToFirmware does a HalpReboot no matter what parameter is sent. Modified: trunk/reactos/hal/halx86/generic/reboot.c Modified: trunk/reactos/hal/halx86/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halx86/generic/reboot.c (original) +++ trunk/reactos/hal/halx86/generic/reboot.c Mon Nov 13 07:33:45 2006 @@ -1,70 +1,98 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/hal/x86/reboot.c - * PURPOSE: Reboot functions. - * PROGRAMMER: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) - * UPDATE HISTORY: - * Created 11/10/99 + * PURPOSE: Reboot functions + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) */ + +/* INCLUDES ******************************************************************/ #include <hal.h> #define NDEBUG #include <debug.h> +/* PRIVATE FUNCTIONS *********************************************************/ -static VOID -HalReboot (VOID) +VOID +NTAPI +HalpWriteResetCommand(VOID) { - char data; + /* Generate RESET signal via keyboard controller */ + WRITE_PORT_UCHAR((PUCHAR)0x64, 0xFE); +}; + +VOID +NTAPI +HalpReboot(VOID) +{ + UCHAR Data; extern PVOID HalpZeroPageMapping; - /* enable warm reboot */ - ((PUCHAR)HalpZeroPageMapping)[0x472] = 0x34; - ((PUCHAR)HalpZeroPageMapping)[0x473] = 0x12; + /* Enable warm reboot */ + ((PUSHORT)HalpZeroPageMapping)[0x472] = 0x1234; - /* disable interrupts */ - Ki386DisableInterrupts(); + /* FIXME: Lock CMOS Access */ + /* Disable interrupts */ + _disable(); - /* disable periodic interrupt (RTC) */ - WRITE_PORT_UCHAR((PUCHAR)0x70, 0x0b); - data = READ_PORT_UCHAR((PUCHAR)0x71); - WRITE_PORT_UCHAR((PUCHAR)0x71, (UCHAR)(data & 0xbf)); + /* Setup control register B */ + WRITE_PORT_UCHAR((PUCHAR)0x70, 0x0B); + KeStallExecutionProcessor(1); - /* */ - WRITE_PORT_UCHAR((PUCHAR)0x70, 0x0a); - data = READ_PORT_UCHAR((PUCHAR)0x71); - WRITE_PORT_UCHAR((PUCHAR)0x71, (UCHAR)((data & 0xf0) | 0x06)); + /* Read periodic register and clear the interrupt enable */ + Data = READ_PORT_UCHAR((PUCHAR)0x71); + WRITE_PORT_UCHAR((PUCHAR)0x71, Data & 0xBF); + KeStallExecutionProcessor(1); - /* */ + /* Setup control register A */ + WRITE_PORT_UCHAR((PUCHAR)0x70, 0x0A); + KeStallExecutionProcessor(1); + + /* Read divider rate and reset it */ + Data = READ_PORT_UCHAR((PUCHAR)0x71); + WRITE_PORT_UCHAR((PUCHAR)0x71, (Data & 0xF0) | 0x06); + KeStallExecutionProcessor(1); + + /* Reset neutral CMOS address */ WRITE_PORT_UCHAR((PUCHAR)0x70, 0x15); + KeStallExecutionProcessor(1); - /* generate RESET signal via keyboard controller */ - WRITE_PORT_UCHAR((PUCHAR)0x64, 0xfe); + /* Flush write buffers and send the reset command */ + KeFlushWriteBuffer(); + HalpWriteResetCommand(); - /* stop the processor */ -#if 1 + /* Halt the CPU */ Ki386HaltProcessor(); - for(;;); -#endif } +/* PUBLIC FUNCTIONS **********************************************************/ -VOID STDCALL -HalReturnToFirmware ( - FIRMWARE_REENTRY Action - ) +/* + * @implemented + */ +VOID +NTAPI +HalReturnToFirmware(IN FIRMWARE_REENTRY Action) { - if (Action == HalHaltRoutine) + /* Check the kind of action this is */ + switch (Action) { - DbgPrint ("HalReturnToFirmware called!\n"); - DbgBreakPoint (); - } - else if (Action == HalRebootRoutine) - { - HalReboot (); + /* All recognized actions */ + case HalHaltRoutine: + case HalRebootRoutine: + + /* Call the internal reboot function */ + HalpReboot(); + + /* Anything else */ + default: + + /* Print message and break */ + DbgPrint("HalReturnToFirmware called!\n"); + DbgBreakPoint(); } }

18 years, 1 month

[ion] 24740: - Re-implement messy portio.c by using MSVC-compatible intrinsics instead. 20 lines of code become 1, yay!

by ion＠svn.reactos.org

Author: ion Date: Mon Nov 13 07:31:39 2006 New Revision: 24740 URL: http://svn.reactos.org/svn/reactos?rev=24740&view=rev Log: - Re-implement messy portio.c by using MSVC-compatible intrinsics instead. 20 lines of code become 1, yay! Modified: trunk/reactos/hal/halx86/generic/portio.c trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/hal/halx86/generic/portio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/portio.… ============================================================================== --- trunk/reactos/hal/halx86/generic/portio.c (original) +++ trunk/reactos/hal/halx86/generic/portio.c Mon Nov 13 07:31:39 2006 @@ -1,343 +1,121 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/portio.c - * PURPOSE: Port I/O functions - * PROGRAMMER: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) - * UPDATE HISTORY: - * Created 18/10/99 - */ +/* +* PROJECT: ReactOS HAL +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/hal/x86/portio.c +* PURPOSE: I/O Functions for access to ports +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ + +/* INCLUDES ******************************************************************/ #include <hal.h> #define NDEBUG #include <debug.h> -/* FUNCTIONS ****************************************************************/ +// +// HAL Port to Inlined Port +// +#define H2I(Port) PtrToUshort(Port) -/* - * This file contains the definitions for the x86 IO instructions - * inb/inw/inl/outb/outw/outl and the "string versions" of the same - * (insb/insw/insl/outsb/outsw/outsl). You can also use "pausing" - * versions of the single-IO instructions (inb_p/inw_p/..). - * - * This file is not meant to be obfuscating: it's just complicated - * to (a) handle it all in a way that makes gcc able to optimize it - * as well as possible and (b) trying to avoid writing the same thing - * over and over again with slight variations and possibly making a - * mistake somewhere. - */ +/* FUNCTIONS *****************************************************************/ -/* - * Thanks to James van Artsdalen for a better timing-fix than - * the two short jumps: using outb's to a nonexistent port seems - * to guarantee better timings even on fast machines. - * - * On the other hand, I'd like to be sure of a non-existent port: - * I feel a bit unsafe about using 0x80 (should be safe, though) - * - * Linus - */ - -#if defined(__GNUC__) - -#ifdef SLOW_IO_BY_JUMPING -#define __SLOW_DOWN_IO __asm__ __volatile__("jmp 1f\n1:\tjmp 1f\n1:") -#else -#define __SLOW_DOWN_IO __asm__ __volatile__("outb %al,$0x80") -#endif - -#elif defined(_MSC_VER) - -#ifdef SLOW_IO_BY_JUMPING -#define __SLOW_DOWN_IO __asm jmp 1f __asm jmp 1f 1f: -#else -#define __SLOW_DOWN_IO __asm out 0x80, al -#endif - -#else -#error Unknown compiler for inline assembler -#endif - - -#ifdef REALLY_SLOW_IO -#define SLOW_DOWN_IO { __SLOW_DOWN_IO; __SLOW_DOWN_IO; __SLOW_DOWN_IO; __SLOW_DOWN_IO; } -#else -#define SLOW_DOWN_IO __SLOW_DOWN_IO -#endif - -VOID STDCALL -READ_PORT_BUFFER_UCHAR (PUCHAR Port, - PUCHAR Buffer, - ULONG Count) +VOID +NTAPI +READ_PORT_BUFFER_UCHAR(IN PUCHAR Port, + OUT PUCHAR Buffer, + IN ULONG Count) { -#if defined(__GNUC__) - __asm__ __volatile__ ("cld ; rep ; insb\n\t" - : "=D" (Buffer), "=c" (Count) - : "d" (Port),"0" (Buffer),"1" (Count)); -#elif defined(_MSC_VER) - __asm - { - mov edx, Port - mov edi, Buffer - mov ecx, Count - cld - rep ins byte ptr[edi], dx - } -#else -#error Unknown compiler for inline assembler -#endif + __inbytestring(H2I(Port), Buffer, Count); } -VOID STDCALL -READ_PORT_BUFFER_USHORT (PUSHORT Port, - PUSHORT Buffer, - ULONG Count) +VOID +NTAPI +READ_PORT_BUFFER_USHORT(IN PUSHORT Port, + OUT PUSHORT Buffer, + IN ULONG Count) { -#if defined(__GNUC__) - __asm__ __volatile__ ("cld ; rep ; insw" - : "=D" (Buffer), "=c" (Count) - : "d" (Port),"0" (Buffer),"1" (Count)); -#elif defined(_MSC_VER) - __asm - { - mov edx, Port - mov edi, Buffer - mov ecx, Count - cld - rep ins word ptr[edi], dx - } -#else -#error Unknown compiler for inline assembler -#endif + __inwordstring(H2I(Port), Buffer, Count); } -VOID STDCALL -READ_PORT_BUFFER_ULONG (PULONG Port, - PULONG Buffer, - ULONG Count) +VOID +NTAPI +READ_PORT_BUFFER_ULONG(IN PULONG Port, + OUT PULONG Buffer, + IN ULONG Count) { -#if defined(__GNUC__) - __asm__ __volatile__ ("cld ; rep ; insl" - : "=D" (Buffer), "=c" (Count) - : "d" (Port),"0" (Buffer),"1" (Count)); -#elif defined(_MSC_VER) - __asm - { - mov edx, Port - mov edi, Buffer - mov ecx, Count - cld - rep ins dword ptr[edi], dx - } -#else -#error Unknown compiler for inline assembler -#endif + __indwordstring(H2I(Port), Buffer, Count); } -UCHAR STDCALL -READ_PORT_UCHAR (PUCHAR Port) +UCHAR +NTAPI +READ_PORT_UCHAR(IN PUCHAR Port) { - UCHAR Value; - -#if defined(__GNUC__) - __asm__("inb %w1, %0\n\t" - : "=a" (Value) - : "d" (Port)); -#elif defined(_MSC_VER) - __asm - { - mov edx, Port - in al, dx - mov Value, al - } -#else -#error Unknown compiler for inline assembler -#endif - - SLOW_DOWN_IO; - return(Value); + return __inbyte(H2I(Port)); } -USHORT STDCALL -READ_PORT_USHORT (PUSHORT Port) +USHORT +NTAPI +READ_PORT_USHORT(IN PUSHORT Port) { - USHORT Value; - -#if defined(__GNUC__) - __asm__("inw %w1, %0\n\t" - : "=a" (Value) - : "d" (Port)); -#elif defined(_MSC_VER) - __asm - { - mov edx, Port - in ax, dx - mov Value, ax - } -#else -#error Unknown compiler for inline assembler -#endif - SLOW_DOWN_IO; - return(Value); + return __inword(H2I(Port)); } -ULONG STDCALL -READ_PORT_ULONG (PULONG Port) +ULONG +NTAPI +READ_PORT_ULONG(IN PULONG Port) { - ULONG Value; - -#if defined(__GNUC__) - __asm__("inl %w1, %0\n\t" - : "=a" (Value) - : "d" (Port)); -#elif defined(_MSC_VER) - __asm - { - mov edx, Port - in eax, dx - mov Value, eax - } -#else -#error Unknown compiler for inline assembler -#endif - SLOW_DOWN_IO; - return(Value); + return __indword(H2I(Port)); } -VOID STDCALL -WRITE_PORT_BUFFER_UCHAR (PUCHAR Port, - PUCHAR Buffer, - ULONG Count) +VOID +NTAPI +WRITE_PORT_BUFFER_UCHAR(IN PUCHAR Port, + IN PUCHAR Buffer, + IN ULONG Count) { -#if defined(__GNUC__) - __asm__ __volatile__ ("cld ; rep ; outsb" - : "=S" (Buffer), "=c" (Count) - : "d" (Port),"0" (Buffer),"1" (Count)); -#elif defined(_MSC_VER) - __asm - { - mov edx, Port - mov esi, Buffer - mov ecx, Count - cld - rep outs - } -#else -#error Unknown compiler for inline assembler -#endif + __outbytestring(H2I(Port), Buffer, Count); } -VOID STDCALL -WRITE_PORT_BUFFER_USHORT (PUSHORT Port, - PUSHORT Buffer, - ULONG Count) +VOID +NTAPI +WRITE_PORT_BUFFER_USHORT(IN PUSHORT Port, + IN PUSHORT Buffer, + IN ULONG Count) { -#if defined(__GNUC__) - __asm__ __volatile__ ("cld ; rep ; outsw" - : "=S" (Buffer), "=c" (Count) - : "d" (Port),"0" (Buffer),"1" (Count)); -#elif defined(_MSC_VER) - __asm - { - mov edx, Port - mov esi, Buffer - mov ecx, Count - cld - rep outsw - } -#else -#error Unknown compiler for inline assembler -#endif + __outwordstring(H2I(Port), Buffer, Count); } -VOID STDCALL -WRITE_PORT_BUFFER_ULONG (PULONG Port, - PULONG Buffer, - ULONG Count) +VOID +NTAPI +WRITE_PORT_BUFFER_ULONG(IN PULONG Port, + IN PULONG Buffer, + IN ULONG Count) { -#if defined(__GNUC__) - __asm__ __volatile__ ("cld ; rep ; outsl" - : "=S" (Buffer), "=c" (Count) - : "d" (Port),"0" (Buffer),"1" (Count)); -#elif defined(_MSC_VER) - __asm - { - mov edx, Port - mov esi, Buffer - mov ecx, Count - cld - rep outsd - } -#else -#error Unknown compiler for inline assembler -#endif + __outdwordstring(H2I(Port), Buffer, Count); } -VOID STDCALL -WRITE_PORT_UCHAR (PUCHAR Port, - UCHAR Value) +VOID +NTAPI +WRITE_PORT_UCHAR(IN PUCHAR Port, + IN UCHAR Value) { -#if defined(__GNUC__) - __asm__("outb %0, %w1\n\t" - : - : "a" (Value), - "d" (Port)); -#elif defined(_MSC_VER) - __asm - { - mov edx, Port - mov al, Value - out dx,al - } -#else -#error Unknown compiler for inline assembler -#endif - SLOW_DOWN_IO; + __outbyte(H2I(Port), Value); } -VOID STDCALL -WRITE_PORT_USHORT (PUSHORT Port, - USHORT Value) +VOID +NTAPI +WRITE_PORT_USHORT(IN PUSHORT Port, + IN USHORT Value) { -#if defined(__GNUC__) - __asm__("outw %0, %w1\n\t" - : - : "a" (Value), - "d" (Port)); -#elif defined(_MSC_VER) - __asm - { - mov edx, Port - mov ax, Value - out dx,ax - } -#else -#error Unknown compiler for inline assembler -#endif - SLOW_DOWN_IO; + __outword(H2I(Port), Value); } -VOID STDCALL -WRITE_PORT_ULONG (PULONG Port, - ULONG Value) +VOID +NTAPI +WRITE_PORT_ULONG(IN PULONG Port, + IN ULONG Value) { -#if defined(__GNUC__) - __asm__("outl %0, %w1\n\t" - : - : "a" (Value), - "d" (Port)); -#elif defined(_MSC_VER) - __asm - { - mov edx, Port - mov eax, Value - out dx,eax - } -#else -#error Unknown compiler for inline assembler -#endif - SLOW_DOWN_IO; + __outdword(H2I(Port), Value); } /* EOF */ Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h (original) +++ trunk/reactos/include/ndk/halfuncs.h Mon Nov 13 07:31:39 2006 @@ -31,8 +31,8 @@ // The DDK steals these away from you. // #ifdef _MSC_VER -void _enable(void); -void _disable(void); +//void _enable(void); +//void _disable(void); #pragma intrinsic(_enable) #pragma intrinsic(_disable) #endif

18 years, 1 month

[ion] 24739: - Fix a typo in DbgkCreateThread which caused a boot-time crash/regression.

by ion＠svn.reactos.org

Author: ion Date: Mon Nov 13 04:47:10 2006 New Revision: 24739 URL: http://svn.reactos.org/svn/reactos?rev=24739&view=rev Log: - Fix a typo in DbgkCreateThread which caused a boot-time crash/regression. Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Mon Nov 13 04:47:10 2006 @@ -169,7 +169,7 @@ /* Fail if we have no port */ DebugPort = Process->DebugPort; - if (DebugPort) return; + if (!DebugPort) return; /* Check if create was not already reported */ if (!(ProcessFlags & PSF_CREATE_REPORTED_BIT))

18 years, 1 month

[ion] 24738: - Fix build error.

by ion＠svn.reactos.org

Author: ion Date: Mon Nov 13 02:32:11 2006 New Revision: 24738 URL: http://svn.reactos.org/svn/reactos?rev=24738&view=rev Log: - Fix build error. Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h (original) +++ trunk/reactos/include/ndk/mmtypes.h Mon Nov 13 02:32:11 2006 @@ -646,7 +646,7 @@ typedef struct _DRIVER_SPECIFIED_VERIFIER_THUNKS { LIST_ENTRY ListEntry; - PLDR_DATA_TABLE_ENTRY DataTableEntry; + struct _LDR_DATA_TABLE_ENTRY *DataTableEntry; ULONG NumberOfThunks; } DRIVER_SPECIFIED_VERIFIER_THUNKS, *PDRIVER_SPECIFIED_VERIFIER_THUNKS;

18 years, 1 month

← Newer
1
...
24
25
26
27
28
29
30
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2006