March 2016 - Wine-commits - list.winehq.org

Francois Gouget : d3dx9/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: master Commit: 8fda75fe4a7294cd99968e960dc60c23ae3f8b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fda75fe4a7294cd99968e960… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 17 23:38:56 2016 +0100 d3dx9/tests: Add a trailing '\n' to an ok() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index e43bbdc..13467ed 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2904,7 +2904,7 @@ static void test_effect_states(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetLightEnable(device, 2, &bval); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); if (hr == D3D_OK) - ok(!bval, "Got result %u, expected 0.", bval); + ok(!bval, "Got result %u, expected 0.\n", bval); hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(1), &test_mat); hr = effect->lpVtbl->Begin(effect, &npasses, 0);

1 0

Piotr Caban : msvcrt: Handle non c++ exceptions in __DestructExceptionObject.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: master Commit: 856f0f9d13af93d2d0b1d36fcf3f8dc976a4f4f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=856f0f9d13af93d2d0b1d36fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 18 12:40:25 2016 +0100 msvcrt: Handle non c++ exceptions in __DestructExceptionObject. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 09f42f0..fc0e36e 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -400,6 +400,15 @@ void CDECL __DestructExceptionObject(EXCEPTION_RECORD *rec) TRACE("(%p)\n", rec); + if (rec->ExceptionCode != CXX_EXCEPTION) return; +#ifndef __x86_64__ + if (rec->NumberParameters != 3) return; +#else + if (rec->NumberParameters != 4) return; +#endif + if (rec->ExceptionInformation[0] < CXX_FRAME_MAGIC_VC6 || + rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8) return; + if (!info || !info->destructor) return;

1 0

Piotr Caban : msvcrt: Destroy thrown c++ object before calling handler in _except_handler4_common.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: master Commit: 4a397b4009e9fd5e9e8899456d177865af465291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a397b4009e9fd5e9e8899456… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 18 12:40:33 2016 +0100 msvcrt: Destroy thrown c++ object before calling handler in _except_handler4_common. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 2 ++ dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 7d7ec75..418c68b 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -950,6 +950,8 @@ int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void), if (retval == EXCEPTION_EXECUTE_HANDLER) { + __DestructExceptionObject(rec); + /* Unwind all higher frames, this one will handle the exception */ _global_unwind2((EXCEPTION_REGISTRATION_RECORD*)frame); msvcrt_local_unwind4( cookie, frame, trylevel, &frame->_ebp ); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index fafdc6b..b564dc1 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -219,6 +219,7 @@ typedef struct BOOL __cdecl __CxxRegisterExceptionObject(EXCEPTION_RECORD**, cxx_frame_info*); void __cdecl __CxxUnregisterExceptionObject(cxx_frame_info*, BOOL); +void CDECL __DestructExceptionObject(EXCEPTION_RECORD*); /* TLS data */ extern DWORD msvcrt_tls_index DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : Release 1.9.6.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: master Commit: 6bc0ce26a853b51f11958545bfa5570bdcb1cf01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc0ce26a853b51f11958545b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 22:31:01 2016 +0900 Release 1.9.6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 758 +++++++++++++++++++++++++++----------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 342 insertions(+), 437 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bc0ce26a853b51f11958…

1 0

Tag wine-1.9.6 : Alexandre Julliard : Release 1.9.6
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: refs/tags/wine-1.9.6 Tag: e2e545aff7dd1fdf53bcad4d44f8b620ea9f960c URL: http://source.winehq.org/git/wine.git/?a=tag;h=e2e545aff7dd1fdf53bcad4d44f8… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 22:31:01 2016 +0900 Release 1.9.6

1 0

Henri Verbeet : wined3d: Properly check if sRGB writes should be enabled in context_apply_clear_state ().
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: master Commit: cb9704a979747c31e856b755a026e6b892d2b9e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9704a979747c31e856b755a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 17 16:30:01 2016 +0100 wined3d: Properly check if sRGB writes should be enabled in context_apply_clear_state(). In particular, while enabling sRGB writes is harmless for framebuffers that are not sRGB capable, the default framebuffer may be sRGB capable regardless of the associated wined3d format. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 37c0fe0..e372eaa 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2606,10 +2606,9 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win * performance incredibly. */ gl_info->gl_ops.gl.p_glDisable(GL_BLEND); gl_info->gl_ops.gl.p_glEnable(GL_SCISSOR_TEST); - if (gl_info->supported[ARB_FRAMEBUFFER_SRGB]) + if (rt_count && gl_info->supported[ARB_FRAMEBUFFER_SRGB]) { - if (!(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) - || device->state.render_states[WINED3D_RS_SRGBWRITEENABLE]) + if (needs_srgb_write(context, &device->state, fb)) gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); else gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB);

