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

*** empty log message ***

Browse Source
This commit is contained in:
Viktor Szakats
1999-08-03 10:37:34 +00:00
parent 759e2189ba
commit 5e207720b7
31 changed files with 250 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
harbour/ChangeLog
View File

@@ -1,3 +1,33 @@
19990803-12:22 GMT+1 Victor Szel <info@szelvesz.hu>
! include/rddapi.h
ITEM -> PHB_ITEM
#ifdef COMMENT -> #ifdef 0
+ include/error.api
ERRORP definition added.
! include/itemapi.h - HB_EVAL_PARAM_MAX_ set back to 9
+ include/*.api - #include all the things they include in original
CA-Cl*pper. (*.api, clipdefs.h)
Some other CA-Cl*pper compatible typedefs added.
+ include/fm.api - Some Clipper'87 compatible memory alloc functions
added, also contained in CA-Cl*pper.
_exmgrab(), _exmback (anyone using these ? 8-)
! include/filesys.h
source/rtl/files.c
ERRORP -> PHB_ITEM
* source/rtl/files.c -> source/rtl/filesys.c
source/rtl/Makefile
makefile.*
! makefile.b31 - Fixed a bug where filesys.obj depended on extend.c
+ include/filesys.api
include/extend.api - Some more CA-Cl*pper defines added.
* source/rtl/gt/gtwin.c
__CYGWIN32__ -> __CYGWIN__
Since Cygnus's wrote somewhere that the "32" will be removed
in the future versions of Cygwin GCC.
* include/gtapi.h - Platform detection code moved to
include/hbsetup.h
BTW, it seems that it's not used anywhere yet.
19990803-04:50 EDT Paul Tucker <ptucker@sympatico.ca>
* source/rtl/codebloc.c source/rtl/memvars.c
+ #include "itemapi.h"

1
harbour/include/assert.ch
View File

@@ -26,4 +26,3 @@
#endif /* NDEBUG */
#endif /* _ASSERT_CH */

5
harbour/include/caundoc.api
View File

@@ -10,10 +10,11 @@
#ifndef HB_CAUNDOC_API_
#define HB_CAUNDOC_API_
/* Undocumented TSUPPORT API */
#include "clipdefs.h"
#include "filesys.h"
/* Undocumented TSUPPORT API */
#define _tcreat hb_fsCreate
#define _tunlink hb_fsDelete
#define _topen hb_fsOpen

13
harbour/include/clipdefs.h
View File

@@ -13,12 +13,21 @@
#include "hbdefs.h"
/* old types */
/* Types moved here from *.api files */
typedef PHB_ITEM ERRORP;
typedef double XDOUBLE;
typedef PHB_ITEM ITEM;
typedef PEVALINFO EVALINFOP;
/* Old types */
typedef BYTE byte;
typedef USHORT quant;
typedef BOOL Boolean;
/* new types */
/* New types */
typedef BYTE* BYTEP;
typedef BYTEP PBYTE;
typedef BYTEP BYTEPP;

1
harbour/include/dbstruct.ch
View File

@@ -15,4 +15,3 @@
#define DBS_ALEN 4
#endif /* _DBSTRUCT_CH */

1
harbour/include/directry.ch
View File

@@ -16,4 +16,3 @@
#define F_LEN 5
#endif /* _DIRECTRY_CH */

BIN
harbour/include/error.api
View File

Binary file not shown.

1
harbour/include/errorapi.h
View File

@@ -107,4 +107,3 @@ extern void hb_errorInternal ( ULONG ulCode );
extern char * hb_errorNatDescription ( ULONG ulGenCode ); /* Reads error description in national language */
#endif /* HB_ERRORAPI_H_ */

18
harbour/include/extend.api
View File

@@ -8,8 +8,26 @@
#ifndef HB_EXTEND_API_
#define HB_EXTEND_API_
#include "clipdefs.h"
#include "extend.h"
/* Compatible defines */
#define UNDEF IT_NIL
#define CHARACTER IT_STRING
#define NUMERIC IT_NUMERIC
#define LOGICAL IT_LOGICAL
#define DATE IT_DATE
#define ALIAS IT_ALIAS
#define MPTR IT_BYREF /* or'ed with type when passed by reference */
#define MEMO IT_MEMO
#define WORD ( IT_INTEGER | IT_LONG )
#define ARRAY IT_ARRAY
#define BLOCK IT_BLOCK
#define DOUBLE IT_DOUBLE
/* Functions */
#define _parc hb_parc
#define _parclen hb_parclen
#define _parcsiz hb_parcsiz

