November 2015 - Wine-devel - list.winehq.org

Re: [PATCH] user32: Use font default height if GetTextExtentPoint returns empty rectangle
by Nikolay Sivov 13 Nov '15

13 Nov '15

I just sent a test [1] to confirm that GetTextExtenPoint is not responsible in setting 'cy' for empty string case. It confirms that it has to be dealt with separately, just like this patch does. [1] https://www.winehq.org/pipermail/wine-patches/2015-November/144589.html

1 0

Regressions by Path
by Vincent Povirk 13 Nov '15

13 Nov '15

I'm looking for things to do during code freeze, and my regressions list is rather unhelpful. There's a reason each of those aren't fixed yet. So I thought I'd try organizing the list by component instead. To do this, I wrote a script that would search for open bugs with a regression sha1, grab the sha1, get the description and affected paths from git, and write out a tree. This turned out to be equally helpful for me, but maybe it'd be useful to someone else? Here it is, just in case. Maybe I'll try to fix some tests instead.

1 0

Re: [v7 07/10] ddraw7/tests: Test SetColorKey() on cubemap surfaces.
by Henri Verbeet 13 Nov '15

13 Nov '15

On 10 November 2015 at 14:10, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > From: Stefan Dösinger <stefan(a)codeweavers.com> > > Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> I'd prefer it if Stefan would just send this in himself. > + D3DDEVICEDESC7 device_desc; ... > + BOOL cubemap_supported; ... > + hr = IDirect3DDevice7_GetCaps(device, &device_desc); > + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); > + cubemap_supported = !!(device_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP); ... > + if (!cubemap_supported) > + goto cleanup; This seems a bit pointless if you're only going to use "cubemap_supported" once. I think there should be a skip() here.

2 2

Re: [v7 03/10] d3d9: Call wined3d_device_copy_sub_resource_region() instead of wined3d_device_update_surface() in d3d9_device_UpdateSurface().
by Henri Verbeet 13 Nov '15

13 Nov '15

On 10 November 2015 at 14:09, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c > index 16b27e5..3dca920 100644 > --- a/dlls/d3d9/device.c > +++ b/dlls/d3d9/device.c > @@ -1227,16 +1227,32 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, > struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); > struct d3d9_surface *src = unsafe_impl_from_IDirect3DSurface9(src_surface); > struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface); > + struct wined3d_box src_box; > HRESULT hr; > > TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_point %p.\n", > iface, src_surface, src_rect, dst_surface, dst_point); > > + if (src_rect) > + { > + src_box.left = src_rect->left; > + src_box.top = src_rect->top; > + src_box.right = src_rect->right; > + src_box.bottom = src_rect->bottom; > + src_box.front = 0; > + src_box.back = 1; > + } > + > wined3d_mutex_lock(); > - hr = wined3d_device_update_surface(device->wined3d_device, src->wined3d_surface, src_rect, > - dst->wined3d_surface, dst_point); > + hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, > + wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0, > + dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture), > + src->sub_resource_idx, src_rect ? &src_box : NULL); > wined3d_mutex_unlock(); This is fine. > + if (FAILED(hr)) > + return D3DERR_INVALIDCALL; > + > return hr; Is this needed? I.e., would just "return hr;" also work? > diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c > index 365629b..0f64469 100644 > --- a/dlls/wined3d/device.c > +++ b/dlls/wined3d/device.c > @@ -3888,14 +3888,6 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev > return WINED3DERR_INVALIDCALL; > } > > - if (src_resource->type != dst_resource->type) > - { > - WARN("Resource types (%s / %s) don't match.\n", > - debug_d3dresourcetype(dst_resource->type), > - debug_d3dresourcetype(src_resource->type)); > - return WINED3DERR_INVALIDCALL; > - } > - > if (src_resource->format->id != dst_resource->format->id) > { > WARN("Resource formats (%s / %s) don't match.\n", > @@ -3904,9 +3896,11 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev > return WINED3DERR_INVALIDCALL; > } > > - if (dst_resource->type != WINED3D_RTYPE_TEXTURE) > + if ((dst_resource->type != WINED3D_RTYPE_TEXTURE && dst_resource->type != WINED3D_RTYPE_CUBE_TEXTURE) > + || (src_resource->type != WINED3D_RTYPE_TEXTURE && src_resource->type != WINED3D_RTYPE_CUBE_TEXTURE)) > { > - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type)); > + FIXME("Not implemented for %s to %s resources.\n", > + debug_d3dresourcetype(src_resource->type), debug_d3dresourcetype(dst_resource->type)); > return WINED3DERR_INVALIDCALL; > } > This is really a separate change. I'd prefer something like the following: enum wined3d_resource_type src_resource_type, dst_resource_type; ... src_resource_type = src_resource->type; if (src_resource_type == WINED3D_RTYPE_CUBE_TEXTURE) src_resource_type = WINED3D_RTYPE_TEXTURE; ... if (src_resource_type != dst_resource_type) { ... } ...

