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

2010-01-14 18:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/rtl/strclear.c
    + HB_STRCLEAR() return value will now precisely inform about
      successful clear operation. Thanks to Mindaugas.

  * src/vm/hashfunc.c
  * src/vm/macro.c
  * src/vm/strapi.c
  * src/vm/runner.c
  * src/vm/estack.c
  * src/vm/codebloc.c
  * src/vm/hashes.c
  * src/vm/maindll.c
  * src/vm/dynsym.c
  * src/vm/debug.c
  * src/vm/itemapi.c
  * src/vm/garbage.c
  * src/vm/asort.c
  * src/vm/hvm.c
  * src/vm/cmdarg.c
  * src/vm/mainstd.c
  * src/vm/maindllp.c
  * src/vm/arrays.c
  * src/vm/task.c
  * src/vm/fm.c
  * src/vm/proc.c
  * src/vm/thread.c
  * src/vm/memvars.c
  * src/vm/arrayshb.c
  * src/vm/eval.c
  * src/vm/extend.c
  * src/vm/dynlibhb.c
  * src/vm/set.c
  * src/vm/classes.c
  * src/debug/dbgentry.c
  * src/common/hbgete.c
  * src/common/hbffind.c
  * src/common/hbver.c
  * src/common/hbprintf.c
  * src/common/hbfsapi.c
  * src/common/hbstr.c
  * src/common/expropt1.c
  * src/common/expropt2.c
  * src/common/hbdate.c
  * src/common/strwild.c
  * src/common/hbhash.c
  * src/rtl/gtdos/gtdos.c
  * src/rtl/fscopy.c
  * src/rtl/run.c
  * src/rtl/gtwin/gtwin.c
  * src/rtl/gtxwc/gtxwc.h
  * src/rtl/gtxwc/gtxwc.c
  * src/rtl/math.c
  * src/rtl/empty.c
  * src/rtl/gtcrs/gtcrs.c
  * src/rtl/trim.c
  * src/rtl/filehb.c
  * src/rtl/hbtoken.c
  * src/rtl/fstemp.c
  * src/rtl/gtchrmap.c
  * src/rtl/strmatch.c
  * src/rtl/gtstd/gtstd.c
  * src/rtl/gttrm/gttrm.c
  * src/rtl/padr.c
  * src/rtl/hbstrfmt.c
  * src/rtl/transfrm.c
  * src/rtl/fserr.c
  * src/rtl/minmax.c
  * src/rtl/hbfeof.c
  * src/rtl/dates.c
  * src/rtl/padc.c
  * src/rtl/gtcgi/gtcgi.c
  * src/rtl/errapi.c
  * src/rtl/version.c
  * src/rtl/hbregexc.c
  * src/rtl/hbrandom.c
  * src/rtl/strtran.c
  * src/rtl/hbprocfn.c
  * src/rtl/hbsocket.c
  * src/rtl/hbinet.c
  * src/rtl/copyfile.c
  * src/rtl/errintlo.c
  * src/rtl/gtapi.c
  * src/rtl/filesys.c
  * src/rtl/padl.c
  * src/rtl/hbregex.c
  * src/rtl/hbbit.c
  * src/rtl/isprint.c
  * src/rtl/saverest.c
  * src/rtl/diskspac.c
  * src/rtl/console.c
  * src/rtl/spfiles.c
  * src/rtl/gtos2/gtos2.c
  * src/rtl/philes.c
  * src/rtl/hbbffnc.c
  * src/rtl/hbgtcore.c
  * src/rtl/cdpapi.c
  * src/rtl/dirdrive.c
  * src/rtl/hbi18n1.c
  * src/rtl/gtclip.c
  * src/rtl/mlcfunc.c
  * src/rtl/gtapiu.c
  * src/rtl/accept.c
  * src/rtl/idle.c
  * src/rtl/itemseri.c
  * src/rtl/hbrunfun.c
  * src/rtl/setcolor.c
  * src/rtl/setkey.c
  * src/rtl/gtsln/mousesln.c
  * src/rtl/gtsln/gtsln.c
  * src/rtl/gtsln/kbsln.c
  * src/rtl/gtsln/gtsln.h
  * src/rtl/disksphb.c
  * src/rtl/strc.c
  * src/rtl/gtpca/gtpca.c
  * src/rtl/gtgui/gtgui.c
  * src/rtl/hbhex.c
  * src/rtl/trace.c
  * src/rtl/gt_tpl/gt_tpl.c
  * src/rtl/inkeyapi.c
  * src/rtl/filebuf.c
  * src/rtl/gete.c
  * src/rtl/setcurs.c
  * src/rtl/hbproces.c
  * src/rtl/langapi.c
  * src/rtl/gtwvt/gtwvt.h
  * src/rtl/gtwvt/gtwvt.c
  * src/rtl/mouse53.c
  * src/rtl/fssize.c
  * src/rtl/hbbyte.c
  * src/rtl/mouseapi.c
  * src/rtl/memofile.c
  * src/rtl/valtostr.c
  * src/rtl/file.c
  * src/rtl/val.c
  * src/rtl/rat.c
  * src/rdd/hbsix/sxcompr.c
  * include/hbvmpub.h
  * include/hbset.h
  * include/hbapicdp.h
  * include/hbstack.h
  * include/hbapilng.h
  * include/hbgtcore.h
  * include/hbapifs.h
  * include/hbthread.h
  * include/hbxvm.h
  * include/hbmacro.h
  * include/hbtypes.h
  * include/hbapi.h
  * include/hbapiitm.h
  * include/hbznet.h
  * include/hbvm.h
  * include/hbapidbg.h
  * include/hbcomp.h
  * include/hbsxfunc.h
  * include/hbcompdf.h
  * include/hbmather.h
  * include/hbapistr.h
  * include/hbwmain.c
  * include/hbexpra.c
  * include/hbexprop.h
  * include/hbsocket.h
  * include/hbapigt.h
  * include/hbapicls.h
  * include/hbhash.h
  * include/hbregex.h
  * include/hbexprb.c
  * include/hbdate.h
  * contrib/gtalleg/gtalleg.c
  * contrib/xhb/hboutdbg.c
  * contrib/xhb/hbserv.h
  * contrib/xhb/bkgtsks.c
  * contrib/xhb/dbf2txt.c
  * contrib/xhb/xhbis.c
  * contrib/xhb/fparse.c
  * contrib/xhb/xhb.h
  * contrib/xhb/xhbsave.c
  * contrib/xhb/xhbmsgs.c
  * contrib/xhb/freadlin.c
  * contrib/xhb/txtline.c
  * contrib/xhb/dbgfxc.c
  * contrib/xhb/xhberrc.c
  * contrib/xhb/filestat.c
  * contrib/xhb/xhbcopyf.c
  * contrib/xhb/hbnxs.h
  * contrib/xhb/hbserv.c
  * contrib/xhb/cstructc.c
  * contrib/xhb/xhbfunc.c
  * contrib/hbmzip/hbmzip.c
  * contrib/gtqtc/gtqtc.cpp
  * contrib/gtwvg/gtwvg.c
  * contrib/gtwvg/gtwvg.h
  * contrib/gtwvg/wvggui.c
  * contrib/gtwvg/wvgcuig.c
  * contrib/gtwvg/wvggui.h
  * contrib/gtwvg/wvgwin.c
  * contrib/gtwvg/wvgutils.c
  * contrib/gtwvg/wvgcore.c
  * contrib/gtwvg/wvgwing.c
  * contrib/hbmisc/hb_f.c
  * contrib/hbmisc/dates2.c
  * contrib/hbwin/hbwapi.h
  * contrib/hbbtree/tests/ctest.c
    * BOOL  -> HB_BOOL
    * TRUE  -> HB_TRUE
    * FALSE -> HB_FALSE
    ; If possible please try to verify me, at least your own are of interest
      or expertise. Look for HB_BOOL/HB_TRUE/HB_FALSE usage in WINAPI calls,
      if you see such thing, it's wrong. Also some, HB_BOOL WINAPI BOOL
      implicit conversions may need to be cleaned.
    ; I didn't touch PP, RDD, SDD and compiler parts yet.
    ; In few places it's possible that some in-line comments are disaligned
      after this operation.
This commit is contained in:
Viktor Szakats
2010-01-14 17:59:30 +00:00
parent 856331771d
commit 003fd7c41e
200 changed files with 4271 additions and 4060 deletions
Download Patch File Download Diff File Expand all files Collapse all files

214
harbour/ChangeLog
View File

@@ -17,6 +17,220 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-14 18:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/strclear.c
+ HB_STRCLEAR() return value will now precisely inform about
successful clear operation. Thanks to Mindaugas.
* src/vm/hashfunc.c
* src/vm/macro.c
* src/vm/strapi.c
* src/vm/runner.c
* src/vm/estack.c
* src/vm/codebloc.c
* src/vm/hashes.c
* src/vm/maindll.c
* src/vm/dynsym.c
* src/vm/debug.c
* src/vm/itemapi.c
* src/vm/garbage.c
* src/vm/asort.c
* src/vm/hvm.c
* src/vm/cmdarg.c
* src/vm/mainstd.c
* src/vm/maindllp.c
* src/vm/arrays.c
* src/vm/task.c
* src/vm/fm.c
* src/vm/proc.c
* src/vm/thread.c
* src/vm/memvars.c
* src/vm/arrayshb.c
* src/vm/eval.c
* src/vm/extend.c
* src/vm/dynlibhb.c
* src/vm/set.c
* src/vm/classes.c
* src/debug/dbgentry.c
* src/common/hbgete.c
* src/common/hbffind.c
* src/common/hbver.c
* src/common/hbprintf.c
* src/common/hbfsapi.c
* src/common/hbstr.c
* src/common/expropt1.c
* src/common/expropt2.c
* src/common/hbdate.c
* src/common/strwild.c
* src/common/hbhash.c
* src/rtl/gtdos/gtdos.c
* src/rtl/fscopy.c
* src/rtl/run.c
* src/rtl/gtwin/gtwin.c
* src/rtl/gtxwc/gtxwc.h
* src/rtl/gtxwc/gtxwc.c
* src/rtl/math.c
* src/rtl/empty.c
* src/rtl/gtcrs/gtcrs.c
* src/rtl/trim.c
* src/rtl/filehb.c
* src/rtl/hbtoken.c
* src/rtl/fstemp.c
* src/rtl/gtchrmap.c
* src/rtl/strmatch.c
* src/rtl/gtstd/gtstd.c
* src/rtl/gttrm/gttrm.c
* src/rtl/padr.c
* src/rtl/hbstrfmt.c
* src/rtl/transfrm.c
* src/rtl/fserr.c
* src/rtl/minmax.c
* src/rtl/hbfeof.c
* src/rtl/dates.c
* src/rtl/padc.c
* src/rtl/gtcgi/gtcgi.c
* src/rtl/errapi.c
* src/rtl/version.c
* src/rtl/hbregexc.c
* src/rtl/hbrandom.c
* src/rtl/strtran.c
* src/rtl/hbprocfn.c
* src/rtl/hbsocket.c
* src/rtl/hbinet.c
* src/rtl/copyfile.c
* src/rtl/errintlo.c
* src/rtl/gtapi.c
* src/rtl/filesys.c
* src/rtl/padl.c
* src/rtl/hbregex.c
* src/rtl/hbbit.c
* src/rtl/isprint.c
* src/rtl/saverest.c
* src/rtl/diskspac.c
* src/rtl/console.c
* src/rtl/spfiles.c
* src/rtl/gtos2/gtos2.c
* src/rtl/philes.c
* src/rtl/hbbffnc.c
* src/rtl/hbgtcore.c
* src/rtl/cdpapi.c
* src/rtl/dirdrive.c
* src/rtl/hbi18n1.c
* src/rtl/gtclip.c
* src/rtl/mlcfunc.c
* src/rtl/gtapiu.c
* src/rtl/accept.c
* src/rtl/idle.c
* src/rtl/itemseri.c
* src/rtl/hbrunfun.c
* src/rtl/setcolor.c
* src/rtl/setkey.c
* src/rtl/gtsln/mousesln.c
* src/rtl/gtsln/gtsln.c
* src/rtl/gtsln/kbsln.c
* src/rtl/gtsln/gtsln.h
* src/rtl/disksphb.c
* src/rtl/strc.c
* src/rtl/gtpca/gtpca.c
* src/rtl/gtgui/gtgui.c
* src/rtl/hbhex.c
* src/rtl/trace.c
* src/rtl/gt_tpl/gt_tpl.c
* src/rtl/inkeyapi.c
* src/rtl/filebuf.c
* src/rtl/gete.c
* src/rtl/setcurs.c
* src/rtl/hbproces.c
* src/rtl/langapi.c
* src/rtl/gtwvt/gtwvt.h
* src/rtl/gtwvt/gtwvt.c
* src/rtl/mouse53.c
* src/rtl/fssize.c
* src/rtl/hbbyte.c
* src/rtl/mouseapi.c
* src/rtl/memofile.c
* src/rtl/valtostr.c
* src/rtl/file.c
* src/rtl/val.c
* src/rtl/rat.c
* src/rdd/hbsix/sxcompr.c
* include/hbvmpub.h
* include/hbset.h
* include/hbapicdp.h
* include/hbstack.h
* include/hbapilng.h
* include/hbgtcore.h
* include/hbapifs.h
* include/hbthread.h
* include/hbxvm.h
* include/hbmacro.h
* include/hbtypes.h
* include/hbapi.h
* include/hbapiitm.h
* include/hbznet.h
* include/hbvm.h
* include/hbapidbg.h
* include/hbcomp.h
* include/hbsxfunc.h
* include/hbcompdf.h
* include/hbmather.h
* include/hbapistr.h
* include/hbwmain.c
* include/hbexpra.c
* include/hbexprop.h
* include/hbsocket.h
* include/hbapigt.h
* include/hbapicls.h
* include/hbhash.h
* include/hbregex.h
* include/hbexprb.c
* include/hbdate.h
* contrib/gtalleg/gtalleg.c
* contrib/xhb/hboutdbg.c
* contrib/xhb/hbserv.h
* contrib/xhb/bkgtsks.c
* contrib/xhb/dbf2txt.c
* contrib/xhb/xhbis.c
* contrib/xhb/fparse.c
* contrib/xhb/xhb.h
* contrib/xhb/xhbsave.c
* contrib/xhb/xhbmsgs.c
* contrib/xhb/freadlin.c
* contrib/xhb/txtline.c
* contrib/xhb/dbgfxc.c
* contrib/xhb/xhberrc.c
* contrib/xhb/filestat.c
* contrib/xhb/xhbcopyf.c
* contrib/xhb/hbnxs.h
* contrib/xhb/hbserv.c
* contrib/xhb/cstructc.c
* contrib/xhb/xhbfunc.c
* contrib/hbmzip/hbmzip.c
* contrib/gtqtc/gtqtc.cpp
* contrib/gtwvg/gtwvg.c
* contrib/gtwvg/gtwvg.h
* contrib/gtwvg/wvggui.c
* contrib/gtwvg/wvgcuig.c
* contrib/gtwvg/wvggui.h
* contrib/gtwvg/wvgwin.c
* contrib/gtwvg/wvgutils.c
* contrib/gtwvg/wvgcore.c
* contrib/gtwvg/wvgwing.c
* contrib/hbmisc/hb_f.c
* contrib/hbmisc/dates2.c
* contrib/hbwin/hbwapi.h
* contrib/hbbtree/tests/ctest.c
* BOOL -> HB_BOOL
* TRUE -> HB_TRUE
* FALSE -> HB_FALSE
; If possible please try to verify me, at least your own are of interest
or expertise. Look for HB_BOOL/HB_TRUE/HB_FALSE usage in WINAPI calls,
if you see such thing, it's wrong. Also some, HB_BOOL WINAPI BOOL
implicit conversions may need to be cleaned.
; I didn't touch PP, RDD, SDD and compiler parts yet.
; In few places it's possible that some in-line comments are disaligned
after this operation.
2010-01-14 13:36 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rdd/hbsix/sxcompr.c
* src/rdd/hbsix/sxcrypt.c

60
harbour/contrib/gtalleg/gtalleg.c
View File

@@ -72,9 +72,9 @@ static HB_GT_FUNCS SuperTable;
#define HB_GTID_PTR (&s_GtId)
static BOOL s_fInit;
static BOOL s_fMakeInit;
static BOOL s_fGtError;
static HB_BOOL s_fInit;
static HB_BOOL s_fMakeInit;
static HB_BOOL s_fGtError;
/* font definition */
static ssfFont s_ssfDefaultFont;
@@ -204,20 +204,20 @@ static const gtAllegKey s_CtrlTable[GT_CTRL_TABLE_SIZE] = {
if( r > s_GFXUpd.iRight ) s_GFXUpd.iRight = r; \
} while(0)
#define GT_SCREENINIT() do { if( !s_fInit ) \
hb_gt_alleg_InitializeScreen( pGT, s_iScrHeight, s_iScrWidth, TRUE ); \
hb_gt_alleg_InitializeScreen( pGT, s_iScrHeight, s_iScrWidth, HB_TRUE ); \
} while( 0 )
#define MK_GT8BCOLOR(n) ((n & 0xFF) / 16 | (n & 0xFF00) / 256)
static void hb_gt_alleg_Error( const char * szMsg )
{
s_fGtError = TRUE;
s_fGtError = HB_TRUE;
hb_errInternal( 9997, "%s: %s", szMsg, allegro_error );
}
static BOOL hb_gt_alleg_CursorRect( int iRow, int iCol, int iStyle,
int * piTop, int * piLeft,
int * piBottom, int * piRight )
static HB_BOOL hb_gt_alleg_CursorRect( int iRow, int iCol, int iStyle,
int * piTop, int * piLeft,
int * piBottom, int * piRight )
{
*piLeft = s_iHBorder + iCol * s_byFontWidth;
*piRight = *piLeft + s_byFontWidth - 1;
@@ -246,10 +246,10 @@ static BOOL hb_gt_alleg_CursorRect( int iRow, int iCol, int iStyle,
break;
default:
return FALSE;
return HB_FALSE;
}
return TRUE;
return HB_TRUE;
}
static void hb_gt_alleg_DoCursor( int iRow, int iCol, int iStyle )
@@ -284,7 +284,7 @@ static void hb_gt_alleg_DoCursor( int iRow, int iCol, int iStyle )
static void hb_gt_alleg_ScreenUpdate( PHB_GT pGT )
{
int iRow, iCol, iStyle;
BOOL fPix, fCursor;
HB_BOOL fPix, fCursor;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_alleg_ScreenUpdate(%p)", pGT));
@@ -320,18 +320,18 @@ static void hb_gt_alleg_ScreenUpdate( PHB_GT pGT )
}
}
static BOOL hb_gt_alleg_InitializeScreen( PHB_GT pGT, int iRows, int iCols, BOOL lClearInit )
static HB_BOOL hb_gt_alleg_InitializeScreen( PHB_GT pGT, int iRows, int iCols, HB_BOOL lClearInit )
{
PHB_FNAME pFileName;
int iRet = 1, iWidth, iHeight; /* Don't remove iRet, ixFP and iyFP initializers! */
short ixFP = 0, iyFP = 0;
BOOL lMode = FALSE, lPrev = s_fInit;
HB_BOOL lMode = HB_FALSE, lPrev = s_fInit;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_alleg_InitializeScreen(%p,%d,%d,%d)", pGT, iRows, iCols, (int) lClearInit ));
if( s_fGtError )
{
return FALSE;
return HB_FALSE;
}
if( lPrev )
@@ -427,7 +427,7 @@ static BOOL hb_gt_alleg_InitializeScreen( PHB_GT pGT, int iRows, int iCols, BOOL
}
else
{
lMode = TRUE;
lMode = HB_TRUE;
}
pFileName = hb_fsFNameSplit( hb_cmdargARGV()[0] );
@@ -441,7 +441,7 @@ static BOOL hb_gt_alleg_InitializeScreen( PHB_GT pGT, int iRows, int iCols, BOOL
s_iMsButtons = al_install_mouse();
}
s_fInit = TRUE;
s_fInit = HB_TRUE;
s_mouseBound.iLeft = 0;
s_mouseBound.iTop = 0;
s_mouseBound.iRight = AL_SCREEN_W - 1;
@@ -552,7 +552,7 @@ static void hb_gt_alleg_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hF
ssfCreateThinFont( &s_ssfDefaultFont );
s_iCursorStyle = SC_NONE;
s_fMakeInit = s_fGtError = FALSE;
s_fMakeInit = s_fGtError = HB_FALSE;
if( allegro_init() != 0 )
{
@@ -593,13 +593,13 @@ static const char * hb_gt_alleg_Version( PHB_GT pGT, int iType )
return "Harbour Terminal: Portable Allegro GUI console";
}
static BOOL hb_gt_alleg_SetMode( PHB_GT pGT, int iRows, int iCols )
static HB_BOOL hb_gt_alleg_SetMode( PHB_GT pGT, int iRows, int iCols )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_alleg_SetMode(%p,%d,%d)", pGT, iRows, iCols));
HB_SYMBOL_UNUSED( pGT );
return hb_gt_alleg_InitializeScreen( pGT, iRows, iCols, TRUE );
return hb_gt_alleg_InitializeScreen( pGT, iRows, iCols, HB_TRUE );
}
static int hb_gt_alleg_ReadKey( PHB_GT pGT, int iEventMask )
@@ -728,11 +728,11 @@ static int hb_gt_alleg_ReadKey( PHB_GT pGT, int iEventMask )
return nKey;
}
static BOOL hb_gt_alleg_mouse_IsPresent( PHB_GT pGT )
static HB_BOOL hb_gt_alleg_mouse_IsPresent( PHB_GT pGT )
{
HB_SYMBOL_UNUSED( pGT );
return TRUE;
return HB_TRUE;
}
static void hb_gt_alleg_mouse_GetPos( PHB_GT pGT, int * piRow, int * piCol )
@@ -755,7 +755,7 @@ static void hb_gt_alleg_mouse_SetPos( PHB_GT pGT, int iRow, int iCol )
al_position_mouse(iCol * s_byFontWidth, iRow * s_byFontSize);
}
static BOOL hb_gt_alleg_mouse_ButtonState( PHB_GT pGT, int iButton )
static HB_BOOL hb_gt_alleg_mouse_ButtonState( PHB_GT pGT, int iButton )
{
GT_SCREENINIT();
@@ -812,7 +812,7 @@ static void hb_gt_alleg_mouse_GetBounds( PHB_GT pGT, int *piTop, int *piLeft, in
*piRight = s_mouseBound.iRight;
}
static BOOL hb_gt_alleg_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
static HB_BOOL hb_gt_alleg_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
{
int iWidth, iHeight, iValue;
@@ -823,7 +823,7 @@ static BOOL hb_gt_alleg_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
case HB_GTI_ISGRAPHIC:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
pInfo->pResult = hb_itemPutL( pInfo->pResult, HB_TRUE );
break;
case HB_GTI_INPUTFD:
@@ -924,7 +924,7 @@ static BOOL hb_gt_alleg_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
return HB_GTSUPER_INFO( pGT, iType, pInfo );
}
return TRUE;
return HB_TRUE;
}
/* ********** Graphics API ********** */
@@ -1140,7 +1140,7 @@ static void hb_gt_alleg_Redraw( PHB_GT pGT, int iRow, int iCol, int iSize )
if( iColor != iDefColor || usChar != ' ' )
{
s_fMakeInit = TRUE;
s_fMakeInit = HB_TRUE;
break;
}
}
@@ -1168,7 +1168,7 @@ static void hb_gt_alleg_Refresh( PHB_GT pGT )
HB_GTSUPER_REFRESH( pGT );
if( s_fMakeInit )
{
s_fMakeInit = FALSE;
s_fMakeInit = HB_FALSE;
GT_SCREENINIT();
}
}
@@ -1178,7 +1178,7 @@ static void hb_gt_alleg_Refresh( PHB_GT pGT )
/* ******************************************************************* */
static BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
static HB_BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_FuncInit(%p)", pFuncTable));
@@ -1202,7 +1202,7 @@ static BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
pFuncTable->GfxPrimitive = hb_gt_alleg_gfx_Primitive;
pFuncTable->GfxText = hb_gt_alleg_gfx_Text;
return TRUE;
return HB_TRUE;
}
/* ******************************************************************* */
@@ -1221,7 +1221,7 @@ int _mangled_main( int argc, char * argv[] )
HB_TRACE(HB_TR_DEBUG, ("_mangled_main(%d, %p)", argc, argv));
hb_cmdargInit( argc, argv );
hb_vmInit( TRUE );
hb_vmInit( HB_TRUE );
return hb_vmQuit();
}
void * _mangled_main_address = ( void * ) _mangled_main;

134
harbour/contrib/gtqtc/gtqtc.cpp
View File

@@ -99,7 +99,7 @@ static void DebugIt( char* text, int iVal, int iVal2 )
static bool hb_gt_wvt_Alloc( PHB_GTWVT pWVT )
{
bool fOK = FALSE;
bool fOK = HB_FALSE;
HB_WVT_LOCK
@@ -112,7 +112,7 @@ static bool hb_gt_wvt_Alloc( PHB_GTWVT pWVT )
{
s_wvtWindows[ iPos ] = pWVT;
pWVT->iHandle = iPos;
fOK = TRUE;
fOK = HB_TRUE;
++s_wvtCount;
break;
}
@@ -174,35 +174,35 @@ static PHB_GTWVT hb_gt_wvt_New( PHB_GT pGT, int iCmdShow )
pWVT->fontQuality = 0;
hb_strncpy( pWVT->fontFace, WVT_DEFAULT_FONT_NAME, sizeof( pWVT->fontFace ) - 1 );
pWVT->CaretExist = FALSE;
pWVT->CaretHidden = TRUE;
pWVT->CaretExist = HB_FALSE;
pWVT->CaretHidden = HB_TRUE;
pWVT->CaretSize = 0;
pWVT->CaretWidth = 0;
pWVT->MousePos.setX( 0 );
pWVT->MousePos.setY( 0 );
pWVT->MouseMove = TRUE;
pWVT->MouseMove = HB_TRUE;
pWVT->keyPointerIn = 0;
pWVT->keyPointerOut = 0;
pWVT->keyLast = 0;
pWVT->CenterWindow = TRUE; /* Default is to always display window in centre of screen */
pWVT->CodePage = 255; /* GetACP(); - set code page to default system */
pWVT->CenterWindow = HB_TRUE; /* Default is to always display window in centre of screen */
pWVT->CodePage = 255; /* GetACP(); - set code page to default system */
pWVT->AltF4Close = FALSE;
pWVT->fInit = FALSE;
pWVT->bMaximized = FALSE;
pWVT->bBeingMarked = FALSE;
pWVT->bBeginMarked = FALSE;
pWVT->AltF4Close = HB_FALSE;
pWVT->fInit = HB_FALSE;
pWVT->bMaximized = HB_FALSE;
pWVT->bBeingMarked = HB_FALSE;
pWVT->bBeginMarked = HB_FALSE;
pWVT->pszSelectCopy = hb_strdup( "Mark and Copy" );
pWVT->bSelectCopy = TRUE;
pWVT->bResizable = TRUE;
pWVT->bClosable = TRUE;
pWVT->bSelectCopy = HB_TRUE;
pWVT->bResizable = HB_TRUE;
pWVT->bClosable = HB_TRUE;
pWVT->ResizeMode = HB_GTI_RESIZEMODE_FONT;
pWVT->bResizing = FALSE;
pWVT->bAlreadySizing = FALSE;
pWVT->bResizing = HB_FALSE;
pWVT->bAlreadySizing = HB_FALSE;
pWVT->hostCDP = hb_vmCDP();
#if defined( UNICODE )
@@ -309,7 +309,7 @@ static void hb_gt_wvt_QUpdateCaret( PHB_GTWVT pWVT )
if( pWVT->CaretExist && !pWVT->CaretHidden )
{
pWVT->qWnd->_drawingArea->hideCaret();
pWVT->CaretHidden = TRUE;
pWVT->CaretHidden = HB_TRUE;
}
}
else
@@ -326,7 +326,7 @@ static void hb_gt_wvt_QUpdateCaret( PHB_GTWVT pWVT )
{
pWVT->qWnd->_drawingArea->setCaretPos( iCol, iRow );
pWVT->qWnd->_drawingArea->showCaret();
pWVT->CaretHidden = FALSE;
pWVT->CaretHidden = HB_FALSE;
}
}
}
@@ -336,7 +336,7 @@ static void hb_gt_wvt_QKillCaret( PHB_GTWVT pWVT )
if( pWVT->CaretExist )
{
pWVT->qWnd->_drawingArea->destroyCaret();
pWVT->CaretExist = FALSE;
pWVT->CaretExist = HB_FALSE;
}
}
@@ -373,10 +373,10 @@ static bool hb_gt_wvt_GetCharFromInputQueue( PHB_GTWVT pWVT, int * iKey )
{
pWVT->keyPointerOut = 0;
}
return TRUE;
return HB_TRUE;
}
*iKey = 0;
return FALSE;
return HB_FALSE;
}
int hb_gt_wvt_getKbdState( void )
@@ -449,9 +449,9 @@ static bool hb_gt_wvt_QSetWindowSize( PHB_GTWVT pWVT, int iRows, int iCols )
pWVT->qWnd->_drawingArea->_iROWS = iRows;
pWVT->qWnd->_drawingArea->_iCOLS = iCols;
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
static bool hb_gt_wvt_QInitWindow( PHB_GTWVT pWVT, int iRow, int iCol )
@@ -493,7 +493,7 @@ static bool hb_gt_wvt_QValidWindowSize( int rows, int cols, QFont *qFont, int iW
HB_SYMBOL_UNUSED( qFont );
HB_SYMBOL_UNUSED( iWidth );
return TRUE;
return HB_TRUE;
}
#endif
@@ -536,7 +536,7 @@ static bool hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT )
{
#if 0
HMENU hSysMenu = GetSystemMenu( pWVT->hWnd, FALSE );
HMENU hSysMenu = GetSystemMenu( pWVT->hWnd, HB_FALSE );
if( hSysMenu )
{
/* Create "Mark" prompt in SysMenu to allow console type copy operation */
@@ -547,7 +547,7 @@ static bool hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT )
}
#endif
}
return TRUE;
return HB_TRUE;
}
/* ********************************************************************** */
@@ -664,7 +664,7 @@ static void hb_gt_wvt_Refresh( PHB_GT pGT )
{
if( !pWVT->fInit )
{
pWVT->fInit = TRUE;
pWVT->fInit = HB_TRUE;
if( pWVT->CenterWindow )
{
hb_gt_wvt_QCenterWindow( pWVT );
@@ -680,10 +680,10 @@ static void hb_gt_wvt_Refresh( PHB_GT pGT )
/* ********************************************************************** */
static BOOL hb_gt_wvt_SetMode( PHB_GT pGT, int iRow, int iCol )
static HB_BOOL hb_gt_wvt_SetMode( PHB_GT pGT, int iRow, int iCol )
{
PHB_GTWVT pWVT;
bool fResult = FALSE;
bool fResult = HB_FALSE;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_SetMode(%p,%d,%d)", pGT, iRow, iCol ) );
@@ -728,7 +728,7 @@ static int hb_gt_wvt_ReadKey( PHB_GT pGT, int iEventMask )
{
PHB_GTWVT pWVT;
int c = 0;
bool fKey = FALSE;
bool fKey = HB_FALSE;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_ReadKey(%p,%d)", pGT, iEventMask ) );
HB_SYMBOL_UNUSED( iEventMask ); /* we ignore the eventmask! */
@@ -761,7 +761,7 @@ static void hb_gt_wvt_Tone( PHB_GT pGT, double dFrequency, double dDuration )
/* ********************************************************************** */
static BOOL hb_gt_wvt_SetDispCP( PHB_GT pGT, const char * pszTermCDP, const char * pszHostCDP, BOOL fBox )
static HB_BOOL hb_gt_wvt_SetDispCP( PHB_GT pGT, const char * pszTermCDP, const char * pszHostCDP, HB_BOOL fBox )
{
HB_GTSUPER_SETDISPCP( pGT, pszTermCDP, pszHostCDP, fBox );
@@ -803,15 +803,15 @@ static BOOL hb_gt_wvt_SetDispCP( PHB_GT pGT, const char * pszTermCDP, const char
for( i = 0; i < 256; i++ )
{
pWVT->chrTransTbl[ i ] = ( BYTE )
hb_cdpTranslateChar( i, TRUE, cdpHost, cdpTerm );
hb_cdpTranslateChar( i, HB_TRUE, cdpHost, cdpTerm );
}
}
# endif
return TRUE;
return HB_TRUE;
}
static BOOL hb_gt_wvt_SetKeyCP( PHB_GT pGT, const char * pszTermCDP, const char * pszHostCDP )
static HB_BOOL hb_gt_wvt_SetKeyCP( PHB_GT pGT, const char * pszTermCDP, const char * pszHostCDP )
{
HB_GTSUPER_SETKEYCP( pGT, pszTermCDP, pszHostCDP );
@@ -847,23 +847,23 @@ static BOOL hb_gt_wvt_SetKeyCP( PHB_GT pGT, const char * pszTermCDP, const char
for( i = 0; i < 256; i++ )
pWVT->keyTransTbl[ i ] = ( BYTE )
hb_cdpTranslateChar( i, FALSE, cdpTerm, cdpHost );
hb_cdpTranslateChar( i, HB_FALSE, cdpTerm, cdpHost );
pWVT->inCDP = cdpTerm;
}
# endif
return TRUE;
return HB_TRUE;
}
/* ********************************************************************** */
static BOOL hb_gt_wvt_mouse_IsPresent( PHB_GT pGT )
static HB_BOOL hb_gt_wvt_mouse_IsPresent( PHB_GT pGT )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_wvt_mouse_IsPresent(%p)", pGT));
HB_SYMBOL_UNUSED( pGT );
return TRUE;
return HB_TRUE;
}
static void hb_gt_wvt_mouse_GetPos( PHB_GT pGT, int * piRow, int * piCol )
@@ -877,7 +877,7 @@ static void hb_gt_wvt_mouse_GetPos( PHB_GT pGT, int * piRow, int * piCol )
*piCol = pWVT->MousePos.x();
}
static BOOL hb_gt_wvt_mouse_ButtonState( PHB_GT pGT, int iButton )
static HB_BOOL hb_gt_wvt_mouse_ButtonState( PHB_GT pGT, int iButton )
{
HB_SYMBOL_UNUSED( iButton );
HB_TRACE( HB_TR_DEBUG, ("hb_gt_wvt_mouse_ButtonState(%p,%i)", pGT, iButton) );
@@ -893,7 +893,7 @@ static BOOL hb_gt_wvt_mouse_ButtonState( PHB_GT pGT, int iButton )
case 2:
return qApp->mouseButtons() & Qt::MidButton;
}
return FALSE;
return HB_FALSE;
}
static int hb_gt_wvt_mouse_CountButton( PHB_GT pGT )
@@ -908,7 +908,7 @@ static int hb_gt_wvt_mouse_CountButton( PHB_GT pGT )
/* ********************************************************************** */
static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
{
PHB_GTWVT pWVT;
int iVal;
@@ -928,11 +928,11 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
case HB_GTI_ISGRAPHIC:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
pInfo->pResult = hb_itemPutL( pInfo->pResult, HB_TRUE );
break;
case HB_GTI_ISUNICODE:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
pInfo->pResult = hb_itemPutL( pInfo->pResult, HB_TRUE );
break;
#if 0
case HB_GTI_INPUTFD:
@@ -1128,7 +1128,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
if( iY > 0 )
{
bool bOldCentre = pWVT->CenterWindow;
pWVT->CenterWindow = pWVT->bMaximized ? TRUE : FALSE;
pWVT->CenterWindow = pWVT->bMaximized ? HB_TRUE : HB_FALSE;
HB_GTSELF_SETMODE( pGT, ( USHORT ) ( iY / pWVT->PTEXTSIZE.y() ), ( USHORT ) ( iX / pWVT->PTEXTSIZE.x() ) );
pWVT->CenterWindow = bOldCentre;
}
@@ -1177,17 +1177,17 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
if( hb_itemGetCLen( pInfo->pNewVal ) )
{
#if 0
HMENU hSysMenu = pWVT->hWnd ? GetSystemMenu( pWVT->hWnd, FALSE ) : NULL;
HMENU hSysMenu = pWVT->hWnd ? GetSystemMenu( pWVT->hWnd, HB_FALSE ) : NULL;
if( hSysMenu || !pWVT->hWnd )
{
if( pWVT->pszSelectCopy )
hb_xfree( pWVT->pszSelectCopy );
pWVT->pszSelectCopy = hb_strdup( hb_itemGetCPtr( pInfo->pNewVal ) );
pWVT->bSelectCopy = TRUE;
pWVT->bSelectCopy = HB_TRUE;
}
#endif
pWVT->pszSelectCopy = hb_strdup( hb_itemGetCPtr( pInfo->pNewVal ) );
pWVT->bSelectCopy = TRUE;
pWVT->bSelectCopy = HB_TRUE;
}
}
else if( pInfo->pNewVal )
@@ -1198,7 +1198,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
if( pWVT->qWnd )
{
#if 0
HMENU hSysMenu = GetSystemMenu( pWVT->hWnd, FALSE );
HMENU hSysMenu = GetSystemMenu( pWVT->hWnd, HB_FALSE );
if( hSysMenu )
{
EnableMenuItem( hSysMenu, SYS_EV_MARK, MF_BYCOMMAND | ( bNewValue ? MF_ENABLED : MF_GRAYED ) );
@@ -1312,12 +1312,12 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
return HB_GTSUPER_INFO( pGT, iType, pInfo );
}
return TRUE;
return HB_TRUE;
}
/* ********************************************************************** */
static BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
static HB_BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_FuncInit(%p)", pFuncTable));
@@ -1338,7 +1338,7 @@ static BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
pFuncTable->MouseButtonState = hb_gt_wvt_mouse_ButtonState;
pFuncTable->MouseCountButton = hb_gt_wvt_mouse_CountButton;
return TRUE;
return HB_TRUE;
}
/* ********************************************************************** */
@@ -1374,19 +1374,19 @@ DrawingArea::DrawingArea(QWidget *parent)
_iCOLS = 80;
setFocusPolicy( Qt::StrongFocus );
setMouseTracking( TRUE );
setMouseTracking( HB_TRUE );
setAttribute( Qt::WA_InputMethodEnabled, true );
/* Important but give it a thought */
//setAttribute(Qt::WA_OpaquePaintEvent);
_bBlinking = FALSE;
_bBlinking = HB_FALSE;
_basicTimer = new QBasicTimer();
_bFirst = TRUE;
_bSizing = FALSE;
_bCopying = FALSE;
_bFirst = HB_TRUE;
_bSizing = HB_FALSE;
_bCopying = HB_FALSE;
_image = new QImage();
@@ -1405,7 +1405,7 @@ void DrawingArea::resetWindowSize( void )
_qFont = QFont();
_qFont.setFamily( pWVT->fontFace );
_qFont.setPixelSize( pWVT->fontHeight );
_qFont.setFixedPitch( TRUE );
_qFont.setFixedPitch( HB_TRUE );
_qFont = QFont( _qFont, painter.device() );
QFontMetrics fontMetrics( _qFont );
_fontHeight = fontMetrics.height();
@@ -1598,12 +1598,12 @@ bool DrawingArea::createCaret( int iWidth, int iHeight )
{
_crtWidth = iWidth;
_crtHeight = iHeight;
return TRUE;
return HB_TRUE;
}
void DrawingArea::hideCaret( void )
{
_basicTimer->stop();
_bBlinking = FALSE;
_bBlinking = HB_FALSE;
displayCell( _crtLastRow, _crtLastCol );
}
void DrawingArea::showCaret( void )
@@ -1656,12 +1656,12 @@ void DrawingArea::timerEvent( QTimerEvent *event )
{
if( _bBlinking )
{
_bBlinking = FALSE;
_bBlinking = HB_FALSE;
displayCell( _crtLastRow, _crtLastCol );
}
else
{
_bBlinking = TRUE;
_bBlinking = HB_TRUE;
displayBlock( _crtLastRow, _crtLastCol );
}
}
@@ -1690,14 +1690,14 @@ void DrawingArea::resizeEvent( QResizeEvent *event )
{
PHB_GTWVT pWVT = HB_GTWVT_GET( pGT );
_bSizing = TRUE;
_bSizing = HB_TRUE;
int iW = width();
int iH = height();
if( _bFirst )
{
_bFirst = FALSE;
_bFirst = HB_FALSE;
QWidget::resizeEvent( event );
}
else
@@ -1897,7 +1897,7 @@ void DrawingArea::mousePressEvent( QMouseEvent *event )
if( _bSizing )
{
_bSizing = FALSE;
_bSizing = HB_FALSE;
pWVT->qWnd->setWindowSize();
}
@@ -1933,7 +1933,7 @@ void DrawingArea::mouseReleaseEvent( QMouseEvent *event )
if( _bSizing )
{
_bSizing = FALSE;
_bSizing = HB_FALSE;
pWVT->qWnd->setWindowSize();
}
if( _bCopying )
@@ -1971,7 +1971,7 @@ bool DrawingArea::event( QEvent *event )
{
if( _bSizing && ( event->type() == QEvent::Enter || event->type() == QEvent::Leave ) )
{
_bSizing = FALSE;
_bSizing = HB_FALSE;
PHB_GTWVT pWVT = HB_GTWVT_GET( pGT );
pWVT->qWnd->setWindowSize();
}

280
harbour/contrib/gtwvg/gtwvg.c
View File

@@ -118,7 +118,7 @@ static const int K_Ctrl[] =
K_CTRL_V, K_CTRL_W, K_CTRL_X, K_CTRL_Y, K_CTRL_Z
};
static BOOL b_MouseEnable = TRUE;
static HB_BOOL b_MouseEnable = HB_TRUE;
static void hb_wvt_gtInitGui( PHB_GTWVT pWVT );
static void hb_wvt_gtExitGui( PHB_GTWVT pWVT );
@@ -184,9 +184,9 @@ static PHB_GTWVT hb_gt_wvt_Find( HWND hWnd )
return pWVT;
}
static BOOL hb_gt_wvt_Alloc( PHB_GTWVT pWVT )
static HB_BOOL hb_gt_wvt_Alloc( PHB_GTWVT pWVT )
{
BOOL fOK = FALSE;
HB_BOOL fOK = HB_FALSE;
HB_WVT_LOCK
@@ -204,7 +204,7 @@ static BOOL hb_gt_wvt_Alloc( PHB_GTWVT pWVT )
hb_gt_wvt_RegisterClass( pWVT->hInstance );
hb_wvt_gtLoadGuiData();
}
fOK = TRUE;
fOK = HB_TRUE;
break;
}
++iPos;
@@ -363,41 +363,41 @@ static PHB_GTWVT hb_gt_wvt_New( PHB_GT pGT, HINSTANCE hInstance, int iCmdShow )
pWVT->fontQuality = DEFAULT_QUALITY;
hb_strncpy( pWVT->fontFace, WVT_DEFAULT_FONT_NAME, sizeof( pWVT->fontFace ) - 1 );
pWVT->CaretExist = FALSE;
pWVT->CaretHidden = TRUE;
pWVT->CaretExist = HB_FALSE;
pWVT->CaretHidden = HB_TRUE;
pWVT->CaretSize = 0;
pWVT->CaretWidth = 0;
pWVT->MousePos.x = 0;
pWVT->MousePos.y = 0;
pWVT->MouseMove = TRUE;
pWVT->MouseMove = HB_TRUE;
pWVT->hWnd = NULL;
pWVT->keyPointerIn = 0;
pWVT->keyPointerOut = 0;
pWVT->keyLast = 0;
pWVT->CentreWindow = TRUE; /* Default is to always display window in centre of screen */
pWVT->CentreWindow = HB_TRUE; /* Default is to always display window in centre of screen */
pWVT->CodePage = OEM_CHARSET; /* GetACP(); - set code page to default system */
#if !defined( UNICODE )
pWVT->boxCodePage = OEM_CHARSET; /* GetACP(); - set code page to default system */
#endif
pWVT->Win9X = ( osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS );
pWVT->AltF4Close = FALSE;
pWVT->AltF4Close = HB_FALSE;
pWVT->IgnoreWM_SYSCHAR = FALSE;
pWVT->IgnoreWM_SYSCHAR = HB_FALSE;
pWVT->bMaximized = FALSE;
pWVT->bBeingMarked = FALSE;
pWVT->bBeginMarked = FALSE;
pWVT->bMaximized = HB_FALSE;
pWVT->bBeingMarked = HB_FALSE;
pWVT->bBeginMarked = HB_FALSE;
pWVT->pszSelectCopy = hb_strdup( "Mark and Copy" );
pWVT->bSelectCopy = TRUE;
pWVT->bResizable = TRUE;
pWVT->bClosable = TRUE;
pWVT->bSelectCopy = HB_TRUE;
pWVT->bResizable = HB_TRUE;
pWVT->bClosable = HB_TRUE;
pWVT->ResizeMode = HB_GTI_RESIZEMODE_FONT;
pWVT->bResizing = FALSE;
pWVT->bResizing = HB_FALSE;
pWVT->pPP = ( HB_GT_PARAMS * ) hb_xgrab( sizeof( HB_GT_PARAMS ) );
pWVT->pPP->style = WS_THICKFRAME|WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX;
@@ -407,9 +407,9 @@ static PHB_GTWVT hb_gt_wvt_New( PHB_GT pGT, HINSTANCE hInstance, int iCmdShow )
pWVT->pPP->width = CW_USEDEFAULT;
pWVT->pPP->height = CW_USEDEFAULT;
pWVT->pPP->pParentGT = NULL;
pWVT->pPP->bVisible = FALSE;
pWVT->pPP->bConfigured = FALSE;
pWVT->pPP->bRowCols = FALSE;
pWVT->pPP->bVisible = HB_FALSE;
pWVT->pPP->bConfigured = HB_FALSE;
pWVT->pPP->bRowCols = HB_FALSE;
pWVT->pPP->iWndType = 0;
pWVT->hostCDP = hb_vmCDP();
@@ -556,7 +556,7 @@ static void hb_gt_wvt_UpdateCaret( PHB_GTWVT pWVT )
if( pWVT->CaretExist && !pWVT->CaretHidden )
{
HideCaret( pWVT->hWnd );
pWVT->CaretHidden = TRUE;
pWVT->CaretHidden = HB_TRUE;
}
}
else
@@ -571,7 +571,7 @@ static void hb_gt_wvt_UpdateCaret( PHB_GTWVT pWVT )
}
if( pWVT->CaretExist )
{
BOOL bShow;
HB_BOOL bShow;
POINT xy;
xy = hb_gt_wvt_GetXYFromColRow( pWVT, iCol, iRow );
SetCaretPos( xy.x, pWVT->CaretSize < 0 ?
@@ -588,7 +588,7 @@ static void hb_gt_wvt_UpdateCaret( PHB_GTWVT pWVT )
xy.y : xy.y + pWVT->PTEXTSIZE.y - pWVT->CaretSize );
ShowCaret( pWVT->hWnd );
}
pWVT->CaretHidden = FALSE;
pWVT->CaretHidden = HB_FALSE;
}
}
}
@@ -598,7 +598,7 @@ static void hb_gt_wvt_KillCaret( PHB_GTWVT pWVT )
if( pWVT->CaretExist )
{
DestroyCaret();
pWVT->CaretExist = FALSE;
pWVT->CaretExist = HB_FALSE;
}
}
@@ -645,7 +645,7 @@ static void hb_gt_wvt_AddCharToInputQueue( PHB_GTWVT pWVT, int iKey )
}
}
static BOOL hb_gt_wvt_GetCharFromInputQueue( PHB_GTWVT pWVT, int * iKey )
static HB_BOOL hb_gt_wvt_GetCharFromInputQueue( PHB_GTWVT pWVT, int * iKey )
{
if( pWVT->keyPointerOut != pWVT->keyPointerIn )
{
@@ -654,11 +654,11 @@ static BOOL hb_gt_wvt_GetCharFromInputQueue( PHB_GTWVT pWVT, int * iKey )
{
pWVT->keyPointerOut = 0;
}
return TRUE;
return HB_TRUE;
}
*iKey = 0;
return FALSE;
return HB_FALSE;
}
static void hb_gt_wvt_TranslateKey( PHB_GTWVT pWVT, int key, int shiftkey, int altkey, int controlkey )
@@ -704,7 +704,7 @@ static int hb_gt_wvt_key_ansi_to_oem( int c )
return pszDst[ 0 ];
}
static BOOL hb_gt_wvt_FitRows( PHB_GTWVT pWVT )
static HB_BOOL hb_gt_wvt_FitRows( PHB_GTWVT pWVT )
{
RECT wi;
RECT ci;
@@ -718,7 +718,7 @@ static BOOL hb_gt_wvt_FitRows( PHB_GTWVT pWVT )
&&
( ci.bottom - ci.top ) == ( pWVT->PTEXTSIZE.y * pWVT->ROWS ) )
{
return FALSE;
return HB_FALSE;
}
GetWindowRect( pWVT->hWnd, &wi );
@@ -740,16 +740,16 @@ static BOOL hb_gt_wvt_FitRows( PHB_GTWVT pWVT )
if( maxHeight > 0 )
{
BOOL bOldCentre = pWVT->CentreWindow;
pWVT->CentreWindow = pWVT->bMaximized ? TRUE : FALSE;
HB_BOOL bOldCentre = pWVT->CentreWindow;
pWVT->CentreWindow = pWVT->bMaximized ? HB_TRUE : HB_FALSE;
HB_GTSELF_SETMODE( pWVT->pGT, ( maxHeight / pWVT->PTEXTSIZE.y ), ( maxWidth / pWVT->PTEXTSIZE.x ) );
pWVT->CentreWindow = bOldCentre;
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
static BOOL hb_gt_wvt_FitSize( PHB_GTWVT pWVT )
static HB_BOOL hb_gt_wvt_FitSize( PHB_GTWVT pWVT )
{
RECT wi;
RECT ci;
@@ -765,7 +765,7 @@ static BOOL hb_gt_wvt_FitSize( PHB_GTWVT pWVT )
&&
( ci.bottom - ci.top ) == ( pWVT->PTEXTSIZE.y * pWVT->ROWS ) )
{
return FALSE;
return HB_FALSE;
}
GetWindowRect( pWVT->hWnd, &wi );
@@ -848,7 +848,7 @@ static BOOL hb_gt_wvt_FitSize( PHB_GTWVT pWVT )
pWVT->PTEXTSIZE.y = tm.tmHeight;
#if defined( HB_OS_WIN_CE )
pWVT->FixedFont = FALSE;
pWVT->FixedFont = HB_FALSE;
#else
pWVT->FixedFont = !pWVT->Win9X && pWVT->fontWidth >= 0 &&
( tm.tmPitchAndFamily & TMPF_FIXED_PITCH ) == 0 &&
@@ -885,12 +885,12 @@ static BOOL hb_gt_wvt_FitSize( PHB_GTWVT pWVT )
HB_GTSELF_EXPOSEAREA( pWVT->pGT, 0, 0, pWVT->ROWS, pWVT->COLS );
}
}
return TRUE;
return HB_TRUE;
}
static BOOL hb_gt_wvt_FitSizeRows( PHB_GTWVT pWVT )
static HB_BOOL hb_gt_wvt_FitSizeRows( PHB_GTWVT pWVT )
{
BOOL bSizeChanged = FALSE;
HB_BOOL bSizeChanged = HB_FALSE;
if( pWVT->bResizable )
{
@@ -902,7 +902,7 @@ static BOOL hb_gt_wvt_FitSizeRows( PHB_GTWVT pWVT )
else
bSizeChanged = hb_gt_wvt_FitRows( pWVT );
pWVT->bResizing = FALSE;
pWVT->bResizing = HB_FALSE;
if( bSizeChanged )
{
@@ -920,19 +920,19 @@ static BOOL hb_gt_wvt_FitSizeRows( PHB_GTWVT pWVT )
hb_wvt_gtSaveGuiState( pWVT );
}
else
InvalidateRect( pWVT->hWnd, NULL, FALSE );
InvalidateRect( pWVT->hWnd, NULL, HB_FALSE );
}
else
{
pWVT->bResizing = FALSE;
InvalidateRect( pWVT->hWnd, NULL, FALSE );
pWVT->bResizing = HB_FALSE;
InvalidateRect( pWVT->hWnd, NULL, HB_FALSE );
}
return bSizeChanged;
}
static void hb_gt_wvt_Maximize( PHB_GTWVT pWVT )
{
pWVT->bMaximized = TRUE;
pWVT->bMaximized = HB_TRUE;
hb_gt_wvt_FitSizeRows( pWVT );
/* Disable "maximize" button */
@@ -1000,7 +1000,7 @@ static void hb_gt_wvt_ResetWindowSize( PHB_GTWVT pWVT )
pWVT->PTEXTSIZE.y = tm.tmHeight; /* but seems to be a problem on Win9X so */
/* assume proportional fonts always for Win9X */
#if defined( HB_OS_WIN_CE )
pWVT->FixedFont = FALSE;
pWVT->FixedFont = HB_FALSE;
#else
pWVT->FixedFont = !pWVT->Win9X && pWVT->fontWidth >= 0 &&
( tm.tmPitchAndFamily & TMPF_FIXED_PITCH ) == 0 &&
@@ -1023,7 +1023,7 @@ static void hb_gt_wvt_ResetWindowSize( PHB_GTWVT pWVT )
height += ( int ) ( wi.bottom - wi.top - ci.bottom );
/* Center the window within the CLIENT area on the screen
but only if pWVT->CentreWindow == TRUE */
but only if pWVT->CentreWindow == HB_TRUE */
if( pWVT->CentreWindow && SystemParametersInfo( SPI_GETWORKAREA, 0, &rcWorkArea, 0 ) )
{
wi.left = rcWorkArea.left + ( ( rcWorkArea.right - rcWorkArea.left - width ) / 2 );
@@ -1032,7 +1032,7 @@ static void hb_gt_wvt_ResetWindowSize( PHB_GTWVT pWVT )
if( wi.left < 0 || wi.top < 0 )
{
pWVT->bMaximized = TRUE;
pWVT->bMaximized = HB_TRUE;
hb_gt_wvt_FitSizeRows( pWVT );
/* resize the window to get the specified number of rows and columns */
@@ -1046,7 +1046,7 @@ static void hb_gt_wvt_ResetWindowSize( PHB_GTWVT pWVT )
height += ( int ) ( wi.bottom - wi.top - ci.bottom );
/* Center the window within the CLIENT area on the screen
but only if pWVT->CentreWindow == TRUE */
but only if pWVT->CentreWindow == HB_TRUE */
if( pWVT->CentreWindow && SystemParametersInfo( SPI_GETWORKAREA, 0, &rcWorkArea, 0 ) )
{
wi.left = rcWorkArea.left + ( ( rcWorkArea.right - rcWorkArea.left - width ) / 2 );
@@ -1071,7 +1071,7 @@ static void hb_gt_wvt_SetWindowTitle( HWND hWnd, const char * title )
HB_TCHAR_FREE( text );
}
static BOOL hb_gt_wvt_GetWindowTitle( HWND hWnd, char ** title )
static HB_BOOL hb_gt_wvt_GetWindowTitle( HWND hWnd, char ** title )
{
TCHAR buffer[ WVT_MAX_TITLE_SIZE ];
int iResult;
@@ -1082,28 +1082,28 @@ static BOOL hb_gt_wvt_GetWindowTitle( HWND hWnd, char ** title )
*title = ( char * ) hb_xgrab( iResult + 1 );
HB_TCHAR_GETFROM( *title, buffer, iResult );
( *title )[ iResult ] = '\0';
return TRUE;
return HB_TRUE;
}
*title = NULL;
return FALSE;
return HB_FALSE;
}
static BOOL hb_gt_wvt_SetWindowSize( PHB_GTWVT pWVT, int iRow, int iCol )
static HB_BOOL hb_gt_wvt_SetWindowSize( PHB_GTWVT pWVT, int iRow, int iCol )
{
if( HB_GTSELF_RESIZE( pWVT->pGT, iRow, iCol ) )
{
pWVT->ROWS = iRow;
pWVT->COLS = iCol;
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
static BOOL hb_gt_wvt_InitWindow( PHB_GTWVT pWVT, int iRow, int iCol )
static HB_BOOL hb_gt_wvt_InitWindow( PHB_GTWVT pWVT, int iRow, int iCol )
{
BOOL fRet = hb_gt_wvt_SetWindowSize( pWVT, iRow, iCol );
HB_BOOL fRet = hb_gt_wvt_SetWindowSize( pWVT, iRow, iCol );
hb_gt_wvt_ResetWindowSize( pWVT );
@@ -1175,7 +1175,7 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L
{
if( pWVT->bBeginMarked )
{
pWVT->bBeingMarked = TRUE;
pWVT->bBeingMarked = HB_TRUE;
pWVT->sRectNew.left = xy.x;
pWVT->sRectNew.top = xy.y;
@@ -1207,8 +1207,8 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L
{
if( pWVT->bBeingMarked )
{
pWVT->bBeginMarked = FALSE;
pWVT->bBeingMarked = FALSE;
pWVT->bBeginMarked = HB_FALSE;
pWVT->bBeingMarked = HB_FALSE;
RedrawWindow( pWVT->hWnd, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW );
@@ -1390,16 +1390,16 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L
}
}
static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPARAM lParam )
static HB_BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPARAM lParam )
{
switch( message )
{
case WM_KEYDOWN:
case WM_SYSKEYDOWN:
{
BOOL bAlt = GetKeyState( VK_MENU ) & 0x8000;
HB_BOOL bAlt = GetKeyState( VK_MENU ) & 0x8000;
pWVT->IgnoreWM_SYSCHAR = FALSE;
pWVT->IgnoreWM_SYSCHAR = HB_FALSE;
switch( wParam )
{
@@ -1474,8 +1474,8 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA
break;
default:
{
BOOL bCtrl = GetKeyState( VK_CONTROL ) & 0x8000;
BOOL bShift = GetKeyState( VK_SHIFT ) & 0x8000;
HB_BOOL bCtrl = GetKeyState( VK_CONTROL ) & 0x8000;
HB_BOOL bShift = GetKeyState( VK_SHIFT ) & 0x8000;
int iScanCode = HIWORD( lParam ) & 0xFF;
if( bCtrl && iScanCode == 76 ) /* CTRL_VK_NUMPAD5 */
@@ -1491,7 +1491,7 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA
if( bCtrl ) /* Not scroll lock */
{
hb_gt_wvt_AddCharToInputQueue( pWVT, HB_BREAK_FLAG ); /* Pretend Alt+C pressed */
pWVT->IgnoreWM_SYSCHAR = TRUE;
pWVT->IgnoreWM_SYSCHAR = HB_TRUE;
}
else
{
@@ -1507,7 +1507,7 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA
wParam == VK_SUBTRACT || wParam == VK_DIVIDE ) )
{
if( bAlt )
pWVT->IgnoreWM_SYSCHAR = TRUE;
pWVT->IgnoreWM_SYSCHAR = HB_TRUE;
switch( wParam )
{
@@ -1536,7 +1536,7 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA
case WM_CHAR:
{
BOOL bCtrl = GetKeyState( VK_CONTROL ) & 0x8000;
HB_BOOL bCtrl = GetKeyState( VK_CONTROL ) & 0x8000;
int iScanCode = HIWORD( lParam ) & 0xFF;
int c = ( int ) wParam;
@@ -1571,7 +1571,7 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA
if( pWVT->inCDP )
{
#if defined( UNICODE )
c = hb_cdpGetChar( pWVT->inCDP, FALSE, ( USHORT ) c );
c = hb_cdpGetChar( pWVT->inCDP, HB_FALSE, ( USHORT ) c );
#else
if( c > 0 && c <= 255 && pWVT->keyTransTbl[ c ] )
c = pWVT->keyTransTbl[ c ];
@@ -1584,7 +1584,7 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA
}
}
}
pWVT->IgnoreWM_SYSCHAR = FALSE; /* As Suggested by Peter */
pWVT->IgnoreWM_SYSCHAR = HB_FALSE; /* As Suggested by Peter */
break;
}
@@ -1715,7 +1715,7 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA
}
hb_gt_wvt_AddCharToInputQueue( pWVT, c );
}
pWVT->IgnoreWM_SYSCHAR = FALSE;
pWVT->IgnoreWM_SYSCHAR = HB_FALSE;
}
}
@@ -1726,7 +1726,7 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA
* hb_gt_wvt_TextOut converts col and row to x and y ( pixels ) and calls
* the Windows function TextOut with the expected coordinates
*/
static BOOL hb_gt_wvt_TextOut( PHB_GTWVT pWVT, HDC hdc, int col, int row, int iColor, LPCTSTR lpString, USHORT cbString )
static HB_BOOL hb_gt_wvt_TextOut( PHB_GTWVT pWVT, HDC hdc, int col, int row, int iColor, LPCTSTR lpString, USHORT cbString )
{
POINT xy;
RECT rClip;
@@ -1778,7 +1778,7 @@ static void hb_gt_wvt_PaintText( PHB_GTWVT pWVT, RECT updateRect )
}
if( pWVT->bGui && pWVT->bSetFocus )
{
pWVT->bSetFocus = FALSE;
pWVT->bSetFocus = HB_FALSE;
hb_wvt_gtRestGuiState( pWVT, &updateRect );
ValidateRect( pWVT->hWnd, &updateRect );
{
@@ -1818,7 +1818,7 @@ static void hb_gt_wvt_PaintText( PHB_GTWVT pWVT, RECT updateRect )
iColor &= 0xff;
#if defined( UNICODE )
usChar = hb_cdpGetU16( bAttr & HB_GT_ATTR_BOX ? pWVT->boxCDP : pWVT->hostCDP, TRUE, ( BYTE ) usChar );
usChar = hb_cdpGetU16( bAttr & HB_GT_ATTR_BOX ? pWVT->boxCDP : pWVT->hostCDP, HB_TRUE, ( BYTE ) usChar );
if( len == 0 )
{
iOldColor = iColor;
@@ -1886,7 +1886,7 @@ static void hb_gt_wvt_PaintText( PHB_GTWVT pWVT, RECT updateRect )
}
else
{
pWVT->bPaint = TRUE;
pWVT->bPaint = HB_TRUE;
}
EndPaint( pWVT->hWnd, &ps );
@@ -1977,8 +1977,8 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
case WM_SETFOCUS:
hb_gt_wvt_UpdateCaret( pWVT );
pWVT->bSetFocus = TRUE;
pWVT->bKillFocus = FALSE;
pWVT->bSetFocus = HB_TRUE;
pWVT->bKillFocus = HB_FALSE;
if( pWVT->bGetFocus )
{
@@ -1996,7 +1996,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
}
else
{
pWVT->bGetFocus = TRUE;
pWVT->bGetFocus = HB_TRUE;
}
{ /* For mixing gui/cui items */
PHB_ITEM pEvParams = hb_itemNew( NULL );
@@ -2012,7 +2012,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
case WM_KILLFOCUS:
hb_gt_wvt_KillCaret( pWVT );
pWVT->bKillFocus = TRUE;
pWVT->bKillFocus = HB_TRUE;
if( pWVT->pSymWVT_KILLFOCUS )
{
@@ -2072,7 +2072,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
{
hb_gt_wvt_AddCharToInputQueue( pWVT, 27 );
#if 0
PHB_ITEM pItem = hb_itemPutL( NULL, TRUE );
PHB_ITEM pItem = hb_itemPutL( NULL, HB_TRUE );
hb_setSetItem( HB_SET_CANCEL, pItem );
hb_itemRelease( pItem );
hb_vmRequestCancel();
@@ -2099,7 +2099,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
case WM_ENTERSIZEMOVE:
if( pWVT->bMaximized )
{
pWVT->bMaximized = FALSE;
pWVT->bMaximized = HB_FALSE;
/* Enable "maximize" button */
{
@@ -2112,7 +2112,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
SetWindowPos( pWVT->hWnd, NULL, 0, 0, 0, 0,
SWP_NOACTIVATE | SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_DEFERERASE );
}
pWVT->bResizing = TRUE;
pWVT->bResizing = HB_TRUE;
return 0;
case WM_EXITSIZEMOVE:
@@ -2138,7 +2138,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
}
case SYS_EV_MARK:
{
pWVT->bBeginMarked = TRUE;
pWVT->bBeginMarked = HB_TRUE;
return 0;
}
}
@@ -2233,7 +2233,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
hb_gt_wvt_FireEvent( pWVT, HB_GTE_MOUSE, pEvParams );
pWVT->bTracking = FALSE;
pWVT->bTracking = HB_FALSE;
return DefWindowProc( hWnd, message, wParam, lParam );;
}
#endif
@@ -2277,7 +2277,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
return DefWindowProc( hWnd, message, wParam, lParam );
}
static BOOL hb_gt_wvt_IsDialogMessage( PHB_GTWVT pWVT, LPMSG lpMsg ) /* Proprietory to GTWVG */
static HB_BOOL hb_gt_wvt_IsDialogMessage( PHB_GTWVT pWVT, LPMSG lpMsg ) /* Proprietory to GTWVG */
{
int iIndex;
@@ -2286,11 +2286,11 @@ static BOOL hb_gt_wvt_IsDialogMessage( PHB_GTWVT pWVT, LPMSG lpMsg ) /* Prop
if( pWVT->hDlgModeless[ iIndex ] != 0 )
{
if( IsDialogMessage( pWVT->hDlgModeless[ iIndex ], lpMsg ) )
return TRUE;
return HB_TRUE;
}
}
return FALSE;
return HB_FALSE;
}
static WPARAM hb_gt_wvt_ProcessMessages( PHB_GTWVT pWVT )
@@ -2309,7 +2309,7 @@ static WPARAM hb_gt_wvt_ProcessMessages( PHB_GTWVT pWVT )
return msg.wParam;
}
static BOOL hb_gt_wvt_ValidWindowSize( HWND hWnd, int rows, int cols, HFONT hFont, int iWidth )
static HB_BOOL hb_gt_wvt_ValidWindowSize( HWND hWnd, int rows, int cols, HFONT hFont, int iWidth )
{
HDC hdc;
HFONT hOldFont;
@@ -2379,15 +2379,15 @@ static void hb_gt_wvt_GetBorders( HWND hWnd, int * iBorderLeft, int * iTitlebarH
*iDTHeight = wi.bottom - wi.top;
}
static HWND hb_gt_wvt_CreateWindow( PHB_GTWVT pWVT, BOOL bResizable )
static HWND hb_gt_wvt_CreateWindow( PHB_GTWVT pWVT, HB_BOOL bResizable )
{
HWND hWnd, hWndParent;
LPTSTR szAppName;
BOOL bByConf;
HB_BOOL bByConf;
szAppName = HB_TCHAR_CONVTO( hb_cmdargARGV()[ 0 ] );
bByConf = FALSE;
bByConf = HB_FALSE;
hWndParent = NULL;
if( pWVT->pPP->bConfigured )
{
@@ -2487,7 +2487,7 @@ static HWND hb_gt_wvt_CreateWindow( PHB_GTWVT pWVT, BOOL bResizable )
pWVT->pPP->y = HB_MAX( 0, iDTHeight - iHeight );
}
bByConf = TRUE;
bByConf = HB_TRUE;
}
}
}
@@ -2515,7 +2515,7 @@ static HWND hb_gt_wvt_CreateWindow( PHB_GTWVT pWVT, BOOL bResizable )
pWVT->pPP->y = pt.y;
if( pWVT->pPP->y < 0 )
pWVT->CentreWindow = TRUE;
pWVT->CentreWindow = HB_TRUE;
}
if( ! bResizable )
@@ -2540,7 +2540,7 @@ static HWND hb_gt_wvt_CreateWindow( PHB_GTWVT pWVT, BOOL bResizable )
return hWnd;
}
static BOOL hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT )
static HB_BOOL hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT )
{
if( !pWVT->hWnd )
{
@@ -2625,7 +2625,7 @@ static BOOL hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT )
hb_wvt_gtCreateToolTipWindow( pWVT );
}
}
return TRUE;
return HB_TRUE;
}
/* ********************************************************************** */
@@ -2682,10 +2682,10 @@ static void hb_gt_wvt_Exit( PHB_GT pGT )
/* ********************************************************************** */
static BOOL hb_gt_wvt_SetMode( PHB_GT pGT, int iRow, int iCol )
static HB_BOOL hb_gt_wvt_SetMode( PHB_GT pGT, int iRow, int iCol )
{
PHB_GTWVT pWVT;
BOOL fResult = FALSE;
HB_BOOL fResult = HB_FALSE;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_SetMode(%p,%d,%d)", pGT, iRow, iCol ) );
@@ -2724,15 +2724,15 @@ static BOOL hb_gt_wvt_SetMode( PHB_GT pGT, int iRow, int iCol )
/* ********************************************************************** */
static BOOL hb_gt_wvt_PutChar( PHB_GT pGT, int iRow, int iCol,
static HB_BOOL hb_gt_wvt_PutChar( PHB_GT pGT, int iRow, int iCol,
int iColor, BYTE bAttr, USHORT usChar )
{
if( HB_GTSUPER_PUTCHAR( pGT, iRow, iCol, iColor, bAttr, usChar ) )
{
HB_GTSELF_TOUCHCELL( pGT, iRow, iCol );
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
/* ********************************************************************** */
@@ -2755,7 +2755,7 @@ static int hb_gt_wvt_ReadKey( PHB_GT pGT, int iEventMask )
{
PHB_GTWVT pWVT;
int c = 0;
BOOL fKey;
HB_BOOL fKey;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_ReadKey(%p,%d)", pGT, iEventMask ) );
@@ -2784,13 +2784,13 @@ static void hb_gt_wvt_Tone( PHB_GT pGT, double dFrequency, double dDuration )
/* ********************************************************************** */
static BOOL hb_gt_wvt_mouse_IsPresent( PHB_GT pGT )
static HB_BOOL hb_gt_wvt_mouse_IsPresent( PHB_GT pGT )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_wvt_mouse_IsPresent(%p)", pGT));
HB_SYMBOL_UNUSED( pGT );
return TRUE;
return HB_TRUE;
}
static void hb_gt_wvt_mouse_GetPos( PHB_GT pGT, int * piRow, int * piCol )
@@ -2804,7 +2804,7 @@ static void hb_gt_wvt_mouse_GetPos( PHB_GT pGT, int * piRow, int * piCol )
*piCol = pWVT->MousePos.x;
}
static BOOL hb_gt_wvt_mouse_ButtonState( PHB_GT pGT, int iButton )
static HB_BOOL hb_gt_wvt_mouse_ButtonState( PHB_GT pGT, int iButton )
{
HB_TRACE( HB_TR_DEBUG, ("hb_gt_wvt_mouse_ButtonState(%p,%i)", pGT, iButton) );
@@ -2819,7 +2819,7 @@ static BOOL hb_gt_wvt_mouse_ButtonState( PHB_GT pGT, int iButton )
case 2:
return ( GetKeyState( VK_MBUTTON ) & 0x8000 ) != 0;
}
return FALSE;
return HB_FALSE;
}
static int hb_gt_wvt_mouse_CountButton( PHB_GT pGT )
@@ -2833,7 +2833,7 @@ static int hb_gt_wvt_mouse_CountButton( PHB_GT pGT )
/* ********************************************************************** */
static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
{
PHB_GTWVT pWVT;
int iVal;
@@ -2847,14 +2847,14 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
case HB_GTI_ISGRAPHIC:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
pInfo->pResult = hb_itemPutL( pInfo->pResult, HB_TRUE );
break;
case HB_GTI_ISUNICODE:
#if defined( UNICODE )
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
pInfo->pResult = hb_itemPutL( pInfo->pResult, HB_TRUE );
#else
pInfo->pResult = hb_itemPutL( pInfo->pResult, FALSE );
pInfo->pResult = hb_itemPutL( pInfo->pResult, HB_FALSE );
#endif
break;
@@ -2874,7 +2874,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
break;
case HB_GTI_SETFONT:
pInfo->pResult = hb_itemPutL( pInfo->pResult, FALSE );
pInfo->pResult = hb_itemPutL( pInfo->pResult, HB_FALSE );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_ARRAY )
{
HFONT hFont = hb_gt_wvt_GetFont( hb_arrayGetCPtr( pInfo->pNewVal, 1 ),
@@ -2887,7 +2887,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
{
if( hb_gt_wvt_ValidWindowSize( pWVT->hWnd, pWVT->ROWS, pWVT->COLS, hFont, hb_arrayGetNI( pInfo->pNewVal, 3 ) ) )
{
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
pInfo->pResult = hb_itemPutL( pInfo->pResult, HB_TRUE );
hb_strncpy( pWVT->fontFace, hb_arrayGetCPtr( pInfo->pNewVal, 1 ), sizeof( pWVT->fontFace ) - 1 );
pWVT->fontHeight = hb_arrayGetNI( pInfo->pNewVal, 2 );
@@ -3252,8 +3252,8 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
if( iY > 0 )
{
BOOL bOldCentre = pWVT->CentreWindow;
pWVT->CentreWindow = pWVT->bMaximized ? TRUE : FALSE;
HB_BOOL bOldCentre = pWVT->CentreWindow;
pWVT->CentreWindow = pWVT->bMaximized ? HB_TRUE : HB_FALSE;
HB_GTSELF_SETMODE( pGT, ( iY / pWVT->PTEXTSIZE.y ), ( iX / pWVT->PTEXTSIZE.x ) );
pWVT->CentreWindow = bOldCentre;
}
@@ -3285,7 +3285,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pInfo->pResult = hb_itemPutL( pInfo->pResult, pWVT->bResizable );
if( pInfo->pNewVal )
{
BOOL bNewValue = hb_itemGetL( pInfo->pNewVal );
HB_BOOL bNewValue = hb_itemGetL( pInfo->pNewVal );
if( bNewValue != pWVT->bResizable )
{
pWVT->bResizable = bNewValue;
@@ -3327,7 +3327,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
if( pWVT->pszSelectCopy )
hb_xfree( pWVT->pszSelectCopy );
pWVT->pszSelectCopy = hb_strdup( hb_itemGetCPtr( pInfo->pNewVal ) );
pWVT->bSelectCopy = TRUE;
pWVT->bSelectCopy = HB_TRUE;
#if !defined( HB_OS_WIN_CE ) /* WinCE does not support ModifyMenu */
if( hSysMenu )
@@ -3343,7 +3343,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
else if( pInfo->pNewVal )
{
BOOL bNewValue = hb_itemGetL( pInfo->pNewVal );
HB_BOOL bNewValue = hb_itemGetL( pInfo->pNewVal );
if( bNewValue != pWVT->bSelectCopy )
{
if( pWVT->hWnd )
@@ -3365,7 +3365,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pInfo->pResult = hb_itemPutL( pInfo->pResult, pWVT->bClosable );
if( pInfo->pNewVal )
{
BOOL bNewValue = hb_itemGetL( pInfo->pNewVal );
HB_BOOL bNewValue = hb_itemGetL( pInfo->pNewVal );
if( bNewValue != pWVT->bClosable )
{
if( pWVT->hWnd )
@@ -3731,8 +3731,8 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
/* Flag that caller configured itself */
pWVT->pPP->bConfigured = TRUE;
pWVT->CentreWindow = FALSE;
pWVT->pPP->bConfigured = HB_TRUE;
pWVT->CentreWindow = HB_FALSE;
}
}
}
@@ -3783,7 +3783,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
{
if( pWVT->bSelectCopy )
{
pWVT->bBeginMarked = TRUE;
pWVT->bBeginMarked = HB_TRUE;
}
break;
}
@@ -3796,7 +3796,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
return HB_GTSUPER_INFO( pGT, iType, pInfo );
}
return TRUE;
return HB_TRUE;
}
/* ********************************************************************** */
@@ -3987,7 +3987,7 @@ static void hb_gt_wvt_Redraw( PHB_GT pGT, int iRow, int iCol, int iSize )
InvalidateRect( pWVT->hWnd, &rect, FALSE );
}
else
pWVT->fInit = TRUE;
pWVT->fInit = HB_TRUE;
}
}
@@ -4018,7 +4018,7 @@ static void hb_gt_wvt_Refresh( PHB_GT pGT )
{
if( !pWVT->fInit )
{
pWVT->fInit = TRUE;
pWVT->fInit = HB_TRUE;
hb_gt_wvt_ShowWindow( pWVT );
}
SendNotifyMessage( pWVT->hWnd, WM_MY_UPDATE_CARET, 0, 0 );
@@ -4030,7 +4030,7 @@ static void hb_gt_wvt_Refresh( PHB_GT pGT )
/* ********************************************************************** */
static BOOL hb_gt_wvt_SetDispCP( PHB_GT pGT, const char * pszTermCDP, const char * pszHostCDP, BOOL fBox )
static HB_BOOL hb_gt_wvt_SetDispCP( PHB_GT pGT, const char * pszTermCDP, const char * pszHostCDP, HB_BOOL fBox )
{
HB_GTSUPER_SETDISPCP( pGT, pszTermCDP, pszHostCDP, fBox );
@@ -4072,15 +4072,15 @@ static BOOL hb_gt_wvt_SetDispCP( PHB_GT pGT, const char * pszTermCDP, const char
for( i = 0; i < 256; i++ )
{
pWVT->chrTransTbl[ i ] = ( BYTE )
hb_cdpTranslateChar( i, TRUE, cdpHost, cdpTerm );
hb_cdpTranslateChar( i, HB_TRUE, cdpHost, cdpTerm );
}
}
# endif
return TRUE;
return HB_TRUE;
}
static BOOL hb_gt_wvt_SetKeyCP( PHB_GT pGT, const char * pszTermCDP, const char * pszHostCDP )
static HB_BOOL hb_gt_wvt_SetKeyCP( PHB_GT pGT, const char * pszTermCDP, const char * pszHostCDP )
{
HB_GTSUPER_SETKEYCP( pGT, pszTermCDP, pszHostCDP );
@@ -4116,18 +4116,18 @@ static BOOL hb_gt_wvt_SetKeyCP( PHB_GT pGT, const char * pszTermCDP, const char
for( i = 0; i < 256; i++ )
pWVT->keyTransTbl[ i ] = ( BYTE )
hb_cdpTranslateChar( i, FALSE, cdpTerm, cdpHost );
hb_cdpTranslateChar( i, HB_FALSE, cdpTerm, cdpHost );
pWVT->inCDP = cdpTerm;
}
# endif
return TRUE;
return HB_TRUE;
}
/* ********************************************************************** */
static BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
static HB_BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_FuncInit(%p)", pFuncTable));
@@ -4153,7 +4153,7 @@ static BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
pFuncTable->GfxPrimitive = hb_gt_wvt_gfx_Primitive;
return TRUE;
return HB_TRUE;
}
/* ********************************************************************** */
@@ -4286,8 +4286,8 @@ static void hb_wvt_gtCreateObjects( PHB_GTWVT pWVT )
{
int iIndex;
pWVT->bDeferPaint = FALSE;
pWVT->bTracking = FALSE;
pWVT->bDeferPaint = HB_FALSE;
pWVT->bTracking = HB_FALSE;
pWVT->currentPen = CreatePen( PS_SOLID, 0, ( COLORREF ) RGB( 0, 0, 0 ) );
@@ -4306,8 +4306,8 @@ static void hb_wvt_gtCreateObjects( PHB_GTWVT pWVT )
pWVT->LastMenuEvent = 0;
pWVT->MenuKeyEvent = 1024;
pWVT->InvalidateWindow = TRUE;
pWVT->EnableShortCuts = FALSE;
pWVT->InvalidateWindow = HB_TRUE;
pWVT->EnableShortCuts = HB_FALSE;
pWVT->pSymWVT_PAINT = hb_dynsymFind( "WVT_PAINT" );
pWVT->pSymWVT_SETFOCUS = hb_dynsymFind( "WVT_SETFOCUS" );
pWVT->pSymWVT_KILLFOCUS = hb_dynsymFind( "WVT_KILLFOCUS" );
@@ -4318,7 +4318,7 @@ static void hb_wvt_gtCreateObjects( PHB_GTWVT pWVT )
pWVT->rowStop = 0;
pWVT->colStart = 0;
pWVT->colStop = 0;
pWVT->bToolTipActive = FALSE;
pWVT->bToolTipActive = HB_FALSE;
pWVT->iFactor = 255;
for( iIndex = 0; iIndex < WVT_DLGML_MAX; iIndex++ )
@@ -4334,12 +4334,12 @@ static void hb_wvt_gtCreateObjects( PHB_GTWVT pWVT )
pWVT->iTypeModal[ iIndex ] = 0;
}
pWVT->bGui = FALSE;
pWVT->bGui = HB_FALSE;
pWVT->bPaint = FALSE;
pWVT->bGetFocus = FALSE;
pWVT->bSetFocus = FALSE;
pWVT->bKillFocus = FALSE;
pWVT->bPaint = HB_FALSE;
pWVT->bGetFocus = HB_FALSE;
pWVT->bSetFocus = HB_FALSE;
pWVT->bKillFocus = HB_FALSE;
}
static void hb_wvt_gtExitGui( PHB_GTWVT pWVT )

80
harbour/contrib/gtwvg/gtwvg.h
View File

@@ -284,10 +284,10 @@ typedef struct _tag_GOBJS
#if ! defined( HB_OS_WIN_CE )
IPicture * iPicture ;
#endif
BOOL bDestroyFont ;
BOOL bDestroyPen ;
BOOL bDestroyBrush ;
BOOL bDestroyPicture ;
HB_BOOL bDestroyFont ;
HB_BOOL bDestroyPen ;
HB_BOOL bDestroyBrush ;
HB_BOOL bDestroyPicture ;
TRIVERTEX vert[ 2 ] ;
LPTSTR lpText ;
PHB_ITEM bBlock ;
@@ -304,9 +304,9 @@ typedef struct
int width;
int height;
PHB_ITEM pParentGT;
BOOL bVisible;
BOOL bRowCols;
BOOL bConfigured;
HB_BOOL bVisible;
HB_BOOL bRowCols;
HB_BOOL bConfigured;
int iWndType;
} HB_GT_PARAMS, * PHB_GT_PARAMS;
@@ -346,13 +346,13 @@ typedef struct
COLORREF COLORS[ 16 ]; /* colors */
BOOL CaretExist; /* TRUE if a caret has been created */
BOOL CaretHidden; /* TRUE if a caret has been hiden */
HB_BOOL CaretExist; /* TRUE if a caret has been created */
HB_BOOL CaretHidden; /* TRUE if a caret has been hiden */
int CaretSize; /* Height of solid caret */
int CaretWidth; /* Width of solid caret */
POINT MousePos; /* the last mouse position */
BOOL MouseMove; /* Flag to say whether to return mouse movement events */
HB_BOOL MouseMove; /* Flag to say whether to return mouse movement events */
int Keys[ WVT_CHAR_QUEUE_SIZE ]; /* Array to hold the characters & events */
int keyPointerIn; /* Offset into key array for character to be placed */
@@ -360,7 +360,7 @@ typedef struct
int keyLast; /* last inkey code value in buffer */
POINT PTEXTSIZE; /* size of the fixed width font */
BOOL FixedFont; /* TRUE if current font is a fixed font */
HB_BOOL FixedFont; /* TRUE if current font is a fixed font */
int FixedSize[ WVT_MAX_COLS ]; /* buffer for ExtTextOut() to emulate fixed pitch when Proportional font selected */
int fontHeight; /* requested font height */
int fontWidth; /* requested font width */
@@ -373,7 +373,7 @@ typedef struct
#endif
HWND hWnd; /* the window handle */
BOOL fInit; /* logical variable indicating that window should be open */
HB_BOOL fInit; /* logical variable indicating that window should be open */
PHB_CODEPAGE hostCDP; /* Host/HVM CodePage for unicode output translations */
PHB_CODEPAGE inCDP; /* Host/HVM CodePage for unicode input translations */
@@ -387,26 +387,26 @@ typedef struct
#endif
HICON hIcon; /* Title Bar and Task List icon. Can be NULL. */
BOOL bIconToFree; /* Do we need to free this icon when it's not NULL? */
HB_BOOL bIconToFree; /* Do we need to free this icon when it's not NULL? */
int CodePage; /* Code page to use for display characters */
#if ! defined( UNICODE )
int boxCodePage; /* Code page to use for display draw line characters */
#endif
BOOL Win9X; /* Flag to say if running on Win9X not NT/2000/XP */
BOOL AltF4Close; /* Can use Alt+F4 to close application */
BOOL CentreWindow; /* True if window is to be Reset into centre of window */
HB_BOOL Win9X; /* Flag to say if running on Win9X not NT/2000/XP */
HB_BOOL AltF4Close; /* Can use Alt+F4 to close application */
HB_BOOL CentreWindow; /* True if window is to be Reset into centre of window */
BOOL IgnoreWM_SYSCHAR;
HB_BOOL IgnoreWM_SYSCHAR;
BOOL bMaximized; /* Flag is set when window has been maximized */
BOOL bBeingMarked; /* Flag to control DOS window like copy operation */
BOOL bBeginMarked;
HB_BOOL bMaximized; /* Flag is set when window has been maximized */
HB_BOOL bBeingMarked; /* Flag to control DOS window like copy operation */
HB_BOOL bBeginMarked;
BOOL bResizable;
BOOL bSelectCopy;
HB_BOOL bResizable;
HB_BOOL bSelectCopy;
char * pszSelectCopy;
BOOL bClosable;
HB_BOOL bClosable;
int ResizeMode; /* Sets the resizing mode either to FONT or ROWS */
RECT sRectNew;
@@ -425,19 +425,19 @@ typedef struct
int LastMenuEvent; /* Last menu item selected */
int MenuKeyEvent; /* User definable event number for windows menu command */
BOOL InvalidateWindow; /* Flag for controlling whether to use ScrollWindowEx() */
BOOL EnableShortCuts; /* Determines whether ALT key enables menu or system menu */
HB_BOOL InvalidateWindow; /* Flag for controlling whether to use ScrollWindowEx() */
HB_BOOL EnableShortCuts; /* Determines whether ALT key enables menu or system menu */
BOOL bGui;
HB_BOOL bGui;
HDC hGuiDC;
HBITMAP hGuiBmp;
int iGuiWidth;
int iGuiHeight;
BOOL bPaint;
BOOL bGetFocus;
BOOL bSetFocus;
BOOL bKillFocus;
HB_BOOL bPaint;
HB_BOOL bGetFocus;
HB_BOOL bSetFocus;
HB_BOOL bKillFocus;
PHB_DYNS pSymWVT_PAINT; /* Stores pointer to WVT_PAINT function */
PHB_DYNS pSymWVT_SETFOCUS; /* Stores pointer to WVT_SETFOCUS function */
@@ -454,7 +454,7 @@ typedef struct
HMENU hPopup; /* Handle of context menu invokable with right click */
HWND hWndTT; /* Handle to hold tooltip information */
BOOL bToolTipActive; /* Flag to set whether tooltip is active or not */
HB_BOOL bToolTipActive; /* Flag to set whether tooltip is active or not */
HWND hDlgModeless[ WVT_DLGML_MAX ]; /* Handle to a modeless dialog */
PHB_ITEM pFunc[ WVT_DLGML_MAX ]; /* Function pointer for WndProc */
@@ -469,10 +469,10 @@ typedef struct
PHB_GT_PARAMS pPP; /* Presentation Parameters */
BOOL bDeferPaint; /* To create pure Windows dialogs */
BOOL bTracking; /* To track if mouse has eneter or left the window area */
HB_BOOL bDeferPaint; /* To create pure Windows dialogs */
HB_BOOL bTracking; /* To track if mouse has eneter or left the window area */
BOOL bResizing; /* To know when it is in resizing mode */
HB_BOOL bResizing; /* To know when it is in resizing mode */
PHB_GOBJS gObjs; /* Graphic Objects */
@@ -598,10 +598,10 @@ POINT HB_EXPORT hb_wvt_gtGetXYFromColRow( int col, int row );
#if ! defined( HB_OS_WIN_CE )
IPicture HB_EXPORT * hb_wvt_gtLoadPicture( const char * image );
IPicture HB_EXPORT * hb_wvt_gtLoadPictureFromResource( LPCSTR cResource, LPCSTR cSection );
BOOL HB_EXPORT hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPicture );
BOOL HB_EXPORT hb_wvt_gtDestroyPicture( IPicture * iPicture );
HB_BOOL HB_EXPORT hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPicture );
HB_BOOL HB_EXPORT hb_wvt_gtDestroyPicture( IPicture * iPicture );
#endif
BOOL HB_EXPORT hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, const char * image );
HB_BOOL HB_EXPORT hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, const char * image );
void HB_EXPORT hb_wvt_GetStringAttrib( int top, int left, int bottom, int right, BYTE * sBuffer, BYTE * sAttrib );
void HB_EXPORT hb_wvt_PutStringAttrib( int top, int left, int bottom, int right, BYTE * sBuffer, BYTE * sAttrib );
@@ -621,11 +621,11 @@ void HB_EXPORT hb_gt_wvt_PaintGObjects( PHB_GTWVT pWVT, RECT *uRect );
/*----------------------------------------------------------------------*/
extern BOOL wvt_Array2Rect(PHB_ITEM aRect, RECT *rc );
extern HB_BOOL wvt_Array2Rect(PHB_ITEM aRect, RECT *rc );
extern PHB_ITEM wvt_Rect2Array( RECT *rc );
extern BOOL wvt_Array2Point(PHB_ITEM aPoint, POINT *pt );
extern HB_BOOL wvt_Array2Point(PHB_ITEM aPoint, POINT *pt );
extern PHB_ITEM wvt_Point2Array( POINT *pt );
extern BOOL wvt_Array2Size(PHB_ITEM aSize, SIZE *siz );
extern HB_BOOL wvt_Array2Size(PHB_ITEM aSize, SIZE *siz );
extern PHB_ITEM wvt_Size2Array( SIZE *siz );
extern void wvt_Rect2ArrayEx( RECT *rc ,PHB_ITEM aRect );
extern void wvt_Point2ArrayEx( POINT *pt , PHB_ITEM aPoint);

34
harbour/contrib/gtwvg/wvgcore.c
View File

@@ -229,7 +229,7 @@ IPicture * hb_wvt_gtLoadPicture( const char * cImage )
/*----------------------------------------------------------------------*/
BOOL hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPicture )
HB_BOOL hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPicture )
{
PHB_GTWVT _s = hb_wvt_gtGetWVT();
@@ -243,7 +243,7 @@ BOOL hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPicture
int toc = 0;
HRGN hrgn1;
POINT lpp;
BOOL bResult = FALSE;
HB_BOOL bResult = FALSE;
if( iPicture )
{
@@ -325,9 +325,9 @@ BOOL hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPicture
/*----------------------------------------------------------------------*/
BOOL hb_wvt_gtDestroyPicture( IPicture * iPicture )
HB_BOOL hb_wvt_gtDestroyPicture( IPicture * iPicture )
{
BOOL bResult = FALSE;
HB_BOOL bResult = FALSE;
if( iPicture )
{
@@ -585,7 +585,7 @@ BOOL CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPA
/*----------------------------------------------------------------------*/
BOOL hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, const char * image )
HB_BOOL hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, const char * image )
{
#if ! defined( HB_OS_WIN_CE )
HGLOBAL hGlobal;
@@ -602,7 +602,7 @@ BOOL hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, const char * ima
int toc = 0 ;
HRGN hrgn1;
POINT lpp = { 0,0 };
BOOL bResult = FALSE;
HB_BOOL bResult = FALSE;
LPTSTR lpImage = HB_TCHAR_CONVTO( image );
hFile = CreateFile( lpImage, GENERIC_READ, 0, NULL, OPEN_EXISTING,
@@ -1810,8 +1810,8 @@ HB_FUNC( WVT_DRAWBUTTON )
LOGBRUSH lb = { 0,0,0 };
HBRUSH hBrush;
BOOL bText = HB_ISCHAR( 5 );
BOOL bImage = ( HB_ISNUM( 6 ) || HB_ISCHAR( 6 ) );
HB_BOOL bText = HB_ISCHAR( 5 );
HB_BOOL bImage = ( HB_ISNUM( 6 ) || HB_ISCHAR( 6 ) );
int iFormat = hb_parni( 7 );
COLORREF textColor = !HB_ISNUM( 8 ) ? _s->COLORS[ 0 ] : ( COLORREF ) hb_parnl( 8 ) ;
COLORREF bkColor = !HB_ISNUM( 9 ) ? _s->COLORS[ 7 ] : ( COLORREF ) hb_parnl( 9 ) ;
@@ -2519,7 +2519,7 @@ HB_FUNC( WVT_DRAWSCROLLBUTTON )
POINT * Point;
POINT xy = { 0,0 };
int iHeight, iOff;
BOOL bDepressed = hb_parl( 7 ) ;
HB_BOOL bDepressed = hb_parl( 7 ) ;
Point = ( POINT * ) hb_xgrab( 3 * sizeof( POINT ) );
iOff = 6;
@@ -2733,7 +2733,7 @@ HB_FUNC( WVT_DRAWSHADEDRECT )
{
PHB_GTWVT _s = hb_wvt_gtGetWVT();
BOOL bGF = FALSE;
HB_BOOL bGF = FALSE;
if ( _s->pGUI->hMSImg32 )
{
@@ -2764,11 +2764,11 @@ HB_FUNC( WVT_DRAWSHADEDRECT )
gRect.UpperLeft = 0;
gRect.LowerRight= 1;
bGF = ( BOOL ) _s->pGUI->pfnGF( _s->hdc, vert, 2, &gRect, 1, iMode );
bGF = ( HB_BOOL ) _s->pGUI->pfnGF( _s->hdc, vert, 2, &gRect, 1, iMode );
#if defined( __SETGUI__ )
if ( _s->bGui )
{
bGF = ( BOOL ) _s->pGUI->pfnGF( _s->hGuiDC, vert, 2, &gRect, 1, iMode );
bGF = ( HB_BOOL ) _s->pGUI->pfnGF( _s->hGuiDC, vert, 2, &gRect, 1, iMode );
}
#endif
}
@@ -2855,7 +2855,7 @@ HB_FUNC( WVT_DRAWPROGRESSBAR )
int iBottom = ( _s->PTEXTSIZE.y * ( hb_parni( 3 ) + 1 ) ) - 1 + hb_parvni( 5,3 );
int iRight = ( _s->PTEXTSIZE.x * ( hb_parni( 4 ) + 1 ) ) - 1 + hb_parvni( 5,4 );
int iPercent, iBarUpto, iDirection;
BOOL bVertical, bImage;
HB_BOOL bVertical, bImage;
COLORREF crBarColor;
HBRUSH hBrush;
LOGBRUSH lb = { 0,0,0 };
@@ -2977,7 +2977,7 @@ HB_FUNC( WVT_CREATEFONT )
*/
HB_FUNC( WVT_LOADPICTURE )
{
BOOL bResult = FALSE;
HB_BOOL bResult = FALSE;
#if ! defined( HB_OS_WIN_CE )
PHB_GTWVT _s = hb_wvt_gtGetWVT();
@@ -3002,7 +3002,7 @@ HB_FUNC( WVT_LOADPICTURE )
HB_FUNC( WVT_LOADPICTUREFROMRESOURCE )
{
BOOL bResult = FALSE;
HB_BOOL bResult = FALSE;
#if ! defined( HB_OS_WIN_CE )
PHB_GTWVT _s = hb_wvt_gtGetWVT();
@@ -3151,8 +3151,8 @@ HB_FUNC( WVT_RESTSCREEN )
HBITMAP hBmp;
HDC hCompDC;
BOOL bResult = FALSE;
BOOL bDoNotDestroyBMP = hb_parl( 6 );
HB_BOOL bResult = FALSE;
HB_BOOL bDoNotDestroyBMP = hb_parl( 6 );
xy = hb_wvt_gtGetXYFromColRow( hb_parni( 2 ), hb_parni( 1 ) );;
iTop = xy.y;

6
harbour/contrib/gtwvg/wvgcuig.c
View File

@@ -207,7 +207,7 @@ HB_FUNC( WVG_SETGOBJDATA )
{
PHB_GTWVT pWVT = hb_wvt_gtGetWVT();
int iHandle = hb_parni( 1 );
BOOL bSuccess = FALSE;
HB_BOOL bSuccess = FALSE;
if( iHandle )
{
@@ -1182,7 +1182,7 @@ HB_FUNC( WVG_SHADEDRECT )
/*----------------------------------------------------------------------*/
static void hb_wvg_ShadedRect( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iTop, int iRight, int iBottom )
{
BOOL bGF;
HB_BOOL bGF;
GRADIENT_RECT gRect = { 0,0 };
gRect.UpperLeft = 0;
@@ -1194,7 +1194,7 @@ static void hb_wvg_ShadedRect( PHB_GTWVT pWVT, PHB_GOBJS gObj, int iLeft, int iT
gObj->vert[ 1 ].x = iRight;
gObj->vert[ 1 ].y = iBottom;
bGF = ( BOOL ) pWVT->pGUI->pfnGF( pWVT->hGuiDC, gObj->vert, 2, &gRect, 1, gObj->iData );
bGF = ( HB_BOOL ) pWVT->pGUI->pfnGF( pWVT->hGuiDC, gObj->vert, 2, &gRect, 1, gObj->iData );
HB_SYMBOL_UNUSED( bGF );
}

30
harbour/contrib/gtwvg/wvggui.c
View File

@@ -179,9 +179,9 @@ static PHB_GTWVT hb_gt_wvt_Find( HWND hWnd )
return pWVT;
}
static BOOL hb_gt_wvt_Alloc( PHB_GTWVT pWVT )
static HB_BOOL hb_gt_wvt_Alloc( PHB_GTWVT pWVT )
{
BOOL fOK = FALSE;
HB_BOOL fOK = FALSE;
WVGDEBUG( ( "wvggui:hb_gt_wvt_Alloc()" ) );
@@ -397,7 +397,7 @@ static void hb_gt_wvt_AddCharToInputQueue( PHB_GTWVT pWVT, int iKey )
#endif
}
static BOOL hb_gt_wvt_GetCharFromInputQueue( PHB_GTWVT pWVT, int * iKey )
static HB_BOOL hb_gt_wvt_GetCharFromInputQueue( PHB_GTWVT pWVT, int * iKey )
{
#if 0
WVGDEBUG( ( "wvggui:hb_gt_wvt_GetCharFromInputQueue()" ) );
@@ -494,7 +494,7 @@ static void hb_gt_wvt_SetWindowTitle( HWND hWnd, const char * title )
HB_TCHAR_FREE( text );
}
static BOOL hb_gt_wvt_GetWindowTitle( HWND hWnd, char ** title )
static HB_BOOL hb_gt_wvt_GetWindowTitle( HWND hWnd, char ** title )
{
TCHAR buffer[WVT_MAX_TITLE_SIZE];
int iResult;
@@ -632,7 +632,7 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L
}
}
static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPARAM lParam )
static HB_BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPARAM lParam )
{
WVGDEBUG( ( "wvggui:hb_gt_wvt_KeyEvent()" ) );
@@ -641,7 +641,7 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA
case WM_KEYDOWN:
case WM_SYSKEYDOWN:
{
BOOL bAlt = GetKeyState( VK_MENU ) & 0x8000;
HB_BOOL bAlt = GetKeyState( VK_MENU ) & 0x8000;
pWVT->IgnoreWM_SYSCHAR = FALSE;
@@ -720,8 +720,8 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA
break;
default:
{
BOOL bCtrl = GetKeyState( VK_CONTROL ) & 0x8000;
BOOL bShift = GetKeyState( VK_SHIFT ) & 0x8000;
HB_BOOL bCtrl = GetKeyState( VK_CONTROL ) & 0x8000;
HB_BOOL bShift = GetKeyState( VK_SHIFT ) & 0x8000;
int iScanCode = HIWORD( lParam ) & 0xFF;
if( bCtrl && iScanCode == 76 ) /* CTRL_VK_NUMPAD5 */
@@ -782,7 +782,7 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA
case WM_CHAR:
{
BOOL bCtrl = GetKeyState( VK_CONTROL ) & 0x8000;
HB_BOOL bCtrl = GetKeyState( VK_CONTROL ) & 0x8000;
int iScanCode = HIWORD( lParam ) & 0xFF;
int c = ( int ) wParam;
@@ -1307,7 +1307,7 @@ static HWND hb_gt_wvt_CreateWindow( PHB_GTWVT pWVT )
return hWnd;
}
static BOOL hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT )
static HB_BOOL hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT )
{
WVGDEBUG( ( "wvggui:hb_gt_wvt_CreateConsoleWindow()" ) );
@@ -1401,7 +1401,7 @@ static int hb_gt_wvt_ReadKey( PHB_GT pGT, int iEventMask )
{
PHB_GTWVT pWVT;
int c = 0;
BOOL fKey;
HB_BOOL fKey;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_ReadKey(%p,%d)", pGT, iEventMask ) );
#if 0
@@ -1433,7 +1433,7 @@ static void hb_gt_wvt_Tone( PHB_GT pGT, double dFrequency, double dDuration )
/* ********************************************************************** */
static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
{
PHB_GTWVT pWVT;
int iVal;
@@ -1797,7 +1797,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pInfo->pResult = hb_itemPutL( pInfo->pResult, pWVT->bResizable );
if( pInfo->pNewVal )
{
BOOL bNewValue = hb_itemGetL( pInfo->pNewVal );
HB_BOOL bNewValue = hb_itemGetL( pInfo->pNewVal );
if( bNewValue != pWVT->bResizable )
{
pWVT->bResizable = bNewValue;
@@ -1835,7 +1835,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pInfo->pResult = hb_itemPutL( pInfo->pResult, pWVT->bClosable );
if( pInfo->pNewVal )
{
BOOL bNewValue = hb_itemGetL( pInfo->pNewVal );
HB_BOOL bNewValue = hb_itemGetL( pInfo->pNewVal );
if( bNewValue != pWVT->bClosable )
{
if( pWVT->hWnd )
@@ -2237,7 +2237,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
/* ********************************************************************** */
static BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
static HB_BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
{
HB_TRACE(HB_TR_DEBUG, ("hb_gt_FuncInit(%p)", pFuncTable));
WVGDEBUG( ( "wvggui:hb_gt_FuncInit() " ) );

46
harbour/contrib/gtwvg/wvggui.h
View File

@@ -251,9 +251,9 @@ typedef struct
int width;
int height;
PHB_ITEM pParentGT;
BOOL bVisible;
BOOL bRowCols;
BOOL bConfigured;
HB_BOOL bVisible;
HB_BOOL bRowCols;
HB_BOOL bConfigured;
int iWndType;
} HB_GT_PARAMS, * PHB_GT_PARAMS;
@@ -269,7 +269,7 @@ typedef struct
USHORT COLS; /* number of displayable columns in window */
POINT MousePos; /* the last mouse position */
BOOL MouseMove; /* Flag to say whether to return mouse movement events */
HB_BOOL MouseMove; /* Flag to say whether to return mouse movement events */
int Keys[ WVT_CHAR_QUEUE_SIZE ]; /* Array to hold the characters & events */
int keyPointerIn; /* Offset into key array for character to be placed */
@@ -277,7 +277,7 @@ typedef struct
int keyLast; /* last inkey code value in buffer */
POINT PTEXTSIZE; /* size of the fixed width font */
BOOL FixedFont; /* TRUE if current font is a fixed font */
HB_BOOL FixedFont; /* TRUE if current font is a fixed font */
int FixedSize[ WVT_MAX_COLS ]; /* buffer for ExtTextOut() to emulate fixed pitch when Proportional font selected */
int fontHeight; /* requested font height */
int fontWidth; /* requested font width */
@@ -287,7 +287,7 @@ typedef struct
HFONT hFont; /* current font handle */
HWND hWnd; /* the window handle */
BOOL fInit; /* logical variable indicating that window should be open */
HB_BOOL fInit; /* logical variable indicating that window should be open */
PHB_CODEPAGE hostCDP; /* Host/HVM CodePage for unicode output translations */
PHB_CODEPAGE inCDP; /* Host/HVM CodePage for unicode input translations */
@@ -297,16 +297,16 @@ typedef struct
#endif
HICON hIcon; /* Title Bar and Task List icon. Can be NULL. */
BOOL bIconToFree; /* Do we need to free this icon when it's not NULL? */
HB_BOOL bIconToFree; /* Do we need to free this icon when it's not NULL? */
int CodePage; /* Code page to use for display characters */
BOOL Win9X; /* Flag to say if running on Win9X not NT/2000/XP */
BOOL CentreWindow; /* True if window is to be Reset into centre of window */
HB_BOOL Win9X; /* Flag to say if running on Win9X not NT/2000/XP */
HB_BOOL CentreWindow; /* True if window is to be Reset into centre of window */
BOOL IgnoreWM_SYSCHAR;
HB_BOOL IgnoreWM_SYSCHAR;
BOOL bResizable;
BOOL bClosable;
HB_BOOL bResizable;
HB_BOOL bClosable;
/* To Be Split in 2 Structures <1 GUI dynamic> <2 GUI fixed> */
@@ -319,13 +319,13 @@ typedef struct
int LastMenuEvent; /* Last menu item selected */
int MenuKeyEvent; /* User definable event number for windows menu command */
BOOL InvalidateWindow; /* Flag for controlling whether to use ScrollWindowEx() */
BOOL EnableShortCuts; /* Determines whether ALT key enables menu or system menu */
HB_BOOL InvalidateWindow; /* Flag for controlling whether to use ScrollWindowEx() */
HB_BOOL EnableShortCuts; /* Determines whether ALT key enables menu or system menu */
BOOL bPaint;
BOOL bGetFocus;
BOOL bSetFocus;
BOOL bKillFocus;
HB_BOOL bPaint;
HB_BOOL bGetFocus;
HB_BOOL bSetFocus;
HB_BOOL bKillFocus;
HINSTANCE hMSImg32; /* Handle to the loaded library msimg32.dll */
wvtGradientFill pfnGF; /* Pointer to Address of the GradientFill function in MSImg32.dll*/
@@ -334,8 +334,8 @@ typedef struct
PHB_GT_PARAMS pPP; /* Presentation Parameters */
BOOL bTracking; /* To track if mouse has eneter or left the window area */
BOOL bResizing; /* To know when it is in resizing mode */
HB_BOOL bTracking; /* To track if mouse has eneter or left the window area */
HB_BOOL bResizing; /* To know when it is in resizing mode */
int width;
int height;
@@ -431,11 +431,11 @@ typedef struct _tag_HB_GT_COLDEF
void HB_EXPORT hb_ToOutDebug( const char * sTraceMsg, ... );
/*----------------------------------------------------------------------*/
#if 0
extern BOOL wvt_Array2Rect(PHB_ITEM aRect, RECT *rc );
extern HB_BOOL wvt_Array2Rect(PHB_ITEM aRect, RECT *rc );
extern PHB_ITEM wvt_Rect2Array( RECT *rc );
extern BOOL wvt_Array2Point(PHB_ITEM aPoint, POINT *pt );
extern HB_BOOL wvt_Array2Point(PHB_ITEM aPoint, POINT *pt );
extern PHB_ITEM wvt_Point2Array( POINT *pt );
extern BOOL wvt_Array2Size(PHB_ITEM aSize, SIZE *siz );
extern HB_BOOL wvt_Array2Size(PHB_ITEM aSize, SIZE *siz );
extern PHB_ITEM wvt_Size2Array( SIZE *siz );
extern void wvt_Rect2ArrayEx( RECT *rc ,PHB_ITEM aRect );
extern void wvt_Point2ArrayEx( POINT *pt , PHB_ITEM aPoint);

20
harbour/contrib/gtwvg/wvgutils.c
View File

@@ -89,11 +89,11 @@ BOOL WINAPI ChooseColor( LPCHOOSECOLORW );
#if 0
HB_EXTERN_BEGIN
extern BOOL wvt_Array2Rect(PHB_ITEM aRect, RECT *rc );
extern HB_BOOL wvt_Array2Rect(PHB_ITEM aRect, RECT *rc );
extern PHB_ITEM wvt_Rect2Array( RECT *rc );
extern BOOL wvt_Array2Point(PHB_ITEM aPoint, POINT *pt );
extern HB_BOOL wvt_Array2Point(PHB_ITEM aPoint, POINT *pt );
extern PHB_ITEM wvt_Point2Array( POINT *pt );
extern BOOL wvt_Array2Size(PHB_ITEM aSize, SIZE *siz );
extern HB_BOOL wvt_Array2Size(PHB_ITEM aSize, SIZE *siz );
extern PHB_ITEM wvt_Size2Array( SIZE *siz );
extern void wvt_Rect2ArrayEx( RECT *rc ,PHB_ITEM aRect );
extern void wvt_Point2ArrayEx( POINT *pt , PHB_ITEM aPoint);
@@ -269,7 +269,7 @@ HB_FUNC( WVT_SETTOOLTIPACTIVE )
{
PHB_GTWVT _s = hb_wvt_gtGetWVT();
BOOL bActive = _s->bToolTipActive;
HB_BOOL bActive = _s->bToolTipActive;
if ( HB_ISLOG( 1 ) )
{
@@ -480,7 +480,7 @@ HB_FUNC( WVT_SETGUI )
{
PHB_GTWVT _s = hb_wvt_gtGetWVT();
BOOL bGui = _s->bGui;
HB_BOOL bGui = _s->bGui;
if ( HB_ISLOG( 1 ) )
{
@@ -620,7 +620,7 @@ HB_FUNC( WVT_SETMOUSEMOVE )
{
PHB_GTWVT _s = hb_wvt_gtGetWVT();
BOOL bMouseMove = _s->MouseMove;
HB_BOOL bMouseMove = _s->MouseMove;
if( HB_ISLOG( 1 ) )
_s->MouseMove = hb_parl( 1 );
@@ -810,7 +810,7 @@ HB_FUNC( WVT_ENABLESHORTCUTS )
{
PHB_GTWVT _s = hb_wvt_gtGetWVT();
BOOL bWas = _s->EnableShortCuts;
HB_BOOL bWas = _s->EnableShortCuts;
if( HB_ISLOG( 1 ) )
_s->EnableShortCuts = hb_parl( 1 );
@@ -1382,7 +1382,7 @@ HB_FUNC( WVT_GETFONTHANDLE )
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
BOOL wvt_Array2Rect(PHB_ITEM aRect, RECT *rc )
HB_BOOL wvt_Array2Rect(PHB_ITEM aRect, RECT *rc )
{
if (HB_IS_ARRAY(aRect) && hb_arrayLen(aRect) == 4) {
rc->left = hb_arrayGetNL(aRect,1);
@@ -1410,7 +1410,7 @@ PHB_ITEM wvt_Rect2Array( RECT *rc )
/*----------------------------------------------------------------------*/
BOOL wvt_Array2Point(PHB_ITEM aPoint, POINT *pt )
HB_BOOL wvt_Array2Point(PHB_ITEM aPoint, POINT *pt )
{
if (HB_IS_ARRAY(aPoint) && hb_arrayLen(aPoint) == 2) {
pt->x = hb_arrayGetNL(aPoint,1);
@@ -1434,7 +1434,7 @@ PHB_ITEM wvt_Point2Array( POINT *pt )
/*----------------------------------------------------------------------*/
BOOL wvt_Array2Size(PHB_ITEM aSize, SIZE *siz )
HB_BOOL wvt_Array2Size(PHB_ITEM aSize, SIZE *siz )
{
if (HB_IS_ARRAY(aSize) && hb_arrayLen(aSize) == 2) {
siz->cx = hb_arrayGetNL(aSize,1);

4
harbour/contrib/gtwvg/wvgwin.c
View File

@@ -722,7 +722,7 @@ HB_FUNC( WVG_SETMENU )
HWND hWnd = ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 );
#if 1
BOOL bSet;
HB_BOOL bSet;
RECT wi = { 0, 0, 0, 0 };
RECT ci = { 0, 0, 0, 0 };
int height, width;
@@ -1215,7 +1215,7 @@ HB_FUNC( WVG_SENDTOOLBARMESSAGE )
tbb.dwData = 0;
tbb.iString = wapi_par_INT( 5 );
wapi_ret_L( ( BOOL ) SendMessage( hTB, TB_ADDBUTTONS, ( WPARAM ) 1, ( LPARAM ) ( LPTBBUTTON ) &tbb ) );
wapi_ret_L( SendMessage( hTB, TB_ADDBUTTONS, ( WPARAM ) 1, ( LPARAM ) ( LPTBBUTTON ) &tbb ) );
break;
}
case TB_ADDSTRING :

14
harbour/contrib/gtwvg/wvgwing.c
View File

@@ -142,7 +142,7 @@ static BITMAPINFO * PackedDibLoad( PTSTR szFileName )
{
BITMAPFILEHEADER bmfh;
BITMAPINFO * pbmi;
BOOL bSuccess;
HB_BOOL bSuccess;
DWORD dwPackedDibSize, dwBytesRead;
HANDLE hFile;
@@ -284,7 +284,7 @@ static BYTE * PackedDibGetBitsPtr( BITMAPINFO * pPackedDib )
#endif
static HBITMAP hPrepareBitmap( const char * szBitmapX, UINT uiBitmap,
int iExpWidth, int iExpHeight,
BOOL bMap3Dcolors,
HB_BOOL bMap3Dcolors,
HWND hCtrl,
int iMode )
{
@@ -354,7 +354,7 @@ static HBITMAP hPrepareBitmap( const char * szBitmapX, UINT uiBitmap,
{
HDC hdcSource, hdcTarget;
HBITMAP hBitmap2;
BOOL bResult;
HB_BOOL bResult;
hdcSource = CreateCompatibleDC( hdc );
SelectObject( hdcSource, hBitmap );
@@ -787,7 +787,7 @@ HB_FUNC( WVG_TREEVIEW_SHOWEXPANDED )
/* WvgFontDialog() */
/*----------------------------------------------------------------------*/
PHB_ITEM wvg_logfontTOarray( LPLOGFONT lf, BOOL bEmpty )
PHB_ITEM wvg_logfontTOarray( LPLOGFONT lf, HB_BOOL bEmpty )
{
PHB_ITEM aFont = hb_itemNew( NULL );
hb_arrayNew( aFont, 15 );
@@ -841,8 +841,8 @@ PHB_ITEM wvg_logfontTOarray( LPLOGFONT lf, BOOL bEmpty )
BOOL CALLBACK WvgDialogProcChooseFont( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )
{
BOOL bret = FALSE;
BOOL binit = FALSE;
HB_BOOL bret = FALSE;
HB_BOOL binit = FALSE;
PHB_ITEM block;
if( msg == WM_INITDIALOG )
@@ -1074,7 +1074,7 @@ HB_FUNC( WVG_ADDTOOLBARBUTTON )
{
TBBUTTON tbb;
TBADDBITMAP tbab;
BOOL bSuccess;
HB_BOOL bSuccess;
HWND hWndTB = wapi_par_HWND( 1 );
int iCommand = hb_parni( 4 );
TCHAR * szCaption;

74
harbour/contrib/hbbtree/tests/ctest.c
View File

@@ -38,7 +38,7 @@
#include "hb_btree.h"
static void display( const char *cKey, LONG lData, BOOL NewLine )
static void display( const char *cKey, LONG lData, HB_BOOL NewLine )
{
int n;
char buffer[ 80 ];
@@ -146,79 +146,79 @@ HB_FUNC( CTEST )
{
struct hb_BTree * pBTree;
display( "Harbour API test", 0, TRUE );
display( "Harbour API test", 0, HB_TRUE );
pBTree = hb_BTreeNew( "test_3.out", 2048, 90, HB_BTREE_UNIQUE, 0 );
if ( pBTree != NULL )
{
/*
a := hb_BTreeInfo( pBTree );
display( "File", a[ hb_BTreeINFO_FILENAME ], FALSE );
display( "Page", a[ hb_BTreeINFO_PAGESIZE ], FALSE );
display( "Key ", a[ hb_BTreeINFO_KEYSIZE ], FALSE );
display( "Max ", a[ hb_BTreeINFO_MAXKEYS ], FALSE );
display( "Min ", a[ hb_BTreeINFO_MINKEYS ], FALSE );
display( "Flag", a[ hb_BTreeINFO_FLAGS ], FALSE );
display( "Keys", a[ hb_BTreeINFO_KEYCOUNT ], TRUE );
display( "File", a[ hb_BTreeINFO_FILENAME ], HB_FALSE );
display( "Page", a[ hb_BTreeINFO_PAGESIZE ], HB_FALSE );
display( "Key ", a[ hb_BTreeINFO_KEYSIZE ], HB_FALSE );
display( "Max ", a[ hb_BTreeINFO_MAXKEYS ], HB_FALSE );
display( "Min ", a[ hb_BTreeINFO_MINKEYS ], HB_FALSE );
display( "Flag", a[ hb_BTreeINFO_FLAGS ], HB_FALSE );
display( "Keys", a[ hb_BTreeINFO_KEYCOUNT ], HB_TRUE );
*/
insertdata( pBTree );
/*
display( "Keys", hb_BTreeInfo( pBTree, hb_BTreeINFO_KEYCOUNT ), TRUE );
display( "Keys", hb_BTreeInfo( pBTree, hb_BTreeINFO_KEYCOUNT ), HB_TRUE );
*/
display( "Forward traversal", 0, TRUE );
display( "Forward traversal", 0, HB_TRUE );
hb_BTreeGoTop( pBTree );
while ( TRUE )
while ( HB_TRUE )
{
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), HB_TRUE );
if ( 1 != hb_BTreeSkip( pBTree, 1 ) )
break;
}
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Reverse traversal", 0, TRUE );
display( "Reverse traversal", 0, HB_TRUE );
hb_BTreeGoBottom( pBTree );
while ( TRUE )
while ( HB_TRUE )
{
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), HB_TRUE );
if ( -1 != hb_BTreeSkip( pBTree, -1 ) )
break;
}
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Test SEEK", 0, TRUE );
display( hb_BTreeSeek( pBTree, "cdntyzrf", 36, FALSE ) == 1 ? ".T." : ".F.", 0, TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
display( "Test SEEK", 0, HB_TRUE );
display( hb_BTreeSeek( pBTree, "cdntyzrf", 36, HB_FALSE ) == 1 ? ".T." : ".F.", 0, HB_TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), HB_TRUE );
hb_BTreeSkip( pBTree, 1 );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), FALSE );
display( " dmfmivqb ?", 0, TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), HB_FALSE );
display( " dmfmivqb ?", 0, HB_TRUE );
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Test soft SEEK of a short key", 0, TRUE );
display( hb_BTreeSeek( pBTree, "cd", 0, TRUE ) == 1 ? ".T." : ".F.", 0, TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
display( "Test soft SEEK of a short key", 0, HB_TRUE );
display( hb_BTreeSeek( pBTree, "cd", 0, HB_TRUE ) == 1 ? ".T." : ".F.", 0, HB_TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), HB_TRUE );
hb_BTreeSkip( pBTree, 1 );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), FALSE );
display( " dmfmivqb ?", 0, TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), HB_FALSE );
display( " dmfmivqb ?", 0, HB_TRUE );
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Test soft SEEK of an existing key", 0, TRUE );
display( hb_BTreeSeek( pBTree, "cdntyzrf", 0, TRUE ) == 1 ? ".T." : ".F.", 0, TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
display( "Test soft SEEK of an existing key", 0, HB_TRUE );
display( hb_BTreeSeek( pBTree, "cdntyzrf", 0, HB_TRUE ) == 1 ? ".T." : ".F.", 0, HB_TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), HB_TRUE );
hb_BTreeSkip( pBTree, 1 );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), FALSE );
display( " dmfmivqb ?", 0, TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), HB_FALSE );
display( " dmfmivqb ?", 0, HB_TRUE );
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Test soft SEEK of a missing key, that should force EOF", 0, TRUE );
display( hb_BTreeSeek( pBTree, "zzzzzz", 0, FALSE ) == 1 ? ".T." : ".F.", 0, TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
display( "Test soft SEEK of a missing key, that should force EOF", 0, HB_TRUE );
display( hb_BTreeSeek( pBTree, "zzzzzz", 0, HB_FALSE ) == 1 ? ".T." : ".F.", 0, HB_TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), HB_TRUE );
hb_BTreeSkip( pBTree, 1 );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), FALSE );
display( " dmfmivqb ?", 0, TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), HB_FALSE );
display( " dmfmivqb ?", 0, HB_TRUE );
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
hb_BTreeClose( pBTree );
}
else
display( "error / failure", 0, TRUE );
display( "error / failure", 0, HB_TRUE );
}

14
harbour/contrib/hbmisc/dates2.c
View File

@@ -71,14 +71,14 @@
static int s_daysinmonth[ 12 ] =
{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
BOOL hb_isleapyear( int iYear )
static HB_BOOL hb_isleapyear( int iYear )
{
HB_TRACE(HB_TR_DEBUG, ("hb_isleapyear(%d)", iYear));
return ( iYear % 4 == 0 && iYear % 100 != 0 ) || ( iYear % 400 == 0 );
}
int hb_daysinmonth( int iYear, int iMonth )
static int hb_daysinmonth( int iYear, int iMonth )
{
HB_TRACE(HB_TR_DEBUG, ("hb_daysinmonth(%d, %d)", iYear, iMonth));
@@ -89,7 +89,7 @@ int hb_daysinmonth( int iYear, int iMonth )
return 0;
}
int hb_doy( int iYear, int iMonth, int iDay )
static int hb_doy( int iYear, int iMonth, int iDay )
{
int i;
int iDoy = 0;
@@ -102,7 +102,7 @@ int hb_doy( int iYear, int iMonth, int iDay )
return iDoy + iDay;
}
int hb_wom( int iYear, int iMonth, int iDay )
static int hb_wom( int iYear, int iMonth, int iDay )
{
int iWom;
@@ -115,7 +115,7 @@ int hb_wom( int iYear, int iMonth, int iDay )
return 0;
}
int hb_woy( int iYear, int iMonth, int iDay, BOOL bISO )
static int hb_woy( int iYear, int iMonth, int iDay, HB_BOOL bISO )
{
int iWeek, n;
@@ -167,7 +167,7 @@ HB_FUNC( ISLEAPYEAR )
hb_retl( hb_isleapyear( iYear ) );
}
else
hb_retl( FALSE );
hb_retl( HB_FALSE );
}
HB_FUNC( HBMISC_DAYSINMONTH )
@@ -196,7 +196,7 @@ HB_FUNC( WOY )
int iYear, iMonth, iDay;
hb_dateDecode( hb_itemGetDL( pDate ), &iYear, &iMonth, &iDay );
hb_retni( hb_woy( iYear, iMonth, iDay, HB_ISLOG( 2 ) ? hb_parl( 2 ) : TRUE ) );
hb_retni( hb_woy( iYear, iMonth, iDay, HB_ISLOG( 2 ) ? hb_parl( 2 ) : HB_TRUE ) );
}
else
hb_retni( 0 );

18
harbour/contrib/hbmisc/hb_f.c
View File

@@ -66,7 +66,7 @@ static char * b;
static char * c;
static long last_off[ 10 ];
static long lastbyte[ 10 ];
static int isEof[ 10 ];
static HB_BOOL isEof[ 10 ];
HB_FUNC( HB_FUSE )
{
@@ -101,7 +101,7 @@ HB_FUNC( HB_FUSE )
last_rec[area] = 0L;
last_off[area] = 0L;
lastbyte[area] = 0L;
isEof[area] = 0;
isEof[area] = HB_FALSE;
}
}
@@ -131,17 +131,17 @@ static long hb_hbfskip( int recs )
}
}
if ( (offset[area] + x + 2) < lastbyte[area] ) {
isEof[area] = FALSE;
isEof[area] = HB_FALSE;
offset[area] += (x + 2);
recno[area] += 1;
}
else
isEof[area] = TRUE;
isEof[area] = HB_TRUE;
}
}
else {
recs = -recs;
isEof[area] = FALSE;
isEof[area] = HB_FALSE;
if ( (recno[area] - recs) < 1 )
return( 1 );
@@ -281,7 +281,7 @@ HB_FUNC( HB_FLASTREC )
{
long old_rec;
long old_offset;
int bIsEof;
HB_BOOL bIsEof;
old_rec = recno[area];
old_offset = offset[area];
@@ -292,7 +292,7 @@ HB_FUNC( HB_FLASTREC )
recno[area] = old_rec;
offset[area] = old_offset;
isEof[area] = bIsEof ;
isEof[area] = bIsEof;
}
HB_FUNC( HB_FSELECT )
@@ -333,7 +333,7 @@ HB_FUNC( HB_FREADANDSKIP )
--------------------------------------------------*/
long x = 0;
long read;
BOOL bInField = 0, bHasCRLF = FALSE;
HB_BOOL bInField = HB_FALSE, bHasCRLF = HB_FALSE;
hb_fsSeek( handles[area], offset[area], FS_SET );
read = hb_fsRead( handles[area], b, b_size );
@@ -355,7 +355,7 @@ HB_FUNC( HB_FREADANDSKIP )
((*(b + x) == 10) && x < read-1 && (*(b + x + 1) == 13)) )
{
x += 2;
bHasCRLF = TRUE;
bHasCRLF = HB_TRUE;
break;
}
x++;

34
harbour/contrib/hbmzip/hbmzip.c
View File

@@ -469,7 +469,7 @@ HB_FUNC( HB_UNZIPFILEINFO )
hb_stornl( 0, 7 );
hb_stornl( 0, 8 );
hb_stornl( 0, 9 );
hb_storl( FALSE, 10 );
hb_storl( HB_FALSE, 10 );
hb_storc( NULL, 11 );
}
}
@@ -534,9 +534,9 @@ HB_FUNC( HB_UNZIPFILECLOSE )
*
*/
static BOOL hb_zipGetFileInfoFromHandle( HB_FHANDLE hFile, ULONG * pulCRC, BOOL * pfText )
static HB_BOOL hb_zipGetFileInfoFromHandle( HB_FHANDLE hFile, ULONG * pulCRC, HB_BOOL * pfText )
{
BOOL fText = pfText != NULL, fResult = FALSE;
HB_BOOL fText = pfText != NULL, fResult = HB_FALSE;
ULONG ulCRC = 0;
if( hFile != FS_ERROR )
@@ -562,7 +562,7 @@ static BOOL hb_zipGetFileInfoFromHandle( HB_FHANDLE hFile, ULONG * pulCRC, BOOL
( pString[ u ] >= 0x7F && pString[ u ] < 0xA0 &&
pString[ u ] != ( unsigned char ) HB_CHAR_SOFT1 ) )
{
fText = FALSE;
fText = HB_FALSE;
break;
}
}
@@ -584,10 +584,10 @@ static BOOL hb_zipGetFileInfoFromHandle( HB_FHANDLE hFile, ULONG * pulCRC, BOOL
return fResult;
}
static BOOL hb_zipGetFileInfo( const char* szFileName, ULONG * pulCRC, BOOL * pfText )
static HB_BOOL hb_zipGetFileInfo( const char* szFileName, ULONG * pulCRC, HB_BOOL * pfText )
{
FILE * file;
BOOL fText = pfText != NULL, fResult = FALSE;
HB_BOOL fText = pfText != NULL, fResult = HB_FALSE;
ULONG ulCRC = 0;
file = hb_fopen( szFileName, "rb" );
@@ -614,7 +614,7 @@ static BOOL hb_zipGetFileInfo( const char* szFileName, ULONG * pulCRC, BOOL * pf
( pString[ u ] >= 0x7f && pString[ u ] < 0xA0 &&
pString[ u ] != ( unsigned char ) HB_CHAR_SOFT1 ) )
{
fText = FALSE;
fText = HB_FALSE;
break;
}
}
@@ -691,8 +691,8 @@ static int hb_zipStoreFile( zipFile hZip, const char* szFileName, const char* sz
ULONG ulLen, ulExtAttr;
zip_fileinfo zfi;
int iResult;
BOOL fError;
BOOL fText;
HB_BOOL fError;
HB_BOOL fText;
ULONG ulCRC;
if( szName )
@@ -727,7 +727,7 @@ static int hb_zipStoreFile( zipFile hZip, const char* szFileName, const char* sz
}
memset( &zfi, 0, sizeof( zfi ) );
fError = FALSE;
fError = HB_FALSE;
#if defined( HB_OS_WIN )
{
@@ -745,7 +745,7 @@ static int hb_zipStoreFile( zipFile hZip, const char* szFileName, const char* sz
ulExtAttr = hb_translateExtAttr( szFileName, ulExtAttr );
}
else
fError = TRUE;
fError = HB_TRUE;
HB_TCHAR_FREE( lpFileName );
}
@@ -793,7 +793,7 @@ static int hb_zipStoreFile( zipFile hZip, const char* szFileName, const char* sz
zfi.tmz_date.tm_year = st.tm_year;
}
else
fError = TRUE;
fError = HB_TRUE;
}
#elif defined( HB_OS_DOS )
{
@@ -814,7 +814,7 @@ static int hb_zipStoreFile( zipFile hZip, const char* szFileName, const char* sz
ulExtAttr = hb_translateExtAttr( szFileName, ulExtAttr );
}
else
fError = TRUE;
fError = HB_TRUE;
}
#elif defined( HB_OS_OS2 )
{
@@ -848,7 +848,7 @@ static int hb_zipStoreFile( zipFile hZip, const char* szFileName, const char* sz
zfi.tmz_date.tm_year = fs3.fdateLastWrite.year + 1980;
}
else
fError = TRUE;
fError = HB_TRUE;
}
#else
{
@@ -865,7 +865,7 @@ static int hb_zipStoreFile( zipFile hZip, const char* szFileName, const char* sz
return -200;
}
fText = FALSE;
fText = HB_FALSE;
ulCRC = 0;
zfi.external_fa = ulExtAttr;
@@ -962,7 +962,7 @@ static int hb_zipStoreFileHandle( zipFile hZip, HB_FHANDLE hFile, const char * s
ULONG ulLen;
zip_fileinfo zfi;
int iResult;
BOOL fText;
HB_BOOL fText;
ULONG ulCRC;
if( hFile == FS_ERROR || szName == NULL )
@@ -989,7 +989,7 @@ static int hb_zipStoreFileHandle( zipFile hZip, HB_FHANDLE hFile, const char * s
zfi.tmz_date.tm_year = 0;
ulCRC = 0;
fText = FALSE;
fText = HB_FALSE;
if( szPassword && hb_zipGetFileInfoFromHandle( hFile, &ulCRC, &fText ) )
zfi.internal_fa = fText ? 1 : 0;
else

4
harbour/contrib/hbwin/hbwapi.h
View File

@@ -76,7 +76,7 @@
#define wapi_par_STRUCT( n ) ( hb_parc( n ) )
#define wapi_par_BOOL( n ) ( ( BOOL ) hb_parl( n ) )
#define wapi_par_BOOL( n ) ( ( BOOL ) ( hb_parl( n ) ? TRUE : FALSE ) )
#define wapi_par_INT( n ) ( ( INT ) hb_parni( n ) )
#define wapi_par_UINT( n ) ( ( UINT ) hb_parni( n ) )
#define wapi_par_LONG( n ) ( ( LONG ) hb_parnl( n ) )
@@ -86,7 +86,7 @@
#define wapi_ret_NINT( i ) ( hb_retnint( i ) )
#define wapi_ret_NI( i ) ( hb_retni( i ) )
#define wapi_ret_L( b ) ( hb_retl( b ) )
#define wapi_ret_L( b ) ( hb_retl( b ? HB_TRUE : HB_FALSE ) )
#define wapi_ret_UINT( n ) ( hb_retni( n ) )
#define wapi_ret_LONG( n ) ( hb_retnl( n ) )
#define wapi_ret_WORD( n ) ( hb_retnl( n ) )

36
harbour/contrib/xhb/bkgtsks.c
View File

@@ -84,7 +84,7 @@ typedef struct HB_BACKGROUNDTASK_
PHB_ITEM pTask; /* pointer to the task item */
double dSeconds; /* internal - last time this task has gone */
int millisec; /* milliseconds after this task must run */
BOOL bActive; /* task is active ? */
HB_BOOL bActive; /* task is active ? */
} HB_BACKGROUNDTASK, * PHB_BACKGROUNDTASK, * HB_BACKGROUNDTASK_PTR;
extern void hb_backgroundRunSingle( ULONG ulID ); /* run a single background routine */
@@ -92,10 +92,10 @@ extern void hb_backgroundRunForced( void ); /* run all background routines a
extern void hb_backgroundRun( void ); /* run all background routines but only if them are active*/
extern void hb_backgroundReset( void ); /* reset internal counter */
extern void hb_backgroundShutDown( void ); /* closes all background tasks */
extern ULONG hb_backgroundAddFunc( PHB_ITEM pBlock, int nMillisec, BOOL bActive ); /* Adds a codeblock or an executable array */
extern ULONG hb_backgroundAddFunc( PHB_ITEM pBlock, int nMillisec, HB_BOOL bActive ); /* Adds a codeblock or an executable array */
extern PHB_ITEM hb_backgroundDelFunc( ULONG ulID ); /* Deletes a prevuiously added task */
extern PHB_BACKGROUNDTASK hb_backgroundFind( ULONG ulID );
extern BOOL hb_backgroundActive( ULONG ulID, BOOL bActive );
extern HB_BOOL hb_backgroundActive( ULONG ulID, HB_BOOL bActive );
extern int hb_backgroundTime( ULONG ulID, int nMillisec );
HB_EXTERN_END
@@ -110,10 +110,10 @@ static ULONG s_ulBackgroundID = 0;
*/
static HB_BACKGROUNDTASK_PTR * s_pBackgroundTasks = NULL;
static BOOL s_bEnabled = FALSE;
static HB_BOOL s_bEnabled = HB_FALSE;
/* flag to prevent recursive calls of hb_backgroundRun() */
static BOOL s_bIamBackground = FALSE;
static HB_BOOL s_bIamBackground = HB_FALSE;
/* current task to be executed */
static USHORT s_uiBackgroundTask = 0;
@@ -132,7 +132,7 @@ static USHORT s_uiBackgroundMaxTask = 0;
/* ------------------------ C LEVEL ------------------------------ */
ULONG hb_backgroundAddFunc( PHB_ITEM pBlock, int nMillisec, BOOL bActive )
ULONG hb_backgroundAddFunc( PHB_ITEM pBlock, int nMillisec, HB_BOOL bActive )
{
PHB_BACKGROUNDTASK pBkgTask;
@@ -190,7 +190,7 @@ void hb_backgroundRun( void )
if( ! s_bIamBackground && s_bEnabled )
{
s_bIamBackground = TRUE;
s_bIamBackground = HB_TRUE;
if( s_uiBackgroundTask < s_uiBackgroundMaxTask )
{
@@ -219,16 +219,16 @@ void hb_backgroundRun( void )
s_uiBackgroundTask == s_uiBackgroundMaxTask )
s_uiBackgroundTask = 0;
}
s_bIamBackground = FALSE;
s_bIamBackground = HB_FALSE;
}
}
/* RUN all tasks also if SET BACKGROUND TASKS is OFF */
void hb_backgroundRunForced( void )
{
BOOL bOldSet = s_bEnabled;
HB_BOOL bOldSet = s_bEnabled;
s_bEnabled = TRUE;
s_bEnabled = HB_TRUE;
hb_backgroundRun();
@@ -242,13 +242,13 @@ void hb_backgroundRunSingle( ULONG ulID )
if( ! s_bIamBackground )
{
s_bIamBackground = TRUE;
s_bIamBackground = HB_TRUE;
pBkgTask = hb_backgroundFind( ulID );
if( pBkgTask )
hb_itemRelease( hb_itemDo( pBkgTask->pTask, 0 ) );
s_bIamBackground = FALSE;
s_bIamBackground = HB_FALSE;
}
}
@@ -285,9 +285,9 @@ PHB_ITEM hb_backgroundDelFunc( ULONG ulID )
SHORT iTask;
PHB_BACKGROUNDTASK pBkgTask;
PHB_ITEM pItem = NULL;
BOOL bOldSet = s_bEnabled;
HB_BOOL bOldSet = s_bEnabled;
s_bEnabled = FALSE;
s_bEnabled = HB_FALSE;
iTask = 0;
while( iTask < s_uiBackgroundMaxTask )
@@ -344,10 +344,10 @@ PHB_BACKGROUNDTASK hb_backgroundFind( ULONG ulID )
}
/* Set task as active */
BOOL hb_backgroundActive( ULONG ulID, BOOL bActive )
HB_BOOL hb_backgroundActive( ULONG ulID, HB_BOOL bActive )
{
PHB_BACKGROUNDTASK pBkgTask;
BOOL bOldState = FALSE;
HB_BOOL bOldState = HB_FALSE;
pBkgTask = hb_backgroundFind( ulID );
@@ -421,7 +421,7 @@ HB_FUNC( HB_BACKGROUNDADD )
{
hb_retnl( hb_backgroundAddFunc( pBlock,
( pMillisec == NULL ? 0 : hb_itemGetNI( pMillisec ) ),
( pActive == NULL ? TRUE : hb_itemGetL( pActive ) )
( pActive == NULL ? HB_TRUE : hb_itemGetL( pActive ) )
) );
}
else
@@ -446,7 +446,7 @@ HB_FUNC( HB_BACKGROUNDDEL )
/* Set a task as active or not */
HB_FUNC( HB_BACKGROUNDACTIVE )
{
BOOL bOldActive = FALSE;
HB_BOOL bOldActive = HB_FALSE;
if( s_pBackgroundTasks && HB_ISNUM( 1 ) )
{

6
harbour/contrib/xhb/cstructc.c
View File

@@ -1050,7 +1050,7 @@ HB_FUNC( HB_ARRAYTOSTRUCTURE )
}
}
static PHB_ITEM StructureToArray( BYTE* Buffer, unsigned long ulBufferLen, PHB_ITEM aDef, unsigned int uiAlign, BOOL bAdoptNested, PHB_ITEM pRet )
static PHB_ITEM StructureToArray( BYTE* Buffer, unsigned long ulBufferLen, PHB_ITEM aDef, unsigned int uiAlign, HB_BOOL bAdoptNested, PHB_ITEM pRet )
{
PHB_BASEARRAY pBaseDef = aDef->item.asArray.value;
unsigned long ulLen = pBaseDef->ulLen;
@@ -1371,7 +1371,7 @@ HB_FUNC( HB_STRUCTURETOARRAY )
PHB_ITEM pAlign = hb_param( 3, HB_IT_INTEGER );
PHB_ITEM pAdopt = hb_param( 4, HB_IT_LOGICAL );
PHB_ITEM pRet = hb_param( 5, HB_IT_ARRAY );
BOOL bAdopt;
HB_BOOL bAdopt;
if( Structure && aDef )
{
@@ -1393,7 +1393,7 @@ HB_FUNC( HB_STRUCTURETOARRAY )
}
else
{
bAdopt = FALSE;
bAdopt = HB_FALSE;
}
hb_itemReturnForward( StructureToArray( Buffer, Structure->item.asString.length, aDef, uiAlign, bAdopt, pRet ) );

18
harbour/contrib/xhb/dbf2txt.c
View File

@@ -86,7 +86,7 @@ static char * hb_strescape( const char * szInput, int lLen, const char * cDelim
}
/* Export field values to text file */
static BOOL hb_ExportVar( HB_FHANDLE handle, PHB_ITEM pValue, const char * cDelim, PHB_CODEPAGE cdp )
static HB_BOOL hb_ExportVar( HB_FHANDLE handle, PHB_ITEM pValue, const char * cDelim, PHB_CODEPAGE cdp )
{
switch( hb_itemType( pValue ) )
{
@@ -147,9 +147,9 @@ static BOOL hb_ExportVar( HB_FHANDLE handle, PHB_ITEM pValue, const char * cDeli
/* an "M" field or the other, might be a "V" in SixDriver */
default:
/* We do not want MEMO contents */
return FALSE;
return HB_FALSE;
}
return TRUE;
return HB_TRUE;
}
HB_FUNC( DBF2TEXT )
@@ -172,12 +172,12 @@ HB_FUNC( DBF2TEXT )
USHORT uiFields = 0;
USHORT ui;
PHB_ITEM pTmp;
BOOL bWriteSep = FALSE;
HB_BOOL bWriteSep = HB_FALSE;
BOOL bEof = TRUE;
BOOL bBof = TRUE;
HB_BOOL bEof = HB_TRUE;
HB_BOOL bBof = HB_TRUE;
BOOL bNoFieldPassed = ( pFields == NULL || hb_arrayLen( pFields ) == 0 );
HB_BOOL bNoFieldPassed = ( pFields == NULL || hb_arrayLen( pFields ) == 0 );
if( ! pArea )
{
@@ -220,7 +220,7 @@ HB_FUNC( DBF2TEXT )
break;
/* For condition is met */
/* if For is NULL, hb__Eval returns TRUE */
/* if For is NULL, hb__Eval returns HB_TRUE */
if( ! pFor || hb_itemGetL( hb_vmEvalBlock( pFor ) ) )
{
/* User does not request fields, copy all fields */
@@ -262,7 +262,7 @@ HB_FUNC( DBF2TEXT )
}
}
hb_fsWriteLarge( handle, "\r\n", 2 );
bWriteSep = FALSE;
bWriteSep = HB_FALSE;
}
if( nCount != -1 )

20
harbour/contrib/xhb/dbgfxc.c
View File

@@ -56,14 +56,14 @@
#include "xhb.h"
static BOOL s_bToOutputDebug = TRUE;
static BOOL s_bToLogFile = TRUE;
static HB_BOOL s_bToOutputDebug = HB_TRUE;
static HB_BOOL s_bToLogFile = HB_TRUE;
static BOOL s_bEmptyLogFile = TRUE;
static HB_BOOL s_bEmptyLogFile = HB_TRUE;
BOOL hb_ToOutDebugOnOff( BOOL bOnOff )
HB_BOOL hb_ToOutDebugOnOff( HB_BOOL bOnOff )
{
BOOL bOld = s_bToOutputDebug;
HB_BOOL bOld = s_bToOutputDebug;
s_bToOutputDebug = bOnOff;
return bOld;
}
@@ -83,16 +83,16 @@ void hb_ToOutDebug( const char * sTraceMsg, ... )
}
}
BOOL hb_ToLogFileOnOff( BOOL bOnOff )
HB_BOOL hb_ToLogFileOnOff( HB_BOOL bOnOff )
{
BOOL bOld = s_bToLogFile;
HB_BOOL bOld = s_bToLogFile;
s_bToLogFile = bOnOff;
return bOld;
}
BOOL hb_EmptyLogFile( BOOL bOnOff )
HB_BOOL hb_EmptyLogFile( HB_BOOL bOnOff )
{
BOOL bOld = s_bEmptyLogFile;
HB_BOOL bOld = s_bEmptyLogFile;
s_bEmptyLogFile = bOnOff;
return bOld;
}
@@ -107,7 +107,7 @@ void hb_ToLogFile( const char * sFile, const char * sTraceMsg, ... )
{
if( s_bEmptyLogFile )
{
s_bEmptyLogFile = FALSE;
s_bEmptyLogFile = HB_FALSE;
/* Empty the file if it exists. */
hFile = hb_fopen( "logfile.log", "w" );

16
harbour/contrib/xhb/filestat.c
View File

@@ -70,7 +70,7 @@
#endif
#endif
static BOOL hb_fsFileStats(
static HB_BOOL hb_fsFileStats(
const char * pszFileName,
char * pszAttr,
HB_FOFFSET * llSize,
@@ -79,7 +79,7 @@ static BOOL hb_fsFileStats(
long * lmDate,
long * lmTime )
{
BOOL fResult = FALSE;
HB_BOOL fResult = HB_FALSE;
#if defined( OS_UNIX_COMPATIBLE )
@@ -175,7 +175,7 @@ static BOOL hb_fsFileStats(
hb_fsAttrDecode( ushbAttr, pszAttr );
fResult = TRUE;
fResult = HB_TRUE;
}
#elif defined( HB_OS_WIN )
@@ -194,7 +194,7 @@ static BOOL hb_fsFileStats(
{
/* return */
HB_TCHAR_FREE( lpFileName );
return FALSE;
return HB_FALSE;
}
hb_fsAttrDecode( hb_fsAttrFromRaw( dwAttribs ), pszAttr );
@@ -232,7 +232,7 @@ static BOOL hb_fsFileStats(
*lcDate = hb_dateEncode( 0, 0, 0 );
*lcTime = 0;
}
fResult = TRUE;
fResult = HB_TRUE;
}
}
@@ -256,7 +256,7 @@ static BOOL hb_fsFileStats(
*lmDate = hb_dateEncode( 0, 0, 0 );
*lmTime = 0;
hb_fsFindClose( findinfo );
fResult = TRUE;
fResult = HB_TRUE;
}
}
@@ -290,8 +290,8 @@ HB_FUNC( FILESTATS )
hb_stordl ( lmDate, 6 );
hb_stornint( lmTime, 7 );
hb_retl( TRUE );
hb_retl( HB_TRUE );
}
else
hb_retl( FALSE );
hb_retl( HB_FALSE );
}

4
harbour/contrib/xhb/fparse.c
View File

@@ -325,7 +325,7 @@ static char ** hb_tokensplit ( char *string, BYTE delimiter, int iCharCount, int
}
/*----------------------------------------------------------------------------*/
BOOL file_read ( FILE *stream, char *string, int *iCharCount )
static HB_BOOL file_read( FILE *stream, char *string, int *iCharCount )
{
int ch, cnbr = 0;
@@ -353,7 +353,7 @@ BOOL file_read ( FILE *stream, char *string, int *iCharCount )
{
*iCharCount = cnbr;
string [MAX_READ] = '\0';
return TRUE;
return HB_TRUE;
}
}
}

14
harbour/contrib/xhb/freadlin.c
View File

@@ -58,7 +58,7 @@
#define READING_BLOCK 4096
char * hb_fsReadLine( HB_FHANDLE hFileHandle, LONG * plBuffLen, const char ** Term, int * iTermSizes, int iTerms, BOOL * bFound, BOOL * bEOF )
char * hb_fsReadLine( HB_FHANDLE hFileHandle, LONG * plBuffLen, const char ** Term, int * iTermSizes, int iTerms, HB_BOOL * bFound, HB_BOOL * bEOF )
{
int iPosTerm = 0, iPos, iPosition;
int nTries;
@@ -67,8 +67,8 @@ char * hb_fsReadLine( HB_FHANDLE hFileHandle, LONG * plBuffLen, const char ** Te
HB_TRACE(HB_TR_DEBUG, ("hb_fsReadLine(%p, %ld, %p, %p, %i, %i, %i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, *plBuffLen, Term, iTermSizes, iTerms, *bFound, *bEOF ));
*bFound = FALSE;
*bEOF = FALSE;
*bFound = HB_FALSE;
*bEOF = HB_FALSE;
nTries = 0;
lOffset = 0;
lSize = *plBuffLen;
@@ -102,13 +102,13 @@ char * hb_fsReadLine( HB_FHANDLE hFileHandle, LONG * plBuffLen, const char ** Te
/* Compare with the LAST terminator byte */
if( pBuff[lOffset+iPos] == Term[iPosTerm][iTermSizes[iPosTerm]-1] && (iTermSizes[iPosTerm]-1) <= (iPos+lOffset) )
{
*bFound = TRUE;
*bFound = HB_TRUE;
for(iPosition=0; iPosition < (iTermSizes[iPosTerm]-1); iPosition++)
{
if(Term[iPosTerm][iPosition] != pBuff[ lOffset+(iPos-iTermSizes[iPosTerm])+iPosition+1 ])
{
*bFound = FALSE;
*bFound = HB_FALSE;
break;
}
}
@@ -149,7 +149,7 @@ char * hb_fsReadLine( HB_FHANDLE hFileHandle, LONG * plBuffLen, const char ** Te
*plBuffLen = lOffset + lRead;
}
*bEOF = TRUE;
*bEOF = HB_TRUE;
}
}
@@ -171,7 +171,7 @@ HB_FUNC( HB_FREADLINE )
int * iTermSizes;
LONG lSize = hb_parnl( 4 );
int i, iTerms;
BOOL bFound, bEOF;
HB_BOOL bFound, bEOF;
if( ( !HB_ISBYREF( 2 ) ) || ( !HB_ISNUM( 1 ) ) )
{

34
harbour/contrib/xhb/hbnxs.h
View File

@@ -72,51 +72,51 @@
#define NXS_MAX_KEYLEN 256
void nxs_crypt(
const unsigned char *source, ULONG srclen,
const unsigned char *key, ULONG keylen,
const unsigned char *source, HB_SIZE srclen,
const unsigned char *key, HB_SIZE keylen,
unsigned char *cipher );
void nxs_decrypt(
const unsigned char *cipher, ULONG cypherlen,
const unsigned char *key, ULONG keylen,
const unsigned char *cipher, HB_SIZE cypherlen,
const unsigned char *key, HB_SIZE keylen,
unsigned char *result );
void nxs_scramble(
const unsigned char *source, ULONG srclen,
const unsigned char *key, ULONG keylen,
const unsigned char *source, HB_SIZE srclen,
const unsigned char *key, HB_SIZE keylen,
unsigned char *cipher );
void nxs_partial_scramble(
const unsigned char *source, unsigned char *cipher,
int *scramble,
ULONG len, ULONG keylen );
HB_SIZE len, HB_SIZE keylen );
void nxs_partial_unscramble(
unsigned char *cipher,
int *scramble,
ULONG len, ULONG keylen );
HB_SIZE len, HB_SIZE keylen );
void nxs_unscramble(
unsigned char *cipher, ULONG cypherlen,
const unsigned char *key, ULONG keylen);
unsigned char *cipher, HB_SIZE cypherlen,
const unsigned char *key, HB_SIZE keylen);
void nxs_xorcode(
unsigned char *cipher, ULONG cipherlen,
const unsigned char *key, ULONG keylen );
unsigned char *cipher, HB_SIZE cipherlen,
const unsigned char *key, HB_SIZE keylen );
void nxs_xordecode(
unsigned char *cipher, ULONG cipherlen,
const unsigned char *key, ULONG keylen );
unsigned char *cipher, HB_SIZE cipherlen,
const unsigned char *key, HB_SIZE keylen );
void nxs_xorcyclic(
unsigned char *cipher, ULONG cipherlen,
const unsigned char *key, ULONG keylen );
unsigned char *cipher, HB_SIZE cipherlen,
const unsigned char *key, HB_SIZE keylen );
ULONG nxs_cyclic_sequence( ULONG input );
void nxs_make_scramble(
int *scramble,
const unsigned char *key,
ULONG keylen );
HB_SIZE keylen );
#endif

12
harbour/contrib/xhb/hboutdbg.c
View File

@@ -133,9 +133,9 @@ static void debugInit( void )
#endif
BOOL hb_OutDebugName( PHB_ITEM pName )
HB_BOOL hb_OutDebugName( PHB_ITEM pName )
{
BOOL bRet;
HB_BOOL bRet;
#if defined( HB_OS_UNIX )
if( s_iDebugFd == 0 && pName != NULL)
@@ -143,20 +143,20 @@ BOOL hb_OutDebugName( PHB_ITEM pName )
hb_strncpy( s_szDebugName, hb_itemGetCPtr( pName ), sizeof( s_szDebugName ) - 1 );
s_iUseDebugName = 1;
bRet = TRUE;
bRet = HB_TRUE;
}
else if( pName == NULL)
{
s_iUseDebugName = 0;
bRet = TRUE;
bRet = HB_TRUE;
}
else
bRet = FALSE;
bRet = HB_FALSE;
#else
HB_SYMBOL_UNUSED( pName );
bRet = FALSE;
bRet = HB_FALSE;
#endif
return bRet;

36
harbour/contrib/xhb/hbserv.c
View File

@@ -94,7 +94,7 @@
***************************************************/
HB_EXTERN_BEGIN
BOOL hb_isService( void );
HB_BOOL hb_isService( void );
void hb_serviceExit( void );
HB_EXTERN_END
@@ -104,7 +104,7 @@ static void s_serviceSetDflSig( void );
static void s_signalHandlersInit( void );
static PHB_ITEM sp_hooks = NULL;
static BOOL bSignalEnabled = TRUE;
static HB_BOOL bSignalEnabled = HB_TRUE;
static int sb_isService = 0;
/* There is a service mutex in multithreading */
@@ -177,7 +177,7 @@ static void s_signalHandler( int sig, siginfo_t * info, void * v )
return;
}
bSignalEnabled = FALSE;
bSignalEnabled = HB_FALSE;
ulPos = hb_arrayLen( sp_hooks );
/* subsig not necessary */
uiSig = ( UINT ) s_translateSignal( ( UINT ) sig, 0 );
@@ -227,12 +227,12 @@ static void s_signalHandler( int sig, siginfo_t * info, void * v )
switch( iRet )
{
case HB_SERVICE_HANDLED:
bSignalEnabled = TRUE;
bSignalEnabled = HB_TRUE;
hb_threadLeaveCriticalSection( &s_ServiceMutex );
return;
case HB_SERVICE_QUIT:
bSignalEnabled = FALSE;
bSignalEnabled = HB_FALSE;
hb_threadLeaveCriticalSection( &s_ServiceMutex );
/* TODO: A service cleanup routine */
hb_vmRequestQuit();
@@ -250,7 +250,7 @@ static void s_signalHandler( int sig, siginfo_t * info, void * v )
ulPos--;
}
bSignalEnabled = TRUE;
bSignalEnabled = HB_TRUE;
/*s_serviceSetHBSig();*/
/* TODO
@@ -270,7 +270,7 @@ static void s_signalHandler( int sig, siginfo_t * info, void * v )
#if defined( HB_THREAD_SUPPORT ) && ! defined( HB_OS_OS2 )
static void * s_signalListener( void * my_stack )
{
static BOOL bFirst = TRUE;
static HB_BOOL bFirst = HB_TRUE;
sigset_t passall;
HB_STACK * pStack = ( HB_STACK * ) my_stack;
#if defined( HB_OS_BSD )
@@ -319,7 +319,7 @@ static void * s_signalListener( void * my_stack )
if( bFirst )
{
pthread_sigmask( SIG_SETMASK, &passall, NULL );
bFirst = FALSE;
bFirst = HB_FALSE;
}
/* This is also a cancelation point. When the main thread
@@ -428,7 +428,7 @@ static LONG s_signalHandler( int type, int sig, PEXCEPTION_RECORD exc )
return EXCEPTION_EXECUTE_HANDLER;
}
bSignalEnabled = FALSE;
bSignalEnabled = HB_FALSE;
ulPos = hb_arrayLen( sp_hooks );
/* subsig not necessary */
uiSig = ( UINT ) s_translateSignal( ( UINT ) type, ( UINT ) sig );
@@ -484,12 +484,12 @@ static LONG s_signalHandler( int type, int sig, PEXCEPTION_RECORD exc )
switch( iRet )
{
case HB_SERVICE_HANDLED:
bSignalEnabled = TRUE;
bSignalEnabled = HB_TRUE;
hb_threadLeaveCriticalSection( &s_ServiceMutex );
return EXCEPTION_CONTINUE_EXECUTION;
case HB_SERVICE_QUIT:
bSignalEnabled = FALSE;
bSignalEnabled = HB_FALSE;
hb_threadLeaveCriticalSection( &s_ServiceMutex );
hb_vmRequestQuit();
#ifndef HB_THREAD_SUPPORT
@@ -504,7 +504,7 @@ static LONG s_signalHandler( int type, int sig, PEXCEPTION_RECORD exc )
ulPos--;
}
bSignalEnabled = TRUE;
bSignalEnabled = HB_TRUE;
return EXCEPTION_EXECUTE_HANDLER;
}
@@ -785,7 +785,7 @@ HB_FUNC( HB_STARTSERVICE )
#endif
/* let's begin */
sb_isService = TRUE;
sb_isService = HB_TRUE;
/* in windows, we just detach from console */
#ifdef HB_OS_WIN
@@ -807,7 +807,7 @@ HB_FUNC( HB_STARTSERVICE )
* Been called. C version useful for internal api
*/
BOOL hb_isService( void )
HB_BOOL hb_isService( void )
{
return sb_isService;
}
@@ -860,7 +860,7 @@ HB_FUNC( HB_SERVICELOOP )
}
#endif
hb_gcCollectAll( FALSE );
hb_gcCollectAll( HB_FALSE );
}
HB_FUNC( HB_PUSHSIGNALHANDLER )
@@ -911,7 +911,7 @@ HB_FUNC( HB_POPSIGNALHANDLER )
hb_arrayDel( sp_hooks, nLen );
hb_arrayDel( sp_hooks, nLen - 1 );
hb_arraySize( sp_hooks, nLen - 2 );
hb_retl( TRUE );
hb_retl( HB_TRUE );
if( hb_arrayLen( sp_hooks ) == 0 )
{
hb_itemRelease( sp_hooks );
@@ -920,13 +920,13 @@ HB_FUNC( HB_POPSIGNALHANDLER )
}
else
{
hb_retl( FALSE );
hb_retl( HB_FALSE );
}
hb_threadLeaveCriticalSection( &s_ServiceMutex );
}
else
{
hb_retl( FALSE );
hb_retl( HB_FALSE );
}
}

2
harbour/contrib/xhb/hbserv.h
View File

@@ -56,7 +56,7 @@
#include "hbserv.ch"
#endif
HB_EXTERN_BEGIN
HB_EXPORT BOOL hb_isService( void );
HB_EXPORT HB_BOOL hb_isService( void );
HB_EXPORT void hb_serviceExit( void );
HB_EXTERN_END
#endif

16
harbour/contrib/xhb/txtline.c
View File

@@ -56,11 +56,11 @@
#include "hbapiitm.h"
#include "hbapierr.h"
void hb_readLine( const char * szText, HB_SIZE ulTextLen, HB_SIZE uiLineLen, USHORT uiTabLen, BOOL bWrap, char ** Term, int * iTermSizes, USHORT uiTerms, BOOL * bFound, BOOL * bEOF, LONG * lEnd, HB_SIZE * ulEndOffset )
void hb_readLine( const char * szText, HB_SIZE ulTextLen, HB_SIZE uiLineLen, USHORT uiTabLen, HB_BOOL bWrap, char ** Term, int * iTermSizes, USHORT uiTerms, HB_BOOL * bFound, HB_BOOL * bEOF, LONG * lEnd, HB_SIZE * ulEndOffset )
{
USHORT uiPosTerm, uiPosition;
HB_SIZE ulPos, ulCurrCol, ulLastBlk;
BOOL bBreak = 0;
HB_BOOL bBreak = HB_FALSE;
HB_TRACE(HB_TR_DEBUG, ("hb_readLine(%p, %lu, %lu, %hu, %d, %p, %p, %hu, %p, %p, %p, %p)", szText, ulTextLen, uiLineLen, uiTabLen, bWrap, Term, iTermSizes, uiTerms, bFound, bEOF, lEnd, ulEndOffset ));
@@ -149,7 +149,7 @@ void hb_readLine( const char * szText, HB_SIZE ulTextLen, HB_SIZE uiLineLen, USH
if( ulCurrCol > uiLineLen )
{
if( bWrap == FALSE || ulLastBlk == 0 )
if( bWrap == HB_FALSE || ulLastBlk == 0 )
{
*lEnd = ulPos-1;
*ulEndOffset = ulPos;
@@ -166,7 +166,7 @@ void hb_readLine( const char * szText, HB_SIZE ulTextLen, HB_SIZE uiLineLen, USH
}
}
if( *bFound == FALSE && bBreak == FALSE )
if( *bFound == HB_FALSE && bBreak == HB_FALSE )
{
*lEnd = ulTextLen - 1;
*ulEndOffset = ulTextLen - 1;
@@ -239,13 +239,13 @@ HB_FUNC( HB_READLINE )
USHORT uiTabLen, uiTerms;
HB_SIZE ulLineSize = hb_parni(3);
USHORT i;
BOOL bWrap = hb_parl(5);
BOOL bFound, bEOF;
HB_BOOL bWrap = hb_parl(5);
HB_BOOL bFound, bEOF;
HB_SIZE ulStartOffset;
HB_SIZE ulEndOffset, ulTextLen;
LONG lEnd;
PHB_ITEM pOpt;
BOOL bAlloc_Term1 = FALSE;
HB_BOOL bAlloc_Term1 = HB_FALSE;
if( !HB_ISCHAR( 1 ) )
{
@@ -276,7 +276,7 @@ HB_FUNC( HB_READLINE )
}
pTerm1 = hb_itemPutC( NULL, hb_setGetCPtr( HB_SET_EOL ) );
bAlloc_Term1 = TRUE;
bAlloc_Term1 = HB_TRUE;
}
else
{

8
harbour/contrib/xhb/xhb.h
View File

@@ -59,14 +59,14 @@
HB_EXTERN_BEGIN
/* functions in hboutdbg.c */
extern HB_EXPORT BOOL hb_OutDebugName( PHB_ITEM pName );
extern HB_EXPORT HB_BOOL hb_OutDebugName( PHB_ITEM pName );
extern HB_EXPORT void hb_OutDebug( const char * szMsg, HB_SIZE ulMsgLen );
/* functions in dbgfxc.c */
extern HB_EXPORT BOOL hb_ToOutDebugOnOff( BOOL bOnOff );
extern HB_EXPORT HB_BOOL hb_ToOutDebugOnOff( HB_BOOL bOnOff );
extern HB_EXPORT void hb_ToOutDebug( const char * sTraceMsg, ... );
extern HB_EXPORT BOOL hb_ToLogFileOnOff( BOOL bOnOff );
extern HB_EXPORT BOOL hb_EmptyLogFile( BOOL bOnOff );
extern HB_EXPORT HB_BOOL hb_ToLogFileOnOff( HB_BOOL bOnOff );
extern HB_EXPORT HB_BOOL hb_EmptyLogFile( HB_BOOL bOnOff );
extern HB_EXPORT void hb_ToLogFile( const char * sFile, const char * sTraceMsg, ... );
#define hb_seconds() hb_dateSeconds()

10
harbour/contrib/xhb/xhbcopyf.c
View File

@@ -63,9 +63,9 @@
#define BUFFER_SIZE 8192
static BOOL hb_copyfile( const char * szSource, const char * szDest, PHB_ITEM pBlock )
static HB_BOOL hb_copyfile( const char * szSource, const char * szDest, PHB_ITEM pBlock )
{
BOOL bRetVal = FALSE;
HB_BOOL bRetVal = HB_FALSE;
HB_FHANDLE fhndSource;
HB_TRACE(HB_TR_DEBUG, ("hb_copyfile(%s, %s)", szSource, szDest));
@@ -99,7 +99,7 @@ static BOOL hb_copyfile( const char * szSource, const char * szDest, PHB_ITEM pB
BYTE * buffer = ( BYTE * ) hb_xgrab( BUFFER_SIZE );
USHORT usRead;
bRetVal = TRUE;
bRetVal = HB_TRUE;
if( hb_itemType( pBlock ) != HB_IT_BLOCK )
pBlock = NULL;
@@ -112,7 +112,7 @@ static BOOL hb_copyfile( const char * szSource, const char * szDest, PHB_ITEM pB
if( uiAction != E_RETRY )
{
bRetVal = FALSE;
bRetVal = HB_FALSE;
break;
}
}
@@ -150,7 +150,7 @@ HB_FUNC( XHB_COPYFILE )
if( HB_ISCHAR( 1 ) && HB_ISCHAR( 2 ) )
{
if( ! hb_copyfile( hb_parc( 1 ), hb_parc( 2 ), hb_param( 3, HB_IT_BLOCK ) ) )
hb_retl( FALSE );
hb_retl( HB_FALSE );
}
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); /* NOTE: Undocumented but existing Clipper Run-time error */

2
harbour/contrib/xhb/xhberrc.c
View File

@@ -90,7 +90,7 @@ LONG WINAPI PRGUnhandledExceptionFilter( EXCEPTION_POINTERS *ExceptionInfo )
hb_itemPutCLStatic( &Buffer, (char *) ExceptionInfo, sizeof( EXCEPTION_POINTERS ) );
Adopt.type = HB_IT_LOGICAL;
Adopt.item.asLogical.value = FALSE;
Adopt.item.asLogical.value = HB_FALSE;
hb_objSendMsg( &Exception, "Buffer", 2, &Buffer, &Adopt );
}

4
harbour/contrib/xhb/xhbfunc.c
View File

@@ -222,7 +222,7 @@ HB_FUNC( HB_F_EOF )
uiError = hb_fsError();
}
else
hb_retl( TRUE );
hb_retl( HB_TRUE );
hb_fsSetFError( uiError );
}
@@ -278,7 +278,7 @@ HB_FUNC( HB_EXEC )
{
if( HB_ISSYMBOL( 1 ) )
{
BOOL fSend = FALSE;
HB_BOOL fSend = HB_FALSE;
int iParams = hb_pcount() - 1;
if( iParams >= 1 )

4
harbour/contrib/xhb/xhbis.c
View File

@@ -101,7 +101,7 @@ HB_FUNC( ISALNUM )
if( szString != NULL )
hb_retl( HB_ISALNUM( ( BYTE ) * szString ) );
else
hb_retl( FALSE );
hb_retl( HB_FALSE );
}
/* determines if first char of a string is a white-space character;
@@ -116,7 +116,7 @@ HB_FUNC( ISSPACE )
if( szString != NULL )
hb_retl( HB_ISSPACE( ( BYTE ) * szString ) );
else
hb_retl( FALSE );
hb_retl( HB_FALSE );
}
/* determines if first char of a string is a hexadecimal digit

2
harbour/contrib/xhb/xhbmsgs.c
View File

@@ -102,7 +102,7 @@ HB_FUNC( XHB_INCLUDE )
if( HB_IS_ARRAY( pSelf ) )
{
hb_retl( hb_arrayScan( pSelf, pKey, NULL, NULL, TRUE ) != 0 );
hb_retl( hb_arrayScan( pSelf, pKey, NULL, NULL, HB_TRUE ) != 0 );
}
else if( HB_IS_HASH( pSelf ) && ( HB_IS_HASHKEY( pKey ) || hb_hashLen( pKey ) == 1 ) )
{

14
harbour/contrib/xhb/xhbsave.c
View File

@@ -54,7 +54,7 @@
#include "hbapigt.h"
static void hb_getScreenRange( USHORT * pusMin, USHORT * pusMax,
BOOL fNoCheck, BOOL fVertical )
HB_BOOL fNoCheck, HB_BOOL fVertical )
{
int iFrom, iTo, iMax;
@@ -98,10 +98,10 @@ HB_FUNC( XHB_SAVESCREEN )
USHORT uiTop, uiLeft, uiBottom, uiRight;
HB_SIZE ulSize;
void * pBuffer;
BOOL fNoCheck = hb_parl( 5 );
HB_BOOL fNoCheck = hb_parl( 5 );
hb_getScreenRange( &uiTop, &uiBottom, fNoCheck, TRUE );
hb_getScreenRange( &uiLeft, &uiRight, fNoCheck, FALSE );
hb_getScreenRange( &uiTop, &uiBottom, fNoCheck, HB_TRUE );
hb_getScreenRange( &uiLeft, &uiRight, fNoCheck, HB_FALSE );
hb_gtRectSize( uiTop, uiLeft, uiBottom, uiRight, &ulSize );
pBuffer = hb_xgrab( ulSize + 1 );
@@ -115,10 +115,10 @@ HB_FUNC( XHB_RESTSCREEN )
if( HB_ISCHAR( 5 ) )
{
USHORT uiTop, uiLeft, uiBottom, uiRight;
BOOL fNoCheck = hb_parl( 6 );
HB_BOOL fNoCheck = hb_parl( 6 );
hb_getScreenRange( &uiTop, &uiBottom, fNoCheck, TRUE );
hb_getScreenRange( &uiLeft, &uiRight, fNoCheck, FALSE );
hb_getScreenRange( &uiTop, &uiBottom, fNoCheck, HB_TRUE );
hb_getScreenRange( &uiLeft, &uiRight, fNoCheck, HB_FALSE );
hb_gtRest( uiTop, uiLeft, uiBottom, uiRight, ( void * ) hb_parc( 5 ) );
}

176
harbour/include/hbapi.h
View File

@@ -303,8 +303,8 @@ struct hb_struBlock
struct hb_struPointer
{
void * value;
BOOL collect;
BOOL single;
HB_BOOL collect;
HB_BOOL single;
};
struct hb_struDateTime
@@ -334,7 +334,7 @@ struct hb_struLong
struct hb_struLogical
{
BOOL value;
HB_BOOL value;
};
struct hb_struMemvar
@@ -442,7 +442,7 @@ typedef struct _HB_CODEBLOCK
PHB_ITEM pLocals; /* table with referenced local variables */
void * pStatics; /* STATICs base frame */
USHORT uiLocals; /* number of referenced local variables */
SHORT dynBuffer; /* is pcode buffer allocated dynamically, SHORT used instead of BOOL intentionally to force optimal alignment */
SHORT dynBuffer; /* is pcode buffer allocated dynamically, SHORT used instead of HB_BOOL intentionally to force optimal alignment */
} HB_CODEBLOCK, * PHB_CODEBLOCK, * HB_CODEBLOCK_PTR;
typedef void ( * HB_EXTREF_FUNC0 )( void * );
@@ -503,7 +503,7 @@ extern void hb_xclean( void );
#ifdef _HB_API_INTERNAL_
extern void hb_xRefInc( void * pMem ); /* increment reference counter */
extern BOOL hb_xRefDec( void * pMem ); /* decrement reference counter, return HB_TRUE when 0 reached */
extern HB_BOOL hb_xRefDec( void * pMem ); /* decrement reference counter, return HB_TRUE when 0 reached */
extern void hb_xRefFree( void * pMem ); /* decrement reference counter and free the block when 0 reached */
extern HB_COUNTER hb_xRefCount( void * pMem ); /* return number of references */
extern void * hb_xRefResize( void * pMem, ULONG ulSave, ULONG ulSize, ULONG * pulAllocated ); /* reallocates memory, create copy if reference counter greater then 1 */
@@ -617,15 +617,15 @@ extern HB_COUNTER hb_gcRefCount( void * pAlloc ); /* return number of reference
#endif /* _HB_API_INTERNAL_ */
extern void hb_gcCollect( void ); /* checks if a single memory block can be released */
extern void hb_gcCollectAll( BOOL fForce ); /* checks if all memory blocks can be released */
extern void hb_gcCollectAll( HB_BOOL fForce ); /* checks if all memory blocks can be released */
/* Extend API */
extern HB_EXPORT ULONG hb_parinfo( int iParam ); /* Determine the param count or data type */
extern HB_EXPORT ULONG hb_parinfa( int iParamNum, HB_SIZE uiArrayIndex ); /* retrieve length or element type of an array parameter */
extern HB_EXPORT PHB_ITEM hb_param( int iParam, long lMask ); /* retrieve a generic parameter */
extern HB_EXPORT PHB_ITEM hb_paramError( int iParam ); /* Returns either the generic parameter or a NIL item if param not provided */
extern HB_EXPORT BOOL hb_extIsArray( int iParam );
extern HB_EXPORT BOOL hb_extIsObject( int iParam );
extern HB_EXPORT HB_BOOL hb_extIsArray( int iParam );
extern HB_EXPORT HB_BOOL hb_extIsObject( int iParam );
extern HB_EXPORT const char * hb_parc( int iParam ); /* retrieve a string parameter */
extern HB_EXPORT const char * hb_parcx( int iParam ); /* retrieve a string parameter */
@@ -635,7 +635,7 @@ extern HB_EXPORT const char * hb_pards( int iParam ); /* retrieve a date as a st
extern HB_EXPORT char * hb_pardsbuff( char * szDate, int iParam ); /* retrieve a date as a string YYYYMMDD */
extern HB_EXPORT long hb_pardl( int iParam ); /* retrieve a date as a long integer */
extern HB_EXPORT double hb_partd( int iParam ); /* retrieve a timestamp as a double number */
extern HB_EXPORT BOOL hb_partdt( long * plJulian, long * plMilliSec , int iParam ); /* retrieve a timestamp as two long numbers */
extern HB_EXPORT HB_BOOL hb_partdt( long * plJulian, long * plMilliSec , int iParam ); /* retrieve a timestamp as two long numbers */
extern HB_EXPORT int hb_parl( int iParam ); /* retrieve a logical parameter as an int */
extern HB_EXPORT int hb_parldef( int iParam, int iDefValue ); /* retrieve a logical parameter as an int, return default value if parameter isn't logical */
extern HB_EXPORT double hb_parnd( int iParam ); /* retrieve a numeric parameter as a double */
@@ -658,7 +658,7 @@ extern HB_EXPORT const char * hb_parvds( int iParam, ... ); /* retrieve a date a
extern HB_EXPORT char * hb_parvdsbuff( char * szDate, int iParam, ... ); /* retrieve a date as a string YYYYMMDD */
extern HB_EXPORT long hb_parvdl( int iParam, ... ); /* retrieve a date as a long integer */
extern HB_EXPORT double hb_parvtd( int iParam, ... ); /* retrieve a timestamp as a double number */
extern HB_EXPORT BOOL hb_parvtdt( long * plJulian, long * plMilliSec , int iParam, ... ); /* retrieve a timestamp as two long numbers */
extern HB_EXPORT HB_BOOL hb_parvtdt( long * plJulian, long * plMilliSec , int iParam, ... ); /* retrieve a timestamp as two long numbers */
extern HB_EXPORT int hb_parvl( int iParam, ... ); /* retrieve a logical parameter as an int */
extern HB_EXPORT double hb_parvnd( int iParam, ... ); /* retrieve a numeric parameter as a double */
extern HB_EXPORT int hb_parvni( int iParam, ... ); /* retrieve a numeric parameter as a integer */
@@ -787,18 +787,18 @@ extern HB_EXPORT int hb_storvnll( LONGLONG lValue, int iParam, ... ); /* stor
#endif
/* array management */
extern HB_EXPORT BOOL hb_arrayNew( PHB_ITEM pItem, HB_SIZE ulLen ); /* creates a new array */
extern HB_EXPORT HB_BOOL hb_arrayNew( PHB_ITEM pItem, HB_SIZE ulLen ); /* creates a new array */
extern HB_EXPORT HB_SIZE hb_arrayLen( PHB_ITEM pArray ); /* retrieves the array len */
extern HB_EXPORT BOOL hb_arrayIsObject( PHB_ITEM pArray ); /* retrieves if the array is an object */
extern HB_EXPORT HB_BOOL hb_arrayIsObject( PHB_ITEM pArray ); /* retrieves if the array is an object */
extern HB_EXPORT void * hb_arrayId( PHB_ITEM pArray ); /* retrieves the array unique ID */
extern HB_EXPORT BOOL hb_arrayAdd( PHB_ITEM pArray, PHB_ITEM pItemValue ); /* add a new item to the end of an array item */
extern HB_EXPORT BOOL hb_arrayAddForward( PHB_ITEM pArray, PHB_ITEM pValue ); /* add a new item to the end of an array item with no incrementing of reference counters */
extern HB_EXPORT BOOL hb_arrayIns( PHB_ITEM pArray, HB_SIZE ulIndex ); /* insert a nil item into an array, without changing the length */
extern HB_EXPORT BOOL hb_arrayDel( PHB_ITEM pArray, HB_SIZE ulIndex ); /* delete an array item, without changing length */
extern HB_EXPORT BOOL hb_arraySize( PHB_ITEM pArray, HB_SIZE ulLen ); /* sets the array total length */
extern HB_EXPORT BOOL hb_arrayLast( PHB_ITEM pArray, PHB_ITEM pResult ); /* retrieve last item in an array */
extern HB_EXPORT BOOL hb_arrayGet( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_ITEM pItem ); /* retrieves an item */
extern HB_EXPORT BOOL hb_arrayGetItemRef( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_ITEM pItem ); /* create a reference to an array element */
extern HB_EXPORT HB_BOOL hb_arrayAdd( PHB_ITEM pArray, PHB_ITEM pItemValue ); /* add a new item to the end of an array item */
extern HB_EXPORT HB_BOOL hb_arrayAddForward( PHB_ITEM pArray, PHB_ITEM pValue ); /* add a new item to the end of an array item with no incrementing of reference counters */
extern HB_EXPORT HB_BOOL hb_arrayIns( PHB_ITEM pArray, HB_SIZE ulIndex ); /* insert a nil item into an array, without changing the length */
extern HB_EXPORT HB_BOOL hb_arrayDel( PHB_ITEM pArray, HB_SIZE ulIndex ); /* delete an array item, without changing length */
extern HB_EXPORT HB_BOOL hb_arraySize( PHB_ITEM pArray, HB_SIZE ulLen ); /* sets the array total length */
extern HB_EXPORT HB_BOOL hb_arrayLast( PHB_ITEM pArray, PHB_ITEM pResult ); /* retrieve last item in an array */
extern HB_EXPORT HB_BOOL hb_arrayGet( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_ITEM pItem ); /* retrieves an item */
extern HB_EXPORT HB_BOOL hb_arrayGetItemRef( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_ITEM pItem ); /* create a reference to an array element */
/* hb_arrayGetItemPtr() is dangerous, be sure that base ARRAY value will not be changed (f.e. resized) */
extern HB_EXPORT PHB_ITEM hb_arrayGetItemPtr( PHB_ITEM pArray, HB_SIZE ulIndex ); /* returns pointer to specified element of the array */
extern HB_EXPORT HB_SIZE hb_arrayCopyC( PHB_ITEM pArray, HB_SIZE ulIndex, char * szBuffer, HB_SIZE ulLen ); /* copy a string from an array item */
@@ -808,7 +808,7 @@ extern HB_EXPORT HB_SIZE hb_arrayGetCLen( PHB_ITEM pArray, HB_SIZE ulIndex
extern HB_EXPORT void * hb_arrayGetPtr( PHB_ITEM pArray, HB_SIZE ulIndex ); /* retrieves the pointer contained on an array element */
extern HB_EXPORT void * hb_arrayGetPtrGC( PHB_ITEM pArray, HB_SIZE ulIndex, const HB_GC_FUNCS * pFuncs ); /* retrieves the GC pointer contained on an array element */
extern HB_EXPORT PHB_SYMB hb_arrayGetSymbol( PHB_ITEM pArray, HB_SIZE ulIndex ); /* retrieves symbol contained on an array element */
extern HB_EXPORT BOOL hb_arrayGetL( PHB_ITEM pArray, HB_SIZE ulIndex ); /* retrieves the logical value contained on an array element */
extern HB_EXPORT HB_BOOL hb_arrayGetL( PHB_ITEM pArray, HB_SIZE ulIndex ); /* retrieves the logical value contained on an array element */
extern HB_EXPORT int hb_arrayGetNI( PHB_ITEM pArray, HB_SIZE ulIndex ); /* retrieves the int value contained on an array element */
extern HB_EXPORT long hb_arrayGetNL( PHB_ITEM pArray, HB_SIZE ulIndex ); /* retrieves the long numeric value contained on an array element */
extern HB_EXPORT HB_LONG hb_arrayGetNInt( PHB_ITEM pArray, HB_SIZE ulIndex ); /* retrieves the HB_LONG value contained on an array element */
@@ -816,36 +816,36 @@ extern HB_EXPORT double hb_arrayGetND( PHB_ITEM pArray, HB_SIZE ulIndex );
extern HB_EXPORT char * hb_arrayGetDS( PHB_ITEM pArray, HB_SIZE ulIndex, char * szDate ); /* retrieves the date value contained in an array element */
extern HB_EXPORT long hb_arrayGetDL( PHB_ITEM pArray, HB_SIZE ulIndex ); /* retrieves the date value contained in an array element, as a long integer */
extern HB_EXPORT double hb_arrayGetTD( PHB_ITEM pArray, HB_SIZE ulIndex ); /* retrieves the timestamp value contained in an array element, as a double value */
extern HB_EXPORT BOOL hb_arrayGetTDT( PHB_ITEM pArray, HB_SIZE ulIndex, long * plJulian, long * plMilliSec ); /* retrieves the timestamp value contained in an array element, as two long values */
extern HB_EXPORT HB_BOOL hb_arrayGetTDT( PHB_ITEM pArray, HB_SIZE ulIndex, long * plJulian, long * plMilliSec ); /* retrieves the timestamp value contained in an array element, as two long values */
extern HB_EXPORT HB_TYPE hb_arrayGetType( PHB_ITEM pArray, HB_SIZE ulIndex ); /* retrieves the type of an array item */
extern HB_EXPORT BOOL hb_arraySet( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_ITEM pItem ); /* sets an array element */
extern HB_EXPORT BOOL hb_arraySetForward( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_ITEM pItem ); /* sets an array element by forwarding it's value */
extern HB_EXPORT BOOL hb_arraySetDS( PHB_ITEM pArray, HB_SIZE ulIndex, const char * szDate );
extern HB_EXPORT BOOL hb_arraySetDL( PHB_ITEM pArray, HB_SIZE ulIndex, long lDate );
extern HB_EXPORT BOOL hb_arraySetTD( PHB_ITEM pArray, HB_SIZE ulIndex, double dTimeStamp );
extern HB_EXPORT BOOL hb_arraySetTDT( PHB_ITEM pArray, HB_SIZE ulIndex, long lJulian, long lMilliSec );
extern HB_EXPORT BOOL hb_arraySetL( PHB_ITEM pArray, HB_SIZE ulIndex, BOOL fValue );
extern HB_EXPORT BOOL hb_arraySetNI( PHB_ITEM pArray, HB_SIZE ulIndex, int iNumber );
extern HB_EXPORT BOOL hb_arraySetNL( PHB_ITEM pArray, HB_SIZE ulIndex, long lNumber );
extern HB_EXPORT HB_BOOL hb_arraySet( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_ITEM pItem ); /* sets an array element */
extern HB_EXPORT HB_BOOL hb_arraySetForward( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_ITEM pItem ); /* sets an array element by forwarding it's value */
extern HB_EXPORT HB_BOOL hb_arraySetDS( PHB_ITEM pArray, HB_SIZE ulIndex, const char * szDate );
extern HB_EXPORT HB_BOOL hb_arraySetDL( PHB_ITEM pArray, HB_SIZE ulIndex, long lDate );
extern HB_EXPORT HB_BOOL hb_arraySetTD( PHB_ITEM pArray, HB_SIZE ulIndex, double dTimeStamp );
extern HB_EXPORT HB_BOOL hb_arraySetTDT( PHB_ITEM pArray, HB_SIZE ulIndex, long lJulian, long lMilliSec );
extern HB_EXPORT HB_BOOL hb_arraySetL( PHB_ITEM pArray, HB_SIZE ulIndex, HB_BOOL fValue );
extern HB_EXPORT HB_BOOL hb_arraySetNI( PHB_ITEM pArray, HB_SIZE ulIndex, int iNumber );
extern HB_EXPORT HB_BOOL hb_arraySetNL( PHB_ITEM pArray, HB_SIZE ulIndex, long lNumber );
#ifndef HB_LONG_LONG_OFF
extern HB_EXPORT BOOL hb_arraySetNLL( PHB_ITEM pArray, HB_SIZE ulIndex, LONGLONG llNumber );
extern HB_EXPORT HB_BOOL hb_arraySetNLL( PHB_ITEM pArray, HB_SIZE ulIndex, LONGLONG llNumber );
#endif
extern HB_EXPORT BOOL hb_arraySetNInt( PHB_ITEM pArray, HB_SIZE ulIndex, HB_LONG lNumber );
extern HB_EXPORT BOOL hb_arraySetND( PHB_ITEM pArray, HB_SIZE ulIndex, double dNumber );
extern HB_EXPORT BOOL hb_arraySetC( PHB_ITEM pArray, HB_SIZE ulIndex, const char * szText );
extern HB_EXPORT BOOL hb_arraySetCL( PHB_ITEM pArray, HB_SIZE ulIndex, const char * szText, HB_SIZE ulLen );
extern HB_EXPORT BOOL hb_arraySetCLPtr( PHB_ITEM pArray, HB_SIZE ulIndex, char * szText, HB_SIZE ulLen );
extern HB_EXPORT BOOL hb_arraySetPtr( PHB_ITEM pArray, HB_SIZE ulIndex, void * pValue );
extern HB_EXPORT BOOL hb_arraySetPtrGC( PHB_ITEM pArray, HB_SIZE ulIndex, void * pValue );
extern HB_EXPORT BOOL hb_arraySetSymbol( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_SYMB pSymbol );
extern HB_EXPORT BOOL hb_arrayFill( PHB_ITEM pArray, PHB_ITEM pValue, HB_SIZE * pulStart, HB_SIZE * pulCount ); /* fill an array with a given item */
extern HB_EXPORT HB_SIZE hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, HB_SIZE * pulStart, HB_SIZE * pulCount, BOOL fExact ); /* scan an array for a given item, or until code-block item returns HB_TRUE */
extern HB_EXPORT HB_SIZE hb_arrayRevScan( PHB_ITEM pArray, PHB_ITEM pValue, HB_SIZE * pulStart, HB_SIZE * pulCount, BOOL fExact ); /* scan an array for a given item, or until code-block item returns HB_TRUE in reverted order */
extern HB_EXPORT BOOL hb_arrayEval( PHB_ITEM pArray, PHB_ITEM bBlock, HB_SIZE * pulStart, HB_SIZE * pulCount ); /* execute a code-block for every element of an array item */
extern HB_EXPORT BOOL hb_arrayCopy( PHB_ITEM pSrcArray, PHB_ITEM pDstArray, HB_SIZE * pulStart, HB_SIZE * pulCount, HB_SIZE * pulTarget ); /* copy items from one array to another */
extern HB_EXPORT HB_BOOL hb_arraySetNInt( PHB_ITEM pArray, HB_SIZE ulIndex, HB_LONG lNumber );
extern HB_EXPORT HB_BOOL hb_arraySetND( PHB_ITEM pArray, HB_SIZE ulIndex, double dNumber );
extern HB_EXPORT HB_BOOL hb_arraySetC( PHB_ITEM pArray, HB_SIZE ulIndex, const char * szText );
extern HB_EXPORT HB_BOOL hb_arraySetCL( PHB_ITEM pArray, HB_SIZE ulIndex, const char * szText, HB_SIZE ulLen );
extern HB_EXPORT HB_BOOL hb_arraySetCLPtr( PHB_ITEM pArray, HB_SIZE ulIndex, char * szText, HB_SIZE ulLen );
extern HB_EXPORT HB_BOOL hb_arraySetPtr( PHB_ITEM pArray, HB_SIZE ulIndex, void * pValue );
extern HB_EXPORT HB_BOOL hb_arraySetPtrGC( PHB_ITEM pArray, HB_SIZE ulIndex, void * pValue );
extern HB_EXPORT HB_BOOL hb_arraySetSymbol( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_SYMB pSymbol );
extern HB_EXPORT HB_BOOL hb_arrayFill( PHB_ITEM pArray, PHB_ITEM pValue, HB_SIZE * pulStart, HB_SIZE * pulCount ); /* fill an array with a given item */
extern HB_EXPORT HB_SIZE hb_arrayScan( PHB_ITEM pArray, PHB_ITEM pValue, HB_SIZE * pulStart, HB_SIZE * pulCount, HB_BOOL fExact ); /* scan an array for a given item, or until code-block item returns HB_TRUE */
extern HB_EXPORT HB_SIZE hb_arrayRevScan( PHB_ITEM pArray, PHB_ITEM pValue, HB_SIZE * pulStart, HB_SIZE * pulCount, HB_BOOL fExact ); /* scan an array for a given item, or until code-block item returns HB_TRUE in reverted order */
extern HB_EXPORT HB_BOOL hb_arrayEval( PHB_ITEM pArray, PHB_ITEM bBlock, HB_SIZE * pulStart, HB_SIZE * pulCount ); /* execute a code-block for every element of an array item */
extern HB_EXPORT HB_BOOL hb_arrayCopy( PHB_ITEM pSrcArray, PHB_ITEM pDstArray, HB_SIZE * pulStart, HB_SIZE * pulCount, HB_SIZE * pulTarget ); /* copy items from one array to another */
extern HB_EXPORT PHB_ITEM hb_arrayClone( PHB_ITEM pArray ); /* returns a duplicate of an existing array, including all nested items */
extern HB_EXPORT PHB_ITEM hb_arrayCloneTo( PHB_ITEM pDest, PHB_ITEM pArray ); /* returns a duplicate of an existing array, including all nested items */
extern HB_EXPORT BOOL hb_arraySort( PHB_ITEM pArray, HB_SIZE * pulStart, HB_SIZE * pulCount, PHB_ITEM pBlock ); /* sorts an array item */
extern HB_EXPORT HB_BOOL hb_arraySort( PHB_ITEM pArray, HB_SIZE * pulStart, HB_SIZE * pulCount, PHB_ITEM pBlock ); /* sorts an array item */
extern HB_EXPORT PHB_ITEM hb_arrayFromStack( USHORT uiLen ); /* Creates and returns an Array of n Elements from the Eval Stack - Does NOT pop the items. */
extern HB_EXPORT PHB_ITEM hb_arrayFromParams( int iLevel ); /* Creates and returns an Array of Generic Parameters for a given call level */
extern HB_EXPORT PHB_ITEM hb_arrayBaseParams( void ); /* Creates and returns an Array of Generic Parameters for current base symbol. */
@@ -864,16 +864,16 @@ extern void hb_hashCloneBody( PHB_ITEM pHash, PHB_ITEM pDest, PHB_NESTED_CLONED
/* hash management */
extern HB_EXPORT PHB_ITEM hb_hashNew( PHB_ITEM pItem );
extern HB_EXPORT HB_SIZE hb_hashLen( PHB_ITEM pHash );
extern HB_EXPORT BOOL hb_hashDel( PHB_ITEM pHash, PHB_ITEM pKey );
extern HB_EXPORT BOOL hb_hashAdd( PHB_ITEM pHash, PHB_ITEM pKey, PHB_ITEM pValue );
extern HB_EXPORT BOOL hb_hashAddNew( PHB_ITEM pHash, PHB_ITEM pKey, PHB_ITEM pValue );
extern HB_EXPORT BOOL hb_hashRemove( PHB_ITEM pHash, PHB_ITEM pItem );
extern HB_EXPORT BOOL hb_hashAllocNewPair( PHB_ITEM pHash, PHB_ITEM * pKeyPtr, PHB_ITEM * pValPtr );
extern HB_EXPORT HB_BOOL hb_hashDel( PHB_ITEM pHash, PHB_ITEM pKey );
extern HB_EXPORT HB_BOOL hb_hashAdd( PHB_ITEM pHash, PHB_ITEM pKey, PHB_ITEM pValue );
extern HB_EXPORT HB_BOOL hb_hashAddNew( PHB_ITEM pHash, PHB_ITEM pKey, PHB_ITEM pValue );
extern HB_EXPORT HB_BOOL hb_hashRemove( PHB_ITEM pHash, PHB_ITEM pItem );
extern HB_EXPORT HB_BOOL hb_hashAllocNewPair( PHB_ITEM pHash, PHB_ITEM * pKeyPtr, PHB_ITEM * pValPtr );
extern HB_EXPORT void hb_hashSort( PHB_ITEM pHash );
extern HB_EXPORT PHB_ITEM hb_hashClone( PHB_ITEM pHash );
extern HB_EXPORT PHB_ITEM hb_hashCloneTo( PHB_ITEM pDest, PHB_ITEM pHash );
extern HB_EXPORT void hb_hashJoin( PHB_ITEM pDest, PHB_ITEM pSource, int iType );
extern HB_EXPORT BOOL hb_hashScan( PHB_ITEM pHash, PHB_ITEM pKey, HB_SIZE * pulPos );
extern HB_EXPORT HB_BOOL hb_hashScan( PHB_ITEM pHash, PHB_ITEM pKey, HB_SIZE * pulPos );
extern HB_EXPORT void hb_hashPreallocate( PHB_ITEM pHash, HB_SIZE ulNewSize );
extern HB_EXPORT PHB_ITEM hb_hashGetKeys( PHB_ITEM pHash );
extern HB_EXPORT PHB_ITEM hb_hashGetValues( PHB_ITEM pHash );
@@ -891,7 +891,7 @@ extern HB_EXPORT PHB_ITEM hb_hashGetCItemPtr( PHB_ITEM pHash, const char * pszK
extern HB_EXPORT PHB_ITEM hb_hashGetKeyAt( PHB_ITEM pHash, HB_SIZE ulPos );
extern HB_EXPORT PHB_ITEM hb_hashGetValueAt( PHB_ITEM pHash, HB_SIZE ulPos );
extern HB_EXPORT BOOL hb_hashDelAt( PHB_ITEM pHash, HB_SIZE ulPos );
extern HB_EXPORT HB_BOOL hb_hashDelAt( PHB_ITEM pHash, HB_SIZE ulPos );
/* hash item flags */
#define HB_HASH_AUTOADD_NEVER 0x00
@@ -930,28 +930,28 @@ extern HB_EXPORT HB_SIZE hb_strlentrim( const char * pszText ); /* like strlen
extern HB_EXPORT HB_SIZE hb_strnlen( const char * pszText, HB_SIZE ulLen ); /* like strlen() but result is limited to ulLen */
extern HB_EXPORT char * hb_xstrcat( char * dest, const char * src, ... ); /* Concatenates multiple strings into a single result */
extern HB_EXPORT char * hb_xstrcpy( char * szDest, const char * szSrc, ... ); /* Concatenates multiple strings into a single result */
extern HB_EXPORT BOOL hb_compStrToNum( const char * szNum, HB_SIZE ulLen, HB_LONG * plVal, double * pdVal, int * piDec, int * piWidth ); /* converts string to number, sets iDec, iWidth and returns HB_TRUE if results is double, used by compiler */
extern HB_EXPORT BOOL hb_valStrnToNum( const char * szNum, HB_SIZE ulLen, HB_LONG * plVal, double * pdVal, int * piDec, int * piWidth ); /* converts string to number, sets iDec, iWidth and returns HB_TRUE if results is double, used by VAL() */
extern HB_EXPORT BOOL hb_strToNum( const char * szNum, HB_LONG * plVal, double * pdVal ); /* converts string to number, returns HB_TRUE if results is double */
extern HB_EXPORT BOOL hb_strnToNum( const char * szNum, HB_SIZE ulLen, HB_LONG * plVal, double * pdVal ); /* converts string to number, returns HB_TRUE if results is double */
extern HB_EXPORT HB_BOOL hb_compStrToNum( const char * szNum, HB_SIZE ulLen, HB_LONG * plVal, double * pdVal, int * piDec, int * piWidth ); /* converts string to number, sets iDec, iWidth and returns HB_TRUE if results is double, used by compiler */
extern HB_EXPORT HB_BOOL hb_valStrnToNum( const char * szNum, HB_SIZE ulLen, HB_LONG * plVal, double * pdVal, int * piDec, int * piWidth ); /* converts string to number, sets iDec, iWidth and returns HB_TRUE if results is double, used by VAL() */
extern HB_EXPORT HB_BOOL hb_strToNum( const char * szNum, HB_LONG * plVal, double * pdVal ); /* converts string to number, returns HB_TRUE if results is double */
extern HB_EXPORT HB_BOOL hb_strnToNum( const char * szNum, HB_SIZE ulLen, HB_LONG * plVal, double * pdVal ); /* converts string to number, returns HB_TRUE if results is double */
extern HB_EXPORT int hb_snprintf( char * buffer, size_t bufsize, const char * format, ... ) HB_PRINTF_FORMAT( 3, 4 ); /* snprintf() equivalent */
extern HB_EXPORT int hb_vsnprintf( char * buffer, size_t bufsize, const char * format, va_list ap ); /* vsnprintf() equivalent */
extern HB_EXPORT int hb_printf_params( const char * format );
extern HB_EXPORT BOOL hb_strMatchFile( const char * pszString, const char * szPattern ); /* compare two strings using platform dependent rules for file matching */
extern HB_EXPORT BOOL hb_strMatchRegExp( const char * szString, const char * szPattern ); /* compare two strings using a regular expression pattern */
extern HB_EXPORT BOOL hb_strMatchWild( const char * szString, const char * szPattern ); /* compare two strings using pattern with wildcard (?*) - patern have to be prefix of given string */
extern HB_EXPORT BOOL hb_strMatchWildExact( const char * szString, const char * szPattern ); /* compare two strings using pattern with wildcard (?*) - patern have to cover whole string */
extern HB_EXPORT BOOL hb_strMatchCaseWildExact( const char * szString, const char * szPattern ); /* compare two strings using pattern with wildcard (?*) ignoring the case of the characters - patern have to cover whole string */
extern HB_EXPORT BOOL hb_strEmpty( const char * szText, HB_SIZE ulLen ); /* returns whether a string contains only white space */
extern HB_EXPORT HB_BOOL hb_strMatchFile( const char * pszString, const char * szPattern ); /* compare two strings using platform dependent rules for file matching */
extern HB_EXPORT HB_BOOL hb_strMatchRegExp( const char * szString, const char * szPattern ); /* compare two strings using a regular expression pattern */
extern HB_EXPORT HB_BOOL hb_strMatchWild( const char * szString, const char * szPattern ); /* compare two strings using pattern with wildcard (?*) - patern have to be prefix of given string */
extern HB_EXPORT HB_BOOL hb_strMatchWildExact( const char * szString, const char * szPattern ); /* compare two strings using pattern with wildcard (?*) - patern have to cover whole string */
extern HB_EXPORT HB_BOOL hb_strMatchCaseWildExact( const char * szString, const char * szPattern ); /* compare two strings using pattern with wildcard (?*) ignoring the case of the characters - patern have to cover whole string */
extern HB_EXPORT HB_BOOL hb_strEmpty( const char * szText, HB_SIZE ulLen ); /* returns whether a string contains only white space */
extern HB_EXPORT void hb_strDescend( char * szStringTo, const char * szStringFrom, HB_SIZE ulLen ); /* copy a string to a buffer, inverting each character */
extern HB_EXPORT HB_SIZE hb_strAt( const char * szSub, HB_SIZE ulSubLen, const char * szText, HB_SIZE ulLen ); /* returns an index to a sub-string within another string */
extern HB_EXPORT char * hb_strUpper( char * szText, HB_SIZE ulLen ); /* convert an existing string buffer to upper case */
extern HB_EXPORT char * hb_strLower( char * szText, HB_SIZE ulLen ); /* convert an existing string buffer to lower case */
extern HB_EXPORT BOOL hb_charIsDigit( int iChar );
extern HB_EXPORT BOOL hb_charIsAlpha( int iChar );
extern HB_EXPORT BOOL hb_charIsLower( int iChar );
extern HB_EXPORT BOOL hb_charIsUpper( int iChar );
extern HB_EXPORT HB_BOOL hb_charIsDigit( int iChar );
extern HB_EXPORT HB_BOOL hb_charIsAlpha( int iChar );
extern HB_EXPORT HB_BOOL hb_charIsLower( int iChar );
extern HB_EXPORT HB_BOOL hb_charIsUpper( int iChar );
extern HB_EXPORT int hb_charUpper( int iChar ); /* converts iChar to upper case */
extern HB_EXPORT int hb_charLower( int iChar ); /* converts iChar to lower case */
extern HB_EXPORT char * hb_strncpy( char * pDest, const char * pSource, HB_SIZE ulLen ); /* copy at most ulLen bytes from string buffer to another buffer and _always_ set 0 in destin buffer */
@@ -962,7 +962,7 @@ extern HB_EXPORT char * hb_strncpyUpper( char * pDest, const char * pSource,
extern HB_EXPORT char * hb_strncpyUpperTrim( char * pDest, const char * pSource, HB_SIZE ulLen );
extern HB_EXPORT double hb_strVal( const char * szText, HB_SIZE ulLen ); /* return the numeric value of a character string representation of a number */
extern HB_EXPORT const char * hb_strLTrim( const char * szText, HB_SIZE * ulLen ); /* return a pointer to the first non-white space character */
extern HB_EXPORT HB_SIZE hb_strRTrimLen( const char * szText, HB_SIZE ulLen, BOOL bAnySpace ); /* return length of a string, ignoring trailing white space (or true spaces) */
extern HB_EXPORT HB_SIZE hb_strRTrimLen( const char * szText, HB_SIZE ulLen, HB_BOOL bAnySpace ); /* return length of a string, ignoring trailing white space (or true spaces) */
extern HB_EXPORT double hb_strVal( const char * szText, HB_SIZE ulLen );
extern HB_EXPORT HB_LONG hb_strValInt( const char * szText, int * iOverflow );
extern HB_EXPORT char * hb_strRemEscSeq( char * szText, HB_SIZE * ulLen ); /* remove C ESC sequences and converts them to Clipper chars */
@@ -1002,7 +1002,7 @@ extern HB_EXPORT PHB_SYMB hb_dynsymGetSymbol( const char * szName ); /* finds a
extern HB_EXPORT PHB_SYMB hb_dynsymFindSymbol( const char * szName ); /* finds a dynamic symbol and return pointer to its HB_SYMB structure */
extern HB_EXPORT PHB_SYMB hb_dynsymSymbol( PHB_DYNS pDynSym );
extern HB_EXPORT const char * hb_dynsymName( PHB_DYNS pDynSym ); /* return dynamic symbol name */
extern HB_EXPORT BOOL hb_dynsymIsFunction( PHB_DYNS pDynSym );
extern HB_EXPORT HB_BOOL hb_dynsymIsFunction( PHB_DYNS pDynSym );
extern HB_EXPORT int hb_dynsymAreaHandle( PHB_DYNS pDynSym ); /* return work area number bound with given dynamic symbol */
extern HB_EXPORT void hb_dynsymSetAreaHandle( PHB_DYNS pDynSym, int iArea ); /* set work area number for a given dynamic symbol */
#ifdef _HB_API_INTERNAL_
@@ -1020,14 +1020,14 @@ extern void hb_cmdargUpdate( void ); /* update arguments after HVM init
extern int hb_cmdargARGC( void ); /* retrieve command line argument count */
extern char ** hb_cmdargARGV( void ); /* retrieve command line argument buffer pointer */
extern const char * hb_cmdargARGVN( int argc ); /* retrieve given command line argument */
extern BOOL hb_cmdargIsInternal( const char * szArg, int * piLen ); /* determine if a string is an internal setting */
extern BOOL hb_cmdargCheck( const char * pszName ); /* Check if a given internal switch (like //INFO) was set */
extern HB_BOOL hb_cmdargIsInternal( const char * szArg, int * piLen ); /* determine if a string is an internal setting */
extern HB_BOOL hb_cmdargCheck( const char * pszName ); /* Check if a given internal switch (like //INFO) was set */
extern char * hb_cmdargString( const char * pszName ); /* Returns the string value of an internal switch (like //TEMPPATH:"C:\") */
extern int hb_cmdargNum( const char * pszName ); /* Returns the numeric value of an internal switch (like //F:90) */
extern ULONG hb_cmdargProcessVM( int*, int* ); /* Check for command line internal arguments */
#if defined( HB_OS_WIN ) && defined( HB_OS_WIN_USED )
extern HB_EXPORT void hb_winmainArgInit( HANDLE hInstance, HANDLE hPrevInstance, int iCmdShow ); /* Set WinMain() parameters */
extern HB_EXPORT BOOL hb_winmainArgGet( HANDLE * phInstance, HANDLE * phPrevInstance, int * piCmdShow ); /* Retrieve WinMain() parameters */
extern HB_EXPORT void hb_winmainArgInit( HANDLE hInstance, HANDLE hPrevInstance, int iCmdShow ); /* Set WinMain() parameters */
extern HB_EXPORT HB_BOOL hb_winmainArgGet( HANDLE * phInstance, HANDLE * phPrevInstance, int * piCmdShow ); /* Retrieve WinMain() parameters */
#endif
/* Codeblock management */
@@ -1039,7 +1039,7 @@ extern PHB_ITEM hb_codeblockGetRef( HB_CODEBLOCK_PTR pCBlock, LONG iItem
extern void hb_codeblockEvaluate( HB_ITEM_PTR pItem ); /* evaluate a codeblock */
/* memvars subsystem */
extern void hb_memvarsClear( BOOL fAll ); /* clear all PUBLIC and PRIVATE variables optionally without GetList PUBLIC variable */
extern void hb_memvarsClear( HB_BOOL fAll ); /* clear all PUBLIC and PRIVATE variables optionally without GetList PUBLIC variable */
extern void hb_memvarSetValue( PHB_SYMB pMemvarSymb, HB_ITEM_PTR pItem ); /* copy an item into a symbol */
extern HB_ERRCODE hb_memvarGet( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ); /* copy an symbol value into an item */
extern void hb_memvarGetValue( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ); /* copy an symbol value into an item, with error trapping */
@@ -1053,7 +1053,7 @@ extern void hb_memvarCreateFromItem( PHB_ITEM pMemvar, BYTE bScope, PHB_IT
extern int hb_memvarScope( const char * szVarName, ULONG ulLength ); /* retrieve scope of a dynamic variable symbol */
extern PHB_ITEM hb_memvarDetachLocal( HB_ITEM_PTR pLocal ); /* Detach a local variable from the eval stack */
extern PHB_ITEM hb_memvarGetValueBySym( PHB_DYNS pDynSym );
extern PHB_ITEM hb_memvarSaveInArray( int iScope, BOOL fCopy ); /* create array with visible memvar references or copies respecting given memvars scope */
extern PHB_ITEM hb_memvarSaveInArray( int iScope, HB_BOOL fCopy ); /* create array with visible memvar references or copies respecting given memvars scope */
extern void hb_memvarRestoreFromArray( PHB_ITEM pArray );
#ifdef _HB_API_INTERNAL_
@@ -1072,7 +1072,7 @@ extern HB_EXPORT const char * hb_conNewLine( void ); /* retrieve a pointer to a
extern HB_EXPORT void hb_conOutStd( const char * pStr, HB_SIZE ulLen ); /* output an string to STDOUT */
extern HB_EXPORT void hb_conOutErr( const char * pStr, HB_SIZE ulLen ); /* output an string to STDERR */
extern HB_EXPORT void hb_conOutAlt( const char * pStr, HB_SIZE ulLen ); /* output an string to the screen and/or printer and/or alternate */
extern HB_EXPORT int hb_conSetCursor( BOOL bSetCursor, int iNewCursor ); /* retrieve and optionally set cursor shape */
extern HB_EXPORT int hb_conSetCursor( HB_BOOL bSetCursor, int iNewCursor ); /* retrieve and optionally set cursor shape */
extern HB_EXPORT const char * hb_conSetColor( const char * szColor ); /* retrieve and optionally set console color */
/* compiler and macro compiler */
@@ -1081,8 +1081,8 @@ extern char * hb_compEncodeString( int iMethod, const char * szText, HB_SI
extern char * hb_compDecodeString( int iMethod, const char * szText, HB_SIZE * pulLen );
/* misc */
extern char * hb_procname( int iLevel, char * szName, BOOL bskipBlock ); /* retrieve a procedure name into a buffer */
extern BOOL hb_procinfo( int iLevel, char * szName, USHORT * puiLine, char * szFile );
extern char * hb_procname( int iLevel, char * szName, HB_BOOL bskipBlock ); /* retrieve a procedure name into a buffer */
extern HB_BOOL hb_procinfo( int iLevel, char * szName, USHORT * puiLine, char * szFile );
/* macro compiler */
#if defined( HB_MACRO_SUPPORT )
@@ -1099,8 +1099,8 @@ extern void hb_macroPushSymbol( HB_ITEM_PTR pItem ); /* handle a macro functio
extern void hb_macroRun( HB_MACRO_PTR pMacro ); /* executes pcode compiled by macro compiler */
extern HB_MACRO_PTR hb_macroCompile( const char * szString ); /* compile a string and return a pcode buffer */
extern void hb_macroDelete( HB_MACRO_PTR pMacro ); /* release all memory allocated for macro evaluation */
extern char * hb_macroTextSymbol( const char * szString, HB_SIZE ulLength, BOOL *pfNewString ); /* substitute macro variables occurences within a given string and check if result is a valid function or variable name */
extern char * hb_macroExpandString( const char * szString, HB_SIZE ulLength, BOOL *pfNewString ); /* expands valid '&' operator */
extern char * hb_macroTextSymbol( const char * szString, HB_SIZE ulLength, HB_BOOL * pfNewString ); /* substitute macro variables occurences within a given string and check if result is a valid function or variable name */
extern char * hb_macroExpandString( const char * szString, HB_SIZE ulLength, HB_BOOL * pfNewString ); /* expands valid '&' operator */
extern void hb_macroPopAliasedValue( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, BYTE flags ); /* compiles and evaluates an aliased macro expression */
extern void hb_macroPushAliasedValue( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, BYTE flags ); /* compiles and evaluates an aliased macro expression */
extern const char * hb_macroGetType( HB_ITEM_PTR pItem ); /* determine the type of an expression */
@@ -1144,21 +1144,21 @@ extern HB_EXPORT const char * hb_verFlagsPRG( void ); /* retrieves a stat
extern HB_EXPORT const char * hb_verHB_PLAT( void ); /* retrieves a static buffer containing build time HB_PLATFORM setting */
extern HB_EXPORT const char * hb_verHB_COMP( void ); /* retrieves a static buffer containing build time HB_COMPILER setting */
extern HB_EXPORT BOOL hb_iswinnt( void ); /* return .T. if OS == Windows NT, 2000, XP */
extern HB_EXPORT BOOL hb_iswince( void ); /* return .T. if OS is Windows CE or Windows Mobile */
extern HB_EXPORT BOOL hb_printerIsReady( const char * pszPrinterName );
extern HB_EXPORT HB_BOOL hb_iswinnt( void ); /* return .T. if OS == Windows NT, 2000, XP */
extern HB_EXPORT HB_BOOL hb_iswince( void ); /* return .T. if OS is Windows CE or Windows Mobile */
extern HB_EXPORT HB_BOOL hb_printerIsReady( const char * pszPrinterName );
/* OS/Harbour codepage conversion */
extern HB_EXPORT const char * hb_osEncodeCP( const char * szName, char ** pszFree, HB_SIZE * pulSize ); /* Convert a string sent to a system call, from Harbour codepage. */
extern HB_EXPORT const char * hb_osDecodeCP( const char * szName, char ** pszFree, HB_SIZE * pulSize ); /* Convert a string received from a system call, to Harbour codepage. */
/* environment variables access */
extern BOOL hb_getenv_buffer( const char * szName, char * szBuffer, int nSize );
extern HB_BOOL hb_getenv_buffer( const char * szName, char * szBuffer, int nSize );
/* WARNING: This returned pointer must be freed if not NULL using hb_xfree( ( void * ) ptr ); */
extern char * hb_getenv( const char * name );
extern BOOL hb_setenv( const char * szName, const char * szValue ); /* set or delete (szValue==NULL) environment variable */
extern char * hb_netname( void );
extern char * hb_username( void );
extern char * hb_getenv( const char * name );
extern HB_BOOL hb_setenv( const char * szName, const char * szValue ); /* set or delete (szValue==NULL) environment variable */
extern char * hb_netname( void );
extern char * hb_username( void );
/* Translation related things */

42
harbour/include/hbapicdp.h
View File

@@ -328,8 +328,8 @@ extern HB_EXPORT void hb_vmSetCDP( PHB_CODEPAGE pCDP );
#define HB_CDP_ENDIAN_LITTLE 1
#define HB_CDP_ENDIAN_BIG 2
extern HB_EXPORT BOOL hb_cdpRegisterRaw( PHB_CODEPAGE cdp );
extern HB_EXPORT BOOL hb_cdpRegisterNew( const char * id,
extern HB_EXPORT HB_BOOL hb_cdpRegisterRaw( PHB_CODEPAGE cdp );
extern HB_EXPORT HB_BOOL hb_cdpRegisterNew( const char * id,
const char * info,
PHB_UNITABLE uniTable,
const char * pszUpper,
@@ -342,12 +342,12 @@ extern HB_EXPORT const char * hb_cdpSelectID( const char * id );
extern HB_EXPORT PHB_CODEPAGE hb_cdpFind( const char * id );
extern HB_EXPORT PHB_CODEPAGE hb_cdpFindExt( const char * id );
extern HB_EXPORT BOOL hb_cdpIsDigit( PHB_CODEPAGE cdp, int iChar );
extern HB_EXPORT BOOL hb_cdpIsAlpha( PHB_CODEPAGE cdp, int iChar );
extern HB_EXPORT BOOL hb_cdpIsLower( PHB_CODEPAGE cdp, int iChar );
extern HB_EXPORT BOOL hb_cdpIsUpper( PHB_CODEPAGE cdp, int iChar );
extern HB_EXPORT int hb_cdpcmp( const char * szFirst, HB_SIZE ulLenFirst, const char * szSecond, HB_SIZE ulLenSecond, PHB_CODEPAGE cdp, BOOL fExact );
extern HB_EXPORT int hb_cdpicmp( const char * szFirst, HB_SIZE ulLenFirst, const char * szSecond, HB_SIZE ulLenSecond, PHB_CODEPAGE cdp, BOOL fExact );
extern HB_EXPORT HB_BOOL hb_cdpIsDigit( PHB_CODEPAGE cdp, int iChar );
extern HB_EXPORT HB_BOOL hb_cdpIsAlpha( PHB_CODEPAGE cdp, int iChar );
extern HB_EXPORT HB_BOOL hb_cdpIsLower( PHB_CODEPAGE cdp, int iChar );
extern HB_EXPORT HB_BOOL hb_cdpIsUpper( PHB_CODEPAGE cdp, int iChar );
extern HB_EXPORT int hb_cdpcmp( const char * szFirst, HB_SIZE ulLenFirst, const char * szSecond, HB_SIZE ulLenSecond, PHB_CODEPAGE cdp, HB_BOOL fExact );
extern HB_EXPORT int hb_cdpicmp( const char * szFirst, HB_SIZE ulLenFirst, const char * szSecond, HB_SIZE ulLenSecond, PHB_CODEPAGE cdp, HB_BOOL fExact );
extern HB_EXPORT int hb_cdpchrcmp( char cFirst, char cSecond, PHB_CODEPAGE cdp );
extern HB_EXPORT char * hb_cdpDup( const char *, PHB_CODEPAGE, PHB_CODEPAGE );
@@ -357,30 +357,30 @@ extern HB_EXPORT const char * hb_cdpnDup3( const char *, HB_SIZE, char *, HB_SIZ
extern HB_EXPORT HB_SIZE hb_cdpnDupLen( const char *, HB_SIZE, PHB_CODEPAGE, PHB_CODEPAGE );
extern HB_EXPORT HB_SIZE hb_cdpnDup2Len( const char *, HB_SIZE, HB_SIZE, PHB_CODEPAGE, PHB_CODEPAGE );
extern HB_EXPORT int hb_cdpTranslateChar( int iChar, BOOL fCtrl, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut );
extern HB_EXPORT int hb_cdpTranslateChar( int iChar, HB_BOOL fCtrl, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut );
extern HB_EXPORT HB_SIZE hb_cdpTransLen( const char * pSrc, HB_SIZE ulSrc, HB_SIZE ulMax, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut );
extern HB_EXPORT HB_SIZE hb_cdpTransTo( const char * pSrc, HB_SIZE ulSrc, char * pDst, HB_SIZE ulDst, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut );
extern HB_EXPORT HB_WCHAR hb_cdpGetU16( PHB_CODEPAGE cdp, BOOL fCtrl, unsigned char ch );
extern HB_EXPORT UCHAR hb_cdpGetChar( PHB_CODEPAGE cdp, BOOL fCtrl, HB_WCHAR wc );
extern HB_EXPORT BOOL hb_cdpGetFromUTF8( PHB_CODEPAGE cdp, BOOL fCtrl, unsigned char ch, int * n, HB_WCHAR * pwc );
extern HB_EXPORT HB_WCHAR hb_cdpGetU16( PHB_CODEPAGE cdp, HB_BOOL fCtrl, unsigned char ch );
extern HB_EXPORT UCHAR hb_cdpGetChar( PHB_CODEPAGE cdp, HB_BOOL fCtrl, HB_WCHAR wc );
extern HB_EXPORT HB_BOOL hb_cdpGetFromUTF8( PHB_CODEPAGE cdp, HB_BOOL fCtrl, unsigned char ch, int * n, HB_WCHAR * pwc );
extern HB_EXPORT HB_SIZE hb_cdpUTF8StringLength( const char * pSrc, HB_SIZE ulLen );
extern HB_EXPORT HB_SIZE hb_cdpUTF8StringPeek( const char * pSrc, HB_SIZE ulLen, HB_SIZE ulPos );
extern HB_EXPORT char * hb_cdpUTF8StringSubstr( const char * pSrc, HB_SIZE ulLen, HB_SIZE ulFrom, HB_SIZE ulCount, HB_SIZE * pulDest );
extern HB_EXPORT HB_SIZE hb_cdpUTF8AsStrLen( PHB_CODEPAGE cdp, BOOL fCtrl, const char * pSrc, HB_SIZE ulSrc, HB_SIZE ulMax );
extern HB_EXPORT HB_SIZE hb_cdpUTF8ToStr( PHB_CODEPAGE cdp, BOOL fCtrl, const char * pSrc, HB_SIZE ulSrc, char * pDst, HB_SIZE ulDst );
extern HB_EXPORT HB_SIZE hb_cdpStrAsUTF8Len( PHB_CODEPAGE cdp, BOOL fCtrl, const char * pSrc, HB_SIZE ulSrc, HB_SIZE ulMax );
extern HB_EXPORT HB_SIZE hb_cdpStrToUTF8( PHB_CODEPAGE cdp, BOOL fCtrl, const char * pSrc, HB_SIZE ulSrc, char * pDst, HB_SIZE ulDst );
extern HB_EXPORT HB_SIZE hb_cdpUTF8AsStrLen( PHB_CODEPAGE cdp, HB_BOOL fCtrl, const char * pSrc, HB_SIZE ulSrc, HB_SIZE ulMax );
extern HB_EXPORT HB_SIZE hb_cdpUTF8ToStr( PHB_CODEPAGE cdp, HB_BOOL fCtrl, const char * pSrc, HB_SIZE ulSrc, char * pDst, HB_SIZE ulDst );
extern HB_EXPORT HB_SIZE hb_cdpStrAsUTF8Len( PHB_CODEPAGE cdp, HB_BOOL fCtrl, const char * pSrc, HB_SIZE ulSrc, HB_SIZE ulMax );
extern HB_EXPORT HB_SIZE hb_cdpStrToUTF8( PHB_CODEPAGE cdp, HB_BOOL fCtrl, const char * pSrc, HB_SIZE ulSrc, char * pDst, HB_SIZE ulDst );
extern HB_EXPORT HB_SIZE hb_cdpU16AsStrLen( PHB_CODEPAGE cdp, BOOL fCtrl, const HB_WCHAR * pSrc, HB_SIZE ulSrc, HB_SIZE ulMax );
extern HB_EXPORT HB_SIZE hb_cdpU16ToStr( PHB_CODEPAGE cdp, BOOL fCtrl, int iEndian, const HB_WCHAR * pSrc, HB_SIZE ulSrc, char * pDst, HB_SIZE ulDst );
extern HB_EXPORT HB_SIZE hb_cdpStrAsU16Len( PHB_CODEPAGE cdp, BOOL fCtrl, const char * pSrc, HB_SIZE ulSrc, HB_SIZE ulMax );
extern HB_EXPORT HB_SIZE hb_cdpStrToU16( PHB_CODEPAGE cdp, BOOL fCtrl, int iEndian, const char * pSrc, HB_SIZE ulSrc, HB_WCHAR * pDst, HB_SIZE ulDst );
extern HB_EXPORT HB_SIZE hb_cdpU16AsStrLen( PHB_CODEPAGE cdp, HB_BOOL fCtrl, const HB_WCHAR * pSrc, HB_SIZE ulSrc, HB_SIZE ulMax );
extern HB_EXPORT HB_SIZE hb_cdpU16ToStr( PHB_CODEPAGE cdp, HB_BOOL fCtrl, int iEndian, const HB_WCHAR * pSrc, HB_SIZE ulSrc, char * pDst, HB_SIZE ulDst );
extern HB_EXPORT HB_SIZE hb_cdpStrAsU16Len( PHB_CODEPAGE cdp, HB_BOOL fCtrl, const char * pSrc, HB_SIZE ulSrc, HB_SIZE ulMax );
extern HB_EXPORT HB_SIZE hb_cdpStrToU16( PHB_CODEPAGE cdp, HB_BOOL fCtrl, int iEndian, const char * pSrc, HB_SIZE ulSrc, HB_WCHAR * pDst, HB_SIZE ulDst );
extern HB_EXPORT PHB_ITEM hb_itemDeserializeCP( const char ** pBufferPtr, HB_SIZE * pulSize, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut );
extern HB_EXPORT char * hb_itemSerializeCP( PHB_ITEM pItem, BOOL fNumSize, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut, HB_SIZE *pulSize );
extern HB_EXPORT char * hb_itemSerializeCP( PHB_ITEM pItem, HB_BOOL fNumSize, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut, HB_SIZE *pulSize );
#ifdef HB_LEGACY_LEVEL2
extern HB_EXPORT void hb_cdpTranslate( char *, PHB_CODEPAGE, PHB_CODEPAGE );

14
harbour/include/hbapicls.h
View File

@@ -94,13 +94,13 @@ extern void hb_clsInit( void ); /* initialize Classy/OO system a
extern void hb_clsDoInit( void ); /* initialize Classy/OO system .prg functions */
extern void hb_clsReleaseAll( void ); /* releases all defined classes */
extern void hb_clsIsClassRef( void ); /* classes.c - mark all class internals as used */
extern BOOL hb_clsHasDestructor( USHORT uiClass );
extern HB_BOOL hb_clsHasDestructor( USHORT uiClass );
extern PHB_SYMB hb_clsMethodSym( PHB_ITEM pBaseSymbol ); /* returns the real method symbol for given stack symbol */
extern PHB_SYMB hb_objGetMethod( PHB_ITEM pObject, PHB_SYMB pSymMsg, PHB_STACK_STATE pStack ); /* returns the method pointer of an object class */
extern BOOL hb_objGetVarRef( PHB_ITEM pObject, PHB_SYMB pMessage, PHB_STACK_STATE pStack ); /* create object variable reference */
extern BOOL hb_objHasOperator( PHB_ITEM pObject, USHORT uiOperator );
extern BOOL hb_objOperatorCall( USHORT uiOperator, HB_ITEM_PTR pResult, PHB_ITEM pObject, PHB_ITEM pMsgArg1, PHB_ITEM pMsgArg2 );
extern HB_BOOL hb_objGetVarRef( PHB_ITEM pObject, PHB_SYMB pMessage, PHB_STACK_STATE pStack ); /* create object variable reference */
extern HB_BOOL hb_objHasOperator( PHB_ITEM pObject, USHORT uiOperator );
extern HB_BOOL hb_objOperatorCall( USHORT uiOperator, HB_ITEM_PTR pResult, PHB_ITEM pObject, PHB_ITEM pMsgArg1, PHB_ITEM pMsgArg2 );
extern void hb_objDestructorCall( PHB_ITEM pObject );
#ifndef HB_NO_PROFILER
@@ -114,7 +114,7 @@ extern void hb_mthAddTime( ULONG ); /* profiler from classes.c */
HB_EXPORT extern const char * hb_clsName( USHORT uiClass );
HB_EXPORT extern const char * hb_clsFuncName( USHORT uiClass );
HB_EXPORT extern const char * hb_clsMethodName( USHORT uiClass, USHORT uiMethod );
HB_EXPORT extern BOOL hb_clsIsParent( USHORT uiClass, const char * szParentName ); /* is a class handle inherited from szParentName Class ? */
HB_EXPORT extern HB_BOOL hb_clsIsParent( USHORT uiClass, const char * szParentName ); /* is a class handle inherited from szParentName Class ? */
HB_EXPORT extern USHORT hb_clsFindClass( const char * szClass, const char * szFunc );
/* object management */
@@ -123,8 +123,8 @@ HB_EXPORT extern USHORT hb_objSetClass( PHB_ITEM pItem, const char * szClass
HB_EXPORT extern const char * hb_objGetClsName( PHB_ITEM pObject ); /* retrieves an object class name */
HB_EXPORT extern const char * hb_objGetRealClsName( PHB_ITEM pObject, const char * szString ); /* retrieves an object class name for a specific message */
HB_EXPORT extern BOOL hb_objHasMsg( PHB_ITEM pObject, const char * szString ); /* returns TRUE/FALSE whether szString is an existing message for object */
HB_EXPORT extern BOOL hb_objHasMessage( PHB_ITEM pObject, PHB_DYNS pMessage );
HB_EXPORT extern HB_BOOL hb_objHasMsg( PHB_ITEM pObject, const char * szString ); /* returns TRUE/FALSE whether szString is an existing message for object */
HB_EXPORT extern HB_BOOL hb_objHasMessage( PHB_ITEM pObject, PHB_DYNS pMessage );
HB_EXPORT extern PHB_ITEM hb_objSendMsg( PHB_ITEM pObj, const char *sMsg, ULONG ulArg, ... );
HB_EXPORT extern PHB_ITEM hb_objSendMessage( PHB_ITEM pObj, PHB_DYNS pMessage, ULONG ulArg, ... );

36
harbour/include/hbapidbg.h
View File

@@ -62,7 +62,7 @@ HB_EXTERN_BEGIN
/* HVM debugger function */
typedef void (*HB_DBGENTRY_FUNC) ( int , int , const char *, int , PHB_ITEM );
extern HB_DBGENTRY_FUNC hb_dbg_SetEntry( HB_DBGENTRY_FUNC pFunDbgEntry );
extern BOOL hb_dbg_InvokeDebug( BOOL bInvoke );
extern HB_BOOL hb_dbg_InvokeDebug( HB_BOOL bInvoke );
extern ULONG hb_dbg_ProcLevel( void );
extern PHB_ITEM hb_dbg_vmVarSGet( PHB_ITEM pStaticsBase, int nOffset );
extern PHB_ITEM hb_dbg_vmVarLGet( int iLevel, int iLocal );
@@ -70,23 +70,23 @@ extern ULONG hb_dbg_vmVarGCount( void );
extern PHB_ITEM hb_dbg_vmVarGGet( int nGlobal, int nOffset );
/* internal debugger function */
extern void hb_dbgEntry( int nMode, int nLine, const char *szName, int nIndex, PHB_ITEM pFrame );
extern void hb_dbgAddBreak( void *handle, const char *cModule, int nLine, const char *szFunction );
extern void hb_dbgAddWatch( void *handle, const char *szExpr, BOOL bTrace );
extern void hb_dbgDelBreak( void *handle, int nBreak );
extern void hb_dbgDelWatch( void *handle, int nWatch );
extern PHB_ITEM hb_dbgGetExpressionValue( void *handle, const char *expression );
extern PHB_ITEM hb_dbgGetSourceFiles( void *handle );
extern PHB_ITEM hb_dbgGetWatchValue( void *handle, int nWatch );
extern BOOL hb_dbgIsValidStopLine( void *handle, const char *szModule, int nLine );
extern void hb_dbgSetCBTrace( void *handle, BOOL bCBTrace );
extern void hb_dbgSetGo( void *handle );
extern void hb_dbgSetInvoke( void *handle, BOOL ( *pFunInvoke )( void ) );
extern void hb_dbgSetNextRoutine( void *handle );
extern void hb_dbgSetQuit( void *handle );
extern void hb_dbgSetToCursor( void *handle, const char *szModule, int nLine );
extern void hb_dbgSetTrace( void *handle );
extern void hb_dbgSetWatch( void *handle, int nWatch, const char *szExpr, BOOL bTrace );
extern void hb_dbgEntry( int nMode, int nLine, const char * szName, int nIndex, PHB_ITEM pFrame );
extern void hb_dbgAddBreak( void * handle, const char * cModule, int nLine, const char * szFunction );
extern void hb_dbgAddWatch( void * handle, const char * szExpr, HB_BOOL bTrace );
extern void hb_dbgDelBreak( void * handle, int nBreak );
extern void hb_dbgDelWatch( void * handle, int nWatch );
extern PHB_ITEM hb_dbgGetExpressionValue( void * handle, const char *expression );
extern PHB_ITEM hb_dbgGetSourceFiles( void * handle );
extern PHB_ITEM hb_dbgGetWatchValue( void * handle, int nWatch );
extern HB_BOOL hb_dbgIsValidStopLine( void * handle, const char *szModule, int nLine );
extern void hb_dbgSetCBTrace( void * handle, HB_BOOL bCBTrace );
extern void hb_dbgSetGo( void * handle );
extern void hb_dbgSetInvoke( void * handle, HB_BOOL ( *pFunInvoke )( void ) );
extern void hb_dbgSetNextRoutine( void * handle );
extern void hb_dbgSetQuit( void * handle );
extern void hb_dbgSetToCursor( void * handle, const char * szModule, int nLine );
extern void hb_dbgSetTrace( void * handle );
extern void hb_dbgSetWatch( void * handle, int nWatch, const char * szExpr, HB_BOOL bTrace );
HB_EXTERN_END

88
harbour/include/hbapifs.h
View File

@@ -154,7 +154,7 @@ HB_EXTERN_BEGIN
HB_FA_POSIX_USR(a) | \
HB_FA_POSIX_SID(a) )
extern HB_EXPORT BOOL hb_fsChDir ( const char * pszDirName ); /* change working directory */
extern HB_EXPORT HB_BOOL hb_fsChDir ( const char * pszDirName ); /* change working directory */
extern HB_EXPORT HB_ERRCODE hb_fsChDrv ( BYTE nDrive ); /* change working drive */
extern HB_EXPORT void hb_fsClose ( HB_FHANDLE hFileHandle ); /* close a file */
extern HB_EXPORT void hb_fsCommit ( HB_FHANDLE hFileHandle ); /* commit updates of a file */
@@ -166,40 +166,40 @@ extern HB_EXPORT const char * hb_fsCurDir ( USHORT uiDrive ); /* retrieve a s
extern HB_EXPORT HB_ERRCODE hb_fsCurDirBuff ( USHORT uiDrive, char * pbyBuffer, HB_SIZE ulLen ); /* copy current directory for given drive into a buffer */
extern HB_EXPORT void hb_fsBaseDirBuff ( char * pbyBuffer ); /* retrieve the base dir of the executable */
extern HB_EXPORT BYTE hb_fsCurDrv ( void ); /* retrieve current drive number */
extern HB_EXPORT BOOL hb_fsDelete ( const char * pszFileName ); /* delete a file */
extern HB_EXPORT BOOL hb_fsEof ( HB_FHANDLE hFileHandle ); /* determine if an open file is position at end-of-file */
extern HB_EXPORT HB_BOOL hb_fsDelete ( const char * pszFileName ); /* delete a file */
extern HB_EXPORT HB_BOOL hb_fsEof ( HB_FHANDLE hFileHandle ); /* determine if an open file is position at end-of-file */
extern HB_EXPORT HB_ERRCODE hb_fsError ( void ); /* retrieve file system error */
extern HB_EXPORT HB_ERRCODE hb_fsOsError ( void ); /* retrieve system dependant file system error */
extern HB_EXPORT BOOL hb_fsFile ( const char * pszFileName ); /* determine if a file exists */
extern HB_EXPORT BOOL hb_fsIsDirectory ( const char * pszFilename );
extern HB_EXPORT HB_FOFFSET hb_fsFSize ( const char * pszFileName, BOOL bUseDirEntry ); /* determine the size of a file */
extern HB_EXPORT HB_BOOL hb_fsFile ( const char * pszFileName ); /* determine if a file exists */
extern HB_EXPORT HB_BOOL hb_fsIsDirectory ( const char * pszFilename );
extern HB_EXPORT HB_FOFFSET hb_fsFSize ( const char * pszFileName, HB_BOOL bUseDirEntry ); /* determine the size of a file */
extern HB_EXPORT HB_FHANDLE hb_fsExtOpen ( const char * pszFileName, const char * pDefExt,
USHORT uiFlags, const char * pPaths, PHB_ITEM pError ); /* open a file using default extension and a list of paths */
extern HB_EXPORT char * hb_fsExtName ( const char * pFilename, const char * pDefExt,
USHORT uiExFlags, const char * pPaths ); /* convert file name for hb_fsExtOpen, caller must free the returned buffer */
extern HB_EXPORT HB_ERRCODE hb_fsIsDrv ( BYTE nDrive ); /* determine if a drive number is a valid drive */
extern HB_EXPORT BOOL hb_fsIsDevice ( HB_FHANDLE hFileHandle ); /* determine if a file is attached to a device (console?) */
extern HB_EXPORT BOOL hb_fsLock ( HB_FHANDLE hFileHandle, ULONG ulStart, ULONG ulLength, USHORT uiMode ); /* request a lock on a portion of a file */
extern HB_EXPORT BOOL hb_fsLockLarge ( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart,
extern HB_EXPORT HB_BOOL hb_fsIsDevice ( HB_FHANDLE hFileHandle ); /* determine if a file is attached to a device (console?) */
extern HB_EXPORT HB_BOOL hb_fsLock ( HB_FHANDLE hFileHandle, ULONG ulStart, ULONG ulLength, USHORT uiMode ); /* request a lock on a portion of a file */
extern HB_EXPORT HB_BOOL hb_fsLockLarge ( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart,
HB_FOFFSET ulLength, USHORT uiMode ); /* request a lock on a portion of a file using 64bit API */
extern HB_EXPORT BOOL hb_fsMkDir ( const char * pszDirName ); /* create a directory */
extern HB_EXPORT HB_BOOL hb_fsMkDir ( const char * pszDirName ); /* create a directory */
extern HB_EXPORT HB_FHANDLE hb_fsOpen ( const char * pszFileName, USHORT uiFlags ); /* open a file */
extern HB_EXPORT USHORT hb_fsRead ( HB_FHANDLE hFileHandle, void * pBuff, USHORT ulCount ); /* read contents of a file into a buffer (<=64K) */
extern HB_EXPORT ULONG hb_fsReadLarge ( HB_FHANDLE hFileHandle, void * pBuff, ULONG ulCount ); /* read contents of a file into a buffer (>64K) */
extern HB_EXPORT ULONG hb_fsReadAt ( HB_FHANDLE hFileHandle, void * pBuff, ULONG ulCount, HB_FOFFSET llOffset ); /* read from given offset contents of a file into a buffer (>64K) */
extern HB_EXPORT BOOL hb_fsRmDir ( const char * pszDirName ); /* remove a directory */
extern HB_EXPORT BOOL hb_fsRename ( const char * pszOldName, const char * pszNewName ); /* rename a file */
extern HB_EXPORT HB_BOOL hb_fsRmDir ( const char * pszDirName ); /* remove a directory */
extern HB_EXPORT HB_BOOL hb_fsRename ( const char * pszOldName, const char * pszNewName ); /* rename a file */
extern HB_EXPORT ULONG hb_fsSeek ( HB_FHANDLE hFileHandle, LONG lOffset, USHORT uiMode ); /* reposition an open file */
extern HB_EXPORT HB_FOFFSET hb_fsSeekLarge ( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset, USHORT uiFlags ); /* reposition an open file using 64bit API */
extern HB_EXPORT ULONG hb_fsTell ( HB_FHANDLE hFileHandle ); /* retrieve the current position of a file */
extern HB_EXPORT int hb_fsSetDevMode ( HB_FHANDLE hFileHandle, int iDevMode ); /* change the device mode of a file (text/binary) */
extern HB_EXPORT BOOL hb_fsGetFileTime ( const char * pszFileName, long * plJulian, long * plMillisec );
extern HB_EXPORT BOOL hb_fsSetFileTime ( const char * pszFileName, long lJulian, long lMillisec );
extern HB_EXPORT BOOL hb_fsGetAttr ( const char * pszFileName, HB_FATTR * pulAttr );
extern HB_EXPORT BOOL hb_fsSetAttr ( const char * pszFileName, HB_FATTR ulAttr );
extern HB_EXPORT HB_BOOL hb_fsGetFileTime ( const char * pszFileName, long * plJulian, long * plMillisec );
extern HB_EXPORT HB_BOOL hb_fsSetFileTime ( const char * pszFileName, long lJulian, long lMillisec );
extern HB_EXPORT HB_BOOL hb_fsGetAttr ( const char * pszFileName, HB_FATTR * pulAttr );
extern HB_EXPORT HB_BOOL hb_fsSetAttr ( const char * pszFileName, HB_FATTR ulAttr );
extern HB_EXPORT void hb_fsSetError ( HB_ERRCODE uiError ); /* set the file system DOS error number */
extern HB_EXPORT void hb_fsSetIOError ( BOOL fResult, USHORT uiOperation ); /* set the file system error number after IO operation */
extern HB_EXPORT BOOL hb_fsTruncAt ( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset ); /* truncate file to given size */
extern HB_EXPORT void hb_fsSetIOError ( HB_BOOL fResult, USHORT uiOperation ); /* set the file system error number after IO operation */
extern HB_EXPORT HB_BOOL hb_fsTruncAt ( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset ); /* truncate file to given size */
extern HB_EXPORT USHORT hb_fsWrite ( HB_FHANDLE hFileHandle, const void * pBuff, USHORT ulCount ); /* write to an open file from a buffer (<=64K) */
extern HB_EXPORT ULONG hb_fsWriteLarge ( HB_FHANDLE hFileHandle, const void * pBuff, ULONG ulCount ); /* write to an open file from a buffer (>64K) */
extern HB_EXPORT ULONG hb_fsWriteAt ( HB_FHANDLE hFileHandle, const void * pBuff, ULONG ulCount, HB_FOFFSET llOffset ); /* write to an open file at given offset from a buffer (>64K) */
@@ -207,10 +207,10 @@ extern HB_EXPORT HB_FHANDLE hb_fsPOpen ( const char * pFilename, const cha
extern HB_EXPORT HB_FHANDLE hb_fsGetOsHandle ( HB_FHANDLE hFileHandle );
extern HB_EXPORT HB_ERRCODE hb_fsGetFError ( void ); /* get FERROR() flag */
extern HB_EXPORT void hb_fsSetFError ( HB_ERRCODE uiError ); /* set FERROR() flag */
extern HB_EXPORT BOOL hb_fsNameExists ( const char * pszFileName ); /* check if a name exists in the filesystem (wildcard chars not accepted). */
extern HB_EXPORT BOOL hb_fsFileExists ( const char * pszFileName ); /* check if a file exists (wildcard chars not accepted). */
extern HB_EXPORT BOOL hb_fsDirExists ( const char * pszDirName ); /* check if a directory exists (wildcard chars not accepted). */
extern HB_EXPORT BOOL hb_fsCopy ( const char * pSource, const char * pDest );
extern HB_EXPORT HB_BOOL hb_fsNameExists ( const char * pszFileName ); /* check if a name exists in the filesystem (wildcard chars not accepted). */
extern HB_EXPORT HB_BOOL hb_fsFileExists ( const char * pszFileName ); /* check if a file exists (wildcard chars not accepted). */
extern HB_EXPORT HB_BOOL hb_fsDirExists ( const char * pszDirName ); /* check if a directory exists (wildcard chars not accepted). */
extern HB_EXPORT HB_BOOL hb_fsCopy ( const char * pSource, const char * pDest );
#define hb_fsFLock( h, s, l ) hb_fsLock( h, s, l, FL_LOCK )
#define hb_fsFUnlock( h, s, l ) hb_fsLock( h, s, l, FL_UNLOCK )
@@ -255,14 +255,14 @@ typedef struct _HB_PATHNAMES
{
char * szPath;
struct _HB_PATHNAMES * pNext;
BOOL fFree;
HB_BOOL fFree;
} HB_PATHNAMES;
extern HB_EXPORT void hb_fsAddSearchPath( const char * szPath, HB_PATHNAMES ** pSearchList );
extern HB_EXPORT void hb_fsFreeSearchPath( HB_PATHNAMES * pSearchList );
extern HB_EXPORT BOOL hb_spFile( const char * pFilename, char * pRetPath );
extern HB_EXPORT BOOL hb_spFileExists( const char * pFilename, char * pRetPath );
extern HB_EXPORT HB_BOOL hb_spFile( const char * pFilename, char * pRetPath );
extern HB_EXPORT HB_BOOL hb_spFileExists( const char * pFilename, char * pRetPath );
extern HB_EXPORT HB_FHANDLE hb_spOpen( const char * pFilename, USHORT uiFlags );
extern HB_EXPORT HB_FHANDLE hb_spCreate( const char * pFilename, HB_FATTR ulAttr );
extern HB_EXPORT HB_FHANDLE hb_spCreateEx( const char * pFilename, HB_FATTR ulAttr, USHORT uiFlags );
@@ -281,7 +281,7 @@ typedef struct
const char * pszFileMask;
HB_FATTR attrmask;
BOOL bFirst;
HB_BOOL bFirst;
void * info; /* Pointer to the platform specific find info */
@@ -289,28 +289,28 @@ typedef struct
/* File Find API functions */
extern HB_EXPORT PHB_FFIND hb_fsFindFirst( const char * pszFileName, HB_FATTR ulAttrMask );
extern HB_EXPORT BOOL hb_fsFindNext( PHB_FFIND ffind );
extern HB_EXPORT HB_BOOL hb_fsFindNext( PHB_FFIND ffind );
extern HB_EXPORT void hb_fsFindClose( PHB_FFIND ffind );
/* functions to create, wait and terminate processes */
extern HB_FHANDLE hb_fsProcessOpen( const char *pszFilename,
HB_FHANDLE *phStdin, HB_FHANDLE *phStdout,
HB_FHANDLE *phStderr,
BOOL fDetach, ULONG *pulPID );
HB_BOOL fDetach, ULONG *pulPID );
extern int hb_fsProcessRun( const char *pszFilename,
const char * pStdInBuf, HB_SIZE ulStdInLen,
char ** pStdOutPtr, HB_SIZE * pulStdOut,
char ** pStdErrPtr, HB_SIZE * pulStdErr,
BOOL fDetach );
extern int hb_fsProcessValue( HB_FHANDLE hProcess, BOOL fWait );
extern BOOL hb_fsProcessClose( HB_FHANDLE hProcess, BOOL fGentle );
HB_BOOL fDetach );
extern int hb_fsProcessValue( HB_FHANDLE hProcess, HB_BOOL fWait );
extern HB_BOOL hb_fsProcessClose( HB_FHANDLE hProcess, HB_BOOL fGentle );
/* Misc helper functions */
extern HB_FATTR hb_fsAttrFromRaw( HB_FATTR raw_attr );
extern HB_FATTR hb_fsAttrToRaw( HB_FATTR ulAttr );
extern HB_FATTR hb_fsAttrEncode( const char * szAttr );
extern char * hb_fsAttrDecode( HB_FATTR ulAttr, char * szAttr );
extern HB_EXPORT BOOL hb_fsMaxFilesError( void );
extern HB_EXPORT HB_BOOL hb_fsMaxFilesError( void );
extern HB_EXPORT const char * hb_fsNameConv( const char * szFileName, char ** pszFree );
/* Harbour file functions with shared file handles and locks
@@ -323,32 +323,32 @@ extern HB_EXPORT const char * hb_fsNameConv( const char * szFileName, char ** ps
typedef struct _HB_FILE_FUNCS
{
BOOL (* Accept ) ( const char * pszFilename );
BOOL (* Exists ) ( const char * pszFilename, char * pRetPath );
BOOL (* Delete ) ( const char * pszFilename );
BOOL (* Rename ) ( const char * pszFilename, const char * pszNewName );
HB_BOOL (* Accept ) ( const char * pszFilename );
HB_BOOL (* Exists ) ( const char * pszFilename, char * pRetPath );
HB_BOOL (* Delete ) ( const char * pszFilename );
HB_BOOL (* Rename ) ( const char * pszFilename, const char * pszNewName );
PHB_FILE (* Open ) ( const char * pszFilename, const char * pDefExt,
USHORT uiExFlags, const char * pPaths,
PHB_ITEM pError );
void (* Close ) ( PHB_FILE pFile );
BOOL (* Lock ) ( PHB_FILE, HB_FOFFSET ulStart, HB_FOFFSET ulLen, int iType );
HB_BOOL (* Lock ) ( PHB_FILE, HB_FOFFSET ulStart, HB_FOFFSET ulLen, int iType );
ULONG (* ReadAt ) ( PHB_FILE pFile, void * buffer, ULONG ulSize, HB_FOFFSET llOffset );
ULONG (* WriteAt ) ( PHB_FILE pFile, const void * buffer, ULONG ulSize, HB_FOFFSET llOffset );
BOOL (* TruncAt ) ( PHB_FILE pFile, HB_FOFFSET llOffset );
HB_BOOL (* TruncAt ) ( PHB_FILE pFile, HB_FOFFSET llOffset );
HB_FOFFSET (* Size ) ( PHB_FILE pFile );
void (* Commit ) ( PHB_FILE pFile );
HB_FHANDLE (* Handle ) ( PHB_FILE pFile );
}
HB_FILE_FUNCS;
extern HB_EXPORT BOOL hb_fileRegister( const HB_FILE_FUNCS * pFuncs );
extern HB_EXPORT HB_BOOL hb_fileRegister( const HB_FILE_FUNCS * pFuncs );
#else
typedef void * PHB_FILE;
#endif
extern HB_EXPORT BOOL hb_fileExists( const char * pFilename, char * pRetPath );
extern HB_EXPORT BOOL hb_fileDelete( const char * pFilename );
extern HB_EXPORT BOOL hb_fileRename( const char * pFilename, const char * pszNewName );
extern HB_EXPORT HB_BOOL hb_fileExists( const char * pFilename, char * pRetPath );
extern HB_EXPORT HB_BOOL hb_fileDelete( const char * pFilename );
extern HB_EXPORT HB_BOOL hb_fileRename( const char * pFilename, const char * pszNewName );
extern HB_EXPORT PHB_FILE hb_fileExtOpen( const char * pszFilename, const char * pDefExt,
USHORT uiExFlags, const char * pPaths,
PHB_ITEM pError );
@@ -360,10 +360,10 @@ extern HB_EXPORT PHB_FILE hb_fileCreateTempEx( char * pszName,
const char * pszExt,
HB_FATTR ulAttr );
extern HB_EXPORT void hb_fileClose( PHB_FILE pFile );
extern HB_EXPORT BOOL hb_fileLock( PHB_FILE pFile, HB_FOFFSET ulStart, HB_FOFFSET ulLen, int iType );
extern HB_EXPORT HB_BOOL hb_fileLock( PHB_FILE pFile, HB_FOFFSET ulStart, HB_FOFFSET ulLen, int iType );
extern HB_EXPORT ULONG hb_fileReadAt( PHB_FILE pFile, void * buffer, ULONG ulSize, HB_FOFFSET llOffset );
extern HB_EXPORT ULONG hb_fileWriteAt( PHB_FILE pFile, const void * buffer, ULONG ulSize, HB_FOFFSET llOffset );
extern HB_EXPORT BOOL hb_fileTruncAt( PHB_FILE pFile, HB_FOFFSET llOffset );
extern HB_EXPORT HB_BOOL hb_fileTruncAt( PHB_FILE pFile, HB_FOFFSET llOffset );
extern HB_EXPORT HB_FOFFSET hb_fileSize( PHB_FILE pFile );
extern HB_EXPORT void hb_fileCommit( PHB_FILE pFile );
extern HB_EXPORT HB_FHANDLE hb_fileHandle( PHB_FILE pFile );

30
harbour/include/hbapigt.h
View File

@@ -161,7 +161,7 @@ extern HB_EXPORT void * hb_gtAlloc( void * hGT );
extern HB_EXPORT void hb_gtRelease( void * hGT );
extern HB_EXPORT void hb_gtAttach( void * hGT );
extern HB_EXPORT void * hb_gtSwap( void * hGT );
extern HB_EXPORT BOOL hb_gtReload( const char * szGtName,
extern HB_EXPORT HB_BOOL hb_gtReload( const char * szGtName,
HB_FHANDLE hFilenoStdin,
HB_FHANDLE hFilenoStdout,
HB_FHANDLE hFilenoStderr );
@@ -185,11 +185,11 @@ extern HB_EXPORT HB_ERRCODE hb_gtDispBegin( void );
extern HB_EXPORT int hb_gtDispCount( void );
extern HB_EXPORT HB_ERRCODE hb_gtDispEnd( void );
extern HB_EXPORT HB_ERRCODE hb_gtDrawShadow( int iTop, int iLeft, int iBottom, int iRight, int iColor );
extern HB_EXPORT HB_ERRCODE hb_gtGetBlink( BOOL * pbBlink );
extern HB_EXPORT HB_ERRCODE hb_gtGetBlink( HB_BOOL * pbBlink );
extern HB_EXPORT HB_ERRCODE hb_gtGetColorStr( char * pszColorString );
extern HB_EXPORT HB_ERRCODE hb_gtGetCursor( int * piCursorShape );
extern HB_EXPORT HB_ERRCODE hb_gtGetPos( int * piRow, int * piCol );
extern HB_EXPORT BOOL hb_gtIsColor( void );
extern HB_EXPORT HB_BOOL hb_gtIsColor( void );
extern HB_EXPORT int hb_gtMaxCol( void );
extern HB_EXPORT int hb_gtMaxRow( void );
extern HB_EXPORT HB_ERRCODE hb_gtPostExt( void );
@@ -209,12 +209,12 @@ extern HB_EXPORT HB_ERRCODE hb_gtScrDim( int * piHeight, int * piWidth );
extern HB_EXPORT HB_ERRCODE hb_gtScroll( int iTop, int iLeft, int iBottom, int iRight, int iRows, int iCols );
extern HB_EXPORT HB_ERRCODE hb_gtScrollUp( int iRows );
extern HB_EXPORT HB_ERRCODE hb_gtSetAttribute( int iTop, int iLeft, int iBottom, int iRight, int iColor );
extern HB_EXPORT HB_ERRCODE hb_gtSetBlink( BOOL bBlink );
extern HB_EXPORT HB_ERRCODE hb_gtSetBlink( HB_BOOL bBlink );
extern HB_EXPORT HB_ERRCODE hb_gtSetColorStr( const char * pszColorString );
extern HB_EXPORT HB_ERRCODE hb_gtSetCursor( int iCursorShape );
extern HB_EXPORT HB_ERRCODE hb_gtSetMode( int iRows, int iCols );
extern HB_EXPORT HB_ERRCODE hb_gtSetPos( int iRow, int iCol );
extern HB_EXPORT HB_ERRCODE hb_gtSetSnowFlag( BOOL bNoSnow );
extern HB_EXPORT HB_ERRCODE hb_gtSetSnowFlag( HB_BOOL bNoSnow );
extern HB_EXPORT HB_ERRCODE hb_gtTone( double dFrequency, double dDuration );
extern HB_EXPORT HB_ERRCODE hb_gtWrite( const char * szStr, HB_SIZE ulLen );
extern HB_EXPORT HB_ERRCODE hb_gtWriteAt( int iRow, int iCol, const char * szStr, HB_SIZE ulLen );
@@ -223,7 +223,7 @@ extern HB_EXPORT HB_ERRCODE hb_gtPutText( int iRow, int iCol, const char * szStr
extern HB_EXPORT const char * hb_gtVersion( int iType );
extern HB_EXPORT HB_ERRCODE hb_gtOutStd( const char * szStr, HB_SIZE ulLen );
extern HB_EXPORT HB_ERRCODE hb_gtOutErr( const char * szStr, HB_SIZE ulLen );
extern HB_EXPORT HB_ERRCODE hb_gtSetDispCP( const char * pszTermCDP, const char * pszHostCDP, BOOL fBox );
extern HB_EXPORT HB_ERRCODE hb_gtSetDispCP( const char * pszTermCDP, const char * pszHostCDP, HB_BOOL fBox );
extern HB_EXPORT HB_ERRCODE hb_gtSetKeyCP( const char * pszTermCDP, const char * pszHostCDP );
extern HB_EXPORT HB_ERRCODE hb_gtInfo( int iType, PHB_GT_INFO pInfo );
extern HB_EXPORT int hb_gtAlert( PHB_ITEM pMessage, PHB_ITEM pOptions, int iClrNorm, int iClrHigh, double dDelay );
@@ -242,9 +242,9 @@ extern HB_EXPORT HB_ERRCODE hb_gtBoxEx( int iTop, int iLeft, int iBottom, int iR
extern HB_EXPORT int hb_gtGfxPrimitive( int iType, int iTop, int iLeft, int iBottom, int iRight, int iColor );
extern HB_EXPORT HB_ERRCODE hb_gtGfxText( int iTop, int iLeft, const char * szText, int iColor, int iSize, int iWidth );
extern HB_EXPORT BOOL hb_mouseIsPresent( void );
extern HB_EXPORT BOOL hb_mouseGetCursor( void );
extern HB_EXPORT void hb_mouseSetCursor( BOOL bVisible );
extern HB_EXPORT HB_BOOL hb_mouseIsPresent( void );
extern HB_EXPORT HB_BOOL hb_mouseGetCursor( void );
extern HB_EXPORT void hb_mouseSetCursor( HB_BOOL bVisible );
extern HB_EXPORT int hb_mouseCol( void );
extern HB_EXPORT int hb_mouseRow( void );
extern HB_EXPORT void hb_mouseGetPos( int * piRow, int * piCol );
@@ -257,9 +257,9 @@ extern HB_EXPORT void hb_mouseRestoreState( const void * pBuffer );
extern HB_EXPORT int hb_mouseGetDoubleClickSpeed( void );
extern HB_EXPORT void hb_mouseSetDoubleClickSpeed( int iSpeed );
extern HB_EXPORT int hb_mouseCountButton( void );
extern HB_EXPORT BOOL hb_mouseButtonState( int iButton );
extern HB_EXPORT BOOL hb_mouseButtonPressed( int iButton, int * piRow, int * piCol );
extern HB_EXPORT BOOL hb_mouseButtonReleased( int iButton, int * piRow, int * piCol );
extern HB_EXPORT HB_BOOL hb_mouseButtonState( int iButton );
extern HB_EXPORT HB_BOOL hb_mouseButtonPressed( int iButton, int * piRow, int * piCol );
extern HB_EXPORT HB_BOOL hb_mouseButtonReleased( int iButton, int * piRow, int * piCol );
extern HB_EXPORT int hb_mouseReadKey( int iEventMask );
typedef struct
@@ -286,11 +286,11 @@ typedef HB_GT_CORD * PHB_GT_CORD;
extern HB_EXPORT void hb_gtWCreate( HB_GT_RECT * rect, HB_GT_WND ** wnd );
extern HB_EXPORT void hb_gtWDestroy( HB_GT_WND * wnd );
extern HB_EXPORT BOOL hb_gtWFlash( void );
extern HB_EXPORT HB_BOOL hb_gtWFlash( void );
extern HB_EXPORT void hb_gtWApp( HB_GT_WND ** wnd );
extern HB_EXPORT void hb_gtWCurrent( HB_GT_WND * wnd );
extern HB_EXPORT void hb_gtWPos( HB_GT_WND * wnd, HB_GT_RECT * rect );
extern HB_EXPORT BOOL hb_gtWVis( HB_GT_WND * wnd, USHORT uiStatus );
extern HB_EXPORT HB_BOOL hb_gtWVis( HB_GT_WND * wnd, USHORT uiStatus );
extern HB_EXPORT HB_ERRCODE hb_gtSLR( HB_GT_SLR * pSLR ); /* System Level Request */
extern HB_EXPORT HB_ERRCODE hb_gtModalRead( void * );
@@ -309,7 +309,7 @@ extern HB_EXPORT HB_ERRCODE hb_gtSetBorder( HB_GT_RGB * color );
#define INKEY_RAW 256 /* Minimally Decoded Keyboard Events */
/* Harbour keyboard support functions */
extern HB_EXPORT int hb_inkey( BOOL bWait, double dSeconds, int iEvenMask ); /* Wait for keyboard input */
extern HB_EXPORT int hb_inkey( HB_BOOL bWait, double dSeconds, int iEvenMask ); /* Wait for keyboard input */
extern HB_EXPORT void hb_inkeyPut( int ch ); /* Inserts an inkey code into the keyboard buffer */
extern HB_EXPORT void hb_inkeyIns( int ch ); /* Inserts an inkey code into the keyboard buffer */
extern HB_EXPORT int hb_inkeyLast( int iEvenMask ); /* Return the value of the last key that was extracted */

36
harbour/include/hbapiitm.h
View File

@@ -66,15 +66,15 @@ typedef struct
} HB_EVALINFO, * PHB_EVALINFO;
extern HB_EXPORT PHB_ITEM hb_evalLaunch ( PHB_EVALINFO pEvalInfo );
extern HB_EXPORT BOOL hb_evalNew ( PHB_EVALINFO pEvalInfo, PHB_ITEM pItem );
extern HB_EXPORT BOOL hb_evalPutParam ( PHB_EVALINFO pEvalInfo, PHB_ITEM pItem );
extern HB_EXPORT BOOL hb_evalRelease ( PHB_EVALINFO pEvalInfo );
extern HB_EXPORT HB_BOOL hb_evalNew ( PHB_EVALINFO pEvalInfo, PHB_ITEM pItem );
extern HB_EXPORT HB_BOOL hb_evalPutParam ( PHB_EVALINFO pEvalInfo, PHB_ITEM pItem );
extern HB_EXPORT HB_BOOL hb_evalRelease ( PHB_EVALINFO pEvalInfo );
extern HB_EXPORT void hb_evalBlock( PHB_ITEM pCodeBlock, ... );
extern HB_EXPORT void hb_evalBlock0( PHB_ITEM pCodeBlock );
extern HB_EXPORT void hb_evalBlock1( PHB_ITEM pCodeBlock, PHB_ITEM pParam );
extern HB_EXPORT BOOL hb_execFromArray ( PHB_ITEM pParam );
extern HB_EXPORT HB_BOOL hb_execFromArray ( PHB_ITEM pParam );
extern HB_EXPORT PHB_ITEM hb_itemDo ( PHB_ITEM pItem, ULONG ulPCount, ... );
extern HB_EXPORT PHB_ITEM hb_itemDoC ( const char * szFunc, ULONG ulPCount, ... );
@@ -83,7 +83,7 @@ extern HB_EXPORT PHB_ITEM hb_itemArrayGet ( PHB_ITEM pArray, HB_SIZE ulInde
extern HB_EXPORT PHB_ITEM hb_itemArrayNew ( HB_SIZE ulLen );
extern HB_EXPORT PHB_ITEM hb_itemArrayPut ( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_ITEM pItem );
extern HB_EXPORT HB_SIZE hb_itemCopyC ( PHB_ITEM pItem, char * szBuffer, HB_SIZE ulLen );
extern HB_EXPORT BOOL hb_itemFreeC ( char * szText );
extern HB_EXPORT HB_BOOL hb_itemFreeC ( char * szText );
extern HB_EXPORT char * hb_itemGetC ( PHB_ITEM pItem );
extern HB_EXPORT const char * hb_itemGetCPtr ( PHB_ITEM pItem );
extern HB_EXPORT HB_SIZE hb_itemGetCLen ( PHB_ITEM pItem );
@@ -91,8 +91,8 @@ extern HB_EXPORT char * hb_itemGetDS ( PHB_ITEM pItem, char * szDate )
extern HB_EXPORT char * hb_itemGetTS ( PHB_ITEM pItem, char * szDateTime );
extern HB_EXPORT long hb_itemGetDL ( PHB_ITEM pItem );
extern HB_EXPORT double hb_itemGetTD ( PHB_ITEM pItem );
extern HB_EXPORT BOOL hb_itemGetTDT ( PHB_ITEM pItem, long * plJulian, long * plMilliSec );
extern HB_EXPORT BOOL hb_itemGetL ( PHB_ITEM pItem );
extern HB_EXPORT HB_BOOL hb_itemGetTDT ( PHB_ITEM pItem, long * plJulian, long * plMilliSec );
extern HB_EXPORT HB_BOOL hb_itemGetL ( PHB_ITEM pItem );
extern HB_EXPORT double hb_itemGetND ( PHB_ITEM pItem );
extern HB_EXPORT double hb_itemGetNDDec ( PHB_ITEM pItem, int * piDec );
extern HB_EXPORT int hb_itemGetNI ( PHB_ITEM pItem );
@@ -119,7 +119,7 @@ extern HB_EXPORT PHB_ITEM hb_itemPutTS ( PHB_ITEM pItem, const char * sz
extern HB_EXPORT PHB_ITEM hb_itemPutDL ( PHB_ITEM pItem, long lJulian );
extern HB_EXPORT PHB_ITEM hb_itemPutTD ( PHB_ITEM pItem, double dTimeStamp );
extern HB_EXPORT PHB_ITEM hb_itemPutTDT ( PHB_ITEM pItem, long lJulian, long lMilliSec );
extern HB_EXPORT PHB_ITEM hb_itemPutL ( PHB_ITEM pItem, BOOL bValue );
extern HB_EXPORT PHB_ITEM hb_itemPutL ( PHB_ITEM pItem, HB_BOOL bValue );
extern HB_EXPORT PHB_ITEM hb_itemPutND ( PHB_ITEM pItem, double dNumber );
extern HB_EXPORT PHB_ITEM hb_itemPutNI ( PHB_ITEM pItem, int iNumber );
extern HB_EXPORT PHB_ITEM hb_itemPutNL ( PHB_ITEM pItem, long lNumber );
@@ -134,7 +134,7 @@ extern HB_EXPORT PHB_ITEM hb_itemPutNumType( PHB_ITEM pItem, double dNumber,
extern HB_EXPORT PHB_ITEM hb_itemPutPtr ( PHB_ITEM pItem, void * pValue );
extern HB_EXPORT PHB_ITEM hb_itemPutPtrGC ( PHB_ITEM pItem, void * pValue );
extern HB_EXPORT PHB_ITEM hb_itemPutSymbol ( PHB_ITEM pItem, PHB_SYMB pSym );
extern HB_EXPORT BOOL hb_itemRelease ( PHB_ITEM pItem );
extern HB_EXPORT HB_BOOL hb_itemRelease ( PHB_ITEM pItem );
extern HB_EXPORT PHB_ITEM hb_itemReturn ( PHB_ITEM pItem );
extern HB_EXPORT PHB_ITEM hb_itemReturnForward( PHB_ITEM pItem );
extern HB_EXPORT void hb_itemReturnRelease( PHB_ITEM pItem );
@@ -150,10 +150,10 @@ extern HB_EXPORT PHB_ITEM hb_itemPutNLLLen ( PHB_ITEM pItem, LONGLONG lNumbe
/* Non Clipper compliant internal API */
extern HB_EXPORT PHB_ITEM hb_itemParamPtr ( USHORT uiParam, long lMask );
extern HB_EXPORT BOOL hb_itemParamStore( USHORT uiParam, PHB_ITEM pItem );
extern HB_EXPORT BOOL hb_itemParamStoreForward( USHORT uiParam, PHB_ITEM pItem );
extern HB_EXPORT int hb_itemStrCmp ( PHB_ITEM pFirst, PHB_ITEM pSecond, BOOL bForceExact ); /* our string compare */
extern HB_EXPORT int hb_itemStrICmp ( PHB_ITEM pFirst, PHB_ITEM pSecond, BOOL bForceExact ); /* our string compare */
extern HB_EXPORT HB_BOOL hb_itemParamStore( USHORT uiParam, PHB_ITEM pItem );
extern HB_EXPORT HB_BOOL hb_itemParamStoreForward( USHORT uiParam, PHB_ITEM pItem );
extern HB_EXPORT int hb_itemStrCmp ( PHB_ITEM pFirst, PHB_ITEM pSecond, HB_BOOL bForceExact ); /* our string compare */
extern HB_EXPORT int hb_itemStrICmp ( PHB_ITEM pFirst, PHB_ITEM pSecond, HB_BOOL bForceExact ); /* our string compare */
extern HB_EXPORT void hb_itemCopy ( PHB_ITEM pDest, PHB_ITEM pSource ); /* copies an item to one place to another respecting its containts */
extern HB_EXPORT void hb_itemCopyToRef ( PHB_ITEM pDest, PHB_ITEM pSource );
extern HB_EXPORT void hb_itemCopyFromRef( PHB_ITEM pDest, PHB_ITEM pSource );
@@ -169,17 +169,17 @@ extern HB_EXPORT PHB_ITEM hb_itemUnRefWrite( PHB_ITEM pItem, PHB_ITEM pSourc
extern HB_EXPORT PHB_ITEM hb_itemUnShare ( PHB_ITEM pItem ); /* un-share given string item */
extern HB_EXPORT PHB_ITEM hb_itemUnShareString( PHB_ITEM pItem ); /* un-share given string item - the pItem have to be valid unrefed string item */
extern HB_EXPORT PHB_ITEM hb_itemReSizeString( PHB_ITEM pItem, HB_SIZE ulSize ); /* Resize string buffer of given string item - the pItem have to be valid unrefed string item */
extern HB_EXPORT BOOL hb_itemGetWriteCL( PHB_ITEM pItem, char ** pszValue, HB_SIZE * pulLen );
extern HB_EXPORT HB_BOOL hb_itemGetWriteCL( PHB_ITEM pItem, char ** pszValue, HB_SIZE * pulLen );
extern HB_EXPORT PHB_ITEM hb_itemClone ( PHB_ITEM pItem ); /* clone the given item */
extern HB_EXPORT PHB_ITEM hb_itemCloneTo ( PHB_ITEM pDest, PHB_ITEM pSource ); /* clone the given item */
extern HB_EXPORT char * hb_itemStr ( PHB_ITEM pNumber, PHB_ITEM pWidth, PHB_ITEM pDec ); /* convert a number to a string */
extern HB_EXPORT char * hb_itemString ( PHB_ITEM pItem, HB_SIZE * ulLen, BOOL * bFreeReq ); /* Convert any scalar to a string */
extern HB_EXPORT BOOL hb_itemStrBuf ( char *szResult, PHB_ITEM pNumber, int iSize, int iDec ); /* convert a number to a string */
extern HB_EXPORT char * hb_itemString ( PHB_ITEM pItem, HB_SIZE * ulLen, HB_BOOL * bFreeReq ); /* Convert any scalar to a string */
extern HB_EXPORT HB_BOOL hb_itemStrBuf ( char *szResult, PHB_ITEM pNumber, int iSize, int iDec ); /* convert a number to a string */
extern HB_EXPORT PHB_ITEM hb_itemValToStr ( PHB_ITEM pItem ); /* Convert any scalar to a string */
extern HB_EXPORT char * hb_itemPadConv ( PHB_ITEM pItem, HB_SIZE * pulSize, BOOL * bFreeReq );
extern HB_EXPORT char * hb_itemPadConv ( PHB_ITEM pItem, HB_SIZE * pulSize, HB_BOOL * bFreeReq );
extern HB_EXPORT void hb_itemSwap ( PHB_ITEM pItem1, PHB_ITEM pItem2 );
extern HB_EXPORT char * hb_itemSerialize( PHB_ITEM pItem, BOOL fNumSize, ULONG * pulSize );
extern HB_EXPORT char * hb_itemSerialize( PHB_ITEM pItem, HB_BOOL fNumSize, ULONG * pulSize );
extern HB_EXPORT PHB_ITEM hb_itemDeserialize( const char ** pBufferPtr, ULONG * pulSize );
#if defined( _HB_API_INTERNAL_ )

4
harbour/include/hbapilng.h
View File

@@ -83,8 +83,8 @@ extern HB_EXPORT void hb_vmSetLang( PHB_LANG pLang );
/* Supported language list management */
extern HB_EXPORT BOOL hb_langRegister ( PHB_LANG lang );
extern HB_EXPORT BOOL hb_langDeRegister ( const char * pszID );
extern HB_EXPORT HB_BOOL hb_langRegister ( PHB_LANG lang );
extern HB_EXPORT HB_BOOL hb_langDeRegister ( const char * pszID );
extern HB_EXPORT PHB_LANG hb_langFind ( const char * pszID );
/* Default language selection and data query */

12
harbour/include/hbapistr.h
View File

@@ -93,13 +93,13 @@ extern HB_EXPORT const char * hb_arrayGetStr( PHB_ITEM pArray, HB_SIZE ulIndex,
extern HB_EXPORT const char * hb_arrayGetStrUTF8( PHB_ITEM pArray, HB_SIZE ulIndex, void ** phString, HB_SIZE * pulLen );
extern HB_EXPORT const HB_WCHAR * hb_arrayGetStrU16( PHB_ITEM pArray, HB_SIZE ulIndex, int iEndian, void ** phString, HB_SIZE * pulLen );
extern HB_EXPORT BOOL hb_arraySetStrLen( PHB_ITEM pArray, HB_SIZE ulIndex, void * cdp, const char * pStr, HB_SIZE ulLen );
extern HB_EXPORT BOOL hb_arraySetStrLenUTF8( PHB_ITEM pArray, HB_SIZE ulIndex, const char * pStr, HB_SIZE ulLen );
extern HB_EXPORT BOOL hb_arraySetStrLenU16( PHB_ITEM pArray, HB_SIZE ulIndex, int iEndian, const HB_WCHAR * pStr, HB_SIZE ulLen );
extern HB_EXPORT HB_BOOL hb_arraySetStrLen( PHB_ITEM pArray, HB_SIZE ulIndex, void * cdp, const char * pStr, HB_SIZE ulLen );
extern HB_EXPORT HB_BOOL hb_arraySetStrLenUTF8( PHB_ITEM pArray, HB_SIZE ulIndex, const char * pStr, HB_SIZE ulLen );
extern HB_EXPORT HB_BOOL hb_arraySetStrLenU16( PHB_ITEM pArray, HB_SIZE ulIndex, int iEndian, const HB_WCHAR * pStr, HB_SIZE ulLen );
extern HB_EXPORT BOOL hb_arraySetStr( PHB_ITEM pArray, HB_SIZE ulIndex, void * cdp, const char * pStr );
extern HB_EXPORT BOOL hb_arraySetStrUTF8( PHB_ITEM pArray, HB_SIZE ulIndex, const char * pStr);
extern HB_EXPORT BOOL hb_arraySetStrU16( PHB_ITEM pArray, HB_SIZE ulIndex, int iEndian, const HB_WCHAR * pStr );
extern HB_EXPORT HB_BOOL hb_arraySetStr( PHB_ITEM pArray, HB_SIZE ulIndex, void * cdp, const char * pStr );
extern HB_EXPORT HB_BOOL hb_arraySetStrUTF8( PHB_ITEM pArray, HB_SIZE ulIndex, const char * pStr );
extern HB_EXPORT HB_BOOL hb_arraySetStrU16( PHB_ITEM pArray, HB_SIZE ulIndex, int iEndian, const HB_WCHAR * pStr );
extern HB_EXPORT const char * hb_parstr( int iParam, void * cdp, void ** phString, HB_SIZE * pulLen );

68
harbour/include/hbcomp.h
View File

@@ -140,7 +140,7 @@ extern int hb_compVariableScope( HB_COMP_DECL, const char * );
#define FUN_ATTACHED 0x0200 /* function attached to function list */
extern void hb_compFunctionAdd( HB_COMP_DECL, const char * szFunName, HB_SYMBOLSCOPE cScope, int iType ); /* starts a new Clipper language function definition */
extern BOOL hb_compFunCallCheck( HB_COMP_DECL, const char *, int );
extern HB_BOOL hb_compFunCallCheck( HB_COMP_DECL, const char *, int );
extern PINLINE hb_compInlineAdd( HB_COMP_DECL, const char * szFunName, int iLine );
extern void hb_compFunctionMarkStatic( HB_COMP_DECL, const char * szFunName );
@@ -168,7 +168,7 @@ extern void hb_compGenBreak( HB_COMP_DECL ); /* generate code for BREAK stateme
extern void hb_compExternAdd( HB_COMP_DECL, const char * szExternName, HB_SYMBOLSCOPE cScope ); /* defines a new extern name */
extern void hb_compModuleAdd( HB_COMP_DECL, const char * szModuleName, BOOL fForce );
extern void hb_compModuleAdd( HB_COMP_DECL, const char * szModuleName, HB_BOOL fForce );
extern void hb_compRTVariableKill( HB_COMP_DECL, PFUNCTION );
extern void hb_compSwitchKill( HB_COMP_DECL, PFUNCTION );
@@ -178,7 +178,7 @@ extern void hb_compLoopKill( PFUNCTION );
extern void hb_compGenError( HB_COMP_DECL, const char * szErrors[], char cPrefix, int iError, const char * szError1, const char * szError2 ); /* generic parsing error management function */
extern void hb_compGenWarning( HB_COMP_DECL, const char * szWarnings[], char cPrefix, int iWarning, const char * szWarning1, const char * szWarning2); /* generic parsing warning management function */
extern BOOL hb_compForEachVarError( HB_COMP_DECL, const char * ); /* checks if it is FOR EACH enumerator variable and generates a warning */
extern HB_BOOL hb_compForEachVarError( HB_COMP_DECL, const char * ); /* checks if it is FOR EACH enumerator variable and generates a warning */
extern ULONG hb_compGenJump( LONG, HB_COMP_DECL ); /* generates the pcode to jump to a specific offset */
extern ULONG hb_compGenJumpFalse( LONG, HB_COMP_DECL ); /* generates the pcode to jump if false */
@@ -192,27 +192,27 @@ extern void hb_compLinePushIfDebugger( HB_COMP_DECL ); /* generates the pcode
extern void hb_compLinePushIfInside( HB_COMP_DECL ); /* generates the pcode with the currently compiled source code line */
extern void hb_compStatmentStart( HB_COMP_DECL ); /* Check if we can start statement (without line pushing) */
extern void hb_compGenMessage( const char * szMsgName, BOOL bIsObject, HB_COMP_DECL ); /* sends a message to an object */
extern void hb_compGenMessageData( const char * szMsg, BOOL bIsObject, HB_COMP_DECL ); /* generates an underscore-symbol name for a data assignment */
extern void hb_compGenPopVar( const char * szVarName, HB_COMP_DECL ); /* generates the pcode to pop a value from the virtual machine stack onto a variable */
extern void hb_compGenPopMemvar( const char * szVarName, HB_COMP_DECL ); /* generates the pcode to pop a value from the virtual machine stack onto a memvar variable */
extern void hb_compGenPushDouble( double dNumber, BYTE bWidth, BYTE bDec, HB_COMP_DECL ); /* Pushes a number on the virtual machine stack */
extern void hb_compGenPushFunCall( const char *, HB_COMP_DECL ); /* generates the pcode to push function's call */
extern void hb_compGenPushFunSym( const char *, HB_COMP_DECL ); /* generates the pcode to push function's symbol */
extern void hb_compGenPushFunRef( const char *, HB_COMP_DECL ); /* generates the pcode to push function's reference symbol */
extern void hb_compGenPushVar( const char * szVarName, BOOL bMacroVar, HB_COMP_DECL ); /* generates the pcode to push a variable value to the virtual machine stack */
extern void hb_compGenPushVarRef( const char * szVarName, HB_COMP_DECL ); /* generates the pcode to push a variable by reference to the virtual machine stack */
extern void hb_compGenPushMemvarRef( const char * szVarName, HB_COMP_DECL ); /* generates the pcode to push memvar variable by reference to the virtual machine stack */
extern void hb_compGenPushInteger( int iNumber, HB_COMP_DECL ); /* Pushes a integer number on the virtual machine stack */
extern void hb_compGenPushLogical( int iTrueFalse, HB_COMP_DECL ); /* pushes a logical value on the virtual machine stack */
extern void hb_compGenPushLong( HB_LONG lNumber, HB_COMP_DECL ); /* Pushes a long number on the virtual machine stack */
extern void hb_compGenPushDate( long lDate, HB_COMP_DECL ); /* Pushes a date constant on the virtual machine stack */
extern void hb_compGenPushTimeStamp( long lDate, long lTime, HB_COMP_DECL ); /* Pushes a timestamp constant on the virtual machine stack */
extern void hb_compGenPushNil( HB_COMP_DECL ); /* Pushes nil on the virtual machine stack */
extern void hb_compGenPushString( const char * szText, ULONG ulLen, HB_COMP_DECL ); /* Pushes a string on the virtual machine stack */
extern void hb_compGenPushSymbol( const char * szSymbolName, BOOL bFunction, HB_COMP_DECL ); /* Pushes a symbol on to the Virtual machine stack */
extern void hb_compGenPushAliasedVar( const char *, BOOL, const char *, HB_LONG, HB_COMP_DECL );
extern void hb_compGenPopAliasedVar( const char *, BOOL, const char *, HB_LONG, HB_COMP_DECL );
extern void hb_compGenMessage( const char * szMsgName, HB_BOOL bIsObject, HB_COMP_DECL ); /* sends a message to an object */
extern void hb_compGenMessageData( const char * szMsg, HB_BOOL bIsObject, HB_COMP_DECL ); /* generates an underscore-symbol name for a data assignment */
extern void hb_compGenPopVar( const char * szVarName, HB_COMP_DECL ); /* generates the pcode to pop a value from the virtual machine stack onto a variable */
extern void hb_compGenPopMemvar( const char * szVarName, HB_COMP_DECL ); /* generates the pcode to pop a value from the virtual machine stack onto a memvar variable */
extern void hb_compGenPushDouble( double dNumber, BYTE bWidth, BYTE bDec, HB_COMP_DECL ); /* Pushes a number on the virtual machine stack */
extern void hb_compGenPushFunCall( const char *, HB_COMP_DECL ); /* generates the pcode to push function's call */
extern void hb_compGenPushFunSym( const char *, HB_COMP_DECL ); /* generates the pcode to push function's symbol */
extern void hb_compGenPushFunRef( const char *, HB_COMP_DECL ); /* generates the pcode to push function's reference symbol */
extern void hb_compGenPushVar( const char * szVarName, HB_BOOL bMacroVar, HB_COMP_DECL ); /* generates the pcode to push a variable value to the virtual machine stack */
extern void hb_compGenPushVarRef( const char * szVarName, HB_COMP_DECL ); /* generates the pcode to push a variable by reference to the virtual machine stack */
extern void hb_compGenPushMemvarRef( const char * szVarName, HB_COMP_DECL ); /* generates the pcode to push memvar variable by reference to the virtual machine stack */
extern void hb_compGenPushInteger( int iNumber, HB_COMP_DECL ); /* Pushes a integer number on the virtual machine stack */
extern void hb_compGenPushLogical( int iTrueFalse, HB_COMP_DECL ); /* pushes a logical value on the virtual machine stack */
extern void hb_compGenPushLong( HB_LONG lNumber, HB_COMP_DECL ); /* Pushes a long number on the virtual machine stack */
extern void hb_compGenPushDate( long lDate, HB_COMP_DECL ); /* Pushes a date constant on the virtual machine stack */
extern void hb_compGenPushTimeStamp( long lDate, long lTime, HB_COMP_DECL ); /* Pushes a timestamp constant on the virtual machine stack */
extern void hb_compGenPushNil( HB_COMP_DECL ); /* Pushes nil on the virtual machine stack */
extern void hb_compGenPushString( const char * szText, ULONG ulLen, HB_COMP_DECL ); /* Pushes a string on the virtual machine stack */
extern void hb_compGenPushSymbol( const char * szSymbolName, HB_BOOL bFunction, HB_COMP_DECL ); /* Pushes a symbol on to the Virtual machine stack */
extern void hb_compGenPushAliasedVar( const char *, HB_BOOL, const char *, HB_LONG, HB_COMP_DECL );
extern void hb_compGenPopAliasedVar( const char *, HB_BOOL, const char *, HB_LONG, HB_COMP_DECL );
extern void hb_compGenPCode1( BYTE, HB_COMP_DECL ); /* generates 1 byte of pcode */
extern void hb_compGenPCode2( BYTE, BYTE, HB_COMP_DECL ); /* generates 2 bytes of pcode + flag for optional StrongType(). */
extern void hb_compGenPCode3( BYTE, BYTE, BYTE, HB_COMP_DECL ); /* generates 3 bytes of pcode + flag for optional StrongType() */
@@ -222,7 +222,7 @@ extern void hb_compGenPCodeN( const BYTE * pBuffer, ULONG ulSize, HB_COMP_DECL )
extern ULONG hb_compSequenceBegin( HB_COMP_DECL );
extern ULONG hb_compSequenceEnd( HB_COMP_DECL );
extern ULONG hb_compSequenceAlways( HB_COMP_DECL );
extern void hb_compSequenceFinish( HB_COMP_DECL, ULONG, ULONG, ULONG, BOOL, BOOL, BOOL );
extern void hb_compSequenceFinish( HB_COMP_DECL, ULONG, ULONG, ULONG, HB_BOOL, HB_BOOL, HB_BOOL );
/* support for FIELD declaration */
extern void hb_compFieldSetAlias( HB_COMP_DECL, const char *, int );
@@ -232,7 +232,7 @@ extern int hb_compFieldsCount( HB_COMP_DECL );
extern void hb_compStaticDefStart( HB_COMP_DECL );
extern void hb_compStaticDefEnd( HB_COMP_DECL, const char * );
extern BOOL hb_compCheckUnclosedStru( HB_COMP_DECL, PFUNCTION );
extern HB_BOOL hb_compCheckUnclosedStru( HB_COMP_DECL, PFUNCTION );
#define HB_COMP_ERROR_TYPE( x ) HB_COMP_PARAM->funcs->ErrorType( HB_COMP_PARAM, x )
#define HB_COMP_ERROR_SYNTAX( x ) HB_COMP_PARAM->funcs->ErrorSyntax( HB_COMP_PARAM, x )
@@ -289,13 +289,13 @@ extern void hb_compErrorVParams( HB_COMP_DECL, const char * );
extern HB_EXPR_PTR hb_compErrorStatic( HB_COMP_DECL, const char *, HB_EXPR_PTR );
extern void hb_compErrorCodeblock( HB_COMP_DECL, const char * );
extern BOOL hb_compIsValidMacroText( HB_COMP_DECL, const char *, ULONG );
extern HB_BOOL hb_compIsValidMacroText( HB_COMP_DECL, const char *, ULONG );
/* Codeblocks */
extern void hb_compCodeBlockStart( HB_COMP_DECL, BOOL ); /* starts a codeblock creation */
extern void hb_compCodeBlockEnd( HB_COMP_DECL ); /* end of codeblock creation */
extern void hb_compCodeBlockStop( HB_COMP_DECL ); /* end of fake codeblock */
extern void hb_compCodeBlockRewind( HB_COMP_DECL ); /* restart of fake codeblock */
extern void hb_compCodeBlockStart( HB_COMP_DECL, HB_BOOL ); /* starts a codeblock creation */
extern void hb_compCodeBlockEnd( HB_COMP_DECL ); /* end of codeblock creation */
extern void hb_compCodeBlockStop( HB_COMP_DECL ); /* end of fake codeblock */
extern void hb_compCodeBlockRewind( HB_COMP_DECL ); /* restart of fake codeblock */
#endif /* HB_MACRO_SUPPORT */
@@ -313,8 +313,8 @@ extern void hb_compPrintLogo( HB_COMP_DECL );
extern void hb_compPrintModes( HB_COMP_DECL );
/* Misc functions defined in harbour.c */
extern void hb_compNOOPfill( PFUNCTION pFunc, ULONG ulFrom, int iCount, BOOL fPop, BOOL fCheck );
extern BOOL hb_compHasJump( PFUNCTION pFunc, ULONG ulPos );
extern void hb_compNOOPfill( PFUNCTION pFunc, ULONG ulFrom, int iCount, HB_BOOL fPop, HB_BOOL fCheck );
extern HB_BOOL hb_compHasJump( PFUNCTION pFunc, ULONG ulPos );
/* Misc functions defined in hbfix.c */
extern void hb_compFixFuncPCode( HB_COMP_DECL, PFUNCTION pFunc );
@@ -346,7 +346,7 @@ extern void hb_compIdentifierClose( HB_COMP_DECL ); /* release the table of iden
/* compi18n.c */
extern void hb_compI18nFree( HB_COMP_DECL );
extern BOOL hb_compI18nSave( HB_COMP_DECL, BOOL fFinal );
extern HB_BOOL hb_compI18nSave( HB_COMP_DECL, HB_BOOL fFinal );
extern void hb_compI18nAdd( HB_COMP_DECL, const char* szText, const char* szContext, const char * szModule, UINT uiLine );
extern void hb_compI18nAddPlural( HB_COMP_DECL, const char** szTexts, ULONG ulCount, const char* szContext, const char * szModule, UINT uiLine );

126
harbour/include/hbcompdf.h
View File

@@ -112,7 +112,7 @@ typedef struct HB_CBVAR_
{
const char * szName;
BYTE bType;
BOOL bUsed;
HB_BOOL bUsed;
struct HB_CBVAR_ * pNext;
} HB_CBVAR, * HB_CBVAR_PTR;
@@ -246,18 +246,18 @@ typedef struct HB_EXPR_
{
union
{
const char *asSymbol;/* variable name */
BOOL asLogical; /* logical value */
const char * asSymbol; /* variable name */
HB_BOOL asLogical; /* logical value */
struct
{
char *string; /* literal strings */
BOOL dealloc; /* automatic deallocate on expresion deletion */
char * string; /* literal strings */
HB_BOOL dealloc; /* automatic deallocate on expresion deletion */
} asString;
struct
{
struct HB_EXPR_ *pMacro; /* macro variable */
const char *szName; /* variable name */
} asRTVar; /* PUBLIC or PRIVATE variable declaration */
struct HB_EXPR_ * pMacro; /* macro variable */
const char * szName; /* variable name */
} asRTVar; /* PUBLIC or PRIVATE variable declaration */
struct
{
union {
@@ -276,47 +276,47 @@ typedef struct HB_EXPR_
struct
{
const char * szMacro; /* identifier after the macro operator */
struct HB_EXPR_ *pExprList; /* list elements if &(...) was used */
struct HB_EXPR_ * pExprList; /* list elements if &(...) was used */
USHORT SubType; /* context in which macro is used */
unsigned char cMacroOp; /* macro operator */
} asMacro;
struct
{
struct HB_EXPR_ *pExprList; /* list elements */
struct HB_EXPR_ *pIndex; /* array index, others */
BOOL reference; /* push array item by reference or pass variable parameters to called function or method */
struct HB_EXPR_ * pExprList; /* list elements */
struct HB_EXPR_ * pIndex; /* array index, others */
HB_BOOL reference; /* push array item by reference or pass variable parameters to called function or method */
} asList;
struct
{
struct HB_EXPR_ *pExprList; /* list elements */
struct HB_EXPR_ * pExprList; /* list elements */
HB_CBVAR_PTR pLocals; /* list of local variables */
char *string; /* source code of a codeblock */
char * string; /* source code of a codeblock */
USHORT flags; /* HB_BLOCK_MACRO, HB_BLOCK_LATEEVAL, HB_BLOCK_VPARAMS */
} asCodeblock;
struct
{
struct HB_EXPR_ *pAlias; /* alias expression */
struct HB_EXPR_ *pVar; /* aliased variable or macro */
struct HB_EXPR_ *pExpList; /* aliased expression list */
struct HB_EXPR_ * pAlias; /* alias expression */
struct HB_EXPR_ * pVar; /* aliased variable or macro */
struct HB_EXPR_ * pExpList; /* aliased expression list */
} asAlias;
struct
{
struct HB_EXPR_ *pFunName; /* function name */
struct HB_EXPR_ *pParms; /* function call parameters */
struct HB_EXPR_ * pFunName; /* function name */
struct HB_EXPR_ * pParms; /* function call parameters */
} asFunCall;
struct
{
struct HB_EXPR_ *pObject; /* object */
struct HB_EXPR_ *pParms; /* method parameters */
struct HB_EXPR_ * pObject; /* object */
struct HB_EXPR_ * pParms; /* method parameters */
const char * szMessage; /* message as string */
struct HB_EXPR_ *pMessage; /* message as macro */
struct HB_EXPR_ * pMessage; /* message as macro */
} asMessage;
struct
{
struct HB_EXPR_ *pLeft; /* object */
struct HB_EXPR_ *pRight; /* object */
struct HB_EXPR_ * pLeft; /* object */
struct HB_EXPR_ * pRight; /* object */
} asOperator;
struct HB_EXPR_ *asReference;
struct HB_EXPR_ * asReference;
} value;
ULONG ulLength;
ULONG Counter;
@@ -328,7 +328,7 @@ typedef struct HB_EXPR_
typedef struct HB_ENUMERATOR_
{
const char *szName;
BOOL bForEach;
HB_BOOL bForEach;
struct HB_ENUMERATOR_ *pNext;
} HB_ENUMERATOR, *HB_ENUMERATOR_PTR; /* support structure for FOR EACH statements */
@@ -344,7 +344,7 @@ typedef struct HB_ELSEIF_
typedef struct HB_LOOPEXIT_
{
ULONG ulOffset;
BOOL fCanLoop;
HB_BOOL fCanLoop;
USHORT wSeqCounter;
USHORT wAlwaysCounter;
USHORT wWithObjectCnt;
@@ -375,7 +375,7 @@ typedef struct HB_SWITCHCMD_
typedef struct HB_RTVAR_
{
HB_EXPR_PTR pVar;
BOOL bPopValue;
HB_BOOL bPopValue;
struct HB_RTVAR_ *pNext;
struct HB_RTVAR_ *pPrev;
} HB_RTVAR, *HB_RTVAR_PTR;
@@ -403,10 +403,10 @@ typedef struct __FUNC
ULONG * pJumps; /* pointer to the Jumps array */
ULONG iNOOPs; /* NOOPs Counter */
ULONG iJumps; /* Jumps Counter */
BOOL bLateEval; /* TRUE if accessing of declared (compile time) variables is allowed */
BOOL fVParams; /* TRUE if variable number of parameters is used */
BOOL bError; /* error during function compilation */
BOOL bBlock; /* TRUE if simple codeblock body is compiled */
HB_BOOL bLateEval; /* TRUE if accessing of declared (compile time) variables is allowed */
HB_BOOL fVParams; /* TRUE if variable number of parameters is used */
HB_BOOL bError; /* error during function compilation */
HB_BOOL bBlock; /* TRUE if simple codeblock body is compiled */
struct __FUNC * pOwner; /* pointer to the function/procedure that owns the codeblock */
struct __FUNC * pNext; /* pointer to the next defined function */
HB_ENUMERATOR_PTR pEnum; /* pointer to FOR EACH variables */
@@ -488,7 +488,7 @@ typedef struct __EXTERN
typedef struct _HB_MODULE
{
const char * szName;
BOOL force;
HB_BOOL force;
struct _HB_MODULE * pNext;
} HB_MODULE, * PHB_MODULE;
@@ -505,10 +505,10 @@ typedef struct _HB_DEBUGINFO
typedef struct _HB_LABEL_INFO
{
FILE * yyc;
BOOL fVerbose;
BOOL fSetSeqBegin;
BOOL fCondJump;
BOOL fEndRequest;
HB_BOOL fVerbose;
HB_BOOL fSetSeqBegin;
HB_BOOL fCondJump;
HB_BOOL fEndRequest;
int iNestedBlock;
ULONG * pulLabels;
} HB_LABEL_INFO, * PHB_LABEL_INFO;
@@ -539,10 +539,10 @@ HB_COMMON, * HB_COMMON_PTR;
typedef struct HB_PCODE_INFO_ /* compiled pcode container for macro compiler */
{
BYTE * pCode; /* pointer to a memory block where pcode is stored */
ULONG lPCodeSize; /* total memory size for pcode */
ULONG lPCodePos; /* actual pcode offset */
BOOL fVParams; /* function/codeblock with variable parameters */
BYTE * pCode; /* pointer to a memory block where pcode is stored */
ULONG lPCodeSize; /* total memory size for pcode */
ULONG lPCodePos; /* actual pcode offset */
HB_BOOL fVParams; /* function/codeblock with variable parameters */
struct HB_PCODE_INFO_ * pPrev;
HB_CBVAR_PTR pLocals;
} HB_PCODE_INFO, * HB_PCODE_INFO_PTR;
@@ -604,7 +604,7 @@ typedef struct _HB_COMP_LEX
{
PHB_PP_STATE pPP;
int iState;
BOOL fEol;
HB_BOOL fEol;
const char * lasttok;
}
HB_COMP_LEX, * PHB_COMP_LEX;
@@ -658,7 +658,7 @@ typedef struct _HB_COMP
PHB_FNAME pPpoPath;
PHB_FNAME pI18nFileName;
PHB_I18NTABLE pI18n;
BOOL fI18n;
HB_BOOL fI18n;
void ( * outStdFunc ) ( void *, const char* );
void ( * outErrFunc ) ( void *, const char* );
@@ -700,26 +700,26 @@ typedef struct _HB_COMP
int iTraceInclude; /* trace included files and generate dependencies list */
int iSyntaxCheckOnly; /* syntax check only */
BOOL fQuiet; /* be quiet during compilation (-q) */
BOOL fFullQuiet; /* be quiet during compilation disable all messages */
BOOL fExit; /* force breaking compilation process */
BOOL fPPO; /* flag indicating, is ppo output needed */
BOOL fPPT; /* flag indicating, is ppt output needed */
BOOL fLineNumbers; /* holds if we need pcodes with line numbers */
BOOL fAnyWarning; /* holds if there was any warning during the compilation process */
BOOL fAutoMemvarAssume; /* holds if undeclared variables are automatically assumed MEMVAR (-a)*/
BOOL fForceMemvars; /* holds if memvars are assumed when accesing undeclared variable (-v)*/
BOOL fDebugInfo; /* holds if generate debugger required info */
BOOL fNoStartUp; /* C code generation embed HB_FS_FIRST or not */
BOOL fCredits; /* print credits */
BOOL fBuildInfo; /* print build info */
BOOL fLogo; /* print logo */
BOOL fLongOptimize; /* optimize PCODEs generated for integers */
BOOL fSingleModule; /* do not automatically compile DO...[WITH...] external modules (-m) */
BOOL fError; /* error appeared during compilation */
BOOL fNoArchDefs; /* do not define architecture dependent macros: __PLATFORM__*, __ARCH??BIT__, __*_ENDIAN__ */
BOOL fMeaningful; /* do not generate warnings about meaningless expression usage */
BOOL fINCLUDE; /* use INCLUDE envvar as header path (default) */
HB_BOOL fQuiet; /* be quiet during compilation (-q) */
HB_BOOL fFullQuiet; /* be quiet during compilation disable all messages */
HB_BOOL fExit; /* force breaking compilation process */
HB_BOOL fPPO; /* flag indicating, is ppo output needed */
HB_BOOL fPPT; /* flag indicating, is ppt output needed */
HB_BOOL fLineNumbers; /* holds if we need pcodes with line numbers */
HB_BOOL fAnyWarning; /* holds if there was any warning during the compilation process */
HB_BOOL fAutoMemvarAssume; /* holds if undeclared variables are automatically assumed MEMVAR (-a)*/
HB_BOOL fForceMemvars; /* holds if memvars are assumed when accesing undeclared variable (-v)*/
HB_BOOL fDebugInfo; /* holds if generate debugger required info */
HB_BOOL fNoStartUp; /* C code generation embed HB_FS_FIRST or not */
HB_BOOL fCredits; /* print credits */
HB_BOOL fBuildInfo; /* print build info */
HB_BOOL fLogo; /* print logo */
HB_BOOL fLongOptimize; /* optimize PCODEs generated for integers */
HB_BOOL fSingleModule; /* do not automatically compile DO...[WITH...] external modules (-m) */
HB_BOOL fError; /* error appeared during compilation */
HB_BOOL fNoArchDefs; /* do not define architecture dependent macros: __PLATFORM__*, __ARCH??BIT__, __*_ENDIAN__ */
HB_BOOL fMeaningful; /* do not generate warnings about meaningless expression usage */
HB_BOOL fINCLUDE; /* use INCLUDE envvar as header path (default) */
}
HB_COMP, * HB_COMP_PTR;

10
harbour/include/hbdate.h
View File

@@ -89,9 +89,9 @@ extern HB_EXPORT long hb_timeEncode( int iHour, int iMinutes, int iSeconds, in
extern HB_EXPORT void hb_timeDecode( long lMilliSec, int * piHour, int * piMinutes,
int * piSeconds, int * piMSec );
extern HB_EXPORT char * hb_timeStr( char * szTime, long lMilliSec );
extern HB_EXPORT BOOL hb_timeStrGet( const char * szTime,
int * piHour, int * piMinutes,
int * piSeconds, int * piMSec );
extern HB_EXPORT HB_BOOL hb_timeStrGet( const char * szTime,
int * piHour, int * piMinutes,
int * piSeconds, int * piMSec );
extern HB_EXPORT void hb_timeStrRawGet( const char * szTime,
int * piHour, int * piMinutes,
@@ -110,11 +110,11 @@ extern HB_EXPORT char * hb_timeStampStrRawPut( char * szDateTime, long lJulian,
extern HB_EXPORT void hb_timeStampStrRawGet( const char * szDateTime, long * plJulian, long * plMilliSec );
extern HB_EXPORT char * hb_timeStampStr( char * szDateTime, long lJulian, long lMilliSec );
extern HB_EXPORT BOOL hb_timeStampStrGet( const char * szDateTime,
extern HB_EXPORT HB_BOOL hb_timeStampStrGet( const char * szDateTime,
int * piYear, int * piMonth, int * piDay,
int * piHour, int * piMinutes, int * piSeconds,
int * piMSec );
extern HB_EXPORT BOOL hb_timeStampStrGetDT( const char * szDateTime,
extern HB_EXPORT HB_BOOL hb_timeStampStrGetDT( const char * szDateTime,
long * plJulian, long * plMilliSec );
extern HB_EXPORT double hb_timeStampPackDT( long lJulian, long lMilliSec );

10
harbour/include/hbexpra.c
View File

@@ -80,8 +80,8 @@ ULONG hb_compExprListEval2( HB_COMP_DECL, HB_EXPR_PTR pExpr1, HB_EXPR_PTR pExpr2
if( !pEval )
return ulLen;
if( (pExpr1->ExprType == HB_ET_LIST || pExpr1->ExprType == HB_ET_ARGLIST)
&&
if( (pExpr1->ExprType == HB_ET_LIST || pExpr1->ExprType == HB_ET_ARGLIST)
&&
(pExpr2->ExprType == HB_ET_LIST || pExpr2->ExprType == HB_ET_ARGLIST) )
{
pExpr1 = pExpr1->value.asList.pExprList;
@@ -177,7 +177,7 @@ HB_EXPR_PTR hb_compExprNewFunCall( HB_EXPR_PTR pName, HB_EXPR_PTR pParms, HB_COM
if( szName )
{
HB_COMP_EXPR_DELETE( pParms );
HB_COMP_EXPR_DELETE( pName );
HB_COMP_EXPR_DELETE( pName );
return hb_compExprNewMethodCall( hb_compExprNewSend(
hb_compExprNewVar( szName, HB_COMP_PARAM ),
szMessage, NULL, HB_COMP_PARAM ), NULL );
@@ -205,7 +205,7 @@ HB_EXPR_PTR hb_compExprNewFunCall( HB_EXPR_PTR pName, HB_EXPR_PTR pParms, HB_COM
#endif
pParms->value.asList.pExprList = NULL;
HB_COMP_EXPR_DELETE( pParms );
HB_COMP_EXPR_DELETE( pName );
HB_COMP_EXPR_DELETE( pName );
return pEval;
}
else if( iLen == 5 && memcmp( "_GET_", pName->value.asSymbol, 5 ) == 0 )
@@ -554,7 +554,7 @@ static const char * s_szStaticFun[] = {
#define STATIC_FUNCTIONS ( sizeof( s_szStaticFun ) / sizeof( char * ) )
static BOOL hb_compStaticFunction( const char * szName )
static HB_BOOL hb_compStaticFunction( const char * szName )
{
unsigned int ui;
for( ui = 0; ui < STATIC_FUNCTIONS; ++ui )

32
harbour/include/hbexprb.c
View File

@@ -131,7 +131,7 @@ static HB_EXPR_FUNC( hb_compExprUseNegate );
#if defined( HB_MACRO_SUPPORT )
static void hb_compExprCodeblockPush( HB_EXPR_PTR, HB_COMP_DECL );
#else
static void hb_compExprCodeblockPush( HB_EXPR_PTR, BOOL, HB_COMP_DECL );
static void hb_compExprCodeblockPush( HB_EXPR_PTR, HB_BOOL, HB_COMP_DECL );
static void hb_compExprCodeblockEarly( HB_EXPR_PTR, HB_COMP_DECL );
static void hb_compExprCodeblockExtPush( HB_EXPR_PTR pSelf, HB_COMP_DECL );
#endif
@@ -146,7 +146,7 @@ static void hb_compExprUsePreOp( HB_EXPR_PTR pSelf, BYTE bOper, HB_COMP_DECL );
static void hb_compExprUseAliasMacro( HB_EXPR_PTR pAliasedVar, BYTE bAction, HB_COMP_DECL );
static HB_EXPR_PTR hb_compExprReduceList( HB_EXPR_PTR pExpr, HB_COMP_DECL );
static HB_EXPR_PTR hb_compExprReduceAliasString( HB_EXPR_PTR pExpr, HB_EXPR_PTR pAlias, HB_COMP_DECL );
static BOOL hb_compExprIsMemvarAlias( const char *szAlias );
static HB_BOOL hb_compExprIsMemvarAlias( const char *szAlias );
const HB_EXPR_FUNC_PTR hb_comp_ExprTable[ HB_EXPR_COUNT ] = {
@@ -587,7 +587,7 @@ static HB_EXPR_FUNC( hb_compExprUseArray )
}
else
{
BOOL fArgsList = pSelf->ExprType == HB_ET_MACROARGLIST;
HB_BOOL fArgsList = pSelf->ExprType == HB_ET_MACROARGLIST;
if( !fArgsList )
{
@@ -1381,7 +1381,7 @@ static HB_EXPR_FUNC( hb_compExprUseArrayAt )
case HB_EA_PUSH_PCODE:
{
BOOL fMacroIndex = FALSE;
HB_BOOL fMacroIndex = FALSE;
if( pSelf->value.asList.pIndex->ExprType == HB_ET_MACRO )
{
@@ -1452,7 +1452,7 @@ static HB_EXPR_FUNC( hb_compExprUseArrayAt )
case HB_EA_POP_PCODE:
{
BOOL fMacroIndex = FALSE;
HB_BOOL fMacroIndex = FALSE;
if( pSelf->value.asList.pIndex->ExprType == HB_ET_MACRO )
{
if( HB_SUPPORT_XBASE )
@@ -1791,7 +1791,7 @@ static HB_EXPR_FUNC( hb_compExprUseFunCall )
{
HB_EXPR_PTR pArg = pParms->value.asList.pExprList;
HB_LONG lResult = 0;
BOOL fOptimize = FALSE, fBool = FALSE;
HB_BOOL fOptimize = FALSE, fBool = FALSE;
if( usCount >= 2 )
{
@@ -1887,7 +1887,7 @@ static HB_EXPR_FUNC( hb_compExprUseFunCall )
else if( strncmp( "HB_I18N_", pName->value.asSymbol, 8 ) == 0 )
{
HB_EXPR_PTR pArg = pParms->value.asList.pExprList, pCount = NULL;
BOOL fStrict, fNoop, fPlural, fI18nFunc;
HB_BOOL fStrict, fNoop, fPlural, fI18nFunc;
ULONG ulPos = 8;
fStrict = fNoop = fPlural = fI18nFunc = FALSE;
@@ -2082,7 +2082,7 @@ static HB_EXPR_FUNC( hb_compExprUseFunCall )
case HB_EA_PUSH_PCODE:
{
BOOL fArgsList = FALSE;
HB_BOOL fArgsList = FALSE;
USHORT usCount = 0;
if( pSelf->value.asFunCall.pFunName->ExprType == HB_ET_FUNNAME )
@@ -2124,7 +2124,7 @@ static HB_EXPR_FUNC( hb_compExprUseFunCall )
case HB_EA_PUSH_POP:
case HB_EA_STATEMENT:
{
BOOL fArgsList = FALSE;
HB_BOOL fArgsList = FALSE;
USHORT usCount = 0;
if( pSelf->value.asFunCall.pFunName->ExprType == HB_ET_FUNNAME )
@@ -2551,7 +2551,7 @@ static HB_EXPR_FUNC( hb_compExprUseSend )
case HB_EA_PUSH_PCODE:
if( pSelf->value.asMessage.pParms ) /* Is it a method call ? */
{
BOOL fArgsList = FALSE;
HB_BOOL fArgsList = FALSE;
int iParms = ( int ) hb_compExprParamListCheck( HB_COMP_PARAM, pSelf->value.asMessage.pParms );
hb_compExprPushSendPush( pSelf, HB_COMP_PARAM );
@@ -3117,7 +3117,7 @@ static HB_EXPR_FUNC( hb_compExprUseOr )
HB_EXPR_USE( pSelf->value.asOperator.pRight, HB_EA_PUSH_POP );
#else
{
BOOL fMeaningful = HB_COMP_PARAM->fMeaningful;
HB_BOOL fMeaningful = HB_COMP_PARAM->fMeaningful;
/* do not generate warning about meaningless expression usage */
HB_COMP_PARAM->fMeaningful = TRUE;
HB_EXPR_USE( pSelf->value.asOperator.pRight, HB_EA_PUSH_POP );
@@ -3202,7 +3202,7 @@ static HB_EXPR_FUNC( hb_compExprUseAnd )
HB_EXPR_USE( pSelf->value.asOperator.pRight, HB_EA_PUSH_POP );
#else
{
BOOL fMeaningful = HB_COMP_PARAM->fMeaningful;
HB_BOOL fMeaningful = HB_COMP_PARAM->fMeaningful;
/* do not generate warning about meaningless expression usage */
HB_COMP_PARAM->fMeaningful = TRUE;
HB_EXPR_USE( pSelf->value.asOperator.pRight, HB_EA_PUSH_POP );
@@ -4314,7 +4314,7 @@ static HB_EXPR_FUNC( hb_compExprUsePreDec )
#if defined( HB_MACRO_SUPPORT )
static void hb_compExprCodeblockPush( HB_EXPR_PTR pSelf, HB_COMP_DECL )
#else
static void hb_compExprCodeblockPush( HB_EXPR_PTR pSelf, BOOL bLateEval, HB_COMP_DECL )
static void hb_compExprCodeblockPush( HB_EXPR_PTR pSelf, HB_BOOL bLateEval, HB_COMP_DECL )
#endif
{
HB_EXPR_PTR pExpr, pNext;
@@ -4531,7 +4531,7 @@ static void hb_compExprPushSendPush( HB_EXPR_PTR pSelf, HB_COMP_DECL )
}
static void hb_compExprPushSendPopPush( HB_EXPR_PTR pObj, HB_EXPR_PTR pValue,
BOOL fPreOp, BYTE bOper, HB_COMP_DECL )
HB_BOOL fPreOp, BYTE bOper, HB_COMP_DECL )
{
if( HB_SUPPORT_HARBOUR )
{
@@ -5310,7 +5310,7 @@ static HB_EXPR_PTR hb_compExprReduceAliasString( HB_EXPR_PTR pExpr, HB_EXPR_PTR
ULONG ulLen = pAlias->ulLength;
if( ulLen <= HB_SYMBOL_NAME_LEN )
{
BOOL fLower = FALSE;
HB_BOOL fLower = FALSE;
while( ulLen )
{
char c = szAlias[ ulLen - 1 ];
@@ -5341,7 +5341,7 @@ static HB_EXPR_PTR hb_compExprReduceAliasString( HB_EXPR_PTR pExpr, HB_EXPR_PTR
return pExpr;
}
static BOOL hb_compExprIsMemvarAlias( const char *szAlias )
static HB_BOOL hb_compExprIsMemvarAlias( const char *szAlias )
{
int iLen = strlen( szAlias );
/* @M-> @MEMVAR-> or @MEMVA-> or @MEMV-> */

34
harbour/include/hbexprop.h
View File

@@ -87,7 +87,7 @@ extern HB_EXPR_PTR hb_compExprNewDouble( double, BYTE, BYTE, HB_COMP_DECL );
extern HB_EXPR_PTR hb_compExprNewLong( HB_LONG, HB_COMP_DECL );
extern HB_EXPR_PTR hb_compExprNewDate( long, HB_COMP_DECL );
extern HB_EXPR_PTR hb_compExprNewTimeStamp( long, long, HB_COMP_DECL );
extern HB_EXPR_PTR hb_compExprNewString( const char *, ULONG, BOOL, HB_COMP_DECL );
extern HB_EXPR_PTR hb_compExprNewString( const char *, ULONG, HB_BOOL, HB_COMP_DECL );
extern HB_EXPR_PTR hb_compExprNewLogical( int, HB_COMP_DECL );
extern HB_EXPR_PTR hb_compExprNewSelf( HB_COMP_DECL );
extern HB_EXPR_PTR hb_compExprNewCodeBlock( char *, ULONG, int, HB_COMP_DECL );
@@ -151,7 +151,7 @@ extern HB_EXPR_PTR hb_compExprAssign( HB_EXPR_PTR, HB_EXPR_PTR, HB_COMP_DECL );
extern HB_EXPR_PTR hb_compExprEqual( HB_EXPR_PTR, HB_EXPR_PTR );
extern HB_EXPR_PTR hb_compExprAssignStatic( HB_EXPR_PTR, HB_EXPR_PTR, HB_COMP_DECL );
extern HB_EXPR_PTR hb_compExprClone( HB_EXPR_PTR pSrc );
extern BOOL hb_compExprListTypeCheck( HB_EXPR_PTR pExpr, HB_EXPRTYPE ExprType );
extern HB_BOOL hb_compExprListTypeCheck( HB_EXPR_PTR pExpr, HB_EXPRTYPE ExprType );
extern ULONG hb_compExprListLen( HB_EXPR_PTR );
extern ULONG hb_compExprParamListLen( HB_EXPR_PTR );
extern ULONG hb_compExprMacroListLen( HB_EXPR_PTR );
@@ -170,7 +170,7 @@ extern const char * hb_compExprAsString( HB_EXPR_PTR );
extern const char * hb_compExprAsSymbol( HB_EXPR_PTR );
extern HB_EXPR_PTR hb_compExprListStrip( HB_EXPR_PTR, HB_COMP_DECL );
extern BOOL hb_compExprIsValidMacro( const char *, ULONG, BOOL *, HB_COMP_DECL );
extern HB_BOOL hb_compExprIsValidMacro( const char *, ULONG, HB_BOOL *, HB_COMP_DECL );
extern HB_EXPR_PTR hb_compExprSetOperand( HB_EXPR_PTR, HB_EXPR_PTR, HB_COMP_DECL );
extern HB_EXPR_PTR hb_compExprSetGetBlock( HB_EXPR_PTR pExpr, HB_COMP_DECL );
@@ -195,20 +195,20 @@ extern HB_EXPR_PTR hb_compExprReduceAnd( HB_EXPR_PTR pSelf, HB_COMP_DECL );
extern HB_EXPR_PTR hb_compExprReduceOr( HB_EXPR_PTR pSelf, HB_COMP_DECL );
extern HB_EXPR_PTR hb_compExprReduceIIF( HB_EXPR_PTR, HB_COMP_DECL );
extern BOOL hb_compExprReduceAT( HB_EXPR_PTR, HB_COMP_DECL );
extern BOOL hb_compExprReduceCHR( HB_EXPR_PTR, HB_COMP_DECL );
extern BOOL hb_compExprReduceLEN( HB_EXPR_PTR, HB_COMP_DECL );
extern BOOL hb_compExprReduceASC( HB_EXPR_PTR, HB_COMP_DECL );
extern BOOL hb_compExprReduceINT( HB_EXPR_PTR, HB_COMP_DECL );
extern BOOL hb_compExprReduceEMPTY( HB_EXPR_PTR, HB_COMP_DECL );
extern BOOL hb_compExprReduceSTOT( HB_EXPR_PTR, USHORT usCount, HB_COMP_DECL );
extern BOOL hb_compExprReduceSTOD( HB_EXPR_PTR, USHORT usCount, HB_COMP_DECL );
extern BOOL hb_compExprReduceDTOS( HB_EXPR_PTR, HB_COMP_DECL );
extern BOOL hb_compExprReduceCTOD( HB_EXPR_PTR, HB_COMP_DECL );
extern BOOL hb_compExprReduceUPPER( HB_EXPR_PTR, HB_COMP_DECL );
extern BOOL hb_compExprReduceMIN( HB_EXPR_PTR, HB_COMP_DECL );
extern BOOL hb_compExprReduceMAX( HB_EXPR_PTR, HB_COMP_DECL );
extern BOOL hb_compExprReduceBitFunc( HB_EXPR_PTR, HB_LONG, BOOL, HB_COMP_DECL );
extern HB_BOOL hb_compExprReduceAT( HB_EXPR_PTR, HB_COMP_DECL );
extern HB_BOOL hb_compExprReduceCHR( HB_EXPR_PTR, HB_COMP_DECL );
extern HB_BOOL hb_compExprReduceLEN( HB_EXPR_PTR, HB_COMP_DECL );
extern HB_BOOL hb_compExprReduceASC( HB_EXPR_PTR, HB_COMP_DECL );
extern HB_BOOL hb_compExprReduceINT( HB_EXPR_PTR, HB_COMP_DECL );
extern HB_BOOL hb_compExprReduceEMPTY( HB_EXPR_PTR, HB_COMP_DECL );
extern HB_BOOL hb_compExprReduceSTOT( HB_EXPR_PTR, USHORT usCount, HB_COMP_DECL );
extern HB_BOOL hb_compExprReduceSTOD( HB_EXPR_PTR, USHORT usCount, HB_COMP_DECL );
extern HB_BOOL hb_compExprReduceDTOS( HB_EXPR_PTR, HB_COMP_DECL );
extern HB_BOOL hb_compExprReduceCTOD( HB_EXPR_PTR, HB_COMP_DECL );
extern HB_BOOL hb_compExprReduceUPPER( HB_EXPR_PTR, HB_COMP_DECL );
extern HB_BOOL hb_compExprReduceMIN( HB_EXPR_PTR, HB_COMP_DECL );
extern HB_BOOL hb_compExprReduceMAX( HB_EXPR_PTR, HB_COMP_DECL );
extern HB_BOOL hb_compExprReduceBitFunc( HB_EXPR_PTR, HB_LONG, HB_BOOL, HB_COMP_DECL );
HB_EXTERN_END

92
harbour/include/hbgtcore.h
View File

@@ -110,15 +110,15 @@ struct _HB_GT_BASE;
typedef struct
{
BOOL (* Lock) ( HB_GT_PTR );
HB_BOOL (* Lock) ( HB_GT_PTR );
void (* Unlock) ( HB_GT_PTR );
void (* Init) ( HB_GT_PTR, HB_FHANDLE, HB_FHANDLE, HB_FHANDLE );
void (* Exit) ( HB_GT_PTR );
void * (* New) ( HB_GT_PTR );
void (* Free) ( HB_GT_PTR );
void (* Mark) ( HB_GT_PTR );
BOOL (* Resize) ( HB_GT_PTR, int, int );
BOOL (* SetMode) ( HB_GT_PTR, int, int );
HB_BOOL (* Resize) ( HB_GT_PTR, int, int );
HB_BOOL (* SetMode) ( HB_GT_PTR, int, int );
void (* GetSize) ( HB_GT_PTR, int *, int * );
void (* SemiCold) ( HB_GT_PTR );
void (* ColdArea) ( HB_GT_PTR, int, int, int, int );
@@ -132,10 +132,10 @@ typedef struct
void (* Flush) ( HB_GT_PTR );
int (* MaxCol) ( HB_GT_PTR );
int (* MaxRow) ( HB_GT_PTR );
BOOL (* CheckPos) ( HB_GT_PTR, int, int, long * );
HB_BOOL (* CheckPos) ( HB_GT_PTR, int, int, long * );
void (* SetPos) ( HB_GT_PTR, int, int );
void (* GetPos) ( HB_GT_PTR, int *, int * );
BOOL (* IsColor) ( HB_GT_PTR );
HB_BOOL (* IsColor) ( HB_GT_PTR );
void (* GetColorStr) ( HB_GT_PTR, char * );
void (* SetColorStr) ( HB_GT_PTR, const char * );
void (* ColorSelect) ( HB_GT_PTR, int );
@@ -151,13 +151,13 @@ typedef struct
int (* GetCursorStyle) ( HB_GT_PTR );
void (* SetCursorStyle) ( HB_GT_PTR, int );
void (* GetScrCursor) ( HB_GT_PTR, int *, int *, int * );
BOOL (* GetScrChar) ( HB_GT_PTR, int, int, int *, BYTE *, USHORT * );
BOOL (* PutScrChar) ( HB_GT_PTR, int, int, int, BYTE, USHORT );
HB_BOOL (* GetScrChar) ( HB_GT_PTR, int, int, int *, BYTE *, USHORT * );
HB_BOOL (* PutScrChar) ( HB_GT_PTR, int, int, int, BYTE, USHORT );
void (* DispBegin) ( HB_GT_PTR );
void (* DispEnd) ( HB_GT_PTR );
int (* DispCount) ( HB_GT_PTR );
BOOL (* GetChar) ( HB_GT_PTR, int, int, int *, BYTE *, USHORT * );
BOOL (* PutChar) ( HB_GT_PTR, int, int, int, BYTE, USHORT );
HB_BOOL (* GetChar) ( HB_GT_PTR, int, int, int *, BYTE *, USHORT * );
HB_BOOL (* PutChar) ( HB_GT_PTR, int, int, int, BYTE, USHORT );
long (* RectSize) ( HB_GT_PTR, int, int, int, int );
void (* Save) ( HB_GT_PTR, int, int, int, int, void * );
void (* Rest) ( HB_GT_PTR, int, int, int, int, const void * );
@@ -175,30 +175,30 @@ typedef struct
void (* BoxS) ( HB_GT_PTR, int, int, int, int, const char *, int );
void (* HorizLine) ( HB_GT_PTR, int, int, int, USHORT, int );
void (* VertLine) ( HB_GT_PTR, int, int, int, USHORT, int );
BOOL (* GetBlink) ( HB_GT_PTR );
void (* SetBlink) ( HB_GT_PTR, BOOL );
void (* SetSnowFlag) ( HB_GT_PTR, BOOL );
HB_BOOL (* GetBlink) ( HB_GT_PTR );
void (* SetBlink) ( HB_GT_PTR, HB_BOOL );
void (* SetSnowFlag) ( HB_GT_PTR, HB_BOOL );
const char * (* Version) ( HB_GT_PTR, int );
BOOL (* Suspend) ( HB_GT_PTR );
BOOL (* Resume) ( HB_GT_PTR );
BOOL (* PreExt) ( HB_GT_PTR );
BOOL (* PostExt) ( HB_GT_PTR );
HB_BOOL (* Suspend) ( HB_GT_PTR );
HB_BOOL (* Resume) ( HB_GT_PTR );
HB_BOOL (* PreExt) ( HB_GT_PTR );
HB_BOOL (* PostExt) ( HB_GT_PTR );
void (* OutStd) ( HB_GT_PTR, const char *, HB_SIZE );
void (* OutErr) ( HB_GT_PTR, const char *, HB_SIZE );
void (* Tone) ( HB_GT_PTR, double, double );
void (* Bell) ( HB_GT_PTR );
BOOL (* Info) ( HB_GT_PTR, int, PHB_GT_INFO );
HB_BOOL (* Info) ( HB_GT_PTR, int, PHB_GT_INFO );
int (* Alert) ( HB_GT_PTR, PHB_ITEM, PHB_ITEM, int, int, double );
int (* SetFlag) ( HB_GT_PTR, int, int );
/* internationalization */
BOOL (* SetDispCP) ( HB_GT_PTR, const char *, const char *, BOOL );
BOOL (* SetKeyCP) ( HB_GT_PTR, const char *, const char * );
HB_BOOL (* SetDispCP) ( HB_GT_PTR, const char *, const char *, HB_BOOL );
HB_BOOL (* SetKeyCP) ( HB_GT_PTR, const char *, const char * );
/* keyboard */
int (* ReadKey) ( HB_GT_PTR, int );
int (* InkeyGet) ( HB_GT_PTR, BOOL fWait, double dSeconds, int iEventMask );
int (* InkeyGet) ( HB_GT_PTR, HB_BOOL fWait, double dSeconds, int iEventMask );
void (* InkeyPut) ( HB_GT_PTR, int iKey );
void (* InkeyIns) ( HB_GT_PTR, int iKey );
int (* InkeyLast) ( HB_GT_PTR, int iEventMask );
@@ -212,11 +212,11 @@ typedef struct
/* mouse */
void (* MouseInit) ( HB_GT_PTR );
void (* MouseExit) ( HB_GT_PTR );
BOOL (* MouseIsPresent) ( HB_GT_PTR );
HB_BOOL (* MouseIsPresent) ( HB_GT_PTR );
void (* MouseShow) ( HB_GT_PTR );
void (* MouseHide) ( HB_GT_PTR );
BOOL (* MouseGetCursor) ( HB_GT_PTR );
void (* MouseSetCursor) ( HB_GT_PTR, BOOL );
HB_BOOL (* MouseGetCursor) ( HB_GT_PTR );
void (* MouseSetCursor) ( HB_GT_PTR, HB_BOOL );
int (* MouseCol) ( HB_GT_PTR );
int (* MouseRow) ( HB_GT_PTR );
void (* MouseGetPos) ( HB_GT_PTR, int *, int * );
@@ -229,9 +229,9 @@ typedef struct
int (* MouseGetDoubleClickSpeed) ( HB_GT_PTR );
void (* MouseSetDoubleClickSpeed) ( HB_GT_PTR, int );
int (* MouseCountButton) ( HB_GT_PTR );
BOOL (* MouseButtonState) ( HB_GT_PTR, int );
BOOL (* MouseButtonPressed) ( HB_GT_PTR, int, int *, int * );
BOOL (* MouseButtonReleased) ( HB_GT_PTR, int, int *, int * );
HB_BOOL (* MouseButtonState) ( HB_GT_PTR, int );
HB_BOOL (* MouseButtonPressed) ( HB_GT_PTR, int, int *, int * );
HB_BOOL (* MouseButtonReleased) ( HB_GT_PTR, int, int *, int * );
int (* MouseReadKey) ( HB_GT_PTR, int );
/* Graphics API */
@@ -252,7 +252,7 @@ typedef int ( * GTENTRYP_V )( void );
typedef struct _HB_GT_INIT
{
const char * id;
BOOL (* init) ( PHB_GT_FUNCS );
HB_BOOL (* init) ( PHB_GT_FUNCS );
PHB_GT_FUNCS pSuperTable;
int * pGtId;
} HB_GT_INIT, * PHB_GT_INIT;
@@ -287,14 +287,14 @@ typedef struct _HB_GT_BASE
PHB_SCREENCELL screenBuffer; /* window foreground (board) current buffer */
PHB_SCREENCELL prevBuffer; /* window foreground (board) previous buffer */
BOOL * pLines; /* Touched Window lines */
BOOL fRefresh; /* Should Window be refreshed */
HB_BOOL * pLines; /* Touched Window lines */
HB_BOOL fRefresh; /* Should Window be refreshed */
BOOL fVgaCell;
BOOL fIsColor;
BOOL fBlinking;
BOOL fStdOutCon;
BOOL fStdErrCon;
HB_BOOL fVgaCell;
HB_BOOL fIsColor;
HB_BOOL fBlinking;
HB_BOOL fStdOutCon;
HB_BOOL fStdErrCon;
int iCursorShape;
int iDispCount;
int iExtCount;
@@ -304,7 +304,7 @@ typedef struct _HB_GT_BASE
HB_FHANDLE hStdOut;
HB_FHANDLE hStdErr;
BOOL fDispTrans;
HB_BOOL fDispTrans;
PHB_CODEPAGE cdpTerm;
PHB_CODEPAGE cdpHost;
@@ -313,7 +313,7 @@ typedef struct _HB_GT_BASE
int * pColor;
int iDoubleClickSpeed; /* In milliseconds */
BOOL fMouseVisible;
HB_BOOL fMouseVisible;
int iMouseLastRow;
int iMouseLastCol;
HB_LONG iMouseLeftTimer;
@@ -590,19 +590,19 @@ extern void hb_gt_gcMark( void );
#define HB_GTSUPER_GFXTEXT(g,t,l,s,c,h,w) (HB_GTSUPERTABLE(g))->GfxText(g,t,l,s,c,h,w)
#define HB_GTSUPER_WHOCARES(g,p) (HB_GTSUPERTABLE(g))->WhoCares(g,p)
extern HB_EXPORT BOOL hb_gtRegister( const HB_GT_INIT * gtInit );
extern HB_EXPORT PHB_GT hb_gtLoad( const char * szGtName, PHB_GT pGT, PHB_GT_FUNCS pSuperTable );
extern HB_EXPORT HB_BOOL hb_gtRegister( const HB_GT_INIT * gtInit );
extern HB_EXPORT PHB_GT hb_gtLoad( const char * szGtName, PHB_GT pGT, PHB_GT_FUNCS pSuperTable );
/* low level GT functions common to different GTs supported by RTL */
extern int hb_gt_chrmapinit( int * piTransTbl, const char * pszTerm, BOOL fSetACSC );
extern BOOL hb_gt_setClipboard( const char * szClipData, HB_SIZE ulLen );
extern BOOL hb_gt_getClipboard( char ** pszClipData, HB_SIZE * pulLen );
extern int hb_gt_chrmapinit( int * piTransTbl, const char * pszTerm, HB_BOOL fSetACSC );
extern HB_BOOL hb_gt_setClipboard( const char * szClipData, HB_SIZE ulLen );
extern HB_BOOL hb_gt_getClipboard( char ** pszClipData, HB_SIZE * pulLen );
#if defined( HB_OS_WIN )
extern BOOL hb_gt_winapi_setClipboard( UINT uFormat, const char * szClipData, HB_SIZE ulLen );
extern BOOL hb_gt_winapi_getClipboard( UINT uFormat, char ** pszClipData, HB_SIZE * pulLen );
extern int hb_gt_winapi_getKbdState( void );
extern void hb_gt_winapi_setKbdState( int kbdShifts );
extern void hb_gt_winapi_tone( double dFrequency, double dDuration );
extern HB_BOOL hb_gt_winapi_setClipboard( UINT uFormat, const char * szClipData, HB_SIZE ulLen );
extern HB_BOOL hb_gt_winapi_getClipboard( UINT uFormat, char ** pszClipData, HB_SIZE * pulLen );
extern int hb_gt_winapi_getKbdState( void );
extern void hb_gt_winapi_setKbdState( int kbdShifts );
extern void hb_gt_winapi_tone( double dFrequency, double dDuration );
#endif /* HB_OS_WIN */
#if defined( HB_OS_DOS ) || defined( HB_OS_WIN ) || defined( HB_OS_OS2 )
extern int hb_gt_dos_keyCodeTranslate( int iKey );

4
harbour/include/hbhash.h
View File

@@ -88,8 +88,8 @@ extern HB_HASH_TABLE_PTR hb_hashTableCreate( HB_SIZE ulSize,
HB_HASH_FUNC_PTR pDelete,
HB_HASH_FUNC_PTR pComp );
extern void hb_hashTableKill( HB_HASH_TABLE_PTR pTable ); /* release all items and the hash table */
extern BOOL hb_hashTableAdd( HB_HASH_TABLE_PTR pTable, const void * pKey, const void * pValue ); /* add a new item into the table */
extern BOOL hb_hashTableDel( HB_HASH_TABLE_PTR pTable, const void * pKey ); /* delete an item from the table */
extern HB_BOOL hb_hashTableAdd( HB_HASH_TABLE_PTR pTable, const void * pKey, const void * pValue ); /* add a new item into the table */
extern HB_BOOL hb_hashTableDel( HB_HASH_TABLE_PTR pTable, const void * pKey ); /* delete an item from the table */
extern const void * hb_hashTableFind( HB_HASH_TABLE_PTR pTable, const void * pKey ); /* return the pointer to item's value or NULL if not found */
extern HB_HASH_TABLE_PTR hb_hashTableResize( HB_HASH_TABLE_PTR pTable, HB_SIZE ulNewSize ); /* resize the hash table */
extern HB_SIZE hb_hashTableSize( HB_HASH_TABLE_PTR pTable ); /* return the hash table size */

18
harbour/include/hbmacro.h
View File

@@ -98,9 +98,9 @@ HB_EXTERN_BEGIN
*/
extern void hb_macroError( int iError, HB_COMP_DECL );
extern int hb_macroYYParse( HB_MACRO_PTR pMacro );
extern ULONG hb_macroSetMacro( BOOL bSet, ULONG ulFlag );
extern ULONG hb_macroSetMacro( HB_BOOL bSet, ULONG ulFlag );
extern ULONG hb_macroAutoSetMacro( ULONG ulFlag );
extern BOOL hb_macroLexNew( HB_MACRO_PTR pMacro );
extern HB_BOOL hb_macroLexNew( HB_MACRO_PTR pMacro );
extern void hb_macroLexDelete( HB_MACRO_PTR pMacro );
extern char * hb_macroIdentNew( HB_COMP_DECL, char * );
@@ -130,23 +130,23 @@ extern void hb_macroGenJumpThere( ULONG ulFrom, ULONG ulTo, HB_COMP_DECL );
extern void hb_macroGenJumpHere( ULONG ulOffset, HB_COMP_DECL );
extern ULONG hb_macroGenJumpTrue( LONG lOffset, HB_COMP_DECL );
extern void hb_macroGenPushSymbol( const char * szSymbolName, BOOL bFunction, HB_COMP_DECL );
extern void hb_macroGenPushSymbol( const char * szSymbolName, HB_BOOL bFunction, HB_COMP_DECL );
extern void hb_macroGenPushLong( HB_LONG lNumber, HB_COMP_DECL );
extern void hb_macroGenPushDate( long lDate, HB_COMP_DECL );
extern void hb_macroGenPushTimeStamp( long lDate, long lTime, HB_COMP_DECL );
extern void hb_macroGenMessage( const char * szMsgName, BOOL bIsObject, HB_COMP_DECL );
extern void hb_macroGenMessageData( const char * szMsg, BOOL bIsObject, HB_COMP_DECL );
extern void hb_macroGenMessage( const char * szMsgName, HB_BOOL bIsObject, HB_COMP_DECL );
extern void hb_macroGenMessageData( const char * szMsg, HB_BOOL bIsObject, HB_COMP_DECL );
extern void hb_macroGenPopVar( const char * szVarName, HB_COMP_DECL );
extern void hb_macroGenPopMemvar( const char * szVarName, HB_COMP_DECL );
extern void hb_macroGenPopAliasedVar( const char * szVarName,
BOOL bPushAliasValue,
HB_BOOL bPushAliasValue,
const char * szAlias,
HB_LONG lWorkarea, HB_COMP_DECL );
extern void hb_macroGenPushVar( const char * szVarName, BOOL bMacroVar, HB_COMP_DECL );
extern void hb_macroGenPushVar( const char * szVarName, HB_BOOL bMacroVar, HB_COMP_DECL );
extern void hb_macroGenPushVarRef( const char * szVarName, HB_COMP_DECL );
extern void hb_macroGenPushMemvarRef( const char * szVarName, HB_COMP_DECL );
extern void hb_macroGenPushAliasedVar( const char * szVarName,
BOOL bPushAliasValue,
HB_BOOL bPushAliasValue,
const char * szAlias,
HB_LONG lWorkarea, HB_COMP_DECL );
extern void hb_macroGenPushLogical( int iTrueFalse, HB_COMP_DECL );
@@ -160,7 +160,7 @@ extern void hb_macroCodeBlockStart( HB_COMP_DECL );
extern void hb_macroCodeBlockEnd( HB_COMP_DECL );
extern int hb_macroLocalVarGetPos( const char * szVarName, HB_COMP_DECL );
extern BOOL hb_macroIsValidMacroText( const char *, ULONG );
extern HB_BOOL hb_macroIsValidMacroText( const char *, ULONG );
#endif /* HB_MACRO_SUPPORT */

2
harbour/include/hbmather.h
View File

@@ -113,7 +113,7 @@ typedef struct _HB_MATH_EXCEPTION
typedef int ( * HB_MATH_HANDLERPROC )( HB_MATH_EXCEPTION * err );
extern HB_EXPORT void hb_mathResetError( HB_MATH_EXCEPTION * phb_exc );
extern HB_EXPORT BOOL hb_mathGetError( HB_MATH_EXCEPTION * phb_exc, const char *szFunc, double arg1, double arg2, double dResult );
extern HB_EXPORT HB_BOOL hb_mathGetError( HB_MATH_EXCEPTION * phb_exc, const char *szFunc, double arg1, double arg2, double dResult );
extern HB_EXPORT int hb_mathSetErrMode( int imode );
extern HB_EXPORT int hb_mathGetErrMode( void );

6
harbour/include/hbregex.h
View File

@@ -73,7 +73,7 @@
typedef struct
{
BOOL fFree;
HB_BOOL fFree;
int iFlags;
int iEFlags;
#if defined( HB_HAS_PCRE )
@@ -106,7 +106,7 @@ typedef int ( * HB_REG_COMP )( PHB_REGEX, const char * );
typedef int ( * HB_REG_EXEC )( PHB_REGEX, const char *, ULONG, int, HB_REGMATCH * );
extern void hb_regexInit( HB_REG_FREE pFree, HB_REG_COMP pComp, HB_REG_EXEC pExec );
extern BOOL hb_regexIs( PHB_ITEM pItem );
extern HB_BOOL hb_regexIs( PHB_ITEM pItem );
#ifndef REG_EXTENDED
# define REG_EXTENDED 0x00
@@ -138,7 +138,7 @@ HB_EXTERN_BEGIN
extern HB_EXPORT PHB_REGEX hb_regexCompile( const char * szRegEx, ULONG ulLen, int iFlags );
extern HB_EXPORT PHB_REGEX hb_regexGet( PHB_ITEM pRegExItm, int iFlags );
extern HB_EXPORT void hb_regexFree( PHB_REGEX pRegEx );
extern HB_EXPORT BOOL hb_regexMatch( PHB_REGEX pRegEx, const char * szString, ULONG UlLen, BOOL fFull );
extern HB_EXPORT HB_BOOL hb_regexMatch( PHB_REGEX pRegEx, const char * szString, ULONG UlLen, HB_BOOL fFull );
HB_EXTERN_END

142
harbour/include/hbset.h
View File

@@ -146,8 +146,8 @@ typedef enum
typedef struct
{
/* Lower case members are indirectly related to a SET */
BOOL hb_set_century;
BOOL hb_set_prndevice;
HB_BOOL hb_set_century;
HB_BOOL hb_set_prndevice;
HB_FHANDLE hb_set_althan;
HB_FHANDLE hb_set_extrahan;
HB_FHANDLE hb_set_printhan;
@@ -156,63 +156,63 @@ typedef struct
void * hb_set_listener;
/* Upper case members are directly related to a SET */
BOOL HB_SET_ALTERNATE;
HB_BOOL HB_SET_ALTERNATE;
char * HB_SET_ALTFILE;
BOOL HB_SET_AUTOPEN;
HB_BOOL HB_SET_AUTOPEN;
int HB_SET_AUTORDER;
int HB_SET_AUTOSHARE;
BOOL HB_SET_BELL;
BOOL HB_SET_CANCEL;
HB_BOOL HB_SET_BELL;
HB_BOOL HB_SET_CANCEL;
char * HB_SET_COLOR;
BOOL HB_SET_CONFIRM;
BOOL HB_SET_CONSOLE;
HB_BOOL HB_SET_CONFIRM;
HB_BOOL HB_SET_CONSOLE;
char * HB_SET_DATEFORMAT;
BOOL HB_SET_DEBUG;
HB_BOOL HB_SET_DEBUG;
int HB_SET_DECIMALS;
char * HB_SET_DEFAULT;
BOOL HB_SET_DELETED;
HB_BOOL HB_SET_DELETED;
char * HB_SET_DELIMCHARS;
BOOL HB_SET_DELIMITERS;
HB_BOOL HB_SET_DELIMITERS;
char * HB_SET_DEVICE;
BOOL HB_SET_EOF;
HB_BOOL HB_SET_EOF;
int HB_SET_EPOCH;
BOOL HB_SET_ESCAPE;
HB_BOOL HB_SET_ESCAPE;
int HB_SET_EVENTMASK;
BOOL HB_SET_EXACT;
BOOL HB_SET_EXCLUSIVE;
BOOL HB_SET_EXIT;
BOOL HB_SET_EXTRA;
HB_BOOL HB_SET_EXACT;
HB_BOOL HB_SET_EXCLUSIVE;
HB_BOOL HB_SET_EXIT;
HB_BOOL HB_SET_EXTRA;
char * HB_SET_EXTRAFILE;
BOOL HB_SET_FIXED;
BOOL HB_SET_IDLEREPEAT;
BOOL HB_SET_INSERT;
BOOL HB_SET_INTENSITY;
HB_BOOL HB_SET_FIXED;
HB_BOOL HB_SET_IDLEREPEAT;
HB_BOOL HB_SET_INSERT;
HB_BOOL HB_SET_INTENSITY;
char * HB_SET_PATH;
int HB_SET_MARGIN;
int HB_SET_MBLOCKSIZE;
BOOL HB_SET_MCENTER;
HB_BOOL HB_SET_MCENTER;
int HB_SET_MESSAGE;
char * HB_SET_MFILEEXT;
BOOL HB_SET_OPTIMIZE;
BOOL HB_SET_PRINTER;
HB_BOOL HB_SET_OPTIMIZE;
HB_BOOL HB_SET_PRINTER;
char * HB_SET_PRINTFILE;
BOOL HB_SET_SCOREBOARD;
BOOL HB_SET_SCROLLBREAK;
BOOL HB_SET_SOFTSEEK;
BOOL HB_SET_STRICTREAD;
HB_BOOL HB_SET_SCOREBOARD;
HB_BOOL HB_SET_SCROLLBREAK;
HB_BOOL HB_SET_SOFTSEEK;
HB_BOOL HB_SET_STRICTREAD;
int HB_SET_TYPEAHEAD;
BOOL HB_SET_UNIQUE;
HB_BOOL HB_SET_UNIQUE;
int HB_SET_FILECASE;
int HB_SET_DIRCASE;
int HB_SET_DIRSEPARATOR;
int HB_SET_VIDEOMODE;
BOOL HB_SET_WRAP;
HB_BOOL HB_SET_WRAP;
int HB_SET_DBFLOCKSCHEME;
BOOL HB_SET_HARDCOMMIT;
BOOL HB_SET_FORCEOPT;
BOOL HB_SET_DEFEXTENSIONS;
HB_BOOL HB_SET_HARDCOMMIT;
HB_BOOL HB_SET_FORCEOPT;
HB_BOOL HB_SET_DEFEXTENSIONS;
char * HB_SET_EOL;
BOOL HB_SET_TRIMFILENAME;
HB_BOOL HB_SET_TRIMFILENAME;
char * HB_SET_HBOUTLOG;
char * HB_SET_HBOUTLOGINFO;
char * HB_SET_OSCODEPAGE;
@@ -255,81 +255,81 @@ extern int hb_setListenerAdd( HB_SET_LISTENER_CALLBACK * );
extern void hb_setListenerNotify( HB_set_enum, HB_set_listener_enum );
extern int hb_setListenerRemove( int );
extern HB_EXPORT BOOL hb_setGetL( HB_set_enum set_specifier );
extern HB_EXPORT HB_BOOL hb_setGetL( HB_set_enum set_specifier );
extern HB_EXPORT const char * hb_setGetCPtr( HB_set_enum set_specifier );
extern HB_EXPORT int hb_setGetNI( HB_set_enum set_specifier );
extern HB_EXPORT long hb_setGetNL( HB_set_enum set_specifier );
extern HB_EXPORT BOOL hb_setSetItem( HB_set_enum set_specifier, PHB_ITEM pItem );
extern HB_EXPORT BOOL hb_setSetItem2( HB_set_enum set_specifier, PHB_ITEM pItem1, PHB_ITEM pItem2 );
extern HB_EXPORT HB_BOOL hb_setSetItem( HB_set_enum set_specifier, PHB_ITEM pItem );
extern HB_EXPORT HB_BOOL hb_setSetItem2( HB_set_enum set_specifier, PHB_ITEM pItem1, PHB_ITEM pItem2 );
extern HB_EXPORT HB_PATHNAMES * hb_setGetFirstSetPath( void );
extern HB_EXPORT BOOL hb_setGetCentury( void );
extern HB_EXPORT BOOL hb_setSetCentury( BOOL );
extern HB_EXPORT HB_BOOL hb_setGetCentury( void );
extern HB_EXPORT HB_BOOL hb_setSetCentury( HB_BOOL );
extern HB_EXPORT HB_FHANDLE hb_setGetAltHan( void );
extern HB_EXPORT HB_FHANDLE hb_setGetExtraHan( void );
extern HB_EXPORT HB_FHANDLE hb_setGetPrintHan( void );
extern HB_EXPORT HB_FHANDLE hb_setGetPrinterHandle( int );
extern HB_EXPORT BOOL hb_setGetAlternate( void );
extern HB_EXPORT HB_BOOL hb_setGetAlternate( void );
extern HB_EXPORT const char * hb_setGetAltFile( void );
extern HB_EXPORT BOOL hb_setGetAutOpen( void );
extern HB_EXPORT HB_BOOL hb_setGetAutOpen( void );
extern HB_EXPORT int hb_setGetAutOrder( void );
extern HB_EXPORT int hb_setGetAutoShare( void );
extern HB_EXPORT BOOL hb_setGetBell( void );
extern HB_EXPORT BOOL hb_setGetCancel( void );
extern HB_EXPORT HB_BOOL hb_setGetBell( void );
extern HB_EXPORT HB_BOOL hb_setGetCancel( void );
extern HB_EXPORT char * hb_setGetColor( void );
extern HB_EXPORT BOOL hb_setGetConfirm( void );
extern HB_EXPORT BOOL hb_setGetConsole( void );
extern HB_EXPORT HB_BOOL hb_setGetConfirm( void );
extern HB_EXPORT HB_BOOL hb_setGetConsole( void );
extern HB_EXPORT const char * hb_setGetDateFormat( void );
extern HB_EXPORT const char * hb_setGetTimeFormat( void );
extern HB_EXPORT BOOL hb_setGetDebug( void );
extern HB_EXPORT HB_BOOL hb_setGetDebug( void );
extern HB_EXPORT int hb_setGetDecimals( void );
extern HB_EXPORT const char * hb_setGetDefault( void );
extern HB_EXPORT BOOL hb_setGetDeleted( void );
extern HB_EXPORT HB_BOOL hb_setGetDeleted( void );
extern HB_EXPORT const char * hb_setGetDelimChars( void );
extern HB_EXPORT BOOL hb_setGetDelimiters( void );
extern HB_EXPORT HB_BOOL hb_setGetDelimiters( void );
extern HB_EXPORT const char * hb_setGetDevice( void );
extern HB_EXPORT BOOL hb_setGetEOF( void );
extern HB_EXPORT HB_BOOL hb_setGetEOF( void );
extern HB_EXPORT int hb_setGetEpoch( void );
extern HB_EXPORT BOOL hb_setGetEscape( void );
extern HB_EXPORT HB_BOOL hb_setGetEscape( void );
extern HB_EXPORT int hb_setGetEventMask( void );
extern HB_EXPORT BOOL hb_setGetExact( void );
extern HB_EXPORT BOOL hb_setGetExclusive( void );
extern HB_EXPORT BOOL hb_setGetExit( void );
extern HB_EXPORT BOOL hb_setGetExtra( void );
extern HB_EXPORT HB_BOOL hb_setGetExact( void );
extern HB_EXPORT HB_BOOL hb_setGetExclusive( void );
extern HB_EXPORT HB_BOOL hb_setGetExit( void );
extern HB_EXPORT HB_BOOL hb_setGetExtra( void );
extern HB_EXPORT const char * hb_setGetExtraFile( void );
extern HB_EXPORT BOOL hb_setGetFixed( void );
extern HB_EXPORT BOOL hb_setGetIdleRepeat( void );
extern HB_EXPORT BOOL hb_setGetInsert( void );
extern HB_EXPORT BOOL hb_setGetIntensity( void );
extern HB_EXPORT HB_BOOL hb_setGetFixed( void );
extern HB_EXPORT HB_BOOL hb_setGetIdleRepeat( void );
extern HB_EXPORT HB_BOOL hb_setGetInsert( void );
extern HB_EXPORT HB_BOOL hb_setGetIntensity( void );
extern HB_EXPORT const char * hb_setGetPath( void );
extern HB_EXPORT int hb_setGetMargin( void );
extern HB_EXPORT int hb_setGetMBlockSize( void );
extern HB_EXPORT BOOL hb_setGetMCenter( void );
extern HB_EXPORT HB_BOOL hb_setGetMCenter( void );
extern HB_EXPORT int hb_setGetMessage( void );
extern HB_EXPORT const char * hb_setGetMFileExt( void );
extern HB_EXPORT BOOL hb_setGetOptimize( void );
extern HB_EXPORT BOOL hb_setGetPrinter( void );
extern HB_EXPORT HB_BOOL hb_setGetOptimize( void );
extern HB_EXPORT HB_BOOL hb_setGetPrinter( void );
extern HB_EXPORT const char * hb_setGetPrintFile( void );
extern HB_EXPORT BOOL hb_setGetScoreBoard( void );
extern HB_EXPORT BOOL hb_setGetScrollBreak( void );
extern HB_EXPORT BOOL hb_setGetSoftSeek( void );
extern HB_EXPORT BOOL hb_setGetStrictRead( void );
extern HB_EXPORT HB_BOOL hb_setGetScoreBoard( void );
extern HB_EXPORT HB_BOOL hb_setGetScrollBreak( void );
extern HB_EXPORT HB_BOOL hb_setGetSoftSeek( void );
extern HB_EXPORT HB_BOOL hb_setGetStrictRead( void );
extern HB_EXPORT int hb_setGetTypeAhead( void );
extern HB_EXPORT BOOL hb_setGetUnique( void );
extern HB_EXPORT HB_BOOL hb_setGetUnique( void );
extern HB_EXPORT int hb_setGetFileCase( void );
extern HB_EXPORT int hb_setGetDirCase( void );
extern HB_EXPORT int hb_setGetDirSeparator( void );
extern HB_EXPORT int hb_setGetVideoMode( void );
extern HB_EXPORT BOOL hb_setGetWrap( void );
extern HB_EXPORT HB_BOOL hb_setGetWrap( void );
extern HB_EXPORT int hb_setGetDBFLockScheme( void );
extern HB_EXPORT BOOL hb_setGetHardCommit( void );
extern HB_EXPORT BOOL hb_setGetForceOpt( void );
extern HB_EXPORT BOOL hb_setGetDefExtension( void );
extern HB_EXPORT HB_BOOL hb_setGetHardCommit( void );
extern HB_EXPORT HB_BOOL hb_setGetForceOpt( void );
extern HB_EXPORT HB_BOOL hb_setGetDefExtension( void );
extern HB_EXPORT const char * hb_setGetEOL( void );
extern HB_EXPORT BOOL hb_setGetTrimFileName( void );
extern HB_EXPORT HB_BOOL hb_setGetTrimFileName( void );
extern HB_EXPORT const char * hb_setGetHBOUTLOG( void );
extern HB_EXPORT const char * hb_setGetHBOUTLOGINFO( void );
extern HB_EXPORT const char * hb_setGetOSCODEPAGE( void );

26
harbour/include/hbsocket.h
View File

@@ -74,16 +74,16 @@ HB_EXPORT extern int hb_socketGetError( void );
HB_EXPORT extern int hb_socketGetOsError( void );
HB_EXPORT extern const char * hb_socketErrorStr( int iError );
HB_EXPORT extern int hb_socketGetAddrFamilly( const void * pSockAddr, unsigned len );
HB_EXPORT extern BOOL hb_socketLocalAddr( void ** pSockAddr, unsigned * puiLen, const char * szAddr );
HB_EXPORT extern BOOL hb_socketInetAddr( void ** pSockAddr, unsigned * puiLen, const char * szAddr, int iPort );
HB_EXPORT extern BOOL hb_socketInet6Addr( void ** pSockAddr, unsigned * puiLen, const char * szAddr, int iPort );
HB_EXPORT extern HB_BOOL hb_socketLocalAddr( void ** pSockAddr, unsigned * puiLen, const char * szAddr );
HB_EXPORT extern HB_BOOL hb_socketInetAddr( void ** pSockAddr, unsigned * puiLen, const char * szAddr, int iPort );
HB_EXPORT extern HB_BOOL hb_socketInet6Addr( void ** pSockAddr, unsigned * puiLen, const char * szAddr, int iPort );
HB_EXPORT extern char * hb_socketAddrGetName( const void * pSockAddr, unsigned len );
HB_EXPORT extern BOOL hb_socketResolveInetAddr( void ** pSockAddr, unsigned * puiLen, const char * szAddr, int iPort );
HB_EXPORT extern HB_BOOL hb_socketResolveInetAddr( void ** pSockAddr, unsigned * puiLen, const char * szAddr, int iPort );
HB_EXPORT extern char * hb_socketResolveAddr( const char * szAddr, int af );
HB_EXPORT extern PHB_ITEM hb_socketGetHosts( const char * szAddr, int af );
HB_EXPORT extern PHB_ITEM hb_socketGetAliases( const char * szAddr, int af );
HB_EXPORT extern int hb_socketAddrGetPort( const void * pSockAddr, unsigned len );
HB_EXPORT extern BOOL hb_socketAddrFromItem( void ** pSockAddr, unsigned * puiLen, PHB_ITEM pAddrItm );
HB_EXPORT extern HB_BOOL hb_socketAddrFromItem( void ** pSockAddr, unsigned * puiLen, PHB_ITEM pAddrItm );
HB_EXPORT extern PHB_ITEM hb_socketAddrToItem( const void * pSockAddr, unsigned len );
HB_EXPORT extern int hb_socketGetSockName( HB_SOCKET sd, void ** pSockAddr, unsigned * puiLen );
HB_EXPORT extern int hb_socketGetPeerName( HB_SOCKET sd, void ** pSockAddr, unsigned * puiLen );
@@ -98,11 +98,11 @@ HB_EXPORT extern long hb_socketSend( HB_SOCKET sd, const void * data, lo
HB_EXPORT extern long hb_socketSendTo( HB_SOCKET sd, const void * data, long len, int flags, const void * pSockAddr, unsigned uiSockLen, HB_LONG timeout );
HB_EXPORT extern long hb_socketRecv( HB_SOCKET sd, void * data, long len, int flags, HB_LONG timeout );
HB_EXPORT extern long hb_socketRecvFrom( HB_SOCKET sd, void * data, long len, int flags, void ** pSockAddr, unsigned * puiSockLen, HB_LONG timeout );
HB_EXPORT extern int hb_socketSetBlockingIO( HB_SOCKET sd, BOOL fBlocking );
HB_EXPORT extern int hb_socketSetNoDelay( HB_SOCKET sd, BOOL fNoDelay );
HB_EXPORT extern int hb_socketSetReuseAddr( HB_SOCKET sd, BOOL fReuse );
HB_EXPORT extern int hb_socketSetKeepAlive( HB_SOCKET sd, BOOL fKeepAlive );
HB_EXPORT extern int hb_socketSetBroadcast( HB_SOCKET sd, BOOL fBroadcast );
HB_EXPORT extern int hb_socketSetBlockingIO( HB_SOCKET sd, HB_BOOL fBlocking );
HB_EXPORT extern int hb_socketSetNoDelay( HB_SOCKET sd, HB_BOOL fNoDelay );
HB_EXPORT extern int hb_socketSetReuseAddr( HB_SOCKET sd, HB_BOOL fReuse );
HB_EXPORT extern int hb_socketSetKeepAlive( HB_SOCKET sd, HB_BOOL fKeepAlive );
HB_EXPORT extern int hb_socketSetBroadcast( HB_SOCKET sd, HB_BOOL fBroadcast );
HB_EXPORT extern int hb_socketSetSndBufSize( HB_SOCKET sd, int iSize );
HB_EXPORT extern int hb_socketSetRcvBufSize( HB_SOCKET sd, int iSize );
HB_EXPORT extern int hb_socketGetRcvBufSize( HB_SOCKET sd, int * piSize );
@@ -111,9 +111,9 @@ HB_EXPORT extern int hb_socketSetMulticast( HB_SOCKET sd, int af, const
HB_EXPORT extern int hb_socketSelectRead( HB_SOCKET sd, HB_LONG timeout );
HB_EXPORT extern int hb_socketSelectWrite( HB_SOCKET sd, HB_LONG timeout );
HB_EXPORT extern int hb_socketSelectWriteEx( HB_SOCKET sd, HB_LONG timeout );
HB_EXPORT extern int hb_socketSelect( PHB_ITEM pArrayRD, BOOL fSetRD,
PHB_ITEM pArrayWR, BOOL fSetWR,
PHB_ITEM pArrayEX, BOOL fSetEX,
HB_EXPORT extern int hb_socketSelect( PHB_ITEM pArrayRD, HB_BOOL fSetRD,
PHB_ITEM pArrayWR, HB_BOOL fSetWR,
PHB_ITEM pArrayEX, HB_BOOL fSetEX,
HB_LONG timeout, HB_SOCKET_FUNC pFunc );
HB_EXTERN_END

8
harbour/include/hbstack.h
View File

@@ -101,7 +101,7 @@ HB_IOERRORS, * PHB_IOERRORS;
typedef struct
{
const char * szDefaultRDD; /* default RDD */
BOOL fNetError; /* current NETERR() flag */
HB_BOOL fNetError; /* current NETERR() flag */
void ** waList; /* Allocated WorkAreas */
USHORT uiWaMax; /* Number of allocated WA */
@@ -177,7 +177,7 @@ typedef struct
HB_PRIVATE_STACK privates; /* private variables stack */
HB_SET_STRUCT set;
int iKeyPoll; /* counter for GT/keyboard polling */
BOOL fDebugRequest; /* request debugger activation */
HB_BOOL fDebugRequest; /* request debugger activation */
void * pDebugInfo; /* internal debugger structure */
#if defined( HB_MT_VM )
int iUnlocked; /* counter for nested hb_vmUnlock() calls */
@@ -332,7 +332,7 @@ extern LONG hb_stackWithObjectOffset( void );
extern void hb_stackWithObjectSetOffset( LONG );
extern int * hb_stackKeyPolls( void );
extern BOOL * hb_stackDebugRequest( void );
extern HB_BOOL * hb_stackDebugRequest( void );
extern void hb_stackDestroyTSD( void );
@@ -354,7 +354,7 @@ extern void hb_stackUpdateAllocator( void *, PHB_ALLOCUPDT_FUNC, int );
extern PHB_DYN_HANDLES hb_stackGetDynHandle( PHB_DYNS pDynSym );
extern int hb_stackDynHandlesCount( void );
extern void hb_stackClearMemvars( int );
extern BOOL hb_stackQuitState( void );
extern HB_BOOL hb_stackQuitState( void );
extern void hb_stackSetQuitState( USHORT uiState );
extern int hb_stackUnlock( void );
extern int hb_stackLock( void );

8
harbour/include/hbsxfunc.h
View File

@@ -68,10 +68,10 @@ LONG hb_sxPtoD( const char * pDate );
void hb_sxEnCrypt( const char * pSrc, char * pDst, const char * pKeyVal, HB_SIZE ulLen );
void hb_sxDeCrypt( const char * pSrc, char * pDst, const char * pKeyVal, HB_SIZE ulLen );
BOOL hb_LZSSxDecompressMem( const char * pSrcBuf, HB_SIZE ulSrcLen, char * pDstBuf, HB_SIZE ulDstLen );
BOOL hb_LZSSxCompressMem( const char * pSrcBuf, HB_SIZE ulSrcLen, char * pDstBuf, HB_SIZE ulDstLen, HB_SIZE * pulSize );
BOOL hb_LZSSxCompressFile( HB_FHANDLE hInput, HB_FHANDLE hOutput, HB_SIZE * pulSize );
BOOL hb_LZSSxDecompressFile( HB_FHANDLE hInput, HB_FHANDLE hOutput );
HB_BOOL hb_LZSSxDecompressMem( const char * pSrcBuf, HB_SIZE ulSrcLen, char * pDstBuf, HB_SIZE ulDstLen );
HB_BOOL hb_LZSSxCompressMem( const char * pSrcBuf, HB_SIZE ulSrcLen, char * pDstBuf, HB_SIZE ulDstLen, HB_SIZE * pulSize );
HB_BOOL hb_LZSSxCompressFile( HB_FHANDLE hInput, HB_FHANDLE hOutput, HB_SIZE * pulSize );
HB_BOOL hb_LZSSxDecompressFile( HB_FHANDLE hInput, HB_FHANDLE hOutput );
HB_EXTERN_END

44
harbour/include/hbthread.h
View File

@@ -284,7 +284,7 @@ HB_EXTERN_BEGIN
struct _HB_WAIT_LIST * prev;
struct _HB_WAIT_LIST * next;
HB_OSCOND_T cond;
BOOL signaled;
HB_BOOL signaled;
} HB_WAIT_LIST, * PHB_WAIT_LIST;
typedef struct
@@ -304,7 +304,7 @@ HB_EXTERN_BEGIN
#ifdef HB_CRITICAL_NEED_INIT
typedef struct
{
BOOL fInit;
HB_BOOL fInit;
union
{
int dummy;
@@ -318,7 +318,7 @@ HB_EXTERN_BEGIN
# if defined( HB_COND_OS_SUPPORT )
typedef struct
{
BOOL fInit;
HB_BOOL fInit;
union
{
int dummy;
@@ -329,7 +329,7 @@ HB_EXTERN_BEGIN
# else
typedef struct
{
BOOL fInit;
HB_BOOL fInit;
int waiters;
union
{
@@ -369,8 +369,8 @@ typedef struct _HB_THREADSTATE
void * pI18N;
void * hGT;
void * pStackId;
BOOL fActive;
BOOL fFinished;
HB_BOOL fActive;
HB_BOOL fFinished;
PHB_ITEM pParams;
PHB_ITEM pMemvars;
PHB_ITEM pResult;
@@ -396,36 +396,36 @@ extern void hb_threadReleaseCPU( void );
void hb_atomic_set( volatile HB_COUNTER * pCounter, HB_COUNTER value );
HB_COUNTER hb_atomic_get( volatile HB_COUNTER * pCounter );
void hb_atomic_inc( volatile HB_COUNTER * pCounter );
BOOL hb_atomic_dec( volatile HB_COUNTER * pCounter ); /* returns TRUE when counter reach after decrementation */
HB_BOOL hb_atomic_dec( volatile HB_COUNTER * pCounter ); /* returns TRUE when counter reach after decrementation */
/* Critical sections or fast non recursive MUTEXes */
extern void hb_threadEnterCriticalSection( HB_CRITICAL_T * critical );
extern void hb_threadLeaveCriticalSection( HB_CRITICAL_T * critical );
/* conditional variables */
extern BOOL hb_threadCondSignal( HB_COND_T * cond );
extern BOOL hb_threadCondBroadcast( HB_COND_T * cond );
extern BOOL hb_threadCondWait( HB_COND_T * cond, HB_CRITICAL_T * mutex );
extern BOOL hb_threadCondTimedWait( HB_COND_T * cond, HB_CRITICAL_T * mutex, ULONG ulMilliSec );
extern HB_BOOL hb_threadCondSignal( HB_COND_T * cond );
extern HB_BOOL hb_threadCondBroadcast( HB_COND_T * cond );
extern HB_BOOL hb_threadCondWait( HB_COND_T * cond, HB_CRITICAL_T * mutex );
extern HB_BOOL hb_threadCondTimedWait( HB_COND_T * cond, HB_CRITICAL_T * mutex, ULONG ulMilliSec );
extern HB_THREAD_HANDLE hb_threadCreate( HB_THREAD_ID * th_id, PHB_THREAD_STARTFUNC start_func, void * Cargo );
extern BOOL hb_threadJoin( HB_THREAD_HANDLE th_h );
extern BOOL hb_threadDetach( HB_THREAD_HANDLE th_h );
extern HB_BOOL hb_threadJoin( HB_THREAD_HANDLE th_h );
extern HB_BOOL hb_threadDetach( HB_THREAD_HANDLE th_h );
/* used by .prg code */
extern PHB_ITEM hb_threadMutexCreate( void );
extern BOOL hb_threadMutexLock( PHB_ITEM pItem );
extern BOOL hb_threadMutexTimedLock( PHB_ITEM pItem, ULONG ulMilliSec );
extern BOOL hb_threadMutexUnlock( PHB_ITEM pItem );
extern void hb_threadMutexNotify( PHB_ITEM pItem, PHB_ITEM pNotifier, BOOL fWaiting );
extern PHB_ITEM hb_threadMutexSubscribe( PHB_ITEM pItem, BOOL fClear );
extern PHB_ITEM hb_threadMutexTimedSubscribe( PHB_ITEM pItem, ULONG ulMilliSec, BOOL fClear );
extern HB_BOOL hb_threadMutexLock( PHB_ITEM pItem );
extern HB_BOOL hb_threadMutexTimedLock( PHB_ITEM pItem, ULONG ulMilliSec );
extern HB_BOOL hb_threadMutexUnlock( PHB_ITEM pItem );
extern void hb_threadMutexNotify( PHB_ITEM pItem, PHB_ITEM pNotifier, HB_BOOL fWaiting );
extern PHB_ITEM hb_threadMutexSubscribe( PHB_ITEM pItem, HB_BOOL fClear );
extern PHB_ITEM hb_threadMutexTimedSubscribe( PHB_ITEM pItem, ULONG ulMilliSec, HB_BOOL fClear );
#if defined( HB_MT_VM ) && defined( _HB_API_INTERNAL_ )
extern void hb_threadMutexUnlockAll( void );
extern void hb_threadMutexSyncSignal( PHB_ITEM pItemMtx );
extern BOOL hb_threadMutexSyncWait( PHB_ITEM pItemMtx, ULONG ulMilliSec, PHB_ITEM pItemSync );
extern void hb_threadMutexUnlockAll( void );
extern void hb_threadMutexSyncSignal( PHB_ITEM pItemMtx );
extern HB_BOOL hb_threadMutexSyncWait( PHB_ITEM pItemMtx, ULONG ulMilliSec, PHB_ITEM pItemSync );
#if defined( HB_NO_TLS ) || defined( HB_TASK_THREAD )
# undef HB_USE_TLS

20
harbour/include/hbtypes.h
View File

@@ -66,7 +66,7 @@ typedef PHB_SYMB ( * VM_PROCESS_SYMBOLS )
typedef void ( * VM_EXECUTE ) ( const BYTE * pCode, PHB_SYMB pSymbols );
typedef BOOL ( * EXT_IS_ARRAY ) ( int iParam );
typedef HB_BOOL ( * EXT_IS_ARRAY ) ( int iParam );
typedef char * ( * EXT_PARC1 ) ( int iParam );
typedef char * ( * EXT_PARC2 ) ( int iParam, HB_SIZE ulArrayIndex );
typedef PHB_ITEM ( * HB_PARAM )( int iParam, long lMask );
@@ -119,16 +119,16 @@ typedef int ( * HB_STORL2 )( int iLogical, int iParam , HB_SIZE ulArrayInde
typedef int ( * HB_STORNI2 )( int iValue, int iParam , HB_SIZE ulArrayIndex );
typedef int ( * HB_STORNL2 )( long lValue, int iParam , HB_SIZE ulArrayIndex );
typedef int ( * HB_STORND2 )( double dValue, int iParam , HB_SIZE ulArrayIndex );
typedef BOOL ( * HB_ARRAYNEW )( PHB_ITEM pItem, HB_SIZE ulLen );
typedef HB_BOOL ( * HB_ARRAYNEW )( PHB_ITEM pItem, HB_SIZE ulLen );
typedef HB_SIZE ( * HB_ARRAYLEN )( PHB_ITEM pArray );
typedef BOOL ( * HB_ARRAYISOBJECT )( PHB_ITEM pArray );
typedef BOOL ( * HB_ARRAYADD )( PHB_ITEM pArray, PHB_ITEM pItemValue );
typedef BOOL ( * HB_ARRAYINS )( PHB_ITEM pArray, HB_SIZE ulIndex );
typedef BOOL ( * HB_ARRAYDEL )( PHB_ITEM pArray, HB_SIZE ulIndex );
typedef BOOL ( * HB_ARRAYSIZE )( PHB_ITEM pArray, HB_SIZE ulLen );
typedef BOOL ( * HB_ARRAYLAST )( PHB_ITEM pArray, PHB_ITEM pResult );
typedef BOOL ( * HB_ARRAYSET )( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_ITEM pItem );
typedef BOOL ( * HB_ARRAYGET )( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_ITEM pItem );
typedef HB_BOOL ( * HB_ARRAYISOBJECT )( PHB_ITEM pArray );
typedef HB_BOOL ( * HB_ARRAYADD )( PHB_ITEM pArray, PHB_ITEM pItemValue );
typedef HB_BOOL ( * HB_ARRAYINS )( PHB_ITEM pArray, HB_SIZE ulIndex );
typedef HB_BOOL ( * HB_ARRAYDEL )( PHB_ITEM pArray, HB_SIZE ulIndex );
typedef HB_BOOL ( * HB_ARRAYSIZE )( PHB_ITEM pArray, HB_SIZE ulLen );
typedef HB_BOOL ( * HB_ARRAYLAST )( PHB_ITEM pArray, PHB_ITEM pResult );
typedef HB_BOOL ( * HB_ARRAYSET )( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_ITEM pItem );
typedef HB_BOOL ( * HB_ARRAYGET )( PHB_ITEM pArray, HB_SIZE ulIndex, PHB_ITEM pItem );
typedef void ( * HB_XINIT )( void ); /* Initialize fixed memory subsystem */
typedef void ( * HB_XEXIT )( void ); /* Deinitialize fixed memory subsystem */
typedef void * ( * HB_XALLOC )( ULONG ulSize ); /* allocates memory, returns NULL on failure */

28
harbour/include/hbvm.h
View File

@@ -58,7 +58,7 @@
HB_EXTERN_BEGIN
/* Harbour virtual machine init/exit functions */
extern HB_EXPORT void hb_vmInit( BOOL bStartMainProc );
extern HB_EXPORT void hb_vmInit( HB_BOOL bStartMainProc );
extern HB_EXPORT int hb_vmQuit( void ); /* Immediately quits the virtual machine, return ERRORLEVEL code */
/* registration AtInit, AtExit and AtQuit functions.
@@ -87,27 +87,27 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessDynLibSymbols( PHB_SYMB pSymbols, USHORT u
struct _HB_SYMBOLS * pNext; /* pointer to the next SYMBOLS structure */
HB_SYMBOLSCOPE hScope; /* scope collected from all symbols in module used to speed initialization code */
void * hDynLib; /* handler to dynamic library */
BOOL fAllocated; /* the symbol table is dynamically allocated and should be freed on HVM exit */
BOOL fActive; /* the symbol table is currently active */
BOOL fInitStatics; /* static initialization should be executed */
HB_BOOL fAllocated; /* the symbol table is dynamically allocated and should be freed on HVM exit */
HB_BOOL fActive; /* the symbol table is currently active */
HB_BOOL fInitStatics; /* static initialization should be executed */
char * szModuleName; /* module name */
ULONG ulID; /* module unique identifier */
} HB_SYMBOLS, * PHB_SYMBOLS; /* structure to keep track of all modules symbol tables */
extern PHB_SYMBOLS hb_vmRegisterSymbols( PHB_SYMB pModuleSymbols, USHORT uiSymbols, const char * szModuleName, ULONG ulID, BOOL fDynLib, BOOL fClone );
extern BOOL hb_vmLockModuleSymbols( void );
extern PHB_SYMBOLS hb_vmRegisterSymbols( PHB_SYMB pModuleSymbols, USHORT uiSymbols, const char * szModuleName, ULONG ulID, HB_BOOL fDynLib, HB_BOOL fClone );
extern HB_BOOL hb_vmLockModuleSymbols( void );
extern void hb_vmUnlockModuleSymbols( void );
extern void hb_vmFreeSymbols( PHB_SYMBOLS pSymbols );
extern void hb_vmBeginSymbolGroup( void * hDynLib, BOOL fClone );
extern void hb_vmBeginSymbolGroup( void * hDynLib, HB_BOOL fClone );
extern void hb_vmInitSymbolGroup( void * hNewDynLib, int argc, const char * argv[] );
extern void hb_vmExitSymbolGroup( void * hDynLib );
extern const char * hb_vmFindModuleSymbolName( PHB_SYMB pSym );
extern BOOL hb_vmFindModuleSymbols( PHB_SYMB pSym, PHB_SYMB * pSymbols, USHORT * puiSymbols );
extern HB_BOOL hb_vmFindModuleSymbols( PHB_SYMB pSym, PHB_SYMB * pSymbols, USHORT * puiSymbols );
extern PHB_SYMB hb_vmGetRealFuncSym( PHB_SYMB pSym );
extern void hb_vmSetFunction( PHB_SYMB pOldSym, PHB_SYMB pNewSym );
extern void hb_vmEnumRelease( PHB_ITEM pBase, PHB_ITEM pValue );
extern BOOL hb_vmMsgReference( PHB_ITEM pObject, PHB_DYNS pMessage, PHB_DYNS pAccMsg ); /* create extended message reference */
extern HB_BOOL hb_vmMsgReference( PHB_ITEM pObject, PHB_DYNS pMessage, PHB_DYNS pAccMsg ); /* create extended message reference */
extern void hb_vmUpdateAllocator( PHB_ALLOCUPDT_FUNC pFunc, int iCount );
@@ -125,7 +125,7 @@ extern HB_EXPORT void hb_vmRequestCancel( void );
extern HB_EXPORT void hb_vmRequestQuit( void );
extern HB_EXPORT void hb_vmRequestEndProc( void );
extern HB_EXPORT USHORT hb_vmRequestQuery( void );
extern HB_EXPORT BOOL hb_vmRequestReenter( void );
extern HB_EXPORT HB_BOOL hb_vmRequestReenter( void );
extern HB_EXPORT void hb_vmRequestRestore( void );
/* Return values of hb_vmRequestQuery() */
@@ -154,7 +154,7 @@ extern HB_EXPORT void hb_vmPushInteger( int iNumber ); /* pushes a integer n
extern HB_EXPORT void hb_vmPushLong( long lNumber ); /* pushes a long number onto the stack */
extern HB_EXPORT void hb_vmPushDouble( double lNumber, int iDec ); /* pushes a double number onto the stack */
extern HB_EXPORT void hb_vmPushNumInt( HB_LONG lNumber ); /* pushes a number on to the stack and decides if it is integer or HB_LONG */
extern HB_EXPORT void hb_vmPushLogical( BOOL bValue ); /* pushes a logical value onto the stack */
extern HB_EXPORT void hb_vmPushLogical( HB_BOOL bValue ); /* pushes a logical value onto the stack */
extern HB_EXPORT void hb_vmPushString( const char * szText, HB_SIZE length ); /* pushes a string on to the stack */
extern HB_EXPORT void hb_vmPushStringPcode( const char * szText, HB_SIZE length ); /* pushes a string from pcode on to the stack */
extern HB_EXPORT void hb_vmPushDate( long lDate ); /* pushes a long date onto the stack */
@@ -167,14 +167,14 @@ extern HB_EXPORT void hb_vmPushState( void ); /* push current VM state on st
extern HB_EXPORT void hb_vmPopState( void ); /* pop current VM state from stack */
extern HB_EXPORT void hb_vmPushItemRef( PHB_ITEM pItem ); /* push item reference */
extern HB_EXPORT BOOL hb_vmIsMt( void ); /* return TRUE if HVM is compiled with thread support */
extern HB_EXPORT HB_BOOL hb_vmIsMt( void ); /* return TRUE if HVM is compiled with thread support */
extern HB_EXPORT void hb_vmLock( void ); /* lock VM blocking GC execution by other threads */
extern HB_EXPORT void hb_vmUnlock( void ); /* unlock VM, allow GC execution */
#ifdef _HB_API_INTERNAL_
extern HB_EXPORT BOOL hb_vmSuspendThreads( BOOL fWait ); /* (try to) stop all threads except current one */
extern HB_EXPORT HB_BOOL hb_vmSuspendThreads( HB_BOOL fWait ); /* (try to) stop all threads except current one */
extern HB_EXPORT void hb_vmResumeThreads( void ); /* unblock execution of threads stopped by hb_vmSuspendThreads() */
#endif
extern HB_EXPORT BOOL hb_vmThreadRegister( void * ); /* Register new thread without local thread HVM stack */
extern HB_EXPORT HB_BOOL hb_vmThreadRegister( void * ); /* Register new thread without local thread HVM stack */
extern HB_EXPORT void hb_vmThreadRelease( void * ); /* Remove registered thread which does not have local thread HVM stack yet */
extern HB_EXPORT void hb_vmThreadInit( void * ); /* allocate local thread HVM stack */
extern HB_EXPORT void hb_vmThreadQuit( void ); /* destroy local thread HVM stack */

2
harbour/include/hbvmpub.h
View File

@@ -222,7 +222,7 @@ typedef struct _HB_SYMB
PHB_DYNS pDynSym; /* pointer to its dynamic symbol if defined */
} HB_SYMB, * PHB_SYMB;
#define HB_DYNS_FUNC( hbfunc ) BOOL hbfunc( PHB_DYNS pDynSymbol, void * Cargo )
#define HB_DYNS_FUNC( hbfunc ) HB_BOOL hbfunc( PHB_DYNS pDynSymbol, void * Cargo )
typedef HB_DYNS_FUNC( PHB_DYNS_FUNC );
typedef void * ( * PHB_ALLOCUPDT_FUNC )( void *, int );

2
harbour/include/hbwmain.c
View File

@@ -69,7 +69,7 @@ int WINAPI WinMain( HINSTANCE hInstance, /* handle to current instance */
int iCmdShow ) /* show state of window */
{
LPSTR pArgs, pArg, pDst, pSrc, pFree;
BOOL fQuoted;
HB_BOOL fQuoted;
int iErrorCode;
HANDLE hHeap;

300
harbour/include/hbxvm.h
View File

@@ -73,148 +73,148 @@ HB_EXTERN_BEGIN
* to check HVM state so they are simply declared as void.
*/
extern HB_EXPORT void hb_xvmExitProc( void );
extern HB_EXPORT void hb_xvmEndProc( void );
extern HB_EXPORT void hb_xvmSeqBegin( void );
extern HB_EXPORT BOOL hb_xvmSeqEnd( void );
extern HB_EXPORT BOOL hb_xvmSeqEndTest( void );
extern HB_EXPORT BOOL hb_xvmSeqRecover( void );
extern HB_EXPORT void hb_xvmSeqAlways( void );
extern HB_EXPORT BOOL hb_xvmAlwaysBegin( void );
extern HB_EXPORT BOOL hb_xvmAlwaysEnd( void );
extern HB_EXPORT BOOL hb_xvmSeqBlock( void );
extern HB_EXPORT void hb_xvmExitProc( void );
extern HB_EXPORT void hb_xvmEndProc( void );
extern HB_EXPORT void hb_xvmSeqBegin( void );
extern HB_EXPORT HB_BOOL hb_xvmSeqEnd( void );
extern HB_EXPORT HB_BOOL hb_xvmSeqEndTest( void );
extern HB_EXPORT HB_BOOL hb_xvmSeqRecover( void );
extern HB_EXPORT void hb_xvmSeqAlways( void );
extern HB_EXPORT HB_BOOL hb_xvmAlwaysBegin( void );
extern HB_EXPORT HB_BOOL hb_xvmAlwaysEnd( void );
extern HB_EXPORT HB_BOOL hb_xvmSeqBlock( void );
extern HB_EXPORT BOOL hb_xvmEnumStart( BYTE, BYTE ); /* prepare FOR EACH loop */
extern HB_EXPORT BOOL hb_xvmEnumNext( void ); /* increment FOR EACH loop counter */
extern HB_EXPORT BOOL hb_xvmEnumPrev( void ); /* decrement FOR EACH loop counter */
extern HB_EXPORT void hb_xvmEnumEnd( void ); /* rewind the stack after FOR EACH loop counter */
extern HB_EXPORT HB_BOOL hb_xvmEnumStart( BYTE, BYTE ); /* prepare FOR EACH loop */
extern HB_EXPORT HB_BOOL hb_xvmEnumNext( void ); /* increment FOR EACH loop counter */
extern HB_EXPORT HB_BOOL hb_xvmEnumPrev( void ); /* decrement FOR EACH loop counter */
extern HB_EXPORT void hb_xvmEnumEnd( void ); /* rewind the stack after FOR EACH loop counter */
extern HB_EXPORT void hb_xvmWithObjectStart( void ); /* prepare WITH OBJECT statement */
extern HB_EXPORT void hb_xvmWithObjectEnd( void ); /* rewind the stack after normal WITH OBJECT */
extern HB_EXPORT void hb_xvmWithObjectMessage( PHB_SYMB ); /* send WITH OBJECT message to current WITH OBJECT control variable */
extern HB_EXPORT void hb_xvmWithObjectStart( void ); /* prepare WITH OBJECT statement */
extern HB_EXPORT void hb_xvmWithObjectEnd( void ); /* rewind the stack after normal WITH OBJECT */
extern HB_EXPORT void hb_xvmWithObjectMessage( PHB_SYMB ); /* send WITH OBJECT message to current WITH OBJECT control variable */
extern HB_EXPORT BOOL hb_xvmSwitchGet( PHB_ITEM * );
extern HB_EXPORT HB_BOOL hb_xvmSwitchGet( PHB_ITEM * );
extern HB_EXPORT void hb_xvmSetLine( USHORT uiLine ); /* set .prg line number information */
extern HB_EXPORT void hb_xvmSetLine( USHORT uiLine ); /* set .prg line number information */
extern HB_EXPORT void hb_xvmFrame( int iLocals, int iParams ); /* increases the stack pointer for the amount of locals and params suplied */
extern HB_EXPORT void hb_xvmVFrame( int iLocals, int iParams ); /* increases the stack pointer for the amount of locals and variable params */
extern HB_EXPORT void hb_xvmSFrame( PHB_SYMB pSymbol );
extern HB_EXPORT void hb_xvmStatics( PHB_SYMB pSymbol, USHORT uiStatics );
extern HB_EXPORT void hb_xvmThreadStatics( USHORT uiStatics, const BYTE * statics );
extern HB_EXPORT void hb_xvmParameter( PHB_SYMB pSymbol, int iParams );
extern HB_EXPORT void hb_xvmRetValue( void ); /* pops the latest stack value into stack.Return */
extern HB_EXPORT BOOL hb_xvmDo( USHORT uiParams );
extern HB_EXPORT BOOL hb_xvmFunction( USHORT uiParams );
extern HB_EXPORT BOOL hb_xvmSend( USHORT uiParams );
extern HB_EXPORT BOOL hb_xvmPushObjectVarRef( void );
extern HB_EXPORT void hb_xvmPushStatic( USHORT uiStatic );
extern HB_EXPORT void hb_xvmPushStaticByRef( USHORT uiStatic );
extern HB_EXPORT void hb_xvmPopStatic( USHORT uiStatic );
extern HB_EXPORT BOOL hb_xvmPushVariable( PHB_SYMB pSymbol );
extern HB_EXPORT BOOL hb_xvmPopVariable( PHB_SYMB pSymbol );
extern HB_EXPORT void hb_xvmPushBlock( const BYTE * pCode, PHB_SYMB pSymbols ); /* creates a codeblock */
extern HB_EXPORT void hb_xvmPushBlockShort( const BYTE * pCode, PHB_SYMB pSymbols ); /* creates a codeblock */
extern HB_EXPORT void hb_xvmPushBlockLarge( const BYTE * pCode, PHB_SYMB pSymbols ); /* creates a codeblock */
extern HB_EXPORT void hb_xvmPushSelf( void );
extern HB_EXPORT void hb_xvmPushVParams( void );
extern HB_EXPORT void hb_xvmPushLocal( SHORT iLocal ); /* pushes the containts of a local onto the stack */
extern HB_EXPORT void hb_xvmPushLocalByRef( SHORT iLocal ); /* pushes a local by refrence onto the stack */
extern HB_EXPORT void hb_xvmPopLocal( SHORT iLocal ); /* pops the stack latest value onto a local */
extern HB_EXPORT BOOL hb_xvmPushField( PHB_SYMB pSymbol );
extern HB_EXPORT BOOL hb_xvmPopField( PHB_SYMB pSymbol );
extern HB_EXPORT BOOL hb_xvmPushMemvar( PHB_SYMB pSymbol );
extern HB_EXPORT BOOL hb_xvmPushMemvarByRef( PHB_SYMB pSymbol );
extern HB_EXPORT BOOL hb_xvmPopMemvar( PHB_SYMB pSymbol );
extern HB_EXPORT BOOL hb_xvmPushAliasedField( PHB_SYMB pSymbol );
extern HB_EXPORT BOOL hb_xvmPopAliasedField( PHB_SYMB pSymbol );
extern HB_EXPORT BOOL hb_xvmPushAliasedVar( PHB_SYMB pSymbol );
extern HB_EXPORT BOOL hb_xvmPopAliasedVar( PHB_SYMB pSymbol );
extern HB_EXPORT BOOL hb_xvmPushAlias( void );
extern HB_EXPORT BOOL hb_xvmPopAlias( void ); /* select the workarea using a given item or a substituted value */
extern HB_EXPORT BOOL hb_xvmPopLogical( BOOL * ); /* pops the stack latest value and returns its logical value */
extern HB_EXPORT BOOL hb_xvmSwapAlias( void ); /* swaps items on the eval stack and pops the workarea number */
extern HB_EXPORT BOOL hb_xvmLocalAddInt( int iLocal, LONG lAdd ); /* add integer to given local variable */
extern HB_EXPORT BOOL hb_xvmLocalInc( int iLocal ); /* increment given local variable */
extern HB_EXPORT BOOL hb_xvmLocalDec( int iLocal ); /* decrement given local variable */
extern HB_EXPORT BOOL hb_xvmLocalIncPush( int iLocal ); /* increment given local variable and pussh it on HVM stack */
extern HB_EXPORT void hb_xvmFrame( int iLocals, int iParams ); /* increases the stack pointer for the amount of locals and params suplied */
extern HB_EXPORT void hb_xvmVFrame( int iLocals, int iParams ); /* increases the stack pointer for the amount of locals and variable params */
extern HB_EXPORT void hb_xvmSFrame( PHB_SYMB pSymbol );
extern HB_EXPORT void hb_xvmStatics( PHB_SYMB pSymbol, USHORT uiStatics );
extern HB_EXPORT void hb_xvmThreadStatics( USHORT uiStatics, const BYTE * statics );
extern HB_EXPORT void hb_xvmParameter( PHB_SYMB pSymbol, int iParams );
extern HB_EXPORT void hb_xvmRetValue( void ); /* pops the latest stack value into stack.Return */
extern HB_EXPORT HB_BOOL hb_xvmDo( USHORT uiParams );
extern HB_EXPORT HB_BOOL hb_xvmFunction( USHORT uiParams );
extern HB_EXPORT HB_BOOL hb_xvmSend( USHORT uiParams );
extern HB_EXPORT HB_BOOL hb_xvmPushObjectVarRef( void );
extern HB_EXPORT void hb_xvmPushStatic( USHORT uiStatic );
extern HB_EXPORT void hb_xvmPushStaticByRef( USHORT uiStatic );
extern HB_EXPORT void hb_xvmPopStatic( USHORT uiStatic );
extern HB_EXPORT HB_BOOL hb_xvmPushVariable( PHB_SYMB pSymbol );
extern HB_EXPORT HB_BOOL hb_xvmPopVariable( PHB_SYMB pSymbol );
extern HB_EXPORT void hb_xvmPushBlock( const BYTE * pCode, PHB_SYMB pSymbols ); /* creates a codeblock */
extern HB_EXPORT void hb_xvmPushBlockShort( const BYTE * pCode, PHB_SYMB pSymbols ); /* creates a codeblock */
extern HB_EXPORT void hb_xvmPushBlockLarge( const BYTE * pCode, PHB_SYMB pSymbols ); /* creates a codeblock */
extern HB_EXPORT void hb_xvmPushSelf( void );
extern HB_EXPORT void hb_xvmPushVParams( void );
extern HB_EXPORT void hb_xvmPushLocal( SHORT iLocal ); /* pushes the containts of a local onto the stack */
extern HB_EXPORT void hb_xvmPushLocalByRef( SHORT iLocal ); /* pushes a local by refrence onto the stack */
extern HB_EXPORT void hb_xvmPopLocal( SHORT iLocal ); /* pops the stack latest value onto a local */
extern HB_EXPORT HB_BOOL hb_xvmPushField( PHB_SYMB pSymbol );
extern HB_EXPORT HB_BOOL hb_xvmPopField( PHB_SYMB pSymbol );
extern HB_EXPORT HB_BOOL hb_xvmPushMemvar( PHB_SYMB pSymbol );
extern HB_EXPORT HB_BOOL hb_xvmPushMemvarByRef( PHB_SYMB pSymbol );
extern HB_EXPORT HB_BOOL hb_xvmPopMemvar( PHB_SYMB pSymbol );
extern HB_EXPORT HB_BOOL hb_xvmPushAliasedField( PHB_SYMB pSymbol );
extern HB_EXPORT HB_BOOL hb_xvmPopAliasedField( PHB_SYMB pSymbol );
extern HB_EXPORT HB_BOOL hb_xvmPushAliasedVar( PHB_SYMB pSymbol );
extern HB_EXPORT HB_BOOL hb_xvmPopAliasedVar( PHB_SYMB pSymbol );
extern HB_EXPORT HB_BOOL hb_xvmPushAlias( void );
extern HB_EXPORT HB_BOOL hb_xvmPopAlias( void ); /* select the workarea using a given item or a substituted value */
extern HB_EXPORT HB_BOOL hb_xvmPopLogical( HB_BOOL * ); /* pops the stack latest value and returns its logical value */
extern HB_EXPORT HB_BOOL hb_xvmSwapAlias( void ); /* swaps items on the eval stack and pops the workarea number */
extern HB_EXPORT HB_BOOL hb_xvmLocalAddInt( int iLocal, LONG lAdd ); /* add integer to given local variable */
extern HB_EXPORT HB_BOOL hb_xvmLocalInc( int iLocal ); /* increment given local variable */
extern HB_EXPORT HB_BOOL hb_xvmLocalDec( int iLocal ); /* decrement given local variable */
extern HB_EXPORT HB_BOOL hb_xvmLocalIncPush( int iLocal ); /* increment given local variable and pussh it on HVM stack */
extern HB_EXPORT BOOL hb_xvmAnd( void );
extern HB_EXPORT BOOL hb_xvmOr( void );
extern HB_EXPORT BOOL hb_xvmNot( void );
extern HB_EXPORT BOOL hb_xvmNegate( void );
extern HB_EXPORT void hb_xvmDuplicate( void );
extern HB_EXPORT void hb_xvmDuplUnRef( void );
extern HB_EXPORT void hb_xvmPushUnRef( void );
extern HB_EXPORT void hb_xvmSwap( int iCount );
extern HB_EXPORT BOOL hb_xvmForTest( void );
extern HB_EXPORT void hb_xvmFuncPtr( void );
extern HB_EXPORT BOOL hb_xvmEqual( void ); /* checks if the two latest values on the stack are equal, removes both and leaves result */
extern HB_EXPORT BOOL hb_xvmExactlyEqual( void ); /* checks if the two latest values on the stack are exactly equal, removes both and leaves result */
extern HB_EXPORT BOOL hb_xvmNotEqual( void ); /* checks if the two latest values on the stack are not equal, removes both and leaves result */
extern HB_EXPORT BOOL hb_xvmLess( void ); /* checks if the latest - 1 value is less than the latest, removes both and leaves result */
extern HB_EXPORT BOOL hb_xvmLessEqual( void ); /* checks if the latest - 1 value is less than or equal the latest, removes both and leaves result */
extern HB_EXPORT BOOL hb_xvmGreater( void ); /* checks if the latest - 1 value is greater than the latest, removes both and leaves result */
extern HB_EXPORT BOOL hb_xvmGreaterEqual( void ); /* checks if the latest - 1 value is greater than or equal the latest, removes both and leaves result */
extern HB_EXPORT BOOL hb_xvmInstring( void ); /* check whether string 1 is contained in string 2 */
extern HB_EXPORT BOOL hb_xvmPlus( void ); /* sums the latest two values on the stack, removes them and leaves the result */
extern HB_EXPORT BOOL hb_xvmPlusEq( void );
extern HB_EXPORT BOOL hb_xvmPlusEqPop( void );
extern HB_EXPORT BOOL hb_xvmMinus( void ); /* substracts the latest two values on the stack, removes them and leaves the result */
extern HB_EXPORT BOOL hb_xvmMinusEq( void );
extern HB_EXPORT BOOL hb_xvmMinusEqPop( void );
extern HB_EXPORT BOOL hb_xvmMult( void ); /* multiplies the latest two values on the stack, removes them and leaves the result */
extern HB_EXPORT BOOL hb_xvmMultEq( void );
extern HB_EXPORT BOOL hb_xvmMultEqPop( void );
extern HB_EXPORT BOOL hb_xvmDivide( void ); /* divides the latest two values on the stack, removes them and leaves the result */
extern HB_EXPORT BOOL hb_xvmDivEq( void );
extern HB_EXPORT BOOL hb_xvmDivEqPop( void );
extern HB_EXPORT BOOL hb_xvmModulus( void ); /* calculates the modulus of latest two values on the stack, removes them and leaves the result */
extern HB_EXPORT BOOL hb_xvmModEq( void );
extern HB_EXPORT BOOL hb_xvmModEqPop( void );
extern HB_EXPORT BOOL hb_xvmPower( void );
extern HB_EXPORT BOOL hb_xvmExpEq( void );
extern HB_EXPORT BOOL hb_xvmExpEqPop( void );
extern HB_EXPORT BOOL hb_xvmInc( void );
extern HB_EXPORT BOOL hb_xvmIncEq( void );
extern HB_EXPORT BOOL hb_xvmIncEqPop( void );
extern HB_EXPORT BOOL hb_xvmDec( void );
extern HB_EXPORT BOOL hb_xvmDecEq( void );
extern HB_EXPORT BOOL hb_xvmDecEqPop( void );
extern HB_EXPORT HB_BOOL hb_xvmAnd( void );
extern HB_EXPORT HB_BOOL hb_xvmOr( void );
extern HB_EXPORT HB_BOOL hb_xvmNot( void );
extern HB_EXPORT HB_BOOL hb_xvmNegate( void );
extern HB_EXPORT void hb_xvmDuplicate( void );
extern HB_EXPORT void hb_xvmDuplUnRef( void );
extern HB_EXPORT void hb_xvmPushUnRef( void );
extern HB_EXPORT void hb_xvmSwap( int iCount );
extern HB_EXPORT HB_BOOL hb_xvmForTest( void );
extern HB_EXPORT void hb_xvmFuncPtr( void );
extern HB_EXPORT HB_BOOL hb_xvmEqual( void ); /* checks if the two latest values on the stack are equal, removes both and leaves result */
extern HB_EXPORT HB_BOOL hb_xvmExactlyEqual( void ); /* checks if the two latest values on the stack are exactly equal, removes both and leaves result */
extern HB_EXPORT HB_BOOL hb_xvmNotEqual( void ); /* checks if the two latest values on the stack are not equal, removes both and leaves result */
extern HB_EXPORT HB_BOOL hb_xvmLess( void ); /* checks if the latest - 1 value is less than the latest, removes both and leaves result */
extern HB_EXPORT HB_BOOL hb_xvmLessEqual( void ); /* checks if the latest - 1 value is less than or equal the latest, removes both and leaves result */
extern HB_EXPORT HB_BOOL hb_xvmGreater( void ); /* checks if the latest - 1 value is greater than the latest, removes both and leaves result */
extern HB_EXPORT HB_BOOL hb_xvmGreaterEqual( void ); /* checks if the latest - 1 value is greater than or equal the latest, removes both and leaves result */
extern HB_EXPORT HB_BOOL hb_xvmInstring( void ); /* check whether string 1 is contained in string 2 */
extern HB_EXPORT HB_BOOL hb_xvmPlus( void ); /* sums the latest two values on the stack, removes them and leaves the result */
extern HB_EXPORT HB_BOOL hb_xvmPlusEq( void );
extern HB_EXPORT HB_BOOL hb_xvmPlusEqPop( void );
extern HB_EXPORT HB_BOOL hb_xvmMinus( void ); /* substracts the latest two values on the stack, removes them and leaves the result */
extern HB_EXPORT HB_BOOL hb_xvmMinusEq( void );
extern HB_EXPORT HB_BOOL hb_xvmMinusEqPop( void );
extern HB_EXPORT HB_BOOL hb_xvmMult( void ); /* multiplies the latest two values on the stack, removes them and leaves the result */
extern HB_EXPORT HB_BOOL hb_xvmMultEq( void );
extern HB_EXPORT HB_BOOL hb_xvmMultEqPop( void );
extern HB_EXPORT HB_BOOL hb_xvmDivide( void ); /* divides the latest two values on the stack, removes them and leaves the result */
extern HB_EXPORT HB_BOOL hb_xvmDivEq( void );
extern HB_EXPORT HB_BOOL hb_xvmDivEqPop( void );
extern HB_EXPORT HB_BOOL hb_xvmModulus( void ); /* calculates the modulus of latest two values on the stack, removes them and leaves the result */
extern HB_EXPORT HB_BOOL hb_xvmModEq( void );
extern HB_EXPORT HB_BOOL hb_xvmModEqPop( void );
extern HB_EXPORT HB_BOOL hb_xvmPower( void );
extern HB_EXPORT HB_BOOL hb_xvmExpEq( void );
extern HB_EXPORT HB_BOOL hb_xvmExpEqPop( void );
extern HB_EXPORT HB_BOOL hb_xvmInc( void );
extern HB_EXPORT HB_BOOL hb_xvmIncEq( void );
extern HB_EXPORT HB_BOOL hb_xvmIncEqPop( void );
extern HB_EXPORT HB_BOOL hb_xvmDec( void );
extern HB_EXPORT HB_BOOL hb_xvmDecEq( void );
extern HB_EXPORT HB_BOOL hb_xvmDecEqPop( void );
extern HB_EXPORT void hb_xvmArrayDim( USHORT uiDimensions ); /* generates an uiDimensions Array and initialize those dimensions from the stack values */
extern HB_EXPORT void hb_xvmArrayGen( HB_SIZE ulElements ); /* generates an ulElements Array and fills it from the stack values */
extern HB_EXPORT BOOL hb_xvmArrayPush( void ); /* pushes an array element to the stack, removing the array and the index from the stack */
extern HB_EXPORT BOOL hb_xvmArrayPushRef( void ); /* pushes a reference to an array element to the stack, removing the array and the index from the stack */
extern HB_EXPORT BOOL hb_xvmArrayPop( void ); /* pops a value from the stack */
extern HB_EXPORT void hb_xvmHashGen( HB_SIZE ulElements ); /* generates an ulElements Hash and fills it from the stack values */
extern HB_EXPORT void hb_xvmArrayDim( USHORT uiDimensions ); /* generates an uiDimensions Array and initialize those dimensions from the stack values */
extern HB_EXPORT void hb_xvmArrayGen( HB_SIZE ulElements ); /* generates an ulElements Array and fills it from the stack values */
extern HB_EXPORT HB_BOOL hb_xvmArrayPush( void ); /* pushes an array element to the stack, removing the array and the index from the stack */
extern HB_EXPORT HB_BOOL hb_xvmArrayPushRef( void ); /* pushes a reference to an array element to the stack, removing the array and the index from the stack */
extern HB_EXPORT HB_BOOL hb_xvmArrayPop( void ); /* pops a value from the stack */
extern HB_EXPORT void hb_xvmHashGen( HB_SIZE ulElements ); /* generates an ulElements Hash and fills it from the stack values */
extern HB_EXPORT void hb_xvmLocalName( USHORT uiLocal, char * szLocalName );
extern HB_EXPORT void hb_xvmStaticName( BYTE bIsGlobal, USHORT uiStatic, char * szStaticName );
extern HB_EXPORT void hb_xvmModuleName( char * szModuleName );
extern HB_EXPORT void hb_xvmLocalName( USHORT uiLocal, char * szLocalName );
extern HB_EXPORT void hb_xvmStaticName( BYTE bIsGlobal, USHORT uiStatic, char * szStaticName );
extern HB_EXPORT void hb_xvmModuleName( char * szModuleName );
extern HB_EXPORT BOOL hb_xvmMacroDo( USHORT uiArgSets );
extern HB_EXPORT BOOL hb_xvmMacroFunc( USHORT uiArgSets );
extern HB_EXPORT BOOL hb_xvmMacroSend( USHORT uiArgSets );
extern HB_EXPORT BOOL hb_xvmMacroArrayGen( USHORT uiArgSets );
extern HB_EXPORT BOOL hb_xvmMacroPush( BYTE bFlags );
extern HB_EXPORT BOOL hb_xvmMacroPushRef( void );
extern HB_EXPORT BOOL hb_xvmMacroPushIndex( void );
extern HB_EXPORT BOOL hb_xvmMacroPushArg( PHB_SYMB pSymbol, BYTE bFlags );
extern HB_EXPORT BOOL hb_xvmMacroPushList( BYTE bFlags );
extern HB_EXPORT BOOL hb_xvmMacroPushAliased( BYTE bFlags );
extern HB_EXPORT BOOL hb_xvmMacroPushPare( BYTE bFlags );
extern HB_EXPORT BOOL hb_xvmMacroPop( BYTE bFlags );
extern HB_EXPORT BOOL hb_xvmMacroPopAliased( BYTE bFlags );
extern HB_EXPORT BOOL hb_xvmMacroSymbol( void );
extern HB_EXPORT BOOL hb_xvmMacroText( void );
extern HB_EXPORT HB_BOOL hb_xvmMacroDo( USHORT uiArgSets );
extern HB_EXPORT HB_BOOL hb_xvmMacroFunc( USHORT uiArgSets );
extern HB_EXPORT HB_BOOL hb_xvmMacroSend( USHORT uiArgSets );
extern HB_EXPORT HB_BOOL hb_xvmMacroArrayGen( USHORT uiArgSets );
extern HB_EXPORT HB_BOOL hb_xvmMacroPush( BYTE bFlags );
extern HB_EXPORT HB_BOOL hb_xvmMacroPushRef( void );
extern HB_EXPORT HB_BOOL hb_xvmMacroPushIndex( void );
extern HB_EXPORT HB_BOOL hb_xvmMacroPushArg( PHB_SYMB pSymbol, BYTE bFlags );
extern HB_EXPORT HB_BOOL hb_xvmMacroPushList( BYTE bFlags );
extern HB_EXPORT HB_BOOL hb_xvmMacroPushAliased( BYTE bFlags );
extern HB_EXPORT HB_BOOL hb_xvmMacroPushPare( BYTE bFlags );
extern HB_EXPORT HB_BOOL hb_xvmMacroPop( BYTE bFlags );
extern HB_EXPORT HB_BOOL hb_xvmMacroPopAliased( BYTE bFlags );
extern HB_EXPORT HB_BOOL hb_xvmMacroSymbol( void );
extern HB_EXPORT HB_BOOL hb_xvmMacroText( void );
extern HB_EXPORT void hb_xvmPushStringHidden( int iMethod, const char * szText, HB_SIZE ulSize );
extern HB_EXPORT void hb_xvmPushDouble( double dNumber, int iWidth, int iDec );
extern HB_EXPORT void hb_xvmPushStringHidden( int iMethod, const char * szText, HB_SIZE ulSize );
extern HB_EXPORT void hb_xvmPushDouble( double dNumber, int iWidth, int iDec );
#ifdef HB_LONG_LONG_OFF
extern HB_EXPORT void hb_xvmPushLongLong( double dNumber );
extern HB_EXPORT void hb_xvmPushLongLong( double dNumber );
#else
extern HB_EXPORT void hb_xvmPushLongLong( LONGLONG llNumber );
extern HB_EXPORT void hb_xvmPushLongLong( LONGLONG llNumber );
#endif
#define hb_xvmPushLogical( f ) hb_vmPushLogical( f )
@@ -230,31 +230,31 @@ extern HB_EXPORT void hb_xvmPushLongLong( LONGLONG llNumber );
/*
* additional multi PCODE operations
*/
extern HB_EXPORT BOOL hb_xvmArrayItemPush( HB_SIZE ulIndex );
extern HB_EXPORT BOOL hb_xvmArrayItemPop( HB_SIZE ulIndex );
extern HB_EXPORT BOOL hb_xvmMultByInt( LONG lValue );
extern HB_EXPORT BOOL hb_xvmDivideByInt( LONG lValue );
extern HB_EXPORT BOOL hb_xvmAddInt( LONG lValue );
extern HB_EXPORT HB_BOOL hb_xvmArrayItemPush( HB_SIZE ulIndex );
extern HB_EXPORT HB_BOOL hb_xvmArrayItemPop( HB_SIZE ulIndex );
extern HB_EXPORT HB_BOOL hb_xvmMultByInt( LONG lValue );
extern HB_EXPORT HB_BOOL hb_xvmDivideByInt( LONG lValue );
extern HB_EXPORT HB_BOOL hb_xvmAddInt( LONG lValue );
extern HB_EXPORT void hb_xvmLocalSetInt( int iLocal, LONG lValue );
/*extern HB_EXPORT void hb_xvmLocalSetStr( int iLocal, const char * pValue, HB_SIZE ulLen );*/
extern HB_EXPORT void hb_xvmPushFuncSymbol( PHB_SYMB pSym );
extern HB_EXPORT BOOL hb_xvmLessThenInt( LONG lValue );
extern HB_EXPORT BOOL hb_xvmLessThenIntIs( LONG lValue, BOOL *fValue );
extern HB_EXPORT BOOL hb_xvmLessEqualThenInt( LONG lValue );
extern HB_EXPORT BOOL hb_xvmLessEqualThenIntIs( LONG lValue, BOOL *fValue );
extern HB_EXPORT BOOL hb_xvmGreaterThenInt( LONG lValue );
extern HB_EXPORT BOOL hb_xvmGreaterThenIntIs( LONG lValue, BOOL *fValue );
extern HB_EXPORT BOOL hb_xvmGreaterEqualThenInt( LONG lValue );
extern HB_EXPORT BOOL hb_xvmGreaterEqualThenIntIs( LONG lValue, BOOL *fValue );
extern HB_EXPORT BOOL hb_xvmEqualInt( LONG lValue );
extern HB_EXPORT BOOL hb_xvmEqualIntIs( LONG lValue, BOOL *fValue );
extern HB_EXPORT BOOL hb_xvmNotEqualInt( LONG lValue );
extern HB_EXPORT BOOL hb_xvmNotEqualIntIs( LONG lValue, BOOL *fValue );
extern HB_EXPORT HB_BOOL hb_xvmLessThenInt( LONG lValue );
extern HB_EXPORT HB_BOOL hb_xvmLessThenIntIs( LONG lValue, HB_BOOL * fValue );
extern HB_EXPORT HB_BOOL hb_xvmLessEqualThenInt( LONG lValue );
extern HB_EXPORT HB_BOOL hb_xvmLessEqualThenIntIs( LONG lValue, HB_BOOL * fValue );
extern HB_EXPORT HB_BOOL hb_xvmGreaterThenInt( LONG lValue );
extern HB_EXPORT HB_BOOL hb_xvmGreaterThenIntIs( LONG lValue, HB_BOOL * fValue );
extern HB_EXPORT HB_BOOL hb_xvmGreaterEqualThenInt( LONG lValue );
extern HB_EXPORT HB_BOOL hb_xvmGreaterEqualThenIntIs( LONG lValue, HB_BOOL * fValue );
extern HB_EXPORT HB_BOOL hb_xvmEqualInt( LONG lValue );
extern HB_EXPORT HB_BOOL hb_xvmEqualIntIs( LONG lValue, HB_BOOL * fValue );
extern HB_EXPORT HB_BOOL hb_xvmNotEqualInt( LONG lValue );
extern HB_EXPORT HB_BOOL hb_xvmNotEqualIntIs( LONG lValue, HB_BOOL * fValue );
extern HB_EXPORT BOOL hb_xvmLocalAdd( int iLocal );
extern HB_EXPORT BOOL hb_xvmStaticAdd( USHORT uiStatic );
extern HB_EXPORT BOOL hb_xvmMemvarAdd( PHB_SYMB pSymbol );
extern HB_EXPORT HB_BOOL hb_xvmLocalAdd( int iLocal );
extern HB_EXPORT HB_BOOL hb_xvmStaticAdd( USHORT uiStatic );
extern HB_EXPORT HB_BOOL hb_xvmMemvarAdd( PHB_SYMB pSymbol );
extern HB_EXPORT void hb_xvmCopyLocals( int iDest, int iSource );

22
harbour/include/hbznet.h
View File

@@ -72,18 +72,18 @@ typedef void ( * HB_INET_CFUNC ) ( PHB_ZNETSTREAM );
extern HB_EXPORT int hb_znetError( PHB_ZNETSTREAM pStream );
extern HB_EXPORT PHB_ZNETSTREAM hb_znetOpen( int level, int strategy );
extern HB_EXPORT void hb_znetEncryptKey( PHB_ZNETSTREAM pStream, const void * keydata, int keylen );
extern HB_EXPORT void hb_znetClose( PHB_ZNETSTREAM pStream );
extern HB_EXPORT int hb_znetError( PHB_ZNETSTREAM pStream );
extern HB_EXPORT long hb_znetRead( PHB_ZNETSTREAM pStream, HB_SOCKET sd, void * buffer, long len, HB_LONG timeout );
extern HB_EXPORT long hb_znetFlush( PHB_ZNETSTREAM pStream, HB_SOCKET sd, HB_LONG timeout );
extern HB_EXPORT long hb_znetWrite( PHB_ZNETSTREAM pStream, HB_SOCKET sd, const void * buffer, long len, HB_LONG timeout, long * plast );
extern HB_EXPORT void hb_znetEncryptKey( PHB_ZNETSTREAM pStream, const void * keydata, int keylen );
extern HB_EXPORT void hb_znetClose( PHB_ZNETSTREAM pStream );
extern HB_EXPORT int hb_znetError( PHB_ZNETSTREAM pStream );
extern HB_EXPORT long hb_znetRead( PHB_ZNETSTREAM pStream, HB_SOCKET sd, void * buffer, long len, HB_LONG timeout );
extern HB_EXPORT long hb_znetFlush( PHB_ZNETSTREAM pStream, HB_SOCKET sd, HB_LONG timeout );
extern HB_EXPORT long hb_znetWrite( PHB_ZNETSTREAM pStream, HB_SOCKET sd, const void * buffer, long len, HB_LONG timeout, long * plast );
extern HB_EXPORT BOOL hb_znetInetInitialize( PHB_ITEM, PHB_ZNETSTREAM,
HB_INET_RFUNC,
HB_INET_SFUNC,
HB_INET_FFUNC,
HB_INET_CFUNC );
extern HB_EXPORT HB_BOOL hb_znetInetInitialize( PHB_ITEM, PHB_ZNETSTREAM,
HB_INET_RFUNC,
HB_INET_SFUNC,
HB_INET_FFUNC,
HB_INET_CFUNC );
HB_EXTERN_END

18
harbour/src/common/expropt1.c
View File

@@ -367,7 +367,7 @@ HB_EXPR_PTR hb_compExprNewTimeStamp( long lDate, long lTime, HB_COMP_DECL )
return pExpr;
}
HB_EXPR_PTR hb_compExprNewString( const char *szValue, ULONG ulLen, BOOL fDealloc, HB_COMP_DECL )
HB_EXPR_PTR hb_compExprNewString( const char *szValue, ULONG ulLen, HB_BOOL fDealloc, HB_COMP_DECL )
{
HB_EXPR_PTR pExpr;
@@ -395,7 +395,7 @@ HB_EXPR_PTR hb_compExprNewArray( HB_EXPR_PTR pArrList, HB_COMP_DECL )
pArrList->ExprType = HB_ET_ARRAY; /* change type from ET_LIST */
pArrList->ValType = HB_EV_ARRAY;
pArrList->ulLength = 0;
pArrList->value.asList.reference = FALSE;
pArrList->value.asList.reference = HB_FALSE;
pExpr = pArrList->value.asList.pExprList; /* get first element on the list */
/* Now we need to replace all EO_NONE expressions with ET_NIL expressions
@@ -443,7 +443,7 @@ HB_EXPR_PTR hb_compExprNewHash( HB_EXPR_PTR pHashList, HB_COMP_DECL )
}
pHashList->ValType = HB_EV_HASH;
pHashList->ulLength = 0;
pHashList->value.asList.reference = FALSE;
pHashList->value.asList.reference = HB_FALSE;
pHashList->value.asList.pIndex = NULL;
/*
@@ -708,7 +708,7 @@ HB_EXPR_PTR hb_compExprNewList( HB_EXPR_PTR pFirstItem, HB_COMP_DECL )
pExpr = HB_COMP_EXPR_NEW( HB_ET_LIST );
pExpr->value.asList.pExprList = pFirstItem;
pExpr->value.asList.reference = FALSE;
pExpr->value.asList.reference = HB_FALSE;
return pExpr;
}
@@ -722,7 +722,7 @@ HB_EXPR_PTR hb_compExprNewArgList( HB_EXPR_PTR pFirstItem, HB_COMP_DECL )
pExpr = HB_COMP_EXPR_NEW( HB_ET_ARGLIST );
pExpr->value.asList.pExprList = pFirstItem;
pExpr->value.asList.reference = FALSE;
pExpr->value.asList.reference = HB_FALSE;
return pExpr;
}
@@ -736,7 +736,7 @@ HB_EXPR_PTR hb_compExprNewArgRef( HB_COMP_DECL )
pExpr = HB_COMP_EXPR_NEW( HB_ET_ARGLIST );
pExpr->value.asList.pExprList = NULL;
pExpr->value.asList.reference = TRUE;
pExpr->value.asList.reference = HB_TRUE;
return pExpr;
}
@@ -1219,7 +1219,7 @@ ULONG hb_compExprListLen( HB_EXPR_PTR pExpr )
return ulLen;
}
BOOL hb_compExprListTypeCheck( HB_EXPR_PTR pExpr, HB_EXPRTYPE ExprType )
HB_BOOL hb_compExprListTypeCheck( HB_EXPR_PTR pExpr, HB_EXPRTYPE ExprType )
{
pExpr = pExpr->value.asList.pExprList;
if( pExpr )
@@ -1234,7 +1234,7 @@ BOOL hb_compExprListTypeCheck( HB_EXPR_PTR pExpr, HB_EXPRTYPE ExprType )
return pExpr == NULL;
}
return FALSE;
return HB_FALSE;
}
/* Return a number of parameters passed to function or method
@@ -1359,7 +1359,7 @@ static HB_CBVAR_PTR hb_compExprCBVarNew( const char * szVarName, BYTE bType )
pVar->szName = szVarName;
pVar->bType = bType;
pVar->pNext = NULL;
pVar->bUsed = FALSE;
pVar->bUsed = HB_FALSE;
return pVar;
}

232
harbour/src/common/expropt2.c
View File

@@ -60,7 +60,7 @@
#include "hbdate.h"
#include "hbmath.h"
static BOOL hb_compExprHasMacro( const char * szText, ULONG ulLen, HB_COMP_DECL )
static HB_BOOL hb_compExprHasMacro( const char * szText, ULONG ulLen, HB_COMP_DECL )
{
while( ulLen-- )
{
@@ -70,11 +70,11 @@ static BOOL hb_compExprHasMacro( const char * szText, ULONG ulLen, HB_COMP_DECL
( *szText >= 'A' && *szText <= 'Z' ) ||
( *szText >= 'a' && *szText <= 'z' ) ) ) )
{
return TRUE;
return HB_TRUE;
}
}
}
return FALSE;
return HB_FALSE;
}
static HB_EXPR_PTR hb_compExprReducePlusStrings( HB_EXPR_PTR pLeft, HB_EXPR_PTR pRight, HB_COMP_DECL )
@@ -96,7 +96,7 @@ static HB_EXPR_PTR hb_compExprReducePlusStrings( HB_EXPR_PTR pLeft, HB_EXPR_PTR
pLeft->ulLength += pRight->ulLength;
szString[ pLeft->ulLength ] = '\0';
pLeft->value.asString.string = szString;
pLeft->value.asString.dealloc = TRUE;
pLeft->value.asString.dealloc = HB_TRUE;
}
HB_COMP_EXPR_FREE( pRight );
return pLeft;
@@ -130,7 +130,7 @@ static HB_EXPR_PTR hb_compExprReduceMinusStrings( HB_EXPR_PTR pLeft, HB_EXPR_PTR
pLeft->ulLength += pRight->ulLength;
szString[ pLeft->ulLength ] = '\0';
pLeft->value.asString.string = szString;
pLeft->value.asString.dealloc = TRUE;
pLeft->value.asString.dealloc = HB_TRUE;
}
HB_COMP_EXPR_FREE( pRight );
return pLeft;
@@ -591,7 +591,7 @@ HB_EXPR_PTR hb_compExprReduceMinus( HB_EXPR_PTR pSelf, HB_COMP_DECL )
}
else
{
BOOL fReduce = TRUE;
HB_BOOL fReduce = HB_TRUE;
/* Do not reduce strings with the macro operator '&'
*/
@@ -610,7 +610,7 @@ HB_EXPR_PTR hb_compExprReduceMinus( HB_EXPR_PTR pSelf, HB_COMP_DECL )
( ch >= 'a' && ch <= 'z' ) || ch == '_' ||
! HB_SUPPORT_HARBOUR )
{
fReduce = FALSE;
fReduce = HB_FALSE;
break;
}
}
@@ -633,7 +633,7 @@ HB_EXPR_PTR hb_compExprReduceMinus( HB_EXPR_PTR pSelf, HB_COMP_DECL )
return pSelf;
}
static BOOL hb_compExprReducePlusNums( HB_EXPR_PTR pSelf, HB_EXPR_PTR pAdd )
static HB_BOOL hb_compExprReducePlusNums( HB_EXPR_PTR pSelf, HB_EXPR_PTR pAdd )
{
HB_EXPR_PTR pLeft, pRight, pNum;
@@ -649,7 +649,7 @@ static BOOL hb_compExprReducePlusNums( HB_EXPR_PTR pSelf, HB_EXPR_PTR pAdd )
else if( pRight->ExprType == HB_EO_PLUS )
return hb_compExprReducePlusNums( pRight, pAdd );
else
return FALSE;
return HB_FALSE;
switch( pNum->value.asNum.NumType & pAdd->value.asNum.NumType )
{
@@ -688,7 +688,7 @@ static BOOL hb_compExprReducePlusNums( HB_EXPR_PTR pSelf, HB_EXPR_PTR pAdd )
break;
}
return TRUE;
return HB_TRUE;
}
HB_EXPR_PTR hb_compExprReducePlus( HB_EXPR_PTR pSelf, HB_COMP_DECL )
@@ -896,7 +896,7 @@ HB_EXPR_PTR hb_compExprReducePlus( HB_EXPR_PTR pSelf, HB_COMP_DECL )
}
else
{
BOOL fReduce = TRUE;
HB_BOOL fReduce = HB_TRUE;
/* Do not reduce strings with the macro operator '&'
*/
@@ -914,7 +914,7 @@ HB_EXPR_PTR hb_compExprReducePlus( HB_EXPR_PTR pSelf, HB_COMP_DECL )
( ch >= 'a' && ch <= 'z' ) || ch == '_' ||
! HB_SUPPORT_HARBOUR )
{
fReduce = FALSE;
fReduce = HB_FALSE;
break;
}
}
@@ -1006,7 +1006,7 @@ HB_EXPR_PTR hb_compExprReduceIN( HB_EXPR_PTR pSelf, HB_COMP_DECL )
!hb_compExprHasMacro( pRight->value.asString.string,
pRight->ulLength, HB_COMP_PARAM ) ) )
{
BOOL bResult;
HB_BOOL bResult;
/* NOTE: CA-Cl*pper has a bug where the $ operator returns .T.
* when an empty string is searched [vszakats]
@@ -1054,7 +1054,7 @@ HB_EXPR_PTR hb_compExprReduceNE( HB_EXPR_PTR pSelf, HB_COMP_DECL )
* .F. != .F. = .F.
* .T. != .F. = .T.
*/
BOOL bResult = ( pLeft->value.asLogical != pRight->value.asLogical );
HB_BOOL bResult = ( pLeft->value.asLogical != pRight->value.asLogical );
HB_COMP_EXPR_FREE( pLeft );
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
@@ -1066,7 +1066,7 @@ HB_EXPR_PTR hb_compExprReduceNE( HB_EXPR_PTR pSelf, HB_COMP_DECL )
case HB_ET_STRING:
/* NOTE: the result depends on SET EXACT setting then it
* cannot be optimized except the case when NULL string are
* compared - "" != "" is always FALSE regardless of EXACT
* compared - "" != "" is always HB_FALSE regardless of EXACT
* setting
*/
if( ( pLeft->ulLength | pRight->ulLength ) == 0 )
@@ -1075,7 +1075,7 @@ HB_EXPR_PTR hb_compExprReduceNE( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
pSelf->ValType = HB_EV_LOGICAL;
pSelf->value.asLogical = FALSE;
pSelf->value.asLogical = HB_FALSE;
/* NOTE: COMPATIBILITY: Clipper doesn't optimize this */
}
@@ -1083,7 +1083,7 @@ HB_EXPR_PTR hb_compExprReduceNE( HB_EXPR_PTR pSelf, HB_COMP_DECL )
case HB_ET_NUMERIC:
{
BOOL bResult;
HB_BOOL bResult;
switch( pLeft->value.asNum.NumType & pRight->value.asNum.NumType )
{
@@ -1113,8 +1113,8 @@ HB_EXPR_PTR hb_compExprReduceNE( HB_EXPR_PTR pSelf, HB_COMP_DECL )
case HB_ET_DATE:
case HB_ET_TIMESTAMP:
{
BOOL bResult = pLeft->value.asDate.lDate != pRight->value.asDate.lDate ||
pLeft->value.asDate.lTime != pRight->value.asDate.lTime;
HB_BOOL bResult = pLeft->value.asDate.lDate != pRight->value.asDate.lDate ||
pLeft->value.asDate.lTime != pRight->value.asDate.lTime;
HB_COMP_EXPR_FREE( pLeft );
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
@@ -1128,7 +1128,7 @@ HB_EXPR_PTR hb_compExprReduceNE( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
pSelf->ValType = HB_EV_LOGICAL;
pSelf->value.asLogical = FALSE;
pSelf->value.asLogical = HB_FALSE;
break;
}
}
@@ -1168,7 +1168,7 @@ HB_EXPR_PTR hb_compExprReduceNE( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
pSelf->ValType = HB_EV_LOGICAL;
pSelf->value.asLogical = TRUE;
pSelf->value.asLogical = HB_TRUE;
}
/* TODO: add checking of incompatible types
else
@@ -1195,7 +1195,7 @@ HB_EXPR_PTR hb_compExprReduceGE( HB_EXPR_PTR pSelf, HB_COMP_DECL )
* .F. >= .F. = .T.
* .F. >= .T. = .f.
*/
BOOL bResult = ! ( ! pLeft->value.asLogical && pRight->value.asLogical );
HB_BOOL bResult = ! ( ! pLeft->value.asLogical && pRight->value.asLogical );
HB_COMP_EXPR_FREE( pLeft );
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
@@ -1206,7 +1206,7 @@ HB_EXPR_PTR hb_compExprReduceGE( HB_EXPR_PTR pSelf, HB_COMP_DECL )
case HB_ET_NUMERIC:
{
BOOL bResult;
HB_BOOL bResult;
switch( pLeft->value.asNum.NumType & pRight->value.asNum.NumType )
{
@@ -1236,9 +1236,9 @@ HB_EXPR_PTR hb_compExprReduceGE( HB_EXPR_PTR pSelf, HB_COMP_DECL )
case HB_ET_DATE:
case HB_ET_TIMESTAMP:
{
BOOL bResult = ( pLeft->value.asDate.lDate > pRight->value.asDate.lDate ) ||
( pLeft->value.asDate.lDate == pRight->value.asDate.lDate &&
pLeft->value.asDate.lTime >= pRight->value.asDate.lTime );
HB_BOOL bResult = ( pLeft->value.asDate.lDate > pRight->value.asDate.lDate ) ||
( pLeft->value.asDate.lDate == pRight->value.asDate.lDate &&
pLeft->value.asDate.lTime >= pRight->value.asDate.lTime );
HB_COMP_EXPR_FREE( pLeft );
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
@@ -1284,7 +1284,7 @@ HB_EXPR_PTR hb_compExprReduceLE( HB_EXPR_PTR pSelf, HB_COMP_DECL )
* .F. <= .F. = .T.
* .F. <= .T. = .T.
*/
BOOL bResult = ! ( pLeft->value.asLogical && ! pRight->value.asLogical );
HB_BOOL bResult = ! ( pLeft->value.asLogical && ! pRight->value.asLogical );
HB_COMP_EXPR_FREE( pLeft );
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
@@ -1295,7 +1295,7 @@ HB_EXPR_PTR hb_compExprReduceLE( HB_EXPR_PTR pSelf, HB_COMP_DECL )
case HB_ET_NUMERIC:
{
BOOL bResult;
HB_BOOL bResult;
switch( pLeft->value.asNum.NumType & pRight->value.asNum.NumType )
{
@@ -1325,9 +1325,9 @@ HB_EXPR_PTR hb_compExprReduceLE( HB_EXPR_PTR pSelf, HB_COMP_DECL )
case HB_ET_DATE:
case HB_ET_TIMESTAMP:
{
BOOL bResult = ( pLeft->value.asDate.lDate < pRight->value.asDate.lDate ) ||
( pLeft->value.asDate.lDate == pRight->value.asDate.lDate &&
pLeft->value.asDate.lTime <= pRight->value.asDate.lTime );
HB_BOOL bResult = ( pLeft->value.asDate.lDate < pRight->value.asDate.lDate ) ||
( pLeft->value.asDate.lDate == pRight->value.asDate.lDate &&
pLeft->value.asDate.lTime <= pRight->value.asDate.lTime );
HB_COMP_EXPR_FREE( pLeft );
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
@@ -1373,7 +1373,7 @@ HB_EXPR_PTR hb_compExprReduceGT( HB_EXPR_PTR pSelf, HB_COMP_DECL )
* .F. > .F. = .F.
* .F. > .T. = .F.
*/
BOOL bResult = ( pLeft->value.asLogical && ! pRight->value.asLogical );
HB_BOOL bResult = ( pLeft->value.asLogical && ! pRight->value.asLogical );
HB_COMP_EXPR_FREE( pLeft );
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
@@ -1384,7 +1384,7 @@ HB_EXPR_PTR hb_compExprReduceGT( HB_EXPR_PTR pSelf, HB_COMP_DECL )
case HB_ET_NUMERIC:
{
BOOL bResult;
HB_BOOL bResult;
switch( pLeft->value.asNum.NumType & pRight->value.asNum.NumType )
{
@@ -1414,9 +1414,9 @@ HB_EXPR_PTR hb_compExprReduceGT( HB_EXPR_PTR pSelf, HB_COMP_DECL )
case HB_ET_DATE:
case HB_ET_TIMESTAMP:
{
BOOL bResult = ( pLeft->value.asDate.lDate > pRight->value.asDate.lDate ) ||
( pLeft->value.asDate.lDate == pRight->value.asDate.lDate &&
pLeft->value.asDate.lTime > pRight->value.asDate.lTime );
HB_BOOL bResult = ( pLeft->value.asDate.lDate > pRight->value.asDate.lDate ) ||
( pLeft->value.asDate.lDate == pRight->value.asDate.lDate &&
pLeft->value.asDate.lTime > pRight->value.asDate.lTime );
HB_COMP_EXPR_FREE( pLeft );
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
@@ -1462,7 +1462,7 @@ HB_EXPR_PTR hb_compExprReduceLT( HB_EXPR_PTR pSelf, HB_COMP_DECL )
* .F. < .F. = .F.
* .T. < .F. = .F.
*/
BOOL bResult = ( ! pLeft->value.asLogical && pRight->value.asLogical );
HB_BOOL bResult = ( ! pLeft->value.asLogical && pRight->value.asLogical );
HB_COMP_EXPR_FREE( pLeft );
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
@@ -1473,7 +1473,7 @@ HB_EXPR_PTR hb_compExprReduceLT( HB_EXPR_PTR pSelf, HB_COMP_DECL )
case HB_ET_NUMERIC:
{
BOOL bResult;
HB_BOOL bResult;
switch( pLeft->value.asNum.NumType & pRight->value.asNum.NumType )
{
@@ -1503,9 +1503,9 @@ HB_EXPR_PTR hb_compExprReduceLT( HB_EXPR_PTR pSelf, HB_COMP_DECL )
case HB_ET_DATE:
case HB_ET_TIMESTAMP:
{
BOOL bResult = ( pLeft->value.asDate.lDate < pRight->value.asDate.lDate ) ||
( pLeft->value.asDate.lDate == pRight->value.asDate.lDate &&
pLeft->value.asDate.lTime < pRight->value.asDate.lTime );
HB_BOOL bResult = ( pLeft->value.asDate.lDate < pRight->value.asDate.lDate ) ||
( pLeft->value.asDate.lDate == pRight->value.asDate.lDate &&
pLeft->value.asDate.lTime < pRight->value.asDate.lTime );
HB_COMP_EXPR_FREE( pLeft );
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
@@ -1547,7 +1547,7 @@ HB_EXPR_PTR hb_compExprReduceEQ( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
case HB_ET_LOGICAL:
{
BOOL bResult = ( pLeft->value.asLogical == pRight->value.asLogical );
HB_BOOL bResult = ( pLeft->value.asLogical == pRight->value.asLogical );
HB_COMP_EXPR_FREE( pLeft );
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
@@ -1574,10 +1574,10 @@ HB_EXPR_PTR hb_compExprReduceEQ( HB_EXPR_PTR pSelf, HB_COMP_DECL )
!hb_compExprHasMacro( pRight->value.asString.string,
pRight->ulLength, HB_COMP_PARAM ) ) ) ) )
{
BOOL bResult = pLeft->ulLength == pRight->ulLength &&
memcmp( pLeft->value.asString.string,
pRight->value.asString.string,
pLeft->ulLength ) == 0;
HB_BOOL bResult = pLeft->ulLength == pRight->ulLength &&
memcmp( pLeft->value.asString.string,
pRight->value.asString.string,
pLeft->ulLength ) == 0;
HB_COMP_EXPR_FREE( pLeft );
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
@@ -1588,7 +1588,7 @@ HB_EXPR_PTR hb_compExprReduceEQ( HB_EXPR_PTR pSelf, HB_COMP_DECL )
case HB_ET_NUMERIC:
{
BOOL bResult;
HB_BOOL bResult;
switch( pLeft->value.asNum.NumType & pRight->value.asNum.NumType )
{
@@ -1616,8 +1616,8 @@ HB_EXPR_PTR hb_compExprReduceEQ( HB_EXPR_PTR pSelf, HB_COMP_DECL )
case HB_ET_DATE:
case HB_ET_TIMESTAMP:
{
BOOL bResult = ( pLeft->value.asDate.lDate == pRight->value.asDate.lDate ) &&
( pLeft->value.asDate.lTime == pRight->value.asDate.lTime );
HB_BOOL bResult = ( pLeft->value.asDate.lDate == pRight->value.asDate.lDate ) &&
( pLeft->value.asDate.lTime == pRight->value.asDate.lTime );
HB_COMP_EXPR_FREE( pLeft );
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
@@ -1631,7 +1631,7 @@ HB_EXPR_PTR hb_compExprReduceEQ( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
pSelf->ValType = HB_EV_LOGICAL;
pSelf->value.asLogical = TRUE;
pSelf->value.asLogical = HB_TRUE;
break;
}
}
@@ -1673,7 +1673,7 @@ HB_EXPR_PTR hb_compExprReduceEQ( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
pSelf->ValType = HB_EV_LOGICAL;
pSelf->value.asLogical = FALSE;
pSelf->value.asLogical = HB_FALSE;
}
/* TODO: add checking of incompatible types
else
@@ -1692,7 +1692,7 @@ HB_EXPR_PTR hb_compExprReduceAnd( HB_EXPR_PTR pSelf, HB_COMP_DECL )
if( pLeft->ExprType == HB_ET_LOGICAL && pRight->ExprType == HB_ET_LOGICAL )
{
BOOL bResult;
HB_BOOL bResult;
bResult = pLeft->value.asLogical && pRight->value.asLogical;
HB_COMP_EXPR_FREE( pLeft );
@@ -1721,7 +1721,7 @@ HB_EXPR_PTR hb_compExprReduceAnd( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pRight ); /* discard expression */
pSelf->ExprType = HB_ET_LOGICAL;
pSelf->ValType = HB_EV_LOGICAL;
pSelf->value.asLogical = FALSE;
pSelf->value.asLogical = HB_FALSE;
}
}
else if( pRight->ExprType == HB_ET_LOGICAL &&
@@ -1744,7 +1744,7 @@ HB_EXPR_PTR hb_compExprReduceAnd( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
pSelf->ValType = HB_EV_LOGICAL;
pSelf->value.asLogical = FALSE;
pSelf->value.asLogical = HB_FALSE;
}
}
return pSelf;
@@ -1759,7 +1759,7 @@ HB_EXPR_PTR hb_compExprReduceOr( HB_EXPR_PTR pSelf, HB_COMP_DECL )
if( pLeft->ExprType == HB_ET_LOGICAL && pRight->ExprType == HB_ET_LOGICAL )
{
BOOL bResult;
HB_BOOL bResult;
bResult = pLeft->value.asLogical || pRight->value.asLogical;
HB_COMP_EXPR_FREE( pLeft );
@@ -1779,7 +1779,7 @@ HB_EXPR_PTR hb_compExprReduceOr( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pRight ); /* discard expression */
pSelf->ExprType = HB_ET_LOGICAL;
pSelf->ValType = HB_EV_LOGICAL;
pSelf->value.asLogical = TRUE;
pSelf->value.asLogical = HB_TRUE;
}
else
{
@@ -1802,7 +1802,7 @@ HB_EXPR_PTR hb_compExprReduceOr( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pRight );
pSelf->ExprType = HB_ET_LOGICAL;
pSelf->ValType = HB_EV_LOGICAL;
pSelf->value.asLogical = TRUE;
pSelf->value.asLogical = HB_TRUE;
}
else
{
@@ -1845,8 +1845,8 @@ HB_EXPR_PTR hb_compExprReduceIIF( HB_EXPR_PTR pSelf, HB_COMP_DECL )
/* store the TRUE expression as a result of reduction
*/
pSelf = pExpr;
pExpr = pExpr->pNext; /* skip to FALSE expression */
HB_COMP_EXPR_FREE( pExpr ); /* delete FALSE expr */
pExpr = pExpr->pNext; /* skip to HB_FALSE expression */
HB_COMP_EXPR_FREE( pExpr ); /* delete HB_FALSE expr */
pSelf->pNext = NULL;
}
else
@@ -1863,7 +1863,7 @@ HB_EXPR_PTR hb_compExprReduceIIF( HB_EXPR_PTR pSelf, HB_COMP_DECL )
*/
pSelf->value.asList.pExprList = NULL;
HB_COMP_EXPR_FREE( pSelf );
/* store the FALSE expression as a result of reduction
/* store the HB_FALSE expression as a result of reduction
*/
pSelf = pExpr->pNext;
HB_COMP_EXPR_FREE( pExpr ); /* delete TRUE expr */
@@ -1921,7 +1921,7 @@ HB_EXPR_PTR hb_compExprListStrip( HB_EXPR_PTR pSelf, HB_COMP_DECL )
return pSelf;
}
BOOL hb_compExprReduceAT( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_BOOL hb_compExprReduceAT( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms;
HB_EXPR_PTR pSub = pParms->value.asList.pExprList;
@@ -1955,13 +1955,13 @@ BOOL hb_compExprReduceAT( HB_EXPR_PTR pSelf, HB_COMP_DECL )
memcpy( pSelf, pReduced, sizeof( HB_EXPR ) );
HB_COMP_EXPR_CLEAR( pReduced );
return TRUE;
return HB_TRUE;
}
else
return FALSE;
return HB_FALSE;
}
BOOL hb_compExprReduceCHR( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_BOOL hb_compExprReduceCHR( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms;
HB_EXPR_PTR pArg = pParms->value.asList.pExprList;
@@ -1992,20 +1992,20 @@ BOOL hb_compExprReduceCHR( HB_EXPR_PTR pSelf, HB_COMP_DECL )
pArg->value.asNum.val.l != 0 )
{
pExpr->value.asString.string = ( char * ) "";
pExpr->value.asString.dealloc = FALSE;
pExpr->value.asString.dealloc = HB_FALSE;
pExpr->ulLength = 0;
}
else
{
pExpr->value.asString.string = ( char * ) hb_szAscii[ ( int ) pArg->value.asNum.val.l & 0xff ];
pExpr->value.asString.dealloc = FALSE;
pExpr->value.asString.dealloc = HB_FALSE;
pExpr->ulLength = 1;
}
}
else
{
pExpr->value.asString.string = ( char * ) hb_szAscii[ ( unsigned int ) pArg->value.asNum.val.d & 0xff ];
pExpr->value.asString.dealloc = FALSE;
pExpr->value.asString.dealloc = HB_FALSE;
pExpr->ulLength = 1;
}
@@ -2013,13 +2013,13 @@ BOOL hb_compExprReduceCHR( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pSelf->value.asFunCall.pFunName );
memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
HB_COMP_EXPR_CLEAR( pExpr );
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
BOOL hb_compExprReduceLEN( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_BOOL hb_compExprReduceLEN( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms;
HB_EXPR_PTR pArg = pParms->value.asList.pExprList;
@@ -2035,16 +2035,16 @@ BOOL hb_compExprReduceLEN( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pSelf->value.asFunCall.pFunName );
memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
HB_COMP_EXPR_CLEAR( pExpr );
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
BOOL hb_compExprReduceEMPTY( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_BOOL hb_compExprReduceEMPTY( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms;
HB_EXPR_PTR pArg = pParms->value.asList.pExprList;
BOOL fReduced = TRUE, fResult = FALSE;
HB_BOOL fReduced = HB_TRUE, fResult = HB_FALSE;
switch( pArg->ExprType )
{
@@ -2070,7 +2070,7 @@ BOOL hb_compExprReduceEMPTY( HB_EXPR_PTR pSelf, HB_COMP_DECL )
break;
case HB_ET_NIL:
fResult = TRUE;
fResult = HB_TRUE;
break;
case HB_ET_DATE:
@@ -2087,7 +2087,7 @@ BOOL hb_compExprReduceEMPTY( HB_EXPR_PTR pSelf, HB_COMP_DECL )
/* case HB_ET_FUNREF: */
default:
fReduced = FALSE;
fReduced = HB_FALSE;
}
if( fReduced )
@@ -2098,12 +2098,12 @@ BOOL hb_compExprReduceEMPTY( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pSelf->value.asFunCall.pFunName );
memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
HB_COMP_EXPR_CLEAR( pExpr );
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
BOOL hb_compExprReduceASC( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_BOOL hb_compExprReduceASC( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms;
HB_EXPR_PTR pArg = pParms->value.asList.pExprList;
@@ -2117,12 +2117,12 @@ BOOL hb_compExprReduceASC( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pSelf->value.asFunCall.pFunName );
memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
HB_COMP_EXPR_CLEAR( pExpr );
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
BOOL hb_compExprReduceINT( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_BOOL hb_compExprReduceINT( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms;
HB_EXPR_PTR pArg = pParms->value.asList.pExprList;
@@ -2147,12 +2147,12 @@ BOOL hb_compExprReduceINT( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pSelf->value.asFunCall.pFunName );
memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
HB_COMP_EXPR_CLEAR( pExpr );
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
BOOL hb_compExprReduceSTOT( HB_EXPR_PTR pSelf, USHORT usCount, HB_COMP_DECL )
HB_BOOL hb_compExprReduceSTOT( HB_EXPR_PTR pSelf, USHORT usCount, HB_COMP_DECL )
{
HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms;
HB_EXPR_PTR pArg = pParms ? pParms->value.asList.pExprList : NULL;
@@ -2177,13 +2177,13 @@ BOOL hb_compExprReduceSTOT( HB_EXPR_PTR pSelf, USHORT usCount, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pSelf->value.asFunCall.pFunName );
memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
HB_COMP_EXPR_CLEAR( pExpr );
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
BOOL hb_compExprReduceSTOD( HB_EXPR_PTR pSelf, USHORT usCount, HB_COMP_DECL )
HB_BOOL hb_compExprReduceSTOD( HB_EXPR_PTR pSelf, USHORT usCount, HB_COMP_DECL )
{
HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms;
HB_EXPR_PTR pArg = pParms ? pParms->value.asList.pExprList : NULL;
@@ -2208,13 +2208,13 @@ BOOL hb_compExprReduceSTOD( HB_EXPR_PTR pSelf, USHORT usCount, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pSelf->value.asFunCall.pFunName );
memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
HB_COMP_EXPR_CLEAR( pExpr );
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
BOOL hb_compExprReduceDTOS( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_BOOL hb_compExprReduceDTOS( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms;
HB_EXPR_PTR pArg = pParms->value.asList.pExprList;
@@ -2226,19 +2226,19 @@ BOOL hb_compExprReduceDTOS( HB_EXPR_PTR pSelf, HB_COMP_DECL )
szDate = ( char * ) memcpy( hb_xgrab( 9 ),
hb_dateDecStr( szBuffer, ( long ) pArg->value.asDate.lDate ), 9 );
pExpr = hb_compExprNewString( szDate, 8, TRUE, HB_COMP_PARAM );
pExpr = hb_compExprNewString( szDate, 8, HB_TRUE, HB_COMP_PARAM );
HB_COMP_EXPR_FREE( pParms );
HB_COMP_EXPR_FREE( pSelf->value.asFunCall.pFunName );
memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
HB_COMP_EXPR_CLEAR( pExpr );
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
BOOL hb_compExprReduceCTOD( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_BOOL hb_compExprReduceCTOD( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms;
HB_EXPR_PTR pArg = pParms->value.asList.pExprList;
@@ -2251,13 +2251,13 @@ BOOL hb_compExprReduceCTOD( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pSelf->value.asFunCall.pFunName );
memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
HB_COMP_EXPR_CLEAR( pExpr );
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
BOOL hb_compExprReduceUPPER( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_BOOL hb_compExprReduceUPPER( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms;
HB_EXPR_PTR pArg = pParms->value.asList.pExprList;
@@ -2265,7 +2265,7 @@ BOOL hb_compExprReduceUPPER( HB_EXPR_PTR pSelf, HB_COMP_DECL )
if( pArg->ExprType == HB_ET_STRING )
{
ULONG ulLen = pArg->ulLength;
BOOL fLower = FALSE;
HB_BOOL fLower = HB_FALSE;
if( ulLen )
{
@@ -2274,7 +2274,7 @@ BOOL hb_compExprReduceUPPER( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
char c = * szValue++;
if( c >= 'a' && c <= 'z' )
fLower = TRUE;
fLower = HB_TRUE;
else if( !( ( c >= 'A' && c <= 'Z' ) ||
( c >= '0' && c <= '9' ) || c == ' ' ) )
break;
@@ -2286,7 +2286,7 @@ BOOL hb_compExprReduceUPPER( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
HB_EXPR_PTR pExpr;
char * szValue;
BOOL fDealloc;
HB_BOOL fDealloc;
if( fLower )
{
@@ -2294,21 +2294,21 @@ BOOL hb_compExprReduceUPPER( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
szValue = ( char * ) hb_szAscii[ HB_TOUPPER( ( unsigned char )
pArg->value.asString.string[ 0 ] ) ];
fDealloc = FALSE;
fDealloc = HB_FALSE;
}
else
{
if( pArg->value.asString.dealloc )
{
szValue = pArg->value.asString.string;
pArg->value.asString.dealloc = FALSE;
fDealloc = TRUE;
pArg->value.asString.dealloc = HB_FALSE;
fDealloc = HB_TRUE;
}
else
{
szValue = ( char * ) hb_xgrab( pArg->ulLength + 1 );
memcpy( szValue, pArg->value.asString.string, pArg->ulLength + 1 );
fDealloc = TRUE;
fDealloc = HB_TRUE;
}
do
szValue[ ulLen ] = ( char ) HB_TOUPPER( ( unsigned char ) szValue[ ulLen ] );
@@ -2319,7 +2319,7 @@ BOOL hb_compExprReduceUPPER( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
szValue = pArg->value.asString.string;
fDealloc = pArg->value.asString.dealloc;
pArg->value.asString.dealloc = FALSE;
pArg->value.asString.dealloc = HB_FALSE;
}
pExpr = HB_COMP_EXPR_NEW( HB_ET_STRING );
@@ -2333,14 +2333,14 @@ BOOL hb_compExprReduceUPPER( HB_EXPR_PTR pSelf, HB_COMP_DECL )
memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
HB_COMP_EXPR_CLEAR( pExpr );
return TRUE;
return HB_TRUE;
}
}
return FALSE;
return HB_FALSE;
}
BOOL hb_compExprReduceMIN( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_BOOL hb_compExprReduceMIN( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms;
HB_EXPR_PTR pFirst = pParms->value.asList.pExprList;
@@ -2420,13 +2420,13 @@ BOOL hb_compExprReduceMIN( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pSelf->value.asFunCall.pFunName );
memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
HB_COMP_EXPR_CLEAR( pExpr );
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
BOOL hb_compExprReduceMAX( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_BOOL hb_compExprReduceMAX( HB_EXPR_PTR pSelf, HB_COMP_DECL )
{
HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms;
HB_EXPR_PTR pFirst = pParms->value.asList.pExprList;
@@ -2507,13 +2507,13 @@ BOOL hb_compExprReduceMAX( HB_EXPR_PTR pSelf, HB_COMP_DECL )
HB_COMP_EXPR_FREE( pSelf->value.asFunCall.pFunName );
memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
HB_COMP_EXPR_CLEAR( pExpr );
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
BOOL hb_compExprReduceBitFunc( HB_EXPR_PTR pSelf, HB_LONG lResult, BOOL fBool, HB_COMP_DECL )
HB_BOOL hb_compExprReduceBitFunc( HB_EXPR_PTR pSelf, HB_LONG lResult, HB_BOOL fBool, HB_COMP_DECL )
{
HB_EXPR_PTR pParms = pSelf->value.asFunCall.pParms;
HB_EXPR_PTR pExpr = fBool ? hb_compExprNewLogical( lResult != 0, HB_COMP_PARAM ) :
@@ -2523,5 +2523,5 @@ BOOL hb_compExprReduceBitFunc( HB_EXPR_PTR pSelf, HB_LONG lResult, BOOL fBool, H
HB_COMP_EXPR_FREE( pSelf->value.asFunCall.pFunName );
memcpy( pSelf, pExpr, sizeof( HB_EXPR ) );
HB_COMP_EXPR_CLEAR( pExpr );
return TRUE;
return HB_TRUE;
}

38
harbour/src/common/hbdate.c
View File

@@ -473,17 +473,17 @@ char * hb_timeStr( char * szTime, long lMilliSec )
return szTime;
}
BOOL hb_timeStrGet( const char * szTime,
int * piHour, int * piMinutes,
int * piSeconds, int * piMSec )
HB_BOOL hb_timeStrGet( const char * szTime,
int * piHour, int * piMinutes,
int * piSeconds, int * piMSec )
{
int iHour, iMinutes, iSeconds, iMSec, iBlocks;
BOOL fValid;
HB_BOOL fValid;
HB_TRACE(HB_TR_DEBUG, ("hb_timeStrGet(%s, %p, %p, %p, %p)", szTime, piHour, piMinutes, piSeconds, piMSec));
iHour = iMinutes = iSeconds = iMSec = iBlocks = 0;
fValid = FALSE;
fValid = HB_FALSE;
if( szTime )
{
@@ -551,7 +551,7 @@ BOOL hb_timeStrGet( const char * szTime,
++szTime;
if( *szTime == 0 && iBlocks > 0 &&
iHour < 24 && iMinutes < 60 && iSeconds < 60 )
fValid = TRUE;
fValid = HB_TRUE;
else
iHour = iMinutes = iSeconds = iMSec = 0;
}
@@ -687,18 +687,18 @@ char * hb_timeStampStr( char * szDateTime, long lJulian, long lMilliSec )
return szDateTime;
}
BOOL hb_timeStampStrGet( const char * szDateTime,
int * piYear, int * piMonth, int * piDay,
int * piHour, int * piMinutes, int * piSeconds,
int * piMSec )
HB_BOOL hb_timeStampStrGet( const char * szDateTime,
int * piYear, int * piMonth, int * piDay,
int * piHour, int * piMinutes, int * piSeconds,
int * piMSec )
{
int iYear, iMonth, iDay;
BOOL fValid;
HB_BOOL fValid;
HB_TRACE(HB_TR_DEBUG, ("hb_timeStampStrGet(%s, %p, %p, %p, %p, %p, %p, %p)", szDateTime, piYear, piMonth, piDay, piHour, piMinutes, piSeconds, piMSec));
iYear = iMonth = iDay = 0;
fValid = FALSE;
fValid = HB_FALSE;
if( szDateTime )
{
@@ -735,7 +735,7 @@ BOOL hb_timeStampStrGet( const char * szDateTime,
++szDateTime;
if( *szDateTime == '\0' )
szDateTime = NULL;
fValid = TRUE;
fValid = HB_TRUE;
}
}
else
@@ -751,13 +751,13 @@ BOOL hb_timeStampStrGet( const char * szDateTime,
if( !hb_timeStrGet( szDateTime, piHour, piMinutes, piSeconds, piMSec ) )
{
if( szDateTime )
fValid = FALSE;
fValid = HB_FALSE;
}
else
fValid = TRUE;
fValid = HB_TRUE;
}
else if( szDateTime )
fValid = FALSE;
fValid = HB_FALSE;
if( piYear )
*piYear = iYear;
@@ -769,11 +769,11 @@ BOOL hb_timeStampStrGet( const char * szDateTime,
return fValid;
}
BOOL hb_timeStampStrGetDT( const char * szDateTime,
long * plJulian, long * plMilliSec )
HB_BOOL hb_timeStampStrGetDT( const char * szDateTime,
long * plJulian, long * plMilliSec )
{
int iYear, iMonth, iDay, iHour, iMinutes, iSeconds, iMSec;
BOOL fValid;
HB_BOOL fValid;
HB_TRACE(HB_TR_DEBUG, ("hb_timeStampStrGetDT(%s, %p, %p)", szDateTime, plJulian, plMilliSec));

36
harbour/src/common/hbffind.c
View File

@@ -381,9 +381,9 @@ char * hb_fsAttrDecode( HB_FATTR ulAttr, char * szAttr )
each call. Does low-level (platform dependent
filtering if needed. */
static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
static HB_BOOL hb_fsFindNextLow( PHB_FFIND ffind )
{
BOOL bFound;
HB_BOOL bFound;
int iYear = 0;
int iMonth = 0;
@@ -415,7 +415,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
if( ffind->bFirst )
{
ffind->bFirst = FALSE;
ffind->bFirst = HB_FALSE;
/* tzset(); */
@@ -474,7 +474,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
if( ffind->bFirst )
{
ffind->bFirst = FALSE;
ffind->bFirst = HB_FALSE;
/* tzset(); */
@@ -520,7 +520,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
{
PHB_FFIND_INFO info = ( PHB_FFIND_INFO ) ffind->info;
bFound = FALSE;
bFound = HB_FALSE;
if( ffind->attrmask & HB_FA_LABEL )
{
@@ -530,7 +530,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
LPTSTR lpFileMask = HB_TCHAR_CONVTO( ffind->pszFileMask );
TCHAR szName[ HB_PATH_MAX ];
ffind->bFirst = FALSE;
ffind->bFirst = HB_FALSE;
ffind->szName[ 0 ] = '\0';
bFound = GetVolumeInformation( lpFileMask, szName, sizeof( szName ), NULL, NULL, NULL, NULL, 0 );
@@ -547,13 +547,13 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
{
LPTSTR lpFileMask = HB_TCHAR_CONVTO( ffind->pszFileMask );
ffind->bFirst = FALSE;
ffind->bFirst = HB_FALSE;
info->hFindFile = FindFirstFile( lpFileMask, &info->pFindFileData );
info->dwAttr = ( DWORD ) hb_fsAttrToRaw( ffind->attrmask );
if( ( info->hFindFile != INVALID_HANDLE_VALUE ) && HB_WIN_MATCH() )
bFound = TRUE;
bFound = HB_TRUE;
HB_TCHAR_FREE( lpFileMask );
}
@@ -564,7 +564,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
{
if( HB_WIN_MATCH() )
{
bFound = TRUE;
bFound = HB_TRUE;
break;
}
}
@@ -623,7 +623,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
char dirname[ HB_PATH_MAX ];
bFound = FALSE;
bFound = HB_FALSE;
/* TODO: HB_FA_LABEL handling */
@@ -631,7 +631,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
{
char * pos;
ffind->bFirst = FALSE;
ffind->bFirst = HB_FALSE;
hb_strncpy( dirname, ffind->pszFileMask, sizeof( dirname ) - 1 );
pos = strrchr( dirname, HB_OS_PATH_DELIM_CHR );
@@ -660,7 +660,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
{
if( hb_strMatchFile( info->entry->d_name, info->pattern ) )
{
bFound = TRUE;
bFound = HB_TRUE;
break;
}
}
@@ -703,7 +703,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
iSec = lt.tm_sec;
}
else
bFound = FALSE;
bFound = HB_FALSE;
}
}
hb_fsSetIOError( bFound, 0 );
@@ -724,7 +724,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
HB_SYMBOL_UNUSED( iSec );
HB_SYMBOL_UNUSED( raw_attr );
bFound = FALSE;
bFound = HB_FALSE;
hb_fsSetError( ( HB_ERRCODE ) FS_ERROR );
}
@@ -778,7 +778,7 @@ PHB_FFIND hb_fsFindFirst( const char * pszFileMask, HB_FATTR attrmask )
/* Store search parameters */
ffind->pszFileMask = pszFileMask;
ffind->attrmask = attrmask;
ffind->bFirst = TRUE;
ffind->bFirst = HB_TRUE;
/* Find first/next matching file */
@@ -795,7 +795,7 @@ PHB_FFIND hb_fsFindFirst( const char * pszFileMask, HB_FATTR attrmask )
/* Finds next matching file, and applies a filter which makes
searching CA-Cl*pper/MS-DOS compatible. */
BOOL hb_fsFindNext( PHB_FFIND ffind )
HB_BOOL hb_fsFindNext( PHB_FFIND ffind )
{
while( hb_fsFindNextLow( ffind ) )
{
@@ -806,11 +806,11 @@ BOOL hb_fsFindNext( PHB_FFIND ffind )
( ( ffind->attrmask & HB_FA_LABEL ) == 0 && ( ffind->attr & HB_FA_LABEL ) != 0 ) ||
( ( ffind->attrmask & HB_FA_DIRECTORY ) == 0 && ( ffind->attr & HB_FA_DIRECTORY ) != 0 ) ) )
{
return TRUE;
return HB_TRUE;
}
}
return FALSE;
return HB_FALSE;
}
void hb_fsFindClose( PHB_FFIND ffind )

30
harbour/src/common/hbfsapi.c
View File

@@ -87,7 +87,7 @@ void hb_fsAddSearchPath( const char * szPath, HB_PATHNAMES ** pSearchList )
{
char * pPath;
char * pDelim;
BOOL fFree = TRUE;
HB_BOOL fFree = HB_TRUE;
while( *pSearchList )
{
@@ -103,7 +103,7 @@ void hb_fsAddSearchPath( const char * szPath, HB_PATHNAMES ** pSearchList )
(*pSearchList)->fFree = fFree;
pSearchList = &(*pSearchList)->pNext;
pPath = pDelim + 1;
fFree = FALSE;
fFree = HB_FALSE;
}
*pSearchList = ( HB_PATHNAMES * ) hb_xgrab( sizeof( HB_PATHNAMES ) );
(*pSearchList)->szPath = pPath;
@@ -287,15 +287,15 @@ char * hb_fsFNameMerge( char * pszFileName, PHB_FNAME pFileName )
return pszFileName;
}
BOOL hb_fsNameExists( const char * pszFileName )
HB_BOOL hb_fsNameExists( const char * pszFileName )
{
BOOL fExist;
HB_BOOL fExist;
char * pszFree = NULL;
HB_TRACE(HB_TR_DEBUG, ("hb_fsNameExists(%p)", pszFileName));
if( pszFileName == NULL )
return FALSE;
return HB_FALSE;
pszFileName = hb_fsNameConv( pszFileName, &pszFree );
@@ -332,7 +332,7 @@ BOOL hb_fsNameExists( const char * pszFileName )
{
int iTODO; /* To force warning */
fExist = FALSE;
fExist = HB_FALSE;
}
#endif
@@ -342,15 +342,15 @@ BOOL hb_fsNameExists( const char * pszFileName )
return fExist;
}
BOOL hb_fsFileExists( const char * pszFileName )
HB_BOOL hb_fsFileExists( const char * pszFileName )
{
BOOL fExist;
HB_BOOL fExist;
char * pszFree = NULL;
HB_TRACE(HB_TR_DEBUG, ("hb_fsFileExists(%p)", pszFileName));
if( pszFileName == NULL )
return FALSE;
return HB_FALSE;
pszFileName = hb_fsNameConv( pszFileName, &pszFree );
@@ -395,7 +395,7 @@ BOOL hb_fsFileExists( const char * pszFileName )
{
int iTODO; /* To force warning */
fExist = FALSE;
fExist = HB_FALSE;
}
#endif
@@ -405,15 +405,15 @@ BOOL hb_fsFileExists( const char * pszFileName )
return fExist;
}
BOOL hb_fsDirExists( const char * pszDirName )
HB_BOOL hb_fsDirExists( const char * pszDirName )
{
BOOL fExist;
HB_BOOL fExist;
char * pszFree = NULL;
HB_TRACE(HB_TR_DEBUG, ("hb_fsDirExists(%p)", pszDirName));
if( pszDirName == NULL )
return FALSE;
return HB_FALSE;
pszDirName = hb_fsNameConv( pszDirName, &pszFree );
@@ -457,7 +457,7 @@ BOOL hb_fsDirExists( const char * pszDirName )
{
int iTODO; /* To force warning */
fExist = FALSE;
fExist = HB_FALSE;
}
#endif
@@ -467,7 +467,7 @@ BOOL hb_fsDirExists( const char * pszDirName )
return fExist;
}
BOOL hb_fsMaxFilesError( void )
HB_BOOL hb_fsMaxFilesError( void )
{
HB_TRACE(HB_TR_DEBUG, ("hb_fsMaxFilesError()"));

24
harbour/src/common/hbgete.c
View File

@@ -113,9 +113,9 @@ char * hb_getenv( const char * szName )
}
BOOL hb_getenv_buffer( const char * szName, char * szBuffer, int nSize )
HB_BOOL hb_getenv_buffer( const char * szName, char * szBuffer, int nSize )
{
BOOL fRetVal;
HB_BOOL fRetVal;
#if defined( HB_OS_WIN )
{
@@ -156,12 +156,12 @@ BOOL hb_getenv_buffer( const char * szName, char * szBuffer, int nSize )
if( DosScanEnv( ( PCSZ ) szName, &EnvValue ) == NO_ERROR )
{
fRetVal = TRUE;
fRetVal = HB_TRUE;
if( szBuffer != NULL && nSize != 0 )
hb_strncpy( szBuffer, ( char * ) EnvValue, nSize - 1 );
}
else
fRetVal = FALSE;
fRetVal = HB_FALSE;
}
#else
{
@@ -169,12 +169,12 @@ BOOL hb_getenv_buffer( const char * szName, char * szBuffer, int nSize )
if( pszTemp != NULL )
{
fRetVal = TRUE;
fRetVal = HB_TRUE;
if( szBuffer != NULL && nSize != 0 )
hb_strncpy( szBuffer, pszTemp, nSize - 1 );
}
else
fRetVal = FALSE;
fRetVal = HB_FALSE;
}
#endif
@@ -187,13 +187,13 @@ BOOL hb_getenv_buffer( const char * szName, char * szBuffer, int nSize )
/* set current process environment variable, if szValue is NULL delete
* environment variable
*/
BOOL hb_setenv( const char * szName, const char * szValue )
HB_BOOL hb_setenv( const char * szName, const char * szValue )
{
#if defined( HB_OS_WIN )
{
LPTSTR lpName = HB_TCHAR_CONVTO( szName );
LPTSTR lpValue = HB_TCHAR_CONVTO( szValue );
BOOL bResult = ( SetEnvironmentVariable( lpName, lpValue ) != 0 );
HB_BOOL bResult = ( SetEnvironmentVariable( lpName, lpValue ) != 0 );
HB_TCHAR_FREE( lpValue );
HB_TCHAR_FREE( lpName );
return bResult;
@@ -216,10 +216,10 @@ BOOL hb_setenv( const char * szName, const char * szValue )
if( szValue && *szValue )
return setenv( szName, "", 1 ) == 0;
else
return TRUE;
return HB_TRUE;
# elif defined( __OpenBSD__ )
unsetenv( szName );
return TRUE;
return HB_TRUE;
# else
return unsetenv( szName ) == 0;
# endif
@@ -230,7 +230,7 @@ BOOL hb_setenv( const char * szName, const char * szValue )
HB_SYMBOL_UNUSED( szName );
HB_SYMBOL_UNUSED( szValue );
return FALSE;
return HB_FALSE;
#else
/* please add support for other C compilers
@@ -244,7 +244,7 @@ BOOL hb_setenv( const char * szName, const char * szValue )
HB_SYMBOL_UNUSED( szName );
HB_SYMBOL_UNUSED( szValue );
return FALSE;
return HB_FALSE;
#endif
}

14
harbour/src/common/hbhash.c
View File

@@ -179,7 +179,7 @@ HB_HASH_TABLE_PTR hb_hashTableResize( HB_HASH_TABLE_PTR pTable, HB_SIZE ulNewSiz
}
/* add a new value into th ehash table */
BOOL hb_hashTableAdd( HB_HASH_TABLE_PTR pTable, const void * pKey, const void * pValue )
HB_BOOL hb_hashTableAdd( HB_HASH_TABLE_PTR pTable, const void * pKey, const void * pValue )
{
ULONG ulKey;
HB_HASH_ITEM_PTR pItem;
@@ -199,7 +199,7 @@ BOOL hb_hashTableAdd( HB_HASH_TABLE_PTR pTable, const void * pKey, const void *
}
++pTable->ulCount;
return TRUE;
return HB_TRUE;
}
/* return the pointer to item's value or NULL if not found
@@ -225,19 +225,19 @@ const void * hb_hashTableFind( HB_HASH_TABLE_PTR pTable, const void * pKey )
}
/* Delete an item from the table
* Returns TRUE if item was found and returns FALSE when passed item
* Returns HB_TRUE if item was found and returns HB_FALSE when passed item
* is not stored in the table
*/
BOOL hb_hashTableDel( HB_HASH_TABLE_PTR pTable, const void *pKey )
HB_BOOL hb_hashTableDel( HB_HASH_TABLE_PTR pTable, const void *pKey )
{
ULONG ulKey;
HB_HASH_ITEM_PTR pItem;
HB_HASH_ITEM_PTR pPrev = NULL;
BOOL bFound = FALSE;
HB_BOOL bFound = HB_FALSE;
ulKey = ( pTable->pKeyFunc )( pTable, pKey, NULL );
if( ulKey > pTable->ulTableSize )
return FALSE;
return HB_FALSE;
pItem = pTable->pItems[ ulKey ];
while( pItem && ! bFound )
@@ -259,7 +259,7 @@ BOOL hb_hashTableDel( HB_HASH_TABLE_PTR pTable, const void *pKey )
}
--pTable->ulCount;
hb_hashItemDelete( pTable, pItem );
bFound = TRUE;
bFound = HB_TRUE;
}
else
{

6
harbour/src/common/hbprintf.c
View File

@@ -236,7 +236,7 @@ typedef struct {
typedef struct {
int maxarg;
int size;
BOOL repeat;
HB_BOOL repeat;
v_param * arglst;
} v_paramlst;
@@ -286,7 +286,7 @@ static v_param * va_arg_get( int iArg, v_paramlst * plst, int iType )
{
if( plst->maxarg == 0 )
{
plst->repeat = TRUE;
plst->repeat = HB_TRUE;
memset( plst->arglst, 0, plst->size * sizeof( v_param ) );
}
if( plst->repeat )
@@ -928,7 +928,7 @@ int hb_vsnprintf( char * buffer, size_t bufsize, const char * format, va_list ap
#ifndef __NO_ARGPOS__
do
{
params.repeat = FALSE;
params.repeat = HB_FALSE;
if( params.maxarg > 0 )
{
va_copy( args, ap );

56
harbour/src/common/hbstr.c
View File

@@ -114,7 +114,7 @@ HB_SIZE hb_strAt( const char * szSub, HB_SIZE ulSubLen, const char * szText, HB_
return 0;
}
BOOL hb_strEmpty( const char * szText, HB_SIZE ulLen )
HB_BOOL hb_strEmpty( const char * szText, HB_SIZE ulLen )
{
HB_TRACE(HB_TR_DEBUG, ("hb_strEmpty(%s, %lu)", szText, ulLen));
@@ -123,10 +123,10 @@ BOOL hb_strEmpty( const char * szText, HB_SIZE ulLen )
char c = szText[ ulLen ];
if( !HB_ISSPACE( c ) )
return FALSE;
return HB_FALSE;
}
return TRUE;
return HB_TRUE;
}
char * hb_strupr( char * pszText )
@@ -439,15 +439,15 @@ double hb_numRound( double dNum, int iDec )
*/
{
int iDecR, iPrec;
BOOL fNeg;
HB_BOOL fNeg;
if( dNum < 0 )
{
fNeg = TRUE;
fNeg = HB_TRUE;
dNum = -dNum;
}
else
fNeg = FALSE;
fNeg = HB_FALSE;
iDecR = ( int ) log10( dNum );
iPrec = iDecR + iDec;
@@ -535,9 +535,9 @@ double hb_numDecConv( double dNum, int iDec )
return hb_numRound( dNum, 0 );
}
static BOOL hb_str2number( BOOL fPCode, const char* szNum, HB_SIZE ulLen, HB_LONG * lVal, double * dVal, int * piDec, int * piWidth )
static HB_BOOL hb_str2number( HB_BOOL fPCode, const char* szNum, HB_SIZE ulLen, HB_LONG * lVal, double * dVal, int * piDec, int * piWidth )
{
BOOL fDbl = FALSE, fDec = FALSE, fNeg, fHex = FALSE;
HB_BOOL fDbl = HB_FALSE, fDec = HB_FALSE, fNeg, fHex = HB_FALSE;
HB_SIZE ulPos = 0;
int c, iWidth, iDec = 0, iDecR = 0;
@@ -548,16 +548,16 @@ static BOOL hb_str2number( BOOL fPCode, const char* szNum, HB_SIZE ulLen, HB_LON
if( ulPos >= ulLen )
{
fNeg = FALSE;
fNeg = HB_FALSE;
}
else if( szNum[ ulPos ] == '-' )
{
fNeg = TRUE;
fNeg = HB_TRUE;
ulPos++;
}
else
{
fNeg = FALSE;
fNeg = HB_FALSE;
if( szNum[ ulPos ] == '+' )
ulPos++;
}
@@ -570,7 +570,7 @@ static BOOL hb_str2number( BOOL fPCode, const char* szNum, HB_SIZE ulLen, HB_LON
{
ulPos += 2;
iWidth = HB_DEFAULT_WIDTH;
fHex = TRUE;
fHex = HB_TRUE;
for( ; ulPos < ulLen; ulPos++ )
{
c = szNum[ ulPos ];
@@ -611,7 +611,7 @@ static BOOL hb_str2number( BOOL fPCode, const char* szNum, HB_SIZE ulLen, HB_LON
else
{
*dVal = ( double ) *lVal * 10.0 + ( c - '0' );
fDbl = TRUE;
fDbl = HB_TRUE;
}
if( fDec )
iDec++;
@@ -620,14 +620,14 @@ static BOOL hb_str2number( BOOL fPCode, const char* szNum, HB_SIZE ulLen, HB_LON
}
else if( c == '.' && !fDec )
{
fDec = TRUE;
fDec = HB_TRUE;
}
else
{
while( !fDec && ulPos < ulLen )
{
if( szNum[ ulPos++ ] == '.' )
fDec = TRUE;
fDec = HB_TRUE;
else
iWidth++;
}
@@ -652,7 +652,7 @@ static BOOL hb_str2number( BOOL fPCode, const char* szNum, HB_SIZE ulLen, HB_LON
fDec ) )
{
*dVal = ( double ) *lVal;
fDbl = TRUE;
fDbl = HB_TRUE;
}
if( iDec )
{
@@ -700,28 +700,28 @@ static BOOL hb_str2number( BOOL fPCode, const char* szNum, HB_SIZE ulLen, HB_LON
return fDbl;
}
BOOL hb_compStrToNum( const char* szNum, HB_SIZE ulLen, HB_LONG * plVal, double * pdVal, int * piDec, int * piWidth )
HB_BOOL hb_compStrToNum( const char* szNum, HB_SIZE ulLen, HB_LONG * plVal, double * pdVal, int * piDec, int * piWidth )
{
HB_TRACE(HB_TR_DEBUG, ("hb_compStrToNum( %s, %lu, %p, %p, %p, %p)", szNum, ulLen, plVal, pdVal, piDec, piWidth ));
return hb_str2number( TRUE, szNum, ulLen, plVal, pdVal, piDec, piWidth );
return hb_str2number( HB_TRUE, szNum, ulLen, plVal, pdVal, piDec, piWidth );
}
BOOL hb_valStrnToNum( const char* szNum, HB_SIZE ulLen, HB_LONG * plVal, double * pdVal, int * piDec, int * piWidth )
HB_BOOL hb_valStrnToNum( const char* szNum, HB_SIZE ulLen, HB_LONG * plVal, double * pdVal, int * piDec, int * piWidth )
{
HB_TRACE(HB_TR_DEBUG, ("hb_valStrToNum( %s, %lu, %p, %p, %p, %p)", szNum, ulLen, plVal, pdVal, piDec, piWidth ));
return hb_str2number( FALSE, szNum, ulLen, plVal, pdVal, piDec, piWidth );
return hb_str2number( HB_FALSE, szNum, ulLen, plVal, pdVal, piDec, piWidth );
}
BOOL hb_strToNum( const char* szNum, HB_LONG * plVal, double * pdVal )
HB_BOOL hb_strToNum( const char* szNum, HB_LONG * plVal, double * pdVal )
{
HB_TRACE(HB_TR_DEBUG, ("hb_strToNum(%s, %p, %p)", szNum, plVal, pdVal ));
return hb_str2number( FALSE, szNum, strlen( szNum ), plVal, pdVal, NULL, NULL );
return hb_str2number( HB_FALSE, szNum, strlen( szNum ), plVal, pdVal, NULL, NULL );
}
BOOL hb_strnToNum( const char* szNum, HB_SIZE ulLen, HB_LONG * plVal, double * pdVal )
HB_BOOL hb_strnToNum( const char* szNum, HB_SIZE ulLen, HB_LONG * plVal, double * pdVal )
{
HB_TRACE(HB_TR_DEBUG, ("hb_strToNum(%s, %lu, %p, %p)", szNum, ulLen, plVal, pdVal ));
return hb_str2number( FALSE, szNum, ulLen, plVal, pdVal, NULL, NULL );
return hb_str2number( HB_FALSE, szNum, ulLen, plVal, pdVal, NULL, NULL );
}
/* returns the numeric value of a character string representation of a number */
@@ -732,7 +732,7 @@ double hb_strVal( const char * szText, HB_SIZE ulLen )
HB_TRACE(HB_TR_DEBUG, ("hb_strVal(%s, %lu)", szText, ulLen));
if( ! hb_str2number( FALSE, szText, ulLen, &lVal, &dVal, NULL, NULL ) )
if( ! hb_str2number( HB_FALSE, szText, ulLen, &lVal, &dVal, NULL, NULL ) )
dVal = ( double ) lVal;
return dVal;
}
@@ -744,7 +744,7 @@ HB_LONG hb_strValInt( const char * szText, int * iOverflow )
HB_TRACE(HB_TR_DEBUG, ("hb_strValInt(%s)", szText));
if( hb_str2number( TRUE, szText, strlen( szText ), &lVal, &dVal, NULL, NULL ) )
if( hb_str2number( HB_TRUE, szText, strlen( szText ), &lVal, &dVal, NULL, NULL ) )
{
*iOverflow = 1;
return 0;
@@ -756,14 +756,14 @@ HB_LONG hb_strValInt( const char * szText, int * iOverflow )
char * hb_numToStr( char * szBuf, HB_SIZE ulSize, HB_LONG lNumber )
{
int iPos = ( int ) ulSize;
BOOL fNeg = FALSE;
HB_BOOL fNeg = HB_FALSE;
HB_TRACE(HB_TR_DEBUG, ("hb_numToStr(%p, %lu, %" PFHL "i)", szBuf, ulSize, lNumber));
szBuf[ --iPos ] = '\0';
if( lNumber < 0 )
{
fNeg = TRUE;
fNeg = HB_TRUE;
lNumber = -lNumber;
}

16
harbour/src/common/hbver.c
View File

@@ -393,11 +393,11 @@ char * hb_verPlatform( void )
return pszPlatform;
}
BOOL hb_iswinnt( void )
HB_BOOL hb_iswinnt( void )
{
#if defined( HB_OS_WIN )
static BOOL s_fWinNT = FALSE;
static BOOL s_fInited = FALSE;
static HB_BOOL s_fWinNT = HB_FALSE;
static HB_BOOL s_fInited = HB_FALSE;
if( ! s_fInited )
{
@@ -405,20 +405,20 @@ BOOL hb_iswinnt( void )
osvi.dwOSVersionInfoSize = sizeof( osvi );
if( GetVersionEx( &osvi ) )
s_fWinNT = osvi.dwPlatformId == VER_PLATFORM_WIN32_NT; /* && osvi.dwMajorVersion >= 4); */
s_fInited = TRUE;
s_fInited = HB_TRUE;
}
return s_fWinNT;
#else
return FALSE;
return HB_FALSE;
#endif
}
BOOL hb_iswince( void )
HB_BOOL hb_iswince( void )
{
#if defined( HB_OS_WIN_CE )
return TRUE;
return HB_TRUE;
#else
return FALSE;
return HB_FALSE;
#endif
}

38
harbour/src/common/strwild.c
View File

@@ -58,9 +58,9 @@
#define HB_MAX_WILDPATTERN 256
BOOL hb_strMatchWild( const char *szString, const char *szPattern )
HB_BOOL hb_strMatchWild( const char *szString, const char *szPattern )
{
BOOL fMatch = TRUE, fAny = FALSE;
HB_BOOL fMatch = HB_TRUE, fAny = HB_FALSE;
HB_SIZE pulBufPosP[ HB_MAX_WILDPATTERN ], pulBufPosV[ HB_MAX_WILDPATTERN ],
ulBufSize = HB_MAX_WILDPATTERN;
HB_SIZE * ulAnyPosP = pulBufPosP, * ulAnyPosV = pulBufPosV,
@@ -73,7 +73,7 @@ BOOL hb_strMatchWild( const char *szString, const char *szPattern )
{
if( szPattern[i] == '*' )
{
fAny = TRUE;
fAny = HB_TRUE;
i++;
}
else if( j < ulLen && ( szPattern[i] == '?' || szPattern[i] == szString[j] ) )
@@ -98,7 +98,7 @@ BOOL hb_strMatchWild( const char *szString, const char *szPattern )
ulAnyPosP[ ulAny ] = i;
ulAnyPosV[ ulAny ] = j;
ulAny++;
fAny = FALSE;
fAny = HB_FALSE;
}
j++;
i++;
@@ -112,11 +112,11 @@ BOOL hb_strMatchWild( const char *szString, const char *szPattern )
ulAny--;
i = ulAnyPosP[ ulAny ];
j = ulAnyPosV[ ulAny ] + 1;
fAny = TRUE;
fAny = HB_TRUE;
}
else
{
fMatch = FALSE;
fMatch = HB_FALSE;
break;
}
}
@@ -128,9 +128,9 @@ BOOL hb_strMatchWild( const char *szString, const char *szPattern )
return fMatch;
}
BOOL hb_strMatchWildExact( const char *szString, const char *szPattern )
HB_BOOL hb_strMatchWildExact( const char *szString, const char *szPattern )
{
BOOL fMatch = TRUE, fAny = FALSE;
HB_BOOL fMatch = HB_TRUE, fAny = HB_FALSE;
HB_SIZE pulBufPosP[ HB_MAX_WILDPATTERN ], pulBufPosV[ HB_MAX_WILDPATTERN ],
ulBufSize = HB_MAX_WILDPATTERN;
HB_SIZE * ulAnyPosP = pulBufPosP, * ulAnyPosV = pulBufPosV,
@@ -143,7 +143,7 @@ BOOL hb_strMatchWildExact( const char *szString, const char *szPattern )
{
if( i < ulSize && szPattern[i] == '*' )
{
fAny = TRUE;
fAny = HB_TRUE;
i++;
}
else if( j < ulLen && i < ulSize &&
@@ -169,7 +169,7 @@ BOOL hb_strMatchWildExact( const char *szString, const char *szPattern )
ulAnyPosP[ ulAny ] = i;
ulAnyPosV[ ulAny ] = j;
ulAny++;
fAny = FALSE;
fAny = HB_FALSE;
}
j++;
i++;
@@ -183,11 +183,11 @@ BOOL hb_strMatchWildExact( const char *szString, const char *szPattern )
ulAny--;
i = ulAnyPosP[ ulAny ];
j = ulAnyPosV[ ulAny ] + 1;
fAny = TRUE;
fAny = HB_TRUE;
}
else
{
fMatch = FALSE;
fMatch = HB_FALSE;
break;
}
}
@@ -199,9 +199,9 @@ BOOL hb_strMatchWildExact( const char *szString, const char *szPattern )
return fMatch;
}
BOOL hb_strMatchCaseWildExact( const char *szString, const char *szPattern )
HB_BOOL hb_strMatchCaseWildExact( const char *szString, const char *szPattern )
{
BOOL fMatch = TRUE, fAny = FALSE;
HB_BOOL fMatch = HB_TRUE, fAny = HB_FALSE;
HB_SIZE pulBufPosP[ HB_MAX_WILDPATTERN ], pulBufPosV[ HB_MAX_WILDPATTERN ],
ulBufSize = HB_MAX_WILDPATTERN;
HB_SIZE * ulAnyPosP = pulBufPosP, * ulAnyPosV = pulBufPosV,
@@ -214,7 +214,7 @@ BOOL hb_strMatchCaseWildExact( const char *szString, const char *szPattern )
{
if( i < ulSize && szPattern[i] == '*' )
{
fAny = TRUE;
fAny = HB_TRUE;
i++;
}
else if( j < ulLen && i < ulSize &&
@@ -241,7 +241,7 @@ BOOL hb_strMatchCaseWildExact( const char *szString, const char *szPattern )
ulAnyPosP[ ulAny ] = i;
ulAnyPosV[ ulAny ] = j;
ulAny++;
fAny = FALSE;
fAny = HB_FALSE;
}
j++;
i++;
@@ -255,11 +255,11 @@ BOOL hb_strMatchCaseWildExact( const char *szString, const char *szPattern )
ulAny--;
i = ulAnyPosP[ ulAny ];
j = ulAnyPosV[ ulAny ] + 1;
fAny = TRUE;
fAny = HB_TRUE;
}
else
{
fMatch = FALSE;
fMatch = HB_FALSE;
break;
}
}
@@ -271,7 +271,7 @@ BOOL hb_strMatchCaseWildExact( const char *szString, const char *szPattern )
return fMatch;
}
BOOL hb_strMatchFile( const char * szString, const char * szPattern )
HB_BOOL hb_strMatchFile( const char * szString, const char * szPattern )
{
#if defined( HB_OS_UNIX )
# if defined( HB_NO_FNMATCH )

156
harbour/src/debug/dbgentry.c
View File

@@ -60,7 +60,7 @@
#include "hbmacro.ch"
/* dummy function declaration */
static BOOL hb_clsSetScope( BOOL fScope ) { return fScope; }
static HB_BOOL hb_clsSetScope( HB_BOOL fScope ) { return fScope; }
#define HB_DBGINFO_DISABLE ( ( HB_DEBUGINFO * ) ( HB_PTRDIFF ) 0x01 )
@@ -141,20 +141,20 @@ typedef struct
typedef struct
{
BOOL bQuit;
BOOL bGo;
BOOL bInside;
HB_BOOL bQuit;
HB_BOOL bGo;
HB_BOOL bInside;
int nBreakPoints;
HB_BREAKPOINT *aBreak;
int nTracePoints;
HB_TRACEPOINT *aTrace;
int nWatchPoints;
HB_WATCHPOINT *aWatch;
BOOL bTraceOver;
HB_BOOL bTraceOver;
int nTraceLevel;
BOOL bNextRoutine;
BOOL bCodeBlock;
BOOL bToCursor;
HB_BOOL bNextRoutine;
HB_BOOL bCodeBlock;
HB_BOOL bToCursor;
int nToCursorLine;
char *szToCursorModule;
int nProcLevel;
@@ -162,11 +162,11 @@ typedef struct
HB_CALLSTACKINFO *aCallStack;
int nModules;
HB_MODULEINFO *aModules;
BOOL bCBTrace;
BOOL ( *pFunInvoke )( void );
BOOL bInitGlobals;
BOOL bInitStatics;
BOOL bInitLines;
HB_BOOL bCBTrace;
HB_BOOL ( *pFunInvoke )( void );
HB_BOOL bInitGlobals;
HB_BOOL bInitStatics;
HB_BOOL bInitLines;
PHB_ITEM pStopLines;
} HB_DEBUGINFO;
@@ -185,9 +185,9 @@ static PHB_ITEM hb_dbgEval( HB_DEBUGINFO *info, HB_WATCHPOINT *watch );
static PHB_ITEM hb_dbgEvalMacro( const char *szExpr, PHB_ITEM pItem );
static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch );
static PHB_ITEM hb_dbgEvalResolve( HB_DEBUGINFO *info, HB_WATCHPOINT *watch );
static BOOL hb_dbgIsAltD( void );
static BOOL hb_dbgIsBreakPoint( HB_DEBUGINFO *info, const char *szModule, int nLine );
static BOOL hb_dbgEqual( PHB_ITEM pItem1, PHB_ITEM pItem2 );
static HB_BOOL hb_dbgIsAltD( void );
static HB_BOOL hb_dbgIsBreakPoint( HB_DEBUGINFO *info, const char *szModule, int nLine );
static HB_BOOL hb_dbgEqual( PHB_ITEM pItem1, PHB_ITEM pItem2 );
static void hb_dbgQuit( HB_DEBUGINFO *info );
static PHB_ITEM hb_dbgVarGet( HB_VARINFO *scope );
static void hb_dbgVarSet( HB_VARINFO *scope, PHB_ITEM xNewValue );
@@ -347,7 +347,7 @@ void hb_dbgEntry( int nMode, int nLine, const char *szName, int nIndex, PHB_ITEM
{
info = *infoPtr = ( HB_DEBUGINFO * ) hb_xgrab( sizeof( HB_DEBUGINFO ) );
memset( info, 0, sizeof( HB_DEBUGINFO ) );
info->bCBTrace = TRUE;
info->bCBTrace = HB_TRUE;
}
else if( info->bInside || info->bQuit )
return;
@@ -363,18 +363,18 @@ void hb_dbgEntry( int nMode, int nLine, const char *szName, int nIndex, PHB_ITEM
hb_procinfo( 0, szProcName, NULL, NULL );
if( !strncmp( szProcName, "(_INITSTATICS", 13 ) )
info->bInitStatics = TRUE;
info->bInitStatics = HB_TRUE;
else if( !strncmp( szProcName, "(_INITGLOBALS", 13 ) )
info->bInitGlobals = TRUE;
info->bInitGlobals = HB_TRUE;
else if( !strncmp( szProcName, "(_INITLINES", 11 ) )
info->bInitLines = TRUE;
info->bInitLines = HB_TRUE;
if( info->bInitStatics || info->bInitGlobals )
hb_dbgAddModule( info, szName );
else if( !strncmp( szProcName, "(b)", 3 ) )
info->bCodeBlock = TRUE;
info->bCodeBlock = HB_TRUE;
else if( info->bNextRoutine )
info->bNextRoutine = FALSE;
info->bNextRoutine = HB_FALSE;
hb_dbgAddStack( info, szName, hb_dbg_ProcLevel() );
for( i = 0; i < info->nBreakPoints; i++ )
@@ -382,7 +382,7 @@ void hb_dbgEntry( int nMode, int nLine, const char *szName, int nIndex, PHB_ITEM
if( info->aBreak[ i ].szFunction
&& !strcmp( info->aBreak[ i ].szFunction, szProcName ) )
{
hb_dbg_InvokeDebug( TRUE );
hb_dbg_InvokeDebug( HB_TRUE );
break;
}
}
@@ -403,14 +403,14 @@ void hb_dbgEntry( int nMode, int nLine, const char *szName, int nIndex, PHB_ITEM
case HB_DBG_SHOWLINE:
{
HB_CALLSTACKINFO *pTop = &info->aCallStack[ info->nCallStackLen - 1 ];
BOOL bOldClsScope;
HB_BOOL bOldClsScope;
HB_TRACE( HB_TR_DEBUG, ( "SHOWLINE %d", nLine ) );
nProcLevel = hb_dbg_ProcLevel();
/* Check if we've hit a tracepoint */
bOldClsScope = hb_clsSetScope( FALSE );
bOldClsScope = hb_clsSetScope( HB_FALSE );
for( i = 0; i < info->nTracePoints; i++ )
{
HB_TRACEPOINT *tp = &info->aTrace[ i ];
@@ -428,15 +428,15 @@ void hb_dbgEntry( int nMode, int nLine, const char *szName, int nIndex, PHB_ITEM
pTop->nLine = nLine;
info->nProcLevel = nProcLevel - ( hb_dbgIsAltD() ? 2 : 0 );
info->bTraceOver = FALSE;
info->bCodeBlock = FALSE;
info->bGo = FALSE;
info->bTraceOver = HB_FALSE;
info->bCodeBlock = HB_FALSE;
info->bGo = HB_FALSE;
if( info->bToCursor )
{
info->bToCursor = FALSE;
info->bToCursor = HB_FALSE;
hb_xfree( info->szToCursorModule );
}
info->bNextRoutine = FALSE;
info->bNextRoutine = HB_FALSE;
hb_dbgActivate( info );
return;
@@ -446,17 +446,17 @@ void hb_dbgEntry( int nMode, int nLine, const char *szName, int nIndex, PHB_ITEM
hb_clsSetScope( bOldClsScope );
if( hb_dbgIsBreakPoint( info, pTop->szModule, nLine )
|| hb_dbg_InvokeDebug( FALSE )
|| hb_dbg_InvokeDebug( HB_FALSE )
|| ( info->pFunInvoke && info->pFunInvoke() ) )
{
info->bTraceOver = FALSE;
info->bTraceOver = HB_FALSE;
if( info->bToCursor )
{
info->bToCursor = FALSE;
info->bToCursor = HB_FALSE;
hb_xfree( info->szToCursorModule );
}
info->bNextRoutine = FALSE;
info->bGo = FALSE;
info->bNextRoutine = HB_FALSE;
info->bGo = HB_FALSE;
}
/* Check if we must skip every level above info->nTraceLevel */
@@ -464,7 +464,7 @@ void hb_dbgEntry( int nMode, int nLine, const char *szName, int nIndex, PHB_ITEM
{
if( info->nTraceLevel < info->nCallStackLen )
return;
info->bTraceOver = FALSE;
info->bTraceOver = HB_FALSE;
}
/* Check if we're skipping to a specific line of source */
@@ -474,7 +474,7 @@ void hb_dbgEntry( int nMode, int nLine, const char *szName, int nIndex, PHB_ITEM
&& FILENAME_EQUAL( pTop->szModule, info->szToCursorModule ) )
{
hb_xfree( info->szToCursorModule );
info->bToCursor = FALSE;
info->bToCursor = HB_FALSE;
}
else
{
@@ -488,7 +488,7 @@ void hb_dbgEntry( int nMode, int nLine, const char *szName, int nIndex, PHB_ITEM
if( info->bCodeBlock )
{
info->bCodeBlock = FALSE;
info->bCodeBlock = HB_FALSE;
if( !info->bCBTrace )
return;
}
@@ -512,10 +512,10 @@ void hb_dbgEntry( int nMode, int nLine, const char *szName, int nIndex, PHB_ITEM
{
hb_dbgAddStopLines( info, hb_stackReturnItem() );
}
info->bCodeBlock = FALSE;
info->bInitStatics = FALSE;
info->bInitGlobals = FALSE;
info->bInitLines = FALSE;
info->bCodeBlock = HB_FALSE;
info->bInitStatics = HB_FALSE;
info->bInitGlobals = HB_FALSE;
info->bInitLines = HB_FALSE;
hb_dbgEndProc( info );
return;
@@ -701,7 +701,7 @@ static void hb_dbgAddStopLines( HB_DEBUGINFO *info, PHB_ITEM pItem )
{
PHB_ITEM pEntry = hb_arrayGetItemPtr( pItem, i );
const char *szModule = hb_arrayGetCPtr( pEntry, 1 );
BOOL bFound = FALSE;
HB_BOOL bFound = HB_FALSE;
szModule = hb_dbgStripModuleName( szModule );
for( j = 1; j <= nLinesLen; j++ )
@@ -733,7 +733,7 @@ static void hb_dbgAddStopLines( HB_DEBUGINFO *info, PHB_ITEM pItem )
hb_arraySetNL( pLines, 2, nMin );
if( !hb_arraySetCLPtr( pLines, 3, pBuffer, nLen - 1 ) )
hb_xfree( pBuffer );
bFound = TRUE;
bFound = HB_TRUE;
break;
}
}
@@ -778,7 +778,7 @@ static void hb_dbgAddVar( int *nVars, HB_VARINFO **aVars, const char *szName, ch
}
void hb_dbgAddWatch( void *handle, const char *szExpr, BOOL bTrace )
void hb_dbgAddWatch( void *handle, const char *szExpr, HB_BOOL bTrace )
{
HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
HB_WATCHPOINT *pWatch;
@@ -888,10 +888,10 @@ static void hb_dbgEndProc( HB_DEBUGINFO *info )
}
static BOOL hb_dbgEqual( PHB_ITEM pItem1, PHB_ITEM pItem2 )
static HB_BOOL hb_dbgEqual( PHB_ITEM pItem1, PHB_ITEM pItem2 )
{
if( HB_ITEM_TYPE( pItem1 ) != HB_ITEM_TYPE( pItem2 ) )
return FALSE;
return HB_FALSE;
if( HB_IS_NIL( pItem1 ) )
return HB_IS_NIL( pItem2 );
if( HB_IS_LOGICAL( pItem1 ) )
@@ -899,7 +899,7 @@ static BOOL hb_dbgEqual( PHB_ITEM pItem1, PHB_ITEM pItem2 )
if( HB_IS_POINTER( pItem1 ) )
return ( hb_itemGetPtr( pItem1 ) == hb_itemGetPtr( pItem2 ) );
if( HB_IS_STRING( pItem1 ) )
return !hb_itemStrCmp( pItem1, pItem2, TRUE );
return !hb_itemStrCmp( pItem1, pItem2, HB_TRUE );
if( HB_IS_NUMINT( pItem1 ) )
return ( hb_itemGetNInt( pItem1 ) == hb_itemGetNInt( pItem2 ) );
if( HB_IS_NUMERIC( pItem1 ) )
@@ -908,7 +908,7 @@ static BOOL hb_dbgEqual( PHB_ITEM pItem1, PHB_ITEM pItem2 )
return ( hb_arrayId( pItem1 ) == hb_arrayId( pItem2 ) );
if( HB_IS_HASH( pItem1 ) )
return ( hb_hashId( pItem1 ) == hb_hashId( pItem2 ) );
return FALSE;
return HB_FALSE;
}
@@ -932,9 +932,9 @@ static PHB_ITEM hb_dbgEval( HB_DEBUGINFO *info, HB_WATCHPOINT *watch )
hb_arrayCopy( aVars, aNewVars, NULL, NULL, NULL );
info->bInside = TRUE;
info->bInside = HB_TRUE;
xResult = hb_itemDo( watch->pBlock, 1, aNewVars );
info->bInside = FALSE;
info->bInside = HB_FALSE;
for( i = 0; i < watch->nVars; i++ )
{
@@ -1028,7 +1028,7 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch )
{
int i = 0;
PHB_ITEM pBlock;
BOOL bAfterId = FALSE;
HB_BOOL bAfterId = HB_FALSE;
char *s;
int buffsize;
@@ -1075,7 +1075,7 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch )
}
hb_strupr( szWord );
i = hb_dbgEvalSubstituteVar( watch, szWord, nStart, nLen );
bAfterId = TRUE;
bAfterId = HB_TRUE;
continue;
}
if( c == '.' )
@@ -1099,7 +1099,7 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch )
{
i++;
}
bAfterId = FALSE;
bAfterId = HB_FALSE;
continue;
}
if( c == ':'
@@ -1109,7 +1109,7 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch )
if( c == ':' && watch->szExpr[ i + 1 ] == ':' )
{
i = hb_dbgEvalSubstituteVar( watch, hb_strdup( "SELF" ), i, 1 );
bAfterId = TRUE;
bAfterId = HB_TRUE;
continue;
}
if( c == '-' )
@@ -1121,13 +1121,13 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch )
{
i++;
}
bAfterId = TRUE;
bAfterId = HB_TRUE;
continue;
}
if( strchr( " !#$=<>(+-*/%^|,{&", c ) )
{
i++;
bAfterId = FALSE;
bAfterId = HB_FALSE;
continue;
}
if( c == '\'' || c == '\"' )
@@ -1141,7 +1141,7 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch )
{
i++;
}
bAfterId = TRUE;
bAfterId = HB_TRUE;
continue;
}
if( c == '[' )
@@ -1149,7 +1149,7 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch )
i++;
if( bAfterId )
{
bAfterId = FALSE;
bAfterId = HB_FALSE;
}
else
{
@@ -1161,7 +1161,7 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch )
{
i++;
}
bAfterId = TRUE;
bAfterId = HB_TRUE;
}
continue;
}
@@ -1356,7 +1356,7 @@ PHB_ITEM hb_dbgGetWatchValue( void *handle, int nWatch )
}
static BOOL hb_dbgIsAltD( void )
static HB_BOOL hb_dbgIsAltD( void )
{
char szName[ HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 5];
@@ -1365,7 +1365,7 @@ static BOOL hb_dbgIsAltD( void )
}
static BOOL hb_dbgIsBreakPoint( HB_DEBUGINFO *info, const char *szModule, int nLine )
static HB_BOOL hb_dbgIsBreakPoint( HB_DEBUGINFO *info, const char *szModule, int nLine )
{
int i;
@@ -1375,13 +1375,13 @@ static BOOL hb_dbgIsBreakPoint( HB_DEBUGINFO *info, const char *szModule, int nL
if( point->nLine == nLine
&& FILENAME_EQUAL( szModule, point->szModule ) )
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
BOOL hb_dbgIsValidStopLine( void *handle, const char *szModule, int nLine )
HB_BOOL hb_dbgIsValidStopLine( void *handle, const char *szModule, int nLine )
{
HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
int nModules = hb_itemSize( info->pStopLines );
@@ -1398,12 +1398,12 @@ BOOL hb_dbgIsValidStopLine( void *handle, const char *szModule, int nLine )
if( nLine < nMin || ( HB_SIZE )( nOfs / 8 ) > hb_arrayGetCLen( pEntry, 3 ) )
{
return FALSE;
return HB_FALSE;
}
return ( hb_arrayGetCPtr( pEntry, 3 )[ nOfs / 8 ] & ( 1 << ( nOfs % 8 ) ) ) != 0;
}
}
return FALSE;
return HB_FALSE;
}
@@ -1441,13 +1441,13 @@ static void hb_dbgQuit( HB_DEBUGINFO *info )
}
if( info->bToCursor )
{
info->bToCursor = FALSE;
info->bToCursor = HB_FALSE;
hb_xfree( info->szToCursorModule );
}
}
void hb_dbgSetCBTrace( void *handle, BOOL bCBTrace )
void hb_dbgSetCBTrace( void *handle, HB_BOOL bCBTrace )
{
HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
@@ -1459,11 +1459,11 @@ void hb_dbgSetGo( void *handle )
{
HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
info->bGo = TRUE;
info->bGo = HB_TRUE;
}
void hb_dbgSetInvoke( void *handle, BOOL ( *pFunInvoke )( void ) )
void hb_dbgSetInvoke( void *handle, HB_BOOL ( *pFunInvoke )( void ) )
{
HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
@@ -1475,7 +1475,7 @@ void hb_dbgSetNextRoutine( void *handle )
{
HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
info->bNextRoutine = TRUE;
info->bNextRoutine = HB_TRUE;
}
@@ -1483,7 +1483,7 @@ void hb_dbgSetQuit( void *handle )
{
HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
info->bQuit = TRUE;
info->bQuit = HB_TRUE;
}
@@ -1491,7 +1491,7 @@ void hb_dbgSetToCursor( void *handle, const char *szModule, int nLine )
{
HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
info->bToCursor = TRUE;
info->bToCursor = HB_TRUE;
info->szToCursorModule = hb_strdup( szModule );
info->nToCursorLine = nLine;
}
@@ -1501,12 +1501,12 @@ void hb_dbgSetTrace( void *handle )
{
HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
info->bTraceOver = TRUE;
info->bTraceOver = HB_TRUE;
info->nTraceLevel = info->nCallStackLen;
}
void hb_dbgSetWatch( void *handle, int nWatch, const char *szExpr, BOOL bTrace )
void hb_dbgSetWatch( void *handle, int nWatch, const char *szExpr, HB_BOOL bTrace )
{
HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
HB_WATCHPOINT *pWatch = &info->aWatch[ nWatch ];
@@ -1668,11 +1668,11 @@ HB_FUNC( __DBGGETEXPRVALUE )
if( pItem )
{
hb_storl( TRUE, 3 );
hb_storl( HB_TRUE, 3 );
hb_itemReturnRelease( pItem );
}
else
hb_storl( FALSE, 3 );
hb_storl( HB_FALSE, 3 );
}
}

40
harbour/src/rdd/hbsix/sxcompr.c
View File

@@ -177,18 +177,18 @@ typedef struct _HB_LZSSX_COMPR
ULONG inBuffSize;
ULONG inBuffPos;
ULONG inBuffRead;
BOOL fInFree;
HB_BOOL fInFree;
HB_FHANDLE hOutput;
BYTE * outBuffer;
ULONG outBuffSize;
ULONG outBuffPos;
BOOL fOutFree;
HB_BOOL fOutFree;
ULONG ulMaxSize;
ULONG ulOutSize;
BOOL fResult;
BOOL fContinue;
HB_BOOL fResult;
HB_BOOL fContinue;
UCHAR ring_buffer[ RBUFLENGTH + MAXLENGTH - 1 ];
@@ -251,7 +251,7 @@ static PHB_LZSSX_COMPR hb_LZSSxInit(
return pCompr;
}
static BOOL hb_LZSSxFlush( PHB_LZSSX_COMPR pCompr )
static HB_BOOL hb_LZSSxFlush( PHB_LZSSX_COMPR pCompr )
{
if( pCompr->fResult && pCompr->hOutput != FS_ERROR )
{
@@ -269,7 +269,7 @@ static BOOL hb_LZSSxFlush( PHB_LZSSX_COMPR pCompr )
return pCompr->fResult;
}
static BOOL hb_LZSSxWrite( PHB_LZSSX_COMPR pCompr, UCHAR ucVal )
static HB_BOOL hb_LZSSxWrite( PHB_LZSSX_COMPR pCompr, UCHAR ucVal )
{
if( pCompr->fResult )
{
@@ -300,9 +300,9 @@ static int hb_LZSSxRead( PHB_LZSSX_COMPR pCompr )
return -1;
}
static BOOL hb_LZSSxDecode( PHB_LZSSX_COMPR pCompr )
static HB_BOOL hb_LZSSxDecode( PHB_LZSSX_COMPR pCompr )
{
BOOL fResult = TRUE;
HB_BOOL fResult = TRUE;
USHORT itemMask;
int offset, length, index, c, h;
@@ -560,9 +560,9 @@ static HB_SIZE hb_LZSSxEncode( PHB_LZSSX_COMPR pCompr )
}
BOOL hb_LZSSxCompressMem( const char * pSrcBuf, HB_SIZE ulSrcLen,
char * pDstBuf, HB_SIZE ulDstLen,
HB_SIZE * pulSize )
HB_BOOL hb_LZSSxCompressMem( const char * pSrcBuf, HB_SIZE ulSrcLen,
char * pDstBuf, HB_SIZE ulDstLen,
HB_SIZE * pulSize )
{
PHB_LZSSX_COMPR pCompr;
HB_SIZE ulSize;
@@ -576,11 +576,11 @@ BOOL hb_LZSSxCompressMem( const char * pSrcBuf, HB_SIZE ulSrcLen,
return ( ulSize <= ulDstLen );
}
BOOL hb_LZSSxDecompressMem( const char * pSrcBuf, HB_SIZE ulSrcLen,
char * pDstBuf, HB_SIZE ulDstLen )
HB_BOOL hb_LZSSxDecompressMem( const char * pSrcBuf, HB_SIZE ulSrcLen,
char * pDstBuf, HB_SIZE ulDstLen )
{
PHB_LZSSX_COMPR pCompr;
BOOL fResult;
HB_BOOL fResult;
pCompr = hb_LZSSxInit( FS_ERROR, ( BYTE * ) pSrcBuf, ulSrcLen,
FS_ERROR, ( BYTE * ) pDstBuf, ulDstLen );
@@ -589,7 +589,7 @@ BOOL hb_LZSSxDecompressMem( const char * pSrcBuf, HB_SIZE ulSrcLen,
return fResult;
}
BOOL hb_LZSSxCompressFile( HB_FHANDLE hInput, HB_FHANDLE hOutput, HB_SIZE * pulSize )
HB_BOOL hb_LZSSxCompressFile( HB_FHANDLE hInput, HB_FHANDLE hOutput, HB_SIZE * pulSize )
{
PHB_LZSSX_COMPR pCompr;
HB_SIZE ulSize;
@@ -602,10 +602,10 @@ BOOL hb_LZSSxCompressFile( HB_FHANDLE hInput, HB_FHANDLE hOutput, HB_SIZE * pulS
return ulSize != ( HB_SIZE ) -1;
}
BOOL hb_LZSSxDecompressFile( HB_FHANDLE hInput, HB_FHANDLE hOutput )
HB_BOOL hb_LZSSxDecompressFile( HB_FHANDLE hInput, HB_FHANDLE hOutput )
{
PHB_LZSSX_COMPR pCompr;
BOOL fResult;
HB_BOOL fResult;
pCompr = hb_LZSSxInit( hInput, NULL, 0, hOutput, NULL, 0 );
fResult = hb_LZSSxDecode( pCompr );
@@ -615,7 +615,7 @@ BOOL hb_LZSSxDecompressFile( HB_FHANDLE hInput, HB_FHANDLE hOutput )
HB_FUNC( SX_FCOMPRESS )
{
BOOL fRet = FALSE;
HB_BOOL fRet = FALSE;
HB_FHANDLE hInput, hOutput;
const char * szSource = hb_parc( 1 ), * szDestin = hb_parc( 2 );
BYTE buf[ 4 ];
@@ -652,7 +652,7 @@ HB_FUNC( SX_FCOMPRESS )
HB_FUNC( SX_FDECOMPRESS )
{
BOOL fRet = FALSE;
HB_BOOL fRet = FALSE;
HB_FHANDLE hInput, hOutput;
const char * szSource = hb_parc( 1 ), * szDestin = hb_parc( 2 );
@@ -707,7 +707,7 @@ HB_FUNC( _SX_STRCOMPRESS )
HB_FUNC( _SX_STRDECOMPRESS )
{
BOOL fOK = FALSE;
HB_BOOL fOK = FALSE;
const char * pStr = hb_parc( 1 );
char * pBuf;

2
harbour/src/rtl/accept.c
View File

@@ -102,7 +102,7 @@ HB_FUNC( __ACCEPT )
while( input != K_ENTER && hb_vmRequestQuery() == 0 )
{
/* Wait forever, for keyboard events only */
input = hb_inkey( TRUE, 0.0, INKEY_KEYBOARD );
input = hb_inkey( HB_TRUE, 0.0, INKEY_KEYBOARD );
switch( input )
{
case K_BS:

112
harbour/src/rtl/cdpapi.c
View File

@@ -141,7 +141,7 @@ static PHB_CODEPAGE s_cdpList = NULL;
/*
* basic CP functions
*/
BOOL hb_cdpIsDigit( PHB_CODEPAGE cdp, int iChar )
HB_BOOL hb_cdpIsDigit( PHB_CODEPAGE cdp, int iChar )
{
if( cdp )
return ( cdp->flags[ iChar & 0x0ff ] & HB_CDP_DIGIT ) != 0;
@@ -149,7 +149,7 @@ BOOL hb_cdpIsDigit( PHB_CODEPAGE cdp, int iChar )
return HB_ISDIGIT( iChar );
}
BOOL hb_cdpIsAlpha( PHB_CODEPAGE cdp, int iChar )
HB_BOOL hb_cdpIsAlpha( PHB_CODEPAGE cdp, int iChar )
{
if( cdp )
return ( cdp->flags[ iChar & 0x0ff ] & HB_CDP_ALPHA ) != 0;
@@ -157,7 +157,7 @@ BOOL hb_cdpIsAlpha( PHB_CODEPAGE cdp, int iChar )
return HB_ISALPHA( iChar );
}
BOOL hb_cdpIsLower( PHB_CODEPAGE cdp, int iChar )
HB_BOOL hb_cdpIsLower( PHB_CODEPAGE cdp, int iChar )
{
if( cdp )
return ( cdp->flags[ iChar & 0x0ff ] & HB_CDP_LOWER ) != 0;
@@ -165,7 +165,7 @@ BOOL hb_cdpIsLower( PHB_CODEPAGE cdp, int iChar )
return HB_ISLOWER( iChar );
}
BOOL hb_cdpIsUpper( PHB_CODEPAGE cdp, int iChar )
HB_BOOL hb_cdpIsUpper( PHB_CODEPAGE cdp, int iChar )
{
if( cdp )
return ( cdp->flags[ iChar & 0x0ff ] & HB_CDP_UPPER ) != 0;
@@ -173,7 +173,7 @@ BOOL hb_cdpIsUpper( PHB_CODEPAGE cdp, int iChar )
return HB_ISUPPER( iChar );
}
BOOL hb_charIsDigit( int iChar )
HB_BOOL hb_charIsDigit( int iChar )
{
PHB_CODEPAGE cdp = hb_vmCDP();
@@ -183,7 +183,7 @@ BOOL hb_charIsDigit( int iChar )
return HB_ISDIGIT( iChar );
}
BOOL hb_charIsAlpha( int iChar )
HB_BOOL hb_charIsAlpha( int iChar )
{
PHB_CODEPAGE cdp = hb_vmCDP();
@@ -193,7 +193,7 @@ BOOL hb_charIsAlpha( int iChar )
return HB_ISALPHA( iChar );
}
BOOL hb_charIsLower( int iChar )
HB_BOOL hb_charIsLower( int iChar )
{
PHB_CODEPAGE cdp = hb_vmCDP();
@@ -203,7 +203,7 @@ BOOL hb_charIsLower( int iChar )
return HB_ISLOWER( iChar );
}
BOOL hb_charIsUpper( int iChar )
HB_BOOL hb_charIsUpper( int iChar )
{
PHB_CODEPAGE cdp = hb_vmCDP();
@@ -325,7 +325,7 @@ static int hb_cdpMultiWeight( PHB_CODEPAGE cdp, const char * szChar )
int hb_cdpcmp( const char * szFirst, HB_SIZE ulLenFirst,
const char * szSecond, HB_SIZE ulLenSecond,
PHB_CODEPAGE cdp, BOOL fExact )
PHB_CODEPAGE cdp, HB_BOOL fExact )
{
int iRet = 0, iAcc = 0, n, n1, n2;
HB_SIZE ul, ulLen;
@@ -455,7 +455,7 @@ static int hb_cdpMultiWeightI( PHB_CODEPAGE cdp, const char * szChar )
int hb_cdpicmp( const char * szFirst, HB_SIZE ulLenFirst,
const char * szSecond, HB_SIZE ulLenSecond,
PHB_CODEPAGE cdp, BOOL fExact )
PHB_CODEPAGE cdp, HB_BOOL fExact )
{
int iRet = 0, iAcc = 0, n, n1, n2, u1, u2;
HB_SIZE ul, ulLen;
@@ -658,15 +658,15 @@ static int u16toutf8( char * szUTF8, HB_WCHAR wc )
return n;
}
static BOOL utf8tou16nextchar( unsigned char ucChar, int *n, HB_WCHAR * pwc )
static HB_BOOL utf8tou16nextchar( unsigned char ucChar, int *n, HB_WCHAR * pwc )
{
if( *n > 0 )
{
if( ( ucChar & 0xc0 ) != 0x80 )
return FALSE;
return HB_FALSE;
*pwc = ( *pwc << 6 ) | ( ucChar & 0x3f );
( *n )--;
return TRUE;
return HB_TRUE;
}
*n = 0;
@@ -699,7 +699,7 @@ static BOOL utf8tou16nextchar( unsigned char ucChar, int *n, HB_WCHAR * pwc )
*n = 5;
}
}
return TRUE;
return HB_TRUE;
}
static HB_SIZE utf8pos( const char * szUTF8, HB_SIZE ulLen, HB_SIZE ulUTF8Pos )
@@ -828,8 +828,8 @@ char * hb_cdpUTF8StringSubstr( const char * pSrc, HB_SIZE ulLen,
return pDst;
}
BOOL hb_cdpGetFromUTF8( PHB_CODEPAGE cdp, BOOL fCtrl, unsigned char ch,
int * n, HB_WCHAR * pwc )
HB_BOOL hb_cdpGetFromUTF8( PHB_CODEPAGE cdp, HB_BOOL fCtrl, unsigned char ch,
int * n, HB_WCHAR * pwc )
{
if( utf8tou16nextchar( ch, n, pwc ) )
{
@@ -845,12 +845,12 @@ BOOL hb_cdpGetFromUTF8( PHB_CODEPAGE cdp, BOOL fCtrl, unsigned char ch,
*pwc = uc;
}
}
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
HB_SIZE hb_cdpStrAsUTF8Len( PHB_CODEPAGE cdp, BOOL fCtrl,
HB_SIZE hb_cdpStrAsUTF8Len( PHB_CODEPAGE cdp, HB_BOOL fCtrl,
const char * pSrc, HB_SIZE ulSrc,
HB_SIZE ulMax )
{
@@ -904,7 +904,7 @@ HB_SIZE hb_cdpStrAsUTF8Len( PHB_CODEPAGE cdp, BOOL fCtrl,
return ulD;
}
HB_SIZE hb_cdpStrToUTF8( PHB_CODEPAGE cdp, BOOL fCtrl,
HB_SIZE hb_cdpStrToUTF8( PHB_CODEPAGE cdp, HB_BOOL fCtrl,
const char * pSrc, HB_SIZE ulSrc,
char * pDst, HB_SIZE ulDst )
{
@@ -964,7 +964,7 @@ HB_SIZE hb_cdpStrToUTF8( PHB_CODEPAGE cdp, BOOL fCtrl,
return ulD;
}
HB_SIZE hb_cdpUTF8AsStrLen( PHB_CODEPAGE cdp, BOOL fCtrl,
HB_SIZE hb_cdpUTF8AsStrLen( PHB_CODEPAGE cdp, HB_BOOL fCtrl,
const char * pSrc, HB_SIZE ulSrc,
HB_SIZE ulMax )
{
@@ -1009,7 +1009,7 @@ HB_SIZE hb_cdpUTF8AsStrLen( PHB_CODEPAGE cdp, BOOL fCtrl,
return ulD;
}
HB_SIZE hb_cdpUTF8ToStr( PHB_CODEPAGE cdp, BOOL fCtrl,
HB_SIZE hb_cdpUTF8ToStr( PHB_CODEPAGE cdp, HB_BOOL fCtrl,
const char * pSrc, HB_SIZE ulSrc,
char * pDst, HB_SIZE ulDst )
{
@@ -1072,7 +1072,7 @@ HB_SIZE hb_cdpUTF8ToStr( PHB_CODEPAGE cdp, BOOL fCtrl,
/*
* U16 (hb wide char) conversions
*/
HB_WCHAR hb_cdpGetU16( PHB_CODEPAGE cdp, BOOL fCtrl, unsigned char ch )
HB_WCHAR hb_cdpGetU16( PHB_CODEPAGE cdp, HB_BOOL fCtrl, unsigned char ch )
{
if( cdp && ( fCtrl || ch >= 32 ) )
return cdp->uniTable->uniCodes[ ch ];
@@ -1080,7 +1080,7 @@ HB_WCHAR hb_cdpGetU16( PHB_CODEPAGE cdp, BOOL fCtrl, unsigned char ch )
return ch;
}
unsigned char hb_cdpGetChar( PHB_CODEPAGE cdp, BOOL fCtrl, HB_WCHAR wc )
unsigned char hb_cdpGetChar( PHB_CODEPAGE cdp, HB_BOOL fCtrl, HB_WCHAR wc )
{
if( cdp && ( fCtrl || wc >= 32 ) )
{
@@ -1097,7 +1097,7 @@ unsigned char hb_cdpGetChar( PHB_CODEPAGE cdp, BOOL fCtrl, HB_WCHAR wc )
return wc >= 0x100 ? '?' : ( UCHAR ) wc;
}
HB_SIZE hb_cdpStrAsU16Len( PHB_CODEPAGE cdp, BOOL fCtrl,
HB_SIZE hb_cdpStrAsU16Len( PHB_CODEPAGE cdp, HB_BOOL fCtrl,
const char * pSrc, HB_SIZE ulSrc,
HB_SIZE ulMax )
{
@@ -1145,7 +1145,7 @@ HB_SIZE hb_cdpStrAsU16Len( PHB_CODEPAGE cdp, BOOL fCtrl,
return ulSrc;
}
HB_SIZE hb_cdpStrToU16( PHB_CODEPAGE cdp, BOOL fCtrl, int iEndian,
HB_SIZE hb_cdpStrToU16( PHB_CODEPAGE cdp, HB_BOOL fCtrl, int iEndian,
const char * pSrc, HB_SIZE ulSrc,
HB_WCHAR * pDst, HB_SIZE ulDst )
{
@@ -1214,7 +1214,7 @@ HB_SIZE hb_cdpStrToU16( PHB_CODEPAGE cdp, BOOL fCtrl, int iEndian,
return ulD;
}
HB_SIZE hb_cdpU16AsStrLen( PHB_CODEPAGE cdp, BOOL fCtrl,
HB_SIZE hb_cdpU16AsStrLen( PHB_CODEPAGE cdp, HB_BOOL fCtrl,
const HB_WCHAR * pSrc, HB_SIZE ulSrc,
HB_SIZE ulMax )
{
@@ -1254,7 +1254,7 @@ HB_SIZE hb_cdpU16AsStrLen( PHB_CODEPAGE cdp, BOOL fCtrl,
return ulD;
}
HB_SIZE hb_cdpU16ToStr( PHB_CODEPAGE cdp, BOOL fCtrl, int iEndian,
HB_SIZE hb_cdpU16ToStr( PHB_CODEPAGE cdp, HB_BOOL fCtrl, int iEndian,
const HB_WCHAR * pSrc, HB_SIZE ulSrc,
char * pDst, HB_SIZE ulDst )
{
@@ -1336,9 +1336,9 @@ HB_SIZE hb_cdpTransLen( const char * pSrc, HB_SIZE ulSrc, HB_SIZE ulMax,
if( cdpIn && cdpOut && cdpIn->uniTable != cdpOut->uniTable )
{
if( cdpIn == &s_utf8_codepage )
return hb_cdpUTF8AsStrLen( cdpOut, FALSE, pSrc, ulSrc, ulMax );
return hb_cdpUTF8AsStrLen( cdpOut, HB_FALSE, pSrc, ulSrc, ulMax );
else if( cdpOut == &s_utf8_codepage )
return hb_cdpStrAsUTF8Len( cdpIn, FALSE, pSrc, ulSrc, ulMax );
return hb_cdpStrAsUTF8Len( cdpIn, HB_FALSE, pSrc, ulSrc, ulMax );
else
{
unsigned char * uniTrans;
@@ -1419,9 +1419,9 @@ HB_SIZE hb_cdpTransTo( const char * pSrc, HB_SIZE ulSrc,
if( cdpIn && cdpOut && cdpIn->uniTable != cdpOut->uniTable )
{
if( cdpIn == &s_utf8_codepage )
return hb_cdpUTF8ToStr( cdpOut, FALSE, pSrc, ulSrc, pDst, ulDst );
return hb_cdpUTF8ToStr( cdpOut, HB_FALSE, pSrc, ulSrc, pDst, ulDst );
else if( cdpOut == &s_utf8_codepage )
return hb_cdpStrToUTF8( cdpIn, FALSE, pSrc, ulSrc, pDst, ulDst );
return hb_cdpStrToUTF8( cdpIn, HB_FALSE, pSrc, ulSrc, pDst, ulDst );
else
{
unsigned char * uniTrans;
@@ -1532,7 +1532,7 @@ HB_SIZE hb_cdpTransTo( const char * pSrc, HB_SIZE ulSrc,
return ulSize;
}
int hb_cdpTranslateChar( int iChar, BOOL fCtrl, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut )
int hb_cdpTranslateChar( int iChar, HB_BOOL fCtrl, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut )
{
if( cdpIn && cdpOut && cdpIn->uniTable != cdpOut->uniTable &&
iChar >= ( fCtrl ? 32 : 0 ) && iChar < 256 )
@@ -1641,7 +1641,7 @@ static PHB_CODEPAGE hb_buildCodePage( const char * id, const char * info,
const char * pszLower,
unsigned int nACSort )
{
BOOL lSort, fError;
HB_BOOL lSort, fError;
int iMulti, iAcc, iAccUp, iAccLo, iSortUp, iSortLo, i;
const char * pup, * plo;
unsigned char ucUp, ucLo, ucUp2, ucLo2;
@@ -1654,7 +1654,7 @@ static PHB_CODEPAGE hb_buildCodePage( const char * id, const char * info,
memset( used, '\0', sizeof( used ) );
iMulti = iAcc = iSortUp = iSortLo = 0;
fError = lSort = FALSE;
fError = lSort = HB_FALSE;
ucUp2 = ucLo2 = 0;
pup = pszUpper;
@@ -1666,7 +1666,7 @@ static PHB_CODEPAGE hb_buildCodePage( const char * id, const char * info,
if( ucUp == 0 || ucLo == 0 )
{
if( ucUp || ucLo )
fError = TRUE;
fError = HB_TRUE;
break;
}
if( ucUp == '.' )
@@ -1702,7 +1702,7 @@ static PHB_CODEPAGE hb_buildCodePage( const char * id, const char * info,
}
if( *pup == '.' && *plo == '.' )
{
lSort = TRUE;
lSort = HB_TRUE;
iMulti++;
pup++;
plo++;
@@ -1710,14 +1710,14 @@ static PHB_CODEPAGE hb_buildCodePage( const char * id, const char * info,
}
}
}
fError = TRUE;
fError = HB_TRUE;
break;
}
if( ucUp == '~' )
{
if( ucLo != '~' || *pup == '\0' || *plo == '\0' )
{
fError = TRUE;
fError = HB_TRUE;
break;
}
ucUp = ( unsigned char ) *pup++;
@@ -1730,7 +1730,7 @@ static PHB_CODEPAGE hb_buildCodePage( const char * id, const char * info,
ucLo = ' ';
if( ucUp == ' ' && ucLo == ' ' )
{
fError = TRUE;
fError = HB_TRUE;
break;
}
if( ucUp != ' ' )
@@ -1738,20 +1738,20 @@ static PHB_CODEPAGE hb_buildCodePage( const char * id, const char * info,
used[ ucUp ] = 1;
++iSortLo;
if( ucUp < ucUp2 )
lSort = TRUE;
lSort = HB_TRUE;
ucUp2 = ucUp;
}
if( ucLo != ' ' )
{
used[ ucLo ] = 1;
if( ucLo < ucLo2 )
lSort = TRUE;
lSort = HB_TRUE;
ucLo2 = ucLo;
}
}
if( iMulti > 64 )
fError = TRUE;
fError = HB_TRUE;
if( fError || nACSort > HB_CDP_ACSORT_INTERLEAVED )
hb_errInternal( 9994, "Harbour CP (%s) initialization failure", id, NULL );
@@ -1759,7 +1759,7 @@ static PHB_CODEPAGE hb_buildCodePage( const char * id, const char * info,
if( iAcc == 0 )
nACSort = HB_CDP_ACSORT_NONE;
else if( nACSort != HB_CDP_ACSORT_NONE )
lSort = TRUE;
lSort = HB_TRUE;
ulSize = 0x300;
if( lSort )
@@ -2028,7 +2028,7 @@ static PHB_CODEPAGE * hb_cdpFindPos( const char * id )
return cdp_ptr;
}
BOOL hb_cdpRegisterRaw( PHB_CODEPAGE cdp )
HB_BOOL hb_cdpRegisterRaw( PHB_CODEPAGE cdp )
{
PHB_CODEPAGE * cdp_ptr;
@@ -2038,15 +2038,15 @@ BOOL hb_cdpRegisterRaw( PHB_CODEPAGE cdp )
if( *cdp_ptr == NULL )
{
*cdp_ptr = cdp;
return TRUE;
return HB_TRUE;
}
return FALSE;
return HB_FALSE;
}
BOOL hb_cdpRegisterNew( const char * id, const char * info,
PHB_UNITABLE uniTable,
const char * pszUpper, const char * pszLower,
unsigned int nACSort )
HB_BOOL hb_cdpRegisterNew( const char * id, const char * info,
PHB_UNITABLE uniTable,
const char * pszUpper, const char * pszLower,
unsigned int nACSort )
{
PHB_CODEPAGE * cdp_ptr;
@@ -2058,7 +2058,7 @@ BOOL hb_cdpRegisterNew( const char * id, const char * info,
*cdp_ptr = hb_buildCodePage( id, info, uniTable, pszUpper, pszLower, nACSort );
return *cdp_ptr != NULL;
}
return FALSE;
return HB_FALSE;
}
void hb_cdpReleaseAll( void )
@@ -2281,9 +2281,9 @@ HB_FUNC( HB_STRTOUTF8 )
if( cdp )
{
szString = hb_parc( 1 );
ulDest = hb_cdpStrAsUTF8Len( cdp, FALSE, szString, ulLen, 0 );
ulDest = hb_cdpStrAsUTF8Len( cdp, HB_FALSE, szString, ulLen, 0 );
szDest = ( char * ) hb_xgrab( ulDest + 1 );
hb_cdpStrToUTF8( cdp, FALSE, szString, ulLen, szDest, ulDest + 1 );
hb_cdpStrToUTF8( cdp, HB_FALSE, szString, ulLen, szDest, ulDest + 1 );
}
}
if( szDest )
@@ -2308,9 +2308,9 @@ HB_FUNC( HB_UTF8TOSTR )
if( cdp )
{
szString = hb_parc( 1 );
ulDest = hb_cdpUTF8AsStrLen( cdp, FALSE, szString, ulLen, 0 );
ulDest = hb_cdpUTF8AsStrLen( cdp, HB_FALSE, szString, ulLen, 0 );
szDest = ( char * ) hb_xgrab( ulDest + 1 );
hb_cdpUTF8ToStr( cdp, FALSE, szString, ulLen, szDest, ulDest + 1 );
hb_cdpUTF8ToStr( cdp, HB_FALSE, szString, ulLen, szDest, ulDest + 1 );
}
}

18
harbour/src/rtl/console.c
View File

@@ -273,14 +273,14 @@ static void hb_conOutDev( const char * szStr, HB_SIZE ulLen )
hb_gtWrite( szStr, ulLen );
}
static char * hb_itemStringCon( PHB_ITEM pItem, HB_SIZE * pulLen, BOOL * pfFreeReq )
static char * hb_itemStringCon( PHB_ITEM pItem, HB_SIZE * pulLen, HB_BOOL * pfFreeReq )
{
/* logical values in device output (not console, stdout or stderr) are
shown as single letter */
if( HB_IS_LOGICAL( pItem ) )
{
*pulLen = 1;
*pfFreeReq = FALSE;
*pfFreeReq = HB_FALSE;
return ( char * ) ( hb_itemGetL( pItem ) ? "T" : "F" );
}
return hb_itemString( pItem, pulLen, pfFreeReq );
@@ -294,7 +294,7 @@ HB_FUNC( OUTSTD ) /* writes a list of values to the standard output device */
{
char * pszString;
HB_SIZE ulLen;
BOOL fFree;
HB_BOOL fFree;
if( iParam > 1 )
hb_conOutStd( " ", 1 );
@@ -314,7 +314,7 @@ HB_FUNC( OUTERR ) /* writes a list of values to the standard error device */
{
char * pszString;
HB_SIZE ulLen;
BOOL fFree;
HB_BOOL fFree;
if( iParam > 1 )
hb_conOutErr( " ", 1 );
@@ -334,7 +334,7 @@ HB_FUNC( QQOUT ) /* writes a list of values to the current device (screen or pri
{
char * pszString;
HB_SIZE ulLen;
BOOL fFree;
HB_BOOL fFree;
if( iParam > 1 )
hb_conOutAlt( " ", 1 );
@@ -499,7 +499,7 @@ HB_FUNC( DEVOUT ) /* writes a single value to the current device (screen or prin
{
char * pszString;
HB_SIZE ulLen;
BOOL fFree;
HB_BOOL fFree;
if( HB_ISCHAR( 2 ) )
{
@@ -530,7 +530,7 @@ HB_FUNC( DISPOUT ) /* writes a single value to the screen, but is not affected b
{
char * pszString;
HB_SIZE ulLen;
BOOL bFreeReq;
HB_BOOL bFreeReq;
if( HB_ISCHAR( 2 ) )
{
@@ -567,7 +567,7 @@ HB_FUNC( DISPOUTAT ) /* writes a single value to the screen at speficic position
{
char * pszString;
HB_SIZE ulLen;
BOOL bFreeReq;
HB_BOOL bFreeReq;
if( HB_ISCHAR( 4 ) )
{
@@ -604,7 +604,7 @@ HB_FUNC( HB_DISPOUTAT )
{
char * pszString;
HB_SIZE ulLen;
BOOL bFreeReq;
HB_BOOL bFreeReq;
int iColor;
pszString = hb_itemStringCon( hb_param( 3, HB_IT_ANY ), &ulLen, &bFreeReq );

10
harbour/src/rtl/copyfile.c
View File

@@ -62,9 +62,9 @@
#define BUFFER_SIZE 8192
static BOOL hb_copyfile( const char * szSource, const char * szDest )
static HB_BOOL hb_copyfile( const char * szSource, const char * szDest )
{
BOOL bRetVal = FALSE;
HB_BOOL bRetVal = HB_FALSE;
HB_FHANDLE fhndSource;
PHB_ITEM pError = NULL;
@@ -114,7 +114,7 @@ static BOOL hb_copyfile( const char * szSource, const char * szDest )
buffer = hb_xgrab( BUFFER_SIZE );
bRetVal = TRUE;
bRetVal = HB_TRUE;
while( ( usRead = hb_fsRead( fhndSource, buffer, BUFFER_SIZE ) ) != 0 )
{
@@ -123,7 +123,7 @@ static BOOL hb_copyfile( const char * szSource, const char * szDest )
pError = hb_errRT_FileError( pError, NULL, EG_WRITE, 2016, szDest );
if( hb_errLaunch( pError ) != E_RETRY )
{
bRetVal = FALSE;
bRetVal = HB_FALSE;
break;
}
}
@@ -155,7 +155,7 @@ HB_FUNC( __COPYFILE )
if( HB_ISCHAR( 1 ) && HB_ISCHAR( 2 ) )
{
if( ! hb_copyfile( hb_parc( 1 ), hb_parc( 2 ) ) )
hb_retl( FALSE );
hb_retl( HB_FALSE );
}
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); /* NOTE: Undocumented but existing Clipper Run-time error */

10
harbour/src/rtl/dates.c
View File

@@ -88,10 +88,10 @@ char * hb_dateFormat( const char * szDate, char * szFormattedDate, const char *
{
const char * szPtr;
int digit;
BOOL used_d, used_m, used_y;
HB_BOOL used_d, used_m, used_y;
format_count = 0;
used_d = used_m = used_y = FALSE;
used_d = used_m = used_y = HB_FALSE;
szPtr = szDateFormat;
while( format_count < size )
@@ -139,7 +139,7 @@ char * hb_dateFormat( const char * szDate, char * szFormattedDate, const char *
while( digit_count-- > 0 && format_count < size )
szFormattedDate[ format_count++ ] = ( char ) digit;
}
used_d = TRUE;
used_d = HB_TRUE;
break;
case 'M':
@@ -174,7 +174,7 @@ char * hb_dateFormat( const char * szDate, char * szFormattedDate, const char *
while( digit_count-- > 0 && format_count < size )
szFormattedDate[ format_count++ ] = ( char ) digit;
}
used_m = TRUE;
used_m = HB_TRUE;
break;
case 'Y':
@@ -210,7 +210,7 @@ char * hb_dateFormat( const char * szDate, char * szFormattedDate, const char *
while( digit_count-- > 0 && format_count < size )
szFormattedDate[ format_count++ ] = ( char ) digit;
}
used_y = TRUE;
used_y = HB_TRUE;
break;
default:

4
harbour/src/rtl/dirdrive.c
View File

@@ -90,7 +90,7 @@ HB_FUNC( DIRREMOVE )
HB_FUNC( ISDISK )
{
BOOL fResult = FALSE;
HB_BOOL fResult = HB_FALSE;
const char * szDrive = hb_parc( 1 );
if( szDrive )
@@ -105,7 +105,7 @@ HB_FUNC( ISDISK )
HB_FUNC( DISKCHANGE )
{
BOOL fResult = FALSE;
HB_BOOL fResult = HB_FALSE;
const char * szDrive = hb_parc( 1 );
if( szDrive )

26
harbour/src/rtl/diskspac.c
View File

@@ -80,7 +80,7 @@
HB_FUNC( DISKSPACE )
{
double dSpace = 0.0;
BOOL bError;
HB_BOOL bError;
#if defined( HB_OS_DOS )
{
@@ -149,10 +149,10 @@ HB_FUNC( DISKSPACE )
if( pGetDiskFreeSpaceEx )
{
bError = ! pGetDiskFreeSpaceEx( lpPath,
( PULARGE_INTEGER ) &i64FreeBytesToCaller,
( PULARGE_INTEGER ) &i64TotalBytes,
( PULARGE_INTEGER ) &i64FreeBytes );
bError = pGetDiskFreeSpaceEx( lpPath,
( PULARGE_INTEGER ) &i64FreeBytesToCaller,
( PULARGE_INTEGER ) &i64TotalBytes,
( PULARGE_INTEGER ) &i64FreeBytes ) ? HB_FALSE : HB_TRUE;
if( ! bError )
dSpace = HB_GET_LARGE_UINT( i64FreeBytesToCaller );
}
@@ -163,12 +163,12 @@ HB_FUNC( DISKSPACE )
DWORD dwNumberOfFreeClusters;
DWORD dwTotalNumberOfClusters;
bError = ! GetDiskFreeSpace( lpPath,
&dwSectorsPerCluster,
&dwBytesPerSector,
&dwNumberOfFreeClusters,
&dwTotalNumberOfClusters );
if( !bError )
bError = GetDiskFreeSpace( lpPath,
&dwSectorsPerCluster,
&dwBytesPerSector,
&dwNumberOfFreeClusters,
&dwTotalNumberOfClusters ) ? HB_FALSE : HB_TRUE;
if( ! bError )
dSpace = ( double ) dwNumberOfFreeClusters *
( double ) dwSectorsPerCluster *
( double ) dwBytesPerSector;
@@ -203,7 +203,7 @@ HB_FUNC( DISKSPACE )
#if defined( __WATCOMC__ ) || defined( __CEGCC__ )
int iTODO;
bError = FALSE;
bError = HB_FALSE;
#else
#if defined( HB_OS_DARWIN )
struct statfs st;
@@ -226,7 +226,7 @@ HB_FUNC( DISKSPACE )
hb_xfree( pszFree );
}
#else
bError = FALSE;
bError = HB_FALSE;
#endif
if( bError )

14
harbour/src/rtl/disksphb.c
View File

@@ -170,7 +170,7 @@ HB_FUNC( HB_DISKSPACE )
{
ULARGE_INTEGER i64FreeBytesToCaller, i64TotalBytes, i64FreeBytes;
UINT uiErrMode = SetErrorMode( SEM_FAILCRITICALERRORS );
BOOL fResult;
HB_BOOL fResult;
LPTSTR lpPath = HB_TCHAR_CONVTO( szPath );
@@ -223,7 +223,7 @@ HB_FUNC( HB_DISKSPACE )
fResult = pGetDiskFreeSpaceEx( lpPath,
( PULARGE_INTEGER ) &i64FreeBytesToCaller,
( PULARGE_INTEGER ) &i64TotalBytes,
( PULARGE_INTEGER ) &i64FreeBytes );
( PULARGE_INTEGER ) &i64FreeBytes ) ? HB_TRUE : HB_FALSE;
hb_fsSetIOError( fResult, 0 );
if( fResult )
{
@@ -259,7 +259,7 @@ HB_FUNC( HB_DISKSPACE )
&dwSectorsPerCluster,
&dwBytesPerSector,
&dwNumberOfFreeClusters,
&dwTotalNumberOfClusters );
&dwTotalNumberOfClusters ) ? HB_TRUE : HB_FALSE;
hb_fsSetIOError( fResult, 0 );
if( fResult )
@@ -334,10 +334,10 @@ HB_FUNC( HB_DISKSPACE )
( double ) fsa.cbSector;
break;
}
hb_fsSetIOError( TRUE, 0 );
hb_fsSetIOError( HB_TRUE, 0 );
}
else
hb_fsSetIOError( FALSE, 0 );
hb_fsSetIOError( HB_FALSE, 0 );
}
#elif defined( HB_OS_UNIX ) && !( defined( __WATCOMC__ ) || defined( __CEGCC__ ) )
{
@@ -375,10 +375,10 @@ HB_FUNC( HB_DISKSPACE )
dSpace = ( double ) sf.f_blocks * ( double ) sf.f_bsize;
break;
}
hb_fsSetIOError( TRUE, 0 );
hb_fsSetIOError( HB_TRUE, 0 );
}
else
hb_fsSetIOError( FALSE, 0 );
hb_fsSetIOError( HB_FALSE, 0 );
if( pszFree )
hb_xfree( pszFree );

4
harbour/src/rtl/empty.c
View File

@@ -100,7 +100,7 @@ HB_FUNC( EMPTY )
break;
case HB_IT_BLOCK:
hb_retl( FALSE );
hb_retl( HB_FALSE );
break;
case HB_IT_POINTER:
@@ -113,7 +113,7 @@ HB_FUNC( EMPTY )
break;
default:
hb_retl( TRUE );
hb_retl( HB_TRUE );
break;
}
}

18
harbour/src/rtl/errapi.c
View File

@@ -134,7 +134,7 @@ static void hb_errorDataRelease( void * Cargo )
static HB_TSD_NEW( s_errData, sizeof( HB_ERRDATA ), NULL, hb_errorDataRelease );
static BOOL hb_errGetNumCode( int * piValue, const char * szOperation )
static HB_BOOL hb_errGetNumCode( int * piValue, const char * szOperation )
{
PHB_ITEM pItem = hb_param( 1, HB_IT_NUMERIC );
@@ -147,7 +147,7 @@ static BOOL hb_errGetNumCode( int * piValue, const char * szOperation )
if( ! pItem )
{
*piValue = 0;
return FALSE;
return HB_FALSE;
}
if( ! HB_IS_NUMERIC( pItem ) )
@@ -157,7 +157,7 @@ static BOOL hb_errGetNumCode( int * piValue, const char * szOperation )
hb_itemRelease( pItem );
}
return TRUE;
return HB_TRUE;
}
@@ -203,7 +203,7 @@ HB_FUNC_STATIC( _CANDEFAULT )
if( HB_ISLOG( 1 ) )
{
PHB_ITEM pError = hb_stackSelfItem();
BOOL fCan = hb_parl( 1 );
HB_BOOL fCan = hb_parl( 1 );
if( fCan )
hb_errPutFlags( pError, ( USHORT ) ( hb_errGetFlags( pError ) | EF_CANDEFAULT ) );
@@ -225,7 +225,7 @@ HB_FUNC_STATIC( _CANRETRY )
if( HB_ISLOG( 1 ) )
{
PHB_ITEM pError = hb_stackSelfItem();
BOOL fCan = hb_parl( 1 );
HB_BOOL fCan = hb_parl( 1 );
if( fCan )
hb_errPutFlags( pError, ( USHORT ) ( hb_errGetFlags( pError ) | EF_CANRETRY ) );
@@ -247,7 +247,7 @@ HB_FUNC_STATIC( _CANSUBST )
if( HB_ISLOG( 1 ) )
{
PHB_ITEM pError = hb_stackSelfItem();
BOOL fCan = hb_parl( 1 );
HB_BOOL fCan = hb_parl( 1 );
if( fCan )
hb_errPutFlags( pError, ( USHORT ) ( hb_errGetFlags( pError ) | EF_CANSUBSTITUTE ) );
@@ -590,19 +590,19 @@ USHORT hb_errLaunch( PHB_ITEM pError )
}
else if( pResult )
{
BOOL bFailure = FALSE;
HB_BOOL bFailure = HB_FALSE;
/* If the error block didn't return a logical value, */
/* or the canSubstitute flag has been set, consider it as a failure */
if( hb_itemType( pResult ) != HB_IT_LOGICAL || ( uiFlags & EF_CANSUBSTITUTE ) )
bFailure = TRUE;
bFailure = HB_TRUE;
else
{
uiAction = hb_itemGetL( pResult ) ? E_RETRY : E_DEFAULT;
if( ( uiAction == E_DEFAULT && !( uiFlags & EF_CANDEFAULT ) ) ||
( uiAction == E_RETRY && !( uiFlags & EF_CANRETRY ) ) )
bFailure = TRUE;
bFailure = HB_TRUE;
}
hb_itemRelease( pResult );

2
harbour/src/rtl/errintlo.c
View File

@@ -65,7 +65,7 @@ void hb_errInternalRaw( HB_ERRCODE errCode, const char * szText, const char * sz
char buffer[ 8192 ];
char file[ HB_PATH_MAX ];
const char * szFile, * szInfo;
BOOL fStack, fLang;
HB_BOOL fStack, fLang;
USHORT uiLine;
int iLevel;
FILE * hLog;

12
harbour/src/rtl/file.c
View File

@@ -53,7 +53,7 @@
#include "hbapi.h"
#include "hbapifs.h"
BOOL hb_fsFile( const char * pszFilename )
HB_BOOL hb_fsFile( const char * pszFilename )
{
PHB_FFIND ffind;
char * pszFree;
@@ -67,18 +67,18 @@ BOOL hb_fsFile( const char * pszFilename )
hb_fsFindClose( ffind );
if( pszFree )
hb_xfree( pszFree );
return TRUE;
return HB_TRUE;
}
if( pszFree )
hb_xfree( pszFree );
return FALSE;
return HB_FALSE;
}
BOOL hb_fsIsDirectory( const char * pszFilename )
HB_BOOL hb_fsIsDirectory( const char * pszFilename )
{
BOOL bResult = FALSE;
HB_BOOL bResult = HB_FALSE;
PHB_FFIND ffind;
char * pszFree = NULL;
int iLen;
@@ -104,7 +104,7 @@ BOOL hb_fsIsDirectory( const char * pszFilename )
if( ( ffind = hb_fsFindFirst( pszFilename, HB_FA_DIRECTORY ) ) != NULL )
{
if( ( ffind->attr & HB_FA_DIRECTORY ) == HB_FA_DIRECTORY )
bResult = TRUE;
bResult = HB_TRUE;
hb_fsFindClose( ffind );
}
}

78
harbour/src/rtl/filebuf.c
View File

@@ -81,8 +81,8 @@ typedef struct _HB_FILE
ULONG device;
ULONG inode;
int used;
BOOL shared;
BOOL readonly;
HB_BOOL shared;
HB_BOOL readonly;
HB_FHANDLE hFile;
HB_FHANDLE hFileRO;
PHB_FLOCK pLocks;
@@ -131,8 +131,8 @@ static PHB_FILE hb_fileFind( ULONG device, ULONG inode )
return NULL;
}
static PHB_FILE hb_fileNew( HB_FHANDLE hFile, BOOL fShared, BOOL fReadonly,
ULONG device, ULONG inode, BOOL fBind )
static PHB_FILE hb_fileNew( HB_FHANDLE hFile, HB_BOOL fShared, HB_BOOL fReadonly,
ULONG device, ULONG inode, HB_BOOL fBind )
{
PHB_FILE pFile = hb_fileFind( device, inode );
@@ -219,27 +219,27 @@ static void hb_fileDeleteLock( PHB_FILE pFile, UINT uiPos )
}
}
static BOOL hb_fileSetLock( PHB_FILE pFile, BOOL * pfLockFS,
HB_FOFFSET ulStart, HB_FOFFSET ulLen )
static HB_BOOL hb_fileSetLock( PHB_FILE pFile, HB_BOOL * pfLockFS,
HB_FOFFSET ulStart, HB_FOFFSET ulLen )
{
BOOL fLJoin, fRJoin;
HB_BOOL fLJoin, fRJoin;
UINT uiPos;
uiPos = hb_fileFindOffset( pFile, ulStart );
fLJoin = fRJoin = FALSE;
fLJoin = fRJoin = HB_FALSE;
if( uiPos < pFile->uiLocks )
{
PHB_FLOCK pLock = &pFile->pLocks[ uiPos ];
if( ulStart + ulLen > pLock->start )
return FALSE;
return HB_FALSE;
if( ulStart + ulLen == pLock->start )
fRJoin = TRUE;
fRJoin = HB_TRUE;
}
if( uiPos > 0 )
{
PHB_FLOCK pLock = &pFile->pLocks[ uiPos - 1 ];
if( pLock->start + pLock->len == ulStart )
fLJoin = TRUE;
fLJoin = HB_TRUE;
}
if( fLJoin )
{
@@ -260,14 +260,14 @@ static BOOL hb_fileSetLock( PHB_FILE pFile, BOOL * pfLockFS,
hb_fileInsertLock( pFile, uiPos, ulStart, ulLen );
if( pFile->shared )
* pfLockFS = TRUE;
return TRUE;
* pfLockFS = HB_TRUE;
return HB_TRUE;
}
static BOOL hb_fileUnlock( PHB_FILE pFile, BOOL * pfLockFS,
HB_FOFFSET ulStart, HB_FOFFSET ulLen )
static HB_BOOL hb_fileUnlock( PHB_FILE pFile, HB_BOOL * pfLockFS,
HB_FOFFSET ulStart, HB_FOFFSET ulLen )
{
BOOL fResult = FALSE;
HB_BOOL fResult = HB_FALSE;
UINT uiPos;
uiPos = hb_fileFindOffset( pFile, ulStart );
@@ -296,8 +296,8 @@ static BOOL hb_fileUnlock( PHB_FILE pFile, BOOL * pfLockFS,
pLock->len = ulStart - pLock->start;
}
if( pFile->shared )
* pfLockFS = TRUE;
fResult = TRUE;
* pfLockFS = HB_TRUE;
fResult = HB_TRUE;
}
}
return fResult;
@@ -308,7 +308,7 @@ static BOOL hb_fileUnlock( PHB_FILE pFile, BOOL * pfLockFS,
* file methods
*/
static BOOL s_fileAccept( const char * pFilename )
static HB_BOOL s_fileAccept( const char * pFilename )
{
return pFilename && *pFilename;
}
@@ -320,9 +320,9 @@ static PHB_FILE s_fileExtOpen( const char * pFilename, const char * pDefExt,
PHB_FILE pFile = NULL;
#if defined( HB_OS_UNIX )
struct stat statbuf;
BOOL fResult;
HB_BOOL fResult;
#endif
BOOL fShared, fReadonly;
HB_BOOL fShared, fReadonly;
HB_FHANDLE hFile;
char * pszFile;
@@ -343,7 +343,7 @@ static PHB_FILE s_fileExtOpen( const char * pFilename, const char * pDefExt,
if( pFile )
{
if( !fShared || ! pFile->shared || ( uiExFlags & FXO_TRUNCATE ) != 0 )
fResult = FALSE;
fResult = HB_FALSE;
else if( !fReadonly && pFile->readonly )
pFile = NULL;
else
@@ -390,14 +390,14 @@ static PHB_FILE s_fileExtOpen( const char * pFilename, const char * pDefExt,
#endif
hb_threadEnterCriticalSection( &s_fileMtx );
pFile = hb_fileNew( hFile, fShared, fReadonly, device, inode, TRUE );
pFile = hb_fileNew( hFile, fShared, fReadonly, device, inode, HB_TRUE );
if( pFile->hFile != hFile )
{
if( pFile->hFileRO == FS_ERROR && !fReadonly && pFile->readonly )
{
pFile->hFileRO = pFile->hFile;
pFile->hFile = hFile;
pFile->readonly = FALSE;
pFile->readonly = HB_FALSE;
hFile = FS_ERROR;
}
if( pFile->uiLocks == 0 )
@@ -479,10 +479,10 @@ static void s_fileClose( PHB_FILE pFile )
hb_fsClose( hFileRO );
}
static BOOL s_fileLock( PHB_FILE pFile, HB_FOFFSET ulStart, HB_FOFFSET ulLen,
int iType )
static HB_BOOL s_fileLock( PHB_FILE pFile, HB_FOFFSET ulStart, HB_FOFFSET ulLen,
int iType )
{
BOOL fResult, fLockFS = FALSE;
HB_BOOL fResult, fLockFS = HB_FALSE;
if( ( iType & FL_MASK ) == FL_UNLOCK )
{
@@ -528,7 +528,7 @@ static ULONG s_fileWriteAt( PHB_FILE pFile, const void * buffer, ULONG ulSize,
return hb_fsWriteAt( pFile->hFile, buffer, ulSize, llOffset );
}
static BOOL s_fileTruncAt( PHB_FILE pFile, HB_FOFFSET llOffset )
static HB_BOOL s_fileTruncAt( PHB_FILE pFile, HB_FOFFSET llOffset )
{
return hb_fsTruncAt( pFile->hFile, llOffset );
}
@@ -583,9 +583,9 @@ static int s_iFileTypes = 0;
* public API functions
*/
BOOL hb_fileRegister( const HB_FILE_FUNCS * pFuncs )
HB_BOOL hb_fileRegister( const HB_FILE_FUNCS * pFuncs )
{
BOOL fResult = FALSE;
HB_BOOL fResult = HB_FALSE;
hb_threadEnterCriticalSection( &s_fileMtx );
@@ -593,7 +593,7 @@ BOOL hb_fileRegister( const HB_FILE_FUNCS * pFuncs )
{
s_pFileTypes[ s_iFileTypes ] = pFuncs;
s_iFileTypes++;
fResult = TRUE;
fResult = HB_TRUE;
}
hb_threadLeaveCriticalSection( &s_fileMtx );
@@ -601,7 +601,7 @@ BOOL hb_fileRegister( const HB_FILE_FUNCS * pFuncs )
return fResult;
}
BOOL hb_fileDelete( const char * pFilename )
HB_BOOL hb_fileDelete( const char * pFilename )
{
int i = s_iFileTypes;
@@ -613,7 +613,7 @@ BOOL hb_fileDelete( const char * pFilename )
return hb_fsDelete( pFilename );
}
BOOL hb_fileExists( const char * pFilename, char * pRetPath )
HB_BOOL hb_fileExists( const char * pFilename, char * pRetPath )
{
int i = s_iFileTypes;
@@ -625,7 +625,7 @@ BOOL hb_fileExists( const char * pFilename, char * pRetPath )
return hb_spFileExists( pFilename, pRetPath );
}
BOOL hb_fileRename( const char * pFilename, const char * pszNewName )
HB_BOOL hb_fileRename( const char * pFilename, const char * pszNewName )
{
int i = s_iFileTypes;
@@ -656,8 +656,8 @@ void hb_fileClose( PHB_FILE pFile )
pFile->pFuncs->Close( pFile );
}
BOOL hb_fileLock( PHB_FILE pFile, HB_FOFFSET ulStart, HB_FOFFSET ulLen,
int iType )
HB_BOOL hb_fileLock( PHB_FILE pFile, HB_FOFFSET ulStart, HB_FOFFSET ulLen,
int iType )
{
return pFile->pFuncs->Lock( pFile, ulStart, ulLen, iType );
}
@@ -674,7 +674,7 @@ ULONG hb_fileWriteAt( PHB_FILE pFile, const void * buffer, ULONG ulSize,
return pFile->pFuncs->WriteAt( pFile, buffer, ulSize, llOffset );
}
BOOL hb_fileTruncAt( PHB_FILE pFile, HB_FOFFSET llOffset )
HB_BOOL hb_fileTruncAt( PHB_FILE pFile, HB_FOFFSET llOffset )
{
return pFile->pFuncs->TruncAt( pFile, llOffset );
}
@@ -704,7 +704,7 @@ PHB_FILE hb_fileCreateTemp( const char * pszDir, const char * pszPrefix,
hFile = hb_fsCreateTemp( pszDir, pszPrefix, ulAttr, pszName );
if( hFile != FS_ERROR )
pFile = hb_fileNew( hFile, FALSE, FALSE, 0, 0, FALSE );
pFile = hb_fileNew( hFile, HB_FALSE, HB_FALSE, 0, 0, HB_FALSE );
return pFile;
}
@@ -720,7 +720,7 @@ PHB_FILE hb_fileCreateTempEx( char * pszName,
hFile = hb_fsCreateTempEx( pszName, pszDir, pszPrefix, pszExt, ulAttr );
if( hFile != FS_ERROR )
pFile = hb_fileNew( hFile, FALSE, FALSE, 0, 0, FALSE );
pFile = hb_fileNew( hFile, HB_FALSE, HB_FALSE, 0, 0, HB_FALSE );
return pFile;
}

2
harbour/src/rtl/filehb.c
View File

@@ -68,5 +68,5 @@ HB_FUNC( FILE )
{
const char * szFile = hb_parc( 1 );
hb_retl( szFile ? hb_spFile( szFile, NULL ) : FALSE );
hb_retl( szFile ? hb_spFile( szFile, NULL ) : HB_FALSE );
}

168
harbour/src/rtl/filesys.c
View File

@@ -293,7 +293,7 @@
#define HB_FS_LARGE_OPTIMIZED
#endif
static BOOL s_fUseWaitLocks = TRUE;
static HB_BOOL s_fUseWaitLocks = HB_TRUE;
#if defined( HB_FS_FILE_IO )
@@ -314,7 +314,7 @@ static HANDLE DosToWinHandle( HB_FHANDLE fHandle )
return ( HANDLE ) fHandle;
}
static void convert_open_flags( BOOL fCreate, HB_FATTR ulAttr, USHORT uiFlags,
static void convert_open_flags( HB_BOOL fCreate, HB_FATTR ulAttr, USHORT uiFlags,
DWORD *dwMode, DWORD *dwShare,
DWORD *dwCreat, DWORD *dwAttr )
{
@@ -390,7 +390,7 @@ static void convert_open_flags( BOOL fCreate, HB_FATTR ulAttr, USHORT uiFlags,
#else
static void convert_open_flags( BOOL fCreate, HB_FATTR ulAttr, USHORT uiFlags,
static void convert_open_flags( HB_BOOL fCreate, HB_FATTR ulAttr, USHORT uiFlags,
int *flags, unsigned *mode,
int *share, int *attr )
{
@@ -549,7 +549,7 @@ HB_FHANDLE hb_fsPOpen( const char * pFilename, const char * pMode )
HB_FHANDLE hPipeHandle[2], hNullHandle;
pid_t pid;
char * pszTmp;
BOOL bRead;
HB_BOOL bRead;
HB_SIZE ulLen;
int iMaxFD;
@@ -559,11 +559,11 @@ HB_FHANDLE hb_fsPOpen( const char * pFilename, const char * pMode )
else
{
if( pFilename[0] == '|' )
bRead = FALSE;
bRead = HB_FALSE;
else if( pFilename[ ulLen - 1 ] == '|' )
bRead = TRUE;
bRead = HB_TRUE;
else
bRead = FALSE;
bRead = HB_FALSE;
}
if( pFilename[0] == '|' )
@@ -662,7 +662,7 @@ HB_FHANDLE hb_fsOpen( const char * pFilename, USHORT uiFlags )
DWORD dwMode, dwShare, dwCreat, dwAttr;
HANDLE hFile;
convert_open_flags( FALSE, FC_NORMAL, uiFlags, &dwMode, &dwShare, &dwCreat, &dwAttr );
convert_open_flags( HB_FALSE, FC_NORMAL, uiFlags, &dwMode, &dwShare, &dwCreat, &dwAttr );
hb_vmUnlock();
hFile = CreateFile( lpFilename, dwMode, dwShare, NULL, dwCreat, dwAttr, NULL );
@@ -678,7 +678,7 @@ HB_FHANDLE hb_fsOpen( const char * pFilename, USHORT uiFlags )
int flags, share, attr;
unsigned mode;
convert_open_flags( FALSE, FC_NORMAL, uiFlags, &flags, &mode, &share, &attr );
convert_open_flags( HB_FALSE, FC_NORMAL, uiFlags, &flags, &mode, &share, &attr );
hb_vmUnlock();
#if defined( _MSC_VER ) || defined( __DMC__ )
if( share )
@@ -724,7 +724,7 @@ HB_FHANDLE hb_fsCreate( const char * pFilename, HB_FATTR ulAttr )
DWORD dwMode, dwShare, dwCreat, dwAttr;
HANDLE hFile;
convert_open_flags( TRUE, ulAttr, FO_EXCLUSIVE, &dwMode, &dwShare, &dwCreat, &dwAttr );
convert_open_flags( HB_TRUE, ulAttr, FO_EXCLUSIVE, &dwMode, &dwShare, &dwCreat, &dwAttr );
hb_vmUnlock();
hFile = CreateFile( lpFilename, dwMode, dwShare, NULL, dwCreat, dwAttr, NULL );
@@ -739,7 +739,7 @@ HB_FHANDLE hb_fsCreate( const char * pFilename, HB_FATTR ulAttr )
{
int flags, share, attr;
unsigned mode;
convert_open_flags( TRUE, ulAttr, FO_EXCLUSIVE, &flags, &mode, &share, &attr );
convert_open_flags( HB_TRUE, ulAttr, FO_EXCLUSIVE, &flags, &mode, &share, &attr );
hb_vmUnlock();
#if defined( HB_FS_DOSCREAT )
@@ -786,7 +786,7 @@ HB_FHANDLE hb_fsCreateEx( const char * pFilename, HB_FATTR ulAttr, USHORT uiFlag
DWORD dwMode, dwShare, dwCreat, dwAttr;
HANDLE hFile;
convert_open_flags( TRUE, ulAttr, uiFlags, &dwMode, &dwShare, &dwCreat, &dwAttr );
convert_open_flags( HB_TRUE, ulAttr, uiFlags, &dwMode, &dwShare, &dwCreat, &dwAttr );
hb_vmUnlock();
hFile = CreateFile( lpFilename, dwMode, dwShare, NULL, dwCreat, dwAttr, NULL );
@@ -801,7 +801,7 @@ HB_FHANDLE hb_fsCreateEx( const char * pFilename, HB_FATTR ulAttr, USHORT uiFlag
{
int flags, share, attr;
unsigned mode;
convert_open_flags( TRUE, ulAttr, uiFlags, &flags, &mode, &share, &attr );
convert_open_flags( HB_TRUE, ulAttr, uiFlags, &flags, &mode, &share, &attr );
hb_vmUnlock();
#if defined( HB_FS_SOPEN )
@@ -931,13 +931,13 @@ int hb_fsSetDevMode( HB_FHANDLE hFileHandle, int iDevMode )
#endif
}
BOOL hb_fsGetFileTime( const char * pszFileName, long * plJulian, long * plMillisec )
HB_BOOL hb_fsGetFileTime( const char * pszFileName, long * plJulian, long * plMillisec )
{
BOOL fResult;
HB_BOOL fResult;
HB_TRACE(HB_TR_DEBUG, ("hb_fsGetFileTime(%s, %p, %p)", pszFileName, plJulian, plMillisec));
fResult = FALSE;
fResult = HB_FALSE;
#if defined( HB_IO_WIN )
{
@@ -956,7 +956,7 @@ BOOL hb_fsGetFileTime( const char * pszFileName, long * plJulian, long * plMilli
*plJulian = hb_dateEncode( st.wYear, st.wMonth, st.wDay );
*plMillisec = hb_timeEncode( st.wHour, st.wMinute, st.wSecond, st.wMilliseconds );
fResult = TRUE;
fResult = HB_TRUE;
}
hb_fsSetIOError( fResult, 0 );
hb_vmLock();
@@ -991,7 +991,7 @@ BOOL hb_fsGetFileTime( const char * pszFileName, long * plJulian, long * plMilli
#else
*plMillisec = hb_timeEncode( ft.tm_hour, ft.tm_min, ft.tm_sec, 0 );
#endif
fResult = TRUE;
fResult = HB_TRUE;
}
hb_fsSetIOError( fResult, 0 );
hb_vmLock();
@@ -1012,15 +1012,15 @@ BOOL hb_fsGetFileTime( const char * pszFileName, long * plJulian, long * plMilli
return fResult;
}
BOOL hb_fsGetAttr( const char * pszFileName, HB_FATTR * pulAttr )
HB_BOOL hb_fsGetAttr( const char * pszFileName, HB_FATTR * pulAttr )
{
BOOL fResult;
HB_BOOL fResult;
char * pszFree;
HB_TRACE(HB_TR_DEBUG, ("hb_fsGetAttr(%s, %p)", pszFileName, pulAttr));
*pulAttr = 0;
fResult = FALSE;
fResult = HB_FALSE;
pszFileName = hb_fsNameConv( pszFileName, &pszFree );
#if defined( HB_OS_WIN )
@@ -1034,7 +1034,7 @@ BOOL hb_fsGetAttr( const char * pszFileName, HB_FATTR * pulAttr )
if( dwAttr != INVALID_FILE_ATTRIBUTES )
{
*pulAttr = hb_fsAttrFromRaw( dwAttr );
fResult = TRUE;
fResult = HB_TRUE;
}
hb_fsSetIOError( fResult, 0 );
hb_vmLock();
@@ -1053,7 +1053,7 @@ BOOL hb_fsGetAttr( const char * pszFileName, HB_FATTR * pulAttr )
#endif
{
*pulAttr = hb_fsAttrFromRaw( attr );
fResult = TRUE;
fResult = HB_TRUE;
}
hb_fsSetIOError( fResult, 0 );
}
@@ -1068,7 +1068,7 @@ BOOL hb_fsGetAttr( const char * pszFileName, HB_FATTR * pulAttr )
if( ulrc == NO_ERROR )
{
*pulAttr = hb_fsAttrFromRaw( fs3.attrFile );
fResult = TRUE;
fResult = HB_TRUE;
}
hb_fsSetIOError( fResult, 0 );
hb_vmLock();
@@ -1081,7 +1081,7 @@ BOOL hb_fsGetAttr( const char * pszFileName, HB_FATTR * pulAttr )
if( stat( pszFileName, &sStat ) == 0 )
{
*pulAttr = hb_fsAttrFromRaw( sStat.st_mode );
fResult = TRUE;
fResult = HB_TRUE;
}
hb_fsSetIOError( fResult, 0 );
hb_vmLock();
@@ -1101,9 +1101,9 @@ BOOL hb_fsGetAttr( const char * pszFileName, HB_FATTR * pulAttr )
return fResult;
}
BOOL hb_fsSetFileTime( const char * pszFileName, long lJulian, long lMillisec )
HB_BOOL hb_fsSetFileTime( const char * pszFileName, long lJulian, long lMillisec )
{
BOOL fResult;
HB_BOOL fResult;
int iYear, iMonth, iDay;
int iHour, iMinute, iSecond, iMSec;
@@ -1274,7 +1274,7 @@ BOOL hb_fsSetFileTime( const char * pszFileName, long lJulian, long lMillisec )
{
int iTODO; /* To force warning */
fResult = FALSE;
fResult = HB_FALSE;
hb_fsSetError( ( HB_ERRCODE ) FS_ERROR );
}
#endif
@@ -1282,9 +1282,9 @@ BOOL hb_fsSetFileTime( const char * pszFileName, long lJulian, long lMillisec )
return fResult;
}
BOOL hb_fsSetAttr( const char * pszFileName, HB_FATTR ulAttr )
HB_BOOL hb_fsSetAttr( const char * pszFileName, HB_FATTR ulAttr )
{
BOOL fResult;
HB_BOOL fResult;
char * pszFree;
HB_TRACE(HB_TR_DEBUG, ("hb_fsSetAttr(%s, %lu)", pszFileName, ulAttr));
@@ -1378,7 +1378,7 @@ BOOL hb_fsSetAttr( const char * pszFileName, HB_FATTR ulAttr )
{
int iTODO; /* To force warning */
fResult = FALSE;
fResult = HB_FALSE;
hb_fsSetError( ( HB_ERRCODE ) FS_ERROR );
}
#endif
@@ -1715,7 +1715,7 @@ ULONG hb_fsReadAt( HB_FHANDLE hFileHandle, void * pBuff, ULONG ulCount, HB_FOFFS
SEEK_SET );
llPos = ( ( HB_FOFFSET ) ulOffsetHigh << 32 ) | ulOffsetLow;
if( llPos == ( HB_FOFFSET ) INVALID_SET_FILE_POINTER )
hb_fsSetIOError( FALSE, 0 );
hb_fsSetIOError( HB_FALSE, 0 );
else
hb_fsSetIOError( ReadFile( DosToWinHandle( hFileHandle ),
pBuff, ulCount, &ulRead, NULL ), 0 );
@@ -1739,7 +1739,7 @@ ULONG hb_fsReadAt( HB_FHANDLE hFileHandle, void * pBuff, ULONG ulCount, HB_FOFFS
llPos = lseek( hFileHandle, llOffset, SEEK_SET );
# endif
if( llPos == ( HB_FOFFSET ) -1 )
hb_fsSetIOError( FALSE, 0 );
hb_fsSetIOError( HB_FALSE, 0 );
else
{
ulRead = read( hFileHandle, pBuff, ulCount );
@@ -1809,7 +1809,7 @@ ULONG hb_fsWriteAt( HB_FHANDLE hFileHandle, const void * pBuff, ULONG ulCount, H
SEEK_SET );
llPos = ( ( HB_FOFFSET ) ulOffsetHigh << 32 ) | ulOffsetLow;
if( llPos == ( HB_FOFFSET ) INVALID_SET_FILE_POINTER )
hb_fsSetIOError( FALSE, 0 );
hb_fsSetIOError( HB_FALSE, 0 );
else
hb_fsSetIOError( WriteFile( DosToWinHandle( hFileHandle ),
pBuff, ulCount, &ulWritten, NULL ), 0 );
@@ -1833,7 +1833,7 @@ ULONG hb_fsWriteAt( HB_FHANDLE hFileHandle, const void * pBuff, ULONG ulCount, H
llPos = lseek( hFileHandle, llOffset, SEEK_SET );
# endif
if( llPos == ( HB_FOFFSET ) -1 )
hb_fsSetIOError( FALSE, 0 );
hb_fsSetIOError( HB_FALSE, 0 );
else
{
ulWritten = write( hFileHandle, pBuff, ulCount );
@@ -1859,9 +1859,9 @@ ULONG hb_fsWriteAt( HB_FHANDLE hFileHandle, const void * pBuff, ULONG ulCount, H
return ulWritten;
}
BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset )
HB_BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset )
{
BOOL fResult;
HB_BOOL fResult;
HB_TRACE(HB_TR_DEBUG, ("hb_fsReadAt(%p, %" PFHL "i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, llOffset));
@@ -1884,7 +1884,7 @@ BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset )
if( ( ( ( HB_FOFFSET ) ulOffsetHigh << 32 ) | ulOffsetLow ) == llOffset )
fResult = SetEndOfFile( DosToWinHandle( hFileHandle ) );
else
fResult = FALSE;
fResult = HB_FALSE;
}
#elif defined( HB_USE_LARGEFILE64 )
fResult = ftruncate64( hFileHandle, llOffset ) != -1;
@@ -1896,7 +1896,7 @@ BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset )
#else
fResult = FALSE;
fResult = HB_FALSE;
hb_fsSetError( ( HB_ERRCODE ) FS_ERROR );
#endif
@@ -1972,14 +1972,14 @@ void hb_fsCommit( HB_FHANDLE hFileHandle )
*/
{
int dup_handle;
BOOL fResult = FALSE;
HB_BOOL fResult = HB_FALSE;
hb_vmUnlock();
dup_handle = dup( hFileHandle );
if( dup_handle != -1 )
{
close( dup_handle );
fResult = TRUE;
fResult = HB_TRUE;
}
hb_fsSetIOError( fResult, 0 );
hb_vmLock();
@@ -1992,10 +1992,10 @@ void hb_fsCommit( HB_FHANDLE hFileHandle )
#endif
}
BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart,
HB_BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart,
ULONG ulLength, USHORT uiMode )
{
BOOL bResult;
HB_BOOL bResult;
HB_TRACE(HB_TR_DEBUG, ("hb_fsLock(%p, %lu, %lu, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, ulStart, ulLength, uiMode));
@@ -2041,7 +2041,7 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart,
}
default:
bResult = FALSE;
bResult = HB_FALSE;
}
hb_fsSetIOError( bResult, 0 );
hb_vmLock();
@@ -2075,7 +2075,7 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart,
break;
default:
bResult = FALSE;
bResult = HB_FALSE;
}
hb_fsSetIOError( bResult, 0 );
hb_vmLock();
@@ -2098,7 +2098,7 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart,
break;
default:
bResult = FALSE;
bResult = HB_FALSE;
}
hb_fsSetIOError( bResult, 0 );
hb_vmLock();
@@ -2122,7 +2122,7 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart,
break;
default:
bResult = FALSE;
bResult = HB_FALSE;
}
hb_fsSetIOError( bResult, 0 );
hb_vmLock();
@@ -2162,7 +2162,7 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart,
break;
default:
bResult = FALSE;
bResult = HB_FALSE;
}
hb_fsSetIOError( bResult, 0 );
hb_vmLock();
@@ -2181,14 +2181,14 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart,
break;
default:
bResult = FALSE;
bResult = HB_FALSE;
}
hb_fsSetIOError( bResult, 0 );
hb_vmLock();
#else
bResult = FALSE;
bResult = HB_FALSE;
hb_fsSetError( ( HB_ERRCODE ) FS_ERROR );
#endif
@@ -2196,10 +2196,10 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart,
return bResult;
}
BOOL hb_fsLockLarge( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart,
HB_FOFFSET ulLength, USHORT uiMode )
HB_BOOL hb_fsLockLarge( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart,
HB_FOFFSET ulLength, USHORT uiMode )
{
BOOL bResult;
HB_BOOL bResult;
HB_TRACE(HB_TR_DEBUG, ("hb_fsLockLarge(%p, %" PFHL "u, %" PFHL "i, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, ulStart, ulLength, uiMode));
@@ -2261,7 +2261,7 @@ BOOL hb_fsLockLarge( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart,
break;
default:
bResult = FALSE;
bResult = HB_FALSE;
}
hb_fsSetIOError( bResult, 0 );
hb_vmLock();
@@ -2298,7 +2298,7 @@ BOOL hb_fsLockLarge( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart,
break;
default:
bResult = FALSE;
bResult = HB_FALSE;
}
hb_fsSetIOError( bResult, 0 );
hb_vmLock();
@@ -2469,9 +2469,9 @@ ULONG hb_fsTell( HB_FHANDLE hFileHandle )
return hb_fsSeek( hFileHandle, 0, FS_RELATIVE );
}
BOOL hb_fsDelete( const char * pFilename )
HB_BOOL hb_fsDelete( const char * pFilename )
{
BOOL bResult;
HB_BOOL bResult;
char * pszFree;
HB_TRACE(HB_TR_DEBUG, ("hb_fsDelete(%s)", pFilename));
@@ -2500,7 +2500,7 @@ BOOL hb_fsDelete( const char * pFilename )
#else
bResult = FALSE;
bResult = HB_FALSE;
hb_fsSetError( ( HB_ERRCODE ) FS_ERROR );
#endif
@@ -2511,9 +2511,9 @@ BOOL hb_fsDelete( const char * pFilename )
return bResult;
}
BOOL hb_fsRename( const char * pOldName, const char * pNewName )
HB_BOOL hb_fsRename( const char * pOldName, const char * pNewName )
{
BOOL bResult;
HB_BOOL bResult;
char * pszFreeOld, * pszFreeNew;
HB_TRACE(HB_TR_DEBUG, ("hb_fsRename(%s, %s)", pOldName, pNewName));
@@ -2545,7 +2545,7 @@ BOOL hb_fsRename( const char * pOldName, const char * pNewName )
#else
bResult = FALSE;
bResult = HB_FALSE;
hb_fsSetError( ( HB_ERRCODE ) FS_ERROR );
#endif
@@ -2558,9 +2558,9 @@ BOOL hb_fsRename( const char * pOldName, const char * pNewName )
return bResult;
}
BOOL hb_fsMkDir( const char * pDirname )
HB_BOOL hb_fsMkDir( const char * pDirname )
{
BOOL bResult;
HB_BOOL bResult;
char * pszFree;
HB_TRACE(HB_TR_DEBUG, ("hb_fsMkDir(%s)", pDirname));
@@ -2597,7 +2597,7 @@ BOOL hb_fsMkDir( const char * pDirname )
#else
bResult = FALSE;
bResult = HB_FALSE;
hb_fsSetError( ( HB_ERRCODE ) FS_ERROR );
#endif
@@ -2608,9 +2608,9 @@ BOOL hb_fsMkDir( const char * pDirname )
return bResult;
}
BOOL hb_fsChDir( const char * pDirname )
HB_BOOL hb_fsChDir( const char * pDirname )
{
BOOL bResult;
HB_BOOL bResult;
char * pszFree;
HB_TRACE(HB_TR_DEBUG, ("hb_fsChDir(%s)", pDirname));
@@ -2639,7 +2639,7 @@ BOOL hb_fsChDir( const char * pDirname )
#else
bResult = FALSE;
bResult = HB_FALSE;
hb_fsSetError( ( HB_ERRCODE ) FS_ERROR );
#endif
@@ -2650,9 +2650,9 @@ BOOL hb_fsChDir( const char * pDirname )
return bResult;
}
BOOL hb_fsRmDir( const char * pDirname )
HB_BOOL hb_fsRmDir( const char * pDirname )
{
BOOL bResult;
HB_BOOL bResult;
char * pszFree;
HB_TRACE(HB_TR_DEBUG, ("hb_fsRmDir(%s)", pDirname));
@@ -2681,7 +2681,7 @@ BOOL hb_fsRmDir( const char * pDirname )
#else
bResult = FALSE;
bResult = HB_FALSE;
hb_fsSetError( ( HB_ERRCODE ) FS_ERROR );
#endif
@@ -2716,7 +2716,7 @@ HB_ERRCODE hb_fsCurDirBuff( USHORT uiDrive, char * pszBuffer, HB_SIZE ulSize )
HB_ERRCODE usError;
char * pszStart;
HB_SIZE ulLen;
BOOL fResult;
HB_BOOL fResult;
HB_TRACE(HB_TR_DEBUG, ("hb_fsCurDirBuff(%hu)", uiDrive));
@@ -2778,7 +2778,7 @@ HB_ERRCODE hb_fsCurDirBuff( USHORT uiDrive, char * pszBuffer, HB_SIZE ulSize )
#else
fResult = FALSE;
fResult = HB_FALSE;
hb_fsSetError( ( HB_ERRCODE ) FS_ERROR );
#endif
@@ -2960,9 +2960,9 @@ HB_ERRCODE hb_fsIsDrv( BYTE nDrive )
return uiResult;
}
BOOL hb_fsIsDevice( HB_FHANDLE hFileHandle )
HB_BOOL hb_fsIsDevice( HB_FHANDLE hFileHandle )
{
BOOL bResult;
HB_BOOL bResult;
HB_TRACE(HB_TR_DEBUG, ("hb_fsIsDevice(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle));
@@ -2986,7 +2986,7 @@ BOOL hb_fsIsDevice( HB_FHANDLE hFileHandle )
#else
bResult = FALSE;
bResult = HB_FALSE;
hb_fsSetError( ( HB_ERRCODE ) FS_ERROR );
HB_SYMBOL_UNUSED( hFileHandle );
@@ -3003,7 +3003,7 @@ char * hb_fsExtName( const char * pFilename, const char * pDefExt,
{
HB_PATHNAMES * pNextPath;
PHB_FNAME pFilepath;
BOOL fIsFile = FALSE;
HB_BOOL fIsFile = HB_FALSE;
char * szPath;
szPath = ( char * ) hb_xgrab( HB_PATH_MAX );
@@ -3190,9 +3190,9 @@ HB_FHANDLE hb_fsExtOpen( const char * pFilename, const char * pDefExt,
return hFile;
}
BOOL hb_fsEof( HB_FHANDLE hFileHandle )
HB_BOOL hb_fsEof( HB_FHANDLE hFileHandle )
{
BOOL fResult;
HB_BOOL fResult;
hb_vmUnlock();
@@ -3214,7 +3214,7 @@ BOOL hb_fsEof( HB_FHANDLE hFileHandle )
else
{
endPos = -1;
fResult = FALSE;
fResult = HB_FALSE;
}
hb_fsSetIOError( fResult, 0 );
fResult = !fResult || curPos == endPos;
@@ -3234,7 +3234,7 @@ const char * hb_fsNameConv( const char * szFileName, char ** pszFree )
int iFileCase, iDirCase;
const char * pszCP;
char cDirSep;
BOOL fTrim;
HB_BOOL fTrim;
/*
Convert file and dir case. The allowed SET options are:
@@ -3297,14 +3297,14 @@ const char * hb_fsNameConv( const char * szFileName, char ** pszFree )
if( pFileName->szName )
{
ulLen = strlen( pFileName->szName );
ulLen = hb_strRTrimLen( pFileName->szName, ulLen, FALSE );
ulLen = hb_strRTrimLen( pFileName->szName, ulLen, HB_FALSE );
pFileName->szName = hb_strLTrim( pFileName->szName, &ulLen );
( ( char * ) pFileName->szName )[ ulLen ] = '\0';
}
if( pFileName->szExtension )
{
ulLen = strlen( pFileName->szExtension );
ulLen = hb_strRTrimLen( pFileName->szExtension, ulLen, FALSE );
ulLen = hb_strRTrimLen( pFileName->szExtension, ulLen, HB_FALSE );
pFileName->szExtension = hb_strLTrim( pFileName->szExtension, &ulLen );
( ( char * ) pFileName->szExtension )[ ulLen ] = '\0';
}
@@ -3381,9 +3381,9 @@ void hb_fsBaseDirBuff( char * pszBuffer )
}
}
static BOOL hb_fsDisableWaitLocks( int iSet )
static HB_BOOL hb_fsDisableWaitLocks( int iSet )
{
BOOL fRetVal = s_fUseWaitLocks;
HB_BOOL fRetVal = s_fUseWaitLocks;
if( iSet >= 0 )
s_fUseWaitLocks = ( iSet == 0 );

10
harbour/src/rtl/fscopy.c
View File

@@ -60,9 +60,9 @@
#define HB_FSCOPY_BUFFERSIZE 16384
BOOL hb_fsCopy( const char * pszSource, const char * pszDest )
HB_BOOL hb_fsCopy( const char * pszSource, const char * pszDest )
{
BOOL bRetVal = TRUE;
HB_BOOL bRetVal = HB_TRUE;
HB_FHANDLE fhndSource;
HB_FHANDLE fhndDest;
@@ -81,7 +81,7 @@ BOOL hb_fsCopy( const char * pszSource, const char * pszDest )
{
if( nBytesRead != hb_fsWrite( fhndDest, pbyBuffer, nBytesRead ) )
{
bRetVal = FALSE;
bRetVal = HB_FALSE;
break;
}
}
@@ -96,12 +96,12 @@ BOOL hb_fsCopy( const char * pszSource, const char * pszDest )
hb_fsClose( fhndDest );
}
else
bRetVal = FALSE;
bRetVal = HB_FALSE;
hb_fsClose( fhndSource );
}
else
bRetVal = FALSE;
bRetVal = HB_FALSE;
return bRetVal;
}

2
harbour/src/rtl/fserr.c
View File

@@ -221,7 +221,7 @@ void hb_fsSetError( HB_ERRCODE uiError )
}
/* set error code for last operation */
void hb_fsSetIOError( BOOL fResult, USHORT uiOperation )
void hb_fsSetIOError( HB_BOOL fResult, USHORT uiOperation )
{
HB_ERRCODE uiOsErrorLast, uiErrorLast;
PHB_IOERRORS pIOErrors;

6
harbour/src/rtl/fssize.c
View File

@@ -78,7 +78,7 @@
#endif
HB_FOFFSET hb_fsFSize( const char * pszFileName, BOOL bUseDirEntry )
HB_FOFFSET hb_fsFSize( const char * pszFileName, HB_BOOL bUseDirEntry )
{
if( bUseDirEntry )
{
@@ -98,7 +98,7 @@ HB_FOFFSET hb_fsFSize( const char * pszFileName, BOOL bUseDirEntry )
}
#elif defined( HB_USE_LARGEFILE64 )
char * pszFree;
BOOL fResult;
HB_BOOL fResult;
struct stat64 statbuf;
pszFileName = hb_fsNameConv( pszFileName, &pszFree );
statbuf.st_size = 0;
@@ -112,7 +112,7 @@ HB_FOFFSET hb_fsFSize( const char * pszFileName, BOOL bUseDirEntry )
return ( HB_FOFFSET ) statbuf.st_size;
#else
char * pszFree;
BOOL fResult;
HB_BOOL fResult;
struct stat statbuf;
pszFileName = hb_fsNameConv( pszFileName, &pszFree );
statbuf.st_size = 0;

14
harbour/src/rtl/fstemp.c
View File

@@ -96,9 +96,9 @@
#endif
#if !defined( HB_OS_WIN )
static BOOL fsGetTempDirByCase( char * pszName, const char * pszTempDir )
static HB_BOOL fsGetTempDirByCase( char * pszName, const char * pszTempDir )
{
BOOL fOK = FALSE;
HB_BOOL fOK = HB_FALSE;
if( pszTempDir && *pszTempDir != '\0' )
{
@@ -114,7 +114,7 @@ static BOOL fsGetTempDirByCase( char * pszName, const char * pszTempDir )
fOK = strcmp( pszName, pszTempDir ) == 0;
break;
default:
fOK = TRUE;
fOK = HB_TRUE;
break;
}
}
@@ -257,9 +257,9 @@ static HB_FHANDLE hb_fsCreateTempLow( const char * pszDir, const char * pszPrefi
/* NOTE: The buffer must be at least HB_PATH_MAX chars long */
#if !defined( HB_OS_UNIX )
static BOOL hb_fsTempName( char * pszBuffer, const char * pszDir, const char * pszPrefix )
static HB_BOOL hb_fsTempName( char * pszBuffer, const char * pszDir, const char * pszPrefix )
{
BOOL fResult;
HB_BOOL fResult;
hb_vmUnlock();
@@ -275,8 +275,8 @@ static BOOL hb_fsTempName( char * pszBuffer, const char * pszDir, const char * p
{
if( ! GetTempPath( HB_PATH_MAX, lpTempDir ) )
{
hb_fsSetIOError( FALSE, 0 );
return FALSE;
hb_fsSetIOError( HB_FALSE, 0 );
return HB_FALSE;
}
}
lpTempDir[ HB_PATH_MAX - 1 ] = L'\0';

2
harbour/src/rtl/gete.c
View File

@@ -189,7 +189,7 @@ HB_FUNC( HB_GETENV )
HB_FUNC( HB_SETENV )
{
const char * pszName = hb_parc( 1 );
BOOL fResult = FALSE;
HB_BOOL fResult = HB_FALSE;
if( pszName )
{

Some files were not shown because too many files have changed in this diff Show More