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

19990917-03:22 GMT+1

Browse Source
This commit is contained in:
Viktor Szakats
1999-09-18 01:49:19 +00:00
parent 8799bf1516
commit ac72ee1208
14 changed files with 101 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
harbour/ChangeLog
View File

@@ -1,9 +1,37 @@
19990917-03:22 GMT+1 Victor Szel <info@szelvesz.hu>
* source/rtl/memofile.c
source/rtl/Makefile
makefile.*
funclist.txt
+ MEMOREAD()/MEMOWRIT() functions added.
(Borland/MSVC makefiles modified, but not tested)
* tests/working/rtl_test.prg
+ MEMOREAD()/MEMOWRIT() tests added.
* include/itemapi.h
source/rtl/itemapi.c
+ hb_itemPutCPtr() Item API function added, to make it possible to
attach a buffer directly to a string item in a standard way, this
way one memcpy()/strcpy() can be saved, this can be used when the caller
have already allocated a buffer. Recommended when the expected string
size is very large. The allocated buffer size must be ulLen + 1.
* source/tools/io.c
- CD(), MD(), RD(), DISKFREE() removed since these are in the standard
RTL.
* source/rtl/tget.prg
! Insert() fix by Kwon,Oh-Chul <ohchul@fivetech.net>
* source/rtl/console.c
! HB___ACCEPTSTR() one missing underscore added.
! SAVESCREEN() pBuffer type changed back to void *, since xgrab() would not
be compatible, (char*) casts would not be needed, and gtSave() would have
to complain...in theory at least.
(What was the compiler (and which one) complaining about ?)
19990917-21:10 EDT David G. Holm <dholm@jsd-llc.com>
* include/extend.h
% Changed local pointers in hb_xmemcpy() and hb_xmemset()
from void * to BYTE * to keep Borland C compiler happy.
19990917-18:00 EDT David G. Holm <dholm@jsd-llc.com>
* include/extend.h
@@ -99,7 +127,7 @@
% Internal vmDo() call replaced with standard API functions.
! Internal error removed, direct buffer string modification resolved.
* source/rtl/objfunc.prg
+ Explcitly repeated function names in the __ERR*() call changed to
+ Explcitly repeated function names in the __ERR*() calls changed to
PROCNAME(0).
* source/vm/hvm.c
include/ctoharb.h

4
harbour/funclist.txt
View File

@@ -160,10 +160,10 @@ MAXCOL ;R;
MAXROW ;R;
MEMOEDIT ;N;
MEMOLINE ;N;
MEMOREAD ;N;
MEMOREAD ;R;
MEMORY ;N;
MEMOTRAN ;R;
MEMOWRIT ;N;
MEMOWRIT ;R;
MEMVARBLOCK ;R;
MIN ;R;
MLCOUNT ;N;

1
harbour/include/itemapi.h
View File

@@ -72,6 +72,7 @@ extern PHB_ITEM hb_itemNew ( PHB_ITEM pNull );
extern USHORT hb_itemPCount ( void );
extern PHB_ITEM hb_itemParam ( USHORT uiParam );
extern PHB_ITEM hb_itemPutC ( PHB_ITEM pItem, char * szText );
extern PHB_ITEM hb_itemPutCPtr ( PHB_ITEM pItem, char * szText, ULONG ulLen );
extern PHB_ITEM hb_itemPutCL ( PHB_ITEM pItem, char * szText, ULONG ulLen );
extern PHB_ITEM hb_itemPutDS ( PHB_ITEM pItem, char * szDate );
extern PHB_ITEM hb_itemPutDL ( PHB_ITEM pItem, long lJulian );

3
harbour/makefile.b16
View File

