[ros-diffs] [janderwald] 39524: - Move includes to a common header- Implement IKsDevice interface stubs - Add a DriverEntry - Partly implement KsAllocateObjectHeader - Check for IID_IUnknown in KoCreateInstance
janderwald at svn.reactos.org
janderwald at svn.reactos.org
Tue Feb 10 08:44:44 CET 2009
Author: janderwald
Date: Tue Feb 10 01:44:43 2009
New Revision: 39524
URL: http://svn.reactos.org/svn/reactos?rev=39524&view=rev
Log:
- Move includes to a common header- Implement IKsDevice interface stubs
- Add a DriverEntry
- Partly implement KsAllocateObjectHeader
- Check for IID_IUnknown in KoCreateInstance
Added:
trunk/reactos/drivers/ksfilter/ks/kstypes.h (with props)
trunk/reactos/drivers/ksfilter/ks/priv.h (with props)
Modified:
trunk/reactos/drivers/ksfilter/ks/allocators.c
trunk/reactos/drivers/ksfilter/ks/bag.c
trunk/reactos/drivers/ksfilter/ks/clocks.c
trunk/reactos/drivers/ksfilter/ks/connectivity.c
trunk/reactos/drivers/ksfilter/ks/device.c
trunk/reactos/drivers/ksfilter/ks/driver.c
trunk/reactos/drivers/ksfilter/ks/events.c
trunk/reactos/drivers/ksfilter/ks/irp.c
trunk/reactos/drivers/ksfilter/ks/kcom.c
trunk/reactos/drivers/ksfilter/ks/ksfunc.h
trunk/reactos/drivers/ksfilter/ks/ksiface.h
trunk/reactos/drivers/ksfilter/ks/methods.c
trunk/reactos/drivers/ksfilter/ks/properties.c
trunk/reactos/drivers/ksfilter/ks/worker.c
Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/allocators.c?rev=39524&r1=39523&r2=39524&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -1,10 +1,5 @@
-/* ===============================================================
- Allocator Functions
-*/
+#include "priv.h"
-#include <ntddk.h>
-#include <debug.h>
-#include <ks.h>
/*
@unimplemented
Modified: trunk/reactos/drivers/ksfilter/ks/bag.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/bag.c?rev=39524&r1=39523&r2=39524&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -1,6 +1,6 @@
-#include <ntddk.h>
-#include <debug.h>
-#include <ks.h>
+#include "priv.h"
+
+
#if 0
typedef struct
{
Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/clocks.c?rev=39524&r1=39523&r2=39524&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -1,10 +1,4 @@
-/* ===============================================================
- Clock Functions
-*/
-
-#include <ntddk.h>
-#include <debug.h>
-#include <ks.h>
+#include "priv.h"
typedef struct
{
Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connectivity.c?rev=39524&r1=39523&r2=39524&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -1,14 +1,4 @@
-/*
- KsCreatePin
- KsValidateConnectRequest
- KsPinPropertyHandler
- KsPinDataIntersection
- KsHandleSizedListQuery
-*/
-
-#include <ntddk.h>
-#include <debug.h>
-#include <ks.h>
+#include "priv.h"
KSDDKAPI NTSTATUS NTAPI
KsCreatePin(
Modified: trunk/reactos/drivers/ksfilter/ks/device.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device.c?rev=39524&r1=39523&r2=39524&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -1,32 +1,218 @@
-#include <ntddk.h>
-#include <debug.h>
-#include <ks.h>
-
-#include "ksiface.h"
-#include "ksfunc.h"
+#include "priv.h"
typedef struct
{
IKsDeviceVtbl *lpVtbl;
LONG ref;
-
+ KSDEVICE KsDevice;
}IKsDeviceImpl;
NTSTATUS
NTAPI
+IKsDevice_fnQueryInterface(
+ IN IKsDevice * iface,
+ REFIID InterfaceId,
+ PVOID* Interface)
+{
+ IKsDeviceImpl * This = (IKsDeviceImpl*)iface;
+
+ DPRINT1("IKsDevice_fnQueryInterface %p\n", This);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+ULONG
+NTAPI
+IKsDevice_fnAddRef(
+ IN IKsDevice * iface)
+{
+ IKsDeviceImpl * This = (IKsDeviceImpl*)iface;
+
+ return InterlockedIncrement(&This->ref);
+}
+
+ULONG
+NTAPI
+IKsDevice_fnRelease(
+ IN IKsDevice * iface)
+{
+ IKsDeviceImpl * This = (IKsDeviceImpl*)iface;
+
+ InterlockedDecrement(&This->ref);
+
+ if (This->ref == 0)
+ {
+ ExFreePoolWithTag(This, TAG_KSDEVICE);
+ return 0;
+ }
+
+ return This->ref;
+}
+
+
+
+KSDEVICE *
+NTAPI
+IKsDevice_fnGetStruct(
+ IN IKsDevice * iface)
+{
+ IKsDeviceImpl * This = (IKsDeviceImpl*)iface;
+
+ return &This->KsDevice;
+}
+
+NTSTATUS
+NTAPI
+IKsDevice_fnInitializeObjectBag(
+ IN IKsDevice * iface,
+ IN struct KSIOBJECTBAG *Bag,
+ IN KMUTANT * Mutant)
+{
+ IKsDeviceImpl * This = (IKsDeviceImpl*)iface;
+
+ DPRINT1("IKsDevice_fnInitializeObjectBag %p\n", This);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+NTAPI
+IKsDevice_fnAcquireDevice(
+ IN IKsDevice * iface)
+{
+ IKsDeviceImpl * This = (IKsDeviceImpl*)iface;
+
+ DPRINT1("IKsDevice_fnAcquireDevice %p\n", This);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+NTAPI
+IKsDevice_fnReleaseDevice(
+ IN IKsDevice * iface)
+{
+ IKsDeviceImpl * This = (IKsDeviceImpl*)iface;
+
+ DPRINT1("IKsDevice_fnReleaseDevice %p\n", This);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+NTAPI
+IKsDevice_fnGetAdapterObject(
+ IN IKsDevice * iface,
+ IN PADAPTER_OBJECT Object,
+ IN PULONG Unknown1,
+ IN PULONG Unknown2)
+{
+ IKsDeviceImpl * This = (IKsDeviceImpl*)iface;
+
+ DPRINT1("IKsDevice_fnGetAdapterObject %p\n", This);
+ return STATUS_NOT_IMPLEMENTED;
+
+}
+
+NTSTATUS
+NTAPI
+IKsDevice_fnAddPowerEntry(
+ IN IKsDevice * iface,
+ IN struct KSPOWER_ENTRY * Entry,
+ IN IKsPowerNotify* Notify)
+{
+ IKsDeviceImpl * This = (IKsDeviceImpl*)iface;
+
+ DPRINT1("IKsDevice_fnAddPowerEntry %p\n", This);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+NTSTATUS
+NTAPI
+IKsDevice_fnRemovePowerEntry(
+ IN IKsDevice * iface,
+ IN struct KSPOWER_ENTRY * Entry)
+{
+ IKsDeviceImpl * This = (IKsDeviceImpl*)iface;
+
+ DPRINT1("IKsDevice_fnRemovePowerEntry %p\n", This);
+ return STATUS_NOT_IMPLEMENTED;
+
+}
+
+NTSTATUS
+NTAPI
+IKsDevice_fnPinStateChange(
+ IN IKsDevice * iface,
+ IN KSPIN Pin,
+ IN PIRP Irp,
+ IN KSSTATE OldState,
+ IN KSSTATE NewState)
+{
+ IKsDeviceImpl * This = (IKsDeviceImpl*)iface;
+
+ DPRINT1("IKsDevice_fnPinStateChange %p\n", This);
+ return STATUS_NOT_IMPLEMENTED;
+
+}
+
+NTSTATUS
+NTAPI
+IKsDevice_fnArbitrateAdapterChannel(
+ IN IKsDevice * iface,
+ IN ULONG ControlCode,
+ IN IO_ALLOCATION_ACTION Action,
+ IN PVOID Context)
+{
+ IKsDeviceImpl * This = (IKsDeviceImpl*)iface;
+
+ DPRINT1("IKsDevice_fnArbitrateAdapterChannel %p\n", This);
+ return STATUS_NOT_IMPLEMENTED;
+
+}
+
+NTSTATUS
+NTAPI
+IKsDevice_fnCheckIoCapability(
+ IN IKsDevice * iface,
+ IN ULONG Unknown)
+{
+ IKsDeviceImpl * This = (IKsDeviceImpl*)iface;
+
+ DPRINT1("IKsDevice_fnCheckIoCapability %p\n", This);
+ return STATUS_NOT_IMPLEMENTED;
+}
+
+static IKsDeviceVtbl vt_IKsDevice =
+{
+ IKsDevice_fnQueryInterface,
+ IKsDevice_fnAddRef,
+ IKsDevice_fnRelease,
+ IKsDevice_fnGetStruct,
+ IKsDevice_fnInitializeObjectBag,
+ IKsDevice_fnAcquireDevice,
+ IKsDevice_fnReleaseDevice,
+ IKsDevice_fnGetAdapterObject,
+ IKsDevice_fnAddPowerEntry,
+ IKsDevice_fnRemovePowerEntry,
+ IKsDevice_fnPinStateChange,
+ IKsDevice_fnArbitrateAdapterChannel,
+ IKsDevice_fnCheckIoCapability
+};
+
+
+
+NTSTATUS
+NTAPI
NewIKsDevice(IKsDevice** OutDevice)
{
IKsDeviceImpl * This;
- This = ExAllocatePoolWithTag(NonPagedPool, sizeof(IKsDeviceImpl), 0x12345678); //FIX TAG
+ This = ExAllocatePoolWithTag(NonPagedPool, sizeof(IKsDeviceImpl), TAG_KSDEVICE);
if (!This)
return STATUS_INSUFFICIENT_RESOURCES;
This->ref = 1;
- //This->lpVtbl = &vt_IKsDevice;
+ This->lpVtbl = &vt_IKsDevice;
*OutDevice = (IKsDevice*)This;
return STATUS_SUCCESS;
Modified: trunk/reactos/drivers/ksfilter/ks/driver.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/driver.c?rev=39524&r1=39523&r2=39524&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -1,9 +1,18 @@
-#include <ntddk.h>
-#include <debug.h>
-#include <ks.h>
+#include "priv.h"
#include "ksfunc.h"
+
+NTSTATUS
+NTAPI
+DriverEntry(
+ IN PDRIVER_OBJECT Driver,
+ IN PUNICODE_STRING Registry_path
+)
+{
+ DPRINT1("ks.sys loaded\n");
+ return STATUS_SUCCESS;
+}
/*
@unimplemented
Modified: trunk/reactos/drivers/ksfilter/ks/events.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/events.c?rev=39524&r1=39523&r2=39524&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/events.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/events.c [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -1,6 +1,4 @@
-#include <ntddk.h>
-#include <debug.h>
-#include <ks.h>
+#include "priv.h"
/* ===============================================================
Event Functions
Modified: trunk/reactos/drivers/ksfilter/ks/irp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?rev=39524&r1=39523&r2=39524&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -3,11 +3,7 @@
IRP Helpers
*/
-#include <ntddk.h>
-#include <debug.h>
-#include <ks.h>
-
-#define TAG(A, B, C, D) (IN ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
+#include "priv.h"
/*
@unimplemented
@@ -145,32 +141,31 @@
*/
KSDDKAPI NTSTATUS NTAPI
KsAllocateObjectHeader(
- OUT PVOID Header,
+ OUT KSOBJECT_HEADER *Header,
IN ULONG ItemsCount,
IN PKSOBJECT_CREATE_ITEM ItemsList OPTIONAL,
IN PIRP Irp,
IN KSDISPATCH_TABLE* Table)
{
- /* NOTE: PKSOBJECT_HEADER is not defined yet */
-#if 0
- PKSOBJECT_HEADER object_header;
-
- /* TODO: Validate parameters */
-
- object_header = ExAllocatePoolWithTag(PagedPool, sizeof(KSOBJECT_HEADER), TAG('H','O','S','K'));
-
- if ( ! object_header )
+ PKSIOBJECT_HEADER ObjectHeader;
+
+ ObjectHeader = ExAllocatePoolWithTag(PagedPool, sizeof(KSIOBJECT_HEADER), TAG_KSOBJECT_TAG);
+ if (!ObjectHeader)
{
return STATUS_INSUFFICIENT_RESOURCES;
}
- (PVOID)(*Header) = object_header;
-
- /* TODO ... */
-#endif
-
- UNIMPLEMENTED;
- return STATUS_UNSUCCESSFUL;
+ RtlZeroMemory(ObjectHeader, sizeof(KSIOBJECT_HEADER));
+
+ RtlCopyMemory(&ObjectHeader->DispatchTable, Table, sizeof(KSDISPATCH_TABLE));
+ ObjectHeader->CreateItem = ItemsList;
+
+ //FIXME
+ // copy itemlist
+
+ *Header = ObjectHeader;
+ return STATUS_SUCCESS;
+
}
/*
@@ -584,11 +579,13 @@
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp)
{
+ PIO_STACK_LOCATION IoStack;
+
/* TODO - Nothing implemented really yet! */
-
- DPRINT1("KS IRP dispatch function called\n");
-
- //PKSDISPATCH_TABLE ks_dispatch_table = NULL;
+ IoStack = IoGetCurrentIrpStackLocation(Irp);
+
+
+ DPRINT1("KS IRP dispatch function called with func %x\n", IoStack->MajorFunction);
/* ks_dispatch_table is the first element in a structure pointed to by FsContext */
Modified: trunk/reactos/drivers/ksfilter/ks/kcom.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kcom.c?rev=39524&r1=39523&r2=39524&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -2,11 +2,9 @@
Kernel-mode COM
*/
-#include <ntddk.h>
-#include <portcls.h>
-#include <kcom.h>
-#include <debug.h>
+#include "priv.h"
+const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46}};
/* http://msdn2.microsoft.com/en-us/library/ms809781.aspx */
COMDDKAPI NTSTATUS NTAPI
@@ -24,9 +22,16 @@
if ( ClsContext != CLSCTX_KERNEL_SERVER )
{
- DPRINT("FAILED: ClsContext must be CLSCTX_KERNEL_SERVER\n");
+ DPRINT("KoCreateInstance: ClsContext must be CLSCTX_KERNEL_SERVER\n");
return STATUS_INVALID_PARAMETER_3;
}
+
+ if (IsEqualGUIDAligned(InterfaceId, &IID_IUnknown))
+ {
+ DPRINT("KoCreateInstance: InterfaceId cannot be IID_IUnknown\n");
+ return STATUS_INVALID_PARAMETER_4;
+ }
+
/*
Find the desired interface and create an instance.
Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc.h?rev=39524&r1=39523&r2=39524&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -7,8 +7,9 @@
NTAPI
NewIKsDevice(IKsDevice** OutDevice);
-
-
+#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
+#define TAG_KSDEVICE TAG('K', 'S', 'E', 'D')
+#define TAG_KSOBJECT_TAG TAG('K', 'S', 'O', 'H')
Modified: trunk/reactos/drivers/ksfilter/ks/ksiface.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksiface.h?rev=39524&r1=39523&r2=39524&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/ksiface.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/ksiface.h [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -4,7 +4,15 @@
#include <ntddk.h>
#include <ks.h>
+#if !defined(DEFINE_ABSTRACT_UNKNOWN)
+#define DEFINE_ABSTRACT_UNKNOWN() \
+ STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ \
+ REFIID InterfaceId, \
+ PVOID* Interface)PURE; \
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+#endif
/*****************************************************************************
* IKsFilterFactory
@@ -14,16 +22,13 @@
#undef INTERFACE
#define INTERFACE IKsFilterFactory
-struct KSFILTERFACTORY;
-
DECLARE_INTERFACE_(IKsFilterFactory, IUnknown)
{
- //DEFINE_ABSTRACT_UNKNOWN()
+ DEFINE_ABSTRACT_UNKNOWN()
- STDMETHOD_(struct KSFILTERFACTORY*,GetStruct)(THIS) PURE;
+ STDMETHOD_(KSFILTERFACTORY*,GetStruct)(THIS) PURE;
STDMETHOD_(NTSTATUS,SetDeviceClassesState)(THIS_
- IN ULONG Unknown1,
IN BOOLEAN Enable)PURE;
};
@@ -38,12 +43,12 @@
DECLARE_INTERFACE_(IKsPowerNotify, IUnknown)
{
- //DEFINE_ABSTRACT_UNKNOWN()
+ DEFINE_ABSTRACT_UNKNOWN()
- STDMETHOD_(ULONG,Sleep)(THIS_
+ STDMETHOD_(VOID,Sleep)(THIS_
IN DEVICE_POWER_STATE State) PURE;
- STDMETHOD_(ULONG,Wake)(THIS) PURE;
+ STDMETHOD_(VOID,Wake)(THIS) PURE;
};
@@ -60,27 +65,27 @@
DECLARE_INTERFACE_(IKsDevice, IUnknown)
{
- //DEFINE_ABSTRACT_UNKNOWN()
+ DEFINE_ABSTRACT_UNKNOWN()
- STDMETHOD_(struct KSDEVICE*,GetStruct)(THIS) PURE;
+ STDMETHOD_(KSDEVICE*,GetStruct)(THIS) PURE;
STDMETHOD_(NTSTATUS, InitializeObjectBag)(THIS_
IN struct KSIOBJECTBAG *Bag,
IN KMUTANT * Mutant) PURE;
- STDMETHOD_(ULONG,AcquireDevice)(THIS) PURE;
- STDMETHOD_(ULONG,ReleaseDevice)(THIS) PURE;
+ STDMETHOD_(NTSTATUS,AcquireDevice)(THIS) PURE;
+ STDMETHOD_(NTSTATUS,ReleaseDevice)(THIS) PURE;
- STDMETHOD_(VOID, GetAdapterObject)(THIS_
+ STDMETHOD_(NTSTATUS, GetAdapterObject)(THIS_
IN PADAPTER_OBJECT Object,
IN PULONG Unknown1,
IN PULONG Unknown2) PURE;
- STDMETHOD_(VOID, AddPowerEntry)(THIS_
+ STDMETHOD_(NTSTATUS, AddPowerEntry)(THIS_
IN struct KSPOWER_ENTRY * Entry,
- IN struct IKsPowerNotify* Notify)PURE;
+ IN IKsPowerNotify* Notify)PURE;
- STDMETHOD_(VOID, RemovePowerEntry)(THIS_
+ STDMETHOD_(NTSTATUS, RemovePowerEntry)(THIS_
IN struct KSPOWER_ENTRY * Entry)PURE;
STDMETHOD_(NTSTATUS, PinStateChange)(THIS_
Added: trunk/reactos/drivers/ksfilter/ks/kstypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstypes.h?rev=39524&view=auto
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/kstypes.h (added)
+++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -1,0 +1,18 @@
+#ifndef KSTYPES_H__
+#define KSTYPES_H__
+
+typedef struct
+{
+ KSDISPATCH_TABLE DispatchTable;
+ LIST_ENTRY ListEntry;
+ ACCESS_MASK AccessMask;
+ PKSOBJECT_CREATE_ITEM CreateItem;
+
+}KSIOBJECT_HEADER, *PKSIOBJECT_HEADER;
+
+
+
+
+
+
+#endif
Propchange: trunk/reactos/drivers/ksfilter/ks/kstypes.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/drivers/ksfilter/ks/methods.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/methods.c?rev=39524&r1=39523&r2=39524&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -1,10 +1,8 @@
+#include "priv.h"
+
/* ===============================================================
Method Functions
*/
-
-#include <ntddk.h>
-#include <debug.h>
-#include <ks.h>
/*
@unimplemented
Added: trunk/reactos/drivers/ksfilter/ks/priv.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/priv.h?rev=39524&view=auto
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/priv.h (added)
+++ trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -1,0 +1,19 @@
+#ifndef PRIV_H__
+#define PRIV_H__
+
+#include <ntddk.h>
+#include <debug.h>
+#include <ks.h>
+#include <portcls.h>
+#include <kcom.h>
+
+#include "ksfunc.h"
+#include "kstypes.h"
+#include "ksiface.h"
+
+
+
+
+
+
+#endif
Propchange: trunk/reactos/drivers/ksfilter/ks/priv.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/drivers/ksfilter/ks/properties.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/properties.c?rev=39524&r1=39523&r2=39524&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/properties.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/properties.c [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -1,6 +1,4 @@
-#include <ntddk.h>
-#include <debug.h>
-#include <ks.h>
+#include "priv.h"
/* ===============================================================
Property Functions
Modified: trunk/reactos/drivers/ksfilter/ks/worker.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/worker.c?rev=39524&r1=39523&r2=39524&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] Tue Feb 10 01:44:43 2009
@@ -1,11 +1,8 @@
+#include "priv.h"
+
/* ===============================================================
Worker Management Functions
*/
-
-#include <ntddk.h>
-#include <debug.h>
-#include <ks.h>
-
typedef struct
{
More information about the Ros-diffs
mailing list