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

[PATCH] Use todo_wine_if() in tests.

by Hugh McMaster

On Thursday, 12 May 2016, 04:55:54 CDT, Jacek Caban wrote: >Commit message should specify the module. > >Other than that: Signed-off-by: Jacek Caban <jacek at codeweavers.com> It's not clear which patch you're signing off on. They both have the same subject line. Hadrien (CC'd) also needs to add a Signed-Off-by line to his patches.

May 12, 2016

Re: dbghelp: add EnumerateLoadedModulesEx/EnumerateLoadedModulesExW stubs

by Nikolay Sivov

On 12.05.2016 0:32, Austin English wrote: > For https://bugs.winehq.org/show_bug.cgi?id=40614 > > @ stdcall EnumerateLoadedModules(long ptr ptr) > @ stdcall EnumerateLoadedModules64(long ptr ptr) > -@ stub EnumerateLoadedModulesEx > -@ stub EnumerateLoadedModulesExW > +@ stdcall EnumerateLoadedModulesEx(ptr ptr ptr) > +@ stdcall EnumerateLoadedModulesExW(ptr ptr ptr) For historical reasons first argument is usually made 'long', not that it matters. > +BOOL WINAPI EnumerateLoadedModulesExW(HANDLE process, > + PENUMLOADED_MODULES_CALLBACK64 callback, > + void *context) This prototype is wrong. Are those calls any different from EnumerateLoadedModulesW64/EnumerateLoadedModules64? It looks like we could simply forward to existing calls. Also please update headers.

May 12, 2016

Re: [PATCH] Use todo_wine_if() in tests.

by Jacek Caban

Commit message should specify the module. Other than that: Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

May 12, 2016

Re: [PATCH 3/6] d3drm: Implement IDirect3DRM*_CreateTexture. (v4)

by Henri Verbeet

On 11 May 2016 at 19:25, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > I just realized I can avoid calling d3drm_validate_image() there by just > returning D3DRMERR_BADVALUE if InitFromImage fails. Is that fine? > Yeah.

May 11, 2016

Re: [PATCH 3/6] d3drm: Implement IDirect3DRM*_CreateTexture. (v4)

by Aaryaman Vasishta

I just realized I can avoid calling d3drm_validate_image() there by just returning D3DRMERR_BADVALUE if InitFromImage fails. Is that fine? On Wed, May 11, 2016 at 10:53 PM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > Right, it's actually for the different return values, sorry to not mention > it earlier. > > Cheers, > Aaryaman > > > On Wed, May 11, 2016 at 10:16 PM, Henri Verbeet <hverbeet(a)gmail.com> > wrote: > >> On 11 May 2016 at 17:50, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> >> wrote: >> > If CreateTexture fails because of an invalid image, it doesn't leak a >> > reference to d3drm, unlike the InitFrom* calls. So I had to either do >> this, >> > or explicitly release texture->d3drm if InitFromImage fails. >> > >> That's not what the implementation in patch 2/6 does. It will leak if >> the texture is already initialised, but not when >> d3drm_validate_image() fails. >> > >

May 11, 2016

Re: [PATCH 3/6] d3drm: Implement IDirect3DRM*_CreateTexture. (v4)

by Aaryaman Vasishta

Right, it's actually for the different return values, sorry to not mention it earlier. Cheers, Aaryaman On Wed, May 11, 2016 at 10:16 PM, Henri Verbeet <hverbeet(a)gmail.com> wrote: > On 11 May 2016 at 17:50, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > wrote: > > If CreateTexture fails because of an invalid image, it doesn't leak a > > reference to d3drm, unlike the InitFrom* calls. So I had to either do > this, > > or explicitly release texture->d3drm if InitFromImage fails. > > > That's not what the implementation in patch 2/6 does. It will leak if > the texture is already initialised, but not when > d3drm_validate_image() fails. >

May 11, 2016

Re: [PATCH 3/6] d3drm: Implement IDirect3DRM*_CreateTexture. (v4)

by Henri Verbeet

On 11 May 2016 at 17:50, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > If CreateTexture fails because of an invalid image, it doesn't leak a > reference to d3drm, unlike the InitFrom* calls. So I had to either do this, > or explicitly release texture->d3drm if InitFromImage fails. > That's not what the implementation in patch 2/6 does. It will leak if the texture is already initialised, but not when d3drm_validate_image() fails.

May 11, 2016

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

by Aaryaman Vasishta

On Wed, May 11, 2016 at 9:13 PM, Henri Verbeet <hverbeet(a)gmail.com> wrote: > On 11 May 2016 at 16:43, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > wrote: > > @@ -46,10 +46,27 @@ static inline struct d3drm_texture > *impl_from_IDirect3DRMTexture3(IDirect3DRMTex > > > > void d3drm_texture_destroy(struct d3drm_texture *texture) > > { > > + if (texture->image) > > + IDirect3DRM_Release(texture->d3drm); > > > d3drm_object_cleanup((IDirect3DRMObject*)&texture->IDirect3DRMTexture3_iface, > &texture->obj); > It's somewhat hypothetical, but it seems safer to release the > IDirect3DRM interface after the d3drm_object_cleanup() call, in case > there are callbacks that (implicitly) depend on the Direct3DRM object > still existing. (E.g., is it possible to call > IDirect3DRMObject2::GetDirect3DRM() on textures?) > Right, it makes sense once you take in future pathces in mind. A quick test reveals that you it's possible to call IDirect3DRMObject2::GetDirect3DRM() on textures (and probably any object that inherits IDirect3DRMObject2) so this change does make sense for when this interface is implemented. I'll resent this patch as well. Cheers, Aaryaman

May 11, 2016

Re: [PATCH 1/6] d3drm: Introduce d3drm_texture_destroy helper (v2).

by Aaryaman Vasishta

Right, I didn't pay attention to d3drm_private.h while reviewing the commits :/ my bad. I'll resend this one. Cheers, Aaryaman On Wed, May 11, 2016 at 9:13 PM, Henri Verbeet <hverbeet(a)gmail.com> wrote: > On 11 May 2016 at 16:43, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > wrote: > > +void d3drm_texture_destroy(struct d3drm_texture *texture) > > +{ > > + > d3drm_object_cleanup((IDirect3DRMObject*)&texture->IDirect3DRMTexture3_iface, > &texture->obj); > > + HeapFree(GetProcessHeap(), 0, texture); > > +} > You're not using d3drm_texture_destroy() outside texture.c, so you > don't need the declaration in d3drm_private.h, and this should just be > static. > > >

May 11, 2016

Re: [PATCH 3/6] d3drm: Implement IDirect3DRM*_CreateTexture. (v4)

by Aaryaman Vasishta

If CreateTexture fails because of an invalid image, it doesn't leak a reference to d3drm, unlike the InitFrom* calls. So I had to either do this, or explicitly release texture->d3drm if InitFromImage fails. Cheers, Aaryaman On Wed, May 11, 2016 at 9:13 PM, Henri Verbeet <hverbeet(a)gmail.com> wrote: > On 11 May 2016 at 16:43, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > wrote: > > @@ -1152,15 +1156,21 @@ static HRESULT WINAPI > d3drm3_CreateAnimationSet(IDirect3DRM3 *iface, IDirect3DRM > > static HRESULT WINAPI d3drm3_CreateTexture(IDirect3DRM3 *iface, > > D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) > > { > > - 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 (FAILED(hr = d3drm_texture_create(&object))) > > + if (!d3drm_validate_image(image)) > > + return D3DRMERR_BADVALUE; > Why do you need the d3drm_validate_image() call? Purely for the error code? > > >

May 11, 2016