From 031ae1c1d2a34a38ad3431ba7f83c13406661d37 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 4 Feb 2014 17:15:06 +0000
Subject: [PATCH] [VIDEOPRT] * Do not include debug.h into the main header. *
 Remove one time inclusions from the main header and put them back where they
 belong. * Improve the GUIDs situation. * Improve header inclusions. CORE-7716

svn path=/trunk/; revision=61982
---
 reactos/win32ss/drivers/videoprt/CMakeLists.txt |  1 +
 reactos/win32ss/drivers/videoprt/agp.c          |  4 +++-
 reactos/win32ss/drivers/videoprt/child.c        |  3 +++
 reactos/win32ss/drivers/videoprt/ddc.c          |  4 +++-
 reactos/win32ss/drivers/videoprt/dispatch.c     |  6 ++++++
 reactos/win32ss/drivers/videoprt/dma.c          |  1 +
 reactos/win32ss/drivers/videoprt/event.c        |  4 +++-
 reactos/win32ss/drivers/videoprt/funclist.c     |  4 +++-
 reactos/win32ss/drivers/videoprt/guid.c         |  6 ++++++
 reactos/win32ss/drivers/videoprt/int10.c        |  5 +++++
 reactos/win32ss/drivers/videoprt/interrupt.c    |  5 +++++
 reactos/win32ss/drivers/videoprt/registry.c     |  6 +++++-
 reactos/win32ss/drivers/videoprt/resource.c     |  3 +++
 reactos/win32ss/drivers/videoprt/services.c     |  3 +++
 reactos/win32ss/drivers/videoprt/spinlock.c     |  3 +++
 reactos/win32ss/drivers/videoprt/stubs.c        |  4 +++-
 reactos/win32ss/drivers/videoprt/timer.c        |  3 +++
 reactos/win32ss/drivers/videoprt/videoprt.c     |  9 +++++++--
 reactos/win32ss/drivers/videoprt/videoprt.h     | 12 ------------
 19 files changed, 66 insertions(+), 20 deletions(-)
 create mode 100644 reactos/win32ss/drivers/videoprt/guid.c

diff --git a/reactos/win32ss/drivers/videoprt/CMakeLists.txt b/reactos/win32ss/drivers/videoprt/CMakeLists.txt
index 265c36f9389..322d060a2a8 100644
--- a/reactos/win32ss/drivers/videoprt/CMakeLists.txt
+++ b/reactos/win32ss/drivers/videoprt/CMakeLists.txt
@@ -22,6 +22,7 @@ list(APPEND SOURCE
     stubs.c
     timer.c
     videoprt.c
+    guid.c
     videoprt.rc
     ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def)
 
diff --git a/reactos/win32ss/drivers/videoprt/agp.c b/reactos/win32ss/drivers/videoprt/agp.c
index 54bef7da872..e149a201375 100644
--- a/reactos/win32ss/drivers/videoprt/agp.c
+++ b/reactos/win32ss/drivers/videoprt/agp.c
@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 NTSTATUS
@@ -566,4 +569,3 @@ IntAgpGetInterface(
 
    return STATUS_SUCCESS;
 }
-
diff --git a/reactos/win32ss/drivers/videoprt/child.c b/reactos/win32ss/drivers/videoprt/child.c
index 7bc25339f34..96df9228212 100644
--- a/reactos/win32ss/drivers/videoprt/child.c
+++ b/reactos/win32ss/drivers/videoprt/child.c
@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 BOOLEAN
diff --git a/reactos/win32ss/drivers/videoprt/ddc.c b/reactos/win32ss/drivers/videoprt/ddc.c
index b0cbdf11264..8e998f06557 100644
--- a/reactos/win32ss/drivers/videoprt/ddc.c
+++ b/reactos/win32ss/drivers/videoprt/ddc.c
@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 #define DDC_EEPROM_ADDRESS  0xA0
 
 /* PRIVATE FUNCTIONS **********************************************************/
@@ -222,4 +225,3 @@ VideoPortDDCMonitorHelper(
    INFO_(VIDEOPRT, "VideoPortDDCMonitorHelper() - SUCCESS!\n");
    return TRUE;
 }
