[ros-diffs] [akhaldi] 61714: [D3DX9_36] * Improve the GUIDs situation. * Improve the main header. CORE-7716

Author: akhaldi
Date: Mon Jan 20 11:15:56 2014
New Revision: 61714

URL: http://svn.reactos.org/svn/reactos?rev=61714&view=rev
Log:
[D3DX9_36]
* Improve the GUIDs situation.
* Improve the main header.
CORE-7716

Added:
    trunk/reactos/dll/directx/wine/d3dx9_36/guid.c   (with props)
Modified:
    trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt
    trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h
    trunk/reactos/dll/directx/wine/d3dx9_36/surface.c

Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt	[iso-8859-1] Mon Jan 20
11:15:56 2014
@@ -21,6 +21,7 @@
     util.c
     volume.c
     xfile.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36.def)
 

Modified: trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h	[iso-8859-1] Mon Jan 20
11:15:56 2014
@@ -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>
 

Added: trunk/reactos/dll/directx/wine/d3dx9_36/guid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dx9_36/guid.c	(added)
+++ trunk/reactos/dll/directx/wine/d3dx9_36/guid.c	[iso-8859-1] Mon Jan 20 11:15:56 2014
@@ -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 */

Propchange: trunk/reactos/dll/directx/wine/d3dx9_36/guid.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/directx/wine/d3dx9_36/surface.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dx9_36/surface.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dx9_36/surface.c	[iso-8859-1] Mon Jan 20 11:15:56
2014
@@ -21,6 +21,8 @@
 #include "d3dx9_36_private.h"
 
 #include <ole2.h>
+
+#include <initguid.h>
 #include <wincodec.h>
 
 /* Wine-specific WIC GUIDs */