Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 34477: - Implement KeArmInstructionFaultStatusRegisterGet
by ros-arm-bringup＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 18:31:46 2008 New Revision: 34477 URL: http://svn.reactos.org/svn/reactos?rev=34477&view=rev Log: - Implement KeArmInstructionFaultStatusRegisterGet Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h [iso-8859-1] Sun Jul 13 18:31:46 2008 @@ -35,6 +35,15 @@ { ULONG Value; __asm__ __volatile__ ("mrc p15, 0, %0, c5, c0, 0" : "=r"(Value) : : "cc"); + return Value; +} + +FORCEINLINE +ULONG +KeArmInstructionFaultStatusRegisterGet(VOID) +{ + ULONG Value; + __asm__ __volatile__ ("mrc p15, 0, %0, c5, c0, 1" : "=r"(Value) : : "cc"); return Value; }

1 0

[jimtabor] 34476: Separate Default Window proc from messages.
by jimtabor＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: jimtabor Date: Sun Jul 13 18:31:00 2008 New Revision: 34476 URL: http://svn.reactos.org/svn/reactos?rev=34476&view=rev Log: Separate Default Window proc from messages. Added: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c (with props) Modified: trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Sun Jul 13 18:31:00 2008 @@ -164,6 +164,9 @@ BOOL FASTCALL IntShowOwnedPopups( PWINDOW_OBJECT owner, BOOL fShow ); +LRESULT FASTCALL +IntDefWindowProc( PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam); + #endif /* _WIN32K_WINDOW_H */ /* EOF */ Added: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c (added) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Sun Jul 13 18:31:00 2008 @@ -1,0 +1,61 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Misc User funcs + * FILE: subsystem/win32/win32k/ntuser/defwnd.c + * PROGRAMER: + * REVISION HISTORY: + * 2003/05/22 Created + */ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + + +/* + Win32k counterpart of User DefWindowProc + */ +LRESULT FASTCALL +IntDefWindowProc( + PWINDOW_OBJECT Window, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + PWINDOW Wnd; + + if (Msg > WM_USER) return 0; + + Wnd = Window->Wnd; + if (!Wnd) return 0; + + switch (Msg) + { + case WM_SHOWWINDOW: + { + if ((Wnd->Style & WS_VISIBLE) && wParam) break; + if (!(Wnd->Style & WS_VISIBLE) && !wParam) break; + if (!Window->hOwner) break; + if (LOWORD(lParam)) + { + if (wParam) + { + if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) break; + Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP; + } + else + Window->Flags |= WIN_NEEDS_SHOW_OWNEDPOPUP; + + co_WinPosShowWindow(Window, wParam ? SW_SHOWNOACTIVATE : SW_HIDE); + } + } + break; + } + + return 0; +} + + +/* EOF */ Propchange: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Jul 13 18:31:00 2008 @@ -1832,49 +1832,6 @@ return FALSE; } -/* - Win32k counterpart of User DefWindowProc - */ -LRESULT FASTCALL -IntDefWindowProc( - PWINDOW_OBJECT Window, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - PWINDOW Wnd; - - if (Msg > WM_USER) return 0; - - Wnd = Window->Wnd; - if (!Wnd) return 0; - - switch (Msg) - { - case WM_SHOWWINDOW: - { - if ((Wnd->Style & WS_VISIBLE) && wParam) break; - if (!(Wnd->Style & WS_VISIBLE) && !wParam) break; - if (!Window->hOwner) break; - if (LOWORD(lParam)) - { - if (wParam) - { - if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) break; - Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP; - } - else - Window->Flags |= WIN_NEEDS_SHOW_OWNEDPOPUP; - - co_WinPosShowWindow(Window, wParam ? SW_SHOWNOACTIVATE : SW_HIDE); - } - } - break; - } - - return 0; -} - LRESULT STDCALL NtUserMessageCall( Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sun Jul 13 18:31:00 2008 @@ -110,6 +110,7 @@ <file>clipboard.c</file> <file>csr.c</file> <file>cursoricon.c</file> + <file>defwnd.c</file> <file>desktop.c</file> <file>display.c</file> <file>event.c</file>

1 0

