mirror of
https://github.com/reactos/reactos.git
synced 2024-08-01 00:58:16 +00:00
[GDI32]
- Header describes the bitmap to be created, not the bits we are passed. - Circumvent gcc weirdness (sigh...) svn path=/branches/reactos-yarotows/; revision=47702
This commit is contained in:
parent
974e9c0c41
commit
54e2569bf0
|
@ -146,7 +146,7 @@ typedef BOOL (WINAPI *STARTPAGEPRINTER) (HANDLE);
|
||||||
typedef BOOL (WINAPI *SEEKPRINTER) (HANDLE,LARGE_INTEGER,PLARGE_INTEGER,DWORD,BOOL);
|
typedef BOOL (WINAPI *SEEKPRINTER) (HANDLE,LARGE_INTEGER,PLARGE_INTEGER,DWORD,BOOL);
|
||||||
typedef BOOL (WINAPI *SPLREADPRINTER) (HANDLE,LPBYTE *,DWORD);
|
typedef BOOL (WINAPI *SPLREADPRINTER) (HANDLE,LPBYTE *,DWORD);
|
||||||
// Same as ddk/winsplp.h DriverUnloadComplete?
|
// Same as ddk/winsplp.h DriverUnloadComplete?
|
||||||
typedef BOOL (WINAPI *SPLDRIVERUNLOADCOMPLETE) (LPWSTR);
|
typedef BOOL (WINAPI *SPLDRIVERUNLOADCOMPLETE) (LPWSTR);
|
||||||
// Driver support:
|
// Driver support:
|
||||||
// DrvDocumentEvent api/winddiui.h not W2k8 DocumentEventAW
|
// DrvDocumentEvent api/winddiui.h not W2k8 DocumentEventAW
|
||||||
typedef INT (WINAPI *DOCUMENTEVENT) (HANDLE,HDC,INT,ULONG,PVOID,ULONG,PVOID);
|
typedef INT (WINAPI *DOCUMENTEVENT) (HANDLE,HDC,INT,ULONG,PVOID,ULONG,PVOID);
|
||||||
|
@ -173,10 +173,10 @@ HEAP_strdupA2W(
|
||||||
VOID
|
VOID
|
||||||
HEAP_free(LPVOID memory);
|
HEAP_free(LPVOID memory);
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
FASTCALL
|
FASTCALL
|
||||||
FONT_TextMetricWToA(
|
FONT_TextMetricWToA(
|
||||||
const TEXTMETRICW *ptmW,
|
const TEXTMETRICW *ptmW,
|
||||||
LPTEXTMETRICA ptmA
|
LPTEXTMETRICA ptmA
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -279,7 +279,7 @@ WINAPI
|
||||||
GdiSetLastError( DWORD dwErrCode );
|
GdiSetLastError( DWORD dwErrCode );
|
||||||
|
|
||||||
DWORD WINAPI GdiGetCodePage(HDC);
|
DWORD WINAPI GdiGetCodePage(HDC);
|
||||||
UINT FASTCALL DIB_BitmapBitsSize( PBITMAPINFO );
|
UINT FASTCALL DIB_BitmapBitsSize( CONST BITMAPINFO* );
|
||||||
|
|
||||||
int
|
int
|
||||||
WINAPI
|
WINAPI
|
||||||
|
|
|
@ -34,7 +34,7 @@ DIB_BitmapMaxBitsSize( PBITMAPINFO Info, UINT ScanLines )
|
||||||
|
|
||||||
UINT
|
UINT
|
||||||
FASTCALL
|
FASTCALL
|
||||||
DIB_BitmapBitsSize( PBITMAPINFO Info )
|
DIB_BitmapBitsSize( CONST BITMAPINFO* Info )
|
||||||
{
|
{
|
||||||
UINT Ret;
|
UINT Ret;
|
||||||
|
|
||||||
|
@ -476,7 +476,8 @@ CreateDIBitmap( HDC hDC,
|
||||||
// For Icm support.
|
// For Icm support.
|
||||||
// GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr))
|
// GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr))
|
||||||
|
|
||||||
cjBmpScanSize = DIB_BitmapBitsSize((LPBITMAPINFO)Header);
|
/* Mmmh, this is not really safe */
|
||||||
|
cjBmpScanSize = DIB_BitmapBitsSize(Data);
|
||||||
DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", Data,bpp,dibsize,ConvertedInfoSize,cjBmpScanSize);
|
DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", Data,bpp,dibsize,ConvertedInfoSize,cjBmpScanSize);
|
||||||
|
|
||||||
if ( !width || !height )
|
if ( !width || !height )
|
||||||
|
|
Loading…
Reference in a new issue