[AMINE_HEADER_WORK]

- Get it back for ddraw, d3d8, d3d9 and wined3d, it's too good to be dismissed svn path=/trunk/; revision=58381
2024-08-02 09:30:55 +00:00 · 2013-02-28 19:30:08 +00:00 · 2013-02-28 19:30:08 +00:00 · f709e88f5b
parent 1d5107d6d0
commit f709e88f5b
65 changed files with 189 additions and 173 deletions
--- a/reactos/dll/directx/wine/d3d8/buffer.c
+++ b/reactos/dll/directx/wine/d3d8/buffer.c
@ -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);
--- a/reactos/dll/directx/wine/d3d8/d3d8_main.c
+++ b/reactos/dll/directx/wine/d3d8/d3d8_main.c
@ -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);

--- a/reactos/dll/directx/wine/d3d8/d3d8_private.h
+++ b/reactos/dll/directx/wine/d3d8/d3d8_private.h
@ -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
--- a/reactos/dll/directx/wine/d3d8/device.c
+++ b/reactos/dll/directx/wine/d3d8/device.c
@ -19,18 +19,18 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "config.h"
+#include <config.h>

-#include <math.h>
-#include <stdarg.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"

--- a/reactos/dll/directx/wine/d3d8/directx.c
+++ b/reactos/dll/directx/wine/d3d8/directx.c
@ -20,18 +20,18 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include "config.h"
+#include <config.h>

-#include <stdarg.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"

--- a/reactos/dll/directx/wine/d3d8/shader.c
+++ b/reactos/dll/directx/wine/d3d8/shader.c
@ -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);
--- a/reactos/dll/directx/wine/d3d8/surface.c
+++ b/reactos/dll/directx/wine/d3d8/surface.c
@ -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);
--- a/reactos/dll/directx/wine/d3d8/swapchain.c
+++ b/reactos/dll/directx/wine/d3d8/swapchain.c
@ -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);
--- a/reactos/dll/directx/wine/d3d8/texture.c
+++ b/reactos/dll/directx/wine/d3d8/texture.c
@ -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);
--- a/reactos/dll/directx/wine/d3d8/vertexdeclaration.c
+++ b/reactos/dll/directx/wine/d3d8/vertexdeclaration.c
@ -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);
--- a/reactos/dll/directx/wine/d3d8/volume.c
+++ b/reactos/dll/directx/wine/d3d8/volume.c
@ -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);
--- a/reactos/dll/directx/wine/d3d9/buffer.c
+++ b/reactos/dll/directx/wine/d3d9/buffer.c
@ -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);
--- a/reactos/dll/directx/wine/d3d9/d3d9_main.c
+++ b/reactos/dll/directx/wine/d3d9/d3d9_main.c
@ -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);
--- a/reactos/dll/directx/wine/d3d9/d3d9_private.h
+++ b/reactos/dll/directx/wine/d3d9/d3d9_private.h
@ -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 <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 <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;
--- a/reactos/dll/directx/wine/d3d9/device.c
+++ b/reactos/dll/directx/wine/d3d9/device.c
@ -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);
--- a/reactos/dll/directx/wine/d3d9/directx.c
+++ b/reactos/dll/directx/wine/d3d9/directx.c
@ -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);
--- a/reactos/dll/directx/wine/d3d9/query.c
+++ b/reactos/dll/directx/wine/d3d9/query.c
@ -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);
--- a/reactos/dll/directx/wine/d3d9/shader.c
+++ b/reactos/dll/directx/wine/d3d9/shader.c
@ -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);
--- a/reactos/dll/directx/wine/d3d9/stateblock.c
+++ b/reactos/dll/directx/wine/d3d9/stateblock.c
@ -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);
--- a/reactos/dll/directx/wine/d3d9/surface.c
+++ b/reactos/dll/directx/wine/d3d9/surface.c
@ -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);
--- a/reactos/dll/directx/wine/d3d9/swapchain.c
+++ b/reactos/dll/directx/wine/d3d9/swapchain.c
@ -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);
--- a/reactos/dll/directx/wine/d3d9/texture.c
+++ b/reactos/dll/directx/wine/d3d9/texture.c
@ -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);
--- a/reactos/dll/directx/wine/d3d9/vertexdeclaration.c
+++ b/reactos/dll/directx/wine/d3d9/vertexdeclaration.c
@ -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);
--- a/reactos/dll/directx/wine/d3d9/volume.c
+++ b/reactos/dll/directx/wine/d3d9/volume.c
@ -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);
--- a/reactos/dll/directx/wine/ddraw/clipper.c
+++ b/reactos/dll/directx/wine/ddraw/clipper.c
@ -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"

