Ros-diffs November 2009

ros-diffs@reactos.org

23 participants
444 discussions

[janderwald] 44326: [WDMAUD.DRV] - Implement support for resetting a stream (not yet used) - Don't translate the error again in QueryMixerInfo as SyncOverlappedDeviceIoControl has already translated the error - Don't touch the cbSize member when opening a wave device, as the caller might have passed a WAVEFORMAT struct instead a WAVEFORMATEX struct. Fixes winmm_winetest wave / mixer crashs - Query all available events when an mixer event is fired

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Nov 29 23:58:33 2009 New Revision: 44326 URL: http://svn.reactos.org/svn/reactos?rev=44326&view=rev Log: [WDMAUD.DRV] - Implement support for resetting a stream (not yet used) - Don't translate the error again in QueryMixerInfo as SyncOverlappedDeviceIoControl has already translated the error - Don't touch the cbSize member when opening a wave device, as the caller might have passed a WAVEFORMAT struct instead a WAVEFORMATEX struct. Fixes winmm_winetest wave / mixer crashs - Query all available events when an mixer event is fired Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c 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 Nov 29 23:58:33 2009 @@ -321,24 +321,27 @@ break; } - Result = SyncOverlappedDeviceIoControl(KernelHandle, - IOCTL_GET_MIXER_EVENT, - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - (LPVOID) &DeviceInfo, - sizeof(WDMAUD_DEVICE_INFO), - NULL); - - if (Result == MMSYSERR_NOERROR) - { - DriverCallback(Instance->WinMM.ClientCallback, - HIWORD(Instance->WinMM.Flags), - Instance->WinMM.Handle, - DeviceInfo.u.MixerEvent.NotificationType, - Instance->WinMM.ClientCallbackInstanceData, - (DWORD_PTR)DeviceInfo.u.MixerEvent.Value, - 0); - } + do + { + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_GET_MIXER_EVENT, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + + if (Result == MMSYSERR_NOERROR) + { + DriverCallback(Instance->WinMM.ClientCallback, + HIWORD(Instance->WinMM.Flags), + Instance->WinMM.Handle, + DeviceInfo.u.MixerEvent.NotificationType, + Instance->WinMM.ClientCallbackInstanceData, + (DWORD_PTR)DeviceInfo.u.MixerEvent.Value, + 0); + } + }while(Result == MMSYSERR_NOERROR); }while(TRUE); /* done */ @@ -443,7 +446,7 @@ ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); DeviceInfo.DeviceType = DeviceType; DeviceInfo.DeviceIndex = DeviceId; - DeviceInfo.u.WaveFormatEx.cbSize = WaveFormat->cbSize; + DeviceInfo.u.WaveFormatEx.cbSize = sizeof(WAVEFORMATEX); //WaveFormat->cbSize; DeviceInfo.u.WaveFormatEx.wFormatTag = WaveFormat->wFormatTag; #ifdef USERMODE_MIXER DeviceInfo.u.WaveFormatEx.nChannels = 2; @@ -747,6 +750,35 @@ } MMRESULT +ResetStream( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN MMDEVICE_TYPE DeviceType, + IN BOOLEAN bStartReset) +{ + MMRESULT Result; + HANDLE Handle; + WDMAUD_DEVICE_INFO DeviceInfo; + + Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.hDevice = Handle; + DeviceInfo.DeviceType = DeviceType; + DeviceInfo.u.ResetStream = (bStartReset ? KSRESET_BEGIN : KSRESET_END); + + Result = SyncOverlappedDeviceIoControl(KernelHandle, + IOCTL_RESET_STREAM, + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + (LPVOID) &DeviceInfo, + sizeof(WDMAUD_DEVICE_INFO), + NULL); + return Result; +} + + +MMRESULT QueryMixerInfo( IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, IN UINT uMsg, @@ -808,7 +840,7 @@ if ( ! MMSUCCESS(Result) ) { - return TranslateInternalMmResult(Result); + return Result; } switch(uMsg) @@ -876,6 +908,7 @@ if (DeviceType == WAVE_IN_DEVICE_TYPE || DeviceType == WAVE_OUT_DEVICE_TYPE) { FuncTable.SetState = SetWdmWaveState; + FuncTable.ResetStream = ResetStream; } FuncTable.Open = OpenWdmSoundDevice;

14 years, 10 months

[janderwald] 44325: [MMEBUDDY] - Return correct error code - Fixes last 4 four winmm_winetest mixer test failures

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Nov 29 22:17:15 2009 New Revision: 44325 URL: http://svn.reactos.org/svn/reactos?rev=44325&view=rev Log: [MMEBUDDY] - Return correct error code - Fixes last 4 four winmm_winetest mixer test failures Modified: trunk/reactos/lib/drivers/sound/mmebuddy/utility.c Modified: trunk/reactos/lib/drivers/sound/mmebuddy/utility.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] Sun Nov 29 22:17:15 2009 @@ -113,6 +113,10 @@ case ERROR_INSUFFICIENT_BUFFER : return MMSYSERR_INVALPARAM; + case ERROR_INVALID_PARAMETER : + return MMSYSERR_INVALPARAM; + + default : return MMSYSERR_ERROR; }

