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

2008-05-27 04:10 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/hbwhat32/_windlg.c
   * contrib/hbole/ole2.c
   * contrib/hbfbird/firebird.c
   * contrib/hbziparch/zipnew.cpp
   * contrib/hbziparch/hbcomprs.c
   * contrib/hbnf/dispc.c
   * contrib/gtwvg/wvtutils.c
   * contrib/hbfimage/fi_winfu.c
   * contrib/hbfimage/fi_wrp.c
     ! MSVC error and warnings fixes.
     ; TOFIX: Several of them remain. Some contribs don't 
       compile (gtwvg, hbole, hbw32) at all in C++ mode.

   * contrib/mtpl_vc.mak
     - Removed explicily defining WIN32, __WIN32__, __WINDOWS__ 
       macros.
This commit is contained in:
Viktor Szakats
2008-05-27 02:11:29 +00:00
parent 8b06380b17
commit 81e4af2571
11 changed files with 129 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
harbour/ChangeLog
View File

@@ -8,6 +8,24 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-05-27 04:10 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbwhat32/_windlg.c
* contrib/hbole/ole2.c
* contrib/hbfbird/firebird.c
* contrib/hbziparch/zipnew.cpp
* contrib/hbziparch/hbcomprs.c
* contrib/hbnf/dispc.c
* contrib/gtwvg/wvtutils.c
* contrib/hbfimage/fi_winfu.c
* contrib/hbfimage/fi_wrp.c
! MSVC error and warnings fixes.
; TOFIX: Several of them remain. Some contribs don't
compile (gtwvg, hbole, hbw32) at all in C++ mode.
* contrib/mtpl_vc.mak
- Removed explicily defining WIN32, __WIN32__, __WINDOWS__
macros.
2008-05-27 03:10 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* bin/bld.bat
+ MSVC now sets the lib dir globally, so lib names don't

3
harbour/contrib/gtwvg/wvtutils.c
View File