[silverblade] 34475: Implemented functions required to make wave playback pause and resume function (WODM_PAUSE and WODM_RESTART) using IOCTL_WAVE_SET_STATE. Modified internal I/O control routine to deal with the fact the device does overlapped I/O. Verified pause/resume functions, however there is a crash on exit if all audio buffers are exhausted by the time WODM_CLOSE is issued.
by silverblade＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: silverblade Date: Sun Jul 13 17:53:53 2008 New Revision: 34475 URL: http://svn.reactos.org/svn/reactos?rev=34475&view=rev Log: Implemented functions required to make wave playback pause and resume function (WODM_PAUSE and WODM_RESTART) using IOCTL_WAVE_SET_STATE. Modified internal I/O control routine to deal with the fact the device does overlapped I/O. Verified pause/resume functions, however there is a crash on exit if all audio buffers are exhausted by the time WODM_CLOSE is issued. Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -216,6 +216,12 @@ // SOUND_DEBUG_HEX(Result); + POPUP("Click for WODM_PAUSE"); + Result = wodMessage(0, WODM_PAUSE, (DWORD) InstanceData, (DWORD) 0, 0); + + POPUP("Click for WODM_RESTART"); + Result = wodMessage(0, WODM_RESTART, (DWORD) InstanceData, (DWORD) 0, 0); + POPUP("Click for WODM_CLOSE test"); Result = wodMessage(0, WODM_CLOSE, (DWORD) InstanceData, (DWORD) 0, 0); /* SOUND_DEBUG_HEX(Result); */ Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -217,7 +217,7 @@ typedef MMRESULT (*MMGETWAVESTATE_FUNC)( IN struct _SOUND_DEVICE_INSTANCE* Instance, - OUT PUCHAR State); + OUT PULONG State); typedef MMRESULT (*MMSETWAVESTATE_FUNC)( IN struct _SOUND_DEVICE_INSTANCE* Instance); @@ -262,8 +262,6 @@ typedef struct _WAVE_STREAM_INFO { - /* Current wave stream state */ - WORD State; /* Buffer queue head and tail */ PWAVEHDR BufferQueueHead; PWAVEHDR BufferQueueTail; @@ -446,7 +444,7 @@ IN LPOVERLAPPED Overlapped); MMRESULT -ReadFromDeviceHandle( +RetrieveFromDeviceHandle( IN HANDLE Handle, IN DWORD IoControlCode, OUT LPVOID OutBuffer, @@ -455,7 +453,7 @@ IN LPOVERLAPPED Overlapped); MMRESULT -WriteToDeviceHandle( +SendToDeviceHandle( IN HANDLE Handle, IN DWORD IoControlCode, IN LPVOID InBuffer, @@ -471,26 +469,23 @@ IN DWORD InBufferSize, OUT LPVOID OutBuffer, IN DWORD OutBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped); - -MMRESULT -ReadFromSoundDevice( + OUT LPDWORD BytesReturned); + +MMRESULT +RetrieveFromSoundDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN DWORD IoControlCode, OUT LPVOID OutBuffer, IN DWORD OutBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped); - -MMRESULT -WriteToSoundDevice( + OUT LPDWORD BytesReturned); + +MMRESULT +SendToSoundDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN DWORD IoControlCode, IN LPVOID InBuffer, IN DWORD InBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped); + OUT LPDWORD BytesReturned); MMRESULT WriteSoundDeviceBuffer( @@ -646,12 +641,12 @@ MMRESULT GetWaveDeviceState( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PUCHAR State); + OUT PULONG State); MMRESULT DefaultGetWaveDeviceState( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PUCHAR State); + OUT PULONG State); MMRESULT PauseWaveDevice( Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -95,7 +95,7 @@ } /* Call the driver */ - Result = ReadFromDeviceHandle( + Result = RetrieveFromDeviceHandle( Handle, Ioctl, (LPVOID) RawCapsPtr, Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -94,15 +94,15 @@ IN LPOVERLAPPED Overlapped) { BOOLEAN IoResult = FALSE; - DWORD AccessRights = GENERIC_READ; VALIDATE_MMSYS_PARAMETER( Handle != INVALID_HANDLE_VALUE ); - /* Determine if we actually need to write stuff */ - if ( InBuffer != NULL ) - AccessRights |= GENERIC_WRITE; - - MessageBox(0, L"Doing IO", L"Info", MB_OK | MB_TASKMODAL); + /*MessageBox(0, L"Doing IO", L"Info", MB_OK | MB_TASKMODAL);*/ + + TRACE_("IoCtl on handle %d - in %p (%d), out %p (%d)\n", + (int) Handle, InBuffer, (int) InBufferSize, OutBuffer, + (int) OutBufferSize); + IoResult = DeviceIoControl( Handle, IoControlCode, @@ -113,8 +113,10 @@ BytesReturned, Overlapped); + if ( ! IoResult ) { + TRACE_("IoCtl result %d\n", (int) GetLastError()); return Win32ErrorToMmResult(GetLastError()); } @@ -122,7 +124,7 @@ } MMRESULT -ReadFromDeviceHandle( +RetrieveFromDeviceHandle( IN HANDLE Handle, IN DWORD IoControlCode, OUT LPVOID OutBuffer, @@ -141,7 +143,7 @@ } MMRESULT -WriteToDeviceHandle( +SendToDeviceHandle( IN HANDLE Handle, IN DWORD IoControlCode, IN LPVOID InBuffer, @@ -167,33 +169,75 @@ IN DWORD InBufferSize, OUT LPVOID OutBuffer, IN DWORD OutBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped) -{ + OUT LPDWORD BytesTransferred) +{ + /* + NOTE: This will always do overlapped I/O, which we wait for. + */ + + OVERLAPPED Overlapped; + BOOLEAN IoResult; + MMRESULT Result; + DWORD Transferred; + if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) return MMSYSERR_INVALPARAM; if ( SoundDeviceInstance->Handle == INVALID_HANDLE_VALUE ) return MMSYSERR_ERROR; - return PerformDeviceIo(SoundDeviceInstance->Handle, - IoControlCode, - InBuffer, - InBufferSize, - OutBuffer, - OutBufferSize, - BytesReturned, - Overlapped); -} - -MMRESULT -ReadFromSoundDevice( + ZeroMemory(&Overlapped, sizeof(OVERLAPPED)); + + /* This event is used for announcing the I/O operation completed */ + Overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( Overlapped.hEvent == INVALID_HANDLE_VALUE ) + return Win32ErrorToMmResult(GetLastError()); + + TRACE_("** Overlapped at %p\n", &Overlapped); + + Result = PerformDeviceIo(SoundDeviceInstance->Handle, + IoControlCode, + InBuffer, + InBufferSize, + OutBuffer, + OutBufferSize, + NULL, + &Overlapped); + + if ( Result != MMSYSERR_NOERROR ) + { + return Result; + } + + /* Wait for I/O completion */ + IoResult = GetOverlappedResult(SoundDeviceInstance->Handle, + &Overlapped, + &Transferred, + TRUE); + + CloseHandle(Overlapped.hEvent); + + if ( ! IoResult ) + { + return Win32ErrorToMmResult(GetLastError()); + } + + if ( BytesTransferred ) + { + *BytesTransferred = Transferred; + } + + return Result; +} + +MMRESULT +RetrieveFromSoundDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN DWORD IoControlCode, OUT LPVOID OutBuffer, IN DWORD OutBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped) + OUT LPDWORD BytesReturned) { return PerformSoundDeviceIo(SoundDeviceInstance, IoControlCode, @@ -201,18 +245,16 @@ 0, OutBuffer, OutBufferSize, - BytesReturned, - Overlapped); -} - -MMRESULT -WriteToSoundDevice( + BytesReturned); +} + +MMRESULT +SendToSoundDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN DWORD IoControlCode, IN LPVOID InBuffer, IN DWORD InBufferSize, - OUT LPDWORD BytesReturned, - IN LPOVERLAPPED Overlapped) + OUT LPDWORD BytesReturned) { return PerformSoundDeviceIo(SoundDeviceInstance, IoControlCode, @@ -220,8 +262,7 @@ InBufferSize, NULL, 0, - BytesReturned, - Overlapped); + BytesReturned); } Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -44,6 +44,7 @@ PSOUND_THREAD_OVERLAPPED SoundOverlapped; TRACE_("** I/O has completed\n"); + TRACE_("** Returned overlapped at %p\n", lpOverlapped); SoundOverlapped = (PSOUND_THREAD_OVERLAPPED) lpOverlapped; ASSERT(SoundOverlapped); @@ -155,14 +156,18 @@ /* Wait for a request, or an I/O completion */ WaitResult = WaitForSingleObjectEx(RequestEvent, INFINITE, TRUE); + TRACE_("Came out of waiting\n"); if ( WaitResult == WAIT_OBJECT_0 ) { /* Process the request */ + TRACE_("Processing request\n"); + ASSERT(CurrentRequest.RequestHandler); if ( CurrentRequest.RequestHandler ) { + TRACE_("Calling function %p\n", CurrentRequest.RequestHandler); CurrentRequest.ReturnValue = CurrentRequest.RequestHandler( CurrentRequest.SoundDeviceInstance, CurrentRequest.Parameter); Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -79,12 +79,11 @@ if ( Result != MMSYSERR_NOERROR ) return Result; - Result = WriteToSoundDevice(Handle, - IOCTL_WAVE_QUERY_FORMAT, - (LPVOID) WaveFormat, - WaveFormatSize, - &BytesReturned, - NULL); + Result = SendToSoundDevice(Handle, + IOCTL_WAVE_QUERY_FORMAT, + (LPVOID) WaveFormat, + WaveFormatSize, + &BytesReturned); CloseKernelSoundDevice(Handle); @@ -153,12 +152,11 @@ /* Make sure we have a wave device */ VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) ); - Result = WriteToSoundDevice(SoundDeviceInstance, - IOCTL_WAVE_SET_FORMAT, - (LPVOID) WaveFormat, - WaveFormatSize, - &BytesReturned, - NULL); + Result = SendToSoundDevice(SoundDeviceInstance, + IOCTL_WAVE_SET_FORMAT, + (LPVOID) WaveFormat, + WaveFormatSize, + &BytesReturned); return Result; } Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -27,7 +27,7 @@ StreamInfo = &SoundDeviceInstance->Streaming.Wave; - StreamInfo->State = WAVE_DD_IDLE; + /*StreamInfo->State = WAVE_DD_IDLE;*/ StreamInfo->BufferQueueHead = NULL; StreamInfo->BufferQueueTail = NULL; @@ -65,7 +65,7 @@ MMRESULT GetWaveDeviceState( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PUCHAR State) + OUT PULONG State) { VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); VALIDATE_MMSYS_PARAMETER( State ); @@ -78,45 +78,66 @@ MMRESULT DefaultGetWaveDeviceState( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PUCHAR State) + OUT PULONG State) { -// MMRESULT Result; + MMRESULT Result; + + TRACE_ENTRY(); ASSERT(SoundDeviceInstance); ASSERT(State); -/* - Result = WriteSoundDevice(S -MMRESULT -WriteSoundDevice( - PSOUND_DEVICE SoundDevice, - DWORD IoControlCode, - LPVOID InBuffer, - DWORD InBufferSize, - LPDWORD BytesReturned, - LPOVERLAPPED Overlapped) -*/ - return MMSYSERR_NOERROR; + Result = RetrieveFromSoundDevice(SoundDeviceInstance, + IOCTL_WAVE_GET_STATE, + State, + sizeof(ULONG), + NULL); + + ASSERT( Result == MMSYSERR_NOERROR ); + + Result = TranslateInternalMmResult(Result); + TRACE_EXIT(Result); + + return Result; } MMRESULT PauseWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { + MMRESULT Result; + TRACE_ENTRY(); + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); - return CallUsingSoundThread(SoundDeviceInstance, - PauseWaveDevice_Request, - NULL); + Result = CallUsingSoundThread(SoundDeviceInstance, + PauseWaveDevice_Request, + NULL); + + TRACE_EXIT(Result); + return Result; } MMRESULT DefaultPauseWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { - TRACE_("Pausing device\n"); - /* TODO */ - return MMSYSERR_NOERROR; + ULONG RequestedState = WAVE_DD_STOP; + MMRESULT Result; + + TRACE_ENTRY(); + + Result = SendToSoundDevice(SoundDeviceInstance, + IOCTL_WAVE_SET_STATE, + &RequestedState, + sizeof(RequestedState), + NULL); + + ASSERT( Result == MMSYSERR_NOERROR ); + + Result = TranslateInternalMmResult(Result); + TRACE_EXIT(Result); + return Result; } MMRESULT @@ -134,7 +155,20 @@ DefaultRestartWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { - TRACE_("Restarting device\n"); - /* TODO */ - return MMSYSERR_NOERROR; + ULONG RequestedState = WAVE_DD_PLAY; + MMRESULT Result; + + TRACE_ENTRY(); + + Result = SendToSoundDevice(SoundDeviceInstance, + IOCTL_WAVE_SET_STATE, + &RequestedState, + sizeof(RequestedState), + NULL); + + ASSERT( Result == MMSYSERR_NOERROR ); + + Result = TranslateInternalMmResult(Result); + TRACE_EXIT(Result); + return Result; } Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -82,10 +82,10 @@ /* If we're out of buffers, mark stream as stopped and do nothing */ if ( ! StreamInfo->CurrentBuffer ) { - TRACE_("*** NOTHING TO DO - state is now WAVE_DD_IDLE ***\n"); + TRACE_("*** NOTHING TO DO ***\n"); /* The stream is idle */ - StreamInfo->State = WAVE_DD_IDLE; + /*StreamInfo->State = WAVE_DD_IDLE;*/ return 0; } @@ -120,8 +120,10 @@ /* TODO: Deal with INPUT as well */ if ( DeviceType == WAVE_OUT_DEVICE_TYPE ) { + /* TRACE_("Streamed data - state is now WAVE_DD_PLAYING\n"); StreamInfo->State = WAVE_DD_PLAYING; + */ } else { @@ -270,7 +272,7 @@ MMRESULT Result; PSOUND_DEVICE SoundDevice; PMMFUNCTION_TABLE Functions; - PUCHAR State = (PUCHAR) Parameter; + PULONG State = (PULONG) Parameter; VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); VALIDATE_MMSYS_PARAMETER( State ); @@ -316,13 +318,19 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter) { + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE Functions; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); - if ( SoundDeviceInstance->Streaming.Wave.State != WAVE_DD_STOPPED ) - { - WARN_("Nothing to do\n"); - return MMSYSERR_NOERROR; - } - - return MMSYSERR_NOERROR; -} + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, + &SoundDevice); + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceFunctionTable(SoundDevice, + &Functions); + ASSERT(Result == MMSYSERR_NOERROR); + + return Functions->RestartWaveDevice(SoundDeviceInstance); +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sun Jul 13 17:53:53 2008 @@ -131,11 +131,15 @@ case WODM_PAUSE : { + ASSERT(Instance != NULL); + return PauseWaveDevice(Instance); } case WODM_RESTART : { + ASSERT(Instance != NULL); + return RestartWaveDevice(Instance); }

