- Move the code from my previous commit before signalling the user event

- Sorry for the wasted commit number

svn path=/trunk/; revision=46720
This commit is contained in:
Cameron Gutman 2010-04-04 18:22:54 +00:00
parent 2f22a7d7f8
commit 7be442943e

View file

@ -460,6 +460,22 @@ IopCompleteRequest(IN PKAPC Apc,
} }
else else
{ {
/* Check if we have an associated user IOSB */
if (Irp->UserIosb)
{
/* We do, so let's give them the final status */
_SEH2_TRY
{
/* Save the IOSB Information */
*Irp->UserIosb = Irp->IoStatus;
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
/* Ignore any error */
}
_SEH2_END;
}
/* /*
* Either we didn't return from the request, or we did return but this * Either we didn't return from the request, or we did return but this
* request was synchronous. * request was synchronous.
@ -492,22 +508,6 @@ IopCompleteRequest(IN PKAPC Apc,
} }
} }
/* Check if we have an associated user IOSB */
if (Irp->UserIosb)
{
/* We do, so let's give them the final status */
_SEH2_TRY
{
/* Save the IOSB Information */
*Irp->UserIosb = Irp->IoStatus;
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
/* Ignore any error */
}
_SEH2_END;
}
/* Now that we got here, we do this for incomplete I/Os as well */ /* Now that we got here, we do this for incomplete I/Os as well */
if ((FileObject) && !(Irp->Flags & IRP_CREATE_OPERATION)) if ((FileObject) && !(Irp->Flags & IRP_CREATE_OPERATION))
{ {