* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716
svn path=/trunk/; revision=61326
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-//#include "wine/port.h"
-
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
static inline struct ddraw_clipper *impl_from_IDirectDrawClipper(IDirectDrawClipper *iface)
{
return CONTAINING_RECORD(iface, struct ddraw_clipper, IDirectDrawClipper_iface);
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-//#include "wine/port.h"
-
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
static struct wined3d_display_mode original_mode;
static const struct ddraw *exclusive_ddraw;
static BOOL restore_mode;
#ifndef __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H
#define __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H
+#include <config.h>
+#include <wine/port.h>
+
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#define NONAMELESSSTRUCT
#define NONAMELESSUNION
+
#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
#include <winbase.h>
#include <wingdi.h>
#include <winuser.h>
-#include <d3d.h>
-//#include "ddraw.h"
-#ifdef DDRAW_INIT_GUID
#include <initguid.h>
-#endif
+#include <d3d.h>
+
#include <wine/list.h>
#include <wine/wined3d.h>
*
*/
-#include <config.h>
-#include <wine/port.h>
-
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
WINE_DECLARE_DEBUG_CHANNEL(winediag);
/* The device ID */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-//#include "wine/port.h"
-
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
/*****************************************************************************
* _dump_executedata
* _dump_D3DEXECUTEBUFFERDESC
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-//#include "wine/port.h"
-
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
/*****************************************************************************
* light_update
*
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#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>
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
static struct list global_ddraw_list = LIST_INIT(global_ddraw_list);
static HINSTANCE instance;
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-//#include "wine/port.h"
-
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
static void dump_material(const D3DMATERIAL *mat)
{
TRACE(" dwSize : %d\n", mat->dwSize);
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-//#include "wine/port.h"
-
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
/*****************************************************************************
* IDirectDrawPalette::QueryInterface
*
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-//#include "wine/port.h"
-
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface);
static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface);
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-//#include "wine/port.h"
-
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
static void DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf);
void ddrawformat_from_wined3dformat(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_id wined3d_format)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-//#include "wine/port.h"
-
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
static inline struct d3d_vertex_buffer *impl_from_IDirect3DVertexBuffer(IDirect3DVertexBuffer *iface)
{
return CONTAINING_RECORD(iface, struct d3d_vertex_buffer, IDirect3DVertexBuffer_iface);
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-//#include "wine/port.h"
-
#include "ddraw_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
/*****************************************************************************
* Helper functions
*****************************************************************************/