Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[janderwald] 49376: [MMIXER] - Enumerate MIDI devices and provide all necessary functions to deal with them [WDMAUD_KERNEL] - Implement support functions which call the provided functions of mmixer...
by janderwald＠svn.reactos.org 31 Oct '10

31 Oct '10

Author: janderwald Date: Sun Oct 31 14:34:41 2010 New Revision: 49376 URL: http://svn.reactos.org/svn/reactos?rev=49376&view=rev Log: [MMIXER] - Enumerate MIDI devices and provide all necessary functions to deal with them [WDMAUD_KERNEL] - Implement support functions which call the provided functions of mmixer library - Fix a bug in device interface request ioctl handler - Midi devices should now be visible, capabilities be retrieved and opened / close - Writing data is not yet supported Added: trunk/reactos/lib/drivers/sound/mmixer/midi.c (with props) Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c trunk/reactos/dll/win32/wdmaud.drv/mmixer.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/lib/drivers/sound/mmixer/mixer.c trunk/reactos/lib/drivers/sound/mmixer/mmixer.h trunk/reactos/lib/drivers/sound/mmixer/mmixer.rbuild trunk/reactos/lib/drivers/sound/mmixer/priv.h trunk/reactos/lib/drivers/sound/mmixer/sup.c trunk/reactos/lib/drivers/sound/mmixer/topology.c trunk/reactos/lib/drivers/sound/mmixer/wave.c Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] Sun Oct 31 14:34:41 2010 @@ -171,7 +171,7 @@ { case MIXER_DEVICE_TYPE: { - LPMIXERCAPS MixerCaps = (LPMIXERCAPS) Capabilities; + LPMIXERCAPSW MixerCaps = (LPMIXERCAPSW) Capabilities; DeviceInfo.u.MixCaps.szPname[MAXPNAMELEN-1] = L'\0'; CopyWideString(MixerCaps->szPname, DeviceInfo.u.MixCaps.szPname); @@ -185,13 +185,13 @@ } case WAVE_OUT_DEVICE_TYPE : { - LPWAVEOUTCAPS WaveOutCaps = (LPWAVEOUTCAPS) Capabilities; + LPWAVEOUTCAPSW WaveOutCaps = (LPWAVEOUTCAPSW) Capabilities; DeviceInfo.u.WaveOutCaps.szPname[MAXPNAMELEN-1] = L'\0'; WaveOutCaps->wMid = DeviceInfo.u.WaveOutCaps.wMid; WaveOutCaps->wPid = DeviceInfo.u.WaveOutCaps.wPid; - WaveOutCaps->vDriverVersion = 0x0001; + WaveOutCaps->vDriverVersion = DeviceInfo.u.WaveOutCaps.vDriverVersion; CopyWideString(WaveOutCaps->szPname, DeviceInfo.u.WaveOutCaps.szPname); WaveOutCaps->dwFormats = DeviceInfo.u.WaveOutCaps.dwFormats; @@ -208,12 +208,40 @@ WaveInCaps->wMid = DeviceInfo.u.WaveInCaps.wMid; WaveInCaps->wPid = DeviceInfo.u.WaveInCaps.wPid; - WaveInCaps->vDriverVersion = 0x0001; + WaveInCaps->vDriverVersion = DeviceInfo.u.WaveInCaps.vDriverVersion; CopyWideString(WaveInCaps->szPname, DeviceInfo.u.WaveInCaps.szPname); WaveInCaps->dwFormats = DeviceInfo.u.WaveInCaps.dwFormats; WaveInCaps->wChannels = DeviceInfo.u.WaveInCaps.wChannels; WaveInCaps->wReserved1 = 0; + break; + } + case MIDI_IN_DEVICE_TYPE : + { + LPMIDIINCAPSW MidiInCaps = (LPMIDIINCAPSW)Capabilities; + + DeviceInfo.u.MidiInCaps.szPname[MAXPNAMELEN-1] = L'\0'; + + MidiInCaps->vDriverVersion = DeviceInfo.u.MidiInCaps.vDriverVersion; + MidiInCaps->wMid = DeviceInfo.u.MidiInCaps.wMid; + MidiInCaps->wPid = DeviceInfo.u.MidiInCaps.wPid; + MidiInCaps->dwSupport = DeviceInfo.u.MidiInCaps.dwSupport; + + CopyWideString(MidiInCaps->szPname, DeviceInfo.u.MidiInCaps.szPname); + break; + } + case MIDI_OUT_DEVICE_TYPE : + { + LPMIDIOUTCAPSW MidiOutCaps = (LPMIDIOUTCAPSW)Capabilities; + + DeviceInfo.u.MidiOutCaps.szPname[MAXPNAMELEN-1] = L'\0'; + + MidiOutCaps->vDriverVersion = DeviceInfo.u.MidiOutCaps.vDriverVersion; + MidiOutCaps->wMid = DeviceInfo.u.MidiOutCaps.wMid; + MidiOutCaps->wPid = DeviceInfo.u.MidiOutCaps.wPid; + MidiOutCaps->dwSupport = DeviceInfo.u.MidiOutCaps.dwSupport; + + CopyWideString(MidiOutCaps->szPname, DeviceInfo.u.MidiOutCaps.szPname); break; } } 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] Sun Oct 31 14:34:41 2010 @@ -655,17 +655,46 @@ 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); + MMDEVICE_TYPE DeviceType; + PSOUND_DEVICE SoundDevice; + MMRESULT Result; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + if (DeviceType == WAVE_IN_DEVICE_TYPE || DeviceType == WAVE_OUT_DEVICE_TYPE) + { + 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); + } + } + else if (DeviceType == MIDI_IN_DEVICE_TYPE || DeviceType == MIDI_OUT_DEVICE_TYPE) + { + if (bStart) + { + MMixerSetMidiStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_ACQUIRE); + MMixerSetMidiStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_PAUSE); + MMixerSetMidiStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_RUN); + } + else + { + MMixerSetMidiStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_PAUSE); + MMixerSetMidiStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_ACQUIRE); + MMixerSetMidiStatus(&MixerContext, SoundDeviceInstance->Handle, KSSTATE_STOP); + } } 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] Sun Oct 31 14:34:41 2010 @@ -90,6 +90,12 @@ FuncTable.CommitWaveBuffer = WriteFileEx_Remixer; #endif } + else if (DeviceType == MIDI_IN_DEVICE_TYPE || DeviceType == MIDI_OUT_DEVICE_TYPE) + { + FuncTable.SetWaveFormat = FUNC_NAME(WdmAudSetMixerDeviceFormat); + FuncTable.SetState = FUNC_NAME(WdmAudSetWaveState); + FuncTable.GetPos = FUNC_NAME(WdmAudGetWavePosition); + } SetSoundDeviceFunctionTable(SoundDevice, &FuncTable); } Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Sun Oct 31 14:34:41 2010 @@ -27,6 +27,12 @@ return WdmAudControlOpenWave(DeviceObject, Irp, DeviceInfo, ClientInfo); } + if (DeviceInfo->DeviceType == MIDI_OUT_DEVICE_TYPE || DeviceInfo->DeviceType == MIDI_IN_DEVICE_TYPE) + { + return WdmAudControlOpenMidi(DeviceObject, Irp, DeviceInfo, ClientInfo); + } + + return SetIrpIoStatus(Irp, STATUS_NOT_SUPPORTED, sizeof(WDMAUD_DEVICE_INFO)); } @@ -55,6 +61,15 @@ { Result = WdmAudGetWaveOutDeviceCount(); } + else if (DeviceInfo->DeviceType == MIDI_IN_DEVICE_TYPE) + { + Result = WdmAudGetMidiInDeviceCount(); + } + else if (DeviceInfo->DeviceType == MIDI_OUT_DEVICE_TYPE) + { + Result = WdmAudGetMidiOutDeviceCount(); + } + /* store result count */ DeviceInfo->DeviceCount = Result; @@ -120,6 +135,10 @@ else if (DeviceInfo->DeviceType == WAVE_IN_DEVICE_TYPE || DeviceInfo->DeviceType == WAVE_OUT_DEVICE_TYPE) { Status = WdmAudWaveCapabilities(DeviceObject, DeviceInfo, ClientInfo, DeviceExtension); + } + else if (DeviceInfo->DeviceType == MIDI_IN_DEVICE_TYPE || DeviceInfo->DeviceType == MIDI_OUT_DEVICE_TYPE) + { + Status = WdmAudMidiCapabilities(DeviceObject, DeviceInfo, ClientInfo, DeviceExtension); } return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); @@ -219,80 +238,38 @@ /* get device interface string input length */ Size = DeviceInfo->u.Interface.DeviceInterfaceStringSize; - if (DeviceInfo->DeviceType == WAVE_IN_DEVICE_TYPE || DeviceInfo->DeviceType == WAVE_OUT_DEVICE_TYPE) - { - /* get wave info */ - Status = WdmAudGetPnpNameByIndexAndType(DeviceInfo->DeviceIndex, DeviceInfo->DeviceType, &Device); - - /* check for success */ - if (!NT_SUCCESS(Status)) - { - /* invalid device id */ - return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); - } - - /* calculate length */ - Length = (wcslen(Device)+1) * sizeof(WCHAR); - - if (!Size) - { - /* store device interface size */ - DeviceInfo->u.Interface.DeviceInterfaceStringSize = Length; - } - else if (Size < Length) - { - /* buffer too small */ - DeviceInfo->u.Interface.DeviceInterfaceStringSize = Length; - return SetIrpIoStatus(Irp, STATUS_BUFFER_OVERFLOW, sizeof(WDMAUD_DEVICE_INFO)); - } - else - { - //FIXME SEH - RtlMoveMemory(DeviceInfo->u.Interface.DeviceInterfaceString, Device, Length); - } - - FreeItem(Device); - return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); - } - else if (DeviceInfo->DeviceType == MIXER_DEVICE_TYPE) - { - if (DeviceInfo->DeviceIndex >= WdmAudGetMixerDeviceCount()) - { - /* invalid device id */ - return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, sizeof(WDMAUD_DEVICE_INFO)); - } - - Status = WdmAudGetMixerPnpNameByIndex(DeviceInfo->DeviceIndex, &Device); - /* check for success */ - if (!NT_SUCCESS(Status)) - { - /* invalid device id */ - return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); - } - - /* calculate length */ - Length = (wcslen(Device)+1) * sizeof(WCHAR); - - if (!Size) - { - /* store device interface size */ - DeviceInfo->u.Interface.DeviceInterfaceStringSize = Length; - } - else if (Size < Length) - { - /* buffer too small */ - DeviceInfo->u.Interface.DeviceInterfaceStringSize = Length; - return SetIrpIoStatus(Irp, STATUS_BUFFER_OVERFLOW, sizeof(WDMAUD_DEVICE_INFO)); - } - else - { - //FIXME SEH - RtlMoveMemory(DeviceInfo->u.Interface.DeviceInterfaceString, Device, Length); - } - return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); - } - - return SetIrpIoStatus(Irp, STATUS_INVALID_DEVICE_REQUEST, sizeof(WDMAUD_DEVICE_INFO)); + /* get mixer info */ + Status = WdmAudGetPnpNameByIndexAndType(DeviceInfo->DeviceIndex, DeviceInfo->DeviceType, &Device); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* invalid device id */ + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); + } + + /* calculate length */ + Length = (wcslen(Device)+1) * sizeof(WCHAR); + + if (!Size) + { + /* store device interface size */ + DeviceInfo->u.Interface.DeviceInterfaceStringSize = Length; + } + else if (Size < Length) + { + /* buffer too small */ + DeviceInfo->u.Interface.DeviceInterfaceStringSize = Length; + return SetIrpIoStatus(Irp, STATUS_BUFFER_OVERFLOW, sizeof(WDMAUD_DEVICE_INFO)); + } + else + { + //FIXME SEH + RtlMoveMemory(DeviceInfo->u.Interface.DeviceInterfaceString, Device, Length); + } + + FreeItem(Device); + return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } NTSTATUS Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] Sun Oct 31 14:34:41 2010 @@ -42,6 +42,8 @@ WAVEOUTCAPSW WaveOutCaps; AUXCAPSW AuxCaps; WAVEINCAPSW WaveInCaps; + MIDIINCAPSW MidiInCaps; + MIDIOUTCAPSW MidiOutCaps; ULONGLONG Position; struct { Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c [iso-8859-1] Sun Oct 31 14:34:41 2010 @@ -612,25 +612,44 @@ return MMixerGetWaveOutCount(&MixerContext); } -NTSTATUS -WdmAudGetMixerPnpNameByIndex( - IN ULONG DeviceIndex, - OUT LPWSTR * Device) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; +ULONG +WdmAudGetMidiInDeviceCount() +{ + return MMixerGetMidiInCount(&MixerContext); +} + +ULONG +WdmAudGetMidiOutDeviceCount() +{ + return MMixerGetWaveOutCount(&MixerContext); } NTSTATUS WdmAudGetPnpNameByIndexAndType( - IN ULONG DeviceIndex, - IN SOUND_DEVICE_TYPE DeviceType, + IN ULONG DeviceIndex, + IN SOUND_DEVICE_TYPE DeviceType, OUT LPWSTR *DevicePath) { - if (MMixerGetWaveDevicePath(&MixerContext, DeviceType == WAVE_IN_DEVICE_TYPE, DeviceIndex, DevicePath) == MM_STATUS_SUCCESS) - return STATUS_SUCCESS; - else - return STATUS_UNSUCCESSFUL; + if (DeviceType == WAVE_IN_DEVICE_TYPE || DeviceType == WAVE_OUT_DEVICE_TYPE) + { + if (MMixerGetWaveDevicePath(&MixerContext, DeviceType == WAVE_IN_DEVICE_TYPE, DeviceIndex, DevicePath) == MM_STATUS_SUCCESS) + return STATUS_SUCCESS; + else + return STATUS_UNSUCCESSFUL; + } + else if (DeviceType == MIDI_IN_DEVICE_TYPE || DeviceType == MIDI_OUT_DEVICE_TYPE) + { + if (MMixerGetMidiDevicePath(&MixerContext, DeviceType == MIDI_IN_DEVICE_TYPE, DeviceIndex, DevicePath) == MM_STATUS_SUCCESS) + return STATUS_SUCCESS; + else + return STATUS_UNSUCCESSFUL; + } + else if (DeviceType == MIXER_DEVICE_TYPE) + { + UNIMPLEMENTED; + } + + return STATUS_UNSUCCESSFUL; } NTSTATUS @@ -640,7 +659,7 @@ IN PWDMAUD_CLIENT ClientInfo, IN PWDMAUD_DEVICE_EXTENSION DeviceExtension) { - MIXER_STATUS Status; + MIXER_STATUS Status = MM_STATUS_UNSUCCESSFUL; if (DeviceInfo->DeviceType == WAVE_IN_DEVICE_TYPE) { @@ -652,10 +671,31 @@ /* get capabilities */ Status = MMixerWaveOutCapabilities(&MixerContext, DeviceInfo->DeviceIndex, &DeviceInfo->u.WaveOutCaps); } - else - { - ASSERT(0); - return STATUS_UNSUCCESSFUL; + + if (Status == MM_STATUS_SUCCESS) + return STATUS_SUCCESS; + else + return Status; +} + +NTSTATUS +WdmAudMidiCapabilities( + IN PDEVICE_OBJECT DeviceObject, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo, + IN PWDMAUD_DEVICE_EXTENSION DeviceExtension) +{ + MIXER_STATUS Status = MM_STATUS_UNSUCCESSFUL; + + if (DeviceInfo->DeviceType == MIDI_IN_DEVICE_TYPE) + { + /* get capabilities */ + Status = MMixerMidiInCapabilities(&MixerContext, DeviceInfo->DeviceIndex, &DeviceInfo->u.MidiInCaps); + } + else if (DeviceInfo->DeviceType == WAVE_OUT_DEVICE_TYPE) + { + /* get capabilities */ + Status = MMixerMidiOutCapabilities(&MixerContext, DeviceInfo->DeviceIndex, &DeviceInfo->u.MidiOutCaps); } if (Status == MM_STATUS_SUCCESS) @@ -737,3 +777,26 @@ else return SetIrpIoStatus(Irp, STATUS_NOT_SUPPORTED, sizeof(WDMAUD_DEVICE_INFO)); } + +NTSTATUS +WdmAudControlOpenMidi( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo) +{ + MIXER_STATUS Status; + PIN_CREATE_CONTEXT Context; + + Context.ClientInfo = ClientInfo; + Context.DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + Context.DeviceType = DeviceInfo->DeviceType; + + Status = MMixerOpenMidi(&MixerContext, DeviceInfo->DeviceIndex, DeviceInfo->DeviceType == MIDI_IN_DEVICE_TYPE, CreatePinCallback, &Context, &DeviceInfo->hDevice); + + if (Status == MM_STATUS_SUCCESS) + return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); + else + return SetIrpIoStatus(Irp, STATUS_NOT_SUPPORTED, sizeof(WDMAUD_DEVICE_INFO)); +} + Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Sun Oct 31 14:34:41 2010 @@ -130,6 +130,12 @@ IN PWDMAUD_DEVICE_INFO DeviceInfo, IN PWDMAUD_CLIENT ClientInfo); +NTSTATUS +WdmAudControlOpenMidi( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo); ULONG GetNumOfMixerDevices( @@ -164,6 +170,13 @@ IN PDEVICE_OBJECT DeviceObject, IN PWDMAUD_DEVICE_INFO DeviceInfo, IN PWDMAUD_CLIENT ClientInfo, + IN PWDMAUD_DEVICE_EXTENSION DeviceExtension); + +NTSTATUS +WdmAudMidiCapabilities( + IN PDEVICE_OBJECT DeviceObject, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo, IN PWDMAUD_DEVICE_EXTENSION DeviceExtension); NTSTATUS @@ -267,10 +280,11 @@ ULONG WdmAudGetWaveOutDeviceCount(); -NTSTATUS -WdmAudGetMixerPnpNameByIndex( - IN ULONG DeviceIndex, - OUT LPWSTR * Device); +ULONG +WdmAudGetMidiInDeviceCount(); + +ULONG +WdmAudGetMidiOutDeviceCount(); NTSTATUS WdmAudGetPnpNameByIndexAndType( Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sun Oct 31 14:34:41 2010 @@ -955,7 +955,7 @@ MixerInfo->hMixer = MixerData->hDevice; /* get mixer name */ - MMixerGetDeviceName(MixerContext, MixerInfo, MixerData->hDeviceInterfaceKey); + MMixerGetDeviceName(MixerContext, MixerInfo->MixCaps.szPname, MixerData->hDeviceInterfaceKey); /* initialize line list */ InitializeListHead(&MixerInfo->LineList); @@ -1128,6 +1128,9 @@ } + /* activate midi devices */ + MMixerInitializeMidiForFilter(MixerContext, MixerList, MixerData, Topology); + /* done */ return Status; } Added: trunk/reactos/lib/drivers/sound/mmixer/midi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/midi.c (added) +++ trunk/reactos/lib/drivers/sound/mmixer/midi.c [iso-8859-1] Sun Oct 31 14:34:41 2010 @@ -1,0 +1,541 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: lib/drivers/sound/mmixer/midi.c + * PURPOSE: Midi Support Functions + * PROGRAMMER: Johannes Anderwald + */ + +#include "priv.h" + +MIXER_STATUS +MMixerGetPinDataFlowAndCommunication( + IN PMIXER_CONTEXT MixerContext, + IN LPMIXER_DATA MixerData, + IN ULONG PinId, + OUT PKSPIN_DATAFLOW DataFlow, + OUT PKSPIN_COMMUNICATION Communication) +{ + KSP_PIN Pin; + ULONG BytesReturned; + MIXER_STATUS Status; + + /* setup request */ + Pin.PinId = PinId; + Pin.Reserved = 0; + Pin.Property.Flags = KSPROPERTY_TYPE_GET; + Pin.Property.Id = KSPROPERTY_PIN_DATAFLOW; + Pin.Property.Set = KSPROPSETID_Pin; + + /* get pin dataflow */ + Status = MixerContext->Control(MixerData->hDevice, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)DataFlow, sizeof(KSPIN_DATAFLOW), &BytesReturned); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to retrieve dataflow */ + return Status; + } + + /* setup communication request */ + Pin.Property.Id = KSPROPERTY_PIN_COMMUNICATION; + + /* get pin communication */ + Status = MixerContext->Control(MixerData->hDevice, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)Communication, sizeof(KSPIN_COMMUNICATION), &BytesReturned); + + return Status; +} + +MIXER_STATUS +MMixerAddMidiPin( + IN PMIXER_CONTEXT MixerContext, + IN PMIXER_LIST MixerList, + IN ULONG DeviceId, + IN ULONG PinId, + IN ULONG bInput, + IN LPWSTR DeviceName) +{ + LPMIDI_INFO MidiInfo; + + /* allocate midi info */ + MidiInfo = MixerContext->Alloc(sizeof(MIDI_INFO)); + + if (!MidiInfo) + { + /* no memory */ + return MM_STATUS_NO_MEMORY; + } + + /* initialize midi info */ + MidiInfo->DeviceId = DeviceId; + MidiInfo->PinId = PinId; + + /* sanity check */ + ASSERT(wcslen(DeviceName) + 1 < MAXPNAMELEN); + + /* copy device name */ + if (bInput && DeviceName) + { + wcscpy(MidiInfo->u.InCaps.szPname, DeviceName); + } + else if (!bInput && DeviceName) + { + wcscpy(MidiInfo->u.OutCaps.szPname, DeviceName); + } + + /* FIXME determine manufacturer / product id */ + if (bInput) + { + MidiInfo->u.InCaps.dwSupport = 0; + MidiInfo->u.InCaps.wMid = MM_MICROSOFT; + MidiInfo->u.InCaps.wPid = MM_PID_UNMAPPED; + MidiInfo->u.InCaps.vDriverVersion = 1; + } + else + { + MidiInfo->u.OutCaps.dwSupport = 0; + MidiInfo->u.OutCaps.wMid = MM_MICROSOFT; + MidiInfo->u.OutCaps.wPid = MM_PID_UNMAPPED; + MidiInfo->u.OutCaps.vDriverVersion = 1; + } + + if (bInput) + { + /* insert into list */ + InsertTailList(&MixerList->MidiInList, &MidiInfo->Entry); + MixerList->MidiInListCount++; + } + else + { + /* insert into list */ + InsertTailList(&MixerList->MidiOutList, &MidiInfo->Entry); + MixerList->MidiOutListCount++; + } + + return MM_STATUS_SUCCESS; +} + +VOID +MMixerCheckFilterPinMidiSupport( + IN PMIXER_CONTEXT MixerContext, + IN PMIXER_LIST MixerList, + IN LPMIXER_DATA MixerData, + IN ULONG PinId, + IN PKSMULTIPLE_ITEM MultipleItem, + IN LPWSTR szPname) +{ + ULONG Index; + PKSDATARANGE DataRange; + KSPIN_COMMUNICATION Communication; + KSPIN_DATAFLOW DataFlow; + MIXER_STATUS Status; + + /* get first datarange */ + DataRange = (PKSDATARANGE)(MultipleItem + 1); + + /* alignment assert */ + ASSERT(((ULONG_PTR)DataRange & 0x7) == 0); + + /* iterate through all data ranges */ + for(Index = 0; Index < MultipleItem->Count; Index++) + { + if (IsEqualGUIDAligned(&DataRange->MajorFormat, &KSDATAFORMAT_TYPE_MUSIC) && + IsEqualGUIDAligned(&DataRange->SubFormat, &KSDATAFORMAT_SUBTYPE_MIDI) && + IsEqualGUIDAligned(&DataRange->Specifier, &KSDATAFORMAT_SPECIFIER_NONE)) + { + /* pin supports midi datarange */ + if (MMixerGetPinDataFlowAndCommunication(MixerContext, MixerData, PinId, &DataFlow, &Communication) == MM_STATUS_SUCCESS) + { + if (DataFlow == KSPIN_DATAFLOW_IN && Communication == KSPIN_COMMUNICATION_SINK) + { + Status = MMixerAddMidiPin(MixerContext, MixerList, MixerData->DeviceId, PinId, FALSE, szPname); + } + else if (DataFlow == KSPIN_DATAFLOW_OUT && Communication == KSPIN_COMMUNICATION_SOURCE) + { + Status = MMixerAddMidiPin(MixerContext, MixerList, MixerData->DeviceId, PinId, TRUE, szPname); + } + } + } + + /* move to next datarange */ + DataRange = (PKSDATARANGE)((ULONG_PTR)DataRange + DataRange->FormatSize); + + /* alignment assert */ + ASSERT(((ULONG_PTR)DataRange & 0x7) == 0); + + /* data ranges are 64-bit aligned */ + DataRange = (PVOID)(((ULONG_PTR)DataRange + 0x7) & ~0x7); + } +} + +VOID +MMixerInitializeMidiForFilter( + IN PMIXER_CONTEXT MixerContext, + IN PMIXER_LIST MixerList, + IN LPMIXER_DATA MixerData, + IN PTOPOLOGY Topology) +{ + ULONG PinCount, Index; + MIXER_STATUS Status; + PKSMULTIPLE_ITEM MultipleItem; + WCHAR szPname[MAXPNAMELEN]; + + /* get filter pin count */ + MMixerGetTopologyPinCount(Topology, &PinCount); + + /* get mixer name */ + if (MMixerGetDeviceName(MixerContext, szPname, MixerData->hDeviceInterfaceKey) != MM_STATUS_SUCCESS) + { + /* clear name */ + szPname[0] = 0; + } + + /* iterate all pins and check for KSDATARANGE_MUSIC support */ + for(Index = 0; Index < PinCount; Index++) + { + /* get audio pin data ranges */ + Status = MMixerGetAudioPinDataRanges(MixerContext, MixerData->hDevice, Index, &MultipleItem); + + /* check for success */ + if (Status == MM_STATUS_SUCCESS) + { + /* check if there is support KSDATARANGE_MUSIC */ + MMixerCheckFilterPinMidiSupport(MixerContext, MixerList, MixerData, Index, MultipleItem, szPname); + } + } +} + +MIXER_STATUS +MMixerOpenMidiPin( + IN PMIXER_CONTEXT MixerContext, + IN PMIXER_LIST MixerList, + IN ULONG DeviceId, + IN ULONG PinId, + IN ACCESS_MASK DesiredAccess, + IN PIN_CREATE_CALLBACK CreateCallback, + IN PVOID Context, + OUT PHANDLE PinHandle) +{ + PKSPIN_CONNECT PinConnect; + PKSDATAFORMAT DataFormat; + LPMIXER_DATA MixerData; + NTSTATUS Status; + MIXER_STATUS MixerStatus; + + MixerData = MMixerGetDataByDeviceId(MixerList, DeviceId); + if (!MixerData) + return MM_STATUS_INVALID_PARAMETER; + + /* allocate pin connect */ + PinConnect = MMixerAllocatePinConnect(MixerContext, sizeof(KSDATAFORMAT)); + if (!PinConnect) + { + /* no memory */ + return MM_STATUS_NO_MEMORY; + } + + /* initialize pin connect struct */ + MMixerInitializePinConnect(PinConnect, PinId); + + /* get offset to dataformat */ + DataFormat = (PKSDATAFORMAT) (PinConnect + 1); + + /* initialize data format */ + RtlMoveMemory(&DataFormat->MajorFormat, &KSDATAFORMAT_TYPE_MUSIC, sizeof(GUID)); + RtlMoveMemory(&DataFormat->SubFormat, &KSDATAFORMAT_SUBTYPE_MIDI, sizeof(GUID)); + RtlMoveMemory(&DataFormat->Specifier, &KSDATAFORMAT_SPECIFIER_NONE, sizeof(GUID)); + + if (CreateCallback) + { + /* let the callback handle the creation */ + MixerStatus = CreateCallback(Context, DeviceId, PinId, MixerData->hDevice, PinConnect, DesiredAccess, PinHandle); + } + else + { + /* now create the pin */ + Status = KsCreatePin(MixerData->hDevice, PinConnect, DesiredAccess, PinHandle); + + /* normalize status */ + if (Status == STATUS_SUCCESS) + MixerStatus = MM_STATUS_SUCCESS; + else + MixerStatus = MM_STATUS_UNSUCCESSFUL; + } + + /* free create info */ + MixerContext->Free(PinConnect); + + /* done */ + return MixerStatus; +} + +MIXER_STATUS +MMixerGetMidiInfoByIndexAndType( + IN PMIXER_LIST MixerList, + IN ULONG DeviceIndex, + IN ULONG bMidiInputType, + OUT LPMIDI_INFO *OutMidiInfo) +{ + ULONG Index = 0; + PLIST_ENTRY Entry, ListHead; + LPMIDI_INFO MidiInfo; + + if (bMidiInputType) + ListHead = &MixerList->MidiInList; + else + ListHead = &MixerList->MidiOutList; + + /* get first entry */ + Entry = ListHead->Flink; + + while(Entry != ListHead) + { + MidiInfo = (LPMIDI_INFO)CONTAINING_RECORD(Entry, MIDI_INFO, Entry); + + if (Index == DeviceIndex) + { + *OutMidiInfo = MidiInfo; + return MM_STATUS_SUCCESS; + } + Index++; + Entry = Entry->Flink; + } + + return MM_STATUS_INVALID_PARAMETER; +} + +MIXER_STATUS +MMixerMidiOutCapabilities( + IN PMIXER_CONTEXT MixerContext, + IN ULONG DeviceIndex, + OUT LPMIDIOUTCAPSW Caps) +{ + PMIXER_LIST MixerList; + MIXER_STATUS Status; + LPMIDI_INFO MidiInfo; + + /* verify mixer context */ + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + /* invalid context passed */ + return Status; + } + + /* grab mixer list */ + MixerList = (PMIXER_LIST)MixerContext->MixerContext; + + /* find destination midi */ + Status = MMixerGetMidiInfoByIndexAndType(MixerList, DeviceIndex, FALSE, &MidiInfo); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to find midi info */ + return MM_STATUS_UNSUCCESSFUL; + } + + /* copy capabilities */ + MixerContext->Copy(Caps, &MidiInfo->u.OutCaps, sizeof(MIDIOUTCAPSW)); + + return MM_STATUS_SUCCESS; +} + +MIXER_STATUS +MMixerMidiInCapabilities( + IN PMIXER_CONTEXT MixerContext, + IN ULONG DeviceIndex, + OUT LPMIDIINCAPSW Caps) +{ + PMIXER_LIST MixerList; + MIXER_STATUS Status; + LPMIDI_INFO MidiInfo; + + /* verify mixer context */ + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + /* invalid context passed */ + return Status; + } + + /* grab mixer list */ + MixerList = (PMIXER_LIST)MixerContext->MixerContext; + + /* find destination midi */ + Status = MMixerGetMidiInfoByIndexAndType(MixerList, DeviceIndex, TRUE, &MidiInfo); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to find midi info */ + return MM_STATUS_UNSUCCESSFUL; + } + + /* copy capabilities */ + MixerContext->Copy(Caps, &MidiInfo->u.InCaps, sizeof(MIDIINCAPSW)); + + return MM_STATUS_SUCCESS; +} + +MIXER_STATUS +MMixerGetMidiDevicePath( + IN PMIXER_CONTEXT MixerContext, + IN ULONG bMidiIn, + IN ULONG DeviceId, + OUT LPWSTR * DevicePath) +{ + PMIXER_LIST MixerList; + LPMIXER_DATA MixerData; + LPMIDI_INFO MidiInfo; + ULONG Length; + MIXER_STATUS Status; + + /* verify mixer context */ + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + /* invalid context passed */ + return Status; + } + + /* grab mixer list */ + MixerList = (PMIXER_LIST)MixerContext->MixerContext; + + /* find destination midi */ + Status = MMixerGetMidiInfoByIndexAndType(MixerList, DeviceId, bMidiIn, &MidiInfo); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to find midi info */ + return MM_STATUS_INVALID_PARAMETER; + } + + /* get associated device id */ + MixerData = MMixerGetDataByDeviceId(MixerList, MidiInfo->DeviceId); + if (!MixerData) + return MM_STATUS_INVALID_PARAMETER; + + /* calculate length */ + Length = wcslen(MixerData->DeviceName)+1; + + /* allocate destination buffer */ + *DevicePath = MixerContext->Alloc(Length * sizeof(WCHAR)); + + if (!*DevicePath) + { + /* no memory */ + return MM_STATUS_NO_MEMORY; + } + + /* copy device path */ + MixerContext->Copy(*DevicePath, MixerData->DeviceName, Length * sizeof(WCHAR)); + + /* done */ + return MM_STATUS_SUCCESS; +} + +MIXER_STATUS +MMixerSetMidiStatus( + 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); +} + +MIXER_STATUS +MMixerOpenMidi( + IN PMIXER_CONTEXT MixerContext, + IN ULONG DeviceIndex, + IN ULONG bMidiIn, + IN PIN_CREATE_CALLBACK CreateCallback, + IN PVOID Context, + OUT PHANDLE PinHandle) +{ + PMIXER_LIST MixerList; + MIXER_STATUS Status; + LPMIDI_INFO MidiInfo; + ACCESS_MASK DesiredAccess = 0; + + /* verify mixer context */ + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + /* invalid context passed */ + return Status; + } + + /* grab mixer list */ + MixerList = (PMIXER_LIST)MixerContext->MixerContext; + + /* find destination midi */ + Status = MMixerGetMidiInfoByIndexAndType(MixerList, DeviceIndex, bMidiIn, &MidiInfo); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to find midi info */ + return MM_STATUS_INVALID_PARAMETER; + } + + /* get desired access */ + if (bMidiIn) + { + DesiredAccess |= GENERIC_READ; + } + else + { + DesiredAccess |= GENERIC_WRITE; + } + + /* now try open the pin */ + return MMixerOpenMidiPin(MixerContext, MixerList, MidiInfo->DeviceId, MidiInfo->PinId, DesiredAccess, CreateCallback, Context, PinHandle); +} + +ULONG +MMixerGetMidiInCount( + IN PMIXER_CONTEXT MixerContext) +{ + PMIXER_LIST MixerList; + MIXER_STATUS Status; + + /* verify mixer context */ + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + /* invalid context passed */ + return Status; + } + + /* grab mixer list */ + MixerList = (PMIXER_LIST)MixerContext->MixerContext; + + return MixerList->MidiInListCount; +} + +ULONG +MMixerGetMidiOutCount( + IN PMIXER_CONTEXT MixerContext) +{ + PMIXER_LIST MixerList; + MIXER_STATUS Status; + + /* verify mixer context */ + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + /* invalid context passed */ + return Status; + } + + /* grab mixer list */ + MixerList = (PMIXER_LIST)MixerContext->MixerContext; + + return MixerList->MidiOutListCount; +} Propchange: trunk/reactos/lib/drivers/sound/mmixer/midi.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] Sun Oct 31 14:34:41 2010 @@ -447,11 +447,14 @@ MixerList->MixerDataCount = 0; MixerList->WaveInListCount = 0; MixerList->WaveOutListCount = 0; + MixerList->MidiInListCount = 0; + MixerList->MidiOutListCount = 0; InitializeListHead(&MixerList->MixerList); InitializeListHead(&MixerList->MixerData); InitializeListHead(&MixerList->WaveInList); InitializeListHead(&MixerList->WaveOutList); - + InitializeListHead(&MixerList->MidiInList); + InitializeListHead(&MixerList->MidiOutList); /* store mixer list */ MixerContext->MixerContext = (PVOID)MixerList; 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] Sun Oct 31 14:34:41 2010 @@ -122,6 +122,15 @@ MMixerGetWaveOutCount( IN PMIXER_CONTEXT MixerContext); +ULONG +MMixerGetMidiInCount( + IN PMIXER_CONTEXT MixerContext); + +ULONG +MMixerGetMidiOutCount( + IN PMIXER_CONTEXT MixerContext); + + MIXER_STATUS MMixerGetCapabilities( @@ -199,3 +208,37 @@ IN ULONG bWaveIn, IN ULONG DeviceId, OUT LPWSTR * DevicePath); + +MIXER_STATUS +MMixerMidiOutCapabilities( + IN PMIXER_CONTEXT MixerContext, + IN ULONG DeviceIndex, + OUT LPMIDIOUTCAPSW Caps); + +MIXER_STATUS +MMixerMidiInCapabilities( + IN PMIXER_CONTEXT MixerContext, + IN ULONG DeviceIndex, + OUT LPMIDIINCAPSW Caps); + +MIXER_STATUS +MMixerGetMidiDevicePath( + IN PMIXER_CONTEXT MixerContext, + IN ULONG bMidiIn, + IN ULONG DeviceId, + OUT LPWSTR * DevicePath); + +MIXER_STATUS +MMixerSetMidiStatus( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE PinHandle, + IN KSSTATE State); + +MIXER_STATUS +MMixerOpenMidi( + IN PMIXER_CONTEXT MixerContext, + IN ULONG DeviceIndex, + IN ULONG bMidiIn, + IN PIN_CREATE_CALLBACK CreateCallback, + IN PVOID Context, + OUT PHANDLE PinHandle); Modified: trunk/reactos/lib/drivers/sound/mmixer/mmixer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mmixer.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mmixer.rbuild [iso-8859-1] Sun Oct 31 14:34:41 2010 @@ -5,6 +5,7 @@ <define name="NDEBUG">1</define> <file>controls.c</file> <file>filter.c</file> + <file>midi.c</file> <file>mixer.c</file> <file>sup.c</file> <file>wave.c</file> Modified: trunk/reactos/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/p… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] Sun Oct 31 14:34:41 2010 @@ -130,14 +130,36 @@ typedef struct { + LIST_ENTRY Entry; + ULONG DeviceId; + ULONG PinId; + union + { + MIDIOUTCAPSW OutCaps; + MIDIINCAPSW InCaps; + }u; + +}MIDI_INFO, *LPMIDI_INFO; + +typedef struct +{ ULONG MixerListCount; LIST_ENTRY MixerList; + ULONG MixerDataCount; LIST_ENTRY MixerData; + ULONG WaveInListCount; LIST_ENTRY WaveInList; + ULONG WaveOutListCount; LIST_ENTRY WaveOutList; + + ULONG MidiInListCount; + LIST_ENTRY MidiInList; + + ULONG MidiOutListCount; + LIST_ENTRY MidiOutList; }MIXER_LIST, *PMIXER_LIST; typedef struct @@ -197,27 +219,12 @@ IN LPMIXER_INFO MixerInfo); MIXER_STATUS -MMixerGetTargetPins( - IN PMIXER_CONTEXT MixerContext, - IN PKSMULTIPLE_ITEM NodeTypes, - IN PKSMULTIPLE_ITEM NodeConnections, - IN ULONG NodeIndex, - IN ULONG bUpDirection, - OUT PULONG Pins, - IN ULONG PinCount); - -MIXER_STATUS MMixerGetPhysicalConnection( IN PMIXER_CONTEXT MixerContext, IN HANDLE hMixer, IN ULONG PinId, OUT PKSPIN_PHYSICALCONNECTION *OutConnection); -ULONG -MMixerGetIndexOfGuid( - PKSMULTIPLE_ITEM MultipleItem, - LPCGUID NodeType); - MIXER_STATUS MMixerSetupFilter( IN PMIXER_CONTEXT MixerContext, @@ -225,24 +232,24 @@ IN LPMIXER_DATA MixerData, IN PULONG DeviceCount); -MIXER_STATUS -MMixerGetTargetPinsByNodeConnectionIndex( - IN PMIXER_CONTEXT MixerContext, - IN PKSMULTIPLE_ITEM NodeConnections, - IN PKSMULTIPLE_ITEM NodeTypes, - IN ULONG bUpDirection, - IN ULONG NodeConnectionIndex, - IN ULONG PinCount, - OUT PULONG Pins); - -MIXER_STATUS -MMixerGetControlsFromPin( - IN PMIXER_CONTEXT MixerContext, - IN PKSMULTIPLE_ITEM NodeConnections, - IN PKSMULTIPLE_ITEM NodeTypes, +PKSPIN_CONNECT +MMixerAllocatePinConnect( + IN PMIXER_CONTEXT MixerContext, + ULONG DataFormatSize); + +MIXER_STATUS +MMixerGetAudioPinDataRanges( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE hDevice, IN ULONG PinId, - IN ULONG bUpDirection, - OUT PULONG Nodes); + IN OUT PKSMULTIPLE_ITEM * OutMultipleItem); + +VOID +MMixerInitializeMidiForFilter( + IN PMIXER_CONTEXT MixerContext, + IN PMIXER_LIST MixerList, + IN LPMIXER_DATA MixerData, + IN PTOPOLOGY Topology); MIXER_STATUS MMixerVerifyContext( @@ -315,12 +322,6 @@ IN HANDLE hKey); MIXER_STATUS -MMixerGetDeviceName( - IN PMIXER_CONTEXT MixerContext, - IN LPMIXER_INFO MixerInfo, - IN HANDLE hKey); - -MIXER_STATUS MMixerInitializeWaveInfo( IN PMIXER_CONTEXT MixerContext, IN PMIXER_LIST MixerList, @@ -337,6 +338,18 @@ IN PVOID MixerEvent, IN PMIXER_EVENT MixerEventRoutine); +MIXER_STATUS +MMixerGetDeviceName( + IN PMIXER_CONTEXT MixerContext, + OUT LPWSTR DeviceName, + IN HANDLE hKey); + +VOID +MMixerInitializePinConnect( + IN OUT PKSPIN_CONNECT PinConnect, + IN ULONG PinId); + + /* topology.c */ MIXER_STATUS @@ -448,3 +461,9 @@ IN PTOPOLOGY Topology, IN ULONG NodeIndex, OUT PULONG bReserved); + +VOID +MMixerGetTopologyPinCount( + IN PTOPOLOGY Topology, + OUT PULONG PinCount); + Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Sun Oct 31 14:34:41 2010 @@ -31,6 +31,11 @@ const GUID KSPROPSETID_Topology = {0x720D4AC0L, 0x7533, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; const GUID KSEVENTSETID_AudioControlChange = {0xE85E9698L, 0xFA2F, 0x11D1, {0x95, 0xBD, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3}}; +const GUID KSDATAFORMAT_TYPE_MUSIC = {0xE725D360L, 0x62CC, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSDATAFORMAT_SUBTYPE_MIDI = {0x1D262760L, 0xE957, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSDATAFORMAT_SPECIFIER_NONE = {0x0F6417D6L, 0xC318, 0x11D0, {0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; + + MIXER_STATUS MMixerVerifyContext( IN PMIXER_CONTEXT MixerContext) @@ -444,7 +449,7 @@ MIXER_STATUS MMixerGetDeviceName( IN PMIXER_CONTEXT MixerContext, - IN LPMIXER_INFO MixerInfo, + OUT LPWSTR DeviceName, IN HANDLE hKey) { LPWSTR Name; @@ -457,10 +462,10 @@ if (Status == MM_STATUS_SUCCESS) { /* copy device name */ - MixerContext->Copy(MixerInfo->MixCaps.szPname, Name, min(wcslen(Name), MAXPNAMELEN-1) * sizeof(WCHAR)); + MixerContext->Copy(DeviceName, Name, min(wcslen(Name), MAXPNAMELEN-1) * sizeof(WCHAR)); /* make sure its null terminated */ - MixerInfo->MixCaps.szPname[MAXPNAMELEN-1] = L'\0'; + DeviceName[MAXPNAMELEN-1] = L'\0'; /* free device name */ MixerContext->Free(Name); @@ -473,14 +478,14 @@ if (Status != MM_STATUS_SUCCESS) return Status; - Status = MixerContext->QueryKeyValue(hKey, L"FriendlyName", (PVOID*)&Name, &Length, &Type); + Status = MixerContext->QueryKeyValue(hTemp, L"FriendlyName", (PVOID*)&Name, &Length, &Type); if (Status == MM_STATUS_SUCCESS) { /* copy device name */ - MixerContext->Copy(MixerInfo->MixCaps.szPname, Name, min(wcslen(Name), MAXPNAMELEN-1) * sizeof(WCHAR)); + MixerContext->Copy(DeviceName, Name, min(wcslen(Name), MAXPNAMELEN-1) * sizeof(WCHAR)); /* make sure its null terminated */ - MixerInfo->MixCaps.szPname[MAXPNAMELEN-1] = L'\0'; + DeviceName[MAXPNAMELEN-1] = L'\0'; /* free device name */ MixerContext->Free(Name); @@ -489,3 +494,21 @@ MixerContext->CloseKey(hTemp); return Status; } + +VOID +MMixerInitializePinConnect( + IN OUT PKSPIN_CONNECT PinConnect, + IN ULONG PinId) +{ + PinConnect->Interface.Set = KSINTERFACESETID_Standard; + PinConnect->Interface.Id = KSINTERFACE_STANDARD_STREAMING; + PinConnect->Interface.Flags = 0; + PinConnect->Medium.Set = KSMEDIUMSETID_Standard; + PinConnect->Medium.Id = KSMEDIUM_TYPE_ANYINSTANCE; + PinConnect->Medium.Flags = 0; + PinConnect->PinToHandle = NULL; + PinConnect->PinId = PinId; + PinConnect->Priority.PriorityClass = KSPRIORITY_NORMAL; + PinConnect->Priority.PrioritySubClass = 1; +} + Modified: trunk/reactos/lib/drivers/sound/mmixer/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/t… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/topology.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/topology.c [iso-8859-1] Sun Oct 31 14:34:41 2010 @@ -983,6 +983,15 @@ *OutNodesCount = TopologyNodesCount; } +VOID +MMixerGetTopologyPinCount( + IN PTOPOLOGY Topology, + OUT PULONG PinCount) +{ + /* store pin count */ + *PinCount = Topology->TopologyPinsCount; +} + MIXER_STATUS MMixerAllocateTopologyPinArray( IN PMIXER_CONTEXT MixerContext, 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] Sun Oct 31 14:34:41 2010 @@ -109,22 +109,7 @@ } -VOID -MMixerInitializePinConnect( - IN OUT PKSPIN_CONNECT PinConnect, - IN ULONG PinId) -{ - PinConnect->Interface.Set = KSINTERFACESETID_Standard; - PinConnect->Interface.Id = KSINTERFACE_STANDARD_STREAMING; - PinConnect->Interface.Flags = 0; - PinConnect->Medium.Set = KSMEDIUMSETID_Standard; - PinConnect->Medium.Id = KSMEDIUM_TYPE_ANYINSTANCE; - PinConnect->Medium.Flags = 0; - PinConnect->PinToHandle = NULL; - PinConnect->PinId = PinId; - PinConnect->Priority.PriorityClass = KSPRIORITY_NORMAL; - PinConnect->Priority.PrioritySubClass = 1; -} + VOID MMixerInitializeDataFormat( @@ -369,7 +354,7 @@ WaveInfo->PinId = Pins[0]; /* sanity check */ - ASSERT(wcslen(DeviceName) < MAXPNAMELEN); + ASSERT(wcslen(DeviceName) + 1 < MAXPNAMELEN); /* copy device name */ if (bWaveIn)

