[ros-diffs] [reactos] 08/12: [DXG] Define GUIDs only once

[Hervé Poussineau]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a78dd4b3158cd535d561…

commit 3a78dd4b3158cd535d561e7a95fbb55863a1a669
Author:     Hervé Poussineau <hpoussin(a)reactos.org>
AuthorDate: Sat Mar 30 22:37:56 2019 +0100
Commit:     Hervé Poussineau <hpoussin(a)reactos.org>
CommitDate: Mon Apr 1 11:38:32 2019 +0200

    [DXG] Define GUIDs only once
---
 win32ss/reactx/dxg/dxg_int.h |  1 -
 win32ss/reactx/dxg/main.c    | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/win32ss/reactx/dxg/dxg_int.h b/win32ss/reactx/dxg/dxg_int.h
index fa9c3170a8..b2dd3b7d4d 100644
--- a/win32ss/reactx/dxg/dxg_int.h
+++ b/win32ss/reactx/dxg/dxg_int.h
@@ -19,7 +19,6 @@
 #include <wingdi.h>
 #include <winddi.h>
 #include <ddkernel.h>
-#include <initguid.h>
 #include <ddrawi.h>
 #include <ntgdityp.h>
 #include <psfuncs.h>
diff --git a/win32ss/reactx/dxg/main.c b/win32ss/reactx/dxg/main.c
index 7bcd329b9e..deeb49260c 100644
--- a/win32ss/reactx/dxg/main.c
+++ b/win32ss/reactx/dxg/main.c
@@ -8,6 +8,20 @@
  *       15/10-2007   Magnus Olsen
  */
 
+#include <ntifs.h>
+
+/* Win32 Headers */
+#define WINBASEAPI
+#define STARTF_USESIZE 2
+#define STARTF_USEPOSITION 4
+#define INTERNAL_CALL NTAPI
+#define NT_BUILD_ENVIRONMENT
+
+#include <windef.h>
+#include <winerror.h>
+#include <wingdi.h>
+#include <winddi.h>
+#include <initguid.h>
 #include <dxg_int.h>
 #include "dxg_driver.h"