Ros-diffs December 2009

ros-diffs@reactos.org

22 participants
501 discussions

[sserapion] 44722: Lazy port of kdbg to AMD64. Kdbg is very x86 specific but thankfully amd64 isn't that diferent. It can query register values, list modules, and dump PCR. Other stuff is broken and needs further debugging such as KdpSafe API, IDT, GDT, LDT offsets and disasm code. Backtraces not available because of missing unwind data. Special thanks to Physicus for making this commit possible.
by sserapion＠svn.reactos.org 23 Dec '09

23 Dec '09

Author: sserapion Date: Wed Dec 23 04:36:40 2009 New Revision: 44722 URL: http://svn.reactos.org/svn/reactos?rev=44722&view=rev Log: Lazy port of kdbg to AMD64. Kdbg is very x86 specific but thankfully amd64 isn't that diferent. It can query register values, list modules, and dump PCR. Other stuff is broken and needs further debugging such as KdpSafe API, IDT, GDT, LDT offsets and disasm code. Backtraces not available because of missing unwind data. Special thanks to Physicus for making this commit possible. Added: branches/ros-amd64-bringup/reactos/ntoskrnl/kd/amd64/kdmemsup.c (with props) branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/dis-asm.h (with props) branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/i386-dis.c (with props) branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/setjmp.S (with props) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/kdb.c branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/kdb_help.S branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb.c branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb.h branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb_cli.c branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb_expr.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/ros-amd64-bringup/reactos/ntoskrnl/kd/amd64/kdmemsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Added: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/dis-asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Added: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/i386-dis.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/kdb_help.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Added: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/setjmp.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb_expr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…

1 0

[janderwald] 44721: [WDMAUD.DRV] - Move the routines which interact wdmaud.sys to legacy.c - Implement opening / closing of audio pins as well as writing / reading audio bytes from / to it - By defining USE_MMIXER_LIB, wdmaud.drv bypasses wdmaud+sysaudio and directly writes/reads the audio bytes to portcls.
by janderwald＠svn.reactos.org 23 Dec '09

23 Dec '09