17
harbour/include/filesys.api
View File

@@ -48,7 +48,24 @@
#ifndef HB_FILESYS_API_
#define HB_FILESYS_API_
#include "clipdefs.h"
#include "filesys.h"
#include "error.api"
/* Compatible types */
typedef FHANDLE fhandle;
typedef FHANDLE * FHANDLEP;
/* DOS predefined standard handles */
#define STDIN 0
#define STDOUT 1
#define STDERR 2
#define STDAUX 3
#define STDPRN 4
/* Functions */
#define _fsChDir hb_fsChDir
#define _fsChDrv hb_fsChDrv

3
harbour/include/filesys.h
View File

@@ -50,7 +50,6 @@
#include "extend.h"
#include "fileio.ch"
typedef void * ERRORP;
typedef int FHANDLE;
typedef PBYTE BYTEP;
@@ -64,7 +63,7 @@ extern BYTE hb_fsCurDrv ( void );
extern void hb_fsDelete ( BYTEP fpFilename );
extern USHORT hb_fsError ( void );
extern FHANDLE hb_fsExtOpen ( BYTEP fpFilename, BYTEP fpDefExt,
USHORT uiFlags, BYTEP fpPaths, ERRORP pError );
USHORT uiFlags, BYTEP fpPaths, PHB_ITEM pError );
extern USHORT hb_fsIsDrv ( BYTE nDrive );
extern BOOL hb_fsLock ( FHANDLE hFileHandle, ULONG ulStart,
ULONG ulLength, USHORT uiMode );

8
harbour/include/fm.api
View File

@@ -8,10 +8,18 @@
#ifndef HB_FM_API_
#define HB_FM_API_
#include "clipdefs.h"
#include "extend.h"
/* Functions */
#define _xalloc hb_xalloc
#define _xgrab hb_xgrab
#define _xfree hb_xfree
/* Nant*cket Clipper Summer 87 compatible */
#define _exmgrab hb_xgrab
#define _exmback(p, s) hb_xfree(p)
#endif /* HB_FM_API_ */

1
harbour/include/gt.api
View File

@@ -8,6 +8,7 @@
#ifndef HB_GT_API_
#define HB_GT_API_
#include "clipdefs.h"
#include "gtapi.h"
#define _gtBox hb_gtBox

88
harbour/include/gtapi.h
View File

