Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 50001: [AUDIO-BRINGUP] - Implement a timeout handler, which detects whether the audio thread has hung. The code has not yet been activated - Remove unused members
by janderwald＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: janderwald Date: Fri Dec 10 11:03:28 2010 New Revision: 50001 URL: http://svn.reactos.org/svn/reactos?rev=50001&view=rev Log: [AUDIO-BRINGUP] - Implement a timeout handler, which detects whether the audio thread has hung. The code has not yet been activated - Remove unused members Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… ============================================================================== --- branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Fri Dec 10 11:03:28 2010 @@ -48,6 +48,7 @@ friend NTSTATUS NTAPI PinWaveCyclicAddEndOfStreamEvent(IN PIRP Irp, IN PKSEVENTDATA EventData, IN PKSEVENT_ENTRY EventEntry); friend NTSTATUS NTAPI PinWaveCyclicAddLoopedStreamEvent(IN PIRP Irp, IN PKSEVENTDATA EventData, IN PKSEVENT_ENTRY EventEntry); friend VOID CALLBACK PinSetStateWorkerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); + friend VOID NTAPI PinWaveCyclicIoTimerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); IPortWaveCyclic * m_Port; IPortFilterWaveCyclic * m_Filter; @@ -69,8 +70,7 @@ ULONG m_FrameSize; BOOL m_Capture; - ULONG m_TotalPackets; - ULONG m_StopCount; + ULONGLONG m_TotalPackets; KSAUDIO_POSITION m_Position; KSALLOCATOR_FRAMING m_AllocatorFraming; PSUBDEVICE_DESCRIPTOR m_Descriptor; @@ -81,6 +81,12 @@ KSRESET m_ResetState; ULONG m_Delay; + + ULONGLONG m_GlitchCount; + ULONGLONG m_GlitchLength; + + LARGE_INTEGER m_LastPacketTime; + BOOLEAN m_Started; LONG m_Ref; }; @@ -106,7 +112,7 @@ NTSTATUS NTAPI PinWaveCyclicAddEndOfStreamEvent(IN PIRP Irp, IN PKSEVENTDATA EventData, IN PKSEVENT_ENTRY EventEntry); NTSTATUS NTAPI PinWaveCyclicAddLoopedStreamEvent(IN PIRP Irp, IN PKSEVENTDATA EventData, IN PKSEVENT_ENTRY EventEntry); NTSTATUS NTAPI PinWaveCyclicDRMHandler(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); - +VOID NTAPI PinWaveCyclicIoTimerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); DEFINE_KSPROPERTY_CONNECTIONSET(PinWaveCyclicConnectionSet, PinWaveCyclicState, PinWaveCyclicDataFormat, PinWaveCyclicAllocatorFraming); DEFINE_KSPROPERTY_AUDIOSET(PinWaveCyclicAudioSet, PinWaveCyclicAudioPosition); @@ -175,6 +181,7 @@ //================================================================================================================================== + NTSTATUS NTAPI CPortPinWaveCyclic::QueryInterface( @@ -199,182 +206,6 @@ } return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -PinWaveCyclicDRMHandler( - IN PIRP Irp, - IN PKSIDENTIFIER Request, - IN OUT PVOID Data) -{ - DPRINT1("PinWaveCyclicDRMHandler\n"); - ASSERT(0); - return STATUS_INVALID_PARAMETER; -} - - -NTSTATUS -NTAPI -PinWaveCyclicAddEndOfStreamEvent( - IN PIRP Irp, - IN PKSEVENTDATA EventData, - IN PKSEVENT_ENTRY EventEntry) -{ - PENDOFSTREAM_EVENT_CONTEXT Entry; - PSUBDEVICE_DESCRIPTOR Descriptor; - CPortPinWaveCyclic *Pin; - - // get sub device descriptor - Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); - - // sanity check - PC_ASSERT(Descriptor); - PC_ASSERT(Descriptor->PortPin); - PC_ASSERT_IRQL(DISPATCH_LEVEL); - - // cast to pin impl - Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; - - // get extra size - Entry = (PENDOFSTREAM_EVENT_CONTEXT)(EventEntry + 1); - - // not a looped event - Entry->bLoopedStreaming = FALSE; - - // insert item - (void)ExInterlockedInsertTailList(&Pin->m_EventList, &EventEntry->ListEntry, &Pin->m_EventListLock); - - // done - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -PinWaveCyclicAddLoopedStreamEvent( - IN PIRP Irp, - IN PKSEVENTDATA EventData, - IN PKSEVENT_ENTRY EventEntry) -{ - PLOOPEDSTREAMING_POSITION_EVENT_DATA Data; - PLOOPEDSTREAMING_EVENT_CONTEXT Entry; - PSUBDEVICE_DESCRIPTOR Descriptor; - CPortPinWaveCyclic *Pin; - - // get sub device descriptor - Descriptor = (PSUBDEVICE_DESCRIPTOR)KSEVENT_ITEM_IRP_STORAGE(Irp); - - // sanity check - PC_ASSERT(Descriptor); - PC_ASSERT(Descriptor->PortPin); - PC_ASSERT_IRQL(DISPATCH_LEVEL); - - // cast to pin impl - Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; - - // cast to looped event - Data = (PLOOPEDSTREAMING_POSITION_EVENT_DATA)EventData; - - // get extra size - Entry = (PLOOPEDSTREAMING_EVENT_CONTEXT)(EventEntry + 1); - - Entry->bLoopedStreaming = TRUE; - Entry->Position = Data->Position; - - DPRINT1("Added event\n"); - - // insert item - (void)ExInterlockedInsertTailList(&Pin->m_EventList, &EventEntry->ListEntry, &Pin->m_EventListLock); - - // done - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -PinWaveCyclicAllocatorFraming( - IN PIRP Irp, - IN PKSIDENTIFIER Request, - IN OUT PVOID Data) -{ - CPortPinWaveCyclic *Pin; - PSUBDEVICE_DESCRIPTOR Descriptor; - - // get sub device descriptor - Descriptor = (PSUBDEVICE_DESCRIPTOR)KSEVENT_ITEM_IRP_STORAGE(Irp); - - // sanity check - PC_ASSERT(Descriptor); - PC_ASSERT(Descriptor->PortPin); - PC_ASSERT_IRQL(DISPATCH_LEVEL); - - // cast to pin impl - Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; - - - if (Request->Flags & KSPROPERTY_TYPE_GET) - { - // copy pin framing - RtlMoveMemory(Data, &Pin->m_AllocatorFraming, sizeof(KSALLOCATOR_FRAMING)); - - Irp->IoStatus.Information = sizeof(KSALLOCATOR_FRAMING); - return STATUS_SUCCESS; - } - - // not supported - return STATUS_NOT_SUPPORTED; -} - -NTSTATUS -NTAPI -PinWaveCyclicAudioPosition( - IN PIRP Irp, - IN PKSIDENTIFIER Request, - IN OUT PVOID Data) -{ - CPortPinWaveCyclic *Pin; - PSUBDEVICE_DESCRIPTOR Descriptor; - PKSAUDIO_POSITION Position; - - // get sub device descriptor - Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); - - // sanity check - PC_ASSERT(Descriptor); - PC_ASSERT(Descriptor->PortPin); - PC_ASSERT_IRQL(DISPATCH_LEVEL); - - // cast to pin impl - Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; - - //sanity check - PC_ASSERT(Pin->m_Stream); - - if (Request->Flags & KSPROPERTY_TYPE_GET) - { - // FIXME non multithreading-safe - // copy audio position - - Position = (PKSAUDIO_POSITION)Data; - - if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_STREAMING) - { - RtlMoveMemory(Data, &Pin->m_Position, sizeof(KSAUDIO_POSITION)); - DPRINT("Play %lu Record %lu\n", Pin->m_Position.PlayOffset, Pin->m_Position.WriteOffset); - } - else if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_LOOPED_STREAMING) - { - Position->PlayOffset = Pin->m_Position.PlayOffset; - Position->WriteOffset = (ULONGLONG)Pin->m_IrpQueue->GetCurrentIrpOffset(); - DPRINT("Play %lu Write %lu\n", Position->PlayOffset, Position->WriteOffset); - } - - Irp->IoStatus.Information = sizeof(KSAUDIO_POSITION); - return STATUS_SUCCESS; - } - - // not supported - return STATUS_NOT_SUPPORTED; } typedef struct @@ -408,17 +239,41 @@ { /* FIXME complete pending irps with successfull state */ PinWorkContext->Pin->m_IrpQueue->CancelBuffers(); - } - //HACK - //PinWorkContext->Pin->m_IrpQueue->CancelBuffers(); + PinWorkContext->Pin->m_Stream->Silence(PinWorkContext->Pin->m_CommonBuffer, PinWorkContext->Pin->m_CommonBufferSize); + PinWorkContext->Pin->m_IrpQueue->CancelBuffers(); + PinWorkContext->Pin->m_Position.PlayOffset = 0; + PinWorkContext->Pin->m_Position.WriteOffset = 0; + PinWorkContext->Pin->m_GlitchCount = 0; + PinWorkContext->Pin->m_GlitchLength = 0; + + // unregister the time out + PcUnregisterIoTimeout(GetDeviceObject(PinWorkContext->Pin->m_Port), PinWaveCyclicIoTimerRoutine, (PVOID)PinWorkContext->Pin); + } + else if (PinWorkContext->Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_STREAMING && PinWorkContext->Pin->m_State == KSSTATE_STOP) + { + /* FIXME complete pending irps with successfull state */ + PinWorkContext->Pin->m_IrpQueue->CancelBuffers(); + PinWorkContext->Pin->m_Stream->Silence(PinWorkContext->Pin->m_CommonBuffer, PinWorkContext->Pin->m_CommonBufferSize); + PinWorkContext->Pin->m_IrpQueue->CancelBuffers(); + PinWorkContext->Pin->m_Position.PlayOffset = 0; + PinWorkContext->Pin->m_Position.WriteOffset = 0; + PinWorkContext->Pin->m_GlitchCount = 0; + PinWorkContext->Pin->m_GlitchLength = 0; + + // unregister the time out + PcUnregisterIoTimeout(GetDeviceObject(PinWorkContext->Pin->m_Port), PinWaveCyclicIoTimerRoutine, (PVOID)PinWorkContext->Pin); + } } // store result - PinWorkContext->Irp->IoStatus.Information = sizeof(KSSTATE); - PinWorkContext->Irp->IoStatus.Status = Status; - - // complete irp - IoCompleteRequest(PinWorkContext->Irp, IO_NO_INCREMENT); + if (PinWorkContext->Irp) + { + PinWorkContext->Irp->IoStatus.Information = sizeof(KSSTATE); + PinWorkContext->Irp->IoStatus.Status = Status; + + // complete irp + IoCompleteRequest(PinWorkContext->Irp, IO_NO_INCREMENT); + } // free work item IoFreeWorkItem(PinWorkContext->WorkItem); @@ -428,6 +283,244 @@ } +VOID +NTAPI +PinWaveCyclicIoTimerRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + CPortPinWaveCyclic *Pin; + //PSETPIN_CONTEXT Ctx; + LARGE_INTEGER CurrentTime; + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Context; + + /* query system time */ + KeQuerySystemTime(&CurrentTime); + + /* check if the connection matches */ + if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_STREAMING && Pin->m_ResetState == KSRESET_END && Pin->m_State != KSSTATE_STOP && Pin->m_Started) + { + LARGE_INTEGER Diff; + + Diff.QuadPart = CurrentTime.QuadPart - Pin->m_LastPacketTime.QuadPart; + + if (Diff.QuadPart >= Int32x32To64(3000, 10000)) + { + DPRINT1("AudioThread Hang detected: Last Packet %I64u CurrentTime %I64u Diff %I64u\n", Pin->m_LastPacketTime.QuadPart, CurrentTime.QuadPart, Diff.QuadPart); +#if 0 + /* allocate pin context */ + Ctx = (PSETPIN_CONTEXT)AllocateItem(NonPagedPool, sizeof(SETPIN_CONTEXT), TAG_PORTCLASS); + + if (!Ctx) + { + /* no memory */ + return; + } + + /* initialize ctx */ + Ctx->Pin = Pin; + if (Pin->m_State == KSSTATE_RUN) + Ctx->NewState = KSSTATE_PAUSE; + else if (Pin->m_State == KSSTATE_PAUSE) + Ctx->NewState = KSSTATE_ACQUIRE; + else if (Pin->m_State == KSSTATE_ACQUIRE) + Ctx->NewState = KSSTATE_STOP; + + Ctx->WorkItem = IoAllocateWorkItem(DeviceObject); + Ctx->Irp = NULL; + + if (!Ctx->WorkItem) + { + /* no memory */ + FreeItem(Ctx, TAG_PORTCLASS); + return; + } + + /* queue the work item */ + IoQueueWorkItem(Ctx->WorkItem, PinSetStateWorkerRoutine, DelayedWorkQueue, (PVOID)Ctx); +#endif + } + } +} + + +NTSTATUS +NTAPI +PinWaveCyclicDRMHandler( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + DPRINT1("PinWaveCyclicDRMHandler\n"); + ASSERT(0); + return STATUS_INVALID_PARAMETER; +} + + +NTSTATUS +NTAPI +PinWaveCyclicAddEndOfStreamEvent( + IN PIRP Irp, + IN PKSEVENTDATA EventData, + IN PKSEVENT_ENTRY EventEntry) +{ + PENDOFSTREAM_EVENT_CONTEXT Entry; + PSUBDEVICE_DESCRIPTOR Descriptor; + CPortPinWaveCyclic *Pin; + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + PC_ASSERT_IRQL(DISPATCH_LEVEL); + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; + + // get extra size + Entry = (PENDOFSTREAM_EVENT_CONTEXT)(EventEntry + 1); + + // not a looped event + Entry->bLoopedStreaming = FALSE; + + // insert item + (void)ExInterlockedInsertTailList(&Pin->m_EventList, &EventEntry->ListEntry, &Pin->m_EventListLock); + + // done + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PinWaveCyclicAddLoopedStreamEvent( + IN PIRP Irp, + IN PKSEVENTDATA EventData, + IN PKSEVENT_ENTRY EventEntry) +{ + PLOOPEDSTREAMING_POSITION_EVENT_DATA Data; + PLOOPEDSTREAMING_EVENT_CONTEXT Entry; + PSUBDEVICE_DESCRIPTOR Descriptor; + CPortPinWaveCyclic *Pin; + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSEVENT_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + PC_ASSERT_IRQL(DISPATCH_LEVEL); + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; + + // cast to looped event + Data = (PLOOPEDSTREAMING_POSITION_EVENT_DATA)EventData; + + // get extra size + Entry = (PLOOPEDSTREAMING_EVENT_CONTEXT)(EventEntry + 1); + + Entry->bLoopedStreaming = TRUE; + Entry->Position = Data->Position; + + DPRINT1("Added event\n"); + + // insert item + (void)ExInterlockedInsertTailList(&Pin->m_EventList, &EventEntry->ListEntry, &Pin->m_EventListLock); + + // done + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PinWaveCyclicAllocatorFraming( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + CPortPinWaveCyclic *Pin; + PSUBDEVICE_DESCRIPTOR Descriptor; + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSEVENT_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + PC_ASSERT_IRQL(DISPATCH_LEVEL); + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; + + + if (Request->Flags & KSPROPERTY_TYPE_GET) + { + // copy pin framing + RtlMoveMemory(Data, &Pin->m_AllocatorFraming, sizeof(KSALLOCATOR_FRAMING)); + + Irp->IoStatus.Information = sizeof(KSALLOCATOR_FRAMING); + return STATUS_SUCCESS; + } + + // not supported + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PinWaveCyclicAudioPosition( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + CPortPinWaveCyclic *Pin; + PSUBDEVICE_DESCRIPTOR Descriptor; + PKSAUDIO_POSITION Position; + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + PC_ASSERT_IRQL(DISPATCH_LEVEL); + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; + + //sanity check + PC_ASSERT(Pin->m_Stream); + + if (Request->Flags & KSPROPERTY_TYPE_GET) + { + // FIXME non multithreading-safe + // copy audio position + + Position = (PKSAUDIO_POSITION)Data; + + if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_STREAMING) + { + RtlMoveMemory(Data, &Pin->m_Position, sizeof(KSAUDIO_POSITION)); + DPRINT("Play %I64u Record %I64u\n", Pin->m_Position.PlayOffset, Pin->m_Position.WriteOffset); + } + else if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_LOOPED_STREAMING) + { + Position->PlayOffset = Pin->m_Position.PlayOffset; + Position->WriteOffset = (ULONGLONG)Pin->m_IrpQueue->GetCurrentIrpOffset(); + DPRINT("Play %I64u Write %I64u\n", Position->PlayOffset, Position->WriteOffset); + } + + Irp->IoStatus.Information = sizeof(KSAUDIO_POSITION); + return STATUS_SUCCESS; + } + + // not supported + return STATUS_NOT_SUPPORTED; +} NTSTATUS NTAPI @@ -470,20 +563,46 @@ { // FIXME // complete with successful state + DPRINT1("BytesPlayed %I64u, GlitchCount %I64u GlitchLength %I64u\n", Pin->m_Position.PlayOffset, Pin->m_GlitchCount, Pin->m_GlitchLength); Pin->m_Stream->Silence(Pin->m_CommonBuffer, Pin->m_CommonBufferSize); Pin->m_IrpQueue->CancelBuffers(); Pin->m_Position.PlayOffset = 0; Pin->m_Position.WriteOffset = 0; + Pin->m_GlitchCount = 0; + Pin->m_GlitchLength = 0; + + + // unregister the time out + PcUnregisterIoTimeout(GetDeviceObject(Pin->m_Port), PinWaveCyclicIoTimerRoutine, (PVOID)Pin); } else if (Pin->m_State == KSSTATE_STOP) { + DPRINT1("BytesPlayed %I64u, GlitchCount %I64u GlitchLength %I64u\n", Pin->m_Position.PlayOffset, Pin->m_GlitchCount, Pin->m_GlitchLength); Pin->m_Stream->Silence(Pin->m_CommonBuffer, Pin->m_CommonBufferSize); Pin->m_IrpQueue->CancelBuffers(); Pin->m_Position.PlayOffset = 0; Pin->m_Position.WriteOffset = 0; + Pin->m_GlitchCount = 0; + Pin->m_GlitchLength = 0; + + // unregister the time out + PcUnregisterIoTimeout(GetDeviceObject(Pin->m_Port), PinWaveCyclicIoTimerRoutine, (PVOID)Pin); } // store result Irp->IoStatus.Information = sizeof(KSSTATE); + + if (*State == KSSTATE_RUN) + { + // register wave hung routine + NTSTATUS PcStatus = PcRegisterIoTimeout(GetDeviceObject(Pin->m_Port), PinWaveCyclicIoTimerRoutine, (PVOID)Pin); + if (!NT_SUCCESS(PcStatus)) + { + DPRINT1("Failed to register timer routine with %x\n", PcStatus); + } + + // set flag that stream has started for the wave hung routine + Pin->m_Started = TRUE; + } } return Status; } @@ -701,8 +820,10 @@ Gap = Position - m_CommonBufferOffset; if (Gap > BufferLength) { + // increment glitchcount + m_GlitchCount++; + m_GlitchLength += BufferLength; // insert silence samples - DPRINT1("Inserting Silence Buffer Offset %lu GapLength %lu\n", m_CommonBufferOffset, BufferLength); m_Stream->Silence((PUCHAR)m_CommonBuffer + m_CommonBufferOffset, BufferLength); m_CommonBufferOffset += BufferLength; @@ -760,8 +881,11 @@ Gap = m_CommonBufferSize - m_CommonBufferOffset + Position; if (Gap > BufferLength) { + // increment glitchcount + m_GlitchCount++; + m_GlitchLength += BufferLength; + // insert silence samples - DPRINT1("Overlap Inserting Silence Buffer Size %lu Offset %lu Gap %lu Position %lu\n", m_CommonBufferSize, m_CommonBufferOffset, Gap, Position); m_Stream->Silence((PUCHAR)m_CommonBuffer + m_CommonBufferOffset, BufferLength); m_CommonBufferOffset += BufferLength; @@ -933,6 +1057,8 @@ { m_Position.WriteOffset += Data; Status = STATUS_PENDING; + /* time stamp last packet */ + KeQuerySystemTime(&m_LastPacketTime); } } else @@ -1034,6 +1160,9 @@ DPRINT("Warning: failed to stop stream with %x\n", Status); PC_ASSERT(0); } + + // unregister the time out + PcUnregisterIoTimeout(GetDeviceObject(m_Port), PinWaveCyclicIoTimerRoutine, (PVOID)this); } // set state to stop m_State = KSSTATE_STOP; @@ -1269,7 +1398,7 @@ Status = m_ServiceGroup->AddMember(PSERVICESINK(this)); if (!NT_SUCCESS(Status)) { - DPRINT("Failed to add pin to service group\n"); + DPRINT1("Failed to add pin to service group\n"); return Status; } Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… ============================================================================== --- branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original) +++ branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Fri Dec 10 11:03:28 2010 @@ -60,7 +60,6 @@ ULONG m_TotalPackets; KSAUDIO_POSITION m_Position; - ULONG m_StopCount; BOOL m_bUsePrefetch; ULONG m_PrefetchOffset;

