Alexandre Julliard : gdi32: Get rid of the CreateDIBSection driver entry point.
Alexandre Julliard
julliard at winehq.org
Tue Jan 10 13:11:20 CST 2012
Module: wine
Branch: master
Commit: fbbf3ba40814129effa1be087b29414e139dcf3c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbbf3ba40814129effa1be087b29414e139dcf3c
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Jan 9 14:21:01 2012 +0100
gdi32: Get rid of the CreateDIBSection 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, 1 insertions(+), 16 deletions(-)
diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c
index 220224f..9f1a633 100644
--- a/dlls/gdi32/dibdrv/dc.c
+++ b/dlls/gdi32/dibdrv/dc.c
@@ -575,7 +575,6 @@ const struct gdi_dc_funcs dib_driver =
NULL, /* pCreateBitmap */
NULL, /* pCreateCompatibleDC */
dibdrv_CreateDC, /* pCreateDC */
- NULL, /* pCreateDIBSection */
dibdrv_DeleteBitmap, /* pDeleteBitmap */
dibdrv_DeleteDC, /* pDeleteDC */
NULL, /* pDeleteObject */
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index 29b6973..36bf48f 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -227,11 +227,6 @@ static BOOL nulldrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device,
return FALSE;
}
-static HBITMAP nulldrv_CreateDIBSection( PHYSDEV dev, HBITMAP bitmap, BITMAPINFO *info, UINT usage )
-{
- return bitmap;
-}
-
static BOOL nulldrv_DeleteBitmap( HBITMAP bitmap )
{
return TRUE;
@@ -739,7 +734,6 @@ const struct gdi_dc_funcs null_driver =
nulldrv_CreateBitmap, /* pCreateBitmap */
nulldrv_CreateCompatibleDC, /* pCreateCompatibleDC */
nulldrv_CreateDC, /* pCreateDC */
- nulldrv_CreateDIBSection, /* pCreateDIBSection */
nulldrv_DeleteBitmap, /* pDeleteBitmap */
nulldrv_DeleteDC, /* pDeleteDC */
nulldrv_DeleteObject, /* pDeleteObject */
diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c
index 28c2b2f..f988ebd 100644
--- a/dlls/gdi32/enhmfdrv/init.c
+++ b/dlls/gdi32/enhmfdrv/init.c
@@ -51,7 +51,6 @@ static const struct gdi_dc_funcs EMFDRV_Funcs =
NULL, /* pCreateBitmap */
NULL, /* pCreateCompatibleDC */
NULL, /* pCreateDC */
- NULL, /* pCreateDIBSection */
NULL, /* pDeleteBitmap */
EMFDRV_DeleteDC, /* pDeleteDC */
EMFDRV_DeleteObject, /* pDeleteObject */
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 537d81a..37725a1 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -7158,7 +7158,6 @@ static const struct gdi_dc_funcs freetype_funcs =
NULL, /* pCreateBitmap */
NULL, /* pCreateCompatibleDC */
freetype_CreateDC, /* pCreateDC */
- NULL, /* pCreateDIBSection */
NULL, /* pDeleteBitmap */
freetype_DeleteDC, /* pDeleteDC */
NULL, /* pDeleteObject */
diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c
index 0aa9f3f..e02c6be 100644
--- a/dlls/gdi32/mfdrv/init.c
+++ b/dlls/gdi32/mfdrv/init.c
@@ -96,7 +96,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
NULL, /* pCreateBitmap */
MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */
NULL, /* pCreateDC */
- NULL, /* pCreateDIBSection */
NULL, /* pDeleteBitmap */
MFDRV_DeleteDC, /* pDeleteDC */
MFDRV_DeleteObject, /* pDeleteObject */
diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c
index 4d753fd..52f103d 100644
--- a/dlls/gdi32/path.c
+++ b/dlls/gdi32/path.c
@@ -2250,7 +2250,6 @@ const struct gdi_dc_funcs path_driver =
NULL, /* pCreateBitmap */
NULL, /* pCreateCompatibleDC */
pathdrv_CreateDC, /* pCreateDC */
- NULL, /* pCreateDIBSection */
NULL, /* pDeleteBitmap */
pathdrv_DeleteDC, /* pDeleteDC */
NULL, /* pDeleteObject */
diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index 5f54244..fa47573 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -834,7 +834,6 @@ static const struct gdi_dc_funcs psdrv_funcs =
NULL, /* pCreateBitmap */
PSDRV_CreateCompatibleDC, /* pCreateCompatibleDC */
PSDRV_CreateDC, /* pCreateDC */
- NULL, /* pCreateDIBSection */
NULL, /* pDeleteBitmap */
PSDRV_DeleteDC, /* pDeleteDC */
NULL, /* pDeleteObject */
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 15f110b..0530e31 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -467,7 +467,6 @@ static const struct gdi_dc_funcs x11drv_funcs =
X11DRV_CreateBitmap, /* pCreateBitmap */
X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */
X11DRV_CreateDC, /* pCreateDC */
- X11DRV_CreateDIBSection, /* pCreateDIBSection */
X11DRV_DeleteBitmap, /* pDeleteBitmap */
X11DRV_DeleteDC, /* pDeleteDC */
NULL, /* pDeleteObject */
diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index dc3d55b..feb8523 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -2684,7 +2684,6 @@ static const struct gdi_dc_funcs xrender_funcs =
xrenderdrv_CreateBitmap, /* pCreateBitmap */
xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */
xrenderdrv_CreateDC, /* pCreateDC */
- NULL, /* pCreateDIBSection */
xrenderdrv_DeleteBitmap, /* pDeleteBitmap */
xrenderdrv_DeleteDC, /* pDeleteDC */
NULL, /* pDeleteObject */
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 2ba1b7b..eb64b36 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -77,7 +77,6 @@ struct gdi_dc_funcs
BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP);
BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*);
BOOL (*pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
- HBITMAP (*pCreateDIBSection)(PHYSDEV,HBITMAP,BITMAPINFO *,UINT);
BOOL (*pDeleteBitmap)(HBITMAP);
BOOL (*pDeleteDC)(PHYSDEV);
BOOL (*pDeleteObject)(PHYSDEV,HGDIOBJ);
@@ -212,7 +211,7 @@ struct gdi_dc_funcs
};
/* increment this when you change the DC function table */
-#define WINE_GDI_DRIVER_VERSION 23
+#define WINE_GDI_DRIVER_VERSION 24
static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset )
{
More information about the wine-cvs
mailing list