fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-01-25 02:22 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbwin/win_prn1.c
    + WIN_BITMAPDIMENSIONS(): Added JPEG support.
    ! hbwin_BitmapType(): Added size checks for safety.
    ! ULONG -> HB_SIZE

  * contrib/hbcurl/hbcurl.c
    ! Fixed to define all .prg level functions regardless
      of libcurl version.
This commit is contained in:
Viktor Szakats
2010-01-25 01:23:32 +00:00
parent 7a2fcf6ca0
commit 663b10f15c
3 changed files with 189 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -17,6 +17,16 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-25 02:22 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbwin/win_prn1.c
+ WIN_BITMAPDIMENSIONS(): Added JPEG support.
! hbwin_BitmapType(): Added size checks for safety.
! ULONG -> HB_SIZE
* contrib/hbcurl/hbcurl.c
! Fixed to define all .prg level functions regardless
of libcurl version.
2010-01-24 23:50 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbwin/win_tprn.prg
! Fix to prev.

44
harbour/contrib/hbcurl/hbcurl.c
View File

@@ -604,39 +604,37 @@ HB_FUNC( CURL_EASY_CLEANUP )
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
#if LIBCURL_VERSION_NUM >= 0x070C01
HB_FUNC( CURL_EASY_RESET )
{
if( PHB_CURL_is( 1 ) )
{
#if LIBCURL_VERSION_NUM >= 0x070C01
PHB_CURL hb_curl = PHB_CURL_par( 1 );
if( hb_curl )
PHB_CURL_free( hb_curl, HB_FALSE );
#endif
}
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
#endif
#if LIBCURL_VERSION_NUM >= 0x071200
HB_FUNC( CURL_EASY_PAUSE )
{
if( PHB_CURL_is( 1 ) )
{
#if LIBCURL_VERSION_NUM >= 0x071200
PHB_CURL hb_curl = PHB_CURL_par( 1 );
hb_retnl( hb_curl ? ( long ) curl_easy_pause( hb_curl->curl, hb_parni( 2 ) ) : HB_CURLE_ERROR );
#else
hb_retnl( HB_CURLE_ERROR );
#endif
}
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
#endif
HB_FUNC( CURL_EASY_PERFORM )
{
if( PHB_CURL_is( 1 ) )
@@ -649,15 +647,14 @@ HB_FUNC( CURL_EASY_PERFORM )
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
#if LIBCURL_VERSION_NUM >= 0x071202
/* NOTE: curl_easy_send( curl, cBuffer, @nSentBytes ) -> nResult */
HB_FUNC( CURL_EASY_SEND )
{
if( PHB_CURL_is( 1 ) )
{
PHB_CURL hb_curl = PHB_CURL_par( 1 );
CURLcode res = ( CURLcode ) HB_CURLE_ERROR;
#if LIBCURL_VERSION_NUM >= 0x071202
PHB_CURL hb_curl = PHB_CURL_par( 1 );
if( hb_curl )
{
@@ -667,7 +664,7 @@ HB_FUNC( CURL_EASY_SEND )
hb_stornl( size, 3 );
}
#endif
hb_retnl( ( long ) res );
}
else
@@ -679,8 +676,9 @@ HB_FUNC( CURL_EASY_RECV )
{
if( PHB_CURL_is( 1 ) )
{
PHB_CURL hb_curl = PHB_CURL_par( 1 );
CURLcode res = ( CURLcode ) HB_CURLE_ERROR;
#if LIBCURL_VERSION_NUM >= 0x071202
PHB_CURL hb_curl = PHB_CURL_par( 1 );
if( hb_curl )
{
@@ -697,15 +695,13 @@ HB_FUNC( CURL_EASY_RECV )
if( ! hb_storclen_buffer( ( char * ) buffer, size, 2 ) )
hb_xfree( buffer );
}
#endif
hb_retnl( ( long ) res );
}
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
#endif
HB_FUNC( CURL_EASY_SETOPT )
{
if( PHB_CURL_is( 1 ) && HB_ISNUM( 2 ) )
@@ -1756,12 +1752,11 @@ HB_FUNC( CURL_EASY_GETINFO )
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
#if LIBCURL_VERSION_NUM >= 0x070F04
HB_FUNC( CURL_EASY_ESCAPE )
{
if( PHB_CURL_is( 1 ) )
{
#if LIBCURL_VERSION_NUM >= 0x070F04
PHB_CURL hb_curl = PHB_CURL_par( 1 );
if( hb_curl )
@@ -1771,6 +1766,7 @@ HB_FUNC( CURL_EASY_ESCAPE )
curl_free( buffer );
}
else
#endif
hb_retc_null();
}
else
@@ -1781,6 +1777,7 @@ HB_FUNC( CURL_EASY_UNESCAPE )
{
if( PHB_CURL_is( 1 ) )
{
#if LIBCURL_VERSION_NUM >= 0x070F04
PHB_CURL hb_curl = PHB_CURL_par( 1 );
if( hb_curl )
@@ -1791,14 +1788,13 @@ HB_FUNC( CURL_EASY_UNESCAPE )
curl_free( buffer );
}
else
#endif
hb_retc_null();
}
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
#endif
/* ---------------------------------------------------------------------------- */
/* Harbour interface (session independent) */
@@ -1853,18 +1849,18 @@ HB_FUNC( CURL_VERSION_INFO )
hb_reta( 0 );
}
#if LIBCURL_VERSION_NUM >= 0x070C00
HB_FUNC( CURL_EASY_STRERROR )
{
if( HB_ISNUM( 1 ) )
#if LIBCURL_VERSION_NUM >= 0x070C00
hb_retc( curl_easy_strerror( ( CURLcode ) hb_parnl( 1 ) ) );
#else
hb_retc_null();
#endif
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
#endif
/* NOTE: This returns the number of seconds since January 1st 1970 in the UTC time zone. */
HB_FUNC( CURL_GETDATE )
{

199
harbour/contrib/hbwin/win_prn1.c
View File

@@ -6,6 +6,7 @@
* Harbour Project source code:
* Printing subsystem for Windows using GUI printing
*
* Copyright 2009-2010 Viktor Szakats (harbour.01 syenar.hu)
* Copyright 2004 Peter Rees <peter@rees.co.nz> Rees Software & Systems Ltd
* www - http://www.harbour-project.org
*
@@ -515,17 +516,17 @@ HB_FUNC( WIN_GETDOCUMENTPROPERTIES )
#define HB_WIN_BITMAP_JPEG 2
#define HB_WIN_BITMAP_PNG 3
static int hbwin_BitmapType( const void * pImgBuf )
static int hbwin_BitmapType( const void * pImgBuf, HB_SIZE size )
{
int iType = HB_WIN_BITMAP_UNKNOWN;
if( pImgBuf )
{
if( memcmp( pImgBuf, "BM", 2 ) == 0 )
if( size > 2 && memcmp( pImgBuf, "BM", 2 ) == 0 )
iType = HB_WIN_BITMAP_BMP;
else if( memcmp( pImgBuf, "\377\330\377", 3 ) == 0 )
else if( size > 3 && memcmp( pImgBuf, "\377\330\377", 3 ) == 0 )
iType = HB_WIN_BITMAP_JPEG;
else if( memcmp( pImgBuf, "\211PNG", 4 ) == 0 )
else if( size > 4 && memcmp( pImgBuf, "\211PNG", 4 ) == 0 )
iType = HB_WIN_BITMAP_PNG;
}
@@ -534,7 +535,7 @@ static int hbwin_BitmapType( const void * pImgBuf )
HB_FUNC( WIN_BITMAPTYPE )
{
hb_retni( hbwin_BitmapType( hb_parc( 1 ) ) );
hb_retni( hbwin_BitmapType( hb_parc( 1 ), hb_parclen( 1 ) ) );
}
HB_FUNC( WIN_LOADBITMAPFILE )
@@ -557,7 +558,7 @@ HB_FUNC( WIN_LOADBITMAPFILE )
hb_fsSeek( fhnd, 0, FS_SET );
if( hb_fsReadLarge( fhnd, pbmfh, ulSize ) == ulSize && hbwin_BitmapType( pbmfh ) != HB_WIN_BITMAP_UNKNOWN )
if( hb_fsReadLarge( fhnd, pbmfh, ulSize ) == ulSize && hbwin_BitmapType( pbmfh, ulSize ) != HB_WIN_BITMAP_UNKNOWN )
hb_retclen_buffer( ( char * ) pbmfh, ( HB_SIZE ) ulSize );
else
hb_xfree( pbmfh );
@@ -575,9 +576,12 @@ HB_FUNC( WIN_LOADBITMAPFILE )
#define CHECKPNGFORMAT 4120
#endif
static HB_BOOL hbwin_CheckPrnDrvFormat( HDC hDC, int iType, const void * pImgBuf, ULONG ulSize, int * piErrCode )
static HB_BOOL hbwin_CheckPrnDrvFormat( HDC hDC, int iType, const void * pImgBuf, HB_SIZE nSize, int * piErrCode )
{
if( hDC && iType && pImgBuf && ulSize >= sizeof( BITMAPCOREHEADER ) )
if( hDC &&
iType != HB_WIN_BITMAP_UNKNOWN &&
pImgBuf &&
nSize >= sizeof( BITMAPCOREHEADER ) )
{
if( iType == HB_WIN_BITMAP_BMP )
return HB_TRUE;
@@ -588,7 +592,7 @@ static HB_BOOL hbwin_CheckPrnDrvFormat( HDC hDC, int iType, const void * pImgBuf
iRes = ExtEscape( hDC, QUERYESCSUPPORT, sizeof( iRes ), ( LPCSTR ) &iRes, 0, 0 );
if( iRes > 0 )
{
if( ExtEscape( hDC, iType, ulSize, ( LPCSTR ) pImgBuf, sizeof( iRes ), ( LPSTR ) &iRes ) > 0 )
if( ExtEscape( hDC, iType, nSize, ( LPCSTR ) pImgBuf, sizeof( iRes ), ( LPSTR ) &iRes ) > 0 )
{
if( iRes == 1 )
return HB_TRUE;
@@ -625,9 +629,10 @@ static HB_BOOL hbwin_CheckPrnDrvFormat( HDC hDC, int iType, const void * pImgBuf
HB_FUNC( WIN_CHECKPRNDRVFORMAT )
{
const char * pImgBuf = hb_parc( 2 );
HB_SIZE nSize = hb_parclen( 2 );
int iErrCode = 0;
hb_retl( hbwin_CheckPrnDrvFormat( hbwapi_par_HDC( 1 ), hbwin_BitmapType( pImgBuf ), pImgBuf, hb_parclen( 2 ), &iErrCode ) );
hb_retl( hbwin_CheckPrnDrvFormat( hbwapi_par_HDC( 1 ), hbwin_BitmapType( pImgBuf, nSize ), pImgBuf, nSize, &iErrCode ) );
hb_storni( iErrCode, 3 );
}
@@ -637,17 +642,17 @@ HB_FUNC( WIN_DRAWBITMAP )
BITMAPINFO * pbmi = NULL;
BYTE * pBits = NULL;
HDC hDC = hbwapi_par_HDC( 1 );
ULONG ulSize = hb_parclen( 2 );
HB_SIZE nSize = hb_parclen( 2 );
BITMAPFILEHEADER * pbmfh = ( BITMAPFILEHEADER * ) hb_parc( 2 );
int iType = hbwin_BitmapType( pbmfh );
int iType = hbwin_BitmapType( pbmfh, nSize );
/* TOFIX: No check is done on 2nd parameter which is a large security hole
and may cause GPF in simple error cases.
[vszakats] */
if( hbwin_CheckPrnDrvFormat( hDC, iType, pbmfh, ulSize, NULL ) )
if( hbwin_CheckPrnDrvFormat( hDC, iType, pbmfh, nSize, NULL ) )
{
int cxDib = hb_parni( 7 );
int cyDib = hb_parni( 8 );
int iWidth = hb_parni( 7 );
int iHeight = hb_parni( 8 );
if( iType == HB_WIN_BITMAP_BMP )
{
@@ -657,27 +662,27 @@ HB_FUNC( WIN_DRAWBITMAP )
/* Remember there are 2 types of BitMap File */
if( pbmi->bmiHeader.biSize == sizeof( BITMAPCOREHEADER ) )
{
cxDib = ( ( BITMAPCOREHEADER * ) pbmi )->bcWidth;
cyDib = ( ( BITMAPCOREHEADER * ) pbmi )->bcHeight;
iWidth = ( ( BITMAPCOREHEADER * ) pbmi )->bcWidth;
iHeight = ( ( BITMAPCOREHEADER * ) pbmi )->bcHeight;
}
else
{
cxDib = pbmi->bmiHeader.biWidth;
cyDib = abs( pbmi->bmiHeader.biHeight );
iWidth = pbmi->bmiHeader.biWidth;
iHeight = abs( pbmi->bmiHeader.biHeight );
}
}
else if( cxDib && cyDib )
else if( iWidth && iHeight )
{
BITMAPINFO bmi;
memset( &bmi, 0, sizeof( bmi ) );
bmi.bmiHeader.biSize = sizeof( BITMAPINFO );
bmi.bmiHeader.biWidth = cxDib;
bmi.bmiHeader.biHeight = -cyDib; /* top-down image */
bmi.bmiHeader.biWidth = iWidth;
bmi.bmiHeader.biHeight = -iHeight; /* top-down image */
bmi.bmiHeader.biPlanes = 1;
bmi.bmiHeader.biBitCount = 0;
bmi.bmiHeader.biCompression = ( iType == HB_WIN_BITMAP_JPEG ? BI_JPEG : BI_PNG );
bmi.bmiHeader.biSizeImage = ulSize;
bmi.bmiHeader.biSizeImage = ( DWORD ) nSize;
pbmi = &bmi;
pBits = ( BYTE * ) pbmfh;
}
@@ -686,7 +691,7 @@ HB_FUNC( WIN_DRAWBITMAP )
{
SetStretchBltMode( hDC, COLORONCOLOR );
hb_retl( StretchDIBits( hDC, hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ),
0, 0, cxDib, cyDib, pBits, pbmi,
0, 0, iWidth, iHeight, pBits, pbmi,
DIB_RGB_COLORS, SRCCOPY ) != ( int ) GDI_ERROR );
}
else
@@ -696,39 +701,153 @@ HB_FUNC( WIN_DRAWBITMAP )
hb_retl( HB_FALSE );
}
#define _JPEG_RET_OK 0
#define _JPEG_RET_OVERRUN 1
#define _JPEG_RET_INVALID 2
#define _JPEG_RET_UNSUPPORTED 3
#define _JPEG_CS_GRAYSCALE 1
#define _JPEG_CS_RGB 2
#define _JPEG_CS_CMYK 3
static int hb_jpeg_get_param( const HB_BYTE * buffer, HB_SIZE nBufferSize, int * piHeight, int * piWidth, int * piColorSpace, int * piBPC )
{
HB_SIZE nPos = 0;
HB_U16 tag;
HB_U16 height = 0;
HB_U16 width = 0;
HB_BYTE colorspace = 0;
HB_BYTE bpc = 0;
if( piHeight )
*piHeight = 0;
if( piWidth )
*piWidth = 0;
if( piColorSpace )
*piColorSpace = 0;
if( piBPC )
*piBPC = 0;
if( nPos >= nBufferSize )
return _JPEG_RET_OVERRUN;
tag = HB_SWAP_UINT16( ( HB_U16 ) HB_GET_LE_UINT16( buffer + nPos ) ); nPos += 2;
/* SOI marker */
if( tag != 0xFFD8 )
return _JPEG_RET_INVALID;
for( ;; )
{
HB_U16 size;
if( nPos >= nBufferSize )
return _JPEG_RET_OVERRUN;
tag = HB_SWAP_UINT16( ( HB_U16 ) HB_GET_LE_UINT16( buffer + nPos ) ); nPos += 2;
if( nPos >= nBufferSize )
return _JPEG_RET_OVERRUN;
size = HB_SWAP_UINT16( ( HB_U16 ) HB_GET_LE_UINT16( buffer + nPos ) ); nPos += 2;
/* SOF markers */
if( tag == 0xFFC0 ||
tag == 0xFFC1 ||
tag == 0xFFC2 ||
tag == 0xFFC9 )
{
if( nPos >= nBufferSize )
return _JPEG_RET_OVERRUN;
colorspace = *( buffer + nPos ); nPos += 1;
if( nPos >= nBufferSize )
return _JPEG_RET_OVERRUN;
height = HB_SWAP_UINT16( ( HB_U16 ) HB_GET_LE_UINT16( buffer + nPos ) ); nPos += 2;
if( nPos >= nBufferSize )
return _JPEG_RET_OVERRUN;
width = HB_SWAP_UINT16( ( HB_U16 ) HB_GET_LE_UINT16( buffer + nPos ) ); nPos += 2;
if( nPos >= nBufferSize )
return _JPEG_RET_OVERRUN;
bpc = *( buffer + nPos ); nPos += 1;
break;
}
else if( ( tag | 0x00FF ) != 0xFFFF ) /* lost marker */
return _JPEG_RET_UNSUPPORTED;
nPos += size - 2;
if( nPos >= nBufferSize )
return _JPEG_RET_OVERRUN;
}
if( piHeight )
*piHeight = ( int ) height;
if( piWidth )
*piWidth = ( int ) width;
if( piBPC )
*piBPC = ( int ) bpc;
if( piColorSpace )
{
switch( colorspace )
{
case 1: *piColorSpace = _JPEG_CS_GRAYSCALE; break;
case 3: *piColorSpace = _JPEG_CS_RGB; break;
case 4: *piColorSpace = _JPEG_CS_CMYK; break;
}
}
return _JPEG_RET_OK;
}
HB_FUNC( WIN_BITMAPDIMENSIONS )
{
BITMAPFILEHEADER * pbmfh = ( BITMAPFILEHEADER * ) hb_parc( 1 );
const void * buffer = hb_parc( 1 );
HB_SIZE nSize = hb_parclen( 1 );
if( hb_parclen( 1 ) >= sizeof( BITMAPCOREHEADER ) && hbwin_BitmapType( pbmfh ) == HB_WIN_BITMAP_BMP )
int iType = hbwin_BitmapType( buffer, nSize );
int iHeight = 0;
int iWidth = 0;
HB_BOOL bRetVal = HB_FALSE;
if( iType == HB_WIN_BITMAP_BMP && nSize >= sizeof( BITMAPCOREHEADER ) )
{
int cxDib, cyDib;
BITMAPFILEHEADER * pbmfh = ( BITMAPFILEHEADER * ) buffer;
BITMAPINFO * pbmi = ( BITMAPINFO * ) ( pbmfh + 1 );
/* Remember there are 2 types of BitMap File */
if( pbmi->bmiHeader.biSize == sizeof( BITMAPCOREHEADER ) )
{
cxDib = ( ( BITMAPCOREHEADER * ) pbmi )->bcWidth;
cyDib = ( ( BITMAPCOREHEADER * ) pbmi )->bcHeight;
iWidth = ( ( BITMAPCOREHEADER * ) pbmi )->bcWidth;
iHeight = ( ( BITMAPCOREHEADER * ) pbmi )->bcHeight;
}
else
{
cxDib = pbmi->bmiHeader.biWidth;
cyDib = abs( pbmi->bmiHeader.biHeight );
iWidth = pbmi->bmiHeader.biWidth;
iHeight = abs( pbmi->bmiHeader.biHeight );
}
hb_storni( cxDib, 2 );
hb_storni( cyDib, 3 );
hb_retl( HB_TRUE );
bRetVal = HB_TRUE;
}
else
else if( iType == HB_WIN_BITMAP_JPEG )
{
hb_storni( 0, 2 );
hb_storni( 0, 3 );
hb_retl( HB_FALSE );
bRetVal = ( hb_jpeg_get_param( ( const HB_BYTE * ) buffer, nSize, &iHeight, &iWidth, NULL, NULL ) == _JPEG_RET_OK );
}
/* TODO: Add PNG support */
hb_storni( iWidth, 2 );
hb_storni( iHeight, 3 );
hb_retl( bRetVal );
}
static int CALLBACK FontEnumCallBack( LOGFONT * lplf, TEXTMETRIC * lpntm,