Synchronize with trunk revision 59636 (just before Alex's CreateProcess revamp).

[reactos.git] / drivers / ksfilter / ks / pin.c

diff --git a/drivers/ksfilter/ks/pin.c b/drivers/ksfilter/ks/pin.c
index 019e5ce..883f098 100644 (file)
--- a/drivers/ksfilter/ks/pin.c
+++ b/drivers/ksfilter/ks/pin.c
@@ -1332,7 +1332,9 @@ IKsPin_PrepareStreamHeader(
     else
     StreamPointer->StreamPointer.Offset = &StreamPointer->StreamPointer.OffsetOut;
 
+#ifndef _WIN64
     StreamPointer->StreamPointer.Offset->Alignment = 0;
+#endif
     StreamPointer->StreamPointer.Offset->Count = 0;
     StreamPointer->StreamPointer.Offset->Data = NULL;
     StreamPointer->StreamPointer.Offset->Remaining = 0;
@@ -1352,7 +1354,9 @@ IKsPin_PrepareStreamHeader(
     /* FIXME */
     ASSERT(Length);
 
+#ifndef _WIN64
     StreamPointer->StreamPointer.Offset->Alignment = 0;
+#endif
     StreamPointer->StreamPointer.Context = NULL;
     StreamPointer->StreamPointer.Pin = &This->Pin;
     StreamPointer->StreamPointer.Offset->Count = Length;
@@ -1543,7 +1547,7 @@ KsStreamPointerClone(
     IKsPinImpl * This;
     PKSISTREAM_POINTER CurFrame;
     PKSISTREAM_POINTER NewFrame;
-    ULONG RefCount;
+    ULONG_PTR RefCount;
     NTSTATUS Status;
     ULONG Size;
 
@@ -1556,13 +1560,13 @@ KsStreamPointerClone(
     Size = sizeof(KSISTREAM_POINTER) + ContextSize;
 
     /* allocate new stream pointer */
-    NewFrame = (PKSISTREAM_POINTER)ExAllocatePool(NonPagedPool, Size);
+    NewFrame = (PKSISTREAM_POINTER)AllocateItem(NonPagedPool, Size);
 
     if (!NewFrame)
         return STATUS_INSUFFICIENT_RESOURCES;
 
     /* get current irp stack location */
-    RefCount = (ULONG)CurFrame->Irp->Tail.Overlay.DriverContext[0];
+    RefCount = (ULONG_PTR)CurFrame->Irp->Tail.Overlay.DriverContext[0];
 
     /* increment reference count */
     RefCount++;
@@ -1871,7 +1875,7 @@ IKsPin_DispatchKsStream(
         DPRINT1("KsProbeStreamIrp failed with %x\n", Status);
 
         Irp->IoStatus.Status = Status;
-        IoCompleteRequest(Irp, IO_NO_INCREMENT);
+        CompleteRequest(Irp, IO_NO_INCREMENT);
         return Status;
     }
 
@@ -1884,7 +1888,7 @@ IKsPin_DispatchKsStream(
     {
         DPRINT("NoHeader Canceling Irp %p\n", Irp);
         Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES;
-        IoCompleteRequest(Irp, IO_NO_INCREMENT);
+        CompleteRequest(Irp, IO_NO_INCREMENT);
         return Status;
     }
 
@@ -1907,7 +1911,7 @@ IKsPin_DispatchKsStream(
         {
             DPRINT("NoHeader->Data Canceling Irp %p\n", Irp);
             Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES;
-            IoCompleteRequest(Irp, IO_NO_INCREMENT);
+            CompleteRequest(Irp, IO_NO_INCREMENT);
             return Status;
         }
 
@@ -1956,7 +1960,7 @@ IKsPin_DispatchKsStream(
             /* invalid device request */
             DPRINT("Filter Centric Processing No Process Routine\n");
             Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
-            IoCompleteRequest(Irp, IO_NO_INCREMENT);
+            CompleteRequest(Irp, IO_NO_INCREMENT);
             return STATUS_UNSUCCESSFUL;
         }
 
@@ -2091,7 +2095,7 @@ IKsPin_DispatchDeviceIoControl(
     if (Status != STATUS_PENDING)
     {
         Irp->IoStatus.Status = Status;
-        IoCompleteRequest(Irp, IO_NO_INCREMENT);
+        CompleteRequest(Irp, IO_NO_INCREMENT);
     }
 
     /* done */
@@ -2131,7 +2135,7 @@ IKsPin_Close(
         {
             /* abort closing */
             Irp->IoStatus.Status = Status;
-            IoCompleteRequest(Irp, IO_NO_INCREMENT);
+            CompleteRequest(Irp, IO_NO_INCREMENT);
             return Status;
         }
 
@@ -2141,7 +2145,7 @@ IKsPin_Close(
         if (Status != STATUS_PENDING)
         {
             Irp->IoStatus.Status = Status;
-            IoCompleteRequest(Irp, IO_NO_INCREMENT);
+            CompleteRequest(Irp, IO_NO_INCREMENT);
             return Status;
         }
     }
@@ -2158,7 +2162,7 @@ IKsPin_DispatchCreateAllocator(
     UNIMPLEMENTED;
 
     Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED;
-    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    CompleteRequest(Irp, IO_NO_INCREMENT);
     return STATUS_NOT_IMPLEMENTED;
 }
 
@@ -2240,7 +2244,7 @@ IKsPin_DispatchCreateClock(
 
     /* done */
     Irp->IoStatus.Status = Status;
-    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    CompleteRequest(Irp, IO_NO_INCREMENT);
     return Status;
 }
 
@@ -2253,7 +2257,7 @@ IKsPin_DispatchCreateNode(
     UNIMPLEMENTED;
 
     Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED;
-    IoCompleteRequest(Irp, IO_NO_INCREMENT);
+    CompleteRequest(Irp, IO_NO_INCREMENT);
     return STATUS_NOT_IMPLEMENTED;
 }