Author: janderwald Date: Wed Dec 23 04:05:11 2009 New Revision: 44721 URL: http://svn.reactos.org/svn/reactos?rev=44721&view=rev Log: [WDMAUD.DRV] - Move the routines which interact wdmaud.sys to legacy.c - Implement opening / closing of audio pins as well as writing / reading audio bytes from / to it - By defining USE_MMIXER_LIB, wdmaud.drv bypasses wdmaud+sysaudio and directly writes/reads the audio bytes to portcls. Added: trunk/reactos/dll/win32/wdmaud.drv/legacy.c (with props) Modified: trunk/reactos/dll/win32/wdmaud.drv/mixer.c trunk/reactos/dll/win32/wdmaud.drv/mmixer.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild Added: trunk/reactos/dll/win32/wdmaud.drv/legacy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/legac… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/legacy.c (added) +++ trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] Wed Dec 23 04:05:11 2009 @@ -1,0 +1,823 @@ +/* + * PROJECT: ReactOS Sound System + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/wdmaud.drv/wdmaud.c + * + * PURPOSE: WDM Audio Driver (User-mode part) + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) + Johannes Anderwald + * + * NOTES: Looking for wodMessage & co? You won't find them here. Try + * the MME Buddy library, which is where these routines are + * actually implemented. + * + */ + +#include "wdmaud.h" + +#define KERNEL_DEVICE_NAME L"\\\\.\\wdmaud" +extern HANDLE KernelHandle; +DWORD OpenCount = 0; + +DWORD +WINAPI +MixerEventThreadRoutine( + LPVOID Parameter) +{ + HANDLE WaitObjects[2]; + DWORD dwResult; + MMRESULT Result; + WDMAUD_DEVICE_INFO DeviceInfo; + PSOUND_DEVICE_INSTANCE Instance = (PSOUND_DEVICE_INSTANCE)Parameter; + + /* setup wait objects */ + WaitObjects[0] = Instance->hNotifyEvent; + WaitObjects[1] = Instance->hStopEvent; + + /* zero device info */ + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + + DeviceInfo.hDevice = Instance->Handle; + DeviceInfo.DeviceType = MIXER_DEVICE_TYPE; + + do + { + dwResult = WaitForMultipleObjects(2, WaitObjects, FALSE, INFINITE); + + if (dwResult == WAIT_OBJECT_0 + 1) + { + /* stop event was signalled */ + break; + } + + do + { + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_GET_MIXER_EVENT, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if (Result == MMSYSERR_NOERROR) + { + DriverCallback(Instance->WinMM.ClientCallback, + HIWORD(Instance->WinMM.Flags), + Instance->WinMM.Handle, + DeviceInfo.u.MixerEvent.NotificationType, + Instance->WinMM.ClientCallbackInstanceData, + (DWORD_PTR)DeviceInfo.u.MixerEvent.Value, + 0); + } + }while(Result == MMSYSERR_NOERROR); + }while(TRUE); + + /* done */ + return 0; +} + +VOID +WdmAudCleanupLegacy() +{ + if ( KernelHandle != INVALID_HANDLE_VALUE ) + { + CloseHandle(KernelHandle); + KernelHandle = INVALID_HANDLE_VALUE; + } +} + +MMRESULT +WdmAudGetNumWdmDevsByLegacy( + IN MMDEVICE_TYPE DeviceType, + OUT DWORD* DeviceCount) +{ + MMRESULT Result; + WDMAUD_DEVICE_INFO DeviceInfo; + + VALIDATE_MMSYS_PARAMETER( KernelHandle != INVALID_HANDLE_VALUE ); + VALIDATE_MMSYS_PARAMETER( IS_VALID_SOUND_DEVICE_TYPE(DeviceType) ); + VALIDATE_MMSYS_PARAMETER( DeviceCount ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.DeviceType = DeviceType; + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_GETNUMDEVS_TYPE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( ! MMSUCCESS( Result ) ) + { + SND_ERR(L"Call to IOCTL_GETNUMDEVS_TYPE failed\n"); + *DeviceCount = 0; + return TranslateInternalMmResult(Result); + } + + *DeviceCount = DeviceInfo.DeviceCount; + + return MMSYSERR_NOERROR; +} + +MMRESULT +WdmAudGetCapabilitiesByLegacy( + IN PSOUND_DEVICE SoundDevice, + IN DWORD DeviceId, + OUT PVOID Capabilities, + IN DWORD CapabilitiesSize) +{ + MMRESULT Result; + MMDEVICE_TYPE DeviceType; + WDMAUD_DEVICE_INFO DeviceInfo; + + SND_ASSERT( SoundDevice ); + SND_ASSERT( Capabilities ); + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + if ( ! MMSUCCESS(Result) ) + return Result; + + SND_TRACE(L"WDMAUD - GetWdmDeviceCapabilities DeviceType %u DeviceId %u\n", DeviceType, DeviceId); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.DeviceType = DeviceType; + DeviceInfo.DeviceIndex = DeviceId; + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_GETCAPABILITIES, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + /* This is pretty much a big hack right now */ + switch ( DeviceType ) + { + case MIXER_DEVICE_TYPE: + { + LPMIXERCAPS MixerCaps = (LPMIXERCAPS) Capabilities; + + DeviceInfo.u.MixCaps.szPname[MAXPNAMELEN-1] = L'\0'; + CopyWideString(MixerCaps->szPname, DeviceInfo.u.MixCaps.szPname); + + MixerCaps->cDestinations = DeviceInfo.u.MixCaps.cDestinations; + MixerCaps->fdwSupport = DeviceInfo.u.MixCaps.fdwSupport; + MixerCaps->vDriverVersion = DeviceInfo.u.MixCaps.vDriverVersion; + MixerCaps->wMid = DeviceInfo.u.MixCaps.wMid; + MixerCaps->wPid = DeviceInfo.u.MixCaps.wPid; + break; + } + case WAVE_OUT_DEVICE_TYPE : + { + LPWAVEOUTCAPS WaveOutCaps = (LPWAVEOUTCAPS) Capabilities; + + DeviceInfo.u.WaveOutCaps.szPname[MAXPNAMELEN-1] = L'\0'; + WaveOutCaps->wMid = DeviceInfo.u.WaveOutCaps.wMid; + WaveOutCaps->wPid = DeviceInfo.u.WaveOutCaps.wPid; + + WaveOutCaps->vDriverVersion = 0x0001; + CopyWideString(WaveOutCaps->szPname, DeviceInfo.u.WaveOutCaps.szPname); + + WaveOutCaps->dwFormats = DeviceInfo.u.WaveOutCaps.dwFormats; + WaveOutCaps->wChannels = DeviceInfo.u.WaveOutCaps.wChannels; + WaveOutCaps->dwSupport = DeviceInfo.u.WaveOutCaps.dwSupport; + break; + } + case WAVE_IN_DEVICE_TYPE : + { + LPWAVEINCAPSW WaveInCaps = (LPWAVEINCAPSW) Capabilities; + + DeviceInfo.u.WaveInCaps.szPname[MAXPNAMELEN-1] = L'\0'; + + WaveInCaps->wMid = DeviceInfo.u.WaveInCaps.wMid; + WaveInCaps->wPid = DeviceInfo.u.WaveInCaps.wPid; + + WaveInCaps->vDriverVersion = 0x0001; + CopyWideString(WaveInCaps->szPname, DeviceInfo.u.WaveInCaps.szPname); + + WaveInCaps->dwFormats = DeviceInfo.u.WaveInCaps.dwFormats; + WaveInCaps->wChannels = DeviceInfo.u.WaveInCaps.wChannels; + WaveInCaps->wReserved1 = 0; + break; + } + } + + return MMSYSERR_NOERROR; +} + +MMRESULT +WdmAudOpenSoundDeviceByLegacy() +{ + /* Only open this if it's not already open */ + if ( KernelHandle == INVALID_HANDLE_VALUE ) + { + SND_TRACE(L"Opening wdmaud device\n"); + KernelHandle = CreateFileW(KERNEL_DEVICE_NAME, + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, + NULL); + } + + if ( KernelHandle == INVALID_HANDLE_VALUE ) + return MMSYSERR_ERROR; + + ++ OpenCount; + + return MMSYSERR_NOERROR; +} + +MMRESULT +WdmAudCloseSoundDeviceByLegacy( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN PVOID Handle) +{ + WDMAUD_DEVICE_INFO DeviceInfo; + MMRESULT Result; + MMDEVICE_TYPE DeviceType; + PSOUND_DEVICE SoundDevice; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + if ( OpenCount == 0 ) + { + return MMSYSERR_NOERROR; + } + + SND_ASSERT( KernelHandle != INVALID_HANDLE_VALUE ); + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + if (SoundDeviceInstance->Handle != (PVOID)KernelHandle) + { + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + + DeviceInfo.DeviceType = DeviceType; + DeviceInfo.hDevice = SoundDeviceInstance->Handle; + + /* First stop the stream */ + if (DeviceType != MIXER_DEVICE_TYPE) + { + DeviceInfo.u.State = KSSTATE_STOP; + SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_SETDEVICE_STATE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + } + + SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_CLOSE_WDMAUD, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + } + + if (DeviceType == MIXER_DEVICE_TYPE) + { + SetEvent(SoundDeviceInstance->hStopEvent); + CloseHandle(SoundDeviceInstance->hStopEvent); + CloseHandle(SoundDeviceInstance->hNotifyEvent); + } + + --OpenCount; + + if ( OpenCount < 1 ) + { + CloseHandle(KernelHandle); + KernelHandle = INVALID_HANDLE_VALUE; + } + + return MMSYSERR_NOERROR; +} + +MMRESULT +WdmAudSetMixerDeviceFormatByLegacy( + IN PSOUND_DEVICE_INSTANCE Instance, + IN DWORD DeviceId, + IN PWAVEFORMATEX WaveFormat, + IN DWORD WaveFormatSize) +{ + MMRESULT Result; + WDMAUD_DEVICE_INFO DeviceInfo; + HANDLE hThread; + + + Instance->hNotifyEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if ( ! Instance->hNotifyEvent ) + return MMSYSERR_NOMEM; + + if (Instance->Handle != KernelHandle) + { + /* device is already open */ + return MMSYSERR_NOERROR; + } + + Instance->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if ( ! Instance->hStopEvent ) + return MMSYSERR_NOMEM; + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.DeviceType = MIXER_DEVICE_TYPE; + DeviceInfo.DeviceIndex = DeviceId; + DeviceInfo.u.hNotifyEvent = Instance->hNotifyEvent; + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_OPEN_WDMAUD, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( ! MMSUCCESS(Result) ) + { + CloseHandle(Instance->hNotifyEvent); + CloseHandle(Instance->hStopEvent); + return TranslateInternalMmResult(Result); + } + + hThread = CreateThread(NULL, 0, MixerEventThreadRoutine, (LPVOID)Instance, 0, NULL); + if ( hThread ) + { + CloseHandle(hThread); + } + + /* Store sound device handle instance handle */ + Instance->Handle = (PVOID)DeviceInfo.hDevice; + + return MMSYSERR_NOERROR; +} + +MMRESULT +WdmAudSetWaveDeviceFormatByLegacy( + IN PSOUND_DEVICE_INSTANCE Instance, + IN DWORD DeviceId, + IN PWAVEFORMATEX WaveFormat, + IN DWORD WaveFormatSize) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PVOID Identifier; + WDMAUD_DEVICE_INFO DeviceInfo; + MMDEVICE_TYPE DeviceType; + + Result = GetSoundDeviceFromInstance(Instance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Result = GetSoundDeviceIdentifier(SoundDevice, &Identifier); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + if (Instance->Handle != KernelHandle) + { + /* device is already open */ + return MMSYSERR_NOERROR; + } + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.DeviceType = DeviceType; + DeviceInfo.DeviceIndex = DeviceId; + DeviceInfo.u.WaveFormatEx.cbSize = sizeof(WAVEFORMATEX); //WaveFormat->cbSize; + DeviceInfo.u.WaveFormatEx.wFormatTag = WaveFormat->wFormatTag; +#ifdef USERMODE_MIXER + DeviceInfo.u.WaveFormatEx.nChannels = 2; + DeviceInfo.u.WaveFormatEx.nSamplesPerSec = 44100; + DeviceInfo.u.WaveFormatEx.nBlockAlign = 4; + DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec = 176400; + DeviceInfo.u.WaveFormatEx.wBitsPerSample = 16; +#else + DeviceInfo.u.WaveFormatEx.nChannels = WaveFormat->nChannels; + DeviceInfo.u.WaveFormatEx.nSamplesPerSec = WaveFormat->nSamplesPerSec; + DeviceInfo.u.WaveFormatEx.nBlockAlign = WaveFormat->nBlockAlign; + DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec = WaveFormat->nAvgBytesPerSec; + DeviceInfo.u.WaveFormatEx.wBitsPerSample = WaveFormat->wBitsPerSample; +#endif + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_OPEN_WDMAUD, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + /* Store format */ + Instance->WaveFormatEx.cbSize = WaveFormat->cbSize; + Instance->WaveFormatEx.wFormatTag = WaveFormat->wFormatTag; + Instance->WaveFormatEx.nChannels = WaveFormat->nChannels; + Instance->WaveFormatEx.nSamplesPerSec = WaveFormat->nSamplesPerSec; + Instance->WaveFormatEx.nBlockAlign = WaveFormat->nBlockAlign; + Instance->WaveFormatEx.nAvgBytesPerSec = WaveFormat->nAvgBytesPerSec; + Instance->WaveFormatEx.wBitsPerSample = WaveFormat->wBitsPerSample; + + /* Store sound device handle instance handle */ + Instance->Handle = (PVOID)DeviceInfo.hDevice; + + /* Now determine framing requirements */ + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_GETFRAMESIZE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( MMSUCCESS(Result) ) + { + if (DeviceInfo.u.FrameSize) + { + Instance->FrameSize = DeviceInfo.u.FrameSize * 2; + Instance->BufferCount = WaveFormat->nAvgBytesPerSec / Instance->FrameSize; + SND_TRACE(L"FrameSize %u BufferCount %u\n", Instance->FrameSize, Instance->BufferCount); + } + } + else + { + // use a default of 100 buffers + Instance->BufferCount = 100; + } + + if (DeviceType == WAVE_OUT_DEVICE_TYPE) + { + /* Now start the stream */ + DeviceInfo.u.State = KSSTATE_RUN; + SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_SETDEVICE_STATE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + } + + return MMSYSERR_NOERROR; +} + +MMRESULT +WriteFileEx_Committer2( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID OffsetPtr, + IN DWORD Length, + IN PSOUND_OVERLAPPED Overlap, + IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine) +{ + HANDLE Handle; + MMRESULT Result; + WDMAUD_DEVICE_INFO DeviceInfo; + PSOUND_DEVICE SoundDevice; + MMDEVICE_TYPE DeviceType; + BOOL Ret; + + VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance ); + VALIDATE_MMSYS_PARAMETER( OffsetPtr ); + VALIDATE_MMSYS_PARAMETER( Overlap ); + VALIDATE_MMSYS_PARAMETER( CompletionRoutine ); + + GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); + + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + SND_ASSERT(Handle); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + + DeviceInfo.Header.FrameExtent = Length; + if (DeviceType == WAVE_OUT_DEVICE_TYPE) + { + DeviceInfo.Header.DataUsed = Length; + } + DeviceInfo.Header.Data = OffsetPtr; + DeviceInfo.Header.Size = sizeof(WDMAUD_DEVICE_INFO); + DeviceInfo.Header.PresentationTime.Numerator = 1; + DeviceInfo.Header.PresentationTime.Denominator = 1; + DeviceInfo.hDevice = Handle; + DeviceInfo.DeviceType = DeviceType; + + Overlap->Standard.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + + if (DeviceType == WAVE_OUT_DEVICE_TYPE) + { + Ret = WriteFileEx(KernelHandle, &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, CompletionRoutine); + if (Ret) + WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); + } + else if (DeviceType == WAVE_IN_DEVICE_TYPE) + { + Ret = ReadFileEx(KernelHandle, &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, CompletionRoutine); + //if (Ret) + // WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); + } + + return MMSYSERR_NOERROR; +} + + +MMRESULT +WdmAudSetWaveStateByLegacy( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN BOOL bStart) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + WDMAUD_DEVICE_INFO DeviceInfo; + MMDEVICE_TYPE DeviceType; + HANDLE Handle; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.hDevice = Handle; + DeviceInfo.DeviceType = DeviceType; + + if (bStart) + DeviceInfo.u.State = KSSTATE_RUN; + else + DeviceInfo.u.State = KSSTATE_PAUSE; + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_SETDEVICE_STATE, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + return Result; +} + +MMRESULT +WdmAudGetDeviceInterfaceStringByLegacy( + IN MMDEVICE_TYPE DeviceType, + IN DWORD DeviceId, + IN LPWSTR Interface, + IN DWORD InterfaceLength, + OUT DWORD * InterfaceSize) +{ + WDMAUD_DEVICE_INFO DeviceInfo; + MMRESULT Result; + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.DeviceType = DeviceType; + DeviceInfo.DeviceIndex = DeviceId; + + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_QUERYDEVICEINTERFACESTRING, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + + if (!Interface) + { + SND_ASSERT(InterfaceSize); + + *InterfaceSize = DeviceInfo.u.Interface.DeviceInterfaceStringSize; + return MMSYSERR_NOERROR; + } + + if (InterfaceLength < DeviceInfo.u.Interface.DeviceInterfaceStringSize) + { + /* buffer is too small */ + return MMSYSERR_MOREDATA; + } + + DeviceInfo.u.Interface.DeviceInterfaceStringSize = InterfaceLength; + DeviceInfo.u.Interface.DeviceInterfaceString = Interface; + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_QUERYDEVICEINTERFACESTRING, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( MMSUCCESS(Result) && InterfaceLength > 2) + { + Interface[1] = L'\\'; + Interface[InterfaceLength-1] = L'\0'; + } + + return Result; +} + +MMRESULT +WdmAudGetWavePositionByLegacy( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN MMTIME* Time) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + WDMAUD_DEVICE_INFO DeviceInfo; + MMDEVICE_TYPE DeviceType; + HANDLE Handle; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.hDevice = Handle; + DeviceInfo.DeviceType = DeviceType; + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_OPEN_WDMAUD, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Time->wType = TIME_BYTES; + Time->u.cb = (DWORD)DeviceInfo.u.Position; + + return MMSYSERR_NOERROR; +} + + +MMRESULT +WdmAudResetStreamByLegacy( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN MMDEVICE_TYPE DeviceType, + IN BOOLEAN bStartReset) +{ + MMRESULT Result; + HANDLE Handle; + WDMAUD_DEVICE_INFO DeviceInfo; + + Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.hDevice = Handle; + DeviceInfo.DeviceType = DeviceType; + DeviceInfo.u.ResetStream = (bStartReset ? KSRESET_BEGIN : KSRESET_END); + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_RESET_STREAM, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + return Result; +} + +MMRESULT +WdmAudQueryMixerInfoByLegacy( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN UINT uMsg, + IN LPVOID Parameter, + IN DWORD Flags) +{ + MMRESULT Result; + WDMAUD_DEVICE_INFO DeviceInfo; + HANDLE Handle; + DWORD IoControlCode; + LPMIXERLINEW MixLine; + LPMIXERLINECONTROLSW MixControls; + LPMIXERCONTROLDETAILS MixDetails; + + SND_TRACE(L"uMsg %x Flags %x\n", uMsg, Flags); + + Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.hDevice = Handle; + DeviceInfo.DeviceType = MIXER_DEVICE_TYPE; + DeviceInfo.Flags = Flags; + + MixLine = (LPMIXERLINEW)Parameter; + MixControls = (LPMIXERLINECONTROLSW)Parameter; + MixDetails = (LPMIXERCONTROLDETAILS)Parameter; + + switch(uMsg) + { + case MXDM_GETLINEINFO: + RtlCopyMemory(&DeviceInfo.u.MixLine, MixLine, sizeof(MIXERLINEW)); + IoControlCode = IOCTL_GETLINEINFO; + break; + case MXDM_GETLINECONTROLS: + RtlCopyMemory(&DeviceInfo.u.MixControls, MixControls, sizeof(MIXERLINECONTROLSW)); + IoControlCode = IOCTL_GETLINECONTROLS; + break; + case MXDM_SETCONTROLDETAILS: + RtlCopyMemory(&DeviceInfo.u.MixDetails, MixDetails, sizeof(MIXERCONTROLDETAILS)); + IoControlCode = IOCTL_SETCONTROLDETAILS; + break; + case MXDM_GETCONTROLDETAILS: + RtlCopyMemory(&DeviceInfo.u.MixDetails, MixDetails, sizeof(MIXERCONTROLDETAILS)); + IoControlCode = IOCTL_GETCONTROLDETAILS; + break; + default: + SND_ASSERT(0); + return MMSYSERR_NOTSUPPORTED; + } + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IoControlCode, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if ( ! MMSUCCESS(Result) ) + { + return Result; + } + + switch(uMsg) + { + case MXDM_GETLINEINFO: + { + RtlCopyMemory(MixLine, &DeviceInfo.u.MixLine, sizeof(MIXERLINEW)); + break; + } + } + + return Result; +} Propchange: trunk/reactos/dll/win32/wdmaud.drv/legacy.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wdmaud.drv/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mixer… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] Wed Dec 23 04:05:11 2009 @@ -556,3 +556,4 @@ return MMSYSERR_NOERROR; } + Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mmixe… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Wed Dec 23 04:05:11 2009 @@ -321,11 +321,10 @@ return TRUE; } -ULONG -WdmAudGetMixerCount() -{ - /* return number of mixers available */ - return MMixerGetCount(&MixerContext); +VOID +WdmAudCleanupMMixer() +{ + /* TODO */ } MMRESULT @@ -340,30 +339,9 @@ } MMRESULT -WdmAudCloseMixer( - IN HMIXER Handle, - IN HANDLE hNotifyEvent) -{ - /* FIXME */ - return MMSYSERR_NOERROR; -} - -MMRESULT -WdmAudOpenMixer( - IN PHANDLE hMixer, - IN ULONG DeviceId, - IN HANDLE hNotifyEvent) -{ - if (MMixerOpen(&MixerContext, DeviceId, hNotifyEvent, NULL /* FIXME */, hMixer) == MM_STATUS_SUCCESS) - return MMSYSERR_NOERROR; - - return MMSYSERR_BADDEVICEID; -} - -MMRESULT WdmAudGetLineInfo( IN HANDLE hMixer, - IN LPMIXERLINE MixLine, + IN LPMIXERLINEW MixLine, IN ULONG Flags) { if (MMixerGetLineInfo(&MixerContext, hMixer, Flags, MixLine) == MM_STATUS_SUCCESS) @@ -409,18 +387,6 @@ return MMSYSERR_ERROR; } -ULONG -WdmAudGetWaveOutCount() -{ - return MMixerGetWaveOutCount(&MixerContext); -} - -ULONG -WdmAudGetWaveInCount() -{ - return MMixerGetWaveInCount(&MixerContext); -} - MMRESULT WdmAudGetWaveOutCapabilities( IN ULONG DeviceId, @@ -445,17 +411,297 @@ } MMRESULT -WdmAudOpenWave( - OUT PHANDLE hPin, - IN DWORD DeviceId, - IN PWAVEFORMATEX WaveFormat, - IN DWORD bWaveIn) -{ - if (MMixerOpenWave(&MixerContext, DeviceId, bWaveIn, WaveFormat, hPin) == MM_STATUS_SUCCESS) - { - //fixme - // start stream if waveout +WdmAudSetWdmWaveDeviceFormatByMMixer( + IN PSOUND_DEVICE_INSTANCE Instance, + IN DWORD DeviceId, + IN PWAVEFORMATEX WaveFormat, + IN DWORD WaveFormatSize) +{ + MMDEVICE_TYPE DeviceType; + PSOUND_DEVICE SoundDevice; + MMRESULT Result; + BOOL bWaveIn; + + Result = GetSoundDeviceFromInstance(Instance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + bWaveIn = (DeviceType == WAVE_IN_DEVICE_TYPE ? TRUE : FALSE); + + if (MMixerOpenWave(&MixerContext, DeviceId, bWaveIn, WaveFormat, &Instance->Handle) == MM_STATUS_SUCCESS) + { + if (DeviceType == WAVE_OUT_DEVICE_TYPE) + { + MMixerSetWaveStatus(&MixerContext, Instance->Handle, KSSTATE_ACQUIRE); + MMixerSetWaveStatus(&MixerContext, Instance->Handle, KSSTATE_PAUSE); + MMixerSetWaveStatus(&MixerContext, Instance->Handle, KSSTATE_RUN); + } return MMSYSERR_NOERROR; } return MMSYSERR_ERROR; } + + +MMRESULT +WdmAudGetCapabilitiesByMMixer( + IN PSOUND_DEVICE SoundDevice, + IN DWORD DeviceId, + OUT PVOID Capabilities, + IN DWORD CapabilitiesSize) +{ + MMDEVICE_TYPE DeviceType; + MMRESULT Result; + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + if (DeviceType == MIXER_DEVICE_TYPE) + { + return WdmAudGetMixerCapabilties(DeviceId, (LPMIXERCAPSW)Capabilities); + } + else if (DeviceType == WAVE_OUT_DEVICE_TYPE) + { + return WdmAudGetWaveOutCapabilities(DeviceId, (LPWAVEOUTCAPSW)Capabilities); + } + else if (DeviceType == WAVE_IN_DEVICE_TYPE) + { + return WdmAudGetWaveInCapabilities(DeviceId, (LPWAVEINCAPSW)Capabilities); + } + else + { + // not supported + return MMSYSERR_ERROR; + } +} + +MMRESULT +WdmAudOpenSoundDeviceByMMixer( + IN struct _SOUND_DEVICE* SoundDevice, + OUT PVOID* Handle) +{ + /* no-op */ + return MMSYSERR_NOERROR; +} + +MMRESULT +WdmAudCloseSoundDeviceByMMixer( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN PVOID Handle) +{ + MMDEVICE_TYPE DeviceType; + PSOUND_DEVICE SoundDevice; + MMRESULT Result; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + if (DeviceType == MIXER_DEVICE_TYPE) + { + /* no op */ + return MMSYSERR_NOERROR; + } + else if (DeviceType == WAVE_IN_DEVICE_TYPE || DeviceType == WAVE_OUT_DEVICE_TYPE) + { + /* make sure the pin is stopped */ + MMixerSetWaveStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_PAUSE); + MMixerSetWaveStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_ACQUIRE); + MMixerSetWaveStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_STOP); + + CloseHandle(Handle); + return MMSYSERR_NOERROR; + } + + /* midi is not supported */ + return MMSYSERR_ERROR; +} + +MMRESULT +WdmAudGetNumDevsByMMixer( + IN MMDEVICE_TYPE DeviceType, + OUT DWORD* DeviceCount) +{ + switch(DeviceType) + { + case MIXER_DEVICE_TYPE: + *DeviceCount = MMixerGetCount(&MixerContext); + break; + case WAVE_OUT_DEVICE_TYPE: + *DeviceCount = MMixerGetWaveOutCount(&MixerContext); + break; + case WAVE_IN_DEVICE_TYPE: + *DeviceCount = MMixerGetWaveInCount(&MixerContext); + break; + default: + *DeviceCount = 0; + } + return MMSYSERR_NOERROR; +} + +MMRESULT +WdmAudQueryMixerInfoByMMixer( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN UINT uMsg, + IN LPVOID Parameter, + IN DWORD Flags) +{ + LPMIXERLINEW MixLine; + LPMIXERLINECONTROLSW MixControls; + LPMIXERCONTROLDETAILS MixDetails; + + MixLine = (LPMIXERLINEW)Parameter; + MixControls = (LPMIXERLINECONTROLSW)Parameter; + MixDetails = (LPMIXERCONTROLDETAILS)Parameter; + + /* FIXME param checks */ + + switch(uMsg) + { + case MXDM_GETLINEINFO: + return WdmAudGetLineInfo(SoundDeviceInstance->Handle, MixLine, Flags); + case MXDM_GETLINECONTROLS: + return WdmAudGetLineControls(SoundDeviceInstance->Handle, MixControls, Flags); + case MXDM_SETCONTROLDETAILS: + return WdmAudSetControlDetails(SoundDeviceInstance->Handle, MixDetails, Flags); + break; + case MXDM_GETCONTROLDETAILS: + return WdmAudGetControlDetails(SoundDeviceInstance->Handle, MixDetails, Flags); + break; + default: + SND_ASSERT(0); + return MMSYSERR_NOTSUPPORTED; + } +} + +MMRESULT +WdmAudGetDeviceInterfaceStringByMMixer( + IN MMDEVICE_TYPE DeviceType, + IN DWORD DeviceId, + IN LPWSTR Interface, + IN DWORD InterfaceLength, + OUT DWORD * InterfaceSize) +{ + /* FIXME */ + return MMSYSERR_NOTSUPPORTED; +} + +MMRESULT +WdmAudSetMixerDeviceFormatByMMixer( + IN PSOUND_DEVICE_INSTANCE Instance, + IN DWORD DeviceId, + IN PWAVEFORMATEX WaveFormat, + IN DWORD WaveFormatSize) +{ + Instance->hNotifyEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if ( ! Instance->hNotifyEvent ) + return MMSYSERR_NOMEM; + + if (MMixerOpen(&MixerContext, DeviceId, Instance->hNotifyEvent, NULL /* FIXME */, &Instance->Handle) == MM_STATUS_SUCCESS) + return MMSYSERR_NOERROR; + + return MMSYSERR_BADDEVICEID; +} + +MMRESULT +WdmAudSetWdmWaveStateByMMixer( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN BOOL bStart) +{ + if (bStart) + { + MMixerSetWaveStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_ACQUIRE); + MMixerSetWaveStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_PAUSE); + MMixerSetWaveStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_RUN); + } + else + { + MMixerSetWaveStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_PAUSE); + MMixerSetWaveStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_ACQUIRE); + MMixerSetWaveStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_STOP); + } + + return MMSYSERR_NOERROR; +} + +MMRESULT +WdmAudResetStreamByMMixer( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN MMDEVICE_TYPE DeviceType, + IN BOOLEAN bStartReset) +{ + /* FIXME */ + return MMSYSERR_NOTSUPPORTED; +} + +MMRESULT +WdmAudGetWdmPositionByMMixer( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN MMTIME* Time) +{ + /* FIXME */ + return MMSYSERR_NOTSUPPORTED; +} + +MMRESULT +WdmAudCommitWaveBufferByMMixer( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID OffsetPtr, + IN DWORD Length, + IN PSOUND_OVERLAPPED Overlap, + IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine) +{ + KSSTREAM_HEADER Packet; + PSOUND_DEVICE SoundDevice; + MMDEVICE_TYPE DeviceType; + MMRESULT Result; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + /* setup stream packet */ + ZeroMemory(&Packet, sizeof(KSSTREAM_HEADER)); + Packet.Size = sizeof(KSSTREAM_HEADER); + Packet.PresentationTime.Numerator = 1; + Packet.PresentationTime.Denominator = 1; + Packet.Data = OffsetPtr; + Packet.FrameExtent = Length; + + if (DeviceType == WAVE_OUT_DEVICE_TYPE) + { + Packet.DataUsed = Length; + } + + Result = SyncOverlappedDeviceIoControl(SoundDeviceInstance->Handle, + IOCTL_KS_WRITE_STREAM, + NULL, + 0, + &Packet, + sizeof(KSSTREAM_HEADER), + &Length); + + /* FIXXXXXME + * don't call completion routine directly + */ + CompletionRoutine(ERROR_SUCCESS, Length, (LPOVERLAPPED)Overlap); + + return MMSYSERR_NOERROR; +} Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Wed Dec 23 04:05:11 2009 @@ -14,307 +14,7 @@ #include "wdmaud.h" - -#define KERNEL_DEVICE_NAME L"\\\\.\\wdmaud" - -PWSTR UnknownWaveIn = L"Wave Input"; -PWSTR UnknownWaveOut = L"Wave Output"; -PWSTR UnknownMidiIn = L"Midi Input"; -PWSTR UnknownMidiOut = L"Midi Output"; - - HANDLE KernelHandle = INVALID_HANDLE_VALUE; -DWORD OpenCount = 0; - -MMRESULT -WriteFileEx_Remixer( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID OffsetPtr, - IN DWORD Length, - IN PSOUND_OVERLAPPED Overlap, - IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine); - - - -MMRESULT -GetNumWdmDevs( - IN HANDLE Handle, - IN MMDEVICE_TYPE DeviceType, - OUT DWORD* DeviceCount) -{ -#ifdef USE_MMIXER_LIB - - switch(DeviceType) - { - case MIXER_DEVICE_TYPE: - *DeviceCount = WdmAudGetMixerCount(); - break; - case WAVE_OUT_DEVICE_TYPE: - *DeviceCount = WdmAudGetWaveOutCount(); - break; - case WAVE_IN_DEVICE_TYPE: - *DeviceCount = WdmAudGetWaveInCount(); - break; - default: - *DeviceCount = 0; - } - return MMSYSERR_NOERROR; -#else - - MMRESULT Result; - WDMAUD_DEVICE_INFO DeviceInfo; - - VALIDATE_MMSYS_PARAMETER( Handle != INVALID_HANDLE_VALUE ); - VALIDATE_MMSYS_PARAMETER( IS_VALID_SOUND_DEVICE_TYPE(DeviceType) ); - VALIDATE_MMSYS_PARAMETER( DeviceCount ); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.DeviceType = DeviceType; - - Result = SyncOverlappedDeviceIoControl(Handle, - IOCTL_GETNUMDEVS_TYPE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( ! MMSUCCESS( Result ) ) - { - SND_ERR(L"Call to IOCTL_GETNUMDEVS_TYPE failed\n"); - *DeviceCount = 0; - return TranslateInternalMmResult(Result); - } - - *DeviceCount = DeviceInfo.DeviceCount; - - return MMSYSERR_NOERROR; -#endif -} - -MMRESULT -GetWdmDeviceCapabilities( - IN PSOUND_DEVICE SoundDevice, - IN DWORD DeviceId, - OUT PVOID Capabilities, - IN DWORD CapabilitiesSize) -{ - /* NOTE - At this time, WDMAUD does not support this properly */ - - MMRESULT Result; - MMDEVICE_TYPE DeviceType; - WDMAUD_DEVICE_INFO DeviceInfo; - - SND_ASSERT( SoundDevice ); - SND_ASSERT( Capabilities ); - - Result = GetSoundDeviceType(SoundDevice, &DeviceType); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - if ( ! MMSUCCESS(Result) ) - return Result; - - SND_TRACE(L"WDMAUD - GetWdmDeviceCapabilities DeviceType %u DeviceId %u\n", DeviceType, DeviceId); - -#ifdef USE_MMIXER_LIB - if (DeviceType == MIXER_DEVICE_TYPE) - { - return WdmAudGetMixerCapabilities(DeviceId, (LPMIXERCAPSW)Capabilities); - } - else if (DeviceType == WAVE_OUT_DEVICE_TYPE) - { - return WdmAudGetWaveOutCapabilities(DeviceId, (LPWAVEOUTCAPSW)Capabilities); - } - else if (DeviceType == WAVE_IN_DEVICE_TYPE) - { - return WdmAudGetWaveInCapabilities(DeviceId, (LPWAVEINCAPSW)Capabilities); - } - -#endif - - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.DeviceType = DeviceType; - DeviceInfo.DeviceIndex = DeviceId; - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_GETCAPABILITIES, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - /* This is pretty much a big hack right now */ - switch ( DeviceType ) - { - case MIXER_DEVICE_TYPE: - { - LPMIXERCAPS MixerCaps = (LPMIXERCAPS) Capabilities; - - DeviceInfo.u.MixCaps.szPname[MAXPNAMELEN-1] = L'\0'; - CopyWideString(MixerCaps->szPname, DeviceInfo.u.MixCaps.szPname); - - MixerCaps->cDestinations = DeviceInfo.u.MixCaps.cDestinations; - MixerCaps->fdwSupport = DeviceInfo.u.MixCaps.fdwSupport; - MixerCaps->vDriverVersion = DeviceInfo.u.MixCaps.vDriverVersion; - MixerCaps->wMid = DeviceInfo.u.MixCaps.wMid; - MixerCaps->wPid = DeviceInfo.u.MixCaps.wPid; - break; - } - case WAVE_OUT_DEVICE_TYPE : - { - LPWAVEOUTCAPS WaveOutCaps = (LPWAVEOUTCAPS) Capabilities; - - DeviceInfo.u.WaveOutCaps.szPname[MAXPNAMELEN-1] = L'\0'; - WaveOutCaps->wMid = DeviceInfo.u.WaveOutCaps.wMid; - WaveOutCaps->wPid = DeviceInfo.u.WaveOutCaps.wPid; - - WaveOutCaps->vDriverVersion = 0x0001; - CopyWideString(WaveOutCaps->szPname, DeviceInfo.u.WaveOutCaps.szPname); - - WaveOutCaps->dwFormats = DeviceInfo.u.WaveOutCaps.dwFormats; - WaveOutCaps->wChannels = DeviceInfo.u.WaveOutCaps.wChannels; - WaveOutCaps->dwSupport = DeviceInfo.u.WaveOutCaps.dwSupport; - break; - } - case WAVE_IN_DEVICE_TYPE : - { - LPWAVEINCAPSW WaveInCaps = (LPWAVEINCAPSW) Capabilities; - - DeviceInfo.u.WaveInCaps.szPname[MAXPNAMELEN-1] = L'\0'; - - WaveInCaps->wMid = DeviceInfo.u.WaveInCaps.wMid; - WaveInCaps->wPid = DeviceInfo.u.WaveInCaps.wPid; - - WaveInCaps->vDriverVersion = 0x0001; - CopyWideString(WaveInCaps->szPname, DeviceInfo.u.WaveInCaps.szPname); - - WaveInCaps->dwFormats = DeviceInfo.u.WaveInCaps.dwFormats; - WaveInCaps->wChannels = DeviceInfo.u.WaveInCaps.wChannels; - WaveInCaps->wReserved1 = 0; - break; - } - } - - return MMSYSERR_NOERROR; -} - - -MMRESULT -OpenWdmSoundDevice( - IN struct _SOUND_DEVICE* SoundDevice, /* NOT USED */ - OUT PVOID* Handle) -{ - /* Only open this if it's not already open */ - if ( KernelHandle == INVALID_HANDLE_VALUE ) - { - SND_TRACE(L"Opening wdmaud device\n"); - KernelHandle = CreateFileW(KERNEL_DEVICE_NAME, - GENERIC_READ | GENERIC_WRITE, - 0, - NULL, - OPEN_EXISTING, - FILE_FLAG_OVERLAPPED, - NULL); - } - - if ( KernelHandle == INVALID_HANDLE_VALUE ) - return MMSYSERR_ERROR; - - SND_ASSERT( Handle ); - - *Handle = KernelHandle; - ++ OpenCount; - - return MMSYSERR_NOERROR; -} - -MMRESULT -CloseWdmSoundDevice( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN PVOID Handle) -{ - WDMAUD_DEVICE_INFO DeviceInfo; - MMRESULT Result; - MMDEVICE_TYPE DeviceType; - PSOUND_DEVICE SoundDevice; - - Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - if ( OpenCount == 0 ) - { - return MMSYSERR_NOERROR; - } - - SND_ASSERT( KernelHandle != INVALID_HANDLE_VALUE ); - - Result = GetSoundDeviceType(SoundDevice, &DeviceType); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - if (SoundDeviceInstance->Handle != (PVOID)KernelHandle) - { - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - - DeviceInfo.DeviceType = DeviceType; - DeviceInfo.hDevice = SoundDeviceInstance->Handle; - - /* First stop the stream */ - if (DeviceType != MIXER_DEVICE_TYPE) - { - DeviceInfo.u.State = KSSTATE_STOP; - SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_SETDEVICE_STATE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - } -#ifdef USE_MMIXER_LIB - if (DeviceType == MIXER_DEVICE_TYPE) - { - return WdmAudCloseMixer(SoundDeviceInstance->Handle, SoundDeviceInstance->hNotifyEvent); - } -#endif - - SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_CLOSE_WDMAUD, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - } - - if (DeviceType == MIXER_DEVICE_TYPE) - { - SetEvent(SoundDeviceInstance->hStopEvent); - CloseHandle(SoundDeviceInstance->hStopEvent); - CloseHandle(SoundDeviceInstance->hNotifyEvent); - } - - --OpenCount; - - if ( OpenCount < 1 ) - { - CloseHandle(KernelHandle); - KernelHandle = INVALID_HANDLE_VALUE; - } - - return MMSYSERR_NOERROR; -} - MMRESULT QueryWdmWaveDeviceFormatSupport( @@ -327,605 +27,8 @@ } -DWORD -WINAPI -MixerEventThreadRoutine( - LPVOID Parameter) -{ - HANDLE WaitObjects[2]; - DWORD dwResult; - MMRESULT Result; - WDMAUD_DEVICE_INFO DeviceInfo; - PSOUND_DEVICE_INSTANCE Instance = (PSOUND_DEVICE_INSTANCE)Parameter; - - /* setup wait objects */ - WaitObjects[0] = Instance->hNotifyEvent; - WaitObjects[1] = Instance->hStopEvent; - - /* zero device info */ - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - - DeviceInfo.hDevice = Instance->Handle; - DeviceInfo.DeviceType = MIXER_DEVICE_TYPE; - - do - { - dwResult = WaitForMultipleObjects(2, WaitObjects, FALSE, INFINITE); - - if (dwResult == WAIT_OBJECT_0 + 1) - { - /* stop event was signalled */ - break; - } - - do - { - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_GET_MIXER_EVENT, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if (Result == MMSYSERR_NOERROR) - { - DriverCallback(Instance->WinMM.ClientCallback, - HIWORD(Instance->WinMM.Flags), - Instance->WinMM.Handle, - DeviceInfo.u.MixerEvent.NotificationType, - Instance->WinMM.ClientCallbackInstanceData, - (DWORD_PTR)DeviceInfo.u.MixerEvent.Value, - 0); - } - }while(Result == MMSYSERR_NOERROR); - }while(TRUE); - - /* done */ - return 0; -} - - -MMRESULT -SetWdmMixerDeviceFormat( - IN PSOUND_DEVICE_INSTANCE Instance, - IN DWORD DeviceId, - IN PWAVEFORMATEX WaveFormat, - IN DWORD WaveFormatSize) -{ - MMRESULT Result; - WDMAUD_DEVICE_INFO DeviceInfo; - HANDLE hThread; - - - Instance->hNotifyEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if ( ! Instance->hNotifyEvent ) - return MMSYSERR_NOMEM; - -#ifdef USE_MMIXER_LIB - return WdmAudOpenMixer(&Instance->Handle, DeviceId, Instance->hNotifyEvent); -#endif - - if (Instance->Handle != KernelHandle) - { - /* device is already open */ - return MMSYSERR_NOERROR; - } - - Instance->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if ( ! Instance->hStopEvent ) - return MMSYSERR_NOMEM; - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.DeviceType = MIXER_DEVICE_TYPE; - DeviceInfo.DeviceIndex = DeviceId; - DeviceInfo.u.hNotifyEvent = Instance->hNotifyEvent; - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_OPEN_WDMAUD, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( ! MMSUCCESS(Result) ) - { - CloseHandle(Instance->hNotifyEvent); - CloseHandle(Instance->hStopEvent); - return TranslateInternalMmResult(Result); - } - - hThread = CreateThread(NULL, 0, MixerEventThreadRoutine, (LPVOID)Instance, 0, NULL); - if ( hThread ) - { - CloseHandle(hThread); - } - - /* Store sound device handle instance handle */ - Instance->Handle = (PVOID)DeviceInfo.hDevice; - - return MMSYSERR_NOERROR; -} - -MMRESULT -SetWdmWaveDeviceFormat( - IN PSOUND_DEVICE_INSTANCE Instance, - IN DWORD DeviceId, - IN PWAVEFORMATEX WaveFormat, - IN DWORD WaveFormatSize) -{ - MMRESULT Result; - PSOUND_DEVICE SoundDevice; - PVOID Identifier; - WDMAUD_DEVICE_INFO DeviceInfo; - MMDEVICE_TYPE DeviceType; - - Result = GetSoundDeviceFromInstance(Instance, &SoundDevice); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - Result = GetSoundDeviceIdentifier(SoundDevice, &Identifier); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - if (Instance->Handle != KernelHandle) - { - /* device is already open */ - return MMSYSERR_NOERROR; - } - - Result = GetSoundDeviceType(SoundDevice, &DeviceType); - -#ifdef USE_MMIXER_LIB - return WdmAudOpenWavePin(Instance, DeviceId, WaveFormat, DeviceType); -#endif - - - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.DeviceType = DeviceType; - DeviceInfo.DeviceIndex = DeviceId; - DeviceInfo.u.WaveFormatEx.cbSize = sizeof(WAVEFORMATEX); //WaveFormat->cbSize; - DeviceInfo.u.WaveFormatEx.wFormatTag = WaveFormat->wFormatTag; -#ifdef USERMODE_MIXER - DeviceInfo.u.WaveFormatEx.nChannels = 2; - DeviceInfo.u.WaveFormatEx.nSamplesPerSec = 44100; - DeviceInfo.u.WaveFormatEx.nBlockAlign = 4; - DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec = 176400; - DeviceInfo.u.WaveFormatEx.wBitsPerSample = 16; -#else - DeviceInfo.u.WaveFormatEx.nChannels = WaveFormat->nChannels; - DeviceInfo.u.WaveFormatEx.nSamplesPerSec = WaveFormat->nSamplesPerSec; - DeviceInfo.u.WaveFormatEx.nBlockAlign = WaveFormat->nBlockAlign; - DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec = WaveFormat->nAvgBytesPerSec; - DeviceInfo.u.WaveFormatEx.wBitsPerSample = WaveFormat->wBitsPerSample; -#endif - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_OPEN_WDMAUD, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - /* Store format */ - Instance->WaveFormatEx.cbSize = WaveFormat->cbSize; - Instance->WaveFormatEx.wFormatTag = WaveFormat->wFormatTag; - Instance->WaveFormatEx.nChannels = WaveFormat->nChannels; - Instance->WaveFormatEx.nSamplesPerSec = WaveFormat->nSamplesPerSec; - Instance->WaveFormatEx.nBlockAlign = WaveFormat->nBlockAlign; - Instance->WaveFormatEx.nAvgBytesPerSec = WaveFormat->nAvgBytesPerSec; - Instance->WaveFormatEx.wBitsPerSample = WaveFormat->wBitsPerSample; - - /* Store sound device handle instance handle */ - Instance->Handle = (PVOID)DeviceInfo.hDevice; - - /* Now determine framing requirements */ - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_GETFRAMESIZE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( MMSUCCESS(Result) ) - { - if (DeviceInfo.u.FrameSize) - { - Instance->FrameSize = DeviceInfo.u.FrameSize * 2; - Instance->BufferCount = WaveFormat->nAvgBytesPerSec / Instance->FrameSize; - SND_TRACE(L"FrameSize %u BufferCount %u\n", Instance->FrameSize, Instance->BufferCount); - } - } - else - { - // use a default of 100 buffers - Instance->BufferCount = 100; - } - - if (DeviceType == WAVE_OUT_DEVICE_TYPE) - { - /* Now start the stream */ - DeviceInfo.u.State = KSSTATE_RUN; - SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_SETDEVICE_STATE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - } - - return MMSYSERR_NOERROR; -} - -MMRESULT -WriteFileEx_Committer2( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID OffsetPtr, - IN DWORD Length, - IN PSOUND_OVERLAPPED Overlap, - IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine) -{ - HANDLE Handle; - MMRESULT Result; - WDMAUD_DEVICE_INFO DeviceInfo; - PSOUND_DEVICE SoundDevice; - MMDEVICE_TYPE DeviceType; - BOOL Ret; - - VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance ); - VALIDATE_MMSYS_PARAMETER( OffsetPtr ); - VALIDATE_MMSYS_PARAMETER( Overlap ); - VALIDATE_MMSYS_PARAMETER( CompletionRoutine ); - - GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); - - - Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - Result = GetSoundDeviceType(SoundDevice, &DeviceType); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - SND_ASSERT(Handle); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - - DeviceInfo.Header.FrameExtent = Length; - if (DeviceType == WAVE_OUT_DEVICE_TYPE) - { - DeviceInfo.Header.DataUsed = Length; - } - DeviceInfo.Header.Data = OffsetPtr; - DeviceInfo.Header.Size = sizeof(WDMAUD_DEVICE_INFO); - DeviceInfo.Header.PresentationTime.Numerator = 1; - DeviceInfo.Header.PresentationTime.Denominator = 1; - DeviceInfo.hDevice = Handle; - DeviceInfo.DeviceType = DeviceType; - - Overlap->Standard.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - - if (DeviceType == WAVE_OUT_DEVICE_TYPE) - { - Ret = WriteFileEx(KernelHandle, &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, CompletionRoutine); - if (Ret) - WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); - } - else if (DeviceType == WAVE_IN_DEVICE_TYPE) - { - Ret = ReadFileEx(KernelHandle, &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, CompletionRoutine); - //if (Ret) - // WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); - } - - return MMSYSERR_NOERROR; -} - -MMRESULT -SetWdmWaveState( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN BOOL bStart) -{ - MMRESULT Result; - PSOUND_DEVICE SoundDevice; - WDMAUD_DEVICE_INFO DeviceInfo; - MMDEVICE_TYPE DeviceType; - HANDLE Handle; - - Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - Result = GetSoundDeviceType(SoundDevice, &DeviceType); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.hDevice = Handle; - DeviceInfo.DeviceType = DeviceType; - - if (bStart) - DeviceInfo.u.State = KSSTATE_RUN; - else - DeviceInfo.u.State = KSSTATE_PAUSE; - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_SETDEVICE_STATE, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - return Result; -} - -MMRESULT -GetDeviceInterfaceString( - IN MMDEVICE_TYPE DeviceType, - IN DWORD DeviceId, - IN LPWSTR Interface, - IN DWORD InterfaceLength, - OUT DWORD * InterfaceSize) -{ - WDMAUD_DEVICE_INFO DeviceInfo; - MMRESULT Result; - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.DeviceType = DeviceType; - DeviceInfo.DeviceIndex = DeviceId; - - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_QUERYDEVICEINTERFACESTRING, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - - if (!Interface) - { - SND_ASSERT(InterfaceSize); - - *InterfaceSize = DeviceInfo.u.Interface.DeviceInterfaceStringSize; - return MMSYSERR_NOERROR; - } - - if (InterfaceLength < DeviceInfo.u.Interface.DeviceInterfaceStringSize) - { - /* buffer is too small */ - return MMSYSERR_MOREDATA; - } - - DeviceInfo.u.Interface.DeviceInterfaceStringSize = InterfaceLength; - DeviceInfo.u.Interface.DeviceInterfaceString = Interface; - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_QUERYDEVICEINTERFACESTRING, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( MMSUCCESS(Result) && InterfaceLength > 2) - { - Interface[1] = L'\\'; - Interface[InterfaceLength-1] = L'\0'; - } - - return Result; -} - -MMRESULT -GetWdmPosition( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN MMTIME* Time) -{ - MMRESULT Result; - PSOUND_DEVICE SoundDevice; - WDMAUD_DEVICE_INFO DeviceInfo; - MMDEVICE_TYPE DeviceType; - HANDLE Handle; - - Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - Result = GetSoundDeviceType(SoundDevice, &DeviceType); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.hDevice = Handle; - DeviceInfo.DeviceType = DeviceType; - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_OPEN_WDMAUD, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); - } - - Time->wType = TIME_BYTES; - Time->u.cb = (DWORD)DeviceInfo.u.Position; - - return MMSYSERR_NOERROR; -} - -MMRESULT -ResetStream( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN MMDEVICE_TYPE DeviceType, - IN BOOLEAN bStartReset) -{ - MMRESULT Result; - HANDLE Handle; - WDMAUD_DEVICE_INFO DeviceInfo; - - Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.hDevice = Handle; - DeviceInfo.DeviceType = DeviceType; - DeviceInfo.u.ResetStream = (bStartReset ? KSRESET_BEGIN : KSRESET_END); - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_RESET_STREAM, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - return Result; -} - - -MMRESULT -QueryMixerInfo( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN UINT uMsg, - IN LPVOID Parameter, - IN DWORD Flags) -{ - MMRESULT Result; - WDMAUD_DEVICE_INFO DeviceInfo; - HANDLE Handle; - DWORD IoControlCode; - LPMIXERLINEW MixLine; - LPMIXERLINECONTROLSW MixControls; - LPMIXERCONTROLDETAILS MixDetails; - - SND_TRACE(L"uMsg %x Flags %x\n", uMsg, Flags); - - Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); - SND_ASSERT( Result == MMSYSERR_NOERROR ); - - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - DeviceInfo.hDevice = Handle; - DeviceInfo.DeviceType = MIXER_DEVICE_TYPE; - DeviceInfo.Flags = Flags; - - MixLine = (LPMIXERLINEW)Parameter; - MixControls = (LPMIXERLINECONTROLSW)Parameter; - MixDetails = (LPMIXERCONTROLDETAILS)Parameter; - -#ifdef USE_MMIXER_LIB - switch(uMsg) - { - case MXDM_GETLINEINFO: - return WdmAudGetLineInfo(SoundDeviceInstance->Handle, MixLine, Flags); - case MXDM_GETLINECONTROLS: - return WdmAudGetLineControls(SoundDeviceInstance->Handle, MixControls, Flags); - case MXDM_SETCONTROLDETAILS: - return WdmAudSetControlDetails(SoundDeviceInstance->Handle, MixDetails, Flags); - break; - case MXDM_GETCONTROLDETAILS: - return WdmAudGetControlDetails(SoundDeviceInstance->Handle, MixDetails, Flags); - break; - default: - SND_ASSERT(0); - return MMSYSERR_NOTSUPPORTED; - } -#endif - - - switch(uMsg) - { - case MXDM_GETLINEINFO: - RtlCopyMemory(&DeviceInfo.u.MixLine, MixLine, sizeof(MIXERLINEW)); - IoControlCode = IOCTL_GETLINEINFO; - break; - case MXDM_GETLINECONTROLS: - RtlCopyMemory(&DeviceInfo.u.MixControls, MixControls, sizeof(MIXERLINECONTROLSW)); - IoControlCode = IOCTL_GETLINECONTROLS; - break; - case MXDM_SETCONTROLDETAILS: - RtlCopyMemory(&DeviceInfo.u.MixDetails, MixDetails, sizeof(MIXERCONTROLDETAILS)); - IoControlCode = IOCTL_SETCONTROLDETAILS; - break; - case MXDM_GETCONTROLDETAILS: - RtlCopyMemory(&DeviceInfo.u.MixDetails, MixDetails, sizeof(MIXERCONTROLDETAILS)); - IoControlCode = IOCTL_GETCONTROLDETAILS; - break; - default: - SND_ASSERT(0); - return MMSYSERR_NOTSUPPORTED; - } - - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IoControlCode, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if ( ! MMSUCCESS(Result) ) - { - return Result; - } - - switch(uMsg) - { - case MXDM_GETLINEINFO: - { - RtlCopyMemory(MixLine, &DeviceInfo.u.MixLine, sizeof(MIXERLINEW)); - break; - } - } - - return Result; -} - - MMRESULT PopulateWdmDeviceList( - HANDLE Handle, MMDEVICE_TYPE DeviceType) { MMRESULT Result; @@ -934,10 +37,13 @@ MMFUNCTION_TABLE FuncTable; DWORD i; - VALIDATE_MMSYS_PARAMETER( Handle != INVALID_HANDLE_VALUE ); VALIDATE_MMSYS_PARAMETER( IS_VALID_SOUND_DEVICE_TYPE(DeviceType) ); - Result = GetNumWdmDevs(Handle, DeviceType, &DeviceCount); +#ifdef USE_MMIXER_LIB + Result = WdmAudGetNumDevsByMMixer(DeviceType, &DeviceCount); +#else + Result = WdmAudGetNumWdmDevsByLegacy(DeviceType, &DeviceCount); +#endif if ( ! MMSUCCESS(Result) ) { @@ -960,41 +66,58 @@ /* Set up our function table */ ZeroMemory(&FuncTable, sizeof(MMFUNCTION_TABLE)); - FuncTable.GetCapabilities = GetWdmDeviceCapabilities; +#ifdef USE_MMIXER_LIB + FuncTable.GetCapabilities = WdmAudGetCapabilitiesByMMixer; + FuncTable.Open = WdmAudOpenSoundDeviceByMMixer; + FuncTable.Close = WdmAudCloseSoundDeviceByMMixer; + FuncTable.GetDeviceInterfaceString = WdmAudGetDeviceInterfaceStringByMMixer; +#else + FuncTable.GetCapabilities = WdmAudGetCapabilitiesByLegacy; + FuncTable.Open = WdmAudOpenSoundDeviceByLegacy; + FuncTable.Close = WdmAudCloseSoundDeviceByLegacy; + FuncTable.GetDeviceInterfaceString = WdmAudGetDeviceInterfaceStringByLegacy; +#endif + FuncTable.QueryWaveFormatSupport = QueryWdmWaveDeviceFormatSupport; if (DeviceType == MIXER_DEVICE_TYPE) { - FuncTable.SetWaveFormat = SetWdmMixerDeviceFormat; - FuncTable.QueryMixerInfo = QueryMixerInfo; - } - else - { - FuncTable.SetWaveFormat = SetWdmWaveDeviceFormat; +#ifdef USE_MMIXER_LIB + FuncTable.SetWaveFormat = WdmAudSetMixerDeviceFormatByMMixer; + FuncTable.QueryMixerInfo = WdmAudQueryMixerInfoByMMixer; +#else + FuncTable.SetWaveFormat = WdmAudSetMixerDeviceFormatByLegacy; + FuncTable.QueryMixerInfo = WdmAudQueryMixerInfoByLegacy; +#endif } if (DeviceType == WAVE_IN_DEVICE_TYPE || DeviceType == WAVE_OUT_DEVICE_TYPE) { - FuncTable.SetState = SetWdmWaveState; - FuncTable.ResetStream = ResetStream; - } - - FuncTable.Open = OpenWdmSoundDevice; - FuncTable.Close = CloseWdmSoundDevice; - FuncTable.GetDeviceInterfaceString = GetDeviceInterfaceString; -#ifndef USERMODE_MIXER - FuncTable.CommitWaveBuffer = WriteFileEx_Committer2; -#else - FuncTable.CommitWaveBuffer = WriteFileEx_Remixer; -#endif - FuncTable.GetPos = GetWdmPosition; +#ifdef USE_MMIXER_LIB + FuncTable.SetWaveFormat = WdmAudSetWdmWaveDeviceFormatByMMixer; + FuncTable.SetState = WdmAudSetWdmWaveStateByMMixer; + FuncTable.ResetStream = WdmAudResetStreamByMMixer; + FuncTable.GetPos = WdmAudGetWdmPositionByMMixer; +#else + FuncTable.SetWaveFormat = WdmAudSetWaveDeviceFormatByLegacy; + FuncTable.SetState = WdmAudSetWaveStateByLegacy; + FuncTable.ResetStream = WdmAudResetStreamByLegacy; + FuncTable.GetPos = WdmAudGetWavePositionByLegacy; +#endif + +#ifdef USE_MMIXER_LIB + FuncTable.CommitWaveBuffer = WdmAudCommitWaveBufferByMMixer; +#elif defined (USERMODE_MIXER) + FuncTable.CommitWaveBuffer = WriteFileEx_Remixer; +#else + FuncTable.CommitWaveBuffer = WriteFileEx_Committer2; +#endif + } SetSoundDeviceFunctionTable(SoundDevice, &FuncTable); } return MMSYSERR_NOERROR; } - - LONG APIENTRY @@ -1011,7 +134,10 @@ { case DRV_LOAD : { +#ifndef USE_MMIXER_LIB HANDLE Handle; +#endif + SND_TRACE(L"DRV_LOAD\n"); Result = InitEntrypointMutexes(); @@ -1019,9 +145,14 @@ if ( ! MMSUCCESS(Result) ) return 0L; - OpenWdmSoundDevice(NULL, &Handle); - - if ( Handle == INVALID_HANDLE_VALUE ) +#ifdef USE_MMIXER_LIB + if (!WdmAudInitUserModeMixer()) + { + SND_ERR(L"Failed to initialize mmixer lib\n"); + return 0; + } +#else + if (WdmAudOpenSoundDeviceByLegacy() != MMSYSERR_NOERROR) { SND_ERR(L"Failed to open %s\n", KERNEL_DEVICE_NAME); CleanupEntrypointMutexes(); @@ -1030,15 +161,16 @@ return 0L; } +#endif /* Populate the device lists */ SND_TRACE(L"Populating device lists\n"); - PopulateWdmDeviceList(KernelHandle, WAVE_OUT_DEVICE_TYPE); - PopulateWdmDeviceList(KernelHandle, WAVE_IN_DEVICE_TYPE); - PopulateWdmDeviceList(KernelHandle, MIDI_OUT_DEVICE_TYPE); - PopulateWdmDeviceList(KernelHandle, MIDI_IN_DEVICE_TYPE); - PopulateWdmDeviceList(KernelHandle, AUX_DEVICE_TYPE); - PopulateWdmDeviceList(KernelHandle, MIXER_DEVICE_TYPE); + PopulateWdmDeviceList(WAVE_OUT_DEVICE_TYPE); + PopulateWdmDeviceList(WAVE_IN_DEVICE_TYPE); + PopulateWdmDeviceList(MIDI_OUT_DEVICE_TYPE); + PopulateWdmDeviceList(MIDI_IN_DEVICE_TYPE); + PopulateWdmDeviceList(AUX_DEVICE_TYPE); + PopulateWdmDeviceList(MIXER_DEVICE_TYPE); SND_TRACE(L"Initialisation complete\n"); @@ -1049,11 +181,11 @@ { SND_TRACE(L"DRV_FREE\n"); - if ( KernelHandle != INVALID_HANDLE_VALUE ) - { - CloseHandle(KernelHandle); - KernelHandle = INVALID_HANDLE_VALUE; - } +#ifdef USE_MMIXER_LIB + WdmAudCleanupMMixer(); +#else + WdmAudCleanupLegacy(); +#endif /* TODO: Clean up the path names! */ UnlistAllSoundDevices(); @@ -1107,9 +239,6 @@ switch ( fdwReason ) { case DLL_PROCESS_ATTACH : -#ifdef USE_MMIXER_LIB - WdmAudInitUserModeMixer(); -#endif SND_TRACE(L"WDMAUD.DRV - Process attached\n"); break; case DLL_PROCESS_DETACH : Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] Wed Dec 23 04:05:11 2009 @@ -27,43 +27,39 @@ WdmAudGetMixerCount(); MMRESULT -WdmAudGetMixerCapabilties( - IN ULONG DeviceId, - LPMIXERCAPSW Capabilities); - -MMRESULT -WdmAudGetWaveOutCapabilities( - IN ULONG DeviceId, - LPWAVEOUTCAPSW Capabilities); - -MMRESULT -WdmAudGetWaveInCapabilities( - IN ULONG DeviceId, - LPWAVEINCAPSW Capabilities); - -MMRESULT -WdmAudCloseMixer( - IN HMIXER Handle, - IN HANDLE hNotifyEvent); - -MMRESULT -WdmAudOpenMixer( - IN PHANDLE hMixer, - IN ULONG DeviceId, - IN HANDLE hNotifyEvent); - -MMRESULT -WdmAudOpenWave( - OUT PHANDLE hPin, - IN DWORD DeviceId, - IN PWAVEFORMATEX WaveFormat, - IN DWORD bWaveIn); - +WdmAudGetNumDevsByMMixer( + IN MMDEVICE_TYPE DeviceType, + OUT DWORD* DeviceCount); + +MMRESULT +WriteFileEx_Remixer( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID OffsetPtr, + IN DWORD Length, + IN PSOUND_OVERLAPPED Overlap, + IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine); + +MMRESULT +WdmAudGetCapabilitiesByMMixer( + IN PSOUND_DEVICE SoundDevice, + IN DWORD DeviceId, + OUT PVOID Capabilities, + IN DWORD CapabilitiesSize); + +MMRESULT +WdmAudOpenSoundDeviceByMMixer( + IN struct _SOUND_DEVICE* SoundDevice, + OUT PVOID* Handle); + +MMRESULT +WdmAudCloseSoundDeviceByMMixer( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN PVOID Handle); MMRESULT WdmAudGetLineInfo( IN HANDLE hMixer, - IN LPMIXERLINE MixLine, + IN LPMIXERLINEW MixLine, IN ULONG Flags); MMRESULT @@ -84,4 +80,143 @@ IN LPMIXERCONTROLDETAILS MixDetails, IN ULONG Flags); +MMRESULT +WdmAudSetWdmWaveDeviceFormatByMMixer( + IN PSOUND_DEVICE_INSTANCE Instance, + IN DWORD DeviceId, + IN PWAVEFORMATEX WaveFormat, + IN DWORD WaveFormatSize); + +MMRESULT +WdmAudGetDeviceInterfaceStringByMMixer( + IN MMDEVICE_TYPE DeviceType, + IN DWORD DeviceId, + IN LPWSTR Interface, + IN DWORD InterfaceLength, + OUT DWORD * InterfaceSize); + +MMRESULT +WdmAudSetMixerDeviceFormatByMMixer( + IN PSOUND_DEVICE_INSTANCE Instance, + IN DWORD DeviceId, + IN PWAVEFORMATEX WaveFormat, + IN DWORD WaveFormatSize); + +MMRESULT +WdmAudQueryMixerInfoByMMixer( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN UINT uMsg, + IN LPVOID Parameter, + IN DWORD Flags); + +MMRESULT +WdmAudSetWdmWaveStateByMMixer( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN BOOL bStart); + +MMRESULT +WdmAudResetStreamByMMixer( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN MMDEVICE_TYPE DeviceType, + IN BOOLEAN bStartReset); + +MMRESULT +WdmAudGetWdmPositionByMMixer( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN MMTIME* Time); + +MMRESULT +WdmAudCommitWaveBufferByMMixer( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID OffsetPtr, + IN DWORD Length, + IN PSOUND_OVERLAPPED Overlap, + IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine); + +VOID +WdmAudCleanupMMixer(); + +/* legacy.c */ + +VOID +WdmAudCleanupLegacy(); + +MMRESULT +WdmAudGetCapabilitiesByLegacy( + IN PSOUND_DEVICE SoundDevice, + IN DWORD DeviceId, + OUT PVOID Capabilities, + IN DWORD CapabilitiesSize); + +MMRESULT +WdmAudOpenSoundDeviceByLegacy(); + +MMRESULT +WdmAudCloseSoundDeviceByLegacy( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN PVOID Handle); + +MMRESULT +WdmAudGetDeviceInterfaceStringByLegacy( + IN MMDEVICE_TYPE DeviceType, + IN DWORD DeviceId, + IN LPWSTR Interface, + IN DWORD InterfaceLength, + OUT DWORD * InterfaceSize); + +MMRESULT +WdmAudSetMixerDeviceFormatByLegacy( + IN PSOUND_DEVICE_INSTANCE Instance, + IN DWORD DeviceId, + IN PWAVEFORMATEX WaveFormat, + IN DWORD WaveFormatSize); + +MMRESULT +WdmAudQueryMixerInfoByLegacy( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN UINT uMsg, + IN LPVOID Parameter, + IN DWORD Flags); + +MMRESULT +WdmAudSetWaveDeviceFormatByLegacy( + IN PSOUND_DEVICE_INSTANCE Instance, + IN DWORD DeviceId, + IN PWAVEFORMATEX WaveFormat, + IN DWORD WaveFormatSize); + +MMRESULT +WdmAudSetWaveStateByLegacy( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN BOOL bStart); + +MMRESULT +WdmAudResetStreamByLegacy( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN MMDEVICE_TYPE DeviceType, + IN BOOLEAN bStartReset); + +MMRESULT +WdmAudGetWavePositionByLegacy( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN MMTIME* Time); + +MMRESULT +WriteFileEx_Committer2( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID OffsetPtr, + IN DWORD Length, + IN PSOUND_OVERLAPPED Overlap, + IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine); + +MMRESULT +WdmAudGetNumWdmDevsByLegacy( + IN MMDEVICE_TYPE DeviceType, + OUT DWORD* DeviceCount); + +DWORD +WINAPI +MixerEventThreadRoutine( + LPVOID Parameter); + #endif Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] Wed Dec 23 04:05:11 2009 @@ -5,8 +5,8 @@ <include base="wdmaud_kernel">.</include> <include base="mmixer">.</include> <include base="libsamplerate">.</include> - <define name="NDEBUG">1</define> -  +  +  <library>mmebuddy</library> <library>ntdll</library> <library>user32</library> @@ -20,5 +20,6 @@ <file>wdmaud.c</file> <file>mixer.c</file> <file>mmixer.c</file> + <file>legacy.c</file> <file>wdmaud.rc</file> </module>

1 0

[janderwald] 44720: [MMIXER] - Implement a function for controlling the wave pin state
by janderwald＠svn.reactos.org 23 Dec '09

23 Dec '09

Author: janderwald Date: Wed Dec 23 03:49:18 2009 New Revision: 44720 URL: http://svn.reactos.org/svn/reactos?rev=44720&view=rev Log: [MMIXER] - Implement a function for controlling the wave pin state Modified: trunk/reactos/lib/drivers/sound/mmixer/mmixer.h trunk/reactos/lib/drivers/sound/mmixer/wave.c Modified: trunk/reactos/lib/drivers/sound/mmixer/mmixer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] Wed Dec 23 03:49:18 2009 @@ -166,4 +166,10 @@ IN LPWAVEFORMATEX WaveFormat, OUT PHANDLE PinHandle); +MIXER_STATUS +MMixerSetWaveStatus( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE PinHandle, + IN KSSTATE State); + #endif Modified: trunk/reactos/lib/drivers/sound/mmixer/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/w… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/wave.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/wave.c [iso-8859-1] Wed Dec 23 03:49:18 2009 @@ -8,6 +8,7 @@ #include "priv.h" +const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; const GUID KSDATAFORMAT_TYPE_AUDIO = {0x73647561L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; @@ -576,3 +577,20 @@ return MixerList->WaveOutListCount; } + +MIXER_STATUS +MMixerSetWaveStatus( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE PinHandle, + IN KSSTATE State) +{ + KSPROPERTY Property; + ULONG Length; + + /* setup property request */ + Property.Set = KSPROPSETID_Connection; + Property.Id = KSPROPERTY_CONNECTION_STATE; + Property.Flags = KSPROPERTY_TYPE_SET; + + return MixerContext->Control(PinHandle, IOCTL_KS_PROPERTY, &Property, sizeof(KSPROPERTY), &State, sizeof(KSSTATE), &Length); +}

