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

20000523-02:06 GMT+1 Victor Szakats <info@szelvesz.hu>

Browse Source
This commit is contained in:
Viktor Szakats
2000-05-23 00:03:41 +00:00
parent b055723311
commit 6a0ab26de6
15 changed files with 113 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
harbour/ChangeLog
View File

@@ -1,3 +1,24 @@
20000523-02:06 GMT+1 Victor Szakats <info@szelvesz.hu>
* makefile.bc
* makefile.vc
* contrib/hbclip/hbclip.ch
* source/compiler/hbgenerr.c
* source/lang/Makefile
* source/lang/msgcs852.c
* source/lang/msgcsiso.c
* source/lang/msgcskam.c
* source/lang/msgsr852.c
* source/lang/msgsriso.c
* source/rtl/Makefile
* misc small corrections and fixes.
* include/hbapi.h
* source/rtl/console.c
* source/rtl/xsavescr.c
! Fixed memory leak when no __XRESTSCREEN() was called after an
__XSAVESCREEN()
2000-05-22 18:15 GMT-4 David G. Holm <dholm@jsd-llc.com>
* source/rtl/filesys.c

65
harbour/contrib/hbclip/hbclip.ch
View File

@@ -45,49 +45,48 @@
#ifndef __HARBOUR__
#ifndef HB_CLIP_CH_
#define HB_CLIP_CH_
#ifndef HB_CLIP_CH_
#define HB_CLIP_CH_
/* TODO: Rewrite as much of these in C or Clipper */
/* TODO: Rewrite as much of these in C or Clipper */
#xtranslate HB_ARGCHECK( <s> ) => ( .F. )
#xtranslate HB_ARGSTRING( <s> ) => ""
#xtranslate HB_FNAMESPLIT( <s> ) => NIL
#xtranslate HB_FNAMEMERGE( <s1>[, <s2>[, <s3>[, <s4>]]] ) => ""
#xtranslate HB_PVALUE( <n> ) => NIL
#xtranslate HB_SETKEYGET( [<n>][, <b>] ) => NIL
#xtranslate HB_SETKEYSAVE( [<a>] ) => ( {} )
#xtranslate HB_SETKEYCHECK( <n>[, <x1>[, <x2>[, <x3>]]] ) => ( .F. )
#xtranslate HB_ARGCHECK( <s> ) => ( .F. )
#xtranslate HB_ARGSTRING( <s> ) => ""
#xtranslate HB_FNAMESPLIT( <s> ) => NIL
#xtranslate HB_FNAMEMERGE( <s1>[, <s2>[, <s3>[, <s4>]]] ) => ""
#xtranslate HB_PVALUE( <n> ) => NIL
#xtranslate HB_SETKEYGET( [<n>][, <b>] ) => NIL
#xtranslate HB_SETKEYSAVE( [<a>] ) => ( {} )
#xtranslate HB_SETKEYCHECK( <n>[, <x1>[, <x2>[, <x3>]]] ) => ( .F. )
#TRANSLATE AS ARRAY [OF <type>] =>
#translate AS ARRAY [OF <type>] =>
#TRANSLATE AS CHAR =>
#TRANSLATE AS CHARACTER =>
#TRANSLATE AS STRING =>
#translate AS CHAR =>
#translate AS CHARACTER =>
#translate AS STRING =>
#TRANSLATE AS CLASS <ClassName> =>
#TRANSLATE AS STRU <StruName> =>
#TRANSLATE AS STRUCTURE <StruName> =>
#translate AS CLASS <ClassName> =>
#translate AS STRU <StruName> =>
#translate AS STRUCTURE <StruName> =>
#TRANSLATE AS NUM =>
#TRANSLATE AS NUMERIC =>
#translate AS NUM =>
#translate AS NUMERIC =>
#TRANSLATE AS DATE =>
#TRANSLATE AS BLOCK =>
#translate AS DATE =>
#translate AS BLOCK =>
#TRANSLATE AS OBJ =>
#TRANSLATE AS OBJECT =>
#translate AS OBJ =>
#translate AS OBJECT =>
#TRANSLATE AS BOOL =>
#TRANSLATE AS BOOLEAN =>
#TRANSLATE AS LOG =>
#TRANSLATE AS LOGICAL =>
#translate AS BOOL =>
#translate AS BOOLEAN =>
#translate AS LOG =>
#translate AS LOGICAL =>
#TRANSLATE AS VAR =>
#TRANSLATE AS VARIANT =>
#translate AS VAR =>
#translate AS VARIANT =>
#COMMAND DECLARE <*x*> =>
#COMMAND STRUCTURE <*x*> =>
#command DECLARE <*x*> =>
#command STRUCTURE <*x*> =>
#endif

1
harbour/include/hbapi.h
View File

