From: Colin Finck Date: Wed, 16 Mar 2011 16:17:03 +0000 (+0000) Subject: Merge r51067 X-Git-Tag: ReactOS-0.3.13~1 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=43903288f468c73cd708c0c159414384197a051e Merge r51067 svn path=/branches/ros-branch-0_3_13/; revision=51068 --- diff --git a/reactos/drivers/wdm/audio/legacy/wdmaud/control.c b/reactos/drivers/wdm/audio/legacy/wdmaud/control.c index afc692c15ac..3343405de41 100644 --- a/reactos/drivers/wdm/audio/legacy/wdmaud/control.c +++ b/reactos/drivers/wdm/audio/legacy/wdmaud/control.c @@ -402,28 +402,6 @@ IoCompletion ( /* sanity check */ ASSERT(Header); - /* iterate through all stream headers and collect size */ - do - { - if (Context->Function == IOCTL_KS_READ_STREAM) - { - /* length is stored in DataUsed */ - Length += Header->DataUsed; - } - else - { - /* length stored in frameextend */ - Length += Header->FrameExtent; - } - - /* subtract size */ - Context->Length -= Header->Size; - - /* move to next stream header */ - Header = (PKSSTREAM_HEADER)((ULONG_PTR)Header + Header->Size); - - }while(Context->Length); - /* time to free all allocated mdls */ Mdl = Irp->MdlAddress; @@ -454,12 +432,7 @@ IoCompletion ( DPRINT("IoCompletion Irp %p IoStatus %lx Information %lx Length %lu\n", Irp, Irp->IoStatus.Status, Irp->IoStatus.Information, Length); - if (Irp->IoStatus.Status == STATUS_SUCCESS) - { - /* store the length */ - Irp->IoStatus.Information = Length; - } - else + if (!NT_SUCCESS(Irp->IoStatus.Status)) { /* failed */ Irp->IoStatus.Information = 0; @@ -471,7 +444,6 @@ IoCompletion ( return STATUS_SUCCESS; } - NTSTATUS NTAPI WdmAudReadWrite(