ddrawi.h patch

[Ove Kaaven]

Log:
Ove Kaaven <ovek at transgaming.com>
Yet more stuff for ddrawi.h, including some GetDriverInfo GUIDs.

Index: wine/include/ddrawi.h
diff -u wine/include/ddrawi.h:1.1.1.2 wine/include/ddrawi.h:1.7
--- wine/include/ddrawi.h:1.1.1.2	Tue Mar 20 00:36:39 2001
+++ wine/include/ddrawi.h	Sat Mar 31 11:49:08 2001
@@ -73,6 +73,22 @@
 typedef struct _DDRAWI_DDMOTIONCOMP_INT *LPDDRAWI_DDMOTIONCOMP_INT;
 typedef struct _DDRAWI_DDMOTIONCOMP_LCL *LPDDRAWI_DDMOTIONCOMP_LCL;
 
+/* structure GUIDs for GetDriverInfo */
+DEFINE_GUID( GUID_MiscellaneousCallbacks,	0xEFD60CC0,0x49E7,0x11D0,0x88,0x9D,0x00,0xAA,0x00,0xBB,0xB7,0x6A );
+/* ...videport stuff here... */
+DEFINE_GUID( GUID_D3DCallbacks2,		0x0BA584E1,0x70B6,0x11D0,0x88,0x9D,0x00,0xAA,0x00,0xBB,0xB7,0x6A );
+DEFINE_GUID( GUID_D3DCallbacks3,		0xDDF41230,0xEC0A,0x11D0,0xA9,0xB6,0x00,0xAA,0x00,0xC0,0x99,0x3E );
+DEFINE_GUID( GUID_NonLocalVidMemCaps,		0x86C4FA80,0x8D84,0x11D0,0x94,0xE8,0x00,0xC0,0x4F,0xC3,0x41,0x37 );
+/* ...kernel stuff here... */
+DEFINE_GUID( GUID_D3DExtendedCaps,		0x7DE41F80,0x9D93,0x11D0,0x89,0xAB,0x00,0xA0,0xC9,0x05,0x41,0x29 );
+DEFINE_GUID( GUID_ZPixelFormats,		0x93869880,0x36CF,0x11D1,0x9B,0x1B,0x00,0xAA,0x00,0xBB,0xB8,0xAE );
+DEFINE_GUID( GUID_DDMoreSurfaceCaps,		0x3B8A0466,0xF269,0x11D1,0x88,0x0B,0x00,0xC0,0x4F,0xD9,0x30,0xC5 );
+DEFINE_GUID( GUID_DDStereoMode,			0xF828169C,0xA8E8,0x11D2,0xA1,0xF2,0x00,0xA0,0xC9,0x83,0xEA,0xF6 );
+/* ...more stuff here... */
+DEFINE_GUID(GUID_D3DParseUnknownCommandCallback,0x2E04FFA0,0x98E4,0x11D1,0x8C,0xE1,0x00,0xA0,0xC9,0x06,0x29,0xA8 );
+/* ...motioncomp stuff here... */
+DEFINE_GUID( GUID_Miscellaneous2Callbacks,	0x406B2F00,0x3E5A,0x11D1,0xB6,0x40,0x00,0xAA,0x00,0xA1,0xF9,0x6A );
+
 /*****************************************************************************
  * driver->ddraw callbacks
  */
@@ -219,9 +235,9 @@
     DWORD	dwSSBCKeyCaps;
     DWORD	dwSSBFXCaps;
     DWORD	dwSSBRops[DD_ROP_SPACE];
-    DWORD       dwMaxVideoPorts;
-    DWORD   	dwCurrVideoPorts;
-    DWORD   	dwSVBCaps2;
+    DWORD	dwMaxVideoPorts;
+    DWORD	dwCurrVideoPorts;
+    DWORD	dwSVBCaps2;
 } DDCORECAPS,*LPDDCORECAPS;
 
 typedef struct _DDNONLOCALVIDMEMCAPS {
@@ -239,6 +255,10 @@
     DWORD	dwCaps4;
 } DDSCAPSEX,*LPDDSCAPSEX;
 
