Skip to content

W
wine-cw
Commit 7a36efc3 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard
Browse files
Options

wined3d: Avoid accessing the device after minimize in ddraw.

Signed-off-by: 's avatarStefan Dösinger <stefan@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 222d3075
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
dlls/wined3d/swapchain.c
View file @ 7a36efc3
......@@ -1132,13 +1132,15 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa
{
struct wined3d_device *device = swapchain->device;
BOOL filter_messages = device->filter_messages;
BOOL focus_messages = device->wined3d->flags & WINED3D_FOCUS_MESSAGES;
/* This code is not protected by the wined3d mutex, so it may run while
* wined3d_device_reset is active. Testing on Windows shows that changing
* focus during resets and resetting during focus change events causes
* the application to crash with an invalid memory access. */
device->filter_messages = !(device->wined3d->flags & WINED3D_FOCUS_MESSAGES);
if (!focus_messages)
device->filter_messages = 1;
if (activate)
{
......@@ -1190,7 +1192,8 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa
ShowWindow(swapchain->device_window, SW_MINIMIZE);
}
device->filter_messages = filter_messages;
if (!focus_messages)
device->filter_messages = filter_messages;
}
HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapchain, unsigned int buffer_count,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment