[akhaldi] 61489: [KS] * Do not include debug.h into the main header. * Remove one time inclusions from the main header and put them back where they belong. * Move some inclusions to the main header...
Author: akhaldi Date: Thu Jan 2 11:34:12 2014 New Revision: 61489
URL: http://svn.reactos.org/svn/reactos?rev=61489&view=rev Log: [KS] * Do not include debug.h into the main header. * Remove one time inclusions from the main header and put them back where they belong. * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716
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/ksfunc.h trunk/reactos/drivers/ksfilter/ks/ksiface.h trunk/reactos/drivers/ksfilter/ks/kstypes.h 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/priv.h 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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */
- #include "priv.h" + +#define NDEBUG +#include <debug.h>
typedef enum {
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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */
- #include "priv.h" + +#define NDEBUG +#include <debug.h>
const GUID GUID_NULL = {0x00000000L, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; const GUID KSMEDIUMSETID_Standard = {0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}};
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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */
- #include "priv.h" + +#define NDEBUG +#include <debug.h>
typedef struct {
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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */
- #include "priv.h" + +#define NDEBUG +#include <debug.h>
typedef struct {
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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */
- #include "priv.h" + +#define NDEBUG +#include <debug.h>
KSPIN_INTERFACE StandardPinInterface = {
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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */
- #include "priv.h" + +#define NDEBUG +#include <debug.h>
NTSTATUS NTAPI
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] Thu Jan 2 11:34:12 2014 @@ -1,4 +1,7 @@ #include "priv.h" + +#define NDEBUG +#include <debug.h>
NTSTATUS KspSetDeviceInterfacesState(
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] Thu Jan 2 11:34:12 2014 @@ -7,6 +7,9 @@ */
#include "priv.h" + +#define NDEBUG +#include <debug.h>
/* @implemented
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] Thu Jan 2 11:34:12 2014 @@ -7,6 +7,9 @@ */
#include "priv.h" + +#define NDEBUG +#include <debug.h>
BOOLEAN KspSynchronizedEventRoutine(
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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */
- #include "priv.h" + +#define NDEBUG +#include <debug.h>
typedef struct {
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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */
- #include "priv.h" + +#define NDEBUG +#include <debug.h>
typedef struct {
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] Thu Jan 2 11:34:12 2014 @@ -7,6 +7,12 @@ */
#include "priv.h" + +#include <ntimage.h> +#include <ndk/ldrfuncs.h> + +#define NDEBUG +#include <debug.h>
/* @implemented
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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */
- #include "priv.h" + +#define NDEBUG +#include <debug.h>
/* @implemented
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] Thu Jan 2 11:34:12 2014 @@ -8,6 +8,9 @@ */
#include "priv.h" + +#define NDEBUG +#include <debug.h>
const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46}};
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] Thu Jan 2 11:34:12 2014 @@ -1,7 +1,4 @@ #pragma once - -#include "ksiface.h" -#include "kstypes.h"
#define TAG_KSDEVICE 'DESK' #define TAG_KSOBJECT_TAG 'HOSK'
Modified: trunk/reactos/drivers/ksfilter/ks/ksiface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksiface... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksiface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksiface.h [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -1,7 +1,4 @@ #pragma once - -#include <ntddk.h> -#include <ks.h>
#if !defined(DEFINE_ABSTRACT_UNKNOWN)
Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstypes... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -1,7 +1,4 @@ #pragma once - -#include <ntddk.h> -#include <ks.h>
typedef struct {
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] Thu Jan 2 11:34:12 2014 @@ -7,6 +7,9 @@ */
#include "priv.h" + +#define NDEBUG +#include <debug.h>
NTSTATUS FindMethodHandler(
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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */
- #include "priv.h" + +#define NDEBUG +#include <debug.h>
VOID CompleteRequest(
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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,12 @@ * PROGRAMMER: Johannes Anderwald */
- #include "priv.h" + +#include <bdamedia.h> + +#define NDEBUG +#include <debug.h>
typedef struct _KSISTREAM_POINTER {
Modified: 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 [iso-8859-1] Thu Jan 2 11:34:12 2014 @@ -1,21 +1,13 @@ #define _KSDDK_
-#include <stdio.h> - #include <ntifs.h> -#define NDEBUG -//#define YDEBUG -#include <debug.h> #include <portcls.h> #include <kcom.h> #include <pseh/pseh2.h>
-#include <ntimage.h> -#include <ndk/ldrfuncs.h> - +#include "ksiface.h" +#include "kstypes.h" #include "ksfunc.h" -#include "bdamedia.h" -#include <swenum.h>
#define TAG_DEVICE_HEADER 'KSDH' #define REG_PINFLAG_B_MANY 0x4 /* strmif.h */
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] Thu Jan 2 11:34:12 2014 @@ -7,6 +7,9 @@ */
#include "priv.h" + +#define NDEBUG +#include <debug.h>
const GUID KSPROPTYPESETID_General = {0x97E99BA0L, 0xBDEA, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}};
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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,13 @@ * PROGRAMMER: Johannes Anderwald */
- #include "priv.h" + +#include <stdio.h> +#include <swenum.h> + +#define NDEBUG +#include <debug.h>
LONG KsDeviceCount = 0;
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] Thu Jan 2 11:34:12 2014 @@ -6,9 +6,10 @@ * PROGRAMMER: Johannes Anderwald */
- #include "priv.h"
+#define NDEBUG +#include <debug.h>
NTSTATUS NTAPI
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] Thu Jan 2 11:34:12 2014 @@ -7,8 +7,10 @@ * KJK::Hyperion */
- #include "priv.h" + +#define NDEBUG +#include <debug.h>
#ifdef _X86_ #define KS_DECL_CXX(RET_) extern RET_ __fastcall
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] Thu Jan 2 11:34:12 2014 @@ -6,8 +6,10 @@ * PROGRAMMER: Johannes Anderwald */
- #include "priv.h" + +#define NDEBUG +#include <debug.h>
/* =============================================================== Worker Management Functions
-
akhaldi＠svn.reactos.org