1 0

Henri Verbeet : wined3d: Require a valid rectangle pointer if rect_count is non-zero in device_clear_render_targets ().
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: master Commit: 198042e1d8d3926d4a2269c2c5150e0bcd28445e URL: http://source.winehq.org/git/wine.git/?a=commit;h=198042e1d8d3926d4a2269c2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 17 16:30:02 2016 +0100 wined3d: Require a valid rectangle pointer if rect_count is non-zero in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 6 ++++++ dlls/d3d9/device.c | 6 ++++++ dlls/ddraw/device.c | 6 ++++++ dlls/wined3d/device.c | 9 ++++----- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c1875bc..1cad4be 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1332,6 +1332,12 @@ static HRESULT WINAPI d3d8_device_Clear(IDirect3DDevice8 *iface, DWORD rect_coun TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %u.\n", iface, rect_count, rects, flags, color, z, stencil); + if (rect_count && !rects) + { + WARN("count %u with NULL rects.\n", rect_count); + rect_count = 0; + } + wined3d_mutex_lock(); hr = wined3d_device_clear(device->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0ed2aff..09c56db 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1660,6 +1660,12 @@ static HRESULT WINAPI d3d9_device_Clear(IDirect3DDevice9Ex *iface, DWORD rect_co TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %u.\n", iface, rect_count, rects, flags, color, z, stencil); + if (rect_count && !rects) + { + WARN("count %u with NULL rects.\n", rect_count); + rect_count = 0; + } + wined3d_mutex_lock(); hr = wined3d_device_clear(device->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2474e49..23c3e32 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5157,6 +5157,12 @@ static HRESULT d3d_device7_Clear(IDirect3DDevice7 *iface, DWORD count, TRACE("iface %p, count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %#x.\n", iface, count, rects, flags, color, z, stencil); + if (count && !rects) + { + WARN("count %u with NULL rects.\n", count); + count = 0; + } + wined3d_mutex_lock(); hr = wined3d_device_clear(This->wined3d_device, count, (RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 37d9ee9..e428a79 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -263,7 +263,7 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context { /* draw_rect ⊇ current_rect, test if we're doing a full clear. */ - if (!clear_rect) + if (!rect_count) { /* Full clear, modify only. */ *out_rect = *draw_rect; @@ -285,13 +285,12 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context } void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb, - UINT rect_count, const RECT *rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *color, + UINT rect_count, const RECT *clear_rect, const RECT *draw_rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { struct wined3d_surface *target = rt_count ? wined3d_rendertarget_view_get_surface(fb->render_targets[0]) : NULL; struct wined3d_surface *depth_stencil = fb->depth_stencil ? wined3d_rendertarget_view_get_surface(fb->depth_stencil) : NULL; - const RECT *clear_rect = (rect_count > 0 && rects) ? (const RECT *)rects : NULL; const struct wined3d_gl_info *gl_info; UINT drawable_width, drawable_height; struct wined3d_color corrected_color; @@ -325,7 +324,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (rt && rtv->format->id != WINED3DFMT_NULL) { - if (flags & WINED3DCLEAR_TARGET && !is_full_clear(target, draw_rect, clear_rect)) + if (flags & WINED3DCLEAR_TARGET && !is_full_clear(target, draw_rect, rect_count ? clear_rect : NULL)) surface_load_location(rt, context, rtv->resource->draw_binding); else wined3d_surface_prepare(rt, context, rtv->resource->draw_binding); @@ -440,7 +439,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c clear_mask = clear_mask | GL_COLOR_BUFFER_BIT; } - if (!clear_rect) + if (!rect_count) { if (render_offscreen) {

1 0

Henri Verbeet : wined3d: Ignore the dirty region for swapchain presents more explicitly.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: master Commit: 240912c59b9bb381ddffed987d784bffa3f138f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=240912c59b9bb381ddffed987… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 17 16:30:03 2016 +0100 wined3d: Ignore the dirty region for swapchain presents more explicitly. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/swapchain.c | 7 +++++-- dlls/d3d9/device.c | 15 ++++++++++----- dlls/d3d9/swapchain.c | 7 +++++-- dlls/dxgi/swapchain.c | 2 +- dlls/wined3d/cs.c | 8 ++------ dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 17 ++++++++--------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 7 +++---- include/wine/wined3d.h | 3 +-- 10 files changed, 37 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=240912c59b9bb381ddffe…

