commit 9c68faadab569a159e5e9c9952b2b21de57d15a3
author Huw D M Davies <daviesh@abacus.physics.ox.ac.uk> Wed Nov 25 12:36:03 1998 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Nov 25 12:36:03 1998 +0000
tree d67a3c96085105f2899f1c1eed4138faa3025504
parent 7129d9f69645104c55f8fdedcc2735846aa11deb

Remove X_DC_INFO from DC and make it behave like any other PDEVICE.

objects/dc.c

diff --git a/objects/dc.c b/objects/dc.c
index 10532c2..2ea4f56 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -14,7 +14,7 @@
 #include "debug.h"
 #include "font.h"
 #include "winerror.h"
-
+#include "x11drv.h"
 
 /***********************************************************************
  *           DC_Init_DC_INFO
@@ -221,7 +221,6 @@
 
     TRACE(dc, "(%04x): returning %04x\n", hdc, handle );
 
-    memset( &newdc->u.x, 0, sizeof(newdc->u.x) );
     newdc->w.flags            = dc->w.flags | DC_SAVED;
     newdc->w.devCaps          = dc->w.devCaps;
     newdc->w.hPen             = dc->w.hPen;       
@@ -854,15 +853,18 @@
 BOOL32 WINAPI GetDCOrgEx( HDC32 hDC, LPPOINT32 lpp )
 {
     DC * dc;
+    X11DRV_PDEVICE *physDev;
+
     if (!lpp) return FALSE;
     if (!(dc = (DC *) GDI_GetObjPtr( hDC, DC_MAGIC ))) return FALSE;
+    physDev = (X11DRV_PDEVICE *)dc->physDev;
 
     if (!(dc->w.flags & DC_MEMORY))
     {
        Window root;
        int w, h, border, depth;
        /* FIXME: this is not correct for managed windows */
-       TSXGetGeometry( display, dc->u.x.drawable, &root,
+       TSXGetGeometry( display, physDev->drawable, &root,
                     &lpp->x, &lpp->y, &w, &h, &border, &depth );
     }
     else lpp->x = lpp->y = 0;