Re: [PATCH 2/6] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage. (v3)

[Stefan Dösinger]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256



Am 2016-05-08 um 11:31 schrieb Aaryaman Vasishta:
> +    hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
> +    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %x.\n", hr);
> +    /* Release leaked reference to d3drm1 */
> +    IDirect3DRM_Release(d3drm1);
> I think it's a good idea to explicitly test the increased refcount
> after this failing call.
> +    if (!image
> +            || !image->rgb
> +            || !image->red_mask
> +            || !image->green_mask
> +            || !image->blue_mask
> +            || !image->buffer1)
> +    {
> +        return FALSE;
> +    }
> I guess that there's some way to pass palletized images, e.g. by
> setting rgb = 0, palette_size != 0 and palette != NULL. This shouldn't
> be part of this patch though and I am fine with this code as it is.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJXL2SsAAoJEN0/YqbEcdMwkCQP/iPRJdsglD3on0uzy9v8iQo9
g0BexNDM4r1AtZASW9yp6dNRLY1oX15dTSM6GjdNlNFGp7jQRVJcJ6X71CJt4EEi
oGWtq774F46ewtTjcufP/TOfOed6k6tv/qe6IKRn2rnI7CyusM124jIP4CYZfAlW
dk48LOKp9G9kzF3loa6Cx4Eoxmy1jAfXJ5v/ERGqgU/wHwT8Vaim+5URIglfPq0H
OUG++D6WTacsh1RWGZaeQqLAVq2zlc5YxNNsgJ7iJcd7DG1EYg6hOFFHebwp5FQP
Jq6Dipy1GGB4q+Zt/ygb6HwWsv36taLMVn2erEL2RG6O88QxmM+P3VyxTBNdWKQc
65SHOcq0NjLhT6sO4SSfm5lEsWDBxftzbUuSg9NngrZjmLBa4pfreckYhA+N/p2Y
Jd1GBtpvO7w5XTOLYoHWvco2rrRVCmJan/Q/XAensQyFBkkt7+S8Rjjo7KcT1avF
Lv7WQqg+2HTHJbiiSp13BsoNZQaDZaDEaINsBv56B+LJjBKf3EwJLCZXpRRN3p0v
ByLGPYr7QS3NrukltC9Zb3ZEf2FWBtB8mDBYjh5sHmquujAwlZx85HdaqFEi9ZCb
tIzD3O8yO4k5rwM/+fClBLHmeTUEemnG1LrwxgvOR2pAq6/mK67clDmOZJ4CSBBt
YjYtXXnjuSBzcnvnvp3J
=KSDQ
-----END PGP SIGNATURE-----

[PATCH 2/6] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage. (v3)

[Aaryaman Vasishta]

On Sun, May 8, 2016 at 9:39 PM, Stefan Dösinger <stefandoesinger(a)gmx.at>
wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Am 2016-05-08 um 11:31 schrieb Aaryaman Vasishta:
> > +    hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg);
> > +    ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT,
> > got %x.\n", hr);
> > +    /* Release leaked reference to d3drm1 */
> > +    IDirect3DRM_Release(d3drm1);
> > I think it's a good idea to explicitly test the increased refcount
> > after this failing call.

The refcount tests which happen following the leak do (indirectly) test the
increased refcount. If I hadn't released d3drm1 here, the following
refcount tests would fail.
> > +    if (!image
> > +            || !image->rgb
> > +            || !image->red_mask
> > +            || !image->green_mask
> > +            || !image->blue_mask
> > +            || !image->buffer1)
> > +    {
> > +        return FALSE;
> > +    }
> > I guess that there's some way to pass palletized images, e.g. by
> > setting rgb = 0, palette_size != 0 and palette != NULL. This shouldn't
> > be part of this patch though and I am fine with this code as it is.

Agreed, that also needs to be tested. I'll add that test in this patch and
rework this function.

Cheers,
Aaryaman