[akhaldi] 61982: [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. * Im...
Author: akhaldi Date: Tue Feb 4 17:15:06 2014 New Revision: 61982
URL: http://svn.reactos.org/svn/reactos?rev=61982&view=rev Log: [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
Added: trunk/reactos/win32ss/drivers/videoprt/guid.c (with props) Modified: trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt trunk/reactos/win32ss/drivers/videoprt/agp.c trunk/reactos/win32ss/drivers/videoprt/child.c trunk/reactos/win32ss/drivers/videoprt/ddc.c trunk/reactos/win32ss/drivers/videoprt/dispatch.c trunk/reactos/win32ss/drivers/videoprt/dma.c trunk/reactos/win32ss/drivers/videoprt/event.c trunk/reactos/win32ss/drivers/videoprt/funclist.c trunk/reactos/win32ss/drivers/videoprt/int10.c trunk/reactos/win32ss/drivers/videoprt/interrupt.c trunk/reactos/win32ss/drivers/videoprt/registry.c trunk/reactos/win32ss/drivers/videoprt/resource.c trunk/reactos/win32ss/drivers/videoprt/services.c trunk/reactos/win32ss/drivers/videoprt/spinlock.c trunk/reactos/win32ss/drivers/videoprt/stubs.c trunk/reactos/win32ss/drivers/videoprt/timer.c trunk/reactos/win32ss/drivers/videoprt/videoprt.c trunk/reactos/win32ss/drivers/videoprt/videoprt.h
Modified: trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/CM... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/CMakeLists.txt [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -22,6 +22,7 @@ stubs.c timer.c videoprt.c + guid.c videoprt.rc ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def)
Modified: trunk/reactos/win32ss/drivers/videoprt/agp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/ag... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/agp.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/agp.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -21,6 +21,9 @@
#include "videoprt.h"
+#define NDEBUG +#include <debug.h> + /* PRIVATE FUNCTIONS **********************************************************/
NTSTATUS @@ -566,4 +569,3 @@
return STATUS_SUCCESS; } -
Modified: trunk/reactos/win32ss/drivers/videoprt/child.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/ch... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/child.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/child.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,9 @@ */
#include "videoprt.h" + +#define NDEBUG +#include <debug.h>
/* PRIVATE FUNCTIONS **********************************************************/
Modified: trunk/reactos/win32ss/drivers/videoprt/ddc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/dd... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/ddc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/ddc.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,9 @@ */
#include "videoprt.h" + +#define NDEBUG +#include <debug.h>
#define DDC_EEPROM_ADDRESS 0xA0
@@ -222,4 +225,3 @@ INFO_(VIDEOPRT, "VideoPortDDCMonitorHelper() - SUCCESS!\n"); return TRUE; } -
Modified: trunk/reactos/win32ss/drivers/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/di... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/dispatch.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,12 @@ */
#include "videoprt.h" + +#include <ndk/inbvfuncs.h> +#include <ndk/psfuncs.h> + +#define NDEBUG +#include <debug.h>
/* GLOBAL VARIABLES ***********************************************************/
Modified: trunk/reactos/win32ss/drivers/videoprt/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/dm... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/dma.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/dma.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/
#include <videoprt.h> + #define NDEBUG #include <debug.h>
Modified: trunk/reactos/win32ss/drivers/videoprt/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/ev... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/event.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/event.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -10,6 +10,9 @@
#include "videoprt.h" #include "../../gdi/eng/engevent.h" + +#define NDEBUG +#include <debug.h>
/* PUBLIC FUNCTIONS ***********************************************************/
@@ -137,4 +140,3 @@ }
/* EOF */ -
Modified: trunk/reactos/win32ss/drivers/videoprt/funclist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/fu... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/funclist.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/funclist.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -19,8 +19,10 @@ * */
+#include "videoprt.h"
-#include "videoprt.h" +#define NDEBUG +#include <debug.h>
typedef struct _VIDEO_PORT_FUNCTION_TABLE { PVOID Address;
Added: trunk/reactos/win32ss/drivers/videoprt/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/gu... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/guid.c (added) +++ trunk/reactos/win32ss/drivers/videoprt/guid.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -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 */
Propchange: trunk/reactos/win32ss/drivers/videoprt/guid.c ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/win32ss/drivers/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/in... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/int10.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/int10.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,11 @@ */
#include "videoprt.h" + +#include <ndk/kefuncs.h> + +#define NDEBUG +#include <debug.h>
/* PRIVATE FUNCTIONS **********************************************************/
Modified: trunk/reactos/win32ss/drivers/videoprt/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/in... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/interrupt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/interrupt.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,11 @@ */
#include "videoprt.h" + +#include <ndk/halfuncs.h> + +#define NDEBUG +#include <debug.h>
/* PRIVATE FUNCTIONS **********************************************************/
Modified: trunk/reactos/win32ss/drivers/videoprt/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/re... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/registry.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/registry.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -21,6 +21,11 @@
#include "videoprt.h"
+#include <ndk/obfuncs.h> + +#define NDEBUG +#include <debug.h> + NTSTATUS NTAPI IntCopyRegistryKey( @@ -633,4 +638,3 @@
return STATUS_SUCCESS; } -
Modified: trunk/reactos/win32ss/drivers/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/re... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/resource.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,9 @@ */
#include "videoprt.h" + +#define NDEBUG +#include <debug.h>
/* PRIVATE FUNCTIONS **********************************************************/
Modified: trunk/reactos/win32ss/drivers/videoprt/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/se... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/services.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/services.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,9 @@ */
#include "videoprt.h" + +#define NDEBUG +#include <debug.h>
VOID NTAPI IntInterfaceReference(PVOID Context)
Modified: trunk/reactos/win32ss/drivers/videoprt/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/sp... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/spinlock.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,9 @@ */
#include "videoprt.h" + +#define NDEBUG +#include <debug.h>
/* * @implemented
Modified: trunk/reactos/win32ss/drivers/videoprt/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/st... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/stubs.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -19,8 +19,10 @@ * */
- #include "videoprt.h" + +#define NDEBUG +#include <debug.h>
VP_STATUS NTAPI
Modified: trunk/reactos/win32ss/drivers/videoprt/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/ti... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/timer.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -20,6 +20,9 @@ */
#include "videoprt.h" + +#define NDEBUG +#include <debug.h>
/* PRIVATE FUNCTIONS **********************************************************/
Modified: trunk/reactos/win32ss/drivers/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/vi... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/videoprt.c [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -19,8 +19,14 @@ * */
- #include "videoprt.h" + +#include <stdio.h> +#include <ndk/exfuncs.h> +#include <ndk/rtlfuncs.h> + +#define NDEBUG +#include <debug.h>
/* GLOBAL VARIABLES ***********************************************************/
@@ -1473,4 +1479,3 @@
return FALSE; } -
Modified: trunk/reactos/win32ss/drivers/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/vi... ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/videoprt.h [iso-8859-1] Tue Feb 4 17:15:06 2014 @@ -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,10 +30,7 @@ #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'
-
akhaldi＠svn.reactos.org