PATCH: dga2
Marcus Meissner
marcus at jet.franken.de
Wed May 16 14:33:41 CDT 2001
Hi,
this fixes compile problems with dga2 after the thread x11 change.
Ciao, Marcus
Changelog:
Adopted to new threaded displays.
Index: dga2.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/dga2.c,v
retrieving revision 1.3
diff -u -r1.3 dga2.c
--- dga2.c 2001/05/16 19:52:30 1.3
+++ dga2.c 2001/05/16 20:38:34
@@ -47,6 +47,7 @@
void X11DRV_XF86DGA2_Init(void)
{
int nmodes, major, minor, i;
+ Display *display = thread_display();
if (xf86dga2_modes) return; /* already initialized? */
@@ -102,6 +103,7 @@
{
LPDDRAWI_DIRECTDRAW_LCL ddlocal = data->lpDD->lpExclusiveOwner;
DWORD vram;
+ Display *display = thread_display();
data->ddRVal = DD_OK;
if (data->dwModeIndex) {
@@ -173,6 +175,7 @@
static DWORD PASCAL X11DRV_XF86DGA2_CreatePalette(LPDDHAL_CREATEPALETTEDATA data)
{
+ Display *display = thread_display();
data->lpDDPalette->u1.dwReserved1 = TSXDGACreateColormap(display, DefaultScreen(display), dga_dev, AllocAll);
if (data->lpColorTable)
X11DRV_DDHAL_SetPalEntries(data->lpDDPalette->u1.dwReserved1, 0, 256,
@@ -183,6 +186,7 @@
static DWORD PASCAL X11DRV_XF86DGA2_Flip(LPDDHAL_FLIPDATA data)
{
+ Display *display = thread_display();
if (data->lpSurfCurr == X11DRV_DD_Primary) {
DWORD ofs = data->lpSurfCurr->lpGbl->fpVidMem - dga_mem.fpStart;
TSXDGASetViewport(display, DefaultScreen(display),
@@ -196,6 +200,7 @@
static DWORD PASCAL X11DRV_XF86DGA2_SetPalette(LPDDHAL_SETPALETTEDATA data)
{
+ Display *display = thread_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