1 0

[fireball] 50000: [HEAP] - Time has come to get rid of a slightly modified implementation of WINE's heap, which is a hack based on Windows 95's heap implementation, itself a hack of DOS memory mana...
by fireball＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: fireball Date: Fri Dec 10 09:33:20 2010 New Revision: 50000 URL: http://svn.reactos.org/svn/reactos?rev=50000&view=rev Log: [HEAP] - Time has come to get rid of a slightly modified implementation of WINE's heap, which is a hack based on Windows 95's heap implementation, itself a hack of DOS memory management. It supported 3 out of the 18 possible NT Heap Flags, did not support custom allocation/deallocation routines, and was about 50-80x slower with fragmentation rates up to 500x higher when compared to NT's LFH (WINE is lucky because the advanced NT Heap features are used in kernel-mode usually, not in user-mode, and they are crossing their fingers for this being the same). Several high-end SQL/Database applications would significantly benefit from custom heap features provided by NT. Not to say about removing crappy support for a custom Commit routine and crappy support for User-defined flags and the User-defined value. - So, the glorious moment for a new heap manager, which is (to remind you) a totally new heap manager, resembling real NT heap manager, based on data structures similar to Windows 2003 and Vista+'s heap structures, supporting advanced heap flags (e.g. useful for debugging), having substantially lower fragmentation rates (and thus speed and reliability), having native support for user-defined flags and user-defined values, also native support for a custom commit routine, which is very important for trunk's win32 subsystem. It also reserves, commits, decommits and frees memory on the fly, unlike existing heap manager which prefers to reserve and commit as much as possible, and doesn't decommit when it's no longer necessary. Not to say about support for per process heaps, with a proper lock, and a further support for a special so-called debug heap allocator (to be implemented in heapdbg.c) which will be useful for finding heap corruptions. Yeah, I'm not a fun person :D Added: trunk/reactos/lib/rtl/heap.c - copied unchanged from r49999, trunk/reactos/lib/rtl/heap_rewrite.c Removed: trunk/reactos/lib/rtl/heap_rewrite.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev…

