From 67d39034b997ea5dcf8668093d9a33ec26e00828 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 11 Jan 2001 20:32:45 +0000
Subject: [PATCH] No longer used.

---
 dlls/ddraw/dga.c  | 193 ----------------------------------------------
 dlls/ddraw/dga2.c | 185 --------------------------------------------
 2 files changed, 378 deletions(-)
 delete mode 100644 dlls/ddraw/dga.c
 delete mode 100644 dlls/ddraw/dga2.c

diff --git a/dlls/ddraw/dga.c b/dlls/ddraw/dga.c
deleted file mode 100644
index 4acb9bd17b1..00000000000
--- a/dlls/ddraw/dga.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*		DirectDraw using DGA
- *
- * Copyright 1997-2000 Marcus Meissner
- * Copyright 1998-2000 Lionel Ulmer (most of Direct3D stuff)
- */
-/* XF86DGA:
- * When DirectVideo mode is enabled you can no longer use 'normal' X 
- * applications nor can you switch to a virtual console. Also, enabling
- * only works, if you have switched to the screen where the application
- * is running.
- * Some ways to debug this stuff are:
- * - A terminal connected to the serial port. Can be bought used for cheap.
- *   (This is the method I am using.)
- * - Another machine connected over some kind of network.
- */
-
-#include "config.h"
-#include "winerror.h"
-
-#include <unistd.h>
-#include <assert.h>
-#ifdef HAVE_SYS_SIGNAL_H
-# include <sys/signal.h>
-#endif
-#include <fcntl.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "heap.h"
-#include "wine/exception.h"
-#include "ddraw.h"
-#include "d3d.h"
-#include "debugtools.h"
-#include "options.h"
-
-#include "dga_private.h"
-
-#define RESTORE__SIGNALS
-
-DEFAULT_DEBUG_CHANNEL(ddraw);
-
-#ifdef HAVE_LIBXXF86VM
-XF86VidModeModeInfo *orig_mode = NULL;
-#endif
-
-static inline BOOL get_option( const char *name, BOOL def ) {
-    return PROFILE_GetWineIniBool( "x11drv", name, def );
-}
-
-static BYTE
-DDRAW_DGA_Available(void)
-{
-    int fd, evbase, evret, majver, minver;
-    static BYTE return_value = 0xFF;
-
-    /* This prevents from probing X times for DGA */
-    if (return_value != 0xFF)
-	return return_value;
-
-    if (!get_option( "UseDGA", 1 )) {
-	TRACE("UseDGA disabled.\n");
-	return_value = 0;
-	return 0;
-    }
-
-    /* First, query the extenstion and its version */
-    if (!TSXF86DGAQueryExtension(display,&evbase,&evret)) {
-	TRACE("DGA extension not detected.\n");
-	return_value = 0;
-	return 0;
-    }
-
-    if (!TSXF86DGAQueryVersion(display,&majver,&minver)) {
-	TRACE("DGA version not detected.\n");
-	return_value = 0;
-	return 0;
-    }
-
-    /* You don't have to be root to use DGA extensions. Simply having access
-     * to /dev/mem will do the trick
-     * This can be achieved by adding the user to the "kmem" group on
-     * Debian 2.x systems, don't know about 
-     * others. --stephenc
-     */
-    if ((fd = open("/dev/mem", O_RDWR)) != -1)
-	close(fd);
-
-    if (fd != -1)
-	return_value = 1;
-    else {
-	TRACE("You have no access to /dev/mem\n");
-	return_value = 0;
-    }
-    return return_value;
-}
-
-HRESULT 
-DGA_Create( LPDIRECTDRAW *lplpDD ) {
-    IDirectDrawImpl*		ddraw;
-    dga_dd_private*	dgpriv;
-    int  memsize,banksize,major,minor,flags;
-    char *addr;
-    int  depth;
-    int  dga_version;
-    int  width, height;
-      
-    /* Get DGA availability / version */
-    dga_version = DDRAW_DGA_Available();
-    if (dga_version == 0)
-	return DDERR_GENERIC;
-
-    /* If we were just testing ... return OK */
-    if (lplpDD == NULL)
-	return DD_OK;
-
-    ddraw = (IDirectDrawImpl*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectDrawImpl));
-    *lplpDD = (LPDIRECTDRAW)ddraw;
-    ddraw->ref = 1;
-    ICOM_VTBL(ddraw) = &dga_ddvt;
-    ddraw->d = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*(ddraw->d)));
-    ddraw->d->ref = 1;
-    ddraw->d->private = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(dga_dd_private));
-    dgpriv = (dga_dd_private*)ddraw->d->private;
-
-    TSXF86DGAQueryVersion(display,&major,&minor);
-    TRACE("XF86DGA is version %d.%d\n",major,minor);
-    
-    TSXF86DGAQueryDirectVideo(display,DefaultScreen(display),&flags);
-    if (!(flags & XF86DGADirectPresent)) {
-      /* On some boards, DGA extension is present but does not support DirectVideo */
-      MESSAGE("direct video is NOT PRESENT.\n");
-      return DDERR_GENERIC;
-    }
-    TSXF86DGAGetVideo(display,DefaultScreen(display),&addr,&width,&banksize,&memsize);
-    dgpriv->fb_width = width;
-    TSXF86DGAGetViewPortSize(display,DefaultScreen(display),&width,&height);
-    TSXF86DGASetViewPort(display,DefaultScreen(display),0,0);
-    dgpriv->fb_height = height;
-    TRACE("video framebuffer: begin %p, width %d,banksize %d,memsize %d\n",
-	  addr,width,banksize,memsize
-	  );
-    TRACE("viewport height: %d\n",height);
-    /* Get the screen dimensions as seen by Wine.
-     * In that case, it may be better to ignore the -desktop mode and
-     * return the real screen size => print a warning
-     */
-    ddraw->d->height = GetSystemMetrics(SM_CYSCREEN);
-    ddraw->d->width = GetSystemMetrics(SM_CXSCREEN);
-    if ((ddraw->d->height != height) || (ddraw->d->width  != width))
-      WARN("You seem to be running in -desktop mode. This may prove dangerous in DGA mode...\n");
-    dgpriv->fb_addr		= addr;
-    dgpriv->fb_memsize	= memsize;
-    dgpriv->vpmask		= 0;
-
-    /* Register frame buffer with the kernel, it is a potential DIB section */
-    VirtualAlloc(dgpriv->fb_addr, dgpriv->fb_memsize, MEM_RESERVE|MEM_SYSTEM, PAGE_READWRITE);
-
-    /* The cast is because DGA2's install colormap does not return a value whereas
-       DGA1 version does */
-    dgpriv->InstallColormap = (void (*)(Display *, int, Colormap)) TSXF86DGAInstallColormap;
-    
-    /* just assume the default depth is the DGA depth too */
-    depth = DefaultDepthOfScreen(X11DRV_GetXScreen());
-    
-    _common_depth_to_pixelformat(depth, (IDirectDraw*) ddraw);
-    
-#ifdef RESTORE_SIGNALS
-    SIGNAL_Init();
-#endif
-
-    return DD_OK;
-}
-
-/* Where do these GUIDs come from?  mkuuid.
- * They exist solely to distinguish between the targets Wine support,
- * and should be different than any other GUIDs in existence.
- */
-static GUID DGA_DirectDraw_GUID = { /* e2dcb020-dc60-11d1-8407-9714f5d50802 */
-    0xe2dcb020,
-    0xdc60,
-    0x11d1,
-    {0x84, 0x07, 0x97, 0x14, 0xf5, 0xd5, 0x08, 0x02}
-};
-
-ddraw_driver dga_driver = {
-    &DGA_DirectDraw_GUID,
-    "display",
-    "WINE XF86DGA DirectDraw Driver",
-    100,
-    DGA_Create
-}; 
-
-DECL_GLOBAL_CONSTRUCTOR(DGA_register) { ddraw_register_driver(&dga_driver); }
diff --git a/dlls/ddraw/dga2.c b/dlls/ddraw/dga2.c
deleted file mode 100644
index 521ffb95a2d..00000000000
--- a/dlls/ddraw/dga2.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*		DirectDraw using DGA2
- *
- * Based (well, plagiarized :-) ) on Marcus' dga.c
- */
-
-#include "config.h"
-#include "winerror.h"
-
-#include <unistd.h>
-#include <assert.h>
-#ifdef HAVE_SYS_SIGNAL_H
-# include <sys/signal.h>
-#endif
-#include <fcntl.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "gdi.h"
-#include "heap.h"
-#include "wine/exception.h"
-#include "ddraw.h"
-#include "d3d.h"
-#include "debugtools.h"
-#include "options.h"
-
-#include "dga2_private.h"
-
-DEFAULT_DEBUG_CHANNEL(ddraw);
-
-static inline BOOL get_option( const char *name, BOOL def ) {
-    return PROFILE_GetWineIniBool( "x11drv", name, def );
-}
-
-static BYTE
-DDRAW_DGA2_Available(void)
-{
-    int evbase, evret, majver, minver;
-    static BYTE return_value = 0xFF;
-
-    /* This prevents from probing X times for DGA */
-    if (return_value != 0xFF)
-	return return_value;
-
-    if (!get_option( "UseDGA", 1 )) {
-	TRACE("UseDGA disabled.\n");
-	return_value = 0;
-	return 0;
-    }
-
-    /* First, query the extenstion and its version */
-    if (!TSXF86DGAQueryExtension(display,&evbase,&evret)) {
-	TRACE("DGA extension not detected.\n");
-	return_value = 0;
-	return 0;
-    }
-
-    if (!TSXF86DGAQueryVersion(display,&majver,&minver)) {
-	TRACE("DGA version not detected.\n");
-	return_value = 0;
-	return 0;
-    }
-
-    if (majver >= 2) {
-	/* We have DGA 2.0 available ! */
-	if (TSXDGAOpenFramebuffer(display, DefaultScreen(display))) {
-	    TSXDGACloseFramebuffer(display, DefaultScreen(display));
-	    return_value = 2;
-	} else
-	    return_value = 0;
-	return return_value;
-    }
-    
-    return 0;
-}
-
-HRESULT 
-DGA2_Create( LPDIRECTDRAW *lplpDD ) {
-    IDirectDrawImpl*		ddraw;
-    dga2_dd_private*	dgpriv;
-    int  major,minor;
-    int  dga_version;
-    XDGAMode *modes;
-    int i, num_modes;
-    int mode_to_use = 0;
-
-    /* Get DGA availability / version */
-    dga_version = DDRAW_DGA2_Available();
-    if (dga_version == 0)
-	return DDERR_GENERIC;
-
-    /* If we were just testing ... return OK */
-    if (lplpDD == NULL)
-	return DD_OK;
-
-    ddraw = (IDirectDrawImpl*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectDrawImpl));
-    *lplpDD = (LPDIRECTDRAW)ddraw;
-    ddraw->ref = 1;
-    ICOM_VTBL(ddraw) = &dga2_ddvt;
-
-    ddraw->d = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*(ddraw->d)));
-    ddraw->d->ref = 1;
-    ddraw->d->private = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(dga2_dd_private));
-
-    dgpriv = (dga2_dd_private*)ddraw->d->private;
-    
-    TSXDGAQueryVersion(display,&major,&minor);
-    TRACE("XDGA is version %d.%d\n",major,minor);
-    
-    TRACE("Opening the frame buffer.\n");
-    if (!TSXDGAOpenFramebuffer(display, DefaultScreen(display))) {
-      ERR("Error opening the frame buffer !!!\n");
-      return DDERR_GENERIC;
-    }
-
-    /* List all available modes */
-    modes = TSXDGAQueryModes(display, DefaultScreen(display), &num_modes);
-    dgpriv->modes	= modes;
-    dgpriv->num_modes	= num_modes;
-    
-    TRACE("Available modes :\n");
-    for (i = 0; i < num_modes; i++) {
-      if (TRACE_ON(ddraw)) {
-	DPRINTF("   %d) - %s (FB: %dx%d / VP: %dx%d) - depth %d -",
-		modes[i].num,
-		modes[i].name, modes[i].imageWidth, modes[i].imageHeight,
-		modes[i].viewportWidth, modes[i].viewportHeight,
-		modes[i].depth
-		);
-#define XX(x) if (modes[i].flags & x) DPRINTF(" "#x" ");
-	XX(XDGAConcurrentAccess);
-	XX(XDGASolidFillRect);
-	XX(XDGABlitRect);
-	XX(XDGABlitTransRect);
-	XX(XDGAPixmap);
-#undef XX
-	DPRINTF("\n");
-      }
-      if ((GetSystemMetrics(SM_CYSCREEN) == modes[i].viewportHeight) &&
-	  (GetSystemMetrics(SM_CXSCREEN) == modes[i].viewportWidth) &&
-	  (X11DRV_GetDepth() == modes[i].depth)
-	  ) {
-	mode_to_use = modes[i].num;
-      }
-    }
-    if (mode_to_use == 0) {
-      ERR("Could not find mode !\n");
-      mode_to_use = 1;
-    } else {
-      TRACE("Using mode number %d\n", mode_to_use);
-    }
-
-    dgpriv->DGA.InstallColormap = TSXDGAInstallColormap;
-    
-    /* Initialize the frame buffer */
-    _DGA2_Initialize_FrameBuffer(ddraw, mode_to_use);
-
-    /* Register frame buffer with the kernel, it is a potential DIB section */
-    VirtualAlloc(dgpriv->DGA.fb_addr, dgpriv->DGA.fb_memsize, MEM_RESERVE|MEM_SYSTEM, PAGE_READWRITE);
-    
-    /* Set the input handling for relative mouse movements */
-    X11DRV_EVENT_SetInputMethod(X11DRV_INPUT_RELATIVE);
-    
-    return DD_OK;
-}
-
-/* Where do these GUIDs come from?  mkuuid.
- * They exist solely to distinguish between the targets Wine support,
- * and should be different than any other GUIDs in existence.
- */
-static GUID DGA2_DirectDraw_GUID = { /* e2dcb020-dc60-11d1-8407-9714f5d50803 */
-    0xe2dcb020,
-    0xdc60,
-    0x11d1,
-    {0x84, 0x07, 0x97, 0x14, 0xf5, 0xd5, 0x08, 0x03}
-};
-
-ddraw_driver dga2_driver = {
-    &DGA2_DirectDraw_GUID,
-    "display",
-    "WINE XF86DGA2 DirectDraw Driver",
-    150,
-    DGA2_Create
-}; 
-
-DECL_GLOBAL_CONSTRUCTOR(DGA2_register) { ddraw_register_driver(&dga2_driver); }
-- 
GitLab