14 years, 10 months

[janderwald] 44324: - Partly revert 44309 as it sometimes causes problems

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Nov 29 20:29:52 2009 New Revision: 44324 URL: http://svn.reactos.org/svn/reactos?rev=44324&view=rev Log: - Partly revert 44309 as it sometimes causes problems Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Sun Nov 29 20:29:52 2009 @@ -415,10 +415,10 @@ IN PKSIDENTIFIER Request, IN OUT PVOID Data) { + NTSTATUS Status = STATUS_UNSUCCESSFUL; CPortPinWaveCyclic *Pin; PSUBDEVICE_DESCRIPTOR Descriptor; PKSSTATE State = (PKSSTATE)Data; - PSETPIN_CONTEXT PinWorkContext; // get sub device descriptor Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); @@ -436,20 +436,24 @@ if (Request->Flags & KSPROPERTY_TYPE_SET) { - PinWorkContext = (PSETPIN_CONTEXT)AllocateItem(NonPagedPool, sizeof(PSETPIN_CONTEXT), TAG_PORTCLASS); - PC_ASSERT(PinWorkContext); - - PinWorkContext->WorkItem = IoAllocateWorkItem(IoGetCurrentIrpStackLocation(Irp)->DeviceObject); - PC_ASSERT(PinWorkContext->WorkItem); - // initialize work item context - PinWorkContext->NewState = *State; - PinWorkContext->Pin = Pin; - PinWorkContext->Irp = Irp; - - IoMarkIrpPending(Irp); - - IoQueueWorkItem(PinWorkContext->WorkItem, PinSetStateWorkerRoutine, DelayedWorkQueue, (PVOID)PinWorkContext); - return STATUS_PENDING; + // try set stream + Status = Pin->m_Stream->SetState(*State); + + DPRINT("Setting state %u %x\n", *State, Status); + if (NT_SUCCESS(Status)) + { + // store new state + Pin->m_State = *State; + + if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_LOOPED_STREAMING && Pin->m_State == KSSTATE_STOP) + { + // FIXME + // complete with successful state + Pin->m_IrpQueue->CancelBuffers(); + } + // store result + Irp->IoStatus.Information = sizeof(KSSTATE); + } } else if (Request->Flags & KSPROPERTY_TYPE_GET) { @@ -457,7 +461,7 @@ *State = Pin->m_State; // store result Irp->IoStatus.Information = sizeof(KSSTATE); - DPRINT1("Getting state %u %x\n", *State, STATUS_SUCCESS); + return STATUS_SUCCESS; } @@ -1243,8 +1247,8 @@ m_Port = Port; m_Filter = Filter; - DPRINT("Setting state to acquire %x\n", m_Stream->SetState(KSSTATE_ACQUIRE)); - DPRINT("Setting state to pause %x\n", m_Stream->SetState(KSSTATE_PAUSE)); + //DPRINT("Setting state to acquire %x\n", m_Stream->SetState(KSSTATE_ACQUIRE)); + //DPRINT("Setting state to pause %x\n", m_Stream->SetState(KSSTATE_PAUSE)); return STATUS_SUCCESS; }

14 years, 10 months

