March 2015 - Wine-Devel - list.winehq.org

Re: [PATCH 4/4] d3drm/tests: Add QueryInterface tests for IDirect3DRMFrame3

by Stefan Dösinger

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi again, Am 2015-03-31 um 23:44 schrieb Stefan Dösinger: > I'll do a few experiments with these interfaces myself. I am still > a bit puzzled by IDirect3DRMObject(2), and in particular the Clone > method, which apparently allows these objects to be aggregated. I've satisfied my curiosity for now. It seems that IDirect3DRMObject::Clone always returns a new object. When the UnkOuter parameter is NULL this is relatively straightforward. It gets funny when aggregation is used: The only way the caller can get his hands on the inner IUnknown is to pass IID_IUnknown as iid parameter. If the caller passes anything else there's no way he can release the inner object once his outer object is destroyed. I checked the theory that the inner object destroys itself when the outer unknown's Release method returns 0. This is not the case. It would be a fairly shaky setup after all - maybe the final Release call is called on one of the outer object's vtables directly, rather than through an inner vtable. Finding out whether the clone is a deep copy or not is left as your exercise. Also, no guarantees that my findings are complete or free of errors. What does this mean for your patches? Since you're not implementing Clone() for now not too much. Please port the tests to d3drm1 and 2 and add tests for which interface pointer is returned when IDirect3DRMObject, IDirect3DRMVisual and IUnknown are queried. Properly testing all the details of Clone and aggregation is something that can be done later. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVGzTIAAoJEN0/YqbEcdMw/EAQAIkFiLYPy48zY0qEOXNj4wKf 0dTtBJCre9Z4QcMk2WqpPFEvza6xxnEPLZQLq1P3oQQ+zmtVn0RpMIEmuP54Pg+s Gyr46R+vZiZXqSj+2MPoJ8GctOiWo4LvTL/OEScJffuQWZdJ+mc2vqaxElIgMOuH HUkyAtB5tJAv0OMI2QxdCVoJMZ6vbphcFTBhuTQdxMuSdVvIc+xWuJEyj1/wnXf8 WMzQs5yTJ1oud4zbViVpg+2B4tQxmkjAYnvXtTmpth85kNsuwI+2C7OAc5sAnVwK zk/80EdBacLJZwjnDnwMGS3eYnGO272sT1mWJT4img0VIuSUURtV9rgv197+BvPu HsxJtsOFWLOGwiXBE1QoD7oMd+aDq7N1CwD0CsVlIEeUn5a4h9011NYShqWCZxCT 2kbY+axvplmU12HxjBA2NRYs/MfM9WjsaWQatjyRXVG9O2QkWmxFoprzfBqJfYtc 6ALzLKJdZ9cE4dXWIXFQ2rYrSAP3Ntd9Mum1TwaWbEWi/vpyknLyWvFouvxOWPeb xz10/yrne2KisKSJVfbMMCQE918kGB8W7S6+IRv/omoaGOCnj1JqtsqANsiTmkt8 /Y7NhiZDmcwb3jKmjyIDKxYrDvFCVahmzyU06uuYtaGnfcrxYy4XQFyWM9YoDi2r LKOZaYS91eUlGNg4Li0+ =mI5S -----END PGP SIGNATURE-----

March 31, 2015

Re: [PATCH 4/4] d3drm/tests: Add QueryInterface tests for IDirect3DRMFrame3

by Stefan Dösinger

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Am 2015-03-31 um 20:24 schrieb Aaryaman Vasishta: > The tests also pass when the frame is created via > IDirect3DRM_CreateFrame and IDirect3DRM2_CreateFrame. I'll do a few experiments with these interfaces myself. I am still a bit puzzled by IDirect3DRMObject(2), and in particular the Clone method, which apparently allows these objects to be aggregated. The different interface pointers are more important than I originally thought, especially the separate IUnknown interface (necessary for aggregation). I think it'd be a good idea to behave in the same way, and have tests for it. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVGxUqAAoJEN0/YqbEcdMwQRAP/0XtD6DdCex0eJWYVALmCK7F lDZ4tVZo8iA23OEuAdXXKd0mq+pwTLQmO/VEcMTM0sE7/QQKUE/sxHVNIrp9JGf3 0Sy8SiykmYi3ERw/lAfc8fmw2YMnpKpx3iUoPKiOWplfN78ZOSYkosFZJFxZ0l9g DtF5fmOlkxbykhSVCMSCDTdT3bu/+IigWy+TWdWT6PiQwFSSH3gV2sCFqcAFe5fX SLXPCeTDYLXjQHV6Can+kgu0JgYDES4TwO70Bijy7jjZlOERxs+NSoOg8I/XGcWP 8xuzblxs8r1jXIifzBwMOtzOs2+mUgzXbXLdnFza4n9wKz+UvsKOBBekCqlvS0BN 9DM3CJUVQZHnxlbMl+OjUbxTXRFeBblwBFTX6KOOuUzxcMxGRrvf3/5fysE0W9fs 67qHE/LJRaT9Q+Bhi2L1LRgnCLYNckQ/+XUm6nhSbUuSJ/XqUN14a3C+GYGbHp1v QQnbpu19dxE9PrNjk274HZDAc5R5JyPIpa8EBMtn8pKgDmu4qvkcm9PIUQOWVsjd sEOIHN4MqXvaphkLuh4zmhHtdUnzW0HPQvgW7Ci3eMSTioCzC+H0nExfTLMkK8SX MJG6dSjih3atELfVHdO7VlD9tlsQL/eLO2ZwVvXZCPVDLcsHncZ+ieAUiit2fnN5 jFRRejVCwdDYmgG9DqUW =L66l -----END PGP SIGNATURE-----

