ntoskrnl: Clear the pending flags for the current stack location before calling the previous location's completion routine.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-08-24 16:11:45 -05:00 committed by Alexandre Julliard
parent 14d1855a0c
commit 2f08e95b4b
2 changed files with 4 additions and 3 deletions

View File

@ -1990,6 +1990,7 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost )
else
device = NULL;
irp->PendingReturned = !!(irpsp->Control & SL_PENDING_RETURNED);
irpsp->Control = 0;
if (call_flag)
{
TRACE( "calling %p( %p, %p, %p )\n", routine, device, irp, irpsp->Context );

View File

@ -1753,7 +1753,7 @@ static NTSTATUS WINAPI completion_cb(DEVICE_OBJECT *device, IRP *irp, void *cont
ok(stack->Control == (SL_INVOKE_ON_CANCEL | SL_INVOKE_ON_ERROR | SL_INVOKE_ON_SUCCESS),
"Got control flags %#x.\n", stack->Control);
stack = IoGetNextIrpStackLocation(irp);
todo_wine ok(!stack->Control, "Got control flags %#x.\n", stack->Control);
ok(!stack->Control, "Got control flags %#x.\n", stack->Control);
stack = irp->Tail.Overlay.CurrentStackLocation + 1; /* previous location */
ok(!stack->Control, "Got control flags %#x.\n", stack->Control);
@ -1768,9 +1768,9 @@ static NTSTATUS WINAPI completion_cb(DEVICE_OBJECT *device, IRP *irp, void *cont
ok(irp->CurrentLocation == 3, "Got current location %u.\n", irp->CurrentLocation);
ok(!stack->Control, "Got control flags %#x.\n", stack->Control);
stack = IoGetNextIrpStackLocation(irp);
todo_wine ok(!stack->Control, "Got control flags %#x.\n", stack->Control);
ok(!stack->Control, "Got control flags %#x.\n", stack->Control);
stack = irp->Tail.Overlay.CurrentStackLocation - 2; /* lowest location */
todo_wine ok(!stack->Control, "Got control flags %#x.\n", stack->Control);
ok(!stack->Control, "Got control flags %#x.\n", stack->Control);
}
++got_completion;