--- a/reactos/dll/directx/wine/ddraw/ddraw.c
+++ b/reactos/dll/directx/wine/ddraw/ddraw.c
@ -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"

--- a/reactos/dll/directx/wine/ddraw/ddraw_private.h
+++ b/reactos/dll/directx/wine/ddraw/ddraw_private.h
@ -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 <wine/debug.h>

-#include "winbase.h"
-#include "wingdi.h"
+#include <winbase.h>
+#include <wingdi.h>
 #include "winuser.h"
+#include <winuser.h>

-#include "d3d.h"
-#include "ddraw.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
 {
--- a/reactos/dll/directx/wine/ddraw/device.c
+++ b/reactos/dll/directx/wine/ddraw/device.c
@ -27,8 +27,8 @@
 *
 */

-#include "config.h"
-#include "wine/port.h"
+#include <config.h>
+#include <wine/port.h>

 #include "ddraw_private.h"

--- a/reactos/dll/directx/wine/ddraw/executebuffer.c
+++ b/reactos/dll/directx/wine/ddraw/executebuffer.c
@ -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"

--- a/reactos/dll/directx/wine/ddraw/light.c
+++ b/reactos/dll/directx/wine/ddraw/light.c
@ -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"

--- a/reactos/dll/directx/wine/ddraw/main.c
+++ b/reactos/dll/directx/wine/ddraw/main.c
@ -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 <rpcproxy.h>

-#include "wine/exception.h"
-#include "winreg.h"
+#include <wine/exception.h>
+#include <winreg.h>

 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);

--- a/reactos/dll/directx/wine/ddraw/material.c
+++ b/reactos/dll/directx/wine/ddraw/material.c
@ -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"

--- a/reactos/dll/directx/wine/ddraw/palette.c
+++ b/reactos/dll/directx/wine/ddraw/palette.c
@ -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"

--- a/reactos/dll/directx/wine/ddraw/surface.c
+++ b/reactos/dll/directx/wine/ddraw/surface.c
@ -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"

--- a/reactos/dll/directx/wine/ddraw/utils.c
+++ b/reactos/dll/directx/wine/ddraw/utils.c
@ -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"

--- a/reactos/dll/directx/wine/ddraw/vertexbuffer.c
+++ b/reactos/dll/directx/wine/ddraw/vertexbuffer.c
@ -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"

--- a/reactos/dll/directx/wine/ddraw/viewport.c
+++ b/reactos/dll/directx/wine/ddraw/viewport.c
@ -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"

--- a/reactos/dll/directx/wine/wined3d/arb_program_shader.c
+++ b/reactos/dll/directx/wine/wined3d/arb_program_shader.c
@ -27,10 +27,10 @@
 * 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 <math.h>
+//#include <math.h>
 #include <stdio.h>

 #include "wined3d_private.h"
--- a/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c
+++ b/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c
@ -18,11 +18,11 @@
 * 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 <math.h>
-#include <stdio.h>
+//#include <math.h>
+//#include <stdio.h>

 #include "wined3d_private.h"

--- a/reactos/dll/directx/wine/wined3d/buffer.c
+++ b/reactos/dll/directx/wine/wined3d/buffer.c
@ -22,8 +22,8 @@
 *
 */

-#include "config.h"
-#include "wine/port.h"
+#include <config.h>
+#include <wine/port.h>

 #include "wined3d_private.h"

--- a/reactos/dll/directx/wine/wined3d/context.c
+++ b/reactos/dll/directx/wine/wined3d/context.c
@ -19,10 +19,10 @@
 * 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 <stdio.h>
 #ifdef HAVE_FLOAT_H
 # include <float.h>
 #endif
--- a/reactos/dll/directx/wine/wined3d/device.c
+++ b/reactos/dll/directx/wine/wined3d/device.c
@ -24,10 +24,10 @@
 * 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 <stdio.h>
 #ifdef HAVE_FLOAT_H
 # include <float.h>
 #endif
--- a/reactos/dll/directx/wine/wined3d/directx.c
+++ b/reactos/dll/directx/wine/wined3d/directx.c
@ -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);

--- a/reactos/dll/directx/wine/wined3d/drawprim.c
+++ b/reactos/dll/directx/wine/wined3d/drawprim.c
@ -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,
--- a/reactos/dll/directx/wine/wined3d/gl_compat.c
+++ b/reactos/dll/directx/wine/wined3d/gl_compat.c
@ -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
--- a/reactos/dll/directx/wine/wined3d/glsl_shader.c
+++ b/reactos/dll/directx/wine/wined3d/glsl_shader.c
@ -29,10 +29,10 @@
 * mask for the destination parameter into account.
 */