@@ -19,7 +19,7 @@ harbour.lib : arrays.obj asort.obj classes.obj codebloc.obj dates.obj \
dates2.obj datesx.obj \
debug.obj descend.obj devoutp.obj dynsym.obj environ.obj terror.obj \
errorapi.obj errorsys.obj harbinit.obj extend.obj files.obj fm.obj \
hardcr.obj initsymb.obj itemapi.obj math.obj memvars.obj \
hardcr.obj initsymb.obj itemapi.obj math.obj memofile.obj memvars.obj \
mathx.obj mtran.obj objfunc.obj set.obj setcolor.obj stringp.obj \
strings.obj stringsx.obj tclass.obj transfrm.obj
@@ -56,6 +56,7 @@ initsymb.obj : initsymb.c extend.h hbdefs.h
itemapi.obj : itemapi.c extend.h hbdefs.h
math.obj : math.c extend.h hbdefs.h
mathx.obj : mathx.c extend.h hbdefs.h
memofile.obj : memofile.c extend.h hbdefs.h
memvars.obj : memvars.c extend.h hbdefs.h
mtran.obj : mtran.c extend.h hbdefs.h
objfunc.obj : objfunc.c extend.h hbdefs.h

3
harbour/makefile.b31
View File

@@ -22,7 +22,7 @@ harbour.lib : arrays.obj asort.obj classes.obj codebloc.obj copyfile.obj \
dates.obj descend.obj devoutp.obj dir.obj dynsym.obj environ.obj \
terror.obj errorapi.obj errorsys.obj harbinit.obj extend.obj \
filesys.obj gtapi.obj hardcr.obj initsymb.obj itemapi.obj \
math.obj memvars.obj mtran.obj msguk.obj objfunc.obj \
math.obj memofile.obj memvars.obj mtran.obj msguk.obj objfunc.obj \
set.obj setcolor.obj strings.obj symbols.obj \
tclass.obj transfrm.obj
@@ -66,6 +66,7 @@ harbinit.obj : harbinit.prg extend.h hbdefs.h init.h pcode.h
hardcr.obj : hardcr.c extend.h hbdefs.h
itemapi.obj : itemapi.c extend.h hbdefs.h ctoharb.h itemapi.h set.h dates.h
math.obj : math.c extend.h hbdefs.h
memofile.obj : memofile.c extend.h hbdefs.h
memvars.obj : memvars.c extend.h hbdefs.h
mtran.obj : mtran.c extend.h hbdefs.h
objfunc.obj : objfunc.prg extend.h hbdefs.h init.h pcode.h

3
harbour/makefile.b32
View File

@@ -23,7 +23,7 @@ harbour.lib : achoice.obj adir.obj alert.obj arrays.obj asort.obj \
dir.obj do.obj dynsym.obj environ.obj terror.obj \
errorapi.obj errorsys.obj harbinit.obj extend.obj fileread.obj filesys.obj fm.obj \
hardcr.obj hb_f.obj hvm.obj initsymb.obj inkey.obj itemapi.obj \
langapi.obj math.obj mathx.obj memvars.obj menuto.obj mtran.obj msges.obj \
langapi.obj math.obj mathx.obj memofile.obj memvars.obj menuto.obj mtran.obj msges.obj \
objfunc.obj readvar.obj xsavescr.obj memvarbl.obj \
set.obj setcolor.obj setkey.obj strfmt.obj strings.obj symbols.obj stringp.obj \
stringsx.obj tbcolumn.obj tbrowse.obj tbrwtext.obj tclass.obj tget.obj tgetlist.obj tone.obj transfrm.obj
@@ -66,6 +66,7 @@ itemapi.obj : itemapi.c extend.h hbdefs.h
langapi.obj : langapi.c extend.h hbdefs.h
math.obj : math.c extend.h hbdefs.h
mathx.obj : mathx.c extend.h hbdefs.h
memofile.obj : memofile.c extend.h hbdefs.h
memvars.obj : memvars.c extend.h hbdefs.h
menuto.obj : menuto.c extend.h hbdefs.h
msges.obj : msges.c extend.h hbdefs.h

3
harbour/makefile.b40
View File

@@ -21,7 +21,7 @@ harbour.lib : arrays.obj asort.obj classes.obj codebloc.obj alert.obj \
dir.obj dynsym.obj environ.obj terror.obj menu.obj \
errorapi.obj errorsys.obj harbinit.obj extend.obj files.obj \
hardcr.obj hb_f.obj initsymb.obj inkey.obj itemapi.obj memvars.obj \
math.obj mathx.obj msguk.obj mtran.obj objfunc.obj \
memofile.obj math.obj mathx.obj msguk.obj mtran.obj objfunc.obj \
set.obj setcolor.obj symbols.obj strings.obj stringp.obj \
stringsx.obj tclass.obj transfrm.obj copyfile.obj
@@ -55,6 +55,7 @@ inkey.obj : inkey.c extend.h hbdefs.h
itemapi.obj : itemapi.c extend.h hbdefs.h
math.obj : math.c extend.h hbdefs.h
memvars.obj : memvars.c extend.h hbdefs.h
memofile.obj : memofile.c extend.h hbdefs.h
mathx.obj : mathx.c extend.h hbdefs.h
msguk.obj : msguk.c extend.h hbdefs.h
mtran.obj : mtran.c extend.h hbdefs.h

