Author: tkreuzer Date: Fri Jun 4 17:58:43 2010 New Revision: 47567
URL: http://svn.reactos.org/svn/reactos?rev=47567&view=rev Log: [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
Modified: trunk/reactos/drivers/ksfilter/ks/pin.c
Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?r... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Fri Jun 4 17:58:43 2010 @@ -1332,7 +1332,9 @@ 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 @@ /* 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 @@ IKsPinImpl * This; PKSISTREAM_POINTER CurFrame; PKSISTREAM_POINTER NewFrame; - ULONG RefCount; + ULONG_PTR RefCount; NTSTATUS Status; ULONG Size;
@@ -1562,7 +1566,7 @@ 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++;