[janderwald] 44323: [WDMAUD_KERNEL] - Always set Mute control on first channel [PORTCLS] - Rewrite node property handling. Fixes lots of bugs and fixes all winmm_winetest mixer failures

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Nov 29 19:56:56 2009 New Revision: 44323 URL: http://svn.reactos.org/svn/reactos?rev=44323&view=rev Log: [WDMAUD_KERNEL] - Always set Mute control on first channel [PORTCLS] - Rewrite node property handling. Fixes lots of bugs and fixes all winmm_winetest mixer failures Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Sun Nov 29 19:56:56 2009 @@ -1243,8 +1243,8 @@ m_Port = Port; m_Filter = Filter; - //DPRINT("Setting state to acquire %x\n", m_Stream->SetState(KSSTATE_ACQUIRE)); - //DPRINT("Setting state to pause %x\n", m_Stream->SetState(KSSTATE_PAUSE)); + DPRINT("Setting state to acquire %x\n", m_Stream->SetState(KSSTATE_ACQUIRE)); + DPRINT("Setting state to pause %x\n", m_Stream->SetState(KSSTATE_PAUSE)); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Sun Nov 29 19:56:56 2009 @@ -86,6 +86,269 @@ return KsDisableEvent(Irp, Descriptor->EventList, KSEVENTS_SPINLOCK, (PVOID)Descriptor->EventListLock); } +NTSTATUS +PcHandleGuidNullRequest( + IN OUT PIRP Irp, + IN PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor) +{ + PPCNODE_DESCRIPTOR Node; + PPCPROPERTY_ITEM PropertyItem; + PIO_STACK_LOCATION IoStack; + PKSP_NODE Property; + LPGUID Buffer; + ULONG Count = 0, SubIndex, Index; + + // get current irp stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + + // access property + Property = (PKSP_NODE)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + if (Property->NodeId >= SubDeviceDescriptor->DeviceDescriptor->NodeCount) + { + // request is out of bounds + Irp->IoStatus.Information = 0; + return STATUS_INVALID_PARAMETER; + } + + Node = (PPCNODE_DESCRIPTOR)((ULONG_PTR)SubDeviceDescriptor->DeviceDescriptor->Nodes + (Property->NodeId * SubDeviceDescriptor->DeviceDescriptor->NodeSize)); + + if (!Node->AutomationTable) + { + // request is out of bounds + Irp->IoStatus.Information = 0; + return STATUS_INVALID_PARAMETER; + } + + PC_ASSERT(Node->AutomationTable); + PC_ASSERT(Node->AutomationTable->PropertyCount); + PC_ASSERT(Node->AutomationTable->PropertyItemSize); + + Buffer = (LPGUID)AllocateItem(NonPagedPool, sizeof (GUID) * Node->AutomationTable->PropertyCount, TAG_PORTCLASS); + if (!Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + + PropertyItem = (PCPROPERTY_ITEM*)Node->AutomationTable->Properties; + for (Index = 0; Index < Node->AutomationTable->PropertyCount; Index++) + { + BOOL Found = FALSE; + for (SubIndex = 0; SubIndex < Count; Index++) + { + if (IsEqualGUIDAligned(Buffer[SubIndex], *PropertyItem->Set)) + { + Found = TRUE; + break; + } + } + if (!Found) + { + RtlMoveMemory(&Buffer[Count], PropertyItem->Set, sizeof (GUID)); + Count++; + } + PropertyItem = (PPCPROPERTY_ITEM)((ULONG_PTR)PropertyItem + Node->AutomationTable->PropertyItemSize); + } + + // store result length + Irp->IoStatus.Information = sizeof (GUID) * Count; + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof (GUID) * Count) + { + // buffer too small + FreeItem(Buffer, TAG_PORTCLASS); + return STATUS_MORE_ENTRIES; + } + + RtlMoveMemory(Irp->UserBuffer, Buffer, sizeof (GUID) * Count); + FreeItem(Buffer, TAG_PORTCLASS); + return STATUS_SUCCESS; +} + +NTSTATUS +PcFindNodePropertyHandler( + PIRP Irp, + PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor, + OUT PPCPROPERTY_ITEM * OutPropertyItem) +{ + PPCNODE_DESCRIPTOR Node; + PPCPROPERTY_ITEM PropertyItem; + PIO_STACK_LOCATION IoStack; + PKSP_NODE Property; + ULONG Index; + + // get current irp stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // access property + Property = (PKSP_NODE)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + if (Property->NodeId >= SubDeviceDescriptor->DeviceDescriptor->NodeCount) + { + // request is out of bounds + DPRINT("InvalidIndex %u %u\n", Property->NodeId, SubDeviceDescriptor->DeviceDescriptor->NodeCount); + return STATUS_INVALID_PARAMETER; + } + + Node = (PPCNODE_DESCRIPTOR)((ULONG_PTR)SubDeviceDescriptor->DeviceDescriptor->Nodes + (Property->NodeId * SubDeviceDescriptor->DeviceDescriptor->NodeSize)); + + if (!Node->AutomationTable) + { + // request is out of bounds + Irp->IoStatus.Information = 0; + return STATUS_NOT_FOUND; + } + + // sanity checks + PC_ASSERT(Node->AutomationTable); + PC_ASSERT(Node->AutomationTable->PropertyCount); + PC_ASSERT(Node->AutomationTable->PropertyItemSize); + + PropertyItem = (PCPROPERTY_ITEM*)Node->AutomationTable->Properties; + + DPRINT("NodeId %u PropertyCount %u\n", Property->NodeId, Node->AutomationTable->PropertyCount); + for(Index = 0; Index < Node->AutomationTable->PropertyCount; Index++) + { + if (IsEqualGUIDAligned(*PropertyItem->Set, Property->Property.Set) && PropertyItem->Id == Property->Property.Id) + { + //found property handler + *OutPropertyItem = PropertyItem; + return STATUS_SUCCESS; + } + PropertyItem = (PPCPROPERTY_ITEM)((ULONG_PTR)PropertyItem + Node->AutomationTable->PropertyItemSize); + } + + // no handler yet found + DPRINT("NotFound\n"); + return STATUS_NOT_FOUND; +} + +NTSTATUS +PcNodeBasicSupportHandler( + PIRP Irp, + PPCPROPERTY_ITEM PropertyItem) +{ + PULONG Flags; + PIO_STACK_LOCATION IoStack; + PKSPROPERTY_DESCRIPTION Description; + PKSP_NODE Property; + + // get current irp stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // access property + Property = (PKSP_NODE)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + PC_ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(ULONG)); + Flags= (PULONG)Irp->UserBuffer; + + // reset flags + *Flags = 0; + + if (PropertyItem->Flags & KSPROPERTY_TYPE_SET) + *Flags |= KSPROPERTY_TYPE_SET; + + if (PropertyItem->Flags & KSPROPERTY_TYPE_GET) + *Flags |= KSPROPERTY_TYPE_GET; + + // store result length + Irp->IoStatus.Information = sizeof(ULONG); + + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(KSPROPERTY_DESCRIPTION)) + { + // get output buffer + Description = (PKSPROPERTY_DESCRIPTION)Irp->UserBuffer; + + // store result + Description->DescriptionSize = sizeof(KSPROPERTY_DESCRIPTION); + Description->PropTypeSet.Set = KSPROPTYPESETID_General; + Description->PropTypeSet.Id = 0; + Description->PropTypeSet.Flags = 0; + Description->MembersListCount = 0; + Description->Reserved = 0; + + Irp->IoStatus.Information = sizeof(KSPROPERTY_DESCRIPTION); + } + return STATUS_SUCCESS; +} + + +NTSTATUS +PcHandleNodePropertyRequest( + PIRP Irp, + IN PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor) +{ + PIO_STACK_LOCATION IoStack; + PPCPROPERTY_ITEM PropertyItem; + PPCPROPERTY_REQUEST PropertyRequest; + PKSP_NODE Property; + NTSTATUS Status; + + // get current irp stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSP_NODE)) + { + // certainly not a node property request + return STATUS_NOT_FOUND; + } + + // access property + Property = (PKSP_NODE)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + if (IsEqualGUIDAligned(Property->Property.Set, GUID_NULL) && Property->Property.Id == 0 && Property->Property.Flags == (KSPROPERTY_TYPE_SETSUPPORT | KSPROPERTY_TYPE_TOPOLOGY)) + { + return PcHandleGuidNullRequest(Irp, SubDeviceDescriptor); + } + + // find property handler + Status = PcFindNodePropertyHandler(Irp, SubDeviceDescriptor, &PropertyItem); + + // check for success + if (!NT_SUCCESS(Status)) + { + // might not be a node property request + DPRINT("NotFound\n"); + return STATUS_NOT_FOUND; + } + + if (Property->Property.Flags & KSPROPERTY_TYPE_BASICSUPPORT) + { + // caller issued a basic property request + if (!(PropertyItem->Flags & KSPROPERTY_TYPE_BASICSUPPORT)) + { + // driver does not have a basic support handler + return PcNodeBasicSupportHandler(Irp, PropertyItem); + } + } + + // allocate a property request + PropertyRequest = (PPCPROPERTY_REQUEST)AllocateItem(NonPagedPool, sizeof(PCPROPERTY_REQUEST), TAG_PORTCLASS); + if (!PropertyRequest) + return STATUS_INSUFFICIENT_RESOURCES; + + PropertyRequest->MajorTarget = SubDeviceDescriptor->UnknownMiniport; + PropertyRequest->MinorTarget = SubDeviceDescriptor->UnknownStream; + PropertyRequest->Irp = Irp; + PropertyRequest->Node = Property->NodeId; + PropertyRequest->PropertyItem = PropertyItem; + PropertyRequest->Verb = Property->Property.Flags; + PropertyRequest->InstanceSize = IoStack->Parameters.DeviceIoControl.InputBufferLength - sizeof(KSNODEPROPERTY); + PropertyRequest->Instance = (PVOID)((ULONG_PTR)IoStack->Parameters.DeviceIoControl.Type3InputBuffer + sizeof(KSNODEPROPERTY)); + PropertyRequest->ValueSize = IoStack->Parameters.DeviceIoControl.OutputBufferLength; + PropertyRequest->Value = Irp->UserBuffer; + + Status = PropertyItem->Handler(PropertyRequest); + + if (Status != STATUS_PENDING) + { + //request completed + Irp->IoStatus.Information = PropertyRequest->ValueSize; + ExFreePool(PropertyRequest); + } + + // done + DPRINT("Status %x\n", Status); + return Status; +} NTSTATUS NTAPI @@ -96,207 +359,19 @@ IN PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor) { NTSTATUS Status; - PIO_STACK_LOCATION IoStack; - PKSP_NODE Property; - PPCNODE_DESCRIPTOR Node; - PPCPROPERTY_ITEM PropertyItem; - ULONG Index; - LPGUID Buffer; - //PULONG Flags; - PPCPROPERTY_REQUEST PropertyRequest; - - KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PKSPROPERTY_ITEM)SubDeviceDescriptor; - - /* try first KsPropertyHandler */ - Status = KsPropertyHandler(Irp, PropertySetCount, PropertySet); - - if (Status != STATUS_NOT_FOUND) - return Status; - - // get current irp stack location - IoStack = IoGetCurrentIrpStackLocation(Irp); - - // access property - Property = (PKSP_NODE)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; - - // check if this a GUID_NULL request + + // try handle it as node property request + Status = PcHandleNodePropertyRequest(Irp, SubDeviceDescriptor); + if (Status == STATUS_NOT_FOUND) { - if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSP_NODE)) - return Status; - - // check if its a request for a topology node - if (IsEqualGUIDAligned(Property->Property.Set, GUID_NULL) && Property->Property.Id == 0 && Property->Property.Flags == (KSPROPERTY_TYPE_SETSUPPORT | KSPROPERTY_TYPE_TOPOLOGY)) - { - if (Property->NodeId >= SubDeviceDescriptor->DeviceDescriptor->NodeCount) - { - // request is out of bounds - Irp->IoStatus.Information = 0; - return STATUS_INVALID_PARAMETER; - } - - Node = (PPCNODE_DESCRIPTOR)((ULONG_PTR)SubDeviceDescriptor->DeviceDescriptor->Nodes + (Property->NodeId * SubDeviceDescriptor->DeviceDescriptor->NodeSize)); - - if (!Node->AutomationTable) - { - // request is out of bounds - Irp->IoStatus.Information = 0; - return STATUS_INVALID_PARAMETER; - } - - PC_ASSERT(Node->AutomationTable); - PC_ASSERT(Node->AutomationTable->PropertyCount); - PC_ASSERT(Node->AutomationTable->PropertyItemSize); - - Buffer = (LPGUID)AllocateItem(NonPagedPool, sizeof (GUID) * Node->AutomationTable->PropertyCount, TAG_PORTCLASS); - if (!Buffer) - return STATUS_INSUFFICIENT_RESOURCES; - - - ULONG Count = 0, SubIndex; - PropertyItem = (PCPROPERTY_ITEM*)Node->AutomationTable->Properties; - for (Index = 0; Index < Node->AutomationTable->PropertyCount; Index++) - { - BOOL Found = FALSE; - for (SubIndex = 0; SubIndex < Count; Index++) - { - if (IsEqualGUIDAligned(Buffer[SubIndex], *PropertyItem->Set)) - { - Found = TRUE; - break; - } - } - if (!Found) - { - RtlMoveMemory(&Buffer[Count], PropertyItem->Set, sizeof (GUID)); - Count++; - } - PropertyItem = (PPCPROPERTY_ITEM)((ULONG_PTR)PropertyItem + Node->AutomationTable->PropertyItemSize); - } - - Irp->IoStatus.Information = sizeof (GUID) * Count; - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof (GUID) * Count) - { - // buffer too small - FreeItem(Buffer, TAG_PORTCLASS); - return STATUS_MORE_ENTRIES; - } - - RtlMoveMemory(Irp->UserBuffer, Buffer, sizeof (GUID) * Count); - FreeItem(Buffer, TAG_PORTCLASS); - return STATUS_SUCCESS; - } - else /*if (Property->Property.Flags == (KSPROPERTY_TYPE_BASICSUPPORT | KSPROPERTY_TYPE_TOPOLOGY) || - Property->Property.Flags == (KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_TOPOLOGY) || - Property->Property.Flags == (KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_TOPOLOGY)) */ - { - //UNICODE_STRING GuidString; - - if (Property->NodeId >= SubDeviceDescriptor->DeviceDescriptor->NodeCount) - { - // request is out of bounds - Irp->IoStatus.Information = 0; - return STATUS_INVALID_PARAMETER; - } - - Node = (PPCNODE_DESCRIPTOR)((ULONG_PTR)SubDeviceDescriptor->DeviceDescriptor->Nodes + (Property->NodeId * SubDeviceDescriptor->DeviceDescriptor->NodeSize)); - - if (!Node->AutomationTable) - { - // request is out of bounds - Irp->IoStatus.Information = 0; - return STATUS_NOT_FOUND; - } - - PC_ASSERT(Node->AutomationTable); - PC_ASSERT(Node->AutomationTable->PropertyCount); - PC_ASSERT(Node->AutomationTable->PropertyItemSize); - - PropertyItem = (PCPROPERTY_ITEM*)Node->AutomationTable->Properties; - - for(Index = 0; Index < Node->AutomationTable->PropertyCount; Index++) - { - if (IsEqualGUIDAligned(*PropertyItem->Set, Property->Property.Set) && PropertyItem->Id == Property->Property.Id) - { - if (Property->Property.Flags & KSPROPERTY_TYPE_BASICSUPPORT) - { - if (!(PropertyItem->Flags & KSPROPERTY_TYPE_BASICSUPPORT)) - { - PC_ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(ULONG)); - PULONG Flags = (PULONG)Irp->UserBuffer; - - /* reset flags */ - *Flags = 0; - - if (PropertyItem->Flags & KSPROPERTY_TYPE_SET) - *Flags |= KSPROPERTY_TYPE_SET; - - if (PropertyItem->Flags & KSPROPERTY_TYPE_GET) - *Flags |= KSPROPERTY_TYPE_GET; - - Irp->IoStatus.Information = sizeof(ULONG); - - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(KSPROPERTY_DESCRIPTION)) - { - /* get output buffer */ - PKSPROPERTY_DESCRIPTION Description = (PKSPROPERTY_DESCRIPTION)Irp->UserBuffer; - - /* store result */ - Description->DescriptionSize = sizeof(KSPROPERTY_DESCRIPTION); - Description->PropTypeSet.Set = KSPROPTYPESETID_General; - Description->PropTypeSet.Id = 0; - Description->PropTypeSet.Flags = 0; - Description->MembersListCount = 0; - Description->Reserved = 0; - - Irp->IoStatus.Information = sizeof(KSPROPERTY_DESCRIPTION); - } - return STATUS_SUCCESS; - } - } - - - PropertyRequest = (PPCPROPERTY_REQUEST)AllocateItem(NonPagedPool, sizeof(PCPROPERTY_REQUEST), TAG_PORTCLASS); - if (!PropertyRequest) - return STATUS_INSUFFICIENT_RESOURCES; - - PC_ASSERT(SubDeviceDescriptor->UnknownMiniport); - PropertyRequest->MajorTarget = SubDeviceDescriptor->UnknownMiniport; - PropertyRequest->MinorTarget = SubDeviceDescriptor->UnknownStream; - PropertyRequest->Irp = Irp; - PropertyRequest->Node = Property->NodeId; - PropertyRequest->PropertyItem = PropertyItem; - PropertyRequest->Verb = Property->Property.Flags; - PropertyRequest->InstanceSize = IoStack->Parameters.DeviceIoControl.InputBufferLength - sizeof(KSNODEPROPERTY); - PropertyRequest->Instance = (PVOID)((ULONG_PTR)IoStack->Parameters.DeviceIoControl.Type3InputBuffer + sizeof(KSNODEPROPERTY)); - PropertyRequest->ValueSize = IoStack->Parameters.DeviceIoControl.OutputBufferLength; - PropertyRequest->Value = Irp->UserBuffer; - - Status = PropertyItem->Handler(PropertyRequest); - - if (Status != STATUS_PENDING) - { - //DPRINT("Status %x ValueSize %u - - Irp->IoStatus.Information = PropertyRequest->ValueSize; - ExFreePool(PropertyRequest); - } -#if 0 - RtlStringFromGUID(Property->Property.Set, &GuidString); - DPRINT("Id %u Flags %x Set %S FlagsItem %x Status %x\n", Property->Property.Id, Property->Property.Flags, GuidString.Buffer, PropertyItem->Flags, Status); - RtlFreeUnicodeString(&GuidString); -#endif - return Status; - } - PropertyItem = (PPCPROPERTY_ITEM)((ULONG_PTR)PropertyItem + Node->AutomationTable->PropertyItemSize); - } -#if 0 - RtlStringFromGUID(Property->Property.Set, &GuidString); - DPRINT("Id %u Flags %x Set %S Status %x\n", Property->Property.Id, Property->Property.Flags, GuidString.Buffer, Status); - RtlFreeUnicodeString(&GuidString); -#endif - } - } + // store device descriptor + KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PKSPROPERTY_ITEM)SubDeviceDescriptor; + + /* then try KsPropertyHandler */ + Status = KsPropertyHandler(Irp, PropertySetCount, PropertySet); + } + return Status; } Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Sun Nov 29 19:56:56 2009 @@ -2162,7 +2162,7 @@ Value = Input->fValue; /* set control details */ - Status = SetGetControlDetails(DeviceObject, DeviceId, NodeId, DeviceInfo, bSet, KSPROPERTY_AUDIO_MUTE, MAXULONG, &Value); + Status = SetGetControlDetails(DeviceObject, DeviceId, NodeId, DeviceInfo, bSet, KSPROPERTY_AUDIO_MUTE, 0, &Value); if (!NT_SUCCESS(Status)) return Status;

