[PATCH v2] d3dx9: Correctly handle sprites array reallocation.
Matteo Bruni
mbruni at codeweavers.com
Mon Nov 23 10:14:04 CST 2020
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
v2: Fix allocated_sprites update (big fail on my part, thanks Henri!)
dlls/d3dx9_36/sprite.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c
index cd244e657ef..5499904da24 100644
--- a/dlls/d3dx9_36/sprite.c
+++ b/dlls/d3dx9_36/sprite.c
@@ -342,6 +342,7 @@ static HRESULT WINAPI d3dx9_sprite_Draw(ID3DXSprite *iface, IDirect3DTexture9 *t
const RECT *rect, const D3DXVECTOR3 *center, const D3DXVECTOR3 *position, D3DCOLOR color)
{
struct d3dx9_sprite *This = impl_from_ID3DXSprite(iface);
+ struct sprite *new_sprites;
D3DSURFACE_DESC texdesc;
TRACE("iface %p, texture %p, rect %s, center %p, position %p, color 0x%08x.\n",
@@ -357,9 +358,12 @@ static HRESULT WINAPI d3dx9_sprite_Draw(ID3DXSprite *iface, IDirect3DTexture9 *t
}
else if (This->allocated_sprites <= This->sprite_count)
{
- This->allocated_sprites += This->allocated_sprites / 2;
- This->sprites = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
- This->sprites, This->allocated_sprites * sizeof(*This->sprites));
+ new_sprites = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
+ This->sprites, This->allocated_sprites * 2 * sizeof(*This->sprites));
+ if (!new_sprites)
+ return E_OUTOFMEMORY;
+ This->sprites = new_sprites;
+ This->allocated_sprites *= 2;
}
This->sprites[This->sprite_count].texture=texture;
if(!(This->flags & D3DXSPRITE_DO_NOT_ADDREF_TEXTURE))
--
2.26.2
More information about the wine-devel
mailing list