1 0

[fireball] 44719: - Update to the newest server protocol version.
by fireball＠svn.reactos.org 22 Dec '09

22 Dec '09

Author: fireball Date: Tue Dec 22 21:33:39 2009 New Revision: 44719 URL: http://svn.reactos.org/svn/reactos?rev=44719&view=rev Log: - Update to the newest server protocol version. Modified: branches/arwinss/reactos/include/reactos/wine/server_protocol.h branches/arwinss/reactos/subsystems/win32/win32k/include/request.h branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c Modified: branches/arwinss/reactos/include/reactos/wine/server_protocol.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/server_protocol.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/server_protocol.h [iso-8859-1] Tue Dec 22 21:33:39 2009 @@ -1204,6 +1204,21 @@ +struct get_handle_unix_name_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_handle_unix_name_reply +{ + struct reply_header __header; + data_size_t name_len; + /* VARARG(name,string); */ + char __pad_12[4]; +}; + + + struct get_handle_fd_request { struct request_header __header; @@ -4105,16 +4120,17 @@ char __pad_20[4]; }; -struct get_token_user_request +struct get_token_sid_request { struct request_header __header; obj_handle_t handle; -}; -struct get_token_user_reply -{ - struct reply_header __header; - data_size_t user_len; - /* VARARG(user,SID); */ + unsigned int which_sid; +}; +struct get_token_sid_reply +{ + struct reply_header __header; + data_size_t sid_len; + /* VARARG(sid,SID); */ char __pad_12[4]; }; @@ -4675,6 +4691,7 @@ REQ_create_file, REQ_open_file_object, REQ_alloc_file_handle, + REQ_get_handle_unix_name, REQ_get_handle_fd, REQ_flush_file, REQ_lock_file, @@ -4843,7 +4860,7 @@ REQ_check_token_privileges, REQ_duplicate_token, REQ_access_check, - REQ_get_token_user, + REQ_get_token_sid, REQ_get_token_groups, REQ_get_token_default_dacl, REQ_set_token_default_dacl, @@ -4922,6 +4939,7 @@ struct create_file_request create_file_request; struct open_file_object_request open_file_object_request; struct alloc_file_handle_request alloc_file_handle_request; + struct get_handle_unix_name_request get_handle_unix_name_request; struct get_handle_fd_request get_handle_fd_request; struct flush_file_request flush_file_request; struct lock_file_request lock_file_request; @@ -5090,7 +5108,7 @@ struct check_token_privileges_request check_token_privileges_request; struct duplicate_token_request duplicate_token_request; struct access_check_request access_check_request; - struct get_token_user_request get_token_user_request; + struct get_token_sid_request get_token_sid_request; struct get_token_groups_request get_token_groups_request; struct get_token_default_dacl_request get_token_default_dacl_request; struct set_token_default_dacl_request set_token_default_dacl_request; @@ -5167,6 +5185,7 @@ struct create_file_reply create_file_reply; struct open_file_object_reply open_file_object_reply; struct alloc_file_handle_reply alloc_file_handle_reply; + struct get_handle_unix_name_reply get_handle_unix_name_reply; struct get_handle_fd_reply get_handle_fd_reply; struct flush_file_reply flush_file_reply; struct lock_file_reply lock_file_reply; @@ -5335,7 +5354,7 @@ struct check_token_privileges_reply check_token_privileges_reply; struct duplicate_token_reply duplicate_token_reply; struct access_check_reply access_check_reply; - struct get_token_user_reply get_token_user_reply; + struct get_token_sid_reply get_token_sid_reply; struct get_token_groups_reply get_token_groups_reply; struct get_token_default_dacl_reply get_token_default_dacl_reply; struct set_token_default_dacl_reply set_token_default_dacl_reply; @@ -5372,6 +5391,6 @@ struct free_user_handle_reply free_user_handle_reply; }; -#define SERVER_PROTOCOL_VERSION 392 +#define SERVER_PROTOCOL_VERSION 394 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/request.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/request.h [iso-8859-1] Tue Dec 22 21:33:39 2009 @@ -109,6 +109,7 @@ DECL_HANDLER(create_file); DECL_HANDLER(open_file_object); DECL_HANDLER(alloc_file_handle); +DECL_HANDLER(get_handle_unix_name); DECL_HANDLER(get_handle_fd); DECL_HANDLER(flush_file); DECL_HANDLER(lock_file); @@ -277,7 +278,7 @@ DECL_HANDLER(check_token_privileges); DECL_HANDLER(duplicate_token); DECL_HANDLER(access_check); -DECL_HANDLER(get_token_user); +DECL_HANDLER(get_token_sid); DECL_HANDLER(get_token_groups); DECL_HANDLER(get_token_default_dacl); DECL_HANDLER(set_token_default_dacl); @@ -355,6 +356,7 @@ (req_handler)req_create_file, (req_handler)req_open_file_object, (req_handler)req_alloc_file_handle, + (req_handler)req_get_handle_unix_name, (req_handler)req_get_handle_fd, (req_handler)req_flush_file, (req_handler)req_lock_file, @@ -523,7 +525,7 @@ (req_handler)req_check_token_privileges, (req_handler)req_duplicate_token, (req_handler)req_access_check, - (req_handler)req_get_token_user, + (req_handler)req_get_token_sid, (req_handler)req_get_token_groups, (req_handler)req_get_token_default_dacl, (req_handler)req_set_token_default_dacl, @@ -808,6 +810,9 @@ C_ASSERT( FIELD_OFFSET(struct alloc_file_handle_request, fd) == 20 ); C_ASSERT( FIELD_OFFSET(struct alloc_file_handle_reply, handle) == 8 ); C_ASSERT( sizeof(struct alloc_file_handle_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_handle_unix_name_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_handle_unix_name_reply, name_len) == 8 ); +C_ASSERT( sizeof(struct get_handle_unix_name_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_handle_fd_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_handle_fd_reply, type) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_handle_fd_reply, removable) == 12 ); @@ -1712,9 +1717,10 @@ C_ASSERT( FIELD_OFFSET(struct access_check_reply, access_status) == 12 ); C_ASSERT( FIELD_OFFSET(struct access_check_reply, privileges_len) == 16 ); C_ASSERT( sizeof(struct access_check_reply) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_token_user_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_token_user_reply, user_len) == 8 ); -C_ASSERT( sizeof(struct get_token_user_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_token_sid_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_token_sid_request, which_sid) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_token_sid_reply, sid_len) == 8 ); +C_ASSERT( sizeof(struct get_token_sid_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_token_groups_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_token_groups_reply, user_len) == 8 ); C_ASSERT( sizeof(struct get_token_groups_reply) == 16 ); Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/stubs.c [iso-8859-1] Tue Dec 22 21:33:39 2009 @@ -198,6 +198,11 @@ UNIMPLEMENTED; } +DECL_HANDLER(get_handle_unix_name) +{ + UNIMPLEMENTED; +} + DECL_HANDLER(flush_file) { UNIMPLEMENTED; @@ -633,7 +638,7 @@ UNIMPLEMENTED; } -DECL_HANDLER(get_token_user) +DECL_HANDLER(get_token_sid) { UNIMPLEMENTED; }