-
diff --git a/reactos/win32ss/drivers/videoprt/dispatch.c b/reactos/win32ss/drivers/videoprt/dispatch.c
index 9a4d0268812..5d6fac7ed9e 100644
--- a/reactos/win32ss/drivers/videoprt/dispatch.c
+++ b/reactos/win32ss/drivers/videoprt/dispatch.c
@@ -21,6 +21,12 @@
 
 #include "videoprt.h"
 
+#include <ndk/inbvfuncs.h>
+#include <ndk/psfuncs.h>
+
+#define NDEBUG
+#include <debug.h>
+
 /* GLOBAL VARIABLES ***********************************************************/
 
 PVIDEO_PORT_DEVICE_EXTENSION ResetDisplayParametersDeviceExtension = NULL;
diff --git a/reactos/win32ss/drivers/videoprt/dma.c b/reactos/win32ss/drivers/videoprt/dma.c
index 60d50ee4c89..22cbc9424cc 100644
--- a/reactos/win32ss/drivers/videoprt/dma.c
+++ b/reactos/win32ss/drivers/videoprt/dma.c
@@ -9,6 +9,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <videoprt.h>
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/win32ss/drivers/videoprt/event.c b/reactos/win32ss/drivers/videoprt/event.c
index 7f14c46ad67..0112d6b7adf 100644
--- a/reactos/win32ss/drivers/videoprt/event.c
+++ b/reactos/win32ss/drivers/videoprt/event.c
@@ -11,6 +11,9 @@
 #include "videoprt.h"
 #include "../../gdi/eng/engevent.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* PUBLIC FUNCTIONS ***********************************************************/
 
 /*
@@ -137,4 +140,3 @@ VideoPortWaitForSingleObject(IN PVOID HwDeviceExtension,
 }
 
 /* EOF */
-
diff --git a/reactos/win32ss/drivers/videoprt/funclist.c b/reactos/win32ss/drivers/videoprt/funclist.c
index c0eb203f413..55c7430ead5 100644
--- a/reactos/win32ss/drivers/videoprt/funclist.c
+++ b/reactos/win32ss/drivers/videoprt/funclist.c
@@ -19,9 +19,11 @@
  *
  */
 
