[WINED3D]

* Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 svn path=/trunk/; revision=61329
2024-07-10 14:45:06 +00:00 · 2013-12-21 19:11:16 +00:00 · 2013-12-21 19:11:16 +00:00 · 95313a5fb0
parent b453f9616c
commit 95313a5fb0
28 changed files with 9 additions and 118 deletions
--- a/reactos/dll/directx/wine/wined3d/arb_program_shader.c
+++ b/reactos/dll/directx/wine/wined3d/arb_program_shader.c
@ -27,12 +27,6 @@
 * 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 "wined3d_private.h"

 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
--- a/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c
+++ b/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c
@ -18,12 +18,6 @@
 * 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 "wined3d_private.h"

 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
--- a/reactos/dll/directx/wine/wined3d/buffer.c
+++ b/reactos/dll/directx/wine/wined3d/buffer.c
@ -22,9 +22,6 @@
 *
 */

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

 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
--- a/reactos/dll/directx/wine/wined3d/context.c
+++ b/reactos/dll/directx/wine/wined3d/context.c
@ -19,14 +19,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <config.h>
-#include <wine/port.h>
-
-//#include <stdio.h>
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
-
 #include "wined3d_private.h"

 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
--- a/reactos/dll/directx/wine/wined3d/device.c
+++ b/reactos/dll/directx/wine/wined3d/device.c
@ -24,14 +24,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <config.h>
-#include <wine/port.h>
-
-//#include <stdio.h>
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
-
 #include "wined3d_private.h"

 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
--- a/reactos/dll/directx/wine/wined3d/directx.c
+++ b/reactos/dll/directx/wine/wined3d/directx.c
@ -21,13 +21,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <config.h>
-#include <wine/port.h>
-
-#include <stdio.h>
-
 #include "wined3d_private.h"
-//#include "winternl.h"

 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
--- a/reactos/dll/directx/wine/wined3d/drawprim.c
+++ b/reactos/dll/directx/wine/wined3d/drawprim.c
@ -24,9 +24,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

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

 WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw);
--- a/reactos/dll/directx/wine/wined3d/gl_compat.c
+++ b/reactos/dll/directx/wine/wined3d/gl_compat.c
@ -18,14 +18,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <config.h>
-#include <wine/port.h>
-
-#include <stdio.h>
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
-
 #include "wined3d_private.h"

 WINE_DEFAULT_DEBUG_CHANNEL(gl_compat);
--- a/reactos/dll/directx/wine/wined3d/glsl_shader.c
+++ b/reactos/dll/directx/wine/wined3d/glsl_shader.c
@ -29,12 +29,6 @@
 * mask for the destination parameter into account.
 */

-#include <config.h>
-#include <wine/port.h>
-
-//#include <limits.h>
-#include <stdio.h>
-
 #include "wined3d_private.h"

 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
--- a/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c
+++ b/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c
@ -19,11 +19,6 @@
 * 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 "wined3d_private.h"

--- a/reactos/dll/directx/wine/wined3d/palette.c
+++ b/reactos/dll/directx/wine/wined3d/palette.c
@ -18,12 +18,6 @@
 * 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 "wined3d_private.h"

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

-
-#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
@ -21,8 +21,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#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,9 +17,6 @@
 *
 */

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

 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
--- a/reactos/dll/directx/wine/wined3d/shader.c
+++ b/reactos/dll/directx/wine/wined3d/shader.c
@ -22,13 +22,6 @@
 * 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 <string.h>
-
 #include "wined3d_private.h"

 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
--- a/reactos/dll/directx/wine/wined3d/shader_sm1.c
+++ b/reactos/dll/directx/wine/wined3d/shader_sm1.c
@ -22,9 +22,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

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

 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
--- a/reactos/dll/directx/wine/wined3d/shader_sm4.c
+++ b/reactos/dll/directx/wine/wined3d/shader_sm4.c
@ -16,9 +16,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

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

 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
--- a/reactos/dll/directx/wine/wined3d/state.c
+++ b/reactos/dll/directx/wine/wined3d/state.c
@ -25,14 +25,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <config.h>
-#include <wine/port.h>
-
-//#include <stdio.h>
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
-
 #include "wined3d_private.h"

 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
--- a/reactos/dll/directx/wine/wined3d/stateblock.c
+++ b/reactos/dll/directx/wine/wined3d/stateblock.c
@ -22,8 +22,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#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,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#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,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#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,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#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,9 +24,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

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

 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
--- a/reactos/dll/directx/wine/wined3d/vertexdeclaration.c
+++ b/reactos/dll/directx/wine/wined3d/vertexdeclaration.c
@ -22,8 +22,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#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,9 +17,6 @@
 *
 */

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

 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
--- a/reactos/dll/directx/wine/wined3d/volume.c
+++ b/reactos/dll/directx/wine/wined3d/volume.c
@ -20,8 +20,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#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,6 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <config.h>
-#include <wine/port.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
@ -25,6 +25,9 @@
 #ifndef __WINE_WINED3D_PRIVATE_H
 #define __WINE_WINED3D_PRIVATE_H

+#include <config.h>
+#include <wine/port.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
@ -35,14 +38,18 @@
 #define WINE_GLAPI
 #endif

+#ifdef HAVE_FLOAT_H
+# include <float.h>
+#endif
+
 #include <stdarg.h>
+#include <stdio.h>
 #include <math.h>
-//#include <limits.h>
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #define COBJMACROS
 #include <windef.h>
-//#include "winbase.h"
+#include <winbase.h>
 #include <winreg.h>
 #include <wingdi.h>
 #include <winuser.h>