+#define DDSCAPS_EXECUTEBUFFER	DDSCAPS_RESERVED2
+#define DDSCAPS2_VERTEXBUFFER	DDSCAPS2_RESERVED1
+#define DDSCAPS2_COMMANDBUFFER	DDSCAPS2_RESERVED2
+
 /*****************************************************************************
  * ddraw->driver callbacks
  */
@@ -344,7 +364,7 @@
     LPDDHALPALCB_SETENTRIES		SetEntries;
 } DDHAL_DDPALETTECALLBACKS,*LPDDHAL_DDPALETTECALLBACKS;
 
-typedef DWORD PASCAL (*LPDDHALEXEBUFCB_CANCREATEEXEBUF)(LPDDHAL_CANCREATESURFACEDATA );
+typedef DWORD PASCAL (*LPDDHALEXEBUFCB_CANCREATEEXEBUF)(LPDDHAL_CANCREATESURFACEDATA);
 typedef DWORD PASCAL (*LPDDHALEXEBUFCB_CREATEEXEBUF)   (LPDDHAL_CREATESURFACEDATA);
 typedef DWORD PASCAL (*LPDDHALEXEBUFCB_DESTROYEXEBUF)  (LPDDHAL_DESTROYSURFACEDATA);
 typedef DWORD PASCAL (*LPDDHALEXEBUFCB_LOCKEXEBUF)     (LPDDHAL_LOCKDATA);
@@ -360,6 +380,40 @@
     LPDDHALEXEBUFCB_UNLOCKEXEBUF	UnlockExecuteBuffer;
 } DDHAL_DDEXEBUFCALLBACKS,*LPDDHAL_DDEXEBUFCALLBACKS;
 
