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

Piotr Caban : msvcrt: Destroy exception object when frame storing it is unwound.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: f085be3028e86ebc6666d20a4802831bf7b3f3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f085be3028e86ebc6666d20a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 15 13:41:20 2016 +0100 msvcrt: Destroy exception object when frame storing it is unwound. Thrown object was incorrectly freed in following situation: try { throw obj; } catch(object &obj) { try { throw 1; } catch(...) {} //use object here } Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 56165c0..78ce488 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -131,6 +131,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, const cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ); +BOOL __cdecl _IsExceptionObjectToBeDestroyed(const void*); /* call a function with a given ebp */ static inline void *call_ebp_func( void *func, void *ebp ) @@ -361,9 +362,18 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { struct catch_func_nested_frame *nested_frame = (struct catch_func_nested_frame *)frame; + PEXCEPTION_RECORD prev_rec = nested_frame->rec; if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) { + if (prev_rec->ExceptionCode == CXX_EXCEPTION) + { + void *object = (void*)prev_rec->ExceptionInformation[1]; + cxx_exception_type *info = (cxx_exception_type*) prev_rec->ExceptionInformation[2]; + if (info && info->destructor && _IsExceptionObjectToBeDestroyed(object)) + call_dtor( info->destructor, object); + } + msvcrt_get_thread_data()->exc_record = nested_frame->prev_rec; return ExceptionContinueSearch; } @@ -372,7 +382,6 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG if(rec->ExceptionCode == CXX_EXCEPTION) { - PEXCEPTION_RECORD prev_rec = nested_frame->rec; if((rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) || (prev_rec->ExceptionCode == CXX_EXCEPTION && rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && @@ -388,22 +397,6 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } } - else if (nested_frame->prev_rec && nested_frame->prev_rec->ExceptionCode == CXX_EXCEPTION && - nested_frame->prev_rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && - nested_frame->prev_rec->ExceptionInformation[2] == prev_rec->ExceptionInformation[2]) - { - TRACE("detect threw new exception in catch block - not owning old(obj: %lx type: %lx)\n", - prev_rec->ExceptionInformation[1], prev_rec->ExceptionInformation[2]); - } - else if (prev_rec->ExceptionCode == CXX_EXCEPTION) { - /* new exception in exception handler, destroy old */ - void *object = (void*)prev_rec->ExceptionInformation[1]; - cxx_exception_type *info = (cxx_exception_type*) prev_rec->ExceptionInformation[2]; - TRACE("detect threw new exception in catch block - destroy old(obj: %p type: %p)\n", - object, info); - if(info && info->destructor) - call_dtor( info->destructor, object ); - } else { TRACE("detect threw new exception in catch block\n");

1 0

Sebastian Lackner : services: Fix a typo.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 4a3d712608e3651394d952730bac89f4ffbd8c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3d712608e3651394d952730… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:28:32 2016 +0100 services: Fix a typo. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index c49dad3..78baaf2 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -103,7 +103,7 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) } if ((err = process_create(&(*entry)->process)) != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, (*entry)->process); + HeapFree(GetProcessHeap(), 0, (*entry)->name); HeapFree(GetProcessHeap(), 0, *entry); return err; }

1 0

Sebastian Lackner : services: Hold scmdatabase lock while checking marked_for_delete.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 38a09f9c7bb2b29287bb24dc9cb7053ca0c5303c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a09f9c7bb2b29287bb24dc9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:30:39 2016 +0100 services: Hold scmdatabase lock while checking marked_for_delete. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 78baaf2..9f7e889 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -456,13 +456,15 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase void release_service(struct service_entry *service) { + struct scmdatabase *db = service->db; + + scmdatabase_lock(db); if (InterlockedDecrement(&service->ref_count) == 0 && is_marked_for_delete(service)) { - scmdatabase_lock(service->db); - scmdatabase_remove_service(service->db, service); - scmdatabase_unlock(service->db); + scmdatabase_remove_service(db, service); free_service_entry(service); } + scmdatabase_unlock(db); } static DWORD scmdatabase_create(struct scmdatabase **db)

1 0

