Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[jimtabor] 34399: CS_NOKEYCVT is used to set Classname to Version when calling to register class.
by jimtabor＠svn.reactos.org 10 Jul '08

10 Jul '08

Author: jimtabor Date: Wed Jul 9 20:28:59 2008 New Revision: 34399 URL: http://svn.reactos.org/svn/reactos?rev=34399&view=rev Log: CS_NOKEYCVT is used to set Classname to Version when calling to register class. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Wed Jul 9 20:28:59 2008 @@ -639,7 +639,7 @@ #define CS_BYTEALIGNCLIENT 4096 #define CS_BYTEALIGNWINDOW 8192 #define CS_KEYCVTWINDOW 4 -#define CS_NOKEYCVT 256 +#define CS_NOKEYCVT 256 // Class Name to Version #define CS_CLASSDC 64 #define CS_DBLCLKS 8 #define CS_GLOBALCLASS 16384

1 0

[silverblade] 34398: Rewrote sound threading code. No point in having a single thread per audio device when all it's doing is swapping buffers over. Also rewrote the wave streaming code. It can now stream multiple WAVEHDRs and split them up as needed. Playback not very smooth in places - need to double-buffer the audio data.
by silverblade＠svn.reactos.org 09 Jul '08

09 Jul '08

Author: silverblade Date: Wed Jul 9 18:43:44 2008 New Revision: 34398 URL: http://svn.reactos.org/svn/reactos?rev=34398&view=rev Log: Rewrote sound threading code. No point in having a single thread per audio device when all it's doing is swapping buffers over. Also rewrote the wave streaming code. It can now stream multiple WAVEHDRs and split them up as needed. Playback not very smooth in places - need to double-buffer the audio data. Modified: branches/silverblade-audio/dll/win32/mmdrv/testing.c branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h 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/mme/wodMessage.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c Modified: branches/silverblade-audio/dll/win32/mmdrv/testing.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/mmd… ============================================================================== --- branches/silverblade-audio/dll/win32/mmdrv/testing.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/mmdrv/testing.c [iso-8859-1] Wed Jul 9 18:43:44 2008 @@ -45,7 +45,7 @@ { /* MessageBox(0, DevicePath, L"CALLBACK", MB_OK | MB_TASKMODAL);*/ - AddSoundDevice(DeviceType, DevicePath); + AddSoundDevice(DeviceType, DevicePath, NULL); return TRUE; } @@ -106,7 +106,7 @@ PSOUND_DEVICE Device; MMRESULT Result; - AddSoundDevice(WAVE_OUT_DEVICE_TYPE, L"\\\\.\\SBWaveOut0"); + AddSoundDevice(WAVE_OUT_DEVICE_TYPE, L"\\\\.\\SBWaveOut0", NULL); Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, 0, &Device); if ( Result != MMSYSERR_NOERROR ) @@ -136,7 +136,7 @@ MMRESULT Result; WAVEFORMATEX fmt; - AddSoundDevice(WAVE_OUT_DEVICE_TYPE, L"\\\\.\\SBWaveOut0"); + AddSoundDevice(WAVE_OUT_DEVICE_TYPE, L"\\\\.\\SBWaveOut0", NULL); Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, 0, &Device); if ( Result != MMSYSERR_NOERROR ) @@ -179,86 +179,6 @@ } -VOID -TestPlaybackHackingly() -{ - WCHAR msg[1024]; - MMRESULT Result; - WAVEFORMATEX fmt; - ULONG i; - - for ( i = 0; i < 65536; ++ i ) - JunkBuffer[i] = rand(); - - AddSoundDevice(WAVE_OUT_DEVICE_TYPE, L"\\\\.\\SBWaveOut0"); - Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, 0, &Device); - - if ( Result != MMSYSERR_NOERROR ) - { - MessageBox(0, L"Fail 1", L"Fail", MB_OK | MB_TASKMODAL); - return; - } - -/* Result = OpenKernelSoundDevice(Device, GENERIC_READ | GENERIC_WRITE); - if ( Result != MMSYSERR_NOERROR ) - { - MessageBox(0, L"Fail open", L"Fail", MB_OK | MB_TASKMODAL); - return; - } - wsprintf(msg, L"Opened handle %x", Device->Handle); - MessageBox(0, msg, L"Result", MB_OK | MB_TASKMODAL); -*/ - - Result = CreateSoundDeviceInstance(Device, &Instance); - if ( Result != MMSYSERR_NOERROR ) - { - MessageBox(0, L"Fail 2", L"Fail 2", MB_OK | MB_TASKMODAL); - return; - } - - /* Request a valid format */ - fmt.wFormatTag = WAVE_FORMAT_PCM; - fmt.nChannels = 1; - fmt.nSamplesPerSec = 22050; - fmt.wBitsPerSample = 16; - fmt.nBlockAlign = fmt.nChannels * (fmt.wBitsPerSample / 8); - fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign; - fmt.cbSize = 0; - - Result = SetWaveDeviceFormat(Instance, &fmt, sizeof(WAVEFORMATEX)); - - wsprintf(msg, L"Format support set result: %d\nClick to play!", Result); - MessageBox(0, msg, L"Result", MB_OK | MB_TASKMODAL); - - //SOUND_DEBUG_HEX(Instance->Device->Handle); - - Result = StartWaveThread(Instance); - if ( Result != MMSYSERR_NOERROR ) - { - MessageBox(0, L"Failed to start thread", L"Fail 3", MB_OK | MB_TASKMODAL); - return; - } - - //SOUND_DEBUG_HEX(Instance->Device->Handle); - - waveheader.lpData = (PVOID) JunkBuffer; - waveheader.dwBufferLength = 65536; - waveheader.dwFlags = WHDR_PREPARED; - - Result = QueueWaveDeviceBuffer(Instance, &waveheader); -// CallSoundThread(Instance, WAVEREQUEST_QUEUE_BUFFER, &waveheader); -/* - Result = WriteSoundDeviceBuffer(Instance, - JunkBuffer, 65535, OverlappedCallback); -*/ - wsprintf(msg, L"Play result: %d", Result); - MessageBox(0, msg, L"Result", MB_OK | MB_TASKMODAL); - - StopWaveThread(Instance); - DestroySoundDeviceInstance(Instance); -} - - APIENTRY VOID TestDevEnum() { @@ -281,44 +201,6 @@ } -WINAPI VOID -TestThreading() -{ - MMRESULT Result; - PSOUND_DEVICE Device; - PSOUND_DEVICE_INSTANCE Instance; - - AddSoundDevice(WAVE_OUT_DEVICE_TYPE, L"\\\\.\\SBWaveOut0"); - Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, 0, &Device); - if ( Result != MMSYSERR_NOERROR ) - { - MessageBox(0, L"Fail 1", L"Fail 1", MB_OK | MB_TASKMODAL); - return; - } - - Result = CreateSoundDeviceInstance(Device, &Instance); - if ( Result != MMSYSERR_NOERROR ) - { - MessageBox(0, L"Fail 2", L"Fail 2", MB_OK | MB_TASKMODAL); - return; - } - - Result = StartWaveThread(Instance); - if ( Result != MMSYSERR_NOERROR ) - { - MessageBox(0, L"Fail 3", L"Fail 3", MB_OK | MB_TASKMODAL); - return; - } - - MessageBox(0, L"Click to send a request", L"Bai", MB_OK | MB_TASKMODAL); - CallSoundThread(Instance, 69, NULL); - - MessageBox(0, L"Click to kill thread", L"Bai", MB_OK | MB_TASKMODAL); - - StopWaveThread(Instance); -} - - VOID wodTest() { @@ -353,14 +235,6 @@ LPWSTR lpCmdLine, int nCmdShow) { -// TestDeviceDetection(); -// wodTest(); -// TestFormatQuery(); - TestPlaybackHackingly(); -// TestDevEnum(); -/* - TestThreading(); -*/ MessageBox(0, L"Le end", L"Bai", MB_OK | MB_TASKMODAL); return 0; } 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] Wed Jul 9 18:43:44 2008 @@ -96,10 +96,15 @@ 0, FoundDevice); + /* TODO: Check return value */ + StartSoundThread(); + return 1L; case DRV_FREE : SOUND_DEBUG(L"DRV_FREE"); + + StopSoundThread(); RemoveAllSoundDevices(); @@ -139,7 +144,7 @@ FILE* f; f = fopen("27may2_a.wav", "rb"); - fseek(f, 50, SEEK_SET); + fseek(f, 48, SEEK_SET); fread(Buffer, 1, 5340000, f); fclose(f); @@ -160,7 +165,7 @@ /* WODM_OPEN */ Format.wFormatTag = WAVE_FORMAT_PCM; Format.nChannels = 2; - Format.nSamplesPerSec = 44100; + Format.nSamplesPerSec = 22050; Format.wBitsPerSample = 16; Format.nBlockAlign = Format.nChannels * (Format.wBitsPerSample / 8); Format.nAvgBytesPerSec = Format.nSamplesPerSec * Format.nBlockAlign; @@ -189,6 +194,14 @@ WaveHeaders[2].dwBufferLength = 1000000; WaveHeaders[2].dwFlags = WHDR_PREPARED; + WaveHeaders[3].lpData = (PVOID) ((PCHAR)Buffer + (1000000 *3)); + WaveHeaders[3].dwBufferLength = 1000000; + WaveHeaders[3].dwFlags = WHDR_PREPARED; + + WaveHeaders[4].lpData = (PVOID) ((PCHAR)Buffer + (1000000 *4)); + WaveHeaders[4].dwBufferLength = 1000000; + WaveHeaders[4].dwFlags = WHDR_PREPARED; + // WaveHeader2.lpData = (PVOID) Buffer2; // WaveHeader2.dwBufferLength = 10; // WaveHeader2.dwFlags = WHDR_PREPARED; @@ -196,6 +209,8 @@ Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeaders[0], 0); Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeaders[1], 0); Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeaders[2], 0); + Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeaders[3], 0); + Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeaders[4], 0); //Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeader2, 0); 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] Wed Jul 9 18:43:44 2008 @@ -21,6 +21,9 @@ /* Hacky debug macro */ + +#include <stdio.h> +#define SOUND_TRACE printf #define SOUND_DEBUG(x) \ MessageBox(0, x, L"Debug", MB_OK | MB_TASKMODAL); @@ -90,6 +93,50 @@ } UNIVERSAL_CAPS, *PUNIVERSAL_CAPS; + +/* New sound thread code */ + +typedef MMRESULT (*SOUND_THREAD_REQUEST_HANDLER)( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN OPTIONAL PVOID Parameter); + +typedef struct _SOUND_THREAD_REQUEST +{ + /* The sound device instance this request relates to */ + struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance; + /* What function to call */ + SOUND_THREAD_REQUEST_HANDLER RequestHandler; + /* Caller-defined parameter */ + PVOID Parameter; + /* This will contain the return code of the request function */ + MMRESULT ReturnValue; +} SOUND_THREAD_REQUEST, *PSOUND_THREAD_REQUEST; + +typedef VOID (*SOUND_THREAD_IO_COMPLETION_HANDLER)( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN PVOID Parameter OPTIONAL, + IN DWORD BytesWritten); + +typedef struct _SOUND_THREAD_COMPLETED_IO +{ + struct _SOUND_THREAD_COMPLETED_IO* Previous; + struct _SOUND_THREAD_COMPLETED_IO* Next; + + struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance; + SOUND_THREAD_IO_COMPLETION_HANDLER CompletionHandler; + PVOID Parameter; + DWORD BytesTransferred; +} SOUND_THREAD_COMPLETED_IO, *PSOUND_THREAD_COMPLETED_IO; + +typedef struct _SOUND_THREAD_OVERLAPPED +{ + OVERLAPPED General; + + /* Pointer to structure to fill with completion data */ + PSOUND_THREAD_COMPLETED_IO CompletionData; +} SOUND_THREAD_OVERLAPPED, *PSOUND_THREAD_OVERLAPPED; + +#if 0 /* Used internally to shuttle data to/from the sound processing thread. */ @@ -117,11 +164,6 @@ PSOUND_THREAD_COMPLETED_IO CompletionData; } SOUND_THREAD_OVERLAPPED, *PSOUND_THREAD_OVERLAPPED; -typedef MMRESULT (*SOUND_THREAD_REQUEST_HANDLER)( - IN struct _SOUND_DEVICE_INSTANCE* Instance, - IN PVOID PrivateThreadData, - IN DWORD RequestId, - IN PVOID Data); typedef VOID (*SOUND_THREAD_IO_COMPLETION_HANDLER)( IN struct _SOUND_DEVICE_INSTANCE* Instance, @@ -147,25 +189,16 @@ PSOUND_THREAD_COMPLETED_IO FirstCompletedIo; SOUND_THREAD_IO_COMPLETION_HANDLER IoCompletionHandler; } SOUND_THREAD, *PSOUND_THREAD; +#endif /* Wave thread */ - -typedef struct _WAVE_OVERLAPPED -{ - OVERLAPPED General; - struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance; - struct _WAVE_THREAD_DATA* ThreadData; - PWAVEHDR Header; -} WAVE_OVERLAPPED, *PWAVE_OVERLAPPED; - +#if 0 typedef struct _WAVE_THREAD_DATA { /* Wave thread specific */ - WAVE_OVERLAPPED Overlapped; - DWORD BufferCount; PWAVEHDR CurrentBuffer; PWAVEHDR FirstBuffer; @@ -174,6 +207,7 @@ /* How much data is waiting with the driver */ DWORD RemainingBytes; } WAVE_THREAD_DATA, *PWAVE_THREAD_DATA; +#endif /* Audio device function table @@ -234,17 +268,36 @@ Represents an individual instance of an audio device */ +typedef struct _WAVE_STREAM_INFO +{ + /* Buffer queue head and tail */ + PWAVEHDR BufferQueueHead; + PWAVEHDR BufferQueueTail; + /* The buffer currently being processed */ + PWAVEHDR CurrentBuffer; + /* How far into the current buffer we've gone */ + DWORD BufferOffset; + /* How much data we're expecting back */ + DWORD BytesOutstanding; +} WAVE_STREAM_INFO, *PWAVE_STREAM_INFO; + typedef struct _SOUND_DEVICE_INSTANCE { struct _SOUND_DEVICE_INSTANCE* Next; PSOUND_DEVICE Device; - PSOUND_THREAD Thread; +/* PSOUND_THREAD Thread;*/ /* Stuff generously donated to us from WinMM */ struct { DWORD ClientCallback; } WinMM; + + /* Device-specific parameters */ + union + { + WAVE_STREAM_INFO Wave; + } Streaming; } SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE; @@ -493,60 +546,38 @@ DefaultInstanceDestructor( IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance); + +/* + thread.c +*/ + +MMRESULT +OverlappedSoundDeviceIo( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Buffer, + IN DWORD BufferSize, + IN SOUND_THREAD_IO_COMPLETION_HANDLER IoCompletionHandler, + IN PVOID CompletionParameter OPTIONAL); + +MMRESULT +StartSoundThread(); + +MMRESULT +StopSoundThread(); + +MMRESULT +CallUsingSoundThread( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, + IN PVOID Parameter); + + + MMRESULT QueueWaveDeviceBuffer( IN PSOUND_DEVICE_INSTANCE Instance, IN PWAVEHDR BufferHeader); - -/* - thread.c -*/ - -MMRESULT -StartSoundThread( - IN PSOUND_DEVICE_INSTANCE Instance, - IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, - IN SOUND_THREAD_IO_COMPLETION_HANDLER IoCompletionHandler, - IN LPVOID PrivateThreadData); - -MMRESULT -StopSoundThread( - IN PSOUND_DEVICE_INSTANCE Instance); - -MMRESULT -CallSoundThread( - IN PSOUND_DEVICE_INSTANCE Instance, - IN DWORD RequestId, - IN PVOID RequestData); - -MMRESULT -GetSoundThreadPrivateData( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PVOID* PrivateData); - -VOID CALLBACK -CompleteSoundThreadIo( - IN DWORD dwErrorCode, - IN DWORD dwNumberOfBytesTransferred, - IN LPOVERLAPPED lpOverlapped); - -MMRESULT -OverlappedWriteToSoundDevice( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID ContextData, - IN PVOID Buffer, - IN DWORD BufferSize); - - - -MMRESULT -StartWaveThread( - IN PSOUND_DEVICE_INSTANCE Instance); - -MMRESULT -StopWaveThread( - IN PSOUND_DEVICE_INSTANCE Instance); /* 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] Wed Jul 9 18:43:44 2008 @@ -570,36 +570,3 @@ ASSERT(Result == MMSYSERR_NOERROR); } - - -MMRESULT -QueueWaveDeviceBuffer( - IN PSOUND_DEVICE_INSTANCE Instance, - IN PWAVEHDR BufferHeader) -{ - MMRESULT Result; - - if ( ! Instance ) - return MMSYSERR_INVALPARAM; - - if ( ! BufferHeader ) - return MMSYSERR_INVALPARAM; - - if ( ! BufferHeader->lpData ) - return MMSYSERR_INVALPARAM; - - if ( ! BufferHeader->dwBufferLength ) - return MMSYSERR_INVALPARAM; - - if ( ! (BufferHeader->dwFlags & WHDR_PREPARED ) ) - return WAVERR_UNPREPARED; - - /* TODO: WHDR_INQUEUE */ - - BufferHeader->dwFlags &= ~WHDR_DONE; - BufferHeader->lpNext = NULL; - - Result = CallSoundThread(Instance, WAVEREQUEST_QUEUE_BUFFER, BufferHeader); - - return Result; -} 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] Wed Jul 9 18:43:44 2008 @@ -30,7 +30,6 @@ /* Initialise */ SoundDeviceInstance->Next = NULL; SoundDeviceInstance->Device = NULL; - SoundDeviceInstance->Thread = NULL; /* TODO: WinMM callback entry */ } 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] Wed Jul 9 18:43:44 2008 @@ -217,10 +217,13 @@ { WCHAR msg[128]; if ( ( ! SoundDeviceInstance ) || ( ! Buffer ) || ( BufferSize == 0 ) ) - return MMSYSERR_INVALPARAM; - - wsprintf(msg, L"Writing to handle %x", SoundDeviceInstance->Device->Handle); - SOUND_DEBUG(msg); + { + SOUND_DEBUG(L"Invalid parameter!\n"); + return MMSYSERR_INVALPARAM; + } + + /*wsprintf(msg, L"Writing to handle %x", SoundDeviceInstance->Device->Handle);*/ + /*SOUND_DEBUG(msg);*/ if ( ! WriteFileEx(SoundDeviceInstance->Device->Handle, Buffer, Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wodMessage.c [iso-8859-1] Wed Jul 9 18:43:44 2008 @@ -33,7 +33,7 @@ PSOUND_DEVICE_INSTANCE Instance = (PSOUND_DEVICE_INSTANCE)private_handle; - SOUND_DEBUG(L"wodMessageStub called\n"); + SOUND_TRACE("wodMessageStub called\n"); switch ( message ) { @@ -64,7 +64,7 @@ { WAVEOPENDESC* OpenParameters = (WAVEOPENDESC*) parameter1; - SOUND_DEBUG(L"In WODM_OPEN"); + SOUND_TRACE("In WODM_OPEN\n"); Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, device_id, &Device); if ( Result != MMSYSERR_NOERROR ) return Result; @@ -94,15 +94,6 @@ return Result; } - /* Start the wave handling thread */ - Result = StartWaveThread(Instance); - if ( Result != MMSYSERR_NOERROR ) - { - /* TODO: Do we need to do anything more */ - DestroySoundDeviceInstance(Instance); - return Result; - } - /* Provide winmm with instance handle */ *((PSOUND_DEVICE_INSTANCE*)private_handle) = Instance; @@ -117,9 +108,6 @@ SOUND_ASSERT(Instance != NULL); /* TODO: Ensure its OK to close */ - - Result = StopWaveThread(Instance); - SOUND_ASSERT(Result == MMSYSERR_NOERROR); Result = DestroySoundDeviceInstance(Instance); SOUND_DEBUG_HEX(Result); 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] Wed Jul 9 18:43:44 2008 @@ -12,16 +12,7 @@ 4 July 2008 - Created 5 July 2008 - Implemented basic request processing 6 July 2008 - Added I/O completion handling - - Possible improvements: - Spawn *one* thread to deal with requests and I/O completion, rather - than have a thread per sound device instance. This wouldn't be too - hard to do but not worth doing right now. -*/ - -/* - This is used internally by the internal routines - (my, how recursive of you...) + 9 July 2008 - Rewritten to have a single streaming thread */ #include <windows.h> @@ -29,309 +20,29 @@ #include <mmebuddy.h> - -/* - This is the sound thread's processing loop. Its job is to aid in - asynchronous streaming of sound data with a kernel-mode driver. It's - basically a loop in which we wait for a request from the client, or - completed data from the kernel-mode driver. - - When either of these events occur, the relevant details get passed on - to one of the routines specified when the thread was started. -*/ -DWORD WINAPI -SoundThreadProc( - IN LPVOID lpParameter) -{ - PSOUND_DEVICE_INSTANCE Instance; - PSOUND_THREAD Thread; - - Instance = (PSOUND_DEVICE_INSTANCE) lpParameter; - Thread = Instance->Thread; - - Thread->Running = TRUE; - - /* We're ready to do work */ - SetEvent(Thread->ReadyEvent); - - /*MessageBox(0, L"Hi from thread!", L"Hi!", MB_OK | MB_TASKMODAL);*/ - - while ( Thread->Running ) - { - DWORD WaitResult; - - /* Wait for some work, or I/O completion */ - WaitResult = WaitForSingleObjectEx(Thread->RequestEvent, INFINITE, TRUE); - - if ( WaitResult == WAIT_OBJECT_0 ) - { - /* Do the work (request 0 kills the thread) */ - Thread->Request.Result = - Thread->RequestHandler(Instance, - Thread->PrivateData, - Thread->Request.RequestId, - Thread->Request.Data); - - if ( Thread->Request.RequestId == 0 ) - { - Thread->Running = FALSE; - Thread->Request.Result = MMSYSERR_NOERROR; - } - - /* Notify the caller that the work is done */ - SetEvent(Thread->ReadyEvent); - SetEvent(Thread->DoneEvent); - } - else if ( WaitResult == WAIT_IO_COMPLETION ) - { - /* This gets called after I/O completion */ - PSOUND_THREAD_COMPLETED_IO CompletionData; - SOUND_ASSERT(Thread->FirstCompletedIo); - - //SOUND_DEBUG(L"Outside I/O completion APC"); - - /* - Purge the completed data queue - FIXME? This will be done in the WRONG ORDER! - Is this such a problem? The caller won't care. We'll need - to remove them from our queue though! - */ - while ( (CompletionData = Thread->FirstCompletedIo) ) - { - /* Call high-level custom I/O completion routine */ - Thread->IoCompletionHandler(Instance, - Thread->PrivateData, - CompletionData->ContextData, - CompletionData->BytesTransferred); - - /* TODO: I'm sure I've forgotten something ... */ - - Thread->FirstCompletedIo = CompletionData->Next; - FreeMemory(CompletionData); - } - } - } - - /*MessageBox(0, L"Bye from thread!", L"Bye!", MB_OK | MB_TASKMODAL);*/ - - ExitThread(0); - return 0; -} - -MMRESULT -CreateThreadEvents( - IN PSOUND_THREAD Thread) -{ - /* Create the request event */ - Thread->RequestEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - - if ( ! Thread->RequestEvent ) - { - return MMSYSERR_NOMEM; - } - - /* Create the 'ready' event */ - Thread->ReadyEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - - if ( ! Thread->ReadyEvent ) - { - CloseHandle(Thread->RequestEvent); - return MMSYSERR_NOMEM; - } - - /* Create the 'done' event */ - Thread->DoneEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - - if ( ! Thread->DoneEvent ) - { - CloseHandle(Thread->ReadyEvent); - CloseHandle(Thread->RequestEvent); - return MMSYSERR_NOMEM; - } - - return MMSYSERR_NOERROR; -} - -MMRESULT -DestroyThreadEvents( - IN PSOUND_THREAD Thread) -{ - CloseHandle(Thread->RequestEvent); - Thread->RequestEvent = INVALID_HANDLE_VALUE; - - CloseHandle(Thread->ReadyEvent); - Thread->ReadyEvent = INVALID_HANDLE_VALUE; - - CloseHandle(Thread->DoneEvent); - Thread->DoneEvent = INVALID_HANDLE_VALUE; - - return MMSYSERR_NOERROR; -} - - -MMRESULT -StartSoundThread( - IN PSOUND_DEVICE_INSTANCE Instance, - IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, - IN SOUND_THREAD_IO_COMPLETION_HANDLER IoCompletionHandler, - IN LPVOID PrivateThreadData) -{ - PSOUND_THREAD SoundThread = NULL; - - /* Validate parameters */ - if ( ! Instance ) - return MMSYSERR_INVALPARAM; - - if ( ! RequestHandler ) - return MMSYSERR_INVALPARAM; - - /* Only allowed one thread per instance */ - if ( Instance->Thread ) - return MMSYSERR_ERROR; - - /* Allocate memory for the thread info */ - SoundThread = AllocateMemoryFor(SOUND_THREAD); - - if ( ! SoundThread ) - return MMSYSERR_NOMEM; - - /* Initialise */ - SoundThread->PrivateData = PrivateThreadData; - SoundThread->Running = FALSE; - SoundThread->Handle = INVALID_HANDLE_VALUE; - - SoundThread->RequestHandler = RequestHandler; - SoundThread->ReadyEvent = INVALID_HANDLE_VALUE; - SoundThread->RequestEvent = INVALID_HANDLE_VALUE; - SoundThread->DoneEvent = INVALID_HANDLE_VALUE; - - SoundThread->IoCompletionHandler = IoCompletionHandler; - SoundThread->FirstCompletedIo = NULL; - - /* No need to initialise the requests */ - - /* Create the events */ - if ( CreateThreadEvents(SoundThread) != MMSYSERR_NOERROR ) - { - FreeMemory(SoundThread); - return MMSYSERR_NOMEM; - } - - if ( ! SoundThread->RequestEvent ) - { - CloseHandle(SoundThread->RequestEvent); - FreeMemory(SoundThread); - return MMSYSERR_NOMEM; - } - - /* Do the creation thang */ - SoundThread->Handle = CreateThread(NULL, - 0, - &SoundThreadProc, - (LPVOID) Instance, - CREATE_SUSPENDED, - NULL); - - if (SoundThread->Handle == INVALID_HANDLE_VALUE ) - { - FreeMemory(SoundThread); - return Win32ErrorToMmResult(GetLastError()); - } - - /* Assign the thread to the instance */ - Instance->Thread = SoundThread; - - /* Go! */ - ResumeThread(SoundThread->Handle); - - return MMSYSERR_NOERROR; -} - -MMRESULT -StopSoundThread( - IN PSOUND_DEVICE_INSTANCE Instance) -{ - if ( ! Instance ) - return MMSYSERR_INVALPARAM; - - if ( ! Instance->Thread ) - return MMSYSERR_ERROR; - - /* Send request zero to ask the thread to end */ - CallSoundThread(Instance, 0, NULL); - - /* Wait for the thread to exit */ - WaitForSingleObject(Instance->Thread->Handle, INFINITE); - - /* Finish with the thread */ - CloseHandle(Instance->Thread->Handle); - Instance->Thread->Handle = INVALID_HANDLE_VALUE; - - /* Clean up the thread events */ - DestroyThreadEvents(Instance->Thread); - - /* Free memory associated with the thread */ - FreeMemory(Instance->Thread); - Instance->Thread = NULL; - - return MMSYSERR_NOERROR; -} - -MMRESULT -CallSoundThread( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN DWORD RequestId, - IN PVOID RequestData) -{ - MMRESULT Result; - - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! SoundDeviceInstance->Thread ) - return MMSYSERR_ERROR; - - //SOUND_DEBUG(L"Waiting for Ready event"); - - /* Wait for the thread to be ready */ - WaitForSingleObject(SoundDeviceInstance->Thread->ReadyEvent, INFINITE); - - /* Load the request */ - SoundDeviceInstance->Thread->Request.DeviceInstance = SoundDeviceInstance; - SoundDeviceInstance->Thread->Request.RequestId = RequestId; - SoundDeviceInstance->Thread->Request.Data = RequestData; - SoundDeviceInstance->Thread->Request.Result = MMSYSERR_NOTSUPPORTED; - - /* Notify the thread that there's a request to be processed */ - SetEvent(SoundDeviceInstance->Thread->RequestEvent); - - /* Wait for the thread to be ready (request complete) */ - WaitForSingleObject(SoundDeviceInstance->Thread->DoneEvent, INFINITE); - - /* Grab the result */ - Result = SoundDeviceInstance->Thread->Request.Result; - - return Result; -} - -MMRESULT -GetSoundThreadPrivateData( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PVOID* PrivateData) -{ - if ( ! SoundDeviceInstance ) - return MMSYSERR_INVALPARAM; - - if ( ! SoundDeviceInstance->Thread ) - return MMSYSERR_ERROR; - - if ( ! PrivateData ) - return MMSYSERR_INVALPARAM; - - *PrivateData = SoundDeviceInstance->Thread->PrivateData; - - return MMSYSERR_NOERROR; -} +/* HAX */ +#include <stdio.h> + +static BOOLEAN ThreadRunning = FALSE; +static HANDLE SoundThread = INVALID_HANDLE_VALUE; +static HANDLE ReadyEvent = INVALID_HANDLE_VALUE; +static HANDLE RequestEvent = INVALID_HANDLE_VALUE; +static HANDLE DoneEvent = INVALID_HANDLE_VALUE; + +static SOUND_THREAD_REQUEST CurrentRequest = +{ + NULL, + NULL, + NULL, + MMSYSERR_NOERROR +}; + +static SOUND_THREAD_COMPLETED_IO* CompletedIoListHead = NULL; +static SOUND_THREAD_COMPLETED_IO* CompletedIoListTail = NULL; + + +VOID +CleanupThreadEvents(); VOID CALLBACK CompleteSoundThreadIo( @@ -339,85 +50,337 @@ IN DWORD dwNumberOfBytesTransferred, IN LPOVERLAPPED lpOverlapped) { - PSOUND_DEVICE_INSTANCE SoundDeviceInstance; - PSOUND_THREAD_OVERLAPPED SoundThreadOverlapped; PSOUND_THREAD_COMPLETED_IO CompletionData; - - SoundThreadOverlapped = (PSOUND_THREAD_OVERLAPPED) lpOverlapped; - SOUND_ASSERT(SoundThreadOverlapped); - - CompletionData = SoundThreadOverlapped->CompletionData; + PSOUND_THREAD_OVERLAPPED SoundOverlapped; + + printf("Overlapped I/O completion APC called\n"); + + SoundOverlapped = (PSOUND_THREAD_OVERLAPPED) lpOverlapped; + SOUND_ASSERT(SoundOverlapped); + + CompletionData = SoundOverlapped->CompletionData; SOUND_ASSERT(CompletionData); - SoundDeviceInstance = SoundThreadOverlapped->SoundDeviceInstance; - SOUND_ASSERT(SoundDeviceInstance); - SOUND_ASSERT(SoundDeviceInstance->Thread); - - //SOUND_DEBUG(L"New I/O Completion Callback Called"); - - /* This is going at the start of the list */ - CompletionData->Next = SoundDeviceInstance->Thread->FirstCompletedIo; - SoundDeviceInstance->Thread->FirstCompletedIo = CompletionData; - - /* Whatever information was supplied to us originally by the caller */ - CompletionData->ContextData = SoundThreadOverlapped->ContextData; - - /* How much data was transferred */ CompletionData->BytesTransferred = dwNumberOfBytesTransferred; - /* Overlapped structure gets freed now, but we still need the completion */ - FreeMemory(SoundThreadOverlapped); - - //SOUND_DEBUG(L"New I/O Completion Callback Done"); -} - -MMRESULT -OverlappedWriteToSoundDevice( + /* Is this the first completion? */ + if ( ! CompletedIoListHead ) + { + printf("First completion - making new head and tail\n"); + /* This is the first completion */ + SOUND_ASSERT(CompletedIoListTail == NULL); + + CompletionData->Previous = NULL; + CompletionData->Next = NULL; + + CompletedIoListHead = CompletionData; + CompletedIoListTail = CompletionData; + } + else + { + printf("Not the first completion - making new tail\n"); + /* This is not the first completion */ + CompletionData->Previous = CompletedIoListTail; + CompletionData->Next = NULL; + + /* Completion data gets made the new tail */ + CompletedIoListTail->Next = CompletionData; + CompletedIoListTail = CompletionData; + } + + /* We keep the completion data, but no longer need this: */ + FreeMemory(SoundOverlapped); +} + +MMRESULT +OverlappedSoundDeviceIo( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID ContextData, IN PVOID Buffer, - IN DWORD BufferSize) + IN DWORD BufferSize, + IN SOUND_THREAD_IO_COMPLETION_HANDLER IoCompletionHandler, + IN PVOID CompletionParameter OPTIONAL) { PSOUND_THREAD_OVERLAPPED Overlapped; - PSOUND_THREAD_COMPLETED_IO CompletedIo; if ( ! SoundDeviceInstance ) return MMSYSERR_INVALPARAM; - if ( ! SoundDeviceInstance->Thread ) - return MMSYSERR_ERROR; /* FIXME - better return code? */ - if ( ! Buffer ) return MMSYSERR_INVALPARAM; - /* This will contain information about the write operation */ + if ( BufferSize == 0 ) + return MMSYSERR_INVALPARAM; + + if ( ! IoCompletionHandler ) + return MMSYSERR_INVALPARAM; + + /* Allocate memory for the overlapped I/O structure (auto-zeroed) */ Overlapped = AllocateMemoryFor(SOUND_THREAD_OVERLAPPED); + if ( ! Overlapped ) return MMSYSERR_NOMEM; - /* We collect this on I/O completion */ - CompletedIo = AllocateMemoryFor(SOUND_THREAD_COMPLETED_IO); - if ( ! CompletedIo ) + /* We also need memory for the completion data (auto-zeroed) */ + Overlapped->CompletionData = AllocateMemoryFor(SOUND_THREAD_COMPLETED_IO); + + if ( ! Overlapped->CompletionData ) { FreeMemory(Overlapped); return MMSYSERR_NOMEM; } - ZeroMemory(Overlapped, sizeof(SOUND_THREAD_OVERLAPPED)); - ZeroMemory(CompletedIo, sizeof(SOUND_THREAD_COMPLETED_IO)); - - /* We'll want to know which device to queue completion data to */ - Overlapped->SoundDeviceInstance = SoundDeviceInstance; - - /* Caller-supplied data, gets passed back on completion */ - Overlapped->ContextData = ContextData; - - /* The completion data buffer which will be filled later */ - Overlapped->CompletionData = CompletedIo; - + /* Information to be passed to the completion routine */ + Overlapped->CompletionData->SoundDeviceInstance = SoundDeviceInstance; + Overlapped->CompletionData->CompletionHandler = IoCompletionHandler; + Overlapped->CompletionData->Parameter = CompletionParameter; + Overlapped->CompletionData->BytesTransferred = 0; + + printf("Performing overlapped I/O\n"); return WriteSoundDeviceBuffer(SoundDeviceInstance, Buffer, BufferSize, CompleteSoundThreadIo, (LPOVERLAPPED) Overlapped); } + +MMRESULT +ProcessThreadExitRequest( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance OPTIONAL, + IN PVOID Parameter OPTIONAL) +{ + printf("ProcessThreadExitRequest called\n"); + ThreadRunning = FALSE; + return MMSYSERR_NOERROR; +} + +DWORD WINAPI +SoundThreadProc( + IN LPVOID lpParameter OPTIONAL) +{ + ThreadRunning = TRUE; + + /* We're ready to do work */ + SetEvent(ReadyEvent); + + while ( ThreadRunning ) + { + DWORD WaitResult; + + /* Wait for a request, or an I/O completion */ + WaitResult = WaitForSingleObjectEx(RequestEvent, INFINITE, TRUE); + + if ( WaitResult == WAIT_OBJECT_0 ) + { + /* Process the request */ + + SOUND_ASSERT(CurrentRequest.RequestHandler != NULL); + if ( CurrentRequest.RequestHandler != NULL ) + { + CurrentRequest.ReturnValue = CurrentRequest.RequestHandler( + CurrentRequest.SoundDeviceInstance, + CurrentRequest.Parameter); + } + else + { + CurrentRequest.ReturnValue = MMSYSERR_ERROR; + } + + /* Announce completion of the request */ + SetEvent(DoneEvent); + /* Accept new requests */ + SetEvent(ReadyEvent); + } + else if ( WaitResult == WAIT_IO_COMPLETION ) + { + PSOUND_THREAD_COMPLETED_IO CurrentCompletion; + + /* Process the I/O Completion */ + + CurrentCompletion = CompletedIoListHead; + SOUND_ASSERT(CurrentCompletion); + + while ( CurrentCompletion ) + { + PSOUND_THREAD_COMPLETED_IO PreviousCompletion; + + /* Call the completion handler */ + CurrentCompletion->CompletionHandler( + CurrentCompletion->SoundDeviceInstance, + CurrentCompletion->Parameter, + CurrentCompletion->BytesTransferred); + + /* Get the next completion but destroy the previous */ + PreviousCompletion = CurrentCompletion; + CurrentCompletion = CurrentCompletion->Next; + FreeMemory(PreviousCompletion); + } + + /* Nothing in the completion queue/list now */ + CompletedIoListHead = NULL; + CompletedIoListTail = NULL; + } + else + { + /* Shouldn't happen! */ + SOUND_ASSERT(FALSE); + } + } + + printf("THREAD: Exiting\n"); + + ExitThread(0); + return 0; +} + +MMRESULT +CreateThreadEvents() +{ + ReadyEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( ReadyEvent == INVALID_HANDLE_VALUE ) + { + CleanupThreadEvents(); + return MMSYSERR_NOMEM; + } + + RequestEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( RequestEvent == INVALID_HANDLE_VALUE ) + { + CleanupThreadEvents(); + return MMSYSERR_NOMEM; + } + + DoneEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( DoneEvent == INVALID_HANDLE_VALUE ) + { + CleanupThreadEvents(); + return MMSYSERR_NOMEM; + } + + return MMSYSERR_NOERROR; +} + +VOID +CleanupThreadEvents() +{ + if ( ReadyEvent != INVALID_HANDLE_VALUE ) + { + CloseHandle(ReadyEvent); + ReadyEvent = INVALID_HANDLE_VALUE; + } + + if ( RequestEvent != INVALID_HANDLE_VALUE ) + { + CloseHandle(RequestEvent); + RequestEvent = INVALID_HANDLE_VALUE; + } + + if ( DoneEvent != INVALID_HANDLE_VALUE ) + { + CloseHandle(DoneEvent); + DoneEvent = INVALID_HANDLE_VALUE; + } +} + +MMRESULT +StartSoundThread() +{ + MMRESULT Result; + + /* Create the thread events */ + Result = CreateThreadEvents(); + + if ( Result != MMSYSERR_NOERROR ) + { + return Result; + } + + /* Create the thread */ + SoundThread = CreateThread(NULL, + 0, + &SoundThreadProc, + (LPVOID) NULL, /* Parameter */ + CREATE_SUSPENDED, + NULL); + + if ( SoundThread == INVALID_HANDLE_VALUE ) + { + CleanupThreadEvents(); + return Win32ErrorToMmResult(GetLastError()); + } + + printf("Starting sound thread\n"); + + /* We're all set to go, so let's start the thread up */ + ResumeThread(SoundThread); + + return MMSYSERR_NOERROR; +} + +MMRESULT +CallUsingSoundThread( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance OPTIONAL, + IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, + IN PVOID Parameter OPTIONAL) +{ + if ( ! RequestHandler ) + return MMSYSERR_INVALPARAM; + + SOUND_ASSERT(SoundThread != INVALID_HANDLE_VALUE); + if ( SoundThread == INVALID_HANDLE_VALUE ) + { + return MMSYSERR_ERROR; + } + + /* Wait for the sound thread to be ready for a request */ + WaitForSingleObject(ReadyEvent, INFINITE); + + /* Fill in the information about the request */ + CurrentRequest.SoundDeviceInstance = SoundDeviceInstance; + CurrentRequest.RequestHandler = RequestHandler; + CurrentRequest.Parameter = Parameter; + CurrentRequest.ReturnValue = MMSYSERR_ERROR; + + /* Tell the sound thread there is a request waiting */ + SetEvent(RequestEvent); + + /* Wait for our request to be dealt with */ + WaitForSingleObject(DoneEvent, INFINITE); + + return CurrentRequest.ReturnValue; +} + +MMRESULT +StopSoundThread() +{ + MMRESULT Result; + + SOUND_ASSERT(SoundThread != INVALID_HANDLE_VALUE); + if ( SoundThread == INVALID_HANDLE_VALUE ) + { + return MMSYSERR_ERROR; + } + + printf("Calling thread shutdown function\n"); + + Result = CallUsingSoundThread(NULL, + ProcessThreadExitRequest, + NULL); + + /* Our request didn't get processed? */ + SOUND_ASSERT(Result != MMSYSERR_NOERROR); + if ( Result != MMSYSERR_NOERROR ) + return Result; + + WaitForSingleObject(SoundThread, INFINITE); + + printf("Sound thread has quit\n"); + + /* Clean up */ + CloseHandle(SoundThread); + CleanupThreadEvents(); + + return MMSYSERR_NOERROR; +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c [iso-8859-1] Wed Jul 9 18:43:44 2008 @@ -30,312 +30,236 @@ Should it be configurable? Some sound drivers let you set buffer size... */ -#define MAX_SOUND_BUFFER_SIZE 1500000 - - -/* - Audio buffer I/O streaming handler. Slices 'n dices your buffers and - serves them up on a platter with a side dressing of your choice. - - It's safe to update the buffer information post-submission within this - routine since any completion will be done in an APC for the same thread, - so we're not likely to be rudely interrupted by a completion routine - bursting through the door. -*/ +#define MAX_SOUND_BUFFER_SIZE 65536 + + + +VOID +CompleteWaveBuffer( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter, + IN DWORD BytesWritten); + + MMRESULT -StreamWaveData( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PWAVE_THREAD_DATA ThreadData) -{ - PWAVEHDR Buffer = ThreadData->CurrentBuffer; - DWORD BufferOffset, BytesToStream, BytesAvailable; - MMRESULT Result; - - SOUND_ASSERT(ThreadData->RemainingBytes <= MAX_SOUND_BUFFER_SIZE); - SOUND_ASSERT(Buffer); - - /* Work out how much data can be streamed with the driver */ - BytesAvailable = MAX_SOUND_BUFFER_SIZE - ThreadData->RemainingBytes; - - while ( ( Buffer = ThreadData->CurrentBuffer ) && ( BytesAvailable > 0 ) ) - { - /* The 'reserved' member of Buffer contains the offset */ - BufferOffset = Buffer->reserved; - - /* - Adjust the amount of data to be streamed based on how much of the - current buffer has actually been dealt with already. - */ - BytesToStream = Buffer->dwBufferLength - BufferOffset; - - /* - We may find that there's nothing to be done with the current - buffer, either on initial entry to this loop or after having - been through a few iterations. Once the buffer has been squeezed - dry, move on to the next victim... +StreamWaveIo( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + PWAVE_STREAM_INFO StreamInfo; + DWORD BytesAvailable, BytesToStream; + + SOUND_TRACE("<== Streaming wave I/O ==>\n"); + + SOUND_ASSERT(SoundDeviceInstance); + + /* Get the streaming info */ + StreamInfo = &SoundDeviceInstance->Streaming.Wave; + + BytesAvailable = MAX_SOUND_BUFFER_SIZE - StreamInfo->BytesOutstanding; + + if ( ! BytesAvailable ) + { + SOUND_TRACE("NO BUFFER SPACE AVAILABLE\n"); + } + + if ( ! StreamInfo->CurrentBuffer ) + { + SOUND_TRACE("NO CURRENT BUFFER\n"); + } + + while ( StreamInfo->CurrentBuffer && BytesAvailable ) + { + /* + Determine how much of the current buffer remains to be + streamed. + */ + BytesToStream = StreamInfo->CurrentBuffer->dwBufferLength - + StreamInfo->BufferOffset; + + SOUND_TRACE("Buffer %p, offset %d, length %d\nAvailable %d | BytesToStream %d | BytesOutstanding %d\n", + StreamInfo->CurrentBuffer, + (int) StreamInfo->BufferOffset, + (int) StreamInfo->CurrentBuffer->dwBufferLength, + (int) BytesAvailable, + (int) BytesToStream, + (int) StreamInfo->BytesOutstanding); + + + /* + We may receive a buffer with no bytes left to stream, for + example as a result of an I/O completion triggering this + routine, or if on a previous iteration of this loop we managed + to finish sending a buffer. */ if ( BytesToStream == 0 ) { - /* TODO */ - SOUND_DEBUG(L"Advancing buffer"); - ThreadData->CurrentBuffer = ThreadData->CurrentBuffer->lpNext; + SOUND_TRACE("No bytes to stream\n"); + StreamInfo->CurrentBuffer = StreamInfo->CurrentBuffer->lpNext; + StreamInfo->BufferOffset = 0; continue; } /* - Now we know how much buffer is waiting to be provided to the - driver, we need to consider how much the driver can accept. + If the buffer can't be sent in its entirety to the sound driver, + send a portion of it to fill the available space. */ if ( BytesToStream > BytesAvailable ) { - /* Buffer can't fit entirely - fill the available space */ BytesToStream = BytesAvailable; } - /* - Now the audio buffer sets sail on its merry way to the sound - driver... - NOTE: Will need to implement a 'read' function, too. - */ - SOUND_DEBUG(L"Writing data"); - Result = OverlappedWriteToSoundDevice(SoundDeviceInstance, - (PVOID) Buffer, - Buffer->lpData + BufferOffset, - BytesToStream); - -// if ( Result != MMSYSERR_NOERROR ) -// return Result; - - /* Update the offset ready for the next streaming operation */ - BufferOffset += BytesToStream; - Buffer->reserved = BufferOffset; - - /* More data has been sent to the driver, so these get updated, too */ - ThreadData->RemainingBytes += BytesToStream; - BytesAvailable = MAX_SOUND_BUFFER_SIZE - ThreadData->RemainingBytes; - - /* - If the offset is now equal to the buffer length, this will be - because the entirety of the buffer has been sent. - */ -/* - if ( BufferOffset == Buffer->dwBufferLength ) + SOUND_TRACE("Writing %d bytes from buffer %p, offset %d\n", + (int) BytesToStream, + StreamInfo->CurrentBuffer->lpData, + (int)StreamInfo->BufferOffset); + + /* TODO: Do the streaming */ + OverlappedSoundDeviceIo(SoundDeviceInstance, + (PCHAR) StreamInfo->CurrentBuffer->lpData + + StreamInfo->BufferOffset, + BytesToStream, + CompleteWaveBuffer, + (PVOID) StreamInfo->CurrentBuffer); + + /* + Keep track of the amount of data currently in the hands of the + sound driver, so we know how much space is being used up so + far, and how many bytes will be announced to the completion + routines. + */ + StreamInfo->BytesOutstanding += BytesToStream; + + /* + Update the offset within the buffer to reflect the amount of + data being transferred in this transaction. + */ + StreamInfo->BufferOffset += BytesToStream; + + /* + Update the number of bytes available for the next iteration. + */ + BytesAvailable = MAX_SOUND_BUFFER_SIZE - StreamInfo->BytesOutstanding; + + } + + SOUND_TRACE("<== Done filling stream ==>\n"); + +#if 0 + /* TODO: Check result */ + OverlappedSoundDeviceIo(SoundDeviceInstance, + WaveHeader->lpData, + WaveHeader->dwBufferLength, + CompleteWaveBuffer, + (PVOID) WaveHeader); +#endif + + return MMSYSERR_NOERROR; +} + + +VOID +CompleteWaveBuffer( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter, + IN DWORD BytesWritten) +{ + SOUND_TRACE("CompleteWaveBuffer called - wrote %d bytes\n", (int)BytesWritten); + + SoundDeviceInstance->Streaming.Wave.BytesOutstanding -= BytesWritten; + + StreamWaveIo(SoundDeviceInstance); +} + + +MMRESULT +QueueBuffer_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter) +{ + PWAVEHDR WaveHeader = (PWAVEHDR) Parameter; + PWAVE_STREAM_INFO StreamInfo; + + if ( ! SoundDeviceInstance ) + return MMSYSERR_INVALPARAM; + + if ( ! WaveHeader ) + return MMSYSERR_INVALPARAM; + + /* To avoid stupidly long variable names we alias this */ + StreamInfo = &SoundDeviceInstance->Streaming.Wave; + + SOUND_TRACE("QueueBuffer_Request\n"); + + /* Initialise fields of interest to us */ + WaveHeader->lpNext = NULL; + WaveHeader->reserved = 0; + + /* + Is this the first buffer being queued? Streaming only needs to be + done here if there's nothing else playing. + */ + if ( ! StreamInfo->BufferQueueHead ) + { + SOUND_TRACE("This is the first buffer being queued\n"); + + /* Set head, tail and current to this buffer */ + StreamInfo->BufferQueueHead = WaveHeader; + StreamInfo->BufferQueueTail = WaveHeader; + StreamInfo->CurrentBuffer = WaveHeader; + + /* Initialise the stream state */ + StreamInfo->BufferOffset = 0; + StreamInfo->BytesOutstanding = 0; + + /* Get the streaming started */ + StreamWaveIo(SoundDeviceInstance); + } + else + { + SOUND_TRACE("This is not the first buffer being queued\n"); + + /* Point the existing tail to the new buffer */ + StreamInfo->BufferQueueTail->lpNext = WaveHeader; + /* ...and set the buffer as the new tail */ + StreamInfo->BufferQueueTail = WaveHeader; + + if ( ! StreamInfo->CurrentBuffer ) { - SOUND_DEBUG(L"Advancing buffer"); - ThreadData->CurrentBuffer = ThreadData->CurrentBuffer->lpNext; + /* All buffers so far have been committed to the sound driver */ + StreamInfo->CurrentBuffer = WaveHeader; } -*/ - } - - SOUND_DEBUG(L"Leaving"); + } return MMSYSERR_NOERROR; } -/* - Private thread dispatch routines -*/ - MMRESULT -SubmitWaveBuffer( - IN PSOUND_DEVICE_INSTANCE Instance, - IN PWAVE_THREAD_DATA ThreadData, - IN PWAVEHDR Buffer) -{ -/* DWORD BytesSubmitted = 0;*/ - - SOUND_ASSERT(Instance != NULL); - SOUND_ASSERT(Buffer != NULL); - SOUND_ASSERT(Instance->Thread != NULL); - - /* This is used to mark the offset within the buffer */ - Buffer->reserved = 0; - /* TODO: Clear completion flag */ - - /* Set the head of the buffer list if this is the first buffer */ - if ( ! ThreadData->FirstBuffer ) - { - SOUND_DEBUG(L"First buffer"); - ThreadData->FirstBuffer = Buffer; - } - - /* Attach the buffer to the end of the list, unless this is the first */ - if ( ThreadData->LastBuffer ) - { - SOUND_DEBUG(L"Adding to end of list"); - ThreadData->LastBuffer->lpNext = Buffer; - } - - /* Update our record of the last buffer */ - ThreadData->LastBuffer = Buffer; - - /* Increment the number of buffers queued */ - ++ ThreadData->BufferCount; - - /* If nothing is playing, we'll need to start things off */ - if ( ThreadData->RemainingBytes == 0 ) - { - SOUND_DEBUG(L"Kicking off processing"); - ThreadData->CurrentBuffer = ThreadData->FirstBuffer; - StreamWaveData(Instance, ThreadData); - } - - return MMSYSERR_NOERROR; -} - - -/* - Thread request dispatcher -*/ - -MMRESULT -ProcessWaveThreadRequest( - IN PSOUND_DEVICE_INSTANCE Instance, - IN PVOID PrivateThreadData, - IN DWORD RequestId, - IN PVOID Data) -{ - PWAVE_THREAD_DATA WaveThreadData = - (PWAVE_THREAD_DATA) PrivateThreadData; - - /* Just some temporary testing code for now */ - WCHAR msg[128]; - wsprintf(msg, L"Request %d received", RequestId); - - MessageBox(0, msg, L"Request", MB_OK | MB_TASKMODAL); - - SOUND_ASSERT(Instance != NULL); - - switch ( RequestId ) - { - case WAVEREQUEST_QUEUE_BUFFER : - { - PWAVEHDR Buffer = (PWAVEHDR) Data; - - return SubmitWaveBuffer(Instance, WaveThreadData, Buffer); - } - } - - return MMSYSERR_NOTSUPPORTED; -} - - -/* - I/O completion - Called from outside the overlapped I/O completion APC -*/ - -VOID -ProcessWaveIoCompletion( - IN struct _SOUND_DEVICE_INSTANCE* Instance, - IN PVOID PrivateThreadData, - IN PVOID ContextData, - IN DWORD BytesTransferred) -{ - PWAVE_THREAD_DATA ThreadData = (PWAVE_THREAD_DATA) PrivateThreadData; - PWAVEHDR WaveHeader = (PWAVEHDR) ContextData; - SOUND_ASSERT(ThreadData); - WCHAR msg[1024]; - - /*SOUND_DEBUG(L"ProcessWaveIoCompletion called :)");*/ - /*SOUND_DEBUG_HEX(WaveHeader);*/ - - /* - At this point we know: - - The sound device instance involved in the transaction - - The wave header for the buffer which just completed - - How much data was transferred - - The next task is to figure out how much of the buffer - got played, and enqueue the next buffer if the current - one has been completed. - - Basically, this routine is responsible for keeping the - stream of audio data to/from the sound driver going. - - When no more WAVEHDRs are queued (ie, WaveHeader->lpNext - is NULL), no more buffers are submitted and the sound - thread will wait for more requests from the client before - it does anything else. - */ - - /* Discount the amount of buffer which has been processed */ - SOUND_ASSERT(BytesTransferred <= ThreadData->RemainingBytes); - ThreadData->RemainingBytes -= BytesTransferred; - - wsprintf(msg, L"Wave header: %x\nOffset: %d\nTransferred: %d bytes\nRemaining: %d bytes", - WaveHeader, - WaveHeader->reserved, - BytesTransferred, - ThreadData->RemainingBytes); - - MessageBox(0, msg, L"I/O COMPLETE", MB_OK | MB_TASKMODAL); - - /* TODO: Check return value */ - StreamWaveData(Instance, ThreadData); -} - - -/* - Wave thread start/stop routines -*/ - -MMRESULT -StartWaveThread( - IN PSOUND_DEVICE_INSTANCE Instance) -{ - MMRESULT Result = MMSYSERR_NOERROR; - PWAVE_THREAD_DATA WaveThreadData = NULL; - - if ( ! Instance ) - return MMSYSERR_INVALPARAM; - - WaveThreadData = AllocateMemoryFor(WAVE_THREAD_DATA); - - if ( ! WaveThreadData ) - return MMSYSERR_NOMEM; - - /* Initialise our data */ - WaveThreadData->CurrentBuffer = NULL; - WaveThreadData->FirstBuffer = NULL; - WaveThreadData->LastBuffer = NULL; - WaveThreadData->BufferCount = 0; - /* TODO: More */ - - /* Kick off the thread */ - Result = StartSoundThread(Instance, - ProcessWaveThreadRequest, - ProcessWaveIoCompletion, - WaveThreadData); - if ( Result != MMSYSERR_NOERROR ) - { - FreeMemory(WaveThreadData); - return Result; - } - - /* AddSoundThreadOperation(Instance, 69, SayHello); */ - return MMSYSERR_NOERROR; -} - -MMRESULT -StopWaveThread( - IN PSOUND_DEVICE_INSTANCE Instance) -{ - MMRESULT Result; - PWAVE_THREAD_DATA WaveThreadData = NULL; - - if ( ! Instance ) - return MMSYSERR_INVALPARAM; - - Result = GetSoundThreadPrivateData(Instance, (PVOID*) &WaveThreadData); - SOUND_ASSERT( Result == MMSYSERR_NOERROR ); - - /* This shouldn't fail... */ - Result = StopSoundThread(Instance); - SOUND_ASSERT( Result == MMSYSERR_NOERROR ); - - FreeMemory(WaveThreadData); - - return MMSYSERR_NOERROR; -} +QueueWaveDeviceBuffer( + 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; + + if ( ! (BufferHeader->dwFlags & WHDR_PREPARED ) ) + return WAVERR_UNPREPARED; + + /* TODO: WHDR_INQUEUE */ + + BufferHeader->dwFlags &= ~WHDR_DONE; + BufferHeader->lpNext = NULL; + + return CallUsingSoundThread(SoundDeviceInstance, + QueueBuffer_Request, + BufferHeader); +}