1 0

[janderwald] 49999: [AUDIO-BRINGUP] - Implement WODM_RESTART / WODM_PAUSE - Fixes playback in Audacity and many others probably
by janderwald＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: janderwald Date: Fri Dec 10 08:23:20 2010 New Revision: 49999 URL: http://svn.reactos.org/svn/reactos?rev=49999&view=rev Log: [AUDIO-BRINGUP] - Implement WODM_RESTART / WODM_PAUSE - Fixes playback in Audacity and many others probably Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Fri Dec 10 08:23:20 2010 @@ -109,11 +109,13 @@ case WODM_RESTART : { /* Continue playback when paused */ + Result = MmeSetState(PrivateHandle, TRUE); break; } case WODM_PAUSE : { /* pause playback */ + Result = MmeSetState(PrivateHandle, FALSE); break; }

1 0

[janderwald] 49998: [AUDIO-BRINGUP] - Fix broken wave recording
by janderwald＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: janderwald Date: Fri Dec 10 07:41:44 2010 New Revision: 49998 URL: http://svn.reactos.org/svn/reactos?rev=49998&view=rev Log: [AUDIO-BRINGUP] - Fix broken wave recording Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Fri Dec 10 07:41:44 2010 @@ -15,6 +15,7 @@ HANDLE hDevice; PSOUND_OVERLAPPED Overlap; LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine; + DWORD IoCtl; }IO_PACKET, *LPIO_PACKET; BOOL MMixerLibraryInitialized = FALSE; @@ -786,28 +787,18 @@ LPIO_PACKET Packet = (LPIO_PACKET)lpParameter; Result = SyncOverlappedDeviceIoControl(Packet->hDevice, - IOCTL_KS_WRITE_STREAM, //FIXME IOCTL_KS_READ_STREAM + Packet->IoCtl, NULL, 0, &Packet->Header, sizeof(KSSTREAM_HEADER), &Length); - /* HACK: - * don't call completion routine directly - */ - Packet->CompletionRoutine(ERROR_SUCCESS, Packet->Header.DataUsed, (LPOVERLAPPED)Packet->Overlap); HeapFree(GetProcessHeap(), 0, Packet); return 0; } - - - - - - MMRESULT WdmAudCommitWaveBufferByMMixer( @@ -849,6 +840,7 @@ Packet->hDevice = SoundDeviceInstance->Handle; Packet->Overlap = Overlap; Packet->CompletionRoutine = CompletionRoutine; + Packet->IoCtl = (DeviceType == WAVE_OUT_DEVICE_TYPE ? IOCTL_KS_WRITE_STREAM : IOCTL_KS_READ_STREAM); if (DeviceType == WAVE_OUT_DEVICE_TYPE) {