1 0

[ros-arm-bringup] 34474: - Write a DebugService routine for ARM in the RTL library and get rid of the hack in ntoskrnl. - Just like on x86, this routine generates a breakpoint -- on ARM this is done with BKPT followed by an index. - We use the BREAKPOINT_PRINT index just like on x86. - This generates a prefetch abort -- so now we implement the prefetch abort handler. Thanks to the trap macros, this was 10 lines of code. - This calls into the real C handler, which is now unimplemented and hangs t
by ros-arm-bringup＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 17:40:36 2008 New Revision: 34474 URL: http://svn.reactos.org/svn/reactos?rev=34474&view=rev Log: - Write a DebugService routine for ARM in the RTL library and get rid of the hack in ntoskrnl. - Just like on x86, this routine generates a breakpoint -- on ARM this is done with BKPT followed by an index. - We use the BREAKPOINT_PRINT index just like on x86. - This generates a prefetch abort -- so now we implement the prefetch abort handler. Thanks to the trap macros, this was 10 lines of code. - This calls into the real C handler, which is now unimplemented and hangs the whole system, so we've regressed way back (on purpose). Modified: trunk/reactos/lib/rtl/arm/debug_asm.S trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/lib/rtl/arm/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/arm/debug_asm.S?re… ============================================================================== --- trunk/reactos/lib/rtl/arm/debug_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/arm/debug_asm.S [iso-8859-1] Sun Jul 13 17:40:36 2008 @@ -17,9 +17,19 @@ // // Do a breakpoint and return // - bkpt 3 + bkpt BREAKPOINT_BREAK bx lr ENTRY_END DbgBreakPoint + + NESTED_ENTRY DebugService + PROLOG_END DebugService + + // + // Do a breakpoint and return + // + bkpt BREAKPOINT_PRINT // Could also be PROMPT -- we check later in a1 + bx lr + ENTRY_END DebugService NESTED_ENTRY RtlCaptureContext PROLOG_END RtlCaptureContext Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h [iso-8859-1] Sun Jul 13 17:40:36 2008 @@ -102,6 +102,16 @@ .equ CsPc, 0x40 .equ CsPsr, 0x44 +/* + * DebugService Control Types + */ +.equ BREAKPOINT_BREAK, 0 +.equ BREAKPOINT_PRINT, 1 +.equ BREAKPOINT_PROMPT, 2 +.equ BREAKPOINT_LOAD_SYMBOLS, 3 +.equ BREAKPOINT_UNLOAD_SYMBOLS, 4 +.equ BREAKPOINT_COMMAND_STRING, 5 + #else /* Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Sun Jul 13 17:40:36 2008 @@ -30,24 +30,6 @@ KiIdleLoop( VOID ); - -VOID -STDCALL -KdpSerialDebugPrint(LPSTR Message, - ULONG Length); - -VOID -DebugService(IN ULONG ServiceType, - IN PCHAR Buffer, - IN ULONG Length, - IN ULONG Component, - IN ULONG Level) -{ - // - // FIXME: ARM Bring-up Hack - // - KdpSerialDebugPrint(Buffer, Length); -} VOID DebugService2(IN ULONG Arg1, Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] Sun Jul 13 17:40:36 2008 @@ -67,9 +67,22 @@ PROLOG_END KiPrefetchAbortException // - // FIXME: TODO + // Handle trap entry // - b . + TRAP_PROLOG 1 // FromAbort + + // + // Call the C handler + // + adr lr, 1f + mov r0, sp + ldr pc, =KiPrefetchAbortHandler + +1: + // + // Handle trap exit + // + TRAP_EPILOG 0 // NotFromSystemCall ENTRY_END KiPrefetchAbortException Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Sun Jul 13 17:40:36 2008 @@ -432,6 +432,14 @@ } NTSTATUS +KiPrefetchAbortHandler(IN PKTRAP_FRAME TrapFrame) +{ + ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS KiDataAbortHandler(IN PKTRAP_FRAME TrapFrame) { NTSTATUS Status;

1 0