1 0

Henri Verbeet : wined3d: Handle NULL rectangles in wined3d_swapchain_present().
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: master Commit: a2e5881de1d59d512235f79bcc4757da4c22d21e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e5881de1d59d512235f79bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 17 16:30:04 2016 +0100 wined3d: Handle NULL rectangles in wined3d_swapchain_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 55 ++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9f39455..7d02375 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -135,6 +135,8 @@ void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWN HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags) { + RECT s, d; + TRACE("swapchain %p, src_rect %s, dst_rect %s, dst_window_override %p, flags %#x.\n", swapchain, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, flags); @@ -148,6 +150,19 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, return WINED3DERR_INVALIDCALL; } + if (!src_rect) + { + SetRect(&s, 0, 0, swapchain->desc.backbuffer_width, + swapchain->desc.backbuffer_height); + src_rect = &s; + } + + if (!dst_rect) + { + GetClientRect(swapchain->win_handle, &d); + dst_rect = &d; + } + wined3d_cs_emit_present(swapchain->device->cs, swapchain, src_rect, dst_rect, dst_window_override, flags); @@ -467,7 +482,7 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct } static void swapchain_gl_present(struct wined3d_swapchain *swapchain, - const RECT *src_rect_in, const RECT *dst_rect_in, DWORD flags) + const RECT *src_rect, const RECT *dst_rect, DWORD flags) { struct wined3d_surface *back_buffer = surface_from_resource( wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)); @@ -475,7 +490,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const struct wined3d_gl_info *gl_info; struct wined3d_context *context; struct wined3d_surface *front; - RECT src_rect, dst_rect; BOOL render_to_fbo; context = context_acquire(swapchain->device, back_buffer); @@ -530,32 +544,13 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, TRACE("Presenting HDC %p.\n", context->hdc); - render_to_fbo = swapchain->render_to_fbo; - - if (src_rect_in) - { - src_rect = *src_rect_in; - if (!render_to_fbo && (src_rect.left || src_rect.top - || src_rect.right != swapchain->desc.backbuffer_width - || src_rect.bottom != swapchain->desc.backbuffer_height)) - { - render_to_fbo = TRUE; - } - } - else - { - SetRect(&src_rect, 0, 0, swapchain->desc.backbuffer_width, - swapchain->desc.backbuffer_height); - } - - if (dst_rect_in) - dst_rect = *dst_rect_in; - else - GetClientRect(swapchain->win_handle, &dst_rect); - - if (!render_to_fbo && (dst_rect.left || dst_rect.top - || dst_rect.right != swapchain->desc.backbuffer_width - || dst_rect.bottom != swapchain->desc.backbuffer_height)) + if (!(render_to_fbo = swapchain->render_to_fbo) + && (src_rect->left || src_rect->top + || src_rect->right != swapchain->desc.backbuffer_width + || src_rect->bottom != swapchain->desc.backbuffer_height + || dst_rect->left || dst_rect->top + || dst_rect->right != swapchain->desc.backbuffer_width + || dst_rect->bottom != swapchain->desc.backbuffer_height)) render_to_fbo = TRUE; /* Rendering to a window of different size, presenting partial rectangles, @@ -584,7 +579,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP && !once++) FIXME("WINED3D_SWAP_EFFECT_FLIP not implemented.\n"); - swapchain_blit(swapchain, context, &src_rect, &dst_rect); + swapchain_blit(swapchain, context, src_rect, dst_rect); } if (swapchain->num_contexts > 1) @@ -709,7 +704,7 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai } static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, - const RECT *src_rect_in, const RECT *dst_rect_in, DWORD flags) + const RECT *src_rect, const RECT *dst_rect, DWORD flags) { struct wined3d_surface *front, *back;

1 0

Henri Verbeet : wined3d: Explicitly check for WINED3DUSAGE_TEXTURE when validating surface dimensions in surface_private_setup ().
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: wine Branch: master Commit: 7fb0ff9e89711c22a510d11b91d516ab2f46c7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb0ff9e89711c22a510d11b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 17 16:30:05 2016 +0100 wined3d: Explicitly check for WINED3DUSAGE_TEXTURE when validating surface dimensions in surface_private_setup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d61034a..846b78f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -558,7 +558,7 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) } if ((surface->pow2Width > gl_info->limits.texture_size || surface->pow2Height > gl_info->limits.texture_size) - && !(texture->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) + && (texture->resource.usage & WINED3DUSAGE_TEXTURE)) { /* One of three options: * 1: Do the same as we do with NPOT and scale the texture, (any

1 0