Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed ddk/ddrawi.h because we have it twice, also removed some defines from ddrawint.h that are already in ddrawi.h

Browse source 
svn path=/trunk/; revision=16224
This commit is contained in:
Maarten Bosma 2005-06-22 19:51:01 +00:00
parent 2778f92cc3
commit 588a9bc3cb
4 changed files with 3 additions and 1355 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/include/ddentry.h
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <ddk/ddrawi.h>
#include <ddrawi.h>
#include <ddk/d3dhal.h>
#include <ddk/winddi.h>
BOOL STDCALL DdCreateDirectDrawObject(

2
reactos/include/ddk/d3dhal.h
View file

@ -26,7 +26,7 @@
extern "C" {
#endif
#include <ddk/ddrawi.h>
#include <ddrawi.h>
#include <d3d.h>
/*****************************************************************************

1332
reactos/include/ddk/ddrawi.h
View file

File diff suppressed because it is too large Load diff

22
reactos/include/ddk/ddrawint.h
View file

@ -6,22 +6,17 @@
#define __DD_INCLUDED__
#include <ddraw.h>
#include <ddrawi.h>
#ifdef __cplusplus
extern "C" {
#endif
/* pointer to video memory */
typedef ULONG_PTR FLATPTR;
// FIXME: These should have been defined in other header files!
typedef struct _DDVIDEOPORTCAPS *LPDDVIDEOPORTCAPS; /* should be in dvp.h */
typedef struct _DDVIDEOPORTDESC *LPDDVIDEOPORTDESC; /* should be in dvp.h */
typedef struct _DDVIDEOPORTBANDWIDTH *LPDDVIDEOPORTBANDWIDTH; /* should be in dvp.h */
typedef struct _DDVIDEOPORTCONNECT *LPDDVIDEOPORTCONNECT; /* should be in dvp.h */
typedef struct _DDVIDEOPORTINFO *LPDDVIDEOPORTINFO; /* should be in dvp.h */
typedef struct _DDKERNELCAPS *LPDDKERNELCAPS; /* should be in ddkernel.h */
typedef struct _VMEMHEAP *LPVMEMHEAP; /* should be in dmemmgr.h */
typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL; /* should be defined here once we have dvp.h */
/************************************************************************/
@ -46,13 +41,6 @@ typedef struct
};
} VIDEOMEMORY, *PVIDEOMEMORY;
#define VIDMEM_ISLINEAR (1<<0)
#define VIDMEM_ISRECTANGULAR (1<<1)
#define VIDMEM_ISHEAP (1<<2)
#define VIDMEM_ISNONLOCAL (1<<3)
#define VIDMEM_ISWC (1<<4)
#define VIDMEM_ISDISABLED (1<<5)
typedef struct
{
FLATPTR fpPrimary;
@ -155,14 +143,6 @@ typedef struct
RECT rcOverlaySrc;
} DD_SURFACE_LOCAL, *PDD_SURFACE_LOCAL;
#define DDRAWISURF_HASCKEYSRCBLT 0x00000800L
#define DDRAWISURF_HASPIXELFORMAT 0x00002000L
#define DDRAWISURF_HASOVERLAYDATA 0x00004000L
#define DDRAWISURF_FRONTBUFFER 0x04000000L
#define DDRAWISURF_BACKBUFFER 0x08000000L
#define DDRAWISURF_INVALID 0x10000000L
#define DDRAWISURF_DRIVERMANAGED 0x40000000L
typedef struct _DD_ATTACHLIST
{
PDD_ATTACHLIST lpLink;