Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 15:15:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compilation of ks

Browse source 
and fix some issues with portcls (not all)

svn path=/trunk/; revision=26438
This commit is contained in:
Christoph von Wittich 2007-04-20 16:45:18 +00:00
parent 006c35bd43
commit e97e061bad
18 changed files with 240 additions and 216 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/drivers/ksfilter/ks/allocators.c
View file

@ -2,6 +2,8 @@
Allocator Functions Allocator Functions
*/ */
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* /*

2
reactos/drivers/ksfilter/ks/clocks.c
View file

@ -2,6 +2,8 @@
Clock Functions Clock Functions
*/ */
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* /*

2
reactos/drivers/ksfilter/ks/connectivity.c
View file

@ -6,6 +6,8 @@
KsHandleSizedListQuery KsHandleSizedListQuery
*/ */
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
KSDDKAPI NTSTATUS NTAPI KSDDKAPI NTSTATUS NTAPI

2
reactos/drivers/ksfilter/ks/events.c
View file

@ -1,3 +1,5 @@
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* =============================================================== /* ===============================================================

2
reactos/drivers/ksfilter/ks/irp.c
View file

@ -3,6 +3,8 @@
IRP Helpers IRP Helpers
*/ */
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
#define TAG(A, B, C, D) (IN ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG(A, B, C, D) (IN ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))

1
reactos/drivers/ksfilter/ks/ks.rbuild
View file

@ -6,6 +6,7 @@
<library>ntoskrnl</library> <library>ntoskrnl</library>
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="BUILDING_KS" /> <define name="BUILDING_KS" />
<define name="_NTDDK_" />
<file>ks.rc</file> <file>ks.rc</file>
<file>allocators.c</file> <file>allocators.c</file>
<file>clocks.c</file> <file>clocks.c</file>

2
reactos/drivers/ksfilter/ks/methods.c
View file