1 0

[fireball] 44718: - Merge Wine-1.1.34 and 1.1.35 changes.
by fireball＠svn.reactos.org 22 Dec '09

22 Dec '09

Author: fireball Date: Tue Dec 22 21:16:41 2009 New Revision: 44718 URL: http://svn.reactos.org/svn/reactos?rev=44718&view=rev Log: - Merge Wine-1.1.34 and 1.1.35 changes. Modified: branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/gdi32/bidi.c branches/arwinss/reactos/dll/win32/gdi32/brush.c branches/arwinss/reactos/dll/win32/gdi32/dc.c branches/arwinss/reactos/dll/win32/gdi32/driver.c branches/arwinss/reactos/dll/win32/gdi32/enhmetafile.c branches/arwinss/reactos/dll/win32/gdi32/enhmfdrv/bitblt.c branches/arwinss/reactos/dll/win32/gdi32/enhmfdrv/init.c branches/arwinss/reactos/dll/win32/gdi32/font.c branches/arwinss/reactos/dll/win32/gdi32/freetype.c branches/arwinss/reactos/dll/win32/gdi32/gdi_main.c branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h branches/arwinss/reactos/dll/win32/gdi32/gdiobj.c branches/arwinss/reactos/dll/win32/gdi32/metafile.c branches/arwinss/reactos/dll/win32/gdi32/mfdrv/graphics.c branches/arwinss/reactos/dll/win32/gdi32/mfdrv/init.c branches/arwinss/reactos/dll/win32/gdi32/mfdrv/mapping.c branches/arwinss/reactos/dll/win32/gdi32/mfdrv/objects.c branches/arwinss/reactos/dll/win32/gdi32/mfdrv/text.c branches/arwinss/reactos/dll/win32/gdi32/opengl.c branches/arwinss/reactos/dll/win32/gdi32/palette.c branches/arwinss/reactos/dll/win32/gdi32/path.c branches/arwinss/reactos/dll/win32/gdi32/printdrv.c branches/arwinss/reactos/dll/win32/gdi32/region.c branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/user32/button.c branches/arwinss/reactos/dll/win32/user32/class.c branches/arwinss/reactos/dll/win32/user32/combo.c branches/arwinss/reactos/dll/win32/user32/controls.h branches/arwinss/reactos/dll/win32/user32/dde_misc.c branches/arwinss/reactos/dll/win32/user32/desktop.c branches/arwinss/reactos/dll/win32/user32/dialog.c branches/arwinss/reactos/dll/win32/user32/edit.c branches/arwinss/reactos/dll/win32/user32/icontitle.c branches/arwinss/reactos/dll/win32/user32/listbox.c branches/arwinss/reactos/dll/win32/user32/mdi.c branches/arwinss/reactos/dll/win32/user32/menu.c branches/arwinss/reactos/dll/win32/user32/message.c branches/arwinss/reactos/dll/win32/user32/msg16.c branches/arwinss/reactos/dll/win32/user32/painting.c branches/arwinss/reactos/dll/win32/user32/property.c branches/arwinss/reactos/dll/win32/user32/scroll.c branches/arwinss/reactos/dll/win32/user32/static.c branches/arwinss/reactos/dll/win32/user32/sysparams.c branches/arwinss/reactos/dll/win32/user32/user32.spec branches/arwinss/reactos/dll/win32/user32/user_private.h branches/arwinss/reactos/dll/win32/user32/win.c branches/arwinss/reactos/dll/win32/user32/win.h branches/arwinss/reactos/dll/win32/user32/winproc.c branches/arwinss/reactos/dll/win32/user32/wsprintf.c branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/bitmap.c branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c branches/arwinss/reactos/dll/win32/winex11.drv/event.c branches/arwinss/reactos/dll/win32/winex11.drv/graphics.c branches/arwinss/reactos/dll/win32/winex11.drv/keyboard.c branches/arwinss/reactos/dll/win32/winex11.drv/opengl.c branches/arwinss/reactos/dll/win32/winex11.drv/winex11.drv.spec branches/arwinss/reactos/dll/win32/winex11.drv/wintab.c branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c branches/arwinss/reactos/subsystems/win32/win32k/include/handle.h branches/arwinss/reactos/subsystems/win32/win32k/wine/ (props changed) branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/dll/win32/gdi32/bidi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/brush.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/driver.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/enhmetafile.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/enhmfdrv/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/enhmfdrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/mfdrv/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/mfdrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/mfdrv/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/mfdrv/objects.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/mfdrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/opengl.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/palette.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/path.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/printdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/gdi32/region.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Modified: branches/arwinss/reactos/dll/win32/user32/button.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/class.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/combo.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/controls.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/dde_misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/edit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/icontitle.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/listbox.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/mdi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/menu.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/message.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/msg16.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/painting.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/property.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/scroll.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/static.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/user_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/win.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/winproc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/wsprintf.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/opengl.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/winex11.drv.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/wintab.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/x11drv.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xrender.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/handle.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

