Stefan Dösinger : wined3d: Add WINED3DINDEXBUFFER_DESC to wined3dtypes.h.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 6cc87406cfe423178622d8d7d19a918ededeaa84
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=6cc87406cfe423178622d8d7d19a918ededeaa84

Author: Stefan Dösinger <stefandoesinger at gmx.at>
Date:   Tue Mar 14 23:14:40 2006 +0100

wined3d: Add WINED3DINDEXBUFFER_DESC to wined3dtypes.h.

---

 dlls/d3d8/indexbuffer.c          |    2 +-
 dlls/d3d9/indexbuffer.c          |    2 +-
 dlls/wined3d/device.c            |    2 +-
 dlls/wined3d/indexbuffer.c       |    2 +-
 include/wine/wined3d_interface.h |    2 +-
 include/wine/wined3d_types.h     |    8 ++++++++
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c
index 7d18a44..2f06cf9 100644
--- a/dlls/d3d8/indexbuffer.c
+++ b/dlls/d3d8/indexbuffer.c
@@ -126,7 +126,7 @@ HRESULT WINAPI IDirect3DIndexBuffer8Impl
 HRESULT  WINAPI        IDirect3DIndexBuffer8Impl_GetDesc(LPDIRECT3DINDEXBUFFER8 iface, D3DINDEXBUFFER_DESC *pDesc) {
     IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface;
     TRACE("(%p) Relay\n", This);
-    return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, pDesc);
+    return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, (WINED3DINDEXBUFFER_DESC *) pDesc);
 }
 
 
diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c
index 1b17ebd..5e5def0 100644
--- a/dlls/d3d9/indexbuffer.c
+++ b/dlls/d3d9/indexbuffer.c
@@ -127,7 +127,7 @@ HRESULT WINAPI IDirect3DIndexBuffer9Impl
 HRESULT  WINAPI        IDirect3DIndexBuffer9Impl_GetDesc(LPDIRECT3DINDEXBUFFER9 iface, D3DINDEXBUFFER_DESC *pDesc) {
     IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface;
     TRACE("(%p) Relay\n", This);
-    return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, pDesc);
+    return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, (WINED3DINDEXBUFFER_DESC *) pDesc);
 }
 
 
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index eab7fbf..84b7d14 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5024,7 +5024,7 @@ HRESULT  WINAPI  IWineD3DDeviceImpl_Draw
     IWineD3DDeviceImpl  *This = (IWineD3DDeviceImpl *)iface;
     UINT                 idxStride = 2;
     IWineD3DIndexBuffer *pIB;
-    D3DINDEXBUFFER_DESC  IdxBufDsc;
+    WINED3DINDEXBUFFER_DESC  IdxBufDsc;
 
     pIB = This->stateBlock->pIndexData;
     This->stateBlock->streamIsUP = FALSE;
diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c
index 834b79a..ffa55ce 100644
--- a/dlls/wined3d/indexbuffer.c
+++ b/dlls/wined3d/indexbuffer.c
@@ -116,7 +116,7 @@ HRESULT  WINAPI        IWineD3DIndexBuff
     TRACE("(%p) : stub\n", This);
     return D3D_OK;
 }
-HRESULT  WINAPI        IWineD3DIndexBufferImpl_GetDesc(IWineD3DIndexBuffer *iface, D3DINDEXBUFFER_DESC *pDesc) {
+HRESULT  WINAPI        IWineD3DIndexBufferImpl_GetDesc(IWineD3DIndexBuffer *iface, WINED3DINDEXBUFFER_DESC *pDesc) {
     IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface;
 
     TRACE("(%p)\n", This);
diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h
index 7739225..f1ff945 100644
--- a/include/wine/wined3d_interface.h
+++ b/include/wine/wined3d_interface.h
@@ -684,7 +684,7 @@ DECLARE_INTERFACE_(IWineD3DIndexBuffer,I
     /*** IWineD3DIndexBuffer methods ***/
     STDMETHOD(Lock)(THIS_ UINT  OffsetToLock, UINT  SizeToLock, BYTE ** ppbData, DWORD  Flags) PURE;
     STDMETHOD(Unlock)(THIS) PURE;
-    STDMETHOD(GetDesc)(THIS_ D3DINDEXBUFFER_DESC  * pDesc) PURE;
+    STDMETHOD(GetDesc)(THIS_ WINED3DINDEXBUFFER_DESC  * pDesc) PURE;
 };
 #undef INTERFACE
 
diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h
index 6b8a558..d5fe5f7 100644
--- a/include/wine/wined3d_types.h
+++ b/include/wine/wined3d_types.h
@@ -610,6 +610,14 @@ typedef struct _WINED3DVERTEXBUFFER_DESC
     DWORD                   FVF;
 } WINED3DVERTEXBUFFER_DESC;
 
+typedef struct _WINED3DINDEXBUFFER_DESC {
+    WINED3DFORMAT           Format;
+    WINED3DRESOURCETYPE     Type;
+    DWORD                   Usage;
+    D3DPOOL                 Pool;
+    UINT                    Size;
+} WINED3DINDEXBUFFER_DESC;
+
 /*
  * The wined3dcaps structure
  */