@@ -2,6 +2,38 @@
* $Id$
*/
/*
GTAPI.H; Screen drawing, cursor and keyboard routines for text mode
16-bit and 32-bit MS-DOS, 16-bit and 32-bit OS/2, and 32-bit
Windows 95/NT applications.
This module is based on VIDMGR by Andrew Clarke and modified for
the Harbour project
GTAPI has been compiled and tested with the following C compilers:
- Turbo C++ (16-bit) for DOS 3.0
- Borland C++ (16-bit) for DOS 3.1
- Borland C++ (16-bit) for DOS 4.5
- Borland C++ (32-bit) for OS/2 1.0
- Cygnus GNU C (32-bit) for Windows 95/NT b14.0
- DJGPP GNU C (32-bit) for DOS 2.0
- EMX GNU C (32-bit) for OS/2 & DOS 0.9b
- IBM VisualAge C/C++ 3.0 (32-bit) for OS/2
- Microsoft C/C++ (16-bit) for OS/2 6.00a
- Microsoft C/C++ (16-bit) for DOS 8.00c
- Microsoft Quick C (16-bit) for DOS 2.50
- Microsoft Visual C/C++ (16-bit) for DOS 1.52
- Microsoft Visual C/C++ (32-bit) for Windows 95/NT 5.0 and 6.0
- WATCOM C/C++ (16-bit & 32-bit) for DOS 9.5
- WATCOM C/C++ (16-bit & 32-bit) for DOS 10.0
- WATCOM C/C++ (32-bit) for OS/2 10.0
- WATCOM C/C++ (32-bit) for Windows 95/NT 10.0
- HI-TECH Pacific C (16-bit) for DOS 7.51
- Symantec C/C++ (16-bit) for DOS 7.0
- Zortech C/C++ (16-bit) for DOS 3.0r4
*/
#ifndef HB_GTAPI_H_
#define HB_GTAPI_H_
@@ -13,38 +45,6 @@
/* maximum length of color string */
#define CLR_STRLEN 64
/*
* GTAPI.H; Screen drawing, cursor and keyboard routines for text mode
* 16-bit and 32-bit MS-DOS, 16-bit and 32-bit OS/2, and 32-bit
* Windows 95/NT applications.
*
* This module is based on VIDMGR by Andrew Clarke and modified for
* the Harbour project
*
* GTAPI has been compiled and tested with the following C compilers:
*
* - Turbo C++ (16-bit) for DOS 3.0
* - Borland C++ (16-bit) for DOS 3.1
* - Borland C++ (16-bit) for DOS 4.5
* - Borland C++ (32-bit) for OS/2 1.0
* - Cygnus GNU C (32-bit) for Windows 95/NT b14.0
* - DJGPP GNU C (32-bit) for DOS 2.0
* - EMX GNU C (32-bit) for OS/2 & DOS 0.9b
* - IBM VisualAge C/C++ 3.0 (32-bit) for OS/2
* - Microsoft C/C++ (16-bit) for OS/2 6.00a
* - Microsoft C/C++ (16-bit) for DOS 8.00c
* - Microsoft Quick C (16-bit) for DOS 2.50
* - Microsoft Visual C/C++ (16-bit) for DOS 1.52
* - Microsoft Visual C/C++ (32-bit) for Windows 95/NT 5.0 and 6.0
* - WATCOM C/C++ (16-bit & 32-bit) for DOS 9.5
* - WATCOM C/C++ (16-bit & 32-bit) for DOS 10.0
* - WATCOM C/C++ (32-bit) for OS/2 10.0
* - WATCOM C/C++ (32-bit) for Windows 95/NT 10.0
* - HI-TECH Pacific C (16-bit) for DOS 7.51
* - Symantec C/C++ (16-bit) for DOS 7.0
* - Zortech C/C++ (16-bit) for DOS 3.0r4
*/
/* Public interface. These should never change, only be added to. */
extern void hb_gtInit(void);
@@ -80,30 +80,6 @@ extern int hb_gtWrite(char * fpStr, ULONG length);
extern int hb_gtWriteAt(USHORT uiRow, USHORT uiCol, char * fpStr, ULONG length);
extern int hb_gtWriteCon(char * fpStr, ULONG length);
#ifndef DOS
#if defined(_QC) || defined(__DOS__) || defined(MSDOS) || defined(__MSDOS__)
#define DOS
#endif
#endif
#ifndef OS2
#if defined(__OS2__) || defined(OS_2)
#define OS2
#endif
#endif
#ifndef EMX
#if defined(__EMX__)
#define EMX
#endif
#endif
#ifndef WINNT
#if defined(__NT__)
#define WINNT
#endif
#endif
/* private interface listed below. these are common to all platforms */
extern void hb_gt_Init(void);

1
harbour/include/hbpp.h
View File

@@ -88,4 +88,3 @@ extern FILENAME *_pFileName;
extern DEFINES *topDefine;
#endif /* HB_PP_H_ */

28
harbour/include/hbsetup.h
View File

@@ -136,4 +136,32 @@
#define OS_DOS_COMPATIBLE
#endif
/* ***********************************************************************
* Platform detection
*/
#ifndef DOS
#if defined(_QC) || defined(__DOS__) || defined(MSDOS) || defined(__MSDOS__)
#define DOS
#endif
#endif
#ifndef OS2
#if defined(__OS2__) || defined(OS_2)
#define OS2
#endif
#endif
#ifndef EMX
#if defined(__EMX__)
#define EMX
#endif
#endif
#ifndef WINNT
#if defined(__NT__)
#define WINNT
#endif
#endif
#endif /* HB_SETUP_H_ */

4
harbour/include/item.api
View File

@@ -10,10 +10,6 @@
#include "itemapi.h"
#ifndef ITEM
#define ITEM PHB_ITEM
#endif
#define _evalLaunch hb_evalLaunch
#define _evalNew hb_evalNew
#define _evalPutParam hb_evalPutParam

2
harbour/include/itemapi.h
View File