1 0

[janderwald] 44717: [MMIXER] - Fix a bug in the file header
by janderwald＠svn.reactos.org 22 Dec '09

22 Dec '09

Author: janderwald Date: Tue Dec 22 19:08:51 2009 New Revision: 44717 URL: http://svn.reactos.org/svn/reactos?rev=44717&view=rev Log: [MMIXER] - Fix a bug in the file header Modified: trunk/reactos/lib/drivers/sound/mmixer/wave.c Modified: trunk/reactos/lib/drivers/sound/mmixer/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/w… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/wave.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/wave.c [iso-8859-1] Tue Dec 22 19:08:51 2009 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel Streaming - * FILE: lib/drivers/sound/mmixer/mmixer.c - * PURPOSE: Mixer Handling Functions + * FILE: lib/drivers/sound/mmixer/wave.c + * PURPOSE: Wave Handling Functions * PROGRAMMER: Johannes Anderwald */

1 0

[ekohl] 44716: If the user doubleclicked a treeview item, make sure the doubleclicked item has already been selected. Otherwise the user can expand or collapse a treeview iten and a previously selected item get opened. That's not what we want.
by ekohl＠svn.reactos.org 22 Dec '09

22 Dec '09

Author: ekohl Date: Tue Dec 22 18:00:45 2009 New Revision: 44716 URL: http://svn.reactos.org/svn/reactos?rev=44716&view=rev Log: If the user doubleclicked a treeview item, make sure the doubleclicked item has already been selected. Otherwise the user can expand or collapse a treeview iten and a previously selected item get opened. That's not what we want. Modified: trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c Modified: trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] Tue Dec 22 18:00:45 2009 @@ -342,12 +342,21 @@ case NM_DBLCLK: { HTREEITEM hSelected = TreeView_GetSelection(Info->hTreeView); + TV_HITTESTINFO HitTest; if (!TreeView_GetChild(Info->hTreeView, hSelected)) { - OpenPropSheet(Info->hTreeView, - hSelected); + if (GetCursorPos(&HitTest.pt) && + ScreenToClient(Info->hTreeView, &HitTest.pt)) + { + if (TreeView_HitTest(Info->hTreeView, &HitTest)) + { + if (HitTest.hItem == hSelected) + OpenPropSheet(Info->hTreeView, + hSelected); + } + } } } break;