Henri Verbeet : wined3d: Allow swapchain sample counts to be overridden with a registry key.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 91f0b0010347fc501ba6c0ad7179dd23c9dfa142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f0b0010347fc501ba6c0ad7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:08 2016 +0100 wined3d: Allow swapchain sample counts to be overridden with a registry key. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_main.c | 4 ++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 31 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9f3a36b..3033773 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -814,6 +814,28 @@ static void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) swapchain->render_to_fbo = TRUE; } +static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_swapchain *swapchain, + enum wined3d_format_id format_id, enum wined3d_multisample_type *type, DWORD *quality) +{ + const struct wined3d_gl_info *gl_info; + const struct wined3d_format *format; + enum wined3d_multisample_type t; + + if (wined3d_settings.sample_count == ~0u) + return; + + gl_info = &swapchain->device->adapter->gl_info; + if (!(format = wined3d_get_format(gl_info, format_id))) + return; + + if ((t = min(wined3d_settings.sample_count, gl_info->limits.samples))) + while (!(format->multisample_types & 1u << (t - 1))) + ++t; + TRACE("Using sample count %u.\n", t); + *type = t; + *quality = 0; +} + static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -878,6 +900,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 } } swapchain->desc = *desc; + wined3d_swapchain_apply_sample_count_override(swapchain, swapchain->desc.backbuffer_format, + &swapchain->desc.multisample_type, &swapchain->desc.multisample_quality); swapchain_update_render_to_fbo(swapchain); TRACE("Creating front buffer.\n"); @@ -1277,6 +1301,8 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha swapchain, buffer_count, width, height, debug_d3dformat(format_id), multisample_type, multisample_quality); + wined3d_swapchain_apply_sample_count_override(swapchain, format_id, &multisample_type, &multisample_quality); + if (buffer_count && buffer_count != swapchain->desc.backbuffer_count) FIXME("Cannot change the back buffer count yet.\n"); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 45e41ad..71dc180 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -80,6 +80,7 @@ struct wined3d_settings wined3d_settings = 0, /* The default of memory is set in init_driver_info */ NULL, /* No wine logo by default */ TRUE, /* Multisampling enabled by default. */ + ~0u, /* Don't force a specific sample count by default. */ FALSE, /* No strict draw ordering. */ TRUE, /* Don't try to render onscreen by default. */ FALSE, /* Don't range check relative addressing indices in float constants. */ @@ -291,6 +292,9 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.allow_multisampling = FALSE; } } + if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count)) + ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n", + wined3d_settings.sample_count); if (!get_config_key(hkey, appkey, "StrictDrawOrdering", buffer, size) && !strcmp(buffer,"enabled")) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23d8565..206cac5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -288,6 +288,7 @@ struct wined3d_settings UINT64 emulated_textureram; char *logo; int allow_multisampling; + unsigned int sample_count; BOOL strict_draw_ordering; BOOL always_offscreen; BOOL check_float_constants;

1 0

Henri Verbeet : ddraw: Do not destroy surfaces that are still attached.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 9ff40749f92d773f6aed74ba5e018daf8e3838f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff40749f92d773f6aed74ba5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:09 2016 +0100 ddraw: Do not destroy surfaces that are still attached. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d133e7e..4259c10 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -531,7 +531,14 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) ULONG ddraw_surface_release_iface(struct ddraw_surface *This) { - ULONG iface_count = InterlockedDecrement(&This->iface_count); + ULONG iface_count; + + /* Prevent the surface from being destroyed if it's still attached to + * another surface. It will be destroyed when the root is destroyed. */ + if (This->iface_count == 1 && This->attached_iface) + IUnknown_AddRef(This->attached_iface); + iface_count = InterlockedDecrement(&This->iface_count); + TRACE("%p decreasing iface count to %u.\n", This, iface_count); if (iface_count == 0) @@ -5623,20 +5630,10 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren TRACE("surface %p.\n", surface); - /* Check for attached surfaces and detach them. */ + /* This shouldn't happen, ddraw_surface_release_iface() should prevent the + * surface from being destroyed in this case. */ if (surface->first_attached != surface) - { - /* Well, this shouldn't happen: The surface being attached is - * referenced in AddAttachedSurface(), so it shouldn't be released - * until DeleteAttachedSurface() is called, because the refcount is - * held. It looks like the application released it often enough to - * force this. */ - WARN("Surface is still attached to surface %p.\n", surface->first_attached); - - /* The refcount will drop to -1 here */ - if (FAILED(ddraw_surface_delete_attached_surface(surface->first_attached, surface, surface->attached_iface))) - ERR("DeleteAttachedSurface failed.\n"); - } + ERR("Surface is still attached to surface %p.\n", surface->first_attached); while (surface->next_attached) if (FAILED(ddraw_surface_delete_attached_surface(surface,

1 0

Henri Verbeet : ddraw: Avoid d3d_device_update_depth_stencil() in ddraw_surface_delete_attached_surface().
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 130bd9d8c73a5199524645ce5f83544646c80642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=130bd9d8c73a5199524645ce5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:10 2016 +0100 ddraw: Avoid d3d_device_update_depth_stencil() in ddraw_surface_delete_attached_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4259c10..9e28655 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1997,9 +1997,14 @@ static HRESULT ddraw_surface_delete_attached_surface(struct ddraw_surface *surfa attachment->next_attached = NULL; attachment->first_attached = attachment; - /* Check if the wined3d depth stencil needs updating. */ - if (surface->ddraw->d3ddevice) - d3d_device_update_depth_stencil(surface->ddraw->d3ddevice); + /* Check if the wined3d depth stencil needs updating. Note that we don't + * just call d3d_device_update_depth_stencil() here since it uses + * QueryInterface(). Some applications, SCP - Containment Breach in + * particular, modify the QueryInterface() pointer in the surface vtbl + * but don't cleanup properly after the relevant dll is unloaded. */ + if (attachment->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER + && wined3d_device_get_depth_stencil_view(surface->ddraw->wined3d_device) == surface->wined3d_rtv) + wined3d_device_set_depth_stencil_view(surface->ddraw->wined3d_device, NULL); wined3d_mutex_unlock(); /* Set attached_iface to NULL before releasing it, the surface may go

1 0

Henri Verbeet : ddraw: Just return an error if we failed to find the predecessor in ddraw_surface_delete_attached_surface ().
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 644724d32cf832db895c4ed58a1e0ac31363077c URL: http://source.winehq.org/git/wine.git/?a=commit;h=644724d32cf832db895c4ed58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 15 16:55:11 2016 +0100 ddraw: Just return an error if we failed to find the predecessor in ddraw_surface_delete_attached_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9e28655..3709b94 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1982,16 +1982,16 @@ static HRESULT ddraw_surface_delete_attached_surface(struct ddraw_surface *surfa } /* Find the predecessor of the detached surface */ - while (prev) + while (prev->next_attached != attachment) { - if (prev->next_attached == attachment) - break; - prev = prev->next_attached; + if (!(prev = prev->next_attached)) + { + ERR("Failed to find predecessor of %p.\n", attachment); + wined3d_mutex_unlock(); + return DDERR_SURFACENOTATTACHED; + } } - /* There must be a surface, otherwise there's a bug */ - assert(prev); - /* Unchain the surface */ prev->next_attached = attachment->next_attached; attachment->next_attached = NULL;

1 0

Józef Kucia : d3d10core/tests: Move typeless textures test to test_create_texture{2d, 3d}().
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: d4c9ba84272793053a1a2d5f24d2cb640c2bd09f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c9ba84272793053a1a2d5f2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:42 2016 +0100 d3d10core/tests: Move typeless textures test to test_create_texture{2d, 3d}(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 180 ++++++++++++++++++------------------------ 1 file changed, 77 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4c9ba84272793053a1a2…

1 0

Józef Kucia : d3d11/tests: Move typeless textures test to test_create_texture{2d, 3d}().
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: 75c9178c9808544090e38c4362bed965570b369e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c9178c9808544090e38c436… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:43 2016 +0100 d3d11/tests: Move typeless textures test to test_create_texture{2d, 3d}(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 180 ++++++++++++++++++++--------------------------- 1 file changed, 77 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75c9178c9808544090e38…

1 0

Józef Kucia : d3d11/tests: Add more create texture tests.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: d6bef36f229ad2570be5308f715f684d6f2dcedc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bef36f229ad2570be5308f7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 15 10:52:44 2016 +0100 d3d11/tests: Add more create texture tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d707067..ebed409 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -759,6 +759,9 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R8_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, TRUE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, TRUE}, + {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, TRUE}, }; if (!(device = create_device(NULL))) @@ -1065,9 +1068,15 @@ static void test_create_texture3d(void) } tests[] = { + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_VERTEX_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_INDEX_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_CONSTANT_BUFFER, FALSE, TRUE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, TRUE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, TRUE}, + {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, TRUE}, }; if (!(device = create_device(NULL)))

1 0