From 9699213e29c83c027180b8505ec368b758af1ca8 Mon Sep 17 00:00:00 2001 From: "Alexander S.Kresin" Date: Sat, 11 Mar 2000 20:34:59 +0000 Subject: [PATCH] Updating RDD files --- harbour/ChangeLog | 9 +++++++++ harbour/contrib/rdd_ads/ads1.c | 10 ++++++++++ harbour/include/hbapirdd.h | 13 ++----------- harbour/source/rdd/dbcmd.c | 5 +++++ harbour/source/rdd/dbf1.c | 10 ++++++++++ harbour/source/rdd/dbfcdx/dbfcdx1.c | 10 ++++++++++ 6 files changed, 46 insertions(+), 11 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 907a91055b..86c8a0554d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,12 @@ +20000311-23:00 GMT+3 Alexander Kresin + * contrib/rdd_ads/ads1.c + * include/hbapirdd.h + * source/rdd/dbcmd.c + * source/rdd/dbf1.c + * source/rdd/dbfcdx/dbfcdx1.c + * uncommented scope functions in header file and added declarations to + virtual method tables in *.c files + 20000311-18:52 GMT+1 Victor Szakats - include/hbinkey.h - include/hbapimou.h diff --git a/harbour/contrib/rdd_ads/ads1.c b/harbour/contrib/rdd_ads/ads1.c index cabc3e9b13..bd64017bfa 100644 --- a/harbour/contrib/rdd_ads/ads1.c +++ b/harbour/contrib/rdd_ads/ads1.c @@ -1023,9 +1023,14 @@ static ERRCODE adsOrderInfo( ADSAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOrde #define adsClearFilter NULL #define adsClearLocate NULL +#define adsClearScope NULL +#define adsCountScope NULL #define adsFilterText NULL +#define adsScopeInfo NULL #define adsSetFilter NULL #define adsSetLocate NULL +#define adsSetScope NULL +#define adsSkipScope NULL #define adsCompile NULL #define adsError NULL #define adsEvalBlock NULL @@ -1230,9 +1235,14 @@ static RDDFUNCS adsTable = { adsBof, ( DBENTRYP_OII ) adsOrderInfo, adsClearFilter, adsClearLocate, + adsClearScope, + adsCountScope, adsFilterText, + adsScopeInfo, adsSetFilter, adsSetLocate, + adsSetScope, + adsSkipScope, adsCompile, adsError, adsEvalBlock, diff --git a/harbour/include/hbapirdd.h b/harbour/include/hbapirdd.h index 8e58975668..8c3f19b638 100644 --- a/harbour/include/hbapirdd.h +++ b/harbour/include/hbapirdd.h @@ -612,12 +612,9 @@ typedef USHORT ( * DBENTRYP_SVL )( AREAP area, USHORT index, ULONG * param ); 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_BIB )( AREAP area, BOOL p1, PHB_ITEM p2, BOOL p3 ); - -#if 0 typedef USHORT ( * DBENTRYP_VPL )( AREAP area, void * p1, LONG p2); -typedef USHORT ( * DBENTRYP_VPLP )( AREAP area, void * p1, LONGP p2); -typedef USHORT ( * DBENTRYP_LSP )( AREAP area, LONG p1, USHORTP p2); -#endif +typedef USHORT ( * DBENTRYP_VPLP )( AREAP area, void * p1, LONG * p2); +typedef USHORT ( * DBENTRYP_LSP )( AREAP area, LONG p1, USHORT * p2); /*--------------------* Virtual Method Table *----------------------*/ @@ -723,20 +720,14 @@ typedef struct _RDDFUNCS DBENTRYP_V clearFilter; DBENTRYP_V clearLocate; -#if 0 DBENTRYP_V clearScope; DBENTRYP_VPLP countScope; -#endif DBENTRYP_I filterText; -#if 0 DBENTRYP_SI scopeInfo; -#endif DBENTRYP_VFI setFilter; DBENTRYP_VLO setLocate; -#if 0 DBENTRYP_VP setScope; DBENTRYP_VPL skipScope; -#endif /* Miscellaneous */ diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c index 08f633db76..b264a3a528 100644 --- a/harbour/source/rdd/dbcmd.c +++ b/harbour/source/rdd/dbcmd.c @@ -844,9 +844,14 @@ static RDDFUNCS defTable = { defBof, ( DBENTRYP_OII ) defUnSupported, defClearFilter, defClearLocate, + ( DBENTRYP_V ) defUnSupported, + ( DBENTRYP_VPLP ) defUnSupported, defFilterText, + ( DBENTRYP_SI ) defUnSupported, defSetFilter, defSetLocate, + ( DBENTRYP_VP ) defUnSupported, + ( DBENTRYP_VPL ) defUnSupported, defCompile, defError, defEvalBlock, diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index 0f28988c98..c187ad2c4f 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -664,9 +664,14 @@ static RDDFUNCS dbfSuper = { 0 }; #define dbfOrderInfo NULL #define dbfClearFilter NULL #define dbfClearLocate NULL +#define dbfClearScope NULL +#define dbfCountScope NULL #define dbfFilterText NULL +#define dbfScopeInfo NULL #define dbfSetFilter NULL #define dbfSetLocate NULL +#define dbfSetScope NULL +#define dbfSkipScope NULL #define dbfCompile NULL #define dbfError NULL #define dbfEvalBlock NULL @@ -2062,9 +2067,14 @@ static RDDFUNCS dbfTable = { dbfBof, dbfOrderInfo, dbfClearFilter, dbfClearLocate, + dbfClearScope, + dbfCountScope, dbfFilterText, + dbfScopeInfo, dbfSetFilter, dbfSetLocate, + dbfSetScope, + dbfSkipScope, dbfCompile, dbfError, dbfEvalBlock, diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c index 70b19b1a12..d9705ae34b 100644 --- a/harbour/source/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c @@ -310,9 +310,14 @@ static BOOL hb_cdxWriteMemo( AREAP pArea, LPDBFMEMO pMemo, ULONG * lNewRecNo ) #define cdxOrderCondition NULL #define cdxClearFilter NULL #define cdxClearLocate NULL +#define cdxClearScope NULL +#define cdxCountScope NULL #define cdxFilterText NULL +#define cdxScopeInfo NULL #define cdxSetFilter NULL #define cdxSetLocate NULL +#define cdxSetScope NULL +#define cdxSkipScope NULL #define cdxCompile NULL #define cdxError NULL #define cdxEvalBlock NULL @@ -895,9 +900,14 @@ static RDDFUNCS cdxTable = { cdxBof, cdxOrderInfo, cdxClearFilter, cdxClearLocate, + cdxClearScope, + cdxCountScope, cdxFilterText, + cdxScopeInfo, cdxSetFilter, cdxSetLocate, + cdxSetScope, + cdxSkipScope, cdxCompile, cdxError, cdxEvalBlock,