4
harbour/makefile.vc
View File

@@ -89,6 +89,7 @@ HARBOUR_LIB_OBJS = \
$(OBJ_DIR)\itemapi.obj \
$(OBJ_DIR)\langapi.obj \
$(OBJ_DIR)\math.obj \
$(OBJ_DIR)\memofile.obj \
$(OBJ_DIR)\memvarbl.obj \
$(OBJ_DIR)\memvars.obj \
$(OBJ_DIR)\menuto.obj \
@@ -417,6 +418,9 @@ $(RTL_DIR)\memvarbl.c : $(RTL_DIR)\memvarbl.prg
$(OBJ_DIR)\memvarbl.obj : $(RTL_DIR)\memvarbl.c
$(CC) $(CLIBFLAGS) -Fo$@ $**
$(OBJ_DIR)\memofile.obj : $(RTL_DIR)\memofile.c
$(CC) $(CLIBFLAGS) -Fo$@ $**
$(OBJ_DIR)\memvars.obj : $(RTL_DIR)\memvars.c
$(CC) $(CLIBFLAGS) -Fo$@ $**

1
harbour/source/rtl/Makefile
View File

@@ -25,6 +25,7 @@ C_SOURCES=\
itemapi.c \
langapi.c \
math.c \
memofile.c \
memvars.c \
mouseapi.c \
mtran.c \

4
harbour/source/rtl/console.c
View File

