gdi32: Get rid of the GetBitmapBits driver entry point.
This commit is contained in:
parent
96c1b3bbc2
commit
366174b213
|
@ -50,16 +50,6 @@ static const struct gdi_obj_funcs bitmap_funcs =
|
||||||
* null driver fallback implementations
|
* 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 )
|
LONG nulldrv_SetBitmapBits( HBITMAP bitmap, const void *bits, LONG size )
|
||||||
{
|
{
|
||||||
BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP );
|
BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP );
|
||||||
|
|
|
@ -586,7 +586,6 @@ const DC_FUNCTIONS dib_driver =
|
||||||
NULL, /* pFlattenPath */
|
NULL, /* pFlattenPath */
|
||||||
NULL, /* pFrameRgn */
|
NULL, /* pFrameRgn */
|
||||||
NULL, /* pGdiComment */
|
NULL, /* pGdiComment */
|
||||||
NULL, /* pGetBitmapBits */
|
|
||||||
NULL, /* pGetCharWidth */
|
NULL, /* pGetCharWidth */
|
||||||
NULL, /* pGetDeviceCaps */
|
NULL, /* pGetDeviceCaps */
|
||||||
NULL, /* pGetDeviceGammaRamp */
|
NULL, /* pGetDeviceGammaRamp */
|
||||||
|
|
|
@ -702,7 +702,6 @@ const DC_FUNCTIONS null_driver =
|
||||||
nulldrv_FlattenPath, /* pFlattenPath */
|
nulldrv_FlattenPath, /* pFlattenPath */
|
||||||
nulldrv_FrameRgn, /* pFrameRgn */
|
nulldrv_FrameRgn, /* pFrameRgn */
|
||||||
nulldrv_GdiComment, /* pGdiComment */
|
nulldrv_GdiComment, /* pGdiComment */
|
||||||
nulldrv_GetBitmapBits, /* pGetBitmapBits */
|
|
||||||
nulldrv_GetCharWidth, /* pGetCharWidth */
|
nulldrv_GetCharWidth, /* pGetCharWidth */
|
||||||
nulldrv_GetDeviceCaps, /* pGetDeviceCaps */
|
nulldrv_GetDeviceCaps, /* pGetDeviceCaps */
|
||||||
nulldrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */
|
nulldrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */
|
||||||
|
|
|
@ -71,7 +71,6 @@ static const DC_FUNCTIONS EMFDRV_Funcs =
|
||||||
EMFDRV_FlattenPath, /* pFlattenPath */
|
EMFDRV_FlattenPath, /* pFlattenPath */
|
||||||
EMFDRV_FrameRgn, /* pFrameRgn */
|
EMFDRV_FrameRgn, /* pFrameRgn */
|
||||||
EMFDRV_GdiComment, /* pGdiComment */
|
EMFDRV_GdiComment, /* pGdiComment */
|
||||||
NULL, /* pGetBitmapBits */
|
|
||||||
NULL, /* pGetCharWidth */
|
NULL, /* pGetCharWidth */
|
||||||
EMFDRV_GetDeviceCaps, /* pGetDeviceCaps */
|
EMFDRV_GetDeviceCaps, /* pGetDeviceCaps */
|
||||||
NULL, /* pGetDeviceGammaRamp */
|
NULL, /* pGetDeviceGammaRamp */
|
||||||
|
|
|
@ -115,7 +115,6 @@ static const DC_FUNCTIONS MFDRV_Funcs =
|
||||||
MFDRV_FlattenPath, /* pFlattenPath */
|
MFDRV_FlattenPath, /* pFlattenPath */
|
||||||
MFDRV_FrameRgn, /* pFrameRgn */
|
MFDRV_FrameRgn, /* pFrameRgn */
|
||||||
NULL, /* pGdiComment */
|
NULL, /* pGdiComment */
|
||||||
NULL, /* pGetBitmapBits */
|
|
||||||
NULL, /* pGetCharWidth */
|
NULL, /* pGetCharWidth */
|
||||||
MFDRV_GetDeviceCaps, /* pGetDeviceCaps */
|
MFDRV_GetDeviceCaps, /* pGetDeviceCaps */
|
||||||
NULL, /* pGetDeviceGammaRamp */
|
NULL, /* pGetDeviceGammaRamp */
|
||||||
|
|
|
@ -837,7 +837,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
|
||||||
NULL, /* pFlattenPath */
|
NULL, /* pFlattenPath */
|
||||||
NULL, /* pFrameRgn */
|
NULL, /* pFrameRgn */
|
||||||
NULL, /* pGdiComment */
|
NULL, /* pGdiComment */
|
||||||
NULL, /* pGetBitmapBits */
|
|
||||||
PSDRV_GetCharWidth, /* pGetCharWidth */
|
PSDRV_GetCharWidth, /* pGetCharWidth */
|
||||||
PSDRV_GetDeviceCaps, /* pGetDeviceCaps */
|
PSDRV_GetDeviceCaps, /* pGetDeviceCaps */
|
||||||
NULL, /* pGetDeviceGammaRamp */
|
NULL, /* pGetDeviceGammaRamp */
|
||||||
|
|
|
@ -480,7 +480,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
|
||||||
NULL, /* pFlattenPath */
|
NULL, /* pFlattenPath */
|
||||||
NULL, /* pFrameRgn */
|
NULL, /* pFrameRgn */
|
||||||
NULL, /* pGdiComment */
|
NULL, /* pGdiComment */
|
||||||
NULL, /* pGetBitmapBits */
|
|
||||||
X11DRV_GetCharWidth, /* pGetCharWidth */
|
X11DRV_GetCharWidth, /* pGetCharWidth */
|
||||||
X11DRV_GetDeviceCaps, /* pGetDeviceCaps */
|
X11DRV_GetDeviceCaps, /* pGetDeviceCaps */
|
||||||
X11DRV_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */
|
X11DRV_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */
|
||||||
|
|
|
@ -89,7 +89,6 @@ struct gdi_dc_funcs
|
||||||
BOOL (*pFlattenPath)(PHYSDEV);
|
BOOL (*pFlattenPath)(PHYSDEV);
|
||||||
BOOL (*pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT);
|
BOOL (*pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT);
|
||||||
BOOL (*pGdiComment)(PHYSDEV,UINT,CONST BYTE*);
|
BOOL (*pGdiComment)(PHYSDEV,UINT,CONST BYTE*);
|
||||||
LONG (*pGetBitmapBits)(HBITMAP,void*,LONG);
|
|
||||||
BOOL (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT);
|
BOOL (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT);
|
||||||
INT (*pGetDeviceCaps)(PHYSDEV,INT);
|
INT (*pGetDeviceCaps)(PHYSDEV,INT);
|
||||||
BOOL (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID);
|
BOOL (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID);
|
||||||
|
@ -190,7 +189,7 @@ struct gdi_dc_funcs
|
||||||
};
|
};
|
||||||
|
|
||||||
/* increment this when you change the DC function table */
|
/* 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 )
|
static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue