April 2016 - Wine-Devel - list.winehq.org

Re: [PATCH 3/4] d3drm: Implement IDirect3DRM*_CreateTexture.

by Stefan Dösinger

> Am 28.04.2016 um 20:17 schrieb Aaryaman Vasishta <jem456.vasishta(a)gmail.com>: > > @@ -198,13 +198,24 @@ static HRESULT WINAPI d3drm1_CreateTexture(IDirect3DRM *iface, > struct d3drm_texture *object; > HRESULT hr; > > - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); > + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); > + > + if (!d3drm_validate_image(image)) > + return D3DRMERR_BADVALUE; > > if (FAILED(hr = d3drm_texture_create(&object))) > + { > + d3drm_texture_destroy(object); > return hr; > + } > + object->d3drm = iface; > + object->initialized = TRUE; > + object->image = image; > > *texture = &object->IDirect3DRMTexture_iface; > > + IDirect3DRM_AddRef(iface); > + > return D3DRM_OK; > } > Is there anything wrong with calling Texture3::InitFromImage here, or even calling IDirect3DRM3::CreateTexture? in D3DRM1::CreateTexture and D3DRM2::CreateTexture?

April 29, 2016

Re: [PATCH 2/4] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage.

by Stefan Dösinger

>> IDirect3DRM_AddRef(texture->d3drm); >> + >> + if (texture->image) >> + return D3DRMERR_BADOBJECT; > Afair the ref leak here is intentional. If it is, I think it's worth adding a comment. I just saw the other mails that Apple mail has been hiding from me... Still, a comment would be a good idea :-)

April 29, 2016

Re: [PATCH 2/4] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage.

by Stefan Dösinger

> Am 28.04.2016 um 20:17 schrieb Aaryaman Vasishta <jem456.vasishta(a)gmail.com>: > > + if (texture->d3drm && texture->initialized) > + IDirect3DRM_Release(texture->d3drm); I thought the idea was to use AddDestroyCallback instead of a flag to control the Release call. Do I remember this incorrectly, or what's the reason for going back to a flag? Also, what's the difference between image != NULL and initialized? Or, in a later stage when you have initFromTexture or what it is called, image != NULL || ddraw_texture != NULL? > IDirect3DRM_AddRef(texture->d3drm); > + > + if (texture->image) > + return D3DRMERR_BADOBJECT; Afair the ref leak here is intentional. If it is, I think it's worth adding a comment.

April 29, 2016

Re: [PATCH 2/2] ntdll: Fix prev_count from NtReleaseMutant

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=22715 Your paranoid android. === wvistau64 (32 bit om) === om.c:1913: Test failed: Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got c0000002 === w2008s64 (32 bit om) === om.c:1913: Test failed: Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got c0000002

April 29, 2016

Re: [PATCH 1/2] ntdll: Add NtQueryMutant

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=22714 Your paranoid android. === wvistau64 (32 bit om) === om.c:1913: Test failed: Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got c0000002 === w2008s64 (32 bit om) === om.c:1913: Test failed: Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got c0000002

April 29, 2016

Re: [PATCH 1/2] ntdll: Add NtQueryMutant

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=22713 Your paranoid android. === wvistau64 (32 bit om) === om.c:1913: Test failed: Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got c0000002 === w2008s64 (32 bit om) === om.c:1913: Test failed: Failed to NtQueryMutant, expected STATUS_INVALID_INFO_CLASS, got c0000002

April 29, 2016

Re: [PATCH 3/4] d3drm: Implement IDirect3DRM*_CreateTexture.

by Aaryaman Vasishta

Right, I'll send another patch to fix this. Cheers, Aaryaman On Friday, April 29, 2016, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > On 28.04.2016 21:17, Aaryaman Vasishta wrote: > > if (FAILED(hr = d3drm_texture_create(&object))) > > + { > > + d3drm_texture_destroy(object); > > return hr; > > + } > > I have not reviewed the whole series, but it looks like you are calling > d3drm_texture_destroy on an uninitialized variable here. > >

April 28, 2016

Re: [PATCH 2/4] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage.

by Aaryaman Vasishta

It does, but that's how Native behaves too. See the tests on this patch for more details. Cheers, Aaryaman On Friday, April 29, 2016, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > On 28.04.2016 21:17, Aaryaman Vasishta wrote: > > + IDirect3DRM_AddRef(texture->d3drm); > > + > > + if (texture->image) > > + return D3DRMERR_BADOBJECT; > > Doesn't this leak a reference in case of an error? ->initialized is not > set to TRUE yet. > >

April 28, 2016

Re: [PATCH 2/4] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage.

by Sebastian Lackner

On 28.04.2016 21:17, Aaryaman Vasishta wrote: > + IDirect3DRM_AddRef(texture->d3drm); > + > + if (texture->image) > + return D3DRMERR_BADOBJECT; Doesn't this leak a reference in case of an error? ->initialized is not set to TRUE yet.

April 28, 2016

Re: [PATCH 3/4] d3drm: Implement IDirect3DRM*_CreateTexture.

by Sebastian Lackner

On 28.04.2016 21:17, Aaryaman Vasishta wrote: > if (FAILED(hr = d3drm_texture_create(&object))) > + { > + d3drm_texture_destroy(object); > return hr; > + } I have not reviewed the whole series, but it looks like you are calling d3drm_texture_destroy on an uninitialized variable here.

April 28, 2016