10 May
2014
10 May
'14
10:02 a.m.
Author: tkreuzer
Date: Sat May 10 10:02:09 2014
New Revision: 63214
URL: http://svn.reactos.org/svn/reactos?rev=63214&view=rev
Log:
[KS]
Fix some prototypes and some MSVC/x64 warnings
Modified:
trunk/reactos/drivers/ksfilter/ks/api.c
trunk/reactos/drivers/ksfilter/ks/event.c
trunk/reactos/drivers/ksfilter/ks/ksfunc.h
trunk/reactos/drivers/ksfilter/ks/methods.c
trunk/reactos/drivers/ksfilter/ks/misc.c
trunk/reactos/drivers/ksfilter/ks/property.c
trunk/reactos/drivers/ksfilter/ks/swenum.c
trunk/reactos/include/psdk/ks.h
Modified: trunk/reactos/drivers/ksfilter/ks/api.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?…
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Sat May 10 10:02:09 2014
@@ -1140,7 +1140,7 @@
if (Status)
{
/* store bytes returned */
- *BytesReturned = IoStatusBlock.Information;
+ *BytesReturned = (ULONG)IoStatusBlock.Information;
/* return status */
return IoStatusBlock.Status;
}
@@ -1181,7 +1181,7 @@
Status = IoStatusBlock.Status;
}
- *BytesReturned = IoStatusBlock.Information;
+ *BytesReturned = (ULONG)IoStatusBlock.Information;
return Status;
}
@@ -1716,8 +1716,8 @@
return;
}
- /* FIXME
- * delete object / device header
+ /* FIXME
+ * delete object / device header
* remove dead pin / filter instance
*/
UNIMPLEMENTED
@@ -1782,7 +1782,7 @@
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 @@
/* 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 @@
PKSPROPERTY_ITEM PropertyItem, CurrentPropertyItem;
NTSTATUS Status;
- // max properties
+ // max properties
PropertyCount = PropertySetA->PropertiesCount + PropertySetB->PropertiesCount;
// allocate items
@@ -2518,7 +2518,7 @@
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)
Modified: trunk/reactos/drivers/ksfilter/ks/event.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/event.…
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] Sat May 10 10:02:09 2014
@@ -87,7 +87,7 @@
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 @@
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 @@
/* invalid type requested */
return STATUS_INVALID_PARAMETER;
}
- }
+ }
/* calculate request size */
@@ -398,18 +398,19 @@
/*
@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);
}
Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc…
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Sat May 10 10:02:09 2014
@@ -175,7 +175,7 @@
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,
Modified: trunk/reactos/drivers/ksfilter/ks/methods.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/method…
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] Sat May 10 10:02:09 2014
@@ -147,7 +147,7 @@
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 @@
/*
@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 @@
/*
@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);
}
Modified: trunk/reactos/drivers/ksfilter/ks/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c…
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Sat May 10 10:02:09 2014
@@ -103,7 +103,7 @@
OUT PVOID * Result)
{
PIO_STACK_LOCATION IoStack;
- ULONG ObjectLength, ParametersLength;
+ SIZE_T ObjectLength, ParametersLength;
PVOID Buffer;
/* get current irp stack */
@@ -129,7 +129,7 @@
/* store result */
*Result = Buffer;
- *Size = ParametersLength;
+ *Size = (ULONG)ParametersLength;
return STATUS_SUCCESS;
}
@@ -199,7 +199,7 @@
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 */
Modified: trunk/reactos/drivers/ksfilter/ks/property.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper…
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] Sat May 10 10:02:09
2014
@@ -300,7 +300,7 @@
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 @@
/*
@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);
}
Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/swenum…
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sat May 10 10:02:09 2014
@@ -329,7 +329,7 @@
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 @@
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 @@
PIRP Irp,
PBUS_DEVICE_ENTRY DeviceEntry)
{
- ULONG Length;
+ SIZE_T Length;
LPWSTR Buffer;
PIO_STACK_LOCATION IoStack;
@@ -885,7 +885,7 @@
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 @@
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 @@
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 @@
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;
Modified: trunk/reactos/include/psdk/ks.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=6321…
==============================================================================
--- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Sat May 10 10:02:09 2014
@@ -3525,7 +3525,7 @@
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 @@
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 @@
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 @@
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 @@
DECLARE_INTERFACE_(IKsControl,IUnknown)
{
- STDMETHOD_(NTSTATUS, QueryInterface)( THIS_
+ STDMETHOD_(NTSTATUS, QueryInterface)( THIS_
REFIID InterfaceId,
PVOID* Interface)PURE;
4055
days inactive
4055
days old
0 comments
1 participants
participants (1)
-
tkreuzer＠svn.reactos.org