projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge trunk head (r43756)
[reactos.git]
/
reactos
/
ntoskrnl
/
io
/
iomgr
/
irp.c
diff --git
a/reactos/ntoskrnl/io/iomgr/irp.c
b/reactos/ntoskrnl/io/iomgr/irp.c
index
e7e0fb1
..
9ef5f0c
100644
(file)
--- a/
reactos/ntoskrnl/io/iomgr/irp.c
+++ b/
reactos/ntoskrnl/io/iomgr/irp.c
@@
-1214,7
+1214,7
@@
IofCompleteRequest(IN PIRP Irp,
if (LastStackPtr->Control & SL_ERROR_RETURNED)
{
/* Get the error code */
if (LastStackPtr->Control & SL_ERROR_RETURNED)
{
/* Get the error code */
- ErrorCode =
(NTSTATUS)LastStackPtr->Parameters.Others.Argument4
;
+ ErrorCode =
PtrToUlong(LastStackPtr->Parameters.Others.Argument4)
;
}
/* Get the Current Stack and skip it */
}
/* Get the Current Stack and skip it */
@@
-1236,7
+1236,7
@@
IofCompleteRequest(IN PIRP Irp,
/* Update the error for the current stack */
ErrorCode = Irp->IoStatus.Status;
StackPtr->Control |= SL_ERROR_RETURNED;
/* Update the error for the current stack */
ErrorCode = Irp->IoStatus.Status;
StackPtr->Control |= SL_ERROR_RETURNED;
- LastStackPtr->Parameters.Others.Argument4 =
(PVOID)ErrorCode
;
+ LastStackPtr->Parameters.Others.Argument4 =
UlongToPtr(ErrorCode)
;
LastStackPtr->Control |= SL_ERROR_RETURNED;
}
}
LastStackPtr->Control |= SL_ERROR_RETURNED;
}
}
@@
-1610,7
+1610,7
@@
NTAPI
IoGetRequestorProcessId(IN PIRP Irp)
{
/* Return the requestor process' id */
IoGetRequestorProcessId(IN PIRP Irp)
{
/* Return the requestor process' id */
- return
(ULONG)
(IoGetRequestorProcess(Irp)->UniqueProcessId);
+ return
PtrToUlong
(IoGetRequestorProcess(Irp)->UniqueProcessId);
}
/*
}
/*
@@
-1782,5
+1782,5
@@
NTAPI
IoSetTopLevelIrp(IN PIRP Irp)
{
/* Set the IRP */
IoSetTopLevelIrp(IN PIRP Irp)
{
/* Set the IRP */
- PsGetCurrentThread()->TopLevelIrp = (ULONG)Irp;
+ PsGetCurrentThread()->TopLevelIrp = (ULONG
_PTR
)Irp;
}
}