1 0

[jimtabor] 34397: - Removed NtUserGetShellWindow, update related.
by jimtabor＠svn.reactos.org 09 Jul '08

09 Jul '08

Author: jimtabor Date: Wed Jul 9 17:46:17 2008 New Revision: 34397 URL: http://svn.reactos.org/svn/reactos?rev=34397&view=rev Log: - Removed NtUserGetShellWindow, update related. Modified: trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Wed Jul 9 17:46:17 2008 @@ -703,7 +703,9 @@ HWND STDCALL GetShellWindow(VOID) { - return NtUserGetShellWindow(); + PDESKTOP pdi; + pdi = GetThreadDesktopInfo(); + return pdi->hShellWindow; } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Jul 9 17:46:17 2008 @@ -34,6 +34,7 @@ ULONG_PTR HeapLimit; HWND hTaskManWindow; HWND hProgmanWindow; + HWND hShellWindow; struct _WINDOW *Wnd; union @@ -333,7 +334,7 @@ ULONG_PTR ulClientDelta; PVOID phkCurrent; ULONG fsHooks; - HWND hWND; // Well be replaced with CALLBACKWND. + HWND hWND; // Will be replaced with CALLBACKWND. PVOID pvWND; // " " ULONG Win32ClientInfo; DWORD dwHookCurrent; @@ -372,6 +373,8 @@ HANDLE Data; ATOM Atom; } PROPERTY, *PPROPERTY; + + PW32THREADINFO GetW32ThreadInfo(VOID); PW32PROCESSINFO GetW32ProcessInfo(VOID); @@ -1281,7 +1284,7 @@ INT NTAPI NtUserGetClassName(HWND hWnd, - BOOL Unknown, // 0 GetClassNameW, 1 RealGetWindowClassA/W + BOOL Real, // 0 GetClassNameW, 1 RealGetWindowClassA/W PUNICODE_STRING ClassName); #endif @@ -2727,10 +2730,6 @@ HWND NTAPI -NtUserGetShellWindow(); - -HWND -NTAPI NtUserGetWindow(HWND hWnd, UINT Relationship); /* Should be done in usermode */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Jul 9 17:46:17 2008 @@ -3079,53 +3079,34 @@ - -HWND FASTCALL UserGetShellWindow() -{ - PWINSTATION_OBJECT WinStaObject; - HWND Ret; - - NTSTATUS Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, - KernelMode, - 0, - &WinStaObject); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return( (HWND)0); - } - - Ret = (HWND)WinStaObject->ShellWindow; - - ObDereferenceObject(WinStaObject); - return( Ret); -} - - -/* - * NtUserGetShellWindow +/* + * UserGetShellWindow * * Returns a handle to shell window that was set by NtUserSetShellWindowEx. * * Status * @implemented */ - -HWND STDCALL -NtUserGetShellWindow() -{ - DECLARE_RETURN(HWND); - - DPRINT("Enter NtUserGetShellWindow\n"); - UserEnterShared(); - - RETURN( UserGetShellWindow() ); - -CLEANUP: - DPRINT("Leave NtUserGetShellWindow, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; +HWND FASTCALL UserGetShellWindow() +{ + PWINSTATION_OBJECT WinStaObject; + HWND Ret; + + NTSTATUS Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, + KernelMode, + 0, + &WinStaObject); + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return( (HWND)0); + } + + Ret = (HWND)WinStaObject->ShellWindow; + + ObDereferenceObject(WinStaObject); + return( Ret); } /* @@ -3137,7 +3118,6 @@ * Status * @implemented */ - BOOL STDCALL NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView) { @@ -3146,6 +3126,7 @@ DECLARE_RETURN(BOOL); USER_REFERENCE_ENTRY Ref; NTSTATUS Status; + PW32THREADINFO ti;; DPRINT("Enter NtUserSetShellWindowEx\n"); UserEnterExclusive(); @@ -3206,6 +3187,9 @@ WinStaObject->ShellWindow = hwndShell; WinStaObject->ShellListView = hwndListView; + + ti = GetW32ThreadInfo(); + if (ti->Desktop) ((PDESKTOP)ti->Desktop)->hShellWindow = hwndShell; UserDerefObjectCo(WndShell); Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Wed Jul 9 17:46:17 2008 @@ -679,6 +679,10 @@ NtGdiSetViewportOrgEx 4 NtGdiSetWindowExtEx 4 NtGdiSetWindowOrgEx 4 +NtGdiGetFontFamilyInfo 4 +NtGdiOffsetViewportOrgEx 4 +NtGdiOffsetWindowOrgEx 4 +# NtUserBuildMenuItemList 4 NtUserCreateCursorIconHandle 2 NtUserGetClassLong 3 @@ -687,7 +691,6 @@ NtUserGetMinMaxInfo 3 NtUserGetMonitorInfo 2 NtUserGetScrollInfo 3 -NtUserGetShellWindow 0 NtUserGetWindow 2 NtUserGetWindowLong 3 NtUserMenuInfo 3 @@ -700,6 +703,3 @@ NtUserSendMessageTimeout 8 NtUserSendNotifyMessage 4 NtUserSetScrollBarInfo 3 -NtGdiGetFontFamilyInfo 4 -NtGdiOffsetViewportOrgEx 4 -NtGdiOffsetWindowOrgEx 4