March 31, 2015

Re: [PATCH] comctl32: Handle BM_SETSTATE sent to themed buttons.

by Nikolay Sivov

On 03/31/2015 10:45 PM, Mark Harmstone wrote: > This patch changes comctl32 to handle BM_SETSTATE itself when sent to > a themed button, rather than forwarding it to user32. This way, the > theming isn't temporarily lost when user32 repaints it. > > + case BM_SETSTATE: > + { > + int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); > + if (wParam) > + SetWindowLongW(hwnd, 0, state | BST_PUSHED); > + else > + SetWindowLongW(hwnd, 0, state & ~BST_PUSHED); > + > + InvalidateRect(hwnd, NULL, FALSE); > + break; > + } > + I guess you can GetWindowLongW(...,0,...) instead of sending a message? But what's more important is that all these difference in behavior comparing to user32 controls should not be visible only when you have an active theme. It's actually another version of same Button control with additional messages and different behavior in some aspects, including theming-aware drawing. So my point is that theming support is secondary, what's important is class redirection support, and I'm worried if these theming-only changes will make it more difficult to fix properly later. P.S. 0 window data index is actually implementation details of user32 (I don't know if it's compatible with native one with that regard or not).

March 31, 2015

Re: gdiplus/tests: Use printf() for memory dumps instead of trace(). (try 2)

by Vincent Povirk

This might be considered a bug in the trace() function. The debug output functions we use outside tests can be used in this way without printing the prefix multiple times.

March 31, 2015

Re: gdiplus/tests: Use printf() for memory dumps instead of trace(). (try 2)

by Thomas Faber

On 2015-03-29 12:29, Thomas Faber wrote: > trace is unsuitable since it adds a file:line prefix every time. Is there a preferred way to handle this instead of using printf? Or is this simply a case that seems pointless to fix because tests should never fail anyway (in which case a patch to remove these dumps completely might make sense)? Thanks! -Thomas PS: Here's what I see with trace(), which was my reasoning for the patch: image.c:4241: Test marked todo: 16: data should match image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 80image.c:4249: 80image.c:4249: 80image.c:4249: 80image.c:4249: 80image.c:4249: 80image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4249: 40image.c:4250:

March 31, 2015

Re: [PATCH 4/4] d3drm/tests: Add QueryInterface tests for IDirect3DRMFrame3

by Aaryaman Vasishta

