Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[greatlrd] 19422: implement WaveThreadSetData
by greatlrd＠svn.reactos.com 21 Nov '05

21 Nov '05

implement WaveThreadSetData Modified: trunk/reactos/lib/mmdrv/wave.c _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-11-21 20:46:55 UTC (rev 19421) +++ trunk/reactos/lib/mmdrv/wave.c 2005-11-21 20:56:50 UTC (rev 19422) @@ -102,7 +102,33 @@ break; case WaveThreadSetData: - DPRINT("UNIMPLMENENT WaveThreadGetData "); + { + OVERLAPPED Overlap; + DWORD BytesReturned; + memset((PVOID)&Overlap, 0, sizeof(Overlap)); + Overlap.hEvent = pClient->Event; + + if (!DeviceIoControl(pClient->hDev, pClient->AuxParam.GetSetData.Function, + pClient->AuxParam.GetSetData.pData, pClient->AuxParam.GetSetData.DataLen, + NULL, 0, &BytesReturned, &Overlap)) + { + DWORD cbTransfer; + if (GetLastError() == ERROR_IO_PENDING) + { + if (!GetOverlappedResult(pClient->hDev, &Overlap, &cbTransfer, TRUE)) + pClient->AuxReturnCode = TranslateStatus(); + } + else + pClient->AuxReturnCode = TranslateStatus(); + + } + else + { + while (SleepEx(0, TRUE) == WAIT_IO_COMPLETION) {} + + pClient->AuxReturnCode = MMSYSERR_NOERROR; + } + } break; case WaveThreadBreakLoop:

1 0

[navaraf] 19421: Generate .dsp files with matching !IF/!ELSEIF and !ENDIF directives to make NMAKE accept them.
by navaraf＠svn.reactos.com 21 Nov '05

21 Nov '05

Generate .dsp files with matching !IF/!ELSEIF and !ENDIF directives to make NMAKE accept them. Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-11-21 20:41:34 UTC (rev 19420) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-11-21 20:46:55 UTC (rev 19421) @@ -261,26 +261,21 @@ if ( !lib && !exe ) fprintf ( OUT, "MTL=midl.exe\r\n" ); fprintf ( OUT, "RSC=rc.exe\r\n" ); - int n = 0; - std::string output_dir; for ( size_t icfg = 0; icfg < cfgs.size(); icfg++ ) { std::string& cfg = cfgs[icfg]; - if ( icfg ) + if ( icfg == 0 ) { - if ( n == 0 ) - { - fprintf ( OUT, "!IF \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() ); - fprintf ( OUT, "\r\n" ); - } - else - { - fprintf ( OUT, "\r\n" ); - fprintf ( OUT, "!ELSEIF \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() ); - fprintf ( OUT, "\r\n" ); - } + fprintf ( OUT, "!IF \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() ); + fprintf ( OUT, "\r\n" ); } + else + { + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "!ELSEIF \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() ); + fprintf ( OUT, "\r\n" ); + } bool debug = !strstr ( cfg.c_str(), "Release" ); bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) ); @@ -569,8 +564,6 @@ fprintf ( OUT, "# ADD BASE LIB32 /nologo\r\n" ); fprintf ( OUT, "# ADD LIB32 /nologo\r\n" ); } - - n++; } if ( cfgs.size() != 0 )

1 0

[greatlrd] 19420: waveThread is not longer stub it is alive and do not have all case implement
by greatlrd＠svn.reactos.com 21 Nov '05

21 Nov '05