+typedef struct _DDHAL_GETAVAILDRIVERMEMORYDATA	*LPDDHAL_GETAVAILDRIVERMEMORYDATA;
+typedef struct _DDHAL_UPDATENONLOCALHEAPDATA	*LPDDHAL_UPDATENONLOCALHEAPDATA;
+typedef struct _DDHAL_GETHEAPALIGNMENTDATA	*LPDDHAL_GETHEAPALIGNMENTDATA;
+
+typedef DWORD PASCAL (*LPDDHAL_GETAVAILDRIVERMEMORY)(LPDDHAL_GETAVAILDRIVERMEMORYDATA);
+typedef DWORD PASCAL (*LPDDHAL_UPDATENONLOCALHEAP)  (LPDDHAL_UPDATENONLOCALHEAPDATA);
+typedef DWORD PASCAL (*LPDDHAL_GETHEAPALIGNMENT)    (LPDDHAL_GETHEAPALIGNMENTDATA);
+
+typedef struct _DDHAL_DDMISCELLANEOUSCALLBACKS {
+    DWORD				dwSize;
+    DWORD				dwFlags;
+    LPDDHAL_GETAVAILDRIVERMEMORY	GetAvailDriverMemory;
+    LPDDHAL_UPDATENONLOCALHEAP		UpdateNonLocalHeap;
+    LPDDHAL_GETHEAPALIGNMENT		GetHeapAlignment;
+    LPDDHALSURFCB_GETBLTSTATUS		GetSysmemBltStatus;
+} DDHAL_DDMISCELLANEOUSCALLBACKS,*LPDDHAL_DDMISCELLANEOUSCALLBACKS;
+
+typedef struct _DDHAL_CREATESURFACEEXDATA	*LPDDHAL_CREATESURFACEEXDATA;
+typedef struct _DDHAL_GETDRIVERSTATEDATA	*LPDDHAL_GETDRIVERSTATEDATA;
+typedef struct _DDHAL_DESTROYDDLOCALDATA	*LPDDHAL_DESTROYDDLOCALDATA;
+
+typedef DWORD PASCAL (*LPDDHAL_CREATESURFACEEX)(LPDDHAL_CREATESURFACEEXDATA);
+typedef DWORD PASCAL (*LPDDHAL_GETDRIVERSTATE) (LPDDHAL_GETDRIVERSTATEDATA);
+typedef DWORD PASCAL (*LPDDHAL_DESTROYDDLOCAL) (LPDDHAL_DESTROYDDLOCALDATA);
+
+typedef struct _DDHAL_DDMISCELLANEOUS2CALLBACKS {
+    DWORD				dwSize;
+    DWORD				dwFlags;
+    LPVOID				Reserved;
+    LPDDHAL_CREATESURFACEEX		CreateSurfaceEx;
+    LPDDHAL_GETDRIVERSTATE		GetDriverState;
+    LPDDHAL_DESTROYDDLOCAL		DestroyDDLocal;
+} DDHAL_DDMISCELLANEOUS2CALLBACKS,*LPDDHAL_DDMISCELLANEOUS2CALLBACKS;
+
 typedef HRESULT WINAPI (*LPDDGAMMACALIBRATORPROC)(LPDDGAMMARAMP, LPBYTE);
 
 /*****************************************************************************
@@ -473,6 +527,17 @@
     LPDDHALSURFCB_DESTROYSURFACE DestroySurface;
 } DDHAL_DESTROYSURFACEDATA;
 
+typedef struct _DDHAL_FLIPDATA {
+    LPDDRAWI_DIRECTDRAW_GBL	lpDD;
+    LPDDRAWI_DDRAWSURFACE_LCL	lpSurfCurr;
+    LPDDRAWI_DDRAWSURFACE_LCL	lpSurfTarg;
+    DWORD			dwFlags;
+    HRESULT			ddRVal;
+    LPDDHALSURFCB_FLIP		Flip;
+    LPDDRAWI_DDRAWSURFACE_LCL	lpSurfCurrLeft;
+    LPDDRAWI_DDRAWSURFACE_LCL	lpSurfTargLeft;
+} DDHAL_FLIPDATA;
+
 typedef struct _DDHAL_BLTDATA {
     LPDDRAWI_DIRECTDRAW_GBL	lpDD;
     LPDDRAWI_DDRAWSURFACE_LCL	lpDDDestSurface;
@@ -819,7 +884,29 @@
     DWORD			dwMipMapCount;
     LPDDRAWI_DDRAWCLIPPER_INT	lpDDIClipper;
     /* DirectX 5.0 */
-    /* more... */
+    LPHEAPALIASINFO		lpHeapAliasInfo;
+    DWORD			dwOverlayFlags;
+    VOID			*rgjunc;
+    LPDDRAWI_DDVIDEOPORT_LCL	lpVideoPort;
+    LPDDOVERLAYFX		lpddOverlayFX;
+    DDSCAPSEX			ddsCapsEx;
+    DWORD			dwTextureStage;
+    LPVOID			lpDDRAWReserved;
+    LPVOID			lpDDRAWReserved2;
+    LPVOID			lpDDrawReserved3;
+    DWORD			dwDDrawReserved4;
+    LPVOID			lpDDrawReserved5;
+    LPDWORD			lpGammaRamp;
+    LPDWORD			lpOriginalGammaRamp;
+    LPVOID			lpDDrawReserved6;
+    DWORD			dwSurfaceHandle;
+    DWORD			qwDDrawReserved8[2];
+    LPVOID			lpDDrawReserved9;
+    DWORD			cSurfaces;
+    LPDDSURFACEDESC2		pCreatedDDSurfaceDesc2;
+    LPDDRAWI_DDRAWSURFACE_LCL	*slist;
+    DWORD			dwFVF;
+    LPVOID			lpVB;
 } DDRAWI_DDRAWSURFACE_MORE;
 
 typedef struct _DDRAWI_DDRAWSURFACE_LCL {