@ -2,6 +2,8 @@
Method Functions Method Functions
*/ */
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* /*

2
reactos/drivers/ksfilter/ks/misc.c
View file

@ -1,3 +1,5 @@
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* =============================================================== /* ===============================================================

2
reactos/drivers/ksfilter/ks/properties.c
View file

@ -1,3 +1,5 @@
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* =============================================================== /* ===============================================================

2
reactos/drivers/ksfilter/ks/topology.c
View file

@ -1,3 +1,5 @@
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* =============================================================== /* ===============================================================

2
reactos/drivers/ksfilter/ks/worker.c
View file

@ -2,6 +2,8 @@
Worker Management Functions Worker Management Functions
*/ */
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* /*

2
reactos/drivers/wdm/audio/backpln/portcls/adapter.c
View file

@ -8,7 +8,7 @@
* HISTORY: * HISTORY:
* 27 Jan 07 Created * 27 Jan 07 Created
*/ */
#include <portcls.h>
#include "private.h" #include "private.h"
/* /*

1
reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
View file

@ -3,6 +3,7 @@
<linkerflag>-fno-rtti</linkerflag> <linkerflag>-fno-rtti</linkerflag>
<importlibrary definition="portcls.def" /> <importlibrary definition="portcls.def" />
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="_NTDDK_" />
<include base="portcls">../include</include> <include base="portcls">../include</include>
<library>ntoskrnl</library> <library>ntoskrnl</library>
<library>ks</library> <library>ks</library>

3
reactos/drivers/wdm/audio/backpln/portcls/private.h
View file

@ -7,6 +7,9 @@
#ifndef PORTCLS_PRIVATE_H #ifndef PORTCLS_PRIVATE_H
#define PORTCLS_PRIVATE_H #define PORTCLS_PRIVATE_H
#include <ntddk.h>
#include <debug.h>
#include <portcls.h> #include <portcls.h>
NTAPI NTAPI

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

@ -47,7 +47,7 @@ extern "C" {
/* more DCICOMMAND escapes */ /* more DCICOMMAND escapes */
#ifndef DCICOMMAND #ifndef DCICOMMAND
#define DCICOMMAND 3075 #define DCICOMMAND 3075
#endif #endif
#define DDCREATEDRIVEROBJECT 10 #define DDCREATEDRIVEROBJECT 10
@ -55,7 +55,7 @@ extern "C" {
#define DDNEWCALLBACKFNS 12 #define DDNEWCALLBACKFNS 12
#define DDVERSIONINFO 13 #define DDVERSIONINFO 13
#define DDUNSUPPORTEDMODE ((DWORD) -1) #define DDUNSUPPORTEDMODE ((DWORD) -1)
@ -93,7 +93,7 @@ DEFINE_GUID(GUID_UserModeDriverPassword, 0x97f861b6, 0x60a1, 0x11d1, 0x8c, 0xd0,
DEFINE_GUID(GUID_D3DParseUnknownCommandCallback, 0x2e04ffa0, 0x98e4, 0x11d1, 0x8c, 0xe1, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0xa8); DEFINE_GUID(GUID_D3DParseUnknownCommandCallback, 0x2e04ffa0, 0x98e4, 0x11d1, 0x8c, 0xe1, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0xa8);
DEFINE_GUID(GUID_MotionCompCallbacks, 0xb1122b40, 0x5dA5, 0x11d1, 0x8f, 0xcF, 0x00, 0xc0, 0x4f, 0xc2, 0x9b, 0x4e); DEFINE_GUID(GUID_MotionCompCallbacks, 0xb1122b40, 0x5dA5, 0x11d1, 0x8f, 0xcF, 0x00, 0xc0, 0x4f, 0xc2, 0x9b, 0x4e);
DEFINE_GUID(GUID_Miscellaneous2Callbacks, 0x406B2F00, 0x3E5A, 0x11D1, 0xB6, 0x40, 0x00, 0xAA, 0x00, 0xA1, 0xF9, 0x6A); DEFINE_GUID(GUID_Miscellaneous2Callbacks, 0x406B2F00, 0x3E5A, 0x11D1, 0xB6, 0x40, 0x00, 0xAA, 0x00, 0xA1, 0xF9, 0x6A);
#endif #endif
#ifndef _WIN32 #ifndef _WIN32
#undef E_NOTIMPL #undef E_NOTIMPL
@ -202,7 +202,7 @@ typedef struct _VIDMEM {
union { union {
LPVMEMHEAP lpHeap; LPVMEMHEAP lpHeap;
DWORD dwHeight; DWORD dwHeight;
}; };
} VIDMEM; } VIDMEM;
@ -784,7 +784,7 @@ typedef struct _DDHAL_CALLBACKS {
DDHAL_DDEXEBUFCALLBACKS HELDDExeBuf; DDHAL_DDEXEBUFCALLBACKS HELDDExeBuf;
DDHAL_DDVIDEOPORTCALLBACKS cbDDVideoPortCallbacks; DDHAL_DDVIDEOPORTCALLBACKS cbDDVideoPortCallbacks;
DDHAL_DDVIDEOPORTCALLBACKS HALDDVideoPort; DDHAL_DDVIDEOPORTCALLBACKS HALDDVideoPort;
DDHAL_DDCOLORCONTROLCALLBACKS cbDDColorControlCallbacks; DDHAL_DDCOLORCONTROLCALLBACKS cbDDColorControlCallbacks;
DDHAL_DDCOLORCONTROLCALLBACKS HALDDColorControl; DDHAL_DDCOLORCONTROLCALLBACKS HALDDColorControl;
DDHAL_DDMISCELLANEOUSCALLBACKS cbDDMiscellaneousCallbacks; DDHAL_DDMISCELLANEOUSCALLBACKS cbDDMiscellaneousCallbacks;
DDHAL_DDMISCELLANEOUSCALLBACKS HALDDMiscellaneous; DDHAL_DDMISCELLANEOUSCALLBACKS HALDDMiscellaneous;
@ -933,7 +933,7 @@ typedef struct _DDHAL_CANCREATEVPORTDATA
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
LPDDVIDEOPORTDESC lpDDVideoPortDesc; LPDDVIDEOPORTDESC lpDDVideoPortDesc;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALVPORTCB_CANCREATEVIDEOPORT CanCreateVideoPort; LPDDHALVPORTCB_CANCREATEVIDEOPORT CanCreateVideoPort;
} DDHAL_CANCREATEVPORTDATA; } DDHAL_CANCREATEVPORTDATA;
@ -948,25 +948,25 @@ typedef struct _DDHAL_CREATEVPORTDATA
typedef struct _DDHAL_GETVPORTBANDWIDTHDATA typedef struct _DDHAL_GETVPORTBANDWIDTHDATA
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort;
LPDDPIXELFORMAT lpddpfFormat; LPDDPIXELFORMAT lpddpfFormat;
DWORD dwWidth; DWORD dwWidth;
DWORD dwHeight; DWORD dwHeight;
DWORD dwFlags; DWORD dwFlags;
LPDDVIDEOPORTBANDWIDTH lpBandwidth; LPDDVIDEOPORTBANDWIDTH lpBandwidth;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALVPORTCB_GETBANDWIDTH GetVideoPortBandwidth; LPDDHALVPORTCB_GETBANDWIDTH GetVideoPortBandwidth;
} DDHAL_GETVPORTBANDWIDTHDATA; } DDHAL_GETVPORTBANDWIDTHDATA;
typedef struct _DDHAL_GETVPORTINPUTFORMATDATA typedef struct _DDHAL_GETVPORTINPUTFORMATDATA
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort;
DWORD dwFlags; DWORD dwFlags;
LPDDPIXELFORMAT lpddpfFormat; LPDDPIXELFORMAT lpddpfFormat;
DWORD dwNumFormats; DWORD dwNumFormats;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALVPORTCB_GETINPUTFORMATS GetVideoPortInputFormats; LPDDHALVPORTCB_GETINPUTFORMATS GetVideoPortInputFormats;
} DDHAL_GETVPORTINPUTFORMATDATA; } DDHAL_GETVPORTINPUTFORMATDATA;
@ -995,7 +995,7 @@ typedef struct _DDHAL_GETVPORTLINEDATA
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort;
DWORD dwLine; DWORD dwLine;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALVPORTCB_GETLINE GetVideoPortLine; LPDDHALVPORTCB_GETLINE GetVideoPortLine;
} DDHAL_GETVPORTLINEDATA; } DDHAL_GETVPORTLINEDATA;
@ -1003,7 +1003,7 @@ typedef struct _DDHAL_GETVPORTLINEDATA
typedef struct _DDHAL_DESTROYVPORTDATA typedef struct _DDHAL_DESTROYVPORTDATA
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALVPORTCB_DESTROYVPORT DestroyVideoPort; LPDDHALVPORTCB_DESTROYVPORT DestroyVideoPort;
} DDHAL_DESTROYVPORTDATA; } DDHAL_DESTROYVPORTDATA;
@ -1043,40 +1043,40 @@ typedef struct _DDHAL_WAITFORVPORTSYNCDATA
typedef struct _DDHAL_GETVPORTSIGNALDATA typedef struct _DDHAL_GETVPORTSIGNALDATA
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort;
DWORD dwStatus; DWORD dwStatus;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALVPORTCB_GETSIGNALSTATUS GetVideoSignalStatus; LPDDHALVPORTCB_GETSIGNALSTATUS GetVideoSignalStatus;
} DDHAL_GETVPORTSIGNALDATA; } DDHAL_GETVPORTSIGNALDATA;
typedef struct _DDHAL_VPORTCOLORDATA typedef struct _DDHAL_VPORTCOLORDATA
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort;
DWORD dwFlags; DWORD dwFlags;
LPDDCOLORCONTROL lpColorData; LPDDCOLORCONTROL lpColorData;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALVPORTCB_COLORCONTROL ColorControl; LPDDHALVPORTCB_COLORCONTROL ColorControl;
} DDHAL_VPORTCOLORDATA; } DDHAL_VPORTCOLORDATA;
typedef struct _DDHAL_FLIPVPORTDATA typedef struct _DDHAL_FLIPVPORTDATA
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort;
LPDDRAWI_DDRAWSURFACE_LCL lpSurfCurr; LPDDRAWI_DDRAWSURFACE_LCL lpSurfCurr;
LPDDRAWI_DDRAWSURFACE_LCL lpSurfTarg; LPDDRAWI_DDRAWSURFACE_LCL lpSurfTarg;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALVPORTCB_FLIP FlipVideoPort; LPDDHALVPORTCB_FLIP FlipVideoPort;
} DDHAL_FLIPVPORTDATA; } DDHAL_FLIPVPORTDATA;
typedef struct _DDHAL_GETVPORTCONNECTDATA typedef struct _DDHAL_GETVPORTCONNECTDATA
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
DWORD dwPortId; DWORD dwPortId;
LPDDVIDEOPORTCONNECT lpConnect; LPDDVIDEOPORTCONNECT lpConnect;
DWORD dwNumEntries; DWORD dwNumEntries;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALVPORTCB_GETVPORTCONNECT GetVideoPortConnectInfo; LPDDHALVPORTCB_GETVPORTCONNECT GetVideoPortConnectInfo;
} DDHAL_GETVPORTCONNECTDATA; } DDHAL_GETVPORTCONNECTDATA;
@ -1121,10 +1121,10 @@ typedef struct _DDHAL_DESTROYDDLOCALDATA
} DDHAL_DESTROYDDLOCALDATA; } DDHAL_DESTROYDDLOCALDATA;
typedef struct _DDHAL_CREATESURFACEEXDATA { typedef struct _DDHAL_CREATESURFACEEXDATA {
DWORD dwFlags; DWORD dwFlags;
LPDDRAWI_DIRECTDRAW_LCL lpDDLcl; LPDDRAWI_DIRECTDRAW_LCL lpDDLcl;
LPDDRAWI_DDRAWSURFACE_LCL lpDDSLcl; LPDDRAWI_DDRAWSURFACE_LCL lpDDSLcl;
HRESULT ddRVal; HRESULT ddRVal;
} DDHAL_CREATESURFACEEXDATA; } DDHAL_CREATESURFACEEXDATA;
typedef struct _DDHAL_GETHEAPALIGNMENTDATA typedef struct _DDHAL_GETHEAPALIGNMENTDATA
@ -1139,7 +1139,7 @@ typedef struct _DDHAL_GETHEAPALIGNMENTDATA
typedef struct _DDMORESURFACECAPS typedef struct _DDMORESURFACECAPS
{ {
DWORD dwSize; DWORD dwSize;
DDSCAPSEX ddsCapsMore; DDSCAPSEX ddsCapsMore;
struct tagExtendedHeapRestrictions struct tagExtendedHeapRestrictions
{ {
@ -1150,12 +1150,12 @@ typedef struct _DDMORESURFACECAPS
typedef struct _DDSTEREOMODE typedef struct _DDSTEREOMODE
{ {
DWORD dwSize; DWORD dwSize;
DWORD dwHeight; DWORD dwHeight;
DWORD dwWidth; DWORD dwWidth;
DWORD dwBpp; DWORD dwBpp;
DWORD dwRefreshRate; DWORD dwRefreshRate;
BOOL bSupported; BOOL bSupported;
} DDSTEREOMODE, * LPDDSTEREOMODE; } DDSTEREOMODE, * LPDDSTEREOMODE;
@ -1282,7 +1282,7 @@ typedef struct _DDRAWI_DIRECTDRAW_LCL {
#define DDRAWILCL_ATTEMPTEDD3DCONTEXT 0x00040000 #define DDRAWILCL_ATTEMPTEDD3DCONTEXT 0x00040000
#define DDRAWILCL_FPUPRESERVE 0x00080000 #define DDRAWILCL_FPUPRESERVE 0x00080000
#define DDRAWILCL_DX8DRIVER 0x00100000 #define DDRAWILCL_DX8DRIVER 0x00100000
#define DDRAWILCL_DIRECTDRAW8 0x00200000 #define DDRAWILCL_DIRECTDRAW8 0x00200000
typedef struct _DDRAWI_DIRECTDRAW_GBL { typedef struct _DDRAWI_DIRECTDRAW_GBL {
@ -1409,7 +1409,7 @@ typedef struct _DDRAWI_DDRAWSURFACE_GBL {
LPACCESSRECTLIST lpRectList; LPACCESSRECTLIST lpRectList;
DWORD dwBlockSizeY; DWORD dwBlockSizeY;
LONG lSlicePitch; LONG lSlicePitch;
}; };
union { union {
LPVMEMHEAP lpVidMemHeap; LPVMEMHEAP lpVidMemHeap;
DWORD dwBlockSizeX; DWORD dwBlockSizeX;
@ -1426,7 +1426,7 @@ typedef struct _DDRAWI_DDRAWSURFACE_GBL {
WORD wHeight; WORD wHeight;
WORD wWidth; WORD wWidth;
DWORD dwUsageCount; DWORD dwUsageCount;
ULONG_PTR dwReserved1; ULONG_PTR dwReserved1;
DDPIXELFORMAT ddpfSurface; DDPIXELFORMAT ddpfSurface;
} DDRAWI_DDRAWSURFACE_GBL; } DDRAWI_DDRAWSURFACE_GBL;
@ -1567,7 +1567,7 @@ typedef struct _DDRAWI_DDRAWSURFACE_LCL {
DDCOLORKEY ddckCKDestBlt; DDCOLORKEY ddckCKDestBlt;
DDCOLORKEY ddckCKSrcBlt; DDCOLORKEY ddckCKSrcBlt;
ULONG_PTR hDC; ULONG_PTR hDC;
ULONG_PTR dwReserved1; ULONG_PTR dwReserved1;
DDCOLORKEY ddckCKSrcOverlay; DDCOLORKEY ddckCKSrcOverlay;
DDCOLORKEY ddckCKDestOverlay; DDCOLORKEY ddckCKDestOverlay;
LPDDRAWI_DDRAWSURFACE_INT lpSurfaceOverlaying; LPDDRAWI_DDRAWSURFACE_INT lpSurfaceOverlaying;
@ -1580,40 +1580,40 @@ typedef struct _DDRAWI_DDRAWSURFACE_LCL {
LONG lOverlayY; LONG lOverlayY;
} DDRAWI_DDRAWSURFACE_LCL; } DDRAWI_DDRAWSURFACE_LCL;
#define DDRAWISURF_ATTACHED 0x00000001L #define DDRAWISURF_ATTACHED 0x00000001L
#define DDRAWISURF_IMPLICITCREATE 0x00000002L #define DDRAWISURF_IMPLICITCREATE 0x00000002L
#define DDRAWISURF_ISFREE 0x00000004L #define DDRAWISURF_ISFREE 0x00000004L
#define DDRAWISURF_ATTACHED_FROM 0x00000008L #define DDRAWISURF_ATTACHED_FROM 0x00000008L
#define DDRAWISURF_IMPLICITROOT 0x00000010L #define DDRAWISURF_IMPLICITROOT 0x00000010L
#define DDRAWISURF_PARTOFPRIMARYCHAIN 0x00000020L #define DDRAWISURF_PARTOFPRIMARYCHAIN 0x00000020L
#define DDRAWISURF_DATAISALIASED 0x00000040L #define DDRAWISURF_DATAISALIASED 0x00000040L
#define DDRAWISURF_HASDC 0x00000080L #define DDRAWISURF_HASDC 0x00000080L
#define DDRAWISURF_HASCKEYDESTOVERLAY 0x00000100L #define DDRAWISURF_HASCKEYDESTOVERLAY 0x00000100L
#define DDRAWISURF_HASCKEYDESTBLT 0x00000200L #define DDRAWISURF_HASCKEYDESTBLT 0x00000200L
#define DDRAWISURF_HASCKEYSRCOVERLAY 0x00000400L #define DDRAWISURF_HASCKEYSRCOVERLAY 0x00000400L
#define DDRAWISURF_HASCKEYSRCBLT 0x00000800L #define DDRAWISURF_HASCKEYSRCBLT 0x00000800L
#define DDRAWISURF_LOCKEXCLUDEDCURSOR 0x00001000L #define DDRAWISURF_LOCKEXCLUDEDCURSOR 0x00001000L
#define DDRAWISURF_HASPIXELFORMAT 0x00002000L #define DDRAWISURF_HASPIXELFORMAT 0x00002000L
#define DDRAWISURF_HASOVERLAYDATA 0x00004000L #define DDRAWISURF_HASOVERLAYDATA 0x00004000L
#define DDRAWISURF_SETGAMMA 0x00008000L #define DDRAWISURF_SETGAMMA 0x00008000L
#define DDRAWISURF_SW_CKEYDESTOVERLAY 0x00010000L #define DDRAWISURF_SW_CKEYDESTOVERLAY 0x00010000L
#define DDRAWISURF_SW_CKEYDESTBLT 0x00020000L #define DDRAWISURF_SW_CKEYDESTBLT 0x00020000L
#define DDRAWISURF_SW_CKEYSRCOVERLAY 0x00040000L #define DDRAWISURF_SW_CKEYSRCOVERLAY 0x00040000L
#define DDRAWISURF_SW_CKEYSRCBLT 0x00080000L #define DDRAWISURF_SW_CKEYSRCBLT 0x00080000L
#define DDRAWISURF_HW_CKEYDESTOVERLAY 0x00100000L #define DDRAWISURF_HW_CKEYDESTOVERLAY 0x00100000L
#define DDRAWISURF_HW_CKEYDESTBLT 0x00200000L #define DDRAWISURF_HW_CKEYDESTBLT 0x00200000L
#define DDRAWISURF_HW_CKEYSRCOVERLAY 0x00400000L #define DDRAWISURF_HW_CKEYSRCOVERLAY 0x00400000L
#define DDRAWISURF_HW_CKEYSRCBLT 0x00800000L #define DDRAWISURF_HW_CKEYSRCBLT 0x00800000L
#define DDRAWISURF_INMASTERSPRITELIST 0x01000000L #define DDRAWISURF_INMASTERSPRITELIST 0x01000000L
#define DDRAWISURF_HELCB 0x02000000L #define DDRAWISURF_HELCB 0x02000000L
#define DDRAWISURF_FRONTBUFFER 0x04000000L #define DDRAWISURF_FRONTBUFFER 0x04000000L
#define DDRAWISURF_BACKBUFFER 0x08000000L #define DDRAWISURF_BACKBUFFER 0x08000000L
#define DDRAWISURF_INVALID 0x10000000L #define DDRAWISURF_INVALID 0x10000000L
#define DDRAWISURF_DCIBUSY 0x20000000L #define DDRAWISURF_DCIBUSY 0x20000000L
#define DDRAWISURF_GETDCNULL 0x40000000L #define DDRAWISURF_GETDCNULL 0x40000000L
#define DDRAWISURF_STEREOSURFACELEFT 0x20000000L #define DDRAWISURF_STEREOSURFACELEFT 0x20000000L
#define DDRAWISURF_DRIVERMANAGED 0x40000000L #define DDRAWISURF_DRIVERMANAGED 0x40000000L
#define DDRAWISURF_DCILOCK 0x80000000L #define DDRAWISURF_DCILOCK 0x80000000L
/* palettes */ /* palettes */
typedef struct _DDRAWI_DDRAWPALETTE_INT { typedef struct _DDRAWI_DDRAWPALETTE_INT {
@ -1676,7 +1676,7 @@ typedef struct _DDRAWI_DDRAWPALETTE_GBL {
#define D3DFORMAT_OP_SRGBWRITE 0x00100000L #define D3DFORMAT_OP_SRGBWRITE 0x00100000L
#define D3DFORMAT_OP_NOALPHABLEND 0x00200000L #define D3DFORMAT_OP_NOALPHABLEND 0x00200000L
#define D3DFORMAT_OP_AUTOGENMIPMAP 0x00400000L #define D3DFORMAT_OP_AUTOGENMIPMAP 0x00400000L
#define D3DFORMAT_OP_VERTEXTEXTURE 0x00800000L #define D3DFORMAT_OP_VERTEXTEXTURE 0x00800000L
#define D3DFORMAT_OP_NOTEXCOORDWRAPNORMIP 0x01000000L #define D3DFORMAT_OP_NOTEXCOORDWRAPNORMIP 0x01000000L
#define DELETED_OK 0 #define DELETED_OK 0
#define DELETED_LASTONE 1 #define DELETED_LASTONE 1
@ -1745,22 +1745,22 @@ typedef struct _DDRAWI_DDRAWPALETTE_LCL {
typedef struct _DDMCCOMPBUFFERINFO typedef struct _DDMCCOMPBUFFERINFO
{ {
DWORD dwSize; DWORD dwSize;
DWORD dwNumCompBuffers; DWORD dwNumCompBuffers;
DWORD dwWidthToCreate; DWORD dwWidthToCreate;
DWORD dwHeightToCreate; DWORD dwHeightToCreate;
DWORD dwBytesToAllocate; DWORD dwBytesToAllocate;
DDSCAPS2 ddCompCaps; DDSCAPS2 ddCompCaps;
DDPIXELFORMAT ddPixelFormat; DDPIXELFORMAT ddPixelFormat;
} DDMCCOMPBUFFERINFO, *LPDDMCCOMPBUFFERINFO; } DDMCCOMPBUFFERINFO, *LPDDMCCOMPBUFFERINFO;
typedef struct _DDMCBUFFERINFO typedef struct _DDMCBUFFERINFO
{ {
DWORD dwSize; DWORD dwSize;
LPDDRAWI_DDRAWSURFACE_LCL lpCompSurface; LPDDRAWI_DDRAWSURFACE_LCL lpCompSurface;
DWORD dwDataOffset; DWORD dwDataOffset;
DWORD dwDataSize; DWORD dwDataSize;
LPVOID lpPrivate; LPVOID lpPrivate;
} DDMCBUFFERINFO, *LPDDMCBUFFERINFO; } DDMCBUFFERINFO, *LPDDMCBUFFERINFO;
typedef struct _DDHAL_GETDRIVERSTATEDATA { typedef struct _DDHAL_GETDRIVERSTATEDATA {
@ -1789,23 +1789,23 @@ typedef struct _DDHAL_BEGINMOCOMPFRAMEDATA
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
LPDDRAWI_DDMOTIONCOMP_LCL lpMoComp; LPDDRAWI_DDMOTIONCOMP_LCL lpMoComp;
LPDDRAWI_DDRAWSURFACE_LCL lpDestSurface; LPDDRAWI_DDRAWSURFACE_LCL lpDestSurface;
DWORD dwInputDataSize; DWORD dwInputDataSize;
LPVOID lpInputData; LPVOID lpInputData;
DWORD dwOutputDataSize; DWORD dwOutputDataSize;
LPVOID lpOutputData; LPVOID lpOutputData;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALMOCOMPCB_BEGINFRAME BeginMoCompFrame; LPDDHALMOCOMPCB_BEGINFRAME BeginMoCompFrame;
} DDHAL_BEGINMOCOMPFRAMEDATA; } DDHAL_BEGINMOCOMPFRAMEDATA;
typedef struct _DDHAL_COLORCONTROLDATA typedef struct _DDHAL_COLORCONTROLDATA
{ {
LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DIRECTDRAW_GBL lpDD;
LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface;
LPDDCOLORCONTROL lpColorData; LPDDCOLORCONTROL lpColorData;
DWORD dwFlags; DWORD dwFlags;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALCOLORCB_COLORCONTROL ColorControl; LPDDHALCOLORCB_COLORCONTROL ColorControl;
} DDHAL_COLORCONTROLDATA; } DDHAL_COLORCONTROLDATA;
typedef struct _DDHAL_CREATEMOCOMPDATA typedef struct _DDHAL_CREATEMOCOMPDATA
@ -1842,52 +1842,52 @@ typedef struct _DDHAL_ENDMOCOMPFRAMEDATA
typedef struct _DDHAL_FLIPTOGDISURFACEDATA typedef struct _DDHAL_FLIPTOGDISURFACEDATA
{ {
LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DIRECTDRAW_GBL lpDD;
DWORD dwToGDI; DWORD dwToGDI;
DWORD dwReserved; DWORD dwReserved;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHAL_FLIPTOGDISURFACE FlipToGDISurface; LPDDHAL_FLIPTOGDISURFACE FlipToGDISurface;
} DDHAL_FLIPTOGDISURFACEDATA; } DDHAL_FLIPTOGDISURFACEDATA;
typedef struct _DDHAL_GETAVAILDRIVERMEMORYDATA typedef struct _DDHAL_GETAVAILDRIVERMEMORYDATA
{ {
LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DIRECTDRAW_GBL lpDD;
DDSCAPS DDSCaps; DDSCAPS DDSCaps;
DWORD dwTotal; DWORD dwTotal;
DWORD dwFree; DWORD dwFree;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHAL_GETAVAILDRIVERMEMORY GetAvailDriverMemory; LPDDHAL_GETAVAILDRIVERMEMORY GetAvailDriverMemory;
DDSCAPSEX ddsCapsEx; DDSCAPSEX ddsCapsEx;
} DDHAL_GETAVAILDRIVERMEMORYDATA; } DDHAL_GETAVAILDRIVERMEMORYDATA;
typedef struct _DDHAL_GETBLTSTATUSDATA typedef struct _DDHAL_GETBLTSTATUSDATA
{ {
LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DIRECTDRAW_GBL lpDD;
LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface;
DWORD dwFlags; DWORD dwFlags;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALSURFCB_GETBLTSTATUS GetBltStatus; LPDDHALSURFCB_GETBLTSTATUS GetBltStatus;
} DDHAL_GETBLTSTATUSDATA; } DDHAL_GETBLTSTATUSDATA;
typedef struct _DDHAL_GETFLIPSTATUSDATA typedef struct _DDHAL_GETFLIPSTATUSDATA
{ {
LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DIRECTDRAW_GBL lpDD;
LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface;
DWORD dwFlags; DWORD dwFlags;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALSURFCB_GETFLIPSTATUS GetFlipStatus; LPDDHALSURFCB_GETFLIPSTATUS GetFlipStatus;
} DDHAL_GETFLIPSTATUSDATA; } DDHAL_GETFLIPSTATUSDATA;
typedef struct _DDHAL_GETINTERNALMOCOMPDATA typedef struct _DDHAL_GETINTERNALMOCOMPDATA
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
LPGUID lpGuid; LPGUID lpGuid;
DWORD dwWidth; DWORD dwWidth;
DWORD dwHeight; DWORD dwHeight;
DDPIXELFORMAT ddPixelFormat; DDPIXELFORMAT ddPixelFormat;
DWORD dwScratchMemAlloc; DWORD dwScratchMemAlloc;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALMOCOMPCB_GETINTERNALINFO GetInternalMoCompInfo; LPDDHALMOCOMPCB_GETINTERNALINFO GetInternalMoCompInfo;
} DDHAL_GETINTERNALMOCOMPDATA; } DDHAL_GETINTERNALMOCOMPDATA;
@ -1900,7 +1900,7 @@ typedef struct _DDHAL_GETMOCOMPCOMPBUFFDATA
DDPIXELFORMAT ddPixelFormat; DDPIXELFORMAT ddPixelFormat;
DWORD dwNumTypesCompBuffs; DWORD dwNumTypesCompBuffs;
LPDDMCCOMPBUFFERINFO lpCompBuffInfo; LPDDMCCOMPBUFFERINFO lpCompBuffInfo;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALMOCOMPCB_GETCOMPBUFFINFO GetMoCompBuffInfo; LPDDHALMOCOMPCB_GETCOMPBUFFINFO GetMoCompBuffInfo;
} DDHAL_GETMOCOMPCOMPBUFFDATA; } DDHAL_GETMOCOMPCOMPBUFFDATA;
@ -1925,19 +1925,19 @@ typedef struct _DDHAL_GETMOCOMPFORMATSDATA
typedef struct _DDHAL_GETSCANLINEDATA typedef struct _DDHAL_GETSCANLINEDATA
{ {
LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DIRECTDRAW_GBL lpDD;
DWORD dwScanLine; DWORD dwScanLine;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHAL_GETSCANLINE GetScanLine; LPDDHAL_GETSCANLINE GetScanLine;
} DDHAL_GETSCANLINEDATA; } DDHAL_GETSCANLINEDATA;
typedef struct _DDHAL_QUERYMOCOMPSTATUSDATA typedef struct _DDHAL_QUERYMOCOMPSTATUSDATA
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
LPDDRAWI_DDMOTIONCOMP_LCL lpMoComp; LPDDRAWI_DDMOTIONCOMP_LCL lpMoComp;
LPDDRAWI_DDRAWSURFACE_LCL lpSurface; LPDDRAWI_DDRAWSURFACE_LCL lpSurface;
DWORD dwFlags; DWORD dwFlags;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALMOCOMPCB_QUERYSTATUS QueryMoCompStatus; LPDDHALMOCOMPCB_QUERYSTATUS QueryMoCompStatus;
} DDHAL_QUERYMOCOMPSTATUSDATA; } DDHAL_QUERYMOCOMPSTATUSDATA;
@ -1945,59 +1945,59 @@ typedef struct _DDHAL_RENDERMOCOMPDATA
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
LPDDRAWI_DDMOTIONCOMP_LCL lpMoComp; LPDDRAWI_DDMOTIONCOMP_LCL lpMoComp;
DWORD dwNumBuffers; DWORD dwNumBuffers;
LPDDMCBUFFERINFO lpBufferInfo; LPDDMCBUFFERINFO lpBufferInfo;
DWORD dwFunction; DWORD dwFunction;
LPVOID lpInputData; LPVOID lpInputData;
DWORD dwInputDataSize; DWORD dwInputDataSize;
LPVOID lpOutputData; LPVOID lpOutputData;
DWORD dwOutputDataSize; DWORD dwOutputDataSize;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALMOCOMPCB_RENDER RenderMoComp; LPDDHALMOCOMPCB_RENDER RenderMoComp;
} DDHAL_RENDERMOCOMPDATA; } DDHAL_RENDERMOCOMPDATA;
typedef struct _DDHAL_SETCOLORKEYDATA typedef struct _DDHAL_SETCOLORKEYDATA
{ {
LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DIRECTDRAW_GBL lpDD;
LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface;
DWORD dwFlags; DWORD dwFlags;
DDCOLORKEY ckNew; DDCOLORKEY ckNew;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALSURFCB_SETCOLORKEY SetColorKey; LPDDHALSURFCB_SETCOLORKEY SetColorKey;
} DDHAL_SETCOLORKEYDATA; } DDHAL_SETCOLORKEYDATA;
typedef struct _DDHAL_SETOVERLAYPOSITIONDATA typedef struct _DDHAL_SETOVERLAYPOSITIONDATA
{ {
LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DIRECTDRAW_GBL lpDD;
LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface; LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface;
LPDDRAWI_DDRAWSURFACE_LCL lpDDDestSurface; LPDDRAWI_DDRAWSURFACE_LCL lpDDDestSurface;
LONG lXPos; LONG lXPos;
LONG lYPos; LONG lYPos;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALSURFCB_SETOVERLAYPOSITION SetOverlayPosition; LPDDHALSURFCB_SETOVERLAYPOSITION SetOverlayPosition;
} DDHAL_SETOVERLAYPOSITIONDATA; } DDHAL_SETOVERLAYPOSITIONDATA;
typedef struct _DDHAL_UPDATEOVERLAYDATA typedef struct _DDHAL_UPDATEOVERLAYDATA
{ {
LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DIRECTDRAW_GBL lpDD;
LPDDRAWI_DDRAWSURFACE_LCL lpDDDestSurface; LPDDRAWI_DDRAWSURFACE_LCL lpDDDestSurface;
RECTL rDest; RECTL rDest;
LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface; LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface;
RECTL rSrc; RECTL rSrc;
DWORD dwFlags; DWORD dwFlags;
DDOVERLAYFX overlayFX; DDOVERLAYFX overlayFX;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALSURFCB_UPDATEOVERLAY UpdateOverlay; LPDDHALSURFCB_UPDATEOVERLAY UpdateOverlay;
} DDHAL_UPDATEOVERLAYDATA; } DDHAL_UPDATEOVERLAYDATA;
typedef struct _DDHAL_WAITFORVERTICALBLANKDATA typedef struct _DDHAL_WAITFORVERTICALBLANKDATA
{ {
LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DIRECTDRAW_GBL lpDD;
DWORD dwFlags; DWORD dwFlags;
DWORD bIsInVB; DWORD bIsInVB;
ULONG_PTR hEvent; ULONG_PTR hEvent;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHAL_WAITFORVERTICALBLANK WaitForVerticalBlank; LPDDHAL_WAITFORVERTICALBLANK WaitForVerticalBlank;
} DDHAL_WAITFORVERTICALBLANKDATA; } DDHAL_WAITFORVERTICALBLANKDATA;
typedef struct _DDHAL_DRVSETCOLORKEYDATA typedef struct _DDHAL_DRVSETCOLORKEYDATA
@ -2011,11 +2011,11 @@ typedef struct _DDHAL_DRVSETCOLORKEYDATA
typedef struct _DDMONITORINFO typedef struct _DDMONITORINFO
{ {
WORD Manufacturer; WORD Manufacturer;
WORD Product; WORD Product;
DWORD SerialNumber; DWORD SerialNumber;
GUID DeviceIdentifier; GUID DeviceIdentifier;
int Mode640x480; int Mode640x480;
int Mode800x600; int Mode800x600;
int Mode1024x768; int Mode1024x768;
int Mode1280x1024; int Mode1280x1024;
@ -2035,25 +2035,25 @@ typedef struct _DDRAWI_DDRAWCLIPPER_INT
typedef struct _DDHAL_UPDATENONLOCALHEAPDATA typedef struct _DDHAL_UPDATENONLOCALHEAPDATA
{ {
LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DIRECTDRAW_GBL lpDD;
DWORD dwHeap; DWORD dwHeap;
FLATPTR fpGARTLin; FLATPTR fpGARTLin;
FLATPTR fpGARTDev; FLATPTR fpGARTDev;
ULONG_PTR ulPolicyMaxBytes; ULONG_PTR ulPolicyMaxBytes;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHAL_UPDATENONLOCALHEAP UpdateNonLocalHeap; LPDDHAL_UPDATENONLOCALHEAP UpdateNonLocalHeap;
} DDHAL_UPDATENONLOCALHEAPDATA; } DDHAL_UPDATENONLOCALHEAPDATA;
typedef struct _DDHAL_SETCLIPLISTDATA typedef struct _DDHAL_SETCLIPLISTDATA
{ {
LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DIRECTDRAW_GBL lpDD;
LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface;
HRESULT ddRVal; HRESULT ddRVal;
LPDDHALSURFCB_SETCLIPLIST SetClipList; LPDDHALSURFCB_SETCLIPLIST SetClipList;
} DDHAL_SETCLIPLISTDATA; } DDHAL_SETCLIPLISTDATA;
typedef struct _DDRAWI_DDMOTIONCOMP_LCL typedef struct _DDRAWI_DDMOTIONCOMP_LCL
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
GUID guid; GUID guid;
DWORD dwUncompWidth; DWORD dwUncompWidth;
@ -2082,58 +2082,58 @@ typedef struct _DDRAWI_DDMOTIONCOMP_INT
typedef struct _DDRAWI_DDVIDEOPORT_LCL typedef struct _DDRAWI_DDVIDEOPORT_LCL
{ {
LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DIRECTDRAW_LCL lpDD;
DDVIDEOPORTDESC ddvpDesc; DDVIDEOPORTDESC ddvpDesc;
DDVIDEOPORTINFO ddvpInfo; DDVIDEOPORTINFO ddvpInfo;
LPDDRAWI_DDRAWSURFACE_INT lpSurface; LPDDRAWI_DDRAWSURFACE_INT lpSurface;
LPDDRAWI_DDRAWSURFACE_INT lpVBISurface; LPDDRAWI_DDRAWSURFACE_INT lpVBISurface;
LPDDRAWI_DDRAWSURFACE_INT *lpFlipInts; LPDDRAWI_DDRAWSURFACE_INT *lpFlipInts;
DWORD dwNumAutoflip; DWORD dwNumAutoflip;
DWORD dwProcessID; DWORD dwProcessID;
DWORD dwStateFlags; DWORD dwStateFlags;
DWORD dwFlags; DWORD dwFlags;
DWORD dwRefCnt; DWORD dwRefCnt;
FLATPTR fpLastFlip; FLATPTR fpLastFlip;
ULONG_PTR dwReserved1; ULONG_PTR dwReserved1;
ULONG_PTR dwReserved2; ULONG_PTR dwReserved2;
HANDLE hDDVideoPort; HANDLE hDDVideoPort;
DWORD dwNumVBIAutoflip; DWORD dwNumVBIAutoflip;
LPDDVIDEOPORTDESC lpVBIDesc; LPDDVIDEOPORTDESC lpVBIDesc;
LPDDVIDEOPORTDESC lpVideoDesc; LPDDVIDEOPORTDESC lpVideoDesc;
LPDDVIDEOPORTINFO lpVBIInfo; LPDDVIDEOPORTINFO lpVBIInfo;
LPDDVIDEOPORTINFO lpVideoInfo; LPDDVIDEOPORTINFO lpVideoInfo;
DWORD dwVBIProcessID; DWORD dwVBIProcessID;
LPDDRAWI_DDVIDEOPORT_INT lpVPNotify; LPDDRAWI_DDVIDEOPORT_INT lpVPNotify;
} DDRAWI_DDVIDEOPORT_LCL; } DDRAWI_DDVIDEOPORT_LCL;
typedef struct _DDRAWI_DDVIDEOPORT_INT typedef struct _DDRAWI_DDVIDEOPORT_INT
{ {
LPVOID lpVtbl; LPVOID lpVtbl;
LPDDRAWI_DDVIDEOPORT_LCL lpLcl; LPDDRAWI_DDVIDEOPORT_LCL lpLcl;
LPDDRAWI_DDVIDEOPORT_INT lpLink; LPDDRAWI_DDVIDEOPORT_INT lpLink;
DWORD dwIntRefCnt; DWORD dwIntRefCnt;
DWORD dwFlags; DWORD dwFlags;
} DDRAWI_DDVIDEOPORT_INT; } DDRAWI_DDVIDEOPORT_INT;
typedef struct _DDRAWI_DDRAWCLIPPER_LCL typedef struct _DDRAWI_DDRAWCLIPPER_LCL
{ {
DWORD lpClipMore; DWORD lpClipMore;
LPDDRAWI_DDRAWCLIPPER_GBL lpGbl; LPDDRAWI_DDRAWCLIPPER_GBL lpGbl;
LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl;
DWORD dwLocalRefCnt; DWORD dwLocalRefCnt;
#ifndef _NO_COM #ifndef _NO_COM
IUnknown *pUnkOuter; IUnknown *pUnkOuter;
#else #else
PVOID *pUnkOuter; PVOID *pUnkOuter;
#endif #endif
LPDDRAWI_DIRECTDRAW_INT lpDD_int; LPDDRAWI_DIRECTDRAW_INT lpDD_int;
ULONG_PTR dwReserved1; ULONG_PTR dwReserved1;
#ifndef _NO_COM #ifndef _NO_COM
IUnknown * pAddrefedThisOwner; IUnknown * pAddrefedThisOwner;
#else #else
PVOID pAddrefedThisOwner; PVOID pAddrefedThisOwner;
#endif #endif
} DDRAWI_DDRAWCLIPPER_LCL; } DDRAWI_DDRAWCLIPPER_LCL;
@ -2141,18 +2141,18 @@ typedef struct _DDRAWI_DDRAWCLIPPER_LCL
typedef struct _DDRAWI_DDRAWCLIPPER_GBL typedef struct _DDRAWI_DDRAWCLIPPER_GBL
{ {
DWORD dwRefCnt; DWORD dwRefCnt;
DWORD dwFlags; DWORD dwFlags;
LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DIRECTDRAW_GBL lpDD;
DWORD dwProcessId; DWORD dwProcessId;
ULONG_PTR dwReserved1; ULONG_PTR dwReserved1;
ULONG_PTR hWnd; ULONG_PTR hWnd;
LPRGNDATA lpStaticClipList; LPRGNDATA lpStaticClipList;
} DDRAWI_DDRAWCLIPPER_GBL; } DDRAWI_DDRAWCLIPPER_GBL;
typedef BOOL (PASCAL *LPDDHEL_INIT)(LPDDRAWI_DIRECTDRAW_GBL,BOOL); typedef BOOL (PASCAL *LPDDHEL_INIT)(LPDDRAWI_DIRECTDRAW_GBL,BOOL);
extern HRESULT DDAPI extern HRESULT DDAPI
LateAllocateSurfaceMem( LateAllocateSurfaceMem(
LPDIRECTDRAWSURFACE lpSurface, LPDIRECTDRAWSURFACE lpSurface,
DWORD dwPleaseAllocType, DWORD dwPleaseAllocType,
@ -2186,12 +2186,12 @@ typedef DIRECTDRAWPALETTECALLBACKS FAR *LPDIRECTDRAWPALETTECALLBACKS;
typedef DIRECTDRAWSURFACECALLBACKS FAR *LPDIRECTDRAWSURFACECALLBACKS; typedef DIRECTDRAWSURFACECALLBACKS FAR *LPDIRECTDRAWSURFACECALLBACKS;
typedef DIRECTDRAWCALLBACKS FAR *LPDIRECTDRAWCALLBACKS; typedef DIRECTDRAWCALLBACKS FAR *LPDIRECTDRAWCALLBACKS;
HRESULT CALLBACK HRESULT CALLBACK
D3DParseUnknownCommand (LPVOID lpvCommands, D3DParseUnknownCommand (LPVOID lpvCommands,
LPVOID *lplpvReturnedCommand); LPVOID *lplpvReturnedCommand);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ /* extern "C" */
#endif #endif
#endif /* __DDRAWI_INCLUDED__ */ #endif /* __DDRAWI_INCLUDED__ */

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

@ -127,8 +127,8 @@
#include <windef.h> #include <windef.h>
#include <ks.h> #include <ks.h>
#include <drmk.h>
#include <punknown.h> #include <punknown.h>
#include <drmk.h>
/* TODO */ /* TODO */
#define PORTCLASSAPI EXTERN_C #define PORTCLASSAPI EXTERN_C

1
reactos/include/ddk/punknown.h
View file

@ -9,7 +9,6 @@
#define _UNKNOWN_H_ #define _UNKNOWN_H_
#include <windef.h> #include <windef.h>
//#include <ntddk.h>
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
#include <basetyps.h> #include <basetyps.h>

32
reactos/include/psdk/ks.h
View file

@ -1446,7 +1446,7 @@ typedef struct
/* =============================================================== /* ===============================================================
Device Dispatch Device Dispatch
*/ */
#if defined(_NTDDK_)
typedef struct typedef struct
{ {
/* TODO */ /* TODO */
@ -1508,12 +1508,12 @@ typedef struct _KSDEVICE_DISPATCH
PFNKSDEVICEQUERYPOWER Querypower; PFNKSDEVICEQUERYPOWER Querypower;
PFNKSDEVICESETPOWER SetPower; PFNKSDEVICESETPOWER SetPower;
} KSDEVICE_DISPATCH, *PKSDEVICE_DISPATCH; } KSDEVICE_DISPATCH, *PKSDEVICE_DISPATCH;
#endif
/* =============================================================== /* ===============================================================
Filter Dispatch Filter Dispatch
*/ */
#if defined(_NTDDK_)
typedef struct typedef struct
{ {
} KSFILTER, *PKSFILTER; } KSFILTER, *PKSFILTER;
@ -1568,11 +1568,11 @@ typedef struct
ULONG FilterDescriptorsCount; ULONG FilterDescriptorsCount;
const KSFILTER_DESCRIPTOR*const* FilterDescriptors; const KSFILTER_DESCRIPTOR*const* FilterDescriptors;
} KSDEVICE_DESCRIPTOR, *PKSDEVICE_DESCRIPTOR; } KSDEVICE_DESCRIPTOR, *PKSDEVICE_DESCRIPTOR;
#endif
/* =============================================================== /* ===============================================================
Minidriver Callbacks Minidriver Callbacks
*/ */
#if defined(_NTDDK_)
typedef NTSTATUS (*KStrMethodHandler)( typedef NTSTATUS (*KStrMethodHandler)(
IN PIRP Irp, IN PIRP Irp,
IN PKSIDENTIFIER Request, IN PKSIDENTIFIER Request,
@ -1582,12 +1582,12 @@ typedef NTSTATUS (*KStrSupportHandler)(
IN PIRP Irp, IN PIRP Irp,
IN PKSIDENTIFIER Request, IN PKSIDENTIFIER Request,
IN OUT PVOID Data); IN OUT PVOID Data);
#endif
/* =============================================================== /* ===============================================================
Allocator Functions Allocator Functions
*/ */
#if defined(_NTDDK_)
KSDDKAPI NTSTATUS NTAPI KSDDKAPI NTSTATUS NTAPI
KsCreateAllocator( KsCreateAllocator(
IN HANDLE ConnectionHandle, IN HANDLE ConnectionHandle,
@ -1617,12 +1617,12 @@ KsValidateAllocatorFramingEx(
IN PKSALLOCATOR_FRAMING_EX Framing, IN PKSALLOCATOR_FRAMING_EX Framing,
IN ULONG BufferSize, IN ULONG BufferSize,
IN const KSALLOCATOR_FRAMING_EX* PinFraming); IN const KSALLOCATOR_FRAMING_EX* PinFraming);
#endif
/* =============================================================== /* ===============================================================
Clock Functions Clock Functions
*/ */
#if defined(_NTDDK_)
typedef BOOLEAN (*PFNKSSETTIMER)( typedef BOOLEAN (*PFNKSSETTIMER)(
IN PVOID Context, IN PVOID Context,
IN PKTIMER Timer, IN PKTIMER Timer,
@ -1688,14 +1688,14 @@ KSDDKAPI VOID NTAPI
KsSetDefaultClockTime( KsSetDefaultClockTime(
IN PKSDEFAULTCLOCK DefaultClock, IN PKSDEFAULTCLOCK DefaultClock,
IN LONGLONG Time); IN LONGLONG Time);
#endif
/* =============================================================== /* ===============================================================
Method Functions Method Functions
*/ */
/* Method sets - TODO: Make into macros! */ /* Method sets - TODO: Make into macros! */
#if defined(_NTDDK_)
#if 0 #if 0
VOID VOID
KSMETHOD_SET_IRP_STORAGE( KSMETHOD_SET_IRP_STORAGE(
@ -1734,12 +1734,12 @@ KsFastMethodHandler(
OUT PIO_STATUS_BLOCK IoStatus, OUT PIO_STATUS_BLOCK IoStatus,
IN ULONG MethodSetsCount, IN ULONG MethodSetsCount,
IN const KSMETHOD_SET* MethodSet); IN const KSMETHOD_SET* MethodSet);
#endif
/* =============================================================== /* ===============================================================
Property Functions Property Functions
*/ */
#if defined(_NTDDK_)
KSDDKAPI NTSTATUS NTAPI KSDDKAPI NTSTATUS NTAPI
KsPropertyHandler( KsPropertyHandler(
IN PIRP Irp, IN PIRP Irp,
@ -1770,12 +1770,12 @@ KsFastPropertyHandler(
OUT PIO_STATUS_BLOCK IoStatus, OUT PIO_STATUS_BLOCK IoStatus,
IN ULONG PropertySetsCount, IN ULONG PropertySetsCount,
IN const KSPROPERTY_SET* PropertySet); IN const KSPROPERTY_SET* PropertySet);
#endif
/* =============================================================== /* ===============================================================
Event Functions Event Functions
*/ */
#if defined(_NTDDK_)
KSDDKAPI NTSTATUS NTAPI KSDDKAPI NTSTATUS NTAPI
KsGenerateEvent( KsGenerateEvent(
IN PKSEVENT_ENTRY EntryEvent); IN PKSEVENT_ENTRY EntryEvent);
@ -1823,7 +1823,7 @@ KsFreeEventList(
IN OUT PLIST_ENTRY EventsList, IN OUT PLIST_ENTRY EventsList,
IN KSEVENTS_LOCKTYPE EVentsFlags, IN KSEVENTS_LOCKTYPE EVentsFlags,
IN PVOID EventsLock); IN PVOID EventsLock);
#endif
/* =============================================================== /* ===============================================================
Topology Functions Topology Functions