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

2009-02-03 18:24 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* doc/en/hb_api.txt
  * doc/en/hb_apird.txt
  * include/hbrdddbf.h
  * include/hbrddcdx.h
  * include/hbapi.h
  * include/hbrddfpt.h
  * include/hbrddntx.h
  * contrib/hbct/dbftools.c
  * contrib/rddado/adordd.prg
  * contrib/hbpgsql/pgrdd.prg
  * contrib/rddads/adsx.c
  * contrib/rddads/adsfunc.c
  * contrib/examples/rdddbt/hbrdddbt.h
  * contrib/examples/rdddbt/dbfdbt1.c
  * source/vm/hvm.c
  * source/vm/memvars.c
  * source/debug/dbgentry.c
    * SUCCESS -> HB_SUCCESS
    * FAILURE -> HB_FAILURE
    * ERRCODE -> HB_ERRCODE
    ; Migration finished.
This commit is contained in:
Viktor Szakats
2009-02-03 17:25:32 +00:00
parent 4b82944aa3
commit dc70d7602c
18 changed files with 1992 additions and 1971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
harbour/ChangeLog
View File

@@ -8,6 +8,29 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-03 18:24 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* doc/en/hb_api.txt
* doc/en/hb_apird.txt
* include/hbrdddbf.h
* include/hbrddcdx.h
* include/hbapi.h
* include/hbrddfpt.h
* include/hbrddntx.h
* contrib/hbct/dbftools.c
* contrib/rddado/adordd.prg
* contrib/hbpgsql/pgrdd.prg
* contrib/rddads/adsx.c
* contrib/rddads/adsfunc.c
* contrib/examples/rdddbt/hbrdddbt.h
* contrib/examples/rdddbt/dbfdbt1.c
* source/vm/hvm.c
* source/vm/memvars.c
* source/debug/dbgentry.c
* SUCCESS -> HB_SUCCESS
* FAILURE -> HB_FAILURE
* ERRCODE -> HB_ERRCODE
; Migration finished.
2009-02-03 17:25 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* source/rtl/gtwvt/gtwvt.c
! Fixed for OpenWatcom 1.8. (SM_REMOTESESSION wasn't defined)

66
harbour/contrib/examples/rdddbt/dbfdbt1.c
View File

@@ -429,7 +429,7 @@ static BOOL hb_dbtPutMemo( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
* Obtain the length of a field value.
* ( DBENTRYP_SVL ) hb_dbtGetVarLen
*/
static ERRCODE hb_dbtGetVarLen( DBTAREAP pArea, USHORT uiIndex, ULONG * pLength )
static HB_ERRCODE hb_dbtGetVarLen( DBTAREAP pArea, USHORT uiIndex, ULONG * pLength )
{
BOOL bDeleted;
@@ -438,8 +438,8 @@ static ERRCODE hb_dbtGetVarLen( DBTAREAP pArea, USHORT uiIndex, ULONG * pLength
if( pArea->fHasMemo && pArea->hMemoFile != FS_ERROR )
{
/* Force read record */
if( SELF_DELETED( ( AREAP ) pArea, &bDeleted ) == FAILURE )
return FAILURE;
if( SELF_DELETED( ( AREAP ) pArea, &bDeleted ) == HB_FAILURE )
return HB_FAILURE;
if( pArea->lpFields[ uiIndex - 1 ].uiType == HB_FT_MEMO )
{
@@ -452,7 +452,7 @@ static ERRCODE hb_dbtGetVarLen( DBTAREAP pArea, USHORT uiIndex, ULONG * pLength
{
* pLength = 0;
}
return SUCCESS;
return HB_SUCCESS;
}
}
@@ -463,7 +463,7 @@ static ERRCODE hb_dbtGetVarLen( DBTAREAP pArea, USHORT uiIndex, ULONG * pLength
* Retrieve information about the current driver.
* ( DBENTRYP_SI ) hb_dbtInfo
*/
static ERRCODE hb_dbtInfo( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
static HB_ERRCODE hb_dbtInfo( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
{
HB_TRACE(HB_TR_DEBUG, ("hb_dbtInfo(%p, %hu, %p)", pArea, uiIndex, pItem));
@@ -505,27 +505,27 @@ static ERRCODE hb_dbtInfo( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
return SUPER_INFO( ( AREAP ) pArea, uiIndex, pItem );
}
return SUCCESS;
return HB_SUCCESS;
}
/*
* Retrieve the size of the WorkArea structure.
* ( DBENTRYP_SP ) hb_dbtStructSize
*/
static ERRCODE hb_dbtStructSize( DBTAREAP pArea, USHORT * uiSize )
static HB_ERRCODE hb_dbtStructSize( DBTAREAP pArea, USHORT * uiSize )
{
HB_TRACE(HB_TR_DEBUG, ("hb_dbtStrucSize(%p, %p)", pArea, uiSize));
HB_SYMBOL_UNUSED( pArea );
* uiSize = sizeof( DBTAREA );
return SUCCESS;
return HB_SUCCESS;
}
/*
* Obtain the current value of a field.
* ( DBENTRYP_SI ) hb_dbtGetValue
*/
static ERRCODE hb_dbtGetValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
static HB_ERRCODE hb_dbtGetValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
{
BOOL bDeleted;
@@ -535,8 +535,8 @@ static ERRCODE hb_dbtGetValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
pArea->lpFields[ uiIndex - 1 ].uiType == HB_FT_MEMO )
{
/* Force read record */
if( SELF_DELETED( ( AREAP ) pArea, &bDeleted ) == FAILURE )
return FAILURE;
if( SELF_DELETED( ( AREAP ) pArea, &bDeleted ) == HB_FAILURE )
return HB_FAILURE;
if( hb_dbtFileLockSh( pArea ) )
{
@@ -553,9 +553,9 @@ static ERRCODE hb_dbtGetValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
hb_errPutFlags( pError, EF_CANDEFAULT );
SELF_ERROR( ( AREAP ) pArea, pError );
hb_itemRelease( pError );
return FAILURE;
return HB_FAILURE;
}
return SUCCESS;
return HB_SUCCESS;
}
else
return SUPER_GETVALUE( ( AREAP ) pArea, uiIndex, pItem );
@@ -565,11 +565,11 @@ static ERRCODE hb_dbtGetValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
* Assign a value to a field.
* ( DBENTRYP_SI ) hb_dbtPutValue
*/
static ERRCODE hb_dbtPutValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
static HB_ERRCODE hb_dbtPutValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
{
BOOL bDeleted;
PHB_ITEM pError;
ERRCODE uiError, uiErrorG;
HB_ERRCODE uiError, uiErrorG;
HB_TRACE(HB_TR_DEBUG, ("hb_dbtPutValue(%p, %hu, %p)", pArea, uiIndex, pItem));
@@ -579,19 +579,19 @@ static ERRCODE hb_dbtPutValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
if( HB_IS_MEMO( pItem ) || HB_IS_STRING( pItem ) )
{
/* Force read record */
if( SELF_DELETED( ( AREAP ) pArea, &bDeleted ) == FAILURE )
return FAILURE;
if( SELF_DELETED( ( AREAP ) pArea, &bDeleted ) == HB_FAILURE )
return HB_FAILURE;
if( !pArea->fPositioned )
return SUCCESS;
return HB_SUCCESS;
/* Buffer is hot? */
if( !pArea->fRecordChanged && SELF_GOHOT( ( AREAP ) pArea ) == FAILURE )
return FAILURE;
if( !pArea->fRecordChanged && SELF_GOHOT( ( AREAP ) pArea ) == HB_FAILURE )
return HB_FAILURE;
if( hb_dbtFileLockEx( pArea ) )
{
uiError = hb_dbtPutMemo( pArea, uiIndex -1, pItem ) ? SUCCESS : EDBF_DATAWIDTH;
uiError = hb_dbtPutMemo( pArea, uiIndex -1, pItem ) ? HB_SUCCESS : EDBF_DATAWIDTH;
hb_dbtFileUnLock( pArea );
}
else
@@ -604,7 +604,7 @@ static ERRCODE hb_dbtPutValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
else
uiError = EDBF_DATATYPE;
if( uiError != SUCCESS )
if( uiError != HB_SUCCESS )
{
uiErrorG = uiError == EDBF_DATAWIDTH ? EG_DATAWIDTH :
( uiError == EDBF_LOCK ? EG_LOCK : EG_DATATYPE );
@@ -615,9 +615,9 @@ static ERRCODE hb_dbtPutValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
hb_errPutFlags( pError, EF_CANDEFAULT );
SELF_ERROR( ( AREAP ) pArea, pError );
hb_itemRelease( pError );
return FAILURE;
return HB_FAILURE;
}
return SUCCESS;
return HB_SUCCESS;
}
return SUPER_PUTVALUE( ( AREAP ) pArea, uiIndex, pItem);
}
@@ -629,7 +629,7 @@ static ERRCODE hb_dbtPutValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
* Create a memo file in the WorkArea.
* ( DBENTRYP_VP ) hb_dbtCreateMemFile
*/
static ERRCODE hb_dbtCreateMemFile( DBTAREAP pArea, LPDBOPENINFO pCreateInfo )
static HB_ERRCODE hb_dbtCreateMemFile( DBTAREAP pArea, LPDBOPENINFO pCreateInfo )
{
BYTE pBlock[ DBT_BLOCKSIZE ];
BOOL bRetry;
@@ -669,7 +669,7 @@ static ERRCODE hb_dbtCreateMemFile( DBTAREAP pArea, LPDBOPENINFO pCreateInfo )
hb_itemRelease( pError );
if( pArea->hMemoFile == FS_ERROR )
return FAILURE;
return HB_FAILURE;
}
else /* For zap file */
hb_fsSeek( pArea->hMemoFile, 0, FS_SET );
@@ -677,11 +677,11 @@ static ERRCODE hb_dbtCreateMemFile( DBTAREAP pArea, LPDBOPENINFO pCreateInfo )
memset( pBlock, 0, DBT_BLOCKSIZE );
* ( ( LONG * ) pBlock ) = 1;
if( hb_fsWrite( pArea->hMemoFile, pBlock, DBT_BLOCKSIZE ) != DBT_BLOCKSIZE )
return FAILURE;
return HB_FAILURE;
hb_fsWrite( pArea->hMemoFile, NULL, 0 );
pArea->fMemoFlush = TRUE;
return SUCCESS;
return HB_SUCCESS;
}
@@ -691,7 +691,7 @@ static ERRCODE hb_dbtCreateMemFile( DBTAREAP pArea, LPDBOPENINFO pCreateInfo )
* Open a memo file in the specified WorkArea.
* ( DBENTRYP_VP ) hb_dbtOpenMemFile
*/
static ERRCODE hb_dbtOpenMemFile( DBTAREAP pArea, LPDBOPENINFO pOpenInfo )
static HB_ERRCODE hb_dbtOpenMemFile( DBTAREAP pArea, LPDBOPENINFO pOpenInfo )
{
USHORT uiFlags;
BOOL bRetry;
@@ -731,7 +731,7 @@ static ERRCODE hb_dbtOpenMemFile( DBTAREAP pArea, LPDBOPENINFO pOpenInfo )
}
pArea->uiMemoBlockSize = DBT_BLOCKSIZE;
return ( pArea->hMemoFile == FS_ERROR ? FAILURE : SUCCESS );
return ( pArea->hMemoFile == FS_ERROR ? HB_FAILURE : HB_SUCCESS );
}
/* ( DBENTRYP_SVPB ) hb_dbtPutValueFile : NULL */
@@ -740,7 +740,7 @@ static ERRCODE hb_dbtOpenMemFile( DBTAREAP pArea, LPDBOPENINFO pOpenInfo )
* Retrieve (set) information about RDD
* ( DBENTRYP_RSLV ) hb_dbtFieldInfo
*/
static ERRCODE hb_dbtRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem )
static HB_ERRCODE hb_dbtRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem )
{
HB_TRACE(HB_TR_DEBUG, ("hb_dbtRddInfo(%p, %hu, %lu, %p)", pRDD, uiIndex, ulConnect, pItem));
@@ -785,7 +785,7 @@ static ERRCODE hb_dbtRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, P
return SUPER_RDDINFO( pRDD, uiIndex, ulConnect, pItem );
}
return SUCCESS;
return HB_SUCCESS;
}
@@ -808,7 +808,7 @@ HB_FUNC( DBFDBT_GETFUNCTABLE )
hb_retni( hb_rddInherit( pTable, &dbtTable, &dbtSuper, "DBF" ) );
}
else
hb_retni( FAILURE );
hb_retni( HB_FAILURE );
}

16
harbour/contrib/examples/rdddbt/hbrdddbt.h
View File

@@ -110,12 +110,12 @@ typedef DBTAREA * LPDBTAREA;
#define hb_dbtFieldName NULL
#define hb_dbtFlush NULL
#define hb_dbtGetRec NULL
static ERRCODE hb_dbtGetValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
static ERRCODE hb_dbtGetVarLen( DBTAREAP pArea, USHORT uiIndex, ULONG * pLength );
static HB_ERRCODE hb_dbtGetValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
static HB_ERRCODE hb_dbtGetVarLen( DBTAREAP pArea, USHORT uiIndex, ULONG * pLength );
#define hb_dbtGoCold NULL
#define hb_dbtGoHot NULL
#define hb_dbtPutRec NULL
static ERRCODE hb_dbtPutValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
static HB_ERRCODE hb_dbtPutValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
#define hb_dbtRecall NULL
#define hb_dbtRecCount NULL
#define hb_dbtRecInfo NULL
@@ -125,11 +125,11 @@ static ERRCODE hb_dbtPutValue( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
#define hb_dbtAlias NULL
#define hb_dbtClose NULL
#define hb_dbtCreate NULL
static ERRCODE hb_dbtInfo( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
static HB_ERRCODE hb_dbtInfo( DBTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
#define hb_dbtNewArea NULL
#define hb_dbtOpen NULL
#define hb_dbtRelease NULL
static ERRCODE hb_dbtStructSize( DBTAREAP pArea, USHORT * uiSize );
static HB_ERRCODE hb_dbtStructSize( DBTAREAP pArea, USHORT * uiSize );
#define hb_dbtSysName NULL
#define hb_dbtEval NULL
#define hb_dbtPack NULL
@@ -175,9 +175,9 @@ static ERRCODE hb_dbtStructSize( DBTAREAP pArea, USHORT * uiSize );
#define hb_dbtLock NULL
#define hb_dbtUnLock NULL
#define hb_dbtCloseMemFile NULL
static ERRCODE hb_dbtCreateMemFile( DBTAREAP pArea, LPDBOPENINFO pCreateInfo );
static HB_ERRCODE hb_dbtCreateMemFile( DBTAREAP pArea, LPDBOPENINFO pCreateInfo );
#define hb_dbtGetValueFile NULL
static ERRCODE hb_dbtOpenMemFile( DBTAREAP pArea, LPDBOPENINFO pOpenInfo );
static HB_ERRCODE hb_dbtOpenMemFile( DBTAREAP pArea, LPDBOPENINFO pOpenInfo );
#define hb_dbtPutValueFile NULL
#define hb_dbtReadDBHeader NULL
#define hb_dbtWriteDBHeader NULL
@@ -185,7 +185,7 @@ static ERRCODE hb_dbtOpenMemFile( DBTAREAP pArea, LPDBOPENINFO pOpenInfo );
#define hb_dbtExit NULL
#define hb_dbtDrop NULL
#define hb_dbtExists NULL
static ERRCODE hb_dbtRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem );
static HB_ERRCODE hb_dbtRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem );
#define hb_dbtWhoCares NULL
HB_EXTERN_END

6
harbour/contrib/hbct/dbftools.c
View File

@@ -85,13 +85,13 @@ HB_FUNC( DBFSIZE )
PHB_ITEM pSize = hb_itemNew( NULL );
ULONG ulRecSize, ulRecCount;
if( SELF_INFO( pArea, DBI_GETHEADERSIZE, pSize ) == SUCCESS )
if( SELF_INFO( pArea, DBI_GETHEADERSIZE, pSize ) == HB_SUCCESS )
{
llSize = hb_itemGetNL( pSize ) + 1;
if( SELF_INFO( pArea, DBI_GETRECSIZE, pSize ) == SUCCESS )
if( SELF_INFO( pArea, DBI_GETRECSIZE, pSize ) == HB_SUCCESS )
{
ulRecSize = hb_itemGetNL( pSize );
if( SELF_RECCOUNT( pArea, &ulRecCount ) == SUCCESS )
if( SELF_RECCOUNT( pArea, &ulRecCount ) == HB_SUCCESS )
{
llSize += ( HB_LONG ) ulRecCount *ulRecSize;
}

54
harbour/contrib/hbpgsql/pgrdd.prg
View File

@@ -88,13 +88,13 @@ FUNCTION DBPGCONNECTION( cConnString )
IF oServer:NetErr()
alert( oServer:ErrorMsg() )
RETURN FAILURE
RETURN HB_FAILURE
ELSE
aadd( t_aConnections, oServer )
nConn := len( t_aConnections )
ENDIF
RETURN nConn
RETURN nConn
FUNCTION DBPGCLEARCONNECTION( nConn )
@@ -106,7 +106,7 @@ FUNCTION DBPGCLEARCONNECTION( nConn )
t_aConnections[ nConn ] := nil
RETURN SUCCESS
RETURN HB_SUCCESS
/*
* non work area methods receive RDD ID as first parameter
@@ -117,7 +117,7 @@ STATIC FUNCTION PG_INIT( nRDD )
USRRDD_RDDDATA( nRDD )
RETURN SUCCESS
RETURN HB_SUCCESS
/*
* methods: NEW and RELEASE receive pointer to work area structure
@@ -130,7 +130,7 @@ STATIC FUNCTION PG_NEW( pWA )
USRRDD_AREADATA( pWA, array( AREA_LEN ) )
RETURN SUCCESS
RETURN HB_SUCCESS
STATIC FUNCTION PG_OPEN( nWA, aOpenInfo )
LOCAL aField, oError, lError, cError, nResult
@@ -159,7 +159,7 @@ STATIC FUNCTION PG_OPEN( nWA, aOpenInfo )
oError:FileName := aOpenInfo[ UR_OI_NAME ]
oError:CanDefault := .T.
UR_SUPER_ERROR( nWA, oError )
RETURN FAILURE
RETURN HB_FAILURE
ELSE
aWAData[ AREA_QUERY ] := oQuery
ENDIF
@@ -183,14 +183,14 @@ STATIC FUNCTION PG_OPEN( nWA, aOpenInfo )
/* Call SUPER OPEN to finish allocating work area (f.e.: alias settings) */
nResult := UR_SUPER_OPEN( nWA, aOpenInfo )
RETURN nResult
RETURN nResult
STATIC FUNCTION PG_CLOSE( nWA )
LOCAL aWAData := USRRDD_AREADATA( nWA )
aWAData[ AREA_QUERY ]:Close()
RETURN UR_SUPER_CLOSE( nWA )
RETURN UR_SUPER_CLOSE( nWA )
STATIC FUNCTION PG_GETVALUE( nWA, nField, xValue )
LOCAL aWAData := USRRDD_AREADATA( nWA )
@@ -201,7 +201,7 @@ STATIC FUNCTION PG_GETVALUE( nWA, nField, xValue )
xValue := aWAData[ AREA_QUERY ]:FieldGet( nField )
endif
RETURN SUCCESS
RETURN HB_SUCCESS
STATIC FUNCTION PG_PUTVALUE( nWA, nField, xValue )
LOCAL aWAData := USRRDD_AREADATA( nWA )
@@ -212,7 +212,7 @@ STATIC FUNCTION PG_PUTVALUE( nWA, nField, xValue )
aWAData[ AREA_ROW ]:FieldPut( nField, xValue )
RETURN SUCCESS
RETURN HB_SUCCESS
STATIC FUNCTION PG_SKIP( nWA, nRecords )
LOCAL aWAData := USRRDD_AREADATA( nWA )
@@ -223,16 +223,16 @@ STATIC FUNCTION PG_SKIP( nWA, nRecords )
aWAData[ AREA_QUERY ]:Skip( nRecords )
RETURN SUCCESS
RETURN HB_SUCCESS
STATIC FUNCTION PG_GOTOP( nWA )
RETURN PG_GOTO( nWA, 1 )
RETURN PG_GOTO( nWA, 1 )
STATIC FUNCTION PG_GOBOTTOM( nWA )
RETURN PG_GOTO( nWA, -1 )
RETURN PG_GOTO( nWA, -1 )
STATIC FUNCTION PG_GOTOID( nWA, nRecord )
RETURN PG_GOTO( nWA, nRecord )
RETURN PG_GOTO( nWA, nRecord )
STATIC FUNCTION PG_GOTO( nWA, nRecord )
LOCAL aWAData := USRRDD_AREADATA( nWA )
@@ -249,40 +249,40 @@ STATIC FUNCTION PG_GOTO( nWA, nRecord )
aWAData[ AREA_QUERY ]:Goto( nRecord )
RETURN SUCCESS
RETURN HB_SUCCESS
STATIC FUNCTION PG_RECCOUNT( nWA, nRecords )
LOCAL aWAData := USRRDD_AREADATA( nWA )
nRecords := aWAData[ AREA_QUERY ]:nLastRec
RETURN SUCCESS
RETURN HB_SUCCESS
STATIC FUNCTION PG_BOF( nWA, lBof )
LOCAL aWAData := USRRDD_AREADATA( nWA )
lBof := aWAData[ AREA_QUERY ]:lBof
RETURN SUCCESS
RETURN HB_SUCCESS
STATIC FUNCTION PG_EOF( nWA, lEof )
LOCAL aWAData := USRRDD_AREADATA( nWA )
lEof := aWAData[ AREA_QUERY ]:lEof
RETURN SUCCESS
RETURN HB_SUCCESS
STATIC FUNCTION PG_RECID( nWA, nRecNo )
LOCAL aWAData := USRRDD_AREADATA( nWA )
nRecno := aWAData[ AREA_QUERY ]:nRecNo
RETURN SUCCESS
RETURN HB_SUCCESS
STATIC FUNCTION PG_DELETED( nWA, lDeleted )
HB_SYMBOL_UNUSED( nWA )
lDeleted := .F.
RETURN SUCCESS
RETURN HB_SUCCESS
STATIC FUNCTION PG_FLUSH( nWA )
LOCAL oError
@@ -303,7 +303,7 @@ STATIC FUNCTION PG_FLUSH( nWA )
oError:SubCode := 3000
oError:Description := HB_LANGERRMSG( EG_DATATYPE ) + ", " + aWAData[ AREA_QUERY ]:ErrorMsg()
UR_SUPER_ERROR( nWA, oError )
RETURN FAILURE
RETURN HB_FAILURE
ENDIF
/*
@@ -324,7 +324,7 @@ STATIC FUNCTION PG_FLUSH( nWA )
endif
RETURN SUCCESS
RETURN HB_SUCCESS
STATIC FUNCTION PG_APPEND( nWA, nRecords )
LOCAL aWAData := USRRDD_AREADATA( nWA )
@@ -335,7 +335,7 @@ STATIC FUNCTION PG_APPEND( nWA, nRecords )
aWAData[ AREA_APPEND ] := .T.
RETURN SUCCESS
RETURN HB_SUCCESS
STATIC FUNCTION PG_DELETE( nWA )
LOCAL oError
@@ -351,12 +351,12 @@ STATIC FUNCTION PG_DELETE( nWA )
oError:SubCode := 2000
oError:Description := HB_LANGERRMSG( EG_DATATYPE ) + ", " + aWAData[ AREA_QUERY ]:ErrorMsg()
UR_SUPER_ERROR( nWA, oError )
RETURN FAILURE
RETURN HB_FAILURE
ENDIF
aWAData[ AREA_ROW ] := nil
RETURN SUCCESS
RETURN HB_SUCCESS
/*
* This function have to exist in all RDD and then name have to be in
@@ -386,9 +386,9 @@ FUNCTION PGRDD_GETFUNCTABLE( pFuncCount, pFuncTable, pSuperTable, nRddID )
aMyFunc[ UR_DELETE ] := ( @PG_DELETE() )
aMyFunc[ UR_CLOSE ] := ( @PG_CLOSE() )
RETURN USRRDD_GETFUNCTABLE( pFuncCount, pFuncTable, pSuperTable, nRddID, ;
RETURN USRRDD_GETFUNCTABLE( pFuncCount, pFuncTable, pSuperTable, nRddID, ;
cSuperRDD, aMyFunc )
INIT PROC PG_INIT()
rddRegister( "PGRDD", RDT_FULL )
RETURN
RETURN

2
harbour/contrib/rddado/adordd.prg
View File

@@ -1317,7 +1317,7 @@ STATIC FUNCTION ADO_SEEK( nWA, lSoftSeek, cKey, lFindLast )
//oRecordSet:Find( aWAData[ WA_SCOPEINFO ][ UR_SI_CFOR ], iif( lContinue, 1, 0 ) )
LPCDXKEY pKey;
ERRCODE retval = HB_SUCCESS;
HB_ERRCODE retval = HB_SUCCESS;
BOOL fEOF = FALSE, fLast;
ULONG ulRec;

2
harbour/contrib/rddads/adsfunc.c
View File

@@ -401,7 +401,7 @@ HB_FUNC( ADSSETDELETED )
hb_retl( pbShowDeleted == 0 );
if( ISLOG( 1 ) )
AdsShowDeleted( !hb_parl( 1 ) /* usShowDeleted */ );
AdsShowDeleted( ( UNSIGNED16 ) !hb_parl( 1 ) /* usShowDeleted */ );
}
HB_FUNC( ADSSETEXACT )

322
harbour/contrib/rddads/adsx.c
View File

@@ -180,11 +180,11 @@ static RDDFUNCS adsxSuper;
* Misc functions
************************************************************************/
static ERRCODE hb_mixErrorRT( ADSXAREAP pArea, USHORT uiGenCode, USHORT uiSubCode,
static HB_ERRCODE hb_mixErrorRT( ADSXAREAP pArea, USHORT uiGenCode, USHORT uiSubCode,
char* filename, USHORT uiOsCode, USHORT uiFlags )
{
PHB_ITEM pError;
ERRCODE iRet = FAILURE;
HB_ERRCODE iRet = HB_FAILURE;
if( hb_vmRequestQuery() == 0 )
{
@@ -204,7 +204,7 @@ static ERRCODE hb_mixErrorRT( ADSXAREAP pArea, USHORT uiGenCode, USHORT uiSubCod
}
/* Clone of ADS RDD function */
static ERRCODE hb_adsUpdateAreaFlags( ADSXAREAP pArea )
static HB_ERRCODE hb_adsUpdateAreaFlags( ADSXAREAP pArea )
{
UNSIGNED16 u16Bof, u16Eof, u16Found;
@@ -218,12 +218,12 @@ static ERRCODE hb_adsUpdateAreaFlags( ADSXAREAP pArea )
pArea->fPositioned = !pArea->fBof && !pArea->fEof;
return SUCCESS;
return HB_SUCCESS;
}
/************************************************************************
* Memory Index
* Memory Index
*************************************************************************/
static LPMIXKEY mixKeyNew( PHB_ITEM pItem, ULONG ulRecNo, BYTE bType, USHORT uiLen )
@@ -240,7 +240,7 @@ static LPMIXKEY mixKeyNew( PHB_ITEM pItem, ULONG ulRecNo, BYTE bType, USHORT uiL
{
case 'C':
ul = hb_itemGetCLen( pItem );
if( ul > (ULONG) uiLen )
if( ul > (ULONG) uiLen )
ul = uiLen;
memcpy( pKey->val, hb_itemGetCPtr( pItem ), ul );
if( ul < (ULONG) uiLen )
@@ -300,7 +300,7 @@ static BOOL mixEvalCond( PHB_ITEM pCondItem, ADSXAREAP pArea )
int iCurrArea = 0;
BOOL fRet;
if( pArea )
if( pArea )
{
iCurrArea = hb_rddGetCurrentWorkAreaNumber();
@@ -325,7 +325,7 @@ static void mixKeyFree( LPMIXKEY pKey )
}
static BYTE* mixBuildSortTable( PHB_CODEPAGE pCodepage )
static BYTE * mixBuildSortTable( PHB_CODEPAGE pCodepage )
{
BYTE* pSortTable;
BYTE* pChars;
@@ -350,10 +350,10 @@ static BYTE* mixBuildSortTable( PHB_CODEPAGE pCodepage )
}
}
}
}
}
else
{
for( i = 0; i < 256; i++ )
for( i = 0; i < 256; i++ )
pSortTable[ i ] = ( BYTE ) i;
}
return pSortTable;
@@ -380,9 +380,9 @@ static int mixQSortCompare( LPMIXKEY p1, LPMIXKEY p2, USHORT uiLen, BYTE* pSortT
if( i == 0 )
{
if( p1->rec < p2->rec )
if( p1->rec < p2->rec )
return -1;
else if( p1->rec > p2->rec )
else if( p1->rec > p2->rec )
return 1;
else
return 0;
@@ -400,30 +400,30 @@ static void mixQSort( LPMIXKEY* pKeys, ULONG left, ULONG right, USHORT uiLen, BY
{
ULONG l, r;
LPMIXKEY x, h;
l = left;
l = left;
r = right;
x = pKeys[ (l + r) / 2 ];
do {
while( mixQSortCompare( x, pKeys[ l ], uiLen, pSortTable ) > 0 )
while( mixQSortCompare( x, pKeys[ l ], uiLen, pSortTable ) > 0 )
l++;
while( mixQSortCompare( pKeys[ r ], x, uiLen, pSortTable ) > 0 )
while( mixQSortCompare( pKeys[ r ], x, uiLen, pSortTable ) > 0 )
r--;
if( l < r )
{
h = pKeys[ l ]; pKeys[ l ] = pKeys[ r ]; pKeys[ r ] = h;
l++; r--;
}
}
}
while( l < r );
if( left < r && ( r != right ) )
if( left < r && ( r != right ) )
mixQSort( pKeys, left, r, uiLen, pSortTable );
if( l < right && ( l != left ) )
if( l < right && ( l != left ) )
mixQSort( pKeys, l, right, uiLen, pSortTable );
}
@@ -432,39 +432,39 @@ static LPMIXKEY mixFindKey( LPMIXTAG pTag, LPMIXKEY pKey, ULONG* ulKeyPos )
{
ULONG l, r;
int i = 1;
if( ! pTag->ulRecCount )
{
if( ulKeyPos )
if( ulKeyPos )
*ulKeyPos = 0;
return NULL;
}
l = 0;
r = pTag->ulRecCount - 1;
while( l < r )
{
i = mixQSortCompare( pTag->pKeys[ (l + r) / 2 ], pKey, pTag->uiLen, pTag->pSortTable );
if( i < 0 )
l = (l + r) / 2 + 1;
else if( i > 0 )
r = (l + r) / 2;
else
else
l = r = (l + r) / 2;
}
if( i )
if( i )
{
i = mixQSortCompare( pTag->pKeys[ l ], pKey, pTag->uiLen, pTag->pSortTable );
if( i < 0 )
if( i < 0 )
l++;
}
if( ulKeyPos )
if( ulKeyPos )
*ulKeyPos = l;
return i ? NULL : pTag->pKeys[ l ];
}
@@ -475,8 +475,8 @@ static int mixCompareKey( LPMIXTAG pTag, ULONG ulKeyPos, LPMIXKEY pKey )
}
static LPMIXTAG mixTagCreate( char* szTagName, PHB_ITEM pKeyExpr, PHB_ITEM pKeyItem,
PHB_ITEM pForItem, PHB_ITEM pWhileItem, BYTE bType,
static LPMIXTAG mixTagCreate( char* szTagName, PHB_ITEM pKeyExpr, PHB_ITEM pKeyItem,
PHB_ITEM pForItem, PHB_ITEM pWhileItem, BYTE bType,
USHORT uiLen, ADSXAREAP pArea )
{
LPMIXTAG pTag;
@@ -506,7 +506,7 @@ static LPMIXTAG mixTagCreate( char* szTagName, PHB_ITEM pKeyExpr, PHB_ITEM pKeyI
pTag->uiLen = uiLen;
/* Use national support */
if( bType == 'C' )
if( bType == 'C' )
pTag->pSortTable = pArea->pSortTable;
pTag->pKeys = (LPMIXKEY*) hb_xgrab( sizeof( LPMIXKEY ) * MIX_KEYPOOLFIRST );
@@ -521,16 +521,16 @@ static LPMIXTAG mixTagCreate( char* szTagName, PHB_ITEM pKeyExpr, PHB_ITEM pKeyI
lStep = pOrdCondInfo->lStep;
}
if( ! pOrdCondInfo || pOrdCondInfo->fAll )
if( ! pOrdCondInfo || pOrdCondInfo->fAll )
{
pArea->hOrdCurrent = 0;
}
else
}
else
{
if( pOrdCondInfo->itmRecID )
ulStartRec = hb_itemGetNL( pOrdCondInfo->itmRecID );
if( ulStartRec )
if( ulStartRec )
{
ulNextCount = 1;
}
@@ -538,7 +538,7 @@ static LPMIXTAG mixTagCreate( char* szTagName, PHB_ITEM pKeyExpr, PHB_ITEM pKeyI
{
if( pOrdCondInfo->itmStartRecID )
ulStartRec = hb_itemGetNL( pOrdCondInfo->itmStartRecID );
if( !ulStartRec )
ulStartRec = pArea->ulRecNo;
@@ -555,7 +555,7 @@ static LPMIXTAG mixTagCreate( char* szTagName, PHB_ITEM pKeyExpr, PHB_ITEM pKeyI
if( ulStartRec )
AdsGotoRecord( pArea->hTable, ulStartRec );
else
else
AdsGotoTop( pArea->hTable );
hb_adsUpdateAreaFlags( pArea );
@@ -583,15 +583,15 @@ static LPMIXTAG mixTagCreate( char* szTagName, PHB_ITEM pKeyExpr, PHB_ITEM pKeyI
if( pForItem == NULL || mixEvalCond( pForItem, NULL ) )
{
pItem = hb_vmEvalBlockOrMacro( pKeyItem );
pKey = mixKeyNew( pItem, ulRec, bType, uiLen );
if( pTag->ulRecCount == pTag->ulRecMax )
if( pTag->ulRecCount == pTag->ulRecMax )
{
pTag->pKeys = (LPMIXKEY*) hb_xrealloc( pTag->pKeys, sizeof( LPMIXKEY ) * ( pTag->ulRecMax + MIX_KEYPOOLRESIZE ) );
pTag->ulRecMax += MIX_KEYPOOLRESIZE;
}
pTag->pKeys[ pTag->ulRecCount ] = pKey;
pTag->ulRecCount++;
}
@@ -608,7 +608,7 @@ static LPMIXTAG mixTagCreate( char* szTagName, PHB_ITEM pKeyExpr, PHB_ITEM pKeyI
/* QuickSort */
if( pTag->ulRecCount >= 2 )
mixQSort( pTag->pKeys, 0, pTag->ulRecCount - 1, uiLen, pTag->pSortTable );
mixQSort( pTag->pKeys, 0, pTag->ulRecCount - 1, uiLen, pTag->pSortTable );
return pTag;
}
@@ -620,13 +620,13 @@ static void mixTagDestroy( LPMIXTAG pTag )
hb_xfree( pTag->szName );
hb_xfree( pTag->szKeyExpr );
if( pTag->szForExpr )
if( pTag->szForExpr )
hb_xfree( pTag->szForExpr );
if( pTag->pKeyItem )
if( pTag->pKeyItem )
hb_vmDestroyBlockOrMacro( pTag->pKeyItem );
if( pTag->pForItem )
if( pTag->pForItem )
hb_vmDestroyBlockOrMacro( pTag->pForItem );
for( ul = 0; ul < pTag->ulRecCount; ul++ )
@@ -652,14 +652,14 @@ static LPMIXTAG mixFindTag( ADSXAREAP pArea, PHB_ITEM pOrder )
AdsGetNumIndexes( pArea->hTable, &usOrder );
usOrder++;
pTag = pArea->pTagList;
while( pTag && usOrder != usFind )
while( pTag && usOrder != usFind )
pTag = pTag->pNext;
}
else
}
else
{
hb_strncpyUpperTrim( szTag, hb_itemGetCPtr( pOrder ), MIX_MAXTAGNAMELEN );
pTag = pArea->pTagList;
while( pTag && hb_stricmp( szTag, pTag->szName ) )
while( pTag && hb_stricmp( szTag, pTag->szName ) )
pTag = pTag->pNext;
}
@@ -671,7 +671,7 @@ static LPMIXTAG mixFindTag( ADSXAREAP pArea, PHB_ITEM pOrder )
* ADSX RDD METHODS
*************************************************************************/
static ERRCODE adsxGoBottom( ADSXAREAP pArea )
static HB_ERRCODE adsxGoBottom( ADSXAREAP pArea )
{
LPMIXTAG pTag;
ULONG ulRecNo;
@@ -681,7 +681,7 @@ static ERRCODE adsxGoBottom( ADSXAREAP pArea )
if( ! pTag )
return SUPER_GOBOTTOM( (AREAP) pArea );
if( pTag->ulRecCount > 0 )
if( pTag->ulRecCount > 0 )
{
ulRecNo = pTag->pKeys[ pTag->ulRecCount - 1 ]->rec;
}
@@ -689,17 +689,17 @@ static ERRCODE adsxGoBottom( ADSXAREAP pArea )
{
ulRecNo = 0;
}
if( SUPER_GOTO( (AREAP) pArea, ulRecNo ) == SUCCESS )
if( SUPER_GOTO( (AREAP) pArea, ulRecNo ) == HB_SUCCESS )
{
pTag->ulKeyNo = ulRecNo ? pTag->ulRecCount : 0;
return SUCCESS;
return HB_SUCCESS;
}
pTag->ulKeyNo = 0;
return FAILURE;
return HB_FAILURE;
}
static ERRCODE adsxGoTop( ADSXAREAP pArea )
static HB_ERRCODE adsxGoTop( ADSXAREAP pArea )
{
LPMIXTAG pTag;
ULONG ulRecNo;
@@ -709,7 +709,7 @@ static ERRCODE adsxGoTop( ADSXAREAP pArea )
if( ! pTag )
return SUPER_GOTOP( (AREAP) pArea );
if( pTag->ulRecCount > 0 )
if( pTag->ulRecCount > 0 )
{
ulRecNo = pTag->pKeys[ 0 ]->rec;
}
@@ -717,28 +717,28 @@ static ERRCODE adsxGoTop( ADSXAREAP pArea )
{
ulRecNo = 0;
}
if( SUPER_GOTO( (AREAP) pArea, ulRecNo ) == SUCCESS )
if( SUPER_GOTO( (AREAP) pArea, ulRecNo ) == HB_SUCCESS )
{
pTag->ulKeyNo = ulRecNo ? 1 : 0;
return SUCCESS;
return HB_SUCCESS;
}
pTag->ulKeyNo = 0;
return FAILURE;
return HB_FAILURE;
}
static ERRCODE adsxSeek( ADSXAREAP pArea, BOOL bSoftSeek, PHB_ITEM pKey, BOOL bFindLast )
static HB_ERRCODE adsxSeek( ADSXAREAP pArea, BOOL bSoftSeek, PHB_ITEM pKey, BOOL bFindLast )
{
LPMIXKEY pMixKey;
ULONG ulKeyPos, ulRecNo;
ERRCODE errCode;
HB_ERRCODE errCode;
BOOL fFound = FALSE;
if( ! pArea->pTagCurrent )
return SUPER_SEEK( (AREAP) pArea, bSoftSeek, pKey, bFindLast );
/* TODO: pKey type validation, EG_DATATYPE runtime error */
pMixKey = mixKeyNew( pKey, bFindLast ? (ULONG) (-1) : 0, pArea->pTagCurrent->bType,
pMixKey = mixKeyNew( pKey, bFindLast ? (ULONG) (-1) : 0, pArea->pTagCurrent->bType,
pArea->pTagCurrent->uiLen );
/* reset any pending relations - I hope ACE make the same and the problem
@@ -750,7 +750,7 @@ static ERRCODE adsxSeek( ADSXAREAP pArea, BOOL bSoftSeek, PHB_ITEM pKey, BOOL bF
ulRecNo = 0;
if( bFindLast )
{
if( ulKeyPos > 0 && mixCompareKey( pArea->pTagCurrent, ulKeyPos - 1, pMixKey ) == -1 )
if( ulKeyPos > 0 && mixCompareKey( pArea->pTagCurrent, ulKeyPos - 1, pMixKey ) == -1 )
{
ulRecNo = pArea->pTagCurrent->pKeys[ ulKeyPos - 1 ]->rec;
fFound = 1;
@@ -763,7 +763,7 @@ static ERRCODE adsxSeek( ADSXAREAP pArea, BOOL bSoftSeek, PHB_ITEM pKey, BOOL bF
}
else
{
if( ulKeyPos < pArea->pTagCurrent->ulRecCount )
if( ulKeyPos < pArea->pTagCurrent->ulRecCount )
{
ulRecNo = pArea->pTagCurrent->pKeys[ ulKeyPos ]->rec;
fFound = mixCompareKey( pArea->pTagCurrent, ulKeyPos, pMixKey ) == 1;
@@ -784,11 +784,11 @@ static ERRCODE adsxSeek( ADSXAREAP pArea, BOOL bSoftSeek, PHB_ITEM pKey, BOOL bF
}
static ERRCODE adsxSkip( ADSXAREAP pArea, LONG lToSkip )
static HB_ERRCODE adsxSkip( ADSXAREAP pArea, LONG lToSkip )
{
LPMIXKEY pKey;
ULONG ulKeyPos;
ERRCODE errCode = SUCCESS;
HB_ERRCODE errCode = HB_SUCCESS;
if( ! pArea->pTagCurrent || lToSkip == 0 )
return SUPER_SKIP( (AREAP) pArea, lToSkip );
@@ -816,8 +816,8 @@ static ERRCODE adsxSkip( ADSXAREAP pArea, LONG lToSkip )
pArea->pTagCurrent->ulRecCount > (ULONG) lToSkip &&
ulKeyPos < pArea->pTagCurrent->ulRecCount - (ULONG) lToSkip )
{
if( SELF_GOTO( (AREAP) pArea, pArea->pTagCurrent->pKeys[ ulKeyPos + lToSkip ]->rec ) == FAILURE )
errCode = FAILURE;
if( SELF_GOTO( (AREAP) pArea, pArea->pTagCurrent->pKeys[ ulKeyPos + lToSkip ]->rec ) == HB_FAILURE )
errCode = HB_FAILURE;
}
else
{
@@ -848,8 +848,8 @@ static ERRCODE adsxSkip( ADSXAREAP pArea, LONG lToSkip )
pArea->pTagCurrent->ulRecCount >= (ULONG) (-lToSkip) &&
ulKeyPos >= (ULONG) (-lToSkip) )
{
if( SELF_GOTO( (AREAP) pArea, pArea->pTagCurrent->pKeys[ ulKeyPos + lToSkip ]->rec ) == FAILURE )
errCode = FAILURE;
if( SELF_GOTO( (AREAP) pArea, pArea->pTagCurrent->pKeys[ ulKeyPos + lToSkip ]->rec ) == HB_FAILURE )
errCode = HB_FAILURE;
}
else
{
@@ -870,9 +870,9 @@ static ERRCODE adsxSkip( ADSXAREAP pArea, LONG lToSkip )
}
static ERRCODE adsxClose( ADSXAREAP pArea )
static HB_ERRCODE adsxClose( ADSXAREAP pArea )
{
LPMIXTAG pTag;
LPMIXTAG pTag;
pArea->pTagCurrent = NULL;
while( pArea->pTagList )
@@ -890,9 +890,9 @@ static ERRCODE adsxClose( ADSXAREAP pArea )
}
static ERRCODE adsxCreate( ADSXAREAP pArea, LPDBOPENINFO pCreateInfo )
static HB_ERRCODE adsxCreate( ADSXAREAP pArea, LPDBOPENINFO pCreateInfo )
{
if( SUPER_CREATE( (AREAP) pArea, pCreateInfo ) == SUCCESS )
if( SUPER_CREATE( (AREAP) pArea, pCreateInfo ) == HB_SUCCESS )
{
if( pCreateInfo->cdpId )
{
@@ -904,15 +904,15 @@ static ERRCODE adsxCreate( ADSXAREAP pArea, LPDBOPENINFO pCreateInfo )
pArea->cdPage = hb_vmCDP();
pArea->pSortTable = mixBuildSortTable( pArea->cdPage );
return SUCCESS;
return HB_SUCCESS;
}
return FAILURE;
return HB_FAILURE;
}
static ERRCODE adsxOpen( ADSXAREAP pArea, LPDBOPENINFO pOpenInfo )
static HB_ERRCODE adsxOpen( ADSXAREAP pArea, LPDBOPENINFO pOpenInfo )
{
if( SUPER_OPEN( (AREAP) pArea, pOpenInfo ) == SUCCESS )
if( SUPER_OPEN( (AREAP) pArea, pOpenInfo ) == HB_SUCCESS )
{
if( pOpenInfo->cdpId )
{
@@ -924,24 +924,24 @@ static ERRCODE adsxOpen( ADSXAREAP pArea, LPDBOPENINFO pOpenInfo )
pArea->cdPage = hb_vmCDP();
pArea->pSortTable = mixBuildSortTable( pArea->cdPage );
return SUCCESS;
return HB_SUCCESS;
}
return FAILURE;
return HB_FAILURE;
}
static ERRCODE adsxStructSize( ADSXAREAP pArea, USHORT* StructSize )
static HB_ERRCODE adsxStructSize( ADSXAREAP pArea, USHORT* StructSize )
{
HB_SYMBOL_UNUSED( pArea );
* StructSize = sizeof( ADSXAREA );
return SUCCESS;
return HB_SUCCESS;
}
static ERRCODE adsxOrderListFocus( ADSXAREAP pArea, LPDBORDERINFO pOrderInfo )
static HB_ERRCODE adsxOrderListFocus( ADSXAREAP pArea, LPDBORDERINFO pOrderInfo )
{
if( SUPER_ORDLSTFOCUS( (AREAP) pArea, pOrderInfo ) == SUCCESS )
if( SUPER_ORDLSTFOCUS( (AREAP) pArea, pOrderInfo ) == HB_SUCCESS )
{
if( pArea->pTagCurrent )
{
@@ -949,7 +949,7 @@ static ERRCODE adsxOrderListFocus( ADSXAREAP pArea, LPDBORDERINFO pOrderInfo )
if( pOrderInfo->itmOrder )
pArea->pTagCurrent = NULL;
}
return SUCCESS;
return HB_SUCCESS;
}
if( pArea->pTagCurrent )
@@ -958,16 +958,16 @@ static ERRCODE adsxOrderListFocus( ADSXAREAP pArea, LPDBORDERINFO pOrderInfo )
pArea->pTagCurrent = mixFindTag( pArea, pOrderInfo->itmOrder );
pArea->hOrdCurrent = 0;
if( pArea->pTagCurrent )
return SUCCESS;
else
return FAILURE;
if( pArea->pTagCurrent )
return HB_SUCCESS;
else
return HB_FAILURE;
}
static ERRCODE adsxOrderCreate( ADSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo )
static HB_ERRCODE adsxOrderCreate( ADSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo )
{
LPMIXTAG pTagNew, pTag;
LPMIXTAG pTagNew, pTag;
PHB_ITEM pKeyItem, pForItem = NULL, pWhileItem = NULL, pResult;
ULONG ulRecNo;
USHORT uiLen;
@@ -988,27 +988,27 @@ static ERRCODE adsxOrderCreate( ADSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo
bValidExpr = FALSE;
AdsIsExprValid( pArea->hTable, (UNSIGNED8*) pArea->lpdbOrdCondInfo->abFor, &bValidExpr );
bUseADS = bValidExpr;
}
}
else if( pArea->lpdbOrdCondInfo->itmCobFor )
{
bUseADS = FALSE;
}
/* Test WHILE expression */
if( bUseADS )
{
if( bUseADS )
{
if( pArea->lpdbOrdCondInfo->abWhile )
{
bValidExpr = FALSE;
AdsIsExprValid( pArea->hTable, (UNSIGNED8*) pArea->lpdbOrdCondInfo->abWhile, &bValidExpr );
bUseADS = bValidExpr;
}
}
else if( pArea->lpdbOrdCondInfo->itmCobWhile )
bUseADS = FALSE;
}
}
if( bUseADS )
if( bUseADS )
{
return SUPER_ORDCREATE( (AREAP) pArea, pOrderInfo );
}
@@ -1018,10 +1018,10 @@ static ERRCODE adsxOrderCreate( ADSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo
{
pKeyItem = hb_itemNew( pOrderInfo->itmCobExpr );
}
else
else
{
if( SELF_COMPILE( (AREAP) pArea, (BYTE*) hb_itemGetCPtr( pOrderInfo->abExpr ) ) == FAILURE )
return FAILURE;
if( SELF_COMPILE( (AREAP) pArea, (BYTE*) hb_itemGetCPtr( pOrderInfo->abExpr ) ) == HB_FAILURE )
return HB_FAILURE;
pKeyItem = pArea->valResult;
pArea->valResult = NULL;
}
@@ -1029,11 +1029,11 @@ static ERRCODE adsxOrderCreate( ADSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo
/* Test key codeblock on EOF */
ulRecNo = pArea->ulRecNo;
SELF_GOTO( (AREAP) pArea, 0 );
if( SELF_EVALBLOCK( (AREAP) pArea, pKeyItem ) == FAILURE )
if( SELF_EVALBLOCK( (AREAP) pArea, pKeyItem ) == HB_FAILURE )
{
hb_vmDestroyBlockOrMacro( pKeyItem );
SELF_GOTO( (AREAP) pArea, ulRecNo );
return FAILURE;
return HB_FAILURE;
}
pResult = pArea->valResult;
@@ -1076,7 +1076,7 @@ static ERRCODE adsxOrderCreate( ADSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo
hb_vmDestroyBlockOrMacro( pKeyItem );
SELF_GOTO( (AREAP) pArea, ulRecNo );
hb_mixErrorRT( pArea, bType == 'U' ? EG_DATATYPE : EG_DATAWIDTH, 1026, NULL, 0, 0 );
return FAILURE;
return HB_FAILURE;
}
if( pArea->lpdbOrdCondInfo )
@@ -1088,15 +1088,15 @@ static ERRCODE adsxOrderCreate( ADSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo
}
else if( pArea->lpdbOrdCondInfo->abFor )
{
if( SELF_COMPILE( (AREAP) pArea, pArea->lpdbOrdCondInfo->abFor ) == FAILURE )
if( SELF_COMPILE( (AREAP) pArea, pArea->lpdbOrdCondInfo->abFor ) == HB_FAILURE )
{
hb_vmDestroyBlockOrMacro( pKeyItem );
SELF_GOTO( (AREAP) pArea, ulRecNo );
return FAILURE;
return HB_FAILURE;
}
pForItem = pArea->valResult;
pArea->valResult = NULL;
}
}
/* Obtain WHILE codeblock */
if( pArea->lpdbOrdCondInfo->itmCobWhile )
@@ -1105,30 +1105,30 @@ static ERRCODE adsxOrderCreate( ADSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo
}
else if( pArea->lpdbOrdCondInfo->abWhile )
{
if( SELF_COMPILE( (AREAP) pArea, pArea->lpdbOrdCondInfo->abWhile ) == FAILURE )
if( SELF_COMPILE( (AREAP) pArea, pArea->lpdbOrdCondInfo->abWhile ) == HB_FAILURE )
{
hb_vmDestroyBlockOrMacro( pKeyItem );
if( pForItem )
hb_vmDestroyBlockOrMacro( pForItem );
SELF_GOTO( (AREAP) pArea, ulRecNo );
return FAILURE;
return HB_FAILURE;
}
pWhileItem = pArea->valResult;
pArea->valResult = NULL;
}
}
}
/* Test FOR codeblock on EOF */
if( pForItem )
{
if( SELF_EVALBLOCK( (AREAP) pArea, pForItem ) == FAILURE )
if( SELF_EVALBLOCK( (AREAP) pArea, pForItem ) == HB_FAILURE )
{
hb_vmDestroyBlockOrMacro( pKeyItem );
hb_vmDestroyBlockOrMacro( pForItem );
if( pWhileItem )
hb_vmDestroyBlockOrMacro( pWhileItem );
SELF_GOTO( (AREAP) pArea, ulRecNo );
return FAILURE;
return HB_FAILURE;
}
if( hb_itemType( pArea->valResult ) != HB_IT_LOGICAL )
{
@@ -1140,7 +1140,7 @@ static ERRCODE adsxOrderCreate( ADSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo
hb_vmDestroyBlockOrMacro( pWhileItem );
SELF_GOTO( (AREAP) pArea, ulRecNo );
hb_mixErrorRT( pArea, EG_DATATYPE, EDBF_INVALIDFOR, NULL, 0, 0 );
return FAILURE;
return HB_FAILURE;
}
hb_itemRelease( pArea->valResult );
pArea->valResult = NULL;
@@ -1150,21 +1150,21 @@ static ERRCODE adsxOrderCreate( ADSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo
SELF_GOTO( (AREAP) pArea, ulRecNo );
pTagNew = mixTagCreate( ( char * ) pOrderInfo->atomBagName, pOrderInfo->abExpr, pKeyItem,
pTagNew = mixTagCreate( ( char * ) pOrderInfo->atomBagName, pOrderInfo->abExpr, pKeyItem,
pForItem, pWhileItem, bType, uiLen, pArea );
if( pWhileItem )
hb_vmDestroyBlockOrMacro( pWhileItem );
/* Append the tag to the end of list */
if( pArea->pTagList )
if( pArea->pTagList )
{
pTag = pArea->pTagList;
while( pTag->pNext )
while( pTag->pNext )
pTag = pTag->pNext;
pTag->pNext = pTagNew;
}
else
}
else
{
pArea->pTagList = pTagNew;
}
@@ -1172,17 +1172,17 @@ static ERRCODE adsxOrderCreate( ADSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo
pArea->pTagCurrent = pTagNew;
pArea->hOrdCurrent = 0;
return SUCCESS;
return HB_SUCCESS;
}
static ERRCODE adsxOrderDestroy( ADSXAREAP pArea, LPDBORDERINFO pOrderInfo )
static HB_ERRCODE adsxOrderDestroy( ADSXAREAP pArea, LPDBORDERINFO pOrderInfo )
{
LPMIXTAG pTag, pTag2;
/* TODO: ADS RDD missing implementation of ordDestroy( nOrder ) */
if( SUPER_ORDDESTROY( (AREAP) pArea, pOrderInfo ) == SUCCESS )
return SUCCESS;
if( SUPER_ORDDESTROY( (AREAP) pArea, pOrderInfo ) == HB_SUCCESS )
return HB_SUCCESS;
pTag = mixFindTag( pArea, pOrderInfo->itmOrder );
@@ -1190,29 +1190,29 @@ static ERRCODE adsxOrderDestroy( ADSXAREAP pArea, LPDBORDERINFO pOrderInfo )
if( pTag == pArea->pTagList )
pArea->pTagList = pTag->pNext;
else
else
{
pTag2 = pArea->pTagList;
while( pTag2->pNext != pTag )
while( pTag2->pNext != pTag )
pTag2 = pTag2->pNext;
pTag2->pNext = pTag->pNext;
}
if( pTag == pArea->pTagCurrent )
if( pTag == pArea->pTagCurrent )
pArea->pTagCurrent = NULL;
mixTagDestroy( pTag );
return SUCCESS;
}
else
return HB_SUCCESS;
}
else
{
pArea->hOrdCurrent = 0;
return FAILURE;
return HB_FAILURE;
}
}
static ERRCODE adsxOrderInfo( ADSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOrderInfo )
static HB_ERRCODE adsxOrderInfo( ADSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOrderInfo )
{
LPMIXTAG pTag = pArea->pTagCurrent;
@@ -1263,7 +1263,7 @@ static ERRCODE adsxOrderInfo( ADSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOr
break;
case DBOI_POSITION :
case DBOI_RECNO :
case DBOI_RECNO :
case DBOI_KEYNORAW :
if( uiIndex == DBOI_POSITION && pOrderInfo->itmNewVal && HB_IS_NUMERIC( pOrderInfo->itmNewVal ) )
{
@@ -1285,10 +1285,10 @@ static ERRCODE adsxOrderInfo( ADSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOr
SELF_GOTO( (AREAP) pArea, pArea->ulRecNo );
else
pArea->fEof = FALSE;
pKey = mixKeyEval( pTag, pArea );
hb_itemPutNL( pOrderInfo->itmResult,
hb_itemPutNL( pOrderInfo->itmResult,
mixFindKey( pTag, pKey, &ulKeyPos ) ? (ulKeyPos + 1) : 0 );
mixKeyFree( pKey );
}
@@ -1315,14 +1315,14 @@ static ERRCODE adsxOrderInfo( ADSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOr
SELF_GOTO( (AREAP) pArea, pArea->ulRecNo );
else
pArea->fEof = FALSE;
pKey = mixKeyEval( pTag, pArea );
if( ! mixFindKey( pTag, pKey, &ulKeyPos + 1 ) )
ulKeyPos = 0;
mixKeyFree( pKey );
pOrderInfo->itmResult = hb_itemPutND( pOrderInfo->itmResult,
(double) ulKeyPos / (double) pTag->ulRecCount );
}
@@ -1347,10 +1347,10 @@ static ERRCODE adsxOrderInfo( ADSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOr
case DBOI_ORDERCOUNT:
{
UNSIGNED16 usOrder = 0;
AdsGetNumIndexes( pArea->hTable, &usOrder );
pTag = pArea->pTagList;
while( pTag )
while( pTag )
{
pTag = pTag->pNext;
usOrder++;
@@ -1363,11 +1363,11 @@ static ERRCODE adsxOrderInfo( ADSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOr
{
LPMIXTAG pTag2;
UNSIGNED16 usOrder = 0;
AdsGetNumIndexes( pArea->hTable, &usOrder );
pTag2 = pArea->pTagList;
usOrder++;
while ( pTag2 && pTag != pTag2 )
while ( pTag2 && pTag != pTag2 )
{
pTag2 = pTag2->pNext;
usOrder++;
@@ -1399,23 +1399,23 @@ static ERRCODE adsxOrderInfo( ADSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOr
default:
return SUPER_ORDINFO( ( AREAP ) pArea, uiIndex, pOrderInfo );
}
return SUCCESS;
return HB_SUCCESS;
}
static RDDFUNCS adsxTable = { NULL,
static RDDFUNCS adsxTable = { NULL,
NULL,
NULL,
NULL,
( DBENTRYP_V ) adsxGoBottom,
NULL,
NULL,
NULL,
( DBENTRYP_V ) adsxGoTop,
( DBENTRYP_BIB ) adsxSeek,
( DBENTRYP_L ) adsxSkip,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
@@ -1441,10 +1441,10 @@ static RDDFUNCS adsxTable = { NULL,
NULL,
( DBENTRYP_V ) adsxClose,
( DBENTRYP_VP ) adsxCreate,
NULL,
NULL,
NULL,
NULL,
( DBENTRYP_VP ) adsxOpen,
NULL,
NULL,
( DBENTRYP_SP ) adsxStructSize,
NULL,
NULL,
@@ -1517,10 +1517,10 @@ static void adsxRegisterRDD( USHORT * pusRddId )
if( pTable )
{
ERRCODE errCode;
HB_ERRCODE errCode;
errCode = hb_rddInherit( pTable, &adsxTable, &adsxSuper, "ADS" );
if( errCode == SUCCESS )
if( errCode == HB_SUCCESS )
{
*pusRddId = uiRddId;
}
@@ -1528,7 +1528,7 @@ static void adsxRegisterRDD( USHORT * pusRddId )
}
else
{
hb_retni( FAILURE );
hb_retni( HB_FAILURE );
}
}

3
harbour/doc/en/hb_api.txt
View File

@@ -4366,7 +4366,7 @@
* C Prototype
*
* #include <hbapi.h>
* hb_memvarGet( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ) --> ( ERRCODE )hResult
* hb_memvarGet( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ) --> ( HB_ERRCODE )hResult
* $ARGUMENTS$
* <pItem>
*
@@ -7094,4 +7094,3 @@
*
* $END$
*/

3165
harbour/doc/en/hb_apird.txt
View File

File diff suppressed because it is too large Load Diff

2
harbour/include/hbapi.h
View File

@@ -934,7 +934,7 @@ extern void hb_codeblockEvaluate( HB_ITEM_PTR pItem ); /* evaluate a
/* memvars subsystem */
extern void hb_memvarsClear( void ); /* clear all PUBLIC and PRIVATE variables */
extern void hb_memvarSetValue( PHB_SYMB pMemvarSymb, HB_ITEM_PTR pItem ); /* copy an item into a symbol */
extern ERRCODE hb_memvarGet( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ); /* copy an symbol value into an item */
extern HB_ERRCODE hb_memvarGet( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ); /* copy an symbol value into an item */
extern void hb_memvarGetValue( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ); /* copy an symbol value into an item, with error trapping */
extern void hb_memvarGetRefer( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb ); /* copy a reference to a symbol value into an item, with error trapping */
extern ULONG hb_memvarGetPrivatesBase( void ); /* retrieve current PRIVATE variables stack base */

50
harbour/include/hbrddcdx.h
View File

@@ -557,14 +557,14 @@ typedef CDXAREA * LPCDXAREA;
#define hb_cdxBof NULL
#define hb_cdxEof NULL
#define hb_cdxFound NULL
static ERRCODE hb_cdxGoBottom( CDXAREAP pArea );
static HB_ERRCODE hb_cdxGoBottom( CDXAREAP pArea );
#define hb_cdxGoTo NULL
#define hb_cdxGoToId NULL
static ERRCODE hb_cdxGoTop( CDXAREAP pArea );
static ERRCODE hb_cdxSeek( CDXAREAP pArea, BOOL bSoftSeek, PHB_ITEM pKey, BOOL bFindLast );
static ERRCODE hb_cdxSkip( CDXAREAP pArea, LONG lToSkip );
static HB_ERRCODE hb_cdxGoTop( CDXAREAP pArea );
static HB_ERRCODE hb_cdxSeek( CDXAREAP pArea, BOOL bSoftSeek, PHB_ITEM pKey, BOOL bFindLast );
static HB_ERRCODE hb_cdxSkip( CDXAREAP pArea, LONG lToSkip );
#define hb_cdxSkipFilter NULL
static ERRCODE hb_cdxSkipRaw( CDXAREAP pArea, LONG lToSkip );
static HB_ERRCODE hb_cdxSkipRaw( CDXAREAP pArea, LONG lToSkip );
#define hb_cdxAddField NULL
#define hb_cdxAppend NULL
#define hb_cdxCreateFields NULL
@@ -574,12 +574,12 @@ static ERRCODE hb_cdxSkipRaw( CDXAREAP pArea, LONG lToSkip );
#define hb_cdxFieldDisplay NULL
#define hb_cdxFieldInfo NULL
#define hb_cdxFieldName NULL
static ERRCODE hb_cdxFlush( CDXAREAP pArea );
static HB_ERRCODE hb_cdxFlush( CDXAREAP pArea );
#define hb_cdxGetRec NULL
#define hb_cdxGetValue NULL
#define hb_cdxGetVarLen NULL
static ERRCODE hb_cdxGoCold( CDXAREAP pArea );
static ERRCODE hb_cdxGoHot( CDXAREAP pArea );
static HB_ERRCODE hb_cdxGoCold( CDXAREAP pArea );
static HB_ERRCODE hb_cdxGoHot( CDXAREAP pArea );
#define hb_cdxPutRec NULL
#define hb_cdxPutValue NULL
#define hb_cdxRecall NULL
@@ -589,21 +589,21 @@ static ERRCODE hb_cdxGoHot( CDXAREAP pArea );
#define hb_cdxRecId NULL
#define hb_cdxSetFieldExtent NULL
#define hb_cdxAlias NULL
static ERRCODE hb_cdxClose( CDXAREAP pArea );
static HB_ERRCODE hb_cdxClose( CDXAREAP pArea );
#define hb_cdxCreate NULL
#define hb_cdxInfo NULL
#define hb_cdxNewArea NULL
static ERRCODE hb_cdxOpen( CDXAREAP pArea, LPDBOPENINFO pOpenInfo );
static HB_ERRCODE hb_cdxOpen( CDXAREAP pArea, LPDBOPENINFO pOpenInfo );
#define hb_cdxRelease NULL
static ERRCODE hb_cdxStructSize( CDXAREAP pArea, USHORT * uiSize );
static HB_ERRCODE hb_cdxStructSize( CDXAREAP pArea, USHORT * uiSize );
#define hb_cdxSysName NULL
#define hb_cdxEval NULL
static ERRCODE hb_cdxPack ( CDXAREAP pArea );
static HB_ERRCODE hb_cdxPack ( CDXAREAP pArea );
#define hb_cdxPackRec NULL
#define hb_cdxSort NULL
#define hb_cdxTrans NULL
#define hb_cdxTransRec NULL
static ERRCODE hb_cdxZap ( CDXAREAP pArea );
static HB_ERRCODE hb_cdxZap ( CDXAREAP pArea );
#define hb_cdxChildEnd NULL
#define hb_cdxChildStart NULL
#define hb_cdxChildSync NULL
@@ -614,22 +614,22 @@ static ERRCODE hb_cdxZap ( CDXAREAP pArea );
#define hb_cdxRelEval NULL
#define hb_cdxRelText NULL
#define hb_cdxSetRel NULL
static ERRCODE hb_cdxOrderListAdd( CDXAREAP pArea, LPDBORDERINFO pOrderInfo );
static ERRCODE hb_cdxOrderListClear( CDXAREAP pArea );
static ERRCODE hb_cdxOrderListDelete( CDXAREAP pArea, LPDBORDERINFO pOrderInfo );
static ERRCODE hb_cdxOrderListFocus( CDXAREAP pArea, LPDBORDERINFO pOrderInfo );
static ERRCODE hb_cdxOrderListRebuild( CDXAREAP pArea );
static HB_ERRCODE hb_cdxOrderListAdd( CDXAREAP pArea, LPDBORDERINFO pOrderInfo );
static HB_ERRCODE hb_cdxOrderListClear( CDXAREAP pArea );
static HB_ERRCODE hb_cdxOrderListDelete( CDXAREAP pArea, LPDBORDERINFO pOrderInfo );
static HB_ERRCODE hb_cdxOrderListFocus( CDXAREAP pArea, LPDBORDERINFO pOrderInfo );
static HB_ERRCODE hb_cdxOrderListRebuild( CDXAREAP pArea );
#define hb_cdxOrderCondition NULL
static ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo );
static ERRCODE hb_cdxOrderDestroy( CDXAREAP pArea, LPDBORDERINFO pOrderInfo );
static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOrderInfo );
static ERRCODE hb_cdxClearFilter( CDXAREAP pArea );
static HB_ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo );
static HB_ERRCODE hb_cdxOrderDestroy( CDXAREAP pArea, LPDBORDERINFO pOrderInfo );
static HB_ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOrderInfo );
static HB_ERRCODE hb_cdxClearFilter( CDXAREAP pArea );
#define hb_cdxClearLocate NULL
#define hb_cdxClearScope NULL
static ERRCODE hb_cdxCountScope( CDXAREAP pArea, void * pPtr, LONG * plRec );
static HB_ERRCODE hb_cdxCountScope( CDXAREAP pArea, void * pPtr, LONG * plRec );
#define hb_cdxFilterText NULL
#define hb_cdxScopeInfo NULL
static ERRCODE hb_cdxSetFilter( CDXAREAP pArea, LPDBFILTERINFO pFilterInfo );
static HB_ERRCODE hb_cdxSetFilter( CDXAREAP pArea, LPDBFILTERINFO pFilterInfo );
#define hb_cdxSetLocate NULL
#define hb_cdxSetScope NULL
#define hb_cdxSkipScope NULL
@@ -651,7 +651,7 @@ static ERRCODE hb_cdxSetFilter( CDXAREAP pArea, LPDBFILTERINFO pFilterInfo );
#define hb_cdxExit NULL
#define hb_cdxDrop NULL
#define hb_cdxExists NULL
static ERRCODE hb_cdxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem );
static HB_ERRCODE hb_cdxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem );
#define hb_cdxWhoCares NULL
HB_EXTERN_END

138
harbour/include/hbrdddbf.h
View File

@@ -257,62 +257,62 @@ typedef DBFAREA * LPDBFAREA;
#define SUPERTABLE ( &dbfSuper )
static ERRCODE hb_dbfBof( DBFAREAP pArea, BOOL * pBof );
static ERRCODE hb_dbfEof( DBFAREAP pArea, BOOL * pEof );
static ERRCODE hb_dbfFound( DBFAREAP pArea, BOOL * pFound );
static ERRCODE hb_dbfGoBottom( DBFAREAP pArea );
static ERRCODE hb_dbfGoTo( DBFAREAP pArea, ULONG ulRecNo );
static ERRCODE hb_dbfGoToId( DBFAREAP pArea, PHB_ITEM pItem );
static ERRCODE hb_dbfGoTop( DBFAREAP pArea );
static HB_ERRCODE hb_dbfBof( DBFAREAP pArea, BOOL * pBof );
static HB_ERRCODE hb_dbfEof( DBFAREAP pArea, BOOL * pEof );
static HB_ERRCODE hb_dbfFound( DBFAREAP pArea, BOOL * pFound );
static HB_ERRCODE hb_dbfGoBottom( DBFAREAP pArea );
static HB_ERRCODE hb_dbfGoTo( DBFAREAP pArea, ULONG ulRecNo );
static HB_ERRCODE hb_dbfGoToId( DBFAREAP pArea, PHB_ITEM pItem );
static HB_ERRCODE hb_dbfGoTop( DBFAREAP pArea );
#define hb_dbfSeek NULL
static ERRCODE hb_dbfSkip( DBFAREAP pArea, LONG lToSkip );
static HB_ERRCODE hb_dbfSkip( DBFAREAP pArea, LONG lToSkip );
#define hb_dbfSkipFilter NULL
static ERRCODE hb_dbfSkipRaw( DBFAREAP pArea, LONG lToSkip );
static ERRCODE hb_dbfAddField( DBFAREAP pArea, LPDBFIELDINFO pFieldInfo );
static ERRCODE hb_dbfAppend( DBFAREAP pArea, BOOL bUnLockAll );
static HB_ERRCODE hb_dbfSkipRaw( DBFAREAP pArea, LONG lToSkip );
static HB_ERRCODE hb_dbfAddField( DBFAREAP pArea, LPDBFIELDINFO pFieldInfo );
static HB_ERRCODE hb_dbfAppend( DBFAREAP pArea, BOOL bUnLockAll );
#define hb_dbfCreateFields NULL
static ERRCODE hb_dbfDeleteRec( DBFAREAP pArea );
static ERRCODE hb_dbfDeleted( DBFAREAP pArea, BOOL * pDeleted );
static HB_ERRCODE hb_dbfDeleteRec( DBFAREAP pArea );
static HB_ERRCODE hb_dbfDeleted( DBFAREAP pArea, BOOL * pDeleted );
#define hb_dbfFieldCount NULL
#define hb_dbfFieldDisplay NULL
#define hb_dbfFieldInfo NULL
#define hb_dbfFieldName NULL
static ERRCODE hb_dbfFlush( DBFAREAP pArea );
static ERRCODE hb_dbfGetRec( DBFAREAP pArea, BYTE ** pBuffer );
static ERRCODE hb_dbfGetValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
static ERRCODE hb_dbfGetVarLen( DBFAREAP pArea, USHORT uiIndex, ULONG * pLength );
static ERRCODE hb_dbfGoCold( DBFAREAP pArea );
static ERRCODE hb_dbfGoHot( DBFAREAP pArea );
static ERRCODE hb_dbfPutRec( DBFAREAP pArea, BYTE * pBuffer );
static ERRCODE hb_dbfPutValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
static ERRCODE hb_dbfRecall( DBFAREAP pArea );
static ERRCODE hb_dbfRecCount( DBFAREAP pArea, ULONG * pRecCount );
static ERRCODE hb_dbfRecInfo( DBFAREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType, PHB_ITEM pInfo );
static ERRCODE hb_dbfRecNo( DBFAREAP pArea, ULONG * pRecNo );
static ERRCODE hb_dbfRecId( DBFAREAP pArea, PHB_ITEM pRecNo );
static ERRCODE hb_dbfSetFieldExtent( DBFAREAP pArea, USHORT uiFieldExtent );
static HB_ERRCODE hb_dbfFlush( DBFAREAP pArea );
static HB_ERRCODE hb_dbfGetRec( DBFAREAP pArea, BYTE ** pBuffer );
static HB_ERRCODE hb_dbfGetValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
static HB_ERRCODE hb_dbfGetVarLen( DBFAREAP pArea, USHORT uiIndex, ULONG * pLength );
static HB_ERRCODE hb_dbfGoCold( DBFAREAP pArea );
static HB_ERRCODE hb_dbfGoHot( DBFAREAP pArea );
static HB_ERRCODE hb_dbfPutRec( DBFAREAP pArea, BYTE * pBuffer );
static HB_ERRCODE hb_dbfPutValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
static HB_ERRCODE hb_dbfRecall( DBFAREAP pArea );
static HB_ERRCODE hb_dbfRecCount( DBFAREAP pArea, ULONG * pRecCount );
static HB_ERRCODE hb_dbfRecInfo( DBFAREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType, PHB_ITEM pInfo );
static HB_ERRCODE hb_dbfRecNo( DBFAREAP pArea, ULONG * pRecNo );
static HB_ERRCODE hb_dbfRecId( DBFAREAP pArea, PHB_ITEM pRecNo );
static HB_ERRCODE hb_dbfSetFieldExtent( DBFAREAP pArea, USHORT uiFieldExtent );
#define hb_dbfAlias NULL
static ERRCODE hb_dbfClose( DBFAREAP pArea );
static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo );
static ERRCODE hb_dbfInfo( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
static ERRCODE hb_dbfNewArea( DBFAREAP pArea );
static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo );
static HB_ERRCODE hb_dbfClose( DBFAREAP pArea );
static HB_ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo );
static HB_ERRCODE hb_dbfInfo( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
static HB_ERRCODE hb_dbfNewArea( DBFAREAP pArea );
static HB_ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo );
#define hb_dbfRelease NULL
static ERRCODE hb_dbfStructSize( DBFAREAP pArea, USHORT * uiSize );
static HB_ERRCODE hb_dbfStructSize( DBFAREAP pArea, USHORT * uiSize );
#define hb_dbfSysName NULL
#define hb_dbfEval NULL
static ERRCODE hb_dbfPack( DBFAREAP pArea );
static ERRCODE hb_dbfPackRec( DBFAREAP pArea, ULONG ulRecNo, BOOL *fWritten );
static ERRCODE hb_dbfSort( DBFAREAP pArea, LPDBSORTINFO pSortInfo );
static ERRCODE hb_dbfTrans( DBFAREAP pArea, LPDBTRANSINFO pTransInfo );
static HB_ERRCODE hb_dbfPack( DBFAREAP pArea );
static HB_ERRCODE hb_dbfPackRec( DBFAREAP pArea, ULONG ulRecNo, BOOL *fWritten );
static HB_ERRCODE hb_dbfSort( DBFAREAP pArea, LPDBSORTINFO pSortInfo );
static HB_ERRCODE hb_dbfTrans( DBFAREAP pArea, LPDBTRANSINFO pTransInfo );
#define hb_dbfTransRec NULL
static ERRCODE hb_dbfZap( DBFAREAP pArea );
static ERRCODE hb_dbfChildEnd( DBFAREAP pArea, LPDBRELINFO pRelInfo );
static ERRCODE hb_dbfChildStart( DBFAREAP pArea, LPDBRELINFO pRelInfo );
static ERRCODE hb_dbfChildSync( DBFAREAP pArea, LPDBRELINFO pRelInfo );
static HB_ERRCODE hb_dbfZap( DBFAREAP pArea );
static HB_ERRCODE hb_dbfChildEnd( DBFAREAP pArea, LPDBRELINFO pRelInfo );
static HB_ERRCODE hb_dbfChildStart( DBFAREAP pArea, LPDBRELINFO pRelInfo );
static HB_ERRCODE hb_dbfChildSync( DBFAREAP pArea, LPDBRELINFO pRelInfo );
#define hb_dbfSyncChildren NULL
#define hb_dbfClearRel NULL
static ERRCODE hb_dbfForceRel( DBFAREAP pArea );
static HB_ERRCODE hb_dbfForceRel( DBFAREAP pArea );
#define hb_dbfRelArea NULL
#define hb_dbfRelEval NULL
#define hb_dbfRelText NULL
@@ -332,7 +332,7 @@ static ERRCODE hb_dbfForceRel( DBFAREAP pArea );
#define hb_dbfCountScope NULL
#define hb_dbfFilterText NULL
#define hb_dbfScopeInfo NULL
static ERRCODE hb_dbfSetFilter( DBFAREAP pArea, LPDBFILTERINFO pFilterInfo );
static HB_ERRCODE hb_dbfSetFilter( DBFAREAP pArea, LPDBFILTERINFO pFilterInfo );
#define hb_dbfSetLocate NULL
#define hb_dbfSetScope NULL
#define hb_dbfSkipScope NULL
@@ -340,40 +340,40 @@ static ERRCODE hb_dbfSetFilter( DBFAREAP pArea, LPDBFILTERINFO pFilterInfo );
#define hb_dbfCompile NULL
#define hb_dbfError NULL
#define hb_dbfEvalBlock NULL
static ERRCODE hb_dbfRawLock( DBFAREAP pArea, USHORT uiAction, ULONG lRecNo );
static ERRCODE hb_dbfLock( DBFAREAP pArea, LPDBLOCKINFO pLockInfo );
static ERRCODE hb_dbfUnLock( DBFAREAP pArea, PHB_ITEM pRecNo );
static HB_ERRCODE hb_dbfRawLock( DBFAREAP pArea, USHORT uiAction, ULONG lRecNo );
static HB_ERRCODE hb_dbfLock( DBFAREAP pArea, LPDBLOCKINFO pLockInfo );
static HB_ERRCODE hb_dbfUnLock( DBFAREAP pArea, PHB_ITEM pRecNo );
#define hb_dbfCloseMemFile NULL
static ERRCODE hb_dbfCreateMemFile( DBFAREAP pArea, LPDBOPENINFO pCreateInfo );
static ERRCODE hb_dbfGetValueFile( DBFAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode );
static ERRCODE hb_dbfOpenMemFile( DBFAREAP pArea, LPDBOPENINFO pOpenInfo );
static ERRCODE hb_dbfPutValueFile( DBFAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode );
static HB_ERRCODE hb_dbfCreateMemFile( DBFAREAP pArea, LPDBOPENINFO pCreateInfo );
static HB_ERRCODE hb_dbfGetValueFile( DBFAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode );
static HB_ERRCODE hb_dbfOpenMemFile( DBFAREAP pArea, LPDBOPENINFO pOpenInfo );
static HB_ERRCODE hb_dbfPutValueFile( DBFAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode );
static ERRCODE hb_dbfReadDBHeader( DBFAREAP pArea );
static ERRCODE hb_dbfWriteDBHeader( DBFAREAP pArea );
static HB_ERRCODE hb_dbfReadDBHeader( DBFAREAP pArea );
static HB_ERRCODE hb_dbfWriteDBHeader( DBFAREAP pArea );
static ERRCODE hb_dbfInit( LPRDDNODE pRDD );
static ERRCODE hb_dbfExit( LPRDDNODE pRDD );
static ERRCODE hb_dbfDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex, ULONG ulConnect );
static ERRCODE hb_dbfExists( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex, ULONG ulConnect );
static ERRCODE hb_dbfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem );
static HB_ERRCODE hb_dbfInit( LPRDDNODE pRDD );
static HB_ERRCODE hb_dbfExit( LPRDDNODE pRDD );
static HB_ERRCODE hb_dbfDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex, ULONG ulConnect );
static HB_ERRCODE hb_dbfExists( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex, ULONG ulConnect );
static HB_ERRCODE hb_dbfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem );
#define hb_dbfWhoCares NULL
#endif /* HB_EXTERNAL_RDDDBF_USE */
extern HB_EXPORT ULONG hb_dbfGetMemoBlock( DBFAREAP pArea, USHORT uiIndex );
extern HB_EXPORT void hb_dbfPutMemoBlock( DBFAREAP pArea, USHORT uiIndex,
ULONG ulBlock );
extern HB_EXPORT ERRCODE hb_dbfGetMemoData( DBFAREAP pArea, USHORT uiIndex,
ULONG * pulBlock, ULONG * pulSize,
ULONG * pulType );
extern HB_EXPORT ERRCODE hb_dbfSetMemoData( DBFAREAP pArea, USHORT uiIndex,
ULONG ulBlock, ULONG ulSize,
ULONG ulType );
extern HB_EXPORT ERRCODE hb_dbfGetEGcode( ERRCODE errCode );
extern HB_EXPORT BOOL hb_dbfLockIdxFile( PHB_FILE pFile, BYTE bScheme, USHORT usMode, HB_FOFFSET *pPoolPos );
extern HB_EXPORT BOOL hb_dbfLockIdxGetData( BYTE bScheme, HB_FOFFSET *ulPos, HB_FOFFSET *ulPool );
extern HB_EXPORT ULONG hb_dbfGetMemoBlock( DBFAREAP pArea, USHORT uiIndex );
extern HB_EXPORT void hb_dbfPutMemoBlock( DBFAREAP pArea, USHORT uiIndex,
ULONG ulBlock );
extern HB_EXPORT HB_ERRCODE hb_dbfGetMemoData( DBFAREAP pArea, USHORT uiIndex,
ULONG * pulBlock, ULONG * pulSize,
ULONG * pulType );
extern HB_EXPORT HB_ERRCODE hb_dbfSetMemoData( DBFAREAP pArea, USHORT uiIndex,
ULONG ulBlock, ULONG ulSize,
ULONG ulType );
extern HB_EXPORT HB_ERRCODE hb_dbfGetEGcode( HB_ERRCODE errCode );
extern HB_EXPORT BOOL hb_dbfLockIdxFile( PHB_FILE pFile, BYTE bScheme, USHORT usMode, HB_FOFFSET *pPoolPos );
extern HB_EXPORT BOOL hb_dbfLockIdxGetData( BYTE bScheme, HB_FOFFSET *ulPos, HB_FOFFSET *ulPool );
#ifndef HB_CDP_SUPPORT_OFF
extern HB_EXPORT void hb_dbfTranslateRec( DBFAREAP pArea, BYTE * pBuffer, PHB_CODEPAGE cdp_src, PHB_CODEPAGE cdp_dest );

26
harbour/include/hbrddfpt.h
View File

@@ -272,16 +272,16 @@ typedef FPTAREA * LPFPTAREA;
#define hb_fptDeleted NULL
#define hb_fptFieldCount NULL
#define hb_fptFieldDisplay NULL
static ERRCODE hb_fptFieldInfo( FPTAREAP pArea, USHORT uiIndex, USHORT uiType, PHB_ITEM pItem );
static HB_ERRCODE hb_fptFieldInfo( FPTAREAP pArea, USHORT uiIndex, USHORT uiType, PHB_ITEM pItem );
#define hb_fptFieldName NULL
#define hb_fptFlush NULL
#define hb_fptGetRec NULL
static ERRCODE hb_fptGetValue( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
static ERRCODE hb_fptGetVarLen( FPTAREAP pArea, USHORT uiIndex, ULONG * pLength );
static HB_ERRCODE hb_fptGetValue( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
static HB_ERRCODE hb_fptGetVarLen( FPTAREAP pArea, USHORT uiIndex, ULONG * pLength );
#define hb_fptGoCold NULL
#define hb_fptGoHot NULL
#define hb_fptPutRec NULL
static ERRCODE hb_fptPutValue( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
static HB_ERRCODE hb_fptPutValue( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
#define hb_fptRecall NULL
#define hb_fptRecCount NULL
#define hb_fptRecInfo NULL
@@ -291,15 +291,15 @@ static ERRCODE hb_fptPutValue( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
#define hb_fptAlias NULL
#define hb_fptClose NULL
#define hb_fptCreate NULL
static ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
static HB_ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem );
#define hb_fptNewArea NULL
#define hb_fptOpen NULL
#define hb_fptRelease NULL
static ERRCODE hb_fptStructSize( FPTAREAP pArea, USHORT * uiSize );
static HB_ERRCODE hb_fptStructSize( FPTAREAP pArea, USHORT * uiSize );
#define hb_fptSysName NULL
#define hb_fptEval NULL
static ERRCODE hb_fptPack( FPTAREAP pArea );
static ERRCODE hb_fptPackRec( FPTAREAP pArea, ULONG ulRecNo, BOOL *pfWritten );
static HB_ERRCODE hb_fptPack( FPTAREAP pArea );
static HB_ERRCODE hb_fptPackRec( FPTAREAP pArea, ULONG ulRecNo, BOOL *pfWritten );
#define hb_fptSort NULL
#define hb_fptTrans NULL
#define hb_fptTransRec NULL
@@ -341,17 +341,17 @@ static ERRCODE hb_fptPackRec( FPTAREAP pArea, ULONG ulRecNo, BOOL *pfWritten );
#define hb_fptLock NULL
#define hb_fptUnLock NULL
#define hb_fptCloseMemFile NULL
static ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo );
static ERRCODE hb_fptGetValueFile( FPTAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode );
static ERRCODE hb_fptOpenMemFile( FPTAREAP pArea, LPDBOPENINFO pOpenInfo );
static ERRCODE hb_fptPutValueFile( FPTAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode );
static HB_ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo );
static HB_ERRCODE hb_fptGetValueFile( FPTAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode );
static HB_ERRCODE hb_fptOpenMemFile( FPTAREAP pArea, LPDBOPENINFO pOpenInfo );
static HB_ERRCODE hb_fptPutValueFile( FPTAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode );
#define hb_fptReadDBHeader NULL
#define hb_fptWriteDBHeader NULL
#define hb_fptInit NULL
#define hb_fptExit NULL
#define hb_fptDrop NULL
#define hb_fptExists NULL
static ERRCODE hb_fptRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem );
static HB_ERRCODE hb_fptRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem );
#define hb_fptWhoCares NULL
HB_EXTERN_END

48
harbour/include/hbrddntx.h
View File

@@ -450,16 +450,16 @@ typedef NTXAREA * LPNTXAREA;
#define ntxBof NULL
#define ntxEof NULL
#define ntxFound NULL
static ERRCODE ntxGoBottom( NTXAREAP pArea );
static HB_ERRCODE ntxGoBottom( NTXAREAP pArea );
#define ntxGoTo NULL
#define ntxGoToId NULL
static ERRCODE ntxGoTop( NTXAREAP pArea );
static ERRCODE ntxSeek( NTXAREAP pArea, BOOL bSoftSeek, PHB_ITEM pKey, BOOL bFindLast );
static HB_ERRCODE ntxGoTop( NTXAREAP pArea );
static HB_ERRCODE ntxSeek( NTXAREAP pArea, BOOL bSoftSeek, PHB_ITEM pKey, BOOL bFindLast );
#define ntxSkip NULL
#define ntxSkipFilter NULL
static ERRCODE ntxSkipRaw( NTXAREAP pArea, LONG lToSkip );
static HB_ERRCODE ntxSkipRaw( NTXAREAP pArea, LONG lToSkip );
#define ntxAddField NULL
/* static ERRCODE ntxAppend( NTXAREAP pArea, BOOL bUnLockAll ); */
/* static HB_ERRCODE ntxAppend( NTXAREAP pArea, BOOL bUnLockAll ); */
#define ntxAppend NULL
#define ntxCreateFields NULL
#define ntxDeleteRec NULL
@@ -468,12 +468,12 @@ static ERRCODE ntxSkipRaw( NTXAREAP pArea, LONG lToSkip );
#define ntxFieldDisplay NULL
#define ntxFieldInfo NULL
#define ntxFieldName NULL
static ERRCODE ntxFlush( NTXAREAP pArea );
static HB_ERRCODE ntxFlush( NTXAREAP pArea );
#define ntxGetRec NULL
#define ntxGetValue NULL
#define ntxGetVarLen NULL
static ERRCODE ntxGoCold( NTXAREAP pArea );
static ERRCODE ntxGoHot( NTXAREAP pArea );
static HB_ERRCODE ntxGoCold( NTXAREAP pArea );
static HB_ERRCODE ntxGoHot( NTXAREAP pArea );
#define ntxPutRec NULL
#define ntxPutValue NULL
#define ntxRecall NULL
@@ -483,23 +483,23 @@ static ERRCODE ntxGoHot( NTXAREAP pArea );
#define ntxRecId NULL
#define ntxSetFieldsExtent NULL
#define ntxAlias NULL
static ERRCODE ntxClose( NTXAREAP pArea );
static HB_ERRCODE ntxClose( NTXAREAP pArea );
/* Close workarea - at first we mus close all indexes and than close
workarea */
#define ntxCreate NULL
#define ntxInfo NULL
#define ntxNewArea NULL
static ERRCODE ntxOpen( NTXAREAP pArea, LPDBOPENINFO pOpenInfo );
static HB_ERRCODE ntxOpen( NTXAREAP pArea, LPDBOPENINFO pOpenInfo );
#define ntxRelease NULL
static ERRCODE ntxStructSize( NTXAREAP pArea, USHORT * uiSize );
static HB_ERRCODE ntxStructSize( NTXAREAP pArea, USHORT * uiSize );
#define ntxSysName NULL
#define ntxEval NULL
static ERRCODE ntxPack( NTXAREAP pArea );
static HB_ERRCODE ntxPack( NTXAREAP pArea );
#define ntPackRec NULL
#define ntxSort NULL
#define ntxTrans NULL
#define ntxTransRec NULL
static ERRCODE ntxZap( NTXAREAP pArea );
static HB_ERRCODE ntxZap( NTXAREAP pArea );
#define ntxchildEnd NULL
#define ntxchildStart NULL
#define ntxchildSync NULL
@@ -510,19 +510,19 @@ static ERRCODE ntxZap( NTXAREAP pArea );
#define ntxrelEval NULL
#define ntxrelText NULL
#define ntxsetRel NULL
static ERRCODE ntxOrderListAdd( NTXAREAP pArea, LPDBORDERINFO pOrderInfo );
static ERRCODE ntxOrderListClear( NTXAREAP pArea );
static ERRCODE ntxOrderListDelete( NTXAREAP pArea, LPDBORDERINFO pOrderInfo );
static ERRCODE ntxOrderListFocus( NTXAREAP pArea, LPDBORDERINFO pOrderInfo );
static ERRCODE ntxOrderListRebuild( NTXAREAP pArea );
static HB_ERRCODE ntxOrderListAdd( NTXAREAP pArea, LPDBORDERINFO pOrderInfo );
static HB_ERRCODE ntxOrderListClear( NTXAREAP pArea );
static HB_ERRCODE ntxOrderListDelete( NTXAREAP pArea, LPDBORDERINFO pOrderInfo );
static HB_ERRCODE ntxOrderListFocus( NTXAREAP pArea, LPDBORDERINFO pOrderInfo );
static HB_ERRCODE ntxOrderListRebuild( NTXAREAP pArea );
#define ntxOrderCondition NULL
static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo );
static ERRCODE ntxOrderDestroy( NTXAREAP pArea, LPDBORDERINFO pOrderInfo );
static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo );
static HB_ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo );
static HB_ERRCODE ntxOrderDestroy( NTXAREAP pArea, LPDBORDERINFO pOrderInfo );
static HB_ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo );
#define ntxClearFilter NULL
#define ntxClearLocate NULL
#define ntxClearScope NULL
static ERRCODE ntxCountScope( NTXAREAP pArea, void * pPtr, LONG * plRecNo );
static HB_ERRCODE ntxCountScope( NTXAREAP pArea, void * pPtr, LONG * plRecNo );
#define ntxFilterText NULL
#define ntxScopeInfo NULL
#define ntxSetFilter NULL
@@ -543,11 +543,11 @@ static ERRCODE ntxCountScope( NTXAREAP pArea, void * pPtr, LONG * plRecNo );
#define ntxPutValueFile NULL
#define ntxReadDBHeader NULL
#define ntxWriteDBHeader NULL
static ERRCODE ntxInit( LPRDDNODE pRDD );
static HB_ERRCODE ntxInit( LPRDDNODE pRDD );
#define ntxExit NULL
#define ntxDrop NULL
#define ntxExists NULL
static ERRCODE ntxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem );
static HB_ERRCODE ntxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem );
#define ntxWhoCares NULL
HB_EXTERN_END

2
harbour/source/debug/dbgentry.c
View File

@@ -1566,7 +1566,7 @@ static PHB_ITEM hb_dbgVarGet( HB_VARINFO *scope )
if( !pItem )
{
pItem = hb_itemNew( NULL );
if ( hb_rddFieldGet( pItem, hb_dynsymSymbol( pDyn ) ) == SUCCESS )
if ( hb_rddFieldGet( pItem, hb_dynsymSymbol( pDyn ) ) == HB_SUCCESS )
{
scope->cType = 'F';
}

28
harbour/source/vm/hvm.c
View File

@@ -151,8 +151,8 @@ static void hb_vmMacroArrayGen( USHORT uiArgSets ); /* generate array from
static void hb_vmMacroPushIndex( void ); /* push macro array index {...}[ &var ] */
/* Database */
static ERRCODE hb_vmSelectWorkarea( PHB_ITEM, PHB_SYMB ); /* select the workarea using a given item or a substituted value */
static void hb_vmSwapAlias( void ); /* swaps items on the eval stack and pops the workarea number */
static HB_ERRCODE hb_vmSelectWorkarea( PHB_ITEM, PHB_SYMB ); /* select the workarea using a given item or a substituted value */
static void hb_vmSwapAlias( void ); /* swaps items on the eval stack and pops the workarea number */
/* Execution */
static HARBOUR hb_vmDoBlock( void ); /* executes a codeblock */
@@ -2336,7 +2336,7 @@ void hb_vmExecute( const BYTE * pCode, PHB_SYMB pSymbols )
if( pSymbol->pDynSym && hb_dynsymGetMemvar( pSymbol->pDynSym ) )
/* If exist a memory symbol with this name use it */
hb_memvarSetValue( pSymbol, hb_stackItemFromTop(-1) );
else if( hb_rddFieldPut( hb_stackItemFromTop(-1), pSymbol ) == FAILURE )
else if( hb_rddFieldPut( hb_stackItemFromTop(-1), pSymbol ) == HB_FAILURE )
/* Try with a field and after create a memvar */
hb_memvarSetValue( pSymbol, hb_stackItemFromTop(-1) );
#else
@@ -5288,10 +5288,10 @@ static void hb_vmPushVParams( void )
/* Database */
/* ------------------------------- */
static ERRCODE hb_vmSelectWorkarea( PHB_ITEM pAlias, PHB_SYMB pField )
static HB_ERRCODE hb_vmSelectWorkarea( PHB_ITEM pAlias, PHB_SYMB pField )
{
HB_STACK_TLS_PRELOAD
ERRCODE errCode;
HB_ERRCODE errCode;
BOOL fRepeat;
HB_TRACE(HB_TR_DEBUG, ("hb_vmSelectWorkArea(%p,%p)", pAlias, pField));
@@ -5302,7 +5302,7 @@ static ERRCODE hb_vmSelectWorkarea( PHB_ITEM pAlias, PHB_SYMB pField )
do
{
fRepeat = FALSE;
errCode = SUCCESS;
errCode = HB_SUCCESS;
switch( HB_ITEM_TYPE( pAlias ) )
{
@@ -5380,7 +5380,7 @@ static ERRCODE hb_vmSelectWorkarea( PHB_ITEM pAlias, PHB_SYMB pField )
else
{
hb_itemSetNil( pAlias );
errCode = FAILURE;
errCode = HB_FAILURE;
}
}
else
@@ -6518,7 +6518,7 @@ static void hb_vmPushAliasedField( PHB_SYMB pSym )
/*
* NOTE: hb_vmSelecWorkarea clears passed item
*/
if( hb_vmSelectWorkarea( pAlias, pSym ) == SUCCESS )
if( hb_vmSelectWorkarea( pAlias, pSym ) == HB_SUCCESS )
hb_rddGetFieldValue( pAlias, pSym );
hb_rddSelectWorkAreaNumber( iCurrArea );
@@ -6662,12 +6662,12 @@ static void hb_vmPushVariable( PHB_SYMB pVarSymb )
do
{
/* First try if passed symbol is a name of field
* in a current workarea - if it is not a field (FAILURE)
* in a current workarea - if it is not a field (HB_FAILURE)
* then try the memvar variable
*/
if( hb_rddFieldGet( pItem, pVarSymb ) != SUCCESS )
if( hb_rddFieldGet( pItem, pVarSymb ) != HB_SUCCESS )
{
if( hb_memvarGet( pItem, pVarSymb ) != SUCCESS )
if( hb_memvarGet( pItem, pVarSymb ) != HB_SUCCESS )
{
HB_ITEM_PTR pError;
@@ -6805,7 +6805,7 @@ static void hb_vmPopAliasedField( PHB_SYMB pSym )
HB_TRACE(HB_TR_DEBUG, ("hb_vmPopAliasedField(%p)", pSym));
iCurrArea = hb_rddGetCurrentWorkAreaNumber();
if( hb_vmSelectWorkarea( hb_stackItemFromTop( -1 ), pSym ) == SUCCESS )
if( hb_vmSelectWorkarea( hb_stackItemFromTop( -1 ), pSym ) == HB_SUCCESS )
hb_rddPutFieldValue( hb_stackItemFromTop( -2 ), pSym );
hb_rddSelectWorkAreaNumber( iCurrArea );
@@ -7403,7 +7403,7 @@ PHB_SYMBOLS hb_vmRegisterSymbols( PHB_SYMB pModuleSymbols, USHORT uiSymbols,
fInitStatics = TRUE;
}
if( ( hSymScope & ( HB_FS_PCODEFUNC | HB_FS_LOCAL | HB_FS_FRAME ) ) ==
if( ( hSymScope & ( HB_FS_PCODEFUNC | HB_FS_LOCAL | HB_FS_FRAME ) ) ==
( HB_FS_PCODEFUNC | HB_FS_LOCAL ) && ( fRecycled || fClone ) )
{
pSymbol->value.pCodeFunc->pSymbols = pNewSymbols->pModuleSymbols;
@@ -8688,7 +8688,7 @@ BOOL hb_xvmPopVariable( PHB_SYMB pSymbol )
#if 0
if( pSymbol->pDynSym && hb_dynsymGetMemvar( pSymbol->pDynSym ) )
hb_memvarSetValue( pSymbol, hb_stackItemFromTop(-1) );
else if( hb_rddFieldPut( hb_stackItemFromTop(-1), pSymbol ) == FAILURE )
else if( hb_rddFieldPut( hb_stackItemFromTop(-1), pSymbol ) == HB_FAILURE )
#endif
hb_memvarSetValue( pSymbol, hb_stackItemFromTop(-1) );
hb_stackPop();

10
harbour/source/vm/memvars.c
View File

@@ -357,10 +357,10 @@ void hb_memvarSetValue( PHB_SYMB pMemvarSymb, HB_ITEM_PTR pItem )
hb_errInternal( HB_EI_MVBADSYMBOL, NULL, pMemvarSymb->szName, NULL );
}
ERRCODE hb_memvarGet( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
HB_ERRCODE hb_memvarGet( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
{
PHB_DYNS pDyn;
ERRCODE bSuccess = FAILURE;
HB_ERRCODE bSuccess = HB_FAILURE;
HB_TRACE(HB_TR_DEBUG, ("hb_memvarGet(%p, %p)", pItem, pMemvarSymb));
@@ -382,7 +382,7 @@ ERRCODE hb_memvarGet( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
hb_itemCopy( pItem, hb_itemUnRef( pMemvar ) );
else
hb_itemCopy( pItem, pMemvar );
bSuccess = SUCCESS;
bSuccess = HB_SUCCESS;
}
}
else
@@ -395,7 +395,7 @@ void hb_memvarGetValue( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
{
HB_TRACE(HB_TR_DEBUG, ("hb_memvarGetValue(%p, %p)", pItem, pMemvarSymb));
if( hb_memvarGet( pItem, pMemvarSymb ) == FAILURE )
if( hb_memvarGet( pItem, pMemvarSymb ) == HB_FAILURE )
{
/* Generate an error with retry possibility
* (user created error handler can create this variable)
@@ -407,7 +407,7 @@ void hb_memvarGetValue( HB_ITEM_PTR pItem, PHB_SYMB pMemvarSymb )
while( hb_errLaunch( pError ) == E_RETRY )
{
if( hb_memvarGet( pItem, pMemvarSymb ) == SUCCESS )
if( hb_memvarGet( pItem, pMemvarSymb ) == HB_SUCCESS )
break;
}