Henri Verbeet : wined3d: Rename IWineD3DDevice::GetIndices() to IWineD3DDevice::GetIndexBuffer().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c64da00de75840073d202f79dc8bdc552aa27f30
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c64da00de75840073d202f79dc...

Author: Henri Verbeet 
Date:   Fri Sep 25 13:31:46 2009 +0200

wined3d: Rename IWineD3DDevice::GetIndices() to IWineD3DDevice::GetIndexBuffer().

---

dlls/d3d8/device.c       |    2 +-
 dlls/d3d9/device.c       |    2 +-
 dlls/wined3d/device.c    |    5 +++--
 include/wine/wined3d.idl |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 1076b4e..9bdd016 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -2082,7 +2082,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetIndices(LPDIRECT3DDEVICE8 iface, I
     /* The case from UINT to INT is safe because d3d8 will never set negative values */
     wined3d_mutex_lock();
     IWineD3DDevice_GetBaseVertexIndex(This->WineD3DDevice, (INT *) pBaseVertexIndex);
-    rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData);
+    rc = IWineD3DDevice_GetIndexBuffer(This->WineD3DDevice, &retIndexData);
     if (SUCCEEDED(rc) && retIndexData) {
         IWineD3DBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData);
         IWineD3DBuffer_Release(retIndexData);
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 2ab4c4b..b0e7bbc 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1954,7 +1954,7 @@ static HRESULT  WINAPI  IDirect3DDevice9Impl_GetIndices(LPDIRECT3DDEVICE9EX ifac
     }

wined3d_mutex_lock();
-    rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData);
+    rc = IWineD3DDevice_GetIndexBuffer(This->WineD3DDevice, &retIndexData);
     if (SUCCEEDED(rc) && retIndexData) {
         IWineD3DBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData);
         IWineD3DBuffer_Release(retIndexData);
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 736d91f..9a8a594 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3100,7 +3100,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetIndexBuffer(IWineD3DDevice *iface,
     return WINED3D_OK;
 }

-static HRESULT WINAPI IWineD3DDeviceImpl_GetIndices(IWineD3DDevice *iface, IWineD3DBuffer** ppIndexData) {
+static HRESULT WINAPI IWineD3DDeviceImpl_GetIndexBuffer(IWineD3DDevice *iface, IWineD3DBuffer **ppIndexData)
+{
     IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;

*ppIndexData = This->stateBlock->pIndexData;
@@ -7396,7 +7397,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl =
     IWineD3DDeviceImpl_SetGammaRamp,
     IWineD3DDeviceImpl_GetGammaRamp,
     IWineD3DDeviceImpl_SetIndexBuffer,
-    IWineD3DDeviceImpl_GetIndices,
+    IWineD3DDeviceImpl_GetIndexBuffer,
     IWineD3DDeviceImpl_SetBaseVertexIndex,
     IWineD3DDeviceImpl_GetBaseVertexIndex,
     IWineD3DDeviceImpl_SetLight,
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index 854ce37..079f9f3 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -3122,7 +3122,7 @@ interface IWineD3DDevice : IWineD3DBase
         [in] IWineD3DBuffer *index_buffer,
         [in] WINED3DFORMAT format
     );
-    HRESULT GetIndices(
+    HRESULT GetIndexBuffer(
         [out] IWineD3DBuffer **index_buffer
     );
     HRESULT SetBaseVertexIndex(