[KS]

- KSSTREAM_POINTER_OFFSET doesn't have an Alignment member on 64 bit systems. Comment the use out in these cases. It should probably be removed completely, as it's only an alignment / dummy value, but I leave this to the expert in this field.
- ULONG -> ULONG_PTR for pointer casts

svn path=/trunk/; revision=47567

diff --git a/reactos/drivers/ksfilter/ks/pin.c b/reactos/drivers/ksfilter/ks/pin.c
index 019e5ce..a95755c 100644 (file)
--- a/reactos/drivers/ksfilter/ks/pin.c
+++ b/reactos/drivers/ksfilter/ks/pin.c
@@ -1332,7 +1332,9 @@ IKsPin_PrepareStreamHeader(
     else
     StreamPointer->StreamPointer.Offset = &StreamPointer->StreamPointer.OffsetOut;
 
     else
     StreamPointer->StreamPointer.Offset = &StreamPointer->StreamPointer.OffsetOut;
 

+#ifndef _WIN64

     StreamPointer->StreamPointer.Offset->Alignment = 0;
     StreamPointer->StreamPointer.Offset->Alignment = 0;

+#endif

     StreamPointer->StreamPointer.Offset->Count = 0;
     StreamPointer->StreamPointer.Offset->Data = NULL;
     StreamPointer->StreamPointer.Offset->Remaining = 0;
     StreamPointer->StreamPointer.Offset->Count = 0;
     StreamPointer->StreamPointer.Offset->Data = NULL;
     StreamPointer->StreamPointer.Offset->Remaining = 0;


@@ -1352,7 +1354,9 @@ IKsPin_PrepareStreamHeader(
     /* FIXME */
     ASSERT(Length);
 
     /* FIXME */
     ASSERT(Length);
 

+#ifndef _WIN64

     StreamPointer->StreamPointer.Offset->Alignment = 0;
     StreamPointer->StreamPointer.Offset->Alignment = 0;

+#endif

     StreamPointer->StreamPointer.Context = NULL;
     StreamPointer->StreamPointer.Pin = &This->Pin;
     StreamPointer->StreamPointer.Offset->Count = Length;
     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;
     IKsPinImpl * This;
     PKSISTREAM_POINTER CurFrame;
     PKSISTREAM_POINTER NewFrame;

-    ULONG RefCount;
+    ULONG_PTR RefCount;

     NTSTATUS Status;
     ULONG Size;
 
     NTSTATUS Status;
     ULONG Size;
 


@@ -1562,7 +1566,7 @@ KsStreamPointerClone(
         return STATUS_INSUFFICIENT_RESOURCES;
 
     /* get current irp stack location */
         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++;
 
     /* increment reference count */
     RefCount++;