winex11: Get rid of the old ddraw HAL support.

dlls/winex11.drv/Makefile.in

@@ -30,7 +30,6 @@ C_SRCS = \
 	text.c \
 	window.c \
 	wintab.c \
-	x11ddraw.c \
 	x11drv_main.c \
 	xdnd.c \
 	xfont.c \

dlls/winex11.drv/init.c

@@ -304,15 +304,6 @@ INT CDECL X11DRV_ExtEscape( X11DRV_PDEVICE *physDev, INT escape, INT in_count, L
         }
         break;
 
-    case DCICOMMAND:
-        if (in_data)
-        {
-            const DCICMD *lpCmd = in_data;
-            if (lpCmd->dwVersion != DD_VERSION) break;
-            return X11DRV_DCICommand(in_count, lpCmd, out_data);
-        }
-        break;
-
     case X11DRV_ESCAPE:
         if (in_data && in_count >= sizeof(enum x11drv_escape_codes))
         {

dlls/winex11.drv/settings.c

@@ -31,7 +31,6 @@
 #include "windef.h"
 #include "winreg.h"
 #include "wingdi.h"
-#include "ddrawi.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(x11settings);
@@ -439,39 +438,3 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode,
         devmode->dmBitsPerPel, devmode->dmDisplayFrequency, handler_name);
     return DISP_CHANGE_BADMODE;
 }
-
-
-
-
-/***********************************************************************
- * DirectDraw HAL interface
- *
- */
-static DWORD PASCAL X11DRV_Settings_SetMode(LPDDHAL_SETMODEDATA data)
-{
-    TRACE("Mode %d requested by DDHAL (%s)\n", data->dwModeIndex, handler_name);
-    switch (pSetCurrentMode(data->dwModeIndex))
-    {
-    case DISP_CHANGE_SUCCESSFUL:
-        X11DRV_DDHAL_SwitchMode(data->dwModeIndex, NULL, NULL);
-        data->ddRVal = DD_OK;
-        break;
-    case DISP_CHANGE_BADMODE:
-        data->ddRVal = DDERR_WRONGMODE;
-        break;
-    default:
-        data->ddRVal = DDERR_UNSUPPORTEDMODE;
-    }
-    return DDHAL_DRIVER_HANDLED;
-}
-int X11DRV_Settings_CreateDriver(LPDDHALINFO info)
-{
-    if (!dd_mode_count) return 0; /* no settings defined */
-
-    TRACE("Setting up display settings for DDRAW (%s)\n", handler_name);
-    info->dwNumModes = dd_mode_count;
-    info->lpModeInfo = dd_modes;
-    X11DRV_DDHAL_SwitchMode(pGetCurrentMode(), NULL, NULL);
-    info->lpDDCallbacks->SetMode = X11DRV_Settings_SetMode;
-    return TRUE;
-}

dlls/winex11.drv/x11drv.h

@@ -466,8 +466,6 @@ extern void X11DRV_DIB_DeleteDIBSection(X_PHYSBITMAP *physBitmap, DIBSECTION *di
 extern void X11DRV_DIB_CopyDIBSection(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst,
                                       DWORD xSrc, DWORD ySrc, DWORD xDest, DWORD yDest,
                                       DWORD width, DWORD height);
-struct _DCICMD;
-extern INT X11DRV_DCICommand(INT cbInput, const struct _DCICMD *lpCmd, LPVOID lpOutData);
 
 /**************************************************************************
  * X11 GDI driver
@@ -593,7 +591,6 @@ extern unsigned int screen_bpp;
 extern unsigned int screen_depth;
 extern RECT virtual_screen_rect;
 extern unsigned int text_caps;
-extern int dxgrab;
 extern int use_xkb;
 extern int use_take_focus;
 extern int use_primary_selection;
@@ -848,8 +845,6 @@ LPDDHALMODEINFO X11DRV_Settings_SetHandlers(const char *name,
                                             unsigned int nmodes,
                                             int reserve_depths);
 
-extern void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM fb_mem);
-
 /* XIM support */
 extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN;
 extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN;

dlls/winex11.drv/x11drv_main.c

@@ -75,7 +75,6 @@ unsigned int screen_bpp;
 unsigned int screen_depth;
 RECT virtual_screen_rect;
 Window root_window;
-int dxgrab = 0;
 int usexvidmode = 1;
 int usexrandr = 1;
 int usexcomposite = 1;
@@ -406,9 +405,6 @@ static void setup_options(void)
     if (!get_config_key( hkey, appkey, "Decorated", buffer, sizeof(buffer) ))
         decorated_mode = IS_OPTION_TRUE( buffer[0] );
 
-    if (!get_config_key( hkey, appkey, "DXGrab", buffer, sizeof(buffer) ))
-        dxgrab = IS_OPTION_TRUE( buffer[0] );
-
     if (!get_config_key( hkey, appkey, "UseXVidMode", buffer, sizeof(buffer) ))
         usexvidmode = IS_OPTION_TRUE( buffer[0] );