-#include "config.h"
-#include "wine/port.h"
+#include <config.h>
+#include <wine/port.h>

-#include <limits.h>
+//#include <limits.h>
 #include <stdio.h>

 #include "wined3d_private.h"
--- a/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c
+++ b/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c
@ -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 <config.h>
+#include <wine/port.h>

-#include <math.h>
-#include <stdio.h>
+//#include <math.h>
+//#include <stdio.h>

 #include "wined3d_private.h"

--- a/reactos/dll/directx/wine/wined3d/palette.c
+++ b/reactos/dll/directx/wine/wined3d/palette.c
@ -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 <config.h>
+#include <wine/port.h>
+//#include "winerror.h"
+//#include "wine/debug.h"

-#include <string.h>
+//#include <string.h>

 #include "wined3d_private.h"

--- a/reactos/dll/directx/wine/wined3d/query.c
+++ b/reactos/dll/directx/wine/wined3d/query.c
@ -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);
--- a/reactos/dll/directx/wine/wined3d/resource.c
+++ b/reactos/dll/directx/wine/wined3d/resource.c
@ -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);
--- a/reactos/dll/directx/wine/wined3d/sampler.c
+++ b/reactos/dll/directx/wine/wined3d/sampler.c
@ -17,8 +17,8 @@
 *
 */

-#include "config.h"
-#include "wine/port.h"
+#include <config.h>
+//#include "wine/port.h"

 #include "wined3d_private.h"

--- a/reactos/dll/directx/wine/wined3d/shader.c
+++ b/reactos/dll/directx/wine/wined3d/shader.c
@ -22,12 +22,12 @@
 * 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 <math.h>
+//#include <math.h>
 #include <stdio.h>
-#include <string.h>
+//#include <string.h>

 #include "wined3d_private.h"

--- a/reactos/dll/directx/wine/wined3d/shader_sm1.c
+++ b/reactos/dll/directx/wine/wined3d/shader_sm1.c
@ -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"

--- a/reactos/dll/directx/wine/wined3d/shader_sm4.c
+++ b/reactos/dll/directx/wine/wined3d/shader_sm4.c
@ -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"

--- a/reactos/dll/directx/wine/wined3d/state.c
+++ b/reactos/dll/directx/wine/wined3d/state.c
@ -25,10 +25,10 @@
 * 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 <stdio.h>
 #ifdef HAVE_FLOAT_H
 # include <float.h>
 #endif
--- a/reactos/dll/directx/wine/wined3d/stateblock.c
+++ b/reactos/dll/directx/wine/wined3d/stateblock.c
@ -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);
--- a/reactos/dll/directx/wine/wined3d/surface.c
+++ b/reactos/dll/directx/wine/wined3d/surface.c
@ -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);
--- a/reactos/dll/directx/wine/wined3d/swapchain.c
+++ b/reactos/dll/directx/wine/wined3d/swapchain.c
@ -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);
--- a/reactos/dll/directx/wine/wined3d/texture.c
+++ b/reactos/dll/directx/wine/wined3d/texture.c
@ -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);
--- a/reactos/dll/directx/wine/wined3d/utils.c
+++ b/reactos/dll/directx/wine/wined3d/utils.c
@ -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"

--- a/reactos/dll/directx/wine/wined3d/vertexdeclaration.c
+++ b/reactos/dll/directx/wine/wined3d/vertexdeclaration.c
@ -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);
--- a/reactos/dll/directx/wine/wined3d/view.c
+++ b/reactos/dll/directx/wine/wined3d/view.c
@ -17,8 +17,8 @@
 *
 */

-#include "config.h"
-#include "wine/port.h"
+#include <config.h>
+#include <wine/port.h>

 #include "wined3d_private.h"

--- a/reactos/dll/directx/wine/wined3d/volume.c
+++ b/reactos/dll/directx/wine/wined3d/volume.c
@ -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);
--- a/reactos/dll/directx/wine/wined3d/wined3d_main.c
+++ b/reactos/dll/directx/wine/wined3d/wined3d_main.c
@ -22,10 +22,10 @@
 * 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 "initguid.h"
+//#include "initguid.h"
 #include "wined3d_private.h"

 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
--- a/reactos/dll/directx/wine/wined3d/wined3d_private.h
+++ b/reactos/dll/directx/wine/wined3d/wined3d_private.h
@ -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 <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 <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