[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

@@ -22,6 +22,7 @@ list(APPEND SOURCE
     stubs.c
     timer.c
     videoprt.c
+    guid.c
     videoprt.rc
     ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def)
 

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;
 }
-

reactos/win32ss/drivers/videoprt/child.c

@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 BOOLEAN

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;
 }
-

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;

reactos/win32ss/drivers/videoprt/dma.c

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

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 */
-

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;

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 */

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)

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

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;
 }
-

reactos/win32ss/drivers/videoprt/resource.c

@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 NTSTATUS NTAPI

reactos/win32ss/drivers/videoprt/services.c

@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 VOID NTAPI
 IntInterfaceReference(PVOID Context)
 {

reactos/win32ss/drivers/videoprt/spinlock.c

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

reactos/win32ss/drivers/videoprt/stubs.c

@@ -19,9 +19,11 @@
  *
  */
 
-
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 VP_STATUS
 NTAPI
 VideoPortFlushRegistry(

reactos/win32ss/drivers/videoprt/timer.c

@@ -21,6 +21,9 @@
 
 #include "videoprt.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/
 
 VOID NTAPI

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;
 }
-

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'