Commit 9391c6a7 authored by Alexandre Julliard's avatar Alexandre Julliard

gdi32: Add a CopyBitmap driver entry point.

parent cc673f44
...@@ -523,6 +523,7 @@ const struct gdi_dc_funcs dib_driver = ...@@ -523,6 +523,7 @@ const struct gdi_dc_funcs dib_driver =
NULL, /* pChoosePixelFormat */ NULL, /* pChoosePixelFormat */
NULL, /* pChord */ NULL, /* pChord */
NULL, /* pCloseFigure */ NULL, /* pCloseFigure */
NULL, /* pCopyBitmap */
NULL, /* pCreateBitmap */ NULL, /* pCreateBitmap */
NULL, /* pCreateCompatibleDC */ NULL, /* pCreateCompatibleDC */
dibdrv_CreateDC, /* pCreateDC */ dibdrv_CreateDC, /* pCreateDC */
......
...@@ -209,6 +209,11 @@ static BOOL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom ...@@ -209,6 +209,11 @@ static BOOL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom
return TRUE; return TRUE;
} }
static BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst )
{
return TRUE;
}
static BOOL nulldrv_CreateBitmap( PHYSDEV dev, HBITMAP bitmap ) static BOOL nulldrv_CreateBitmap( PHYSDEV dev, HBITMAP bitmap )
{ {
return TRUE; return TRUE;
...@@ -747,6 +752,7 @@ const struct gdi_dc_funcs null_driver = ...@@ -747,6 +752,7 @@ const struct gdi_dc_funcs null_driver =
nulldrv_ChoosePixelFormat, /* pChoosePixelFormat */ nulldrv_ChoosePixelFormat, /* pChoosePixelFormat */
nulldrv_Chord, /* pChord */ nulldrv_Chord, /* pChord */
nulldrv_CloseFigure, /* pCloseFigure */ nulldrv_CloseFigure, /* pCloseFigure */
nulldrv_CopyBitmap, /* pCopyBitmap */
nulldrv_CreateBitmap, /* pCreateBitmap */ nulldrv_CreateBitmap, /* pCreateBitmap */
nulldrv_CreateCompatibleDC, /* pCreateCompatibleDC */ nulldrv_CreateCompatibleDC, /* pCreateCompatibleDC */
nulldrv_CreateDC, /* pCreateDC */ nulldrv_CreateDC, /* pCreateDC */
......
...@@ -47,6 +47,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = ...@@ -47,6 +47,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs =
NULL, /* pChoosePixelFormat */ NULL, /* pChoosePixelFormat */
EMFDRV_Chord, /* pChord */ EMFDRV_Chord, /* pChord */
EMFDRV_CloseFigure, /* pCloseFigure */ EMFDRV_CloseFigure, /* pCloseFigure */
NULL, /* pCopyBitmap */
NULL, /* pCreateBitmap */ NULL, /* pCreateBitmap */
NULL, /* pCreateCompatibleDC */ NULL, /* pCreateCompatibleDC */
NULL, /* pCreateDC */ NULL, /* pCreateDC */
......
...@@ -7117,6 +7117,7 @@ static const struct gdi_dc_funcs freetype_funcs = ...@@ -7117,6 +7117,7 @@ static const struct gdi_dc_funcs freetype_funcs =
NULL, /* pChoosePixelFormat */ NULL, /* pChoosePixelFormat */
NULL, /* pChord */ NULL, /* pChord */
NULL, /* pCloseFigure */ NULL, /* pCloseFigure */
NULL, /* pCopyBitmap */
NULL, /* pCreateBitmap */ NULL, /* pCreateBitmap */
NULL, /* pCreateCompatibleDC */ NULL, /* pCreateCompatibleDC */
freetype_CreateDC, /* pCreateDC */ freetype_CreateDC, /* pCreateDC */
......
...@@ -92,6 +92,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = ...@@ -92,6 +92,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
NULL, /* pChoosePixelFormat */ NULL, /* pChoosePixelFormat */
MFDRV_Chord, /* pChord */ MFDRV_Chord, /* pChord */
MFDRV_CloseFigure, /* pCloseFigure */ MFDRV_CloseFigure, /* pCloseFigure */
NULL, /* pCopyBitmap */
NULL, /* pCreateBitmap */ NULL, /* pCreateBitmap */
MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */
NULL, /* pCreateDC */ NULL, /* pCreateDC */
......
...@@ -2265,6 +2265,7 @@ const struct gdi_dc_funcs path_driver = ...@@ -2265,6 +2265,7 @@ const struct gdi_dc_funcs path_driver =
NULL, /* pChoosePixelFormat */ NULL, /* pChoosePixelFormat */
pathdrv_Chord, /* pChord */ pathdrv_Chord, /* pChord */
pathdrv_CloseFigure, /* pCloseFigure */ pathdrv_CloseFigure, /* pCloseFigure */
NULL, /* pCopyBitmap */
NULL, /* pCreateBitmap */ NULL, /* pCreateBitmap */
NULL, /* pCreateCompatibleDC */ NULL, /* pCreateCompatibleDC */
pathdrv_CreateDC, /* pCreateDC */ pathdrv_CreateDC, /* pCreateDC */
......
...@@ -829,6 +829,7 @@ static const struct gdi_dc_funcs psdrv_funcs = ...@@ -829,6 +829,7 @@ static const struct gdi_dc_funcs psdrv_funcs =
NULL, /* pChoosePixelFormat */ NULL, /* pChoosePixelFormat */
PSDRV_Chord, /* pChord */ PSDRV_Chord, /* pChord */
NULL, /* pCloseFigure */ NULL, /* pCloseFigure */
NULL, /* pCopyBitmap */
NULL, /* pCreateBitmap */ NULL, /* pCreateBitmap */
PSDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ PSDRV_CreateCompatibleDC, /* pCreateCompatibleDC */
PSDRV_CreateDC, /* pCreateDC */ PSDRV_CreateDC, /* pCreateDC */
......
...@@ -476,6 +476,7 @@ static const struct gdi_dc_funcs x11drv_funcs = ...@@ -476,6 +476,7 @@ static const struct gdi_dc_funcs x11drv_funcs =
X11DRV_ChoosePixelFormat, /* pChoosePixelFormat */ X11DRV_ChoosePixelFormat, /* pChoosePixelFormat */
X11DRV_Chord, /* pChord */ X11DRV_Chord, /* pChord */
NULL, /* pCloseFigure */ NULL, /* pCloseFigure */
NULL, /* pCopyBitmap */
X11DRV_CreateBitmap, /* pCreateBitmap */ X11DRV_CreateBitmap, /* pCreateBitmap */
X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */ X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */
X11DRV_CreateDC, /* pCreateDC */ X11DRV_CreateDC, /* pCreateDC */
......
...@@ -3060,6 +3060,7 @@ static const struct gdi_dc_funcs xrender_funcs = ...@@ -3060,6 +3060,7 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pChoosePixelFormat */ NULL, /* pChoosePixelFormat */
NULL, /* pChord */ NULL, /* pChord */
NULL, /* pCloseFigure */ NULL, /* pCloseFigure */
NULL, /* pCopyBitmap */
xrenderdrv_CreateBitmap, /* pCreateBitmap */ xrenderdrv_CreateBitmap, /* pCreateBitmap */
xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */ xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */
xrenderdrv_CreateDC, /* pCreateDC */ xrenderdrv_CreateDC, /* pCreateDC */
......
...@@ -65,6 +65,7 @@ struct gdi_dc_funcs ...@@ -65,6 +65,7 @@ struct gdi_dc_funcs
INT (*pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *); INT (*pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *);
BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
BOOL (*pCloseFigure)(PHYSDEV); BOOL (*pCloseFigure)(PHYSDEV);
BOOL (*pCopyBitmap)(HBITMAP,HBITMAP);
BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP); BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP);
BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*); BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*);
BOOL (*pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); BOOL (*pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
...@@ -204,7 +205,7 @@ struct gdi_dc_funcs ...@@ -204,7 +205,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 18 #define WINE_GDI_DRIVER_VERSION 19
static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment