Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Correctly handle sprites array reallocation.

Browse source 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 34c0055cfcb84e32d13556b7ec841d01acf5fe96 by Matteo Bruni <mbruni@codeweavers.com>
This commit is contained in:
winesync 2021-01-05 13:16:39 +01:00 • committed by Jérôme Gardou
parent d7f9f9f6e8
commit 1f6645eb19
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dll/directx/wine/d3dx9_36/sprite.c
View file

@ -346,6 +346,7 @@ static HRESULT WINAPI d3dx9_sprite_Draw(ID3DXSprite *iface, IDirect3DTexture9 *t
const RECT *rect, const D3DXVECTOR3 *center, const D3DXVECTOR3 *position, D3DCOLOR color) const RECT *rect, const D3DXVECTOR3 *center, const D3DXVECTOR3 *position, D3DCOLOR color)
{ {
struct d3dx9_sprite *This = impl_from_ID3DXSprite(iface); struct d3dx9_sprite *This = impl_from_ID3DXSprite(iface);
struct sprite *new_sprites;
D3DSURFACE_DESC texdesc; D3DSURFACE_DESC texdesc;
TRACE("iface %p, texture %p, rect %s, center %p, position %p, color 0x%08x.\n", TRACE("iface %p, texture %p, rect %s, center %p, position %p, color 0x%08x.\n",
@ -361,9 +362,12 @@ static HRESULT WINAPI d3dx9_sprite_Draw(ID3DXSprite *iface, IDirect3DTexture9 *t
} }
else if (This->allocated_sprites <= This->sprite_count) else if (This->allocated_sprites <= This->sprite_count)
{ {
This->allocated_sprites += This->allocated_sprites / 2; new_sprites = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
This->sprites = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->sprites, This->allocated_sprites * 2 * sizeof(*This->sprites));
This->sprites, This->allocated_sprites * sizeof(*This->sprites)); if (!new_sprites)
return E_OUTOFMEMORY;
This->sprites = new_sprites;
This->allocated_sprites *= 2;
} }
This->sprites[This->sprite_count].texture=texture; This->sprites[This->sprite_count].texture=texture;
if(!(This->flags & D3DXSPRITE_DO_NOT_ADDREF_TEXTURE)) if(!(This->flags & D3DXSPRITE_DO_NOT_ADDREF_TEXTURE))

2
sdk/tools/winesync/d3dx9.cfg
View file

@ -34,4 +34,4 @@ files:
include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h
include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h
tags: tags:
wine: a097f54ea1e7e75b78842ceb835f5db5f08fea06 wine: 34c0055cfcb84e32d13556b7ec841d01acf5fe96