@@ -459,6 +459,7 @@ extern void hb_conOutStd( char * pStr, ULONG ulLen );
extern void hb_conOutErr( char * pStr, ULONG ulLen );
extern USHORT hb_conSetCursor( BOOL bSetCursor, USHORT usNewCursor );
extern char * hb_conSetColor( char * szColor );
extern void hb_conXSaveRestRelease( void );
/* compiler and macro compiler */
extern char * hb_compReservedName( char * );

35
harbour/makefile.bc
View File

@@ -305,6 +305,9 @@ RTL_LIB_OBJS = \
LANG_LIB_OBJS = \
$(OBJ_DIR)\msgca.obj \
$(OBJ_DIR)\msgcs852.obj \
$(OBJ_DIR)\msgcsiso.obj \
$(OBJ_DIR)\msgcskam.obj \
$(OBJ_DIR)\msgen.obj \
$(OBJ_DIR)\msges.obj \
$(OBJ_DIR)\msgeu.obj \
@@ -319,13 +322,7 @@ LANG_LIB_OBJS = \
$(OBJ_DIR)\msgpt.obj \
$(OBJ_DIR)\msgro.obj \
$(OBJ_DIR)\msgsr852.obj \
$(OBJ_DIR)\msgsriso.obj \
$(OBJ_DIR)\msgcs852.obj \
$(OBJ_DIR)\msgcsiso.obj \
$(OBJ_DIR)\msgcskam.obj
$(OBJ_DIR)\msgsriso.obj
#
# MACRO.LIB rules
@@ -1587,6 +1584,18 @@ $(OBJ_DIR)\msgca.obj : $(LANG_DIR)\msgca.c
$(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\msgcs852.obj : $(LANG_DIR)\msgcs852.c
$(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\msgcsiso.obj : $(LANG_DIR)\msgcsiso.c
$(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\msgcskam.obj : $(LANG_DIR)\msgcskam.c
$(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\msgen.obj : $(LANG_DIR)\msgen.c
$(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
@@ -1647,18 +1656,6 @@ $(OBJ_DIR)\msgsriso.obj : $(LANG_DIR)\msgsriso.c
$(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\msgcs852.obj : $(LANG_DIR)\msgcs852.c
$(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\msgcsiso.obj : $(LANG_DIR)\msgcsiso.c
$(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\msgcskam.obj : $(LANG_DIR)\msgcskam.c
$(CC) $(CLIBFLAGS) -I$(LANG_DIR) -o$@ $**
tlib $(LANG_LIB) $(ARFLAGS) -+$@,,
#
# MACRO.LIB dependencies
#

8
harbour/makefile.vc
View File

@@ -338,6 +338,9 @@ RTL_LIB_OBJS = \
LANG_LIB_OBJS = \
$(OBJ_DIR)\msgca.obj \
$(OBJ_DIR)\msgcs852.obj \
$(OBJ_DIR)\msgcsiso.obj \
$(OBJ_DIR)\msgcskam.obj \
$(OBJ_DIR)\msgen.obj \
$(OBJ_DIR)\msges.obj \
$(OBJ_DIR)\msgeu.obj \
@@ -352,10 +355,7 @@ LANG_LIB_OBJS = \
$(OBJ_DIR)\msgpt.obj \
$(OBJ_DIR)\msgro.obj \
$(OBJ_DIR)\msgsr852.obj \
$(OBJ_DIR)\msgsriso.obj \
$(OBJ_DIR)\msgcs852.obj \
$(OBJ_DIR)\msgcsiso.obj \
$(OBJ_DIR)\msgcskam.obj
$(OBJ_DIR)\msgsriso.obj
#
# MACRO.LIB rules

6
harbour/source/compiler/hbgenerr.c
View File

@@ -94,7 +94,7 @@ char * hb_comp_szWarnings[] =
"1Ambiguous reference: \'%s\'",
"1Ambiguous reference, assuming memvar: \'%s\'",
"2Variable: \'%s\' declared but not used in function: \'%s\'",
"2CodeBlock Parameter: \'%s\' declared but not used in function: \'%s\'",
"2Codeblock Parameter: \'%s\' declared but not used in function: \'%s\'",
"1RETURN statement with no return value in function",
"1Procedure returns value",
"1Function \'%s\' does not end with RETURN statement",
@@ -107,14 +107,14 @@ char * hb_comp_szWarnings[] =
"3Incompatible return type: \'%s\' expected: \'%s\'",
"3Invalid number of parameters: %s expected: %s",
"3Incompatible parameter # %s expected: \'%s\'",
"3Duplicate Declaration of %s \'%s\'",
"3Duplicate declaration of %s \'%s\'",
"3Function \'%s\' conflicting with its declaration",
"3Variable \'%s\' used but never initialized",
"3Value of Variable \'%s\' never used",
"3Incompatible type in assignment to declared array element expected: \'%s\'",
"4Suspicious type in assignment to declared array element expected: \'%s\'",
"3Class \'%s\' not known in declaration of \'%s\'",
"3Message \'%s\' not known in Class \'%s\'",
"3Message \'%s\' not known in class \'%s\'",
"0Meaningless use of expression: \'%s\'",
"2Unreachable code",
"1Redundant \'ANNOUNCE %s\' statement ignored"

6
harbour/source/lang/Makefile
View File

@@ -6,6 +6,9 @@ ROOT = ../../
C_SOURCES=\
msgca.c \
msgcs852.c \
msgcsiso.c \
msgcskam.c \
msgen.c \
msges.c \
msgeu.c \
@@ -21,9 +24,6 @@ C_SOURCES=\
msgro.c \
msgsr852.c \
msgsriso.c \
msgcs852.c \
msgcsiso.c \
msgcskam.c \
LIBNAME=lang

3
harbour/source/lang/msgcs852.c
View File

@@ -187,4 +187,5 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_CS852 )
HB_CALL_ON_STARTUP_END( hb_lang_Init_CS852 )
#if ! defined(__GNUC__) && ! defined(_MSC_VER)
#pragma startup hb_lang_Init_CS852
#endif
#endif

3
harbour/source/lang/msgcsiso.c
View File

@@ -187,4 +187,5 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_CSISO )
HB_CALL_ON_STARTUP_END( hb_lang_Init_CSISO )
#if ! defined(__GNUC__) && ! defined(_MSC_VER)
#pragma startup hb_lang_Init_CSISO
#endif
#endif

3
harbour/source/lang/msgcskam.c
View File

@@ -187,4 +187,5 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_CSKAM )
HB_CALL_ON_STARTUP_END( hb_lang_Init_CSKAM )
#if ! defined(__GNUC__) && ! defined(_MSC_VER)
#pragma startup hb_lang_Init_CSKAM
#endif
#endif

14
harbour/source/lang/msgsr852.c
View File

@@ -44,12 +44,12 @@ static HB_LANG s_lang =
{
/* Identification */
"SR852", /* ID */
"Serbian", /* Name (in English) */
"SR852", /* ID */
"Serbian", /* Name (in English) */
"Srpski", /* Name (in native language) */
"SR", /* RFC ID */
"852", /* Codepage */
"$Revision$ $Date$", /* Version */
"SR", /* RFC ID */
"852", /* Codepage */
"$Revision$ $Date$", /* Version */
/* Month names */
@@ -64,7 +64,7 @@ static HB_LANG s_lang =
"Septembar",
"Oktobar",
"Novembar",
"Decembar"
"Decembar",
/* Day names */
@@ -74,7 +74,7 @@ static HB_LANG s_lang =
"Sreda",
"¬etvrtak",
"Petak",
"Subota"
"Subota",
/* CA-Cl*pper compatible natmsg items */

8
harbour/source/lang/msgsriso.c
View File

@@ -48,8 +48,8 @@ static HB_LANG s_lang =
"Serbian", /* Name (in English) */
"Srpski", /* Name (in native language) */
"SR", /* RFC ID */
"ISO-8859-2", /* Codepage */
"$Revision$ $Date$", /* Version */
"ISO-8859-2", /* Codepage */
"$Revision$ $Date$", /* Version */
/* Month names */
@@ -64,7 +64,7 @@ static HB_LANG s_lang =
"Septembar",
"Oktobar",
"Novembar",
"Decembar"
"Decembar",
/* Day names */
@@ -74,7 +74,7 @@ static HB_LANG s_lang =
"Sreda",
"Èetvrtak",
"Petak",
"Subota"
"Subota",
/* CA-Cl*pper compatible natmsg items */

12
harbour/source/rtl/Makefile
View File

@@ -78,12 +78,12 @@ C_SOURCES=\
scroll.c \
seconds.c \
set.c \
setcolor.c \
setcurs.c \
setkey.c \
setpos.c \
setposbs.c \
shadow.c \
setcolor.c \
setcurs.c \
setkey.c \
setpos.c \
setposbs.c \
shadow.c \
soundex.c \
space.c \
str.c \

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

@@ -139,6 +139,7 @@ void hb_conRelease( void )
s_szCrLf[ 1 ] = '\0';
hb_setkeyExit(); /* April White, May 6, 2000 */
hb_conXSaveRestRelease();
hb_gtExit();
hb_mouseExit();

9
harbour/source/rtl/xsavescr.c
View File

@@ -53,6 +53,15 @@ static SHORT s_iRow;
static SHORT s_iCol;
static void * s_pBuffer = NULL;
void hb_conXSaveRestRelease( void )
{
if( s_pBuffer )
{
hb_xfree( s_pBuffer );
s_pBuffer = NULL;
};
}
HB_FUNC( __XSAVESCREEN )
{
if( s_pBuffer != NULL )