1 0

[fireball] 44715: [vendor/wine] - Import Wine-1.1.35 gdi32, user32, winex11.drv, wineserver.
by fireball＠svn.reactos.org 22 Dec '09

22 Dec '09

Author: fireball Date: Tue Dec 22 17:58:10 2009 New Revision: 44715 URL: http://svn.reactos.org/svn/reactos?rev=44715&view=rev Log: [vendor/wine] - Import Wine-1.1.35 gdi32, user32, winex11.drv, wineserver. Modified: vendor/wine/dlls/gdi32/current/Makefile.in vendor/wine/dlls/gdi32/current/bidi.c vendor/wine/dlls/gdi32/current/brush.c vendor/wine/dlls/gdi32/current/dc.c vendor/wine/dlls/gdi32/current/driver.c vendor/wine/dlls/gdi32/current/enhmetafile.c vendor/wine/dlls/gdi32/current/enhmfdrv/bitblt.c vendor/wine/dlls/gdi32/current/enhmfdrv/init.c vendor/wine/dlls/gdi32/current/font.c vendor/wine/dlls/gdi32/current/freetype.c vendor/wine/dlls/gdi32/current/gdi32.spec vendor/wine/dlls/gdi32/current/gdi_main.c vendor/wine/dlls/gdi32/current/gdi_private.h vendor/wine/dlls/gdi32/current/gdiobj.c vendor/wine/dlls/gdi32/current/metafile.c vendor/wine/dlls/gdi32/current/mfdrv/graphics.c vendor/wine/dlls/gdi32/current/mfdrv/init.c vendor/wine/dlls/gdi32/current/mfdrv/mapping.c vendor/wine/dlls/gdi32/current/mfdrv/objects.c vendor/wine/dlls/gdi32/current/mfdrv/text.c vendor/wine/dlls/gdi32/current/opengl.c vendor/wine/dlls/gdi32/current/palette.c vendor/wine/dlls/gdi32/current/path.c vendor/wine/dlls/gdi32/current/printdrv.c vendor/wine/dlls/gdi32/current/region.c vendor/wine/dlls/gdi32/current/tests/font.c vendor/wine/dlls/gdi32/current/tests/metafile.c vendor/wine/dlls/user32/current/button.c vendor/wine/dlls/user32/current/class.c vendor/wine/dlls/user32/current/combo.c vendor/wine/dlls/user32/current/controls.h vendor/wine/dlls/user32/current/dde_misc.c vendor/wine/dlls/user32/current/desktop.c vendor/wine/dlls/user32/current/dialog.c vendor/wine/dlls/user32/current/edit.c vendor/wine/dlls/user32/current/icontitle.c vendor/wine/dlls/user32/current/listbox.c vendor/wine/dlls/user32/current/mdi.c vendor/wine/dlls/user32/current/menu.c vendor/wine/dlls/user32/current/message.c vendor/wine/dlls/user32/current/msg16.c vendor/wine/dlls/user32/current/painting.c vendor/wine/dlls/user32/current/property.c vendor/wine/dlls/user32/current/scroll.c vendor/wine/dlls/user32/current/static.c vendor/wine/dlls/user32/current/sysparams.c vendor/wine/dlls/user32/current/tests/class.c vendor/wine/dlls/user32/current/tests/dde.c vendor/wine/dlls/user32/current/tests/edit.c vendor/wine/dlls/user32/current/tests/msg.c vendor/wine/dlls/user32/current/user16.c vendor/wine/dlls/user32/current/user32.spec vendor/wine/dlls/user32/current/user_private.h vendor/wine/dlls/user32/current/win.c vendor/wine/dlls/user32/current/win.h vendor/wine/dlls/user32/current/winproc.c vendor/wine/dlls/user32/current/wnd16.c vendor/wine/dlls/user32/current/wsprintf.c vendor/wine/dlls/winex11.drv/current/bitmap.c vendor/wine/dlls/winex11.drv/current/clipboard.c vendor/wine/dlls/winex11.drv/current/event.c vendor/wine/dlls/winex11.drv/current/graphics.c vendor/wine/dlls/winex11.drv/current/keyboard.c vendor/wine/dlls/winex11.drv/current/opengl.c vendor/wine/dlls/winex11.drv/current/winex11.drv.spec vendor/wine/dlls/winex11.drv/current/wintab.c vendor/wine/dlls/winex11.drv/current/x11drv.h vendor/wine/dlls/winex11.drv/current/x11drv_main.c vendor/wine/dlls/winex11.drv/current/xfont.c vendor/wine/dlls/winex11.drv/current/xrender.c vendor/wine/server/current/change.c vendor/wine/server/current/clipboard.c vendor/wine/server/current/fd.c vendor/wine/server/current/file.c vendor/wine/server/current/file.h vendor/wine/server/current/handle.c vendor/wine/server/current/handle.h vendor/wine/server/current/hook.c vendor/wine/server/current/mapping.c vendor/wine/server/current/process.c vendor/wine/server/current/process.h vendor/wine/server/current/protocol.def vendor/wine/server/current/queue.c vendor/wine/server/current/registry.c vendor/wine/server/current/request.h vendor/wine/server/current/security.h vendor/wine/server/current/thread.c vendor/wine/server/current/token.c vendor/wine/server/current/trace.c vendor/wine/server/current/winstation.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: vendor/wine/dlls/gdi32/current/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/Makefile.… Modified: vendor/wine/dlls/gdi32/current/bidi.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/bidi.c?re… Modified: vendor/wine/dlls/gdi32/current/brush.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/brush.c?r… Modified: vendor/wine/dlls/gdi32/current/dc.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/dc.c?rev=… Modified: vendor/wine/dlls/gdi32/current/driver.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/driver.c?… Modified: vendor/wine/dlls/gdi32/current/enhmetafile.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/enhmetafi… Modified: vendor/wine/dlls/gdi32/current/enhmfdrv/bitblt.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/enhmfdrv/… Modified: vendor/wine/dlls/gdi32/current/enhmfdrv/init.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/enhmfdrv/… Modified: vendor/wine/dlls/gdi32/current/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/font.c?re… Modified: vendor/wine/dlls/gdi32/current/freetype.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/freetype.… Modified: vendor/wine/dlls/gdi32/current/gdi32.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/gdi32.spe… Modified: vendor/wine/dlls/gdi32/current/gdi_main.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/gdi_main.… Modified: vendor/wine/dlls/gdi32/current/gdi_private.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/gdi_priva… Modified: vendor/wine/dlls/gdi32/current/gdiobj.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/gdiobj.c?… Modified: vendor/wine/dlls/gdi32/current/metafile.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/metafile.… Modified: vendor/wine/dlls/gdi32/current/mfdrv/graphics.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/mfdrv/gra… Modified: vendor/wine/dlls/gdi32/current/mfdrv/init.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/mfdrv/ini… Modified: vendor/wine/dlls/gdi32/current/mfdrv/mapping.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/mfdrv/map… Modified: vendor/wine/dlls/gdi32/current/mfdrv/objects.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/mfdrv/obj… Modified: vendor/wine/dlls/gdi32/current/mfdrv/text.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/mfdrv/tex… Modified: vendor/wine/dlls/gdi32/current/opengl.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/opengl.c?… Modified: vendor/wine/dlls/gdi32/current/palette.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/palette.c… Modified: vendor/wine/dlls/gdi32/current/path.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/path.c?re… Modified: vendor/wine/dlls/gdi32/current/printdrv.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/printdrv.… Modified: vendor/wine/dlls/gdi32/current/region.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/region.c?… Modified: vendor/wine/dlls/gdi32/current/tests/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/fon… Modified: vendor/wine/dlls/gdi32/current/tests/metafile.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/met… Modified: vendor/wine/dlls/user32/current/button.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/button.c… Modified: vendor/wine/dlls/user32/current/class.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/class.c?… Modified: vendor/wine/dlls/user32/current/combo.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/combo.c?… Modified: vendor/wine/dlls/user32/current/controls.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/controls… Modified: vendor/wine/dlls/user32/current/dde_misc.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/dde_misc… Modified: vendor/wine/dlls/user32/current/desktop.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/desktop.… Modified: vendor/wine/dlls/user32/current/dialog.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/dialog.c… Modified: vendor/wine/dlls/user32/current/edit.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/edit.c?r… Modified: vendor/wine/dlls/user32/current/icontitle.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/icontitl… Modified: vendor/wine/dlls/user32/current/listbox.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/listbox.… Modified: vendor/wine/dlls/user32/current/mdi.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/mdi.c?re… Modified: vendor/wine/dlls/user32/current/menu.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/menu.c?r… Modified: vendor/wine/dlls/user32/current/message.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/message.… Modified: vendor/wine/dlls/user32/current/msg16.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/msg16.c?… Modified: vendor/wine/dlls/user32/current/painting.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/painting… Modified: vendor/wine/dlls/user32/current/property.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/property… Modified: vendor/wine/dlls/user32/current/scroll.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/scroll.c… Modified: vendor/wine/dlls/user32/current/static.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/static.c… Modified: vendor/wine/dlls/user32/current/sysparams.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/sysparam… Modified: vendor/wine/dlls/user32/current/tests/class.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/cl… Modified: vendor/wine/dlls/user32/current/tests/dde.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/dd… Modified: vendor/wine/dlls/user32/current/tests/edit.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/ed… Modified: vendor/wine/dlls/user32/current/tests/msg.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/ms… Modified: vendor/wine/dlls/user32/current/user16.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/user16.c… Modified: vendor/wine/dlls/user32/current/user32.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/user32.s… Modified: vendor/wine/dlls/user32/current/user_private.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/user_pri… Modified: vendor/wine/dlls/user32/current/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/win.c?re… Modified: vendor/wine/dlls/user32/current/win.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/win.h?re… Modified: vendor/wine/dlls/user32/current/winproc.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/winproc.… Modified: vendor/wine/dlls/user32/current/wnd16.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/wnd16.c?… Modified: vendor/wine/dlls/user32/current/wsprintf.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/wsprintf… Modified: vendor/wine/dlls/winex11.drv/current/bitmap.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/bit… Modified: vendor/wine/dlls/winex11.drv/current/clipboard.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/cli… Modified: vendor/wine/dlls/winex11.drv/current/event.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/eve… Modified: vendor/wine/dlls/winex11.drv/current/graphics.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/gra… Modified: vendor/wine/dlls/winex11.drv/current/keyboard.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/key… Modified: vendor/wine/dlls/winex11.drv/current/opengl.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/ope… Modified: vendor/wine/dlls/winex11.drv/current/winex11.drv.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/win… Modified: vendor/wine/dlls/winex11.drv/current/wintab.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/win… Modified: vendor/wine/dlls/winex11.drv/current/x11drv.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/x11… Modified: vendor/wine/dlls/winex11.drv/current/x11drv_main.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/x11… Modified: vendor/wine/dlls/winex11.drv/current/xfont.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/xfo… Modified: vendor/wine/dlls/winex11.drv/current/xrender.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/xre… Modified: vendor/wine/server/current/change.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/change.c?rev=… Modified: vendor/wine/server/current/clipboard.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/clipboard.c?r… Modified: vendor/wine/server/current/fd.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/fd.c?rev=4471… Modified: vendor/wine/server/current/file.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/file.c?rev=44… Modified: vendor/wine/server/current/file.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/file.h?rev=44… Modified: vendor/wine/server/current/handle.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/handle.c?rev=… Modified: vendor/wine/server/current/handle.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/handle.h?rev=… Modified: vendor/wine/server/current/hook.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/hook.c?rev=44… Modified: vendor/wine/server/current/mapping.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/mapping.c?rev… Modified: vendor/wine/server/current/process.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/process.c?rev… Modified: vendor/wine/server/current/process.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/process.h?rev… Modified: vendor/wine/server/current/protocol.def URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/protocol.def?… Modified: vendor/wine/server/current/queue.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/queue.c?rev=4… Modified: vendor/wine/server/current/registry.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/registry.c?re… Modified: vendor/wine/server/current/request.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/request.h?rev… Modified: vendor/wine/server/current/security.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/security.h?re… Modified: vendor/wine/server/current/thread.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/thread.c?rev=… Modified: vendor/wine/server/current/token.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/token.c?rev=4… Modified: vendor/wine/server/current/trace.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/trace.c?rev=4… Modified: vendor/wine/server/current/winstation.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/winstation.c?…

