Author: akhaldi Date: Wed Jan 29 10:59:06 2014 New Revision: 61881
URL: http://svn.reactos.org/svn/reactos?rev=61881&view=rev Log: [KS] * Properly name the main header. * Remove one time inclusions from the main header and put them back where they belong. CORE-7716
Added: trunk/reactos/drivers/ksfilter/ks/precomp.h - copied, changed from r61860, trunk/reactos/drivers/ksfilter/ks/priv.h Removed: trunk/reactos/drivers/ksfilter/ks/priv.h Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c trunk/reactos/drivers/ksfilter/ks/api.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/deviceinterface.c trunk/reactos/drivers/ksfilter/ks/driver.c trunk/reactos/drivers/ksfilter/ks/event.c trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/filterfactory.c trunk/reactos/drivers/ksfilter/ks/image.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/kcom.c trunk/reactos/drivers/ksfilter/ks/methods.c trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/ksfilter/ks/pin.c trunk/reactos/drivers/ksfilter/ks/property.c trunk/reactos/drivers/ksfilter/ks/swenum.c trunk/reactos/drivers/ksfilter/ks/topology.c trunk/reactos/drivers/ksfilter/ks/unknown.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/allocat... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?r... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/bag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/bag.c?r... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/clocks.... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connect... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device.... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/deviceinterface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/devicei... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/deviceinterface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/deviceinterface.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -1,4 +1,4 @@ -#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/driver.... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/event.c... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter.... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/filterfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filterf... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/image.c... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#include <ntimage.h> #include <ndk/ldrfuncs.h>
Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?r... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,9 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h" + +#include <ntifs.h>
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/kcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kcom.c?... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -7,7 +7,7 @@ Andrew Greenwood */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/methods.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/methods... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
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] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
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] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#include <bdamedia.h>
Copied: trunk/reactos/drivers/ksfilter/ks/precomp.h (from r61860, trunk/reactos/drivers/ksfilter/ks/priv.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/precomp... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/precomp.h [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -1,6 +1,6 @@ #define _KSDDK_
-#include <ntifs.h> +#include <ntddk.h> #include <portcls.h> #include <kcom.h> #include <pseh/pseh2.h>
Removed: trunk/reactos/drivers/ksfilter/ks/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/priv.h?... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/priv.h (removed) @@ -1,47 +0,0 @@ -#define _KSDDK_ - -#include <ntifs.h> -#include <portcls.h> -#include <kcom.h> -#include <pseh/pseh2.h> - -#include "ksiface.h" -#include "kstypes.h" -#include "ksfunc.h" - -#define TAG_DEVICE_HEADER 'KSDH' -#define REG_PINFLAG_B_MANY 0x4 /* strmif.h */ -#define MERIT_DO_NOT_USE 0x200000 /* dshow.h */ - -#define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ - PropGeneral, PropInstances, PropIntersection)\ -DEFINE_KSPROPERTY_TABLE(PinSet) {\ - DEFINE_KSPROPERTY_ITEM_PIN_CINSTANCES(PropInstances),\ - DEFINE_KSPROPERTY_ITEM_PIN_CTYPES(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_DATAFLOW(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_DATARANGES(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_DATAINTERSECTION(PropIntersection),\ - DEFINE_KSPROPERTY_ITEM_PIN_INTERFACES(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_MEDIUMS(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_COMMUNICATION(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_CATEGORY(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_NAME(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_CONSTRAINEDDATARANGES(PropGeneral),\ - DEFINE_KSPROPERTY_ITEM_PIN_PROPOSEDATAFORMAT(PropGeneral)\ -} - -#define DEFINE_KSPROPERTY_CONNECTIONSET(PinSet,\ - PropStateHandler, PropDataFormatHandler, PropAllocatorFraming)\ -DEFINE_KSPROPERTY_TABLE(PinSet) {\ - DEFINE_KSPROPERTY_ITEM_CONNECTION_STATE(PropStateHandler, PropStateHandler),\ - DEFINE_KSPROPERTY_ITEM_CONNECTION_DATAFORMAT(PropDataFormatHandler, PropDataFormatHandler),\ - DEFINE_KSPROPERTY_ITEM_CONNECTION_ALLOCATORFRAMING_EX(PropAllocatorFraming)\ -} - -#define DEFINE_KSPROPERTY_STREAMSET(PinSet,\ - PropStreamAllocator, PropMasterClock, PropPipeId)\ -DEFINE_KSPROPERTY_TABLE(PinSet) {\ - DEFINE_KSPROPERTY_ITEM_STREAM_ALLOCATOR(PropStreamAllocator, PropStreamAllocator),\ - DEFINE_KSPROPERTY_ITEM_STREAM_MASTERCLOCK(PropMasterClock, PropMasterClock),\ - DEFINE_KSPROPERTY_ITEM_STREAM_PIPE_ID(PropPipeId, PropPipeId)\ -}
Modified: trunk/reactos/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/propert... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
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] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#include <stdio.h> #include <swenum.h>
Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolog... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/unknown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/unknown... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/unknown.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/unknown.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -7,7 +7,7 @@ * KJK::Hyperion */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/drivers/ksfilter/ks/worker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/worker.... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] Wed Jan 29 10:59:06 2014 @@ -6,7 +6,7 @@ * PROGRAMMER: Johannes Anderwald */
-#include "priv.h" +#include "precomp.h"
#define NDEBUG #include <debug.h>