@@ -1043,7 +1043,7 @@ HARBOUR HB_SAVESCREEN( void )
#ifdef HARBOUR_USE_GTAPI
USHORT uiX;
USHORT uiCoords[ 4 ];
char * pBuffer;
void * pBuffer;
uiCoords[ 0 ] = 0;
uiCoords[ 1 ] = 0;
@@ -1196,7 +1196,7 @@ HARBOUR HB___ACCEPT( void ) /* Internal Clipper function used in ACCEPT command
hb_retc( s_szAcceptResult );
}
HARBOUR HB__ACCEPTSTR( void )
HARBOUR HB___ACCEPTSTR( void )
{
hb_retc( s_szAcceptResult );
}

15
harbour/source/rtl/itemapi.c
View File

@@ -395,6 +395,21 @@ PHB_ITEM hb_itemPutCL( PHB_ITEM pItem, char * szText, ULONG ulLen )
return pItem;
}
PHB_ITEM hb_itemPutCPtr( PHB_ITEM pItem, char * szText, ULONG ulLen )
{
if( pItem )
hb_itemClear( pItem );
else
pItem = hb_itemNew( NULL );
pItem->type = IT_STRING;
pItem->item.asString.length = ulLen;
pItem->item.asString.value = szText;
pItem->item.asString.value[ ulLen ] = '\0';
return pItem;
}
char * hb_itemGetC( PHB_ITEM pItem )
{
if( pItem && IS_STRING( pItem ) )

2
harbour/source/rtl/tget.prg
View File

@@ -455,6 +455,8 @@ METHOD Insert(cChar) CLASS TGet
::BadDate := .f.
endif
::Display() // Kwon,Oh-Chul
return Self
//---------------------------------------------------------------------------//

134
harbour/source/tools/io.c
View File

@@ -10,125 +10,6 @@
#include <bios.h>
#endif
/* $DOC$
* $FUNCNAME$
* CD()
* $CATEGORY$
* DOS
* $ONELINER$
* $SYNTAX$
* CD(<NDIR>)
* $ARGUMENTS$
* <NDIR> DIR TO BE CHANGED
* $RETURNS$
* .T. IF SUCEFUL
* .F. IF NOT
*
* $DESCRIPTION$
* CHANGE THE CURRENT DIRECTORY
* $EXAMPLES$
* IF CD("OLA")
* RETURN(.T.)
* ELSE
* RETURN(.F.)
* ENDIF
*
* $SEEALSO$
*
* $INCLUDE$
* extend.h dos.h dir.h bios.h
* $END$
*/
HARBOUR HB_CD( void )
{
#ifdef __DOS__
hb_retni( ISCHAR( 1 ) ? chdir( hb_parc( 1 ) ) : 0 );
#else
hb_retni( 0 );
#endif
}
/* $DOC$
* $FUNCNAME$
* MD()
* $CATEGORY$
* DOS
* $ONELINER$
*
* $SYNTAX$
* MD(<NDIR>)
* $ARGUMENTS$
* <NDIR> DIRECTORY TO BE CREATED
* $RETURNS$
* .T. IF SUCEFUL
* .F. IF NOT
*
* $DESCRIPTION$
* CREATE A DIRECTORY
* $EXAMPLES$
* IF MD("OLA")
* RETURN(.T.)
* ELSE
* RETURN(.F.)
* ENDIF
*
* $SEEALSO$
*
* $INCLUDE$
* extend.h dos.h dir.h bios.h
* $END$
*/
HARBOUR HB_MD(void)
{
#ifdef __DOS__
hb_retni( ISCHAR( 1 ) ? mkdir( hb_parc( 1 ) ) : 0 );
#else
hb_retni( 0 );
#endif
}
/* $DOC$
* $FUNCNAME$
* RD()
* $CATEGORY$
* DOS
* $ONELINER$
*
* $SYNTAX$
* RD(<NDIR>)
* $ARGUMENTS$
* <NDIR> DIR TO BE DELETED
* $RETURNS$
* .T. IF SUCEFUL
* .F. IF NOT
*
* $DESCRIPTION$
* REMOVE A DIRECTORY
* $EXAMPLES$
* IF RD("OLA")
* RETURN(.T.)
* ELSE
* RETURN(.F.)
* ENDIF
*
* $SEEALSO$
*
* $INCLUDE$
* extend.h dos.h dir.h bios.h
* $END$
*/
HARBOUR HB_RD( void )
{
#ifdef __DOS__
hb_retni( ISCHAR( 1 ) ? rmdir( hb_parc( 1 ) ) : 0 );
#else
hb_retni( 0 );
#endif
}
HARBOUR HB_DISKUSED( void )
{
#ifdef DOS
@@ -150,21 +31,6 @@ HARBOUR HB_DISKUSED( void )
#endif
}
HARBOUR HB_DISKFREE( void )
{
#ifdef DOS
struct diskfree_t disk;
_dos_getdiskfree( 0, &disk );
hb_retnl( ( long ) disk.avail_clusters *
( long ) disk.sectors_per_cluster *
( long ) disk.bytes_per_sector );
#else
hb_retnl( 0 );
#endif
}
HARBOUR HB_DISKFULL( void )
{
#ifdef DOS

41
harbour/tests/working/rtl_test.prg
View File

@@ -73,6 +73,7 @@ STATIC s_nEndTime
STATIC scString
STATIC scStringE
STATIC scStringZ
STATIC scStringW
STATIC snIntZ
STATIC snDoubleZ
STATIC snIntP
@@ -98,6 +99,7 @@ MEMVAR mxNotHere /* Please don't declare this variable, since it's used to test
MEMVAR mcString
MEMVAR mcStringE
MEMVAR mcStringZ
MEMVAR mcStringW
MEMVAR mnIntZ
MEMVAR mnDoubleZ
MEMVAR mnIntP
@@ -1671,10 +1673,10 @@ STATIC FUNCTION Main_MISC()
to hide different path handling, since Harbour is platform
independent. */
TEST_LINE( __copyfile("$$COPYFR.TMP") , "E BASE 2010 Argument error __COPYFILE " )
TEST_LINE( __copyfile("$$COPYFR.TMP", "$$COPYTO.TMP") , NIL )
TEST_LINE( __copyfile("_NOTHERE.$$$", "$$COPYTO.TMP") , "E BASE 2012 Open error _NOTHERE.$$$ F:DR" )
TEST_LINE( __copyfile("$$COPYFR.TMP", "*INVALID*.") , "E BASE 2012 Create error *INVALID*. F:DR" )
TEST_LINE( __CopyFile("$$COPYFR.TMP") , "E BASE 2010 Argument error __COPYFILE " )
TEST_LINE( __CopyFile("$$COPYFR.TMP", "$$COPYTO.TMP") , NIL )
TEST_LINE( __CopyFile("_NOTHERE.$$$", "$$COPYTO.TMP") , "E BASE 2012 Open error _NOTHERE.$$$ F:DR" )
TEST_LINE( __CopyFile("$$COPYFR.TMP", "*INVALID*.") , "E BASE 2012 Create error *INVALID*. F:DR" )
FErase("$$COPYFR.TMP")
FErase("$$COPYTO.TMP")
@@ -1949,6 +1951,24 @@ STATIC FUNCTION Main_MISC()
TEST_LINE( MEMVARBLOCK( "mxNotHere" ) , NIL )
TEST_LINE( MEMVARBLOCK( "mcString" ) , "{||...}" )
/* MEMOWRITE()/MEMOREAD() */
TEST_LINE( MemoWrit() , .F. )
TEST_LINE( MemoWrit("$$MEMOFI.TMP") , .F. )
TEST_LINE( MemoWrit("$$MEMOFI.TMP","") , .T. )
TEST_LINE( MemoRead("$$MEMOFI.TMP") , "" )
TEST_LINE( MemoWrit("$$MEMOFI.TMP",scStringZ) , .T. )
TEST_LINE( MemoRead("$$MEMOFI.TMP") , "A"+Chr(0)+"B" )
TEST_LINE( MemoWrit("$$MEMOFI.TMP",Chr(26)) , .T. )
TEST_LINE( MemoRead("$$MEMOFI.TMP") , ""+Chr(26)+"" )
TEST_LINE( MemoWrit("$$MEMOFI.TMP",scStringW) , .T. )
TEST_LINE( MemoRead("$$MEMOFI.TMP") , ""+Chr(13)+""+Chr(10)+"<22>"+Chr(10)+""+Chr(9)+"" )
TEST_LINE( MemoWrit("*INVALI*.TMP",scStringZ) , .F. )
TEST_LINE( MemoRead() , "" )
TEST_LINE( MemoRead("*INVALI*.TMP") , "" )
FErase("$$MEMOFI.TMP")
RETURN NIL
#ifdef __HARBOUR__
@@ -2101,6 +2121,7 @@ STATIC FUNCTION TEST_BEGIN( cParam )
scString := "HELLO"
scStringE := ""
scStringZ := "A" + Chr( 0 ) + "B"
scStringW := Chr(13)+Chr(10)+Chr(141)+Chr(10)+Chr(9)
snIntZ := 0
snDoubleZ := 0.0
snIntP := 10
@@ -2147,6 +2168,7 @@ STATIC FUNCTION TEST_BEGIN( cParam )
PUBLIC mcString := "HELLO"
PUBLIC mcStringE := ""
PUBLIC mcStringZ := "A" + Chr( 0 ) + "B"
PUBLIC mcStringW := Chr(13)+Chr(10)+Chr(141)+Chr(10)+Chr(9)
PUBLIC mnIntZ := 0
PUBLIC mnDoubleZ := 0.0
PUBLIC mnIntP := 10
@@ -2267,7 +2289,16 @@ STATIC FUNCTION XToStr( xValue )
LOCAL cType := ValType( xValue )
DO CASE
CASE cType == "C" ; RETURN '"' + StrTran( xValue, Chr(0), '"+Chr(0)+"' ) + '"'
CASE cType == "C"
xValue := StrTran( xValue, Chr(0), '"+Chr(0)+"' )
xValue := StrTran( xValue, Chr(9), '"+Chr(9)+"' )
xValue := StrTran( xValue, Chr(10), '"+Chr(10)+"' )
xValue := StrTran( xValue, Chr(13), '"+Chr(13)+"' )
xValue := StrTran( xValue, Chr(26), '"+Chr(26)+"' )
RETURN '"' + xValue + '"'
CASE cType == "N" ; RETURN LTrim( Str( xValue ) )
CASE cType == "D" ; RETURN 'SToD("' + DToS( xValue ) + '")'
CASE cType == "L" ; RETURN iif( xValue, ".T.", ".F." )