commit e21c15e39d7781bae4312d0d758e6eb879b3db03
author Alexandre Julliard <julliard@winehq.org> Thu Mar 28 22:22:05 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Mar 28 22:22:05 2002 +0000
tree 6975c2a8482ef60210f166aa87341478c9706f85
parent c4912ecd5f951772bcc1557b05daba6ec7e1a1a3

Changed the GDI driver interface to pass an opaque PHYSDEV pointer
instead of a DC structure.
Removed some direct accesses to the DC structure from the drivers.
Got rid the bitmap driver.

graphics/mapping.c

diff --git a/graphics/mapping.c b/graphics/mapping.c
index 66a76db..9018bdb 100644
--- a/graphics/mapping.c
+++ b/graphics/mapping.c
@@ -144,7 +144,7 @@
     if (!dc) return 0;
     if (dc->funcs->pSetMapMode)
     {
-        prevMode = dc->funcs->pSetMapMode( dc, mode );
+        prevMode = dc->funcs->pSetMapMode( dc->physDev, mode );
         goto done;
     }
 
@@ -240,7 +240,7 @@
     if (!dc) return FALSE;
     if (dc->funcs->pSetViewportExt)
     {
-        ret = dc->funcs->pSetViewportExt( dc, x, y );
+        ret = dc->funcs->pSetViewportExt( dc->physDev, x, y );
         goto done;
     }
     if (size)
@@ -297,7 +297,7 @@
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc) return FALSE;
     if (dc->funcs->pSetViewportOrg)
-        ret = dc->funcs->pSetViewportOrg( dc, x, y );
+        ret = dc->funcs->pSetViewportOrg( dc->physDev, x, y );
     else
     {
         if (pt)
@@ -347,7 +347,7 @@
     if (!dc) return FALSE;
     if (dc->funcs->pSetWindowExt)
     {
-        ret = dc->funcs->pSetWindowExt( dc, x, y );
+        ret = dc->funcs->pSetWindowExt( dc->physDev, x, y );
         goto done;
     }
     if (size)
@@ -403,7 +403,7 @@
     BOOL ret = TRUE;
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc) return FALSE;
-    if (dc->funcs->pSetWindowOrg) ret = dc->funcs->pSetWindowOrg( dc, x, y );
+    if (dc->funcs->pSetWindowOrg) ret = dc->funcs->pSetWindowOrg( dc->physDev, x, y );
     else
     {
         if (pt)
@@ -452,7 +452,7 @@
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc) return FALSE;
     if (dc->funcs->pOffsetViewportOrg)
-        ret = dc->funcs->pOffsetViewportOrg( dc, x, y );
+        ret = dc->funcs->pOffsetViewportOrg( dc->physDev, x, y );
     else
     {
         if (pt)
@@ -501,7 +501,7 @@
     DC * dc = DC_GetDCPtr( hdc );
     if (!dc) return FALSE;
     if (dc->funcs->pOffsetWindowOrg)
-        ret = dc->funcs->pOffsetWindowOrg( dc, x, y );
+        ret = dc->funcs->pOffsetWindowOrg( dc->physDev, x, y );
     else
     {
         if (pt)
@@ -556,7 +556,7 @@
     if (!dc) return FALSE;
     if (dc->funcs->pScaleViewportExt)
     {
-        ret = dc->funcs->pScaleViewportExt( dc, xNum, xDenom, yNum, yDenom );
+        ret = dc->funcs->pScaleViewportExt( dc->physDev, xNum, xDenom, yNum, yDenom );
         goto done;
     }
     if (size)
@@ -621,7 +621,7 @@
     if (!dc) return FALSE;
     if (dc->funcs->pScaleWindowExt)
     {
-        ret = dc->funcs->pScaleWindowExt( dc, xNum, xDenom, yNum, yDenom );
+        ret = dc->funcs->pScaleWindowExt( dc->physDev, xNum, xDenom, yNum, yDenom );
         goto done;
     }
     if (size)