marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d8: Don't assert on invalid IDirect3DBaseTexture8 interfaces.

oldstable
Rico Schüller 2013-04-14 16:53:37 +02:00 committed by Alexandre Julliard
parent e187c4aec2
commit 1486bdd99f
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/d3d8/texture.c
View File

@ -1155,9 +1155,20 @@ struct d3d8_texture *unsafe_impl_from_IDirect3DBaseTexture8(IDirect3DBaseTexture
{
if (!iface)
return NULL;
assert(iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DTexture8_Vtbl
|| iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DCubeTexture8_Vtbl
|| iface->lpVtbl == (const IDirect3DBaseTexture8Vtbl *)&Direct3DVolumeTexture8_Vtbl);
/* SetTexture() in particular doesn't do a lot of validation on the pointer
* that gets passed in, and passing an invalid pointer works as long as the
* application doesn't try to actually render anything with it, so we print
* a WARN and return NULL instead of having the usual assert() here.
* One application affected by this is Fishdom 2. */
if (iface->lpVtbl != (const IDirect3DBaseTexture8Vtbl *)&Direct3DTexture8_Vtbl
&& iface->lpVtbl != (const IDirect3DBaseTexture8Vtbl *)&Direct3DCubeTexture8_Vtbl
&& iface->lpVtbl != (const IDirect3DBaseTexture8Vtbl *)&Direct3DVolumeTexture8_Vtbl)
{
WARN("%p is not a valid IDirect3DBaseTexture8 interface.\n", iface);
return NULL;
}
return CONTAINING_RECORD(iface, struct d3d8_texture, IDirect3DBaseTexture8_iface);
}