diff options
| author | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2012-09-20 21:49:40 -0700 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2012-10-14 17:42:25 -0700 |
| commit | 01aac1f533d211c90a50127cc82a56bebb44dd0d (patch) | |
| tree | a7295e672cf6fbaaf062f31d86d08a4de783c800 | |
| parent | 9422321b37ddafb5b12f259842e10c7803039857 (diff) | |
XQuartz: Avoid a possible deadlock with DRI on OS X 10.7.5 and OS X 10.8.2server-1.12-branch
<rdar://problem/12338921>
http://bugs.winehq.org/show_bug.cgi?id=31751
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 25d26875bc9bd6fd23ae1b5280f015abf1b033b7)
| -rw-r--r-- | hw/xquartz/xpr/dri.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c index 002ec94a7..9bac56851 100644 --- a/hw/xquartz/xpr/dri.c +++ b/hw/xquartz/xpr/dri.c @@ -68,6 +68,7 @@ #include "mi.h" #include "mipointer.h" #include "rootless.h" +#include "rootlessCommon.h" #include "x-hash.h" #include "x-hook.h" #include "driWrap.h" @@ -384,6 +385,11 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id, DRIDrawablePrivPtr pDRIDrawablePriv; if (pDrawable->type == DRAWABLE_WINDOW) { + /* <rdar://problem/12338921> + * http://bugs.winehq.org/show_bug.cgi?id=31751 + */ + RootlessStopDrawing((WindowPtr)pDrawable, FALSE); + pDRIDrawablePriv = CreateSurfaceForWindow(pScreen, (WindowPtr)pDrawable, &wid); |