1 0

[hyperion] 34396: modified lib/sdk/crt/crt.rbuild modified lib/sdk/crt/libcntpr.rbuild Add qsort and div to crt and libcntpr modified lib/sdk/crt/include/internal/tls.h modified lib/sdk/crt/stdlib/qsort.c Fixed ineptly-ported DJGPP qsort to not use TLS
by hyperion＠svn.reactos.org 09 Jul '08

09 Jul '08

Author: hyperion Date: Wed Jul 9 13:44:46 2008 New Revision: 34396 URL: http://svn.reactos.org/svn/reactos?rev=34396&view=rev Log: modified lib/sdk/crt/crt.rbuild modified lib/sdk/crt/libcntpr.rbuild Add qsort and div to crt and libcntpr modified lib/sdk/crt/include/internal/tls.h modified lib/sdk/crt/stdlib/qsort.c Fixed ineptly-ported DJGPP qsort to not use TLS Modified: trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/include/internal/tls.h trunk/reactos/lib/sdk/crt/libcntpr.rbuild trunk/reactos/lib/sdk/crt/stdlib/qsort.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Wed Jul 9 13:44:46 2008 @@ -267,6 +267,7 @@ <file>mbstowcs.c</file> <file>obsol.c</file> <file>putenv.c</file> + <file>qsort.c</file> <file>rot.c</file> <file>senv.c</file> <file>swab.c</file> Modified: trunk/reactos/lib/sdk/crt/include/internal/tls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/tls.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/tls.h [iso-8859-1] Wed Jul 9 13:44:46 2008 @@ -27,12 +27,6 @@ int fpecode; /* fp exception code */ - /* qsort variables */ - int (*qcmp)(const void *, const void *); /* the comparison routine */ - int qsz; /* size of each record */ - int thresh; /* THRESHold in chars */ - int mthresh; /* MTHRESHold in chars */ - EXCEPTION_RECORD *exc_record; /* Head of exception record list */ } THREADDATA, *PTHREADDATA; Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Wed Jul 9 13:44:46 2008 @@ -54,6 +54,7 @@ </directory> </if> <file>abs.c</file> + <file>div.c</file> <file>labs.c</file> <file>rand_nt.c</file> </directory> @@ -81,6 +82,10 @@ <directory name="search"> <file>bsearch.c</file> <file>lfind.c</file> + </directory> + + <directory name="stdlib"> + <file>qsort.c</file> </directory> <directory name="string"> Modified: trunk/reactos/lib/sdk/crt/stdlib/qsort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/qsort.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/qsort.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/qsort.c [iso-8859-1] Wed Jul 9 13:44:46 2008 @@ -2,7 +2,6 @@ #include <stdlib.h> #include <search.h> -#include <internal/tls.h> /*- * Copyright (c) 1980, 1983 The Regents of the University of California. @@ -51,12 +50,17 @@ */ static void -qst(PTHREADDATA pThreadData, char *base, char *max) +qst(size_t size, int (*compar)(const void*, const void*), char *base, char *max) { char c, *i, *j, *jj; int ii; char *mid, *tmp; int lo, hi; + size_t thresh; + size_t mthresh; + + thresh = size * THRESH; + mthresh = size * MTHRESH; /* * At the top here, lo is the number of characters of elements in the @@ -69,20 +73,20 @@ */ lo = max - base; /* number of elements as chars */ do { - mid = i = base + pThreadData->qsz * ((lo / pThreadData->qsz) >> 1); - if (lo >= pThreadData->mthresh) - { - j = (pThreadData->qcmp((jj = base), i) > 0 ? jj : i); - if (pThreadData->qcmp(j, (tmp = max - pThreadData->qsz)) > 0) + mid = i = base + size * ((lo / size) >> 1); + if (lo >= mthresh) + { + j = (compar((jj = base), i) > 0 ? jj : i); + if (compar(j, (tmp = max - size)) > 0) { /* switch to first loser */ j = (j == jj ? i : jj); - if (pThreadData->qcmp(j, tmp) < 0) + if (compar(j, tmp) < 0) j = tmp; } if (j != i) { - ii = pThreadData->qsz; + ii = size; do { c = *i; *i++ = *j; @@ -93,18 +97,18 @@ /* * Semi-standard quicksort partitioning/swapping */ - for (i = base, j = max - pThreadData->qsz; ; ) - { - while (i < mid && pThreadData->qcmp(i, mid) <= 0) - i += pThreadData->qsz; + for (i = base, j = max - size; ; ) + { + while (i < mid && compar(i, mid) <= 0) + i += size; while (j > mid) { - if (pThreadData->qcmp(mid, j) <= 0) + if (compar(mid, j) <= 0) { - j -= pThreadData->qsz; + j -= size; continue; } - tmp = i + pThreadData->qsz; /* value of i after swap */ + tmp = i + size; /* value of i after swap */ if (i == mid) { /* j <-> mid, new mid is j */ @@ -114,7 +118,7 @@ { /* i <-> j */ jj = j; - j -= pThreadData->qsz; + j -= size; } goto swap; } @@ -127,10 +131,10 @@ /* i <-> mid, new mid is i */ jj = mid; tmp = mid = i; /* value of i after swap */ - j -= pThreadData->qsz; + j -= size; } swap: - ii = pThreadData->qsz; + ii = size; do { c = *i; *i++ = *jj; @@ -146,21 +150,21 @@ * (recursively or by branching) if the partition is * of at least size THRESH. */ - i = (j = mid) + pThreadData->qsz; + i = (j = mid) + size; if ((lo = j - base) <= (hi = max - i)) { - if (lo >= pThreadData->thresh) - qst(pThreadData, base, j); + if (lo >= thresh) + qst(size, compar, base, j); base = i; lo = hi; } else { - if (hi >= pThreadData->thresh) - qst(pThreadData, i, max); + if (hi >= thresh) + qst(size, compar, i, max); max = j; } - } while (lo >= pThreadData->thresh); + } while (lo >= thresh); } /* @@ -174,25 +178,22 @@ void qsort(void *base0, size_t n, size_t size, int (*compar)(const void*, const void*)) { - PTHREADDATA pThreadData; char *base = (char *)base0; char c, *i, *j, *lo, *hi; char *min, *max; + size_t thresh; if (n <= 1) return; - pThreadData = GetThreadData(); - - pThreadData->qsz = size; - pThreadData->qcmp = compar; - pThreadData->thresh = pThreadData->qsz * THRESH; - pThreadData->mthresh = pThreadData->qsz * MTHRESH; - max = base + n * pThreadData->qsz; + size = size; + compar = compar; + thresh = size * THRESH; + max = base + n * size; if (n >= THRESH) { - qst(pThreadData, base, max); - hi = base + pThreadData->thresh; + qst(size, compar, base, max); + hi = base + thresh; } else { @@ -204,13 +205,13 @@ * the first THRESH elements (or the first n if n < THRESH), finding * the min, and swapping it into the first position. */ - for (j = lo = base; (lo += pThreadData->qsz) < hi; ) - if (pThreadData->qcmp(j, lo) > 0) + for (j = lo = base; (lo += size) < hi; ) + if (compar(j, lo) > 0) j = lo; if (j != base) { /* swap j into place */ - for (i = base, hi = base + pThreadData->qsz; i < hi; ) + for (i = base, hi = base + size; i < hi; ) { c = *j; *j++ = *i; @@ -224,15 +225,15 @@ * Then, do the standard insertion sort shift on a character at a time * basis for each element in the frob. */ - for (min = base; (hi = min += pThreadData->qsz) < max; ) - { - while (pThreadData->qcmp(hi -= pThreadData->qsz, min) > 0) + for (min = base; (hi = min += size) < max; ) + { + while (compar(hi -= size, min) > 0) /* void */; - if ((hi += pThreadData->qsz) != min) { - for (lo = min + pThreadData->qsz; --lo >= min; ) + if ((hi += size) != min) { + for (lo = min + size; --lo >= min; ) { c = *lo; - for (i = j = lo; (j -= pThreadData->qsz) >= hi; i = j) + for (i = j = lo; (j -= size) >= hi; i = j) *i = *j; *i = c; }