2 2

Re: [v7 01/10] d3d11: Handle NULL source box in d3d10_device_CopySubresourceRegion().
by Henri Verbeet 13 Nov '15

13 Nov '15

On 10 November 2015 at 14:09, Riccardo Bortolato <rikyz619(a)gmail.com> wrote: > Also modified wined3d_device_copy_sub_resource_region() accordingly. > This patch and the next one are probably fine. Do you have tests?

2 2

Start of code freeze
by Alexandre Julliard 13 Nov '15

13 Nov '15

Folks, Now that release 1.7.55 is out, it's time to start code freeze towards the stable 1.8 release. This means that from now on, new features or code redesigns won't be accepted; only targeted bug fixes that don't look too dangerous will be allowed in. The freeze will get increasingly more strict as we progress towards release. I know that git makes it easy for everybody to keep working on new things on their own branch, but I'd ask that we all take time to concentrate on fixing bugs, and particularly regressions. I'm hoping that we can make the number of regressions drop significantly, like we did for the previous stable releases. I will be making release candidates every Friday until we run out of bugs that can be reasonably fixed. Based on previous experience, the code freeze should last between 4 and 8 weeks. This is also an opportunity to polish things like translations, documentation, web site etc. so there is plenty to do even for non-developers. And most importantly, we need help with retesting as many applications as possible... Thank you all for your help! -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 4/5] d3d11: Implement d3d11_immediate_context_RSGetViewports().
by Henri Verbeet 13 Nov '15

13 Nov '15

On 13 November 2015 at 02:23, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -1516,7 +1516,30 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceCon > static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11DeviceContext *iface, > UINT *viewport_count, D3D11_VIEWPORT *viewports) > { > - FIXME("iface %p, viewport_count %p, viewports %p stub!\n", iface, viewport_count, viewports); > + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); > + struct wined3d_viewport wined3d_vp; > + > + TRACE("iface %p, viewport_count %p, viewports %p.\n", iface, viewport_count, viewports); > + > + if (!viewports) > + { > + *viewport_count = 1; > + return; > + } > + > + wined3d_mutex_lock(); > + wined3d_device_get_viewport(device->wined3d_device, &wined3d_vp); > + wined3d_mutex_unlock(); > + > + viewports[0].TopLeftX = wined3d_vp.x; > + viewports[0].TopLeftY = wined3d_vp.y; > + viewports[0].Width = wined3d_vp.width; > + viewports[0].Height = wined3d_vp.height; > + viewports[0].MinDepth = wined3d_vp.min_z; > + viewports[0].MaxDepth = wined3d_vp.max_z; > + > + if (*viewport_count > 1) > + memset(&viewports[1], 0, (*viewport_count - 1) * sizeof(*viewports)); > } > Are you sure this is correct? (I.e., that calling the function with an invalid viewports pointer and 0 *viewport_count should crash.)

2 1

Re: [PATCH 10/11] ddraw/tests: Port test_shademode() to ddraw1.
by Marvin 12 Nov '15

12 Nov '15

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=18194 Your paranoid android. === w1064 (32 bit ddraw1) === ddraw1.c:2186: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw1.c:2931: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2933: Test failed: Got unexpected screen width 1024. ddraw1.c:2935: Test failed: Got unexpected screen height 768. ddraw1.c:2948: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2950: Test failed: Got unexpected screen width 1024. ddraw1.c:2952: Test failed: Got unexpected screen height 768. ddraw1.c:2956: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2958: Test failed: Got unexpected screen width 1024. ddraw1.c:2960: Test failed: Got unexpected screen height 768. ddraw1.c:2979: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2981: Test failed: Got unexpected screen width 1024. ddraw1.c:2983: Test failed: Got unexpected screen height 768. ddraw1.c:2987: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:2989: Test failed: Got unexpected screen width 1024. ddraw1.c:2991: Test failed: Got unexpected screen height 768. ddraw1.c:3011: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:3013: Test failed: Got unexpected screen width 1024. ddraw1.c:3015: Test failed: Got unexpected screen height 768. ddraw1.c:3020: Test failed: Got unexpected screen width 1024. ddraw1.c:3022: Test failed: Got unexpected screen height 768. ddraw1.c:3035: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:3037: Test failed: Got unexpected screen width 1024. ddraw1.c:3039: Test failed: Got unexpected screen height 768. ddraw1.c:3043: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:3045: Test failed: Got unexpected screen width 1024. ddraw1.c:3047: Test failed: Got unexpected screen height 768. ddraw1.c:3055: Test failed: Got unexpected screen width 1024. ddraw1.c:3057: Test failed: Got unexpected screen height 768. ddraw1.c:3069: Test failed: Failed to set display mode, hr 0x80004001. ddraw1.c:3071: Test failed: Got unexpected screen width 1024. ddraw1.c:3073: Test failed: Got unexpected screen height 768. ddraw1.c:4122: Test failed: Failed to set display mode, hr 0x80004001.

