From 416240b781bc303983562b84ef08eb279d69311e Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 3 May 2012 12:50:52 +0200
Subject: [PATCH] winex11: Remove obsolete escapes.

---
 dlls/winex11.drv/init.c   | 21 ---------------------
 dlls/winex11.drv/x11drv.h |  7 -------
 2 files changed, 28 deletions(-)

diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index b1b52c02fb7..051b293205f 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -343,20 +343,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d
         {
             switch(*(const enum x11drv_escape_codes *)in_data)
             {
-            case X11DRV_GET_DISPLAY:
-                if (out_count >= sizeof(Display *))
-                {
-                    *(Display **)out_data = gdi_display;
-                    return TRUE;
-                }
-                break;
-            case X11DRV_GET_DRAWABLE:
-                if (out_count >= sizeof(Drawable))
-                {
-                    *(Drawable *)out_data = physDev->drawable;
-                    return TRUE;
-                }
-                break;
             case X11DRV_SET_DRAWABLE:
                 if (in_count >= sizeof(struct x11drv_escape_set_drawable))
                 {
@@ -437,13 +423,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d
                     return TRUE;
                 }
                 break;
-            case X11DRV_GET_FONT:
-            case X11DRV_GET_DCE:
-            case X11DRV_SET_DCE:
-            case X11DRV_GET_GLX_DRAWABLE:
-            case X11DRV_SYNC_PIXMAP:
-                FIXME( "%x escape no longer supported\n", *(const enum x11drv_escape_codes *)in_data );
-                break;
             case X11DRV_FLUSH_GL_DRAWABLE:
                 flush_gl_drawable(physDev);
                 return TRUE;
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index e9985bb26fa..58ecf599c09 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -329,16 +329,9 @@ extern void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long
 #define X11DRV_ESCAPE 6789
 enum x11drv_escape_codes
 {
-    X11DRV_GET_DISPLAY,      /* get X11 display for a DC */
-    X11DRV_GET_DRAWABLE,     /* get current drawable for a DC */
-    X11DRV_GET_FONT,         /* get current X font for a DC */
     X11DRV_SET_DRAWABLE,     /* set current drawable for a DC */
     X11DRV_START_EXPOSURES,  /* start graphics exposures */
     X11DRV_END_EXPOSURES,    /* end graphics exposures */
-    X11DRV_GET_DCE,          /* no longer used */
-    X11DRV_SET_DCE,          /* no longer used */
-    X11DRV_GET_GLX_DRAWABLE, /* get current glx drawable for a DC */
-    X11DRV_SYNC_PIXMAP,      /* sync the dibsection to its pixmap */
     X11DRV_FLUSH_GL_DRAWABLE /* flush changes made to the gl drawable */
 };