waveThread is not longer stub it is alive and do not have all case implement Modified: trunk/reactos/lib/mmdrv/wave.c _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-11-21 19:19:13 UTC (rev 19419) +++ trunk/reactos/lib/mmdrv/wave.c 2005-11-21 20:41:34 UTC (rev 19420) @@ -18,8 +18,16 @@ #include <debug.h> #define WHDR_COMPLETE 0x80000000 +#define MAX_BUFFER_SIZE 8192 +#define MAX_WAVE_BYTES 5*MAX_BUFFER_SIZE + PWAVEALLOC WaveLists; +static MMRESULT waveReadWrite(PWAVEALLOC pClient); +void wavePartialOvl(DWORD dwErrorCode, DWORD BytesTransferred, LPOVERLAPPED pOverlapped); +void waveOvl(DWORD dwErrorCode, DWORD BytesTransferred, LPOVERLAPPED pOverlapped); +void waveLoopOvl(DWORD dwErrorCode, DWORD BytesTransferred, LPOVERLAPPED pOverlapped); +void waveBreakOvl(DWORD dwErrorCode, DWORD BytesTransferred, LPOVERLAPPED pOverlapped); /* ============================ * INTERNAL @@ -145,7 +153,7 @@ } } - //waveStart; + waveReadWrite(pClient); if (Terminate) return 1; SetEvent(pClient->AuxEvent2); @@ -174,7 +182,7 @@ } } - //waveStart; + waveReadWrite(pClient); } } @@ -183,10 +191,215 @@ } +static MMRESULT waveReadWrite(PWAVEALLOC pClient) +{ + DWORD dwSize; + BOOL Result; + + while (pClient->NextBuffer) + { + PWAVEHDR pHdr; + pHdr = pClient->NextBuffer; + + //FIXME + //assert(!(pHdr->dwFlags & (WHDR_DONE | WHDR_COMPLETE))); + //assert(pClient->DeviceQueue != NULL); + + dwSize = pHdr->dwBufferLength - pClient->BufferPosition; + if (dwSize > MAX_BUFFER_SIZE) + dwSize = MAX_BUFFER_SIZE; + + if (dwSize + pClient->BytesOutstanding <= MAX_WAVE_BYTES) + { + PWAVEOVL pWaveOvl; + + if (pClient->BufferPosition == 0) + { + if (pClient->NextBuffer && (pClient->NextBuffer->dwFlags & WHDR_BEGINLOOP) && + pClient->NextBuffer != pClient->LoopHead) + { + pClient->LoopCount = pClient->NextBuffer->dwLoops; + pClient->LoopHead = pClient->NextBuffer; + if (pClient->LoopCount > 0) + pClient->LoopCount--; + } + + if (pClient->LoopCount == 0) + pClient->LoopHead = NULL; + } + + pWaveOvl = (PWAVEOVL)HeapAlloc(Heap, HEAP_ZERO_MEMORY, sizeof(*pWaveOvl)); + + if (pWaveOvl == NULL) + return MMSYSERR_NOMEM; + + pWaveOvl->WaveHdr = pHdr; + + if (pClient->DeviceType == WaveOutDevice) + { + Result = WriteFileEx(pClient->hDev, + (PBYTE)pHdr->lpData + pClient->BufferPosition, + dwSize, + (LPOVERLAPPED)pWaveOvl, + (LPOVERLAPPED_COMPLETION_ROUTINE) + (pHdr->dwBufferLength != + pClient->BufferPosition + dwSize ? wavePartialOvl : NULL != pClient->LoopHead ? + waveLoopOvl : waveOvl)); + } + else if (pClient->DeviceType == WaveInDevice) + { + Result = ReadFileEx(pClient->hDev, (PBYTE)pHdr->lpData + pClient->BufferPosition, + dwSize, (LPOVERLAPPED)pWaveOvl, + (LPOVERLAPPED_COMPLETION_ROUTINE) + (pHdr->dwBufferLength != + pClient->BufferPosition + dwSize ? wavePartialOvl : NULL != pClient->LoopHead ? + waveLoopOvl : waveOvl)); + } + + + if (!Result && GetLastError() != ERROR_IO_PENDING) + { + HeapFree(Heap, 0, (LPSTR)pWaveOvl); + + if (pClient->BytesOutstanding == 0) + { + PWAVEHDR pHdr; + for (pHdr = pClient->DeviceQueue; pHdr != NULL; pHdr = pHdr->lpNext) + { + pHdr->dwFlags |= WHDR_COMPLETE; + } + + pClient->NextBuffer = NULL; + pClient->BufferPosition = 0; + + } + return TranslateStatus(); + + } + else + { + pClient->BufferPosition += dwSize; + pClient->BytesOutstanding += dwSize; + if (pClient->BufferPosition == pHdr->dwBufferLength) + { + + if (!pClient->LoopHead || !(pHdr->dwFlags & WHDR_ENDLOOP)) + pClient->NextBuffer = pHdr->lpNext; + else + { + if (pClient->LoopCount != 0) + { + pClient->NextBuffer = pClient->LoopHead; + pClient->LoopCount--; + } + else + { + pClient->DummyWaveOvl.WaveHdr = pClient->LoopHead; + + Result = WriteFileEx(pClient->hDev, (PVOID)pHdr->lpData, 0, + &pClient->DummyWaveOvl.Ovl, + (LPOVERLAPPED_COMPLETION_ROUTINE)waveBreakOvl); + + if (Result || GetLastError() == ERROR_IO_PENDING) + { + pClient->NextBuffer = pHdr->lpNext; + pClient->LoopHead = NULL; + + } + } + } + pClient->BufferPosition = 0; + } + } + + + } + else + break; + } + return MMSYSERR_NOERROR; +} + +void wavePartialOvl(DWORD dwErrorCode, DWORD BytesTransferred, LPOVERLAPPED pOverlapped) +{ + LPWAVEHDR pHdr; + PWAVEALLOC pClient; + + pHdr = ((PWAVEOVL)pOverlapped)->WaveHdr; + pClient = (PWAVEALLOC)pHdr->reserved; + + + /* FIXME + Assert(pHdr->dwFlags & WHDR_INQUEUE); + Assert(!(pHdr->dwFlags & WHDR_COMPLETE)); + */ + + pClient->BytesOutstanding -= MAX_BUFFER_SIZE; + + if (pClient->DeviceType == WaveInDevice) + pHdr->dwBytesRecorded += BytesTransferred; + HeapFree(Heap, 0, (LPSTR)pOverlapped); +} + +void waveBreakOvl(DWORD dwErrorCode, DWORD BytesTransferred, LPOVERLAPPED pOverlapped) +{ + ((PWAVEOVL)pOverlapped)->WaveHdr->dwFlags |= WHDR_COMPLETE; +} + +void waveLoopOvl(DWORD dwErrorCode, DWORD BytesTransferred, LPOVERLAPPED pOverlapped) +{ + DWORD dwFlags; + PWAVEHDR pHdr; + + pHdr = ((PWAVEOVL)pOverlapped)->WaveHdr; + dwFlags = pHdr->dwFlags; + waveOvl(dwErrorCode, BytesTransferred, pOverlapped); + pHdr->dwFlags = dwFlags; +} + +void waveOvl(DWORD dwErrorCode, DWORD BytesTransferred, LPOVERLAPPED pOverlapped) +{ + PWAVEHDR pHdr; + PWAVEALLOC pClient; + + pHdr = ((PWAVEOVL)pOverlapped)->WaveHdr; + pClient = (PWAVEALLOC)pHdr->reserved; + + /* FIXME + Assert(pHdr->dwFlags & WHDR_INQUEUE); + Assert(!(pHdr->dwFlags & WHDR_COMPLETE)); + */ + + pHdr->dwFlags |= WHDR_COMPLETE; + + if (pHdr->dwFlags & WHDR_BEGINLOOP) + { + PWAVEHDR pHdrSearch; + for (pHdrSearch = pClient->DeviceQueue ; pHdrSearch != pHdr ; pHdrSearch = pHdrSearch->lpNext) + { + //Assert(pHdrSearch != NULL); + pHdrSearch->dwFlags |= WHDR_COMPLETE; + } + } + + if (pHdr->dwBufferLength) + pClient->BytesOutstanding -= (pHdr->dwBufferLength - 1) % MAX_BUFFER_SIZE + 1; + + if (pClient->DeviceType == WaveInDevice) + pHdr->dwBytesRecorded += BytesTransferred; + + HeapFree(Heap, 0, (LPSTR)pOverlapped); + +} + + + + + static MMRESULT OpenWaveDevice(UINT DeviceType, DWORD id, DWORD dwUser,

