Alexandre Julliard : winex11: Remove some remainders of the ddraw HAL support.
Alexandre Julliard
julliard at winehq.org
Mon Oct 22 13:42:45 CDT 2012
Module: wine
Branch: master
Commit: 900b5f4b793daca9b8ba2934d6783bdf79a59f0f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=900b5f4b793daca9b8ba2934d6783bdf79a59f0f
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Oct 22 14:36:31 2012 +0200
winex11: Remove some remainders of the ddraw HAL support.
---
dlls/winex11.drv/init.c | 2 --
dlls/winex11.drv/settings.c | 5 -----
include/d3dhal.h | 3 ---
3 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index a27b052..f03dd4d 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -311,8 +311,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d
{
switch (*(const INT *)in_data)
{
- case DCICOMMAND:
- return DD_HAL_VERSION;
case X11DRV_ESCAPE:
return TRUE;
}
diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c
index 9512c64..035b0da 100644
--- a/dlls/winex11.drv/settings.c
+++ b/dlls/winex11.drv/settings.c
@@ -35,11 +35,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(x11settings);
-/*
- * The DDHALMODEINFO type is used to hold all the mode information.
- * This is done because the array of DDHALMODEINFO structures must be
- * created for use by DirectDraw anyway.
- */
static struct x11drv_mode_info *dd_modes = NULL;
static unsigned int dd_mode_count = 0;
static unsigned int dd_max_modes = 0;
diff --git a/include/d3dhal.h b/include/d3dhal.h
index 6c68d4a..9d43313 100644
--- a/include/d3dhal.h
+++ b/include/d3dhal.h
@@ -47,9 +47,6 @@ typedef struct _D3DDeviceDesc_V1 {
DWORD dwMaxVertexCount;
} D3DDEVICEDESC_V1,*LPD3DDEVICEDESC_V1;
-/* this is to allow keeping the bulk of our OpenGL code out of x11drv */
-#define D3DDD_WINE_OPENGL_DEVICE 0x00008000
-
typedef struct _D3DHAL_GLOBALDRIVERDATA {
DWORD dwSize;
D3DDEVICEDESC_V1 hwCaps;
More information about the wine-cvs
mailing list