Module: wine Branch: master Commit: c5a14085d45a7402f3013e0397957d1250261f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a14085d45a7402f3013e0397...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed Aug 18 19:26:20 2010 +0200
ddraw: Remove unused / redundant includes.
---
dlls/ddraw/clipper.c | 15 +-------------- dlls/ddraw/ddraw.c | 18 ------------------ dlls/ddraw/ddraw_private.h | 18 ++++++++---------- dlls/ddraw/device.c | 18 ------------------ dlls/ddraw/executebuffer.c | 18 ------------------ dlls/ddraw/light.c | 17 ----------------- dlls/ddraw/main.c | 19 ++----------------- dlls/ddraw/material.c | 18 ------------------ dlls/ddraw/palette.c | 8 +------- dlls/ddraw/parent.c | 17 ----------------- dlls/ddraw/regsvr.c | 16 ++++------------ dlls/ddraw/surface.c | 18 ------------------ dlls/ddraw/utils.c | 4 +--- dlls/ddraw/vertexbuffer.c | 17 ----------------- dlls/ddraw/viewport.c | 18 ------------------ 15 files changed, 17 insertions(+), 222 deletions(-)
diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index a8a3242..25e71fa 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -20,23 +20,10 @@ */
#include "config.h" - -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "ddraw.h" -#include "winerror.h" +#include "wine/port.h"
#include "ddraw_private.h"
-#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
/***************************************************************************** diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 6f060e7..55753c4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -23,25 +23,7 @@ #include "config.h" #include "wine/port.h"
-#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 990d4f7..fe65b79 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -19,24 +19,22 @@ #ifndef __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H #define __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H
-/* MAY NOT CONTAIN X11 or DGA specific includes/defines/structs! */ +#include <assert.h> +#define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "wine/debug.h"
-#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" #include "winbase.h" -#include "wtypes.h" #include "wingdi.h" #include "winuser.h" -#include "ddraw.h" -#include "ddrawi.h" -#include "d3d.h"
-#include "wine/list.h" +#include "d3d.h" +#include "ddraw.h" #ifdef DDRAW_INIT_GUID #include "initguid.h" #endif +#include "wine/list.h" #include "wine/wined3d.h"
extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 25ff428..bb046b4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -30,25 +30,7 @@ #include "config.h" #include "wine/port.h"
-#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d7); WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 04f856a..9f08976 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -23,25 +23,7 @@ #include "config.h" #include "wine/port.h"
-#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index dd41ffe..9726d86 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -21,23 +21,6 @@
#include "config.h" #include "wine/port.h" -#include "wine/debug.h" - -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h"
#include "ddraw_private.h"
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 7292ed8..0fccec7 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -26,28 +26,13 @@
#include "config.h" #include "wine/port.h" -#include "wine/debug.h"
-#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS +#define DDRAW_INIT_GUID +#include "ddraw_private.h"
-#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" #include "wine/exception.h" #include "winreg.h"
-#include "ddraw.h" -#include "d3d.h" - -#define DDRAW_INIT_GUID -#include "ddraw_private.h" - static typeof(WineDirect3DCreate) *pWineDirect3DCreate;
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 3c5dc1d..68da7ff 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -22,25 +22,7 @@ #include "config.h" #include "wine/port.h"
-#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d7); WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk); diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 9ef0a7c..2937ec6 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -18,13 +18,7 @@ */
#include "config.h" -#include "winerror.h" -#include "wine/debug.h" - -#define COBJMACROS - -#include <assert.h> -#include <string.h> +#include "wine/port.h"
#include "ddraw_private.h"
diff --git a/dlls/ddraw/parent.c b/dlls/ddraw/parent.c index 473152e..2d8f519 100644 --- a/dlls/ddraw/parent.c +++ b/dlls/ddraw/parent.c @@ -23,23 +23,6 @@
#include "config.h" #include "wine/port.h" -#include "wine/debug.h" - -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h"
#include "ddraw_private.h"
diff --git a/dlls/ddraw/regsvr.c b/dlls/ddraw/regsvr.c index 6ab75d1..52a6fb7 100644 --- a/dlls/ddraw/regsvr.c +++ b/dlls/ddraw/regsvr.c @@ -18,20 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> -#include <string.h> +#include "config.h" +#include "wine/port.h"
-#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" - -#include "ddraw.h" - -#include "wine/debug.h" +#include "ddraw_private.h" #include "wine/unicode.h" +#include "winreg.h"
WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8f23ab1..46c166a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -26,25 +26,7 @@ #include "config.h" #include "wine/port.h"
-#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index ed8b480..89234c1 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -22,11 +22,9 @@ */
#include "config.h" - -#define NONAMELESSUNION +#include "wine/port.h"
#include "ddraw_private.h" -#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index f16cf12..fc02660 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -21,23 +21,6 @@
#include "config.h" #include "wine/port.h" -#include "wine/debug.h" - -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h"
#include "ddraw_private.h"
diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 403463b..56572e3 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -22,25 +22,7 @@ #include "config.h" #include "wine/port.h"
-#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d7);