1 0

[gvg] 19419: avifil32 vendor import
by gvg＠svn.reactos.com 21 Nov '05

21 Nov '05

avifil32 vendor import Added: trunk/reactos/lib/avifil32/ Deleted: trunk/reactos/lib/avifil32/.cvsignore Deleted: trunk/reactos/lib/avifil32/Makefile.in Added: trunk/reactos/lib/avifil32/avifil32.xml Modified: trunk/reactos/lib/directory.xml _____ Copied: trunk/reactos/lib/avifil32 (from rev 19418, vendor/wine/dlls/avifil32/current) Property changes on: trunk/reactos/lib/avifil32 ___________________________________________________________________ Name: svn:ignore + GNUmakefile _____ Deleted: trunk/reactos/lib/avifil32/.cvsignore --- vendor/wine/dlls/avifil32/current/.cvsignore 2005-11-21 19:15:37 UTC (rev 19418) +++ trunk/reactos/lib/avifil32/.cvsignore 2005-11-21 19:19:13 UTC (rev 19419) @@ -1,3 +0,0 @@ -Makefile -libavifil32.def -rsrc.res _____ Deleted: trunk/reactos/lib/avifil32/Makefile.in --- vendor/wine/dlls/avifil32/current/Makefile.in 2005-11-21 19:15:37 UTC (rev 19418) +++ trunk/reactos/lib/avifil32/Makefile.in 2005-11-21 19:19:13 UTC (rev 19419) @@ -1,30 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = avifil32.dll -IMPORTLIB = libavifil32.$(IMPLIBEXT) -IMPORTS = msacm32 msvfw32 winmm ole32 user32 advapi32 kernel32 ntdll -EXTRALIBS = -luuid - -C_SRCS = \ - acmstream.c \ - api.c \ - avifile.c \ - editstream.c \ - extrachunk.c \ - factory.c \ - getframe.c \ - icmstream.c \ - regsvr.c \ - tmpfile.c \ - wavfile.c - -SPEC_SRCS16 = avifile.spec - -RC_SRCS = \ - rsrc.rc - -@MAKE_DLL_RULES@ - -### Dependencies: _____ Added: trunk/reactos/lib/avifil32/avifil32.xml --- vendor/wine/dlls/avifil32/current/avifil32.xml 2005-11-21 19:15:37 UTC (rev 19418) +++ trunk/reactos/lib/avifil32/avifil32.xml 2005-11-21 19:19:13 UTC (rev 19419) @@ -0,0 +1,28 @@ +<module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll"> + <importlibrary definition="avifil32.spec.def" /> + <include base="avifil32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x501</define> + <library>uuid</library> + <library>ntdll</library> + <library>winmm</library> + <library>ole32</library> + <library>msvfw32</library> + <library>msacm32</library> + <library>kernel32</library> + <library>wine</library> + <file>acmstream.c</file> + <file>api.c</file> + <file>avifile.c</file> + <file>editstream.c</file> + <file>extrachunk.c</file> + <file>factory.c</file> + <file>getframe.c</file> + <file>icmstream.c</file> + <file>regsvr.c</file> + <file>tmpfile.c</file> + <file>wavfile.c</file> + <file>rsrc.rc</file> + <file>avifil32.spec</file> +</module> Property changes on: trunk/reactos/lib/avifil32/avifil32.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-11-21 19:15:37 UTC (rev 19418) +++ trunk/reactos/lib/directory.xml 2005-11-21 19:19:13 UTC (rev 19419) @@ -17,6 +17,9 @@ <directory name="authz"> <xi:include href="authz/authz.xml" /> </directory> +<directory name="avifil32"> + <xi:include href="avifil32/avifil32.xml" /> +</directory> <directory name="cabinet"> <xi:include href="cabinet/cabinet.xml" /> </directory>

