wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Henri Verbeet : wined3d: Move the "level" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: 6a66af88de69f2335035e3eeb4c3df365ef746a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a66af88de69f2335035e3ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 7 16:29:59 2019 +0430 wined3d: Move the "level" field from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 20 +++++++++----------- dlls/wined3d/wined3d_private.h | 3 +-- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3349570..53d44d9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1570,19 +1570,17 @@ BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) { - struct wined3d_context *context = &context_gl->c; - - TRACE("Releasing context %p, level %u.\n", context_gl, context->level); + TRACE("Releasing context %p, level %u.\n", context_gl, context_gl->level); if (WARN_ON(d3d)) { - if (!context->level) - WARN("Context %p is not active.\n", context); + if (!context_gl->level) + WARN("Context %p is not active.\n", context_gl); else if (context_gl != wined3d_context_gl_get_current()) - WARN("Context %p is not the current context.\n", context); + WARN("Context %p is not the current context.\n", context_gl); } - if (!--context->level) + if (!--context_gl->level) { if (wined3d_context_gl_restore_pixel_format(context_gl)) context_gl->needs_set = 1; @@ -1594,7 +1592,7 @@ void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) context_gl->restore_dc = NULL; } - if (context->destroy_delayed) + if (context_gl->c.destroy_delayed) { TRACE("Destroying context %p.\n", context_gl); wined3d_context_gl_destroy(context_gl); @@ -1618,9 +1616,9 @@ void context_restore(struct wined3d_context *context, struct wined3d_texture *te static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) { - TRACE("Entering context %p, level %u.\n", context_gl, context_gl->c.level + 1); + TRACE("Entering context %p, level %u.\n", context_gl, context_gl->level + 1); - if (!context_gl->c.level++) + if (!context_gl->level++) { const struct wined3d_context_gl *current_context = wined3d_context_gl_get_current(); HGLRC current_gl = wglGetCurrentContext(); @@ -2321,7 +2319,7 @@ void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) /* We delay destroying a context when it is active. The context_release() * function invokes wined3d_context_gl_destroy() again while leaving the * last level. */ - if (context_gl->c.level) + if (context_gl->level) { TRACE("Delaying destruction of context %p.\n", context_gl); context_gl->c.destroy_delayed = 1; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 53c8cfd..e6f9340 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1951,8 +1951,6 @@ struct wined3d_context UINT instance_count; - UINT level; - void *shader_backend_data; void *fragment_pipe_data; @@ -1999,6 +1997,7 @@ struct wined3d_context_gl GLenum *texture_type; /* The WGL context. */ + unsigned int level; HGLRC restore_ctx; HDC restore_dc; int restore_pf;

1 0

Henri Verbeet : wined3d: Move the "gl_info" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: 74b9ef2c1d7bc37c79b02b7c541d4b440de0b43d URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b9ef2c1d7bc37c79b02b7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 7 16:29:58 2019 +0430 wined3d: Move the "gl_info" field from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 18 ++--- dlls/wined3d/arb_program_shader.c | 63 +++++++++------- dlls/wined3d/ati_fragment_shader.c | 15 ++-- dlls/wined3d/buffer.c | 12 +-- dlls/wined3d/context.c | 136 +++++++++++++++++----------------- dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 6 +- dlls/wined3d/gl_compat.c | 20 ++--- dlls/wined3d/glsl_shader.c | 97 +++++++++++++----------- dlls/wined3d/nvidia_texture_shader.c | 15 ++-- dlls/wined3d/query.c | 50 ++++++------- dlls/wined3d/sampler.c | 6 +- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 139 ++++++++++++++++++----------------- dlls/wined3d/surface.c | 24 +++--- dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/texture.c | 42 +++++------ dlls/wined3d/utils.c | 8 +- dlls/wined3d/view.c | 20 ++--- dlls/wined3d/wined3d_private.h | 3 +- 20 files changed, 355 insertions(+), 327 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74b9ef2c1d7bc37c79b0…

1 0

Henri Verbeet : wined3d: Use the format info to determine the A8_UNORM output swizzle in find_ps_compile_args ().
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: 844a5ad74f0b850911392eecf8a36c0052269ba1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=844a5ad74f0b850911392eec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 7 16:29:57 2019 +0430 wined3d: Use the format info to determine the A8_UNORM output swizzle in find_ps_compile_args(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2bd201a..6061efa 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4159,14 +4159,11 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 args->render_offscreen = shader->reg_maps.vpos && gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS] ? context->render_offscreen : 0; - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + for (i = 0; i < ARRAY_SIZE(state->fb->render_targets); ++i) { - for (i = 0; i < ARRAY_SIZE(state->fb->render_targets); ++i) - { - struct wined3d_rendertarget_view *rtv = state->fb->render_targets[i]; - if (rtv && rtv->format->id == WINED3DFMT_A8_UNORM) - args->rt_alpha_swizzle |= 1u << i; - } + struct wined3d_rendertarget_view *rtv = state->fb->render_targets[i]; + if (rtv && rtv->format->id == WINED3DFMT_A8_UNORM && !is_identity_fixup(rtv->format->color_fixup)) + args->rt_alpha_swizzle |= 1u << i; } }

1 0

Paul Gofman : ddraw/tests: Test restoring attached surface for ddraw1.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: aa6517cf875e6f94db85393391397d036b67b24b URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa6517cf875e6f94db853933… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Aug 5 21:58:35 2019 +0300 ddraw/tests: Test restoring attached surface for ddraw1. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b28f1d7..449f0c6 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7166,11 +7166,12 @@ static void test_palette_alpha(void) static void test_lost_device(void) { - IDirectDrawSurface *surface; + IDirectDrawSurface *surface, *back_buffer; DDSURFACEDESC surface_desc; HWND window1, window2; IDirectDraw *ddraw; ULONG refcount; + DDSCAPS caps; HRESULT hr; BOOL ret; @@ -7308,6 +7309,19 @@ static void test_lost_device(void) hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_FLIP; + + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface_Release(back_buffer); + IDirectDrawSurface_Release(surface); refcount = IDirectDraw_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Paul Gofman : ddraw/tests: Test restoring attached surface for ddraw2.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: d8812edc6584d434c4ffd68dc7a3a783623a3703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8812edc6584d434c4ffd68d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Aug 5 21:58:34 2019 +0300 ddraw/tests: Test restoring attached surface for ddraw2. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f25cdd8..df99938 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8048,11 +8048,12 @@ static void test_palette_alpha(void) static void test_lost_device(void) { - IDirectDrawSurface *surface; + IDirectDrawSurface *surface, *back_buffer; DDSURFACEDESC surface_desc; HWND window1, window2; IDirectDraw2 *ddraw; ULONG refcount; + DDSCAPS caps; HRESULT hr; BOOL ret; @@ -8190,6 +8191,19 @@ static void test_lost_device(void) hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_FLIP; + + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface_Release(back_buffer); + IDirectDrawSurface_Release(surface); refcount = IDirectDraw2_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Paul Gofman : ddraw/tests: Test restoring attached surface for ddraw4.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: da2fdc4cd35c261081521f7c486e99be7dbbe87e URL: https://source.winehq.org/git/wine.git/?a=commit;h=da2fdc4cd35c261081521f7c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Aug 5 21:58:33 2019 +0300 ddraw/tests: Test restoring attached surface for ddraw4. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index bc58c18..7578444 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9255,11 +9255,12 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { - IDirectDrawSurface4 *surface; + IDirectDrawSurface4 *surface, *back_buffer; DDSURFACEDESC2 surface_desc; HWND window1, window2; IDirectDraw4 *ddraw; ULONG refcount; + DDSCAPS2 caps; HRESULT hr; BOOL ret; @@ -9426,9 +9427,23 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_FLIP; + + hr = IDirectDrawSurface4_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface4_Release(back_buffer); + IDirectDrawSurface4_Release(surface); refcount = IDirectDraw4_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Paul Gofman : ddraw: Restore complex attached surfaces when restoring surface.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 5c9a7b0986db30c9565af519e6cbdef157524315 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c9a7b0986db30c9565af519… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Aug 5 21:58:32 2019 +0300 ddraw: Restore complex attached surfaces when restoring surface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47586 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 +++++++ dlls/ddraw/tests/ddraw7.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 411267c..d415e4a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3732,6 +3732,7 @@ static HRESULT WINAPI ddraw_surface1_IsLost(IDirectDrawSurface *iface) static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + unsigned int i; TRACE("iface %p.\n", iface); @@ -3772,6 +3773,12 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) ddraw_update_lost_surfaces(surface->ddraw); surface->is_lost = FALSE; + for(i = 0; i < MAX_COMPLEX_ATTACHED; i++) + { + if (surface->complex_array[i]) + surface->complex_array[i]->is_lost = FALSE; + } + return DD_OK; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 171e6a5..99bd9c8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9212,6 +9212,13 @@ static void test_lost_device(void) hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &back_buffer); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Restore(surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(back_buffer); IDirectDrawSurface7_Release(surface); refcount = IDirectDraw7_Release(ddraw);

1 0

Paul Gofman : ddraw: Return DDERR_SURFACELOST from _GetAttachedSurface() if surface is lost.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 7361c7f2cd9a398a6eab6923faad5e4a2a342238 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7361c7f2cd9a398a6eab6923… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Aug 5 21:58:31 2019 +0300 ddraw: Return DDERR_SURFACELOST from _GetAttachedSurface() if surface is lost. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 47 ++++++++++++++++++++++++---------------- dlls/ddraw/tests/ddraw7.c | 55 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 69 insertions(+), 33 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cf3b31f..411267c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -757,38 +757,47 @@ static ULONG WINAPI d3d_texture1_Release(IDirect3DTexture *iface) * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *iface, - DDSCAPS2 *Caps, IDirectDrawSurface7 **Surface) + DDSCAPS2 *caps, IDirectDrawSurface7 **surface) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); + struct ddraw_surface *head_surface = impl_from_IDirectDrawSurface7(iface); struct ddraw_surface *surf; DDSCAPS2 our_caps; int i; - TRACE("iface %p, caps %p, attachment %p.\n", iface, Caps, Surface); + TRACE("iface %p, caps %p, attachment %p.\n", iface, caps, surface); + + if (IDirectDrawSurface7_IsLost(&head_surface->IDirectDrawSurface7_iface) != DD_OK) + { + WARN("Surface %p is lost.\n", head_surface); + + *surface = NULL; + return DDERR_SURFACELOST; + } wined3d_mutex_lock(); - if(This->version < 7) + if(head_surface->version < 7) { /* Earlier dx apps put garbage into these members, clear them */ - our_caps.dwCaps = Caps->dwCaps; + our_caps.dwCaps = caps->dwCaps; our_caps.dwCaps2 = 0; our_caps.dwCaps3 = 0; our_caps.u1.dwCaps4 = 0; } else { - our_caps = *Caps; + our_caps = *caps; } - TRACE("(%p): Looking for caps: %x,%x,%x,%x\n", This, our_caps.dwCaps, our_caps.dwCaps2, our_caps.dwCaps3, our_caps.u1.dwCaps4); /* FIXME: Better debugging */ + TRACE("head_surface %p, looking for caps %#x, %#x, %#x, %#x.\n", head_surface, our_caps.dwCaps, + our_caps.dwCaps2, our_caps.dwCaps3, our_caps.u1.dwCaps4); /* FIXME: Better debugging */ for(i = 0; i < MAX_COMPLEX_ATTACHED; i++) { - surf = This->complex_array[i]; + surf = head_surface->complex_array[i]; if(!surf) break; - TRACE("Surface: (%p) caps: %#x, %#x, %#x, %#x.\n", surf, + TRACE("Surface %p, caps %#x, %#x, %#x, %#x.\n", surf, surf->surface_desc.ddsCaps.dwCaps, surf->surface_desc.ddsCaps.dwCaps2, surf->surface_desc.ddsCaps.dwCaps3, @@ -803,9 +812,9 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa * Not sure how to test this. */ - TRACE("(%p): Returning surface %p\n", This, surf); - *Surface = &surf->IDirectDrawSurface7_iface; - ddraw_surface7_AddRef(*Surface); + TRACE("head_surface %p, returning surface %p.\n", head_surface, surf); + *surface = &surf->IDirectDrawSurface7_iface; + ddraw_surface7_AddRef(*surface); wined3d_mutex_unlock(); return DD_OK; @@ -813,11 +822,11 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa } /* Next, look at the attachment chain */ - surf = This; + surf = head_surface; while( (surf = surf->next_attached) ) { - TRACE("Surface: (%p) caps: %#x, %#x, %#x, %#x.\n", surf, + TRACE("Surface %p, caps %#x, %#x, %#x, %#x.\n", surf, surf->surface_desc.ddsCaps.dwCaps, surf->surface_desc.ddsCaps.dwCaps2, surf->surface_desc.ddsCaps.dwCaps3, @@ -826,19 +835,19 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa if (((surf->surface_desc.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && ((surf->surface_desc.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) { - TRACE("(%p): Returning surface %p\n", This, surf); - *Surface = &surf->IDirectDrawSurface7_iface; - ddraw_surface7_AddRef(*Surface); + TRACE("head_surface %p, returning surface %p.\n", head_surface, surf); + *surface = &surf->IDirectDrawSurface7_iface; + ddraw_surface7_AddRef(*surface); wined3d_mutex_unlock(); return DD_OK; } } - TRACE("(%p) Didn't find a valid surface\n", This); + TRACE("head_surface %p, didn't find a valid surface.\n", head_surface); wined3d_mutex_unlock(); - *Surface = NULL; + *surface = NULL; return DDERR_NOTFOUND; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 49aab66..171e6a5 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -997,6 +997,7 @@ static void test_coop_level_d3d_state(void) IDirectDraw7 *ddraw; IDirect3D7 *d3d; D3DCOLOR color; + DDSCAPS2 caps; DWORD value; HWND window; HRESULT hr; @@ -1010,44 +1011,63 @@ static void test_coop_level_d3d_state(void) } hr = IDirect3DDevice7_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, TRUE); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice7_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); - ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirect3D7_Release(d3d); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(rt); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_ZBUFFER; + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + caps.dwCaps = DDSCAPS_FLIP; + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw7_RestoreAllSurfaces(ddraw); - ok(SUCCEEDED(hr), "Failed to restore surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + caps.dwCaps = DDSCAPS_ZBUFFER; + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(surface); + + caps.dwCaps = DDSCAPS_FLIP; + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + IDirectDraw7_Release(ddraw); hr = IDirect3DDevice7_GetRenderTarget(device, &surface); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface == rt, "Got unexpected surface %p.\n", surface); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); @@ -9012,11 +9032,12 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { - IDirectDrawSurface7 *surface; + IDirectDrawSurface7 *surface, *back_buffer; DDSURFACEDESC2 surface_desc; HWND window1, window2; IDirectDraw7 *ddraw; ULONG refcount; + DDSCAPS2 caps; HRESULT hr; BOOL ret; @@ -9186,6 +9207,12 @@ static void test_lost_device(void) hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_FLIP; + + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(surface); refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Jacek Caban : server: Report only one debug event per process at the time.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: c1a32a080f982d972247db3b8d42a37bea2385dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a32a080f982d972247db3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 15:05:36 2019 +0200 server: Report only one debug event per process at the time. Instead of one per thread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 7 +++++++ server/debugger.c | 10 +++++----- server/process.c | 1 + server/process.h | 1 + server/thread.c | 1 - server/thread.h | 1 - 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 7594b25..106c1c4 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -287,6 +287,9 @@ static void next_event_(unsigned line, struct debugger_context *ctx, unsigned ti static void process_attach_events(struct debugger_context *ctx) { + DEBUG_EVENT ev; + BOOL ret; + ctx->ev.dwDebugEventCode = -1; next_event(ctx, 0); ok(ctx->ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); @@ -304,6 +307,10 @@ static void process_attach_events(struct debugger_context *ctx) do { + /* even when there are more pending events, they are not reported until current event is continued */ + ret = WaitForDebugEvent(&ev, 10); + ok(GetLastError() == ERROR_SEM_TIMEOUT, "WaitForDebugEvent returned %x(%u)\n", ret, GetLastError()); + next_event(ctx, WAIT_EVENT_TIMEOUT); if (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) ok(ctx->ev.u.LoadDll.lpBaseOfDll != ntdll, "ntdll.dll reported out of order\n"); diff --git a/server/debugger.c b/server/debugger.c index 99e50aa..a5c39aa 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -244,7 +244,7 @@ static const fill_event_func fill_debug_event[NB_DEBUG_EVENTS] = static void unlink_event( struct debug_ctx *debug_ctx, struct debug_event *event ) { list_remove( &event->entry ); - if (event->sender->debug_event == event) event->sender->debug_event = NULL; + if (event->sender->process->debug_event == event) event->sender->process->debug_event = NULL; release_object( event ); } @@ -256,7 +256,7 @@ static void link_event( struct debug_event *event ) assert( debug_ctx ); grab_object( event ); list_add_tail( &debug_ctx->event_queue, &event->entry ); - if (!event->sender->debug_event) + if (!event->sender->process->debug_event) { /* grab reference since debugger could be killed while trying to wake up */ grab_object( debug_ctx ); @@ -273,7 +273,7 @@ static struct debug_event *find_event_to_send( struct debug_ctx *debug_ctx ) LIST_FOR_EACH_ENTRY( event, &debug_ctx->event_queue, struct debug_event, entry ) { if (event->state == EVENT_SENT) continue; /* already sent */ - if (event->sender->debug_event) continue; /* thread busy with another one */ + if (event->sender->process->debug_event) continue; /* process busy with another one */ return event; } return NULL; @@ -371,7 +371,7 @@ static int continue_debug_event( struct process *process, struct thread *thread, if (event->state != EVENT_SENT) continue; if (event->sender == thread) { - assert( event->sender->debug_event == event ); + assert( event->sender->process->debug_event == event ); event->status = status; event->state = EVENT_CONTINUED; @@ -594,7 +594,7 @@ DECL_HANDLER(wait_debug_event) { data_size_t size = get_reply_max_size(); event->state = EVENT_SENT; - event->sender->debug_event = event; + event->sender->process->debug_event = event; reply->pid = get_process_id( event->sender->process ); reply->tid = get_thread_id( event->sender ); if (size > sizeof(debug_event_t)) size = sizeof(debug_event_t); diff --git a/server/process.c b/server/process.c index b67bd88..16bb5d5 100644 --- a/server/process.c +++ b/server/process.c @@ -502,6 +502,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all, } process->parent_id = 0; process->debugger = NULL; + process->debug_event = NULL; process->handles = NULL; process->msg_fd = NULL; process->sigkill_timeout = NULL; diff --git a/server/process.h b/server/process.h index 20503a2..20ff6be 100644 --- a/server/process.h +++ b/server/process.h @@ -57,6 +57,7 @@ struct process process_id_t parent_id; /* parent process id (at the time of creation) */ struct list thread_list; /* thread list */ struct thread *debugger; /* thread debugging this process */ + struct debug_event *debug_event; /* debug event being sent to debugger */ struct handle_table *handles; /* handle entries */ struct fd *msg_fd; /* fd for sendmsg/recvmsg */ process_id_t id; /* id of the process */ diff --git a/server/thread.c b/server/thread.c index d5742a1..e753c8d 100644 --- a/server/thread.c +++ b/server/thread.c @@ -184,7 +184,6 @@ static inline void init_thread_structure( struct thread *thread ) thread->teb = 0; thread->entry_point = 0; thread->debug_ctx = NULL; - thread->debug_event = NULL; thread->system_regs = 0; thread->queue = NULL; thread->wait = NULL; diff --git a/server/thread.h b/server/thread.h index 40f0eec..e10120d 100644 --- a/server/thread.h +++ b/server/thread.h @@ -55,7 +55,6 @@ struct thread thread_id_t id; /* thread id */ struct list mutex_list; /* list of currently owned mutexes */ struct debug_ctx *debug_ctx; /* debugger context if this thread is a debugger */ - struct debug_event *debug_event; /* debug event being sent to debugger */ unsigned int system_regs; /* which system regs have been set */ struct msg_queue *queue; /* message queue */ struct thread_wait *wait; /* current wait condition if sleeping */

1 0

Jacek Caban : kernel32/tests: Improve timeout handling in debugger tests.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: wine Branch: master Commit: 6b46a4d24aa6030724a74ec5e21f7299af416ec7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b46a4d24aa6030724a74ec5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 15:05:17 2019 +0200 kernel32/tests: Improve timeout handling in debugger tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index bc12ea8..7594b25 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -226,6 +226,9 @@ struct debugger_context void *image_base; }; +#define WAIT_EVENT_TIMEOUT 20000 +#define POLL_EVENT_TIMEOUT 200 + #define next_event(a,b) next_event_(__LINE__,a,b) static void next_event_(unsigned line, struct debugger_context *ctx, unsigned timeout) { @@ -301,7 +304,7 @@ static void process_attach_events(struct debugger_context *ctx) do { - next_event(ctx, 2000); + next_event(ctx, WAIT_EVENT_TIMEOUT); if (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) ok(ctx->ev.u.LoadDll.lpBaseOfDll != ntdll, "ntdll.dll reported out of order\n"); } while (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == UNLOAD_DLL_DEBUG_EVENT); @@ -312,7 +315,7 @@ static void process_attach_events(struct debugger_context *ctx) if (ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT) { DWORD last_thread = ctx->ev.dwThreadId; - next_event(ctx, 2000); + next_event(ctx, WAIT_EVENT_TIMEOUT); ok(ctx->ev.dwThreadId == last_thread, "unexpected thread\n"); } @@ -322,7 +325,7 @@ static void process_attach_events(struct debugger_context *ctx) ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddres != DbgBreakPoint\n"); /* flush debug events */ - do next_event(ctx, 200); + do next_event(ctx, POLL_EVENT_TIMEOUT); while (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == UNLOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT || ctx->ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT); ok(ctx->ev.dwDebugEventCode == -1, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); @@ -370,7 +373,7 @@ static void doDebugger(int argc, char** argv) if (strstr(myARGV[2], "process")) { - next_event(&ctx, 2000); + next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == STATUS_ACCESS_VIOLATION, "ExceptionCode = %x\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); @@ -958,7 +961,7 @@ static void test_debug_children(char *name, DWORD flag, BOOL debug_child) if (flag) { - next_event(&ctx, 2000); + next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); ok(ctx.pid == pi.dwProcessId, "unexpected dwProcessId %x\n", ctx.ev.dwProcessId == ctx.pid);

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2019