gdi32: Add null driver entry points for the DC state functions.

dlls/gdi32/dc.c

@@ -368,20 +368,14 @@ void DC_UpdateXforms( DC *dc )
 
 
 /***********************************************************************
- *           save_dc_state
+ *           nulldrv_SaveDC
  */
-INT save_dc_state( HDC hdc )
+INT CDECL nulldrv_SaveDC( PHYSDEV dev )
 {
-    DC * newdc, * dc;
+    DC *newdc, *dc = get_nulldrv_dc( dev );
     INT ret;
 
-    if (!(dc = get_dc_ptr( hdc ))) return 0;
+    if (!(newdc = HeapAlloc( GetProcessHeap(), 0, sizeof(*newdc )))) return 0;
-    if (!(newdc = HeapAlloc( GetProcessHeap(), 0, sizeof(*newdc ))))
-    {
-      release_dc_ptr( dc );
-      return 0;
-    }
-
     newdc->flags            = dc->flags | DC_SAVED;
     newdc->layout           = dc->layout;
     newdc->hPen             = dc->hPen;
@@ -441,7 +435,6 @@ INT save_dc_state( HDC hdc )
     if (!(newdc->hSelf = alloc_gdi_handle( &newdc->header, dc->header.type, &dc_funcs )))
     {
         HeapFree( GetProcessHeap(), 0, newdc );
-        release_dc_ptr( dc );
         return 0;
     }
 
@@ -474,7 +467,6 @@ INT save_dc_state( HDC hdc )
     dc->saved_dc = newdc->hSelf;
     ret = ++dc->saveLevel;
     release_dc_ptr( newdc );
-    release_dc_ptr( dc );
     return ret;
 }
 
@@ -482,45 +474,30 @@ INT save_dc_state( HDC hdc )
 /***********************************************************************
  *           restore_dc_state
  */
-BOOL restore_dc_state( HDC hdc, INT level )
+BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level )
 {
+    DC *dcs, *dc = get_nulldrv_dc( dev );
     HDC hdcs, first_dcs;
-    DC *dc, *dcs;
     INT save_level;
 
-    if (!(dc = get_dc_ptr( hdc ))) return FALSE;
-
     /* find the state level to restore */
 
-    if (abs(level) > dc->saveLevel || level == 0)
+    if (abs(level) > dc->saveLevel || level == 0) return FALSE;
-    {
-        release_dc_ptr( dc );
-        return FALSE;
-    }
     if (level < 0) level = dc->saveLevel + level + 1;
     first_dcs = dc->saved_dc;
     for (hdcs = first_dcs, save_level = dc->saveLevel; save_level > level; save_level--)
     {
-	if (!(dcs = get_dc_ptr( hdcs )))
+	if (!(dcs = get_dc_ptr( hdcs ))) return FALSE;
-	{
-            release_dc_ptr( dc );
-            return FALSE;
-	}
         hdcs = dcs->saved_dc;
         release_dc_ptr( dcs );
     }
 
     /* restore the state */
 
-    if (!(dcs = get_dc_ptr( hdcs )))
+    if (!(dcs = get_dc_ptr( hdcs ))) return FALSE;
-    {
-        release_dc_ptr( dc );
-        return FALSE;
-    }
     if (!PATH_AssignGdiPath( &dc->path, &dcs->path ))
     {
         release_dc_ptr( dcs );
-        release_dc_ptr( dc );
         return FALSE;
     }
 
@@ -588,13 +565,13 @@ BOOL restore_dc_state( HDC hdc, INT level )
     DC_UpdateXforms( dc );
     CLIPPING_UpdateGCRegion( dc );
 
-    SelectObject( hdc, dcs->hBitmap );
+    SelectObject( dev->hdc, dcs->hBitmap );
-    SelectObject( hdc, dcs->hBrush );
+    SelectObject( dev->hdc, dcs->hBrush );
-    SelectObject( hdc, dcs->hFont );
+    SelectObject( dev->hdc, dcs->hFont );
-    SelectObject( hdc, dcs->hPen );
+    SelectObject( dev->hdc, dcs->hPen );
-    SetBkColor( hdc, dcs->backgroundColor);
+    SetBkColor( dev->hdc, dcs->backgroundColor);
-    SetTextColor( hdc, dcs->textColor);
+    SetTextColor( dev->hdc, dcs->textColor);
-    GDISelectPalette( hdc, dcs->hPalette, FALSE );
+    GDISelectPalette( dev->hdc, dcs->hPalette, FALSE );
 
     dc->saved_dc  = dcs->saved_dc;
     dcs->saved_dc = 0;
@@ -611,7 +588,6 @@ BOOL restore_dc_state( HDC hdc, INT level )
         free_dc_ptr( dcs );
         first_dcs = hdcs;
     }
-    release_dc_ptr( dc );
     return TRUE;
 }
 
@@ -622,16 +598,14 @@ BOOL restore_dc_state( HDC hdc, INT level )
 INT WINAPI SaveDC( HDC hdc )
 {
     DC * dc;
-    INT ret;
+    INT ret = 0;
-
-    if (!(dc = get_dc_ptr( hdc ))) return 0;
-
-    if(dc->funcs->pSaveDC)
-        ret = dc->funcs->pSaveDC( dc->physDev );
-    else
-        ret = save_dc_state( hdc );
 
+    if ((dc = get_dc_ptr( hdc )))
+    {
+        PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSaveDC );
+        ret = physdev->funcs->pSaveDC( physdev );
         release_dc_ptr( dc );
+    }
     return ret;
 }
 
