From 1a2417d9bce09229f3b6a82853575759259c15ee Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 19 Jun 2006 11:25:42 +0200 Subject: [PATCH] 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 547159a924c..82d0042a69a 100644 --- a/dlls/gdi/dib.c +++ b/dlls/gdi/dib.c @@ -1127,11 +1127,10 @@ HBITMAP16 WINAPI CreateDIBSection16 (HDC16 hdc, const BITMAPINFO *bmi, UINT16 us } /*********************************************************************** - * 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, const BITMAPINFO *bmi, UINT usage, 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, const BITMAPINFO *bmi, UINT usage, 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 1c245d87251..723ffd38e9d 100644 --- a/dlls/gdi/gdi32.spec +++ b/dlls/gdi/gdi32.spec @@ -519,6 +519,5 @@ ################################################################ # 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)