The tests also pass when the frame is created via IDirect3DRM_CreateFrame and IDirect3DRM2_CreateFrame. On Tue, Mar 31, 2015 at 1:36 AM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > --- > dlls/d3drm/tests/d3drm.c | 99 > ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 99 insertions(+) > > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 515aace..6029b1a 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1841,6 +1841,104 @@ static void test_d3drm_qi(void) > IDirect3DRM_Release(d3drm); > } > > +static void test_frame_qi(void) > +{ > + static const struct qi_test tests[] = > + { > + { &IID_IDirect3DRMFrame3, &IID_IDirect3DRMFrame3, S_OK, > FALSE }, > + { &IID_IDirect3DRMFrame2, &IID_IDirect3DRMFrame3, S_OK, > FALSE }, > + { &IID_IDirect3DRMFrame, &IID_IDirect3DRMFrame3, S_OK, > FALSE }, > + { &IID_IDirect3DRM, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMDevice, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMObject, &IID_IDirect3DRMFrame3, S_OK, > FALSE }, > + { &IID_IDirect3DRMDevice2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMDevice3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMViewport, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMViewport2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRM3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRM2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMVisual, &IID_IDirect3DRMFrame3, S_OK, > FALSE }, > + { &IID_IDirect3DRMMesh, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMMeshBuilder, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMMeshBuilder2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMMeshBuilder3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMFace, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMFace2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMLight, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMTexture, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMTexture2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMTexture3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMWrap, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMMaterial, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMMaterial2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMAnimation, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMAnimation2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMAnimationSet, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMAnimationSet2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMObjectArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMDeviceArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMViewportArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMFrameArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMVisualArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMLightArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMPickedArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMFaceArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMAnimationArray, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMUserVisual, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMShadow, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMShadow2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMInterpolator, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMProgressiveMesh, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMPicked2Array, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DRMClippedVisual, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDrawClipper, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDrawSurface7, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDrawSurface4, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDrawSurface3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDrawSurface2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDrawSurface, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DDevice7, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DDevice3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DDevice2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DDevice, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3D7, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3D3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3D2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3D, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDraw7, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDraw4, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDraw3, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDraw2, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirectDraw, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IDirect3DLight, NULL, > CLASS_E_CLASSNOTAVAILABLE, FALSE }, > + { &IID_IUnknown, &IID_IDirect3DRMFrame3, S_OK, > FALSE }, > + }; > + HRESULT hr; > + IDirect3DRM *d3drm; > + IDirect3DRM3 *d3drm3; > + IDirect3DRMFrame3 *frame3; > + > + hr = Direct3DRMCreate(&d3drm); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", > hr); > + > + if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, > (void **)&d3drm3))) > + { > + win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping > tests\n", hr); > + IDirect3DRM_Release(d3drm); > + return; > + } > + > + hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame3 interface (hr = > %x)\n", hr); > + CHECK_REFCOUNT(frame3, 1); > + > + test_qi("frame_qi", (IUnknown *)frame3, &IID_IDirect3DRMFrame3, > tests, sizeof(tests) / sizeof(*tests)); > + > + IDirect3DRMFrame3_Release(frame3); > + IDirect3DRM3_Release(d3drm3); > + IDirect3DRM_Release(d3drm); > +} > + > START_TEST(d3drm) > { > test_MeshBuilder(); > @@ -1857,4 +1955,5 @@ START_TEST(d3drm) > test_d3drm_load(); > test_frame_mesh_materials(); > test_d3drm_qi(); > + test_frame_qi(); > } > -- > 1.9.3 (Apple Git-50) > >

March 31, 2015

Re: [PATCH] gdiplus: Avoid unnecessary post-to-pre-multiplied alpha conversions in GdipDrawImagePointsRect

by Vincent Povirk

On Tue, Mar 31, 2015 at 9:05 AM, Andrew Eikum <aeikum(a)codeweavers.com> wrote: > + if (bg_alpha == 0) return fg; This doesn't seem right. Foreground is premultiplied, but we expect the result to not be premultiplied.

March 31, 2015

Re: [PATCH 6/7] ddraw/tests: Add more d3d7 lighting tests.

by Matteo Bruni

2015-03-31 14:36 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: > On 30 March 2015 at 20:18, Matteo Bruni <mbruni(a)codeweavers.com> wrote: >> + static WORD Indices[] = {0, 1, 2, 2, 3, 0}; > You have a typo here. :) Meh, I thought I fixed all of them...

March 31, 2015

Re: [PATCH 1/7] ddraw: D3DLIGHT lights default to active.

by Matteo Bruni

2015-03-31 14:36 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: > On 30 March 2015 at 20:18, Matteo Bruni <mbruni(a)codeweavers.com> wrote: >> @@ -184,7 +184,7 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) >> - if (data->dwSize >= sizeof(D3DLIGHT2) && (((D3DLIGHT2 *)data)->dwFlags & D3DLIGHT_NO_SPECULAR)) >> + if (!(flags & D3DLIGHT_NO_SPECULAR)) >> light7->dcvSpecular = data->dcvColor; >> else >> light7->dcvSpecular = *(const D3DCOLORVALUE *)zero_value; > I'm not holding this against the patch too much because it's ddraw, > but I think "if (flags & D3DLIGHT_NO_SPECULAR)" and then flipping the > branches reads a bit nicer. If the declaration of "zero_value" is > fixed you can avoid the cast as well. > >> @@ -200,9 +200,10 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) >> + memcpy(&light->light, data, sizeof(D3DLIGHT)); > There's something to be said for "sizeof(D3DLIGHT)" here, although I > don't think "sizeof(*data)" would have been worse. Fair points, I'll write a patch to cleanup those.

March 31, 2015

Re: [PATCH 6/7] ddraw/tests: Add more d3d7 lighting tests.

by Henri Verbeet

On 30 March 2015 at 20:18, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + static WORD Indices[] = {0, 1, 2, 2, 3, 0}; You have a typo here. :)

March 31, 2015