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

[Stefan Dösinger]

-----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?
> - 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").
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJVwHkaAAoJEN0/YqbEcdMwAykP/3XM3HslUzcvJ+d5Jz59febN
pBoVG5dJO0uboxYAjuv1Fj6Ft9+CWvcSOva6Oo1cnwV06ojY82oFC5XIQp+UB9xQ
nU+T8In0b5IPX82uTSEM6k/uVE3Yycc41DmvD1/VxF29el64Oifn1afOcAg7TRAV
f93+yR464vBzx7esXRpXkF5X1xvmsW1LtnJe3Z1uHqNMiZwixn9M33kuceMz0ZqD
H9o8Hxn1sESurxR/2cEZFFzHne36l067NY2/HsJ9yeBk90zay+99iojMcWCLhhF2
CHj6xynbxWZCGFSRQM29HtCt/P5nl6lrg/jXeFY8AwmAf0n9NMBOyxqb8c7BVFx/
bSO75oPiyHS8xzBxdgqCuJka18QlTuy40UwNwQTU6TckcHl+MyezthLKAFSRV42i
zGjcV0S725bQWy2/S4ep+fuxWaJNT5JKULvcqQxHDo3h/NBLyvHI+fNXMhZGJWdH
Z1Xl2lGhoihIieu+2Xo5Jt+ghuecs8RQYIfamsYGQJDIuyovE8PAKGoPy/S+CzyN
ypOPjXwhDTEIJpMm0/Gaxc49FkjbHiLjcevJS6wRP5JQJzIrKy94SwPCIhRiQoj7
dLgsiPAppEGLgkhFTQ1DcYvkS4UcPMlN8K0dmcXFiMWgzmfeKm2gnZ9+2p2WfhZf
5FGMz4ENg5TuWxay3YRj
=4SY2
-----END PGP SIGNATURE-----

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

[Henri Verbeet]

On 4 August 2015 at 10:34, Stefan Dösinger  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.