@@ -1794,7 +1794,7 @@ HB_FUNC( WIN_SETDLGITEMTEXT )
HB_FUNC( WIN_GETDLGITEMTEXT )
{
USHORT iLen = SendMessage( GetDlgItem( ( HWND ) hb_parnl( 1 ), hb_parni( 2 ) ), WM_GETTEXTLENGTH, 0, 0 ) + 1 ;
USHORT iLen = ( USHORT ) SendMessage( GetDlgItem( ( HWND ) hb_parnl( 1 ), hb_parni( 2 ) ), WM_GETTEXTLENGTH, 0, 0 ) + 1 ;
LPTSTR cText = ( LPTSTR ) hb_xgrab( iLen * sizeof( TCHAR ) );
char * szText;
USHORT iResult;
@@ -2394,3 +2394,4 @@ HB_FUNC( WIN_CHOOSECOLOR )
//-------------------------------------------------------------------//

2
harbour/contrib/hbfbird/firebird.c
View File

@@ -678,7 +678,7 @@ HB_FUNC(FBGETBLOB)
isc_tr_handle trans = NULL;
isc_blob_handle blob_handle = NULL;
short blob_seg_len;
char *blob_segment;
char blob_segment[ 512 ];
ISC_QUAD *blob_id;
char p[MAX_BUFFER];
long blob_stat;

4
harbour/contrib/hbfimage/fi_winfu.c
View File

@@ -95,7 +95,7 @@ HB_FUNC( FI_FITOBITMAP )
HDC hDC;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function */
hDC = GetDC( NULL );
@@ -203,7 +203,7 @@ HB_FUNC( FI_WINDRAW )
int scanlines;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
hDC = (HDC) hb_parnl( 2 );
rcDest.top = hb_parni( 3 );
rcDest.left = hb_parni( 4 );

172
harbour/contrib/hbfimage/fi_wrp.c
View File

@@ -258,7 +258,7 @@ HB_FUNC( FI_ALLOCATET )
UINT red_mask, green_mask, blue_mask;
/* Retrieve parameters */
type = hb_parni( 1 );
type = ( FREE_IMAGE_TYPE ) hb_parni( 1 );
width = hb_parni( 2 );
height = hb_parni( 3 );
bpp = ( hb_parinfo( 3 ) & HB_IT_NUMERIC ? hb_parni( 3 ) : 8 );
@@ -296,7 +296,7 @@ HB_FUNC( FI_CLONE )
FIBITMAP *fiClonePtr;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function */
fiClonePtr = FreeImage_Clone( dib );
@@ -332,7 +332,7 @@ HB_FUNC( FI_UNLOAD )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function */
FreeImage_Unload( dib );
@@ -371,7 +371,7 @@ HB_FUNC( FI_LOAD )
int flags;
/* Retrieve parameters */
fif = hb_parni( 1 );
fif = ( FREE_IMAGE_FORMAT ) hb_parni( 1 );
filename = hb_parcx( 2 );
flags = hb_parni( 3 );
@@ -420,8 +420,8 @@ HB_FUNC( FI_SAVE )
int flags;
/* Retrieve parameters */
fif = hb_parni( 1 );
dib = hb_parptr( 2 );
fif = ( FREE_IMAGE_FORMAT ) hb_parni( 1 );
dib = ( FIBITMAP * ) hb_parptr( 2 );
filename = hb_parcx( 3 );
flags = hb_parni( 4 );
@@ -505,7 +505,7 @@ HB_FUNC( FI_OPENMULTIBITMAP )
int flags;
/* Retrieve parameters */
fif = hb_parni( 1 );
fif = ( FREE_IMAGE_FORMAT) hb_parni( 1 );
filename = hb_parcx( 2 );
create_new = hb_parl( 3 );
read_only = hb_parl( 4 );
@@ -547,7 +547,7 @@ HB_FUNC( FI_CLOSEMULTIBITMAP )
int flags;
/* Retrieve parameters */
bitmap = hb_parptr( 1 );
bitmap = ( FIMULTIBITMAP * ) hb_parptr( 1 );
flags = ( hb_parinfo( 2 ) & HB_IT_NUMERIC ? hb_parni( 2 ) : 0 );
/* run function & return value */
@@ -578,7 +578,7 @@ HB_FUNC( FI_GETPAGECOUNT )
FIMULTIBITMAP *bitmap;
/* Retrieve parameters */
bitmap = hb_parptr( 1 );
bitmap = ( FIMULTIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retni( FreeImage_GetPageCount(bitmap) );
@@ -610,8 +610,8 @@ HB_FUNC( FI_APPENDPAGE )
FIBITMAP *data;
/* Retrieve parameters */
bitmap = hb_parptr( 1 );
data = hb_parptr( 2 );
bitmap = ( FIMULTIBITMAP * ) hb_parptr( 1 );
data = ( FIBITMAP * ) hb_parptr( 2 );
/* run function & return value */
FreeImage_AppendPage(bitmap, data);
@@ -645,9 +645,9 @@ HB_FUNC( FI_INSERTPAGE )
FIBITMAP *data;
/* Retrieve parameters */
bitmap = hb_parptr( 1 );
bitmap = ( FIMULTIBITMAP * ) hb_parptr( 1 );
page = hb_parni( 2 ) - 1; // 0-based index
data = hb_parptr( 3 );
data = ( FIBITMAP * ) hb_parptr( 3 );
/* run function & return value */
FreeImage_InsertPage(bitmap, page, data);
@@ -679,7 +679,7 @@ HB_FUNC( FI_DELETEPAGE )
int page;
/* Retrieve parameters */
bitmap = hb_parptr( 1 );
bitmap = ( FIMULTIBITMAP * ) hb_parptr( 1 );
page = hb_parni( 2 ) - 1; // 0-based index
/* run function & return value */
@@ -712,7 +712,7 @@ HB_FUNC( FI_LOCKPAGE )
int page;
/* Retrieve parameters */
bitmap = hb_parptr( 1 );
bitmap = ( FIMULTIBITMAP * ) hb_parptr( 1 );
page = hb_parni( 2 ) - 1; // 0-based index
/* run function & return value */
@@ -747,8 +747,8 @@ HB_FUNC( FI_UNLOCKPAGE )
BOOL changed;
/* Retrieve parameters */
bitmap = hb_parptr( 1 );
page = hb_parptr( 2 );
bitmap = ( FIMULTIBITMAP * ) hb_parptr( 1 );
page = ( FIBITMAP * ) hb_parptr( 2 );
changed = hb_parl( 3 );
/* run function & return value */
@@ -782,7 +782,7 @@ HB_FUNC( FI_MOVEPAGE )
int target, source;
/* Retrieve parameters */
bitmap = hb_parptr( 1 );
bitmap = ( FIMULTIBITMAP * ) hb_parptr( 1 );
target = hb_parni( 2 );
source = hb_parni( 3 );
@@ -862,7 +862,7 @@ HB_FUNC( FI_GETIMAGETYPE )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retni( FreeImage_GetImageType(dib) );
@@ -911,7 +911,7 @@ HB_FUNC( FI_GETBITS )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retptr( FreeImage_GetBits(dib) );
@@ -943,7 +943,7 @@ HB_FUNC( FI_GETSCANLINE )
int scanline;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
scanline = hb_parni( 2 );
/* run function & return value */
@@ -984,7 +984,7 @@ HB_FUNC( FI_GETCOLORSUSED )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retnl( FreeImage_GetColorsUsed(dib) );
@@ -1014,7 +1014,7 @@ HB_FUNC( FI_GETBPP )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value*/
hb_retnl( FreeImage_GetBPP(dib) );
@@ -1044,7 +1044,7 @@ HB_FUNC( FI_GETWIDTH )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retnl( FreeImage_GetWidth(dib) );
@@ -1074,7 +1074,7 @@ HB_FUNC( FI_GETHEIGHT )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retnl( FreeImage_GetHeight(dib) );
@@ -1104,7 +1104,7 @@ HB_FUNC( FI_GETLINE )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retnl( FreeImage_GetLine(dib) );
@@ -1134,7 +1134,7 @@ HB_FUNC( FI_GETPITCH )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retnl( FreeImage_GetPitch(dib) );
@@ -1164,7 +1164,7 @@ HB_FUNC( FI_GETDIBSIZE )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retnl( FreeImage_GetDIBSize(dib) );
@@ -1194,7 +1194,7 @@ HB_FUNC( FI_GETPALETTE )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retptr( FreeImage_GetPalette(dib) );
@@ -1224,7 +1224,7 @@ HB_FUNC( FI_GETDOTSPERMETERX )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retnl( FreeImage_GetDotsPerMeterX(dib) );
@@ -1254,7 +1254,7 @@ HB_FUNC( FI_GETDOTSPERMETERY )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retnl( FreeImage_GetDotsPerMeterY(dib) );
@@ -1286,7 +1286,7 @@ HB_FUNC( FI_SETDOTSPERMETERX )
UINT res;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
res = hb_parni( 2 );
/* run function & return value */
@@ -1319,7 +1319,7 @@ HB_FUNC( FI_SETDOTSPERMETERY )
UINT res;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
res = hb_parni( 2 );
/* run function & return value */
@@ -1355,7 +1355,7 @@ HB_FUNC( FI_GETINFOHEADER )
BITMAPINFOHEADER *bmpinfoheader;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
bmpinfoheader = FreeImage_GetInfoHeader(dib);
@@ -1390,7 +1390,7 @@ HB_FUNC( FI_GETINFO )
BITMAPINFO *bmpinfo;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
bmpinfo = FreeImage_GetInfo(dib);
@@ -1422,7 +1422,7 @@ HB_FUNC( FI_GETCOLORTYPE )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retni( FreeImage_GetColorType(dib) );
@@ -1453,7 +1453,7 @@ HB_FUNC( FI_GETREDMASK )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retni( FreeImage_GetRedMask(dib) );
@@ -1483,7 +1483,7 @@ HB_FUNC( FI_GETGREENMASK )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retni( FreeImage_GetGreenMask(dib) );
@@ -1513,7 +1513,7 @@ HB_FUNC( FI_GETBLUEMASK )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retni( FreeImage_GetBlueMask(dib) );
@@ -1544,7 +1544,7 @@ HB_FUNC( FI_GETTRANSPARENCYCOUNT )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retni( FreeImage_GetTransparencyCount(dib) );
@@ -1574,7 +1574,7 @@ HB_FUNC( FI_GETTRANSPARENCYTABLE )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retptr( FreeImage_GetTransparencyTable(dib) );
@@ -1606,7 +1606,7 @@ HB_FUNC( FI_SETTRANSPARENT )
BOOL enabled;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
enabled = hb_parl( 2 );
/* run function & return value */
@@ -1641,8 +1641,8 @@ HB_FUNC( FI_SETTRANSPARENCYTABLE )
int count;
/* Retrieve parameters */
dib = hb_parptr( 1 );
table = hb_parptr( 2 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
table = ( BYTE * ) hb_parptr( 2 );
count = hb_parni( 3 );
/* run function & return value */
@@ -1673,7 +1673,7 @@ HB_FUNC( FI_ISTRANSPARENT )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retl( FreeImage_IsTransparent(dib) );
@@ -1704,7 +1704,7 @@ HB_FUNC( FI_HASBACKGROUNDCOLOR )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retl( FreeImage_HasBackgroundColor(dib) );
@@ -1734,19 +1734,18 @@ HB_FUNC( FI_GETBACKGROUNDCOLOR )
)
{
FIBITMAP *dib;
RGBQUAD *bkcolor;
RGBQUAD *bkcolor = NULL;
/* Retrieve parameters */
dib = hb_parptr( 1 );
//bkcolor = (RGBQUAD * ) hb_param( 2, HB_IT_STRING )->item.asString.value;
//bkcolor = hb_parptr( 2 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
//bkcolor = ( RGBQUAD * ) hb_param( 2, HB_IT_STRING )->item.asString.value;
//bkcolor = ( RGBQUAD * ) hb_parptr( 2 );
/* run function & return value */
//hb_retl( FreeImage_GetBackgroundColor(dib, bkcolor) );
FreeImage_GetBackgroundColor(dib, bkcolor);
//hb_storptr( bkcolor, 2 );
hb_retptr( bkcolor );
}
else
{
@@ -1776,9 +1775,9 @@ HB_FUNC( FI_SETBACKGROUNDCOLOR )
RGBQUAD *bkcolor;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
bkcolor = (RGBQUAD * ) hb_itemGetCPtr( hb_param( 2, HB_IT_STRING ) );
//bkcolor = hb_parptr( 2 );
//bkcolor = ( RGBQUAD * ) hb_parptr( 2 );
/* run function & return value */
hb_retl( FreeImage_SetBackgroundColor(dib, bkcolor) );
@@ -1817,7 +1816,7 @@ HB_FUNC( FI_GETICCPROFILE )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retptr( FreeImage_GetICCProfile(dib) );
@@ -1852,7 +1851,7 @@ HB_FUNC( FI_CREATEICCPROFILE )
long size;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
data = hb_parptr( 2 );
size = hb_parnl( 3 );
@@ -1886,7 +1885,7 @@ HB_FUNC( FI_DESTROYICCPROFILE )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
FreeImage_DestroyICCProfile(dib);
@@ -1959,7 +1958,7 @@ HB_FUNC( FI_CONVERTTO4BITS )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retptr( FreeImage_ConvertTo4Bits(dib) );
@@ -1990,7 +1989,7 @@ HB_FUNC( FI_CONVERTTO8BITS )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retptr( FreeImage_ConvertTo8Bits(dib) );
@@ -2021,7 +2020,7 @@ HB_FUNC( FI_CONVERTTOGREYSCALE )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retptr( FreeImage_ConvertToGreyscale(dib) );
@@ -2052,7 +2051,7 @@ HB_FUNC( FI_CONVERTTO16BITS555 )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retptr( FreeImage_ConvertTo16Bits555(dib) );
@@ -2083,7 +2082,7 @@ HB_FUNC( FI_CONVERTTO16BITS565 )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retptr( FreeImage_ConvertTo16Bits565(dib) );
@@ -2114,7 +2113,7 @@ HB_FUNC( FI_CONVERTTO24BITS )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retptr( FreeImage_ConvertTo24Bits(dib) );
@@ -2145,7 +2144,7 @@ HB_FUNC( FI_CONVERTTO32BITS )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retptr( FreeImage_ConvertTo32Bits(dib) );
@@ -2178,8 +2177,8 @@ HB_FUNC( FI_COLORQUANTIZE )
FREE_IMAGE_QUANTIZE quantize;
/* Retrieve parameters */
dib = hb_parptr( 1 );
quantize = hb_parni( 2 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
quantize = ( FREE_IMAGE_QUANTIZE ) hb_parni( 2 );
/* run function & return value */
hb_retptr( FreeImage_ColorQuantize(dib, quantize) );
@@ -2217,8 +2216,8 @@ HB_FUNC( FI_DITHER )
FREE_IMAGE_DITHER algorithm;
/* Retrieve parameters */
dib = hb_parptr( 1 );
algorithm = hb_parni( 2 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
algorithm = ( FREE_IMAGE_DITHER ) hb_parni( 2 );
/* run function & return value */
hb_retptr( FreeImage_Dither(dib, algorithm) );
@@ -2255,7 +2254,7 @@ HB_FUNC( FI_CONVERTTORGBF )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retptr( FreeImage_ConvertToRGBF(dib) );
@@ -2288,7 +2287,7 @@ HB_FUNC( FI_CONVERTTOSTANDARDTYPE )
BOOL scale_linear;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
scale_linear = ( hb_parinfo( 2 ) & HB_IT_LOGICAL ) ? hb_parl( 2 ) : TRUE;
/* run function & return value */
@@ -2323,8 +2322,8 @@ HB_FUNC( FI_CONVERTTOTYPE )
BOOL scale_linear;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dst_type = hb_parni( 2 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
dst_type = ( FREE_IMAGE_TYPE ) hb_parni( 2 );
scale_linear = ( hb_parinfo( 3 ) & HB_IT_LOGICAL ) ? hb_parl( 3 ) : TRUE;
/* run function & return value */
@@ -2423,7 +2422,7 @@ HB_FUNC( FI_ROTATECLASSIC )
double angle;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
angle = hb_parnd( 2 );
/* run function & return value */
@@ -2462,7 +2461,7 @@ HB_FUNC( FI_ROTATEEX )
BOOL use_mask;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
angle = hb_parnd( 2 );
x_shift = hb_parnd( 3 );
y_shift = hb_parnd( 4 );
@@ -2500,7 +2499,7 @@ HB_FUNC( FI_FLIPHORIZONTAL )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retl( FreeImage_FlipHorizontal(dib) );
@@ -2530,7 +2529,7 @@ HB_FUNC( FI_FLIPVERTICAL )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retl( FreeImage_FlipVertical(dib) );
@@ -2573,10 +2572,10 @@ HB_FUNC( FI_RESCALE )
FREE_IMAGE_FILTER filter;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
dst_width = hb_parni( 2 );
dst_height = hb_parni( 3 );
filter = hb_parni( 4 );
filter = ( FREE_IMAGE_FILTER ) hb_parni( 4 );
/* run function & return value */
hb_retptr( FreeImage_Rescale(dib, dst_width, dst_height, filter) );
@@ -2617,7 +2616,7 @@ HB_FUNC( FI_ADJUSTGAMMA )
double gamma;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
gamma = hb_parnd( 2 );
/* run function & return value */
@@ -2651,7 +2650,7 @@ HB_FUNC( FI_ADJUSTBRIGHTNESS )
double percentage;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
percentage = hb_parnd( 2 );
/* run function & return value */
@@ -2685,7 +2684,7 @@ HB_FUNC( FI_ADJUSTCONTRAST )
double percentage;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
percentage = hb_parnd( 2 );
/* run function & return value */
@@ -2717,7 +2716,7 @@ HB_FUNC( FI_INVERT )
FIBITMAP *dib;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
/* run function & return value */
hb_retl( FreeImage_Invert(dib) );
@@ -2758,8 +2757,8 @@ HB_FUNC( FI_GETCHANNEL )
FREE_IMAGE_COLOR_CHANNEL channel;
/* Retrieve parameters */
dib = hb_parptr( 1 );
channel = hb_parni( 2 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
channel = ( FREE_IMAGE_COLOR_CHANNEL ) hb_parni( 2 );
/* run function & return value */
hb_retptr( FreeImage_GetChannel(dib, channel) );
@@ -2805,7 +2804,7 @@ HB_FUNC( FI_COPY )
int left, top, right, bottom;
/* Retrieve parameters */
dib = hb_parptr( 1 );
dib = ( FIBITMAP * ) hb_parptr( 1 );
left = hb_parni( 2 );
top = hb_parni( 3 );
right = hb_parni( 4 );
@@ -2847,8 +2846,8 @@ HB_FUNC( FI_PASTE )
int left, top, alpha;
/* Retrieve parameters */
dst = hb_parptr( 1 );
src = hb_parptr( 2 );
dst = ( FIBITMAP * ) hb_parptr( 1 );
src = ( FIBITMAP * ) hb_parptr( 2 );
left = hb_parni( 3 );
top = hb_parni( 4 );
alpha = hb_parni( 5 );
@@ -2876,4 +2875,3 @@ HB_FUNC( FI_PASTE )
// DLL_API FIBITMAP *DLL_CALLCONV FreeImage_Composite(FIBITMAP *fg, BOOL useFileBkg FI_DEFAULT(FALSE), RGBQUAD *appBkColor FI_DEFAULT(NULL), FIBITMAP *bg FI_DEFAULT(NULL));
// --------------------------------------------------------------------------

5
harbour/contrib/hbnf/dispc.c
View File

@@ -65,9 +65,9 @@
#include "inkey.ch"
#define OFF 0
#define ON (!OFF)
#define ON 1
#define NO 0
#define YES (!NO)
#define YES 1
#define OK 0
#define K_STRING 0
#define K_LIST (!K_STRING)
@@ -923,4 +923,3 @@ static void strcpyn( char *dest, const char *source, int len )
dest[len+1] = 0x00;
}

20
harbour/contrib/hbole/ole2.c
View File

@@ -94,16 +94,16 @@ static double DateToDbl( LPSTR cDate )
nDate = hb_dateEncStr( cDate ) - 0x0024d9abL;
return ( nDate );
return nDate;
}
static LPSTR DblToDate( double nDate )
{
static char *cDate = "00000000";
static char * cDate = "00000000";
hb_dateDecStr( cDate, nDate + 0x0024d9abL );
hb_dateDecStr( cDate, ( long ) nDate + 0x0024d9abL );
return ( cDate );
return cDate;
}
static LPSTR AnsiToWide( LPSTR cAnsi )
@@ -115,7 +115,7 @@ static LPSTR AnsiToWide( LPSTR cAnsi )
cString = ( char * ) hb_xgrab( wLen * 2 );
MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, cAnsi, -1,
( LPWSTR ) cString, wLen );
return ( cString );
return cString;
}
static LPSTR WideToAnsi( LPSTR cWide )
@@ -125,10 +125,10 @@ static LPSTR WideToAnsi( LPSTR cWide )
wLen = WideCharToMultiByte( CP_ACP, 0, ( LPWSTR ) cWide, -1,
NULL, 0, NULL, NULL );
cString = hb_xgrab( (!wLen) ? 2 : wLen );
cString = ( LPSTR ) hb_xgrab( (!wLen) ? 2 : wLen );
WideCharToMultiByte( CP_ACP, 0, ( LPWSTR ) cWide, -1,
cString, wLen, NULL, NULL );
return ( cString );
return cString;
}
static void GetParams(DISPPARAMS * dParams)
@@ -172,7 +172,7 @@ static void GetParams(DISPPARAMS * dParams)
#endif
cString = AnsiToWide( hb_parc( nArg ) );
#if !defined(__BORLANDC__) && !defined(__XCC__)
pArgs[ n ].bstrVal = SysAllocString( (LPVOID) cString );
pArgs[ n ].bstrVal = SysAllocString( (OLECHAR *) cString );
#else
pArgs[ n ].n1.n2.n3.bstrVal = SysAllocString( (LPVOID) cString );
#endif
@@ -420,8 +420,8 @@ HB_FUNC( OLESHOWEXCEPTION )
{
LPSTR source, description;
source = WideToAnsi( (LPVOID) excep.bstrSource );
description = WideToAnsi( (LPVOID) excep.bstrDescription );
source = WideToAnsi( (LPSTR) excep.bstrSource );
description = WideToAnsi( (LPSTR) excep.bstrDescription );
MessageBox( NULL, description, source, MB_ICONHAND );
hb_xfree( source );
hb_xfree( description );

26
harbour/contrib/hbwhat32/_windlg.c
View File

@@ -121,8 +121,7 @@ HB_FUNC( SETDLGITEMTEXT )
HB_FUNC( GETDLGITEMTEXT ) // GETDLGITMTEXT
{
USHORT iLen = SendMessage( GetDlgItem( (HWND) hb_parnl( 1 ), hb_parni( 2 ) ), WM_GETTEXTLENGTH, 0, 0 )+1 ;
USHORT iLen = ( USHORT ) SendMessage( GetDlgItem( (HWND) hb_parnl( 1 ), hb_parni( 2 ) ), WM_GETTEXTLENGTH, 0, 0 )+1 ;
char *cText = (char*) hb_xgrab( iLen );
GetDlgItemText(
@@ -378,26 +377,3 @@ if( h ){
//----------------------------------------------------------------------------//

2
harbour/contrib/hbziparch/hbcomprs.c
View File

@@ -4223,7 +4223,7 @@ void HB_EXPORT hb_fsDirectory( PHB_ITEM pDir, char* szSkleton, char* szAttribute
if ( szSkleton && strlen( szSkleton ) > 0 )
{
szDirSpec = hb_fsNameConv( szSkleton, &bAlloc );
szDirSpec = hb_fsNameConv( ( BYTE * ) szSkleton, &bAlloc );
}
else
{

12
harbour/contrib/hbziparch/zipnew.cpp
View File

@@ -210,7 +210,6 @@ PHB_ITEM hb___GetFileNamesFromZip( char *szFile, BOOL iMode )
{
int iNumberOfFiles;
ULONG ulCount;
int iOMode ;
bool iReturn = true;
CZipArchive szZip;
@@ -563,7 +562,6 @@ int hb_UnzipSel( char *szFile, PHB_ITEM pBlock, BOOL lWithPath, char *szPassWord
bool iReturn = true;
ULONG ulCount;
int iCause;
int iMode ;
char * szPath = (char*) hb_xgrab( _POSIX_PATH_MAX + 1 );
BOOL bFreePath = TRUE;
@@ -681,8 +679,10 @@ int hb_UnzipSel( char *szFile, PHB_ITEM pBlock, BOOL lWithPath, char *szPassWord
}
}
catch ( CZipException& e )
catch( CZipException& e )
{
HB_SYMBOL_UNUSED( e );
szZip.CloseFile( NULL, true);
/* szZip.CloseNewFile(true);*/
}
@@ -793,7 +793,6 @@ int hb_UnzipSelIndex( char *szFile, PHB_ITEM pBlock, BOOL lWithPath, char *szPas
bool iReturn = true;
ULONG ulCount;
int iCause;
int iMode ;
CZipArchive szZip;
SpanCallback span;
@@ -872,8 +871,10 @@ int hb_UnzipSelIndex( char *szFile, PHB_ITEM pBlock, BOOL lWithPath, char *szPas
}
}
catch ( CZipException& e )
catch( CZipException& e )
{
HB_SYMBOL_UNUSED( e );
szZip.CloseFile( NULL, true);
}
}
@@ -1288,4 +1289,3 @@ int hb_CheckSpanMode( char * szFile )
return iReturn;
}

3
harbour/contrib/mtpl_vc.mak
View File

@@ -117,8 +117,7 @@ CFLAGS_VER = -Ogt2yb1p -GX- -G6 -YX -FD -Gs
!endif
#-----------
CFLAGS = -I$(INCLUDE_DIR) $(CFLAGS_VER) -W3 -nologo -T$(HB_BUILD_MODE) \
-D__WINDOWS__ -DWIN32 -D__WIN32__ $(C_USR) $(CFLAGS)
CFLAGS = -I$(INCLUDE_DIR) $(CFLAGS_VER) -W3 -nologo -T$(HB_BUILD_MODE) $(C_USR) $(CFLAGS)
#-----------
!if "$(HB_BUILD_DEBUG)" == "yes"