14 years, 10 months

[gschneider] 44322: [setupapi] Sync SetupGetIntField to Wine, fixes six setupapi:parser tests

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun Nov 29 19:07:14 2009 New Revision: 44322 URL: http://svn.reactos.org/svn/reactos?rev=44322&view=rev Log: [setupapi] Sync SetupGetIntField to Wine, fixes six setupapi:parser tests Modified: trunk/reactos/dll/win32/setupapi/parser.c Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] Sun Nov 29 19:07:14 2009 @@ -1894,21 +1894,26 @@ char *end, *buffer = localbuff; DWORD required; INT res; - BOOL ret = FALSE; - - if (!SetupGetStringFieldA( context, index, localbuff, sizeof(localbuff), &required )) + BOOL ret; + + if (!(ret = SetupGetStringFieldA( context, index, localbuff, sizeof(localbuff), &required ))) { if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, required ))) return FALSE; - if (!SetupGetStringFieldA( context, index, buffer, required, NULL )) goto done; - } - res = strtol( buffer, &end, 0 ); - if (end != buffer && !*end) - { - *result = res; - ret = TRUE; - } - else SetLastError( ERROR_INVALID_DATA ); + if (!(ret = SetupGetStringFieldA( context, index, buffer, required, NULL ))) goto done; + } + /* The call to SetupGetStringFieldA succeeded. If buffer is empty we have an optional field */ + if (!*buffer) *result = 0; + else + { + res = strtol( buffer, &end, 0 ); + if (end != buffer && !*end) *result = res; + else + { + SetLastError( ERROR_INVALID_DATA ); + ret = FALSE; + } + } done: if (buffer != localbuff) HeapFree( GetProcessHeap(), 0, buffer );