1 0

[gvg] 19418: Remove avifil32 in preparation of vendor import
by gvg＠svn.reactos.com 21 Nov '05

21 Nov '05

Remove avifil32 in preparation of vendor import Deleted: trunk/reactos/lib/avifil32/ Modified: trunk/reactos/lib/directory.xml _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-11-21 19:01:12 UTC (rev 19417) +++ trunk/reactos/lib/directory.xml 2005-11-21 19:15:37 UTC (rev 19418) @@ -17,9 +17,6 @@ <directory name="authz"> <xi:include href="authz/authz.xml" /> </directory> -<directory name="avifil32"> - <xi:include href="avifil32/avifil32.xml" /> -</directory> <directory name="cabinet"> <xi:include href="cabinet/cabinet.xml" /> </directory>

1 0

[gvg] 19417: - Set eol-style
by gvg＠svn.reactos.com 21 Nov '05

21 Nov '05

- Set eol-style - Tag Wine-0_9_1 Added: vendor/wine/dlls/avifil32/Wine-0_9_1/ _____ Copied: vendor/wine/dlls/avifil32/Wine-0_9_1 (from rev 19415, vendor/wine/dlls/avifil32/current) Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/acmstream.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/api.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifil32.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile_Cs.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile_De.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile_En.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile_Es.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile_Fr.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile_It.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile_Ja.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile_Nl.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile_No.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile_Pl.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile_Pt.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile_Ru.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile_Si.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/avifile_private.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/editstream.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/extrachunk.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/extrachunk.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/factory.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/getframe.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/icmstream.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/regsvr.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/rsrc.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/tmpfile.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/Wine-0_9_1/wavfile.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/acmstream.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/api.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifil32.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile_Cs.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile_De.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile_En.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile_Es.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile_Fr.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile_It.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile_Ja.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile_Nl.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile_No.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile_Pl.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile_Pt.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile_Ru.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile_Si.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/avifile_private.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/editstream.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/extrachunk.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/extrachunk.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/factory.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/getframe.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/icmstream.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/regsvr.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/rsrc.rc ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/tmpfile.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: vendor/wine/dlls/avifil32/current/wavfile.c ___________________________________________________________________ Name: svn:eol-style + native

1 0

[gvg] 19416: Remove Wine-0_9_1 in preparation of copy
by gvg＠svn.reactos.com 21 Nov '05

21 Nov '05

Remove Wine-0_9_1 in preparation of copy Deleted: vendor/wine/dlls/avifil32/Wine-0_9_1/

1 0

[gvg] 19415: Linux doesn't understand VOID
by gvg＠svn.reactos.com 21 Nov '05

21 Nov '05

