Alexandre Julliard : gdi32: Get rid of the no longer needed DIB_CreateDIBSection export.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jun 19 05:44:12 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 1a2417d9bce09229f3b6a82853575759259c15ee
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=1a2417d9bce09229f3b6a82853575759259c15ee

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun 19 11:25:42 2006 +0200

gdi32: Get rid of the no longer needed DIB_CreateDIBSection export.

---

 dlls/gdi/dib.c      |   21 ++++-----------------
 dlls/gdi/gdi32.spec |    1 -
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/dlls/gdi/dib.c b/dlls/gdi/dib.c
index 547159a..82d0042 100644
--- a/dlls/gdi/dib.c
+++ b/dlls/gdi/dib.c
@@ -1127,11 +1127,10 @@ HBITMAP16 WINAPI CreateDIBSection16 (HDC
 }
 
 /***********************************************************************
- *           DIB_CreateDIBSection
+ *           CreateDIBSection    (GDI32.@)
  */
-HBITMAP DIB_CreateDIBSection(HDC hdc, const BITMAPINFO *bmi, UINT usage,
-                             VOID **bits, HANDLE section,
-                             DWORD offset, DWORD ovr_pitch)
+HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage,
+                                VOID **bits, HANDLE section, DWORD offset)
 {
     HBITMAP ret = 0;
     DC *dc;
@@ -1162,7 +1161,7 @@ HBITMAP DIB_CreateDIBSection(HDC hdc, co
     dib->dsBm.bmType       = 0;
     dib->dsBm.bmWidth      = width;
     dib->dsBm.bmHeight     = height >= 0 ? height : -height;
-    dib->dsBm.bmWidthBytes = ovr_pitch ? ovr_pitch : DIB_GetDIBWidthBytes(width, bpp);
+    dib->dsBm.bmWidthBytes = DIB_GetDIBWidthBytes(width, bpp);
     dib->dsBm.bmPlanes     = planes;
     dib->dsBm.bmBitsPixel  = bpp;
     dib->dsBm.bmBits       = NULL;
@@ -1229,8 +1228,6 @@ HBITMAP DIB_CreateDIBSection(HDC hdc, co
         mapBits = MapViewOfFile( section, FILE_MAP_ALL_ACCESS, 0, mapOffset, mapSize );
         if (mapBits) dib->dsBm.bmBits = (char *)mapBits + (offset - mapOffset);
     }
-    else if (ovr_pitch && offset)
-        dib->dsBm.bmBits = (LPVOID) offset;
     else
     {
         offset = 0;
@@ -1287,13 +1284,3 @@ error:
     HeapFree( GetProcessHeap(), 0, dib );
     return 0;
 }
-
-/***********************************************************************
- *           CreateDIBSection    (GDI32.@)
- */
-HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage,
-				VOID **bits, HANDLE section,
-				DWORD offset)
-{
-    return DIB_CreateDIBSection(hdc, bmi, usage, bits, section, offset, 0);
-}
diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec
index 1c245d8..723ffd3 100644
--- a/dlls/gdi/gdi32.spec
+++ b/dlls/gdi/gdi32.spec
@@ -519,6 +519,5 @@ # GDI objects
 ################################################################
 # Wine dll separation hacks, these will go away, don't use them
 #
-@ cdecl DIB_CreateDIBSection(long ptr long ptr long long long)
 @ cdecl GDI_GetObjPtr(long long)
 @ cdecl GDI_ReleaseObj(long)




More information about the wine-cvs mailing list