[PATCH 4/5] d3d9: Don't assert on invalid IDirect3DBaseTexture9 interfaces.

Henri Verbeet hverbeet at gmail.com
Tue Aug 4 03:42:47 CDT 2015


On 4 August 2015 at 10:34, Stefan Dösinger <stefandoesinger at gmail.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Am 2015-08-04 um 08:53 schrieb Henri Verbeet:
>> +    texture->lpVtbl = (IDirect3DBaseTexture9Vtbl *)0xdeadbeef;
>> +    hr = IDirect3DDevice9_SetTexture(device, 0, texture);
>> +    ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr);
> I guess you're not testing GetTexture because it crashes when trying to
> AddRef the texture?
>
Yeah.

>> +    if (iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl
>> +            && iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl
>> +            && iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl)
>> +    {
>> +        WARN("%p is not a valid IDirect3DBaseTexture8 interface.\n", iface);
>> +        return NULL;
>> +    }
> Minor copypaste bug ("IDirect3DBaseTexture8").
Right, I did want the message to be similar to the d3d8 one, but not
that similar.



More information about the wine-devel mailing list