From d253081be0eec2f3ce4f96fe3d45b1f6c96c48c5 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Thu, 27 Sep 2012 11:50:40 +0000 Subject: [PATCH] 2012-09-27 13:50 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * harbour/contrib/xhb/hbcompat.ch * harbour/contrib/xhb/xhbinet.c ! fixed typo in function name should be INETISSOCKET() instead of ISINETSOCKET() * harbour/contrib/xhb/xhbinkey.prg ! fixed typo in SetInkeyBeforeBlock() function name * harbour/contrib/xhb/xhbfs.c + added new function ISDIR() * harbour/contrib/xhb/xhbfunc.c + added new functions: HB_HASHID(), HB_LIBDO(), HB_BITTEST(), DEFAULT() * harbour/contrib/xhb/xhb.hbx * updated --- harbour/ChangeLog | 19 +++++++++++++++++++ harbour/contrib/xhb/hbcompat.ch | 4 ++-- harbour/contrib/xhb/xhb.hbx | 9 +++++++-- harbour/contrib/xhb/xhbfs.c | 5 +++++ harbour/contrib/xhb/xhbfunc.c | 10 ++++++++++ harbour/contrib/xhb/xhbinet.c | 2 +- harbour/contrib/xhb/xhbinkey.prg | 2 +- 7 files changed, 45 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 46d75e8979..16f65bc2cd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,25 @@ The license applies to all entries newer than 2009-04-28. */ +2012-09-27 13:50 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * harbour/contrib/xhb/hbcompat.ch + * harbour/contrib/xhb/xhbinet.c + ! fixed typo in function name should be INETISSOCKET() + instead of ISINETSOCKET() + + * harbour/contrib/xhb/xhbinkey.prg + ! fixed typo in SetInkeyBeforeBlock() function name + + * harbour/contrib/xhb/xhbfs.c + + added new function ISDIR() + + * harbour/contrib/xhb/xhbfunc.c + + added new functions: + HB_HASHID(), HB_LIBDO(), HB_BITTEST(), DEFAULT() + + * harbour/contrib/xhb/xhb.hbx + * updated + 2012-09-27 12:11 UTC+0200 Viktor Szakats (vszakats syenar.net) - contrib/hbide - contrib/hbqt diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch index 1dc7dc195e..a0b4832614 100644 --- a/harbour/contrib/xhb/hbcompat.ch +++ b/harbour/contrib/xhb/hbcompat.ch @@ -237,7 +237,7 @@ #xtranslate hb_INETDGRAMSEND([]) => INETDGRAMSEND() #xtranslate hb_INETDGRAMRECV([]) => INETDGRAMRECV() #xtranslate hb_INETCRLF([]) => INETCRLF() - #xtranslate hb_INETISSOCKET([]) => ISINETSOCKET() + #xtranslate hb_INETISSOCKET([]) => INETISSOCKET() #xtranslate hb_INETCLOSE([]) => INETDESTROY() /* Some statement endings */ @@ -554,7 +554,7 @@ #xtranslate INETDGRAMSEND([]) => hb_INETDGRAMSEND() #xtranslate INETDGRAMRECV([]) => hb_INETDGRAMRECV() #xtranslate INETCRLF([]) => hb_INETCRLF() - #xtranslate ISINETSOCKET([]) => hb_INETISSOCKET() + #xtranslate INETISSOCKET([]) => hb_INETISSOCKET() #xtranslate INETDESTROY([]) => iif( HB_INETISSOCKET( ), hb_INETCLOSE( ), ) /* THROW => generate error */ diff --git a/harbour/contrib/xhb/xhb.hbx b/harbour/contrib/xhb/xhb.hbx index a89fa6f1fd..45c8ab5a47 100644 --- a/harbour/contrib/xhb/xhb.hbx +++ b/harbour/contrib/xhb/xhb.hbx @@ -48,6 +48,7 @@ DYNAMIC DBF2TEXT DYNAMIC DBIMPORT DYNAMIC DBMERGE DYNAMIC DBMODIFYSTRUCTURE +DYNAMIC DEFAULT DYNAMIC DESTROYMUTEX DYNAMIC DIRECTORYRECURSE DYNAMIC DISABLEWAITLOCKS @@ -111,6 +112,7 @@ DYNAMIC HB_BACKGROUNDRESET DYNAMIC HB_BACKGROUNDRUN DYNAMIC HB_BACKGROUNDRUNFORCED DYNAMIC HB_BACKGROUNDTIME +DYNAMIC HB_BITTEST DYNAMIC HB_BLDLOGMSG DYNAMIC HB_BUILDINFO DYNAMIC HB_CHECKSUM @@ -142,10 +144,12 @@ DYNAMIC HB_FUNCPTR DYNAMIC HB_F_EOF DYNAMIC HB_GETLEN8 DYNAMIC HB_HASHADDMEMBER +DYNAMIC HB_HASHID DYNAMIC HB_INITSTANDARDLOG DYNAMIC HB_ISREGEXSTRING DYNAMIC HB_ISSERVICE DYNAMIC HB_IS_CSTRUCTURE +DYNAMIC HB_LIBDO DYNAMIC HB_LOGCHANNEL DYNAMIC HB_LOGCONSOLE DYNAMIC HB_LOGDATESTAMP @@ -272,6 +276,7 @@ DYNAMIC INETGETPERIODCALLBACK DYNAMIC INETGETTIMELIMIT DYNAMIC INETGETTIMEOUT DYNAMIC INETINIT +DYNAMIC INETISSOCKET DYNAMIC INETPORT DYNAMIC INETRECV DYNAMIC INETRECVALL @@ -288,9 +293,9 @@ DYNAMIC INITGREEK DYNAMIC ISALNUM DYNAMIC ISASCII DYNAMIC ISCNTRL +DYNAMIC ISDIR DYNAMIC ISDIRECTORY DYNAMIC ISGRAPH -DYNAMIC ISINETSOCKET DYNAMIC ISLOCKED DYNAMIC ISPOINTER DYNAMIC ISPRINT @@ -359,7 +364,7 @@ DYNAMIC SETCORRUPTFUNC DYNAMIC SETDEFAULTPRINTER DYNAMIC SETERRORFOOTER DYNAMIC SETINKEYAFTERBLOCK -DYNAMIC SETINKEYBEFORE +DYNAMIC SETINKEYBEFOREBLOCK DYNAMIC SETNETDELAY DYNAMIC SETNETMSGCOLOR DYNAMIC SETREGISTRY diff --git a/harbour/contrib/xhb/xhbfs.c b/harbour/contrib/xhb/xhbfs.c index d4fb3f75ad..b7c8870ffe 100644 --- a/harbour/contrib/xhb/xhbfs.c +++ b/harbour/contrib/xhb/xhbfs.c @@ -78,4 +78,9 @@ HB_FUNC( ISDIRECTORY ) hb_retl( bRetVal ); } +HB_FUNC( ISDIR ) +{ + HB_FUNC_EXEC( ISDIRECTORY ); +} + HB_FUNC_EXTERN( HB_DISABLEWAITLOCKS ) ; HB_FUNC( DISABLEWAITLOCKS ) { HB_FUNC_EXEC( HB_DISABLEWAITLOCKS ); } diff --git a/harbour/contrib/xhb/xhbfunc.c b/harbour/contrib/xhb/xhbfunc.c index 104957f6d1..6360d62446 100644 --- a/harbour/contrib/xhb/xhbfunc.c +++ b/harbour/contrib/xhb/xhbfunc.c @@ -274,6 +274,13 @@ HB_FUNC( HB_ARRAYID ) /* for debugging: returns the array's "address" so dual r hb_retptr( pArray ? hb_arrayId( pArray ) : NULL ); } +HB_FUNC( HB_HASHID ) /* for debugging: returns the array's "address" so dual references to same array can be seen */ +{ + PHB_ITEM pHash = hb_param( 1, HB_IT_HASH ); + + hb_retptr( pHash ? hb_hashId( pHash ) : NULL ); +} + HB_FUNC( __SENDRAWMSG ) { hb_dbg_objSendMessage( 0, hb_param( 1, HB_IT_ANY ), @@ -342,6 +349,8 @@ HB_FUNC( HB_ISBYREF ) HB_FUNC_EXTERN( HB_METHODNAME ) ; HB_FUNC( METHODNAME ) { HB_FUNC_EXEC( HB_METHODNAME ); } HB_FUNC_EXTERN( HB_LIBLOAD ) ; HB_FUNC( LIBLOAD ) { HB_FUNC_EXEC( HB_LIBLOAD ); } HB_FUNC_EXTERN( HB_LIBFREE ) ; HB_FUNC( LIBFREE ) { HB_FUNC_EXEC( HB_LIBFREE ); } +HB_FUNC_EXTERN( DO ) ; HB_FUNC( HB_LIBDO ) { HB_FUNC_EXEC( DO ); } +HB_FUNC_EXTERN( HB_BITISSET ) ; HB_FUNC( HB_BITTEST ) { HB_FUNC_EXEC( HB_BITTEST ); } HB_FUNC_EXTERN( HB_IDLESLEEP ) ; HB_FUNC( SECONDSSLEEP ) { HB_FUNC_EXEC( HB_IDLESLEEP ); } HB_FUNC_EXTERN( __DYNSN2SYM ) ; HB_FUNC( HB_FUNCPTR ) { HB_FUNC_EXEC( __DYNSN2SYM ); } HB_FUNC_EXTERN( HB_VALTOEXP ) ; HB_FUNC( VALTOPRGEXP ) { HB_FUNC_EXEC( HB_VALTOEXP ); } @@ -351,3 +360,4 @@ HB_FUNC_EXTERN( HB_HEXTOSTR ) ; HB_FUNC( HEXTOSTR ) { HB_FUNC_EXTERN( HB_STRTOHEX ) ; HB_FUNC( STRTOHEX ) { HB_FUNC_EXEC( HB_STRTOHEX ); } HB_FUNC_EXTERN( HB_ISPOINTER ) ; HB_FUNC( ISPOINTER ) { HB_FUNC_EXEC( HB_ISPOINTER ); } HB_FUNC_EXTERN( HB_CDPSELECT ) ; HB_FUNC( HB_SETCODEPAGE ) { HB_FUNC_EXEC( HB_CDPSELECT ); } +HB_FUNC_EXTERN( __DEFAULTNIL ) ; HB_FUNC( DEFAULT ) { HB_FUNC_EXEC( __DEFAULTNIL ); } diff --git a/harbour/contrib/xhb/xhbinet.c b/harbour/contrib/xhb/xhbinet.c index 3427414ba3..d6bc2c77b3 100644 --- a/harbour/contrib/xhb/xhbinet.c +++ b/harbour/contrib/xhb/xhbinet.c @@ -92,4 +92,4 @@ HB_FUNC_EXTERN( HB_INETDGRAM ) ; HB_FUNC( INETDGRAM HB_FUNC_EXTERN( HB_INETDGRAMSEND ) ; HB_FUNC( INETDGRAMSEND ) { HB_FUNC_EXEC( HB_INETDGRAMSEND ); } HB_FUNC_EXTERN( HB_INETDGRAMRECV ) ; HB_FUNC( INETDGRAMRECV ) { HB_FUNC_EXEC( HB_INETDGRAMRECV ); } HB_FUNC_EXTERN( HB_INETCRLF ) ; HB_FUNC( INETCRLF ) { HB_FUNC_EXEC( HB_INETCRLF ); } -HB_FUNC_EXTERN( HB_INETISSOCKET ) ; HB_FUNC( ISINETSOCKET ) { HB_FUNC_EXEC( HB_INETISSOCKET ); } +HB_FUNC_EXTERN( HB_INETISSOCKET ) ; HB_FUNC( INETISSOCKET ) { HB_FUNC_EXEC( HB_INETISSOCKET ); } diff --git a/harbour/contrib/xhb/xhbinkey.prg b/harbour/contrib/xhb/xhbinkey.prg index ca42f841fe..a9e6716022 100644 --- a/harbour/contrib/xhb/xhbinkey.prg +++ b/harbour/contrib/xhb/xhbinkey.prg @@ -52,7 +52,7 @@ #include "hbgtinfo.ch" -FUNCTION SetInkeyBefore( ... ) +FUNCTION SetInkeyBeforeBlock( ... ) RETURN hb_gtInfo( HB_GTI_INKEYREAD, ... ) FUNCTION SetInkeyAfterBlock( ... )