1 0

[tkreuzer] 49375: [FIND] MSVC compatability: Properly escape quotes in string tables ("", not \")
by tkreuzer＠svn.reactos.org 31 Oct '10

31 Oct '10

Author: tkreuzer Date: Sun Oct 31 13:38:58 2010 New Revision: 49375 URL: http://svn.reactos.org/svn/reactos?rev=49375&view=rev Log: [FIND] MSVC compatability: Properly escape quotes in string tables ("", not \") Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/bg-BG.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/ca-ES.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/cs-CZ.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/de-DE.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/el-GR.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/en-US.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/es-ES.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/fr-FR.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/it-IT.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/lt-LT.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/no-NO.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/pl-PL.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/pt-BR.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/ru-RU.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/sk-SK.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/sv-SE.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/uk-UA.rc Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/bg-BG.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -3,15 +3,15 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_USAGE, "FIND: Èçâåæäà âñè÷êè ðåäîâå âúâ ôàéëà, êîèòî ñúäúðæàò óêàçàíèÿ íèç..\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"íèç\" [ ôàéë... ]\n\ - /C Áðîè êîëêî ðåäà ñúäúðæàò íèçà\n\ - /I Ïðåíåáðåãâà ÃëÀâÍÎñÒòà\n\ - /N Áðîé ïîêàçàíè ðåäîâå, êàòî ñå çàïî÷âà îò 1\n\ - /V Èçâåæäàíå íà ðåäîâåòå, ÍÅñúäúðæàùè íèçà." +IDS_USAGE, "FIND: ÃÃ§Ã¢Ã¥Ã¦Ã¤Ã Ã¢Ã±Ã¨Ã·ÃªÃ¨ Ã°Ã¥Ã¤Ã®Ã¢Ã¥ Ã¢ÃºÃ¢ Ã´Ã Ã©Ã«Ã , ÃªÃ®Ã¨Ã²Ã® Ã±ÃºÃ¤ÃºÃ°Ã¦Ã Ã² Ã³ÃªÃ Ã§Ã ÃÃ¨Ã¿ ÃÃ¨Ã§..\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""ÃÃ¨Ã§"" [ Ã´Ã Ã©Ã«... ]\n\ + /C ÃÃ°Ã®Ã¨ ÃªÃ®Ã«ÃªÃ® Ã°Ã¥Ã¤Ã Ã±ÃºÃ¤ÃºÃ°Ã¦Ã Ã² ÃÃ¨Ã§Ã \n\ + /I ÃÃ°Ã¥ÃÃ¥Ã¡Ã°Ã¥Ã£Ã¢Ã ÃÃ«ÃÃ¢ÃÃÃ±ÃÃ²Ã \n\ + /N ÃÃ°Ã®Ã© Ã¯Ã®ÃªÃ Ã§Ã ÃÃ¨ Ã°Ã¥Ã¤Ã®Ã¢Ã¥, ÃªÃ Ã²Ã® Ã±Ã¥ Ã§Ã Ã¯Ã®Ã·Ã¢Ã Ã®Ã² 1\n\ + /V ÃÃ§Ã¢Ã¥Ã¦Ã¤Ã ÃÃ¥ ÃÃ Ã°Ã¥Ã¤Ã®Ã¢Ã¥Ã²Ã¥, ÃÃÃ±ÃºÃ¤ÃºÃ°Ã¦Ã Ã¹Ã¨ ÃÃ¨Ã§Ã ." -IDS_NO_SUCH_FILE, "FIND: %s: Íÿìà òàêúâ ôàéë\n" +IDS_NO_SUCH_FILE, "FIND: %s: ÃÃ¿Ã¬Ã Ã²Ã ÃªÃºÃ¢ Ã´Ã Ã©Ã«\n" -IDS_CANNOT_OPEN, "FIND: %s: Îòâàðÿíåòî íà ôàéëà å íåâúçìîæíî\n" +IDS_CANNOT_OPEN, "FIND: %s: ÃÃ²Ã¢Ã Ã°Ã¿ÃÃ¥Ã²Ã® ÃÃ Ã´Ã Ã©Ã«Ã Ã¥ ÃÃ¥Ã¢ÃºÃ§Ã¬Ã®Ã¦ÃÃ®\n" END Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/ca-ES.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/ca-ES.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Mostra totes les linies que continguin una determinada cadena de caràcters.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"Cadena de caràcters\" [ file... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""Cadena de caràcters"" [ file... ]\n\ /C Conta el numero de linies que contenen la cadena de caràcters\n\ /I Ignora majúscules i minúscules\n\ /N Numero de linies mostrades, començant per la primera\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/cs-CZ.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -10,7 +10,7 @@ BEGIN IDS_USAGE, "FIND: Zobrazí vechny øádky souboru obsahující hledaný øetìzec.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"øetìzec\" [ soubor... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""øetìzec"" [ soubor... ]\n\ /C Zobrazí poèet øádkù obsahující øetìzec.\n\ /I Ignoruje velikost písmen.\n\ /N Èísluje zobrazené øádky, zaèíná od 1.\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/de-DE.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/de-DE.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "Sucht in einer Datei nach einer Zeichenfolge.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"string\" [ file... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""string"" [ file... ]\n\ /C Zeigt nur die Anzahl der die Zeichenfolge enthaltenen Zeilen an.\n\ /I Ignoriert Groß-/Kleinbuchstaben bei der Suche.\n\ /N Zeigt die Zeilen mit ihren Zeilennummern an.\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/el-GR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/el-GR.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Åêôõðþíåé üëåò ôéò ãñáììÝò åíüò áñ÷åßïõ ðïõ ðåñéÝ÷ïõí Ýíá áëöáñéèìçôéêü.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"áëöáñéèìçôéêü\" [ áñ÷åßï... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""áëöáñéèìçôéêü"" [ áñ÷åßï... ]\n\ /C ÌÝôñçóç ãñáììþí ðïõ ðåñéÝ÷ïõí ôï áëöáñéèìçôéêü\n\ /I Áãíüçóç êåöáëáßùí\n\ /N ÅìöÜíéóç áñéèìþí óôéò åìöáíéæüìåíåò ãñáììÝò, îåêéíþíôáò áðü ôï 1\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/en-US.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/en-US.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Prints all lines of a file that contain a string.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"string\" [ file... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""string"" [ file... ]\n\ /C Count the number of lines that contain string\n\ /I Ignore case\n\ /N Number the displayed lines, starting at 1\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/es-ES.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/es-ES.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Imprime todas las líneas de un fichero que contiene una cadena.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"cadena\" [ fichero... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""cadena"" [ fichero... ]\n\ /C Cuenta el número de líneas que contienen la cadena de caracteres\n\ /I Ignora mayúsculas y minúsculas\n\ /N Numero de líneas a mostrar en pantalla, a partir de la primera\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/fr-FR.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Affiche toutes les lignes d'un fichier qui contiennent un morceau de texte.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"texte\" [ fichier... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""texte"" [ fichier... ]\n\ /C Compte le nombre de lignes qui contiennent le texte\n\ /I Insensible à la casse\n\ /N Numérote les lignes affichées en commençant à 1\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/it-IT.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/it-IT.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Visualizza le linee di un file che contengono un stringa.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"stringa\" [ file... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""stringa"" [ file... ]\n\ /C Conta il numero di linee che contengono la stringa\n\ /I Ignora maiuscole/minuscole\n\ /N Numera le linee visualizzate a partire da 1\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/lt-LT.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/lt-LT.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -13,7 +13,7 @@ BEGIN IDS_USAGE, "FIND: Spausdina visas bylos eilutes, kuriose yra ieðkomas tekstas.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"tekstas\" [ byla... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""tekstas"" [ byla... ]\n\ /C Skaièiuoti eilutes, kuriose yra ieðkomas tekstas\n\ /I Ignoruoti raidþiø dydá\n\ /N Numeruoti vaizduojamas eilutes, pradedant nuo 1\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/no-NO.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/no-NO.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FINN: Skriv alle linjene for filen som inneholder en streng.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"streng\" [ fil... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""streng"" [ fil... ]\n\ /C Teller nummer av linjer som inneholder strenger\n\ /I Ignorere sak\n\ /N Nummer viste linjer, start med 1\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/pl-PL.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -11,7 +11,7 @@ BEGIN IDS_USAGE, "FIND: Wywietla wszystkie linie danego pliku, zawieraj¹ce szukany ci¹g znaków.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"ci¹g znaków\" [ plik... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""ci¹g znaków"" [ plik... ]\n\ /C Oblicza w ilu liniach pojawi³ siê szukany ci¹g znaków\n\ /I Ignoruje wielkoæ liter\n\ /N Numeruje wywietlane linie, zaczynaj¹c od 1\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/pt-BR.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Localiza uma seqüência de texto em um ou mais arquivos.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"seqüência\" [ arquivo... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""seqüência"" [ arquivo... ]\n\ /C Exibe apenas o número de linhas que contêm a seqüência.\n\ /I Ignora maiúsculas/minúsculas ao localizar uma seqüência.\n\ /N Exibe o número de cada linha, iniciando no 1.\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/ru-RU.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Ïîèñê òåêñòîâîé ñòðîêè â îäíîì èëè íåñêîëüêèõ ôàéëàõ.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"ñòðîêà\" [ ôàéë... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""ñòðîêà"" [ ôàéë... ]\n\ /C Âûâîä òîëüêî îáùåãî ÷èñëà ñòðîê, ñîäåðæàùèõ çàäàííóþ ñòðîêó.\n\ /I Ïîèñê áåç ó÷åòà ðåãèñòðà ñèìâîëîâ.\n\ /N Âûâîä íîìåðîâ îòîáðàæàåìûõ ñòðîê (íà÷èíàÿ ñ 1).\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/sk-SK.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -8,7 +8,7 @@ BEGIN IDS_USAGE, "FIND: Zobraz¡ vçetky riadky s£boru obsahuj£ce hadanì reazec.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"reazec\" [ s£bor... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""reazec"" [ s£bor... ]\n\ /C Zobraz¡ poet riadkov, ktor obsahuj£ reazec.\n\ /I Ignoruje vekos p¡smen.\n\ /N ¬¡sluje zobrazen riadky, za¡na od 1.\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/sv-SE.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -4,7 +4,7 @@ BEGIN IDS_USAGE, "FIND: Skriver ut alla rader i en fil som innehåller en sträng.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"sträng\" [ fil... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""sträng"" [ fil... ]\n\ /C Räkna nummren av linjer som innehåller en strängen\n\ /I Ignorera skiftläge\n\ /N Antal visade rader, börjar på 1\n\ Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/lang/uk-UA.rc [iso-8859-1] Sun Oct 31 13:38:58 2010 @@ -12,7 +12,7 @@ BEGIN IDS_USAGE, "FIND: Âèâåäåííÿ âñ³õ ðÿäê³â ôàéëó, ÿê³ ì³ñòÿòü ðÿäîê.\n\n\ - FIND [ /C ] [ /I ] [ /N ] [ /V ] \"ðÿäîê\" [ ôàéë... ]\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] ""ðÿäîê"" [ ôàéë... ]\n\ /C Ïîðàõóâàòè ê³ëüê³ñòü ðÿäê³â, ÿê³ ì³ñòÿòü ðÿäîê\n\ /I Íå âðàõîâóâàòè ðåã³ñòð ñèìâîë³â\n\ /N Íóìåðóâàòè ðÿäêè, ÿê³ â³äîáðàæàþòüñÿ (ïî÷èíàþ÷è ç 1)\n\

1 0

[janderwald] 49374: [MMEBUDDY] - Getting device capabilities requires the unicode version of the structure - Implement MIDM_OPEN, MIDM_CLOSE, MIDM_START, MIDM_STOP - Implement MODM_OPEN, MODM_CLOSE...
by janderwald＠svn.reactos.org 31 Oct '10

31 Oct '10

Author: janderwald Date: Sun Oct 31 13:20:11 2010 New Revision: 49374 URL: http://svn.reactos.org/svn/reactos?rev=49374&view=rev Log: [MMEBUDDY] - Getting device capabilities requires the unicode version of the structure - Implement MIDM_OPEN, MIDM_CLOSE, MIDM_START, MIDM_STOP - Implement MODM_OPEN, MODM_CLOSE - Refactor MmeOpenWaveDevice into MmeOpenDevice add add support MIXER_DEVICE_TYPE, MIDI_IN_DEVICE_TYPE, MIDI_OUT_DEVICE_TYPE - Refactor MmeCloseWaveDeivce into MmeCloseDevice and add support MIXER_DEVICE_TYPE, MIDI_IN_DEVICE_TYPE, MIDI_OUT_DEVICE_TYPE Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound… ============================================================================== --- trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sun Oct 31 13:20:11 2010 @@ -68,7 +68,7 @@ SND_TRACE(L"-- Current wave header list --\n"); \ while ( CurrDumpHdr ) \ { \ - SND_TRACE(L"%x | %d bytes | flags: %x\n", CurrDumpHdr->lpData, \ + SND_TRACE(L"%x | %d bytes | flags: %x\n", CurrDumpHdr, \ CurrDumpHdr->dwBufferLength, \ CurrDumpHdr->dwFlags); \ CurrDumpHdr = CurrDumpHdr->lpNext; \ @@ -364,6 +364,8 @@ WAVEFORMATEX WaveFormatEx; HANDLE hNotifyEvent; HANDLE hStopEvent; + HANDLE hResetEvent; + BOOL ResetInProgress; } SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE; /* This lives in WAVEHDR.reserved */ @@ -411,7 +413,7 @@ IN DWORD CapabilitiesSize); MMRESULT -MmeOpenWaveDevice( +MmeOpenDevice( IN MMDEVICE_TYPE DeviceType, IN UINT DeviceId, IN LPWAVEOPENDESC OpenParameters, Modified: trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] Sun Oct 31 13:20:11 2010 @@ -62,32 +62,32 @@ { case WAVE_OUT_DEVICE_TYPE : { - GoodSize = CapabilitiesSize >= sizeof(WAVEOUTCAPS); + GoodSize = CapabilitiesSize >= sizeof(WAVEOUTCAPSW); break; } case WAVE_IN_DEVICE_TYPE : { - GoodSize = CapabilitiesSize >= sizeof(WAVEINCAPS); + GoodSize = CapabilitiesSize >= sizeof(WAVEINCAPSW); break; } case MIDI_OUT_DEVICE_TYPE : { - GoodSize = CapabilitiesSize >= sizeof(MIDIOUTCAPS); + GoodSize = CapabilitiesSize >= sizeof(MIDIOUTCAPSW); break; } case MIDI_IN_DEVICE_TYPE : { - GoodSize = CapabilitiesSize >= sizeof(MIDIINCAPS); + GoodSize = CapabilitiesSize >= sizeof(MIDIINCAPSW); break; } case AUX_DEVICE_TYPE : { - GoodSize = CapabilitiesSize >= sizeof(AUXCAPS); + GoodSize = CapabilitiesSize >= sizeof(AUXCAPSW); break; } case MIXER_DEVICE_TYPE : { - GoodSize = CapabilitiesSize >= sizeof(MIXERCAPS); + GoodSize = CapabilitiesSize >= sizeof(MIXERCAPSW); break; } }; Modified: trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] Sun Oct 31 13:20:11 2010 @@ -65,6 +65,33 @@ break; } + case MIDM_OPEN : + { + Result = MmeOpenDevice(MIDI_IN_DEVICE_TYPE, + DeviceId, + (LPWAVEOPENDESC) Parameter1, + Parameter2, + (DWORD_PTR*) PrivateHandle); + break; + } + + case MIDM_CLOSE : + { + Result = MmeCloseDevice(PrivateHandle); + break; + } + + case MIDM_START : + { + Result = MmeSetState(PrivateHandle, TRUE); + break; + } + + case MIDM_STOP : + { + Result = MmeSetState(PrivateHandle, FALSE); + break; + } } SND_TRACE(L"midMessage returning MMRESULT %d\n", Result); Modified: trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] Sun Oct 31 13:20:11 2010 @@ -64,6 +64,24 @@ Result = MmeGetDeviceInterfaceString(MIDI_OUT_DEVICE_TYPE, DeviceId, (LPWSTR)Parameter1, Parameter2, NULL); //FIXME DWORD_PTR break; } + + case MODM_OPEN : + { + Result = MmeOpenDevice(MIDI_OUT_DEVICE_TYPE, + DeviceId, + (LPWAVEOPENDESC) Parameter1, /* unused */ + Parameter2, + (DWORD_PTR*)PrivateHandle); + break; + } + + case MODM_CLOSE : + { + Result = MmeCloseDevice(PrivateHandle); + + break; + } + } SND_TRACE(L"modMessage returning MMRESULT %d\n", Result); Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Sun Oct 31 13:20:11 2010 @@ -52,99 +52,6 @@ } -MMRESULT -MmeCloseMixerDevice( - IN DWORD_PTR PrivateHandle) -{ - MMRESULT Result; - PSOUND_DEVICE_INSTANCE SoundDeviceInstance; - PSOUND_DEVICE SoundDevice; - - SND_TRACE(L"Closing mixer device \n"); - - VALIDATE_MMSYS_PARAMETER( PrivateHandle ); - SoundDeviceInstance = (PSOUND_DEVICE_INSTANCE) PrivateHandle; - - if ( ! IsValidSoundDeviceInstance(SoundDeviceInstance) ) - return MMSYSERR_INVALHANDLE; - - Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); - if ( ! MMSUCCESS(Result) ) - return TranslateInternalMmResult(Result); - - - Result = DestroySoundDeviceInstance(SoundDeviceInstance); - - return Result; -} - -MMRESULT -MmeOpenMixerDevice( - IN MMDEVICE_TYPE DeviceType, - IN DWORD DeviceId, - IN LPMIXEROPENDESC OpenParameters, - IN DWORD Flags, - OUT DWORD* PrivateHandle) -{ - MMRESULT Result; - PMMFUNCTION_TABLE FunctionTable; - PSOUND_DEVICE SoundDevice; - PSOUND_DEVICE_INSTANCE SoundDeviceInstance; - - SND_TRACE(L"Opening mixer device"); - - VALIDATE_MMSYS_PARAMETER( OpenParameters ); - - Result = GetSoundDevice(DeviceType, DeviceId, &SoundDevice); - if ( ! MMSUCCESS(Result) ) - return TranslateInternalMmResult(Result); - - /* Check that winmm gave us a private handle to fill */ - VALIDATE_MMSYS_PARAMETER( PrivateHandle ); - - /* Create a sound device instance and open the sound device */ - Result = CreateSoundDeviceInstance(SoundDevice, &SoundDeviceInstance); - if ( ! MMSUCCESS(Result) ) - return TranslateInternalMmResult(Result); - - Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); - if ( ! MMSUCCESS(Result) ) - return TranslateInternalMmResult(Result); - - if ( ! FunctionTable->SetWaveFormat ) - return MMSYSERR_NOTSUPPORTED; - - Result = FunctionTable->SetWaveFormat(SoundDeviceInstance, DeviceId, NULL, 0); - if ( ! MMSUCCESS(Result) ) - { - /* TODO: Destroy sound instance */ - return TranslateInternalMmResult(Result); - } - - /* Store the device instance pointer in the private handle - is DWORD safe here? */ - *PrivateHandle = (DWORD_PTR) SoundDeviceInstance; - - /* Store the additional information we were given - FIXME: Need flags! */ - SetSoundDeviceInstanceMmeData(SoundDeviceInstance, - (HDRVR)OpenParameters->hmx, - OpenParameters->dwCallback, - OpenParameters->dwInstance, - Flags); - - /* Let the application know the device is open */ - ReleaseEntrypointMutex(DeviceType); -#if 0 - NotifyMmeClient(SoundDeviceInstance, - DeviceType == WAVE_OUT_DEVICE_TYPE ? WOM_OPEN : WIM_OPEN, - 0); -#endif - AcquireEntrypointMutex(DeviceType); - - SND_TRACE(L"Mixer device now open\n"); - - return MMSYSERR_NOERROR; -} - /* Standard MME driver entry-point for messages relating to mixers. */ @@ -188,18 +95,18 @@ case MXDM_OPEN : { - Result = MmeOpenMixerDevice(MIXER_DEVICE_TYPE, - DeviceId, - (LPMIXEROPENDESC) Parameter1, - Parameter2, - (DWORD*) PrivateHandle); + Result = MmeOpenDevice(MIXER_DEVICE_TYPE, + DeviceId, + (LPWAVEOPENDESC) Parameter1, /* unused */ + Parameter2, + (DWORD*) PrivateHandle); break; } case MXDM_CLOSE : { - Result = MmeCloseMixerDevice(PrivateHandle); + Result = MmeCloseDevice(PrivateHandle); break; } Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] Sun Oct 31 13:20:11 2010 @@ -119,7 +119,7 @@ } MMRESULT -MmeOpenWaveDevice( +MmeOpenDevice( IN MMDEVICE_TYPE DeviceType, IN UINT DeviceId, IN LPWAVEOPENDESC OpenParameters, @@ -127,33 +127,36 @@ OUT DWORD_PTR* PrivateHandle) { MMRESULT Result; - + UINT Message; PSOUND_DEVICE SoundDevice; PSOUND_DEVICE_INSTANCE SoundDeviceInstance; LPWAVEFORMATEX Format; - SND_TRACE(L"Opening wave device (WIDM_OPEN / WODM_OPEN)"); + SND_TRACE(L"Opening device"); VALIDATE_MMSYS_PARAMETER( IS_WAVE_DEVICE_TYPE(DeviceType) ); /* FIXME? wave in too? */ VALIDATE_MMSYS_PARAMETER( OpenParameters ); - Format = OpenParameters->lpFormat; - Result = GetSoundDevice(DeviceType, DeviceId, &SoundDevice); if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); - /* Does this device support the format? */ - Result = QueryWaveDeviceFormatSupport(SoundDevice, Format, sizeof(WAVEFORMATEX)); - if ( ! MMSUCCESS(Result) ) - { - SND_ERR(L"Format not supported\n"); - return TranslateInternalMmResult(Result); - } - - /* If the caller just wanted to know if a format is supported, end here */ - if ( Flags & WAVE_FORMAT_QUERY ) - return MMSYSERR_NOERROR; + if (DeviceType == WAVE_IN_DEVICE_TYPE || DeviceType == WAVE_OUT_DEVICE_TYPE) + { + Format = OpenParameters->lpFormat; + + /* Does this device support the format? */ + Result = QueryWaveDeviceFormatSupport(SoundDevice, Format, sizeof(WAVEFORMATEX)); + if ( ! MMSUCCESS(Result) ) + { + SND_ERR(L"Format not supported\n"); + return TranslateInternalMmResult(Result); + } + + /* If the caller just wanted to know if a format is supported, end here */ + if ( Flags & WAVE_FORMAT_QUERY ) + return MMSYSERR_NOERROR; + } /* Check that winmm gave us a private handle to fill */ VALIDATE_MMSYS_PARAMETER( PrivateHandle ); @@ -175,20 +178,35 @@ /* Store the additional information we were given - FIXME: Need flags! */ SetSoundDeviceInstanceMmeData(SoundDeviceInstance, - (HDRVR)OpenParameters->hWave, + (HDRVR)OpenParameters->hWave, /* works because LPMIXEROPENDESC/etc has also the handle as first member */ OpenParameters->dwCallback, OpenParameters->dwInstance, Flags); - /* Let the application know the device is open */ - ReleaseEntrypointMutex(DeviceType); - NotifyMmeClient(SoundDeviceInstance, - DeviceType == WAVE_OUT_DEVICE_TYPE ? WOM_OPEN : WIM_OPEN, - 0); - - AcquireEntrypointMutex(DeviceType); - - SND_TRACE(L"Wave device now open\n"); + if (DeviceType == WAVE_OUT_DEVICE_TYPE || DeviceType == WAVE_IN_DEVICE_TYPE || + DeviceType == MIDI_OUT_DEVICE_TYPE || DeviceType == MIDI_IN_DEVICE_TYPE) + { + /* Let the application know the device is open */ + + if (DeviceType == WAVE_OUT_DEVICE_TYPE) + Message = WOM_OPEN; + else if (DeviceType == WAVE_IN_DEVICE_TYPE) + Message = WIM_OPEN; + else if (DeviceType == MIDI_IN_DEVICE_TYPE) + Message = MIM_OPEN; + else + Message = MOM_OPEN; + + ReleaseEntrypointMutex(DeviceType); + + NotifyMmeClient(SoundDeviceInstance, + Message, + 0); + + AcquireEntrypointMutex(DeviceType); + } + + SND_TRACE(L"device now open\n"); return MMSYSERR_NOERROR; } @@ -201,6 +219,7 @@ PSOUND_DEVICE_INSTANCE SoundDeviceInstance; PSOUND_DEVICE SoundDevice; MMDEVICE_TYPE DeviceType; + UINT Message = 0; SND_TRACE(L"Closing wave device (WIDM_CLOSE / WODM_CLOSE)\n"); @@ -221,12 +240,26 @@ /* TODO: Check device is stopped! */ - ReleaseEntrypointMutex(DeviceType); - /* TODO: Work with MIDI devices too */ - NotifyMmeClient(SoundDeviceInstance, - DeviceType == WAVE_OUT_DEVICE_TYPE ? WOM_CLOSE : WIM_CLOSE, - 0); - AcquireEntrypointMutex(DeviceType); + + if (DeviceType != MIXER_DEVICE_TYPE) + { + ReleaseEntrypointMutex(DeviceType); + + if (DeviceType == WAVE_OUT_DEVICE_TYPE) + Message = WOM_CLOSE; + else if (DeviceType == WAVE_IN_DEVICE_TYPE) + Message = WIM_CLOSE; + else if (DeviceType == MIDI_IN_DEVICE_TYPE) + Message = MIM_CLOSE; + else if (DeviceType == MIDI_OUT_DEVICE_TYPE) + Message = MOM_CLOSE; + + /* TODO: Work with MIDI devices too */ + NotifyMmeClient(SoundDeviceInstance, + Message, + 0); + AcquireEntrypointMutex(DeviceType); + } Result = DestroySoundDeviceInstance(SoundDeviceInstance); Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Sun Oct 31 13:20:11 2010 @@ -68,7 +68,7 @@ } case WIDM_OPEN : { - Result = MmeOpenWaveDevice(WAVE_IN_DEVICE_TYPE, + Result = MmeOpenDevice(WAVE_IN_DEVICE_TYPE, DeviceId, (LPWAVEOPENDESC) Parameter1, Parameter2, Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sun Oct 31 13:20:11 2010 @@ -65,11 +65,11 @@ case WODM_OPEN : { - Result = MmeOpenWaveDevice(WAVE_OUT_DEVICE_TYPE, - DeviceId, - (LPWAVEOPENDESC) Parameter1, - Parameter2, - (DWORD_PTR*)PrivateHandle); + Result = MmeOpenDevice(WAVE_OUT_DEVICE_TYPE, + DeviceId, + (LPWAVEOPENDESC) Parameter1, + Parameter2, + (DWORD_PTR*)PrivateHandle); break; }

1 0

[jgardou] 49373: revert 49345 as requested by ros arm team.
by jgardou＠svn.reactos.org 31 Oct '10

31 Oct '10

Author: jgardou Date: Sun Oct 31 10:42:40 2010 New Revision: 49373 URL: http://svn.reactos.org/svn/reactos?rev=49373&view=rev Log: revert 49345 as requested by ros arm team. Modified: branches/cmake-bringup/drivers/storage/classpnp/autorun.c branches/cmake-bringup/drivers/storage/classpnp/class.c branches/cmake-bringup/drivers/storage/classpnp/classp.h branches/cmake-bringup/drivers/storage/classpnp/classwmi.c branches/cmake-bringup/drivers/storage/classpnp/lock.c branches/cmake-bringup/drivers/storage/classpnp/obsolete.c branches/cmake-bringup/drivers/storage/classpnp/power.c branches/cmake-bringup/drivers/storage/classpnp/utils.c Modified: branches/cmake-bringup/drivers/storage/classpnp/autorun.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/autorun.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/autorun.c [iso-8859-1] Sun Oct 31 10:42:40 2010 @@ -148,14 +148,14 @@ // ejection request occured, we could see if any locks for the media // existed. if locked, broadcast. if not, we send the eject irp. // - + // // for now, just always broadcast. make this a public routine, // so class drivers can add special hacks to broadcast this for their // non-MMC-compliant devices also from sense codes. // - DBGTRACE(ClassDebugTrace, ("ClassSendEjectionNotification: media EJECT_REQUEST")); + DBGTRACE(ClassDebugTrace, ("ClassSendEjectionNotification: media EJECT_REQUEST")); ClasspSendNotification(FdoExtension, &GUID_IO_MEDIA_EJECT_REQUEST, 0, @@ -174,7 +174,7 @@ { PTARGET_DEVICE_CUSTOM_NOTIFICATION notification; ULONG requiredSize; - + requiredSize = (sizeof(TARGET_DEVICE_CUSTOM_NOTIFICATION) - sizeof(UCHAR)) + ExtraDataSize; @@ -186,11 +186,11 @@ requiredSize)); return; } - + notification = ExAllocatePoolWithTag(NonPagedPool, requiredSize, 'oNcS'); - + // // if none allocated, exit // @@ -202,7 +202,7 @@ // // Prepare and send the request! // - + RtlZeroMemory(notification, requiredSize); notification->Version = 1; notification->Size = (USHORT)(requiredSize); @@ -214,7 +214,7 @@ IoReportTargetDeviceChangeAsynchronous(FdoExtension->LowerPdo, notification, NULL, NULL); - + ExFreePool(notification); notification = NULL; return; @@ -236,7 +236,7 @@ Arguments: FdoExtension - the device - + DataBuffer - the resulting data from a GESN event. requires at least EIGHT valid bytes (header == 4, data == 4) @@ -245,14 +245,14 @@ event was of the DEVICE BUSY class, else true. Return Value: - + None - + Notes: DataBuffer must be at least four bytes of valid data (header == 4 bytes), and have at least eight bytes of allocated memory (all events == 4 bytes). - + The call to StartNextPacket may occur before this routine is completed. the operational change notifications are informational in nature, and while useful, are not neccessary to ensure proper operation. For example, @@ -261,12 +261,12 @@ IOCTL_IS_DISK_WRITABLE may be called and get an incorrect response. If a device supports software write protect, it is expected that the application can handle such a case. - + NOTE: perhaps setting the updaterequired byte to one should be done here. if so, it relies upon the setting of a 32-byte value to be an atomic operation. unfortunately, there is no simple way to notify a class driver which wants to know that the device behavior requires updating. - + Not ready events may be sent every second. For example, if we were to minimize the number of asynchronous notifications, an application may register just after a large busy time was reported. This would then @@ -339,7 +339,7 @@ lowestSetBit ^= (info->Gesn.EventMask); if (thisEventBit != lowestSetBit) { - + // // HACKHACK - REF #0001 // the first time we ever see an event set that is not the lowest @@ -352,11 +352,11 @@ "Classpnp => GESN::NONE: Compliant drive found, " "removing GESN hack (%x, %x)\n", thisEventBit, info->Gesn.EventMask)); - + info->Gesn.HackEventMask = FALSE; } else if (thisEvent == 0) { - + // // HACKHACK - REF #0001 // note: this hack prevents poorly implemented firmware from constantly @@ -409,13 +409,13 @@ &GUID_IO_GENERIC_GESN_EVENT, sizeof(NOTIFICATION_EVENT_STATUS_HEADER) + dataLength, Header) -*/ +*/ switch (Header->NotificationClass) { case NOTIFICATION_EXTERNAL_REQUEST_CLASS_EVENTS: { // 0x3 - - PNOTIFICATION_EXTERNAL_STATUS externalInfo = + + PNOTIFICATION_EXTERNAL_STATUS externalInfo = (PNOTIFICATION_EXTERNAL_STATUS)(Header->ClassEventData); DEVICE_EVENT_EXTERNAL_REQUEST externalData; @@ -424,12 +424,12 @@ // about keys being pressed, and not released. this makes keys // single-function, but simplifies the code significantly. // - + if (externalInfo->ExternalEvent != NOTIFICATION_EXTERNAL_EVENT_BUTTON_DOWN) { break; } - + *ResendImmediately = TRUE; KdPrintEx((DPFLTR_CLASSPNP_ID, ClassDebugMCN, "Classpnp => GESN::EXTERNAL: Event: %x Status %x Req %x\n", @@ -447,28 +447,28 @@ KeQuerySystemTime(&(externalData.SystemTime)); externalData.SystemTime.QuadPart *= (LONGLONG)KeQueryTimeIncrement(); - DBGTRACE(ClassDebugTrace, ("ClasspInterpretGesnData: media DEVICE_EXTERNAL_REQUEST")); + DBGTRACE(ClassDebugTrace, ("ClasspInterpretGesnData: media DEVICE_EXTERNAL_REQUEST")); ClasspSendNotification(FdoExtension, &GUID_IO_DEVICE_EXTERNAL_REQUEST, sizeof(DEVICE_EVENT_EXTERNAL_REQUEST), &externalData); return; } - + case NOTIFICATION_MEDIA_STATUS_CLASS_EVENTS: { // 0x4 - + PNOTIFICATION_MEDIA_STATUS mediaInfo = (PNOTIFICATION_MEDIA_STATUS)(Header->ClassEventData); - + if (mediaInfo->MediaEvent == NOTIFICATION_MEDIA_EVENT_NO_CHANGE) { break; } - + *ResendImmediately = TRUE; KdPrintEx((DPFLTR_CLASSPNP_ID, ClassDebugMCN, "Classpnp => GESN::MEDIA: Event: %x Status %x\n", mediaInfo->MediaEvent, mediaInfo->MediaStatus)); - + if ((mediaInfo->MediaEvent == NOTIFICATION_MEDIA_EVENT_NEW_MEDIA) || (mediaInfo->MediaEvent == NOTIFICATION_MEDIA_EVENT_MEDIA_CHANGE)) { @@ -489,29 +489,29 @@ TRUE); } else if (mediaInfo->MediaEvent == NOTIFICATION_MEDIA_EVENT_MEDIA_REMOVAL) { - + ClasspSetMediaChangeStateEx(FdoExtension, MediaNotPresent, FALSE, TRUE); - + } else if (mediaInfo->MediaEvent == NOTIFICATION_MEDIA_EVENT_EJECT_REQUEST) { KdPrintEx((DPFLTR_CLASSPNP_ID, ClassDebugError, "Classpnp => GESN Ejection request received!\n")); ClassSendEjectionNotification(FdoExtension); - + } break; } - + case NOTIFICATION_DEVICE_BUSY_CLASS_EVENTS: { // lowest priority events... - + PNOTIFICATION_BUSY_STATUS busyInfo = (PNOTIFICATION_BUSY_STATUS)(Header->ClassEventData); DEVICE_EVENT_BECOMING_READY busyData; - + // // NOTE: we never actually need to immediately retry for these // events: if one exists, the device is busy, and if not, @@ -521,7 +521,7 @@ if (busyInfo->DeviceBusyStatus == NOTIFICATION_BUSY_STATUS_NO_EVENT) { break; } - + // // else we want to report the approximated time till it's ready. // @@ -531,28 +531,28 @@ busyData.Reason = busyInfo->DeviceBusyStatus; busyData.Estimated100msToReady = (busyInfo->Time[0] << 8) | (busyInfo->Time[1] & 0xff); - + KdPrintEx((DPFLTR_CLASSPNP_ID, ClassDebugMCN, "Classpnp => GESN::BUSY: Event: %x Status %x Time %x\n", busyInfo->DeviceBusyEvent, busyInfo->DeviceBusyStatus, busyData.Estimated100msToReady )); - DBGTRACE(ClassDebugTrace, ("ClasspInterpretGesnData: media BECOMING_READY")); + DBGTRACE(ClassDebugTrace, ("ClasspInterpretGesnData: media BECOMING_READY")); ClasspSendNotification(FdoExtension, &GUID_IO_DEVICE_BECOMING_READY, sizeof(DEVICE_EVENT_BECOMING_READY), &busyData); break; } - + default: { - + break; } - - } // end switch on notification class + + } // end switch on notification class return; } @@ -577,7 +577,7 @@ MediaPresent - indicates whether the device has media inserted into it (TRUE) or not (FALSE). - + Return Value: none @@ -656,7 +656,7 @@ sizeof(ULONG), &data); - } + } else if (NewState == MediaNotPresent) { DBGTRACE(ClassDebugTrace, ("ClasspInternalSetMediaChangeState: media REMOVAL")); @@ -673,7 +673,7 @@ return; } - + return; } // end ClasspInternalSetMediaChangeState() @@ -769,10 +769,7 @@ return; } // end ClassSetMediaChangeStateEx() - -SCSIPORTAPI VOID -NTAPI ClassSetMediaChangeState( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN MEDIA_CHANGE_DETECTION_STATE NewState, @@ -836,11 +833,11 @@ /* * HACK for IoMega 2GB Jaz drive: - * This drive spins down on its own to preserve the media. + * This drive spins down on its own to preserve the media. * When spun down, TUR fails with 2/4/0 (SCSI_SENSE_NOT_READY/SCSI_ADSENSE_LUN_NOT_READY/?). * ClassInterpretSenseInfo would then call ClassSendStartUnit to spin the media up, which defeats the * purpose of the spindown. - * So in this case, make this into a successful TUR. + * So in this case, make this into a successful TUR. * This allows the drive to stay spun down until it is actually accessed again. * (If the media were actually removed, TUR would fail with 2/3a/0 ). * This hack only applies to drives with the CAUSE_NOT_REPORTABLE_HACK bit set; this @@ -849,15 +846,15 @@ if ((SRB_STATUS(Srb->SrbStatus) != SRB_STATUS_SUCCESS) && TEST_FLAG(fdoExtension->ScanForSpecialFlags, CLASS_SPECIAL_CAUSE_NOT_REPORTABLE_HACK) && (Srb->SenseInfoBufferLength >= RTL_SIZEOF_THROUGH_FIELD(SENSE_DATA, AdditionalSenseCode))){ - + PSENSE_DATA senseData = Srb->SenseInfoBuffer; - - if ((senseData->SenseKey == SCSI_SENSE_NOT_READY) && + + if ((senseData->SenseKey == SCSI_SENSE_NOT_READY) && (senseData->AdditionalSenseCode == SCSI_ADSENSE_LUN_NOT_READY)){ Srb->SrbStatus = SRB_STATUS_SUCCESS; } - } - + } + // // use ClassInterpretSenseInfo() to check for media state, and also @@ -876,15 +873,15 @@ &status, NULL); - } + } else { - + fdoData->LoggedTURFailureSinceLastIO = FALSE; - + if (!info->Gesn.Supported) { DBGTRACE(ClassDebugMCN, ("ClasspMediaChangeDetectionCompletion - succeeded and GESN NOT supported, setting MediaPresent.")); - + // // success != media for GESN case // @@ -896,7 +893,7 @@ DBGTRACE(ClassDebugMCN, ("ClasspMediaChangeDetectionCompletion - succeeded (GESN supported).")); } } - + if (info->Gesn.Supported) { if (status == STATUS_DATA_OVERRUN) { @@ -904,7 +901,7 @@ status = STATUS_SUCCESS; } - if (!NT_SUCCESS(status)) { + if (!NT_SUCCESS(status)) { DBGTRACE(ClassDebugMCN, ("ClasspMediaChangeDetectionCompletion: GESN failed with status %x", status)); } else { @@ -912,7 +909,7 @@ // for GESN, need to interpret the results of the data. // this may also require an immediate retry // - + if (Irp->IoStatus.Information == 8 ) { ClasspInterpretGesnData(fdoExtension, (PVOID)info->Gesn.Buffer, @@ -949,7 +946,7 @@ // if (retryImmediately) { - + info->MediaChangeRetryCount++; if (info->MediaChangeRetryCount > MAXIMUM_IMMEDIATE_MCN_RETRIES) { ASSERT(!"Recursing too often in MCN?"); @@ -958,7 +955,7 @@ } } else { - + info->MediaChangeRetryCount = 0; } @@ -973,7 +970,7 @@ ClassAcquireRemoveLock(DeviceObject, (PIRP)(&uniqueValue)); ClassReleaseRemoveLock(DeviceObject, Irp); - + // // set the irp as not in use // @@ -995,18 +992,18 @@ else { DBGTRACE(ClassDebugMCN, ("ClasspMediaChangeDetectionCompletion - not retrying immediately")); } - + // // release the temporary remove lock // - + ClassReleaseRemoveLock(DeviceObject, (PIRP)(&uniqueValue)); } DBGTRACE(ClassDebugMCN, ("< ClasspMediaChangeDetectionCompletion")); return STATUS_MORE_PROCESSING_REQUIRED; -} +} /*++//////////////////////////////////////////////////////////////////////////// @@ -1018,8 +1015,8 @@ Arguments: - DeviceObject - - Irp - + DeviceObject - + Irp - Return Value: @@ -1060,7 +1057,7 @@ if (status == REMOVE_COMPLETE) { ASSERT(status != REMOVE_COMPLETE); return NULL; - } + } else if (status == REMOVE_PENDING) { ClassReleaseRemoveLock(FdoExtension->DeviceObject, irp); return NULL; @@ -1108,12 +1105,12 @@ srb->ScsiStatus = 0; srb->OriginalRequest = irp; srb->SenseInfoBufferLength = SENSE_BUFFER_SIZE; - + srb->SrbFlags = FdoExtension->SrbFlags; SET_FLAG(srb->SrbFlags, Info->SrbFlags); srb->TimeOutValue = FdoExtension->TimeOutValue * 2; - + if (srb->TimeOutValue == 0) { if (FdoExtension->TimeOutValue == 0) { @@ -1122,9 +1119,9 @@ "ClassSendTestUnitIrp: FdoExtension->TimeOutValue " "is set to zero?! -- resetting to 10\n")); srb->TimeOutValue = 10 * 2; // reasonable default - + } else { - + KdPrintEx((DPFLTR_CLASSPNP_ID, DPFLTR_ERROR_LEVEL, "ClassSendTestUnitIrp: Someone set " "srb->TimeOutValue to zero?! -- resetting to %x\n", @@ -1134,9 +1131,9 @@ } } - + if (!UseGesn) { - + srb->CdbLength = 6; srb->DataTransferLength = 0; SET_FLAG(srb->SrbFlags, SRB_FLAGS_NO_DATA_TRANSFER); @@ -1145,16 +1142,16 @@ srb->DataBuffer = NULL; srb->DataTransferLength = 0; irp->MdlAddress = NULL; - + cdb = (PCDB) &srb->Cdb[0]; cdb->CDB6GENERIC.OperationCode = SCSIOP_TEST_UNIT_READY; } else { - + ASSERT(Info->Gesn.Buffer); srb->TimeOutValue = GESN_TIMEOUT_VALUE; // much shorter timeout for GESN - + srb->CdbLength = 10; SET_FLAG(srb->SrbFlags, SRB_FLAGS_DATA_IN); nextIrpStack->Parameters.DeviceIoControl.IoControlCode = @@ -1197,8 +1194,8 @@ Arguments: - DeviceObject - - Irp - + DeviceObject - + Irp - Return Value: @@ -1349,7 +1346,7 @@ // device object directly or to the device's StartIo // routine (which doesn't acquire the lock). // - + requestPending = TRUE; DBGTRACE(ClassDebugMCN, (" ClasspSendMediaStateIrp - calling IoCallDriver.")); @@ -1368,7 +1365,7 @@ } DBGTRACE(ClassDebugMCN, ("< ClasspSendMediaStateIrp")); - + return; } // end ClasspSendMediaStateIrp() @@ -1391,9 +1388,7 @@ none --*/ -SCSIPORTAPI VOID -NTAPI ClassCheckMediaState( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -1434,7 +1429,7 @@ Routine Description: Resets the media change count down timer to the default number of seconds. - + Arguments: FdoExtension - the device to reset the timer for @@ -1444,9 +1439,7 @@ None --*/ -SCSIPORTAPI VOID -NTAPI ClassResetMediaChangeTimer( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -1470,8 +1463,8 @@ Arguments: - DeviceObject - - Irp - + DeviceObject - + Irp - Return Value: @@ -1509,11 +1502,11 @@ /* * Allocate an IRP to carry the Test-Unit-Ready. - * Allocate an extra IRP stack location + * Allocate an extra IRP stack location * so we can cache our device object in the top location. */ irp = IoAllocateIrp((CCHAR)(fdo->StackSize+1), FALSE); - + if (irp != NULL) { PVOID buffer; @@ -1634,7 +1627,7 @@ "ClasspInitializePolling: GESN *NOT* available " "for %p\n", FdoExtension->DeviceObject)); } - + ASSERT(info->Gesn.Supported == 0); ASSERT(info->Gesn.Buffer == NULL); ASSERT(info->Gesn.BufferSize == 0); @@ -1661,7 +1654,7 @@ IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PMEDIA_CHANGE_DETECTION_INFO Info ) -{ +{ PNOTIFICATION_EVENT_STATUS_HEADER header; CLASS_DETECTION_STATE detectionState = ClassDetectionUnknown; PSTORAGE_ADAPTER_DESCRIPTOR adapterDescriptor; @@ -1672,7 +1665,7 @@ ULONG i; ULONG atapiResets; - + PAGED_CODE(); ASSERT(Info == FdoExtension->MediaChangeDetectionInfo); @@ -1684,7 +1677,7 @@ CLASSP_REG_SUBKEY_NAME, CLASSP_REG_MMC_DETECTION_VALUE_NAME, (PULONG)&detectionState); - + if (detectionState == ClassDetectionUnsupported) { goto ExitWithError; } @@ -1695,7 +1688,7 @@ if (TEST_FLAG(FdoExtension->PrivateFdoData->HackFlags, FDO_HACK_GESN_IS_BAD)) { - + detectionState = ClassDetectionUnsupported; ClassSetDeviceParameter(FdoExtension, CLASSP_REG_SUBKEY_NAME, @@ -1707,7 +1700,7 @@ // - // else go through the process since we allocate buffers and + // else go through the process since we allocate buffers and // get all sorts of device settings. // @@ -1750,7 +1743,7 @@ atapiResets = 0; retryImmediately = TRUE; for (i = 0; i < 16 && retryImmediately == TRUE; i++) { - + irp = ClasspPrepareMcnIrp(FdoExtension, Info, TRUE); if (irp == NULL) { status = STATUS_INSUFFICIENT_RESOURCES; @@ -1758,19 +1751,19 @@ } ASSERT(TEST_FLAG(Info->MediaChangeSrb.SrbFlags, SRB_FLAGS_NO_QUEUE_FREEZE)); - + // // replace the completion routine with a different one this time... // - + IoSetCompletionRoutine(irp, ClassSignalCompletion, &event, TRUE, TRUE, TRUE); KeInitializeEvent(&event, SynchronizationEvent, FALSE); - + status = IoCallDriver(FdoExtension->CommonExtension.LowerDeviceObject, irp); - + if (status == STATUS_PENDING) { status = KeWaitForSingleObject(&event, Executive, @@ -1780,7 +1773,7 @@ ASSERT(NT_SUCCESS(status)); } ClassReleaseRemoveLock(FdoExtension->DeviceObject, irp); - + if (SRB_STATUS(Info->MediaChangeSrb.SrbStatus) != SRB_STATUS_SUCCESS) { ClassInterpretSenseInfo(FdoExtension->DeviceObject, &(Info->MediaChangeSrb), @@ -1815,18 +1808,18 @@ if (status == STATUS_DATA_OVERRUN) { status = STATUS_SUCCESS; } - + if ((status == STATUS_INVALID_DEVICE_REQUEST) || (status == STATUS_TIMEOUT) || (status == STATUS_IO_DEVICE_ERROR) || (status == STATUS_IO_TIMEOUT) ) { - + // // with these error codes, we don't ever want to try this command // again on this device, since it reacts poorly. // - + ClassSetDeviceParameter(FdoExtension, CLASSP_REG_SUBKEY_NAME, CLASSP_REG_MMC_DETECTION_VALUE_NAME, @@ -1836,9 +1829,9 @@ status, FdoExtension->DeviceObject)); goto ExitWithError; - - } - + + } + if (!NT_SUCCESS(status)) { // @@ -1851,21 +1844,21 @@ status, FdoExtension->DeviceObject)); goto ExitWithError; } - + if (i == 0) { // // the first time, the request was just retrieving a mask of // available bits. use this to mask future requests. // - + header = (PNOTIFICATION_EVENT_STATUS_HEADER)(Info->Gesn.Buffer); - + KdPrintEx((DPFLTR_CLASSPNP_ID, ClassDebugMCN, "Classpnp => Fdo %p supports event mask %x\n", FdoExtension->DeviceObject, header->SupportedEventClasses)); - - + + if (TEST_FLAG(header->SupportedEventClasses, NOTIFICATION_MEDIA_STATUS_CLASS_MASK)) { KdPrintEx((DPFLTR_CLASSPNP_ID, ClassDebugMCN, @@ -1886,13 +1879,13 @@ // therefore, we should not bother querying for the other, // unknown events. clear all but the above flags. // - + Info->Gesn.EventMask &= NOTIFICATION_EXTERNAL_REQUEST_CLASS_MASK | NOTIFICATION_MEDIA_STATUS_CLASS_MASK | NOTIFICATION_DEVICE_BUSY_CLASS_MASK ; - - + + // // HACKHACK - REF #0001 // Some devices will *never* report an event if we've also requested @@ -1906,7 +1899,7 @@ // drives, default to enabling the hack until we find evidence of // proper firmware. // - + if (CountOfSetBitsUChar(Info->Gesn.EventMask) == 1) { KdPrintEx((DPFLTR_CLASSPNP_ID, ClassDebugMCN, "Classpnp => GESN hack %s for FDO %p\n", @@ -1919,7 +1912,7 @@ } } else { - + // // not the first time looping through, so interpret the results. // @@ -1942,13 +1935,13 @@ // since we also rely upon NOT_READY events to change the cursor // into a "wait" cursor, we can't use GESN without NOT_READY support. // - + if (TEST_FLAG(Info->Gesn.EventMask, NOTIFICATION_MEDIA_STATUS_CLASS_MASK) && TEST_FLAG(Info->Gesn.EventMask, NOTIFICATION_DEVICE_BUSY_CLASS_MASK) ) { - + KdPrintEx((DPFLTR_CLASSPNP_ID, ClassDebugMCN, "Classpnp => Enabling GESN support for fdo %p\n", FdoExtension->DeviceObject)); @@ -1962,7 +1955,7 @@ return STATUS_SUCCESS; } - + KdPrintEx((DPFLTR_CLASSPNP_ID, ClassDebugMCN, "Classpnp => GESN available but not enabled for fdo %p\n", FdoExtension->DeviceObject)); @@ -2001,18 +1994,16 @@ Arguments: FdoExtension is the device to poll - + AllowDriveToSleep says whether to attempt to allow the drive to sleep - or not. This only affects system-known spin down states, so if a + or not. This only affects system-known spin down states, so if a drive spins itself down, this has no effect until the system spins it down. Return Value: --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassInitializeTestUnitPolling( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN BOOLEAN AllowDriveToSleep @@ -2031,24 +2022,22 @@ to autorun) for a given device. It will then check the device-type wide key "Autorun" in the service key (for legacy reasons), and then look in the device-specific key to potentially override that setting. - + If MCN is to be enabled, all neccessary structures and memory are allocated and initialized. - + This routine MUST be called only from the ClassInit() callback. Arguments: FdoExtension - the device to initialize MCN for, if appropriate - + EventPrefix - unused, legacy argument. Set to zero. Return Value: --*/ -SCSIPORTAPI VOID -NTAPI ClassInitializeMediaChangeDetection( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PUCHAR EventPrefix @@ -2119,7 +2108,7 @@ if (disabled) { return; } - + // // if the drive is not a CDROM, allow the drive to sleep // @@ -2672,7 +2661,7 @@ } ZwClose(serviceKey); - + DebugPrint((ClassDebugMCN, "ClassCheckServiceMCN: " "Autoplay for device %p is %s\n", FdoExtension->DeviceObject, @@ -2698,15 +2687,13 @@ Arguments: - DeviceObject - - Irp - + DeviceObject - + Irp - Return Value: --*/ -SCSIPORTAPI VOID -NTAPI ClassEnableMediaChangeDetection( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -2782,17 +2769,15 @@ Arguments: - DeviceObject - - Irp - + DeviceObject - + Irp - Return Value: --*/ ULONG BreakOnMcnDisable = FALSE; -SCSIPORTAPI VOID -NTAPI ClassDisableMediaChangeDetection( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -2837,9 +2822,7 @@ Return Value: --*/ -SCSIPORTAPI VOID -NTAPI ClassCleanupMediaChangeDetection( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -2853,7 +2836,7 @@ } FdoExtension->MediaChangeDetectionInfo = NULL; - + if (info->Gesn.Buffer) { ExFreePool(info->Gesn.Buffer); } @@ -2873,8 +2856,8 @@ Arguments: - DeviceObject - - Irp - + DeviceObject - + Irp - Return Value: @@ -3067,8 +3050,8 @@ Arguments: - DeviceObject - - Irp - + DeviceObject - + Irp - Return Value: @@ -3214,8 +3197,8 @@ Arguments: - DeviceObject - - Irp - + DeviceObject - + Irp - Return Value: @@ -3264,8 +3247,8 @@ Arguments: - DeviceObject - - Irp - + DeviceObject - + Irp - Return Value: @@ -3317,8 +3300,8 @@ Arguments: - DeviceObject - - Irp - + DeviceObject - + Irp - Return Value: @@ -3450,9 +3433,7 @@ Return Value: --*/ -SCSIPORTAPI VOID -NTAPI ClassNotifyFailurePredicted( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PUCHAR Buffer, @@ -3535,9 +3516,7 @@ NT Status --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassSetFailurePredictionPoll( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, FAILURE_PREDICTION_METHOD FailurePredictionMethod, Modified: branches/cmake-bringup/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/class.c [iso-8859-1] Sun Oct 31 10:42:40 2010 @@ -115,9 +115,7 @@ A valid return code for a DriverEntry routine. --*/ -SCSIPORTAPI ULONG -NTAPI ClassInitialize( IN PVOID Argument1, IN PVOID Argument2, @@ -132,7 +130,7 @@ NTSTATUS status; PAGED_CODE(); - + DebugPrint((3,"\n\nSCSI Class Driver\n")); ClasspInitializeDebugGlobals(); @@ -363,9 +361,7 @@ Status Code --*/ -SCSIPORTAPI ULONG -NTAPI ClassInitializeEx( IN PDRIVER_OBJECT DriverObject, IN LPGUID Guid, @@ -1729,10 +1725,7 @@ Status is returned. --*/ -SCSIPORTAPI -NTSTATUS -NTAPI -ClassReadDriveCapacity(IN PDEVICE_OBJECT Fdo) +NTSTATUS ClassReadDriveCapacity(IN PDEVICE_OBJECT Fdo) { READ_CAPACITY_DATA readCapacityBuffer = {0}; NTSTATUS status; @@ -2015,9 +2008,7 @@ None. --*/ -SCSIPORTAPI VOID -NTAPI ClassSendStartUnit( IN PDEVICE_OBJECT Fdo ) @@ -2170,9 +2161,7 @@ None. --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassAsynchronousCompletion( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -2438,9 +2427,7 @@ NT status --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassIoComplete( IN PDEVICE_OBJECT Fdo, IN PIRP Irp, @@ -2656,9 +2643,7 @@ Srb->DataTransferLength --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassSendSrbSynchronous( PDEVICE_OBJECT Fdo, PSCSI_REQUEST_BLOCK Srb, @@ -3004,9 +2989,7 @@ FALSE: Drivers should not retry this request. --*/ -SCSIPORTAPI BOOLEAN -NTAPI ClassInterpretSenseInfo( IN PDEVICE_OBJECT Fdo, IN PSCSI_REQUEST_BLOCK Srb, @@ -4070,7 +4053,7 @@ /* * If logError is set, also save this log in the system's error log. - * But make sure we don't log TUR failures over and over + * But make sure we don't log TUR failures over and over * (e.g. if an external drive was switched off and we're still sending TUR's to it every second). */ if ((((PCDB)Srb->Cdb)->CDB10.OperationCode == SCSIOP_TEST_UNIT_READY) && logError){ @@ -4078,7 +4061,7 @@ logError = FALSE; } else { - fdoData->LoggedTURFailureSinceLastIO = TRUE; + fdoData->LoggedTURFailureSinceLastIO = TRUE; } } if (logError){ @@ -4137,10 +4120,7 @@ Length of the transferred data is returned. --*/ -SCSIPORTAPI -ULONG -NTAPI -ClassModeSense( IN PDEVICE_OBJECT Fdo, +ULONG ClassModeSense( IN PDEVICE_OBJECT Fdo, IN PCHAR ModeSenseBuffer, IN ULONG Length, IN UCHAR PageMode) @@ -4226,9 +4206,7 @@ then NULL is return. --*/ -SCSIPORTAPI PVOID -NTAPI ClassFindModePage( IN PCHAR ModeSenseBuffer, IN ULONG Length, @@ -4339,9 +4317,7 @@ or returns a status value to indicate why it failed. --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassSendSrbAsynchronous( PDEVICE_OBJECT Fdo, PSCSI_REQUEST_BLOCK Srb, @@ -4609,9 +4585,7 @@ Returns back a STATUS_PENDING or a completion status. --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassDeviceControl( PDEVICE_OBJECT DeviceObject, PIRP Irp @@ -5634,7 +5608,6 @@ --*/ NTSTATUS -NTAPI ClassShutdownFlush( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -5707,9 +5680,7 @@ NTSTATUS --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassCreateDeviceObject( IN PDRIVER_OBJECT DriverObject, IN PCCHAR ObjectNameBuffer, @@ -6006,9 +5977,7 @@ Returns a status indicating success or failure of the operation. --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassClaimDevice( IN PDEVICE_OBJECT LowerDeviceObject, IN BOOLEAN Release @@ -6139,9 +6108,7 @@ Returns back a STATUS_PENDING or a completion status. --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassInternalIoControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -6213,9 +6180,7 @@ None, but it sets a new default timeout for a class of devices. --*/ -SCSIPORTAPI ULONG -NTAPI ClassQueryTimeOutRegistryValue( IN PDEVICE_OBJECT DeviceObject ) @@ -6322,9 +6287,7 @@ NT status --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassCheckVerifyComplete( IN PDEVICE_OBJECT Fdo, IN PIRP Irp, @@ -6389,9 +6352,7 @@ buffer allocated on behalf of the caller. --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassGetDescriptor( IN PDEVICE_OBJECT DeviceObject, IN PSTORAGE_PROPERTY_ID PropertyId, @@ -6540,9 +6501,7 @@ STATUS_MORE_PROCESSING_REQUIRED --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassSignalCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -6629,9 +6588,7 @@ None --*/ -SCSIPORTAPI VOID -NTAPI ClassMarkChildrenMissing( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo ) @@ -6683,9 +6640,7 @@ to PNP. --*/ -SCSIPORTAPI BOOLEAN -NTAPI ClassMarkChildMissing( IN PPHYSICAL_DEVICE_EXTENSION Child, IN BOOLEAN AcquireChildLock @@ -6939,9 +6894,7 @@ none --*/ -SCSIPORTAPI VOID -NTAPI ClassInvalidateBusRelations( IN PDEVICE_OBJECT Fdo ) @@ -6996,9 +6949,7 @@ status --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassRemoveDevice( IN PDEVICE_OBJECT DeviceObject, IN UCHAR RemoveType @@ -7262,9 +7213,7 @@ Either NULL if none, or a pointer to the driver extension --*/ -SCSIPORTAPI PCLASS_DRIVER_EXTENSION -NTAPI ClassGetDriverExtension( IN PDRIVER_OBJECT DriverObject ) @@ -7348,9 +7297,7 @@ None --*/ -SCSIPORTAPI VOID -NTAPI ClassUpdateInformationInRegistry( IN PDEVICE_OBJECT Fdo, IN PCHAR DeviceName, @@ -7687,9 +7634,7 @@ Return Value: --*/ -SCSIPORTAPI VOID -NTAPI ClassSendDeviceIoControlSynchronous( IN ULONG IoControlCode, IN PDEVICE_OBJECT TargetDeviceObject, @@ -7946,9 +7891,7 @@ Return Value: --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassForwardIrpSynchronous( IN PCOMMON_DEVICE_EXTENSION CommonExtension, IN PIRP Irp @@ -7977,9 +7920,7 @@ Return Value: --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassSendIrpSynchronous( IN PDEVICE_OBJECT TargetDeviceObject, IN PIRP Irp @@ -8078,9 +8019,7 @@ the VPB, or NULL if none. --*/ -SCSIPORTAPI PVPB -NTAPI ClassGetVpb( IN PDEVICE_OBJECT DeviceObject ) @@ -8189,9 +8128,7 @@ None. --*/ -SCSIPORTAPI VOID -NTAPI ClassReleaseQueue( IN PDEVICE_OBJECT Fdo ) @@ -8511,9 +8448,7 @@ None --*/ -SCSIPORTAPI VOID -NTAPI ClassAcquireChildLock( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -8555,9 +8490,7 @@ None. --*/ -SCSIPORTAPI VOID -NTAPI ClassReleaseChildLock( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) Modified: branches/cmake-bringup/drivers/storage/classpnp/classp.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/classp.h [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/classp.h [iso-8859-1] Sun Oct 31 10:42:40 2010 @@ -424,7 +424,7 @@ BOOLEAN TimerStarted; BOOLEAN LoggedTURFailureSinceLastIO; - + // // privately allocated release queue irp // protected by fdoExtension->ReleaseQueueSpinLock @@ -508,7 +508,6 @@ } NTSTATUS -NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath @@ -557,6 +556,12 @@ ); NTSTATUS +ClassDeviceControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp + ); + +NTSTATUS ClassDispatchPnp( PDEVICE_OBJECT DeviceObject, PIRP Irp @@ -568,7 +573,12 @@ ); NTSTATUS -NTAPI +ClassInternalIoControl ( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp + ); + +NTSTATUS ClassShutdownFlush( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp Modified: branches/cmake-bringup/drivers/storage/classpnp/classwmi.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/classwmi.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/classwmi.c [iso-8859-1] Sun Oct 31 10:42:40 2010 @@ -256,14 +256,14 @@ ClassQueryWmiRegInfoEx = commonExtension->IsFdo ? driverExtension->ClassFdoQueryWmiRegInfoEx : driverExtension->ClassPdoQueryWmiRegInfoEx; - + if (ClassQueryWmiRegInfoEx == NULL) { status = classWmiInfo->ClassQueryWmiRegInfo( DeviceObject, &nameFlags, &name); - + RtlInitUnicodeString(&mofName, MOFRESOURCENAME); } else { RtlInitUnicodeString(&mofName, L""); @@ -545,13 +545,13 @@ DeviceObject - Supplies a pointer to the device object for this request. Irp - Supplies the Irp making the request. - + Status - Status to complete the irp with. STATUS_BUFFER_TOO_SMALL is used to indicate that more buffer is required for the data requested. - + BufferUsed - number of bytes of actual data to return (not including WMI specific structures) - + PriorityBoost - priority boost to pass to ClassCompleteRequest Return Value: @@ -561,7 +561,6 @@ --*/ SCSIPORTAPI NTSTATUS -NTAPI ClassWmiCompleteRequest( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -725,9 +724,7 @@ status --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassWmiFireEvent( IN PDEVICE_OBJECT DeviceObject, IN LPGUID Guid, Modified: branches/cmake-bringup/drivers/storage/classpnp/lock.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/lock.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/lock.c [iso-8859-1] Sun Oct 31 10:42:40 2010 @@ -78,9 +78,7 @@ lock. --*/ -SCSIPORTAPI ULONG -NTAPI ClassAcquireRemoveLockEx( IN PDEVICE_OBJECT DeviceObject, IN OPTIONAL PVOID Tag, @@ -125,14 +123,14 @@ &oldIrql); commonExtension->RemoveTrackingUntrackedCount++; - + DebugPrint((ClassDebugWarning, ">>>>>ClassAcquireRemoveLock: " "Cannot track Tag %p - currently %d untracked requsts\n", Tag, commonExtension->RemoveTrackingUntrackedCount)); KeReleaseSpinLock(&commonExtension->RemoveTrackingSpinlock, oldIrql); - } + } else { PREMOVE_TRACKING_BLOCK *removeTrackingList = (PREMOVE_TRACKING_BLOCK)&commonExtension->RemoveTrackingList; @@ -210,9 +208,7 @@ none --*/ -SCSIPORTAPI VOID -NTAPI ClassReleaseRemoveLock( IN PDEVICE_OBJECT DeviceObject, IN OPTIONAL PIRP Tag @@ -365,9 +361,9 @@ Arguments: DeviceObject - the device object that was handling this request - + Irp - the irp to be completed by IoCompleteRequest - + PriorityBoost - the priority boost to pass to IoCompleteRequest Return Value: @@ -375,9 +371,7 @@ none --*/ -SCSIPORTAPI VOID -NTAPI ClassCompleteRequest( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, Modified: branches/cmake-bringup/drivers/storage/classpnp/obsolete.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/obsolete.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/obsolete.c [iso-8859-1] Sun Oct 31 10:42:40 2010 @@ -51,10 +51,7 @@ * StartIo routine when the transfer size is too large for the hardware. * We map it to our new read/write handler. */ -SCSIPORTAPI -VOID -NTAPI -ClassSplitRequest(IN PDEVICE_OBJECT Fdo, IN PIRP Irp, IN ULONG MaximumBytes) +VOID ClassSplitRequest(IN PDEVICE_OBJECT Fdo, IN PIRP Irp, IN ULONG MaximumBytes) { PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension; PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData; @@ -71,7 +68,7 @@ } ServiceTransferRequest(Fdo, Irp); -} +} /*++//////////////////////////////////////////////////////////////////////////// @@ -102,9 +99,7 @@ NT status --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassIoCompleteAssociated( IN PDEVICE_OBJECT Fdo, IN PIRP Irp, @@ -481,9 +476,7 @@ NT Status --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassBuildRequest( PDEVICE_OBJECT Fdo, PIRP Irp @@ -746,13 +739,13 @@ DBGWARN(("ClasspInsertCScanList is OBSOLETE !")); // - // Iterate through the list. Insert this entry in the sorted list in - // order (after other requests for the same block). At each stop if + // Iterate through the list. Insert this entry in the sorted list in + // order (after other requests for the same block). At each stop if // blockNumber(Entry) >= blockNumber(t) then move on. // - for(t = (PCSCAN_LIST_ENTRY) ListHead->Flink; - t != (PCSCAN_LIST_ENTRY) ListHead; + for(t = (PCSCAN_LIST_ENTRY) ListHead->Flink; + t != (PCSCAN_LIST_ENTRY) ListHead; t = (PCSCAN_LIST_ENTRY) t->Entry.Flink) { if(Entry->BlockNumber < t->BlockNumber) { @@ -775,7 +768,7 @@ } // - // Insert this entry at the tail of the list. If the list was empty this + // Insert this entry at the tail of the list. If the list was empty this // will also be the head of the list. // @@ -794,25 +787,25 @@ to the access of the list. Low priority requests are always scheduled to run on the next sweep across - the disk. Normal priority requests will be inserted into the current or + the disk. Normal priority requests will be inserted into the current or next sweep based on the standard C-SCAN algorithm. Arguments: List - the list to insert into - + Irp - the irp to be inserted. - + BlockNumber - the block number for this request. - - LowPriority - indicates that the request is lower priority and should be - done on the next sweep across the disk. + + LowPriority - indicates that the request is lower priority and should be + done on the next sweep across the disk. Return Value: none - ---*/ + +--*/ { PCSCAN_LIST_ENTRY entry = (PCSCAN_LIST_ENTRY)Irp->Tail.Overlay.DriverContext; @@ -824,7 +817,7 @@ entry->BlockNumber = BlockNumber; // - // If it's a normal priority request and further down the disk than our + // If it's a normal priority request and further down the disk than our // current position then insert this entry into the current sweep. // @@ -845,22 +838,22 @@ Routine Description: - This routine will attempt to reuse the provided SRB to start a blocked - read/write request. + This routine will attempt to reuse the provided SRB to start a blocked + read/write request. If there is no need to reuse the request it will be returned to the SRB lookaside list. Arguments: Fdo - the device extension - + Srb - the SRB which is to be reused or freed. - + Return Value: none. - ---*/ + +--*/ { PCLASS_PRIVATE_FDO_DATA privateData = FdoExtension->PrivateFdoData; @@ -876,7 +869,7 @@ // memory leak. // ASSERT(!TEST_FLAG(Srb->SrbFlags, SRB_FLAGS_FREE_SENSE_BUFFER)); - + if (commonExt->IsSrbLookasideListInitialized){ /* * Put the SRB back in our lookaside list. @@ -903,7 +896,7 @@ This routine deletes a lookaside listhead for srbs, and should be called only during the final removal. - + If called at other times, the caller is responsible for synchronization and removal issues. @@ -916,10 +909,7 @@ None --*/ -SCSIPORTAPI -VOID -NTAPI -ClassDeleteSrbLookasideList(IN PCOMMON_DEVICE_EXTENSION CommonExtension) +VOID ClassDeleteSrbLookasideList(IN PCOMMON_DEVICE_EXTENSION CommonExtension) { PAGED_CODE(); @@ -933,7 +923,7 @@ else { DBGWARN(("ClassDeleteSrbLookasideList: attempt to delete uninitialized or freed srblookasidelist")); } -} +} /*++//////////////////////////////////////////////////////////////////////////// @@ -944,7 +934,7 @@ This routine sets up a lookaside listhead for srbs, and should be called only from the ClassInitDevice() routine to prevent race conditions. - + If called from other locations, the caller is responsible for synchronization and removal issues. @@ -954,7 +944,7 @@ NumberElements - Supplies the maximum depth of the lookaside list. - + Note: The Windows 2000 version of classpnp did not return any status value from @@ -962,10 +952,7 @@ --*/ -SCSIPORTAPI -VOID -NTAPI -ClassInitializeSrbLookasideList( IN PCOMMON_DEVICE_EXTENSION CommonExtension, +VOID ClassInitializeSrbLookasideList( IN PCOMMON_DEVICE_EXTENSION CommonExtension, IN ULONG NumberElements) { PAGED_CODE(); @@ -986,8 +973,8 @@ CommonExtension->IsSrbLookasideListInitialized = TRUE; } - -} + +} @@ -1021,7 +1008,7 @@ List->CurrentSweep = List->NextSweep; // - // Unlink the next sweep list from the list head now that we have a copy + // Unlink the next sweep list from the list head now that we have a copy // of it. // Modified: branches/cmake-bringup/drivers/storage/classpnp/power.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/power.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/power.c [iso-8859-1] Sun Oct 31 10:42:40 2010 @@ -77,8 +77,8 @@ Arguments: - DeviceObject - - Irp - + DeviceObject - + Irp - Return Value: @@ -151,7 +151,7 @@ STATUS_MORE_PROCESSING_REQUIRED or STATUS_SUCCESS - + --*/ NTSTATUS ClasspPowerUpCompletion( @@ -389,7 +389,7 @@ break; } - + // reset retries Context->RetryCount = MAXIMUM_RETRIES; @@ -406,7 +406,7 @@ Context->Srb.SrbFlags = SRB_FLAGS_BYPASS_LOCKED_QUEUE; Context->Srb.SrbStatus = Context->Srb.ScsiStatus = 0; Context->Srb.DataTransferLength = 0; - + nextStack->Parameters.Scsi.Srb = &(Context->Srb); nextStack->MajorFunction = IRP_MJ_SCSI; @@ -466,7 +466,7 @@ // Indicate to Po that we've been successfully powered up so // it can do it's notification stuff. // - + PoSetPowerState(DeviceObject, currentStack->Parameters.Power.Type, currentStack->Parameters.Power.State); @@ -623,45 +623,45 @@ // // send SCSIOP_SYNCHRONIZE_CACHE // - + Context->Srb.Length = sizeof(SCSI_REQUEST_BLOCK); Context->Srb.Function = SRB_FUNCTION_EXECUTE_SCSI; - + Context->Srb.TimeOutValue = fdoExtension->TimeOutValue; - + Context->Srb.SrbFlags = SRB_FLAGS_NO_DATA_TRANSFER | SRB_FLAGS_DISABLE_AUTOSENSE | SRB_FLAGS_DISABLE_SYNCH_TRANSFER | SRB_FLAGS_NO_QUEUE_FREEZE | SRB_FLAGS_BYPASS_LOCKED_QUEUE; - + Context->Srb.SrbStatus = Context->Srb.ScsiStatus = 0; Context->Srb.DataTransferLength = 0; - + Context->Srb.CdbLength = 10; - + cdb = (PCDB) Context->Srb.Cdb; - + RtlZeroMemory(cdb, sizeof(CDB)); cdb->SYNCHRONIZE_CACHE10.OperationCode = SCSIOP_SYNCHRONIZE_CACHE; - + IoSetCompletionRoutine(Irp, ClasspPowerDownCompletion, Context, TRUE, TRUE, TRUE); - + nextStack->Parameters.Scsi.Srb = &(Context->Srb); nextStack->MajorFunction = IRP_MJ_SCSI; - + status = IoCallDriver(commonExtension->LowerDeviceObject, Irp); - + DebugPrint((1, "(%p)\tIoCallDriver returned %lx\n", Irp, status)); break; - + } else { - + DebugPrint((1, "(%p)\tPower Down: not sending SYNCH_CACHE\n", DeviceObject)); Context->PowerChangeState.PowerDown2++; @@ -671,7 +671,7 @@ // no break in case the device doesn't like synch_cache commands } - + case PowerDownDeviceFlushed2: { PCDB cdb; @@ -843,9 +843,9 @@ // if (!NT_SUCCESS(status)) { - + PSENSE_DATA senseBuffer = Context->Srb.SenseInfoBuffer; - + if (TEST_FLAG(Context->Srb.SrbStatus, SRB_STATUS_AUTOSENSE_VALID) && ((senseBuffer->SenseKey & 0xf) == SCSI_SENSE_NOT_READY) && @@ -881,7 +881,7 @@ DebugPrint((1, "(%p)\tPoCallDriver returned %lx\n", Irp, status)); break; } - + // else fall through w/o sending the power irp, since the device // is reporting an error that would be "really bad" to power down // during. @@ -900,7 +900,7 @@ if (Context->QueueLocked) { DebugPrint((1, "(%p)\tUnlocking queue\n", Irp)); - + Context->Srb.Length = sizeof(SCSI_REQUEST_BLOCK); Context->Srb.SrbStatus = Context->Srb.ScsiStatus = 0; @@ -956,7 +956,7 @@ Irp->IoStatus.Information = 0; if (NT_SUCCESS(status)) { - + // // Set the new power state // @@ -989,7 +989,7 @@ This routine reduces the number of useless spinups and spindown requests sent to a given device by ignoring transitions to power states we are currently in. - + ISSUE-2000/02/20-henrygab - by ignoring spin-up requests, we may be allowing the drive @@ -1046,7 +1046,7 @@ irpStack->Parameters.Power.State.SystemState)); switch (irpStack->Parameters.Power.ShutdownType){ - + case PowerActionSleep: case PowerActionHibernate: if (fdoData->HotplugInfo.MediaRemovable || fdoData->HotplugInfo.MediaHotplug){ @@ -1060,7 +1060,7 @@ } break; } - + break; } @@ -1311,7 +1311,7 @@ if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { - PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = + PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension; // @@ -1319,9 +1319,9 @@ // if (irpStack->MinorFunction == IRP_MN_SET_POWER){ PVPB vpb; - + switch (irpStack->Parameters.Power.ShutdownType){ - + case PowerActionSleep: case PowerActionHibernate: // @@ -1331,11 +1331,11 @@ // vpb = ClassGetVpb(fdoExtension->DeviceObject); if (vpb && (vpb->Flags & VPB_MOUNTED)){ - SET_FLAG(fdoExtension->DeviceObject->Flags, DO_VERIFY_VOLUME); - } + SET_FLAG(fdoExtension->DeviceObject->Flags, DO_VERIFY_VOLUME); + } break; } - } + } } IoCopyCurrentIrpStackLocationToNext(Irp); @@ -1345,7 +1345,7 @@ if (irpStack->MinorFunction != IRP_MN_SET_POWER && irpStack->MinorFunction != IRP_MN_QUERY_POWER) { - + NOTHING; } else { @@ -1371,7 +1371,7 @@ a start and a stop to be sent to the device. (actually the starts are almost always optional, since most device power themselves on to process commands, but i digress). - + Determines proper use of spinup, spindown, and queue locking based upon ScanForSpecialFlags in the FdoExtension. This is the most common power handler passed into classpnp.sys @@ -1387,9 +1387,7 @@ None --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassSpinDownPowerHandler( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -1451,14 +1449,12 @@ This routine is an outdated call. To achieve equivalent functionality, the driver should set the following flags in ScanForSpecialFlags in the FdoExtension: - + CLASS_SPECIAL_DISABLE_SPIN_UP CLASS_SPECIAL_NO_QUEUE_LOCK --*/ -SCSIPORTAPI NTSTATUS -NTAPI ClassStopUnitPowerHandler( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp Modified: branches/cmake-bringup/drivers/storage/classpnp/utils.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/utils.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/utils.c [iso-8859-1] Sun Oct 31 10:42:40 2010 @@ -55,10 +55,7 @@ } -SCSIPORTAPI -VOID -NTAPI -ClassGetDeviceParameter( +VOID ClassGetDeviceParameter( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PWSTR SubkeyName OPTIONAL, IN PWSTR ParameterName, @@ -143,10 +140,7 @@ } // end ClassGetDeviceParameter() -SCSIPORTAPI -NTSTATUS -NTAPI -ClassSetDeviceParameter( +NTSTATUS ClassSetDeviceParameter( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PWSTR SubkeyName OPTIONAL, IN PWSTR ParameterName, @@ -224,10 +218,7 @@ * hardware based upon id strings. it does not check the registry. */ -SCSIPORTAPI -VOID -NTAPI -ClassScanForSpecial( +VOID ClassScanForSpecial( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN CLASSPNP_SCAN_FOR_SPECIAL_INFO DeviceList[], IN PCLASS_SCAN_FOR_SPECIAL_HANDLER Function)

1 0

[janderwald] 49372: [SHELL32] - Enable code as we support now IOCTL_DISK_GET_LENGTH_INFO - IOCTL_DISK_GET_LENGTH_INFO implemented in 49369
by janderwald＠svn.reactos.org 31 Oct '10

31 Oct '10

Author: janderwald Date: Sun Oct 31 10:09:55 2010 New Revision: 49372 URL: http://svn.reactos.org/svn/reactos?rev=49372&view=rev Log: [SHELL32] - Enable code as we support now IOCTL_DISK_GET_LENGTH_INFO - IOCTL_DISK_GET_LENGTH_INFO implemented in 49369 Modified: trunk/reactos/dll/win32/shell32/drive.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Sun Oct 31 10:09:55 2010 @@ -395,7 +395,6 @@ { WCHAR szResult[128]; LONGLONG Result; -#ifdef IOCTL_DISK_GET_LENGTH_INFO_IMPLEMENTED HANDLE hVolume; DWORD BytesReturned = 0; @@ -404,16 +403,13 @@ if (hVolume != INVALID_HANDLE_VALUE) { ret = DeviceIoControl(hVolume, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, (LPVOID)&TotalNumberOfBytes, sizeof(ULARGE_INTEGER), &BytesReturned, NULL); - if (ret && StrFormatByteSizeW(LengthInformation.Length.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) + if (ret && StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); CloseHandle(hVolume); } - TRACE("szResult %s hVOlume %p ret %d LengthInformation %ul Bytesreturned %d\n", debugstr_w(szResult), hVolume, ret, LengthInformation.Length.QuadPart, BytesReturned); -#else - if (ret && StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); -#endif + + TRACE("szResult %s hVOlume %p ret %d LengthInformation %ul Bytesreturned %d\n", debugstr_w(szResult), hVolume, ret, TotalNumberOfBytes.QuadPart, BytesReturned); if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart - FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) SendDlgItemMessageW(hwndDlg, 14003, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult);

1 0

[ekohl] 49371: [SERVICES] Revert r49366.
by ekohl＠svn.reactos.org 31 Oct '10

31 Oct '10

Author: ekohl Date: Sun Oct 31 10:00:21 2010 New Revision: 49371 URL: http://svn.reactos.org/svn/reactos?rev=49371&view=rev Log: [SERVICES] Revert r49366. Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Oct 31 10:00:21 2010 @@ -678,10 +678,66 @@ DWORD -ScmSendServiceCommand(PSERVICE Service, - DWORD dwControl, - DWORD argc, - LPWSTR *argv) +ScmControlService(PSERVICE Service, + DWORD dwControl) +{ + PSCM_CONTROL_PACKET ControlPacket; + SCM_REPLY_PACKET ReplyPacket; + + DWORD dwWriteCount = 0; + DWORD dwReadCount = 0; + DWORD TotalLength; + DWORD dwError = ERROR_SUCCESS; + + DPRINT("ScmControlService() called\n"); + + TotalLength = wcslen(Service->lpServiceName) + 1; + + ControlPacket = (SCM_CONTROL_PACKET*)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SCM_CONTROL_PACKET) + (TotalLength * sizeof(WCHAR))); + if (ControlPacket == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + ControlPacket->dwControl = dwControl; + ControlPacket->dwSize = TotalLength; + ControlPacket->hServiceStatus = (SERVICE_STATUS_HANDLE)Service; + wcscpy(&ControlPacket->szArguments[0], Service->lpServiceName); + + /* Send the control packet */ + WriteFile(Service->ControlPipeHandle, + ControlPacket, + sizeof(SCM_CONTROL_PACKET) + (TotalLength * sizeof(WCHAR)), + &dwWriteCount, + NULL); + + /* Read the reply */ + ReadFile(Service->ControlPipeHandle, + &ReplyPacket, + sizeof(SCM_REPLY_PACKET), + &dwReadCount, + NULL); + + /* Release the contol packet */ + HeapFree(GetProcessHeap(), + 0, + ControlPacket); + + if (dwReadCount == sizeof(SCM_REPLY_PACKET)) + { + dwError = ReplyPacket.dwError; + } + + DPRINT("ScmControlService() done\n"); + + return dwError; +} + + +static DWORD +ScmSendStartCommand(PSERVICE Service, + DWORD argc, + LPWSTR *argv) { PSCM_CONTROL_PACKET ControlPacket; SCM_REPLY_PACKET ReplyPacket; @@ -694,7 +750,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD i; - DPRINT("ScmSendServiceCommand() called\n"); + DPRINT("ScmSendStartCommand() called\n"); /* Calculate the total length of the start command line */ TotalLength = wcslen(Service->lpServiceName) + 1; @@ -718,7 +774,7 @@ if (ControlPacket == NULL) return ERROR_NOT_ENOUGH_MEMORY; - ControlPacket->dwControl = dwControl; + ControlPacket->dwControl = SERVICE_CONTROL_START; ControlPacket->hServiceStatus = (SERVICE_STATUS_HANDLE)Service; ControlPacket->dwSize = TotalLength; Ptr = &ControlPacket->szArguments[0]; @@ -763,7 +819,7 @@ dwError = ReplyPacket.dwError; } - DPRINT("ScmSendServiceCommand() done\n"); + DPRINT("ScmSendStartCommand() done\n"); return dwError; } @@ -942,10 +998,7 @@ DPRINT("Received service process ID %lu\n", dwProcessId); /* Send start command */ - dwError = ScmSendServiceCommand(Service, - SERVICE_CONTROL_START, - argc, - argv); + dwError = ScmSendStartCommand(Service, argc, argv); } } else @@ -1174,10 +1227,7 @@ CurrentService->Status.dwCurrentState == SERVICE_START_PENDING) { /* shutdown service */ - ScmSendServiceCommand(CurrentService, - SERVICE_CONTROL_STOP, - 0, - NULL); + ScmControlService(CurrentService, SERVICE_CONTROL_STOP); } ServiceEntry = ServiceEntry->Flink; 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] Sun Oct 31 10:00:21 2010 @@ -699,10 +699,8 @@ } /* Send control code to the service */ - dwError = ScmSendServiceCommand(lpService, - dwControl, - 0, - NULL); + dwError = ScmControlService(lpService, + dwControl); /* Return service status information */ RtlCopyMemory(lpServiceStatus, @@ -2866,10 +2864,7 @@ } /* Start the service */ - dwError = ScmSendServiceCommand(lpService, - SERVICE_CONTROL_START, - argc, - (LPWSTR *)argv); + dwError = ScmStartService(lpService, argc, (LPWSTR *)argv); return dwError; } @@ -4077,10 +4072,7 @@ /* FIXME: Convert argument vector to Unicode */ /* Start the service */ - dwError = ScmSendServiceCommand(lpService, - SERVICE_CONTROL_START, - 0, - NULL); + dwError = ScmStartService(lpService, 0, NULL); /* FIXME: Free argument vector */ Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sun Oct 31 10:00:21 2010 @@ -104,10 +104,9 @@ VOID ScmGetBootAndSystemDriverState(VOID); VOID ScmAutoStartServices(VOID); VOID ScmAutoShutdownServices(VOID); -DWORD ScmSendServiceCommand(PSERVICE Service, - DWORD dwControl, - DWORD argc, - LPWSTR *argv); +DWORD ScmStartService(PSERVICE Service, + DWORD argc, + LPWSTR *argv); PSERVICE ScmGetServiceEntryByName(LPCWSTR lpServiceName); PSERVICE ScmGetServiceEntryByDisplayName(LPCWSTR lpDisplayName); @@ -116,6 +115,9 @@ PSERVICE *lpServiceRecord); VOID ScmDeleteServiceRecord(PSERVICE lpService); DWORD ScmMarkServiceForDelete(PSERVICE pService); + +DWORD ScmControlService(PSERVICE Service, + DWORD dwControl); BOOL ScmLockDatabaseExclusive(VOID); BOOL ScmLockDatabaseShared(VOID);

1 0

[tkreuzer] 49370: [CMAKE] Fix a typo
by tkreuzer＠svn.reactos.org 31 Oct '10

31 Oct '10

Author: tkreuzer Date: Sun Oct 31 09:16:35 2010 New Revision: 49370 URL: http://svn.reactos.org/svn/reactos?rev=49370&view=rev Log: [CMAKE] Fix a typo Modified: branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched2… ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] Sun Oct 31 09:16:35 2010 @@ -36,7 +36,7 @@ uuid) if(MSVC) - set_target_properties(portcls PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") + set_target_properties(riched20 PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") endif(MSVC) add_importlibs(riched20

1 0

[pschweitzer] 49369: [DISK] Implemented support for IOCTL_DISK_GET_LENGTH_INFO
by pschweitzer＠svn.reactos.org 31 Oct '10

31 Oct '10

Author: pschweitzer Date: Sun Oct 31 08:13:33 2010 New Revision: 49369 URL: http://svn.reactos.org/svn/reactos?rev=49369&view=rev Log: [DISK] Implemented support for IOCTL_DISK_GET_LENGTH_INFO Modified: trunk/reactos/drivers/storage/class/disk/disk.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Sun Oct 31 08:13:33 2010 @@ -2808,6 +2808,53 @@ // Fall through and let the class driver process the request. // + case IOCTL_DISK_GET_LENGTH_INFO: + + // + // Validate buffer length. + // + + if (irpStack->Parameters.DeviceIoControl.OutputBufferLength < + sizeof(GET_LENGTH_INFORMATION)) { + status = STATUS_BUFFER_TOO_SMALL; + + } else { + + PGET_LENGTH_INFORMATION lengthInformation = Irp->AssociatedIrp.SystemBuffer; + + // + // Update the geometry in case it has changed. + // + + status = UpdateRemovableGeometry (DeviceObject, Irp); + + if (!NT_SUCCESS(status)) { + + // + // Note the drive is not ready. + // + + diskData->DriveNotReady = TRUE; + break; + } + + // + // Note the drive is now ready. + // + + diskData->DriveNotReady = FALSE; + + // + // Output data, and return + // + + lengthInformation->Length.QuadPart = deviceExtension->PartitionLength.QuadPart; + status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(GET_LENGTH_INFORMATION); + } + + break; + default: //

1 0

[janderwald] 49368: [PORTCLS] - Revert 49356 - This change breaks portcls on WinXP
by janderwald＠svn.reactos.org 30 Oct '10

30 Oct '10

Author: janderwald Date: Sat Oct 30 23:17:34 2010 New Revision: 49368 URL: http://svn.reactos.org/svn/reactos?rev=49368&view=rev Log: [PORTCLS] - Revert 49356 - This change breaks portcls on WinXP Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Sat Oct 30 23:17:34 2010 @@ -293,7 +293,7 @@ { PKSSTREAM_HEADER StreamHeader; ULONG Size, NumData, Index; - PMDL CurMdl, NextMdl; + //PMDL CurMdl, NextMdl; if (!m_Irp) { @@ -385,7 +385,7 @@ // done return; } - +#if 0 // now free allocated mdls CurMdl = m_Irp->MdlAddress; for(Index = 0; Index < STREAMHEADER_COUNT(m_Irp); Index++) @@ -418,6 +418,7 @@ // is this really needed? m_Irp->AssociatedIrp.SystemBuffer = NULL; +#endif // store operation status m_Irp->IoStatus.Status = STATUS_SUCCESS;

1 0

[akhaldi] 49367: [CMAKE] - "cmake gracefully handles def files as source files" You mean it gracefully ignores them, right ? - Fix the kernel and class2 exports. More to come. - Fix imaadp32.acm
by akhaldi＠svn.reactos.org 30 Oct '10

30 Oct '10

Author: akhaldi Date: Sat Oct 30 22:03:40 2010 New Revision: 49367 URL: http://svn.reactos.org/svn/reactos?rev=49367&view=rev Log: [CMAKE] - "cmake gracefully handles def files as source files" You mean it gracefully ignores them, right ? - Fix the kernel and class2 exports. More to come. - Fix imaadp32.acm Modified: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3… ============================================================================== --- branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] Sat Oct 30 22:03:40 2010 @@ -6,14 +6,14 @@ spec2def(imaadp32.acm imaadp32.acm.spec) -add_library(imaadp32 SHARED imaadp32.c +add_library(imaadp32.acm SHARED imaadp32.c ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.def) -set_entrypoint(imaadp32 0) -set_target_properties(imaadp32 PROPERTIES SUFFIX "acm") +set_entrypoint(imaadp32.acm 0) +set_target_properties(imaadp32.acm PROPERTIES SUFFIX ".acm") -target_link_libraries(imaadp32 wine) +target_link_libraries(imaadp32.acm wine) -add_importlibs(imaadp32 winmm user32 msvcrt kernel32 ntdll) -add_dependencies(imaadp32 psdk buildno_header) -add_cab_target(imaadp32 1) +add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll) +add_dependencies(imaadp32.acm psdk buildno_header) +add_cab_target(imaadp32.acm 1) Modified: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] Sat Oct 30 22:03:40 2010 @@ -5,12 +5,12 @@ spec2def(class2.sys class2.spec) -add_library(class2 SHARED class2.c class2.rc - ${CMAKE_CURRENT_BINARY_DIR}/class2.def) +add_library(class2 SHARED class2.c class2.rc) set_target_properties(class2 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(class2 + ${CMAKE_CURRENT_BINARY_DIR}/class2.def -lscsiport -lntoskrnl -lhal) Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Sat Oct 30 22:03:40 2010 @@ -241,8 +241,7 @@ vf/driver.c wmi/wmi.c ntoskrnl.rc - ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S - ${CMAKE_CURRENT_SOURCE_DIR}/ntoskrnl_${ARCH}.def) + ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S) if(ARCH MATCHES i386) list(APPEND SOURCE @@ -405,6 +404,7 @@ set_target_properties(ntoskrnl PROPERTIES LINK_FLAGS "-Wl,-entry,_KiSystemStartup@4 -Wl,--image-base,0x80800000 -Wl,--subsystem,native") target_link_libraries(ntoskrnl + ${CMAKE_CURRENT_SOURCE_DIR}/ntoskrnl_${ARCH}.def cportlib csq -lhal

1 0

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 October 2010