-
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 typedef struct _VIDEO_PORT_FUNCTION_TABLE {
     PVOID Address;
     PUCHAR Name;
diff --git a/reactos/win32ss/drivers/videoprt/guid.c b/reactos/win32ss/drivers/videoprt/guid.c
new file mode 100644
index 00000000000..3f4468bf330
--- /dev/null
+++ b/reactos/win32ss/drivers/videoprt/guid.c
@@ -0,0 +1,6 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <initguid.h>
+#include <wdmguid.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
diff --git a/reactos/win32ss/drivers/videoprt/int10.c b/reactos/win32ss/drivers/videoprt/int10.c
index 77425d93a85..b6a5eb93afe 100644
--- a/reactos/win32ss/drivers/videoprt/int10.c
+++ b/reactos/win32ss/drivers/videoprt/int10.c
@@ -21,6 +21,11 @@
 
 #include "videoprt.h"
 
+#include <ndk/kefuncs.h>
+
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 #if defined(_M_IX86) || defined(_M_AMD64)
diff --git a/reactos/win32ss/drivers/videoprt/interrupt.c b/reactos/win32ss/drivers/videoprt/interrupt.c
index b244f531dca..8f8a9634ed6 100644
--- a/reactos/win32ss/drivers/videoprt/interrupt.c
+++ b/reactos/win32ss/drivers/videoprt/interrupt.c
@@ -21,6 +21,11 @@
 
 #include "videoprt.h"
 
+#include <ndk/halfuncs.h>
+
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 BOOLEAN NTAPI
diff --git a/reactos/win32ss/drivers/videoprt/registry.c b/reactos/win32ss/drivers/videoprt/registry.c
index d8ae8838f47..7f62a4a4d7d 100644
--- a/reactos/win32ss/drivers/videoprt/registry.c
+++ b/reactos/win32ss/drivers/videoprt/registry.c
@@ -21,6 +21,11 @@
 
 #include "videoprt.h"
 
+#include <ndk/obfuncs.h>
+
+#define NDEBUG
+#include <debug.h>
+
 NTSTATUS
 NTAPI
 IntCopyRegistryKey(
@@ -633,4 +638,3 @@ IntCreateRegistryPath(
 
     return STATUS_SUCCESS;
 }
-
diff --git a/reactos/win32ss/drivers/videoprt/resource.c b/reactos/win32ss/drivers/videoprt/resource.c
index f6982cf956f..a4d7afad2d8 100644
--- a/reactos/win32ss/drivers/videoprt/resource.c
+++ b/reactos/win32ss/drivers/videoprt/resource.c
@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 NTSTATUS NTAPI
diff --git a/reactos/win32ss/drivers/videoprt/services.c b/reactos/win32ss/drivers/videoprt/services.c
index bece37565d2..18290c08d26 100644
--- a/reactos/win32ss/drivers/videoprt/services.c
+++ b/reactos/win32ss/drivers/videoprt/services.c
@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 VOID NTAPI
 IntInterfaceReference(PVOID Context)
 {
diff --git a/reactos/win32ss/drivers/videoprt/spinlock.c b/reactos/win32ss/drivers/videoprt/spinlock.c
index 793a5e09809..ba3e8a53628 100644
--- a/reactos/win32ss/drivers/videoprt/spinlock.c
+++ b/reactos/win32ss/drivers/videoprt/spinlock.c
@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /*
  * @implemented
  */
diff --git a/reactos/win32ss/drivers/videoprt/stubs.c b/reactos/win32ss/drivers/videoprt/stubs.c
index debd903f2e1..d7b0d890f2b 100644
--- a/reactos/win32ss/drivers/videoprt/stubs.c
+++ b/reactos/win32ss/drivers/videoprt/stubs.c
@@ -19,9 +19,11 @@
  *
  */
 
-
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 VP_STATUS
 NTAPI
 VideoPortFlushRegistry(
diff --git a/reactos/win32ss/drivers/videoprt/timer.c b/reactos/win32ss/drivers/videoprt/timer.c
index d30f6fc231b..9ff8600e55c 100644
--- a/reactos/win32ss/drivers/videoprt/timer.c
+++ b/reactos/win32ss/drivers/videoprt/timer.c
@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 VOID NTAPI
diff --git a/reactos/win32ss/drivers/videoprt/videoprt.c b/reactos/win32ss/drivers/videoprt/videoprt.c
index d24ed782431..2c0cbee7e7a 100644
--- a/reactos/win32ss/drivers/videoprt/videoprt.c
+++ b/reactos/win32ss/drivers/videoprt/videoprt.c
@@ -19,9 +19,15 @@
  *
  */
 
-
 #include "videoprt.h"
 
+#include <stdio.h>
+#include <ndk/exfuncs.h>
+#include <ndk/rtlfuncs.h>
+
+#define NDEBUG
+#include <debug.h>
+
 /* GLOBAL VARIABLES ***********************************************************/
 
 ULONG CsrssInitialized = FALSE;
@@ -1473,4 +1479,3 @@ VideoPortIsNoVesa(VOID)
 
     return FALSE;
 }
-
diff --git a/reactos/win32ss/drivers/videoprt/videoprt.h b/reactos/win32ss/drivers/videoprt/videoprt.h
index 2c2c13185be..eb0e4cb5694 100644
--- a/reactos/win32ss/drivers/videoprt/videoprt.h
+++ b/reactos/win32ss/drivers/videoprt/videoprt.h
@@ -22,16 +22,7 @@
 #ifndef VIDEOPRT_H
 #define VIDEOPRT_H
 
-#include <stdio.h>
-
 #include <ntifs.h>
-#include <ndk/exfuncs.h>
-#include <ndk/halfuncs.h>
-#include <ndk/inbvfuncs.h>
-#include <ndk/kefuncs.h>
-#include <ndk/rtlfuncs.h>
-#include <ndk/obfuncs.h>
-#include <ndk/psfuncs.h>
 
 #define __BROKEN__
 #include <miniport.h>
@@ -39,11 +30,8 @@
 #include <ntagp.h>
 #include <dderror.h>
 #include <windef.h>
-#include <initguid.h>
 #include <wdmguid.h>
 
-#include <debug.h>
-
 #define TAG_VIDEO_PORT  'PDIV'
 #define TAG_VIDEO_PORT_BUFFER  '\0mpV'
 #define TAG_REQUEST_PACKET 'qRpV'
-- 
2.17.1