Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-02 09:30:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DDRAW]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2013-12-21 17:31:51 +00:00
parent 942db97a16
commit cd74723d2f
13 changed files with 7 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/directx/wine/ddraw/clipper.c
View file

@ -19,13 +19,8 @@
* 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);

5
reactos/dll/directx/wine/ddraw/ddraw.c
View file

@ -21,13 +21,8 @@
* 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;

11
reactos/dll/directx/wine/ddraw/ddraw_private.h
View file

@ -19,6 +19,9 @@
#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
@ -26,17 +29,17 @@
#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>

4
reactos/dll/directx/wine/ddraw/device.c
View file

@ -27,12 +27,8 @@
*
*/
#include <config.h>
#include <wine/port.h>
#include "ddraw_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
WINE_DECLARE_DEBUG_CHANNEL(winediag);
/* The device ID */

5
reactos/dll/directx/wine/ddraw/executebuffer.c
View file

@ -20,13 +20,8 @@
* 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

5
reactos/dll/directx/wine/ddraw/light.c
View file

@ -19,13 +19,8 @@
* 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
*

6
reactos/dll/directx/wine/ddraw/main.c
View file

@ -24,18 +24,12 @@
* 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;

5
reactos/dll/directx/wine/ddraw/material.c
View file

@ -19,13 +19,8 @@
* 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);

5
reactos/dll/directx/wine/ddraw/palette.c
View file

@ -16,13 +16,8 @@
* 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
*

5
reactos/dll/directx/wine/ddraw/surface.c
View file

@ -21,13 +21,8 @@
* 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);

5
reactos/dll/directx/wine/ddraw/utils.c
View file

@ -21,13 +21,8 @@
* 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)

5
reactos/dll/directx/wine/ddraw/vertexbuffer.c
View file

@ -19,13 +19,8 @@
* 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);

5
reactos/dll/directx/wine/ddraw/viewport.c
View file

@ -19,13 +19,8 @@
* 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
*****************************************************************************/