Linux doesn't understand VOID Modified: trunk/reactos/tools/rbuild/global.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h _____ Modified: trunk/reactos/tools/rbuild/global.cpp --- trunk/reactos/tools/rbuild/global.cpp 2005-11-21 18:49:41 UTC (rev 19414) +++ trunk/reactos/tools/rbuild/global.cpp 2005-11-21 18:58:20 UTC (rev 19415) @@ -28,7 +28,7 @@ char cBadSep; -VOID +void InitializeEnvironment () { char *SepValue, *ExePostfixValue, *ExePrefixValue;; _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-11-21 18:49:41 UTC (rev 19414) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-11-21 18:58:20 UTC (rev 19415) @@ -801,7 +801,7 @@ }; -extern VOID +extern void InitializeEnvironment (); extern std::string

1 0

[greatlrd] 19414: adding code for waveTheard it is not complete yet
by greatlrd＠svn.reactos.com 21 Nov '05

21 Nov '05

adding code for waveTheard it is not complete yet Modified: trunk/reactos/lib/mmdrv/wave.c _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-11-21 18:38:09 UTC (rev 19413) +++ trunk/reactos/lib/mmdrv/wave.c 2005-11-21 18:49:41 UTC (rev 19414) @@ -17,17 +17,15 @@ #define NDEBUG #include <debug.h> -PWAVEALLOC WaveLists; +#define WHDR_COMPLETE 0x80000000 +PWAVEALLOC WaveLists; + /* ============================ * INTERNAL * functions start here * ============================ */ -static DWORD waveThread(LPVOID lpParameter) -{ - return MMSYSERR_NOERROR; -} MMRESULT GetDeviceCapabilities(DWORD ID, UINT DeviceType, LPBYTE pCaps, DWORD Size) @@ -69,6 +67,126 @@ return Result; } +static DWORD waveThread(LPVOID lpParameter) +{ + + PWAVEALLOC pClient; + BOOL Terminate; + + SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL); + SetEvent(pClient->AuxEvent2); + WaitForSingleObject(pClient->AuxEvent1, INFINITE); + + for (;;) + { + switch (pClient->AuxFunction) + { + case WaveThreadAddBuffer: + DPRINT("UNIMPLMENENT WaveThreadAddBuffer "); + break; + + case WaveThreadSetState: + DPRINT("UNIMPLMENENT WaveThreadSetState "); + break; + + case WaveThreadGetData: + DPRINT("UNIMPLMENENT WaveThreadGetData "); + break; + + case WaveThreadSetData: + DPRINT("UNIMPLMENENT WaveThreadGetData "); + break; + + case WaveThreadBreakLoop: + pClient->AuxReturnCode = MMSYSERR_NOERROR; + if (pClient->LoopHead) + pClient->LoopCount = 0; + break; + + case WaveThreadClose: + if (pClient->DeviceQueue != NULL) + pClient->AuxReturnCode = WAVERR_STILLPLAYING; + else + pClient->AuxReturnCode = MMSYSERR_NOERROR; + break; + + case WaveThreadTerminate: + Terminate = TRUE; + break; + + default: + DPRINT("WaveThread Error"); + break; + + } + + pClient->AuxFunction = WaveThreadInvalid; + + while (pClient->DeviceQueue && (pClient->DeviceQueue->dwFlags & WHDR_COMPLETE)) + { + PWAVEHDR pHdr; + PWAVEALLOC pWav; + + pHdr = pClient->DeviceQueue; + pClient->DeviceQueue = pHdr->lpNext; + + pHdr->dwFlags &= ~WHDR_COMPLETE; + pHdr->dwFlags &= ~WHDR_INQUEUE; + pHdr->lpNext = NULL; + pHdr->dwFlags |= WHDR_DONE; + + pWav = (PWAVEALLOC)pHdr->reserved; + + if (pWav->dwCallback) + { + DriverCallback(pWav->dwCallback, HIWORD(pWav->dwFlags), (HDRVR)pWav->hWave, + pClient->DeviceType == WaveOutDevice ? WOM_DONE : WIM_DATA, + pWav->dwInstance, (DWORD)pHdr, 0L); + } + } + + //waveStart; + + if (Terminate) return 1; + SetEvent(pClient->AuxEvent2); + while (WaitForSingleObjectEx(pClient->AuxEvent1, INFINITE, TRUE) == WAIT_IO_COMPLETION) + { + while (pClient->DeviceQueue && (pClient->DeviceQueue->dwFlags & WHDR_COMPLETE)) + { + PWAVEHDR pHdr; + PWAVEALLOC pWav; + + pHdr = pClient->DeviceQueue; + pClient->DeviceQueue = pHdr->lpNext; + + pHdr->dwFlags &= ~WHDR_COMPLETE; + pHdr->dwFlags &= ~WHDR_INQUEUE; + pHdr->lpNext = NULL; + pHdr->dwFlags |= WHDR_DONE; + + pWav = (PWAVEALLOC)pHdr->reserved; + + if (pWav->dwCallback) + { + DriverCallback(pWav->dwCallback, HIWORD(pWav->dwFlags), (HDRVR)pWav->hWave, + pClient->DeviceType == WaveOutDevice ? WOM_DONE : WIM_DATA, + pWav->dwInstance, (DWORD)pHdr, 0L); + } + } + + //waveStart; + } + } + + + return MMSYSERR_NOERROR; +} + + + + + + static MMRESULT OpenWaveDevice(UINT DeviceType, DWORD id, DWORD dwUser,

