Alexandre Julliard : gdi32: Remove the GetDIBits entry point from the graphics driver.
Alexandre Julliard
julliard at winehq.org
Mon Jul 18 12:47:01 CDT 2011
Module: wine
Branch: master
Commit: b01eb195114f69884d894d11c1c6a73063b0d12b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01eb195114f69884d894d11c1c6a73063b0d12b
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jul 18 17:07:51 2011 +0200
gdi32: Remove the GetDIBits entry point from the graphics driver.
---
dlls/gdi32/bitmap.c | 7 -------
dlls/gdi32/dibdrv/dc.c | 1 -
dlls/gdi32/driver.c | 1 -
dlls/gdi32/enhmfdrv/init.c | 1 -
dlls/gdi32/gdi_private.h | 1 -
dlls/gdi32/mfdrv/init.c | 1 -
dlls/wineps.drv/init.c | 1 -
dlls/winex11.drv/init.c | 1 -
dlls/winex11.drv/x11drv.h | 2 --
include/wine/gdi_driver.h | 3 +--
10 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c
index 36a04a7..0c745d9 100644
--- a/dlls/gdi32/bitmap.c
+++ b/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 )
{
diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c
index 1122579..6c783e8 100644
--- a/dlls/gdi32/dibdrv/dc.c
+++ b/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 */
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index 6cdf35d..0c26839 100644
--- a/dlls/gdi32/driver.c
+++ b/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 */
diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c
index e7cbf2e..8d8e326 100644
--- a/dlls/gdi32/enhmfdrv/init.c
+++ b/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 */
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 10bfc20..7fa14d3 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/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;
diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c
index 4685470..65487fd 100644
--- a/dlls/gdi32/mfdrv/init.c
+++ b/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 */
diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index 5a1af9c..a45cf86 100644
--- a/dlls/wineps.drv/init.c
+++ b/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 */
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 2541df0..4e374c7 100644
--- a/dlls/winex11.drv/init.c
+++ b/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 */
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 5c98d2e..1729546 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/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;
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 811cf80..2c05d82 100644
--- a/include/wine/gdi_driver.h
+++ b/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 )
{
More information about the wine-cvs
mailing list