Alexandre Julliard : gdi32: Get rid of the GetBitmapBits driver entry point .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 366174b2133e50978014493695b6ac720b39d0ef
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=366174b2133e50978014493695b6ac720b39d0ef

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jul 25 20:32:41 2011 +0200

gdi32: Get rid of the GetBitmapBits driver entry point.

---

 dlls/gdi32/bitmap.c        |   10 ----------
 dlls/gdi32/dibdrv/dc.c     |    1 -
 dlls/gdi32/driver.c        |    1 -
 dlls/gdi32/enhmfdrv/init.c |    1 -
 dlls/gdi32/mfdrv/init.c    |    1 -
 dlls/wineps.drv/init.c     |    1 -
 dlls/winex11.drv/init.c    |    1 -
 include/wine/gdi_driver.h  |    3 +--
 8 files changed, 1 insertions(+), 18 deletions(-)

diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c
index a1838fd..93bfe77 100644
--- a/dlls/gdi32/bitmap.c
+++ b/dlls/gdi32/bitmap.c
@@ -50,16 +50,6 @@ static const struct gdi_obj_funcs bitmap_funcs =
  *           null driver fallback implementations
  */
 
-LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size )
-{
-    BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP );
-
-    if (bmp->bitmap.bmBits) memcpy( bits, bmp->bitmap.bmBits, size );
-    else memset( bits, 0, size );
-    GDI_ReleaseObj( bitmap );
-    return size;
-}
-
 LONG nulldrv_SetBitmapBits( HBITMAP bitmap, const void *bits, LONG size )
 {
     BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP );
diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c
index eaa187f..50ceffe 100644
--- a/dlls/gdi32/dibdrv/dc.c
+++ b/dlls/gdi32/dibdrv/dc.c
@@ -586,7 +586,6 @@ const DC_FUNCTIONS dib_driver =
     NULL,                               /* pFlattenPath */
     NULL,                               /* pFrameRgn */
     NULL,                               /* pGdiComment */
-    NULL,                               /* pGetBitmapBits */
     NULL,                               /* pGetCharWidth */
     NULL,                               /* pGetDeviceCaps */
     NULL,                               /* pGetDeviceGammaRamp */
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index 4a65b8d..290a30d 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -702,7 +702,6 @@ const DC_FUNCTIONS null_driver =
     nulldrv_FlattenPath,                /* pFlattenPath */
     nulldrv_FrameRgn,                   /* pFrameRgn */
     nulldrv_GdiComment,                 /* pGdiComment */
-    nulldrv_GetBitmapBits,              /* pGetBitmapBits */
     nulldrv_GetCharWidth,               /* pGetCharWidth */
     nulldrv_GetDeviceCaps,              /* pGetDeviceCaps */
     nulldrv_GetDeviceGammaRamp,         /* pGetDeviceGammaRamp */
diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c
index b4b9e6e..a73ea00 100644
--- a/dlls/gdi32/enhmfdrv/init.c
+++ b/dlls/gdi32/enhmfdrv/init.c
@@ -71,7 +71,6 @@ static const DC_FUNCTIONS EMFDRV_Funcs =
     EMFDRV_FlattenPath,              /* pFlattenPath */
     EMFDRV_FrameRgn,                 /* pFrameRgn */
     EMFDRV_GdiComment,               /* pGdiComment */
-    NULL,                            /* pGetBitmapBits */
     NULL,                            /* pGetCharWidth */
     EMFDRV_GetDeviceCaps,            /* pGetDeviceCaps */
     NULL,                            /* pGetDeviceGammaRamp */
diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c
index 1474014..83edb1b 100644
--- a/dlls/gdi32/mfdrv/init.c
+++ b/dlls/gdi32/mfdrv/init.c
@@ -115,7 +115,6 @@ static const DC_FUNCTIONS MFDRV_Funcs =
     MFDRV_FlattenPath,               /* pFlattenPath */
     MFDRV_FrameRgn,                  /* pFrameRgn */
     NULL,                            /* pGdiComment */
-    NULL,                            /* pGetBitmapBits */
     NULL,                            /* pGetCharWidth */
     MFDRV_GetDeviceCaps,             /* pGetDeviceCaps */
     NULL,                            /* pGetDeviceGammaRamp */
diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index f038a66..554e0f8 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -837,7 +837,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
     NULL,                               /* pFlattenPath */
     NULL,                               /* pFrameRgn */
     NULL,                               /* pGdiComment */
-    NULL,                               /* pGetBitmapBits */
     PSDRV_GetCharWidth,                 /* pGetCharWidth */
     PSDRV_GetDeviceCaps,                /* pGetDeviceCaps */
     NULL,                               /* pGetDeviceGammaRamp */
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 5e12e27..d73b91f 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -480,7 +480,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
     NULL,                               /* pFlattenPath */
     NULL,                               /* pFrameRgn */
     NULL,                               /* pGdiComment */
-    NULL,                               /* pGetBitmapBits */
     X11DRV_GetCharWidth,                /* pGetCharWidth */
     X11DRV_GetDeviceCaps,               /* pGetDeviceCaps */
     X11DRV_GetDeviceGammaRamp,          /* pGetDeviceGammaRamp */
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 5a251a1..cffd3f6 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -89,7 +89,6 @@ struct gdi_dc_funcs
     BOOL     (*pFlattenPath)(PHYSDEV);
     BOOL     (*pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT);
     BOOL     (*pGdiComment)(PHYSDEV,UINT,CONST BYTE*);
-    LONG     (*pGetBitmapBits)(HBITMAP,void*,LONG);
     BOOL     (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT);
     INT      (*pGetDeviceCaps)(PHYSDEV,INT);
     BOOL     (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID);
@@ -190,7 +189,7 @@ struct gdi_dc_funcs
 };
 
 /* increment this when you change the DC function table */
-#define WINE_GDI_DRIVER_VERSION 8
+#define WINE_GDI_DRIVER_VERSION 9
 
 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset )
 {