1 0

[silverblade] 34395: Various adjustments to the wave audio playback code. Seems to work OK when playing large buffers that require splitting up however doesn't work if multiple buffers are sent in succession.
by silverblade＠svn.reactos.org 09 Jul '08

09 Jul '08

Author: silverblade Date: Wed Jul 9 12:41:18 2008 New Revision: 34395 URL: http://svn.reactos.org/svn/reactos?rev=34395&view=rev Log: Various adjustments to the wave audio playback code. Seems to work OK when playing large buffers that require splitting up however doesn't work if multiple buffers are sent in succession. 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/thread.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.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] Wed Jul 9 12:41:18 2008 @@ -117,8 +117,10 @@ } -WORD Buffer[65536]; -WAVEHDR WaveHeader; +#include <stdio.h> + +WORD Buffer[5347700 / 2]; +WAVEHDR WaveHeaders[534]; int APIENTRY wWinMain( HINSTANCE hInstance, @@ -126,57 +128,78 @@ LPWSTR lpCmdLine, int nCmdShow) { - WCHAR msg[1024]; - WAVEOUTCAPS Caps; +// WCHAR msg[1024]; +// WAVEOUTCAPS Caps; WAVEOPENDESC OpenDesc; WAVEFORMATEX Format; MMRESULT Result; PVOID InstanceData; - int i; - - for ( i = 0; i < 65536; ++ i ) - Buffer[i] = rand(); +// int i; + + FILE* f; + + f = fopen("27may2_a.wav", "rb"); + fseek(f, 50, SEEK_SET); + fread(Buffer, 1, 5340000, f); + fclose(f); /* DRV_LOAD */ DriverProc(0, 0, DRV_LOAD, 0, 0); /* WODM_GETNUMDEVS */ - SOUND_DEBUG_HEX(wodMessage(0, WODM_GETNUMDEVS, 0, 0, 0)); - - Result = wodMessage(0, WODM_GETDEVCAPS, 0, - (DWORD) &Caps, sizeof(WAVEOUTCAPS)); + //SOUND_DEBUG_HEX(wodMessage(0, WODM_GETNUMDEVS, 0, 0, 0)); + + //Result = wodMessage(0, WODM_GETDEVCAPS, 0, + //(DWORD) &Caps, sizeof(WAVEOUTCAPS)); /* WODM_GETDEVCAPS */ - wsprintf(msg, L"Device name: %ls\nManufacturer ID: %d\nProduct ID: %d\nDriver version: %x\nChannels: %d", Caps.szPname, Caps.wMid, Caps.wPid, Caps.vDriverVersion, Caps.wChannels); - - MessageBox(0, msg, L"Device capabilities", MB_OK | MB_TASKMODAL); + //wsprintf(msg, L"Device name: %ls\nManufacturer ID: %d\nProduct ID: %d\nDriver version: %x\nChannels: %d", Caps.szPname, Caps.wMid, Caps.wPid, Caps.vDriverVersion, Caps.wChannels); + + //MessageBox(0, msg, L"Device capabilities", MB_OK | MB_TASKMODAL); /* WODM_OPEN */ Format.wFormatTag = WAVE_FORMAT_PCM; - Format.nChannels = 1; - Format.nSamplesPerSec = 22050; + Format.nChannels = 2; + Format.nSamplesPerSec = 44100; Format.wBitsPerSample = 16; Format.nBlockAlign = Format.nChannels * (Format.wBitsPerSample / 8); Format.nAvgBytesPerSec = Format.nSamplesPerSec * Format.nBlockAlign; Format.cbSize = 0; - SOUND_DEBUG(L"WODM_OPEN test 1 (query format support only)"); - OpenDesc.lpFormat = &Format; - Result = wodMessage(0, WODM_OPEN, 0, (DWORD) &OpenDesc, WAVE_FORMAT_QUERY); - SOUND_DEBUG_HEX(Result); - - SOUND_DEBUG(L"WODM_OPEN test 2"); + //SOUND_DEBUG(L"WODM_OPEN test 1 (query format support only)"); + //OpenDesc.lpFormat = &Format; + //Result = wodMessage(0, WODM_OPEN, 0, (DWORD) &OpenDesc, WAVE_FORMAT_QUERY); + //SOUND_DEBUG_HEX(Result); + + //SOUND_DEBUG(L"WODM_OPEN test 2"); OpenDesc.lpFormat = &Format; Result = wodMessage(0, WODM_OPEN, (DWORD) &InstanceData, (DWORD) &OpenDesc, 0); SOUND_DEBUG_HEX(Result); SOUND_DEBUG(L"WODM_WRITE test"); - WaveHeader.lpData = (PVOID) Buffer; - WaveHeader.dwBufferLength = 65536; - WaveHeader.dwFlags = WHDR_PREPARED; - - Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeader, 0); - SOUND_DEBUG_HEX(Result); + WaveHeaders[0].lpData = (PVOID) Buffer; + WaveHeaders[0].dwBufferLength = 1000000; + WaveHeaders[0].dwFlags = WHDR_PREPARED; + + WaveHeaders[1].lpData = (PVOID) ((PCHAR)Buffer + 1000000); + WaveHeaders[1].dwBufferLength = 1000000; + WaveHeaders[1].dwFlags = WHDR_PREPARED; + + WaveHeaders[2].lpData = (PVOID) ((PCHAR)Buffer + (1000000 *2)); + WaveHeaders[2].dwBufferLength = 1000000; + WaveHeaders[2].dwFlags = WHDR_PREPARED; + +// WaveHeader2.lpData = (PVOID) Buffer2; +// WaveHeader2.dwBufferLength = 10; +// WaveHeader2.dwFlags = WHDR_PREPARED; + + Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeaders[0], 0); + Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeaders[1], 0); + Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeaders[2], 0); + + //Result = wodMessage(0, WODM_WRITE, (DWORD) InstanceData, (DWORD) &WaveHeader2, 0); + +// SOUND_DEBUG_HEX(Result); SOUND_DEBUG(L"WODM_CLOSE test"); Result = wodMessage(0, WODM_CLOSE, (DWORD) InstanceData, (DWORD) 0, 0); 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] Wed Jul 9 12:41:18 2008 @@ -112,6 +112,7 @@ { OVERLAPPED General; struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance; + PVOID PrivateThreadData; PVOID ContextData; /* eg: PWAVEHDR */ PSOUND_THREAD_COMPLETED_IO CompletionData; } SOUND_THREAD_OVERLAPPED, *PSOUND_THREAD_OVERLAPPED; @@ -124,6 +125,7 @@ typedef VOID (*SOUND_THREAD_IO_COMPLETION_HANDLER)( IN struct _SOUND_DEVICE_INSTANCE* Instance, + IN PVOID PrivateThreadData, IN PVOID ContextData, IN DWORD BytesTransferred); 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] Wed Jul 9 12:41:18 2008 @@ -88,7 +88,7 @@ PSOUND_THREAD_COMPLETED_IO CompletionData; SOUND_ASSERT(Thread->FirstCompletedIo); - SOUND_DEBUG(L"Outside I/O completion APC"); + //SOUND_DEBUG(L"Outside I/O completion APC"); /* Purge the completed data queue @@ -100,6 +100,7 @@ { /* Call high-level custom I/O completion routine */ Thread->IoCompletionHandler(Instance, + Thread->PrivateData, CompletionData->ContextData, CompletionData->BytesTransferred); @@ -290,6 +291,8 @@ if ( ! SoundDeviceInstance->Thread ) return MMSYSERR_ERROR; + //SOUND_DEBUG(L"Waiting for Ready event"); + /* Wait for the thread to be ready */ WaitForSingleObject(SoundDeviceInstance->Thread->ReadyEvent, INFINITE); @@ -350,7 +353,7 @@ SOUND_ASSERT(SoundDeviceInstance); SOUND_ASSERT(SoundDeviceInstance->Thread); - SOUND_DEBUG(L"New I/O Completion Callback Called"); + //SOUND_DEBUG(L"New I/O Completion Callback Called"); /* This is going at the start of the list */ CompletionData->Next = SoundDeviceInstance->Thread->FirstCompletedIo; @@ -365,7 +368,7 @@ /* Overlapped structure gets freed now, but we still need the completion */ FreeMemory(SoundThreadOverlapped); - SOUND_DEBUG(L"New I/O Completion Callback Done"); + //SOUND_DEBUG(L"New I/O Completion Callback Done"); } MMRESULT Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wavethread.c [iso-8859-1] Wed Jul 9 12:41:18 2008 @@ -30,7 +30,7 @@ Should it be configurable? Some sound drivers let you set buffer size... */ -#define MAX_SOUND_BUFFER_SIZE 16383 +#define MAX_SOUND_BUFFER_SIZE 1500000 /* @@ -54,64 +54,80 @@ SOUND_ASSERT(ThreadData->RemainingBytes <= MAX_SOUND_BUFFER_SIZE); SOUND_ASSERT(Buffer); - /* The 'reserved' member of Buffer contains the offset */ - BufferOffset = Buffer->reserved; - /* Work out how much data can be streamed with the driver */ BytesAvailable = MAX_SOUND_BUFFER_SIZE - ThreadData->RemainingBytes; - /* - If no space available, don't do anything. The routine will be revisited - as buffers complete, at which point the backlog will start being - dealt with. - */ - if ( BytesAvailable == 0 ) - return MMSYSERR_NOERROR; - - /* - Adjust the amount of data to be streamed based on how much of the - current buffer has actually been dealt with already. - */ - BytesToStream = Buffer->dwBufferLength - BufferOffset; - - /* - No point in doing work unless we have to... This is, however, a - completed buffer, so it should be dealt with!! - */ - if ( BytesToStream == 0 ) - { - /* TODO */ - return MMSYSERR_NOERROR; - } - - /* - Now we know how much buffer is waiting to be provided to the driver, - we need to consider how much the driver can accept. - */ - if ( BytesToStream > BytesAvailable ) - { - /* Buffer can't fit entirely - fill the available space */ - BytesToStream = BytesAvailable; - } - - /* - Now the audio buffer sets sail on its merry way to the sound driver... - NOTE: Will need to implement a 'read' function, too. - */ - Result = OverlappedWriteToSoundDevice(SoundDeviceInstance, - (PVOID) ThreadData, - Buffer->lpData + BufferOffset, - BytesToStream); - - if ( Result != MMSYSERR_NOERROR ) - return Result; - - /* Update the offset ready for the next streaming operation */ - BufferOffset += BytesToStream; - Buffer->reserved = BufferOffset; - - /* More data has been sent to the driver, so this is updated, too */ - ThreadData->RemainingBytes += BytesToStream; + while ( ( Buffer = ThreadData->CurrentBuffer ) && ( BytesAvailable > 0 ) ) + { + /* The 'reserved' member of Buffer contains the offset */ + BufferOffset = Buffer->reserved; + + /* + Adjust the amount of data to be streamed based on how much of the + current buffer has actually been dealt with already. + */ + BytesToStream = Buffer->dwBufferLength - BufferOffset; + + /* + We may find that there's nothing to be done with the current + buffer, either on initial entry to this loop or after having + been through a few iterations. Once the buffer has been squeezed + dry, move on to the next victim... + */ + if ( BytesToStream == 0 ) + { + /* TODO */ + SOUND_DEBUG(L"Advancing buffer"); + ThreadData->CurrentBuffer = ThreadData->CurrentBuffer->lpNext; + continue; + } + + /* + Now we know how much buffer is waiting to be provided to the + driver, we need to consider how much the driver can accept. + */ + if ( BytesToStream > BytesAvailable ) + { + /* Buffer can't fit entirely - fill the available space */ + BytesToStream = BytesAvailable; + } + + /* + Now the audio buffer sets sail on its merry way to the sound + driver... + NOTE: Will need to implement a 'read' function, too. + */ + SOUND_DEBUG(L"Writing data"); + Result = OverlappedWriteToSoundDevice(SoundDeviceInstance, + (PVOID) Buffer, + Buffer->lpData + BufferOffset, + BytesToStream); + +// if ( Result != MMSYSERR_NOERROR ) +// return Result; + + /* Update the offset ready for the next streaming operation */ + BufferOffset += BytesToStream; + Buffer->reserved = BufferOffset; + + /* More data has been sent to the driver, so these get updated, too */ + ThreadData->RemainingBytes += BytesToStream; + BytesAvailable = MAX_SOUND_BUFFER_SIZE - ThreadData->RemainingBytes; + + /* + If the offset is now equal to the buffer length, this will be + because the entirety of the buffer has been sent. + */ +/* + if ( BufferOffset == Buffer->dwBufferLength ) + { + SOUND_DEBUG(L"Advancing buffer"); + ThreadData->CurrentBuffer = ThreadData->CurrentBuffer->lpNext; + } +*/ + } + + SOUND_DEBUG(L"Leaving"); return MMSYSERR_NOERROR; } @@ -140,12 +156,14 @@ /* Set the head of the buffer list if this is the first buffer */ if ( ! ThreadData->FirstBuffer ) { + SOUND_DEBUG(L"First buffer"); ThreadData->FirstBuffer = Buffer; } /* Attach the buffer to the end of the list, unless this is the first */ if ( ThreadData->LastBuffer ) { + SOUND_DEBUG(L"Adding to end of list"); ThreadData->LastBuffer->lpNext = Buffer; } @@ -158,6 +176,7 @@ /* If nothing is playing, we'll need to start things off */ if ( ThreadData->RemainingBytes == 0 ) { + SOUND_DEBUG(L"Kicking off processing"); ThreadData->CurrentBuffer = ThreadData->FirstBuffer; StreamWaveData(Instance, ThreadData); } @@ -210,10 +229,12 @@ VOID ProcessWaveIoCompletion( IN struct _SOUND_DEVICE_INSTANCE* Instance, + IN PVOID PrivateThreadData, IN PVOID ContextData, IN DWORD BytesTransferred) { - PWAVE_THREAD_DATA ThreadData = (PWAVE_THREAD_DATA) ContextData; + PWAVE_THREAD_DATA ThreadData = (PWAVE_THREAD_DATA) PrivateThreadData; + PWAVEHDR WaveHeader = (PWAVEHDR) ContextData; SOUND_ASSERT(ThreadData); WCHAR msg[1024]; @@ -244,8 +265,8 @@ ThreadData->RemainingBytes -= BytesTransferred; wsprintf(msg, L"Wave header: %x\nOffset: %d\nTransferred: %d bytes\nRemaining: %d bytes", - ThreadData->CurrentBuffer, - ThreadData->CurrentBuffer->reserved, + WaveHeader, + WaveHeader->reserved, BytesTransferred, ThreadData->RemainingBytes);

