[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 svn path=/trunk/; revision=61489
2026-09-02 19:26:32 +00:00 · 2014-01-02 11:34:12 +00:00
parent 33f697046e
commit f69493f8d8
26 changed files with 75 additions and 34 deletions
@@ -6,9 +6,11 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 typedef enum
 {
    ALLOCATOR_NPAGED_LOOKASIDE,
@@ -6,9 +6,11 @@
 * 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}};

@@ -6,9 +6,11 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 typedef struct
 {
    LIST_ENTRY Entry;
@@ -6,9 +6,11 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 typedef struct
 {
    LONGLONG Time;
@@ -6,9 +6,11 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 KSPIN_INTERFACE StandardPinInterface = 
 {
    {STATIC_KSINTERFACESETID_Standard},
@@ -6,9 +6,11 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 NTSTATUS
 NTAPI
 IKsDevice_fnQueryInterface(
@@ -1,5 +1,8 @@
 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 NTSTATUS
 KspSetDeviceInterfacesState(
    IN PLIST_ENTRY ListHead,
@@ -8,6 +8,9 @@

 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 /*
    @implemented
 */
@@ -8,6 +8,9 @@

 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 BOOLEAN
 KspSynchronizedEventRoutine(
    IN KSEVENTS_LOCKTYPE EventsFlags,
@@ -6,9 +6,11 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 typedef struct
 {
    KSBASIC_HEADER Header;
@@ -6,9 +6,11 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 typedef struct
 {
    KSBASIC_HEADER Header;
@@ -8,6 +8,12 @@

 #include "priv.h"

+#include <ntimage.h>
+#include <ndk/ldrfuncs.h>
+
+#define NDEBUG
+#include <debug.h>
+
 /*
    @implemented
 */
@@ -6,9 +6,11 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 /*
    @implemented
 */
@@ -9,6 +9,9 @@

 #include "priv.h"

+#define NDEBUG
+#include <debug.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 */
@@ -1,8 +1,5 @@
 #pragma once

-#include "ksiface.h"
-#include "kstypes.h"
-
 #define TAG_KSDEVICE 'DESK'
 #define TAG_KSOBJECT_TAG 'HOSK'

@@ -1,8 +1,5 @@
 #pragma once

-#include <ntddk.h>
-#include <ks.h>
-
 #if !defined(DEFINE_ABSTRACT_UNKNOWN)

 #define DEFINE_ABSTRACT_UNKNOWN()                               \
@@ -1,8 +1,5 @@
 #pragma once

-#include <ntddk.h>
-#include <ks.h>
-
 typedef struct
 {
    KoCreateObjectHandler CreateObjectHandler;
@@ -8,6 +8,9 @@

 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 NTSTATUS
 FindMethodHandler(
    IN PIO_STATUS_BLOCK IoStatus,
@@ -6,9 +6,11 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 VOID
 CompleteRequest(
    PIRP Irp,
@@ -6,9 +6,13 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "priv.h"

+#include <bdamedia.h>
+
+#define NDEBUG
+#include <debug.h>
+
 typedef struct _KSISTREAM_POINTER
 {
    PFNKSSTREAMPOINTER Callback;
@@ -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 */
@@ -8,6 +8,9 @@

 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 const GUID KSPROPTYPESETID_General = {0x97E99BA0L, 0xBDEA, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}};

 NTSTATUS
@@ -6,9 +6,14 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "priv.h"

+#include <stdio.h>
+#include <swenum.h>
+
+#define NDEBUG
+#include <debug.h>
+
 LONG KsDeviceCount = 0;

 typedef NTSTATUS (NTAPI *PKSP_BUS_ENUM_CALLBACK)(
@@ -6,9 +6,10 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "priv.h"

+#define NDEBUG
+#include <debug.h>

 NTSTATUS
 NTAPI
@@ -7,9 +7,11 @@
 *                  KJK::Hyperion
 */

-
 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 #ifdef _X86_
 #define KS_DECL_CXX(RET_) extern RET_ __fastcall
 #define KS_THIS(CLASS_)   CLASS_ * This, void * dummy_
@@ -6,9 +6,11 @@
 * PROGRAMMER:      Johannes Anderwald
 */

-
 #include "priv.h"

+#define NDEBUG
+#include <debug.h>
+
 /* ===============================================================
    Worker Management Functions
 */