14 years, 10 months

[tkreuzer] 44321: [MM] - Fix calculation of MemoryArea size for the Page tables - Fix debug output for page table and hyperspace addresses

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 29 16:55:46 2009 New Revision: 44321 URL: http://svn.reactos.org/svn/reactos?rev=44321&view=rev Log: [MM] - Fix calculation of MemoryArea size for the Page tables - Fix debug output for page table and hyperspace addresses Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sun Nov 29 16:55:46 2009 @@ -84,7 +84,7 @@ Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, &BaseAddress, - PTE_BASE - PTE_TOP + 1, + PTE_TOP - PTE_BASE + 1, PAGE_READWRITE, &MArea, TRUE, @@ -308,13 +308,13 @@ MiSessionSpaceEnd, "Session Space"); DPRINT1(" 0x%p - 0x%p\t%s\n", - PTE_BASE, PDE_BASE, + PTE_BASE, PTE_TOP, "Page Tables"); DPRINT1(" 0x%p - 0x%p\t%s\n", - PDE_BASE, HYPER_SPACE, + PDE_BASE, PDE_TOP, "Page Directories"); DPRINT1(" 0x%p - 0x%p\t%s\n", - HYPER_SPACE, HYPER_SPACE + (4 * 1024 * 1024), + HYPER_SPACE, HYPER_SPACE_END, "Hyperspace"); DPRINT1(" 0x%p - 0x%p\t%s\n", MmPagedPoolStart,