1 0

[cwittich] 34394: return correct error code in link macro
by cwittich＠svn.reactos.org 09 Jul '08

09 Jul '08

Author: cwittich Date: Wed Jul 9 10:25:50 2008 New Revision: 34394 URL: http://svn.reactos.org/svn/reactos?rev=34394&view=rev Log: return correct error code in link macro Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h [iso-8859-1] Wed Jul 9 10:25:50 2008 @@ -41,7 +41,7 @@ #define unlink _unlink #define mkdir(dirname, access) _mkdir(dirname) #define x_realpath(a) strdup(a) - #define link(filename, linkname) CreateHardLinkA(linkname, filename, NULL) + #define link(filename, linkname) CreateHardLinkA(linkname, filename, NULL) ? 0 : -1 #define lstat(x, y) stat(x, y) #ifdef _MSC_VER

1 0

[gedmurphy] 34393: don't try to free a NULL object. patch by hto (hto at dev dot null) See issue #3486 for more details.
by gedmurphy＠svn.reactos.org 09 Jul '08

09 Jul '08

Author: gedmurphy Date: Wed Jul 9 09:20:08 2008 New Revision: 34393 URL: http://svn.reactos.org/svn/reactos?rev=34393&view=rev Log: don't try to free a NULL object. patch by hto (hto at dev dot null) See issue #3486 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Wed Jul 9 09:20:08 2008 @@ -2085,7 +2085,8 @@ EngDeleteXlate(XlateObj); if(TextObj != NULL) TEXTOBJ_UnlockText(TextObj); - BITMAPOBJ_UnlockBitmap(BitmapObj); + if (BitmapObj != NULL) + BITMAPOBJ_UnlockBitmap(BitmapObj); if (hBrushBg != NULL) { BRUSHOBJ_UnlockBrush(BrushBg);

1 0

[pschweitzer] 34392: Updated usp10_ros.diff to match with r34390 changes
by pschweitzer＠svn.reactos.org 09 Jul '08

09 Jul '08

Author: pschweitzer Date: Wed Jul 9 06:40:00 2008 New Revision: 34392 URL: http://svn.reactos.org/svn/reactos?rev=34392&view=rev Log: Updated usp10_ros.diff to match with r34390 changes Modified: trunk/reactos/dll/win32/usp10/usp10_ros.diff Modified: trunk/reactos/dll/win32/usp10/usp10_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_ros.… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10_ros.diff [iso-8859-1] Wed Jul 9 06:40:00 2008 @@ -3,23 +3,23 @@ --- usp10.c (revision 34385) +++ usp10.c (working copy) @@ -1726,3 +1726,10 @@ - for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i]; - return S_OK; - } -+ -+ -+VOID WINAPI LpkPresent() -+{ -+ /* FIXME */ -+ DbgPrint("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); -+} + for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i]; + return S_OK; + } ++ ++ ++VOID WINAPI LpkPresent() ++{ ++ /* FIXME */ ++ ERR("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); ++} Index: usp10.spec =================================================================== --- usp10.spec (revision 34385) +++ usp10.spec (working copy) @@ -1,4 +1,4 @@ --@ stub LpkPresent -+@ stdcall LpkPresent() - @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) - @ stub ScriptApplyLogicalWidth - @ stdcall ScriptBreak(ptr long ptr ptr) +-@ stub LpkPresent ++@ stdcall LpkPresent() + @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) + @ stub ScriptApplyLogicalWidth + @ stdcall ScriptBreak(ptr long ptr ptr)