[ros-arm-bringup] 34473: - Now that KDCOM works for printing on the serial port, get rid of the arm_kprintf file, function and hack, and use KdpSerialPrint instead (still a hack, but at least uses our components)
by ros-arm-bringup＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 17:17:28 2008 New Revision: 34473 URL: http://svn.reactos.org/svn/reactos?rev=34473&view=rev Log: - Now that KDCOM works for printing on the serial port, get rid of the arm_kprintf file, function and hack,and use KdpSerialPrint instead (still a hack, but at least uses our components) Removed: trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Removed: trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/arm_kprint… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/arm_kprintf.c (removed) @@ -1,84 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/ke/arm/arm_kprintf.c - * PURPOSE: Early serial printf-style kernel debugging (ARM bringup) - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -/* INCLUDES *******************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS ********************************************************************/ - -// -// UART Registers -// -#define UART_BASE (void*)0xe00f1000 /* HACK: freeldr mapped it here */ - -#define UART_PL01x_DR (UART_BASE + 0x00) -#define UART_PL01x_RSR (UART_BASE + 0x04) -#define UART_PL01x_ECR (UART_BASE + 0x04) -#define UART_PL01x_FR (UART_BASE + 0x18) -#define UART_PL011_IBRD (UART_BASE + 0x24) -#define UART_PL011_FBRD (UART_BASE + 0x28) -#define UART_PL011_LCRH (UART_BASE + 0x2C) -#define UART_PL011_CR (UART_BASE + 0x30) -#define UART_PL011_IMSC (UART_BASE + 0x38) - -// -// LCR Values -// -#define UART_PL011_LCRH_WLEN_8 0x60 -#define UART_PL011_LCRH_FEN 0x10 - -// -// FCR Values -// -#define UART_PL011_CR_UARTEN 0x01 -#define UART_PL011_CR_TXE 0x100 -#define UART_PL011_CR_RXE 0x200 - -// -// LSR Values -// -#define UART_PL01x_FR_RXFE 0x10 -#define UART_PL01x_FR_TXFF 0x20 - -#define READ_REGISTER_ULONG(r) (*(volatile ULONG * const)(r)) -#define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG *)(r) = (v)) - -/* FUNCTIONS ******************************************************************/ - -VOID -ArmVersaPutChar(IN INT Char) -{ - // - // Properly support new-lines - // - if (Char == '\n') ArmVersaPutChar('\r'); - - // - // Wait for ready - // - while ((READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_TXFF) != 0); - - // - // Send the character - // - WRITE_REGISTER_ULONG(UART_PL01x_DR, Char); -} - -void arm_kprintf(const char *fmt, ...) { - char buf[1024], *s; - va_list args; - - va_start(args, fmt); - _vsnprintf(buf,sizeof(buf),fmt,args); - va_end(args); - for (s = buf; *s; s++) - ArmVersaPutChar(*s); -} Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Sun Jul 13 17:17:28 2008 @@ -32,6 +32,11 @@ ); VOID +STDCALL +KdpSerialDebugPrint(LPSTR Message, + ULONG Length); + +VOID DebugService(IN ULONG ServiceType, IN PCHAR Buffer, IN ULONG Length, @@ -41,8 +46,7 @@ // // FIXME: ARM Bring-up Hack // - void arm_kprintf(const char *fmt, ...); - arm_kprintf("%s", Buffer); + KdpSerialDebugPrint(Buffer, Length); } VOID @@ -51,10 +55,9 @@ IN ULONG Service) { // - // FIXME: ARM Bring-up Hack - // - void arm_kprintf(const char *fmt, ...); - arm_kprintf("Loading symbols for %Z...\n", (PCHAR)Arg1); + // FIXME: TODO + // + return; } VOID @@ -79,8 +82,6 @@ LARGE_INTEGER PageDirectory; PKPCR Pcr; ULONG i; - DPRINT1("[INIT] Process: %p Thread: %p Stack: %p PRCB: %p Number: %d LoaderBlock: %p\n", - InitProcess, InitThread, IdleStack, Prcb, Number, LoaderBlock); // // Initialize the platform @@ -330,13 +331,6 @@ ARM_PTE Pte; PKPCR Pcr; ARM_CONTROL_REGISTER ControlRegister; - DPRINT1("-----------------------------------------------------\n"); - DPRINT1("ReactOS-ARM "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); - DPRINT1("Command Line: %s\n", LoaderBlock->LoadOptions); - DPRINT1("ARC Paths: %s %s %s %s\n", LoaderBlock->ArcBootDeviceName, - LoaderBlock->NtHalPathName, - LoaderBlock->ArcHalDeviceName, - LoaderBlock->NtBootPathName); // // Detect ARM version (Architecture 6 is the ARMv5TE-J, go figure!) Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jul 13 17:17:28 2008 @@ -61,7 +61,6 @@ <if property="ARCH" value="arm"> <directory name="arm"> <file first="true">boot.s</file> - <file>arm_kprintf.c</file> <file>cpu.c</file> <file>ctxswtch.s</file> <file>exp.c</file>

1 0

[ros-arm-bringup] 34472: - Implement KdPortPutByteEx and KdPortInitializeEx in KDCOM. Only supports Versatile for now, we can make this more portable later.
by ros-arm-bringup＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 17:16:48 2008 New Revision: 34472 URL: http://svn.reactos.org/svn/reactos?rev=34472&view=rev Log: - Implement KdPortPutByteEx and KdPortInitializeEx in KDCOM. Only supports Versatile for now, we can make this more portable later. Modified: trunk/reactos/drivers/base/kdcom/arm/kdbg.c Modified: trunk/reactos/drivers/base/kdcom/arm/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/arm/kdb… ============================================================================== --- trunk/reactos/drivers/base/kdcom/arm/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/arm/kdbg.c [iso-8859-1] Sun Jul 13 17:16:48 2008 @@ -18,6 +18,7 @@ #include "windbgkd.h" #include <kddll.h> #include <ioaccess.h> +#include <arm/peripherals/pl011.h> /* GLOBALS ********************************************************************/ @@ -30,7 +31,65 @@ KD_PORT_INFORMATION DefaultPort = {0, 0, 0}; +// +// We need to build this in the configuration root and use KeFindConfigurationEntry +// to recover it later. +// +#define HACK 24000000 + /* REACTOS FUNCTIONS **********************************************************/ + +BOOLEAN +NTAPI +KdPortInitializeEx(IN PKD_PORT_INFORMATION PortInformation, + IN ULONG Unknown1, + IN ULONG Unknown2) +{ + ULONG Divider, Remainder, Fraction; + ULONG Baudrate = PortInformation->BaudRate; + + // + // Calculate baudrate clock divider and remainder + // + Divider = HACK / (16 * Baudrate); + Remainder = HACK % (16 * Baudrate); + + // + // Calculate the fractional part + // + Fraction = (8 * Remainder / Baudrate) >> 1; + Fraction += (8 * Remainder / Baudrate) & 1; + + // + // Disable interrupts + // + WRITE_REGISTER_ULONG(UART_PL011_CR, 0); + + // + // Set the baud rate + // + WRITE_REGISTER_ULONG(UART_PL011_IBRD, Divider); + WRITE_REGISTER_ULONG(UART_PL011_FBRD, Fraction); + + // + // Set 8 bits for data, 1 stop bit, no parity, FIFO enabled + // + WRITE_REGISTER_ULONG(UART_PL011_LCRH, + UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN); + + // + // Clear and enable FIFO + // + WRITE_REGISTER_ULONG(UART_PL011_CR, + UART_PL011_CR_UARTEN | + UART_PL011_CR_TXE | + UART_PL011_CR_RXE); + + // + // Done + // + return TRUE; +} BOOLEAN NTAPI @@ -38,19 +97,10 @@ IN ULONG Unknown1, IN ULONG Unknown2) { - UNIMPLEMENTED; - while (TRUE); - return TRUE; -} - -BOOLEAN -NTAPI -KdPortInitializeEx(IN PKD_PORT_INFORMATION PortInformation, - IN ULONG Unknown1, - IN ULONG Unknown2) -{ - UNIMPLEMENTED; - return FALSE; + // + // Call the extended version + // + return KdPortInitializeEx(PortInformation, Unknown1, Unknown2); } BOOLEAN @@ -67,6 +117,9 @@ NTAPI KdPortGetByte(OUT PUCHAR ByteReceived) { + // + // Call the extended version + // return KdPortGetByteEx(&DefaultPort, ByteReceived); } @@ -84,6 +137,9 @@ NTAPI KdPortPollByte(OUT PUCHAR ByteReceived) { + // + // Call the extended version + // return KdPortPollByteEx(&DefaultPort, ByteReceived); } @@ -92,14 +148,24 @@ KdPortPutByteEx(IN PKD_PORT_INFORMATION PortInformation, IN UCHAR ByteToSend) { - UNIMPLEMENTED; - while (TRUE); + // + // Wait for ready + // + while ((READ_REGISTER_ULONG(UART_PL01x_FR) & UART_PL01x_FR_TXFF) != 0); + + // + // Send the character + // + WRITE_REGISTER_ULONG(UART_PL01x_DR, ByteToSend); } VOID NTAPI KdPortPutByte(IN UCHAR ByteToSend) { + // + // Call the extended version + // KdPortPutByteEx(&DefaultPort, ByteToSend); }

1 0

[ros-arm-bringup] 34471: - Fix FILE location in the header
by ros-arm-bringup＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 17:15:56 2008 New Revision: 34471 URL: http://svn.reactos.org/svn/reactos?rev=34471&view=rev Log: - Fix FILE location in the header Modified: trunk/reactos/include/reactos/arm/peripherals/pl011.h Modified: trunk/reactos/include/reactos/arm/peripherals/pl011.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/periph… ============================================================================== --- trunk/reactos/include/reactos/arm/peripherals/pl011.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/peripherals/pl011.h [iso-8859-1] Sun Jul 13 17:15:56 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: include/reactos/arm/targets/pl011.h + * FILE: include/reactos/arm/peripherals/pl011.h * PURPOSE: PL011 Registers and Constants * PROGRAMMERS: ReactOS Portable Systems Group */

