From 6cc5a3a4e2b740de6ff1f1b3c4ae3c92066d0f5f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 5 Dec 2001 18:44:47 +0000 Subject: [PATCH] 2001-12-05 19:44 UTC+0100 Viktor Szakats --- harbour/ChangeLog | 44 + harbour/contrib/libct/ctmath.c | 46 +- harbour/include/hbextern.ch | 1339 ++++++++++++------------------- harbour/include/hbmath.h | 54 +- harbour/source/rtl/defpath.c | 3 + harbour/source/rtl/getsys.prg | 58 +- harbour/source/rtl/math.c | 265 +++--- harbour/source/rtl/mlctopos.c | 13 +- harbour/source/rtl/mpostolc.c | 6 +- harbour/source/rtl/natmsg.c | 3 + harbour/source/rtl/oemansi.c | 4 + harbour/source/rtl/seconds.c | 4 + harbour/source/rtl/setcolor.c | 6 +- harbour/source/rtl/setposbs.c | 5 +- harbour/source/rtl/shadow.c | 4 + harbour/source/rtl/tgetlist.prg | 16 +- harbour/source/rtl/trim.c | 4 + 17 files changed, 818 insertions(+), 1056 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 13c9ab12e6..bcbf0f6104 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,47 @@ +2001-12-05 19:44 UTC+0100 Viktor Szakats + + * include/hbmath.h + * source/rtl/math.c + * contrib/libct/ctmath.c + * Renamed math handler C level functions to match the + naming system of Harbour: + hb_getMathError -> hb_mathGetError + hb_resetMathError -> hb_mathResetError + hb_isMathHandler -> hb_mathIsHandler + hb_installMathHandler -> hb_mathHandlerInstall + hb_deinstallMathHandler -> hb_mathHandlerDeinstall + hb_setMathHandlerStatus -> hb_mathHandlerSetStatus + hb_getMathHandlerStatus -> hb_mathHandlerGetStatus + HB_MATHERR* -> HB_MATH_ERR* + + * source/rtl/mlctopos.c + * source/rtl/mpostolc.c + ! Missing CVS headers added. + + * include/hbextern.ch + * source/rtl/defpath.c + * source/rtl/natmsg.c + * source/rtl/oemansi.c + * source/rtl/seconds.c + * source/rtl/setcolor.c + * source/rtl/setposbs.c + * source/rtl/shadow.c + * source/rtl/trim.c + ! Functions, features marked as extensions or + as undocumented. + * Functions reordered by category in hbextern.ch + It's now smaller, faster, and it's much more + meaningful for the eye. + ! Fixed faulty defines in hbextern.ch which + excluded the complete GETSYS function list, + when C53 compatibility was turned off. + ! Some missing symbols added to hbextern.ch + ! Removed doubly defined items from hbextern.ch + + * source/rtl/getsys.prg + * source/rtl/tgetlist.prg + * Some formatting. + 2001-12-05 14:08 GTM+1 Antonio Linares * source/vm/eval.c ! hb_evalBlock0() and hb_evalBlock1() functions added diff --git a/harbour/contrib/libct/ctmath.c b/harbour/contrib/libct/ctmath.c index c1b0c4f8a4..6827bead57 100644 --- a/harbour/contrib/libct/ctmath.c +++ b/harbour/contrib/libct/ctmath.c @@ -64,11 +64,11 @@ int ct_math_init (void) { HB_TRACE(HB_TR_DEBUG, ("ctmath_init()")); - if (hb_isMathHandler()) + if (hb_mathIsHandler()) { - s_ctMathHandler = hb_installMathHandler (ct_matherr); + s_ctMathHandler = hb_mathHandlerInstall (ct_matherr); /* CT3 math handler is inactive by default */ - hb_setMathHandlerStatus (s_ctMathHandler, CT_MATHERR_STATUS_INACTIVE); + hb_mathHandlerSetStatus (s_ctMathHandler, CT_MATHERR_STATUS_INACTIVE); return (1); } return (0); @@ -77,9 +77,9 @@ int ct_math_init (void) int ct_math_exit (void) { HB_TRACE(HB_TR_DEBUG, ("ctmath_exit()")); - if (hb_isMathHandler()) + if (hb_mathIsHandler()) { - hb_deinstallMathHandler (s_ctMathHandler); + hb_mathHandlerDeinstall (s_ctMathHandler); } return (1); } @@ -102,9 +102,9 @@ int ct_getmatherrstatus (void) void ct_matherrbegin (void) { HB_TRACE(HB_TR_DEBUG, ("ct_matherrbegin()")); - if (hb_isMathHandler() && (s_ct_matherr_status == CT_MATHERR_STATUS_ACTIVE)) + if (hb_mathIsHandler() && (s_ct_matherr_status == CT_MATHERR_STATUS_ACTIVE)) { - hb_setMathHandlerStatus (s_ctMathHandler, CT_MATHERR_STATUS_ACTIVE); + hb_mathHandlerSetStatus (s_ctMathHandler, CT_MATHERR_STATUS_ACTIVE); } return; } @@ -112,9 +112,9 @@ void ct_matherrbegin (void) void ct_matherrend (void) { HB_TRACE(HB_TR_DEBUG, ("ct_matherrend()")); - if (hb_isMathHandler()) + if (hb_mathIsHandler()) { - hb_setMathHandlerStatus (s_ctMathHandler, CT_MATHERR_STATUS_INACTIVE); + hb_mathHandlerSetStatus (s_ctMathHandler, CT_MATHERR_STATUS_INACTIVE); } return; } @@ -305,25 +305,25 @@ int ct_matherr (HB_MATH_EXCEPTION * pexc) switch (pexc->type) { - case HB_MATHERR_DOMAIN: + case HB_MATH_ERR_DOMAIN: /* a domain error has occured, such as sqrt( -1 ) */ ulSubCode = CT_ERROR_MATHLIB_DOMAIN; break; - case HB_MATHERR_SING: + case HB_MATH_ERR_SING: /* a singularity will result, such as pow( 0, -2 ) */ ulSubCode = CT_ERROR_MATHLIB_SING; break; - case HB_MATHERR_OVERFLOW: + case HB_MATH_ERR_OVERFLOW: /* an overflow will result, such as pow( 10, 100 ) */ ulSubCode = CT_ERROR_MATHLIB_OVERFLOW; break; - case HB_MATHERR_UNDERFLOW: + case HB_MATH_ERR_UNDERFLOW: /* an underflow will result, such as pow( 10, -100 ) */ ulSubCode = CT_ERROR_MATHLIB_UNDERFLOW; break; - case HB_MATHERR_TLOSS: + case HB_MATH_ERR_TLOSS: /* total loss of significance will result, such as exp( 1000 ) */ ulSubCode = CT_ERROR_MATHLIB_TLOSS; break; - case HB_MATHERR_PLOSS: + case HB_MATH_ERR_PLOSS: /* partial loss of significance will result, such as sin( 10e70 ) */ ulSubCode = CT_ERROR_MATHLIB_PLOSS; break; - default: /* HB_MATHERR_UNKNOWN */ + default: /* HB_MATH_ERR_UNKNOWN */ /* unknown math lib error */ ulSubCode = CT_ERROR_MATHLIB; break; } @@ -351,12 +351,12 @@ int ct_matherr (HB_MATH_EXCEPTION * pexc) /* find some appropiate return values */ switch (pexc->type) { - case HB_MATHERR_DOMAIN: + case HB_MATH_ERR_DOMAIN: /* a domain error has occured, such as sqrt( -1 ) */ pexc->retval = 0.0; retval = 1; break; - case HB_MATHERR_SING: + case HB_MATH_ERR_SING: /* a singularity will result, such as pow( 0, -2 ) */ if (pexc->arg1 < 0) /* it is just a guess that the resulting singularity has the same sign as the first argument */ @@ -365,7 +365,7 @@ int ct_matherr (HB_MATH_EXCEPTION * pexc) pexc->retval = DBL_MAX; retval = 1; break; - case HB_MATHERR_OVERFLOW: + case HB_MATH_ERR_OVERFLOW: /* an overflow will result, such as pow( 10, 100 ) */ if (pexc->arg1 < 0) /* it is just a guess that the resulting singularity has the same sign as the first argument */ @@ -374,7 +374,7 @@ int ct_matherr (HB_MATH_EXCEPTION * pexc) pexc->retval = DBL_MAX; retval = 1; break; - case HB_MATHERR_UNDERFLOW: + case HB_MATH_ERR_UNDERFLOW: /* an underflow will result, such as pow( 10, -100 ) */ if (pexc->arg1 < 0) /* it is just a guess that the resulting singularity has the same sign as the first argument */ @@ -383,17 +383,17 @@ int ct_matherr (HB_MATH_EXCEPTION * pexc) pexc->retval = DBL_MIN; retval = 1; break; - case HB_MATHERR_TLOSS: + case HB_MATH_ERR_TLOSS: /* total loss of significance will result, such as exp( 1000 ) */ pexc->retval = 1.0; retval = 1; break; - case HB_MATHERR_PLOSS: + case HB_MATH_ERR_PLOSS: /* partial loss of significance will result, such as sin( 10e70 ) */ pexc->retval = 1.0; retval = 1; break; - default: /* HB_MATHERR_UNKNOWN */ + default: /* HB_MATH_ERR_UNKNOWN */ /* unknown math lib error */ pexc->retval = 0.0; retval = 1; diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index 7240d2ddee..d1c840ac1e 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -55,766 +55,184 @@ #include "hbsetup.ch" -// Files from: vm -// -// -//symbols from file: vm\arrays.c -// -EXTERNAL ARRAY + +/* CA-Cl*pper compatible standard functions */ + EXTERNAL AADD -EXTERNAL ASIZE -EXTERNAL ATAIL -EXTERNAL AINS -EXTERNAL ADEL -EXTERNAL AFILL -EXTERNAL ASCAN -EXTERNAL AEVAL -EXTERNAL ACOPY +EXTERNAL ABS +EXTERNAL ACHOICE EXTERNAL ACLONE -// -//symbols from file: vm\break.c -// -EXTERNAL BREAK -// -//symbols from file: vm\classes.c -// -EXTERNAL __CLSADDMSG -EXTERNAL __CLSNEW -EXTERNAL __CLSDELMSG -EXTERNAL __CLSINST -EXTERNAL __CLSMODMSG -EXTERNAL __OBJGETCLSNAME -EXTERNAL __OBJHASMSG -EXTERNAL __OBJCLONE -EXTERNAL __OBJSENDMSG -EXTERNAL __CLSINSTSUPER -EXTERNAL __CLS_CNTCLSDATA -EXTERNAL __CLS_CNTDATA -EXTERNAL __CLS_DECDATA -EXTERNAL __CLS_INCDATA -EXTERNAL __CLASSNEW -EXTERNAL __CLASSINSTANCE -EXTERNAL __CLASSADD -EXTERNAL __CLASSNAME -EXTERNAL __CLASSSEL -EXTERNAL __GETMESSAGE -EXTERNAL __CLS_PARAM -EXTERNAL __CLSPARENT -EXTERNAL __SENDER -// -//symbols from file: vm\cmdarg.c -// -EXTERNAL HB_ARGCHECK -EXTERNAL HB_ARGSTRING -EXTERNAL HB_ARGC -EXTERNAL HB_ARGV -// -//symbols from file: vm\debug.c -// -EXTERNAL __VMSTKGCOUNT -EXTERNAL __VMSTKGLIST -EXTERNAL __VMSTKLCOUNT -EXTERNAL __VMSTKLLIST -EXTERNAL __VMPARLLIST -EXTERNAL __VMVARLGET -// -//symbols from file: vm\dynsym.c -// -#ifdef HB_EXTENSION -EXTERNAL __DYNSCOUNT -EXTERNAL __DYNSGETNAME -EXTERNAL __DYNSGETINDEX -#endif -// -//symbols from file: vm\fm.c -// -EXTERNAL MEMORY -// -//symbols from file: vm\hvm.c -// -EXTERNAL ERRORLEVEL -EXTERNAL __VMVARSLIST -EXTERNAL __VMVARSGET -// -//symbols from file: vm\initexit.c -// -EXTERNAL __QUIT -// -//symbols from file: vm\memvars.c -// -EXTERNAL __MVPUBLIC -EXTERNAL __MVPRIVATE -EXTERNAL __MVXRELEASE -EXTERNAL __MVRELEASE -EXTERNAL __MVSCOPE -EXTERNAL __MVCLEAR -EXTERNAL __MVDBGINFO -EXTERNAL __MVGET -EXTERNAL __MVPUT -EXTERNAL __MVSAVE -EXTERNAL __MVRESTORE -#ifdef HB_C52_UNDOC -EXTERNAL __QQPUB -#endif -EXTERNAL __MCLEAR -EXTERNAL __MRELEASE -EXTERNAL __MXRELEASE -EXTERNAL __MSAVE -EXTERNAL __MRESTORE -// -//symbols from file: vm\pcount.c -// -EXTERNAL PCOUNT -// -//symbols from file: vm\proc.c -// -EXTERNAL PROCNAME -EXTERNAL PROCLINE -#ifdef HB_C52_UNDOC -EXTERNAL PROCFILE -#endif -// -//symbols from file: vm\pvalue.c -// -EXTERNAL HB_PVALUE -// -//symbols from file: vm\harbinit.prg -// -EXTERNAL CLIPPER520 -#ifdef HB_COMPAT_C53 -EXTERNAL CLIPPER530 -#endif -EXTERNAL __SETHELPK -//------------------------------------------------------------ -// Files from: rtl -// -// -//symbols from file: rtl\binnum.c -// -EXTERNAL BIN2W +EXTERNAL ACOPY +EXTERNAL ADEL +EXTERNAL ADIR +EXTERNAL AEVAL +EXTERNAL AFIELDS +EXTERNAL AFILL +EXTERNAL AINS +EXTERNAL ALERT +EXTERNAL ALIAS +EXTERNAL ALLTRIM +EXTERNAL AMPM +EXTERNAL ARRAY +EXTERNAL ASC +EXTERNAL ASCAN +EXTERNAL ASIZE +EXTERNAL ASORT +EXTERNAL AT +EXTERNAL ATAIL EXTERNAL BIN2I EXTERNAL BIN2L -EXTERNAL I2BIN -EXTERNAL L2BIN -#ifdef HB_COMPAT_XPP -EXTERNAL BIN2U -EXTERNAL W2BIN -EXTERNAL U2BIN -#endif -// -//symbols from file: rtl\console.c -// -EXTERNAL HB_OSNEWLINE -EXTERNAL OUTSTD -EXTERNAL OUTERR -EXTERNAL QQOUT -EXTERNAL QOUT -EXTERNAL SETPOS -EXTERNAL SETPOSBS -EXTERNAL DEVPOS -EXTERNAL DEVOUT -EXTERNAL DISPOUT -EXTERNAL DISPOUTAT -EXTERNAL __EJECT -EXTERNAL PROW -EXTERNAL PCOL -EXTERNAL SETPRC -EXTERNAL SCROLL -EXTERNAL MAXROW -EXTERNAL MAXCOL -EXTERNAL ROW -EXTERNAL COL -EXTERNAL DISPBOX -EXTERNAL DISPBEGIN -EXTERNAL DISPEND -EXTERNAL DISPCOUNT -EXTERNAL ISCOLOR -EXTERNAL NOSNOW -EXTERNAL HB_SHADOW -#ifdef HB_C52_UNDOC -EXTERNAL DBGSHADOW -#endif -EXTERNAL SAVESCREEN -EXTERNAL RESTSCREEN -EXTERNAL SETCURSOR -EXTERNAL SETBLINK -EXTERNAL SETMODE -EXTERNAL __ACCEPT -#ifdef HB_C52_UNDOC -EXTERNAL __ACCEPTSTR -#endif -EXTERNAL HB_COLORINDEX -// -//symbols from file: rtl\copyfile.c -// -EXTERNAL __COPYFILE -// -//symbols from file: rtl\dates.c -// -EXTERNAL CTOD -EXTERNAL DTOC -EXTERNAL DTOS -#ifdef HB_COMPAT_XPP -EXTERNAL STOD -#endif -EXTERNAL HB_STOD -EXTERNAL YEAR -EXTERNAL MONTH -EXTERNAL DAY -EXTERNAL TIME -EXTERNAL DATE -EXTERNAL DOW -EXTERNAL CMONTH -EXTERNAL CDOW -EXTERNAL SECONDS -// -//symbols from file: rtl\descend.c -// -EXTERNAL DESCEND -// -//symbols from file: rtl\dir.c -// -EXTERNAL DIRECTORY -// -//symbols from file: rtl\do.c -// -EXTERNAL DO -EXTERNAL EVAL -// -//symbols from file: rtl\empty.c -// -EXTERNAL EMPTY -// -//symbols from file: rtl\environ.c -// -EXTERNAL OS -EXTERNAL HB_COMPILER -EXTERNAL VERSION -EXTERNAL GETENV -EXTERNAL GETE -EXTERNAL __RUN -// -//symbols from file: rtl\errorapi.c -// -EXTERNAL ERRORNEW -EXTERNAL __ERRINHANDLER -EXTERNAL ERRORBLOCK -EXTERNAL DOSERROR -EXTERNAL __ERRRT_BASE -EXTERNAL __ERRRT_SBASE -// -//symbols from file: rtl\filesys.c -// -EXTERNAL FOPEN -EXTERNAL FCREATE -#ifdef HB_EXTENSION -EXTERNAL HB_FCREATE -#endif -EXTERNAL FREAD -EXTERNAL FWRITE -EXTERNAL FERROR -EXTERNAL FCLOSE -EXTERNAL FERASE -EXTERNAL FRENAME -EXTERNAL FSEEK -EXTERNAL FILE -EXTERNAL FREADSTR -EXTERNAL CURDIR -EXTERNAL DISKSPACE -#ifdef HB_EXTENSION -EXTERNAL HB_DISKSPACE -#endif -EXTERNAL HB_FNAMESPLIT -EXTERNAL HB_FNAMEMERGE -#ifdef HB_COMPAT_XPP -EXTERNAL CURDRIVE -#endif -#ifdef HB_COMPAT_53 -EXTERNAL DIRCHANGE -EXTERNAL MAKEDIR -EXTERNAL DIRREMOVE -EXTERNAL ISDISK -EXTERNAL DISKCHANGE -EXTERNAL DISKNAME -EXTERNAL FSETDEVMOD -#endif -// -//symbols from file: rtl\hardcr.c -// -EXTERNAL HARDCR -// -//symbols from file: rtl\inkey.c -// -EXTERNAL INKEY -EXTERNAL __KEYBOARD -#ifdef HB_EXTENSION -EXTERNAL HB_KEYPUT -#endif -EXTERNAL NEXTKEY -EXTERNAL LASTKEY -EXTERNAL FKLABEL -EXTERNAL FKMAX -// -//symbols from file: rtl\isprint.c -// -EXTERNAL ISPRINTER -// -//symbols from file: rtl\len.c -// -EXTERNAL LEN -// -//symbols from file: rtl\math.c -// -EXTERNAL ABS -EXTERNAL EXP -EXTERNAL INT -EXTERNAL LOG -EXTERNAL MAX -EXTERNAL MIN -EXTERNAL MOD -EXTERNAL ROUND -EXTERNAL SQRT -// -//symbols from file: rtl\memofile.c -// -EXTERNAL MEMOREAD -EXTERNAL MEMOWRIT -// -//symbols from file: rtl\memoline.c -// -EXTERNAL MEMOLINE -// -//symbols from file: rtl\mlcount.c -// -EXTERNAL MLCOUNT -// -//symbols from file: rtl\mlpos.c -// -EXTERNAL MLPOS -// -//symbols from file: rtl\mouseapi.c -// -#ifdef HB_COMPAT_C53 -EXTERNAL MPRESENT -EXTERNAL MHIDE -EXTERNAL MSHOW -EXTERNAL MSETCURSOR -EXTERNAL MROW -EXTERNAL MCOL -EXTERNAL MSETPOS -EXTERNAL MRIGHTDOWN -EXTERNAL MLEFTDOWN -EXTERNAL MDBLCLK -EXTERNAL MSAVESTATE -EXTERNAL MRESTSTATE -EXTERNAL MSETBOUNDS -#endif -#ifdef HB_COMPAT_XPP -EXTERNAL NUMBUTTONS -EXTERNAL SETMOUSE -#endif -// -//symbols from file: rtl\mtran.c -// -EXTERNAL MEMOTRAN -// -//symbols from file: rtl\natmsg.c -// -EXTERNAL ISAFFIRM -EXTERNAL ISNEGATIVE -EXTERNAL NATIONMSG -EXTERNAL _NATSORTVER -EXTERNAL _NATMSGVER -// -//symbols from file: rtl\net.c -// -EXTERNAL NETNAME -// -//symbols from file: rtl\oemansi.c -// -EXTERNAL HB_ANSITOOEM -EXTERNAL HB_OEMTOANSI -#ifdef HB_COMPAT_XPP -EXTERNAL CONVTOOEMCP -EXTERNAL CONVTOANSICP -#endif -// -//symbols from file: rtl\oldbox.c -// -#ifdef HB_C52_UNDOC -EXTERNAL __BOX -EXTERNAL __BOXD -EXTERNAL __BOXS -#endif -// -//symbols from file: rtl\oldclear.c -// -#ifdef HB_C52_UNDOC -EXTERNAL __ATCLEAR -EXTERNAL __CLEAR -#endif -// -//symbols from file: rtl\samples.c -// -EXTERNAL AMPM -EXTERNAL DAYS -EXTERNAL ELAPTIME -EXTERNAL LENNUM -EXTERNAL SECS -EXTERNAL TSTRING -// -//symbols from file: rtl\set.c -// -EXTERNAL SETCANCEL -EXTERNAL __SETCENTURY -EXTERNAL SET -EXTERNAL DEFPATH -EXTERNAL __DEFPATH -// -//symbols from file: rtl\setcolor.c -// -EXTERNAL SETCOLOR -EXTERNAL COLORSELECT -// -//symbols from file: rtl\soundex.c -// -EXTERNAL SOUNDEX -// -//symbols from file: rtl\strings.c -// -EXTERNAL ISALPHA -EXTERNAL ISDIGIT -EXTERNAL ISUPPER -EXTERNAL ISLOWER -EXTERNAL LTRIM -EXTERNAL RTRIM -EXTERNAL TRIM -EXTERNAL ALLTRIM -EXTERNAL PADR -EXTERNAL PAD -EXTERNAL PADL -EXTERNAL PADC -EXTERNAL AT -EXTERNAL RAT -EXTERNAL CHR -EXTERNAL ASC -EXTERNAL LEFT -EXTERNAL RIGHT -EXTERNAL SUBSTR -EXTERNAL LOWER -EXTERNAL UPPER -EXTERNAL REPLICATE -EXTERNAL SPACE -EXTERNAL STUFF -EXTERNAL STRTRAN -EXTERNAL VAL -EXTERNAL STR -EXTERNAL STRZERO -#ifdef HB_EXTENSION -EXTERNAL HB_VALTOSTR -#endif -// -//symbols from file: rtl\tone.c -// -EXTERNAL TONE -// -//symbols from file: rtl\trace.c -// -#ifdef HB_EXTENSION -EXTERNAL HB_TRACESTATE -EXTERNAL HB_TRACELEVEL -#endif -// -//symbols from file: rtl\transfrm.c -// -EXTERNAL TRANSFORM -// -//symbols from file: rtl\type.c -// -EXTERNAL TYPE -// -//symbols from file: rtl\valtype.c -// -EXTERNAL VALTYPE -// -//symbols from file: rtl\word.c -// -EXTERNAL WORD -// -//symbols from file: rtl\xhelp.c -// -EXTERNAL __XHELP -// -//symbols from file: rtl\achoice.prg -// -EXTERNAL ACHOICE -// -//symbols from file: rtl\adir.prg -// -EXTERNAL ADIR -// -//symbols from file: rtl\alert.prg -// -EXTERNAL ALERT -#ifdef HB_C52_UNDOC -EXTERNAL __NONOALERT -#endif -// -//symbols from file: rtl\asort.prg -// -EXTERNAL ASORT -// -//symbols from file: rtl\browdb.prg -// -EXTERNAL TBROWSEDB -#ifdef HB_COMPAT_XPP -EXTERNAL DBSKIPPER -#endif -// -//symbols from file: rtl\browse.prg -// -EXTERNAL BROWSE -// -//symbols from file: rtl\dbedit.prg -// -EXTERNAL DBEDIT -// -//symbols from file: rtl\devoutp.prg -// -EXTERNAL DEVOUTPICT -// -//symbols from file: rtl\dircmd.prg -// -EXTERNAL __DIR -// -//symbols from file: rtl\dummy.prg -// -EXTERNAL ORDSCOPE -#ifdef HB_COMPAT_C53 -EXTERNAL ORDCOND -EXTERNAL ORDDESCEND -EXTERNAL ORDISUNIQUE -EXTERNAL ORDKEYADD -EXTERNAL ORDKEYCOUNT -EXTERNAL ORDKEYDEL -EXTERNAL ORDKEYGOTO -EXTERNAL ORDKEYNO -EXTERNAL ORDKEYVAL -EXTERNAL ORDSETRELATION -EXTERNAL ORDSKIPUNIQUE -#endif -#ifdef HB_COMPAT_C53 -EXTERNAL DBFILEGET -EXTERNAL DBFILEPUT -EXTERNAL DBINFO -EXTERNAL DBORDERINFO -EXTERNAL DBRECORDINFO -EXTERNAL DBFIELDINFO -#endif -EXTERNAL DBSETRELATION -EXTERNAL DBCLEARRELATION -EXTERNAL MEMOEDIT -EXTERNAL MLCTOPOS -EXTERNAL MPOSTOLC -EXTERNAL __DBAPP -EXTERNAL __DBCOPY -EXTERNAL __DBDELIM -EXTERNAL __DBJOIN -EXTERNAL __DBLIST -EXTERNAL __DBSDF -EXTERNAL __DBSORT -EXTERNAL __DBTOTAL -EXTERNAL __DBUPDATE -EXTERNAL __DBARRANGE -EXTERNAL __DBFLIST -EXTERNAL __DBOPENSDF -EXTERNAL __DBTRANS -EXTERNAL __DBTRANSREC -// -//symbols from file: rtl\fieldbl.prg -// -EXTERNAL FIELDBLOCK -EXTERNAL FIELDWBLOCK -// -//symbols from file: rtl\input.prg -// -#ifdef HB_C52_UNDOC -EXTERNAL __INPUT -#endif -// -//symbols from file: rtl\memvarbl.prg -// -EXTERNAL MEMVARBLOCK -// -//symbols from file: rtl\menuto.prg -// -EXTERNAL __ATPROMPT -EXTERNAL __MENUTO -// -//symbols from file: rtl\objfunc.prg -// -EXTERNAL __OBJHASDATA -EXTERNAL __OBJHASMETHOD -EXTERNAL __OBJGETMSGLIST -EXTERNAL __OBJGETMETHODLIST -EXTERNAL __OBJGETVALUELIST -EXTERNAL __OBJSETVALUELIST -EXTERNAL __OBJADDMETHOD -EXTERNAL __OBJADDINLINE -EXTERNAL __OBJADDDATA -EXTERNAL __OBJMODMETHOD -EXTERNAL __OBJMODINLINE -EXTERNAL __OBJDELMETHOD -EXTERNAL __OBJDELINLINE -EXTERNAL __OBJDELDATA -EXTERNAL __OBJDERIVEDFROM //Added by RaC&JfL -// -//symbols from file: rtl\readkey.prg -// -EXTERNAL READKEY -// -//symbols from file: rtl\setkey.c -// -EXTERNAL SETKEY -#ifdef HB_EXTENSION -EXTERNAL HB_SETKEYARRAY -EXTERNAL HB_SETKEYGET -EXTERNAL HB_SETKEYSAVE -EXTERNAL HB_SETKEYCHECK -#endif -// -//symbols from file: rtl\setta.prg -// -#ifdef HB_C52_UNDOC -EXTERNAL SETTYPEAHEAD -#endif -// -//symbols from file: rtl\tbcolumn.prg -// -EXTERNAL TBCOLUMNNEW -// -//symbols from file: rtl\tbrowse.prg -// -EXTERNAL TBROWSENEW -// -//symbols from file: rtl\tclass.prg -// -EXTERNAL HBCLASS -//symbols from file:rtl\tobject.prg -// -EXTERNAL HBOBJECT -// -//symbols from file: rtl\text.prg -// -EXTERNAL __TEXTSAVE -EXTERNAL __TEXTRESTORE -// -//symbols from file: rtl\tget.prg -// -EXTERNAL GETNEW -EXTERNAL __GET -EXTERNAL __GETA -// -//symbols from file: rtl\tgetlist.prg -// -EXTERNAL READMODAL -EXTERNAL GETREADER -EXTERNAL GETPREVALIDATE -EXTERNAL GETPOSTVALIDATE -EXTERNAL GETDOSETKEY -EXTERNAL READFORMAT -EXTERNAL __SETFORMAT -EXTERNAL READKILL -EXTERNAL __KILLREAD -EXTERNAL GETACTIVE -EXTERNAL READVAR -EXTERNAL READEXIT -EXTERNAL READINSERT -EXTERNAL READUPDATED -EXTERNAL UPDATED -EXTERNAL GETAPPLYKEY -// -//symbols from file: rtl\tlabel.prg -// -EXTERNAL __LABELFORM -// -//symbols from file: rtl\treport.prg -// -EXTERNAL __REPORTFORM -// -//symbols from file: rtl\typefile.prg -// -EXTERNAL __TYPEFILE -// -//symbols from file: rtl\wait.prg -// -EXTERNAL __WAIT -// -//symbols from file: rtl\xsavescr.prg -// -EXTERNAL __XSAVESCREEN -EXTERNAL __XRESTSCREEN -//------------------------------------------------------------ -// Files from: rdd -// -// -//symbols from file: rdd\dbcmd.c -// -EXTERNAL _DBF -EXTERNAL _SDF -EXTERNAL _DELIM -EXTERNAL RDDSYS -EXTERNAL AFIELDS -EXTERNAL ALIAS -EXTERNAL DBEVAL -EXTERNAL DBF +EXTERNAL BIN2W EXTERNAL BOF +EXTERNAL BREAK +EXTERNAL BROWSE +EXTERNAL CDOW +EXTERNAL CHR +EXTERNAL CMONTH +EXTERNAL COL +EXTERNAL COLORSELECT +EXTERNAL CTOD +EXTERNAL CURDIR +EXTERNAL DATE +EXTERNAL DAY +EXTERNAL DAYS EXTERNAL DBAPPEND EXTERNAL DBCLEARFILTER +EXTERNAL DBCLEARINDEX +EXTERNAL DBCLEARRELATION EXTERNAL DBCLOSEALL EXTERNAL DBCLOSEAREA EXTERNAL DBCOMMIT EXTERNAL DBCOMMITALL -EXTERNAL __DBCONTINUE EXTERNAL DBCREATE +EXTERNAL DBCREATEINDEX EXTERNAL DBDELETE +EXTERNAL DBEDIT +EXTERNAL DBEVAL EXTERNAL DBFILTER EXTERNAL DBGOBOTTOM EXTERNAL DBGOTO EXTERNAL DBGOTOP -EXTERNAL __DBLOCATE -EXTERNAL __DBSETLOCATE -EXTERNAL __DBPACK EXTERNAL DBRECALL +EXTERNAL DBREINDEX EXTERNAL DBRLOCK EXTERNAL DBRLOCKLIST EXTERNAL DBRUNLOCK EXTERNAL DBSEEK EXTERNAL DBSELECTAREA -EXTERNAL __DBSETFOUND -EXTERNAL DBSKIP +EXTERNAL DBSETDRIVER EXTERNAL DBSETFILTER +EXTERNAL DBSETINDEX +EXTERNAL DBSETORDER +EXTERNAL DBSETRELATION +EXTERNAL DBSKIP EXTERNAL DBSTRUCT -EXTERNAL DBTABLEEXT EXTERNAL DBUNLOCK EXTERNAL DBUNLOCKALL EXTERNAL DBUSEAREA -EXTERNAL __DBZAP EXTERNAL DELETED +EXTERNAL DESCEND +EXTERNAL DEVOUT +EXTERNAL DEVOUTPICT +EXTERNAL DEVPOS +EXTERNAL DIRECTORY +EXTERNAL DISKSPACE +EXTERNAL DISPBEGIN +EXTERNAL DISPBOX +EXTERNAL DISPCOUNT +EXTERNAL DISPEND +EXTERNAL DISPOUT +EXTERNAL DISPOUTAT /* Undocumented but always required */ +EXTERNAL DO +EXTERNAL DOSERROR +EXTERNAL DOW +EXTERNAL DTOC +EXTERNAL DTOS +EXTERNAL ELAPTIME +EXTERNAL EMPTY EXTERNAL EOF +EXTERNAL ERRORBLOCK +EXTERNAL ERRORLEVEL +EXTERNAL ERRORNEW +EXTERNAL EVAL +EXTERNAL EXP +EXTERNAL FCLOSE EXTERNAL FCOUNT +EXTERNAL FCREATE +EXTERNAL FERASE +EXTERNAL FERROR +EXTERNAL FIELDBLOCK EXTERNAL FIELDGET EXTERNAL FIELDNAME EXTERNAL FIELDPOS EXTERNAL FIELDPUT +EXTERNAL FIELDWBLOCK +EXTERNAL FILE +EXTERNAL FKLABEL +EXTERNAL FKMAX EXTERNAL FLOCK +EXTERNAL FOPEN EXTERNAL FOUND +EXTERNAL FREAD +EXTERNAL FREADSTR +EXTERNAL FRENAME +EXTERNAL FSEEK +EXTERNAL FWRITE +EXTERNAL GETACTIVE +EXTERNAL GETAPPLYKEY +EXTERNAL GETDOSETKEY +EXTERNAL GETE +EXTERNAL GETENV +EXTERNAL GETNEW +EXTERNAL GETPOSTVALIDATE +EXTERNAL GETPREVALIDATE +EXTERNAL GETREADER +EXTERNAL HARDCR EXTERNAL HEADER +EXTERNAL I2BIN +EXTERNAL INDEXEXT +EXTERNAL INDEXKEY EXTERNAL INDEXORD +EXTERNAL INKEY +EXTERNAL INT +EXTERNAL ISALPHA +EXTERNAL ISCOLOR +EXTERNAL ISDIGIT +EXTERNAL ISLOWER +EXTERNAL ISPRINTER +EXTERNAL ISUPPER +EXTERNAL L2BIN +EXTERNAL LASTKEY EXTERNAL LASTREC +EXTERNAL LEFT +EXTERNAL LEN +EXTERNAL LENNUM EXTERNAL LOCK +EXTERNAL LOG +EXTERNAL LOWER +EXTERNAL LTRIM EXTERNAL LUPDATE +EXTERNAL MAX +EXTERNAL MAXCOL +EXTERNAL MAXROW +EXTERNAL MEMOEDIT +EXTERNAL MEMOLINE +EXTERNAL MEMOREAD +EXTERNAL MEMORY +EXTERNAL MEMOTRAN +EXTERNAL MEMOWRIT +EXTERNAL MEMVARBLOCK +EXTERNAL MIN +EXTERNAL MLCOUNT +EXTERNAL MLCTOPOS +EXTERNAL MLPOS +EXTERNAL MOD +EXTERNAL MONTH +EXTERNAL MPOSTOLC EXTERNAL NETERR +EXTERNAL NETNAME +EXTERNAL NEXTKEY +EXTERNAL NOSNOW EXTERNAL ORDBAGEXT EXTERNAL ORDBAGNAME EXTERNAL ORDCONDSET @@ -827,153 +245,402 @@ EXTERNAL ORDLISTCLEAR EXTERNAL ORDLISTREBUILD EXTERNAL ORDNAME EXTERNAL ORDNUMBER +EXTERNAL ORDSCOPE EXTERNAL ORDSETFOCUS +EXTERNAL OS +EXTERNAL OUTERR +EXTERNAL OUTSTD +EXTERNAL PAD +EXTERNAL PADC +EXTERNAL PADL +EXTERNAL PADR +EXTERNAL PCOL +EXTERNAL PCOUNT +EXTERNAL PROCLINE +EXTERNAL PROCNAME +EXTERNAL PROW +EXTERNAL QOUT +EXTERNAL QQOUT +EXTERNAL RANGECHECK /* Undocumented but always required */ +EXTERNAL RAT EXTERNAL RDDLIST EXTERNAL RDDNAME EXTERNAL RDDREGISTER +EXTERNAL RDDSETDEFAULT +EXTERNAL READEXIT +EXTERNAL READFORMAT +EXTERNAL READINSERT +EXTERNAL READKEY +EXTERNAL READKILL +EXTERNAL READMODAL +EXTERNAL READUPDATED +EXTERNAL READVAR EXTERNAL RECCOUNT EXTERNAL RECNO EXTERNAL RECSIZE +EXTERNAL REPLICATE +EXTERNAL RESTSCREEN +EXTERNAL RIGHT EXTERNAL RLOCK +EXTERNAL ROUND +EXTERNAL ROW +EXTERNAL RTRIM +EXTERNAL SAVESCREEN +EXTERNAL SCROLL +EXTERNAL SECONDS +EXTERNAL SECS EXTERNAL SELECT +EXTERNAL SET +EXTERNAL SETBLINK +EXTERNAL SETCANCEL +EXTERNAL SETCOLOR +EXTERNAL SETCURSOR +EXTERNAL SETKEY +EXTERNAL SETMODE +EXTERNAL SETPOS +EXTERNAL SETPOSBS /* Undocumented but always required */ +EXTERNAL SETPRC +EXTERNAL SOUNDEX +EXTERNAL SPACE +EXTERNAL SQRT +EXTERNAL STR +EXTERNAL STRTRAN +EXTERNAL STRZERO +EXTERNAL STUFF +EXTERNAL SUBSTR +EXTERNAL TBCOLUMNNEW +EXTERNAL TBROWSEDB +EXTERNAL TBROWSENEW +EXTERNAL TIME +EXTERNAL TONE +EXTERNAL TRANSFORM +EXTERNAL TRIM +EXTERNAL TSTRING +EXTERNAL TYPE +EXTERNAL UPDATED +EXTERNAL UPPER EXTERNAL USED -EXTERNAL __RDDSETDEFAULT -EXTERNAL RDDSETDEFAULT -EXTERNAL DBSETDRIVER +EXTERNAL VAL +EXTERNAL VALTYPE +EXTERNAL VERSION +EXTERNAL WORD +EXTERNAL YEAR -EXTERNAL DBFCDX -// -//symbols from file: rdd\dbf1.c -// -EXTERNAL _DBFC -EXTERNAL DBF_GETFUNCTABLE -// -//symbols from file: rdd\dbnubs.c -// -EXTERNAL DBREINDEX -EXTERNAL DBCREATEINDEX -EXTERNAL DBCLEARINDEX -EXTERNAL DBSETINDEX -EXTERNAL DBSETORDER -#ifdef HB_C52_UNDOC -EXTERNAL __DBSEEK -EXTERNAL __DBSKIP -EXTERNAL __DBGOTOP -EXTERNAL __DBGOBOTTOM -EXTERNAL __DBGOTO -EXTERNAL __DBAPPEND -EXTERNAL __DBDELETE -EXTERNAL __DBRECALL -EXTERNAL __DBCOMMIT -EXTERNAL __DBCOMMITALL -EXTERNAL __DBUNLOCK -EXTERNAL __DBUNLALL -EXTERNAL __DBSETFILTER -EXTERNAL __DBCLEARRELATION -EXTERNAL __DBSETRELATION -EXTERNAL __DBREINDEX -EXTERNAL __DBCREATINDEX -EXTERNAL __DBCLEARINDEX -EXTERNAL __DBSETINDEX -EXTERNAL __DBSETORDER -EXTERNAL __DBCLOSEAREA -EXTERNAL __DBCLOSE -EXTERNAL __DBUSE -EXTERNAL __DBSELECT -#endif -// -//symbols from file: rdd\delim1.c -// -EXTERNAL _DELIMC -EXTERNAL DELIM_GETFUNCTABLE -// -//symbols from file: rdd\sdf1.c -// -EXTERNAL _SDFC -EXTERNAL SDF_GETFUNCTABLE -// -//symbols from file: rdd\dbstrux.prg -// +/* Harbour extensions, always on */ + +EXTERNAL HB_ARGC +EXTERNAL HB_ARGCHECK +EXTERNAL HB_ARGSTRING +EXTERNAL HB_ARGV +EXTERNAL HB_COLORINDEX +EXTERNAL HB_COMPILER +EXTERNAL HB_FNAMEMERGE +EXTERNAL HB_FNAMESPLIT +EXTERNAL HB_LANGNAME +EXTERNAL HB_LANGSELECT +EXTERNAL HB_OSNEWLINE +EXTERNAL HB_PVALUE +EXTERNAL HB_STOD +EXTERNAL HBCLASS +EXTERNAL HBOBJECT + +/* CA-Cl*pper compatible internal functions */ + +EXTERNAL CLIPPER520 +EXTERNAL __ACCEPT +EXTERNAL __ATPROMPT +EXTERNAL __COPYFILE +EXTERNAL __DBAPP +EXTERNAL __DBARRANGE +EXTERNAL __DBCONTINUE +EXTERNAL __DBCOPY EXTERNAL __DBCOPYSTRUCT EXTERNAL __DBCOPYXSTRUCT EXTERNAL __DBCREATE -#ifdef HB_C52_UNDOC -EXTERNAL __FLEDIT -#endif +EXTERNAL __DBDELIM +EXTERNAL __DBFLIST +EXTERNAL __DBJOIN +EXTERNAL __DBLIST +EXTERNAL __DBLOCATE +EXTERNAL __DBOPENSDF +EXTERNAL __DBPACK +EXTERNAL __DBSDF +EXTERNAL __DBSETFOUND +EXTERNAL __DBSETLOCATE +EXTERNAL __DBSORT EXTERNAL __DBSTRUCTFILTER -// -//symbols from file: rdd\rddord.prg -// -EXTERNAL INDEXEXT -EXTERNAL INDEXKEY -//------------------------------------------------------------ -// Files from: pp -// -// -//symbols from file: pp\hbpplib.c -// -#ifdef HB_EXTENSION -EXTERNAL __PREPROCESS -#endif +EXTERNAL __DBTOTAL +EXTERNAL __DBTRANS +EXTERNAL __DBTRANSREC +EXTERNAL __DBUPDATE +EXTERNAL __DBZAP +EXTERNAL __DIR +EXTERNAL __EJECT +EXTERNAL __GET +EXTERNAL __GETA +EXTERNAL __GETMESSAGE +EXTERNAL __KEYBOARD +EXTERNAL __KILLREAD +EXTERNAL __LABELFORM +EXTERNAL __MCLEAR +EXTERNAL __MENUTO +EXTERNAL __MRELEASE +EXTERNAL __MRESTORE +EXTERNAL __MSAVE +EXTERNAL __MXRELEASE +EXTERNAL __QUIT +EXTERNAL __RDDSETDEFAULT +EXTERNAL __REPORTFORM +EXTERNAL __RUN +EXTERNAL __SETCENTURY +EXTERNAL __SETFORMAT +EXTERNAL __SETHELPK +EXTERNAL __TEXTRESTORE +EXTERNAL __TEXTSAVE +EXTERNAL __TYPEFILE +EXTERNAL __WAIT +EXTERNAL __XHELP +EXTERNAL __XRESTSCREEN +EXTERNAL __XSAVESCREEN -#ifdef HB_EXTENSION -EXTERNAL HB_FSIZE -EXTERNAL HB_FTEMPCREATE -#endif +/* Harbour internal functions /* +EXTERNAL __CLASSADD +EXTERNAL __CLASSINSTANCE +EXTERNAL __CLASSNAME +EXTERNAL __CLASSNEW +EXTERNAL __CLASSSEL +EXTERNAL __CLS_CNTCLSDATA +EXTERNAL __CLS_CNTDATA +EXTERNAL __CLS_DECDATA +EXTERNAL __CLS_INCDATA +EXTERNAL __CLS_PARAM +EXTERNAL __CLSADDMSG +EXTERNAL __CLSDELMSG +EXTERNAL __CLSINST +EXTERNAL __CLSINSTSUPER +EXTERNAL __CLSMODMSG +EXTERNAL __CLSNEW +EXTERNAL __CLSPARENT +EXTERNAL __ERRINHANDLER +EXTERNAL __ERRRT_BASE +EXTERNAL __ERRRT_SBASE EXTERNAL __HRBRUN +EXTERNAL __MVCLEAR +EXTERNAL __MVDBGINFO +EXTERNAL __MVGET +EXTERNAL __MVPRIVATE +EXTERNAL __MVPUBLIC +EXTERNAL __MVPUT +EXTERNAL __MVRELEASE +EXTERNAL __MVRESTORE +EXTERNAL __MVSAVE +EXTERNAL __MVSCOPE +EXTERNAL __MVXRELEASE +EXTERNAL __OBJADDDATA +EXTERNAL __OBJADDINLINE +EXTERNAL __OBJADDMETHOD +EXTERNAL __OBJCLONE +EXTERNAL __OBJDELDATA +EXTERNAL __OBJDELINLINE +EXTERNAL __OBJDELMETHOD +EXTERNAL __OBJDERIVEDFROM +EXTERNAL __OBJGETCLSNAME +EXTERNAL __OBJGETMETHODLIST +EXTERNAL __OBJGETMSGLIST +EXTERNAL __OBJGETVALUELIST +EXTERNAL __OBJHASDATA +EXTERNAL __OBJHASMETHOD +EXTERNAL __OBJHASMSG +EXTERNAL __OBJMODINLINE +EXTERNAL __OBJMODMETHOD +EXTERNAL __OBJSENDMSG +EXTERNAL __OBJSETVALUELIST +EXTERNAL __SENDER +EXTERNAL __VMPARLLIST +EXTERNAL __VMSTKGCOUNT +EXTERNAL __VMSTKGLIST +EXTERNAL __VMSTKLCOUNT +EXTERNAL __VMSTKLLIST +EXTERNAL __VMVARLGET +EXTERNAL __VMVARSGET +EXTERNAL __VMVARSLIST -EXTERNAL HB_LANGSELECT -EXTERNAL HB_LANGNAME +/* RDD related symbols */ + +EXTERNAL _DBF +EXTERNAL _DBFC +EXTERNAL _DBFCDX +EXTERNAL _DBFNTX +EXTERNAL _DELIM +EXTERNAL _DELIMC +EXTERNAL _SDF +EXTERNAL _SDFC +EXTERNAL DBF +EXTERNAL DBF_GETFUNCTABLE +EXTERNAL DBFCDX +EXTERNAL DBFCDX_GETFUNCTABLE +EXTERNAL DBFNTX_GETFUNCTABLE +EXTERNAL DBTABLEEXT +EXTERNAL DELIM_GETFUNCTABLE +EXTERNAL RDDSYS +EXTERNAL SDF_GETFUNCTABLE + +/* CA-Cl*pper 5.2 compatible undocumented functions */ + +#ifdef HB_C52_UNDOC + +EXTERNAL __ACCEPTSTR +EXTERNAL __ATCLEAR +EXTERNAL __BOX +EXTERNAL __BOXD +EXTERNAL __BOXS +EXTERNAL __CLEAR +EXTERNAL __DBAPPEND +EXTERNAL __DBCLEARINDEX +EXTERNAL __DBCLEARRELATION +EXTERNAL __DBCLOSE +EXTERNAL __DBCLOSEAREA +EXTERNAL __DBCOMMIT +EXTERNAL __DBCOMMITALL +EXTERNAL __DBCREATINDEX +EXTERNAL __DBDELETE +EXTERNAL __DBGOBOTTOM +EXTERNAL __DBGOTO +EXTERNAL __DBGOTOP +EXTERNAL __DBRECALL +EXTERNAL __DBREINDEX +EXTERNAL __DBSEEK +EXTERNAL __DBSELECT +EXTERNAL __DBSETFILTER +EXTERNAL __DBSETINDEX +EXTERNAL __DBSETORDER +EXTERNAL __DBSETRELATION +EXTERNAL __DBSKIP +EXTERNAL __DBUNLALL +EXTERNAL __DBUNLOCK +EXTERNAL __DBUSE +EXTERNAL __DEFPATH +EXTERNAL __FLEDIT +EXTERNAL __INPUT +EXTERNAL __NONOALERT +EXTERNAL __QQPUB +EXTERNAL _NATMSGVER +EXTERNAL _NATSORTVER +EXTERNAL DBGSHADOW +EXTERNAL DEFPATH +EXTERNAL ISAFFIRM +EXTERNAL ISNEGATIVE +EXTERNAL NATIONMSG +EXTERNAL PROCFILE +EXTERNAL SETTYPEAHEAD + +#endif /* HB_C52_UNDOC */ + +/* CA-Cl*pper 5.3 compatible functions */ #ifdef HB_COMPAT_C53 -EXTERNAL TOPBAR -EXTERNAL POPUP -EXTERNAL MENUITEM -EXTERNAL RADIOBUTTO + EXTERNAL __CAPTION -EXTERNAL CHECKBOX EXTERNAL __GUICOLOR EXTERNAL _CHECKBOX_ -EXTERNAL ISDEFCOLOR -EXTERNAL RADIOGROUP EXTERNAL _RADIOGRP_ - -EXTERNAL READMODAL -EXTERNAL GETREADER -EXTERNAL GETACTIVE -EXTERNAL GETDOSETKEY -EXTERNAL GETAPPLYKEY -EXTERNAL GETPREVALIDATE -EXTERNAL GETPOSTVALIDATE -EXTERNAL READEXIT -EXTERNAL READINSERT -EXTERNAL READUPDATED -EXTERNAL UPDATED -EXTERNAL READKILL -EXTERNAL __KILLREAD -EXTERNAL __SETFORMAT -EXTERNAL READFORMAT -EXTERNAL RANGECHECK -EXTERNAL GUIREADER +EXTERNAL CHECKBOX +EXTERNAL CLIPPER530 +EXTERNAL DBFIELDINFO +EXTERNAL DBFILEGET +EXTERNAL DBFILEPUT +EXTERNAL DBINFO +EXTERNAL DBORDERINFO +EXTERNAL DBRECORDINFO +EXTERNAL DIRCHANGE +EXTERNAL DIRREMOVE +EXTERNAL DISKCHANGE +EXTERNAL DISKNAME +EXTERNAL FSETDEVMOD EXTERNAL GUIAPPLYKEY -EXTERNAL GUIGETPREVALIDATE EXTERNAL GUIGETPOSTVALIDATE +EXTERNAL GUIGETPREVALIDATE +EXTERNAL GUIREADER +EXTERNAL ISDEFCOLOR +EXTERNAL ISDISK +EXTERNAL MAKEDIR +EXTERNAL MCOL +EXTERNAL MDBLCLK +EXTERNAL MENUITEM +EXTERNAL MHIDE +EXTERNAL MLEFTDOWN +EXTERNAL MPRESENT +EXTERNAL MRESTSTATE +EXTERNAL MRIGHTDOWN +EXTERNAL MROW +EXTERNAL MSAVESTATE +EXTERNAL MSETBOUNDS +EXTERNAL MSETCURSOR +EXTERNAL MSETPOS +EXTERNAL MSHOW +EXTERNAL ORDCOND +EXTERNAL ORDDESCEND +EXTERNAL ORDISUNIQUE +EXTERNAL ORDKEYADD +EXTERNAL ORDKEYCOUNT +EXTERNAL ORDKEYDEL +EXTERNAL ORDKEYGOTO +EXTERNAL ORDKEYNO +EXTERNAL ORDKEYVAL +EXTERNAL ORDSETRELATION +EXTERNAL ORDSKIPUNIQUE +EXTERNAL POPUP +EXTERNAL RADIOBUTTO +EXTERNAL RADIOGROUP +EXTERNAL TOPBAR -EXTERNAL _DBFCDX -EXTERNAL DBFCDX_GETFUNCTABLE -// -//symbols from file: ..\..\source\rdd\dbfcdx\dbfcdx0.prg -// -//------------------------------------------------------------ -// Files from: ..\..\source\rdd\dbfntx -// -// -//symbols from file: ..\..\source\rdd\dbfntx\dbfntx1.c -// -EXTERNAL _DBFNTX -EXTERNAL DBFNTX_GETFUNCTABLE +#endif /* HB_COMPAT_C53 */ -#endif +/* Xbase++ compatible functions */ + +#ifdef HB_COMPAT_XPP + +EXTERNAL BIN2U +EXTERNAL CONVTOANSICP +EXTERNAL CONVTOOEMCP +EXTERNAL CURDRIVE +EXTERNAL DBSKIPPER +EXTERNAL NUMBUTTONS +EXTERNAL SETMOUSE +EXTERNAL STOD +EXTERNAL U2BIN +EXTERNAL W2BIN + +#endif /* HB_COMPAT_XPP */ + +/* Harbour extensions */ + +#ifdef HB_EXTENSION + +EXTERNAL __DYNSCOUNT +EXTERNAL __DYNSGETINDEX +EXTERNAL __DYNSGETNAME +EXTERNAL __PREPROCESS +EXTERNAL HB_ANSITOOEM +EXTERNAL HB_CLOCKS2SECS +EXTERNAL HB_CLRAREA +EXTERNAL HB_COLORTON +EXTERNAL HB_DISKSPACE +EXTERNAL HB_FCREATE +EXTERNAL HB_FSIZE +EXTERNAL HB_FTEMPCREATE +EXTERNAL HB_KEYPUT +EXTERNAL HB_OEMTOANSI +EXTERNAL HB_SETKEYARRAY +EXTERNAL HB_SETKEYCHECK +EXTERNAL HB_SETKEYGET +EXTERNAL HB_SETKEYSAVE +EXTERNAL HB_SHADOW +EXTERNAL HB_TRACELEVEL +EXTERNAL HB_TRACESTATE +EXTERNAL HB_VALTOSTR + +#endif /* HB_EXTENSION */ #endif /* HB_EXTERN_CH_ */ diff --git a/harbour/include/hbmath.h b/harbour/include/hbmath.h index 75100f09e2..b9888d2c32 100644 --- a/harbour/include/hbmath.h +++ b/harbour/include/hbmath.h @@ -55,6 +55,7 @@ #define HB_MATH_H_ #include "hbapi.h" + #include #if defined(HB_EXTERN_C) @@ -83,45 +84,44 @@ extern "C" { #define exception _exception #endif -extern int hb_getMathError (void); -extern void hb_resetMathError (void); -extern int hb_isMathHandler (void); - typedef struct _HB_MATH_EXCEPTION { - int type; - char *name; - double arg1; - double arg2; - double retval; + int type; + char * name; + double arg1; + double arg2; + double retval; } HB_MATH_EXCEPTION; -typedef int (* HB_MATH_HANDLERPROC)(HB_MATH_EXCEPTION *err); +typedef int ( * HB_MATH_HANDLERPROC )( HB_MATH_EXCEPTION * err ); typedef struct HB_MATH_HANDLERCHAINELEMENT_ { - HB_MATH_HANDLERPROC handlerproc; - int status; - struct HB_MATH_HANDLERCHAINELEMENT_ * pnext; + HB_MATH_HANDLERPROC handlerproc; + int status; + struct HB_MATH_HANDLERCHAINELEMENT_ * pnext; } HB_MATH_HANDLERCHAINELEMENT, * PHB_MATH_HANDLERCHAINELEMENT; typedef PHB_MATH_HANDLERCHAINELEMENT HB_MATH_HANDLERHANDLE; -extern HB_MATH_HANDLERHANDLE hb_installMathHandler (HB_MATH_HANDLERPROC handlerproc); -extern int hb_deinstallMathHandler (HB_MATH_HANDLERHANDLE handle); -extern int hb_setMathHandlerStatus (HB_MATH_HANDLERHANDLE handle, int status); -extern int hb_getMathHandlerStatus (HB_MATH_HANDLERHANDLE handle); +extern int hb_mathGetError( void ); +extern void hb_mathResetError( void ); +extern int hb_mathIsHandler( void ); +extern HB_MATH_HANDLERHANDLE hb_mathHandlerInstall( HB_MATH_HANDLERPROC handlerproc ); +extern int hb_mathHandlerDeinstall( HB_MATH_HANDLERHANDLE handle ); +extern int hb_mathHandlerSetStatus( HB_MATH_HANDLERHANDLE handle, int status ); +extern int hb_mathHandlerGetStatus( HB_MATH_HANDLERHANDLE handle ); -#define HB_MATH_HANDLER_STATUS_NOTFOUND ((int)-1) -#define HB_MATH_HANDLER_STATUS_INACTIVE ((int)0) -#define HB_MATH_HANDLER_STATUS_ACTIVE ((int)1) +#define HB_MATH_HANDLER_STATUS_NOTFOUND ( ( int ) -1 ) +#define HB_MATH_HANDLER_STATUS_INACTIVE ( ( int ) 0 ) +#define HB_MATH_HANDLER_STATUS_ACTIVE ( ( int ) 1 ) -#define HB_MATHERR_UNKNOWN ((int)0) -#define HB_MATHERR_DOMAIN ((int)1) -#define HB_MATHERR_SING ((int)2) -#define HB_MATHERR_OVERFLOW ((int)3) -#define HB_MATHERR_UNDERFLOW ((int)4) -#define HB_MATHERR_TLOSS ((int)5) -#define HB_MATHERR_PLOSS ((int)6) +#define HB_MATH_ERR_UNKNOWN ( ( int ) 0 ) +#define HB_MATH_ERR_DOMAIN ( ( int ) 1 ) +#define HB_MATH_ERR_SING ( ( int ) 2 ) +#define HB_MATH_ERR_OVERFLOW ( ( int ) 3 ) +#define HB_MATH_ERR_UNDERFLOW ( ( int ) 4 ) +#define HB_MATH_ERR_TLOSS ( ( int ) 5 ) +#define HB_MATH_ERR_PLOSS ( ( int ) 6 ) #if defined(HB_EXTERN_C) diff --git a/harbour/source/rtl/defpath.c b/harbour/source/rtl/defpath.c index f96ed7054c..45282b3d93 100644 --- a/harbour/source/rtl/defpath.c +++ b/harbour/source/rtl/defpath.c @@ -53,6 +53,8 @@ #include "hbapi.h" #include "hbset.h" +#ifdef HB_C52_UNDOC + HB_FUNC( DEFPATH ) { char buffer[ _POSIX_PATH_MAX ]; @@ -92,3 +94,4 @@ HB_FUNC( __DEFPATH ) HB_FUNCNAME( DEFPATH )(); } +#endif diff --git a/harbour/source/rtl/getsys.prg b/harbour/source/rtl/getsys.prg index 66c76aafa3..81e89de00f 100644 --- a/harbour/source/rtl/getsys.prg +++ b/harbour/source/rtl/getsys.prg @@ -6,7 +6,7 @@ * Harbour Project source code: * GET system module (default) * - * Copyright 1999 Antonio Linares + * Copyright 1999-2001 Antonio Linares * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -55,7 +55,7 @@ * www - http://www.harbour-project.org * * Copyright 2001 Luiz Rafael Culik - * Support for Ca-Clipper 5.3 Getsystem + * Support for CA-Clipper 5.3 Getsystem * * See doc/license.txt for licensing terms. * @@ -63,19 +63,23 @@ #include "common.ch" #include "hbsetup.ch" -#ifndef HB_COMPAT_C53 -FUNCTION ReadModal( GetList, nPos ) -#else -FUNCTION ReadModal( GetList, nPos, nMsgRow, nMsgLeft, nMsgRight, cMsgColor ) -#endif - LOCAL oGetList + #ifdef HB_COMPAT_C53 - Local lMsgFlag - Local cSaveColor - Local cOldMsg - Local lColorFlag - Local oGet +FUNCTION ReadModal( GetList, nPos, nMsgRow, nMsgLeft, nMsgRight, cMsgColor ) +#else +FUNCTION ReadModal( GetList, nPos ) #endif + + LOCAL oGetList + +#ifdef HB_COMPAT_C53 + LOCAL lMsgFlag + LOCAL cSaveColor + LOCAL cOldMsg + LOCAL lColorFlag + LOCAL oGet +#endif + IF Empty( GetList ) SetPos( MaxRow() - 1, 0 ) RETURN .F. @@ -90,6 +94,7 @@ FUNCTION ReadModal( GetList, nPos, nMsgRow, nMsgLeft, nMsgRight, cMsgColor ) IF ! ( ISNUMBER( nPos ) .AND. nPos > 0 ) oGetList:nPos := oGetList:Settle( 0 ) ENDIF + #ifdef HB_COMPAT_C53 if ( ! ValType( nMsgRow ) == "N" ) lMsgFlag := .f. @@ -106,13 +111,14 @@ FUNCTION ReadModal( GetList, nPos, nMsgRow, nMsgLeft, nMsgRight, cMsgColor ) lColorFlag := ( ValType( cMsgColor ) == "C" ) endif - #endif + DO WHILE oGetList:nPos != 0 oGetList:oGet := oGetList:aGetList[ oGetList:nPos ] oGetList:PostActiveGet() - #ifdef HB_COMPAT_C53 + +#ifdef HB_COMPAT_C53 if ( lMsgFlag ) oGet := oGetList:aGetList[ oGetList:nPos ] if ( lColorFlag ) @@ -131,13 +137,14 @@ FUNCTION ReadModal( GetList, nPos, nMsgRow, nMsgLeft, nMsgRight, cMsgColor ) SetColor( cSaveColor ) endif endif - #endif +#endif + IF ISBLOCK( oGetList:oGet:Reader ) - #ifndef HB_COMPAT_C53 - Eval( oGetList:oGet:Reader, oGetList:oGet ) - #Else +#ifdef HB_COMPAT_C53 Eval( oGetList:oGet:Reader, oGetList:oGet ,Ogetlist) - #endif +#else + Eval( oGetList:oGet:Reader, oGetList:oGet ) +#endif ELSE oGetList:Reader() ENDIF @@ -145,11 +152,13 @@ FUNCTION ReadModal( GetList, nPos, nMsgRow, nMsgLeft, nMsgRight, cMsgColor ) oGetList:nPos := oGetList:Settle() ENDDO - #ifdef HB_COMPAT_C53 + +#ifdef HB_COMPAT_C53 if ( lMsgFlag ) RestScreen( nMsgRow, nMsgLeft, nMsgRow, nMsgRight, cOldMsg ) endif #endif + SetPos( MaxRow() - 1, 0 ) RETURN oGetList:lUpdated @@ -159,7 +168,6 @@ PROCEDURE GetReader( oGet ) RETURN - FUNCTION GetActive( oGet ) LOCAL oGetList := __GetListActive() @@ -338,11 +346,14 @@ FUNCTION RangeCheck( oGet, xDummy, xLow, xHigh ) ENDIF RETURN .F. + #ifdef HB_COMPAT_C53 + PROCEDURE GUIReader( oGet ,oGetlist,a,b) oGetlist:GuiReader(oGet,oGetList,a,b) -return + + RETURN PROCEDURE GuiApplyKey(oGet,nKey) LOCAL oGetList := __GetListActive() @@ -380,5 +391,4 @@ FUNCTION GuiGetPostValidate( oGet,oGui ) RETURN .F. - #endif diff --git a/harbour/source/rtl/math.c b/harbour/source/rtl/math.c index 8e9218e17c..6c9adb1993 100644 --- a/harbour/source/rtl/math.c +++ b/harbour/source/rtl/math.c @@ -62,125 +62,122 @@ #include "hbapierr.h" #include "hbmath.h" - #if defined(HB_MATH_HANDLER) static int s_internal_math_error = 0; /* TOFIX: This is not thread safe. */ -int hb_getMathError( void ) +int hb_mathGetError( void ) { - HB_TRACE(HB_TR_DEBUG, ("hb_getMathError()")); - return( s_internal_math_error ); + HB_TRACE(HB_TR_DEBUG, ("hb_mathGetError()")); + + return s_internal_math_error; } -void hb_resetMathError( void ) +void hb_mathResetError( void ) { - HB_TRACE(HB_TR_DEBUG, ("hb_resetMathError()")); + HB_TRACE(HB_TR_DEBUG, ("hb_mathResetError()")); + s_internal_math_error = 0; } /* math handler present ? */ -int hb_isMathHandler( void ) +int hb_mathIsHandler( void ) { - HB_TRACE(HB_TR_DEBUG, ("hb_isMathHandler()")); - return (1); -} + HB_TRACE(HB_TR_DEBUG, ("hb_mathIsHandler()")); + return 1; +} static PHB_MATH_HANDLERCHAINELEMENT s_pChain = NULL; /* TODO: make this thread safe */ /* install custom math handler */ -HB_MATH_HANDLERHANDLE hb_installMathHandler (HB_MATH_HANDLERPROC handlerproc) +HB_MATH_HANDLERHANDLE hb_mathHandlerInstall( HB_MATH_HANDLERPROC handlerproc ) { - - PHB_MATH_HANDLERCHAINELEMENT pChain, pNewChainelement; - - HB_TRACE(HB_TR_DEBUG, ("hb_installMathHandler (%p)", handlerproc)); - pNewChainelement = (PHB_MATH_HANDLERCHAINELEMENT)hb_xgrab (sizeof (HB_MATH_HANDLERCHAINELEMENT)); - pNewChainelement->handlerproc = handlerproc; - pNewChainelement->status = HB_MATH_HANDLER_STATUS_ACTIVE; - /* initially activated */ - pNewChainelement->pnext = NULL; - - pChain = s_pChain; - if (pChain == NULL) - { - s_pChain = pNewChainelement; - } - else - { - while (pChain->pnext != NULL) - pChain = pChain->pnext; - pChain->pnext = pNewChainelement; - } - - return ((HB_MATH_HANDLERHANDLE)pNewChainelement); - + PHB_MATH_HANDLERCHAINELEMENT pChain, pNewChainelement; + + HB_TRACE(HB_TR_DEBUG, ("hb_mathHandlerInstall (%p)", handlerproc)); + pNewChainelement = (PHB_MATH_HANDLERCHAINELEMENT)hb_xgrab (sizeof (HB_MATH_HANDLERCHAINELEMENT)); + pNewChainelement->handlerproc = handlerproc; + pNewChainelement->status = HB_MATH_HANDLER_STATUS_ACTIVE; + /* initially activated */ + pNewChainelement->pnext = NULL; + + pChain = s_pChain; + if( pChain == NULL ) + { + s_pChain = pNewChainelement; + } + else + { + while( pChain->pnext != NULL ) + pChain = pChain->pnext; + pChain->pnext = pNewChainelement; + } + + return ( HB_MATH_HANDLERHANDLE ) pNewChainelement; } /* deinstall custom math handler */ -int hb_deinstallMathHandler (HB_MATH_HANDLERHANDLE handle) +int hb_mathHandlerDeinstall( HB_MATH_HANDLERHANDLE handle ) { + PHB_MATH_HANDLERCHAINELEMENT pChain; + + HB_TRACE(HB_TR_DEBUG, ("hb_mathHandlerDeinstall (%p)", handle)); - PHB_MATH_HANDLERCHAINELEMENT pChain; - - HB_TRACE(HB_TR_DEBUG, ("hb_deinstallMathHandler (%p)", handle)); - if (handle != NULL) - { - if (s_pChain == (PHB_MATH_HANDLERCHAINELEMENT)handle) - { - s_pChain = ((PHB_MATH_HANDLERCHAINELEMENT)handle)->pnext; - hb_xfree ((void *)handle); - return (0); - } - else - { - pChain = s_pChain; - - while (pChain != NULL) + if( handle != NULL ) + { + if( s_pChain == ( PHB_MATH_HANDLERCHAINELEMENT ) handle ) { - if (pChain->pnext == (PHB_MATH_HANDLERCHAINELEMENT)handle) - { - pChain->pnext = ((PHB_MATH_HANDLERCHAINELEMENT)handle)->pnext; - hb_xfree ((void *)handle); - return (0); - } - - pChain = pChain->pnext; + s_pChain = ( ( PHB_MATH_HANDLERCHAINELEMENT ) handle )->pnext; + hb_xfree( ( void * ) handle); + return 0; } - } - } - - return (-1); /* not found, not deinstalled, so return error code */ - + else + { + pChain = s_pChain; + + while( pChain != NULL ) + { + if( pChain->pnext == ( PHB_MATH_HANDLERCHAINELEMENT ) handle ) + { + pChain->pnext = ( ( PHB_MATH_HANDLERCHAINELEMENT ) handle )->pnext; + hb_xfree( ( void * ) handle ); + return 0; + } + + pChain = pChain->pnext; + } + } + } + + return -1; /* not found, not deinstalled, so return error code */ } /* set custom math handler status */ -int hb_setMathHandlerStatus (HB_MATH_HANDLERHANDLE handle, int status) +int hb_mathHandlerSetStatus( HB_MATH_HANDLERHANDLE handle, int status ) { - int oldstatus = HB_MATH_HANDLER_STATUS_NOTFOUND; + int oldstatus = HB_MATH_HANDLER_STATUS_NOTFOUND; + + HB_TRACE(HB_TR_DEBUG, ("hb_mathHandlerSetStatus (%p, %i)", handle, status)); + + if( handle != NULL ) + { + oldstatus = ( ( PHB_MATH_HANDLERCHAINELEMENT ) handle )->status; + ( ( PHB_MATH_HANDLERCHAINELEMENT ) handle )->status = status; + } - HB_TRACE(HB_TR_DEBUG, ("hb_setMathHandlerStatus (%p, %i)", handle, status)); - if (handle != NULL) - { - oldstatus = ((PHB_MATH_HANDLERCHAINELEMENT)handle)->status; - ((PHB_MATH_HANDLERCHAINELEMENT)handle)->status = status; - } - return (oldstatus); + return oldstatus; } /* get custom math handler status */ -int hb_getMathHandlerStatus (HB_MATH_HANDLERHANDLE handle) +int hb_mathHandlerGetStatus( HB_MATH_HANDLERHANDLE handle ) { - HB_TRACE(HB_TR_DEBUG, ("hb_getMathHandlerStatus (%p)", handle)); - if (handle != NULL) - { - return (((PHB_MATH_HANDLERCHAINELEMENT)handle)->status); - } - else - { - return (HB_MATH_HANDLER_STATUS_NOTFOUND); - } + HB_TRACE(HB_TR_DEBUG, ("hb_mathHandlerGetStatus (%p)", handle)); + + if( handle != NULL ) + return ( ( PHB_MATH_HANDLERCHAINELEMENT ) handle )->status; + else + return HB_MATH_HANDLER_STATUS_NOTFOUND; } @@ -188,7 +185,6 @@ int hb_getMathHandlerStatus (HB_MATH_HANDLERHANDLE handle) */ int matherr( struct exception * err ) { - PHB_MATH_HANDLERCHAINELEMENT pChain = s_pChain; int retval = -1; double dretval = 0.0; @@ -200,46 +196,46 @@ int matherr( struct exception * err ) switch( err->type ) { case DOMAIN: - exc.type = HB_MATHERR_DOMAIN; + exc.type = HB_MATH_ERR_DOMAIN; break; case SING: - exc.type = HB_MATHERR_SING; + exc.type = HB_MATH_ERR_SING; break; case OVERFLOW: - exc.type = HB_MATHERR_OVERFLOW; + exc.type = HB_MATH_ERR_OVERFLOW; break; case UNDERFLOW: - exc.type = HB_MATHERR_UNDERFLOW; + exc.type = HB_MATH_ERR_UNDERFLOW; break; case TLOSS: - exc.type = HB_MATHERR_TLOSS; + exc.type = HB_MATH_ERR_TLOSS; break; case PLOSS: - exc.type = HB_MATHERR_PLOSS; + exc.type = HB_MATH_ERR_PLOSS; break; default: - exc.type = HB_MATHERR_UNKNOWN; + exc.type = HB_MATH_ERR_UNKNOWN; break; } + exc.name = err->name; exc.arg1 = err->arg1; exc.arg2 = err->arg2; exc.retval = err->retval; - while (pChain != NULL) + while( pChain != NULL ) { - int ret; - if (pChain->status == HB_MATH_HANDLER_STATUS_ACTIVE) - { - ret = (*(pChain->handlerproc))(&exc); - /* store the math return value from the handler that returns the largest integer */ - if (ret > retval) - { - dretval = exc.retval; - retval = ret; - } - } - pChain = pChain->pnext; + if( pChain->status == HB_MATH_HANDLER_STATUS_ACTIVE ) + { + int ret = ( *( pChain->handlerproc ) )( &exc ); + /* store the math return value from the handler that returns the largest integer */ + if( ret > retval ) + { + dretval = exc.retval; + retval = ret; + } + } + pChain = pChain->pnext; } switch( err->type ) @@ -273,62 +269,69 @@ int matherr( struct exception * err ) break; } - if (retval == -1) + if( retval == -1 ) { - /* default behaviour */ - err->retval = 0.0; - return (1); /* don't print any message and don't set errno */ + /* default behaviour */ + err->retval = 0.0; + return 1; /* don't print any message and don't set errno */ } err->retval = dretval; - return (retval); + return retval; } #else /* defined (HB_MATH_HANDLER) */ /* the functions don't do anything but they must exist */ -int hb_getMathError (void) +int hb_mathGetError( void ) { - HB_TRACE(HB_TR_DEBUG, ("hb_getMathError()")); - return (0); + HB_TRACE(HB_TR_DEBUG, ("hb_mathGetError()")); + + return 0; } -void hb_resetMathError (void) +void hb_mathResetError( void ) { - HB_TRACE(HB_TR_DEBUG, ("hb_resetMathError()")); - return; + HB_TRACE(HB_TR_DEBUG, ("hb_mathResetError()")); + + return; } -int hb_isMathHandler (void) +int hb_mathIsHandler( void ) { - HB_TRACE(HB_TR_DEBUG, ("hb_isMathHandler()")); - return (0); + HB_TRACE(HB_TR_DEBUG, ("hb_mathIsHandler()")); + + return 0; } -HB_MATH_HANDLERHANDLE hb_installMathHandler (HB_MATH_HANDLERPROC handlerproc) +HB_MATH_HANDLERHANDLE hb_mathHandlerInstall( HB_MATH_HANDLERPROC handlerproc ) { - HB_TRACE(HB_TR_DEBUG, ("hb_installMathHandler (%p)", handlerproc)); - return ((HB_MATH_HANDLERHANDLE)NULL); + HB_TRACE(HB_TR_DEBUG, ("hb_mathHandlerInstall (%p)", handlerproc)); + + return ( HB_MATH_HANDLERHANDLE ) NULL; } -int hb_deinstallMathHandler (HB_MATH_HANDLERHANDLE handle) +int hb_mathHandlerDeinstall( HB_MATH_HANDLERHANDLE handle ) { - HB_TRACE(HB_TR_DEBUG, ("hb_deinstallMathHandler (%p)", handle)); - return (-1); + HB_TRACE(HB_TR_DEBUG, ("hb_mathHandlerDeinstall (%p)", handle)); + + return -1; } -int hb_setMathHandlerStatus (HB_MATH_HANDLERHANDLE handle, int status) +int hb_mathHandlerSetStatus( HB_MATH_HANDLERHANDLE handle, int status ) { - HB_TRACE(HB_TR_DEBUG, ("hb_setMathHandlerStatus (%p, %i)", handle, status)); - return (HB_MATH_HANDLER_STATUS_NOTFOUND); + HB_TRACE(HB_TR_DEBUG, ("hb_mathHandlerSetStatus (%p, %i)", handle, status)); + + return HB_MATH_HANDLER_STATUS_NOTFOUND; } -int hb_getMathHandlerStatus (HB_MATH_HANDLERHANDLE handle) +int hb_mathHandlerGetStatus( HB_MATH_HANDLERHANDLE handle ) { - HB_TRACE(HB_TR_DEBUG, ("hb_getMathHandlerStatus (%p)", handle)); - return (HB_MATH_HANDLER_STATUS_NOTFOUND); + HB_TRACE(HB_TR_DEBUG, ("hb_mathHandlerGetStatus (%p)", handle)); + + return HB_MATH_HANDLER_STATUS_NOTFOUND; } #endif diff --git a/harbour/source/rtl/mlctopos.c b/harbour/source/rtl/mlctopos.c index 5c51c70fa7..e8631c3df8 100644 --- a/harbour/source/rtl/mlctopos.c +++ b/harbour/source/rtl/mlctopos.c @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + /* * Harbour Project source code: * MLCTOPOS() function @@ -125,11 +129,12 @@ HB_FUNC( MLCTOPOS ) ulLastLen = ulCurLength ; } - if ( ulLine == ulLines ) + if( ulLine == ulLines ) { - ulLastLen--; /*Column is zero based*/ - hb_retnl( ulBegOfLine + ( ( ulCol < ulLastLen ) ? ulCol : ulLastLen ) ); + ulLastLen--; /* Column is zero based */ + hb_retnl( ulBegOfLine + ( ( ulCol < ulLastLen ) ? ulCol : ulLastLen ) ); } else hb_retnl( ulLen ); -} \ No newline at end of file +} + diff --git a/harbour/source/rtl/mpostolc.c b/harbour/source/rtl/mpostolc.c index 9a5c335d44..7fbffff834 100644 --- a/harbour/source/rtl/mpostolc.c +++ b/harbour/source/rtl/mpostolc.c @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + /* * Harbour Project source code: * MPOSTOLC() function @@ -119,4 +123,4 @@ HB_FUNC( MPOSTOLC ) hb_reta( 2 ); hb_stornl( ulLines, -1, 1 ); hb_stornl( ulCurLength ? ulCurLength - 1 : 0, -1, 2 ); -} \ No newline at end of file +} diff --git a/harbour/source/rtl/natmsg.c b/harbour/source/rtl/natmsg.c index 7f87545de5..f3a4bb175a 100644 --- a/harbour/source/rtl/natmsg.c +++ b/harbour/source/rtl/natmsg.c @@ -93,6 +93,8 @@ char * hb_nationGetMsg( USHORT uiMsg ) return ( uiMsg >= 1 && uiMsg <= 13 ) ? ( char * ) hb_langDGetItem( HB_LANG_ITEM_BASE_NATMSG + uiMsg - 1 ) : ""; } +#ifdef HB_C52_UNDOC + HB_FUNC( ISAFFIRM ) { PHB_ITEM pItem = hb_param( 1, HB_IT_STRING ); @@ -140,3 +142,4 @@ HB_FUNC( _NATMSGVER ) hb_retc( "NATMSGS (Harbour)" ); } +#endif diff --git a/harbour/source/rtl/oemansi.c b/harbour/source/rtl/oemansi.c index 6487a436ad..d35ee45974 100644 --- a/harbour/source/rtl/oemansi.c +++ b/harbour/source/rtl/oemansi.c @@ -58,6 +58,8 @@ #include "hbapi.h" #include "hbapiitm.h" +#ifdef HB_EXTENSION + HB_FUNC( HB_ANSITOOEM ) { PHB_ITEM pString = hb_param( 1, HB_IT_STRING ); @@ -102,6 +104,8 @@ HB_FUNC( HB_OEMTOANSI ) hb_retc( "" ); } +#endif + #ifdef HB_COMPAT_XPP /* NOTE: Xbase++ compatible function */ diff --git a/harbour/source/rtl/seconds.c b/harbour/source/rtl/seconds.c index a18fa3608d..a4361ff8e3 100644 --- a/harbour/source/rtl/seconds.c +++ b/harbour/source/rtl/seconds.c @@ -84,7 +84,11 @@ HB_FUNC( SECONDS ) hb_retnd( hb_dateSeconds() ); } +#ifdef HB_EXTENSION + HB_FUNC( HB_CLOCKS2SECS ) { hb_retnd((double) hb_parnl( 1 ) / CLOCKS_PER_SEC ); } + +#endif diff --git a/harbour/source/rtl/setcolor.c b/harbour/source/rtl/setcolor.c index fd53f723c2..1448ef456b 100644 --- a/harbour/source/rtl/setcolor.c +++ b/harbour/source/rtl/setcolor.c @@ -89,10 +89,14 @@ HB_FUNC( SETBLINK ) hb_gtSetBlink( hb_parl( 1 ) ); } +#ifdef HB_EXTENSION + HB_FUNC( HB_COLORTON ) { if( ISCHAR( 1 ) ) hb_retni( hb_gtColorToN( hb_parc( 1 ) ) ); else hb_retni( 0 ); -} \ No newline at end of file +} + +#endif diff --git a/harbour/source/rtl/setposbs.c b/harbour/source/rtl/setposbs.c index cfa6d9507b..c4632b0b3c 100644 --- a/harbour/source/rtl/setposbs.c +++ b/harbour/source/rtl/setposbs.c @@ -53,7 +53,10 @@ #include "hbapi.h" #include "hbapigt.h" -/* NOTE: CA-Cl*pper undocumented */ +/* NOTE: Cannot be disabled with the HB_C52_UNDOC macro, because this symbol + is referenced by the VM [vszakats] */ + +/* NOTE: Clipper 5.x undocumented */ HB_FUNC( SETPOSBS ) /* Move the screen position to the right by one column */ { diff --git a/harbour/source/rtl/shadow.c b/harbour/source/rtl/shadow.c index e7c641ab08..997571b81b 100644 --- a/harbour/source/rtl/shadow.c +++ b/harbour/source/rtl/shadow.c @@ -53,6 +53,8 @@ #include "hbapi.h" #include "hbapigt.h" +#ifdef HB_EXTENSION + HB_FUNC( HB_SHADOW ) { if( hb_pcount() >= 4 ) @@ -73,6 +75,8 @@ HB_FUNC( HB_CLRAREA ) hb_parni( 5 ) ); } +#endif + #ifdef HB_C52_UNDOC HB_FUNC( DBGSHADOW ) diff --git a/harbour/source/rtl/tgetlist.prg b/harbour/source/rtl/tgetlist.prg index 4d67dfa021..f8cc1a1a99 100644 --- a/harbour/source/rtl/tgetlist.prg +++ b/harbour/source/rtl/tgetlist.prg @@ -111,12 +111,12 @@ CLASS HBGetList METHOD ReadExit( lNew ) INLINE Set( _SET_EXIT, lNew ) METHOD SetFocus() METHOD Updated() INLINE ::lUpdated - #ifdef HB_COMPAT_C53 +#ifdef HB_COMPAT_C53 METHOD GUIReader(oget,getsys,a,b) - METHOD GUIApplyKey( oGUI, nKey ) - METHOD GuiPreValidate(oGui) - METHOD GuiPostValidate(oGui) - #endif + METHOD GUIApplyKey( oGUI, nKey ) + METHOD GUIPreValidate(oGui) + METHOD GUIPostValidate(oGui) +#endif ENDCLASS METHOD New( GetList ) CLASS HBGetList @@ -141,6 +141,7 @@ METHOD SetFocus() CLASS HBGetList ::aGetList[ ::nPos ]:SetFocus() return Self + METHOD Reader() CLASS HBGetList local oGet := ::oGet @@ -559,8 +560,9 @@ METHOD ReadUpdated( lUpdated ) CLASS HBGetList return lSavUpdated #ifdef HB_COMPAT_C53 + METHOD GuiReader(oget,getsys,a,b) CLASS HBGetList -//Local oGet := ::oGet + //Local oGet := ::oGet Local oGui IF ( ! ::GUIPreValidate( oGet , oGet:Control ) ) elseif ( ValType( oGet:Control ) == "O" ) @@ -716,7 +718,6 @@ METHOD GUIApplyKey( oGUI, nKey ) CLASS HBGetList #endif - if ( ! lClose ) elseif ( ! TheClass == "LISTBOX" ) elseif ( ! oGUI:DropDown ) @@ -730,7 +731,6 @@ METHOD GUIApplyKey( oGUI, nKey ) CLASS HBGetList RETURN Self - METHOD GUIPostValidate( oGUI ) CLASS HBGetList Local oGet := ::oGet LOCAL lSavUpdated diff --git a/harbour/source/rtl/trim.c b/harbour/source/rtl/trim.c index 74e8596328..329f2f7ca6 100644 --- a/harbour/source/rtl/trim.c +++ b/harbour/source/rtl/trim.c @@ -117,8 +117,12 @@ HB_FUNC( RTRIM ) { char * pszText = hb_itemGetCPtr( pText ); +#ifdef HB_EXTENSION hb_retclen( pszText, hb_strRTrimLen( pszText, hb_itemGetCLen( pText ), ISLOG( 2 ) ? hb_parl( 2 ) : FALSE ) ); +#else + hb_retclen( pszText, hb_strRTrimLen( pszText, hb_itemGetCLen( pText ), FALSE ) ); +#endif } else /* NOTE: "TRIM" is right here [vszakats] */