Author: akhaldi Date: Sun Jan 19 10:46:55 2014 New Revision: 61704
URL: http://svn.reactos.org/svn/reactos?rev=61704&view=rev Log: [D3D9] * Improve the GUIDs situation. CORE-7716
Added: trunk/reactos/dll/directx/wine/d3d9/guid.c (with props) Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h
Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMake... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Sun Jan 19 10:46:55 2014 @@ -20,6 +20,7 @@ texture.c vertexdeclaration.c volume.c + guid.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3d9_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def)
Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9_... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h [iso-8859-1] Sun Jan 19 10:46:55 2014 @@ -25,16 +25,17 @@
#include <config.h>
+#include <assert.h> +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H
-#include <assert.h> -#include <stdarg.h> - #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS + #include <windef.h> #include <winbase.h> #include <wingdi.h> @@ -42,7 +43,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
-#include <initguid.h> #include <d3d9.h> #include <wine/wined3d.h>
Added: trunk/reactos/dll/directx/wine/d3d9/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/guid.... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/guid.c (added) +++ trunk/reactos/dll/directx/wine/d3d9/guid.c [iso-8859-1] Sun Jan 19 10:46:55 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 <d3d9.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
Propchange: trunk/reactos/dll/directx/wine/d3d9/guid.c ------------------------------------------------------------------------------ svn:eol-style = native