Removed ddk/ddrawi.h because we have it twice, also removed some defines from ddrawin...

[reactos.git] / reactos / include / ddk / d3dhal.h

diff --git a/reactos/include/ddk/d3dhal.h b/reactos/include/ddk/d3dhal.h
index db1f0b7..d60fda2 100644 (file)
--- a/reactos/include/ddk/d3dhal.h
+++ b/reactos/include/ddk/d3dhal.h
@@ -26,7 +26,7 @@
 extern "C" {
 #endif
 
-#include <ddk\ddrawi.h>
+#include <ddrawi.h>
 #include <d3d.h>
 
 /*****************************************************************************
@@ -528,86 +528,6 @@ typedef struct _D3DHAL_VALIDATETEXTURESTAGESTATEDATA
     HRESULT         ddrval;
 } D3DHAL_VALIDATETEXTURESTAGESTATEDATA;
 
-/* FIXME: get definition for this */
-typedef DWORD D3DNTHAL_CONTEXTCREATEI;
-
-typedef D3DHAL_CONTEXTDESTROYDATA D3DNTHAL_CONTEXTDESTROYDATA;
-typedef D3DNTHAL_CONTEXTDESTROYDATA *LPD3DNTHAL_CONTEXTDESTROYDATA;
-typedef D3DHAL_VALIDATETEXTURESTAGESTATEDATA D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA;
-typedef D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA *LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA;
-typedef D3DHAL_DRAWPRIMITIVES2DATA D3DNTHAL_DRAWPRIMITIVES2DATA;
-typedef D3DNTHAL_DRAWPRIMITIVES2DATA *LPD3DNTHAL_DRAWPRIMITIVES2DATA;
-typedef DDHAL_GETDRIVERSTATEDATA DD_GETDRIVERSTATEDATA;
-typedef DD_GETDRIVERSTATEDATA *PDD_GETDRIVERSTATEDATA;
-typedef DDHAL_ADDATTACHEDSURFACEDATA DD_ADDATTACHEDSURFACEDATA;
-typedef DD_ADDATTACHEDSURFACEDATA *PDD_ADDATTACHEDSURFACEDATA;
-typedef DDHAL_BLTDATA DD_BLTDATA;
-typedef DD_BLTDATA *PDD_BLTDATA;
-typedef DDHAL_BEGINMOCOMPFRAMEDATA DD_BEGINMOCOMPFRAMEDATA;
-typedef DD_BEGINMOCOMPFRAMEDATA *PDD_BEGINMOCOMPFRAMEDATA;
-typedef DDHAL_CANCREATESURFACEDATA DD_CANCREATESURFACEDATA;
-typedef DD_CANCREATESURFACEDATA *PDD_CANCREATESURFACEDATA;
-typedef DDHAL_COLORCONTROLDATA DD_COLORCONTROLDATA;
-typedef DD_COLORCONTROLDATA *PDD_COLORCONTROLDATA;
-typedef DDRAWI_DDRAWSURFACE_GBL DD_SURFACE_GLOBAL;
-typedef DD_SURFACE_GLOBAL *PDD_SURFACE_GLOBAL;
-typedef DDHAL_CREATEMOCOMPDATA DD_CREATEMOCOMPDATA;
-typedef DD_CREATEMOCOMPDATA *PDD_CREATEMOCOMPDATA;
-typedef DDRAWI_DDRAWSURFACE_LCL DD_SURFACE_LOCAL;
-typedef DD_SURFACE_LOCAL *PDD_SURFACE_LOCAL;
-typedef DDRAWI_DDRAWSURFACE_MORE DD_SURFACE_MORE;
-typedef DD_SURFACE_MORE *PDD_SURFACE_MORE;
-typedef DDHAL_DESTROYMOCOMPDATA DD_DESTROYMOCOMPDATA;
-typedef DD_DESTROYMOCOMPDATA *PDD_DESTROYMOCOMPDATA;
-typedef DDHAL_ENDMOCOMPFRAMEDATA DD_ENDMOCOMPFRAMEDATA;
-typedef DD_ENDMOCOMPFRAMEDATA *PDD_ENDMOCOMPFRAMEDATA;
-typedef DDHAL_FLIPDATA DD_FLIPDATA;
-typedef DD_FLIPDATA *PDD_FLIPDATA;
-typedef DDHAL_FLIPTOGDISURFACEDATA DD_FLIPTOGDISURFACEDATA;
-typedef DD_FLIPTOGDISURFACEDATA *PDD_FLIPTOGDISURFACEDATA;
-typedef DDHAL_GETAVAILDRIVERMEMORYDATA DD_GETAVAILDRIVERMEMORYDATA;
-typedef DD_GETAVAILDRIVERMEMORYDATA *PDD_GETAVAILDRIVERMEMORYDATA;
-typedef DDHAL_GETBLTSTATUSDATA DD_GETBLTSTATUSDATA;
-typedef DD_GETBLTSTATUSDATA *PDD_GETBLTSTATUSDATA;
-typedef DDHAL_GETDRIVERINFODATA DD_GETDRIVERINFODATA;
-typedef DD_GETDRIVERINFODATA *PDD_GETDRIVERINFODATA;
-typedef DDHAL_GETFLIPSTATUSDATA DD_GETFLIPSTATUSDATA;
-typedef DD_GETFLIPSTATUSDATA *PDD_GETFLIPSTATUSDATA;
-typedef DDHAL_GETINTERNALMOCOMPDATA DD_GETINTERNALMOCOMPDATA;
-typedef DD_GETINTERNALMOCOMPDATA *PDD_GETINTERNALMOCOMPDATA;
-typedef DDHAL_GETMOCOMPCOMPBUFFDATA DD_GETMOCOMPCOMPBUFFDATA;
-typedef DD_GETMOCOMPCOMPBUFFDATA *PDD_GETMOCOMPCOMPBUFFDATA;
-typedef DDHAL_GETMOCOMPGUIDSDATA DD_GETMOCOMPGUIDSDATA;
-typedef DD_GETMOCOMPGUIDSDATA *PDD_GETMOCOMPGUIDSDATA;
-typedef DDHAL_GETMOCOMPFORMATSDATA DD_GETMOCOMPFORMATSDATA;
-typedef DD_GETMOCOMPFORMATSDATA *PDD_GETMOCOMPFORMATSDATA;
-typedef DDHAL_GETSCANLINEDATA DD_GETSCANLINEDATA;
-typedef DD_GETSCANLINEDATA *PDD_GETSCANLINEDATA;
-typedef DDHAL_LOCKDATA DD_LOCKDATA;
-typedef DD_LOCKDATA *PDD_LOCKDATA;
-typedef DDHALINFO DD_HALINFO;
-typedef DDHAL_QUERYMOCOMPSTATUSDATA DD_QUERYMOCOMPSTATUSDATA;
-typedef DD_QUERYMOCOMPSTATUSDATA *PDD_QUERYMOCOMPSTATUSDATA;
-typedef DDHAL_RENDERMOCOMPDATA DD_RENDERMOCOMPDATA;
-typedef DD_RENDERMOCOMPDATA *PDD_RENDERMOCOMPDATA;
-typedef DDHAL_SETCOLORKEYDATA DD_SETCOLORKEYDATA;
-typedef DD_SETCOLORKEYDATA *PDD_SETCOLORKEYDATA;
-typedef DDHAL_SETEXCLUSIVEMODEDATA DD_SETEXCLUSIVEMODEDATA;
-typedef DD_SETEXCLUSIVEMODEDATA *PDD_SETEXCLUSIVEMODEDATA;
-typedef DDHAL_SETOVERLAYPOSITIONDATA DD_SETOVERLAYPOSITIONDATA;
-typedef DD_SETOVERLAYPOSITIONDATA *PDD_SETOVERLAYPOSITIONDATA;
-typedef DDHAL_UNLOCKDATA DD_UNLOCKDATA;
-typedef DD_UNLOCKDATA *PDD_UNLOCKDATA;
-typedef DDHAL_CREATESURFACEDATA DD_CREATESURFACEDATA;
-typedef DD_CREATESURFACEDATA *LPDD_CREATESURFACEDATA;
-typedef DDHAL_UPDATEOVERLAYDATA DD_UPDATEOVERLAYDATA;
-typedef DD_UPDATEOVERLAYDATA *PDD_UPDATEOVERLAYDATA;
-typedef DDHAL_WAITFORVERTICALBLANKDATA DD_WAITFORVERTICALBLANKDATA;
-typedef DD_WAITFORVERTICALBLANKDATA *PDD_WAITFORVERTICALBLANKDATA;
-typedef D3DHAL_CALLBACKS D3DNTHAL_CALLBACKS;
-typedef D3DNTHAL_CALLBACKS *LPD3DNTHAL_CALLBACKS;
-typedef D3DHAL_GLOBALDRIVERDATA D3DNTHAL_GLOBALDRIVERDATA;
-typedef D3DNTHAL_GLOBALDRIVERDATA *LPD3DNTHAL_GLOBALDRIVERDATA;
 #ifdef __cplusplus
 } /* extern "C" */
 #endif