1 0

[ros-arm-bringup] 34470: - Get rid of a really-early debug print, since it's done before KdInit and thus will never be seen.
by ros-arm-bringup＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 17:15:23 2008 New Revision: 34470 URL: http://svn.reactos.org/svn/reactos?rev=34470&view=rev Log: - Get rid of a really-early debug print, since it's done before KdInit and thus will never be seen. Modified: trunk/reactos/ntoskrnl/ke/arm/cpu.c Modified: trunk/reactos/ntoskrnl/ke/arm/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/cpu.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/cpu.c [iso-8859-1] Sun Jul 13 17:15:23 2008 @@ -89,7 +89,6 @@ // // On these systems, we'll just keep the PTE mapped // - DPRINT1("TLB Lockdown Failure (%p). Running on QEMU?\n", Virtual); } else {

1 0

[ros-arm-bringup] 34469: - Uncomment the check to see if we came from kernel or user mode, since we can now do this after the major trap fixes
by ros-arm-bringup＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: ros-arm-bringup Date: Sun Jul 13 17:14:43 2008 New Revision: 34469 URL: http://svn.reactos.org/svn/reactos?rev=34469&view=rev Log: - Uncomment the check to see if we came from kernel or user mode, since we can now do this after the major trap fixes Modified: trunk/reactos/ntoskrnl/ke/arm/time.c Modified: trunk/reactos/ntoskrnl/ke/arm/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/time.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/time.c [iso-8859-1] Sun Jul 13 17:14:43 2008 @@ -182,7 +182,7 @@ // // Check if we came from user mode // - if (0) //(TrapFrame->PreviousMode != KernelMode) + if (TrapFrame->PreviousMode != KernelMode) { // // Increase process user time

1 0

[silverblade] 34468: Made parameter checks macro-based, and added other validation and debugging code. Basically a code tidy-up with some additional code to prevent/detect bugs.
by silverblade＠svn.reactos.org 13 Jul '08

13 Jul '08

