[jgardou] 58381: [AMINE_HEADER_WORK] - Get it back for ddraw, d3d8, d3d9 and wined3d, it's too good to be dismissed
Author: jgardou Date: Thu Feb 28 19:30:08 2013 New Revision: 58381
URL: http://svn.reactos.org/svn/reactos?rev=58381&view=rev Log: [AMINE_HEADER_WORK] - Get it back for ddraw, d3d8, d3d9 and wined3d, it's too good to be dismissed
Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/shader.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d9/buffer.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/shader.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/ddraw/clipper.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/light.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/material.c trunk/reactos/dll/directx/wine/ddraw/palette.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c trunk/reactos/dll/directx/wine/ddraw/viewport.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/sampler.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/view.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h
Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/buffe... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/buffer.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d8_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8_... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,10 +19,10 @@ * */
-#include "config.h" -#include "initguid.h" +#include <config.h> +#include <initguid.h> #include "d3d8_private.h" -#include "wine/debug.h" +//#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8_... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -23,18 +23,22 @@ #ifndef __WINE_D3D8_PRIVATE_H #define __WINE_D3D8_PRIVATE_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" -#include "wine/debug.h" -#include "d3d8.h" -#include "wine/wined3d.h" +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <wine/debug.h> +#include <d3d8.h> +#include <wine/wined3d.h>
/* CreateVertexShader can return > 0xFFFF */ #define VS_HIGHESTFIXEDFXF 0xF0000000
Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devic... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/device.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,18 +19,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" - -#include <math.h> -#include <stdarg.h> +#include <config.h> + +//#include <math.h> +//#include <stdarg.h>
#define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "wine/debug.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winuser.h" +//#include "wingdi.h" +//#include "wine/debug.h"
#include "d3d8_private.h"
Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/direc... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/directx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/directx.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -20,18 +20,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" - -#include <stdarg.h> +#include <config.h> + +//#include <stdarg.h>
#define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/debug.h" -#include "wine/unicode.h" +//#include "windef.h" +//#include "winbase.h" +//#include "wingdi.h" +//#include "winuser.h" +//#include "wine/debug.h" +//#include "wine/unicode.h"
#include "d3d8_private.h"
Modified: trunk/reactos/dll/directx/wine/d3d8/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/shade... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/shader.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d8_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surfa... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/surface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/surface.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d8_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swapc... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/swapchain.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d8_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/textu... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/texture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/texture.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d8_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/verte... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -21,7 +21,7 @@ /* IDirect3DVertexDeclaration8 is internal to our implementation. * It's not visible in the API. */
-#include "config.h" +#include <config.h> #include "d3d8_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volum... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/volume.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d8_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
Modified: trunk/reactos/dll/directx/wine/d3d9/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/buffe... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/buffer.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9_... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -21,8 +21,8 @@ * */
-#include "config.h" -#include "initguid.h" +#include <config.h> +#include <initguid.h> #include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
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] Thu Feb 28 19:30:08 2013 @@ -23,21 +23,25 @@ #ifndef __WINE_D3D9_PRIVATE_H #define __WINE_D3D9_PRIVATE_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" -#include "winuser.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -#include "d3d9.h" -#include "wine/wined3d.h" +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +//#include "winuser.h" +#include <wine/debug.h> +//#include "wine/unicode.h" + +#include <d3d9.h> +#include <wine/wined3d.h>
extern HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN;
Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devic... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/device.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/direc... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/directx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/directx.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/query... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/query.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
Modified: trunk/reactos/dll/directx/wine/d3d9/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/shade... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/shader.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/state... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/stateblock.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/stateblock.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surfa... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/surface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/surface.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swapc... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/swapchain.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/textu... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/texture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/texture.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/verte... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volum... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/volume.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" +#include <config.h> #include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
Modified: trunk/reactos/dll/directx/wine/ddraw/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/clip... ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/clipper.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/clipper.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +//#include "wine/port.h"
#include "ddraw_private.h"
Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddra... ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/ddraw.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +//#include "wine/port.h"
#include "ddraw_private.h"
Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddra... ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,23 +19,27 @@ #ifndef __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H #define __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H
+#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <assert.h> #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "wine/debug.h" - -#include "winbase.h" -#include "wingdi.h" +#include <wine/debug.h> + +#include <winbase.h> +#include <wingdi.h> #include "winuser.h" - -#include "d3d.h" -#include "ddraw.h" +#include <winuser.h> + +#include <d3d.h> +//#include "ddraw.h" #ifdef DDRAW_INIT_GUID -#include "initguid.h" +#include <initguid.h> #endif -#include "wine/list.h" -#include "wine/wined3d.h" +#include <wine/list.h> +#include <wine/wined3d.h>
enum ddraw_surface_type {
Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/devi... ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/device.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -27,8 +27,8 @@ * */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h>
#include "ddraw_private.h"
Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exec... ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/executebuffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/executebuffer.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +//#include "wine/port.h"
#include "ddraw_private.h"
Modified: trunk/reactos/dll/directx/wine/ddraw/light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ligh... ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/light.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/light.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +//#include "wine/port.h"
#include "ddraw_private.h"
Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/main... ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/main.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -24,15 +24,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +//#include "wine/port.h"
#define DDRAW_INIT_GUID #include "ddraw_private.h" -#include "rpcproxy.h" - -#include "wine/exception.h" -#include "winreg.h" +#include <rpcproxy.h> + +#include <wine/exception.h> +#include <winreg.h>
WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
Modified: trunk/reactos/dll/directx/wine/ddraw/material.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mate... ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/material.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/material.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +//#include "wine/port.h"
#include "ddraw_private.h"
Modified: trunk/reactos/dll/directx/wine/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/pale... ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/palette.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +//#include "wine/port.h"
#include "ddraw_private.h"
Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/surf... ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/surface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/surface.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +//#include "wine/port.h"
#include "ddraw_private.h"
Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/util... ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/utils.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +//#include "wine/port.h"
#include "ddraw_private.h"
Modified: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vert... ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +//#include "wine/port.h"
#include "ddraw_private.h"
Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/view... ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/viewport.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/viewport.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +//#include "wine/port.h"
#include "ddraw_private.h"
Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/ar... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -27,10 +27,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" - -#include <math.h> +#include <config.h> +#include <wine/port.h> + +//#include <math.h> #include <stdio.h>
#include "wined3d_private.h"
Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/at... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" - -#include <math.h> -#include <stdio.h> +#include <config.h> +#include <wine/port.h> + +//#include <math.h> +//#include <stdio.h>
#include "wined3d_private.h"
Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/bu... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/buffer.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -22,8 +22,8 @@ * */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h>
#include "wined3d_private.h"
Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/co... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/context.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" - -#include <stdio.h> +#include <config.h> +#include <wine/port.h> + +//#include <stdio.h> #ifdef HAVE_FLOAT_H # include <float.h> #endif
Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/de... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/device.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -24,10 +24,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" - -#include <stdio.h> +#include <config.h> +#include <wine/port.h> + +//#include <stdio.h> #ifdef HAVE_FLOAT_H # include <float.h> #endif
Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/di... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -21,13 +21,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h>
#include <stdio.h>
#include "wined3d_private.h" -#include "winternl.h" +//#include "winternl.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/dr... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/drawprim.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/drawprim.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -24,15 +24,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h>
#include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw);
-#include <stdio.h> -#include <math.h> +//#include <stdio.h> +//#include <math.h>
/* Context activation is done by the caller. */ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primitive_type, UINT count, UINT idx_size,
Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/gl... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/gl_compat.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/gl_compat.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h>
#include <stdio.h> #ifdef HAVE_FLOAT_H
Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/gl... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -29,10 +29,10 @@ * mask for the destination parameter into account. */
-#include "config.h" -#include "wine/port.h" - -#include <limits.h> +#include <config.h> +#include <wine/port.h> + +//#include <limits.h> #include <stdio.h>
#include "wined3d_private.h"
Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/nv... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,11 +19,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - -#include <math.h> -#include <stdio.h> +#include <config.h> +#include <wine/port.h> + +//#include <math.h> +//#include <stdio.h>
#include "wined3d_private.h"
Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/pa... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/palette.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" -#include "winerror.h" -#include "wine/debug.h" - -#include <string.h> +#include <config.h> +#include <wine/port.h> +//#include "winerror.h" +//#include "wine/debug.h" + +//#include <string.h>
#include "wined3d_private.h"
Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/qu... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/query.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,8 +19,8 @@ */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h> #include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/re... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/resource.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/resource.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h> #include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
Modified: trunk/reactos/dll/directx/wine/wined3d/sampler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/sa... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/sampler.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/sampler.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -17,8 +17,8 @@ * */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +//#include "wine/port.h"
#include "wined3d_private.h"
Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/sh... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/shader.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -22,12 +22,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" - -#include <math.h> +#include <config.h> +#include <wine/port.h> + +//#include <math.h> #include <stdio.h> -#include <string.h> +//#include <string.h>
#include "wined3d_private.h"
Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/sh... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -22,8 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h>
#include "wined3d_private.h"
Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/sh... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h>
#include "wined3d_private.h"
Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/st... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -25,10 +25,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" - -#include <stdio.h> +#include <config.h> +#include <wine/port.h> + +//#include <stdio.h> #ifdef HAVE_FLOAT_H # include <float.h> #endif
Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/st... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/stateblock.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/stateblock.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -22,8 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h> #include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/su... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/surface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/surface.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -26,8 +26,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h> #include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface);
Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/sw... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/swapchain.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h> #include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/te... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/texture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/texture.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h> #include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture);
Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/ut... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/utils.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -24,8 +24,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h>
#include "wined3d_private.h"
Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/ve... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -22,8 +22,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h> #include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl);
Modified: trunk/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/vi... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/view.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/view.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -17,8 +17,8 @@ * */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h>
#include "wined3d_private.h"
Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/vo... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/volume.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" +#include <config.h> +#include <wine/port.h> #include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface);
Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/wi... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -22,10 +22,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h" - -#include "initguid.h" +#include <config.h> +#include <wine/port.h> + +//#include "initguid.h" #include "wined3d_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/wi... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Thu Feb 28 19:30:08 2013 @@ -24,6 +24,10 @@ #ifndef __WINE_WINED3D_PRIVATE_H #define __WINE_WINED3D_PRIVATE_H
+#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #ifdef USE_WIN32_OPENGL #define WINE_GLAPI __stdcall #else @@ -32,24 +36,24 @@
#include <stdarg.h> #include <math.h> -#include <limits.h> +//#include <limits.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -#include "objbase.h" -#include "wine/wined3d.h" +#include <windef.h> +//#include "winbase.h" +#include <winreg.h> +#include <wingdi.h> +#include <winuser.h> +#include <wine/debug.h> +#include <wine/unicode.h> + +#include <objbase.h> +#include <wine/wined3d.h> #include "wined3d_gl.h" -#include "wine/list.h" -#include "wine/rbtree.h" -#include "wine/wgl_driver.h" +#include <wine/list.h> +#include <wine/rbtree.h> +#include <wine/wgl_driver.h>
/* Driver quirks */ #define WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT 0x00000001
-
jgardou＠svn.reactos.org