1 0

[ekohl] 44714: Fix a typo. Use lpStartServiceName instead of lpServiceName. This fixes two winetests.
by ekohl＠svn.reactos.org 22 Dec '09

22 Dec '09

Author: ekohl Date: Tue Dec 22 17:57:27 2009 New Revision: 44714 URL: http://svn.reactos.org/svn/reactos?rev=44714&view=rev Log: Fix a typo. Use lpStartServiceName instead of lpServiceName. This fixes two winetests. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Tue Dec 22 17:57:27 2009 @@ -1969,8 +1969,9 @@ goto done; } - /* If a non driver and NULL for lpServiceName, write ObjectName as LocalSystem */ - if ((dwServiceType & SERVICE_WIN32) && (!lpServiceName)) + /* FIXME: Handle lpServiceStartName propertly! */ + /* If a non driver and NULL for lpServiceStartName, write ObjectName as LocalSystem */ + if ((dwServiceType & SERVICE_WIN32) && (!lpServiceStartName)) { dwError = RegSetValueExW(hServiceKey, L"ObjectName",

1 0

[ekohl] 44713: - Remove unused variable - Get rid of those ugly single line if-statements. - No code changes
by ekohl＠svn.reactos.org 22 Dec '09

22 Dec '09

Author: ekohl Date: Tue Dec 22 17:51:33 2009 New Revision: 44713 URL: http://svn.reactos.org/svn/reactos?rev=44713&view=rev Log: - Remove unused variable - Get rid of those ugly single line if-statements. - No code changes Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Tue Dec 22 17:51:33 2009 @@ -2228,7 +2228,8 @@ return ERROR_ACCESS_DENIED; } - if (lpResumeHandle) dwLastResumeCount = *lpResumeHandle; + if (lpResumeHandle) + dwLastResumeCount = *lpResumeHandle; /* FIXME: Lock the service list shared */ @@ -2306,7 +2307,9 @@ DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize); - if (lpResumeHandle) *lpResumeHandle = dwLastResumeCount; + if (lpResumeHandle) + *lpResumeHandle = dwLastResumeCount; + *lpServicesReturned = dwServiceCount; *pcbBytesNeeded = dwRequiredSize; @@ -3244,7 +3247,8 @@ KEY_READ, &hServicesKey); - if (dwError != ERROR_SUCCESS) return dwError; + if (dwError != ERROR_SUCCESS) + return dwError; /* NOTE: Windows calculates the pcbBytesNeeded based on WCHAR strings for both EnumDependentServicesA and EnumDependentServicesW. So returned pcbBytesNeeded @@ -3376,8 +3380,7 @@ } } - dwError = REnumServicesStatusW(//BindingHandle, - hSCManager, + dwError = REnumServicesStatusW(hSCManager, dwServiceType, dwServiceState, (LPBYTE)lpStatusPtrW, @@ -3387,7 +3390,8 @@ lpResumeHandle); /* if no services were returned then we are Done */ - if (*lpServicesReturned == 0) goto Done; + if (*lpServicesReturned == 0) + goto Done; lpStatusPtrA = (LPENUM_SERVICE_STATUSA)lpBuffer; lpStringPtrA = (LPSTR)((ULONG_PTR)lpBuffer + @@ -3434,7 +3438,8 @@ } Done:; - if (lpStatusPtrW) HeapFree(GetProcessHeap(), 0, lpStatusPtrW); + if (lpStatusPtrW) + HeapFree(GetProcessHeap(), 0, lpStatusPtrW); DPRINT("REnumServicesStatusA() done (Error %lu)\n", dwError);

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
51
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 December 2009