From 3dac1591e343ac8f7d3833de81771e61a819d6be Mon Sep 17 00:00:00 2001 From: "Alexander S.Kresin" Date: Tue, 2 Apr 2002 14:55:54 +0000 Subject: [PATCH] 2002-04-02 18:57 UTC+0300 Alexander Kresin --- harbour/ChangeLog | 7 +++++++ harbour/contrib/rdd_ads/ads1.c | 14 +++++++------- harbour/contrib/rdd_ads/adsfunc.c | 18 +++++++++++------- harbour/contrib/rdd_ads/adsmgmnt.c | 4 ++-- harbour/contrib/rdd_ads/testmg.prg | 4 ++-- 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4aa02a9b29..898d80d9a5 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,13 @@ For example: 2002-12-01 23:12 UTC+0100 Foo Bar */ + * contrib/rdd_ads/ace.h + * New ace.h from Extended Systems, Inc. + +2002-04-02 21:12 UTC+0200 JF Lefebvre (Mafact) + * include/hbclass.ch + + Refined Class(y) compatibility as needed by Horacio. + * source/rdd/dbfntx/dbfntx1.c * Added two type cast needed by VC++ 2002-04-02 21:46 UTC+0300 Alexander Kresin diff --git a/harbour/contrib/rdd_ads/ads1.c b/harbour/contrib/rdd_ads/ads1.c index 6cdfdcf6a1..1bfc8e5395 100644 --- a/harbour/contrib/rdd_ads/ads1.c +++ b/harbour/contrib/rdd_ads/ads1.c @@ -732,7 +732,7 @@ static ERRCODE adsFieldName( ADSAREAP pArea, USHORT uiIndex, void * szName ) if( uiIndex > pArea->uiFieldCount ) return FAILURE; - AdsGetFieldName( pArea->hTable, uiIndex, (UCHAR*)szName, &pusBufLen ); + AdsGetFieldName( pArea->hTable, uiIndex, (UNSIGNED8*)szName, &pusBufLen ); return SUCCESS; } @@ -809,7 +809,7 @@ static ERRCODE adsGetValue( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) UNSIGNED8 pucFormat[ 11 ]; UNSIGNED16 pusLen = 10; AdsGetDateFormat ( pucFormat, &pusLen ); - AdsSetDateFormat ( (UCHAR*)"YYYYMMDD" ); + AdsSetDateFormat ( (UNSIGNED8*)"YYYYMMDD" ); pulLength = pArea->maxFieldLen; if (AdsGetField( pArea->hTable, szName, pBuffer, &pulLength, ADS_NONE ) == AE_NO_CURRENT_RECORD ) { @@ -918,7 +918,7 @@ static ERRCODE adsPutValue( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) uiCount = ( USHORT ) hb_itemGetCLen( pItem ); if( uiCount > pField->uiLen ) uiCount = pField->uiLen; - AdsSetString( pArea->hTable, szName, (UCHAR*)hb_itemGetCPtr( pItem ), uiCount ); + AdsSetString( pArea->hTable, szName, (UNSIGNED8*)hb_itemGetCPtr( pItem ), uiCount ); bError = FALSE; } break; @@ -947,7 +947,7 @@ static ERRCODE adsPutValue( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) if( HB_IS_DATE( pItem ) ) { AdsGetDateFormat ( pucFormat, &pusLen ); - AdsSetDateFormat ( (UCHAR*)"YYYYMMDD" ); + AdsSetDateFormat ( (UNSIGNED8*)"YYYYMMDD" ); szEndChar = * ( szText + pField->uiLen ); hb_dateDecode( hb_itemGetDL( pItem ), &lYear, &lMonth, &lDay ); hb_dateStrPut( ( char * ) szText, lYear, lMonth, lDay ); @@ -972,7 +972,7 @@ static ERRCODE adsPutValue( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { uiCount = ( USHORT ) hb_itemGetCLen( pItem ); AdsSetString( pArea->hTable, szName, - (UCHAR*)hb_itemGetCPtr( pItem ), uiCount ); + (UNSIGNED8*)hb_itemGetCPtr( pItem ), uiCount ); bError = FALSE; } break; @@ -1612,8 +1612,8 @@ static ERRCODE adsOrderCreate( ADSAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) ulOptions |= ADS_UNIQUE; ulRetVal = AdsCreateIndex( hTableOrIndex, pOrderInfo->abBagName, - pOrderInfo->atomBagName, (UCHAR*)hb_itemGetCPtr( pExprItem ), - ( pArea->lpdbOrdCondInfo && pArea->lpdbOrdCondInfo->abFor ) ? (UCHAR*)pArea->lpdbOrdCondInfo->abFor : (UCHAR*)"", + pOrderInfo->atomBagName, (UNSIGNED8*)hb_itemGetCPtr( pExprItem ), + ( pArea->lpdbOrdCondInfo && pArea->lpdbOrdCondInfo->abFor ) ? (UNSIGNED8*)pArea->lpdbOrdCondInfo->abFor : (UNSIGNED8*)"", pucWhile, ulOptions, &phIndex); if ( ulRetVal != AE_SUCCESS ) diff --git a/harbour/contrib/rdd_ads/adsfunc.c b/harbour/contrib/rdd_ads/adsfunc.c index 5295000bd4..ba44f988c4 100644 --- a/harbour/contrib/rdd_ads/adsfunc.c +++ b/harbour/contrib/rdd_ads/adsfunc.c @@ -110,7 +110,7 @@ HB_FUNC( ADSSETDATEFORMAT ) if( ISCHAR( 1 )) { - AdsSetDateFormat ( (UCHAR*) hb_parc(1) ); + AdsSetDateFormat ( (UNSIGNED8*) hb_parc(1) ); } } @@ -272,7 +272,7 @@ HB_FUNC( ADSBLOB2FILE ) } pArea = (ADSAREAP) hb_rddGetCurrentWorkAreaPointer(); - ulRetVal = AdsBinaryToFile( pArea->hTable, (UCHAR*)szFieldName, (UCHAR*)szFileName); + ulRetVal = AdsBinaryToFile( pArea->hTable, (UNSIGNED8*)szFieldName, (UNSIGNED8*)szFileName); if ( ulRetVal == AE_SUCCESS ) hb_retl( 1 ); else @@ -300,7 +300,7 @@ HB_FUNC( ADSFILE2BLOB ) usBinaryType = ADS_BINARY; pArea = (ADSAREAP) hb_rddGetCurrentWorkAreaPointer(); - ulRetVal = AdsFileToBinary( pArea->hTable, (UCHAR*)szFieldName, usBinaryType, (UCHAR*)szFileName); + ulRetVal = AdsFileToBinary( pArea->hTable, (UNSIGNED8*)szFieldName, usBinaryType, (UNSIGNED8*)szFileName); if ( ulRetVal == AE_SUCCESS ) hb_retl( 1 ); else @@ -327,7 +327,7 @@ HB_FUNC( ADSKEYNO ) } else { - ordName = (UCHAR*)hb_parc( 1 ); + ordName = (UNSIGNED8*)hb_parc( 1 ); AdsGetIndexHandle( pArea->hTable, ordName, &hIndex ); } AdsGetKeyNum ( hIndex, ADS_IGNOREFILTERS, &pulKey); @@ -370,7 +370,7 @@ HB_FUNC( ADSKEYCOUNT ) } else if(ISCHAR( 1 )) { - ordName = (UCHAR*)hb_parc( 1 ); + ordName = (UNSIGNED8*)hb_parc( 1 ); AdsGetIndexHandle( pArea->hTable, ordName, &hIndex ); } else if(! ISNIL( 1 )) @@ -444,7 +444,7 @@ HB_FUNC( ADSADDCUSTOMKEY ) } else { - ordName = (UCHAR*)hb_parc( 1 ); + ordName = (UNSIGNED8*)hb_parc( 1 ); AdsGetIndexHandle( pArea->hTable, ordName, &hIndex ); } hb_retnl( (LONG) AdsAddCustomKey( hIndex ) ); @@ -483,7 +483,7 @@ HB_FUNC( ADSDELETECUSTOMKEY ) } else { - ordName = (UCHAR*)hb_parc( 1 ); + ordName = (UNSIGNED8*)hb_parc( 1 ); AdsGetIndexHandle( pArea->hTable, ordName, &hIndex ); } hb_retnl( (LONG) AdsDeleteCustomKey( hIndex ) ); @@ -1094,6 +1094,8 @@ HB_FUNC( ADSCONVERTTABLE ) } +#if !defined( ADS_LINUX ) + UNSIGNED32 WINAPI ShowPercentage( UNSIGNED16 usPercentDone ) { UNSIGNED32 bRet = 0; @@ -1160,6 +1162,8 @@ HB_FUNC( ADSCLRCALLBACK ) } } +#endif + HB_FUNC( ADSISINDEXED ) { ADSAREAP pArea; diff --git a/harbour/contrib/rdd_ads/adsmgmnt.c b/harbour/contrib/rdd_ads/adsmgmnt.c index 494286ca79..83bc68b5f3 100644 --- a/harbour/contrib/rdd_ads/adsmgmnt.c +++ b/harbour/contrib/rdd_ads/adsmgmnt.c @@ -306,7 +306,7 @@ HB_FUNC( ADSMGGETCONFIGINFO ) { if ( iOption == 0 ) { - hb_reta( 26 ); + hb_reta( 25 ); hb_stornl( stConfigValues.ulNumConnections , -1, 1 ); /* number connections */ hb_stornl( stConfigValues.ulNumWorkAreas , -1, 2 ); /* number work areas */ hb_stornl( stConfigValues.ulNumTables , -1, 3 ); /* number tables */ @@ -332,7 +332,7 @@ HB_FUNC( ADSMGGETCONFIGINFO ) hb_storni( stConfigValues.ucReserved4 , -1, 23); /* reserved */ hb_stornl( stConfigValues.usSendIPPort , -1, 24); /* NT Service IP send port # */ hb_stornl( stConfigValues.usReceiveIPPort , -1, 25); /* NT Service IP rcv port # */ - hb_stornl( stConfigValues.usReserved5 , -1, 26); /* reserved */ + /* hb_stornl( stConfigValues.usReserved5 , -1, 26); reserved */ }else if ( iOption == 1 ) diff --git a/harbour/contrib/rdd_ads/testmg.prg b/harbour/contrib/rdd_ads/testmg.prg index 7b8f4c45cf..a0202fc6b8 100644 --- a/harbour/contrib/rdd_ads/testmg.prg +++ b/harbour/contrib/rdd_ads/testmg.prg @@ -169,7 +169,7 @@ function Main() ? aRay := AdsMgGetConfigInfo(0) - IF len(aRay) > 25 + IF len(aRay) > 24 ? aRay[1] , " number connections " ? aRay[2] , " number work areas " ? aRay[3] , " number tables " @@ -195,7 +195,7 @@ function Main() ? aRay[23], " reserved " ? aRay[24], " NT Service IP send port # " ? aRay[25], " NT Service IP rcv port # " - ? aRay[26], " reserved " + // ? aRay[26], " reserved " ENDIF wait