From fc4f9522de8d0de3cdae1fd02b85bba710500995 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 20 Jan 2014 11:15:56 +0000
Subject: [PATCH 1/1] [D3DX9_36] * Improve the GUIDs situation. * Improve the
 main header. CORE-7716

svn path=/trunk/; revision=61714
---
 reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt  |  1 +
 .../dll/directx/wine/d3dx9_36/d3dx9_36_private.h  |  8 +++-----
 reactos/dll/directx/wine/d3dx9_36/guid.c          | 15 +++++++++++++++
 reactos/dll/directx/wine/d3dx9_36/surface.c       |  2 ++
 4 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 reactos/dll/directx/wine/d3dx9_36/guid.c

diff --git a/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt
index b4144ac8d37..67206a49be3 100644
--- a/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt
+++ b/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt
@@ -21,6 +21,7 @@ list(APPEND SOURCE
     util.c
     volume.c
     xfile.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36.def)
 
diff --git a/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h b/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h
index 8d26b23bb7c..a505372de5f 100644
--- a/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h
+++ b/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h
@@ -25,21 +25,19 @@
 #include <config.h>
 #include <wine/port.h>
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <stdarg.h>
-
-#include <initguid.h>
-
 #define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
-#include <winnls.h>
 #include <winuser.h>
 #include <d3dx9.h>
 
diff --git a/reactos/dll/directx/wine/d3dx9_36/guid.c b/reactos/dll/directx/wine/d3dx9_36/guid.c
new file mode 100644
index 00000000000..c43ee3c8b42
--- /dev/null
+++ b/reactos/dll/directx/wine/d3dx9_36/guid.c
@@ -0,0 +1,15 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <initguid.h>
+#include <d3dx9.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
diff --git a/reactos/dll/directx/wine/d3dx9_36/surface.c b/reactos/dll/directx/wine/d3dx9_36/surface.c
index 7455d190a53..bd141c18563 100644
--- a/reactos/dll/directx/wine/d3dx9_36/surface.c
+++ b/reactos/dll/directx/wine/d3dx9_36/surface.c
@@ -21,6 +21,8 @@
 #include "d3dx9_36_private.h"
 
 #include <ole2.h>
+
+#include <initguid.h>
 #include <wincodec.h>
 
 /* Wine-specific WIC GUIDs */
-- 
2.17.1