1 0

[fireball] 34391: - Update winetests for synced DLLs.
by fireball＠svn.reactos.org 09 Jul '08

09 Jul '08

Author: fireball Date: Wed Jul 9 06:34:20 2008 New Revision: 34391 URL: http://svn.reactos.org/svn/reactos?rev=34391&view=rev Log: - Update winetests for synced DLLs. Added: trunk/rostests/winetests/gdiplus/pathiterator.c (with props) trunk/rostests/winetests/gdiplus/region.c (with props) Modified: trunk/rostests/winetests/advpack/advpack.c trunk/rostests/winetests/advpack/files.c trunk/rostests/winetests/advpack/install.c trunk/rostests/winetests/comctl32/comboex.c trunk/rostests/winetests/comctl32/dpa.c trunk/rostests/winetests/comctl32/listview.c trunk/rostests/winetests/comctl32/misc.c trunk/rostests/winetests/comctl32/monthcal.c trunk/rostests/winetests/comctl32/mru.c trunk/rostests/winetests/comdlg32/filedlg.c trunk/rostests/winetests/comdlg32/printdlg.c trunk/rostests/winetests/gdiplus/font.c trunk/rostests/winetests/gdiplus/gdiplus.rbuild trunk/rostests/winetests/gdiplus/graphicspath.c trunk/rostests/winetests/gdiplus/image.c trunk/rostests/winetests/gdiplus/testlist.c trunk/rostests/winetests/lz32/lzexpand_main.c trunk/rostests/winetests/mapi32/prop.c trunk/rostests/winetests/mlang/mlang.c trunk/rostests/winetests/mlang/mlang.rbuild trunk/rostests/winetests/mshtml/dom.c trunk/rostests/winetests/mshtml/htmldoc.c trunk/rostests/winetests/mshtml/mshtml.rbuild trunk/rostests/winetests/mshtml/protocol.c trunk/rostests/winetests/mshtml/script.c trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/source.c trunk/rostests/winetests/netapi32/access.c trunk/rostests/winetests/netapi32/apibuf.c trunk/rostests/winetests/netapi32/ds.c trunk/rostests/winetests/netapi32/wksta.c trunk/rostests/winetests/ole32/clipboard.c trunk/rostests/winetests/ole32/compobj.c trunk/rostests/winetests/ole32/ole2.c trunk/rostests/winetests/oleaut32/oleaut32.rbuild trunk/rostests/winetests/rsaenh/rsaenh.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/advpack… Modified: trunk/rostests/winetests/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/files.c… Modified: trunk/rostests/winetests/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/install… Modified: trunk/rostests/winetests/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/comboe… Modified: trunk/rostests/winetests/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/dpa.c?… Modified: trunk/rostests/winetests/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/listvi… Modified: trunk/rostests/winetests/comctl32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/misc.c… Modified: trunk/rostests/winetests/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/monthc… Modified: trunk/rostests/winetests/comctl32/mru.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/mru.c?… Modified: trunk/rostests/winetests/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/filedl… Modified: trunk/rostests/winetests/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/printd… Modified: trunk/rostests/winetests/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?… Modified: trunk/rostests/winetests/gdiplus/gdiplus.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/gdiplus… Modified: trunk/rostests/winetests/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… Modified: trunk/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/image.c… Added: trunk/rostests/winetests/gdiplus/pathiterator.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/pathite… Added: trunk/rostests/winetests/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/region.… Modified: trunk/rostests/winetests/gdiplus/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/testlis… Modified: trunk/rostests/winetests/lz32/lzexpand_main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/lz32/lzexpand_m… Modified: trunk/rostests/winetests/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/prop.c?r… Modified: trunk/rostests/winetests/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.c?r… Modified: trunk/rostests/winetests/mlang/mlang.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.rbu… Modified: trunk/rostests/winetests/mshtml/dom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/dom.c?re… Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… Modified: trunk/rostests/winetests/mshtml/mshtml.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/mshtml.r… Modified: trunk/rostests/winetests/mshtml/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/protocol… Modified: trunk/rostests/winetests/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/script.c… Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=34… Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=3… Modified: trunk/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/source.c?re… Modified: trunk/rostests/winetests/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/access… Modified: trunk/rostests/winetests/netapi32/apibuf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/apibuf… Modified: trunk/rostests/winetests/netapi32/ds.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/ds.c?r… Modified: trunk/rostests/winetests/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/wksta.… Modified: trunk/rostests/winetests/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/clipboard… Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… Modified: trunk/rostests/winetests/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole2.c?re… Modified: trunk/rostests/winetests/oleaut32/oleaut32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/oleaut… Modified: trunk/rostests/winetests/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/rsaenh.c…

1 0

[fireball] 34390: - One should not mix debug output macros and direct usage of DbgPrint.
by fireball＠svn.reactos.org 09 Jul '08

09 Jul '08

Author: fireball Date: Wed Jul 9 06:26:31 2008 New Revision: 34390 URL: http://svn.reactos.org/svn/reactos?rev=34390&view=rev Log: - One should not mix debug output macros and direct usage of DbgPrint. Modified: trunk/reactos/dll/win32/usp10/usp10.c Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Wed Jul 9 06:26:31 2008 @@ -1728,8 +1728,8 @@ } -VOID WINAPI LpkPresent() -{ - /* FIXME */ - DbgPrint("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); -} +VOID WINAPI LpkPresent() +{ + /* FIXME */ + ERR("LPK: %s is unimplemented, please try again later.\n", __FUNCTION__); +}

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
77
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 July 2008