Module: wine Branch: master Commit: b6f25e52506db727c3ddc1949bb1fcd4838ea913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f25e52506db727c3ddc1949b...
Author: Alexandre Julliard julliard@winehq.org Date: Wed May 23 22:26:35 2012 +0200
gdi32: Remove the null driver Get/PutImage fallbacks for bitmaps.
---
dlls/gdi32/bitmap.c | 20 -------------------- dlls/gdi32/driver.c | 13 +++++++++++++ dlls/gdi32/gdi_private.h | 4 ---- 3 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 8f6fbdb..c0d6810 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -46,26 +46,6 @@ static const struct gdi_obj_funcs bitmap_funcs = };
-/*********************************************************************** - * null driver fallback implementations - */ - -DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, - struct gdi_image_bits *bits, struct bitblt_coords *src ) -{ - if (!hbitmap) return ERROR_NOT_SUPPORTED; - return dib_driver.pGetImage( 0, hbitmap, info, bits, src ); -} - -DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) -{ - if (!hbitmap) return ERROR_SUCCESS; - return dib_driver.pPutImage( NULL, hbitmap, clip, info, bits, src, dst, rop ); -} - - /****************************************************************************** * CreateBitmap [GDI32.@] * diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d4eae73..8fc94b0 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -385,6 +385,12 @@ static BOOL nulldrv_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) return FALSE; }
+static DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, + struct gdi_image_bits *bits, struct bitblt_coords *src ) +{ + return ERROR_NOT_SUPPORTED; +} + static DWORD nulldrv_GetKerningPairs( PHYSDEV dev, DWORD count, LPKERNINGPAIR pairs ) { return 0; @@ -496,6 +502,13 @@ static BOOL nulldrv_Polyline( PHYSDEV dev, const POINT *points, INT count ) return PolyPolyline( dev->hdc, points, counts, 1 ); }
+static DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) +{ + return ERROR_SUCCESS; +} + static UINT nulldrv_RealizeDefaultPalette( PHYSDEV dev ) { return 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 1fa9395..6872093 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -371,7 +371,6 @@ extern BOOL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) DECLSPEC_HIDD extern BOOL nulldrv_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT height ) DECLSPEC_HIDDEN; extern LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) DECLSPEC_HIDDEN; -extern DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, @@ -386,9 +385,6 @@ extern BOOL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count ) extern BOOL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) DECLSPEC_HIDDEN; extern BOOL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) DECLSPEC_HIDDEN; -extern DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; extern INT nulldrv_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN;