ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "d3d: Remove AddRef from IWineD3DDevice_GetIndices.". 

This reverts commit 5c4008719c.
This commit is contained in:
Markus Amsler 2006-11-30 13:33:18 +01:00 committed by Alexandre Julliard
parent c40501db50
commit 9dd81f64cb
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/d3d8/device.c
View File

@ -1311,6 +1311,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetIndices(LPDIRECT3DDEVICE8 iface, I
rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData, &tmp); rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData, &tmp);
if (D3D_OK == rc && NULL != retIndexData) { if (D3D_OK == rc && NULL != retIndexData) {
IWineD3DVertexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); IWineD3DVertexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData);
IWineD3DVertexBuffer_Release(retIndexData);
} else { } else {
if(rc != D3D_OK) FIXME("Call to GetIndices failed\n"); if(rc != D3D_OK) FIXME("Call to GetIndices failed\n");
*ppIndexData = NULL; *ppIndexData = NULL;

1
dlls/d3d9/device.c
View File

@ -833,6 +833,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(LPDIRECT3DDEVICE9 iface,
rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData, &tmp); rc = IWineD3DDevice_GetIndices(This->WineD3DDevice, &retIndexData, &tmp);
if (rc == D3D_OK && NULL != retIndexData) { if (rc == D3D_OK && NULL != retIndexData) {
IWineD3DVertexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData); IWineD3DVertexBuffer_GetParent(retIndexData, (IUnknown **)ppIndexData);
IWineD3DVertexBuffer_Release(retIndexData);
}else{ }else{
if(rc != D3D_OK) FIXME("Call to GetIndices failed\n"); if(rc != D3D_OK) FIXME("Call to GetIndices failed\n");
*ppIndexData = NULL; *ppIndexData = NULL;

2
dlls/wined3d/device.c
View File

@ -3244,7 +3244,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetIndices(IWineD3DDevice *iface, IWine
*ppIndexData = This->stateBlock->pIndexData; *ppIndexData = This->stateBlock->pIndexData;
/* up ref count on ppindexdata */
if (*ppIndexData) { if (*ppIndexData) {
IWineD3DIndexBuffer_AddRef(*ppIndexData);
*pBaseVertexIndex = This->stateBlock->baseVertexIndex; *pBaseVertexIndex = This->stateBlock->baseVertexIndex;
TRACE("(%p) index data set to %p + %u\n", This, ppIndexData, This->stateBlock->baseVertexIndex); TRACE("(%p) index data set to %p + %u\n", This, ppIndexData, This->stateBlock->baseVertexIndex);
}else{ }else{