ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Alexandre Julliard 2006-06-19 11:25:42 +02:00
parent e8950b29ae
commit 1a2417d9bc
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/gdi/dib.c
View File

@ -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, HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage,
VOID **bits, HANDLE section, VOID **bits, HANDLE section, DWORD offset)
DWORD offset, DWORD ovr_pitch)
{ {
HBITMAP ret = 0; HBITMAP ret = 0;
DC *dc; DC *dc;
@ -1162,7 +1161,7 @@ HBITMAP DIB_CreateDIBSection(HDC hdc, const BITMAPINFO *bmi, UINT usage,
dib->dsBm.bmType = 0; dib->dsBm.bmType = 0;
dib->dsBm.bmWidth = width; dib->dsBm.bmWidth = width;
dib->dsBm.bmHeight = height >= 0 ? height : -height; 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.bmPlanes = planes;
dib->dsBm.bmBitsPixel = bpp; dib->dsBm.bmBitsPixel = bpp;
dib->dsBm.bmBits = NULL; 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 ); mapBits = MapViewOfFile( section, FILE_MAP_ALL_ACCESS, 0, mapOffset, mapSize );
if (mapBits) dib->dsBm.bmBits = (char *)mapBits + (offset - mapOffset); if (mapBits) dib->dsBm.bmBits = (char *)mapBits + (offset - mapOffset);
} }
else if (ovr_pitch && offset)
dib->dsBm.bmBits = (LPVOID) offset;
else else
{ {
offset = 0; offset = 0;
@ -1287,13 +1284,3 @@ error:
HeapFree( GetProcessHeap(), 0, dib ); HeapFree( GetProcessHeap(), 0, dib );
return 0; 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);
}

1
dlls/gdi/gdi32.spec
View File

@ -519,6 +519,5 @@
################################################################ ################################################################
# Wine dll separation hacks, these will go away, don't use them # 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_GetObjPtr(long long)
@ cdecl GDI_ReleaseObj(long) @ cdecl GDI_ReleaseObj(long)