@@ -642,18 +616,16 @@ INT WINAPI SaveDC( HDC hdc )
 BOOL WINAPI RestoreDC( HDC hdc, INT level )
 {
     DC *dc;
-    BOOL success;
+    BOOL success = FALSE;
 
     TRACE("%p %d\n", hdc, level );
-    if (!(dc = get_dc_ptr( hdc ))) return FALSE;
+    if ((dc = get_dc_ptr( hdc )))
+    {
+        PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRestoreDC );
         update_dc( dc );
-
+        success = physdev->funcs->pRestoreDC( physdev, level );
-    if(dc->funcs->pRestoreDC)
-        success = dc->funcs->pRestoreDC( dc->physDev, level );
-    else
-        success = restore_dc_state( hdc, level );
-
         release_dc_ptr( dc );
+    }
     return success;
 }
 
@@ -898,13 +870,12 @@ BOOL WINAPI DeleteDC( HDC hdc )
 HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode )
 {
     DC *dc;
-    HDC ret = hdc;
+    HDC ret = 0;
 
     if ((dc = get_dc_ptr( hdc )))
     {
-        if (dc->funcs->pResetDC)
+        PHYSDEV physdev = GET_DC_PHYSDEV( dc, pResetDC );
-        {
+        ret = physdev->funcs->pResetDC( physdev, devmode );
-            ret = dc->funcs->pResetDC( dc->physDev, devmode );
         if (ret)  /* reset the visible region */
         {
             dc->dirty = 0;
@@ -916,7 +887,6 @@ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode )
                         dc->vis_rect.right, dc->vis_rect.bottom );
             CLIPPING_UpdateGCRegion( dc );
         }
-        }
         release_dc_ptr( dc );
     }
     return ret;

dlls/gdi32/driver.c

@@ -487,6 +487,11 @@ static BOOL CDECL nulldrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right,
     return TRUE;
 }
 
+static HDC CDECL nulldrv_ResetDC( PHYSDEV dev, const DEVMODEW *devmode )
+{
+    return 0;
+}
+
 static BOOL CDECL nulldrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
                                      INT ell_width, INT ell_height )
 {
@@ -760,10 +765,10 @@ const DC_FUNCTIONS null_driver =
     nulldrv_RealizeDefaultPalette,      /* pRealizeDefaultPalette */
     nulldrv_RealizePalette,             /* pRealizePalette */
     nulldrv_Rectangle,                  /* pRectangle */
-    NULL,                               /* pResetDC */
+    nulldrv_ResetDC,                    /* pResetDC */
-    NULL,                               /* pRestoreDC */
+    nulldrv_RestoreDC,                  /* pRestoreDC */
     nulldrv_RoundRect,                  /* pRoundRect */
-    NULL,                               /* pSaveDC */
+    nulldrv_SaveDC,                     /* pSaveDC */
     nulldrv_ScaleViewportExtEx,         /* pScaleViewportExt */
     nulldrv_ScaleWindowExtEx,           /* pScaleWindowExt */
     nulldrv_SelectBitmap,               /* pSelectBitmap */

dlls/gdi32/enhmfdrv/dc.c

@@ -25,12 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
 
 INT CDECL EMFDRV_SaveDC( PHYSDEV dev )
 {
-    EMFDRV_PDEVICE* physDev = (EMFDRV_PDEVICE*)dev;
+    PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSaveDC );
-    INT ret = save_dc_state( physDev->hdc );
+    INT ret = next->funcs->pSaveDC( next );
-    EMRSAVEDC emr;
 
     if (ret)
     {
+        EMRSAVEDC emr;
         emr.emr.iType = EMR_SAVEDC;
         emr.emr.nSize = sizeof(emr);
         EMFDRV_WriteRecord( dev, &emr.emr );
@@ -40,6 +40,7 @@ INT CDECL EMFDRV_SaveDC( PHYSDEV dev )
 
 BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level )
 {
+    PHYSDEV next = GET_NEXT_PHYSDEV( dev, pRestoreDC );
     EMFDRV_PDEVICE* physDev = (EMFDRV_PDEVICE*)dev;
     DC *dc = get_dc_ptr( physDev->hdc );
     EMRRESTOREDC emr;
@@ -55,7 +56,7 @@ BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level )
     release_dc_ptr( dc );
 
     physDev->restoring++;
-    ret = restore_dc_state( physDev->hdc, level );
+    ret = next->funcs->pRestoreDC( next, level );
     physDev->restoring--;
 
     if (ret) EMFDRV_WriteRecord( dev, &emr.emr );

dlls/gdi32/gdi_private.h

@@ -384,8 +384,6 @@ extern void push_dc_driver( DC * dc, PHYSDEV physdev ) DECLSPEC_HIDDEN;
 extern void pop_dc_driver( DC * dc, PHYSDEV physdev ) DECLSPEC_HIDDEN;
 extern void DC_InitDC( DC * dc ) DECLSPEC_HIDDEN;
 extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN;
-extern INT save_dc_state( HDC hdc ) DECLSPEC_HIDDEN;
-extern BOOL restore_dc_state( HDC hdc, INT level ) DECLSPEC_HIDDEN;
 
 /* dib.c */
 extern int DIB_GetDIBWidthBytes( int width, int depth ) DECLSPEC_HIDDEN;
@@ -539,6 +537,8 @@ extern BOOL CDECL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD co
 extern BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN;
 extern BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) DECLSPEC_HIDDEN;
 extern BOOL CDECL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) DECLSPEC_HIDDEN;
+extern BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN;
+extern INT  CDECL nulldrv_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN;
 extern BOOL CDECL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN;
 extern BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN;
 extern BOOL CDECL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;