Author: silverblade Date: Sun Jul 13 15:48:50 2008 New Revision: 34468 URL: http://svn.reactos.org/svn/reactos?rev=34468&view=rev Log: Made parameter checks macro-based, and added other validation and debugging code. Basically a code tidy-up with some additional code to prevent/detect bugs. Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -62,12 +62,27 @@ } \ } +#define TRACE_ENTRY() \ + TRACE_("entered function\n") + +#define TRACE_EXIT(retval) \ + TRACE_("returning %d (0x%x)\n", (int)retval, (int)retval) + #endif /* Some memory allocation helper macros */ + +#define AllocateMemory(amount) \ + AllocateTaggedMemory(0x00000000, amount) + +#define FreeMemory(ptr) \ + FreeTaggedMemory(0x00000000, ptr) + +#define AllocateTaggedMemoryFor(tag, thing) \ + (thing*) AllocateTaggedMemory(tag, sizeof(thing)) #define AllocateMemoryFor(thing) \ (thing*) AllocateMemory(sizeof(thing)) @@ -85,11 +100,30 @@ CopyMemory(dest, source, StringLengthToBytes(WCHAR, wcslen(source))) +/* + Helps find the minimum/maximum of two values +*/ + #define MinimumOf(value_a, value_b) \ ( value_a < value_b ? value_a : value_b ) #define MaximumOf(value_a, value_b) \ ( value_a > value_b ? value_a : value_b ) + + +/* + Validation +*/ + +#define VALIDATE_MMSYS_PARAMETER(parameter_condition) \ + { \ + if ( ! (parameter_condition) ) \ + { \ + ERR_("Parameter check: %s\n", #parameter_condition); \ + TRACE_EXIT(MMSYSERR_INVALPARAM); \ + return MMSYSERR_INVALPARAM; \ + } \ + } struct _SOUND_DEVICE; @@ -208,6 +242,8 @@ Represents an audio device */ +#define SOUND_DEVICE_TAG "SndD" + typedef struct _SOUND_DEVICE { struct _SOUND_DEVICE* Next; @@ -221,6 +257,8 @@ /* Represents an individual instance of an audio device */ + +#define WAVE_STREAM_INFO_TAG "WavS" typedef struct _WAVE_STREAM_INFO { @@ -237,6 +275,9 @@ DWORD BuffersOutstanding; } WAVE_STREAM_INFO, *PWAVE_STREAM_INFO; + +#define SOUND_DEVICE_INSTANCE_TAG "SndI" + typedef struct _SOUND_DEVICE_INSTANCE { struct _SOUND_DEVICE_INSTANCE* Next; @@ -465,11 +506,13 @@ */ PVOID -AllocateMemory( +AllocateTaggedMemory( + IN DWORD Tag, IN DWORD Size); VOID -FreeMemory( +FreeTaggedMemory( + IN DWORD Tag, IN PVOID Pointer); DWORD @@ -482,6 +525,9 @@ MMRESULT Win32ErrorToMmResult(IN UINT error_code); +MMRESULT +TranslateInternalMmResult(MMRESULT Result); + /* instances.c @@ -521,7 +567,7 @@ MMRESULT GetSoundDeviceCapabilities( - IN PSOUND_DEVICE Device, + IN PSOUND_DEVICE SoundDevice, OUT PUNIVERSAL_CAPS Capabilities); MMRESULT Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -17,16 +17,13 @@ MMRESULT GetSoundDeviceCapabilities( - IN PSOUND_DEVICE Device, + IN PSOUND_DEVICE SoundDevice, OUT PUNIVERSAL_CAPS Capabilities) { - if ( ! Device ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( Capabilities ); - if ( ! Capabilities ) - return MMSYSERR_INVALPARAM; - - return Device->Functions.GetCapabilities(Device, Capabilities); + return SoundDevice->Functions.GetCapabilities(SoundDevice, Capabilities); } MMRESULT @@ -41,13 +38,10 @@ MMRESULT Result; DWORD BytesReturned; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( Capabilities ); + ZeroMemory(Capabilities, sizeof(UNIVERSAL_CAPS)); - - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; - - if ( ! Capabilities ) - return MMSYSERR_INVALPARAM; /* Select appropriate IOCTL and capabilities structure */ switch ( SoundDevice->DeviceType ) @@ -96,7 +90,8 @@ if ( Result != MMSYSERR_NOERROR ) { - return Result; /* OK? */ + Result = TranslateInternalMmResult(Result); + return Result; } /* Call the driver */ Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -23,17 +23,27 @@ ULONG SoundDeviceTotals[SOUND_DEVICE_TYPES]; PSOUND_DEVICE SoundDeviceLists[SOUND_DEVICE_TYPES]; +#define DEVICE_TYPE_TO_INDEX(device_type) \ + ( device_type - MIN_SOUND_DEVICE_TYPE ) + ULONG GetSoundDeviceCount( IN UCHAR DeviceType) { + ULONG Count; + TRACE_ENTRY(); + if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) { + TRACE_EXIT(0); return 0; } - return SoundDeviceTotals[DeviceType - MIN_SOUND_DEVICE_TYPE]; + Count = SoundDeviceTotals[DeviceType - MIN_SOUND_DEVICE_TYPE]; + + TRACE_EXIT(Count); + return Count; } @@ -42,6 +52,8 @@ IN PSOUND_DEVICE Device, IN PMMFUNCTION_TABLE SourceFunctionTable) { + TRACE_ENTRY(); + Device->Functions.Constructor = DefaultInstanceConstructor; Device->Functions.Destructor = DefaultInstanceDestructor; @@ -56,7 +68,10 @@ Device->Functions.RestartWaveDevice = DefaultRestartWaveDevice; if ( ! SourceFunctionTable ) + { + TRACE_EXIT(0); return; + } /* If we get here, the function table is being over-ridden */ @@ -107,6 +122,8 @@ Device->Functions.RestartWaveDevice = SourceFunctionTable->RestartWaveDevice; } + + TRACE_EXIT(0); } @@ -119,10 +136,13 @@ PSOUND_DEVICE NewDevice; UCHAR TypeIndex; + TRACE_ENTRY(); + TRACE_("Adding a sound device to list %d\n", DeviceType); if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) { + TRACE_EXIT(FALSE); return FALSE; } @@ -136,6 +156,7 @@ if ( ! NewDevice ) { + TRACE_EXIT(FALSE); return FALSE; } @@ -153,6 +174,7 @@ { FreeMemory(NewDevice); /*HeapFree(GetProcessHeap(), 0, NewDevice);*/ + TRACE_EXIT(FALSE); return FALSE; } @@ -189,6 +211,7 @@ ++ SoundDeviceTotals[TypeIndex]; TRACE_("Now %d devices of type %d\n", (int) SoundDeviceTotals[TypeIndex], DeviceType); + TRACE_EXIT(TRUE); return TRUE; } @@ -198,13 +221,13 @@ IN PSOUND_DEVICE SoundDevice) { ULONG TypeIndex; + BOOLEAN Done = FALSE; PSOUND_DEVICE CurrentDevice = NULL; PSOUND_DEVICE PreviousDevice = NULL; /*TRACE_("Removing a sound device from list %d\n", DeviceType);*/ - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); TypeIndex = SoundDevice->DeviceType - MIN_SOUND_DEVICE_TYPE; @@ -217,6 +240,7 @@ if ( SoundDeviceLists[TypeIndex] == SoundDevice ) { SoundDeviceLists[TypeIndex] = SoundDevice->Next; + Done = TRUE; } else { @@ -230,6 +254,7 @@ { ASSERT(PreviousDevice != NULL); PreviousDevice->Next = CurrentDevice->Next; + Done = TRUE; break; } @@ -239,10 +264,13 @@ } } + ASSERT(Done); + /* Free the memory associated with the device info */ FreeMemory(SoundDevice->DevicePath); FreeMemory(SoundDevice); + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR;; } @@ -251,15 +279,14 @@ RemoveSoundDevices( IN UCHAR DeviceType) { + MMRESULT Result; PSOUND_DEVICE CurrentDevice; + TRACE_ENTRY(); + TRACE_("Emptying device list for device type %d\n", DeviceType); - if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) - { - ERR_("Invalid device type - %d\n", DeviceType); - return MMSYSERR_INVALPARAM; - } + VALIDATE_MMSYS_PARAMETER( VALID_SOUND_DEVICE_TYPE(DeviceType) ); /* Clean out the device list. This works by repeatedly removing the @@ -268,13 +295,15 @@ while ( (CurrentDevice = SoundDeviceLists[DeviceType - MIN_SOUND_DEVICE_TYPE]) ) { - RemoveSoundDevice(CurrentDevice); + Result = RemoveSoundDevice(CurrentDevice); + ASSERT(Result == MMSYSERR_NOERROR); } /* Reset the list content and item count */ SoundDeviceLists[DeviceType - MIN_SOUND_DEVICE_TYPE] = NULL; SoundDeviceTotals[DeviceType - MIN_SOUND_DEVICE_TYPE] = 0; + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -283,21 +312,54 @@ RemoveAllSoundDevices() { ULONG i; - - TRACE_("Emptying all device lists\n"); + TRACE_ENTRY(); + + TRACE_("RemoveAllSoundDevices\n"); for ( i = MIN_SOUND_DEVICE_TYPE; i <= MAX_SOUND_DEVICE_TYPE; ++ i ) { RemoveSoundDevices(i); } + + TRACE_EXIT(0); } BOOLEAN IsValidSoundDevice( IN PSOUND_DEVICE SoundDevice) { - /* TODO */ - return ( SoundDevice != NULL ); + UCHAR DeviceType; + PSOUND_DEVICE CurrentDevice; + + /* TRACE_ENTRY(); */ + + if ( ! SoundDevice ) + { + TRACE_EXIT(FALSE); + return FALSE; + } + + for ( DeviceType = MIN_SOUND_DEVICE_TYPE; + DeviceType <= MAX_SOUND_DEVICE_TYPE; + ++DeviceType ) + { + CurrentDevice = SoundDeviceLists[DEVICE_TYPE_TO_INDEX(DeviceType)]; + + while ( CurrentDevice ) + { + if ( CurrentDevice == SoundDevice ) + { + /* TRACE_EXIT(TRUE); */ + return TRUE; + } + + CurrentDevice = CurrentDevice->Next; + } + } + + /* Not found in list */ + TRACE_EXIT(FALSE); + return FALSE; } @@ -310,14 +372,16 @@ ULONG Count = 0; PSOUND_DEVICE CurrentDevice = NULL; - if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( VALID_SOUND_DEVICE_TYPE(DeviceType) ); + VALIDATE_MMSYS_PARAMETER( Device ); if ( DeviceIndex >= SoundDeviceTotals[DeviceType - MIN_SOUND_DEVICE_TYPE] ) + { + TRACE_EXIT(MMSYSERR_BADDEVICEID); return MMSYSERR_BADDEVICEID; - - if ( ! Device ) - return MMSYSERR_INVALPARAM; + } /* We know by now that a device at the index should exist @@ -332,6 +396,7 @@ CurrentDevice = CurrentDevice->Next; } + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -341,15 +406,15 @@ IN PSOUND_DEVICE SoundDevice, OUT LPWSTR* DevicePath) { - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; - - if ( ! DevicePath ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( DevicePath ); MessageBox(0, SoundDevice->DevicePath, L"Foo", MB_TASKMODAL | MB_OK); *DevicePath = SoundDevice->DevicePath; + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -359,14 +424,14 @@ IN PSOUND_DEVICE SoundDevice, OUT PUCHAR DeviceType) { - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; - - if ( ! DeviceType ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( DeviceType ); *DeviceType = SoundDevice->DeviceType; + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -375,14 +440,14 @@ IN PSOUND_DEVICE SoundDevice, OUT PMMFUNCTION_TABLE* FunctionTable) { - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; - - if ( ! FunctionTable ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( FunctionTable ); *FunctionTable = &SoundDevice->Functions; + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -400,7 +465,7 @@ DWORD AccessRights = GENERIC_READ; MMRESULT Result; - TRACE_("Default instance ctor"); + TRACE_ENTRY(); ASSERT(SoundDeviceInstance != NULL); GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); @@ -408,10 +473,12 @@ /* If this fails, we have an internal error somewhere */ Result = GetSoundDeviceType(SoundDevice, &DeviceType); + ASSERT(Result == MMSYSERR_NOERROR); if ( Result != MMSYSERR_NOERROR ) { - ASSERT(Result != MMSYSERR_NOERROR); - return MMSYSERR_ERROR; + Result = TranslateInternalMmResult(Result); + TRACE_EXIT(Result); + return Result; } if ( DeviceType == WAVE_OUT_DEVICE_TYPE ) @@ -420,11 +487,15 @@ Result = OpenKernelSoundDevice(SoundDevice, AccessRights, &SoundDeviceInstance->Handle); + if ( Result != MMSYSERR_NOERROR ) + { + Result = TranslateInternalMmResult(Result); + TRACE_EXIT(MMSYSERR_NOERROR); return Result; - - TRACE_("Returning from default ctor"); - + } + + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -436,13 +507,14 @@ PSOUND_DEVICE SoundDevice; MMRESULT Result; - TRACE_("Default instance dtor"); + TRACE_ENTRY(); ASSERT(SoundDeviceInstance); GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); ASSERT(SoundDevice); Result = CloseKernelSoundDevice(SoundDevice); - ASSERT(Result == MMSYSERR_NOERROR); -} + + TRACE_EXIT(0); +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/instances.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -62,6 +62,8 @@ MMRESULT Result; PSOUND_DEVICE_INSTANCE CurrentInstance = NULL; + TRACE_ENTRY(); + ASSERT(SoundDevice != NULL); ASSERT(SoundDeviceInstance != NULL); ASSERT(SoundDeviceInstance->Device == NULL); @@ -75,12 +77,18 @@ } else if ( IS_MIDI_DEVICE_TYPE(SoundDevice->DeviceType) ) { + /* TODO ... */ + ASSERT(FALSE); } else if ( IS_MIXER_DEVICE_TYPE(SoundDevice->DeviceType) ) { + /* TODO ... */ + ASSERT(FALSE); } else if ( IS_AUX_DEVICE_TYPE(SoundDevice->DeviceType) ) { + /* TODO ... */ + ASSERT(FALSE); } else { @@ -111,6 +119,8 @@ CurrentInstance = CurrentInstance->Next; } } + + TRACE_EXIT(0); } VOID @@ -119,6 +129,8 @@ { PSOUND_DEVICE SoundDevice; PSOUND_DEVICE_INSTANCE CurrentInstance; + + TRACE_ENTRY(); ASSERT(SoundDeviceInstance != NULL); ASSERT(SoundDeviceInstance->Device != NULL); @@ -145,6 +157,8 @@ /* This is actually the one before the one we want to remove */ CurrentInstance->Next = SoundDeviceInstance->Next; } + + TRACE_EXIT(0); } @@ -160,15 +174,20 @@ PSOUND_DEVICE_INSTANCE CreatedInstance = NULL; MMRESULT Result; - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; - - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + TRACE_("Creating instance of PSOUND_DEVICE %p\n", SoundDevice); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance ); CreatedInstance = AllocateSoundDeviceInstance(); + if ( ! CreatedInstance ) + { + TRACE_EXIT(MMSYSERR_NOMEM); return MMSYSERR_NOMEM; + } /* Add the new instance to the device's instance list */ ListSoundDeviceInstance(SoundDevice, CreatedInstance); @@ -183,10 +202,14 @@ FreeSoundDeviceInstance(CreatedInstance); CreatedInstance = NULL; //DestroySoundDeviceInstance(CreatedInstance); + + Result = TranslateInternalMmResult(Result); } /* Fill the output parameter with this */ *SoundDeviceInstance = CreatedInstance; + + TRACE_EXIT(Result); return Result; } @@ -199,14 +222,14 @@ ASSERT(SoundDeviceInstance); ASSERT(SoundDevice); - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( SoundDevice ); *SoundDevice = SoundDeviceInstance->Device; + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -216,8 +239,9 @@ { PSOUND_DEVICE SoundDevice = NULL; - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); SoundDevice = SoundDeviceInstance->Device; @@ -233,6 +257,7 @@ FreeSoundDeviceInstance(SoundDeviceInstance); /*HeapFree(GetProcessHeap(), 0, Instance);*/ + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -243,15 +268,18 @@ PSOUND_DEVICE_INSTANCE CurrentInstance = NULL; MMRESULT Result; - if ( ! SoundDevice ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); /* Just munch away at the first item repeatedly */ while ( (CurrentInstance = SoundDevice->FirstInstance) ) { Result = DestroySoundDeviceInstance(CurrentInstance); - } - + ASSERT(Result == MMSYSERR_NOERROR); + } + + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -259,8 +287,21 @@ IsValidSoundDeviceInstance( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { - /* TODO - Once multiple instances are supported */ - return ( SoundDeviceInstance != NULL ); + /* TRACE_ENTRY(); */ + + if ( ! SoundDeviceInstance ) + { + TRACE_EXIT(FALSE); + return FALSE; + } + + /* Now what? */ + return TRUE; + + /* TRACE_EXIT(12345678); */ + + TRACE_EXIT(FALSE); + return ( FALSE ); } MMRESULT @@ -271,16 +312,22 @@ MMRESULT Result; PSOUND_DEVICE SoundDevice; - if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) - return MMSYSERR_INVALPARAM; - - if ( ! DeviceType ) - return MMSYSERR_INVALPARAM; + TRACE_ENTRY(); + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( DeviceType ); Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); if ( Result != MMSYSERR_NOERROR ) + { + TRACE_EXIT(Result); return Result; - - return GetSoundDeviceType(SoundDevice, DeviceType); -} + } + + Result = GetSoundDeviceType(SoundDevice, DeviceType); + Result = TranslateInternalMmResult(Result); + + TRACE_EXIT(Result); + return Result; +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -24,17 +24,8 @@ { DWORD OpenFlags = 0; - if ( ! Handle ) - { - ERR_("No handle ptr\n"); - return MMSYSERR_INVALPARAM; - } - - if ( ! DeviceName ) - { - ERR_("No device name\n"); - return MMSYSERR_INVALPARAM; - } + VALIDATE_MMSYS_PARAMETER( Handle ); + VALIDATE_MMSYS_PARAMETER( DeviceName ); if ( AccessRights != GENERIC_READ ) { @@ -68,21 +59,14 @@ { MMRESULT Result; - if ( ! SoundDevice ) - { - ERR_("No sound device specified"); - return MMSYSERR_INVALPARAM; - } - - if ( ! Handle ) - { - return MMSYSERR_INVALPARAM; - } + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( Handle ); Result = OpenKernelSoundDeviceByName(SoundDevice->DevicePath, AccessRights, Handle); + Result = TranslateInternalMmResult(Result); return Result; } @@ -112,8 +96,7 @@ BOOLEAN IoResult = FALSE; DWORD AccessRights = GENERIC_READ; - if ( Handle == INVALID_HANDLE_VALUE ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( Handle != INVALID_HANDLE_VALUE ); /* Determine if we actually need to write stuff */ if ( InBuffer != NULL ) @@ -245,18 +228,16 @@ /* TODO: move somewhere else */ MMRESULT WriteSoundDeviceBuffer( - PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - LPVOID Buffer, - DWORD BufferSize, - LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine, - LPOVERLAPPED Overlapped) -{ - if ( ( ! SoundDeviceInstance ) || ( ! Buffer ) || ( BufferSize == 0 ) ) - { - ERR_("Invalid parameter in WriteSoundDeviceBuffer!\n"); - return MMSYSERR_INVALPARAM; - } - + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN LPVOID Buffer, + IN DWORD BufferSize, + IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine, + IN LPOVERLAPPED Overlapped) +{ + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( Buffer ); + VALIDATE_MMSYS_PARAMETER( BufferSize > 0 ); + /*wsprintf(msg, L"Writing to handle %x", SoundDeviceInstance->Device->Handle);*/ /*SOUND_DEBUG(msg);*/ Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -29,11 +29,8 @@ ULONG KeyLength; PWCHAR ParametersKeyName; - if ( ! ServiceName ) - return MMSYSERR_INVALPARAM; - - if ( ! KeyHandle ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( ServiceName ); + VALIDATE_MMSYS_PARAMETER( KeyHandle ); /* Work out how long the string will be */ KeyLength = wcslen(REG_SERVICES_KEY_NAME_U) + 1 @@ -85,11 +82,8 @@ DWORD PathLength; PWCHAR RegPath; - if ( ! ServiceName ) - return MMSYSERR_INVALPARAM; - - if ( ! KeyHandle ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( ServiceName ); + VALIDATE_MMSYS_PARAMETER( KeyHandle ); /* Work out the space required to hold the path: @@ -156,14 +150,11 @@ HKEY Key; DWORD KeyIndex = 0; - /* Validate parameters */ - if ( ! ServiceName ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( ServiceName ); /* Device type zero means "all" */ - if ( ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) && - ( DeviceType != 0 ) ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( VALID_SOUND_DEVICE_TYPE(DeviceType) || + DeviceType == 0 ); while ( OpenSoundDeviceRegKey(ServiceName, KeyIndex, &Key) == MMSYSERR_NOERROR ) { @@ -284,10 +275,7 @@ TRACE_("Detecting NT4 style sound devices of type %d\n", DeviceType); - if ( ! VALID_SOUND_DEVICE_TYPE(DeviceType) ) - { - return MMSYSERR_INVALPARAM; - } + VALIDATE_MMSYS_PARAMETER( VALID_SOUND_DEVICE_TYPE(DeviceType) ); DeviceNameLength = wcslen(BaseDeviceName); /* Consider the length of the number */ Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -96,17 +96,10 @@ { PSOUND_THREAD_OVERLAPPED Overlapped; - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! Buffer ) - return MMSYSERR_INVALPARAM; - - if ( BufferSize == 0 ) - return MMSYSERR_INVALPARAM; - - if ( ! IoCompletionHandler ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( Buffer ); + VALIDATE_MMSYS_PARAMETER( BufferSize > 0 ); + VALIDATE_MMSYS_PARAMETER( IoCompletionHandler ); /* Allocate memory for the overlapped I/O structure (auto-zeroed) */ Overlapped = AllocateMemoryFor(SOUND_THREAD_OVERLAPPED); @@ -326,8 +319,7 @@ IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, IN PVOID Parameter OPTIONAL) { - if ( ! RequestHandler ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( RequestHandler ); ASSERT(SoundThread != INVALID_HANDLE_VALUE); if ( SoundThread == INVALID_HANDLE_VALUE ) Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -20,11 +20,20 @@ static HANDLE ProcessHeapHandle = INVALID_HANDLE_VALUE; static DWORD CurrentAllocations = 0; +typedef struct _ALLOCATION +{ + DWORD Tag; + DWORD Size; +} ALLOCATION; + PVOID -AllocateMemory( +AllocateTaggedMemory( + IN DWORD Tag, IN DWORD Size) { PVOID Pointer = NULL; + + Size += sizeof(ALLOCATION); if ( ProcessHeapHandle == INVALID_HANDLE_VALUE ) ProcessHeapHandle = GetProcessHeap(); @@ -34,19 +43,31 @@ if ( ! Pointer ) return NULL; + /* Store the tag and size */ + ((ALLOCATION*)Pointer)->Tag = Tag; + ((ALLOCATION*)Pointer)->Size = Size; + ++ CurrentAllocations; - return Pointer; + return ((PCHAR)Pointer) + sizeof(ALLOCATION); } VOID -FreeMemory( +FreeTaggedMemory( + IN DWORD Tag, IN PVOID Pointer) { + ALLOCATION* AllocationInfo; + ASSERT(ProcessHeapHandle != INVALID_HANDLE_VALUE); ASSERT(Pointer); - HeapFree(ProcessHeapHandle, 0, Pointer); + AllocationInfo = (ALLOCATION*)((PCHAR)Pointer - sizeof(ALLOCATION)); + + ASSERT( AllocationInfo->Tag == Tag ); + + ZeroMemory(AllocationInfo, AllocationInfo->Size + sizeof(ALLOCATION)); + HeapFree(ProcessHeapHandle, 0, AllocationInfo); -- CurrentAllocations; } @@ -78,6 +99,12 @@ return Digits; } + + +/* + Result codes +*/ + MMRESULT Win32ErrorToMmResult(UINT error_code) { @@ -108,3 +135,31 @@ return MMSYSERR_ERROR; } + +/* + If a function invokes another function, this aids in translating the result + code so that it is applicable in the context of the original caller. For + example, specifying that an invalid parameter was passed probably does not + make much sense if the parameter wasn't passed by the original caller! + + However, things like MMSYSERR_NOMEM make sense to return to the caller. + + This could potentially highlight internal logic problems. +*/ +MMRESULT +TranslateInternalMmResult(MMRESULT Result) +{ + switch ( Result ) + { + case MMSYSERR_INVALPARAM : + case MMSYSERR_INVALFLAG : + { + ERR_("MMRESULT from an internal routine failed with error %d\n", + (int) Result); + + return MMSYSERR_ERROR; + } + } + + return Result; +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -25,11 +25,10 @@ UCHAR DeviceType; MMRESULT Result; - if ( ! IsValidSoundDevice(SoundDevice) ) - return MMSYSERR_INVALPARAM; + TRACE_("QueryWaveDeviceFormatSupport\n"); - if ( ! WaveFormat ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( WaveFormat ); Result = GetSoundDeviceType(SoundDevice, &DeviceType); ASSERT(Result == MMSYSERR_NOERROR); @@ -61,19 +60,17 @@ DWORD BytesReturned = 0; MMRESULT Result; - if ( ! IsValidSoundDevice(SoundDevice) ) - return MMSYSERR_INVALPARAM; + TRACE_("DefaultQueryWaveDeviceFormatSupport\n"); - if ( ! WaveFormat ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDevice(SoundDevice) ); + VALIDATE_MMSYS_PARAMETER( WaveFormat ); Result = GetSoundDeviceType(SoundDevice, &DeviceType); ASSERT(Result == MMSYSERR_NOERROR); /* Make sure we have a wave device */ - if ( ! IS_WAVE_DEVICE_TYPE(DeviceType) ) - return MMSYSERR_INVALPARAM; /* FIXME? */ + VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) ); Result = OpenKernelSoundDevice(SoundDevice, GENERIC_READ | GENERIC_WRITE, @@ -105,11 +102,10 @@ PMMFUNCTION_TABLE FunctionTable; MMRESULT Result; - if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) - return MMSYSERR_INVALPARAM; + TRACE_("SetWaveDeviceFormat\n"); - if ( ! WaveFormat ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( WaveFormat ); Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); ASSERT(Result == MMSYSERR_NOERROR); @@ -118,8 +114,7 @@ ASSERT(Result == MMSYSERR_NOERROR); /* Make sure we have a wave device */ - if ( ! IS_WAVE_DEVICE_TYPE(DeviceType) ) - return MMSYSERR_INVALPARAM; /* FIXME? */ + VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) ); /* TODO: Should we check the size? */ @@ -144,11 +139,10 @@ MMRESULT Result; DWORD BytesReturned = 0; - if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) - return MMSYSERR_INVALPARAM; + TRACE_("DefaultSetWaveDeviceFormat\n"); - if ( ! WaveFormat ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( WaveFormat ); Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); ASSERT(Result == MMSYSERR_NOERROR); @@ -157,8 +151,7 @@ ASSERT(Result == MMSYSERR_NOERROR); /* Make sure we have a wave device */ - if ( ! IS_WAVE_DEVICE_TYPE(DeviceType) ) - return MMSYSERR_INVALPARAM; /* FIXME? */ + VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) ); Result = WriteToSoundDevice(SoundDeviceInstance, IOCTL_WAVE_SET_FORMAT, Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -23,8 +23,7 @@ { PWAVE_STREAM_INFO StreamInfo; - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); StreamInfo = &SoundDeviceInstance->Streaming.Wave; @@ -44,17 +43,11 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PWAVEHDR BufferHeader) { - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! BufferHeader ) - return MMSYSERR_INVALPARAM; - - if ( ! BufferHeader->lpData ) - return MMSYSERR_INVALPARAM; - - if ( ! BufferHeader->dwBufferLength ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( BufferHeader ); + VALIDATE_MMSYS_PARAMETER( BufferHeader->lpData ); + VALIDATE_MMSYS_PARAMETER( BufferHeader->dwBufferLength > 0 ); + /* TODO: Check anything more about this buffer? */ if ( ! (BufferHeader->dwFlags & WHDR_PREPARED ) ) return WAVERR_UNPREPARED; @@ -74,11 +67,8 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, OUT PUCHAR State) { - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! State ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( State ); return CallUsingSoundThread(SoundDeviceInstance, GetWaveDeviceState_Request, @@ -113,8 +103,7 @@ PauseWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); return CallUsingSoundThread(SoundDeviceInstance, PauseWaveDevice_Request, @@ -134,8 +123,7 @@ RestartWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); return CallUsingSoundThread(SoundDeviceInstance, RestartWaveDevice_Request, Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -65,7 +65,7 @@ TRACE_("PerformWaveIo\n"); - ASSERT(SoundDeviceInstance); + ASSERT( IsValidSoundDeviceInstance(SoundDeviceInstance) ); /* These shouldn't fail unless we pass them garbage */ Result = GetSoundDeviceFromInstance(SoundDeviceInstance, @@ -210,11 +210,8 @@ PWAVEHDR WaveHeader = (PWAVEHDR) Parameter; PWAVE_STREAM_INFO StreamInfo; - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! WaveHeader ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( WaveHeader ); /* To avoid stupidly long variable names we alias this */ StreamInfo = &SoundDeviceInstance->Streaming.Wave; @@ -275,11 +272,8 @@ PMMFUNCTION_TABLE Functions; PUCHAR State = (PUCHAR) Parameter; - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! State ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( State ); // *State = SoundDeviceInstance->Streaming.Wave.State; @@ -304,8 +298,7 @@ PSOUND_DEVICE SoundDevice; PMMFUNCTION_TABLE Functions; - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); @@ -323,8 +316,7 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter) { - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); if ( SoundDeviceInstance->Streaming.Wave.State != WAVE_DD_STOPPED ) { Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sun Jul 13 15:48:50 2008 @@ -62,6 +62,9 @@ TRACE_("In WODM_OPEN\n"); Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, device_id, &Device); + TRACE_("GetSoundDevice == %d\n", (int) Result); + + if ( Result != MMSYSERR_NOERROR ) return Result; @@ -77,6 +80,8 @@ ASSERT(private_handle != 0); Result = CreateSoundDeviceInstance(Device, &Instance); + TRACE_("CreateSoundDeviceInstance == %d\n", (int) Result); + if ( Result != MMSYSERR_NOERROR ) return Result;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs