2009-06-26 02:22 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

* harbour/include/hbvm.h * harbour/include/hbrdddbf.h * harbour/include/hbapidbg.h * harbour/include/hbset.h * harbour/include/hbcomp.h * harbour/include/hbapirdd.h * harbour/include/hbstack.h * harbour/include/hbsxfunc.h * harbour/include/hbapilng.h * harbour/include/hbgtcore.h * harbour/include/hbapifs.h * harbour/include/hbdbsort.h * harbour/include/hbapigt.h * harbour/include/hbapi.h * harbour/include/hbapierr.h * harbour/include/hbapiitm.h * harbour/include/hbrddfpt.h * harbour/contrib/hbmysql/mysql.c * harbour/contrib/hbct/bitnum.c * harbour/contrib/hbct/token2.c * harbour/contrib/hbct/charsprd.c * harbour/contrib/hbct/ctnet.c * harbour/contrib/hbct/charonly.c * harbour/contrib/hbct/atadjust.c * harbour/contrib/hbct/ctwin.c * harbour/contrib/hbct/charsort.c * harbour/contrib/hbct/ctwin.h * harbour/contrib/hbct/charmix.c * harbour/contrib/hbct/charevod.c * harbour/contrib/hbct/maxline.c * harbour/contrib/hbct/wordrepl.c * harbour/contrib/hbct/charrepl.c * harbour/contrib/hbct/files.c * harbour/contrib/hbct/video.c * harbour/contrib/hbct/charswap.c * harbour/contrib/hbct/dattime3.c * harbour/contrib/hbct/charop.c * harbour/contrib/hbct/misc2.c * harbour/contrib/hbct/charone.c * harbour/contrib/hbct/ctstr.c * harbour/contrib/hbct/screen1.c * harbour/contrib/hbct/token1.c * harbour/contrib/hbct/ctstr.h * harbour/contrib/hbct/charmirr.c * harbour/contrib/hbct/relation.c * harbour/contrib/hbct/atnum.c * harbour/contrib/hbct/like.c * harbour/contrib/hbct/count.c * harbour/contrib/hbct/disk.c * harbour/contrib/hbct/ctstrfil.c * harbour/contrib/hbct/posdiff.c * harbour/contrib/hbct/addascii.c * harbour/contrib/hbct/tab.c * harbour/contrib/hbct/numline.c * harbour/contrib/hbct/dattime2.c * harbour/contrib/hbct/asciisum.c * harbour/contrib/hbct/expand.c * harbour/contrib/hbct/pos2.c * harbour/contrib/hbct/numat.c * harbour/contrib/hbct/atrepl.c * harbour/contrib/hbct/wordtoch.c * harbour/contrib/hbct/print.c * harbour/contrib/hbct/justify.c * harbour/contrib/xhb/hbxml.c * harbour/contrib/xhb/dbf2txt.c * harbour/contrib/xhb/xhbis.c * harbour/contrib/xhb/fparse.c * harbour/contrib/xhb/xstrdel.c * harbour/contrib/xhb/hbcomprs.c * harbour/contrib/xhb/datesxhb.c * harbour/contrib/xhb/xhbmsgs.c * harbour/contrib/xhb/freadlin.c * harbour/contrib/xhb/txtline.c * harbour/contrib/xhb/xhbtrim.c * harbour/contrib/xhb/xhbcopyf.c * harbour/contrib/xhb/cstructc.c * harbour/contrib/xhb/xhbfunc.c * harbour/contrib/hbtpathy/tplinux.c * harbour/contrib/hbgt/charmixg.c * harbour/contrib/hbgt/strexpan.c * harbour/contrib/hbgt/charodd.c * harbour/contrib/hbgt/strright.c * harbour/contrib/hbgt/asciisgt.c * harbour/contrib/hbgt/strdiffg.c * harbour/contrib/hbgt/chrtotal.c * harbour/contrib/hbgt/strcount.c * harbour/contrib/hbgt/strleft.c * harbour/contrib/hbgt/ascposgt.c * harbour/contrib/hbgt/chrfirst.c * harbour/contrib/hbgt/chrcount.c * harbour/contrib/hbgt/strpbrk.c * harbour/contrib/hbgt/chareven.c * harbour/contrib/hbgt/strcspn.c * harbour/contrib/hbgt/atdiff.c * harbour/contrib/hbsqlit3/hbsqlit3.c * harbour/contrib/hbmzip/hbmzip.c * harbour/contrib/hbnf/proper.c * harbour/contrib/hbnf/fttext.c * harbour/contrib/hbnf/chdir.c * harbour/contrib/hbnf/getver.c * harbour/contrib/hbnf/ftattr.c * harbour/contrib/hbnf/mkdir.c * harbour/contrib/hbnf/rmdir.c * harbour/contrib/Makefile * harbour/contrib/hbcurl/hbcurl.c * harbour/contrib/rddsql/sddmy/mysqldd.c * harbour/contrib/rddsql/sddpg/pgsqldd.c * harbour/contrib/rddsql/sddfb/fbirddd.c * harbour/contrib/rddsql/sddodbc/odbcdd.c * harbour/contrib/rddsql/sqlmix.c * harbour/contrib/hbhpdf/harupdf.c * harbour/contrib/rddads/adsx.c * harbour/contrib/rddads/adsfunc.c * harbour/contrib/rddads/rddads.h * harbour/contrib/rddads/ads1.c * harbour/contrib/hbmisc/hb_f.c * harbour/contrib/hbmisc/strfmt.c * harbour/contrib/hbmisc/stringsx.c * harbour/contrib/hbmisc/spd.c * harbour/contrib/hbtip/utils.c * harbour/contrib/hbwin/wapi_winbase.c * harbour/contrib/hbwin/win_misc.c * harbour/contrib/hbbtree/hb_btree.h * harbour/contrib/hbbtree/hb_btree.c * harbour/source/pp/hbpp.c * harbour/source/vm/runner.c * harbour/source/vm/estack.c * harbour/source/vm/itemapi.c * harbour/source/vm/hvm.c * harbour/source/vm/cmdarg.c * harbour/source/vm/memvars.c * harbour/source/vm/dynlibhb.c * harbour/source/vm/set.c * harbour/source/main/harbour.c * harbour/source/debug/dbgentry.c * harbour/source/common/hbfsapi.c * harbour/source/common/hbfopen.c * harbour/source/rtl/gtdos/gtdos.c * harbour/source/rtl/diskspac.c * harbour/source/rtl/console.c * harbour/source/rtl/chrasc.c * harbour/source/rtl/fscopy.c * harbour/source/rtl/run.c * harbour/source/rtl/spfiles.c * harbour/source/rtl/defpath.c * harbour/source/rtl/philes.c * harbour/source/rtl/oldbox.c * harbour/source/rtl/math.c * harbour/source/rtl/hbgtcore.c * harbour/source/rtl/cdpapi.c * harbour/source/rtl/gtcrs/gtcrs.c * harbour/source/rtl/dirdrive.c * harbour/source/rtl/hbi18n1.c * harbour/source/rtl/trim.c * harbour/source/rtl/hbzlibgz.c * harbour/source/rtl/philesx.c * harbour/source/rtl/mlcfunc.c * harbour/source/rtl/filehb.c * harbour/source/rtl/fstemp.c * harbour/source/rtl/is.c * harbour/source/rtl/hbrunfun.c * harbour/source/rtl/ampm.c * harbour/source/rtl/setcolor.c * harbour/source/rtl/oemansi.c * harbour/source/rtl/disksphb.c * harbour/source/rtl/hbzlib.c * harbour/source/rtl/strpeek.c * harbour/source/rtl/replic.c * harbour/source/rtl/stuff.c * harbour/source/rtl/hbstrfmt.c * harbour/source/rtl/transfrm.c * harbour/source/rtl/hbhex.c * harbour/source/rtl/trace.c * harbour/source/rtl/hbadler.c * harbour/source/rtl/samples.c * harbour/source/rtl/filebuf.c * harbour/source/rtl/hbcrc.c * harbour/source/rtl/gete.c * harbour/source/rtl/hbmd5.c * harbour/source/rtl/langapi.c * harbour/source/rtl/gtcgi/gtcgi.c * harbour/source/rtl/errapi.c * harbour/source/rtl/hbregexc.c * harbour/source/rtl/natmsg.c * harbour/source/rtl/fssize.c * harbour/source/rtl/hbinet.c * harbour/source/rtl/colorind.c * harbour/source/rtl/copyfile.c * harbour/source/rtl/mouseapi.c * harbour/source/rtl/soundex.c * harbour/source/rtl/memofile.c * harbour/source/rtl/hbffind.c * harbour/source/rtl/gtapi.c * harbour/source/rtl/direct.c * harbour/source/rtl/filesys.c * harbour/source/rtl/file.c * harbour/source/rtl/val.c * harbour/source/rtl/hbregex.c * harbour/source/rtl/rat.c * harbour/source/rtl/isprint.c * harbour/source/rdd/dbfntx/dbfntx1.c * harbour/source/rdd/dbsql.c * harbour/source/rdd/workarea.c * harbour/source/rdd/wacore.c * harbour/source/rdd/sdf1.c * harbour/source/rdd/dbdetach.c * harbour/source/rdd/dbcmdx.c * harbour/source/rdd/dbfnsx/dbfnsx1.c * harbour/source/rdd/dbcmd.c * harbour/source/rdd/dbfcdx/dbfcdx1.c * harbour/source/rdd/delim1.c * harbour/source/rdd/dbf1.c * harbour/source/rdd/hsx/hsx.c * harbour/source/rdd/dbcmd53.c * harbour/source/rdd/usrrdd/usrrdd.c * harbour/source/rdd/wafunc.c * harbour/source/rdd/dbffpt/dbffpt1.c * harbour/source/rdd/hbsix/sxsem.c * harbour/source/rdd/hbsix/sxord.c * harbour/source/rdd/hbsix/sxfname.c * harbour/source/rdd/hbsix/sxtable.c * harbour/source/rdd/hbsix/sxdate.c * harbour/source/rdd/hbsix/sxutil.c * harbour/source/rdd/hbsix/sxcompr.c * harbour/source/compiler/hbmain.c * harbour/source/compiler/cmdcheck.c * harbour/source/compiler/hbpcode.c * harbour/source/compiler/genc.c * harbour/source/compiler/gencc.c * harbour/source/compiler/hbcmplib.c * harbour/source/compiler/ppcomp.c * changed 'char *' and changed 'BYTE *' to 'const char *' in the following functions: const char * hb_vmFindModuleSymbolName( PHB_SYMB pSym ); void hb_vmInitSymbolGroup( void * hNewDynLib, int argc, const char * argv[] ); void hb_dbgEntry( int nMode, int nLine, const char *szName, int nIndex, PHB_ITEM pFrame ); void hb_dbgAddBreak( void *handle, const char *cModule, int nLine, const char *szFunction ); void hb_dbgAddWatch( void *handle, const char *szExpr, BOOL bTrace ); PHB_ITEM hb_dbgGetExpressionValue( void *handle, const char *expression ); BOOL hb_dbgIsValidStopLine( void *handle, const char *szModule, int nLine ); void hb_dbgSetToCursor( void *handle, const char *szModule, int nLine ); void hb_dbgSetWatch( void *handle, int nWatch, const char *szExpr, BOOL bTrace ); const char * hb_setGetCPtr( HB_set_enum set_specifier ); const char * hb_setGetAltFile( void ); const char * hb_setGetDateFormat( void ); const char * hb_setGetTimeFormat( void ); const char * hb_setGetDefault( void ); const char * hb_setGetDelimChars( void ); const char * hb_setGetDevice( void ); const char * hb_setGetExtraFile( void ); const char * hb_setGetPath( void ); const char * hb_setGetMFileExt( void ); const char * hb_setGetPrintFile( void ); const char * hb_setGetEOL( void ); const char * hb_setGetHBOUTLOG( void ); const char * hb_setGetHBOUTLOGINFO( void ); const char * hb_setGetOSCODEPAGE( void ); void hb_compInitPP( HB_COMP_DECL, int argc, const char * const argv[] ); void hb_compGenPCodeN( const BYTE * pBuffer, ULONG ulSize, HB_COMP_DECL ); int hb_compMain( int argc, const char * const argv[], BYTE ** pBufPtr, ULONG * pulSize, const char * szSource ); void hb_compChkCompilerSwitch( HB_COMP_DECL, int, const char * const args[] ); void hb_compChkDefines( HB_COMP_DECL, int iArg, const char * const args[] ); void hb_compGenCString( FILE * yyc, const BYTE * pText, ULONG ulLen ); AREAP hb_rddRequestArea( const char * szAlias, PHB_ITEM pCargo, BOOL fNewArea, BOOL fWait ); char * hb_stackDirBuffer( void ); LONG hb_sxPtoD( const char * pDate ); const char * hb_langID( void ); const char * hb_langSelectID( const char * pszID ); const char * hb_langDGetItem( int iIndex ); const char * hb_langDGetErrorDesc( ULONG ulIndex ); BOOL hb_fsChDir( const char * pszDirName ); HB_FHANDLE hb_fsCreate( const char * pszFileName, ULONG ulAttr ); HB_FHANDLE hb_fsCreateEx( const char * pszFilename, ULONG ulAttr, USHORT uiFlags ); HB_FHANDLE hb_fsCreateTemp( const char * pszDir, const char * pszPrefix, ULONG ulAttr, char * pszName ); HB_FHANDLE hb_fsCreateTempEx( char * pszName, const char * pszDir, const char * pszPrefix, const char * pszExt, ULONG ulAttr ); const char * hb_fsCurDir( USHORT uiDrive ); USHORT hb_fsCurDirBuff( USHORT uiDrive, char * pbyBuffer, ULONG ulLen ); void hb_fsBaseDirBuff( char * pbyBuffer ); BOOL hb_fsDelete( const char * pszFileName ); BOOL hb_fsFile( const char * pszFileName ); BOOL hb_fsIsDirectory( const char * pszFilename ); HB_FOFFSET hb_fsFSize( const char * pszFileName, BOOL bUseDirEntry ); HB_FHANDLE hb_fsExtOpen( const char * pszFileName, const char * pDefExt, char * hb_fsExtName( const char * pFilename, const char * pDefExt, USHORT uiExFlags, const char * pPaths ); BOOL hb_fsMkDir( const char * pszDirName ); HB_FHANDLE hb_fsOpen( const char * pszFileName, USHORT uiFlags ); BOOL hb_fsRmDir( const char * pszDirName ); BOOL hb_fsRename( const char * pszOldName, const char * pszNewName ); BOOL hb_fsGetFileTime( const char * pszFileName, LONG * plJulian, LONG * plMillisec ); BOOL hb_fsSetFileTime( const char * pszFileName, LONG lJulian, LONG lMillisec ); BOOL hb_fsGetAttr( const char * pszFileName, ULONG * pulAttr ); BOOL hb_fsSetAttr( const char * pszFileName, ULONG ulAttr ); HB_FHANDLE hb_fsPOpen( const char * pFilename, const char * pMode ); BOOL hb_fsCopy( const char * pSource, const char * pDest ); BOOL hb_spFile( const char * pFilename, char * pRetPath ); BOOL hb_spFileExists( const char * pFilename, char * pRetPath ); HB_FHANDLE hb_spOpen( const char * pFilename, USHORT uiFlags ); HB_FHANDLE hb_spCreate( const char * pFilename, ULONG ulAttr ); HB_FHANDLE hb_spCreateEx( const char * pFilename, ULONG ulAttr, USHORT uiFlags ); PHB_FILE hb_fileExtOpen( const char * pFilename, const char * pDefExt, USHORT uiExFlags, const char * pPaths, PHB_ITEM pError ); PHB_FILE hb_fileCreateTemp( const char * pszDir, const char * pszPrefix, ULONG ulAttr, char * pszName ); PHB_FILE hb_fileCreateTempEx( char * pszName, const char * pszDir, const char * pszPrefix, const char * pszExt, ULONG ulAttr ); HB_ERRCODE hb_gtBox( SHORT uiTop, SHORT uiLeft, SHORT uiBottom, SHORT uiRight, const BYTE * pbyFrame ); HB_ERRCODE hb_gtDrawBox( SHORT uiTop, SHORT uiLeft, SHORT uiBottom, SHORT uiRight, const BYTE * pbyFrame, int iColor ); HB_ERRCODE hb_gtWrite( const BYTE * pbyStr, ULONG ulLen ); HB_ERRCODE hb_gtWriteAt( USHORT uiRow, USHORT uiCol, const BYTE * pbyStr, ULONG ulLen ); HB_ERRCODE hb_gtWriteCon( const BYTE * pbyStr, ULONG ulLen ); HB_ERRCODE hb_gtPutText( USHORT uiRow, USHORT uiCol, const BYTE * pStr, ULONG ulLength, int iColor ); HB_ERRCODE hb_gtOutStd( const BYTE * pbyStr, ULONG ulLen ); HB_ERRCODE hb_gtOutErr( const BYTE * pbyStr, ULONG ulLen ); HB_ERRCODE hb_gtBoxEx( int iTop, int iLeft, int iBottom, int iRight, const BYTE * pbyFrame, int iColor ); void hb_mouseRestoreState( const BYTE * pBuffer ); const char * hb_strLTrim( const char * szText, ULONG * ulLen ); const char * hb_conNewLine( void ); const char * hb_conSetColor( const char * szColor ); const char * hb_errGetDescription( PHB_ITEM pError ); const char * hb_errGetFileName( PHB_ITEM pError ); const char * hb_errGetOperation( PHB_ITEM pError ); const char * hb_errGetSubSystem( PHB_ITEM pError ); int hb_ctwAddWindowBox( int iWindow, const BYTE * szBox, int iColor ); const char *ct_at_exact_forward ( const char *pcString, size_t sStrLen, const char *pcMatch, size_t sMatchLen, size_t *psMatchStrLen ); const char *ct_at_exact_backward ( const char *pcString, size_t sStrLen, const char *pcMatch, size_t sMatchLen, size_t *psMatchStrLen ); const char *ct_at_wildcard_forward ( const char *pcString, size_t sStrLen, const char *pcMatch, size_t sMatchLen, char cWildCard, size_t *psMatchStrLen ); const char *ct_at_wildcard_backward ( const char *pcString, size_t sStrLen, const char *pcMatch, size_t sMatchLen, char cWildCard, size_t *psMatchStrLen ); const char *ct_at_charset_forward ( const char *pcString, size_t sStrLen, const char *pcCharSet, size_t sCharSetLen, size_t *psMatchedCharPos ); const char *ct_at_charset_backward ( const char *pcString, size_t sStrLen, const char *pcCharSet, size_t sCharSetLen, size_t *psMatchedCharPos ); char * hb_adsOemToAnsi( const char * pcString, ULONG ulLen ); char * hb_adsAnsiToOem( const char * pcString, ULONG ulLen ); struct hb_BTree * hb_BTreeNew( const char *FileName, USHORT usPageSize, USHORT usKeySize, ULONG ulFlags, USHORT usBuffers ); struct hb_BTree * hb_BTreeOpen( const char *FileName, ULONG lFlags, USHORT usBuffers ); BOOL hb_BTreeInsert( struct hb_BTree * pBTree, const char * szKey, PHB_ITEM pData ); BOOL hb_BTreeDelete( struct hb_BTree * pBTree, const char * szKey, LONG lData ); BOOL hb_BTreeSeek( struct hb_BTree * pBTree, const char * szKey, LONG lData, BOOL bSoftSeek ); const char * hb_BTreeKey( struct hb_BTree * pBTree ); * modified RDD methods: HB_ERRCODE PUTVALUEFILE( AREAP, USHORT, const char *, USHORT ); HB_ERRCODE GETVALUEFILE( AREAP, USHORT, const char *, USHORT ); * modified GT methods: void REST( HB_GT_PTR, int, int, int, int, const BYTE * ); void PUTTEXT( HB_GT_PTR, int, int, BYTE, const BYTE *, ULONG ); void WRITEAT( HB_GT_PTR, int, int, const BYTE *, ULONG ); void WRITE( HB_GT_PTR, const BYTE *, ULONG ); void WRITECON( HB_GT_PTR, const BYTE *, ULONG ); void BOX( HB_GT_PTR, int, int, int, int, const BYTE *, BYTE ); void BOXD( HB_GT_PTR, int, int, int, int, const BYTE *, BYTE ); void BOXS( HB_GT_PTR, int, int, int, int, const BYTE *, BYTE ); void OUTSTD( HB_GT_PTR, BYTE *, ULONG ); void OUTERR( HB_GT_PTR, BYTE *, ULONG ); void MOUSERESTORESTATE( HB_GT_PTR, const BYTE * ); * modified RDD structers: DBFIELDINFO, DBOPENINFO, DBORDERCONDINFO, DBCONSTRAINTINFO, DBORDERCREATEINFO + modified parameters and behevior: const char * hb_fsNameConv( const char * szFileName, char ** pszFree ); const char * hb_osEncode( const char * szFileName, char ** pszFree ); const char * hb_osDecode( const char * szFileName, char ** pszFree ); Please look at implementation and current usage of these functions. + added new function: BOOL hb_itemGetWriteCL( PHB_ITEM pItem, char ** pszValue, ULONG * pulLen ); which converts item string buffer to writable state to use with functions like FREAD() instead of hb_itemUnShare*() * updatd other code to respect above modifications ! fixed bugs (also GPF traps) located by above modifications TODO: please make build tests. Especially in OS2 - not tested at all.
2009-06-26 00:33:38 +00:00
parent bd5452a48f
commit c3e1436da0
232 changed files with 2444 additions and 2074 deletions
--- a/harbour/source/debug/dbgentry.c
+++ b/harbour/source/debug/dbgentry.c
@@ -70,11 +70,6 @@ static BOOL hb_clsSetScope( BOOL fScope ) { return fScope; }
 #define FILENAME_EQUAL(s1, s2) ( !hb_stricmp( (s1), (s2) ) )
 #endif

-#define ALLOC hb_xgrab
-#define FREE hb_xfree
-#define STRDUP hb_strdup
-#define STRNDUP( dest, source, len ) ( dest = hb_strndup( (source), (len) ) )
-
 #define ARRAY_ADD( type, array, length ) \
   ( ( ++length == 1 ) ? ( array = ( type * ) hb_xgrab( sizeof( type ) ) ) : \
      ( ( array = ( type * ) hb_xrealloc( array, sizeof( type ) * length ) ) + \
@@ -179,19 +174,19 @@ typedef struct
 static PHB_ITEM hb_dbgActivateBreakArray( HB_DEBUGINFO *info );
 static PHB_ITEM hb_dbgActivateModuleArray( HB_DEBUGINFO *info );
 static PHB_ITEM hb_dbgActivateVarArray( int nVars, HB_VARINFO *aVars );
-static void     hb_dbgAddLocal( HB_DEBUGINFO *info, char *szName, int nIndex, int nFrame );
-static void     hb_dbgAddModule( HB_DEBUGINFO *info, char *szName );
-static void     hb_dbgAddStack( HB_DEBUGINFO *info, char *szName, int nProcLevel );
-static void     hb_dbgAddStatic( HB_DEBUGINFO *info, char *szName, int nIndex, PHB_ITEM pFrame );
-static void     hb_dbgAddVar( int *nVars, HB_VARINFO **aVars, char *szName, char cType, int nIndex, int nFrame, PHB_ITEM pFrame );
+static void     hb_dbgAddLocal( HB_DEBUGINFO *info, const char *szName, int nIndex, int nFrame );
+static void     hb_dbgAddModule( HB_DEBUGINFO *info, const char *szName );
+static void     hb_dbgAddStack( HB_DEBUGINFO *info, const char *szName, int nProcLevel );
+static void     hb_dbgAddStatic( HB_DEBUGINFO *info, const char *szName, int nIndex, PHB_ITEM pFrame );
+static void     hb_dbgAddVar( int *nVars, HB_VARINFO **aVars, const char *szName, char cType, int nIndex, int nFrame, PHB_ITEM pFrame );
 static void     hb_dbgAddStopLines( HB_DEBUGINFO *info, PHB_ITEM pItem );
 static void     hb_dbgEndProc( HB_DEBUGINFO *info );
 static PHB_ITEM hb_dbgEval( HB_DEBUGINFO *info, HB_WATCHPOINT *watch );
-static PHB_ITEM hb_dbgEvalMacro( char *szExpr, PHB_ITEM pItem );
+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, char *szModule, int nLine );
+static BOOL     hb_dbgIsBreakPoint( HB_DEBUGINFO *info, const char *szModule, int nLine );
 static BOOL     hb_dbgEqual( PHB_ITEM pItem1, PHB_ITEM pItem2 );
 static void     hb_dbgQuit( HB_DEBUGINFO *info );
 static PHB_ITEM hb_dbgVarGet( HB_VARINFO *scope );
@@ -336,7 +331,7 @@ static PHB_ITEM hb_dbgActivateVarArray( int nVars, HB_VARINFO *aVars )
 }


-void hb_dbgEntry( int nMode, int nLine, char *szName, int nIndex, PHB_ITEM pFrame )
+void hb_dbgEntry( int nMode, int nLine, const char *szName, int nIndex, PHB_ITEM pFrame )
 {
   int i;
   ULONG nProcLevel;
@@ -350,7 +345,7 @@ void hb_dbgEntry( int nMode, int nLine, char *szName, int nIndex, PHB_ITEM pFram
   {
      if( !info )
      {
-         info = *infoPtr = ( HB_DEBUGINFO * ) ALLOC( sizeof( HB_DEBUGINFO ) );
+         info = *infoPtr = ( HB_DEBUGINFO * ) hb_xgrab( sizeof( HB_DEBUGINFO ) );
         memset( info, 0, sizeof( HB_DEBUGINFO ) );
         info->bCBTrace = TRUE;
      }
@@ -439,7 +434,7 @@ void hb_dbgEntry( int nMode, int nLine, char *szName, int nIndex, PHB_ITEM pFram
               if ( info->bToCursor )
               {
                  info->bToCursor = FALSE;
-                  FREE( info->szToCursorModule );
+                  hb_xfree( info->szToCursorModule );
               }
               info->bNextRoutine = FALSE;

@@ -458,7 +453,7 @@ void hb_dbgEntry( int nMode, int nLine, char *szName, int nIndex, PHB_ITEM pFram
            if ( info->bToCursor )
            {
               info->bToCursor = FALSE;
-               FREE( info->szToCursorModule );
+               hb_xfree( info->szToCursorModule );
            }
            info->bNextRoutine = FALSE;
            info->bGo = FALSE;
@@ -478,7 +473,7 @@ void hb_dbgEntry( int nMode, int nLine, char *szName, int nIndex, PHB_ITEM pFram
            if ( nLine == info->nToCursorLine
                 && FILENAME_EQUAL( pTop->szModule, info->szToCursorModule ) )
            {
-               FREE( info->szToCursorModule );
+               hb_xfree( info->szToCursorModule );
               info->bToCursor = FALSE;
            }
            else
@@ -528,7 +523,7 @@ void hb_dbgEntry( int nMode, int nLine, char *szName, int nIndex, PHB_ITEM pFram
         if( info )
         {
            hb_dbgQuit( info );
-            FREE( info );
+            hb_xfree( info );
            *infoPtr = HB_DBGINFO_DISABLE;
         }
         return;
@@ -536,9 +531,9 @@ void hb_dbgEntry( int nMode, int nLine, char *szName, int nIndex, PHB_ITEM pFram
 }


-static char * hb_dbgStripModuleName( char * szName )
+static const char * hb_dbgStripModuleName( const char * szName )
 {
-   char * ptr;
+   const char * ptr;

   if( ( ptr = strrchr( szName, '/' ) ) != NULL )
   {
@@ -553,17 +548,17 @@ static char * hb_dbgStripModuleName( char * szName )
 }


-void hb_dbgAddBreak( void *handle, char *cModule, int nLine, char *szFunction )
+void hb_dbgAddBreak( void *handle, const char *szModule, int nLine, const char *szFunction )
 {
   HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
   HB_BREAKPOINT *pBreak;

   pBreak = ARRAY_ADD( HB_BREAKPOINT, info->aBreak, info->nBreakPoints );
-   pBreak->szModule = STRDUP( cModule );
+   pBreak->szModule = hb_strdup( szModule );
   pBreak->nLine = nLine;
   if ( szFunction )
   {
-      pBreak->szFunction = STRDUP( szFunction );
+      pBreak->szFunction = hb_strdup( szFunction );
   }
   else
   {
@@ -572,7 +567,7 @@ void hb_dbgAddBreak( void *handle, char *cModule, int nLine, char *szFunction )
 }


-static void hb_dbgAddLocal( HB_DEBUGINFO *info, char *szName, int nIndex, int nFrame )
+static void hb_dbgAddLocal( HB_DEBUGINFO *info, const char *szName, int nIndex, int nFrame )
 {
   if ( info->bInitGlobals )
   {
@@ -589,16 +584,16 @@ static void hb_dbgAddLocal( HB_DEBUGINFO *info, char *szName, int nIndex, int nF
 }


-static void hb_dbgAddModule( HB_DEBUGINFO *info, char *szName )
+static void hb_dbgAddModule( HB_DEBUGINFO *info, const char *szName )
 {
   char * szModuleName;
-   char * szFuncName;
+   const char * szFuncName;
   int iLen;

   szName = hb_dbgStripModuleName( szName );
   szFuncName = strrchr( szName, ':' );
   iLen = szFuncName ? ( int ) ( szFuncName - szName ) : ( int ) strlen( szName );
-   STRNDUP( szModuleName, szName, iLen );
+   szModuleName = hb_strndup( szName, iLen );

   if( !info->nModules || strcmp( info->aModules[ info->nModules - 1 ].szModule, szModuleName ) )
   {
@@ -612,16 +607,16 @@ static void hb_dbgAddModule( HB_DEBUGINFO *info, char *szName )
   }
   else
   {
-      FREE( szModuleName );
+      hb_xfree( szModuleName );
   }
 }


-static void hb_dbgAddStack( HB_DEBUGINFO *info, char *szName, int nProcLevel )
+static void hb_dbgAddStack( HB_DEBUGINFO *info, const char *szName, int nProcLevel )
 {
   char szBuff[ HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 5 ];
   HB_CALLSTACKINFO *top;
-   char *szFunction = strrchr( szName, ':' );
+   const char *szFunction = strrchr( szName, ':' );

   if ( szFunction )
   {
@@ -632,29 +627,29 @@ static void hb_dbgAddStack( HB_DEBUGINFO *info, char *szName, int nProcLevel )
   {
      memcpy( szBuff, "(b)", 3 );
      hb_strncpy( szBuff + 3, szFunction, sizeof( szBuff ) - 4 );
-      top->szFunction = STRDUP( szBuff );
+      top->szFunction = hb_strdup( szBuff );
   }
   else
   {
      if ( szFunction )
      {
-         top->szFunction = STRDUP( szFunction );
+         top->szFunction = hb_strdup( szFunction );
      }
      else
      {
         /* We're in an (_INITSTATICSnnnnn) pseudo-function */
         hb_procinfo( 0, szBuff, NULL, NULL );
-         top->szFunction = STRDUP( szBuff );
+         top->szFunction = hb_strdup( szBuff );
      }
   }
   szName = hb_dbgStripModuleName( szName );
   if ( szFunction )
   {
-      STRNDUP( top->szModule, szName, szFunction - szName - 1 );
+      top->szModule = hb_strndup( szName, szFunction - szName - 1 );
   }
   else
   {
-      top->szModule = STRDUP( szName );
+      top->szModule = hb_strdup( szName );
   }
   top->nProcLevel = nProcLevel;
   top->nLine = 0;
@@ -663,7 +658,7 @@ static void hb_dbgAddStack( HB_DEBUGINFO *info, char *szName, int nProcLevel )
 }


-static void hb_dbgAddStatic( HB_DEBUGINFO *info, char *szName, int nIndex, PHB_ITEM pFrame )
+static void hb_dbgAddStatic( HB_DEBUGINFO *info, const char *szName, int nIndex, PHB_ITEM pFrame )
 {
   if ( info->bInitGlobals )
   {
@@ -705,7 +700,7 @@ static void hb_dbgAddStopLines( HB_DEBUGINFO *info, PHB_ITEM pItem )
      for ( i = 1; i <= nItemLen; i++ )
      {
         PHB_ITEM pEntry = hb_arrayGetItemPtr( pItem, i );
-         char *szModule = hb_arrayGetCPtr( pEntry, 1 );
+         const char *szModule = hb_arrayGetCPtr( pEntry, 1 );
         BOOL bFound = FALSE;

         szModule = hb_dbgStripModuleName( szModule );
@@ -722,8 +717,8 @@ static void hb_dbgAddStopLines( HB_DEBUGINFO *info, PHB_ITEM pItem )
               int nNewLen = hb_arrayGetCLen( pEntry, 3 );
               int nMin = HB_MIN( nNewMin, nOrigMin );
               int nMax = HB_MAX( nNewMin + nNewLen * 8, nOrigMin + nOrigLen * 8 );
-               char *pOrigBuffer = hb_arrayGetCPtr( pLines, 3 );
-               char *pNewBuffer = hb_arrayGetCPtr( pEntry, 3 );
+               const char *pOrigBuffer = hb_arrayGetCPtr( pLines, 3 );
+               const char *pNewBuffer = hb_arrayGetCPtr( pEntry, 3 );
               int nLen = ( nMax + 1 - nMin + 7 ) / 8 + 1;
               int k;
               char *pBuffer = (char *) hb_xgrab( nLen );
@@ -752,27 +747,28 @@ static void hb_dbgAddStopLines( HB_DEBUGINFO *info, PHB_ITEM pItem )
   for ( i = 1; i <= nLinesLen; i++ )
   {
      PHB_ITEM pEntry = hb_arrayGetItemPtr( info->pStopLines, i );
-      char *szModule = hb_arrayGetCPtr( pEntry, 1 );
+      const char *szModule = hb_arrayGetCPtr( pEntry, 1 );

      if( szModule )
      {
-         char *szName = hb_dbgStripModuleName( szModule );
+         const char *szName = hb_dbgStripModuleName( szModule );

         if( szName != szModule )
         {
-            hb_arraySetC( pEntry, 1, szName );
+            hb_arraySetCPtr( pEntry, 1, hb_strdup( szName ), strlen( szName ) );
         }
      }
   }
 }


-static void hb_dbgAddVar( int *nVars, HB_VARINFO **aVars, char *szName, char cType, int nIndex, int nFrame, PHB_ITEM pFrame )
+static void hb_dbgAddVar( int *nVars, HB_VARINFO **aVars, const char *szName, char cType, int nIndex, int nFrame, PHB_ITEM pFrame )
 {
   HB_VARINFO *var;

   var = ARRAY_ADD( HB_VARINFO, *aVars, *nVars );
-   var->szName = szName;
+   /* TODO/TOFIX: value should be duplicated here and then released */
+   var->szName = ( char * ) szName;
   var->cType = cType;
   var->nIndex = nIndex;
   if( cType == 'S' )
@@ -782,13 +778,13 @@ static void hb_dbgAddVar( int *nVars, HB_VARINFO **aVars, char *szName, char cTy
 }


-void hb_dbgAddWatch( void *handle, char *szExpr, BOOL bTrace )
+void hb_dbgAddWatch( void *handle, const char *szExpr, BOOL bTrace )
 {
   HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
   HB_WATCHPOINT *pWatch;

   pWatch = ARRAY_ADD( HB_WATCHPOINT, info->aWatch, info->nWatchPoints );
-   pWatch->szExpr = STRDUP( szExpr );
+   pWatch->szExpr = hb_strdup( szExpr );
   pWatch->pBlock = NULL;
   pWatch->nVars = 0;

@@ -804,7 +800,7 @@ void hb_dbgAddWatch( void *handle, char *szExpr, BOOL bTrace )

 static void hb_dbgClearWatch( HB_WATCHPOINT *pWatch )
 {
-   FREE( pWatch->szExpr );
+   hb_xfree( pWatch->szExpr );
   if ( pWatch->pBlock )
   {
      hb_itemRelease( pWatch->pBlock );
@@ -815,9 +811,9 @@ static void hb_dbgClearWatch( HB_WATCHPOINT *pWatch )

      for (i = 0; i < pWatch->nVars; i++)
      {
-         FREE( pWatch->aVars[ i ] );
+         hb_xfree( pWatch->aVars[ i ] );
      }
-      FREE( pWatch->aVars );
+      hb_xfree( pWatch->aVars );
   }
 }

@@ -827,10 +823,10 @@ void hb_dbgDelBreak( void *handle, int nBreak )
   HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
   HB_BREAKPOINT *pBreak = &info->aBreak[ nBreak ];

-   FREE( pBreak->szModule );
+   hb_xfree( pBreak->szModule );
   if ( pBreak->szFunction )
   {
-      FREE( pBreak->szFunction );
+      hb_xfree( pBreak->szFunction );
   }
   ARRAY_DEL( HB_BREAKPOINT, info->aBreak, info->nBreakPoints, nBreak );
 }
@@ -874,19 +870,19 @@ static void hb_dbgEndProc( HB_DEBUGINFO *info )
      return;

   top = &info->aCallStack[ --info->nCallStackLen ];
-   FREE( top->szFunction );
-   FREE( top->szModule );
+   hb_xfree( top->szFunction );
+   hb_xfree( top->szModule );
   if ( top->nLocals )
   {
-      FREE( top->aLocals );
+      hb_xfree( top->aLocals );
   }
   if ( top->nStatics )
   {
-      FREE( top->aStatics );
+      hb_xfree( top->aStatics );
   }
   if ( !info->nCallStackLen )
   {
-      FREE( info->aCallStack );
+      hb_xfree( info->aCallStack );
      info->aCallStack = NULL;
   }
 }
@@ -959,19 +955,19 @@ static PHB_ITEM hb_dbgEval( HB_DEBUGINFO *info, HB_WATCHPOINT *watch )
      {
         if ( watch->aScopes[ i ].cType == 'M' )
         {
-            FREE( watch->aScopes[ i ].szName );
+            hb_xfree( watch->aScopes[ i ].szName );
         }
      }
      if ( watch->nVars )
      {
-         FREE( watch->aScopes );
+         hb_xfree( watch->aScopes );
      }
   }
   return xResult;
 }


-static PHB_ITEM hb_dbgEvalMacro( char *szExpr, PHB_ITEM pItem )
+static PHB_ITEM hb_dbgEvalMacro( const char *szExpr, PHB_ITEM pItem )
 {
   PHB_ITEM pStr;
   const char *type;
@@ -1012,17 +1008,17 @@ static int hb_dbgEvalSubstituteVar( HB_WATCHPOINT *watch, char *szWord, int nSta
   }
   else
   {
-      FREE( szWord );
+      hb_xfree( szWord );
   }

-   t = (char *) ALLOC( strlen( watch->szExpr ) - nLen + 9 + 1 );
+   t = (char *) hb_xgrab( strlen( watch->szExpr ) - nLen + 9 + 1 );
   memmove( t, watch->szExpr, nStart );
   memmove( t + nStart, "__dbg[", 6 );
   t[ nStart + 6 ] = '0' + ( char ) ( ( j + 1 ) / 10 );
   t[ nStart + 7 ] = '0' + ( char ) ( ( j + 1 ) % 10 );
   t[ nStart + 8 ] = ']';
   hb_strncpy( t + nStart + 9, watch->szExpr + nStart + nLen, strlen( watch->szExpr ) - nLen - nStart );
-   FREE( watch->szExpr );
+   hb_xfree( watch->szExpr );
   watch->szExpr = t;
   return nStart + 9;
 }
@@ -1053,7 +1049,7 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch )
            c = watch->szExpr[ j ];
         }
         nLen = j - i;
-         STRNDUP( szWord, watch->szExpr + i, nLen );
+         szWord = hb_strndup( watch->szExpr + i, nLen );
         i = j;
         if ( c )
         {
@@ -1063,7 +1059,7 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch )
            }
            if ( watch->szExpr[ i ] == '(' )
            {
-               FREE( szWord );
+               hb_xfree( szWord );
               continue;
            }
            if ( watch->szExpr[ i ] == '-' && watch->szExpr[ i + 1 ] == '>' )
@@ -1073,7 +1069,7 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch )
               {
                  i++;
               }
-               FREE( szWord );
+               hb_xfree( szWord );
               continue;
            }
         }
@@ -1174,7 +1170,7 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch )

   buffsize = 8 + strlen( watch->szExpr ) + 1;

-   s = ( char * ) ALLOC( buffsize + 1 );
+   s = ( char * ) hb_xgrab( buffsize + 1 );
   hb_strncpy( s, "{|__dbg|", buffsize );
   hb_strncat( s, watch->szExpr, buffsize );
   hb_strncat( s, "}", buffsize );
@@ -1185,7 +1181,7 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch )
      hb_itemRelease( pBlock );
      pBlock = NULL;
   }
-   FREE( s );
+   hb_xfree( s );

   return pBlock;
 }
@@ -1205,7 +1201,7 @@ static PHB_ITEM hb_dbgEvalResolve( HB_DEBUGINFO *info, HB_WATCHPOINT *watch )
      return aVars;
   }

-   scopes = (HB_VARINFO *) ALLOC( watch->nVars * sizeof( HB_VARINFO ) );
+   scopes = (HB_VARINFO *) hb_xgrab( watch->nVars * sizeof( HB_VARINFO ) );
   nProcLevel = hb_dbg_ProcLevel();

   for ( i = 0; i < info->nModules; i++ )
@@ -1303,7 +1299,7 @@ static PHB_ITEM hb_dbgEvalResolve( HB_DEBUGINFO *info, HB_WATCHPOINT *watch )
      }

      scopes[ i ].cType = 'M';
-      scopes[ i ].szName = STRDUP( name );
+      scopes[ i ].szName = hb_strdup( name );
      pItem = hb_dbgVarGet( &scopes[ i ] );
      if ( pItem )
      {
@@ -1319,13 +1315,13 @@ static PHB_ITEM hb_dbgEvalResolve( HB_DEBUGINFO *info, HB_WATCHPOINT *watch )
 }


-PHB_ITEM hb_dbgGetExpressionValue( void *handle, char *expression )
+PHB_ITEM hb_dbgGetExpressionValue( void *handle, const char *expression )
 {
   HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
   PHB_ITEM result;
   HB_WATCHPOINT point;

-   point.szExpr = STRDUP( expression );
+   point.szExpr = hb_strdup( expression );
   point.pBlock = NULL;
   point.nVars = 0;

@@ -1369,7 +1365,7 @@ static BOOL hb_dbgIsAltD( void )
 }


-static BOOL hb_dbgIsBreakPoint( HB_DEBUGINFO *info, char *szModule, int nLine )
+static BOOL hb_dbgIsBreakPoint( HB_DEBUGINFO *info, const char *szModule, int nLine )
 {
   int i;

@@ -1385,7 +1381,7 @@ static BOOL hb_dbgIsBreakPoint( HB_DEBUGINFO *info, char *szModule, int nLine )
 }


-BOOL hb_dbgIsValidStopLine( void *handle, char *szModule, int nLine )
+BOOL hb_dbgIsValidStopLine( void *handle, const char *szModule, int nLine )
 {
   HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
   int nModules = hb_itemSize( info->pStopLines );
@@ -1435,18 +1431,18 @@ static void hb_dbgQuit( HB_DEBUGINFO *info )
      HB_MODULEINFO *module = &info->aModules[ nModules ];
      if ( module->nStatics )
      {
-         FREE( module->aStatics );
+         hb_xfree( module->aStatics );
      }
      if ( module->szModule )
      {
-         FREE( module->szModule );
+         hb_xfree( module->szModule );
      }
      ARRAY_DEL( HB_MODULEINFO, info->aModules, info->nModules, nModules );
   }
   if ( info->bToCursor )
   {
      info->bToCursor = FALSE;
-      FREE( info->szToCursorModule );
+      hb_xfree( info->szToCursorModule );
   }
 }

@@ -1491,12 +1487,12 @@ void hb_dbgSetQuit( void *handle )
 }


-void hb_dbgSetToCursor( void *handle, char *szModule, int nLine )
+void hb_dbgSetToCursor( void *handle, const char *szModule, int nLine )
 {
   HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;

   info->bToCursor = TRUE;
-   info->szToCursorModule = STRDUP( szModule );
+   info->szToCursorModule = hb_strdup( szModule );
   info->nToCursorLine = nLine;
 }

@@ -1510,14 +1506,14 @@ void hb_dbgSetTrace( void *handle )
 }


-void hb_dbgSetWatch( void *handle, int nWatch, char *szExpr, BOOL bTrace )
+void hb_dbgSetWatch( void *handle, int nWatch, const char *szExpr, BOOL bTrace )
 {
   HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle;
   HB_WATCHPOINT *pWatch = &info->aWatch[ nWatch ];
   int i;

   hb_dbgClearWatch( pWatch );
-   pWatch->szExpr = STRDUP( szExpr );
+   pWatch->szExpr = hb_strdup( szExpr );
   pWatch->pBlock = NULL;
   for ( i = 0; i < info->nTracePoints; i++ )
   {