[DXG]

* Include NDK headers on-demand.
* Set dxg_int.h as a PCH.

svn path=/trunk/; revision=53283

diff --git a/reactos/drivers/directx/dxg/CMakeLists.txt b/reactos/drivers/directx/dxg/CMakeLists.txt
index f4eb99c..320055b 100644 (file)
--- a/reactos/drivers/directx/dxg/CMakeLists.txt
+++ b/reactos/drivers/directx/dxg/CMakeLists.txt
@@ -11,5 +11,5 @@ add_library(dxg SHARED
 
 set_module_type(dxg kernelmodedriver)
 add_importlibs(dxg dxgthk ntoskrnl)
-
-add_cd_file(TARGET dxg DESTINATION reactos/system32/drivers FOR all)
\ No newline at end of file
+add_pch(dxg dxg_int.h)
+add_cd_file(TARGET dxg DESTINATION reactos/system32/drivers FOR all)

diff --git a/reactos/drivers/directx/dxg/dxg_driver.h b/reactos/drivers/directx/dxg/dxg_driver.h
index fa9b447..dcbaceb 100644 (file)
--- a/reactos/drivers/directx/dxg/dxg_driver.h
+++ b/reactos/drivers/directx/dxg/dxg_driver.h
@@ -1,5 +1,4 @@
 
-
 DRVFN gaDxgFuncs [] =
 {
     {DXG_INDEX_DxDxgGenericThunk, (PFN)DxDxgGenericThunk},

diff --git a/reactos/drivers/directx/dxg/dxg_int.h b/reactos/drivers/directx/dxg/dxg_int.h
index ccb2204..d650941 100644 (file)
--- a/reactos/drivers/directx/dxg/dxg_int.h
+++ b/reactos/drivers/directx/dxg/dxg_int.h
@@ -1,9 +1,4 @@
-/* DDK/NDK/SDK Headers */
-#include <ntddk.h>
-#include <ntddmou.h>
 #include <ntifs.h>
-#include <tvout.h>
-#include <ntndk.h>
 
 /* Win32 Headers */
 #define WINBASEAPI
@@ -12,13 +7,10 @@
 #define INTERNAL_CALL NTAPI
 #define NT_BUILD_ENVIRONMENT
 
-#include <stdarg.h>
 #include <windef.h>
 #include <winerror.h>
 #include <wingdi.h>
 #include <winddi.h>
-#include <prntfont.h>
-#include <dde.h>
 
 /* DXG treats this as opaque */
 typedef PVOID PDC;
@@ -109,4 +101,3 @@ PVOID FASTCALL DdHmgLock(HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned);
 #define drvDxEngUnlockDC        gpEngFuncs[DXENG_INDEX_DxEngUnlockDC]
 #define drvDxEngUnlockHdev      gpEngFuncs[DXENG_INDEX_DxEngUnlockHdev]
 #define drvDxEngLockHdev        gpEngFuncs[DXENG_INDEX_DxEngLockHdev]
-

diff --git a/reactos/drivers/directx/dxg/eng.c b/reactos/drivers/directx/dxg/eng.c
index 02e04e3..6f5d36d 100644 (file)
--- a/reactos/drivers/directx/dxg/eng.c
+++ b/reactos/drivers/directx/dxg/eng.c
@@ -8,10 +8,8 @@
  *       30/12-2007   Magnus Olsen
  */
 
-
 #include <dxg_int.h>
 
-
 PDD_SURFACE_LOCAL
 NTAPI
 DxDdLockDirectDrawSurface(HANDLE hDdSurface)
@@ -44,11 +42,3 @@ DxDdUnlockDirectDrawSurface(PDD_SURFACE_LOCAL pSurface)
 
     return retVal;
 }
-
-
-
-
-
-
-
-

diff --git a/reactos/drivers/directx/dxg/main.c b/reactos/drivers/directx/dxg/main.c
index f014b37..bdd0335 100644 (file)
--- a/reactos/drivers/directx/dxg/main.c
+++ b/reactos/drivers/directx/dxg/main.c
@@ -8,7 +8,6 @@
  *       15/10-2007   Magnus Olsen
  */
 
-
 #include <dxg_int.h>
 #include "dxg_driver.h"
 
@@ -18,12 +17,10 @@ VOID *gpDummyPage = NULL;
 PEPROCESS gpepSession = NULL;
 PLARGE_INTEGER gpLockShortDelay = NULL;
 
-
 PDRVFN gpEngFuncs;
 const ULONG gcDxgFuncs = DXG_INDEX_DxDdIoctl + 1;
 
 
-
 NTSTATUS NTAPI
 DriverEntry(IN PVOID Context1,
             IN PVOID Context2)
@@ -112,9 +109,6 @@ DxDdStartupDxGraphics (ULONG SizeEngDrv,
     return STATUS_NO_MEMORY;
 }
 
-
-
-
 NTSTATUS
 APIENTRY
 DxDdCleanupDxGraphics(VOID)
@@ -135,4 +129,3 @@ DxDdCleanupDxGraphics(VOID)
 
     return 0;
 }
-

diff --git a/reactos/drivers/directx/dxg/tags.h b/reactos/drivers/directx/dxg/tags.h
index 80afec1..cf721f6 100644 (file)
--- a/reactos/drivers/directx/dxg/tags.h
+++ b/reactos/drivers/directx/dxg/tags.h
@@ -1,8 +1,2 @@
-
-
-
 #define TAG_THDD    'ddht'
 #define TAG_GINI    'iniG'
-
-
-