gdi32: Remove the GetDIBits entry point from the graphics driver.

dlls/gdi32/bitmap.c

@@ -79,13 +79,6 @@ LONG nulldrv_SetBitmapBits( HBITMAP bitmap, const void *bits, LONG size )
     return size;
 }
 
-INT nulldrv_GetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, LPVOID bits,
-                       BITMAPINFO *info, UINT coloruse )
-{
-    /* FIXME: transfer bits from bmp->bitmap.bmBits */
-    return 0;
-}
-
 INT nulldrv_SetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines,
                        const void *bits, const BITMAPINFO *info, UINT coloruse )
 {

dlls/gdi32/dibdrv/dc.c

@@ -470,7 +470,6 @@ const DC_FUNCTIONS dib_driver =
     NULL,                               /* pGdiComment */
     NULL,                               /* pGetBitmapBits */
     NULL,                               /* pGetCharWidth */
-    NULL,                               /* pGetDIBits */
     NULL,                               /* pGetDeviceCaps */
     NULL,                               /* pGetDeviceGammaRamp */
     NULL,                               /* pGetICMProfile */

dlls/gdi32/driver.c

@@ -709,7 +709,6 @@ const DC_FUNCTIONS null_driver =
     nulldrv_GdiComment,                 /* pGdiComment */
     nulldrv_GetBitmapBits,              /* pGetBitmapBits */
     nulldrv_GetCharWidth,               /* pGetCharWidth */
-    nulldrv_GetDIBits,                  /* pGetDIBits */
     nulldrv_GetDeviceCaps,              /* pGetDeviceCaps */
     nulldrv_GetDeviceGammaRamp,         /* pGetDeviceGammaRamp */
     nulldrv_GetICMProfile,              /* pGetICMProfile */

dlls/gdi32/enhmfdrv/init.c

@@ -73,7 +73,6 @@ static const DC_FUNCTIONS EMFDRV_Funcs =
     EMFDRV_GdiComment,               /* pGdiComment */
     NULL,                            /* pGetBitmapBits */
     NULL,                            /* pGetCharWidth */
-    NULL,                            /* pGetDIBits */
     EMFDRV_GetDeviceCaps,            /* pGetDeviceCaps */
     NULL,                            /* pGetDeviceGammaRamp */
     NULL,                            /* pGetICMProfile */

dlls/gdi32/gdi_private.h

@@ -480,7 +480,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 INT  nulldrv_GetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, LPVOID bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN;
 extern COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
 extern INT  nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN;
 extern BOOL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN;

dlls/gdi32/mfdrv/init.c

@@ -117,7 +117,6 @@ static const DC_FUNCTIONS MFDRV_Funcs =
     NULL,                            /* pGdiComment */
     NULL,                            /* pGetBitmapBits */
     NULL,                            /* pGetCharWidth */
-    NULL,                            /* pGetDIBits */
     MFDRV_GetDeviceCaps,             /* pGetDeviceCaps */
     NULL,                            /* pGetDeviceGammaRamp */
     NULL,                            /* pGetICMProfile */

dlls/wineps.drv/init.c

@@ -839,7 +839,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
     NULL,                               /* pGdiComment */
     NULL,                               /* pGetBitmapBits */
     PSDRV_GetCharWidth,                 /* pGetCharWidth */
-    NULL,                               /* pGetDIBits */
     PSDRV_GetDeviceCaps,                /* pGetDeviceCaps */
     NULL,                               /* pGetDeviceGammaRamp */
     NULL,                               /* pGetICMProfile */

dlls/winex11.drv/init.c

@@ -482,7 +482,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
     NULL,                               /* pGdiComment */
     X11DRV_GetBitmapBits,               /* pGetBitmapBits */
     X11DRV_GetCharWidth,                /* pGetCharWidth */
-    X11DRV_GetDIBits,                   /* pGetDIBits */
     X11DRV_GetDeviceCaps,               /* pGetDeviceCaps */
     X11DRV_GetDeviceGammaRamp,          /* pGetDeviceGammaRamp */
     X11DRV_GetICMProfile,               /* pGetICMProfile */

dlls/winex11.drv/x11drv.h

@@ -201,8 +201,6 @@ extern BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT
 extern LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *bits, LONG count ) DECLSPEC_HIDDEN;
 extern BOOL X11DRV_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer ) DECLSPEC_HIDDEN;
 extern BOOL X11DRV_GetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN;
-extern INT X11DRV_GetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, UINT lines,
-                             LPVOID bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN;
 extern BOOL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) DECLSPEC_HIDDEN;
 extern DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info,
                               struct gdi_image_bits *bits, const RECT *rect ) DECLSPEC_HIDDEN;

include/wine/gdi_driver.h

@@ -92,7 +92,6 @@ struct gdi_dc_funcs
     BOOL     (*pGdiComment)(PHYSDEV,UINT,CONST BYTE*);
     LONG     (*pGetBitmapBits)(HBITMAP,void*,LONG);
     BOOL     (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT);
-    INT      (*pGetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPVOID,BITMAPINFO*,UINT);
     INT      (*pGetDeviceCaps)(PHYSDEV,INT);
     BOOL     (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID);
     BOOL     (*pGetICMProfile)(PHYSDEV,LPDWORD,LPWSTR);
@@ -193,7 +192,7 @@ struct gdi_dc_funcs
 };
 
 /* increment this when you change the DC function table */
-#define WINE_GDI_DRIVER_VERSION 3
+#define WINE_GDI_DRIVER_VERSION 4
 
 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset )
 {