Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 02:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KS]

Browse source 
Fix some prototypes and some MSVC/x64 warnings

svn path=/trunk/; revision=63214
This commit is contained in:
Timo Kreuzer 2014-05-10 10:02:09 +00:00
parent 97ab95bca6
commit 5984090c7b
8 changed files with 54 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/drivers/ksfilter/ks/api.c
View file

@ -1140,7 +1140,7 @@ KsSynchronousIoControlDevice(
if (Status)
{
/* store bytes returned */
*BytesReturned = IoStatusBlock.Information;
*BytesReturned = (ULONG)IoStatusBlock.Information;
/* return status */
return IoStatusBlock.Status;
}
@ -1181,7 +1181,7 @@ KsSynchronousIoControlDevice(
Status = IoStatusBlock.Status;
}
*BytesReturned = IoStatusBlock.Information;
*BytesReturned = (ULONG)IoStatusBlock.Information;
return Status;
}
@ -1716,8 +1716,8 @@ KsCompletePendingRequest(
return;
}
/* FIXME
* delete object / device header
/* FIXME
* delete object / device header
* remove dead pin / filter instance
*/
UNIMPLEMENTED
@ -1782,7 +1782,7 @@ KspDeviceSetGetBusData(
Status = IoCallDriver(DeviceObject, Irp);
/* is the request still pending */
if (Status == STATUS_PENDING)
if (Status == STATUS_PENDING)
{
/* have a nap */
KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL);
@ -1887,7 +1887,7 @@ KsGetNextSibling(
/* get the basic header */
BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)Object - sizeof(KSBASIC_HEADER));
ASSERT(BasicHeader->Type == KsObjectTypeDevice || BasicHeader->Type == KsObjectTypeFilterFactory ||
ASSERT(BasicHeader->Type == KsObjectTypeDevice || BasicHeader->Type == KsObjectTypeFilterFactory ||
BasicHeader->Type == KsObjectTypeFilter || BasicHeader->Type == KsObjectTypePin);
return (PVOID)BasicHeader->Next.Pin;
@ -2128,7 +2128,7 @@ KspMergePropertySet(
PKSPROPERTY_ITEM PropertyItem, CurrentPropertyItem;
NTSTATUS Status;
// max properties
// max properties
PropertyCount = PropertySetA->PropertiesCount + PropertySetB->PropertiesCount;
// allocate items
@ -2518,7 +2518,7 @@ KsRegisterAggregatedClientUnknown(
PKSBASIC_HEADER BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)Object - sizeof(KSBASIC_HEADER));
/* sanity check */
ASSERT(BasicHeader->Type == KsObjectTypeDevice || BasicHeader->Type == KsObjectTypeFilterFactory ||
ASSERT(BasicHeader->Type == KsObjectTypeDevice || BasicHeader->Type == KsObjectTypeFilterFactory ||
BasicHeader->Type == KsObjectTypeFilter || BasicHeader->Type == KsObjectTypePin);
if (BasicHeader->ClientAggregate)

23
reactos/drivers/ksfilter/ks/event.c
View file

@ -87,7 +87,7 @@ NTSTATUS
KspEnableEvent(
IN PIRP Irp,
IN ULONG EventSetsCount,
IN PKSEVENT_SET EventSet,
IN const KSEVENT_SET* EventSet,
IN OUT PLIST_ENTRY EventsList OPTIONAL,
IN KSEVENTS_LOCKTYPE EventsFlags OPTIONAL,
IN PVOID EventsLock OPTIONAL,
@ -99,7 +99,7 @@ KspEnableEvent(
KSEVENT Event;
PKSEVENT_ITEM EventItem, FoundEventItem;
PKSEVENTDATA EventData;
PKSEVENT_SET FoundEventSet;
const KSEVENT_SET* FoundEventSet;
PKSEVENT_ENTRY EventEntry;
ULONG Index, SubIndex, Size;
PVOID Object;
@ -270,7 +270,7 @@ KspEnableEvent(
/* invalid type requested */
return STATUS_INVALID_PARAMETER;
}
}
}
/* calculate request size */
@ -398,18 +398,19 @@ KsEnableEvent(
/*
@implemented
*/
_IRQL_requires_max_(PASSIVE_LEVEL)
KSDDKAPI
NTSTATUS
NTAPI
KsEnableEventWithAllocator(
IN PIRP Irp,
IN ULONG EventSetsCount,
IN PKSEVENT_SET EventSet,
IN OUT PLIST_ENTRY EventsList OPTIONAL,
IN KSEVENTS_LOCKTYPE EventsFlags OPTIONAL,
IN PVOID EventsLock OPTIONAL,
IN PFNKSALLOCATOR Allocator OPTIONAL,
IN ULONG EventItemSize OPTIONAL)
_In_ PIRP Irp,
_In_ ULONG EventSetsCount,
_In_reads_(EventSetsCount) const KSEVENT_SET* EventSet,
_Inout_opt_ PLIST_ENTRY EventsList,
_In_opt_ KSEVENTS_LOCKTYPE EventsFlags,
_In_opt_ PVOID EventsLock,
_In_opt_ PFNKSALLOCATOR Allocator,
_In_opt_ ULONG EventItemSize)
{
return KspEnableEvent(Irp, EventSetsCount, EventSet, EventsList, EventsFlags, EventsLock, Allocator, EventItemSize);
}

2
reactos/drivers/ksfilter/ks/ksfunc.h
View file

@ -175,7 +175,7 @@ NTSTATUS
KspEnableEvent(
IN PIRP Irp,
IN ULONG EventSetsCount,
IN PKSEVENT_SET EventSet,
IN const KSEVENT_SET* EventSet,
IN OUT PLIST_ENTRY EventsList OPTIONAL,
IN KSEVENTS_LOCKTYPE EventsFlags OPTIONAL,
IN PVOID EventsLock OPTIONAL,

20
reactos/drivers/ksfilter/ks/methods.c
View file

@ -147,7 +147,7 @@ KspMethodHandlerWithAllocator(
if (Allocator)
{
/* allocate the requested amount */
Status = Allocator(Irp, Irp->IoStatus.Information, FALSE);
Status = Allocator(Irp, (ULONG)Irp->IoStatus.Information, FALSE);
/* check if the block was allocated */
if (!NT_SUCCESS(Status))
@ -189,13 +189,14 @@ KspMethodHandlerWithAllocator(
/*
@implemented
*/
_IRQL_requires_max_(PASSIVE_LEVEL)
KSDDKAPI
NTSTATUS
NTAPI
KsMethodHandler(
IN PIRP Irp,
IN ULONG MethodSetsCount,
IN PKSMETHOD_SET MethodSet)
_In_ PIRP Irp,
_In_ ULONG MethodSetsCount,
_In_reads_(MethodSetsCount) const KSMETHOD_SET* MethodSet)
{
return KspMethodHandlerWithAllocator(Irp, MethodSetsCount, MethodSet, NULL, 0);
}
@ -203,15 +204,16 @@ KsMethodHandler(
/*
@implemented
*/
_IRQL_requires_max_(PASSIVE_LEVEL)
KSDDKAPI
NTSTATUS
NTAPI
KsMethodHandlerWithAllocator(
IN PIRP Irp,
IN ULONG MethodSetsCount,
IN PKSMETHOD_SET MethodSet,
IN PFNKSALLOCATOR Allocator OPTIONAL,
IN ULONG MethodItemSize OPTIONAL)
_In_ PIRP Irp,
_In_ ULONG MethodSetsCount,
_In_reads_(MethodSetsCount) const KSMETHOD_SET* MethodSet,
_In_opt_ PFNKSALLOCATOR Allocator,
_In_opt_ ULONG MethodItemSize)
{
return KspMethodHandlerWithAllocator(Irp, MethodSetsCount, MethodSet, Allocator, MethodItemSize);
}

6
reactos/drivers/ksfilter/ks/misc.c
View file

@ -103,7 +103,7 @@ KspCopyCreateRequest(
OUT PVOID * Result)
{
PIO_STACK_LOCATION IoStack;
ULONG ObjectLength, ParametersLength;
SIZE_T ObjectLength, ParametersLength;
PVOID Buffer;
/* get current irp stack */
@ -129,7 +129,7 @@ KspCopyCreateRequest(
/* store result */
*Result = Buffer;
*Size = ParametersLength;
*Size = (ULONG)ParametersLength;
return STATUS_SUCCESS;
}
@ -199,7 +199,7 @@ KsGetOuterUnknown(
PKSBASIC_HEADER BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)Object - sizeof(KSBASIC_HEADER));
/* sanity check */
ASSERT(BasicHeader->Type == KsObjectTypeDevice || BasicHeader->Type == KsObjectTypeFilterFactory ||
ASSERT(BasicHeader->Type == KsObjectTypeDevice || BasicHeader->Type == KsObjectTypeFilterFactory ||
BasicHeader->Type == KsObjectTypeFilter || BasicHeader->Type == KsObjectTypePin);
/* return objects outer unknown */

13
reactos/drivers/ksfilter/ks/property.c
View file

@ -300,7 +300,7 @@ KspPropertyHandler(
if (Allocator)
{
/* allocate the requested amount */
Status = Allocator(Irp, Irp->IoStatus.Information, FALSE);
Status = Allocator(Irp, (ULONG)Irp->IoStatus.Information, FALSE);
/* check if the block was allocated */
if (!NT_SUCCESS(Status))
@ -364,15 +364,16 @@ KsPropertyHandler(
/*
@implemented
*/
_IRQL_requires_max_(PASSIVE_LEVEL)
KSDDKAPI
NTSTATUS
NTAPI
KsPropertyHandlerWithAllocator(
IN PIRP Irp,
IN ULONG PropertySetsCount,
IN PKSPROPERTY_SET PropertySet,
IN PFNKSALLOCATOR Allocator OPTIONAL,
IN ULONG PropertyItemSize OPTIONAL)
_In_ PIRP Irp,
_In_ ULONG PropertySetsCount,
_In_reads_(PropertySetsCount) const KSPROPERTY_SET* PropertySet,
_In_opt_ PFNKSALLOCATOR Allocator,
_In_opt_ ULONG PropertyItemSize)
{
return KspPropertyHandler(Irp, PropertySetsCount, PropertySet, Allocator, PropertyItemSize);
}

14
reactos/drivers/ksfilter/ks/swenum.c
View file

@ -329,7 +329,7 @@ KspCreateDeviceReference(
IN LPWSTR ReferenceString)
{
LPWSTR DeviceName;
ULONG Length;
SIZE_T Length;
PLIST_ENTRY Entry;
PBUS_DEVICE_ENTRY DeviceEntry = NULL; /* GCC warning */
BOOLEAN ItemExists = FALSE;
@ -523,7 +523,7 @@ KspBusQueryReferenceString(
IN OUT PWCHAR *String)
{
LPWSTR Name;
ULONG Length;
SIZE_T Length;
PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Context;
/* sanity checks */
@ -665,7 +665,7 @@ KspDoReparseForIrp(
PIRP Irp,
PBUS_DEVICE_ENTRY DeviceEntry)
{
ULONG Length;
SIZE_T Length;
LPWSTR Buffer;
PIO_STACK_LOCATION IoStack;
@ -885,7 +885,7 @@ KspQueryId(
PBUS_DEVICE_ENTRY DeviceEntry;
PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension;
LPWSTR Name;
ULONG Length;
SIZE_T Length;
/* get current irp stack location */
IoStack = IoGetCurrentIrpStackLocation(Irp);
@ -972,7 +972,7 @@ KspInstallInterface(
IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension,
IN PSWENUM_INSTALL_INTERFACE InstallInterface)
{
ULONG Length, Index;
SIZE_T Length, Index;
UNICODE_STRING DeviceString, InterfaceString, ReferenceString;
HANDLE hKey, hDeviceKey, hInterfaceKey, hReferenceKey;
NTSTATUS Status;
@ -1369,7 +1369,7 @@ KsGetBusEnumIdentifier(
PDEV_EXTENSION DeviceExtension;
PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension;
PIO_STACK_LOCATION IoStack;
ULONG Length;
SIZE_T Length;
NTSTATUS Status;
LPWSTR Buffer;
@ -1489,7 +1489,7 @@ KsCreateBusEnumObject(
IN REFGUID InterfaceGuid OPTIONAL,
IN PWCHAR ServiceRelativePath OPTIONAL)
{
ULONG Length;
SIZE_T Length;
NTSTATUS Status = STATUS_SUCCESS;
UNICODE_STRING ServiceKeyPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Services\\");
PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension;

10
reactos/include/psdk/ks.h
View file

@ -3525,7 +3525,7 @@ NTAPI
KsMethodHandler(
_In_ PIRP Irp,
_In_ ULONG MethodSetsCount,
_In_reads_(MethodSetsCount) const PKSMETHOD_SET MethodSet);
_In_reads_(MethodSetsCount) const KSMETHOD_SET* MethodSet);
_IRQL_requires_max_(PASSIVE_LEVEL)
KSDDKAPI
@ -3534,7 +3534,7 @@ NTAPI
KsMethodHandlerWithAllocator(
_In_ PIRP Irp,
_In_ ULONG MethodSetsCount,
_In_reads_(MethodSetsCount) const PKSMETHOD_SET MethodSet,
_In_reads_(MethodSetsCount) const KSMETHOD_SET* MethodSet,
_In_opt_ PFNKSALLOCATOR Allocator,
_In_opt_ ULONG MethodItemSize);
@ -3576,7 +3576,7 @@ NTAPI
KsPropertyHandlerWithAllocator(
_In_ PIRP Irp,
_In_ ULONG PropertySetsCount,
_In_reads_(PropertySetsCount) const PKSPROPERTY_SET PropertySet,
_In_reads_(PropertySetsCount) const KSPROPERTY_SET* PropertySet,
_In_opt_ PFNKSALLOCATOR Allocator,
_In_opt_ ULONG PropertyItemSize);
@ -3659,7 +3659,7 @@ NTAPI
KsEnableEventWithAllocator(
_In_ PIRP Irp,
_In_ ULONG EventSetsCount,
_In_reads_(EventSetsCount) const PKSEVENT_SET EventSet,
_In_reads_(EventSetsCount) const KSEVENT_SET* EventSet,
_Inout_opt_ PLIST_ENTRY EventsList,
_In_opt_ KSEVENTS_LOCKTYPE EventsFlags,
_In_opt_ PVOID EventsLock,
@ -4819,7 +4819,7 @@ DEFINE_GUID(IID_IKsControl, 0x28F54685L, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0,
DECLARE_INTERFACE_(IKsControl,IUnknown)
{
STDMETHOD_(NTSTATUS, QueryInterface)( THIS_
STDMETHOD_(NTSTATUS, QueryInterface)( THIS_
REFIID InterfaceId,
PVOID* Interface)PURE;