@@ -29,7 +29,7 @@
#include "extend.h"
#define HB_EVAL_PARAM_MAX_ 10
#define HB_EVAL_PARAM_MAX_ 9
typedef struct
{

1
harbour/include/memoedit.ch
View File

@@ -24,4 +24,3 @@
/* edit action corresponding to the key whose value is returned. */
#endif /* _MEMOEDIT_CH */

2
harbour/include/rdd.api
View File

@@ -8,6 +8,8 @@
#ifndef HB_RDD_API_
#define HB_RDD_API_
#include "clipdefs.h"
#include "rddapi.h"
#include "item.api"
#endif /* HB_RDD_API_ */

136
harbour/include/rddapi.h
View File

@@ -12,8 +12,8 @@ typedef void * FARP;
/* RDD method return codes */
#define SUCCESS 0
#define FAILURE 1
#define SUCCESS 0
#define FAILURE 1
/* Flags for DBTRANSINFO */
@@ -163,28 +163,28 @@ typedef DBOPENINFO * LPDBOPENINFO;
* La estructura de creaci¢n condicional de orden
*/
#ifdef COMMENT
#ifdef 0
typedef struct _DBORDERCONDINFO
{
BOOL fActive;
BYTEP abFor;
ITEM itmCobFor;
ITEM itmCobWhile;
ITEM itmCobEval;
LONG lStep;
LONG lStartRecno;
LONG lNextCount;
LONG lRecno;
BOOL fRest;
BOOL fDescending;
BOOL fScoped;
BOOL fAll;
BOOL fActive;
BYTEP abFor;
PHB_ITEM itmCobFor;
PHB_ITEM itmCobWhile;
PHB_ITEM itmCobEval;
LONG lStep;
LONG lStartRecno;
LONG lNextCount;
LONG lRecno;
BOOL fRest;
BOOL fDescending;
BOOL fScoped;
BOOL fAll;
BOOL fAdditive;
BOOL fUseCurrent;
BOOL fCustom;
BOOL fNoOptimize;
FARP lpvCargo;
BOOL fAdditive;
BOOL fUseCurrent;
BOOL fCustom;
BOOL fNoOptimize;
FARP lpvCargo;
} DBORDERCONDINFO;
@@ -199,19 +199,19 @@ typedef DBORDERCONDINFO * LPDBORDERCONDINFO;
* La estructura de creaci¢n de orden
*/
#ifdef COMMENT
#ifdef 0
typedef struct
{
LPDBORDERCONDINFO lpdbOrdCondInfo; /* Informaci¢n condicional */
BYTEP abBagName; /* Nombre del contenedor de ¢rdenes */
BYTEP atomBagName;
ITEM itmOrder;
PHB_ITEM itmOrder;
BOOL fUnique; /* Indicador que determina si todas */
/* las claves con £nicas */
ITEM itmCobExpr; /* Bloque de c¢digo conteniendo la */
PHB_ITEM itmCobExpr; /* Bloque de c¢digo conteniendo la */
/* expresi¢n clave */
ITEM abExpr; /* Cadena conteniendo la expresi¢n clave */
PHB_ITEM abExpr; /* Cadena conteniendo la expresi¢n clave */
} DBORDERCREATEINFO;
typedef DBORDERCREATEINFO * LPDBORDERCREATEINFO;
@@ -225,17 +225,17 @@ typedef DBORDERCREATEINFO * LPDBORDERCREATEINFO;
* La estructura de Set Index
*/
#ifdef COMMENT
#ifdef 0
typedef struct
{
ITEM atomBagName; /* Nombre del contenedor de ¢rdenes */
ITEM itmOrder; /* Nombre o n£mero de la orden */
PHB_ITEM atomBagName; /* Nombre del contenedor de ¢rdenes */
PHB_ITEM itmOrder; /* Nombre o n£mero de la orden */
ITEM itmCobExpr; /* Bloque de c¢digo conteniendo la expresi¢n clave */
PHB_ITEM itmCobExpr; /* Bloque de c¢digo conteniendo la expresi¢n clave */
ITEM itmResult; /* Resultado de la operaci¢n */
PHB_ITEM itmResult; /* Resultado de la operaci¢n */
BOOL fAllTags; /* Indicador de todos los tags a abrir */
BOOL fAllTags; /* Indicador de todos los tags a abrir */
} DBORDERINFO;
@@ -250,21 +250,21 @@ typedef DBORDERINFO * LPDBORDERINFO;
* La estructura de  mbito
*/
#ifdef COMMENT
#ifdef 0
typedef struct
{
ITEM itmCobFor; /* Bloque de c¢digo representaci¢n de una cl usula FOR */
ITEM lpstrFor; /* Cadena representaci¢n de una cl usula FOR */
ITEM itmCobWhile; /* Bloque de c¢digo representaci¢n de una cl usula WHILE */
ITEM lpstrWhile; /* Cadena representaci¢n de una cl usula WHILE */
ITEM lNext;
ITEM itmRecID;
ITEM fRest; /* TRUE si se empieza desde el registro actual */
PHB_ITEM itmCobFor; /* Bloque de c¢digo representaci¢n de una cl usula FOR */
PHB_ITEM lpstrFor; /* Cadena representaci¢n de una cl usula FOR */
PHB_ITEM itmCobWhile; /* Bloque de c¢digo representaci¢n de una cl usula WHILE */
PHB_ITEM lpstrWhile; /* Cadena representaci¢n de una cl usula WHILE */
PHB_ITEM lNext;
PHB_ITEM itmRecID;
PHB_ITEM fRest; /* TRUE si se empieza desde el registro actual */
BOOL fIgnoreFilter;
BOOL fIncludeDeleted;
BOOL fLast;
BOOL fIgnoreDuplicates;
BOOL fIgnoreFilter;
BOOL fIncludeDeleted;
BOOL fLast;
BOOL fIgnoreDuplicates;
} DBSCOPEINFO;
@@ -279,12 +279,12 @@ typedef DBSCOPEINFO * LPDBSCOPEINFO;
* La estructura de filtro
*/
#ifdef COMMENT
#ifdef 0
typedef struct
{
ITEM itmCobExpr; /* Bloque representaci¢n de la expresi¢n FILTER */
ITEM abFilterText; /* Cadena representaci¢n de la expresi¢n FILTER */
BOOL fFilter;
PHB_ITEM itmCobExpr; /* Bloque representaci¢n de la expresi¢n FILTER */
PHB_ITEM abFilterText; /* Cadena representaci¢n de la expresi¢n FILTER */
BOOL fFilter;
} DBFILTERINFO;
typedef DBFILTERINFO * LPDBFILTERINFO;
@@ -298,11 +298,11 @@ typedef DBFILTERINFO * LPDBFILTERINFO;
* La estrurcura de relaciones
*/
#ifdef COMMENT
#ifdef 0
typedef struct _DBRELINFO
{
ITEM itmCobExpr; /* Bloque representaci¢n de la clave relacional SEEK */
ITEM abKey; /* Cadena representaci¢n de la clave relacional SEEK */
PHB_ITEM itmCobExpr; /* Bloque representaci¢n de la clave relacional SEEK */
PHB_ITEM abKey; /* Cadena representaci¢n de la clave relacional SEEK */
struct _AREA *lpaParent; /* El padre de esta relaci¢n */
struct _AREA *lpaChild; /* Los hijos del padre */
@@ -325,10 +325,10 @@ typedef DBRELINFO * LPDBRELINFO;
* en cada registro del  rea de trabajo
*/
#ifdef COMMENT
#ifdef 0
typedef struct
{
ITEM itmBlock; /* El bloque a evaluar */
PHB_ITEM itmBlock; /* El bloque a evaluar */
DBSCOPEINFO dbsci; /* Ambito que limita la evaluaci¢n */
} DBEVALINFO;
@@ -345,7 +345,7 @@ typedef DBEVALINFO * LPDBEVALINFO;
* de una base de datos a otra; utilizada por DBTRANSINFO
*/
#ifdef COMMENT
#ifdef 0
typedef struct
{
USHORT uiSource; /* N£mero de ¡ndice de campo del fuente */
@@ -365,7 +365,7 @@ typedef DBTRANSITEM * LPDBTRANSITEM;
*  rea de trabajo a otra
*/
#ifdef COMMENT
#ifdef 0
typedef struct
{
struct _AREA *lpaSource; /* Puntero al  rea de trabajo fuente */
@@ -392,7 +392,7 @@ typedef DBTRANSINFO * LPDBTRANSINFO;
* orden de la ordenaci¢n.
*/
#ifdef COMMENT
#ifdef 0
typedef struct
{
USHORT uiField; /* Indice dentro de la estructura */
@@ -421,7 +421,7 @@ typedef DBSORTITEM * LPDBSORTITEM;
* Informaci¢n para la ordenaci¢n f¡sica en un  rea de trabajo
*/
#ifdef COMMENT
#ifdef 0
typedef struct
{
DBTRANSINFO dbtri; /* Informaci¢n de transferencia del  rea de */
@@ -444,7 +444,7 @@ typedef DBSORTINFO * LPDBSORTINFO;
* Contiene informaci¢n de bloqueos de registro o fichero
*/
#ifdef COMMENT
#ifdef 0
typedef struct
{
ULONG itmRecID;
@@ -497,16 +497,16 @@ typedef struct _AREA
{
struct _RDDFUNCS * lprfsHost; /* Virtual method table for this workarea */
USHORT uiArea; /* The number assigned to this workarea */
// FARP atomAlias; /* Pointer to the alias symbol for this workarea */
USHORT uiArea; /* The number assigned to this workarea */
// FARP atomAlias; /* Pointer to the alias symbol for this workarea */
// USHORT uiFieldExtent; /* Total number of fields allocated */
USHORT uiFieldCount; /* Total number of fields used */
LPFIELD lpFields; /* Pointer to an array of fields */
// USHORT uiFieldExtent; /* Total number of fields allocated */
USHORT uiFieldCount; /* Total number of fields used */
LPFIELD lpFields; /* Pointer to an array of fields */
// FARP lpFieldExtents; /* Void ptr for additional field properties */
// FARP lpFieldExtents; /* Void ptr for additional field properties */
// ITEM valResult; /* All purpose result holder */
// PHB_ITEM valResult; /* All purpose result holder */
// BOOL fTop; /* TRUE if "top" */
// BOOL fBottom; /* TRUE if "bottom" */
@@ -547,7 +547,7 @@ typedef USHORT ( * DBENTRYP_SI )( AREAP area, USHORT index, PHB_ITEM param );
typedef USHORT ( * DBENTRYP_VP )( AREAP area, LPDBOPENINFO param );
typedef USHORT ( * DBENTRYP_SP )( AREAP area, USHORT * param );
#ifdef COMMENT
#ifdef 0
typedef USHORT ( * DBENTRYP_S )( AREAP area, USHORT param);
typedef USHORT ( * DBENTRYP_LP )( AREAP area, LONGP param);
typedef USHORT ( * DBENTRYP_PP )( AREAP area, FARPP param);
@@ -556,8 +556,8 @@ typedef USHORT ( * DBENTRYP_SVPB )( AREAP area, USHORT index, FARP param, USHORT
typedef USHORT ( * DBENTRYP_VPL )( AREAP area, FARP p1, LONG p2);
typedef USHORT ( * DBENTRYP_VPLP )( AREAP area, FARP p1, LONGP p2);
typedef USHORT ( * DBENTRYP_LSP )( AREAP area, LONG p1, USHORTP p2);
typedef USHORT ( * DBENTRYP_SSI )( AREAP area, USHORT p1, USHORT p2, ITEM p3);
typedef USHORT ( * DBENTRYP_ISI )( AREAP area, ITEM p1, USHORT p2, ITEM p3);
typedef USHORT ( * DBENTRYP_SSI )( AREAP area, USHORT p1, USHORT p2, PHB_ITEM p3);
typedef USHORT ( * DBENTRYP_ISI )( AREAP area, PHB_ITEM p1, USHORT p2, PHB_ITEM p3);
typedef USHORT ( * DBENTRYP_VSP )( AREAP area, USHORT action, LONG lRecord);
#endif
@@ -861,7 +861,7 @@ typedef RDDFUNCS * PRDDFUNCS;
/*--------------------* M‚todos SUPER *------------------------*/
#ifdef COMMENT
#ifdef 0
/* M‚todos de movimiento y posicionamiento */

2
harbour/include/vm.api
View File

@@ -8,6 +8,7 @@
#ifndef HB_VM_API_
#define HB_VM_API_
#include "clipdefs.h"
#include "extend.h"
typedef void * HANDLE;
@@ -42,4 +43,3 @@ typedef void * HANDLE;
#define _xvheapunlock(h, offset) /* dummy */
#endif /* HB_VM_API_ */

4
harbour/makefile.b31
View File

@@ -17,7 +17,7 @@ PROJECT: harbour.lib hbtools.lib terminal.lib libs\win16\terminal.lib
harbour.lib : arrays.obj asort.obj classes.obj codebloc.obj copyfile.obj \
dates.obj descend.obj devoutp.obj dir.obj dynsym.obj environ.obj \
error.obj errorapi.obj errorsys.obj extend.obj \
files.obj gtapi.obj hardcr.obj initsymb.obj itemapi.obj \
filesys.obj gtapi.obj hardcr.obj initsymb.obj itemapi.obj \
math.obj memvars.obj mtran.obj msguk.obj objfunc.obj \
set.obj setcolor.obj strings.obj symbols.obj \
tclass.obj transfrm.obj
@@ -55,7 +55,7 @@ error.obj : error.prg extend.h hbdefs.h init.h pcode.h
errorapi.obj : errorapi.c extend.h hbdefs.h ctoharb.h
errorsys.obj : errorsys.prg extend.h hbdefs.h init.h pcode.h
extend.obj : extend.c extend.h hbdefs.h set.h dates.h
files.obj : extend.c extend.h hbdefs.h
filesys.obj : filesys.c extend.h hbdefs.h
fm.obj : fm.c extend.h hbdefs.h
gtapi.obj : gtapi.c extend.h hbdefs.h gtapi.h
hardcr.obj : hardcr.c extend.h hbdefs.h

2
harbour/makefile.b32
View File

@@ -42,7 +42,7 @@ error.obj : error.c extend.h hbdefs.h
errorapi.obj : errorapi.c extend.h hbdefs.h
errorsys.obj : errorsys.c extend.h hbdefs.h
extend.obj : extend.c extend.h hbdefs.h
files.obj : files.c extend.h hbdefs.h
filesys.obj : filesys.c extend.h hbdefs.h
fm.obj : fm.c extend.h hbdefs.h
hardcr.obj : hardcr.c extend.h hbdefs.h
hb_f.obj : hb_f.c extend.h hbdefs.h

2
harbour/makefile.b40
View File

@@ -41,7 +41,7 @@ error.obj : error.c extend.h hbdefs.h
errorapi.obj : errorapi.c extend.h hbdefs.h
errorsys.obj : errorsys.c extend.h hbdefs.h
extend.obj : extend.c extend.h hbdefs.h
files.obj : files.c extend.h hbdefs.h
filesys.obj : filesys.c extend.h hbdefs.h
fm.obj : fm.c extend.h hbdefs.h
hardcr.obj : hardcr.c extend.h hbdefs.h
hb_f.obj : hb_f.c extend.h hbdefs.h

2
harbour/makefile.vc
View File

@@ -325,7 +325,7 @@ $(OBJ_DIR)\error.obj : $(RTL_DIR)\error.c
$(OBJ_DIR)\extend.obj : $(RTL_DIR)\extend.c
$(CC) $(CLIBFLAGS) -Fo$@ $**
$(OBJ_DIR)\files.obj : $(RTL_DIR)\files.c
$(OBJ_DIR)\files.obj : $(RTL_DIR)\filesys.c
$(CC) $(CLIBFLAGS) -Fo$@ $**
$(OBJ_DIR)\fm.obj : $(RTL_DIR)\fm.c

2
harbour/source/rtl/Makefile
View File

@@ -17,7 +17,7 @@ C_SOURCES=\
environ.c \
errorapi.c \
extend.c \
files.c \
filesys.c \
fm.c \
gtapi.c \
hardcr.c \

4
harbour/source/rtl/files.c → harbour/source/rtl/filesys.c
View File

@@ -2,10 +2,10 @@
* $Id$
*/
#include <string.h>
#include "extend.h"
#include "init.h"
#include "filesys.h"
#include <string.h>
#include "errorapi.h"
#if defined(__CYGWIN__)
@@ -558,7 +558,7 @@ USHORT hb_fsIsDrv ( BYTE nDrive )
/* TODO: Implement hb_fsExtOpen */
FHANDLE hb_fsExtOpen( BYTEP fpFilename, BYTEP fpDefExt,
USHORT uiFlags, BYTEP fpPaths, ERRORP pError )
USHORT uiFlags, BYTEP fpPaths, PHB_ITEM pError )
{
return FS_ERROR;
}

36
harbour/source/rtl/gt/gtwin.c
View File

@@ -24,7 +24,7 @@
#include "gtapi.h"
#if ! defined(__GNUC__)
#ifdef __CYGWIN32__
#ifdef __CYGWIN__
typedef WORD far *LPWORD;
#endif
#endif /* __GNUC__ */
@@ -158,21 +158,21 @@ int hb_gt_GetCursorStyle(void)
switch(cci.dwSize)
{
case 12:
rc=SC_NORMAL;
break;
rc=SC_NORMAL;
break;
case 99:
rc=SC_INSERT;
break;
rc=SC_INSERT;
break;
case 49:
rc=SC_SPECIAL1;
break;
rc=SC_SPECIAL1;
break;
/* TODO: cannot tell if the block is upper or lower for cursor */
/* TODO: cannot tell if the block is upper or lower for cursor */
/* Answer: Supposed to be upper third, but ms don't support it. */
default:
rc=SC_SPECIAL2;
rc=SC_SPECIAL2;
}
}
@@ -221,10 +221,10 @@ void hb_gt_GetText(char cTop, char cLeft, char cBottom, char cRight, char *dest)
ReadConsoleOutputAttribute(HOutput, pwattr, width, coord, &len);
for (i = 0; i < width; i++)
{
*dest = *(pstr + i);
dest++;
*dest = (char)*(pwattr + i)&0xff;
dest++;
*dest = *(pstr + i);
dest++;
*dest = (char)*(pwattr + i)&0xff;
dest++;
}
}
hb_xfree(pwattr);
@@ -255,10 +255,10 @@ void hb_gt_PutText(char cTop, char cLeft, char cBottom, char cRight, char *srce)
{
for (i = 0; i < width; i++)
{
*(pstr + i) = *srce;
srce++;
*(pwattr + i) = (WORD)((unsigned char)*srce)&0xff;
srce++;
*(pstr + i) = *srce;
srce++;
*(pwattr + i) = (WORD)((unsigned char)*srce)&0xff;
srce++;
}
coord.X = (DWORD) (cLeft);
coord.Y = (DWORD) (y);
@@ -444,7 +444,7 @@ void hb_gt_DispEnd(void)
coBuf, /* col/row size of source buffer */
coDest, /* upper-left cell to write data from in src */
&srWin); /* screen buffer rect to write data to */
hb_xfree(pCharInfo);
}

2
harbour/source/rtl/memvars.c
View File

@@ -35,9 +35,9 @@
#include <string.h>
#include "extend.h"
#include "itemapi.h"
#include "errorapi.h"
#include "error.ch"
#include "itemapi.h"
#define VS_PRIVATE 64
#define VS_PUBLIC 128

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

@@ -110,14 +110,14 @@ FUNCTION Main()
TEST_LINE( PadL("abcdef", -5) , "" )
TEST_LINE( PadL("abcdef", 0) , "" )
TEST_LINE( PadL("abcdef", 5) , "abcde" ) /* QUESTION: CA-Clipper "bug", should return: "bcdef" ? */
TEST_LINE( PadL("abcdef", 5) , "abcde" ) /* QUESTION: CA-Cl*pper "bug", should return: "bcdef" ? */
TEST_LINE( PadL("abcdef", 10) , " abcdef" )
TEST_LINE( PadL("abcdef", 10, "1") , "1111abcdef" )
TEST_LINE( PadL("abcdef", 10, "12") , "1111abcdef" )
TEST_LINE( PadC("abcdef", -5) , "" )
TEST_LINE( PadC("abcdef", 0) , "" )
TEST_LINE( PadC("abcdef", 2) , "ab" ) /* QUESTION: CA-Clipper "bug", should return: "cd" ? */
TEST_LINE( PadC("abcdef", 2) , "ab" ) /* QUESTION: CA-Cl*pper "bug", should return: "cd" ? */
TEST_LINE( PadC("abcdef", 5) , "abcde" )
TEST_LINE( PadC("abcdef", 10) , " abcdef " )
TEST_LINE( PadC("abcdef", 10, "1") , "11abcdef11" )