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

Fix types of GetDIBits functions (LPSTR should be LPVOID).

This commit is contained in:
Zygo Blaxell 1999-02-09 14:13:12 +00:00 committed by Alexandre Julliard
parent e5a6049bee
commit 1084b2cbff
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wingdi.h
View File

@ -2348,8 +2348,8 @@ INT32 WINAPI GetDeviceCaps32(HDC32,INT32);
UINT16 WINAPI GetDIBColorTable16(HDC16,UINT16,UINT16,RGBQUAD*); UINT16 WINAPI GetDIBColorTable16(HDC16,UINT16,UINT16,RGBQUAD*);
UINT32 WINAPI GetDIBColorTable32(HDC32,UINT32,UINT32,RGBQUAD*); UINT32 WINAPI GetDIBColorTable32(HDC32,UINT32,UINT32,RGBQUAD*);
#define GetDIBColorTable WINELIB_NAME(GetDIBColorTable) #define GetDIBColorTable WINELIB_NAME(GetDIBColorTable)
INT16 WINAPI GetDIBits16(HDC16,HBITMAP16,UINT16,UINT16,LPSTR,LPBITMAPINFO,UINT16); INT16 WINAPI GetDIBits16(HDC16,HBITMAP16,UINT16,UINT16,LPVOID,LPBITMAPINFO,UINT16);
INT32 WINAPI GetDIBits32(HDC32,HBITMAP32,UINT32,UINT32,LPSTR,LPBITMAPINFO,UINT32); INT32 WINAPI GetDIBits32(HDC32,HBITMAP32,UINT32,UINT32,LPVOID,LPBITMAPINFO,UINT32);
#define GetDIBits WINELIB_NAME(GetDIBits) #define GetDIBits WINELIB_NAME(GetDIBits)
DWORD WINAPI GetFontData32(HDC32,DWORD,DWORD,LPVOID,DWORD); DWORD WINAPI GetFontData32(HDC32,DWORD,DWORD,LPVOID,DWORD);
#define GetFontData WINELIB_NAME(GetFontData) #define GetFontData WINELIB_NAME(GetFontData)

6
objects/dib.c
View File

@ -418,7 +418,7 @@ UINT32 WINAPI GetDIBColorTable32( HDC32 hdc, UINT32 startpos, UINT32 entries,
* GetDIBits16 (GDI.441) * GetDIBits16 (GDI.441)
*/ */
INT16 WINAPI GetDIBits16( HDC16 hdc, HBITMAP16 hbitmap, UINT16 startscan, INT16 WINAPI GetDIBits16( HDC16 hdc, HBITMAP16 hbitmap, UINT16 startscan,
UINT16 lines, LPSTR bits, BITMAPINFO * info, UINT16 lines, LPVOID bits, BITMAPINFO * info,
UINT16 coloruse ) UINT16 coloruse )
{ {
return GetDIBits32( hdc, hbitmap, startscan, lines, bits, info, coloruse ); return GetDIBits32( hdc, hbitmap, startscan, lines, bits, info, coloruse );
@ -439,7 +439,7 @@ INT32 WINAPI GetDIBits32(
HBITMAP32 hbitmap, /* [in] Handle to bitmap */ HBITMAP32 hbitmap, /* [in] Handle to bitmap */
UINT32 startscan, /* [in] First scan line to set in dest bitmap */ UINT32 startscan, /* [in] First scan line to set in dest bitmap */
UINT32 lines, /* [in] Number of scan lines to copy */ UINT32 lines, /* [in] Number of scan lines to copy */
LPSTR bits, /* [out] Address of array for bitmap bits */ LPVOID bits, /* [out] Address of array for bitmap bits */
BITMAPINFO * info, /* [out] Address of structure with bitmap data */ BITMAPINFO * info, /* [out] Address of structure with bitmap data */
UINT32 coloruse) /* [in] RGB or palette index */ UINT32 coloruse) /* [in] RGB or palette index */
{ {
@ -488,7 +488,7 @@ INT32 WINAPI GetDIBits32(
if (bits) if (bits)
{ {
BYTE* bbits = bits; BYTE* bbits = (BYTE*)bits;
int pad, yend, xend = bmp->bitmap.bmWidth; int pad, yend, xend = bmp->bitmap.bmWidth;
TRACE(bitmap, "%u scanlines of (%i,%i) -> (%i,%i) starting from %u\n", TRACE(bitmap, "%u scanlines of (%i,%i) -> (%i,%i) starting from %u\n",