14 years, 10 months

[tkreuzer] 44320: [MM] MiReloadBootLoadedDrivers: - Allow images with relocations stripped. - Make sure NumberOfRvaAndSizes is *>* IMAGE_DIRECTORY_ENTRY_BASERELOC (== is not enough) - Move one ASSERT, remove a useless ASSERT

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 29 16:51:46 2009 New Revision: 44320 URL: http://svn.reactos.org/svn/reactos?rev=44320&view=rev Log: [MM] MiReloadBootLoadedDrivers: - Allow images with relocations stripped. - Make sure NumberOfRvaAndSizes is *>* IMAGE_DIRECTORY_ENTRY_BASERELOC (== is not enough) - Move one ASSERT, remove a useless ASSERT Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Sun Nov 29 16:51:46 2009 @@ -1200,10 +1200,13 @@ PIMAGE_NT_HEADERS NtHeader; PLDR_DATA_TABLE_ENTRY LdrEntry; PIMAGE_FILE_HEADER FileHeader; - BOOLEAN ValidRelocs; + BOOLEAN ValidRelocs = FALSE; PIMAGE_DATA_DIRECTORY DataDirectory; PVOID DllBase, NewImageAddress; NTSTATUS Status; + + /* Sanity check */ + ASSERT(ExpInitializationPhase == 0); /* Loop driver list */ for (NextEntry = LoaderBlock->LoadOrderListHead.Flink; @@ -1230,32 +1233,28 @@ /* Skip non-drivers */ if (!NtHeader) continue; - /* Get the file header and make sure we can relocate */ + /* Get the file header and check if we can relocate */ FileHeader = &NtHeader->FileHeader; - if (FileHeader->Characteristics & IMAGE_FILE_RELOCS_STRIPPED) continue; - if (NtHeader->OptionalHeader.NumberOfRvaAndSizes < - IMAGE_DIRECTORY_ENTRY_BASERELOC) continue; - - /* Everything made sense until now, check the relocation section too */ - DataDirectory = &NtHeader->OptionalHeader. - DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; - if (!DataDirectory->VirtualAddress) - { - /* We don't really have relocations */ - ValidRelocs = FALSE; - } - else - { - /* Make sure the size is valid */ - if ((DataDirectory->VirtualAddress + DataDirectory->Size) > - LdrEntry->SizeOfImage) + if ( !(FileHeader->Characteristics & IMAGE_FILE_RELOCS_STRIPPED) && + (NtHeader->OptionalHeader.NumberOfRvaAndSizes > + IMAGE_DIRECTORY_ENTRY_BASERELOC) ) + { + /* Everything made sense until now, check the relocation section too */ + DataDirectory = &NtHeader->OptionalHeader. + DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + if (DataDirectory->VirtualAddress) { - /* They're not, skip */ - continue; + /* Make sure the size is valid */ + if ((DataDirectory->VirtualAddress + DataDirectory->Size) > + LdrEntry->SizeOfImage) + { + /* They're not, skip */ + continue; + } + + /* We have relocations */ + ValidRelocs = TRUE; } - - /* We have relocations */ - ValidRelocs = TRUE; } /* Remember the original address */ @@ -1270,9 +1269,7 @@ while (TRUE); } - /* Sanity check */ DPRINT("[Mm0]: Copying from: %p to: %p\n", DllBase, NewImageAddress); - ASSERT(ExpInitializationPhase == 0); /* Now copy the entire driver over */ RtlCopyMemory(NewImageAddress, DllBase, LdrEntry->SizeOfImage);

