dga2.c fix
Glenn Schrader
geschrader at mediaone.net
Fri Nov 30 17:46:20 CST 2001
The attached patch fixes a bug in dga2.c which causes dga
apps to crash with a 'BadColor' X server error.
---
Glenn Schrader
-------------- next part --------------
Index: dga2.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/dga2.c,v
retrieving revision 1.6
diff -u -r1.6 dga2.c
--- dga2.c 2001/11/19 02:30:05 1.6
+++ dga2.c 2001/11/24 13:34:31
@@ -102,7 +102,7 @@
{
LPDDRAWI_DIRECTDRAW_LCL ddlocal = data->lpDD->lpExclusiveOwner;
DWORD vram;
- Display *display = thread_display();
+ Display *display = gdi_display;
data->ddRVal = DD_OK;
if (data->dwModeIndex) {
@@ -174,7 +174,7 @@
static DWORD PASCAL X11DRV_XF86DGA2_CreatePalette(LPDDHAL_CREATEPALETTEDATA data)
{
- Display *display = thread_display();
+ Display *display = gdi_display;
data->lpDDPalette->u1.dwReserved1 = TSXDGACreateColormap(display, DefaultScreen(display), dga_dev, AllocAll);
if (data->lpColorTable)
X11DRV_DDHAL_SetPalEntries(data->lpDDPalette->u1.dwReserved1, 0, 256,
@@ -185,7 +185,7 @@
static DWORD PASCAL X11DRV_XF86DGA2_Flip(LPDDHAL_FLIPDATA data)
{
- Display *display = thread_display();
+ Display *display = gdi_display;
if (data->lpSurfCurr == X11DRV_DD_Primary) {
DWORD ofs = data->lpSurfCurr->lpGbl->fpVidMem - dga_mem.fpStart;
TSXDGASetViewport(display, DefaultScreen(display),
@@ -199,7 +199,7 @@
static DWORD PASCAL X11DRV_XF86DGA2_SetPalette(LPDDHAL_SETPALETTEDATA data)
{
- Display *display = thread_display();
+ Display *display = gdi_display;
if ((data->lpDDSurface == X11DRV_DD_Primary) &&
data->lpDDPalette && data->lpDDPalette->u1.dwReserved1) {
TSXDGAInstallColormap(display, DefaultScreen(display), data->lpDDPalette->u1.dwReserved1);
More information about the wine-patches
mailing list