Alexandre Julliard : gdi32: Add a CopyBitmap driver entry point.
Alexandre Julliard
julliard at winehq.org
Wed Nov 9 13:29:41 CST 2011
Module: wine
Branch: master
Commit: 9391c6a757bb9441064c27250d8733ab596b3563
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9391c6a757bb9441064c27250d8733ab596b3563
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Nov 7 21:46:25 2011 +0100
gdi32: Add a CopyBitmap driver entry point.
---
dlls/gdi32/dibdrv/dc.c | 1 +
dlls/gdi32/driver.c | 6 ++++++
dlls/gdi32/enhmfdrv/init.c | 1 +
dlls/gdi32/freetype.c | 1 +
dlls/gdi32/mfdrv/init.c | 1 +
dlls/gdi32/path.c | 1 +
dlls/wineps.drv/init.c | 1 +
dlls/winex11.drv/init.c | 1 +
dlls/winex11.drv/xrender.c | 1 +
include/wine/gdi_driver.h | 3 ++-
10 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c
index 5a7d011..3adf246 100644
--- a/dlls/gdi32/dibdrv/dc.c
+++ b/dlls/gdi32/dibdrv/dc.c
@@ -523,6 +523,7 @@ const struct gdi_dc_funcs dib_driver =
NULL, /* pChoosePixelFormat */
NULL, /* pChord */
NULL, /* pCloseFigure */
+ NULL, /* pCopyBitmap */
NULL, /* pCreateBitmap */
NULL, /* pCreateCompatibleDC */
dibdrv_CreateDC, /* pCreateDC */
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index 0986d68..b72d6d7 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -209,6 +209,11 @@ static BOOL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom
return TRUE;
}
+static BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst )
+{
+ return TRUE;
+}
+
static BOOL nulldrv_CreateBitmap( PHYSDEV dev, HBITMAP bitmap )
{
return TRUE;
@@ -747,6 +752,7 @@ const struct gdi_dc_funcs null_driver =
nulldrv_ChoosePixelFormat, /* pChoosePixelFormat */
nulldrv_Chord, /* pChord */
nulldrv_CloseFigure, /* pCloseFigure */
+ nulldrv_CopyBitmap, /* pCopyBitmap */
nulldrv_CreateBitmap, /* pCreateBitmap */
nulldrv_CreateCompatibleDC, /* pCreateCompatibleDC */
nulldrv_CreateDC, /* pCreateDC */
diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c
index 11918c1..f4fa4d3 100644
--- a/dlls/gdi32/enhmfdrv/init.c
+++ b/dlls/gdi32/enhmfdrv/init.c
@@ -47,6 +47,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs =
NULL, /* pChoosePixelFormat */
EMFDRV_Chord, /* pChord */
EMFDRV_CloseFigure, /* pCloseFigure */
+ NULL, /* pCopyBitmap */
NULL, /* pCreateBitmap */
NULL, /* pCreateCompatibleDC */
NULL, /* pCreateDC */
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 1fedc74..9137322 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -7117,6 +7117,7 @@ static const struct gdi_dc_funcs freetype_funcs =
NULL, /* pChoosePixelFormat */
NULL, /* pChord */
NULL, /* pCloseFigure */
+ NULL, /* pCopyBitmap */
NULL, /* pCreateBitmap */
NULL, /* pCreateCompatibleDC */
freetype_CreateDC, /* pCreateDC */
diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c
index d738725..b837d84 100644
--- a/dlls/gdi32/mfdrv/init.c
+++ b/dlls/gdi32/mfdrv/init.c
@@ -92,6 +92,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
NULL, /* pChoosePixelFormat */
MFDRV_Chord, /* pChord */
MFDRV_CloseFigure, /* pCloseFigure */
+ NULL, /* pCopyBitmap */
NULL, /* pCreateBitmap */
MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */
NULL, /* pCreateDC */
diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c
index d908774..dfe15ed 100644
--- a/dlls/gdi32/path.c
+++ b/dlls/gdi32/path.c
@@ -2265,6 +2265,7 @@ const struct gdi_dc_funcs path_driver =
NULL, /* pChoosePixelFormat */
pathdrv_Chord, /* pChord */
pathdrv_CloseFigure, /* pCloseFigure */
+ NULL, /* pCopyBitmap */
NULL, /* pCreateBitmap */
NULL, /* pCreateCompatibleDC */
pathdrv_CreateDC, /* pCreateDC */
diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index e6a0254..e61df3e 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -829,6 +829,7 @@ static const struct gdi_dc_funcs psdrv_funcs =
NULL, /* pChoosePixelFormat */
PSDRV_Chord, /* pChord */
NULL, /* pCloseFigure */
+ NULL, /* pCopyBitmap */
NULL, /* pCreateBitmap */
PSDRV_CreateCompatibleDC, /* pCreateCompatibleDC */
PSDRV_CreateDC, /* pCreateDC */
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 484ab7f..6574270 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -476,6 +476,7 @@ static const struct gdi_dc_funcs x11drv_funcs =
X11DRV_ChoosePixelFormat, /* pChoosePixelFormat */
X11DRV_Chord, /* pChord */
NULL, /* pCloseFigure */
+ NULL, /* pCopyBitmap */
X11DRV_CreateBitmap, /* pCreateBitmap */
X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */
X11DRV_CreateDC, /* pCreateDC */
diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index a61568e..30b9553 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -3060,6 +3060,7 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pChoosePixelFormat */
NULL, /* pChord */
NULL, /* pCloseFigure */
+ NULL, /* pCopyBitmap */
xrenderdrv_CreateBitmap, /* pCreateBitmap */
xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */
xrenderdrv_CreateDC, /* pCreateDC */
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index cb12145..d996fb4 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -65,6 +65,7 @@ struct gdi_dc_funcs
INT (*pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *);
BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
BOOL (*pCloseFigure)(PHYSDEV);
+ BOOL (*pCopyBitmap)(HBITMAP,HBITMAP);
BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP);
BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*);
BOOL (*pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
@@ -204,7 +205,7 @@ struct gdi_dc_funcs
};
/* 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 )
{
More information about the wine-cvs
mailing list