14 years, 10 months

[tkreuzer] 44319: [MM] MmCreateMemoryArea: Make tmpLength an ULONG_PTR, so it dowsn't overflow on 64 bit

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 29 16:26:31 2009 New Revision: 44319 URL: http://svn.reactos.org/svn/reactos?rev=44319&view=rev Log: [MM] MmCreateMemoryArea: Make tmpLength an ULONG_PTR, so it dowsn't overflow on 64 bit Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun Nov 29 16:26:31 2009 @@ -929,7 +929,7 @@ { PVOID EndAddress; ULONG Granularity; - ULONG tmpLength; + ULONG_PTR tmpLength; PMEMORY_AREA MemoryArea; DPRINT("MmCreateMemoryArea(Type 0x%lx, BaseAddress %p, "

14 years, 10 months

[mjmartin] 44318: [ntdll] - Implement LdrLockLoaderLock and LdrUnlockLoaderLock.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sun Nov 29 11:53:39 2009 New Revision: 44318 URL: http://svn.reactos.org/svn/reactos?rev=44318&view=rev Log: [ntdll] - Implement LdrLockLoaderLock and LdrUnlockLoaderLock. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Sun Nov 29 11:53:39 2009 @@ -3382,8 +3382,55 @@ OUT PULONG Disposition OPTIONAL, OUT PULONG Cookie OPTIONAL) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + BOOLEAN Ret; + BOOLEAN CookieSet = FALSE; + + if ((Flags != 0x01) && (Flags != 0x02)) + return STATUS_INVALID_PARAMETER_1; + + if (!Cookie) return STATUS_INVALID_PARAMETER_3; + + /* Set some defaults for failure while verifying params */ + _SEH2_TRY + { + *Cookie = 0; + CookieSet = TRUE; + if (Disposition) *Disposition = 0; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + if (CookieSet) + Status = STATUS_INVALID_PARAMETER_3; + else + Status = STATUS_INVALID_PARAMETER_2; + } + _SEH2_END; + + if (Flags == 0x01) + { + DPRINT1("Warning: Reporting errors with exception not supported yet!\n"); + RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock); + Status = STATUS_SUCCESS; + + } + else + { + if (!Disposition) return STATUS_INVALID_PARAMETER_2; + + Ret = RtlTryEnterCriticalSection(NtCurrentPeb()->LoaderLock); + + if (Ret) + *Disposition = 0x01; + else + *Disposition = 0x02; + + Status = STATUS_SUCCESS; + } + + /* FIXME: Cookie is based on part of the thread id */ + *Cookie = (ULONG)NtCurrentTeb()->RealClientId.UniqueThread; + return Status; } NTSTATUS @@ -3391,8 +3438,15 @@ LdrUnlockLoaderLock(IN ULONG Flags, IN ULONG Cookie OPTIONAL) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + if (Flags != 0x01) + return STATUS_INVALID_PARAMETER_1; + + if (Cookie != (ULONG)NtCurrentTeb()->RealClientId.UniqueThread) + return STATUS_INVALID_PARAMETER_2; + + RtlLeaveCriticalSection(NtCurrentPeb()->LoaderLock); + + return STATUS_SUCCESS; } BOOLEAN

14 years, 10 months

[dreimer] 44317: funpic.org is bad, now we are @ bplaced.net.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Nov 29 00:03:00 2009 New Revision: 44317 URL: http://svn.reactos.org/svn/reactos?rev=44317&view=rev Log: funpic.org is bad, now we are @ bplaced.net. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Sun Nov 29 00:03:00 2009 @@ -75,7 +75,7 @@ } # The Update Server. -$_ROSBE_URL = "http://dreimer.dr.funpic.org/rosbe" +$_ROSBE_URL = "http://dreimer.bplaced.net/rosbe" # Save the recent dir to cd back there at the end. $_ROSBE_OPATH = "$pwd" Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Sun Nov 29 00:03:00 2009 @@ -17,7 +17,7 @@ title Updating... :: The Update Server. -set _ROSBE_URL=http://dreimer.dr.funpic.org/rosbe +set _ROSBE_URL=http://dreimer.bplaced.net/rosbe :: Save the recent dir to cd back there at the end. set _ROSBE_OPATH=%CD%

14 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2009