Re: x11ddraw fix

[Glenn Schrader]

Ove Kaaven wrote:
> On Tue, 20 Nov 2001, Glenn Schrader wrote:
> > The two attached patches seem to do the job. Thanks for the hints.
>
> Hmm.
> > @@ -49,7 +49,7 @@
> >
> > static LRESULT WINAPI GrabWndProc(HWND hWnd, UINT message, WPARAM 
> > wParam, LPARAM lParam) { -  Display *display = thread_display();
> > - Display *display = gdi_display;
>
> Is this part really necessary?

No it isn't, my mistake. Updated patches are attached.

---

Glenn Schrader
>

Index: dga2.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/dga2.c,v
retrieving revision 1.5
diff -u -r1.5 dga2.c
--- dga2.c	2001/09/11 00:32:33	1.5
+++ dga2.c	2001/11/20 22:13:32
@@ -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);

Index: x11ddraw.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/x11ddraw.c,v
retrieving revision 1.12
diff -u -r1.12 x11ddraw.c
--- x11ddraw.c	2001/08/27 19:04:18	1.12
+++ x11ddraw.c	2001/11/21 10:40:13
@@ -81,7 +81,7 @@
   if(grab) { 
     Window window = X11DRV_get_whole_window(GetFocus()); 
     if(window)
-      XSetInputFocus(thread_display(), window, RevertToParent, CurrentTime); 
+      XSetInputFocus(gdi_display, window, RevertToParent, CurrentTime); 
   }

if(!X11DRV_DD_GrabMessage)