1 0

[ion] 19413: - Misc janitorial fixes by Brezenbak to fix some MSVC compile errors.
by ion＠svn.reactos.com 21 Nov '05

21 Nov '05

- Misc janitorial fixes by Brezenbak to fix some MSVC compile errors. Modified: trunk/reactos/ntoskrnl/ex/fmutex.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/fs/filelock.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/io/bootlog.c Modified: trunk/reactos/ntoskrnl/io/disk.c Modified: trunk/reactos/ntoskrnl/kd/kdio.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c Modified: trunk/reactos/ntoskrnl/ke/process.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/lpc/reply.c Modified: trunk/reactos/ntoskrnl/mm/cont.c Modified: trunk/reactos/ntoskrnl/mm/npool.c Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h Modified: trunk/reactos/ntoskrnl/ob/sdcache.c _____ Modified: trunk/reactos/ntoskrnl/ex/fmutex.c --- trunk/reactos/ntoskrnl/ex/fmutex.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/ex/fmutex.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -81,9 +81,9 @@ FASTCALL ExAcquireFastMutex(PFAST_MUTEX FastMutex) { + KIRQL OldIrql; ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); - KIRQL OldIrql; - + /* Raise IRQL to APC */ OldIrql = KfRaiseIrql(APC_LEVEL); @@ -180,8 +180,8 @@ FASTCALL ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) { + KIRQL OldIrql; ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); - KIRQL OldIrql; /* Raise to APC_LEVEL */ OldIrql = KfRaiseIrql(APC_LEVEL); _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -220,7 +220,7 @@ } } -inline +__inline VOID STDCALL ExecuteRuntimeAsserts(VOID) @@ -255,7 +255,7 @@ ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA); } -inline +__inline VOID STDCALL ParseAndCacheLoadedModules(VOID) @@ -303,7 +303,7 @@ } } -inline +__inline VOID STDCALL ParseCommandLine(PULONG MaxMem, _____ Modified: trunk/reactos/ntoskrnl/fs/filelock.c --- trunk/reactos/ntoskrnl/fs/filelock.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/fs/filelock.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -27,7 +27,7 @@ -inline BOOLEAN +__inline BOOLEAN IsOverlappingLock( PFILE_LOCK_INFO Lock, PLARGE_INTEGER StartOffset, @@ -48,7 +48,7 @@ } -inline BOOLEAN +__inline BOOLEAN IsSurroundingLock( PFILE_LOCK_INFO Lock, PLARGE_INTEGER StartOffset, _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-11-21 18:38:09 UTC (rev 19413) @@ -266,9 +266,11 @@ #define Ke386GetPageTableDirectory(X) \ __asm mov eax, cr3; \ __asm mov X, eax; -#define Ke386SetPageTableDirectory(X) \ - __asm mov eax, X; \ - __asm mov cr3, eax; +static __forceinline void Ke386SetPageTableDirectory(ULONG X) +{ + __asm mov eax, X + __asm mov cr3, eax +} #else #error Unknown compiler for inline assembler #endif _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-11-21 18:38:09 UTC (rev 19413) @@ -244,7 +244,7 @@ ); KIRQL -inline +__inline FASTCALL KeAcquireDispatcherDatabaseLock(VOID); @@ -363,7 +363,7 @@ ); VOID -inline +__inline FASTCALL KiSatisfyObjectWait( PDISPATCHER_HEADER Object, @@ -371,7 +371,7 @@ ); BOOLEAN -inline +__inline FASTCALL KiIsObjectSignaled( PDISPATCHER_HEADER Object, @@ -379,7 +379,7 @@ ); VOID -inline +__inline FASTCALL KiSatisifyMultipleObjectWaits(PKWAIT_BLOCK WaitBlock); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-11-21 18:38:09 UTC (rev 19413) @@ -255,7 +255,7 @@ #define ICI_SQ(SizeQuery, SizeSet, AlignmentQuery, AlignmentSet, Flags) \ { SizeQuery, SizeSet, AlignmentQuery, AlignmentSet, Flags } -static inline NTSTATUS +static __inline NTSTATUS DefaultSetInfoBufferCheck(UINT Class, const INFORMATION_CLASS_INFO *ClassList, UINT ClassListEntries, @@ -304,7 +304,7 @@ return Status; } -static inline NTSTATUS +static __inline NTSTATUS DefaultQueryInfoBufferCheck(UINT Class, const INFORMATION_CLASS_INFO *ClassList, UINT ClassListEntries, _____ Modified: trunk/reactos/ntoskrnl/io/bootlog.c --- trunk/reactos/ntoskrnl/io/bootlog.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/io/bootlog.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -310,8 +310,11 @@ ExReleaseResourceLite(&IopBootLogResource); return; } - +#if defined (__GNUC__) Status = IopWriteLogFile(L"ReactOS "KERNEL_VERSION_STR); +#elif defined (_MSC_VER) + Status = IopWriteLogFile("ReactOS "KERNEL_VERSION_STR); +#endif if (!NT_SUCCESS(Status)) { DPRINT1("IopWriteLogFile() failed (Status %lx)\n", Status); _____ Modified: trunk/reactos/ntoskrnl/io/disk.c --- trunk/reactos/ntoskrnl/io/disk.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/io/disk.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -1070,7 +1070,7 @@ AUTO_DRIVE, DOSDEVICE_DRIVE_REMOVABLE, 0, - (LARGE_INTEGER)0LL, + RtlConvertLongToLargeInteger(0), hKey); } } @@ -1101,7 +1101,7 @@ (i < 2) ? i : AUTO_DRIVE, DOSDEVICE_DRIVE_REMOVABLE, 0, - (LARGE_INTEGER)0LL, + RtlConvertLongToLargeInteger(0), hKey); } @@ -1121,7 +1121,7 @@ AUTO_DRIVE, DOSDEVICE_DRIVE_CDROM, 0, - (LARGE_INTEGER)0LL, + RtlConvertLongToLargeInteger(0), hKey); } _____ Modified: trunk/reactos/ntoskrnl/kd/kdio.c --- trunk/reactos/ntoskrnl/kd/kdio.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/kd/kdio.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -263,10 +263,11 @@ KdpPrintString(LPSTR String, ULONG Length) { - if (!KdpDebugMode.Value) return 0; PLIST_ENTRY CurrentEntry; PKD_DISPATCH_TABLE CurrentTable; + if (!KdpDebugMode.Value) return 0; + /* Call the registered handlers */ CurrentEntry = KdProviders.Flink; while (CurrentEntry != &KdProviders) _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h --- trunk/reactos/ntoskrnl/kdbg/kdb.h 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/kdbg/kdb.h 2005-11-21 18:38:09 UTC (rev 19413) @@ -87,7 +87,7 @@ /* from i386/kdb_help.S */ -STDCALL VOID +VOID STDCALL KdbpStackSwitchAndCall( IN PVOID NewStack, IN VOID (*Function)(VOID)); _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -559,7 +559,7 @@ IN PLDR_DATA_TABLE_ENTRY Module) { /* Load symbols for the image if available */ - DPRINT("Loading driver %wZ symbols (driver @ %08x)\n", Filename, Module->Base); + DPRINT("Loading driver %wZ symbols (driver @ %08x)\n", Filename, Module->DllBase); Module->PatchInformation = NULL; @@ -664,7 +664,7 @@ DPRINT("Installed symbols: %s@%08x-%08x %p\n", FileName, ModuleObject->DllBase, - ModuleObject->SizeOfImage + ModuleObject->DllBase, + ModuleObject->SizeOfImage + (ULONG)ModuleObject->DllBase, ModuleObject->PatchInformation); } } _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -1064,7 +1064,7 @@ return Status; } -static inline +static __inline VOID RepairList(PLIST_ENTRY Original, PLIST_ENTRY Copy, KPROCESSOR_MODE Mode) _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -170,11 +170,12 @@ NTAPI KePrepareForApplicationProcessorInit(ULONG Id) { - DPRINT("KePrepareForApplicationProcessorInit(Id %d)\n", Id); PFN_TYPE PrcPfn; PKIPCR Pcr; PKIPCR BootPcr; + DPRINT("KePrepareForApplicationProcessorInit(Id %d)\n", Id); + BootPcr = (PKIPCR)KPCR_BASE; Pcr = (PKIPCR)((ULONG_PTR)KPCR_BASE + Id * PAGE_SIZE); _____ Modified: trunk/reactos/ntoskrnl/ke/process.c --- trunk/reactos/ntoskrnl/ke/process.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/ke/process.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -36,7 +36,7 @@ /* FUNCTIONS *****************************************************************/ -static inline void +static __inline void UpdatePageDirs(PKTHREAD Thread, PKPROCESS Process) { /* _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -27,7 +27,7 @@ /* FUNCTIONS *****************************************************************/ BOOLEAN -inline +__inline FASTCALL KiCheckAlertability(BOOLEAN Alertable, PKTHREAD CurrentThread, @@ -771,7 +771,7 @@ } BOOLEAN -inline +__inline FASTCALL KiIsObjectSignaled(PDISPATCHER_HEADER Object, PKTHREAD Thread) @@ -802,7 +802,7 @@ } VOID -inline +__inline FASTCALL KiSatisifyMultipleObjectWaits(PKWAIT_BLOCK WaitBlock) { @@ -819,7 +819,7 @@ } VOID -inline +__inline FASTCALL KeInitializeDispatcherHeader(DISPATCHER_HEADER* Header, ULONG Type, @@ -835,7 +835,7 @@ } KIRQL -inline +__inline FASTCALL KeAcquireDispatcherDatabaseLock(VOID) { @@ -846,7 +846,7 @@ } VOID -inline +__inline FASTCALL KeAcquireDispatcherDatabaseLockAtDpcLevel(VOID) { @@ -854,7 +854,7 @@ } VOID -inline +__inline FASTCALL KeInitializeDispatcher(VOID) { @@ -863,7 +863,7 @@ } VOID -inline +__inline FASTCALL KeReleaseDispatcherDatabaseLock(KIRQL OldIrql) { @@ -882,7 +882,7 @@ } VOID -inline +__inline FASTCALL KeReleaseDispatcherDatabaseLockFromDpcLevel(VOID) { _____ Modified: trunk/reactos/ntoskrnl/lpc/reply.c --- trunk/reactos/ntoskrnl/lpc/reply.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/lpc/reply.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -163,7 +163,7 @@ PreviousMode = ExGetPreviousMode(); DPRINT("NtReplyWaitReceivePortEx(PortHandle %x, LpcReply %x, " - "LpcMessage %x)\n", PortHandle, LpcReply, LpcMessage); + "LpcMessage %x)\n", PortHandle, ReplyMessage, ReceiveMessage); if (PreviousMode != KernelMode) { _____ Modified: trunk/reactos/ntoskrnl/mm/cont.c --- trunk/reactos/ntoskrnl/mm/cont.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/mm/cont.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -16,7 +16,7 @@ /* FUNCTIONS *****************************************************************/ -VOID STATIC +static VOID MmFreeContinuousPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) @@ -93,7 +93,7 @@ &MArea, FALSE, 0, - (PHYSICAL_ADDRESS)0LL); + RtlConvertLongToLargeInteger(0)); MmUnlockAddressSpace(MmGetKernelAddressSpace()); if (!NT_SUCCESS(Status)) @@ -158,9 +158,9 @@ IN PHYSICAL_ADDRESS HighestAcceptableAddress) { return MmAllocateContiguousMemorySpecifyCache(NumberOfBytes, - (PHYSICAL_ADDRESS)0LL, + RtlConvertLongToLargeInteger(0), HighestAcceptableAddress, - (PHYSICAL_ADDRESS)0LL, + RtlConvertLongToLargeInteger(0), MmCached); } _____ Modified: trunk/reactos/ntoskrnl/mm/npool.c --- trunk/reactos/ntoskrnl/mm/npool.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/mm/npool.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -1472,7 +1472,7 @@ DPRINT("freeing block %x\n",blk); POOL_TRACE("ExFreePool(block %x), size %d, caller %x\n",block,blk->hdr.Size, - block->Caller); + blk->Caller); KeAcquireSpinLock(&MmNpoolLock, &oldIrql); VALIDATE_POOL; _____ Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h --- trunk/reactos/ntoskrnl/mm/rpoolmgr.h 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/mm/rpoolmgr.h 2005-11-21 18:38:09 UTC (rev 19413) @@ -496,7 +496,7 @@ return NextBlock; } -inline static void* +static __inline void* RHdrToBody ( void* blk ) /* * FUNCTION: Translate a block header address to the corresponding block @@ -506,7 +506,7 @@ return ( (void *) ((char*)blk + sizeof(R_USED) + R_RZ) ); } -inline static PR_USED +static __inline PR_USED RBodyToHdr ( void* addr ) { return (PR_USED) _____ Modified: trunk/reactos/ntoskrnl/ob/sdcache.c --- trunk/reactos/ntoskrnl/ob/sdcache.c 2005-11-21 18:10:55 UTC (rev 19412) +++ trunk/reactos/ntoskrnl/ob/sdcache.c 2005-11-21 18:38:09 UTC (rev 19413) @@ -52,7 +52,7 @@ } -static inline VOID +static __inline VOID ObpSdCacheLock(VOID) { /* can't acquire a fast mutex in the early boot process... */ @@ -63,7 +63,7 @@ } -static inline VOID +static __inline VOID ObpSdCacheUnlock(VOID) { /* can't acquire a fast mutex in the early boot process... */

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005