[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

@@ -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)
 

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>
 

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

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