1 0

Re: [PATCH 09/11] ddraw/tests: Port test_shademode() to ddraw2.
by Marvin 12 Nov '15

12 Nov '15

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=18193 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2337: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw2.c:3193: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3195: Test failed: Got unexpected screen width 1024. ddraw2.c:3197: Test failed: Got unexpected screen height 768. ddraw2.c:3210: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3212: Test failed: Got unexpected screen width 1024. ddraw2.c:3214: Test failed: Got unexpected screen height 768. ddraw2.c:3218: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3220: Test failed: Got unexpected screen width 1024. ddraw2.c:3222: Test failed: Got unexpected screen height 768. ddraw2.c:3241: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3243: Test failed: Got unexpected screen width 1024. ddraw2.c:3245: Test failed: Got unexpected screen height 768. ddraw2.c:3249: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3251: Test failed: Got unexpected screen width 1024. ddraw2.c:3253: Test failed: Got unexpected screen height 768. ddraw2.c:3273: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3275: Test failed: Got unexpected screen width 1024. ddraw2.c:3277: Test failed: Got unexpected screen height 768. ddraw2.c:3282: Test failed: Got unexpected screen width 1024. ddraw2.c:3284: Test failed: Got unexpected screen height 768. ddraw2.c:3297: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3299: Test failed: Got unexpected screen width 1024. ddraw2.c:3301: Test failed: Got unexpected screen height 768. ddraw2.c:3305: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3307: Test failed: Got unexpected screen width 1024. ddraw2.c:3309: Test failed: Got unexpected screen height 768. ddraw2.c:3317: Test failed: Got unexpected screen width 1024. ddraw2.c:3319: Test failed: Got unexpected screen height 768. ddraw2.c:3331: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3333: Test failed: Got unexpected screen width 1024. ddraw2.c:3335: Test failed: Got unexpected screen height 768. ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3552: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3565: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3581: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:3600: Test failed: Display mode restored after ddraw1-ddraw2 SetCooperativeLevel() call sequence ddraw2.c:3506: Test failed: Failed to set display mode, hr 0x80004001. ddraw2.c:4757: Test failed: Failed to set display mode, hr 0x80004001.

1 0

Re: [PATCH 08/11] ddraw/tests: Port test_shademode() to ddraw4.
by Marvin 12 Nov '15

12 Nov '15

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=18192 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2522: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. ddraw4.c:3363: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3365: Test failed: Got unexpected screen width 1024. ddraw4.c:3367: Test failed: Got unexpected screen height 768. ddraw4.c:3380: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3382: Test failed: Got unexpected screen width 1024. ddraw4.c:3384: Test failed: Got unexpected screen height 768. ddraw4.c:3388: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3390: Test failed: Got unexpected screen width 1024. ddraw4.c:3392: Test failed: Got unexpected screen height 768. ddraw4.c:3411: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3413: Test failed: Got unexpected screen width 1024. ddraw4.c:3415: Test failed: Got unexpected screen height 768. ddraw4.c:3419: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3421: Test failed: Got unexpected screen width 1024. ddraw4.c:3423: Test failed: Got unexpected screen height 768. ddraw4.c:3443: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3445: Test failed: Got unexpected screen width 1024. ddraw4.c:3447: Test failed: Got unexpected screen height 768. ddraw4.c:3452: Test failed: Got unexpected screen width 1024. ddraw4.c:3454: Test failed: Got unexpected screen height 768. ddraw4.c:3467: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3469: Test failed: Got unexpected screen width 1024. ddraw4.c:3471: Test failed: Got unexpected screen height 768. ddraw4.c:3475: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3477: Test failed: Got unexpected screen width 1024. ddraw4.c:3479: Test failed: Got unexpected screen height 768. ddraw4.c:3487: Test failed: Got unexpected screen width 1024. ddraw4.c:3489: Test failed: Got unexpected screen height 768. ddraw4.c:3501: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:3503: Test failed: Got unexpected screen width 1024. ddraw4.c:3505: Test failed: Got unexpected screen height 768. ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4392: Test failed: Display mode restored after good ddraw1::SetCooperativeLevel call ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4405: Test failed: Display mode restored after ddraw1::SetCooperativeLevel(SETFOCUSWINDOW) call ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4421: Test failed: Display mode restored after good-bad ddraw1::SetCooperativeLevel() call sequence ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:4440: Test failed: Display mode restored after ddraw1-ddraw4 SetCooperativeLevel() call sequence ddraw4.c:4346: Test failed: Failed to set display mode, hr 0x80004001. ddraw4.c:6081: Test failed: Failed to set display mode, hr 0x80004001.

1 0