1 0

[janderwald] 49997: [AUDIO-BRINGUP] - Implement WdmAudResetStreamByMMixer, StopStreamingInSoundThread - WIDM_RESET / WODM_RESET are now implemented - Skipping now audio bytes (i.e. jumping to diffe...
by janderwald＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: janderwald Date: Fri Dec 10 06:14:10 2010 New Revision: 49997 URL: http://svn.reactos.org/svn/reactos?rev=49997&view=rev Log: [AUDIO-BRINGUP] - Implement WdmAudResetStreamByMMixer, StopStreamingInSoundThread - WIDM_RESET / WODM_RESET are now implemented - Skipping now audio bytes (i.e. jumping to different audio position) now properly works and no longer causes a hang under certain conditions Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/streaming.c branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.h branches/audio-bringup/lib/drivers/sound/mmixer/wave.c Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Fri Dec 10 06:14:10 2010 @@ -751,7 +751,19 @@ IN MMDEVICE_TYPE DeviceType, IN BOOLEAN bStartReset) { - /* FIXME */ + MIXER_STATUS Status; + + if (DeviceType == WAVE_IN_DEVICE_TYPE || DeviceType == WAVE_OUT_DEVICE_TYPE) + { + Status = MMixerSetWaveResetState(&MixerContext, SoundDeviceInstance->Handle, bStartReset); + if (Status == MM_STATUS_SUCCESS) + { + /* completed successfully */ + return MMSYSERR_NOERROR; + } + } + + return MMSYSERR_NOTSUPPORTED; } Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Fri Dec 10 06:14:10 2010 @@ -277,8 +277,62 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter) { - /* TODO */ - return MMSYSERR_NOTSUPPORTED; + MMDEVICE_TYPE DeviceType; + PMMFUNCTION_TABLE FunctionTable; + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + + /* set state reset in progress */ + SoundDeviceInstance->ResetInProgress = TRUE; + + /* Get sound device */ + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + /* Obtain the function table */ + Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + /* Obtain device instance type */ + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + + /* Check if reset function is supported */ + if (FunctionTable->ResetStream) + { + /* cancel all current audio buffers */ + FunctionTable->ResetStream(SoundDeviceInstance, DeviceType, TRUE); + } + + /* complete all current headers */ + while( SoundDeviceInstance->HeadWaveHeader ) + { + SND_TRACE(L"StopStreamingInSoundThread: Completing Header %p\n", SoundDeviceInstance->HeadWaveHeader); + CompleteWaveHeader( SoundDeviceInstance, SoundDeviceInstance->HeadWaveHeader ); + } + + /* there should be no oustanding buffers now */ + SND_ASSERT(SoundDeviceInstance->OutstandingBuffers == 0); + + while(SoundDeviceInstance->OutstandingBuffers) + { + SND_ERR("StopStreamingInSoundThread OutStandingBufferCount %lu\n", SoundDeviceInstance->OutstandingBuffers); + /* my hack of doom */ + Sleep(10); + } + + /* Check if reset function is supported */ + if (FunctionTable->ResetStream) + { + /* finish the reset */ + FunctionTable->ResetStream(SoundDeviceInstance, DeviceType, FALSE); + } + + /* clear state reset in progress */ + SoundDeviceInstance->ResetInProgress = FALSE; + + + return MMSYSERR_NOERROR; } MMRESULT Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Fri Dec 10 06:14:10 2010 @@ -111,6 +111,11 @@ /* Continue playback when paused */ break; } + case WODM_PAUSE : + { + /* pause playback */ + break; + } case WODM_GETPOS : { Modified: branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] Fri Dec 10 06:14:10 2010 @@ -207,6 +207,12 @@ IN KSSTATE State); MIXER_STATUS +MMixerSetWaveResetState( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE PinHandle, + IN ULONG bBegin); + +MIXER_STATUS MMixerGetWaveDevicePath( IN PMIXER_CONTEXT MixerContext, IN ULONG bWaveIn, Modified: branches/audio-bringup/lib/drivers/sound/mmixer/wave.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/wave.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/wave.c [iso-8859-1] Fri Dec 10 06:14:10 2010 @@ -608,6 +608,16 @@ { KSPROPERTY Property; ULONG Length; + MIXER_STATUS Status; + + /* verify mixer context */ + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + /* invalid context passed */ + return Status; + } /* setup property request */ Property.Set = KSPROPSETID_Connection; @@ -618,6 +628,31 @@ } MIXER_STATUS +MMixerSetWaveResetState( + IN PMIXER_CONTEXT MixerContext, + IN HANDLE PinHandle, + IN ULONG bBegin) +{ + ULONG Length; + MIXER_STATUS Status; + KSRESET Reset; + + /* verify mixer context */ + Status = MMixerVerifyContext(MixerContext); + + if (Status != MM_STATUS_SUCCESS) + { + /* invalid context passed */ + return Status; + } + + /* begin / stop reset */ + Reset = (bBegin ? KSRESET_BEGIN : KSRESET_END); + + return MixerContext->Control(PinHandle, IOCTL_KS_RESET_STATE, &Reset, sizeof(KSRESET), NULL, 0, &Length); +} + +MIXER_STATUS MMixerGetWaveDevicePath( IN PMIXER_CONTEXT MixerContext, IN ULONG bWaveIn,

1 0

[tkreuzer] 49996: [WIN32K] Merge r49994 and r49995 from reactx branch
by tkreuzer＠svn.reactos.org 09 Dec '10

09 Dec '10

Author: tkreuzer Date: Thu Dec 9 15:53:55 2010 New Revision: 49996 URL: http://svn.reactos.org/svn/reactos?rev=49996&view=rev Log: [WIN32K] Merge r49994 and r49995 from reactx branch Modified: trunk/reactos/ (props changed) trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 9 15:53:55 2010 @@ -1,4 +1,5 @@ /branches/header-work:45691-47721 /branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 Modified: trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] Thu Dec 9 15:53:55 2010 @@ -355,8 +355,12 @@ RtlAppendUnicodeToString(&strDriverName, pwsz); /* MSDN says "The driver must include this suffix in the pwszDriver string." - But in fact it's optional. */ - if (_wcsnicmp(pwszDriverName + cwcLength - 4, L".dll", 4) != 0) + But in fact it's optional. + + ms win32k EngLoadImageEx loading .sys file without append .dll + */ + if ( (_wcsnicmp(pwszDriverName + cwcLength - 4, L".dll", 4) != 0) && + (_wcsnicmp(pwszDriverName + cwcLength - 4, L".sys", 4) != 0) ) { /* Append the .dll suffix */ RtlAppendUnicodeToString(&strDriverName, L".dll"); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Thu Dec 9 15:53:55 2010 @@ -138,16 +138,8 @@ /* Loading the kernel interface of directx for win32k */ - DPRINT1("Warning: trying loading vista dxkrnl.sys\n"); - ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxkrnl.sys"); - if ( ghDxGraphics == NULL) - { - DPRINT1("Warning: dxkrnl.sys not found\n"); - /* try loading vista dx kernel */ - DPRINT1("Warning: trying loading xp/2003/reactos dxg.sys\n"); - ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); - } - + DPRINT1("Warning: trying loading xp/2003/windows7/reactos dxg.sys\n"); + ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); if ( ghDxGraphics == NULL) { Status = STATUS_DLL_NOT_FOUND;

1 0

[greatlrd] 49995: DxDdStartupDxGraphics fix loading dxg.sys remove vista stupied behvoir. now it behvoir like windows 7, xp and 2003
by greatlrd＠svn.reactos.org 09 Dec '10

09 Dec '10

Author: greatlrd Date: Thu Dec 9 14:30:17 2010 New Revision: 49995 URL: http://svn.reactos.org/svn/reactos?rev=49995&view=rev Log: DxDdStartupDxGraphics fix loading dxg.sys remove vista stupied behvoir. now it behvoir like windows 7, xp and 2003 Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Thu Dec 9 14:30:17 2010 @@ -138,16 +138,8 @@ /* Loading the kernel interface of directx for win32k */ - DPRINT1("Warning: trying loading vista dxkrnl.sys\n"); - ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxkrnl.sys"); - if ( ghDxGraphics == NULL) - { - DPRINT1("Warning: dxkrnl.sys not found\n"); - /* try loading vista dx kernel */ - DPRINT1("Warning: trying loading xp/2003/reactos dxg.sys\n"); - ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); - } - + DPRINT1("Warning: trying loading xp/2003/windows7/reactos dxg.sys\n"); + ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); if ( ghDxGraphics == NULL) { Status = STATUS_DLL_NOT_FOUND;

1 0

[greatlrd] 49994: EngLoadImageEx BugFix so it can load .sys file as well. Now we can load dxg.sys again
by greatlrd＠svn.reactos.org 09 Dec '10

09 Dec '10

Author: greatlrd Date: Thu Dec 9 14:27:56 2010 New Revision: 49994 URL: http://svn.reactos.org/svn/reactos?rev=49994&view=rev Log: EngLoadImageEx BugFix so it can load .sys file as well. Now we can load dxg.sys again Modified: branches/reactx/reactos/subsystems/win32/win32k/eng/ldevobj.c Modified: branches/reactx/reactos/subsystems/win32/win32k/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] (original) +++ branches/reactx/reactos/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] Thu Dec 9 14:27:56 2010 @@ -355,8 +355,12 @@ RtlAppendUnicodeToString(&strDriverName, pwsz); /* MSDN says "The driver must include this suffix in the pwszDriver string." - But in fact it's optional. */ - if (_wcsnicmp(pwszDriverName + cwcLength - 4, L".dll", 4) != 0) + But in fact it's optional. + + ms win32k EngLoadImageEx loading .sys file without append .dll + */ + if ( (_wcsnicmp(pwszDriverName + cwcLength - 4, L".dll", 4) != 0) && + (_wcsnicmp(pwszDriverName + cwcLength - 4, L".sys", 4) != 0) ) { /* Append the .dll suffix */ RtlAppendUnicodeToString(&strDriverName, L".dll");

1 0

[janderwald] 49993: [AUDIO-BRINGUP] - Respect channel count which defines if the control acts uniform or per channel - Fix bug in MMixerSetGetMuxControlDetails
by janderwald＠svn.reactos.org 09 Dec '10

09 Dec '10

Author: janderwald Date: Thu Dec 9 11:33:58 2010 New Revision: 49993 URL: http://svn.reactos.org/svn/reactos?rev=49993&view=rev Log: [AUDIO-BRINGUP] - Respect channel count which defines if the control acts uniform or per channel - Fix bug in MMixerSetGetMuxControlDetails Added: branches/audio-bringup/lib/drivers/sound/mmixer/TODO Modified: branches/audio-bringup/lib/drivers/sound/mmixer/controls.c branches/audio-bringup/lib/drivers/sound/mmixer/sup.c Added: branches/audio-bringup/lib/drivers/sound/mmixer/TODO URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/TODO (added) +++ branches/audio-bringup/lib/drivers/sound/mmixer/TODO [iso-8859-1] Thu Dec 9 11:33:58 2010 @@ -1,0 +1,6 @@ +=== MMIXER TASKS === + +- Add hacks for source lines, such that Wave Mixer line always has a volume control +- Support custom mixer controls +- Assign mixer controls after all controls have been assigned (starting on the destination lines) +- TESTING & BUGFIXING Modified: branches/audio-bringup/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Thu Dec 9 11:33:58 2010 @@ -35,7 +35,8 @@ IN HANDLE hMixer, IN PTOPOLOGY Topology, IN ULONG NodeIndex, - IN LPMIXERLINE_EXT MixerLine) + IN LPMIXERLINE_EXT MixerLine, + IN ULONG MaxChannels) { LPGUID NodeType; KSP_NODE Node; @@ -66,7 +67,7 @@ /* store control type */ MixerControl->Control.dwControlType = MMixerGetControlTypeFromTopologyNode(NodeType); - MixerControl->Control.fdwControl = MIXERCONTROL_CONTROLF_UNIFORM; /* FIXME */ + MixerControl->Control.fdwControl = (MaxChannels > 1 ? 0 : MIXERCONTROL_CONTROLF_UNIFORM); MixerControl->Control.cMultipleItems = 0; /* setup request to retrieve name */ @@ -136,7 +137,7 @@ MixerControl->Control.Bounds.dwMaximum = NodesCount - 1; MixerControl->Control.Metrics.dwReserved[0] = NodesCount; MixerControl->Control.cMultipleItems = NodesCount; - MixerControl->Control.fdwControl |= MIXERCONTROL_CONTROLF_MULTIPLE; + MixerControl->Control.fdwControl |= MIXERCONTROL_CONTROLF_UNIFORM | MIXERCONTROL_CONTROLF_MULTIPLE; } else if (MixerControl->Control.dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) { @@ -695,9 +696,14 @@ /* calculate maximum channels */ DstLine->Line.cChannels = min(DstLine->Line.cChannels, MaxChannels); } + else + { + /* use default of one channel */ + MaxChannels = 1; + } /* now add the mixer control */ - Status = MMixerAddMixerControl(MixerContext, MixerInfo, hMixer, Topology, Nodes[Index], DstLine); + Status = MMixerAddMixerControl(MixerContext, MixerInfo, hMixer, Topology, Nodes[Index], DstLine, MaxChannels); if (Status == MM_STATUS_SUCCESS) { Modified: branches/audio-bringup/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Thu Dec 9 11:33:58 2010 @@ -536,6 +536,14 @@ return Status; } + /* gets the corresponding mixer data */ + MixerData = MMixerGetMixerDataByDeviceHandle(MixerContext, MixerControl->hDevice); + + /* sanity check */ + ASSERT(MixerData); + ASSERT(MixerData->Topology); + ASSERT(MixerData->MixerInfo == MixerInfo); + /* get logical pin nodes */ MMixerGetConnectedFromLogicalTopologyPins(MixerData->Topology, MixerControl->NodeID, &LogicalNodesCount, LogicalNodes);

1 0

[greatlrd] 49992: implement VBEVideoUnShareVideoMemmory for DdUnlock and DdMapmemmory
by greatlrd＠svn.reactos.org 09 Dec '10

09 Dec '10

Author: greatlrd Date: Thu Dec 9 08:58:46 2010 New Revision: 49992 URL: http://svn.reactos.org/svn/reactos?rev=49992&view=rev Log: implement VBEVideoUnShareVideoMemmory for DdUnlock and DdMapmemmory Modified: branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.h Modified: branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/mi… ============================================================================== --- branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Thu Dec 9 08:58:46 2010 @@ -538,6 +538,17 @@ (PVIDEO_SHARE_MEMORY_INFORMATION)RequestPacket->OutputBuffer, RequestPacket->StatusBlock); break; + case IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY: + if (RequestPacket->InputBufferLength < sizeof(VIDEO_SHARE_MEMORY)) + { + RequestPacket->StatusBlock->Status = ERROR_INSUFFICIENT_BUFFER; + return TRUE; + } + Result = VBEVideoUnShareVideoMemmory( + (PVBE_DEVICE_EXTENSION)HwDeviceExtension, + (PVIDEO_SHARE_MEMORY)RequestPacket->InputBufferLength, + RequestPacket->StatusBlock); + break; default: RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; @@ -853,7 +864,7 @@ } /* - * VBEQueryNumAvailModes + * VBEVideoShareVideoMemmory * */ BOOLEAN FASTCALL @@ -877,8 +888,8 @@ */ if ( ((DeviceExtension->ModeInfo[DeviceExtension->CurrentMode].ModeAttributes & VBE_MODEATTR_LINEAR) != VBE_MODEATTR_LINEAR) || - (pShareMemory->ViewOffset > VBEDeviceExtension->VbeInfo.TotalMemory) || - ((pShareMemory->ViewOffset + pShareMemory->ViewSize) > VBEDeviceExtension->VbeInfo.TotalMemory) ) + (pShareMemory->ViewOffset > DeviceExtension->VbeInfo.TotalMemory) || + ((pShareMemory->ViewOffset + pShareMemory->ViewSize) > DeviceExtension->VbeInfo.TotalMemory) ) { retvalue = FALSE; } @@ -912,9 +923,35 @@ } } - return retvalue; } + +/* + * VBEVideoUnShareVideoMemmory + * + */ +BOOLEAN FASTCALL +VBEVideoUnShareVideoMemmory( + PVBE_DEVICE_EXTENSION DeviceExtension, + PVIDEO_SHARE_MEMORY pShareMemory, + PSTATUS_BLOCK StatusBlock) +{ + BOOLEAN retvalue; + + StatusBlock->Status = VideoPortUnmapMemory( DeviceExtension, + pShareMemory->RequestedVirtualAddress, + pShareMemory->ProcessHandle); + if (StatusBlock->Status == NO_ERROR) + { + retvalue = TRUE; + } + else + { + retvalue = FALSE; + } + return retvalue; +} + /* * VBEQueryNumAvailModes * @@ -1091,7 +1128,7 @@ * For VGA compatible adapters program the color registers directly. */ - if (!(DeviceExtension->VbeInfo.Capabilities & 2)) + if (!(DeviceExtension->VbeInfo.Capabilities & VBE_CHECK_VGA_COMPATIBLE)) { for (Entry = ColorLookUpTable->FirstEntry; Entry < ColorLookUpTable->NumEntries + ColorLookUpTable->FirstEntry; Modified: branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/mi… ============================================================================== --- branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] Thu Dec 9 08:58:46 2010 @@ -101,6 +101,12 @@ #define VBE_GETRETURNCODE(x) (x & 0xFFFF) /* + * VBE checkflags Codes + */ +#define VBE_CHECK_VGA_COMPATIBLE 0x02 +#define VBE_CHECK_STEROSCOPIC_HW_SUPPORT 0x08 + +/* * VBE specification defined structure for general adapter info * returned by function VBE_GET_CONTROLLER_INFORMATION command. */ @@ -312,3 +318,9 @@ PVIDEO_SHARE_MEMORY pShareMemory, PVIDEO_SHARE_MEMORY_INFORMATION pShareMemoryInformation, PSTATUS_BLOCK StatusBlock); + +BOOLEAN FASTCALL +VBEVideoUnShareVideoMemmory( + PVBE_DEVICE_EXTENSION DeviceExtension, + PVIDEO_SHARE_MEMORY pShareMemory, + PSTATUS_BLOCK StatusBlock);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs