ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Don't take the wined3d mutex during WM_DISPLAYCHANGE either.

This commit is contained in:
Henri Verbeet 2012-02-21 10:02:13 +01:00 committed by Alexandre Julliard
parent 40b15a380d
commit ed47f259bd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ddraw/ddraw.c
View File

@ -5359,6 +5359,8 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par
TRACE("device_parent %p, device %p.\n", device_parent, device); TRACE("device_parent %p, device %p.\n", device_parent, device);
} }
/* This is run from device_process_message() in wined3d, we can't take the
* wined3d mutex. */
static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent)
{ {
struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent);

2
dlls/wined3d/device.c
View File

@ -5912,9 +5912,7 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
} }
else if (message == WM_DISPLAYCHANGE) else if (message == WM_DISPLAYCHANGE)
{ {
wined3d_mutex_lock();
device->device_parent->ops->mode_changed(device->device_parent); device->device_parent->ops->mode_changed(device->device_parent);
wined3d_mutex_unlock();
} }
if (unicode) if (unicode)