From 0159c070110b7fb2c50a4202ccd01ac184f3642a Mon Sep 17 00:00:00 2001
From: Greg Turner <gmturner007@ameritech.net>
Date: Fri, 25 Oct 2002 21:04:35 +0000
Subject: [PATCH] Avoid X11 error during DGA detection.

---
 dlls/x11drv/dga2.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dlls/x11drv/dga2.c b/dlls/x11drv/dga2.c
index 3ed01c1b66c..3b12b3d0867 100644
--- a/dlls/x11drv/dga2.c
+++ b/dlls/x11drv/dga2.c
@@ -69,6 +69,8 @@ void X11DRV_XF86DGA2_Init(void)
   int nmodes, major, minor, i;
   Bool ok;
 
+  TRACE("\n");
+
   if (xf86dga2_modes) return; /* already initialized? */
 
   /* if in desktop mode, don't use DGA */
@@ -91,7 +93,10 @@ void X11DRV_XF86DGA2_Init(void)
 
   /* test that it works */
   wine_tsx11_lock();
-  if ((ok = XDGAOpenFramebuffer(gdi_display, DefaultScreen(gdi_display))))
+  X11DRV_expect_error(gdi_display, DGA2ErrorHandler, NULL);
+  ok = XDGAOpenFramebuffer(gdi_display, DefaultScreen(gdi_display));
+  if (X11DRV_check_error()) ok = FALSE;
+  if (ok)
   {
       XDGACloseFramebuffer(gdi_display, DefaultScreen(gdi_display));
       /* retrieve modes */