diff --git a/ChangeLog.txt b/ChangeLog.txt index a69cd9eb94..5a53959a84 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,128 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-04-05 16:24 UTC+0200 Viktor Szakats (harbour syenar.net) + * bin/check.hb + * tests/fixcase.hb + + some exceptions for casing + * deleted one file exception (a readme) + + * contrib/gtwvg/gtwvgd.c + * contrib/gtwvg/wvgcore.c + * contrib/gtwvg/wvgcuig.c + * contrib/gtwvg/wvgwin.c + * contrib/gtwvg/wvgwing.c + * contrib/hbamf/amfenc.c + * contrib/hbbz2/core.c + * contrib/hbct/ctcom1.c + * contrib/hbct/ctcom2.c + * contrib/hbct/ctnet.c + * contrib/hbct/ctstr.c + * contrib/hbct/ctwfunc.c + * contrib/hbct/ctwin.c + * contrib/hbct/disk.c + * contrib/hbct/finan.c + * contrib/hbct/screen2.c + * contrib/hbct/token1.c + * contrib/hbct/token2.c + * contrib/hbct/trig.c + * contrib/hbgd/gdwrp.c + * contrib/hbhpdf/image.c + * contrib/hbmisc/irm.c + * contrib/hbnetio/netiocli.c + * contrib/hbnetio/netiosrv.c + * contrib/hbnetio/readme.txt + * contrib/hbnf/dispc.c + * contrib/hbnf/ftattr.c + * contrib/hbnf/origin.c + * contrib/hbssl/ssl.c + * contrib/hbwin/wapi_commctrl.c + * contrib/hbwin/wapi_winuser.c + * contrib/hbwin/win_dlg.c + * contrib/hbwin/win_prn2.c + * contrib/hbwin/win_shell.c + * contrib/rddads/ads1.c + * contrib/rddads/adsfunc.c + * contrib/xhb/fparse.c + * contrib/xhb/hbcrypt.c + * contrib/xhb/hbserv.c + * contrib/xhb/hbxml.c + * contrib/xhb/txtline.c + * contrib/xhb/xhbarr.c + * contrib/xhb/xhbarrex.c + * extras/gfspell/spellc.c + * extras/gtwvw/gtwvwd.c + * extras/gtwvw/hbgtwvw.h + * extras/gtwvw/wvwcheck.c + * extras/gtwvw/wvwdraw.c + * extras/gtwvw/wvwedit.c + * extras/gtwvw/wvwfuncs.c + * extras/gtwvw/wvwmenu.c + * extras/gtwvw/wvwpush.c + * extras/gtwvw/wvwstbar.c + * extras/gtwvw/wvwtbar.c + * include/hbapi.h + * include/hbapirdd.h + * include/hbdefs.h + * include/hbexpra.c + * include/hbexprb.c + * include/hbpcode.h + * include/hbpp.h + * include/hbrddcdx.h + * include/hbrddnsx.h + * src/codepage/cp_utf8.c + * src/common/expropt1.c + * src/common/expropt2.c + * src/compiler/cmdcheck.c + * src/compiler/genc.c + * src/compiler/gencc.c + * src/compiler/hbfunchk.c + * src/compiler/hbopt.c + * src/pp/pplib.c + * src/rdd/dbcmd.c + * src/rdd/dbf1.c + * src/rdd/dbfcdx/dbfcdx1.c + * src/rdd/hbsix/sxcompr.c + * src/rdd/hbsix/sxord.c + * src/rdd/hsx/hsx.c + * src/rtl/chruni.c + * src/rtl/cputime.c + * src/rtl/dateshb.c + * src/rtl/filehb.c + * src/rtl/filesys.c + * src/rtl/gtsln/gtsln.c + * src/rtl/gtwvt/gtwvt.c + * src/rtl/gtxwc/gtxwc.c + * src/rtl/hbgtcore.c + * src/rtl/hbinet.c + * src/rtl/hblpphb.c + * src/rtl/hbmd5.c + * src/rtl/hbproces.c + * src/rtl/hbsocket.c + * src/rtl/hbsockhb.c + * src/rtl/hbtoken.c + * src/rtl/hbzlib.c + * src/rtl/hbzlibgz.c + * src/rtl/langapi.c + * src/rtl/mlcfunc.c + * src/rtl/philes.c + * src/rtl/soundex.c + * src/rtl/strzero.c + * src/rtl/transfrm.c + * src/vm/arrayshb.c + * src/vm/classes.c + * src/vm/dynsym.c + * src/vm/eval.c + * src/vm/garbage.c + * src/vm/hvm.c + * src/vm/macro.c + * src/vm/memvars.c + * src/vm/runner.c + * src/vm/set.c + * src/vm/thread.c + * run tests/fixcase.hb now that it's able to fixup casing + inside all comments + 2013-04-05 16:16 UTC+0200 Viktor Szakats (harbour syenar.net) * tests/fixcase.hb * debug comment deleted diff --git a/bin/check.hb b/bin/check.hb index fc050c0ec9..6060d30e53 100644 --- a/bin/check.hb +++ b/bin/check.hb @@ -761,7 +761,6 @@ STATIC FUNCTION FixFuncCase( cFileName ) "contrib/3rd/*" , ; "contrib/*/3rd/*" , ; "contrib/xhb/thtm.prg" , ; - "contrib/hbnetio/readme.txt" , ; "contrib/hbnetio/tests/*" , ; "extras/httpsrv/home/*" , ; "tests/hbpptest/*" , ; @@ -804,9 +803,10 @@ STATIC FUNCTION FixFuncCase( cFileName ) IF Len( a[ 2 ] ) != 2 .OR. !( Left( a[ 2 ], 1 ) $ "D" /* "METHOD" */ ) cProper := ProperCase( hAll, hb_StrShrink( a[ 3 ] ) ) + "(" IF !( cProper == a[ 3 ] ) .AND. ; - !( Upper( cProper ) == Upper( "FILE(" ) ) .AND. ; /* interacts with "file(s)" text */ - !( Upper( cProper ) == Upper( "INT(" ) ) .AND. ; /* interacts with SQL statements */ - ( ! lPartial .OR. !( "|" + Lower( cProper ) + "|" $ Lower( "|max(|min(|fopen(|abs(|log10(|getenv(|sqrt(|rand(|" ) ) ) + !( Upper( cProper ) == Upper( "FILE(" ) ) .AND. ; /* interacts with "file(s)" text */ + !( Upper( cProper ) == Upper( "TOKEN(" ) ) .AND. ; /* interacts with "token(s)" text */ + !( Upper( cProper ) == Upper( "INT(" ) ) .AND. ; /* interacts with SQL statements */ + ( ! lPartial .OR. !( "|" + Lower( cProper ) + "|" $ Lower( "|Max(|Min(|FOpen(|Abs(|Log10(|GetEnv(|Sqrt(|Rand(|IsDigit(|IsAlpha(|" ) ) ) cFile := StrTran( cFile, a[ 1 ], StrTran( a[ 1 ], a[ 3 ], cProper ) ) ? cFileName, a[ 3 ], cProper, "|" + a[ 1 ] + "|" nChanged++ diff --git a/contrib/gtwvg/gtwvgd.c b/contrib/gtwvg/gtwvgd.c index 62e6489f73..beab612556 100644 --- a/contrib/gtwvg/gtwvgd.c +++ b/contrib/gtwvg/gtwvgd.c @@ -3966,7 +3966,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) /* ********** Graphics API ********** */ /* * NOTE: - * gfxPrimitive() parameters may have different meanings + * GfxPrimitive() parameters may have different meanings * ie: - Desired color is 'iBottom' for PUTPIXEL and 'iRight' for CIRCLE * - Red is iTop, Green iLeft and Blue is iBottom for MAKECOLOR * diff --git a/contrib/gtwvg/wvgcore.c b/contrib/gtwvg/wvgcore.c index 1ad1225c5b..372763064c 100644 --- a/contrib/gtwvg/wvgcore.c +++ b/contrib/gtwvg/wvgcore.c @@ -1040,7 +1040,7 @@ HB_FUNC( WVT_DRAWIMAGE ) } /* - * WVT_DRAWLABEL( nRow, nCol, cLabel, nAlign, nEscapement, nTextColor, nBkColor,; + * Wvt_DrawLabel( nRow, nCol, cLabel, nAlign, nEscapement, nTextColor, nBkColor,; * cFontFace, nFontHeight, nFontWidth, nFontWeight, nQuality, ; * nCharSet, lItalics, lUnderline, lStrikeOut, aPxlOff ) */ @@ -1840,7 +1840,7 @@ HB_FUNC( WVT_DRAWPICTURE ) } /* - * WVT_DRAWLABELEX( nRow, nCol, cLabel, nAlign, nTextColor, nBkColor, nSlotFont, aPxlOff ) + * Wvt_DrawLabelEx( nRow, nCol, cLabel, nAlign, nTextColor, nBkColor, nSlotFont, aPxlOff ) */ HB_FUNC( WVT_DRAWLABELEX ) { @@ -2106,7 +2106,7 @@ HB_FUNC( WVT_DRAWOUTLINEEX ) } /* 1 2 3 4 5 6 7 8 9 10 11 - * WVT_DRAWLABELOBJ( nTop, nLeft, nBottom, nRight, cLabel, nAlignHorz, nAlignVert, nTextColor, nBkColor, hFont, aPxlOff ) + * Wvt_DrawLabelObj( nTop, nLeft, nBottom, nRight, cLabel, nAlignHorz, nAlignVert, nTextColor, nBkColor, hFont, aPxlOff ) */ HB_FUNC( WVT_DRAWLABELOBJ ) { diff --git a/contrib/gtwvg/wvgcuig.c b/contrib/gtwvg/wvgcuig.c index dee8cd0f11..3a50e87244 100644 --- a/contrib/gtwvg/wvgcuig.c +++ b/contrib/gtwvg/wvgcuig.c @@ -568,7 +568,7 @@ static void hb_wvg_BoxGroupRaised( PHB_GTWVT pWVT, int iLeft, int iTop, int iRig } /* - * WVG_LABEL( nRow, nCol, aPxlOff, cLabel, nAlign, + * Wvg_Label( nRow, nCol, aPxlOff, cLabel, nAlign, * nEscapement, nTextColor, nBkColor, cFontFace, nFontHeight, * nFontWidth, nFontWeight, nQuality, nCharSet, lItalics, * lUnderline, lStrikeOut ) @@ -628,7 +628,7 @@ HB_FUNC( WVG_LABEL ) } /* - WVG_LABELEX( nRow, nCol, aPxlOff, cLabel, nAlign, nTextColor, nBkColor, nSlotFont ) + Wvg_LabelEx( nRow, nCol, aPxlOff, cLabel, nAlign, nTextColor, nBkColor, nSlotFont ) */ HB_FUNC( WVG_LABELEX ) { diff --git a/contrib/gtwvg/wvgwin.c b/contrib/gtwvg/wvgwin.c index 4785556d99..94ad381a50 100644 --- a/contrib/gtwvg/wvgwin.c +++ b/contrib/gtwvg/wvgwin.c @@ -152,7 +152,7 @@ HB_FUNC( WVG_SENDDLGITEMMESSAGE ) } /* - * WIN_SetTimer( hWnd, nIdentifier, nTimeOut ) + * win_SetTimer( hWnd, nIdentifier, nTimeOut ) */ HB_FUNC( WVG_SETTIMER ) { @@ -293,7 +293,7 @@ HB_FUNC( WVG_INVALIDATERECT ) } /* - * Win_LoadIcon( ncIcon ) + * win_LoadIcon( ncIcon ) */ HB_FUNC( WVG_LOADICON ) { @@ -314,7 +314,7 @@ HB_FUNC( WVG_LOADICON ) } /* - * Win_LoadImage( ncImage, nSource, nBmpOrIcon, nWidth, nHeight ) -> hImage + * win_LoadImage( ncImage, nSource, nBmpOrIcon, nWidth, nHeight ) -> hImage * nSource == 0 ResourceIdByNumber * nSource == 1 ResourceIdByName * nSource == 2 ImageFromDiskFile @@ -400,7 +400,7 @@ HB_FUNC( WVG_CREATEBRUSH ) } /* - * Win_DrawText( hDC, cText, aRect, nFormat ) + * win_DrawText( hDC, cText, aRect, nFormat ) */ HB_FUNC( WVG_DRAWTEXT ) { diff --git a/contrib/gtwvg/wvgwing.c b/contrib/gtwvg/wvgwing.c index 426e50f9b1..60ed42b8a0 100644 --- a/contrib/gtwvg/wvgwing.c +++ b/contrib/gtwvg/wvgwing.c @@ -992,7 +992,7 @@ HB_FUNC( WVG_SETCURRENTBRUSH ) /* * IL | DL - * Wvg_AddToolbarButton( hWndTB, nBtn|hBitmap, cCaption, nButtonID, nMode, lIsTooltip ) + * Wvg_AddToolBarButton( hWndTB, nBtn|hBitmap, cCaption, nButtonID, nMode, lIsTooltip ) */ HB_FUNC( WVG_ADDTOOLBARBUTTON ) { @@ -1076,7 +1076,7 @@ HB_FUNC( WVG_REGISTERCLASS_BYNAME ) } /* - * Function with Win_FillRect() exists in hbwin:win_parn1.c with different approach. + * Function with win_FillRect() exists in hbwin:win_parn1.c with different approach. */ HB_FUNC( WVG_FILLRECT ) { @@ -1160,7 +1160,7 @@ HB_FUNC( WVG_RELEASEWINDOWPROCBLOCK ) } /* - WVG_CreateTooltipWindow( hControl ) -> hWndTT + Wvg_CreateToolTipWindow( hControl ) -> hWndTT */ HB_FUNC( WVG_CREATETOOLTIPWINDOW ) { diff --git a/contrib/hbamf/amfenc.c b/contrib/hbamf/amfenc.c index aced18def9..df4ff67808 100644 --- a/contrib/hbamf/amfenc.c +++ b/contrib/hbamf/amfenc.c @@ -17,7 +17,7 @@ #include "hbapicls.h" /* for hb_objSetClass() */ #include "hbstack.h" -#include "hbapirdd.h" /* for AMF3_FROMWA() */ +#include "hbapirdd.h" /* for amf3_FromWA() */ #include "hbapierr.h" /* as above */ #include "amf.h" diff --git a/contrib/hbbz2/core.c b/contrib/hbbz2/core.c index b75aa896f2..8b5d209a9f 100644 --- a/contrib/hbbz2/core.c +++ b/contrib/hbbz2/core.c @@ -214,7 +214,7 @@ static int hb_bz2Uncompress( const char * szSrc, HB_SIZE nSrc, } /* - * HB_BZ2_VERSION() -> + * hb_bz2_Version() -> */ HB_FUNC( HB_BZ2_VERSION ) { @@ -222,7 +222,7 @@ HB_FUNC( HB_BZ2_VERSION ) } /* - * HB_BZ2_COMPRESSBOUND( | ) -> + * hb_bz2_CompressBound( | ) -> */ HB_FUNC( HB_BZ2_COMPRESSBOUND ) { @@ -235,7 +235,7 @@ HB_FUNC( HB_BZ2_COMPRESSBOUND ) } /* - * HB_BZ2_UNCOMPRESSLEN( , [<@nResult>] ) + * hb_bz2_UncompressLen( , [<@nResult>] ) * -> or -1 on error */ HB_FUNC( HB_BZ2_UNCOMPRESSLEN ) @@ -262,7 +262,7 @@ HB_FUNC( HB_BZ2_UNCOMPRESSLEN ) } /* - * HB_BZ2_COMPRESS( , [|<@cBuffer>], [<@nResult>], [] ) + * hb_bz2_Compress( , [|<@cBuffer>], [<@nResult>], [] ) * => or NIL on Error */ HB_FUNC( HB_BZ2_COMPRESS ) @@ -322,7 +322,7 @@ HB_FUNC( HB_BZ2_COMPRESS ) } /* - * HB_BZ2_UNCOMPRESS( , [|<@cBuffer>], [<@nResult>] ) + * hb_bz2_Uncompress( , [|<@cBuffer>], [<@nResult>] ) * => or NIL on Error */ HB_FUNC( HB_BZ2_UNCOMPRESS ) diff --git a/contrib/hbct/ctcom1.c b/contrib/hbct/ctcom1.c index 28a510aef7..245ca93771 100644 --- a/contrib/hbct/ctcom1.c +++ b/contrib/hbct/ctcom1.c @@ -79,63 +79,63 @@ static void hb_ctComTestMSR( int iLine ) hb_retl( fResult ); } -/* COM_COUNT( ) -> +/* com_Count( ) -> */ HB_FUNC( COM_COUNT ) { hb_retni( hb_comInputCount( hb_parni( 1 ) ) ); } -/* COM_SCOUNT( ) -> +/* com_SCount( ) -> */ HB_FUNC( COM_SCOUNT ) { hb_retni( hb_comOutputCount( hb_parni( 1 ) ) ); } -/* COM_FLUSH( ) -> +/* com_Flush( ) -> */ HB_FUNC( COM_FLUSH ) { hb_retl( hb_comFlush( hb_parni( 1 ), HB_COM_IFLUSH ) != -1 ); } -/* COM_SFLUSH( ) -> +/* com_SFlush( ) -> */ HB_FUNC( COM_SFLUSH ) { hb_retl( hb_comFlush( hb_parni( 1 ), HB_COM_OFLUSH ) != -1 ); } -/* COM_CTS( ) -> +/* com_CTS( ) -> */ HB_FUNC( COM_CTS ) { hb_ctComTestMSR( HB_COM_MSR_CTS ); } -/* COM_DCD( ) -> +/* com_DCD( ) -> */ HB_FUNC( COM_DCD ) { hb_ctComTestMSR( HB_COM_MSR_DCD ); } -/* COM_DSR( ) -> +/* com_DSR( ) -> */ HB_FUNC( COM_DSR ) { hb_ctComTestMSR( HB_COM_MSR_DSR ); } -/* COM_RING( ) -> +/* com_Ring( ) -> */ HB_FUNC( COM_RING ) { hb_ctComTestMSR( HB_COM_MSR_RI ); } -/* COM_RTS( , [] ) -> +/* com_RTS( , [] ) -> */ HB_FUNC( COM_RTS ) { @@ -152,7 +152,7 @@ HB_FUNC( COM_RTS ) hb_retl( ( iMCR & HB_COM_MCR_DTR ) != 0 ); } -/* COM_DTR( , [] ) -> +/* com_DTR( , [] ) -> */ HB_FUNC( COM_DTR ) { @@ -169,7 +169,7 @@ HB_FUNC( COM_DTR ) hb_retl( ( iMCR & HB_COM_MCR_DTR ) != 0 ); } -/* COM_MCR( , [] ) -> (MCR_*) +/* com_MCR( , [] ) -> (MCR_*) */ HB_FUNC( COM_MCR ) { @@ -189,7 +189,7 @@ HB_FUNC( COM_MCR ) hb_retni( iMCR ); } -/* COM_MSR( ) -> (MSR_*) +/* com_MSR( ) -> (MSR_*) */ HB_FUNC( COM_MSR ) { @@ -201,7 +201,7 @@ HB_FUNC( COM_MSR ) hb_retni( iMSR ); } -/* COM_LSR( ) -> (LSR_*) +/* com_LSR( ) -> (LSR_*) */ HB_FUNC( COM_LSR ) { @@ -213,14 +213,14 @@ HB_FUNC( COM_LSR ) hb_retni( iLSR ); } -/* COM_BREAK( , =100 ) -> +/* com_Break( , =100 ) -> */ HB_FUNC( COM_BREAK ) { hb_retl( hb_comSendBreak( hb_parni( 1 ), hb_parnidef( 2, 100 ) ) != 0 ); } -/* COM_HARD( , [], [] ) -> +/* com_Hard( , [], [] ) -> */ HB_FUNC( COM_HARD ) { @@ -245,7 +245,7 @@ HB_FUNC( COM_HARD ) hb_retl( fResult ); } -/* COM_SOFT( , [], +/* com_Soft( , [], [], [] ) -> */ HB_FUNC( COM_SOFT ) @@ -272,7 +272,7 @@ HB_FUNC( COM_SOFT ) hb_retl( fResult ); } -/* COM_SOFT_R( , [] ) -> +/* com_Soft_R( , [] ) -> */ HB_FUNC( COM_SOFT_R ) { @@ -290,7 +290,7 @@ HB_FUNC( COM_SOFT_R ) hb_retl( fResult ); } -/* COM_SOFT_S( ) -> +/* com_Soft_S( ) -> */ HB_FUNC( COM_SOFT_S ) { @@ -303,21 +303,21 @@ HB_FUNC( COM_SOFT_S ) hb_retl( fResult ); } -/* COM_ERRCHR( , [] ) -> +/* com_ErrChr( , [] ) -> */ HB_FUNC( COM_ERRCHR ) { hb_retl( hb_comErrorChar( hb_parni( 1 ), hb_ctComCharParam( 2 ) ) != -1 ); } -/* COM_REMOTE( , [] ) -> +/* com_Remote( , [] ) -> */ HB_FUNC( COM_REMOTE ) { hb_retl( hb_comDiscardChar( hb_parni( 1 ), hb_ctComCharParam( 2 ) ) > 0 ); } -/* COM_SMODE( ) -> +/* com_SMode( ) -> */ HB_FUNC( COM_SMODE ) { @@ -338,7 +338,7 @@ HB_FUNC( COM_SMODE ) hb_retni( iResult ); } -/* COM_EVENT( , ) -> +/* com_Event( , ) -> */ HB_FUNC( COM_EVENT ) { @@ -346,7 +346,7 @@ HB_FUNC( COM_EVENT ) hb_retni( 0 ); } -/* COM_KEY( , [], [] ) -> +/* com_Key( , [], [] ) -> */ HB_FUNC( COM_KEY ) { @@ -354,7 +354,7 @@ HB_FUNC( COM_KEY ) hb_retl( HB_FALSE ); } -/* COM_SKEY( [], [], +/* com_SKey( [], [], * [] ) -> */ HB_FUNC( COM_SKEY ) @@ -363,7 +363,7 @@ HB_FUNC( COM_SKEY ) hb_retl( HB_FALSE ); } -/* COM_INIT( , [=300], [=N], +/* com_Init( , [=300], [=N], * [=8], [=1] ) -> */ HB_FUNC( COM_INIT ) @@ -377,7 +377,7 @@ HB_FUNC( COM_INIT ) hb_retl( hb_comInit( iPort, iBaud, iParity, iSize, iStop ) != -1 ); } -/* COM_OPEN( , [=100] [, =0], +/* com_Open( , [=100] [, =0], * [] ) -> */ HB_FUNC( COM_OPEN ) @@ -391,7 +391,7 @@ HB_FUNC( COM_OPEN ) hb_retl( hb_comOpen( iPort ) != -1 ); } -/* COM_CLOSE( ) -> +/* com_Close( ) -> */ HB_FUNC( COM_CLOSE ) { @@ -401,7 +401,7 @@ HB_FUNC( COM_CLOSE ) hb_retl( hb_comClose( iPort ) != -1 ); } -/* COM_READ( , [], [] ) -> +/* com_Read( , [], [] ) -> */ HB_FUNC( COM_READ ) { @@ -442,7 +442,7 @@ HB_FUNC( COM_READ ) hb_retclen_buffer( data, lRecv ); } -/* COM_SEND( , ) -> +/* com_Send( , ) -> */ HB_FUNC( COM_SEND ) { @@ -471,42 +471,42 @@ HB_FUNC( COM_SEND ) hb_retnl( lLen ); } -/* COM_NUM() -> +/* com_Num() -> */ HB_FUNC( COM_NUM ) { hb_retni( hb_comLastNum() ); } -/* COM_GETIO( ) -> | -1 +/* com_GetIO( ) -> | -1 */ HB_FUNC( COM_GETIO ) { /* TODO! */ } -/* COM_SETIO( , ) -> +/* com_SetIO( , ) -> */ HB_FUNC( COM_SETIO ) { /* TODO! */ } -/* COM_GETIRQ( ) -> | -1 +/* com_GetIRQ( ) -> | -1 */ HB_FUNC( COM_GETIRQ ) { /* TODO! */ } -/* COM_SETIRQ( , ) -> +/* com_SetIRQ( , ) -> */ HB_FUNC( COM_SETIRQ ) { /* TODO! */ } -/* COM_DEVNAME( [, ] ) -> +/* com_DevName( [, ] ) -> */ HB_FUNC( COM_DEVNAME ) { diff --git a/contrib/hbct/ctcom2.c b/contrib/hbct/ctcom2.c index 398e7f2886..67fdaf185d 100644 --- a/contrib/hbct/ctcom2.c +++ b/contrib/hbct/ctcom2.c @@ -52,7 +52,7 @@ #include "hbapigt.h" #include "hbchksum.h" -/* COM_DOSCON( , [], [] ) -> +/* com_DosCon( , [], [] ) -> */ HB_FUNC( COM_DOSCON ) { @@ -76,7 +76,7 @@ HB_FUNC( COM_DOSCON ) hb_retc_null(); } -/* COM_CRC( , [], [] ) -> +/* com_CRC( , [], [] ) -> */ HB_FUNC( COM_CRC ) { @@ -113,7 +113,7 @@ static char s_xmoblock_sum( const char * szData, HB_SIZE nLen ) return ( char ) uc; } -/* XMOBLOCK( , , [], [] ) -> +/* XMoBlock( , , [], [] ) -> */ HB_FUNC( XMOBLOCK ) { @@ -154,7 +154,7 @@ HB_FUNC( XMOBLOCK ) hb_retclen_buffer( pszBlock, nSize ); } -/* XMOCHECK( , [] ) -> |-1 +/* XMoCheck( , [] ) -> |-1 */ HB_FUNC( XMOCHECK ) { @@ -185,7 +185,7 @@ HB_FUNC( XMOCHECK ) hb_retni( iResult ); } -/* ZEROINSERT( ) -> +/* ZeroInsert( ) -> */ HB_FUNC( ZEROINSERT ) { @@ -267,7 +267,7 @@ HB_FUNC( ZEROINSERT ) hb_retc_null(); } -/* ZEROREMOVE( ) -> cString +/* ZeroRemove( ) -> cString */ HB_FUNC( ZEROREMOVE ) { diff --git a/contrib/hbct/ctnet.c b/contrib/hbct/ctnet.c index decc7bfafe..ae9487ce24 100644 --- a/contrib/hbct/ctnet.c +++ b/contrib/hbct/ctnet.c @@ -49,32 +49,32 @@ /* * CT3 NET Functions Comments: * - * NETCANCEL( ) -> lReleased + * NetCancel( ) -> lReleased * Return true if was disconnected. * - * NETDISK( cDrive ) -> lSuccess + * NetDisk( cDrive ) -> lSuccess * Return true if is a network drive, otherwise return false if is a local drive. * * NETLOCNAME( cSahredDevice ) -> cLocalDevice * Not implemented yet. * - * NETPRINTER() -> lSuccess + * NetPrinter() -> lSuccess * Return true if a current local printer seted by SET PRINTER TO was connected to a * network printer. * - * NETREDIR( cLocalDevice, cSharedDevice, [ cPassword ], [ lShowError] ) -> lSuccess + * NetRedir( cLocalDevice, cSharedDevice, [ cPassword ], [ lShowError] ) -> lSuccess * Return true if was connected to with , if any. * - * NETRMTNAME( cLocalDevice ) -> cSharedName + * NetRmtname( cLocalDevice ) -> cSharedName * Return the shared resource name connected to a . * The original parameter in CA-Cl*pper Tools was changed to in * xHarbour because in Windows Network I didn't find a number table like in MS-DOS. See * CA-T*ols help for more details. * - * NETWORK() -> lSuccess + * Network() -> lSuccess * Return true if a PC-LAN/MS-NET or Netware type is active. * - * NNETWORK() -> lSuccess + * NNetwork() -> lSuccess * Return true if a Netware type is active. * */ diff --git a/contrib/hbct/ctstr.c b/contrib/hbct/ctstr.c index f71afa58b1..86a567d4d0 100644 --- a/contrib/hbct/ctstr.c +++ b/contrib/hbct/ctstr.c @@ -288,7 +288,7 @@ const char * ct_at_charset_backward( const char * pcString, HB_SIZE sStrLen, } /* - * CSETREF() stuff + * CSetRef() stuff */ void ct_setref( int iNewSwitch ) @@ -326,7 +326,7 @@ HB_FUNC( CSETREF ) } /* - * CSETATMUPA() stuff + * CSetAtMupa() stuff */ void ct_setatmupa( int iNewSwitch ) @@ -364,7 +364,7 @@ HB_FUNC( CSETATMUPA ) } /* - * SETATLIKE() stuff + * SetAtLike() stuff */ void ct_setatlike( int iNewMode ) diff --git a/contrib/hbct/ctwfunc.c b/contrib/hbct/ctwfunc.c index 8364dd2472..9e58344b5b 100644 --- a/contrib/hbct/ctwfunc.c +++ b/contrib/hbct/ctwfunc.c @@ -385,7 +385,7 @@ HB_FUNC( HBCT_MAXCOL ) /* Return the maximum screen/window column number (zero o */ /* - WALIAS( ) -> | -1 + WAlias( ) -> | -1 change current window handle to if is not used by other window or is current window. @@ -406,8 +406,8 @@ HB_FUNC( WALIAS ) } /* - WLIST() -> - _WSTACK() -> + WList() -> + _WStack() -> return string with window handles in each character, the last character is the top window. diff --git a/contrib/hbct/ctwin.c b/contrib/hbct/ctwin.c index 6d5bab3d08..09e9ef20ea 100644 --- a/contrib/hbct/ctwin.c +++ b/contrib/hbct/ctwin.c @@ -1303,7 +1303,7 @@ static void hb_ctw_gt_GetPos( PHB_GT pGT, int * piRow, int * piCol ) /* * CTWIN uses differ rules when set cursor position out of screen visible * area then standard Clipper's GT drivers so we have to replicate it in - * SETPOS() method, [druzus] + * SetPos() method, [druzus] */ static void hb_ctw_gt_SetPos( PHB_GT pGT, int iRow, int iCol ) { @@ -1951,7 +1951,7 @@ static HB_BOOL hb_ctw_gt_PutChar( PHB_GT pGT, int iRow, int iCol, * which switches to window 0 for pass-throw output it causes that * wrong attributes appears after this operation. In Harbour it's * fixed so such problem do not exist. Anyhow some code may switch - * to window 0, make savescreen()/restscreen() and in such case + * to window 0, make SaveScreen()/RestScreen() and in such case * all shadow attributes are copied to window 0 buffer. The code * below is workaround for it. [druzus] */ diff --git a/contrib/hbct/disk.c b/contrib/hbct/disk.c index a3d63d6e62..38af2f5f3d 100644 --- a/contrib/hbct/disk.c +++ b/contrib/hbct/disk.c @@ -181,7 +181,7 @@ HB_FUNC( NUMDISKL ) } /* - * Volume() depends of the CSETSAFETY() setting and, if is true, does not + * Volume() depends of the CSetSafety() setting and, if is true, does not * overwrite an existing label. * * Syntax is: Volume("X:test") or Volume("X:\test"), where "x" is the @@ -237,13 +237,13 @@ HB_FUNC( VOLUME ) /* * VolSerial() function returns the volume serial number of an drive letter like * floppy, Hard-disk, CD or mapped network drive. The return value is a dword - * type. If the drive is not available, volserial() returns -1. + * type. If the drive is not available, VolSerial() returns -1. * * Sintax is: VolSerial("X:\") * Note that the trailing backslash is required. * - * To convert in the hex format, call numtohex() function. - * Example: numtohex( volserial("C:\")). + * To convert in the hex format, call NumToHex() function. + * Example: NumToHex( VolSerial("C:\")). * See volser.prg in xharbour\tests\cttest folder. */ diff --git a/contrib/hbct/finan.c b/contrib/hbct/finan.c index 65345c3a94..bdb9d81882 100644 --- a/contrib/hbct/finan.c +++ b/contrib/hbct/finan.c @@ -283,7 +283,7 @@ HB_FUNC( RATE ) r = j * 0.000833333; /* j * ( 0.01 / 12.0) mensual's rate */ - /* replace PAYMENT() function overhead */ + /* replace Payment() function overhead */ hb_mathResetError( &hb_exc ); dBase = 1.0 + r; diff --git a/contrib/hbct/screen2.c b/contrib/hbct/screen2.c index 9d4ca2c094..f68527c5aa 100644 --- a/contrib/hbct/screen2.c +++ b/contrib/hbct/screen2.c @@ -430,7 +430,7 @@ HB_FUNC( STRSCREEN ) /* TODO: Unicode support */ } /* - * __HBCT_DSPTIME() is helper functions for SHOWTIME() + * __hbct_DspTime() is helper functions for ShowTime() */ HB_FUNC( __HBCT_DSPTIME ) { diff --git a/contrib/hbct/token1.c b/contrib/hbct/token1.c index 99721efbba..d9a2c630e5 100644 --- a/contrib/hbct/token1.c +++ b/contrib/hbct/token1.c @@ -152,7 +152,7 @@ static void do_token1( int iSwitch ) } else { - if( HB_ISNUM( 4 ) ) /* HB_EXTENSION for ATTOKEN()/TOKENLOWER()/TOKENUPPER() */ + if( HB_ISNUM( 4 ) ) /* HB_EXTENSION for AtToken()/TokenLower()/TokenUpper() */ nSkip = hb_parns( 4 ); else nSkip = HB_SIZE_MAX; @@ -160,7 +160,7 @@ static void do_token1( int iSwitch ) if( nSkip == 0 ) nSkip = HB_SIZE_MAX; - /* prepare return value for TOKENUPPER()/TOKENLOWER() */ + /* prepare return value for TokenUpper()/TokenLower() */ if( iSwitch == DO_TOKEN1_TOKENLOWER || iSwitch == DO_TOKEN1_TOKENUPPER ) { if( sStrLen == 0 ) diff --git a/contrib/hbct/token2.c b/contrib/hbct/token2.c index 5dffd2ed95..3935682a94 100644 --- a/contrib/hbct/token2.c +++ b/contrib/hbct/token2.c @@ -83,7 +83,7 @@ static TOKEN_ENVIRONMENT sTokEnvNew( void ) env[ 0 ].sStartPos = 0; /* 0-based index to next free, unused element */ env[ 0 ].sEndPos = TOKEN_ENVIRONMENT_STEP; /* but there are 100 elements ready for use */ - /* use second element to store actual index with tokennext() */ + /* use second element to store actual index with TokenNext() */ env[ 1 ].sStartPos = 0; /* 0-based index value that is to be used NEXT */ return env; diff --git a/contrib/hbct/trig.c b/contrib/hbct/trig.c index 876c17d480..eb55837c84 100644 --- a/contrib/hbct/trig.c +++ b/contrib/hbct/trig.c @@ -300,8 +300,8 @@ HB_FUNC( ATAN ) hb_retndlen( hb_exc.retval, hb_exc.retvalwidth, hb_exc.retvaldec ); else { - /* atan normally don't error, but it's save to return PI()/2 - or -PI()/2, respectively, as these + /* atan normally don't error, but it's save to return Pi()/2 + or -Pi()/2, respectively, as these are the boundary result values */ if( dArg < 0.0 ) hb_retnd( -CT_PI / 2.0 ); @@ -468,14 +468,14 @@ HB_FUNC( TANH ) double dResult, dArg = hb_parnd( 1 ); hb_mathResetError( &hb_exc ); - dResult = tanh( dArg ); + dResult = Tanh( dArg ); if( hb_mathGetError( &hb_exc, "TANH", dArg, 0.0, dResult ) ) { if( hb_exc.handled ) hb_retndlen( hb_exc.retval, hb_exc.retvalwidth, hb_exc.retvaldec ); else { - /* normally, tanh() doesn't give errors, but let's return -1 or +1, + /* normally, Tanh() doesn't give errors, but let's return -1 or +1, respectively, as these are the boundary result values */ if( dArg < 0.0 ) hb_retnd( -1.0 ); diff --git a/contrib/hbgd/gdwrp.c b/contrib/hbgd/gdwrp.c index 0732f770cf..e1964b4061 100644 --- a/contrib/hbgd/gdwrp.c +++ b/contrib/hbgd/gdwrp.c @@ -563,8 +563,8 @@ HB_FUNC( GDIMAGEPNG ) /* original: void gdImagePngEx(gdImagePtr im, FILE *out, i GDImageSaveTo( IMAGE_PNG ); } -HB_FUNC( GDIMAGEWBMP ) /* original: void gdImageWBMP(gdImagePtr im, FILE *out) */ -{ /* implementation: void gdImageWBMP(gdImagePtr im, char *szFile, int fg) */ +HB_FUNC( GDIMAGEWBMP ) /* original: void gdImageWBmp(gdImagePtr im, FILE *out) */ +{ /* implementation: void gdImageWBmp(gdImagePtr im, char *szFile, int fg) */ GDImageSaveTo( IMAGE_WBMP ); } diff --git a/contrib/hbhpdf/image.c b/contrib/hbhpdf/image.c index 90ed03ee6c..5b6b8169ca 100644 --- a/contrib/hbhpdf/image.c +++ b/contrib/hbhpdf/image.c @@ -77,7 +77,7 @@ HB_FUNC( HPDF_LOADRAWIMAGEFROMMEM ) hb_retptr( ( void * ) HPDF_LoadRawImageFromMem( hb_HPDF_Doc_par( 1 ), ( HPDF_BYTE * ) hb_parc( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HPDF_ColorSpace ) hb_parni( 5 ), hb_parni( 6 ) ) ); } -/* HPDF_LoadJPEGImageFromFile( hDoc, cHPEGFileName ) -> hImage +/* HPDF_LoadJpegImageFromFile( hDoc, cHPEGFileName ) -> hImage */ HB_FUNC( HPDF_LOADJPEGIMAGEFROMFILE ) { diff --git a/contrib/hbmisc/irm.c b/contrib/hbmisc/irm.c index d1de7f2dc5..057e27a49d 100644 --- a/contrib/hbmisc/irm.c +++ b/contrib/hbmisc/irm.c @@ -275,7 +275,7 @@ PHB_IRMMAP hb_irmExecute( PHB_ITEM pItem ) } -/* IRMEXECUTE( aFilterTree ) --> pMap */ +/* irmExecute( aFilterTree ) --> pMap */ HB_FUNC( IRMEXECUTE ) { PHB_IRMMAP pMap = hb_irmExecute( hb_param( 1, HB_IT_ANY ) ); @@ -290,7 +290,7 @@ HB_FUNC( IRMEXECUTE ) /* * ulRecNo := 0 - * DO WHILE IRMMAPNEXT( pMap, @ulRecNo ) + * DO WHILE irmMapNext( pMap, @ulRecNo ) * dbGoto( nRecNo ) * ... * ENDDO @@ -311,7 +311,7 @@ HB_FUNC( IRMMAPNEXT ) /* * ulRecNo := 0 - * DO WHILE IRMMAPSKIP( pMap, @ulRecNo ) + * DO WHILE irmMapSkip( pMap, @ulRecNo ) * ... * ENDDO */ @@ -332,7 +332,7 @@ HB_FUNC( IRMMAPSKIP ) } -/* IRMMAPCOUNT( pMap ) --> nRecCount */ +/* irmMapCount( pMap ) --> nRecCount */ HB_FUNC( IRMMAPCOUNT ) { PHB_IRMMAP pMap = hb_irmMapParam( 1 ); diff --git a/contrib/hbnetio/netiocli.c b/contrib/hbnetio/netiocli.c index da014aeae4..7705a76587 100644 --- a/contrib/hbnetio/netiocli.c +++ b/contrib/hbnetio/netiocli.c @@ -951,7 +951,7 @@ static void s_netio_init( void * cargo ) } } -/* NETIO_DECODE( [@], [@], [@], [@], ; +/* netio_Decode( [@], [@], [@], [@], ; * [@], [@], [@] ) -> */ HB_FUNC( NETIO_DECODE ) @@ -993,7 +993,7 @@ HB_FUNC( NETIO_DECODE ) hb_retl( pszFile != pszFullName ); } -/* NETIO_CONNECT( [], [], [], ; +/* netio_Connect( [], [], [], ; * [], [], [] ) -> */ HB_FUNC( NETIO_CONNECT ) @@ -1067,7 +1067,7 @@ static PHB_CONCLI s_connParam( int iParam ) return NULL; } -/* NETIO_GETCONNECTION( [], [], [], ; +/* netio_GetConnection( [], [], [], ; * [], [], [] ) * -> | NIL */ @@ -1098,7 +1098,7 @@ HB_FUNC( NETIO_GETCONNECTION ) } } -/* NETIO_DISCONNECT( [], [] ) -> +/* netio_Disconnect( [], [] ) -> */ HB_FUNC( NETIO_DISCONNECT ) { @@ -1234,7 +1234,7 @@ static HB_BOOL s_netio_procexec( int iMsg, int iType ) /* check if function/procedure exists on the server side: * - * NETIO_PROCEXISTS( ) -> + * netio_ProcExists( ) -> */ HB_FUNC( NETIO_PROCEXISTS ) { @@ -1244,7 +1244,7 @@ HB_FUNC( NETIO_PROCEXISTS ) /* execute function/procedure on server the side, * do not wait for confirmation: * - * NETIO_PROCEXEC( [, ] ) -> + * netio_ProcExec( [, ] ) -> */ HB_FUNC( NETIO_PROCEXEC ) { @@ -1254,7 +1254,7 @@ HB_FUNC( NETIO_PROCEXEC ) /* execute function/procedure on the server side and wait for * confirmation: * - * NETIO_PROCEXECW( [, ] ) -> + * netio_ProcExecW( [, ] ) -> */ HB_FUNC( NETIO_PROCEXECW ) { @@ -1263,7 +1263,7 @@ HB_FUNC( NETIO_PROCEXECW ) /* execute function on the server side and wait for its return value: * - * NETIO_FUNCEXEC( [, ] ) -> + * netio_FuncExec( [, ] ) -> */ HB_FUNC( NETIO_FUNCEXEC ) { @@ -1273,7 +1273,7 @@ HB_FUNC( NETIO_FUNCEXEC ) /* open communication stream/channel which allow to send data * asynchronously from server to client: * - * NETIO_OPENDATASTREAM( [, ] ) -> + * netio_OpenDataStream( [, ] ) -> * * it executes on the server side: * ( , [, ] ) @@ -1291,7 +1291,7 @@ HB_FUNC( NETIO_OPENDATASTREAM ) /* open communication stream/channel which allow to send data * asynchronously from server to client: * - * NETIO_OPENITEMSTREAM( [, ] ) -> + * netio_OpenItemStream( [, ] ) -> * * it executes on the server side: * ( , [, ] ) @@ -1330,7 +1330,7 @@ static PHB_CONCLI s_netio_getConn( void ) /* close communication stream/channel: * - * NETIO_CLOSESTREAM( , [] | [[], []] ) + * netio_CloseStream( , [] | [[], []] ) * -> */ HB_FUNC( NETIO_CLOSESTREAM ) @@ -1366,7 +1366,7 @@ HB_FUNC( NETIO_CLOSESTREAM ) /* retrieve data sent from the server by cominication stream * - * NETIO_GETDATA( , [] | [[], []] ) + * netio_GetData( , [] | [[], []] ) * -> | | NIL */ HB_FUNC( NETIO_GETDATA ) diff --git a/contrib/hbnetio/netiosrv.c b/contrib/hbnetio/netiosrv.c index ed0ce972a9..5bf441689d 100644 --- a/contrib/hbnetio/netiosrv.c +++ b/contrib/hbnetio/netiosrv.c @@ -494,7 +494,7 @@ static void s_listenRet( HB_SOCKET sd, const char * szRootPath, HB_BOOL rpc ) } -/* NETIO_RPC( | [, ] ) -> +/* netio_RPC( | [, ] ) -> */ HB_FUNC( NETIO_RPC ) { @@ -520,7 +520,7 @@ HB_FUNC( NETIO_RPC ) hb_retl( fRPC ); } -/* NETIO_RPCFILTER( , +/* netio_RPCFilter( , * | | NIL ) -> NIL */ HB_FUNC( NETIO_RPCFILTER ) @@ -547,7 +547,7 @@ HB_FUNC( NETIO_RPCFILTER ) } } -/* NETIO_SERVERSTOP( | [, ] ) -> NIL +/* netio_ServerStop( | [, ] ) -> NIL */ HB_FUNC( NETIO_SERVERSTOP ) { @@ -564,7 +564,7 @@ HB_FUNC( NETIO_SERVERSTOP ) } } -/* NETIO_SERVERTIMEOUT( [, ] ) -> [] +/* netio_ServerTimeOut( [, ] ) -> [] */ HB_FUNC( NETIO_SERVERTIMEOUT ) { @@ -578,7 +578,7 @@ HB_FUNC( NETIO_SERVERTIMEOUT ) } } -/* NETIO_LISTEN( [], [], [], [] ) +/* netio_Listen( [], [], [], [] ) * -> | NIL */ HB_FUNC( NETIO_LISTEN ) @@ -617,7 +617,7 @@ HB_FUNC( NETIO_LISTEN ) s_listenRet( sd, szRootPath, fRPC ); } -/* NETIO_ACCEPT( , [], +/* netio_Accept( , [], * [], [], [] ) * -> | NIL */ @@ -673,7 +673,7 @@ HB_FUNC( NETIO_ACCEPT ) s_consrvRet( conn ); } -/* NETIO_COMPRESS( , +/* netio_Compress( , * [], [], [] ) -> NIL */ HB_FUNC( NETIO_COMPRESS ) @@ -745,7 +745,7 @@ static HB_BOOL s_netio_login_accept( PHB_CONSRV conn ) return conn->login; } -/* NETIO_VERIFYCLIENT( ) -> +/* netio_VerifyClient( ) -> */ HB_FUNC( NETIO_VERIFYCLIENT ) { @@ -755,7 +755,7 @@ HB_FUNC( NETIO_VERIFYCLIENT ) hb_retl( s_netio_login_accept( conn ) ); } -/* NETIO_SERVER( ) -> NIL +/* netio_Server( ) -> NIL */ HB_FUNC( NETIO_SERVER ) { @@ -1318,7 +1318,7 @@ HB_FUNC( NETIO_SERVER ) } } -/* NETIO_SRVSENDITEM( , , ) -> +/* netio_SrvSendItem( , , ) -> */ HB_FUNC( NETIO_SRVSENDITEM ) { @@ -1363,7 +1363,7 @@ HB_FUNC( NETIO_SRVSENDITEM ) hb_retl( fResult ); } -/* NETIO_SRVSENDDATA( , , ) -> +/* netio_SrvSendData( , , ) -> */ HB_FUNC( NETIO_SRVSENDDATA ) { @@ -1403,7 +1403,7 @@ HB_FUNC( NETIO_SRVSENDDATA ) hb_retl( fResult ); } -/* NETIO_SRVSTATUS( +/* netio_SrvStatus( * [, | , @] ) -> */ HB_FUNC( NETIO_SRVSTATUS ) diff --git a/contrib/hbnetio/readme.txt b/contrib/hbnetio/readme.txt index f19408aca2..28451f46eb 100644 --- a/contrib/hbnetio/readme.txt +++ b/contrib/hbnetio/readme.txt @@ -12,7 +12,7 @@ RDDs with name starting with "net:" are redirected to the hbnetio server. Client side functions: ====================== - NETIO_CONNECT( [], [], [], ; + netio_Connect( [], [], [], ; [], [], [] ) -> Register HBNETIO as alternative RDD IO API redirecting all files @@ -21,25 +21,25 @@ Client side functions: the connection to this server. When executed 1-st time it sets default connection parameters for all threads. Each thread can overwrite these default settings - with its own local ones calling NETIO_CONNECT() function. - Each successful call to NETIO_CONNECT() increase the reference - counter for given connection. NETIO_DISCONNECT() decrease the + with its own local ones calling netio_Connect() function. + Each successful call to netio_Connect() increase the reference + counter for given connection. netio_Disconnect() decrease the reference. Connection is closed when the counter reach 0. It - means that each NETIO_CONNECT() call needs corresponding call - to NETIO_DISCONNECT(). The connections are recognized by IP server + means that each netio_Connect() call needs corresponding call + to netio_Disconnect(). The connections are recognized by IP server address and port number and they are shared between threads. So when - more then one thread call NETIO_CONNECT() then only one connection - is created. It also means that NETIO_DISCONNECT() does not have to - be called by the same thread which called NETIO_CONNECT(). + more then one thread call netio_Connect() then only one connection + is created. It also means that netio_Disconnect() does not have to + be called by the same thread which called netio_Connect(). On application exit all connections are automatically closed. It possible to open many different connections and keep them open. In RDD IO operations and RPC calls it's possible to specify server address as part of file or procedure/function name, i.e. USE net:192.168.0.2:2942:path/to/file - NETIO_PROCEXEC( "192.168.0.2:2942:procname" ) + netio_ProcExec( "192.168.0.2:2942:procname" ) or using UNC paths: USE net://192.168.0.2:2942/path/to/file - NETIO_PROCEXEC( "//192.168.0.2:2942/procname" ) + netio_ProcExec( "//192.168.0.2:2942/procname" ) It's also possible to specify the password. The connection string is in format: [:[:]]: @@ -49,15 +49,15 @@ Client side functions: //[:]/ Backslashes '\' are also supported and can be used instead of '/'. Password is always terminated by ":" and whole connection string - is terminated by CHR(0) so it's not possible to use these two + is terminated by Chr(0) so it's not possible to use these two characters as part of password. Anyhow when passwords are required - then it's recommended to open the connection by NETIO_CONNECT() + then it's recommended to open the connection by netio_Connect() and then specify only server and port if server is not unique enough to chose from existing connections. If server is not given then default connection is chosen. - NETIO_GETCONNECTION( [], [], [], ; + netio_GetConnection( [], [], [], ; [], [], [] ) -> | NIL Get pointer item with HBNTIO connection. It can be used to speedup @@ -65,11 +65,11 @@ Client side functions: parameter to these functions. - NETIO_DISCONNECT( [], [] ) -> - Close the connection created by NETIO_CONNECT() + netio_Disconnect( [], [] ) -> + Close the connection created by netio_Connect() - NETIO_DECODE( [@], [@], [@], [@], ; + netio_Decode( [@], [@], [@], [@], ; [@], [@], [@] ) -> Decode connection parameters from and default settings. @@ -77,30 +77,30 @@ Client side functions: should not contain "net:" prefix. - NETIO_PROCEXISTS( [,] ) -> + netio_ProcExists( [,] ) -> Check if function or procedure exists on the server side. - NETIO_PROCEXEC( [,] [, ] ) -> + netio_ProcExec( [,] [, ] ) -> Execute function or procedure on server the side do not wait for confirmation from the server. - NETIO_PROCEXECW( [,] [, ] ) + netio_ProcExecW( [,] [, ] ) -> Execute function or procedure on the server side and wait for confirmation from the server. - NETIO_FUNCEXEC( [,] [, ] ) + netio_FuncExec( [,] [, ] ) -> Execute function on the server side and wait for function return value sent by the server. - NETIO_OPENDATASTREAM( [,] [, ] ) + netio_OpenDataStream( [,] [, ] ) -> - NETIO_OPENITEMSTREAM( [,] [, ] ) + netio_OpenItemStream( [,] [, ] ) -> open communication stream/channel which allow to send data asynchronously from server to client. @@ -114,44 +114,44 @@ Client side functions: may contain information about connection parameters just like in NETIO_PROC*() functions. - NETIO_CLOSESTREAM( , + netio_CloseStream( , [] | [[], []] ) -> close communication stream/channel - NETIO_GETDATA( , + netio_GetData( , [] | [[], []] ) -> | | NIL retrieve data sent from the server by communication stream. - If stream was open by NETIO_OPENDATASTREAM() then data is returned + If stream was open by netio_OpenDataStream() then data is returned as string. - If stream was open by NETIO_OPENITEMSTREAM() then data is returned + If stream was open by netio_OpenItemStream() then data is returned as array of items received from the server. Server side functions: ====================== - NETIO_LISTEN( [], [], [], [] ) + netio_Listen( [], [], [], [] ) -> | NIL - NETIO_ACCEPT( , [], + netio_Accept( , [], [], [], [] ) -> | NIL - NETIO_COMPRESS( , + netio_Compress( , [], [], [] ) -> NIL - NETIO_VERIFYCLIENT( ) -> - NETIO_SERVER( ) -> NIL - NETIO_RPC( | [, ] ) -> - NETIO_RPCFILTER( , + netio_VerifyClient( ) -> + netio_Server( ) -> NIL + netio_RPC( | [, ] ) -> + netio_RPCFilter( , | | NIL ) -> NIL - NETIO_SERVERSTOP( | [, ] ) -> NIL - NETIO_SERVERTIMEOUT( [, ] ) -> [] - NETIO_MTSERVER( [], [], [], + netio_ServerStop( | [, ] ) -> NIL + netio_ServerTimeOut( [, ] ) -> [] + netio_MTServer( [], [], [], [ | | ], [], [], [], [] ) -> - NETIO_SRVSTATUS( + netio_SrvStatus( [, | , @] ) -> - NETIO_SRVSENDITEM( , , ) -> - NETIO_SRVSENDDATA( , , ) -> + netio_SrvSendItem( , , ) -> + netio_SrvSendData( , , ) -> diff --git a/contrib/hbnf/dispc.c b/contrib/hbnf/dispc.c index 389ce6a3bb..e90193b46b 100644 --- a/contrib/hbnf/dispc.c +++ b/contrib/hbnf/dispc.c @@ -27,7 +27,7 @@ * Steve Tyrakowski and Kevin Maher modified to be CPMI-compliant. * * Rev 1.4 18 Nov 1991 02:20:20 GLENN - * Mike fixed a bug in _ft_dfinit() related to allocating memory. Some + * Mike fixed a bug in _ft_DFInit() related to allocating memory. Some * users had been reporting problems, but everyone who tested this patch * reported success. * diff --git a/contrib/hbnf/ftattr.c b/contrib/hbnf/ftattr.c index a6854a0a68..dd2deb04f1 100644 --- a/contrib/hbnf/ftattr.c +++ b/contrib/hbnf/ftattr.c @@ -80,7 +80,7 @@ HB_FUNC( FT_SAVEATT ) * * Rev 1.2 03 Oct 1992 14:33:46 GLENN * Ted Means made modifications so these functions will work with - * dispBegin() and dispEnd(). + * DispBegin() and DispEnd(). * * Rev 1.1 15 Aug 1991 23:08:02 GLENN * Forest Belt proofread/edited/cleaned up doc diff --git a/contrib/hbnf/origin.c b/contrib/hbnf/origin.c index 78c9d7087f..7ed6f2ac1a 100644 --- a/contrib/hbnf/origin.c +++ b/contrib/hbnf/origin.c @@ -10,7 +10,7 @@ * * Rev 1.1 09 Nov 1992 22:35:52 GLENN * Function was inadvertently named origin() instead of ft_Origin() when - * it went from an .asm to a .c file. Renamed it back to ft_origin(). + * it went from an .asm to a .c file. Renamed it back to ft_Origin(). * * Rev 1.0 03 Oct 1992 02:13:54 GLENN * Initial revision. diff --git a/contrib/hbssl/ssl.c b/contrib/hbssl/ssl.c index 9dab6975fb..96a312f19b 100644 --- a/contrib/hbssl/ssl.c +++ b/contrib/hbssl/ssl.c @@ -68,7 +68,7 @@ #include "hbssl.h" /* NOTE: See: http://www.openssl.org/support/faq.html#PROG2 - Application must call SSL_INIT(), so that this module gets linked. + Application must call SSL_init(), so that this module gets linked. [vszakats] */ #if defined( HB_OS_WIN ) && ! defined( HB_OPENSSL_STATIC ) && OPENSSL_VERSION_NUMBER >= 0x00908000L /* NOTE: It doesn't build in bcc55: diff --git a/contrib/hbwin/wapi_commctrl.c b/contrib/hbwin/wapi_commctrl.c index bf5f387259..d6a6e97f80 100644 --- a/contrib/hbwin/wapi_commctrl.c +++ b/contrib/hbwin/wapi_commctrl.c @@ -478,7 +478,7 @@ HB_FUNC( WAPI_IMAGELIST_WRITEEX ) /*----------------------------------------------------------------------*/ /* Tab Control Macros */ /*----------------------------------------------------------------------*/ -/* Wapi_TabCtrl_InsertItem( hWndTab, nInsertPos, cText, iImageListIndex ) */ +/* wapi_TabCtrl_InsertItem( hWndTab, nInsertPos, cText, iImageListIndex ) */ HB_FUNC( WAPI_TABCTRL_INSERTITEM ) { @@ -556,7 +556,7 @@ HB_FUNC( WAPI_TABCTRL_SETIMAGELIST ) hbwapi_par_raw_HIMAGELIST( 2 ) ) ); } -/* Wapi_TabCtrl_SetItem( hWndTab, nInsertPos, cText, iImageListIndex ) */ +/* wapi_TabCtrl_SetItem( hWndTab, nInsertPos, cText, iImageListIndex ) */ /* (BOOL)SNDMSG((hwnd), TCM_SETITEM, (WPARAM)(int)(iItem), (LPARAM)(TC_ITEM FAR*)(pitem)) */ HB_FUNC( WAPI_TABCTRL_SETITEM ) diff --git a/contrib/hbwin/wapi_winuser.c b/contrib/hbwin/wapi_winuser.c index ad96e3e2e9..a946637ad1 100644 --- a/contrib/hbwin/wapi_winuser.c +++ b/contrib/hbwin/wapi_winuser.c @@ -243,7 +243,7 @@ HB_FUNC( WAPI_ENABLESCROLLBAR ) Local cSCROLLBARINFO = strSCROLLBARINFO:value Local nCtrlType = OBJID_CLIENT | OBJID_HSCROLL | OBJID_VSCROLL - lSuccess := WAPI_GetScrollInfo( hWnd, nCtrType, @cSCROLLINFO ) + lSuccess := wapi_GetScrollInfo( hWnd, nCtrType, @cSCROLLINFO ) strSCROLLBARINFO:buffer( cSCROLLBARINFO ) ? strSCROLLINFO: @@ -471,7 +471,7 @@ HB_FUNC( WAPI_LOADBITMAP ) } #endif -/* WAPI_LoadImage( [], , [], +/* wapi_LoadImage( [], , [], [], [], [] ) -> */ HB_FUNC( WAPI_LOADIMAGE ) { @@ -829,7 +829,7 @@ HB_FUNC( WAPI_GETMENUDEFAULTITEM ) #endif } -/* WAPI_CreateAcceleratorTable( ) -> */ +/* wapi_CreateAcceleratorTable( ) -> */ HB_FUNC( WAPI_CREATEACCELERATORTABLE ) { HACCEL hAccel = NULL; diff --git a/contrib/hbwin/win_dlg.c b/contrib/hbwin/win_dlg.c index 36d432cd1d..d691b7618d 100644 --- a/contrib/hbwin/win_dlg.c +++ b/contrib/hbwin/win_dlg.c @@ -59,7 +59,7 @@ #endif #include -/* WIN_PRINTDLGDC( [@], [], [], [] ) +/* win_PrintDlgDC( [@], [], [], [] ) * -> */ HB_FUNC( WIN_PRINTDLGDC ) @@ -289,7 +289,7 @@ static void s_GetFileName( HB_BOOL fSave ) hb_strfree( hDefExt ); } -/* WIN_GETOPENFILENAME( [[@]], [], [], [],; +/* win_GetOpenFileName( [[@]], [], [], [],; * [], [[@]], [], [] ) * -> | + e"\0" + [ + e"\0" + ] | "" * @@ -299,7 +299,7 @@ HB_FUNC( WIN_GETOPENFILENAME ) s_GetFileName( HB_FALSE ); } -/* WIN_GETSAVEFILENAME( [[@]], [], [], [],; +/* win_GetSaveFileName( [[@]], [], [], [],; * [], [[@]], [], [] ) * -> | + e"\0" + [ + e"\0" + ] | "" * diff --git a/contrib/hbwin/win_prn2.c b/contrib/hbwin/win_prn2.c index 24f30a48f0..8c892025fb 100644 --- a/contrib/hbwin/win_prn2.c +++ b/contrib/hbwin/win_prn2.c @@ -408,7 +408,7 @@ HB_FUNC( WIN_PRINTFILERAW ) will strip Chr( 26 ) from inside the file, which means it will corrupt it. [vszakats] */ if( pbyBuffer[ nRead - 1 ] == 26 ) - nRead--; /* Skip the EOF() character */ + nRead--; /* Skip the Eof() character */ #endif while( nWritten < nRead ) diff --git a/contrib/hbwin/win_shell.c b/contrib/hbwin/win_shell.c index 9b146fbb74..cf1ddf9151 100644 --- a/contrib/hbwin/win_shell.c +++ b/contrib/hbwin/win_shell.c @@ -82,7 +82,7 @@ # define HB_WIN_V_UNION( x, z ) ( ( x ).z ) #endif -/* WIN_ShellNotifyIcon( [], [], [], [], +/* win_ShellNotifyIcon( [], [], [], [], [], [], [], [], [], [] ) -> */ HB_FUNC( WIN_SHELLNOTIFYICON ) @@ -208,7 +208,7 @@ static LPTSTR s_StringList( int iParam ) #endif -/* WIN_SHFileOperation( [], [], [|], [|], +/* win_SHFileOperation( [], [], [|], [|], [], [<@lAnyOperationAborted>], [], [] ) -> */ HB_FUNC( WIN_SHFILEOPERATION ) diff --git a/contrib/rddads/ads1.c b/contrib/rddads/ads1.c index 3c6e099f0e..d1ee404741 100644 --- a/contrib/rddads/ads1.c +++ b/contrib/rddads/ads1.c @@ -2711,7 +2711,7 @@ static HB_ERRCODE adsPutValue( ADSAREAP pArea, HB_USHORT uiIndex, PHB_ITEM pItem long lDate = hb_itemGetDL( pItem ); /* ADS does not support dates before 0001-01-01. It generates corructed - DBF records and fires ADS error 5095 on FIELDGET() later. [Mindaugas] */ + DBF records and fires ADS error 5095 on FieldGet() later. [Mindaugas] */ if( pField->uiLen != 4 && lDate < 1721426 ) /* 1721426 ~= 0001-01-01 */ lDate = 0; diff --git a/contrib/rddads/adsfunc.c b/contrib/rddads/adsfunc.c index d63477e567..24a5c78ac9 100644 --- a/contrib/rddads/adsfunc.c +++ b/contrib/rddads/adsfunc.c @@ -297,10 +297,10 @@ HB_FUNC( ADSGETCONNECTIONTYPE ) ADSHANDLE hConnToCheck = HB_ADS_PARCONNECTION( 1 ); /* NOTE: Caller can specify a connection. Otherwise use default thread local handle. - The thread default handle will continue to be 0 if no adsConnect60() (Data + The thread default handle will continue to be 0 if no AdsConnect60() (Data Dictionary) calls are made. Simple table access uses an implicit connection whose handle we don't see unless you get it from an opened table - with ADSGETTABLECONTYPE(). */ + with AdsGetTableConType(). */ if( hConnToCheck ) { @@ -1611,7 +1611,7 @@ HB_FUNC( ADSROLLBACK ) /* set the number of records to read ahead, for the current work area - Call: ADSCACHERECORDS( nRecords ) + Call: AdsCacheRecords( nRecords ) Returns: True if successful */ HB_FUNC( ADSCACHERECORDS ) @@ -2088,7 +2088,7 @@ HB_FUNC( ADSDDGETUSERPROPERTY ) /* Verify if a username/password combination is valid for this database - Call : ADSTESTLOGIN( cServerPath, nServerTypes, cUserName, cPassword, options, + Call : AdsTestLogin( cServerPath, nServerTypes, cUserName, cPassword, options, [ nUserProperty, @cBuffer ] ) Returns : True if login succeeds diff --git a/contrib/xhb/fparse.c b/contrib/xhb/fparse.c index 6dbb18bd21..2c33e3898e 100644 --- a/contrib/xhb/fparse.c +++ b/contrib/xhb/fparse.c @@ -53,7 +53,7 @@ */ /* - FPARSE( cFile, cDelimiter ) -> array + FParse( cFile, cDelimiter ) -> array Purpose: Parse a delimited text file. diff --git a/contrib/xhb/hbcrypt.c b/contrib/xhb/hbcrypt.c index 1b8a9f6ba0..f1490d7bb0 100644 --- a/contrib/xhb/hbcrypt.c +++ b/contrib/xhb/hbcrypt.c @@ -390,7 +390,7 @@ void nxs_make_scramble( HB_ISIZ * scramble, const unsigned char * key, HB_SIZE k /***** * Encrypt a text using a key * Usage: - * HB_Crypt( cSource, cKey ) --> cCipher + * hb_Crypt( cSource, cKey ) --> cCipher */ HB_FUNC( HB_CRYPT ) @@ -411,7 +411,7 @@ HB_FUNC( HB_CRYPT ) /***** * Decrypt a text using a key * Usage: - * HB_Decrypt( cCrypt, cKey ) --> cSource + * hb_Decrypt( cCrypt, cKey ) --> cSource */ HB_FUNC( HB_DECRYPT ) diff --git a/contrib/xhb/hbserv.c b/contrib/xhb/hbserv.c index 2c2a975b03..93d64dc7a7 100644 --- a/contrib/xhb/hbserv.c +++ b/contrib/xhb/hbserv.c @@ -801,7 +801,7 @@ HB_FUNC( HB_STARTSERVICE ) } /** - * Returns true if the current program is a service, that is if HB_StartService() has + * Returns true if the current program is a service, that is if hb_StartService() has * Been called. C version useful for internal api */ @@ -828,7 +828,7 @@ void hb_serviceExit( void ) /** - * Returns true if the current program is a service, that is if HB_StartService() has + * Returns true if the current program is a service, that is if hb_StartService() has * Been called. */ HB_FUNC( HB_ISSERVICE ) diff --git a/contrib/xhb/hbxml.c b/contrib/xhb/hbxml.c index 15fd5b3e54..2b8962a230 100644 --- a/contrib/xhb/hbxml.c +++ b/contrib/xhb/hbxml.c @@ -2293,7 +2293,7 @@ HB_FUNC( HBXML_DATAREAD ) /** - * HB_XmlErrorDesc( nErrorNumber ) --> cErrorDesc + * hb_XMLErrorDesc( nErrorNumber ) --> cErrorDesc * Returns a descriptive string telling what the error number is meaning. */ HB_FUNC( HB_XMLERRORDESC ) diff --git a/contrib/xhb/txtline.c b/contrib/xhb/txtline.c index eb43764ed0..4e0613b4fa 100644 --- a/contrib/xhb/txtline.c +++ b/contrib/xhb/txtline.c @@ -208,7 +208,7 @@ HB_FUNC( HB_TABEXPAND ) } } -/* HB_READLINE( , [], , , , [], @nOffSet, @nEnd, @lFound, @lEOF ) */ +/* hb_ReadLine( , [], , , , [], @nOffSet, @nEnd, @lFound, @lEOF ) */ HB_FUNC( HB_READLINE ) { PHB_ITEM pTerm1; diff --git a/contrib/xhb/xhbarr.c b/contrib/xhb/xhbarr.c index 47273619df..7ed88b87cf 100644 --- a/contrib/xhb/xhbarr.c +++ b/contrib/xhb/xhbarr.c @@ -50,7 +50,7 @@ #include "hbapiitm.h" #include "hbapierr.h" -/* aSplice( [, ] [, ] [,] [, ...] [, ] ) => +/* ASplice( [, ] [, ] [,] [, ...] [, ] ) => * Removes elements and return them as array, optionally add items */ HB_FUNC( ASPLICE ) @@ -151,10 +151,10 @@ HB_FUNC( ASPLICE ) } /* TOFIX: Move this to hbxpp library */ -/* Synonym of aSplice() Xbase++ compatibility (extended with optional replacemenet values) */ +/* Synonym of ASplice() Xbase++ compatibility (extended with optional replacemenet values) */ HB_FUNC_TRANSLATE( AREMOVE, ASPLICE ) -/* aMerge( , [, ] ) => aTarget */ +/* AMerge( , [, ] ) => aTarget */ HB_FUNC( AMERGE ) { PHB_ITEM pArray1 = hb_param( 1, HB_IT_ARRAY ); diff --git a/contrib/xhb/xhbarrex.c b/contrib/xhb/xhbarrex.c index 10b1c8b528..001f118c17 100644 --- a/contrib/xhb/xhbarrex.c +++ b/contrib/xhb/xhbarrex.c @@ -48,7 +48,7 @@ #include "hbapi.h" #include "hbapiitm.h" -/* ASIZEALLOC( , ) -> - Set the pre-alloc step. */ +/* ASizeAlloc( , ) -> - Set the pre-alloc step. */ HB_FUNC( ASIZEALLOC ) { PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY ); @@ -61,7 +61,7 @@ HB_FUNC( ASIZEALLOC ) } } -/* ALENALLOC( ) -> - Get the pre-alloc step. */ +/* ALenAlloc( ) -> - Get the pre-alloc step. */ HB_FUNC( ALENALLOC ) { PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY ); diff --git a/extras/gfspell/spellc.c b/extras/gfspell/spellc.c index 0011c643fb..e9ae2e613e 100644 --- a/extras/gfspell/spellc.c +++ b/extras/gfspell/spellc.c @@ -138,7 +138,7 @@ HB_FUNC( XUNFORM ) * Returns: cRating - Letter A-I or Z * Category: INTERNAL * Called by: Sp_Suggest() - * Notes: SP_Rate() assigns a rating based upon how likely the + * Notes: Sp_Rate() assigns a rating based upon how likely the * word matches the dictionary word. It compares the * first 5 letters of the boths word, then the last 5, * down to 2 letters. This results in a rating from A-H. diff --git a/extras/gtwvw/gtwvwd.c b/extras/gtwvw/gtwvwd.c index 67a662f078..3932e7cefe 100644 --- a/extras/gtwvw/gtwvwd.c +++ b/extras/gtwvw/gtwvwd.c @@ -108,7 +108,7 @@ static BOOL s_bMainCoordMode = FALSE; /* in this mode, all HB_GT_FUNC() use static BOOL s_bVertCaret = FALSE; /* if TRUE, caret is in Vertical style */ static BOOL s_bNOSTARTUPSUBWINDOW = FALSE; /* if TRUE, subwindow will not be displayed during opening */ -/* use WVW_NOSTARTUPSUBWINDOW() to check/set it */ +/* use wvw_NoStartupSubWindow() to check/set it */ static BOOL s_bDefCentreWindow = FALSE; /* default CentreWindow setting for subwindows */ @@ -143,7 +143,7 @@ static HWND hWndTT = 0; /* Window handle Tool Tip */ /* for GTWVW private use: ***********************************************/ #if 0 -static BOOL s_bQuickSetMode = FALSE; /* quick SetMode(), to reset maxrow() and maxcol() only */ +static BOOL s_bQuickSetMode = FALSE; /* quick SetMode(), to reset MaxRow() and MaxCol() only */ static BOOL s_bFlashingWindow = FALSE; /* topmost window is flashing due to invalid input on other @@ -1003,7 +1003,7 @@ static BOOL hb_gt_wvw_SetMode( PHB_GT pGT, int iRow, int iCol ) if( s_pWvwData->s_bQuickSetMode ) /*this is eg. done when we are closing window * we do nothing here, what we need is performed by GTAPI level - * ie. setting its s_height and s_width (= maxrow() and maxcol() ) + * ie. setting its s_height and s_width (= MaxRow() and MaxCol() ) */ return TRUE; @@ -1739,7 +1739,7 @@ static BOOL hb_gt_wvw_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) /* * NOTE: - * gfxPrimitive() parameters may have different meanings + * GfxPrimitive() parameters may have different meanings * ie: - Desired color is 'iBottom' for PUTPIXEL and 'iRight' for CIRCLE * - Red is iTop, Green iLeft and Blue is iBottom for MAKECOLOR * @@ -3762,7 +3762,7 @@ static HWND hb_gt_wvwCreateWindow( HINSTANCE hInstance, HINSTANCE hPrevInstance, /* If you wish to show window the way you want, put somewhere in your application * ANNOUNCE HB_NOSTARTUPWINDOW - * If so compiled, then you need to issue Wvw_ShowWindow( nWinNum, SW_RESTORE ) + * If so compiled, then you need to issue wvw_ShowWindow( nWinNum, SW_RESTORE ) * at the point you desire in your code. */ if( hb_dynsymFind( "HB_NOSTARTUPWINDOW" ) != NULL ) @@ -5155,7 +5155,7 @@ static UINT hb_gt_wvwOpenWindow( LPCTSTR lpszWinName, int iRow1, int iCol1, int /* If you wish to show window the way you want, put somewhere in your application * ANNOUNCE HB_NOSTARTUPWINDOW - * If so compiled, then you need to issue Wvw_ShowWindow( nWinNum, SW_RESTORE ) + * If so compiled, then you need to issue wvw_ShowWindow( nWinNum, SW_RESTORE ) * at the point you desire in your code. */ @@ -5392,18 +5392,18 @@ static void hb_gt_wvwInputNotAllowed( UINT usWinNum, UINT message, WPARAM wParam uses coordinate relative to the physical screen area. This mode can be set and reset during runtime,eg. - oldCoordMode := WVW_SetMainCoord( .t. ) + oldCoordMode := wvw_SetMainCoord( .t. ) Illustration: *+------ *|Main Window (Window 0) - *|maxrow()=24 maxcol()=79 + *|MaxRow()=24 MaxCol()=79 | +--------------- | |Window1 RowOfs=3 ColOfs=4 - | |maxrow()=9 maxcol()=29 + | |MaxRow()=9 MaxCol()=29 | | +--------------------------------------+ | | |Window2 RowOfs=6 ColOfs=15 | - | | |maxrow()=3 maxcol()=49 | + | | |MaxRow()=3 MaxCol()=49 | | | | | @ 6,15 say "text1" will be written to Window2 starting at 0,0 @@ -5417,7 +5417,7 @@ static void hb_gt_wvwInputNotAllowed( UINT usWinNum, UINT message, WPARAM wParam If more than one pair of coordinate is dealt with, the second one is ignored. Example: - scroll(2,2,10,10) will operate on Main Window on the above illustration. + Scroll(2,2,10,10) will operate on Main Window on the above illustration. WARNING: Remember current restriction that topmost window is the only one allowed @@ -5459,7 +5459,7 @@ USHORT hb_gt_wvwColOfs( UINT usWinNum ) } /*(usrow,uscol) is coordinate relative to Main Window (MainCoord Mode) - * returns true if usrow and uscol is within maxrow() and maxcol() of Window usWinNum + * returns true if usrow and uscol is within MaxRow() and MaxCol() of Window usWinNum */ static BOOL hb_gt_wvwInWindow( UINT usWinNum, USHORT usrow, USHORT uscol ) { @@ -5566,7 +5566,7 @@ static UINT hb_gt_wvwSetCurWindow( UINT usWinNum ) s_pWvwData->s_bMainCoordMode = FALSE; /*updating GTAPI's statics: - * tell GTAPI about the new maxrow(), maxcol() + * tell GTAPI about the new MaxRow(), MaxCol() */ s_pWvwData->s_bQuickSetMode = TRUE; @@ -5574,7 +5574,7 @@ static UINT hb_gt_wvwSetCurWindow( UINT usWinNum ) s_pWvwData->s_bQuickSetMode = FALSE; - /* tell GTAPI about the new row(), col() */ + /* tell GTAPI about the new Row(), Col() */ hb_gtSetPos( ( SHORT ) s_pWvwData->s_pWindows[ s_pWvwData->s_usCurWindow ]->caretPos.y, ( SHORT ) s_pWvwData->s_pWindows[ s_pWvwData->s_usCurWindow ]->caretPos.x ); @@ -7006,12 +7006,12 @@ WVW_DATA * hb_getWvwData( void ) * now it is wvw_nOpenWindow() * it now returns numeric - * WVW_nOpenWindow(cWinName, row1, col1, row2, col2, ; + * wvw_nOpenWindow(cWinName, row1, col1, row2, col2, ; * nStyle, nParentWin) * rowx and colx are relative to MAIN WINDOW (not current window!) * rowx and colx are used for: * (1) positioning window to its initial position, - * (2) determining the size of the window (new maxrow() and maxcol()) + * (2) determining the size of the window (new MaxRow() and MaxCol()) * (3) saved into RowOfs and ColOfs for MainCoord mode * * nStyle is window style (eg. WS_OVERLAPPEDWINDOW, etc.) @@ -7181,7 +7181,7 @@ HB_FUNC( WVW_SIZE_READY ) } -/*WVW_lCloseWindow() +/*wvw_lCloseWindow() * closes the last/topmost window * returns .t. if successful */ @@ -7219,7 +7219,7 @@ HB_FUNC( WVW_LCLOSEWINDOW ) hb_retl( TRUE ); } -/*WVW_nNumWindows() +/*wvw_nNumWindows() * returns number of windows opened (including main window) */ HB_FUNC( WVW_NNUMWINDOWS ) @@ -7227,14 +7227,14 @@ HB_FUNC( WVW_NNUMWINDOWS ) hb_retni( ( int ) s_pWvwData->s_usNumWindows ); } -/*WVW_xReposWindow(lAnchored) +/*wvw_XReposWindow(lAnchored) * reposition all windows to their initial position * * if lAnchored == .t. (default) * all subwindows are positioned according to their respective (row1,col1) coordinate * else * all subwindows are positioned according to whatever their "CenterWindow" setting - * (see also WVW_CENTERWINDOW()) + * (see also wvw_CenterWindow()) */ HB_FUNC( WVW_XREPOSWINDOW ) { @@ -7258,12 +7258,12 @@ HB_FUNC( WVW_XREPOSWINDOW ) } } -/* WVW_nSetCurWindow( nWinNum ) (0==MAIN) +/* wvw_nSetCurWindow( nWinNum ) (0==MAIN) * assigns nWinNum as the new current window (s_pWvwData->s_usCurWindow) * returns old current window - * example: saved := WVW_nSetCurWindow(0) + * example: saved := wvw_nSetCurWindow(0) * ? "This will be displayed in Main Window" - * WVW_nSetCurWindow(saved) + * wvw_nSetCurWindow(saved) * notes: makes sense only if !s_pWvwData->s_bMainCoordMode */ HB_FUNC( WVW_NSETCURWINDOW ) @@ -7283,7 +7283,7 @@ HB_FUNC( WVW_NSETCURWINDOW ) } } -/*WVW_nRowOfs( [nWinNum] ) +/*wvw_nRowOfs( [nWinNum] ) * returns row offset of window #nWinNum (0==MAIN), relative to Main Window * nWinNum defaults to current window */ @@ -7294,7 +7294,7 @@ HB_FUNC( WVW_NROWOFS ) hb_retni( ( int ) hb_gt_wvwRowOfs( usWinNum ) ); } -/*WVW_nColOfs( [nWinNum] ) +/*wvw_nColOfs( [nWinNum] ) * returns col offset of window #nWinNum (0==MAIN), relative to Main Window * nWinNum defaults to topmost window */ @@ -7306,8 +7306,8 @@ HB_FUNC( WVW_NCOLOFS ) } /* - * WVW_MAXMAXROW( [nWinNum] ) - * returns maximum possible MAXROW() in current screen setting for font used by window nWinNum + * wvw_MaxMaxRow( [nWinNum] ) + * returns maximum possible MaxRow() in current screen setting for font used by window nWinNum * */ HB_FUNC( WVW_MAXMAXROW ) @@ -7322,8 +7322,8 @@ HB_FUNC( WVW_MAXMAXROW ) } /* - * WVW_MAXMAXCOL( [nWinNum] ) - * returns maximum possible MAXCOL() in current screen setting for font used by window nWinNum + * wvw_MaxMaxCol( [nWinNum] ) + * returns maximum possible MaxCol() in current screen setting for font used by window nWinNum * */ HB_FUNC( WVW_MAXMAXCOL ) @@ -7338,9 +7338,9 @@ HB_FUNC( WVW_MAXMAXCOL ) } /* - * WVW_UNREACHEDBR( [nWinNum], [nBottomPixels], [nRightPixels] ) + * wvw_UnreachedBr( [nWinNum], [nBottomPixels], [nRightPixels] ) * get unreached pixels - * below maxrow() to nBottomPixels + * below MaxRow() to nBottomPixels * and on the right of maxcols() to nRightPixels * */ @@ -7356,7 +7356,7 @@ HB_FUNC( WVW_UNREACHEDBR ) hb_storni( cols, 3 ); } -/*WVW_SetMainCoord( [lMainCoord] ) +/*wvw_SetMainCoord( [lMainCoord] ) * returns old setting of s_pWvwData->s_bMainCoordMode, * then assigns s_pWvwData->s_bMainCoordMode := lMainCoord (if supplied) */ @@ -7377,7 +7377,7 @@ HB_FUNC( WVW_SETMAINCOORD ) hb_retl( bOldMainCoordMode ); } -/* WVW_ADDROWS( [nWinNum], nRows) +/* wvw_AddRows( [nWinNum], nRows) * add nRows rows to window nWinNum (nRows may be < 0) * returns .t. if successful * @@ -7385,7 +7385,7 @@ HB_FUNC( WVW_SETMAINCOORD ) * column 0 of original last row * WARNING: no checking if window size will become larger than desktop area * (except if in MainCoord Mode, because it is implied from - * restriction of resulted maxrow()) + * restriction of resulted MaxRow()) */ /* WARNING! this function relies on the fact that char/attr buffers are static! @@ -7497,7 +7497,7 @@ HB_FUNC( WVW_ADDROWS ) } /* - * WVW_NOCLOSE( [nWinNum] ) + * wvw_NoClose( [nWinNum] ) * disable CLOSE 'X' button of a window * * no return value @@ -7515,7 +7515,7 @@ HB_FUNC( WVW_NOCLOSE ) } /* - * WVW_SETWINSTYLE( [nWinNum], [nStyle] ) + * wvw_SetWinStyle( [nWinNum], [nStyle] ) * Get/Set window style * NOTES: if window has controls (eg. pushbutton, scrollbar) * you should include WS_CLIPCHILDREN in nStyle @@ -7546,7 +7546,7 @@ HB_FUNC( WVW_SETWINSTYLE ) } /* - * WVW_ENABLEMAXIMIZE( [nWinNum], [lEnable] ) + * wvw_EnableMaximize( [nWinNum], [lEnable] ) * Get/Set maximize button * * returns maximize box state prior to applying the new style @@ -7595,7 +7595,7 @@ HB_FUNC( WVW_ENABLEMAXIMIZE ) /* */ -/*WVW_SetPaintRefresh( [nPaintRefresh] ) +/*wvw_SetPaintRefresh( [nPaintRefresh] ) * returns old setting of s_pWvwData->s_uiPaintRefresh (millisec between calls to WVW_PAINT) * then assigns s_pWvwData->s_uiPaintRefresh:= nPaintRefresh (if supplied) * NOTES: nPaintRefresh must be >= 50 @@ -7626,7 +7626,7 @@ HB_FUNC( WVW_SETPAINTREFRESH ) hb_retni( uiOldPaintRefresh ); } -/*WVW_SetVertCaret( [lOn] ) +/*wvw_SetVertCaret( [lOn] ) * if lOn is supplied: * lOn == .t.: turn caret into vertical caret * lOn == .f.: turn caret into horizontal caret @@ -7651,7 +7651,7 @@ HB_FUNC( WVW_SETVERTCARET ) hb_retl( bOldVertCaret ); } -/*WVW_SetDefCentreWindow( [lCentre] ) +/*wvw_SetDefCentreWindow( [lCentre] ) * returns old setting of s_pWvwData->s_bDefCentreWindow (default CentreWindow setting for newly opened subwindow) * then assigns s_pWvwData->s_bDefCentreWindow := lCentre (if supplied) * NOTES: @@ -7667,7 +7667,7 @@ HB_FUNC( WVW_SETDEFCENTREWINDOW ) hb_retl( bOldDef ); } -/*WVW_SetDefHCentreWindow( [lCentre] ) +/*wvw_SetDefHCentreWindow( [lCentre] ) * returns old setting of s_pWvwData->s_bDefHCentreWindow (default horizontal CentreWindow setting for newly opened subwindow) * then assigns s_pWvwData->s_bDefHCentreWindow := lCentre (if supplied) * NOTES: @@ -7683,7 +7683,7 @@ HB_FUNC( WVW_SETDEFHCENTREWINDOW ) hb_retl( bOldDef ); } -/*WVW_SetDefVCentreWindow( [lCentre] ) +/*wvw_SetDefVCentreWindow( [lCentre] ) * returns old setting of s_pWvwData->s_bDefVCentreWindow (default horizontal CentreWindow setting for newly opened subwindow) * then assigns s_pWvwData->s_bDefVCentreWindow := lCentre (if supplied) * NOTES: @@ -7699,14 +7699,14 @@ HB_FUNC( WVW_SETDEFVCENTREWINDOW ) hb_retl( bOldDef ); } -/*WVW_SetDefLineSpacing( [nLineSpacing] ) +/*wvw_SetDefLineSpacing( [nLineSpacing] ) * returns old setting of s_pWvwData->s_byDefLineSpacing (default linespacing between lines) * then assigns s_pWvwData->s_byDefLineSpacing:= nLineSpacing (if supplied) * NOTES: * - nLineSpacing will be the default line spacing for all window opens * - nLineSpacing must be even, positive number <= 40 * otherwise it will be ignored - * - to check line spacing being used by a window, use WVW_SetLineSpacing() + * - to check line spacing being used by a window, use wvw_SetLineSpacing() */ HB_FUNC( WVW_SETDEFLINESPACING ) { @@ -7719,14 +7719,14 @@ HB_FUNC( WVW_SETDEFLINESPACING ) hb_retni( byOldLineSpacing ); } -/*WVW_SetLineSpacing( [nWinNum], [nLineSpacing] ) +/*wvw_SetLineSpacing( [nWinNum], [nLineSpacing] ) * returns old setting of linespacing between lines in window nWinNum * then set the line spacing to nLineSpacing (if supplied) * NOTES: * - nLineSpacing must be even, positive number <= 40 * otherwise it will be ignored * - if window size will become too high, line spacing is restored - * - to change default line spacing for next window open, use WVW_SetDefLineSpacing() + * - to change default line spacing for next window open, use wvw_SetDefLineSpacing() */ HB_FUNC( WVW_SETLINESPACING ) { @@ -7756,7 +7756,7 @@ HB_FUNC( WVW_SETLINESPACING ) hb_retni( byOldLineSpacing ); } -/*WVW_SetDefLSpaceColor( [nColorIndex] ) +/*wvw_SetDefLSpaceColor( [nColorIndex] ) * returns old setting of s_pWvwData->s_iDefLSpaceColor (color index of spacing between lines) * then assigns s_pWvwData->s_iDefLSpaceColor:= nColorIndex (if supplied) * NOTES: @@ -7764,7 +7764,7 @@ HB_FUNC( WVW_SETLINESPACING ) * - nColorIndex must >= 0 and <= 15, or == -1 * nCOlorIndex == 0:black, 1:blue, ..., 7:white, ..., 15:bright white * nColorIndex == -1 means line spacing has no color - * - to check line spacing color being used by a window, use WVW_SetLSpaceColor() + * - to check line spacing color being used by a window, use wvw_SetLSpaceColor() */ HB_FUNC( WVW_SETDEFLSPACECOLOR ) { @@ -7776,7 +7776,7 @@ HB_FUNC( WVW_SETDEFLSPACECOLOR ) hb_retni( iOldDefLSpaceColor ); } -/*WVW_SetLSpaceColor( [nWinNum], [nColorIndex] ) +/*wvw_SetLSpaceColor( [nWinNum], [nColorIndex] ) * returns old setting of line space color in window nWinNum * then set the line spacing color to nColorIndex (if supplied) * NOTES: @@ -7784,7 +7784,7 @@ HB_FUNC( WVW_SETDEFLSPACECOLOR ) * otherwise it will be ignored * nCOlorIndex == 0:black, 1:blue, ..., 7:white, ..., 15:bright white * - nColorIndex == -1 means line spacing is not colored - * - to change default line space color for next window open, use WVW_SetDefLineSpacing() + * - to change default line space color for next window open, use wvw_SetDefLineSpacing() */ HB_FUNC( WVW_SETLSPACECOLOR ) { @@ -7803,7 +7803,7 @@ HB_FUNC( WVW_SETLSPACECOLOR ) hb_retni( iOldLSpaceColor ); } -/*WVW_AllowNonTopEvent( [lAllow] ) +/*wvw_AllowNonTopEvent( [lAllow] ) * returns old setting of s_pWvwData->s_bAllowNonTop * and set s_pWvwData->s_bAllowNonTop := lAllow (if this optional param is passed) * @@ -7827,7 +7827,7 @@ HB_FUNC( WVW_ALLOWNONTOPEVENT ) hb_retl( bOldSetting ); } -/*WVW_RecurseCBlock( [lAllow] ) +/*wvw_RecurseCBlock( [lAllow] ) * returns old setting of s_pWvwData->s_bRecurseCBlock * and set s_pWvwData->s_bRecurseCBlock := lAllow (if this optional param is passed) * @@ -7849,7 +7849,7 @@ HB_FUNC( WVW_RECURSECBLOCK ) hb_retl( bOldSetting ); } -/*WVW_NoStartupSubWindow( [lOn] ) +/*wvw_NoStartupSubWindow( [lOn] ) * if lOn is supplied: * lOn == .t.: when opening window, window will not be displayed * lOn == .f.: when opening window, window will be displayed (default) @@ -7878,7 +7878,7 @@ HB_FUNC( WVW_GETSCREENHEIGHT ) } -/*WVW_SetWindowCentre( nWinNum, (0==MAIN) +/*wvw_SetWindowCentre( nWinNum, (0==MAIN) * lCentre, * lPaintIt) (if .f. it will just assign lCentre to WIN_DATA) */ @@ -7890,7 +7890,7 @@ HB_FUNC( WVW_SETWINDOWCENTRE ) } -/*WVW_EnableShortCuts( nWinNum, lEnable ) +/*wvw_EnableShortcuts( nWinNum, lEnable ) * lEnable defaults to .t. * * returns old setting of EnableShortCuts @@ -7933,7 +7933,7 @@ HB_FUNC( WVW_GETTITLE ) /* */ /* Author.....: Francesco Saverio Giudice */ -/* Syntax.....: Wvw_GetRGBColor( nColor ) --> nRGBColor */ +/* Syntax.....: wvw_GetRGBColor( nColor ) --> nRGBColor */ /* Description: Return the RGB values passing the color positional value */ /* 0=Black, 1=Blue, etc */ /* as returned from hb_ColorToN() */ @@ -8184,7 +8184,7 @@ HB_FUNC( WVW_SETTITLE ) } -/* WVW_SetWindowPos( nWinNum, nXposition, nYposition) (position in pixel) */ +/* wvw_SetWindowPos( nWinNum, nXposition, nYposition) (position in pixel) */ HB_FUNC( WVW_SETWINDOWPOS ) { UINT usWinNum = WVW_WHICH_WINDOW; @@ -8209,7 +8209,7 @@ HB_FUNC( WVW_SETCODEPAGE ) } -/* WVW_CenterWindow( nWinNum, lCenter, lPaint ) (nWinNum==0==MAIN) */ +/* wvw_CenterWindow( nWinNum, lCenter, lPaint ) (nWinNum==0==MAIN) */ HB_FUNC( WVW_CENTERWINDOW ) { UINT usWinNum = WVW_WHICH_WINDOW; @@ -8246,7 +8246,7 @@ HB_FUNC( WVW_GETXYFROMROWCOL ) } -/* WVW_GetRowColFromXY( [nWinNum], nX, nY ) +/* wvw_GetRowColFromXY( [nWinNum], nX, nY ) * return an array {nRow, nCol} */ HB_FUNC( WVW_GETROWCOLFROMXY ) @@ -8296,7 +8296,7 @@ HB_FUNC( WVW_GETPALETTE ) /* */ -/* Wvw_SetPalette( aRGBValues ) -> An array of 16 elements with RGB values */ +/* wvw_SetPalette( aRGBValues ) -> An array of 16 elements with RGB values */ /* */ HB_FUNC( WVW_SETPALETTE ) { @@ -8315,11 +8315,11 @@ HB_FUNC( WVW_MINIMIZE ) } -/* wvw_maximize( [nWinNum] ) +/* wvw_Maximize( [nWinNum] ) maximizes the window, if callback function WVW_SIZE exists - note: in gtwvt wvt_maximize() restores the window, not maximizes it - see also: WVW_RESTORE(), WVW_MAXMAXROW(), WVW_MAXMAXCOL() + note: in gtwvt Wvt_Maximize() restores the window, not maximizes it + see also: wvw_Restore(), wvw_MaxMaxRow(), wvw_MaxMaxCol() */ HB_FUNC( WVW_MAXIMIZE ) { @@ -8334,13 +8334,13 @@ HB_FUNC( WVW_MAXIMIZE ) } -/* wvw_restore( [nWinNum] ) - restores the window (similar with gtwvt's wvt_maximize()) +/* wvw_Restore( [nWinNum] ) + restores the window (similar with gtwvt's Wvt_Maximize()) WARNING: restoring window from its maximized state might need handling in callback function WVW_SIZE, - because this function assumes no change in maxrow()/maxcol() - see also: WVW_MAXIMIZE(), WVW_MAXMAXROW(), WVW_MAXMAXCOL() + because this function assumes no change in MaxRow()/MaxCol() + see also: wvw_Maximize(), wvw_MaxMaxRow(), wvw_MaxMaxCol() */ HB_FUNC( WVW_RESTORE ) { diff --git a/extras/gtwvw/hbgtwvw.h b/extras/gtwvw/hbgtwvw.h index 838b537cd9..59bb036fa7 100644 --- a/extras/gtwvw/hbgtwvw.h +++ b/extras/gtwvw/hbgtwvw.h @@ -223,7 +223,7 @@ typedef __int64 LONG_PTR; /* default maximum number of user bitmap cache One bitmap cache currently takes 280 bytes (see BITMAP_HANDLE). - See also wvw_setMaxBMCache(). + See also wvw_SetMaxBMCache(). */ #define WVW_DEFAULT_MAX_BMCACHE 20 @@ -511,7 +511,7 @@ typedef struct win_data int keyPointerOut; /* Offset into key array of next character to read */ int keyLast; - RECT RectInvalid; /* Invalid rectangle if DISPBEGIN() active */ + RECT RectInvalid; /* Invalid rectangle if DispBegin() active */ HFONT hFont; int fontHeight; /* requested font height */ int fontWidth; /* requested font width */ @@ -552,7 +552,7 @@ typedef struct wvw_data BOOL s_bVertCaret; /* if TRUE, caret is in Vertical style */ BOOL s_bNOSTARTUPSUBWINDOW; /* if TRUE, subwindow will not be displayed during opening */ - /* use WVW_NOSTARTUPSUBWINDOW() to check/set it */ + /* use wvw_NoStartupSubWindow() to check/set it */ BOOL s_bDefCentreWindow; /* default CentreWindow setting for subwindows */ @@ -582,7 +582,7 @@ typedef struct wvw_data /* read only by user ***/ /* for GTWVW private use: ***********************************************/ - BOOL s_bQuickSetMode; /* quick SetMode(), to reset maxrow() and maxcol() only */ + BOOL s_bQuickSetMode; /* quick SetMode(), to reset MaxRow() and MaxCol() only */ BOOL s_bFlashingWindow; /* topmost window is flashing diff --git a/extras/gtwvw/wvwcheck.c b/extras/gtwvw/wvwcheck.c index 048c7cf05b..9cd9246f0f 100644 --- a/extras/gtwvw/wvwcheck.c +++ b/extras/gtwvw/wvwcheck.c @@ -77,7 +77,7 @@ /* CHECKBOX begins */ -/*WVW_CXcreate( [nWinNum], nTop, nLeft, nBottom, nRight, cText, cImage/nImage, bBlock, aOffset,; +/*wvw_cxCreate( [nWinNum], nTop, nLeft, nBottom, nRight, cText, cImage/nImage, bBlock, aOffset,; * nStretchBitmap, lMap3Dcolors) * create CHECKBOX for window nWinNum * nTop: row of top/left corner (in character unit) @@ -151,7 +151,7 @@ HB_FUNC( WVW_CXCREATE ) hb_retnl( ( LONG ) uiPBid ); } -/*WVW_CXdestroy( [nWinNum], nCXid ) +/*wvw_cxDestroy( [nWinNum], nCXid ) * destroy checkbox nCXid for window nWinNum */ HB_FUNC( WVW_CXDESTROY ) @@ -187,7 +187,7 @@ HB_FUNC( WVW_CXDESTROY ) hb_xfree( pcd ); } -/*WVW_CXsetFocus( [nWinNum], nButtonId ) +/*wvw_cxSetFocus( [nWinNum], nButtonId ) * set the focus to checkbox nButtonId in window nWinNum */ HB_FUNC( WVW_CXSETFOCUS ) @@ -203,7 +203,7 @@ HB_FUNC( WVW_CXSETFOCUS ) hb_retl( FALSE ); } -/*WVW_CXenable( [nWinNum], nButtonId, [lToggle] ) +/*wvw_cxEnable( [nWinNum], nButtonId, [lToggle] ) * enable/disable checkbox nButtonId on window nWinNum *(lToggle defaults to .t., ie. enabling the checkbox) * return previous state of the checkbox (TRUE:enabled FALSE:disabled) @@ -229,7 +229,7 @@ HB_FUNC( WVW_CXENABLE ) hb_retl( FALSE ); } -/*WVW_CXsetcodeblock( [nWinNum], nCXid, bBlock ) +/*wvw_cxSetCodeblock( [nWinNum], nCXid, bBlock ) * assign (new) codeblock bBlock to button nCXid for window nWinNum * * return .t. if successful @@ -264,7 +264,7 @@ HB_FUNC( WVW_CXSETCODEBLOCK ) hb_retl( TRUE ); } -/* WVW_CXsetcheck( [nWinNum], nCXid, nCheckState ) +/* wvw_cxSetCheck( [nWinNum], nCXid, nCheckState ) * assigns check-state of checkbox nCXid * 0==unchecked BST_UNCHECKED * 1==checked BST_CHECKED @@ -286,7 +286,7 @@ HB_FUNC( WVW_CXSETCHECK ) hb_retl( TRUE ); } -/*WVW_CXgetcheck( [nWinNum], nCXid ) +/*wvw_cxGetCheck( [nWinNum], nCXid ) * returns check-state of checkbox nCXid * 0==unchecked BST_UNCHECKED * 1==checked BST_CHECKED @@ -307,7 +307,7 @@ HB_FUNC( WVW_CXGETCHECK ) hb_retnl( ulCheck ); } -/*WVW_CXSetFont([nWinNum], cFontFace, nHeight, nWidth, nWeight, nQUality,; +/*wvw_cxSetFont([nWinNum], cFontFace, nHeight, nWidth, nWeight, nQUality,; * lItalic, lUnderline, lStrikeout * */ @@ -392,7 +392,7 @@ HB_FUNC( WVW_CXSTATUSFONT ) /* PROGRESSBAR begins */ -/* WVW_PGcreate( [nWinNum], nTop, nLeft, nBottom, nRight, [aOffset], +/* wvw_pgCreate( [nWinNum], nTop, nLeft, nBottom, nRight, [aOffset], * [nBackColor], [nBarColor], [lSmooth], [lVertical]) * create progress bar for window nWinNum * nTop: row of top/left corner (in character unit) @@ -410,11 +410,11 @@ HB_FUNC( WVW_CXSTATUSFONT ) * returns 0 if failed * * example: - * WVW_PGcreate( , 5, 10, 5, 30) + * wvw_pgCreate( , 5, 10, 5, 30) * :: creates horiz progressbar on current window at (5,10) to (5,30) * colors using default ones. * - * WVW_PGcreate( , 5, 10, 5, 30, {-1, 0, +1, 0} ) + * wvw_pgCreate( , 5, 10, 5, 30, {-1, 0, +1, 0} ) * :: same as above, but the bar is enlarged 1 pixel to the top * and 1 pixel to the bottom * @@ -516,7 +516,7 @@ HB_FUNC( WVW_PGCREATE ) hb_retnl( ( LONG ) 0 ); } -/*WVW_PGdestroy( [nWinNum], nPGid ) +/*wvw_pgDestroy( [nWinNum], nPGid ) * destroy progressbar nPGid for window nWinNum * This function has no return value. */ @@ -553,7 +553,7 @@ HB_FUNC( WVW_PGDESTROY ) hb_xfree( pcd ); } -/* WVW_PGsetrange(nWinNum, PGid, [nMin], [nMax]) +/* wvw_pgSetRange(nWinNum, PGid, [nMin], [nMax]) * update progressbar data range (default is 0-100) * nMin: a number in range of -32767 to +32767 * nMax: a number in range of -32767 to +32767 @@ -584,7 +584,7 @@ HB_FUNC( WVW_PGSETRANGE ) hb_retl( TRUE ); } -/*WVW_PGsetpos(nWinNum, PGid, [nPos]) +/*wvw_pgSetPos(nWinNum, PGid, [nPos]) * update progressbar position within current range * nPos: a number in range of current range * returns .t. if operation considered successfull @@ -618,7 +618,7 @@ HB_FUNC( WVW_PGSETPOS ) hb_retl( TRUE ); } -/*WVW_PGgetpos(nWinNum, PGid) +/*wvw_pgGetPos(nWinNum, PGid) * get progressbar current position * returns 0 if operation failed */ diff --git a/extras/gtwvw/wvwdraw.c b/extras/gtwvw/wvwdraw.c index bd45aed77c..d5caaf78ed 100644 --- a/extras/gtwvw/wvwdraw.c +++ b/extras/gtwvw/wvwdraw.c @@ -94,7 +94,7 @@ static COLORREF _COLORS[] = { /* * - * WVW_DRAWLABELOBJ( [nWinNum], nTop, nLeft, nBottom, nRight, cLabel, nAlignHorz, nAlignVert, nTextColor, nBkColor, hFont, + * wvw_DrawLabelObj( [nWinNum], nTop, nLeft, nBottom, nRight, cLabel, nAlignHorz, nAlignVert, nTextColor, nBkColor, hFont, * aOffset ) */ @@ -197,7 +197,7 @@ HB_FUNC( WVW_DRAWLABELOBJ ) /* */ -/* Wvw_DrawToolButtonState( [nWinNum], nTop, nLeft, nBottom, nRight, aPxlOff, nState )*/ +/* wvw_DrawToolButtonState( [nWinNum], nTop, nLeft, nBottom, nRight, aPxlOff, nState )*/ /* */ HB_FUNC( WVW_DRAWTOOLBUTTONSTATE ) { @@ -288,7 +288,7 @@ HB_FUNC( WVW_DRAWTOOLBUTTONSTATE ) /* */ -/* Wvw_DrawScrollButton( [nWinNum], nTop, nLeft, nBottom, nRight, aOffPixels, nTLBR, lDepressed )*/ +/* wvw_DrawScrollButton( [nWinNum], nTop, nLeft, nBottom, nRight, aOffPixels, nTLBR, lDepressed )*/ /* */ /* NOTE: with WVW_XB (scrollbar) this function does not seem to be usefull */ HB_FUNC( WVW_DRAWSCROLLBUTTON ) @@ -497,7 +497,7 @@ HB_FUNC( WVW_DRAWSCROLLTHUMBHORZ ) /* */ -/* Wvw_DrawShadedRect( [nWinNum], nTop, nLeft, nBottom, nRight, aPxlOffSet, nHorVert, aRGBb, aRGBe )*/ +/* wvw_DrawShadedRect( [nWinNum], nTop, nLeft, nBottom, nRight, aPxlOffSet, nHorVert, aRGBb, aRGBe )*/ /* */ HB_FUNC( WVW_DRAWSHADEDRECT ) { @@ -558,7 +558,7 @@ HB_FUNC( WVW_DRAWSHADEDRECT ) /* */ -/* Wvw_DrawTextBox( [nWinNum], nTop, nLeft, nBottom, nRight, aPxlOffSet, cText, ;*/ +/* wvw_DrawTextBox( [nWinNum], nTop, nLeft, nBottom, nRight, aPxlOffSet, cText, ;*/ /* nAlignHorz, nAlignVert, nTextColor, nBackColor, ; */ /* nBackMode, hFont ) */ /* */ @@ -632,7 +632,7 @@ HB_FUNC( WVW_DRAWTEXTBOX ) /* * - * Wvw_DrawProgressBar( [nWinNum], nTop, nLeft, nBottom, nRight, aPxlTLBR, nPercent,; + * wvw_DrawProgressBar( [nWinNum], nTop, nLeft, nBottom, nRight, aPxlTLBR, nPercent,; * nBackColor, nBarColor, cImage, lVertical, nDirection ) */ HB_FUNC( WVW_DRAWPROGRESSBAR ) @@ -742,7 +742,7 @@ HB_FUNC( WVW_DRAWPROGRESSBAR ) /* * - * Wvw_DrawBoxGet( [nWinNum], nRow, nCol, nWidth,; + * wvw_DrawBoxGet( [nWinNum], nRow, nCol, nWidth,; * aOffset ) <-- additional parm, not exist in GTWVT * * NOTES: unlike GTWVT, GTWVW draw white lines on outer right and outer bottom @@ -826,7 +826,7 @@ HB_FUNC( WVW_DRAWBOXGET ) /* * - * Wvw_DrawBoxGet_XP( [nWinNum], nRow, nCol, nWidth,; + * wvw_DrawBoxGet_XP( [nWinNum], nRow, nCol, nWidth,; * aOffset ) <-- additional parm, not exist in GTWVT * * NOTES: unlike GTWVT, GTWVW draw white lines on outer right and outer bottom @@ -889,7 +889,7 @@ HB_FUNC( WVW_DRAWBOXGET_XP ) /* */ -/* Wvw_DrawBoxRaised( nWinNum, */ +/* wvw_DrawBoxRaised( nWinNum, */ /* nTop, nLeft, nBottom, nRight, */ /* lTight/aOffset) */ /* */ @@ -967,7 +967,7 @@ HB_FUNC( WVW_DRAWBOXRAISED ) /* */ -/* Wvw_DrawBoxRecessed( nWinNum, ; */ +/* wvw_DrawBoxRecessed( nWinNum, ; */ /* nTop, nLeft, nBottom, nRight, */ /* lTight/aOffset) <--none in gtwvt */ /* */ @@ -1044,7 +1044,7 @@ HB_FUNC( WVW_DRAWBOXRECESSED ) /* * - * Wvw_DrawBoxGroup( nWinNum, ; + * wvw_DrawBoxGroup( nWinNum, ; * nTop, nLeft, nBottom, nRight,; * [aOffset] ) * @@ -1118,7 +1118,7 @@ HB_FUNC( WVW_DRAWBOXGROUP ) /* */ -/* Wvw_DrawBoxRaised( nWinNum, ; */ +/* wvw_DrawBoxRaised( nWinNum, ; */ /* nTop, nLeft, nBottom, nRight ) */ /* */ @@ -1183,7 +1183,7 @@ HB_FUNC( WVW_DRAWBOXGROUPRAISED ) /* */ -/* Wvw_DrawImage( nWinNum, ; */ +/* wvw_DrawImage( nWinNum, ; */ /* nTop, nLeft, nBottom, nRight, cImage/nPictureSlot, ; */ /* lTight/aOffset,; */ /* lTransparent) <--none in gtwvt */ @@ -1313,7 +1313,7 @@ HB_FUNC( WVW_DRAWIMAGE ) } /* */ -/* WVW_DRAWIMAGE_RESOURCE( nWinNum, ; */ +/* wvw_DrawImage_Resource( nWinNum, ; */ /* nTop, nLeft, nBottom, nRight, nPictureResource/cPictureResource, ; */ /* lTight/aOffset,; */ /* lTransparent) <--none in gtwvt */ @@ -1458,7 +1458,7 @@ HB_FUNC( WVW_DRAWIMAGE_RESOURCE ) /* */ -/* WVW_DRAWLABEL( nWinNum, ; */ +/* wvw_DrawLabel( nWinNum, ; */ /* nRow, nCol, cLabel, nAlign, nEscapement, nTextColor, ; */ /* nBkColor, cFontFace,nHeight, nWidth, nWeight, ; */ /* nQuality, nCharSet, lItalic, lUnderline, lStrikeOut ) */ @@ -1523,7 +1523,7 @@ HB_FUNC( WVW_DRAWLABEL ) /* */ -/* Wvw_DrawOutline( nWinNum, ; */ +/* wvw_DrawOutline( nWinNum, ; */ /* nTop, nLeft, nBottom, nRight, */ /* nThick, nShape, nRGBColor ) */ /* */ @@ -1584,7 +1584,7 @@ HB_FUNC( WVW_DRAWOUTLINE ) /* 1 */ /* 2 3 4 5 6 7 8 9 10 11 */ /* 12 */ -/* Wvw_DrawLine( nWinNum, ; */ +/* wvw_DrawLine( nWinNum, ; */ /* nTop, nLeft, nBottom, nRight, nOrient, nFormat, nAlign, nStyle, nThick, nColor,; */ /* aOffset) */ /* */ @@ -1745,7 +1745,7 @@ HB_FUNC( WVW_DRAWLINE ) /* */ /* Inside the area requested! */ -/* Wvw_DrawEllipse( nWinNum, nTop, nLeft, nBottom, nRight ,; */ +/* wvw_DrawEllipse( nWinNum, nTop, nLeft, nBottom, nRight ,; */ /* aOffset) */ /* */ @@ -1789,7 +1789,7 @@ HB_FUNC( WVW_DRAWELLIPSE ) /* */ -/* Wvw_DrawRectangle( nWinNum, nTop, nLeft, nBottom, nRight ) */ +/* wvw_DrawRectangle( nWinNum, nTop, nLeft, nBottom, nRight ) */ /* aOffset, lUsaCurrentPen) */ /* */ @@ -1838,7 +1838,7 @@ HB_FUNC( WVW_DRAWRECTANGLE ) } /* */ -/* Wvw_DrawRoundRect( nWinNum, nTop, nLeft, nBottom, nRight, ; +/* wvw_DrawRoundRect( nWinNum, nTop, nLeft, nBottom, nRight, ; * aOffset, ; <-- new parm * nRoundHeight, nRoundWidth */ /* */ @@ -1891,7 +1891,7 @@ HB_FUNC( WVW_DRAWROUNDRECT ) /* */ -/* Wvw_DrawFocusRect( nWinNum, nTop, nLeft, nBottom, nRight,; */ +/* wvw_DrawFocusRect( nWinNum, nTop, nLeft, nBottom, nRight,; */ /* aOffset) */ /* */ @@ -1930,11 +1930,11 @@ HB_FUNC( WVW_DRAWFOCUSRECT ) } /*NOTE: this is compatibility function with GTWVT - * similar with WVW_FillRectangle() + * similar with wvw_FillRectangle() */ /* * - * Wvw_DrawColorRect( nWinNum, nTop, nLeft, nBottom, nRight, aPxlOff, nRGB ) + * wvw_DrawColorRect( nWinNum, nTop, nLeft, nBottom, nRight, aPxlOff, nRGB ) */ HB_FUNC( WVW_DRAWCOLORRECT ) { @@ -1984,7 +1984,7 @@ HB_FUNC( WVW_DRAWCOLORRECT ) /* */ -/* Wvw_DrawGridHorz( nWinNum, ; */ +/* wvw_DrawGridHorz( nWinNum, ; */ /* nTop, nLeft, nRight, nRows ) */ /* */ @@ -2033,7 +2033,7 @@ HB_FUNC( WVW_DRAWGRIDHORZ ) /* * - * Wvw_DrawGridVert( nWinNum, ; + * wvw_DrawGridVert( nWinNum, ; * nTop, nBottom, aCols, nCols,; * [aOffset] ) * @@ -2099,7 +2099,7 @@ HB_FUNC( WVW_DRAWGRIDVERT ) /* */ -/* Wvw_DrawButton( nWinNum, ; */ +/* wvw_DrawButton( nWinNum, ; */ /* nTop, nLeft, nBottom, nRight, cText, cImage/nImage, nFormat, ; */ /* nTextColor, nBkColor, nImageAt ) */ /* */ @@ -2245,7 +2245,7 @@ HB_FUNC( WVW_DRAWBUTTON ) } -/* WVW_DrawStatusbar() is meant for WVT compatibility only. +/* wvw_DrawStatusBar() is meant for WVT compatibility only. WVW_SBxxxx() functions are recommended instead. */ @@ -2341,7 +2341,7 @@ HB_FUNC( WVW_DRAWSTATUSBAR ) /* */ -/* Wvw_DrawPicture( [nWinNum], nTop, nLeft, nBottom, nRight, nSlot, lTight/aAdj ) -> lOk */ +/* wvw_DrawPicture( [nWinNum], nTop, nLeft, nBottom, nRight, nSlot, lTight/aAdj ) -> lOk */ /* nSlot <= 20 aAdj == { 0,0,-2,-2 } To Adjust the pixels for { Top,Left,Bottom,Right } */ /* */ @@ -2405,7 +2405,7 @@ HB_FUNC( WVW_DRAWPICTURE ) /* */ -/* WVW_DRAWLABELEX( [nWinNum], nRow, nCol, cLabel, nAlign, nTextColor, nBkColor, nSlotFont ) */ +/* wvw_DrawLabelEx( [nWinNum], nRow, nCol, cLabel, nAlign, nTextColor, nBkColor, nSlotFont ) */ /* */ HB_FUNC( WVW_DRAWLABELEX ) @@ -2449,7 +2449,7 @@ HB_FUNC( WVW_DRAWLABELEX ) /* 1 2 3 4 5 6 7 8 9 */ -/* Wvw_DrawLineEx( [nWinNum], nTop, nLeft, nBottom, nRight, nOrient, nFormat, nAlign, nSlotPen ) */ +/* wvw_DrawLineEx( [nWinNum], nTop, nLeft, nBottom, nRight, nOrient, nFormat, nAlign, nSlotPen ) */ /* */ HB_FUNC( WVW_DRAWLINEEX ) @@ -2591,7 +2591,7 @@ HB_FUNC( WVW_DRAWLINEEX ) /* */ -/* Wvw_DrawOutlineEx( [nWinNum], nTop, nLeft, nBottom, nRight, nSlotPen ) */ +/* wvw_DrawOutlineEx( [nWinNum], nTop, nLeft, nBottom, nRight, nSlotPen ) */ /* */ HB_FUNC( WVW_DRAWOUTLINEEX ) diff --git a/extras/gtwvw/wvwedit.c b/extras/gtwvw/wvwedit.c index 8e9f1d09b7..9111a2a79b 100644 --- a/extras/gtwvw/wvwedit.c +++ b/extras/gtwvw/wvwedit.c @@ -73,7 +73,7 @@ #include "hbgtwvw.h" -/* WVW_EBcreate( [nWinNum], nTop, nLeft, nBottom, nRight, cText, bBlock, ; +/* wvw_ebCreate( [nWinNum], nTop, nLeft, nBottom, nRight, cText, bBlock, ; * lMultiline, nMoreStyle, nMaxChar, nReserved, aOffset) * create editbox for window nWinNum * nTop: row of top/left corner (in character unit) @@ -259,7 +259,7 @@ HB_FUNC( WVW_EBCREATE ) hb_retnl( ( LONG ) 0 ); } -/*WVW_EBdestroy( [nWinNum], nEBid ) +/*wvw_ebDestroy( [nWinNum], nEBid ) * destroy editbox nEBid for window nWinNum */ HB_FUNC( WVW_EBDESTROY ) @@ -295,7 +295,7 @@ HB_FUNC( WVW_EBDESTROY ) hb_xfree( pcd ); } -/*WVW_EBsetFocus( [nWinNum], nEditId ) +/*wvw_ebSetFocus( [nWinNum], nEditId ) * set the focus to editbox nEditId in window nWinNum */ HB_FUNC( WVW_EBSETFOCUS ) @@ -311,7 +311,7 @@ HB_FUNC( WVW_EBSETFOCUS ) hb_retl( FALSE ); } -/*WVW_EBisFocused( [nWinNum], nEditId ) +/*wvw_ebIsFocused( [nWinNum], nEditId ) * returns .t. if the focus is on editbox nEditId in window nWinNum */ HB_FUNC( WVW_EBISFOCUSED ) @@ -324,7 +324,7 @@ HB_FUNC( WVW_EBISFOCUSED ) hb_retl( ( HWND ) GetFocus() == hWndEB ); } -/*WVW_EBenable( [nWinNum], nEditId, [lEnable] ) +/*wvw_ebEnable( [nWinNum], nEditId, [lEnable] ) * enable/disable editbox nEditId on window nWinNum *(lEnable defaults to .t., ie. enabling the editbox) * return previous state of the editbox (TRUE:enabled FALSE:disabled) @@ -350,7 +350,7 @@ HB_FUNC( WVW_EBENABLE ) hb_retl( FALSE ); } -/*WVW_EBeditable( [nWinNum], nEditId, [lEditable] ) +/*wvw_ebEditable( [nWinNum], nEditId, [lEditable] ) * get/set editability attribute from editbox nEditId on window nWinNum *(if lEditable is not specified, no change to editability) * return previous state of the editbox (TRUE:editable FALSE:not editable) @@ -382,7 +382,7 @@ HB_FUNC( WVW_EBEDITABLE ) hb_retl( FALSE ); } -/*WVW_EBsetcodeblock( [nWinNum], nEBid, bBlock ) +/*wvw_ebSetCodeblock( [nWinNum], nEBid, bBlock ) * assign (new) codeblock bBlock to editbox nEBid for window nWinNum * * return .t. if successful @@ -418,7 +418,7 @@ HB_FUNC( WVW_EBSETCODEBLOCK ) hb_retl( TRUE ); } -/* WVW_EBSetFont([nWinNum], cFontFace, nHeight, nWidth, nWeight, nQUality,; +/* wvw_ebSetFont([nWinNum], cFontFace, nHeight, nWidth, nWeight, nQUality,; * lItalic, lUnderline, lStrikeout * * this will initialize font for ALL editboxes in window nWinNum @@ -479,7 +479,7 @@ HB_FUNC( WVW_EBSETFONT ) } -/*WVW_EBIsMultiline( [nWinNum], nEBid ) +/*wvw_ebIsMultiline( [nWinNum], nEBid ) * returns .t. if editbox nEBid in window nWinNum is multiline * otherwise .f. * Also returns .f. if nEBid not valid @@ -501,14 +501,14 @@ HB_FUNC( WVW_EBISMULTILINE ) hb_retl( bMultiline ); } -/* WVW_EBgettext( [nWinNum], nEBid,; +/* wvw_ebGetText( [nWinNum], nEBid,; * lSoftBreak ) * returns current text from editbox nEBid in window nWinNum * lSoftBreak: Default is FALSE. * insert soft line break character (CR+CR+LF) at wordwrap positions * can be usefull to convert the text to MEMO format * eg. converting editbox's softbreaks into memoline softbreak: - * cStr := wvw_ebgettext( NIL, nEBid, .T. ) + * cStr := wvw_ebGetText( NIL, nEBid, .T. ) * cStr := StrTran( cStr, CR + CR + LF, Chr( 141 ) + LF ) * * returns "" in case of error (eg. nEBid not valid) @@ -564,7 +564,7 @@ HB_FUNC( WVW_EBGETTEXT ) hb_xfree( lpszTextANSI ); } -/*WVW_EBsettext( [nWinNum], nEBid, cText ) +/*wvw_ebSetText( [nWinNum], nEBid, cText ) * set current text of editbox nEBid in window nWinNum * returns .t. if successful, .f. in case of error (eg. nEBid not valid) */ @@ -605,7 +605,7 @@ HB_FUNC( WVW_EBSETTEXT ) hb_retl( bRetval ); } -/*WVW_EBgetsel( [nWinNum], nEBid, @nstart, @nend ) +/*wvw_ebGetSel( [nWinNum], nEBid, @nstart, @nend ) * get selected text editbox nEBid in window nWinNum * the start selected text (0-based) is in nstart * the end selected text (0-based) is in nend @@ -638,12 +638,12 @@ HB_FUNC( WVW_EBGETSEL ) hb_retl( TRUE ); } -/*WVW_EBsetsel( [nWinNum], nEBid, nstart, nend ) +/*wvw_ebSetSel( [nWinNum], nEBid, nstart, nend ) * set selected text editbox nEBid in window nWinNum * the start selected text (0-based) is in nstart * the end selected text (0-based) is in nend * notes: nstart may be > nend (flipped selection) - * notes: to selet all text: WVW_EBsetsel(nwinnum, nebid, 0, -1) + * notes: to selet all text: wvw_ebSetSel(nwinnum, nebid, 0, -1) * returns .t. if operation successful * returns .f. if not (eg. nEBid not valid) */ diff --git a/extras/gtwvw/wvwfuncs.c b/extras/gtwvw/wvwfuncs.c index 7535a9c841..d71b9eb5e7 100644 --- a/extras/gtwvw/wvwfuncs.c +++ b/extras/gtwvw/wvwfuncs.c @@ -141,7 +141,7 @@ HB_FUNC( WIN_SENDDLGITEMMESSAGE ) /* * - * WIN_SetTimer( hWnd, nIdentifier, nTimeOut ) + * win_SetTimer( hWnd, nIdentifier, nTimeOut ) */ HB_FUNC( WIN_SETTIMER ) @@ -268,7 +268,7 @@ HB_FUNC( WIN_INVALIDATERECT ) /* * - * Win_LoadIcon( ncIcon ) + * win_LoadIcon( ncIcon ) */ HB_FUNC( WIN_LOADICON ) @@ -285,7 +285,7 @@ HB_FUNC( WIN_LOADICON ) /* * - * Win_LoadImage( ncImage, nSource ) -> hImage + * win_LoadImage( ncImage, nSource ) -> hImage * nSource == 0 ResourceIdByNumber * nSource == 0 ResourceIdByName * nSource == 0 ImageFromDiskFile @@ -375,7 +375,7 @@ HB_FUNC( WIN_CREATEBRUSH ) /* * - * Win_DrawText( hDC, cText, aRect, nFormat ) + * win_DrawText( hDC, cText, aRect, nFormat ) */ HB_FUNC( WIN_DRAWTEXT ) @@ -538,7 +538,7 @@ HB_FUNC( WVW_CXVISIBLE ) hb_retl( ShowWindow( hWndPB, iCmdShow ) == 0 ); } -/* WVW_XBVisible( [nWinNum], nXBid, lShow ) +/* wvw_xbVisible( [nWinNum], nXBid, lShow ) * show/hide scrollbar nXBid in window nWinNum (default to topmost window) * nWinNum better be NIL * nXBid is the handle of the scrolbar @@ -695,7 +695,7 @@ HB_FUNC( ADDTOOLTIPEX ) /* changed by MAG */ /* - * CreateImagelist( array, cx, cy, nGrow, flags ) + * CreateImageList( array, cx, cy, nGrow, flags ) */ HB_FUNC( CREATEIMAGELIST ) { @@ -1338,7 +1338,7 @@ HB_FUNC( WINDOW2BITMAP ) Remarks: There is no way to discard a specific bitmap from the cache. - If you want to control bitmap caching manually, use wvw_loadpicture() + If you want to control bitmap caching manually, use wvw_LoadPicture() instead. Example: @@ -1381,7 +1381,7 @@ HB_FUNC( WVW_NUMBMCACHE ) /* TIMER */ -/*WVW_SetTimer([nWinNum], nInterval) +/*wvw_SetTimer([nWinNum], nInterval) * set timer event for every nInterval millisec *(effective only if WVW_TIMER() function exists) * eg. it can be usefull to update clock on status bar @@ -1405,7 +1405,7 @@ HB_FUNC( WVW_SETTIMER ) hb_retl( FALSE ); } -/*WVW_KillTimer([nWinNum]) +/*wvw_KillTimer([nWinNum]) * kill the timer event handler for window nWinNum * returns .t. if successfull */ @@ -1427,7 +1427,7 @@ HB_FUNC( WVW_KILLTIMER ) } -/*WVW_GetPaintRect( nWinNum ) nWinNum is 0 based */ +/*wvw_GetPaintRect( nWinNum ) nWinNum is 0 based */ /*returns array of paint pending rect {top, left, bottom, right} */ /*WARNING: */ /*unlike WVT, top maybe > bottom */ @@ -1534,7 +1534,7 @@ HB_FUNC( WVW_SETPOINTER ) /* */ -/* Wvw_LoadPicture( nSlot, cFilePic ) */ +/* wvw_LoadPicture( nSlot, cFilePic ) */ /* */ HB_FUNC( WVW_LOADPICTURE ) { @@ -1560,7 +1560,7 @@ HB_FUNC( WVW_LOADPICTURE ) /* */ -/* Wvw_LoadFont( nSlotFont, cFontFace, nHeight, nWidth, nWeight, lItalic, lUnderline, lStrikeout, */ +/* wvw_LoadFont( nSlotFont, cFontFace, nHeight, nWidth, nWeight, lItalic, lUnderline, lStrikeout, */ /* nCharSet, nQuality, nEscapement ) */ /* */ HB_FUNC( WVW_LOADFONT ) @@ -1603,7 +1603,7 @@ HB_FUNC( WVW_LOADFONT ) /* */ -/* Wvw_LoadPen( nSlot, nStyle, nWidth, nRGBColor ) */ +/* wvw_LoadPen( nSlot, nStyle, nWidth, nRGBColor ) */ /* */ HB_FUNC( WVW_LOADPEN ) { @@ -1649,7 +1649,7 @@ HB_FUNC( WVW_MESSAGEBOX ) /* */ -/* Wvw_ChooseFont( cFontName, nHeight, nWidth, nWeight, nQuality, ; */ +/* wvw_ChooseFont( cFontName, nHeight, nWidth, nWeight, nQuality, ; */ /* lItalic, lUnderline, lStrikeout ) */ /* */ @@ -1726,7 +1726,7 @@ HB_FUNC( WVW_CHOOSEFONT ) /* */ -/* Wvw_ChooseColor( nRGBInit, aRGB16, nFlags ) => nRGBSelected */ +/* wvw_ChooseColor( nRGBInit, aRGB16, nFlags ) => nRGBSelected */ /* */ HB_FUNC( WVW_CHOOSECOLOR ) @@ -1754,12 +1754,12 @@ HB_FUNC( WVW_CHOOSECOLOR ) } -/*WVW_SETMOUSEPOS( nWinNum, nRow, nCol ) nWinNum is 0 based */ +/*wvw_SetMousePos( nWinNum, nRow, nCol ) nWinNum is 0 based */ /*WHAT'S the difference with GT_FUNC( mouse_SetPos ) ??? */ /*this func is able to position cursor on any window */ -/*NOTE: consider using 'standard' SETMOUSE() instead: */ -/* SETMOUSE(.t., nRow, nCol) */ +/*NOTE: consider using 'standard' SetMouse() instead: */ +/* SetMouse(.t., nRow, nCol) */ /* This will treat (nRow,nCol) according to current s_pWvwData->s_bMainCoordMode setting */ HB_FUNC( WVW_SETMOUSEPOS ) @@ -1784,7 +1784,7 @@ HB_FUNC( WVW_SETMOUSEPOS ) /*by bdj */ /*none in gtwvt */ -/* Wvw_FillRectangle( nWinNum, nTop, nLeft, nBottom, nRight, nRGBcolor/hBrush, */ +/* wvw_FillRectangle( nWinNum, nTop, nLeft, nBottom, nRight, nRGBcolor/hBrush, */ /* lTight, lUseBrush, aOffSet ) */ /* */ /* if lTight, rect is drawn inside the character region */ @@ -1912,7 +1912,7 @@ HB_FUNC( WVW_DLGSETICON ) /* */ -/* Wvw_SetPen( nPenStyle, nWidth, nColor ) */ +/* wvw_SetPen( nPenStyle, nWidth, nColor ) */ /* */ /* IMPORTANT: in prev release this functions has nWinNum parameter @@ -1959,7 +1959,7 @@ HB_FUNC( WVW_SETPEN ) /* */ -/* Wvw_SetBrush( nStyle, nColor, [ nHatch ] ) */ +/* wvw_SetBrush( nStyle, nColor, [ nHatch ] ) */ /* */ /* IMPORTANT: in prev release this functions has nWinNum parameter @@ -2123,7 +2123,7 @@ HB_FUNC( WVW_GETCURSORPOS ) } -/* WVW_ShowWindow( [nWinNum], nCmdShow ) */ +/* wvw_ShowWindow( [nWinNum], nCmdShow ) */ HB_FUNC( WVW_SHOWWINDOW ) { UINT usWinNum = WVW_WHICH_WINDOW; @@ -2134,7 +2134,7 @@ HB_FUNC( WVW_SHOWWINDOW ) } -/* WVW_UpdateWindow( [nWinNum] ) */ +/* wvw_UpdateWindow( [nWinNum] ) */ HB_FUNC( WVW_UPDATEWINDOW ) { UINT usWinNum = WVW_WHICH_WINDOW; @@ -2372,7 +2372,7 @@ HB_FUNC( WVW_SETASNORMAL ) /* */ -/* aScr := Wvw_SaveScreen( nWinNum, nTop, nLeft, nBottom, nRight ) */ +/* aScr := wvw_SaveScreen( nWinNum, nTop, nLeft, nBottom, nRight ) */ /* */ /*TODO: reconsider, is it really needed? is it better to be handled by application? @@ -2423,7 +2423,7 @@ HB_FUNC( WVW_SAVESCREEN ) /* */ -/* Wvw_RestScreen( nWinNum, nTop, nLeft, nBottom, nRight, aScr, lDoNotDestroyBMP )*/ +/* wvw_RestScreen( nWinNum, nTop, nLeft, nBottom, nRight, aScr, lDoNotDestroyBMP )*/ /* */ /*TODO: reconsider, is it really needed? is it better to be handled by application? @@ -2502,7 +2502,7 @@ HB_FUNC( WVW_RESTSCREEN ) /* */ -/* Wvw_CreateFont( cFontFace, nHeight, nWidth, nWeight, lItalic, lUnderline,*/ +/* wvw_CreateFont( cFontFace, nHeight, nWidth, nWeight, lItalic, lUnderline,*/ /* lStrikeout, nCharSet, nQuality, nEscapement ) */ /* */ HB_FUNC( WVW_CREATEFONT ) diff --git a/extras/gtwvw/wvwmenu.c b/extras/gtwvw/wvwmenu.c index e24836c694..4a8d43b19e 100644 --- a/extras/gtwvw/wvwmenu.c +++ b/extras/gtwvw/wvwmenu.c @@ -116,7 +116,7 @@ HB_FUNC( WVW_CREATEPOPUPMENU ) } -/* WVW_APPENDMENU( hMenu, nFlags, nMenuItemId, cCaption ) */ +/* wvw_AppendMenu( hMenu, nFlags, nMenuItemId, cCaption ) */ HB_FUNC( WVW_APPENDMENU ) { @@ -290,7 +290,7 @@ HB_FUNC( WVW_ENDMENU ) hb_retl( EndMenu() ); } -/* WVW_GetMenu([nWinNum]) */ +/* wvw_GetMenu([nWinNum]) */ HB_FUNC( WVW_GETMENU ) { UINT usWinNum = WVW_WHICH_WINDOW; @@ -299,7 +299,7 @@ HB_FUNC( WVW_GETMENU ) HB_RETHANDLE( GetMenu( pWindowData->hWnd ) ); } -/* WVW_TrackPopupMenu([nWinNum], n) */ +/* wvw_TrackPopupMenu([nWinNum], n) */ HB_FUNC( WVW_TRACKPOPUPMENU ) { UINT usWinNum = WVW_WHICH_WINDOW; @@ -323,7 +323,7 @@ HB_FUNC( WIN_SETMENU ) } /* - * WVW_NOSYSMENU( [nWinNum], lRemoveClose ) + * wvw_NoSysMenu( [nWinNum], lRemoveClose ) * removes System Menu of a window * if lRemoveClose is .t., also removes the 'Close' command and 'X' button * @@ -353,7 +353,7 @@ HB_FUNC( WVW_NOSYSMENU ) } } -/* WVW_GetSystemMenu( [nWinNum], lReset ) +/* wvw_GetSystemMenu( [nWinNum], lReset ) * returns the System Menu of a window * if lRemoveClose is .t., also removes the 'Close' command and 'X' button */ diff --git a/extras/gtwvw/wvwpush.c b/extras/gtwvw/wvwpush.c index c86082999f..73c592023e 100644 --- a/extras/gtwvw/wvwpush.c +++ b/extras/gtwvw/wvwpush.c @@ -73,7 +73,7 @@ #include "hbgtwvw.h" -/* WVW_PBcreate( [nWinNum], nTop, nLeft, nBottom, nRight, cText, cImage/nImage, bBlock, aOffset,; +/* wvw_pbCreate( [nWinNum], nTop, nLeft, nBottom, nRight, cText, cImage/nImage, bBlock, aOffset,; * nStretchBitmap, lMap3Dcolors) * create pushbutton for window nWinNum * nTop: row of top/left corner (in character unit) @@ -150,7 +150,7 @@ HB_FUNC( WVW_PBCREATE ) hb_retnl( ( LONG ) uiPBid ); } -/*WVW_PBdestroy( [nWinNum], nPBid ) +/*wvw_pbDestroy( [nWinNum], nPBid ) * destroy button nPBid for window nWinNum */ HB_FUNC( WVW_PBDESTROY ) @@ -186,7 +186,7 @@ HB_FUNC( WVW_PBDESTROY ) hb_xfree( pcd ); } -/*WVW_PBsetFocus( [nWinNum], nButtonId ) +/*wvw_pbSetFocus( [nWinNum], nButtonId ) * set the focus to button nButtonId in window nWinNum */ HB_FUNC( WVW_PBSETFOCUS ) @@ -202,7 +202,7 @@ HB_FUNC( WVW_PBSETFOCUS ) hb_retl( FALSE ); } -/*WVW_PBisFocused( [nWinNum], nPBid ) +/*wvw_pbIsFocused( [nWinNum], nPBid ) * returns .t. if the focus is on button nPBid in window nWinNum */ HB_FUNC( WVW_PBISFOCUSED ) @@ -215,7 +215,7 @@ HB_FUNC( WVW_PBISFOCUSED ) hb_retl( ( HWND ) GetFocus() == hWndPB ); } -/*WVW_PBenable( [nWinNum], nButtonId, [lToggle] ) +/*wvw_pbEnable( [nWinNum], nButtonId, [lToggle] ) * enable/disable button nButtonId on window nWinNum *(lToggle defaults to .t., ie. enabling the button) * return previous state of the button (TRUE:enabled FALSE:disabled) @@ -241,7 +241,7 @@ HB_FUNC( WVW_PBENABLE ) hb_retl( FALSE ); } -/*WVW_PBsetcodeblock( [nWinNum], nPBid, bBlock ) +/*wvw_pbSetCodeblock( [nWinNum], nPBid, bBlock ) * assign (new) codeblock bBlock to button nPBid for window nWinNum * * return .t. if successful @@ -291,7 +291,7 @@ HB_FUNC( WVW_PBSETCODEBLOCK ) hb_retl( TRUE ); } -/* WVW_PBsetstyle( [nWinNum], nPBid, nStyle ) +/* wvw_pbSetStyle( [nWinNum], nPBid, nStyle ) * assign new style nStyle to button nPBid for window nWinNum * typical usage: nStyle==BS_DEFPUSHBUTTON (==01) to turn the button * into default push button @@ -318,7 +318,7 @@ HB_FUNC( WVW_PBSETSTYLE ) hb_retl( TRUE ); } -/* WVW_PBSetFont([nWinNum], cFontFace, nHeight, nWidth, nWeight, nQUality,; +/* wvw_pbSetFont([nWinNum], cFontFace, nHeight, nWidth, nWeight, nQUality,; * lItalic, lUnderline, lStrikeout * * this will initialize font for ALL pushbuttons in window nWinNum @@ -383,7 +383,7 @@ HB_FUNC( WVW_PBSETFONT ) /* COMBOBOX begins (experimental) */ -/* WVW_CBcreate( [nWinNum], nTop, nLeft, nWidth, aText, bBlock, nListLines, ; +/* wvw_cbCreate( [nWinNum], nTop, nLeft, nWidth, aText, bBlock, nListLines, ; * nReserved, nKbdType, aOffset, hControl ) * create combobox (drop-down list, no editbox) for window nWinNum * nTop: row of top/left corner (in character unit) @@ -403,7 +403,7 @@ HB_FUNC( WVW_PBSETFONT ) * nType : event type (CBN_SELCHANGE/CBN_SETFOCUS/CBN_KILLFOCUS supported) * nIndex : index of the selected list item (0 based) * nListLines: number of lines for list items, default = 3 - * (will be automatically truncated if it's > len(aText)) + * (will be automatically truncated if it's > Len(aText)) * nReserved: reserved for future (this parm is now ignored) * * nKbdType: WVW_CB_KBD_STANDARD (0): similar to standard windows convention @@ -604,7 +604,7 @@ HB_FUNC( WVW_CBCREATE ) hb_retnl( ( LONG ) 0 ); } -/*WVW_CBdestroy( [nWinNum], nCBid ) +/*wvw_cbDestroy( [nWinNum], nCBid ) * destroy combobox nCBid for window nWinNum */ HB_FUNC( WVW_CBDESTROY ) @@ -640,7 +640,7 @@ HB_FUNC( WVW_CBDESTROY ) hb_xfree( pcd ); } -/*WVW_CBsetFocus( [nWinNum], nComboId ) +/*wvw_cbSetFocus( [nWinNum], nComboId ) * set the focus to combobox nComboId in window nWinNum */ HB_FUNC( WVW_CBSETFOCUS ) @@ -656,7 +656,7 @@ HB_FUNC( WVW_CBSETFOCUS ) hb_retl( FALSE ); } -/*WVW_CBisFocused( [nWinNum], nComboId ) +/*wvw_cbIsFocused( [nWinNum], nComboId ) * returns .t. if the focus is on combobox nComboId in window nWinNum */ HB_FUNC( WVW_CBISFOCUSED ) @@ -669,7 +669,7 @@ HB_FUNC( WVW_CBISFOCUSED ) hb_retl( ( HWND ) GetFocus() == hWndCB ); } -/*WVW_CBenable( [nWinNum], nComboId, [lEnable] ) +/*wvw_cbEnable( [nWinNum], nComboId, [lEnable] ) * enable/disable button nComboId on window nWinNum *(lEnable defaults to .t., ie. enabling the combobox) * return previous state of the combobox (TRUE:enabled FALSE:disabled) @@ -695,7 +695,7 @@ HB_FUNC( WVW_CBENABLE ) hb_retl( FALSE ); } -/*WVW_CBsetcodeblock( [nWinNum], nCBid, bBlock ) +/*wvw_cbSetCodeblock( [nWinNum], nCBid, bBlock ) * assign (new) codeblock bBlock to combobox nCBid for window nWinNum * * return .t. if successful @@ -731,7 +731,7 @@ HB_FUNC( WVW_CBSETCODEBLOCK ) hb_retl( TRUE ); } -/* WVW_CBSetFont([nWinNum], cFontFace, nHeight, nWidth, nWeight, nQUality,; +/* wvw_cbSetFont([nWinNum], cFontFace, nHeight, nWidth, nWeight, nQUality,; * lItalic, lUnderline, lStrikeout * * this will initialize font for ALL comboboxes in window nWinNum @@ -793,14 +793,14 @@ HB_FUNC( WVW_CBSETFONT ) } -/* WVW_CBsetIndex( [nWinNum], nCBid, nIndex ) +/* wvw_cbSetIndex( [nWinNum], nCBid, nIndex ) * set current selection of combobox nCBid in window nWinNum to nIndex * (nIndex is 0 based) * returns .t. if successful. * - * NOTE: the better name to this function should be WVW_CBsetCurSel() + * NOTE: the better name to this function should be wvw_CBSetCurSel() * but that name is already used. - * (WVW_CBsetcursel() and WVW_CBaddstring() is NOT related to other + * (wvw_CBSetCurSel() and wvw_cbAddString() is NOT related to other * WVW_CB* functions) */ HB_FUNC( WVW_CBSETINDEX ) @@ -826,7 +826,7 @@ HB_FUNC( WVW_CBSETINDEX ) hb_retl( retval ); } -/* WVW_CBgetIndex( [nWinNum], nCBid ) +/* wvw_cbGetIndex( [nWinNum], nCBid ) * get current selection of combobox nCBid in window nWinNum * return nIndex (0 based) * returns CB_ERR (-1) if none selected @@ -834,7 +834,7 @@ HB_FUNC( WVW_CBSETINDEX ) * NOTE: the better name to this function should be WVW_CBgetCurSel() * but that name is potentially misleading to WVW_CBsetCursel * which is not our family of WVW_CB* functions - * (WVW_CBsetcursel() and WVW_CBaddstring() is NOT related to other + * (wvw_CBSetCurSel() and wvw_cbAddString() is NOT related to other * WVW_CB* functions) */ HB_FUNC( WVW_CBGETINDEX ) @@ -859,7 +859,7 @@ HB_FUNC( WVW_CBGETINDEX ) hb_retni( retval ); } -/* WVW_CBfindString( [nWinNum], nCBid, cString ) +/* wvw_cbFindString( [nWinNum], nCBid, cString ) * find index of cString in combobox nCBid in window nWinNum * returns index of cString (0 based) * returns CB_ERR (-1) if string not found @@ -888,7 +888,7 @@ HB_FUNC( WVW_CBFINDSTRING ) hb_retni( retval ); } -/*WVW_cbGetCurText( [nWinNum], nCBid ) +/*wvw_cbGetCurText( [nWinNum], nCBid ) * get current selected cString in combobox nCBid in window nWinNum * returns "" if none selected * @@ -936,7 +936,7 @@ HB_FUNC( WVW_CBGETCURTEXT ) hb_xfree( lptstr ); } -/*WVW_cbIsDropped( [nWinNum], nCBid ) +/*wvw_cbIsDropped( [nWinNum], nCBid ) * get current dropped state of combobox nCBid in window nWinNum * returns .t. if listbox is being shown, otherwise .f. * Also returns .f. if nCBid not valid diff --git a/extras/gtwvw/wvwstbar.c b/extras/gtwvw/wvwstbar.c index 35f1197b47..2e255bc92a 100644 --- a/extras/gtwvw/wvwstbar.c +++ b/extras/gtwvw/wvwstbar.c @@ -77,7 +77,7 @@ /* STATUS BAR */ -/*WVW_SBcreate( [nWinNum] ) +/*wvw_sbCreate( [nWinNum] ) * create status bar for window nWinNum, with one part. * returns handle to status bar of windows nWinNum * returns 0 if failed, eg. if there is already a status bar for this window @@ -124,7 +124,7 @@ HB_FUNC( WVW_SBCREATE ) hb_retnl( ( LONG ) hWndSB ); } -/*WVW_SBdestroy( [nWinNum] ) +/*wvw_sbDestroy( [nWinNum] ) * destroy status bar for window nWinNum */ HB_FUNC( WVW_SBDESTROY ) @@ -148,7 +148,7 @@ HB_FUNC( WVW_SBDESTROY ) } } -/* WVW_SBaddPart(nWinNum, cMaxText, nWidth, nStyle, lResetParts, [cIcon , cToolTip]) +/* wvw_sbAddPart(nWinNum, cMaxText, nWidth, nStyle, lResetParts, [cIcon , cToolTip]) * ps. * lResetParts==.t. :: remove all previously created parts * nStyle: 0 (default), 0x0200 (SBT_POPOUT), 0x0100 (SBT_NOBORDERS) @@ -237,7 +237,7 @@ HB_FUNC( WVW_SBADDPART ) hb_retni( numOfParts ); } -/*WVW_SBrefresh(nWinNum) +/*wvw_sbRefresh(nWinNum) * reinitialize StatusBar's parts, eg. after window resize * TODO: do it automatically, after hb_gt_wvwResetWindowSize() * returns number of parts @@ -279,7 +279,7 @@ HB_FUNC( WVW_SBREFRESH ) hb_retni( numOfParts ); } -/*WVW_SBsetText([nWinNum], [nPart], cText) +/*wvw_sbSetText([nWinNum], [nPart], cText) * Set Text of status bar's part #npart */ HB_FUNC( WVW_SBSETTEXT ) @@ -314,7 +314,7 @@ HB_FUNC( WVW_SBSETTEXT ) SendMessage( pWindowData->hStatusBar, SB_SETTEXT, iPart, ( LPARAM ) hb_parcx( 3 ) ); } -/*WVW_SBgetText([nWinNum], [nPart]) +/*wvw_sbGetText([nWinNum], [nPart]) * Get Text of status bar's part #npart */ HB_FUNC( WVW_SBGETTEXT ) @@ -328,7 +328,7 @@ HB_FUNC( WVW_SBGETTEXT ) hb_retc( cString ); } -/*WVW_SBgetparts([nWinNum]) +/*wvw_sbGetParts([nWinNum]) * Get number of parts in statusbar of window nWinNum */ HB_FUNC( WVW_SBGETPARTS ) @@ -340,7 +340,7 @@ HB_FUNC( WVW_SBGETPARTS ) hb_retni( numOfParts ); } -/*WVW_SBSetFont([nWinNum], cFontFace, nHeight, nWidth, nWeight, nQUality,; +/*wvw_sbSetFont([nWinNum], cFontFace, nHeight, nWidth, nWeight, nQUality,; * lItalic, lUnderline, lStrikeout * */ @@ -385,7 +385,7 @@ HB_FUNC( WVW_SBSETFONT ) } -/*WVW_XBcreate( [nWinNum], nStyle, nTop, nLeft, nLength, bBlock, aOffset) +/*wvw_xbCreate( [nWinNum], nStyle, nTop, nLeft, nLength, bBlock, aOffset) * create scroll bar for window nWinNum * nStyle: SBS_HORZ (0)=horizontal, SBS_VERT (1)=vertical * nTop: row of top/left corner (in character unit) @@ -422,12 +422,12 @@ HB_FUNC( WVW_SBSETFONT ) * returns 0 if failed * * example: - * WVW_XBcreate( , 1, 10, 70, 12) + * wvw_xbCreate( , 1, 10, 70, 12) * :: creates Vertical scrollbar on current window at (10,70) with length 12 * dimensions using default ones. * buttons/parts behaviour using default ones. * - * WVW_XBcreate( , 1, 10, 70, 12, {0, +5, 0, +5} ) + * wvw_xbCreate( , 1, 10, 70, 12, {0, +5, 0, +5} ) * :: creates Vertical scrollbar on current window at (10,70) with length 12 * left and right coordinate is shifted 5 pixels to the right. * buttons/parts behaviour using default ones. @@ -551,7 +551,7 @@ HB_FUNC( WVW_XBCREATE ) hb_retnl( ( LONG ) 0 ); } -/*WVW_XBdestroy( [nWinNum], nXBid ) +/*wvw_xbDestroy( [nWinNum], nXBid ) * destroy scrollbar nXBid for window nWinNum */ HB_FUNC( WVW_XBDESTROY ) @@ -587,7 +587,7 @@ HB_FUNC( WVW_XBDESTROY ) hb_xfree( pcd ); } -/*WVW_XBupdate(nWinNum, XBid, [nPos], [nPageSize], [nMin], [nMax]) +/*wvw_xbUpdate(nWinNum, XBid, [nPos], [nPageSize], [nMin], [nMax]) * update scrollbar data and its display * nPos, nPageSize, nMin, nMax are optional. * however, both nMin & nMax must be supplied, or not at all. @@ -636,7 +636,7 @@ HB_FUNC( WVW_XBUPDATE ) hb_retni( iRetval ); } -/* WVW_XBinfo( [nWinNum], XBid ) +/* wvw_xbInfo( [nWinNum], XBid ) * return an array {nMin, nMax, nPageSize, nPos, nTrackPos } * return an empty array {} if invalid parameter passed. */ @@ -681,7 +681,7 @@ HB_FUNC( WVW_XBINFO ) hb_itemReturnRelease( aInfo ); } -/* WVW_XBenable( [nWinNum], nXBid, nFlags ) +/* wvw_xbEnable( [nWinNum], nXBid, nFlags ) * enable/disable scrollbar nXBid in window nWinNum (default to topmost window) * nFlags: ESB_ENABLE_BOTH 0: enable both arrows * ESB_DISABLE_LEFT/ESB_DISABLE_UP 1: disable left/up arrow @@ -707,7 +707,7 @@ HB_FUNC( WVW_XBENABLE ) hb_retl( EnableScrollBar( hWndXB, SB_CTL, uiFlags ) ); } -/* WVW_XBshow( [nWinNum], nXBid, lShow ) +/* wvw_xbShow( [nWinNum], nXBid, lShow ) * show/hide scrollbar nXBid in window nWinNum (default to topmost window) * nXBid is the handle of the scrolbar * lShow: .T. shows the scrolbar (default) diff --git a/extras/gtwvw/wvwtbar.c b/extras/gtwvw/wvwtbar.c index e188d03ca6..74a7a4dfa5 100644 --- a/extras/gtwvw/wvwtbar.c +++ b/extras/gtwvw/wvwtbar.c @@ -73,7 +73,7 @@ #include "hbgtwvw.h" -/*WVW_TBCreate([nWinNum], lDisplayText, nStyle, nSystemBitmap, nImageWidth, nImageHeight) +/*wvw_tbCreate([nWinNum], lDisplayText, nStyle, nSystemBitmap, nImageWidth, nImageHeight) * creates a toolbar at the top (no button initially) * lDisplayText==.f. button's string is used as tooltips (default) * nStyle: toolbar style, defaults to TBSTYLE_FLAT | TBSTYLE_TOOLTIPS @@ -201,7 +201,7 @@ HB_FUNC( WVW_TBCREATE ) hb_retnl( ( LONG ) hWndTB ); } -/*WVW_TBAddButton([nWinNum], nCommand, xBitmap, cLabel, nBitmapType,; +/*wvw_tbAddButton([nWinNum], nCommand, xBitmap, cLabel, nBitmapType,; * lMap3Dcolors, lDropdown) * adds one button on the right of existing buttons * xBitmap: @@ -291,7 +291,7 @@ HB_FUNC( WVW_TBADDBUTTON ) hb_retl( TRUE ); } -/*WVW_TBButtonCount([nWinNum]) +/*wvw_tbButtonCount([nWinNum]) * returns number of buttons in toolbar on window nWinNum */ HB_FUNC( WVW_TBBUTTONCOUNT ) @@ -310,7 +310,7 @@ HB_FUNC( WVW_TBBUTTONCOUNT ) hb_retni( SendMessage( hWndTB, TB_BUTTONCOUNT, ( WPARAM ) 0, ( LPARAM ) 0 ) ); } -/*WVW_TBDelButton([nWinNum], nButton) +/*wvw_tbDelButton([nWinNum], nButton) * nButton is zero based index of button to delete * index=0 is the leftmost button * NOTE: button separator is indexed and deleteable too @@ -346,7 +346,7 @@ HB_FUNC( WVW_TBDELBUTTON ) hb_retl( TRUE ); } -/* WVW_TBGetButtonRect([nWinNum], nButton) +/* wvw_tbGetButtonRect([nWinNum], nButton) * return an array {nRowStart, nColStart, nRowStop, nColStop} */ HB_FUNC( WVW_TBGETBUTTONRECT ) @@ -385,7 +385,7 @@ HB_FUNC( WVW_TBGETBUTTONRECT ) } -/*WVW_TBEnableButton([nWinNum], nButton, [lToggle]) +/*wvw_tbEnableButton([nWinNum], nButton, [lToggle]) * nButton is zero based index of button to enable/disable * index=0 is the leftmost button * NOTE: button separator is indexed too @@ -431,7 +431,7 @@ HB_FUNC( WVW_TBENABLEBUTTON ) hb_retl( TRUE ); } -/*WVW_TBdestroy( [nWinNum] ) +/*wvw_tbDestroy( [nWinNum] ) * destroy toolbar for window nWinNum */ HB_FUNC( WVW_TBDESTROY ) @@ -449,7 +449,7 @@ HB_FUNC( WVW_TBDESTROY ) } } -/*WVW_TBINDEX2CMD([nWinNum], nIndex) +/*wvw_tbIndex2Cmd([nWinNum], nIndex) * returns Command Id of button nIndex (0 based) * returns -1 if the button does not exist */ @@ -464,7 +464,7 @@ HB_FUNC( WVW_TBINDEX2CMD ) hb_retni( ( int ) ( iCmd > 0 ? iCmd : -1 ) ); } -/*WVW_TBCmd2Index([nWinNum], nCmd) +/*wvw_tbCmd2Index([nWinNum], nCmd) * returns Index (0 based) of button whose command id is nCmd * returns -1 if the button does not exist */ diff --git a/include/hbapi.h b/include/hbapi.h index 295f95f74d..7b57097c40 100644 --- a/include/hbapi.h +++ b/include/hbapi.h @@ -941,7 +941,7 @@ extern HB_EXPORT HB_SIZE hb_strnlen( const char * pszText, HB_SIZE nLen ); /* extern HB_EXPORT char * hb_xstrcat( char * dest, const char * src, ... ); /* Concatenates multiple strings into a single result */ extern HB_EXPORT char * hb_xstrcpy( char * szDest, const char * szSrc, ... ); /* Concatenates multiple strings into a single result */ extern HB_EXPORT HB_BOOL hb_compStrToNum( const char * szNum, HB_SIZE nLen, HB_MAXINT * pnVal, double * pdVal, int * piDec, int * piWidth ); /* converts string to number, sets iDec, iWidth and returns HB_TRUE if results is double, used by compiler */ -extern HB_EXPORT HB_BOOL hb_valStrnToNum( const char * szNum, HB_SIZE nLen, HB_MAXINT * pnVal, double * pdVal, int * piDec, int * piWidth ); /* converts string to number, sets iDec, iWidth and returns HB_TRUE if results is double, used by VAL() */ +extern HB_EXPORT HB_BOOL hb_valStrnToNum( const char * szNum, HB_SIZE nLen, HB_MAXINT * pnVal, double * pdVal, int * piDec, int * piWidth ); /* converts string to number, sets iDec, iWidth and returns HB_TRUE if results is double, used by Val() */ extern HB_EXPORT HB_BOOL hb_strToNum( const char * szNum, HB_MAXINT * pnVal, double * pdVal ); /* converts string to number, returns HB_TRUE if results is double */ extern HB_EXPORT HB_BOOL hb_strnToNum( const char * szNum, HB_SIZE nLen, HB_MAXINT * pnVal, double * pdVal ); /* converts string to number, returns HB_TRUE if results is double */ extern HB_EXPORT int hb_snprintf( char * buffer, size_t bufsize, const char * format, ... ) HB_PRINTF_FORMAT( 3, 4 ); /* snprintf() equivalent */ diff --git a/include/hbapirdd.h b/include/hbapirdd.h index 1152a49d25..0e3b263462 100644 --- a/include/hbapirdd.h +++ b/include/hbapirdd.h @@ -391,7 +391,7 @@ typedef struct typedef DBEVALINFO * LPDBEVALINFO; /* - * NOTE: If your redefine EVAL() method then you may use itmBlock as + * NOTE: If your redefine Eval() method then you may use itmBlock as * string ITEM to make some operations on server side of remote RDD. */ diff --git a/include/hbdefs.h b/include/hbdefs.h index d6d56b34ce..14c9e5fa8c 100644 --- a/include/hbdefs.h +++ b/include/hbdefs.h @@ -537,7 +537,7 @@ typedef HB_MAXUINT HB_VMMAXUINT; # define HB_LONG_EXPLENGTH( l ) HB_LONG_LENGTH( l ) #endif -/* HB_DBL_LENGTH() is used by VAL() for strings longer then 10 characters +/* HB_DBL_LENGTH() is used by Val() for strings longer then 10 characters * (counted to '.') and to set the size of math operations and new * double item - it's CA-Cl*pper compatible range. For doubles we do * not have separated limit for result of math operations. [druzus] diff --git a/include/hbexpra.c b/include/hbexpra.c index 9389759cc3..dae5fd206d 100644 --- a/include/hbexpra.c +++ b/include/hbexpra.c @@ -254,7 +254,7 @@ PHB_EXPR hb_compExprNewFunCall( PHB_EXPR pName, PHB_EXPR pParms, HB_COMP_DECL ) /* replace: _GET_( a[1], "a[1]", , , ) into: - __GETA( {||a }, "a", , , , { 1 } ) + __GetA( {||a }, "a", , , , { 1 } ) */ PHB_EXPR pIndex, pVar; PHB_EXPR pBase; @@ -304,7 +304,7 @@ PHB_EXPR hb_compExprNewFunCall( PHB_EXPR pName, PHB_EXPR pParms, HB_COMP_DECL ) */ pIndex = hb_compExprNewArray( hb_compExprNewList( pIndex, HB_COMP_PARAM ), HB_COMP_PARAM ); /* The array with index elements have to be the sixth argument - * of __GETA() call + * of __GetA() call */ uiCount = 1; while( ++uiCount < 6 ) @@ -360,8 +360,8 @@ PHB_EXPR hb_compExprNewFunCall( PHB_EXPR pName, PHB_EXPR pParms, HB_COMP_DECL ) } else if( pArg->ExprType == HB_ET_MACRO ) { - /* @ 0,0 GET &var => __GET( NIL, var,... ) - * @ 0,0 GET var&var => __GET( NIL, "var&var",... ) + /* @ 0,0 GET &var => __Get( NIL, var,... ) + * @ 0,0 GET var&var => __Get( NIL, "var&var",... ) */ pName->value.asSymbol.name = "__GET"; if( pArg->value.asMacro.pExprList == NULL ) diff --git a/include/hbexprb.c b/include/hbexprb.c index b6155370e1..b4764f3c6c 100644 --- a/include/hbexprb.c +++ b/include/hbexprb.c @@ -1644,7 +1644,7 @@ static HB_EXPR_FUNC( hb_compExprUseMacro ) else if( pSelf->value.asMacro.SubType & HB_ET_MACRO_PARE ) { /* var := (somevalue, ¯o) - in Xbase++ compatibility mode - * EVAL( {|| ¯o} ) - in all cases + * Eval( {|| ¯o} ) - in all cases */ HB_GEN_FUNC1( PCode1, HB_P_MACROPUSHPARE ); } @@ -4527,7 +4527,7 @@ static HB_BOOL hb_compExprCodeblockPush( PHB_EXPR pSelf, int iEarlyEvalPass, HB_ { /* Clipper allows for list expressions in a codeblock * macro := "1,2" - * EVAL( {|| ¯o} ) + * Eval( {|| ¯o} ) */ pExpr->value.asMacro.SubType |= HB_ET_MACRO_PARE; } @@ -4551,7 +4551,7 @@ static HB_BOOL hb_compExprCodeblockPush( PHB_EXPR pSelf, int iEarlyEvalPass, HB_ /* NOTE: This will genereate warnings if constant value is * used as an expression - some operators will generate it too * e.g. - * EVAL( {|| 3+5, func()} ) + * Eval( {|| 3+5, func()} ) */ #if defined( HB_MACRO_SUPPORT ) if( pNext ) diff --git a/include/hbpcode.h b/include/hbpcode.h index 0abc9abfbf..4bd8b09d7f 100644 --- a/include/hbpcode.h +++ b/include/hbpcode.h @@ -105,7 +105,7 @@ typedef enum HB_P_MACROPOP, /* 38 compile and run - pop a value from the stack */ HB_P_MACROPOPALIASED, /* 39 compile and run - pop a field value from the stack */ HB_P_MACROPUSH, /* 40 compile and run - leave the result on the stack */ - HB_P_MACROARRAYGEN, /* 41 generate array from arguments set(s) on HVM stack { &var } */ + HB_P_MACROARRAYGEN, /* 41 generate array from arguments Set(s) on HVM stack { &var } */ HB_P_MACROPUSHLIST, /* 42 compile and run - leave the result on the stack */ HB_P_MACROPUSHINDEX, /* 43 push array items using macro array index */ HB_P_MACROPUSHPARE, /* 44 compile and run - leave the result on the stack */ diff --git a/include/hbpp.h b/include/hbpp.h index fa360966ec..d0d92a0aac 100644 --- a/include/hbpp.h +++ b/include/hbpp.h @@ -301,7 +301,7 @@ typedef HB_PP_MSG_FUNC_( ( * PHB_PP_MSG_FUNC ) ); properly parsed, f.e: ? 1 + + 2 does not work when - qout( 1 + + 2 ) + QOut( 1 + + 2 ) perfectly does. It this difference will be reason of some problems then please inform me with a code example so I'll be able if it should be implemented or not. diff --git a/include/hbrddcdx.h b/include/hbrddcdx.h index 6f1a424ba1..465880a87e 100644 --- a/include/hbrddcdx.h +++ b/include/hbrddcdx.h @@ -155,11 +155,11 @@ HB_EXTERN_BEGIN case CDX_TYPE_TEMPORARY | CDX_TYPE_CUSTOM: PARTIAL_RYO | NOUPDATE_RYO if index key begin with: - 'SXCHAR(' or 'SXNUM(' or 'SXDATE(' or 'SXLOG(' + 'sxChar(' or 'sxNum(' or 'sxDate(' or 'sxLog(' then | TEMPLATE_RYO - sx_chill() if ( ! NOUPDATE_RYO ) then set ( CHGONLY_RYO | PARTIAL_RYO ) + sx_Chill() if ( ! NOUPDATE_RYO ) then set ( CHGONLY_RYO | PARTIAL_RYO ) if ( indexOpt & ( CDX_TYPE_TEMPORARY | CDX_TYPE_CUSTOM ) != CDX_TYPE_TEMPORARY | CDX_TYPE_CUSTOM ) { @@ -167,7 +167,7 @@ HB_EXTERN_BEGIN indexOpt |= CDX_TYPE_TEMPORARY } - sx_warm() if ( ! NOUPDATE_RYO ) then clear CHGONLY_RYO + sx_Warm() if ( ! NOUPDATE_RYO ) then clear CHGONLY_RYO if ( indexOpt & ( CDX_TYPE_TEMPORARY | CDX_TYPE_CUSTOM ) != CDX_TYPE_TEMPORARY | CDX_TYPE_CUSTOM ) { @@ -175,7 +175,7 @@ HB_EXTERN_BEGIN indexOpt &= ~CDX_TYPE_TEMPORARY } - sx_freeze() set NOUPDATE_RYO + sx_Freeze() set NOUPDATE_RYO indexOpt |= CDX_TYPE_TEMPORARY | CDX_TYPE_CUSTOM; */ diff --git a/include/hbrddnsx.h b/include/hbrddnsx.h index 1baa7fe4bc..73f687565c 100644 --- a/include/hbrddnsx.h +++ b/include/hbrddnsx.h @@ -336,7 +336,7 @@ typedef struct _NSXLEAFKEY */ HB_UCHAR DupCount[1]; /* number of bytes from previous key */ HB_UCHAR KeyData[l]; /* rest of key value with RLE compression: - * FF xx yy => REPLICATE(yy, xx) + * FF xx yy => Replicate(yy, xx) * FF 01 => FF * l = Size - n - 2 * if l == KEY_SIZE - DupCount then key value diff --git a/src/codepage/cp_utf8.c b/src/codepage/cp_utf8.c index 4590d1e868..6bb0bf3dbc 100644 --- a/src/codepage/cp_utf8.c +++ b/src/codepage/cp_utf8.c @@ -281,7 +281,7 @@ static void hb_cp_init( PHB_CODEPAGE cdp ) /* use character indexes instead of bytes ones */ #define HB_CP_CHARIDX -/* CHR(), ASC() and similar functions operates on Unicode values instead of bytes */ +/* Chr(), Asc() and similar functions operates on Unicode values instead of bytes */ #define HB_CP_CHARUNI /* UTF-8 string encoding */ #define HB_CP_UTF8 diff --git a/src/common/expropt1.c b/src/common/expropt1.c index b28af51430..3f59fa86b3 100644 --- a/src/common/expropt1.c +++ b/src/common/expropt1.c @@ -1371,7 +1371,7 @@ HB_SIZE hb_compExprParamListCheck( HB_COMP_DECL, PHB_EXPR pExpr ) { /* ¯o was passed or optional parameters list passed, f.e.: f(a,b,...) - or hb_arrayToParams( aParams ) + or hb_ArrayToParams( aParams ) - handle it differently then in a normal statement */ if( pElem->ExprType == HB_ET_MACRO ) pElem->value.asMacro.SubType |= HB_ET_MACRO_LIST; diff --git a/src/common/expropt2.c b/src/common/expropt2.c index 936a9a129e..f3c4d54b72 100644 --- a/src/common/expropt2.c +++ b/src/common/expropt2.c @@ -1987,7 +1987,7 @@ HB_BOOL hb_compExprReduceAT( PHB_EXPR pSelf, HB_COMP_DECL ) if( pSub->ExprType == HB_ET_STRING && pText->ExprType == HB_ET_STRING && ! HB_SUPPORT_USERCP ) { - /* NOTE: CA-Cl*pper has a bug in AT("",cText) compile time + /* NOTE: CA-Cl*pper has a bug in At("",cText) compile time * optimization and always set 1 as result in such cses. * This bug exist only in compiler and CA-Cl*pper macro * compiler does not have optimizer. This bug is replicated @@ -2041,7 +2041,7 @@ HB_BOOL hb_compExprReduceCHR( PHB_EXPR pSelf, HB_COMP_DECL ) if( fDoOpt ) { /* NOTE: CA-Cl*pper's compiler optimizer will be wrong for those - * CHR() cases where the passed parameter is a constant which + * Chr() cases where the passed parameter is a constant which * can be divided by 256 but it's not zero, in this case it * will return an empty string instead of a Chr(0). [vszakats] * diff --git a/src/compiler/cmdcheck.c b/src/compiler/cmdcheck.c index 1f14a0f6ba..86aff9665b 100644 --- a/src/compiler/cmdcheck.c +++ b/src/compiler/cmdcheck.c @@ -45,7 +45,7 @@ #include "hbdate.h" /* TODO: Add support for this compiler switches - -r -t || hb_getenv( "TMP" ) + -r -t || hb_GetEnv( "TMP" ) */ @@ -1086,14 +1086,14 @@ void hb_compChkCompilerSwitch( HB_COMP_DECL, int iArg, const char * const Args[] /* NOTE: CLIPPERCMD enviroment variable is overriden if HARBOURCMD exists */ - char * szStrEnv = hb_getenv( "HARBOURCMD" ); + char * szStrEnv = hb_GetEnv( "HARBOURCMD" ); if( ! szStrEnv || szStrEnv[ 0 ] == '\0' ) { if( szStrEnv ) hb_xfree( szStrEnv ); - szStrEnv = hb_getenv( "CLIPPERCMD" ); + szStrEnv = hb_GetEnv( "CLIPPERCMD" ); } if( szStrEnv ) @@ -1126,7 +1126,7 @@ void hb_compChkCompilerSwitch( HB_COMP_DECL, int iArg, const char * const Args[] void hb_compChkPaths( HB_COMP_DECL ) { - char * szInclude = hb_getenv( "INCLUDE" ); + char * szInclude = hb_GetEnv( "INCLUDE" ); if( szInclude ) { @@ -1185,14 +1185,14 @@ void hb_compChkDefines( HB_COMP_DECL, int iArg, const char * const Args[] ) { /* NOTE: CLIPPERCMD enviroment variable is overriden if HARBOURCMD exists */ - char * szStrEnv = hb_getenv( "HARBOURCMD" ); + char * szStrEnv = hb_GetEnv( "HARBOURCMD" ); if( ! szStrEnv || szStrEnv[ 0 ] == '\0' ) { if( szStrEnv ) hb_xfree( szStrEnv ); - szStrEnv = hb_getenv( "CLIPPERCMD" ); + szStrEnv = hb_GetEnv( "CLIPPERCMD" ); } if( szStrEnv ) diff --git a/src/compiler/genc.c b/src/compiler/genc.c index 86e5aa77b1..9d43cc52d2 100644 --- a/src/compiler/genc.c +++ b/src/compiler/genc.c @@ -505,7 +505,7 @@ static void hb_compGenCByteStr( FILE * yyc, const HB_BYTE * pText, HB_SIZE nLen { HB_BYTE uchr = ( HB_BYTE ) pText[ nPos ]; /* - * NOTE: After optimization some CHR(n) can be converted + * NOTE: After optimization some Chr(n) can be converted * into a string containing nonprintable characters. * * TODO: add switch to use hexadecimal format "%#04x" diff --git a/src/compiler/gencc.c b/src/compiler/gencc.c index 41c8dbfe2d..9a4b21c99e 100644 --- a/src/compiler/gencc.c +++ b/src/compiler/gencc.c @@ -79,7 +79,7 @@ void hb_compGenCString( FILE * yyc, const HB_BYTE * pText, HB_SIZE nLen ) { HB_BYTE uchr = ( HB_BYTE ) pText[ nPos ]; /* - * NOTE: After optimization some CHR(n) can be converted + * NOTE: After optimization some Chr(n) can be converted * into a string containing nonprintable characters. * * ? is escaped to avoid conflicts with trigraph sequences which diff --git a/src/compiler/hbfunchk.c b/src/compiler/hbfunchk.c index ad9c02c92a..410a43d92d 100644 --- a/src/compiler/hbfunchk.c +++ b/src/compiler/hbfunchk.c @@ -117,7 +117,7 @@ HB_BOOL hb_compFunCallCheck( HB_COMP_DECL, const char * szFuncCall, int iArgs ) int iLen = ( int ) strlen( szFuncCall ), iCmp; /* Respect 4 or more letters shortcuts - * SECO() is not allowed because of Clipper function SECONDS() + * SECO() is not allowed because of Clipper function Seconds() * however SECO32() is a valid name. */ if( iLen < 4 ) diff --git a/src/compiler/hbopt.c b/src/compiler/hbopt.c index 2ce39cbe4b..e0266d310b 100644 --- a/src/compiler/hbopt.c +++ b/src/compiler/hbopt.c @@ -973,7 +973,7 @@ static HB_BOOL hb_compIsUncondJump( HB_BYTE bPCode ) warning in code: BEGIN SEQUENCE nI := 1 - BREAK(NIL) + Break(NIL) RECOVER ? nI END SEQUENCE diff --git a/src/pp/pplib.c b/src/pp/pplib.c index 975a05b6da..07bf1af1f3 100644 --- a/src/pp/pplib.c +++ b/src/pp/pplib.c @@ -150,7 +150,7 @@ PHB_PP_STATE hb_pp_Param( int iParam ) /* * initialize new PP context and return pointer to it. - * __PP_INIT( [], [ ] [, ] ) -> + * __pp_Init( [], [ ] [, ] ) -> * when is empty string ("") then no default rules are used * only the dynamically created #defines like __HARBOUR__, __DATE__, __TIME__ */ @@ -192,7 +192,7 @@ HB_FUNC( __PP_INIT ) /* * add new (or replace previous) include paths. - * __PP_PATH( , [, ] ) -> NIL + * __pp_Path( , [, ] ) -> NIL */ HB_FUNC( __PP_PATH ) { @@ -204,7 +204,7 @@ HB_FUNC( __PP_PATH ) /* * reset the PP context (remove all rules added by user or preprocessed code) - * __PP_RESET( ) -> NIL + * __pp_Reset( ) -> NIL */ HB_FUNC( __PP_RESET ) { @@ -216,7 +216,7 @@ HB_FUNC( __PP_RESET ) /* * preprocess and execute new preprocessor directive - * __PP_ADDRULE( , ) -> + * __pp_AddRule( , ) -> */ HB_FUNC( __PP_ADDRULE ) { @@ -258,7 +258,7 @@ HB_FUNC( __PP_ADDRULE ) /* * preprocess given code and return result - * __PP_PROCESS( , ) -> + * __pp_Process( , ) -> */ HB_FUNC( __PP_PROCESS ) { diff --git a/src/rdd/dbcmd.c b/src/rdd/dbcmd.c index 552e85469c..3e4bc5f70c 100644 --- a/src/rdd/dbcmd.c +++ b/src/rdd/dbcmd.c @@ -53,7 +53,7 @@ * * hb_rddIterateWorkAreas() * hb_rddGetTempAlias() - * hb_RDDGETTEMPALIAS() + * hb_rddGetTempAlias() * */ @@ -457,7 +457,7 @@ HB_FUNC( HB_DBCREATETEMP ) * tested it with Clipper yet. If it doesn't then please inform me about it * and I'll update the code. [druzus] */ -/* __dbopensdf( cFile, aStruct, cRDD, lKeepOpen, cAlias, cDelimArg, cCodePage, nConnection ) */ +/* __dbOpenSDF( cFile, aStruct, cRDD, lKeepOpen, cAlias, cDelimArg, cCodePage, nConnection ) */ HB_FUNC( __DBOPENSDF ) { const char * szFileName, * szAlias, * szDriver, * szCpId; @@ -1068,7 +1068,7 @@ HB_FUNC( INDEXORD ) hb_retni( 0 ); } -/* Same as RECCOUNT() */ +/* Same as RecCount() */ HB_FUNC( LASTREC ) { HB_ULONG ulRecCount = 0; @@ -1221,7 +1221,7 @@ HB_FUNC( ORDCONDSET ) lpdbOrdCondInfo->fNoOptimize = hb_parl( 16 ); /* 18th parameter in [x]Harbour is MEMORY flag added by Alexander for DBFNTX, so far it was served in hacked way inside SELF_ORDSETCOND() - so it was working only if this method was called from ORDCONDSET() + so it was working only if this method was called from ordCondSet() function. I also do not like the idea that it was called MEMORY. It should be RDD decision how such index will be served on low level and it should be IMHO called TEMPORARY - if RDD wants then @@ -1585,7 +1585,7 @@ HB_FUNC( RDDREGISTER ) } } -/* Same as LASTREC() */ +/* Same as LastRec() */ HB_FUNC_TRANSLATE( RECCOUNT, LASTREC ) HB_FUNC( RECNO ) diff --git a/src/rdd/dbf1.c b/src/rdd/dbf1.c index b9bb325a01..18b742fd8e 100644 --- a/src/rdd/dbf1.c +++ b/src/rdd/dbf1.c @@ -1137,7 +1137,7 @@ HB_ERRCODE hb_dbfGetMemoData( DBFAREAP pArea, HB_USHORT uiIndex, } } /* - * check for NULL fields created by Access, they have chr(0) set + * check for NULL fields created by Access, they have Chr(0) set * in the whole memo block address, [druzus] */ else if( pArea->pRecord[ pArea->pFieldOffset[ uiIndex ] ] != 0 ) @@ -5639,7 +5639,7 @@ static HB_ERRCODE hb_dbfDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pIte * supported and if yes then try to delete memo file if it exists * in the same directory as table file * hb_fsFNameSplit() repeated intentionally to respect - * the path set by hb_fileExists() + * the path set by hb_FileExists() */ pFileName = hb_fsFNameSplit( szFileName ); pFileExt = hb_itemPutC( pFileExt, NULL ); @@ -5752,7 +5752,7 @@ static HB_ERRCODE hb_dbfRename( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pI if( szFile[ 0 ] && hb_fileExists( szFileName, szFileName ) ) { /* hb_fsFNameSplit() repeated intentionally to respect - * the path set by hb_fileExists() + * the path set by hb_FileExists() */ pFileName = hb_fsFNameSplit( szFileName ); diff --git a/src/rdd/dbfcdx/dbfcdx1.c b/src/rdd/dbfcdx/dbfcdx1.c index 0f2442d9a0..d82514011a 100644 --- a/src/rdd/dbfcdx/dbfcdx1.c +++ b/src/rdd/dbfcdx/dbfcdx1.c @@ -6570,7 +6570,7 @@ static HB_ERRCODE hb_cdxSeek( CDXAREAP pArea, HB_BOOL fSoftSeek, PHB_ITEM pKeyIt else fLast = pTag->UsrAscend ? fFindLast : ! fFindLast; - /* TODO: runtime error if valtype(pKeyItm) != pTag->Type */ + /* TODO: runtime error if ValType(pKeyItm) != pTag->Type */ pKey = hb_cdxKeyPutItem( NULL, pKeyItm, fLast ? CDX_MAX_REC_NUM : CDX_IGNORE_REC_NUM, pTag, HB_TRUE, CDX_CMP_PREFIX ); diff --git a/src/rdd/hbsix/sxcompr.c b/src/rdd/hbsix/sxcompr.c index 8ddf052351..d99b316dcc 100644 --- a/src/rdd/hbsix/sxcompr.c +++ b/src/rdd/hbsix/sxcompr.c @@ -110,7 +110,7 @@ I do not want to make the same. When file is compressed then SIX put the uncompressed file size in first four bytes. Similar situation is with string returned by - sx_compress() - first four bytes is uncompressed size in little + sx_Compress() - first four bytes is uncompressed size in little endian order. This has to be done in upper level functions, hb_LZSSxCompressMem() and hb_LZSSxCompressFile() intentionally do not do that. diff --git a/src/rdd/hbsix/sxord.c b/src/rdd/hbsix/sxord.c index 3220b78f80..8d83db5866 100644 --- a/src/rdd/hbsix/sxord.c +++ b/src/rdd/hbsix/sxord.c @@ -127,7 +127,7 @@ HB_FUNC( SX_TAGORDER ) } /* - * Sx_TagNo(tag,bag) -> nTagPosInBag + * sx_TagNo(tag,bag) -> nTagPosInBag * returns order position in order bag */ HB_FUNC( SX_TAGNO ) diff --git a/src/rdd/hsx/hsx.c b/src/rdd/hsx/hsx.c index fd4076c88b..01064b09ce 100644 --- a/src/rdd/hsx/hsx.c +++ b/src/rdd/hsx/hsx.c @@ -194,7 +194,7 @@ which are related to workarea errors 6. The literal version passed to HS_SET is remembered and can be later used by HS_VERIFY if not given explicitly. - 7. HS_VERIFY respects the lCase flag (fixed SIX bug) and also CftsVeri() + 7. HS_VERIFY respects the lCase flag (fixed SIX bug) and also cftsVeri() syntax (first parameter in numeric indicating the HSX handler) See also the note about HS_SET. 8. HS_FILTER respects the filter flags in verification process, it @@ -204,7 +204,7 @@ 8. HS_ADD and HS_REPLACE have optional additional logical parameter which allow to set DELETE flag in new/modified record 9. Mindaugas noticed me that tests shows CFTS effectively - uses only the part of string to first chr(0) byte. + uses only the part of string to first Chr(0) byte. In first version this behavior was emulated but later I read in CFTS documentation that behavior for strings with embedded 0 is undefined (so it was not intentionally designed) @@ -472,7 +472,7 @@ static void hb_hsxHashStr( const char * pStr, HB_SIZE nLen, HB_BYTE * pKey, int memset( pKey, '\0', iKeySize ); #if 0 /* This code keeps the strict CFTS behavior which stops string - manipulating at first chr(0) character */ + manipulating at first Chr(0) character */ if( pStr && nLen-- && ( c1 = ( HB_UCHAR ) *pStr++ ) != 0 ) { while( nLen-- && ( c2 = ( HB_UCHAR ) *pStr++ ) != 0 ) @@ -530,7 +530,7 @@ static int hb_hsxStrCmp( const char * pSub, HB_SIZE nSub, const char * pStr, HB_ } } #if 0 -/* This code is for strict CftsVeri() behavior - uncomment if necessary +/* This code is for strict cftsVeri() behavior - uncomment if necessary but it's IMHO bug */ if( iFilter == 1 ) { diff --git a/src/rtl/chruni.c b/src/rtl/chruni.c index 6769ab71f3..abaec3af52 100644 --- a/src/rtl/chruni.c +++ b/src/rtl/chruni.c @@ -53,7 +53,7 @@ #include "hbapiitm.h" #include "hbapierr.h" -/* HB_UCHAR( ) -> +/* hb_UChar( ) -> * return string with U+nCode character in HVM CP encoding */ HB_FUNC( HB_UCHAR ) @@ -71,7 +71,7 @@ HB_FUNC( HB_UCHAR ) hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_BCHAR( ) -> +/* hb_BChar( ) -> * return 1 byte string with value */ HB_FUNC( HB_BCHAR ) @@ -86,7 +86,7 @@ HB_FUNC( HB_BCHAR ) hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_UCODE( ) -> +/* hb_UCode( ) -> * return unicode value of 1-st character (not byte) in given string */ HB_FUNC( HB_UCODE ) @@ -100,7 +100,7 @@ HB_FUNC( HB_UCODE ) hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_BCODE( ) -> +/* hb_BCode( ) -> * return value of 1-st byte in given string */ HB_FUNC( HB_BCODE ) @@ -113,7 +113,7 @@ HB_FUNC( HB_BCODE ) hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_ULEN( ) -> +/* hb_ULen( ) -> * return string length in characters */ HB_FUNC( HB_ULEN ) @@ -127,7 +127,7 @@ HB_FUNC( HB_ULEN ) hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_BLEN( ) -> +/* hb_BLen( ) -> * return string length in bytes */ HB_FUNC( HB_BLEN ) @@ -140,7 +140,7 @@ HB_FUNC( HB_BLEN ) hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_UPEEK( , ) -> +/* hb_UPeek( , ) -> * return unicode value of -th character in given string */ HB_FUNC( HB_UPEEK ) @@ -169,7 +169,7 @@ HB_FUNC( HB_UPEEK ) hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_BPEEK( , ) -> +/* hb_BPeek( , ) -> * return value of -th byte in given string */ HB_FUNC( HB_BPEEK ) @@ -187,7 +187,7 @@ HB_FUNC( HB_BPEEK ) hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_UPOKE( [@], , ) -> +/* hb_UPoke( [@], , ) -> * change -th character in given string to unicode one and return modified text */ HB_FUNC( HB_UPOKE ) @@ -239,7 +239,7 @@ HB_FUNC( HB_UPOKE ) hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_BPOKE( [@], , ) -> +/* hb_BPoke( [@], , ) -> * change -th byte in given string to and return modified text */ HB_FUNC( HB_BPOKE ) @@ -262,7 +262,7 @@ HB_FUNC( HB_BPOKE ) hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_USUBSTR( , , ) -> +/* hb_USubStr( , , ) -> */ HB_FUNC( HB_USUBSTR ) { @@ -310,7 +310,7 @@ HB_FUNC( HB_USUBSTR ) hb_errRT_BASE_SubstR( EG_ARG, 1110, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_BSUBSTR( , , ) -> +/* hb_BSubStr( , , ) -> */ HB_FUNC( HB_BSUBSTR ) { @@ -356,7 +356,7 @@ HB_FUNC( HB_BSUBSTR ) hb_errRT_BASE_SubstR( EG_ARG, 1110, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_ULEFT( , ) -> +/* hb_ULeft( , ) -> */ HB_FUNC( HB_ULEFT ) { @@ -382,7 +382,7 @@ HB_FUNC( HB_ULEFT ) hb_errRT_BASE_SubstR( EG_ARG, 1124, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_BLEFT( , ) -> +/* hb_BLeft( , ) -> */ HB_FUNC( HB_BLEFT ) { @@ -406,7 +406,7 @@ HB_FUNC( HB_BLEFT ) hb_errRT_BASE_SubstR( EG_ARG, 1124, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_URIGHT( , ) -> +/* hb_URight( , ) -> */ HB_FUNC( HB_URIGHT ) { @@ -434,7 +434,7 @@ HB_FUNC( HB_URIGHT ) hb_retc_null(); } -/* HB_BRIGHT( , ) -> +/* hb_BRight( , ) -> */ HB_FUNC( HB_BRIGHT ) { @@ -454,7 +454,7 @@ HB_FUNC( HB_BRIGHT ) } -/* HB_UAT( , , [], [] ) -> +/* hb_UAt( , , [], [] ) -> */ HB_FUNC( HB_UAT ) { @@ -508,7 +508,7 @@ HB_FUNC( HB_UAT ) hb_errRT_BASE_SubstR( EG_ARG, 1108, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_BAT( , , [], [] ) -> +/* hb_BAt( , , [], [] ) -> */ HB_FUNC( HB_BAT ) { diff --git a/src/rtl/cputime.c b/src/rtl/cputime.c index 5babbd0630..acd04178db 100644 --- a/src/rtl/cputime.c +++ b/src/rtl/cputime.c @@ -73,7 +73,7 @@ #endif /* - secondsCPU(n) -> nTime + SecondsCPU(n) -> nTime FlagShip/CLIP compatible function, which reports how many CPU and/or system seconds have elapsed since the beginning of the program execution. n == 1 utime -> user CPU time of the current process diff --git a/src/rtl/dateshb.c b/src/rtl/dateshb.c index abb2c6da1e..468b2b16e4 100644 --- a/src/rtl/dateshb.c +++ b/src/rtl/dateshb.c @@ -136,7 +136,7 @@ HB_FUNC( DTOS ) hb_errRT_BASE_SubstR( EG_ARG, 1120, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* NOTE: Harbour extension, exactly the same as STOD(). */ +/* NOTE: Harbour extension, exactly the same as SToD(). */ HB_FUNC( HB_STOD ) { diff --git a/src/rtl/filehb.c b/src/rtl/filehb.c index 4d7ecec180..3cdacab5ef 100644 --- a/src/rtl/filehb.c +++ b/src/rtl/filehb.c @@ -57,7 +57,7 @@ modification on the filename. [vszakats] For easier portability in Harbour user can optionally enable leading and trailing spaces stripping by - SET( _SET_TRIMFILENAME, .T. ) + Set( _SET_TRIMFILENAME, .T. ) [druzus] */ HB_FUNC( FILE ) diff --git a/src/rtl/filesys.c b/src/rtl/filesys.c index 6a8889e22f..0e8e62cf56 100644 --- a/src/rtl/filesys.c +++ b/src/rtl/filesys.c @@ -3798,7 +3798,7 @@ HB_FHANDLE hb_fsExtOpen( const char * pFilename, const char * pDefExt, hb_fsClose( hFile ); hFile = FS_ERROR; /* - * fix for neterr() support and Clipper compatibility, + * fix for NetErr() support and Clipper compatibility, * should be revised with a better multi platform solution. */ hb_fsSetError( ( uiExFlags & FXO_TRUNCATE ) ? 5 : 32 ); @@ -3818,7 +3818,7 @@ HB_FHANDLE hb_fsExtOpen( const char * pFilename, const char * pDefExt, } #elif 1 /* - * Temporary fix for neterr() support and Clipper compatibility, + * Temporary fix for NetErr() support and Clipper compatibility, * should be revised with a better solution. */ if( ( uiExFlags & ( FXO_TRUNCATE | FXO_APPEND | FXO_UNIQUE ) ) == 0 && diff --git a/src/rtl/gtsln/gtsln.c b/src/rtl/gtsln/gtsln.c index 7084e47f1b..c531eb1ee4 100644 --- a/src/rtl/gtsln/gtsln.c +++ b/src/rtl/gtsln/gtsln.c @@ -765,7 +765,7 @@ static void hb_gt_sln_SetBlink( PHB_GT pGT, HB_BOOL fBlink ) * extensions which can be hard coded only for given hardware (or * software terminal emulator). I think that if it's necessary then * user should add such tricks yourself to his programs using - * outstd( ) + * OutStd( ) * The only one thing I can make in portable way which will always * work is disabling sending BLINK attribute to remote terminal. So * in GTSLN like in GTCRS the function SetBlink( .F. ) does it, [Druzus] diff --git a/src/rtl/gtwvt/gtwvt.c b/src/rtl/gtwvt/gtwvt.c index 2d516377e7..794182f33a 100644 --- a/src/rtl/gtwvt/gtwvt.c +++ b/src/rtl/gtwvt/gtwvt.c @@ -3039,7 +3039,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) /* ********** Graphics API ********** */ /* * NOTE: - * gfxPrimitive() parameters may have different meanings + * GfxPrimitive() parameters may have different meanings * ie: - Desired color is 'iBottom' for PUTPIXEL and 'iRight' for CIRCLE * - Red is iTop, Green iLeft and Blue is iBottom for MAKECOLOR * diff --git a/src/rtl/gtxwc/gtxwc.c b/src/rtl/gtxwc/gtxwc.c index 813c3136c4..b00012968b 100644 --- a/src/rtl/gtxwc/gtxwc.c +++ b/src/rtl/gtxwc/gtxwc.c @@ -4792,7 +4792,7 @@ static HB_BOOL hb_gt_xwc_SetMode( PHB_GT pGT, int iRow, int iCol ) hb_gt_xwc_Enable(); /* hack for multiple window resizing when user executes - * series of setmode() function. I'll look for cleaner + * series of SetMode() function. I'll look for cleaner * solution in some spare time. */ hb_gt_xwc_RealRefresh( wnd, HB_TRUE ); diff --git a/src/rtl/hbgtcore.c b/src/rtl/hbgtcore.c index 549a8e7a18..8f7bc28bc9 100644 --- a/src/rtl/hbgtcore.c +++ b/src/rtl/hbgtcore.c @@ -936,7 +936,7 @@ static void hb_gt_def_WriteCon( PHB_GT pGT, const char * szText, HB_SIZE nLength HB_GTSELF_GETPOS( pGT, &iRow, &iCol ); - /* Limit the starting cursor position to maxrow(),maxcol() + /* Limit the starting cursor position to MaxRow(),MaxCol() on the high end, but don't limit it on the low end. */ if( iRow > iMaxRow || iCol > iMaxCol ) @@ -1078,7 +1078,7 @@ static void hb_gt_def_WriteConW( PHB_GT pGT, const HB_WCHAR * szText, HB_SIZE nL HB_GTSELF_GETPOS( pGT, &iRow, &iCol ); - /* Limit the starting cursor position to maxrow(),maxcol() + /* Limit the starting cursor position to MaxRow(),MaxCol() on the high end, but don't limit it on the low end. */ if( iRow > iMaxRow || iCol > iMaxCol ) @@ -3842,7 +3842,7 @@ void hb_gtStartupInit( void ) hb_errInternal( 9998, "Harbour terminal (GT) initialization failure", NULL, NULL ); - /* not executed, only to force linking HB_GTSYS() */ + /* not executed, only to force linking hb_GTSYS() */ HB_FUNC_EXEC( HB_GTSYS ); } diff --git a/src/rtl/hbinet.c b/src/rtl/hbinet.c index 3c24711375..9aadff9337 100644 --- a/src/rtl/hbinet.c +++ b/src/rtl/hbinet.c @@ -705,7 +705,7 @@ static void s_inetRecvInternal( int iMode ) if( iLen >= 0 ) { iReceived += iLen; - if( iMode == 0 ) /* Called from InetRecv()? */ + if( iMode == 0 ) /* Called from inetRecv()? */ break; } else if( iLen == -1 && hb_socketGetError() == HB_SOCKET_ERR_TIMEOUT ) diff --git a/src/rtl/hblpphb.c b/src/rtl/hblpphb.c index d3fff5ee59..54b805f06c 100644 --- a/src/rtl/hblpphb.c +++ b/src/rtl/hblpphb.c @@ -57,7 +57,7 @@ length of structure before the structure. The latter simple approach was used in Length Prefix Protocol (LPP). Protocol can easily be described by simple Clipper expression: - BIN2L(LEN(cData)) + cData + Bin2L(Len(cData)) + cData Future extensions: Protocol is limitted to 4GB size for a single LPP message. This can be extended in future to use highest bit of length diff --git a/src/rtl/hbmd5.c b/src/rtl/hbmd5.c index 22e8579476..12a4a99acf 100644 --- a/src/rtl/hbmd5.c +++ b/src/rtl/hbmd5.c @@ -56,7 +56,7 @@ PRG functions: - HB_MD5( ) -> + hb_MD5( ) -> Calculates RFC 1321 MD5 digest (128-bit checksum) Parameters: - string variable to calculate MD5 @@ -64,7 +64,7 @@ ASCII hex MD5 digest as 32-byte string empty string on error - HB_MD5FILE( ) -> + hb_MD5File( ) -> Calculates RFC 1321 MD5 digest (128-bit checksum) of a file contents (file size is limited by OS limits only) Parameters: @@ -75,14 +75,14 @@ C functions: - void hb_md5( const void * data, HB_SIZE datalen, char * digest ) + void hb_MD5( const void * data, HB_SIZE datalen, char * digest ) Parameters: data - input byte stream datalen - input stream length digest - raw (unformatted) MD5 digest buffer (at least 16 bytes long) - void hb_md5file( HB_FHANDLE hFile, char * digest ) + void hb_MD5File( HB_FHANDLE hFile, char * digest ) Parameters: hFile - file handle digest - raw (unformatted) MD5 digest buffer @@ -250,7 +250,7 @@ static void hb_md5val( HB_U32 accum[], char * md5val ) } } -void hb_md5( const void * data, HB_SIZE nLen, char * digest ) +void hb_MD5( const void * data, HB_SIZE nLen, char * digest ) { const unsigned char * ucdata = ( const unsigned char * ) data; HB_UCHAR buf[ 128 ]; @@ -294,7 +294,7 @@ void hb_md5( const void * data, HB_SIZE nLen, char * digest ) hb_md5val( md5.accum, digest ); } -void hb_md5file( HB_FHANDLE hFile, char * digest ) +void hb_MD5File( HB_FHANDLE hFile, char * digest ) { MD5_BUF md5; HB_SIZE n; diff --git a/src/rtl/hbproces.c b/src/rtl/hbproces.c index 78cc4a82bd..351ebde300 100644 --- a/src/rtl/hbproces.c +++ b/src/rtl/hbproces.c @@ -1133,7 +1133,7 @@ int hb_fsProcessRun( const char * pszFilename, ul = hb_fsReadLarge( hStdout, pOutBuf + nOutBuf, nOutSize - nOutBuf ); if( ul == 0 ) { - /* zero bytes read after positive select() + /* zero bytes read after positive Select() * - writing process closed the pipe */ hb_fsClose( hStdout ); @@ -1153,7 +1153,7 @@ int hb_fsProcessRun( const char * pszFilename, ul = hb_fsReadLarge( hStderr, pErrBuf + nErrBuf, nErrSize - nErrBuf ); if( ul == 0 ) { - /* zero bytes read after positive select() + /* zero bytes read after positive Select() * - writing process closed the pipe */ hb_fsClose( hStderr ); diff --git a/src/rtl/hbsocket.c b/src/rtl/hbsocket.c index e20c3585f3..ca18887b2b 100644 --- a/src/rtl/hbsocket.c +++ b/src/rtl/hbsocket.c @@ -100,7 +100,7 @@ simple 'struct sockaddr' is not large enough for such usage: #define HB_HAS_SOCKADDR_STORAGE - timeval parameter used in select() function is updated by kernel/CRTL + timeval parameter used in Select() function is updated by kernel/CRTL and decreased by the amount of time the function was waiting: #define HB_HAS_SELECT_TIMER @@ -2213,7 +2213,7 @@ HB_SOCKET hb_socketAccept( HB_SOCKET sd, void ** pSockAddr, unsigned * puiLen, H { /* it's necessary to set non blocking IO to be sure that application * will not be frozen inside accept(). It may happen if some asynchronous - * network error appear after above select() or when other thread + * network error appear after above Select() or when other thread * accepts incoming connection (concurrent calls). */ ret = timeout < 0 ? 0 : hb_socketSetBlockingIO( sd, HB_FALSE ); diff --git a/src/rtl/hbsockhb.c b/src/rtl/hbsockhb.c index 2ac10ff325..8803927719 100644 --- a/src/rtl/hbsockhb.c +++ b/src/rtl/hbsockhb.c @@ -47,43 +47,43 @@ */ /* - * HB_SOCKETGETERROR() --> nSocketError - * HB_SOCKETGETOSERROR() --> nOSError - * HB_SOCKETERRORSTRING( [ nSocketErrror = hb_socketGetError() ] ) --> cError - * HB_SOCKETGETSOCKNAME( hSocket ) --> aAddr | NIL - * HB_SOCKETGETPEERNAME( hSocket ) --> aAddr | NIL - * HB_SOCKETOPEN( [ nDomain = HB_SOCKET_AF_INET ] , [ nType = HB_SOCKET_PT_STREAM ], [ nProtocol = 0 ] ) --> hSocket - * HB_SOCKETCLOSE( hSocket ) --> lSuccess - * HB_SOCKETSHUTDOWN( hSocket, [ nMode = HB_SOCKET_SHUT_RDWR ] ) --> lSuccess - * HB_SOCKETBIND( hSocket, aAddr ) --> lSuccess - * HB_SOCKETLISTEN( hSocket, [ iQueueLen = 10 ] ) --> lSuccess - * HB_SOCKETACCEPT( hSocket, [ @aAddr ], [ nTimeout = FOREVER ] ) --> hConnectionSocket - * HB_SOCKETCONNECT( hSocket, aAddr, [ nTimeout = FOREVER ] ) --> lSuccess - * HB_SOCKETSEND( hSocket, cBuffer, [ nLen = LEN( cBuffer ) ], [ nFlags = 0 ], [ nTimeout = FOREVER ] ) --> nBytesSent - * HB_SOCKETSENDTO( hSocket, cBuffer, [ nLen = LEN( cBuffer ) ], [ nFlags = 0 ], aAddr, [ nTimeout = FOREVER ] ) --> nBytesSent - * HB_SOCKETRECV( hSocket, @cBuffer, [ nLen = LEN( cBuffer ) ], [ nFlags = 0 ], [ nTimeout = FOREVER ] ) --> nBytesRecv - * HB_SOCKETRECVFROM( hSocket, @cBuffer, [ nLen = LEN( cBuffer ) ], [ nFlags = 0 ], @aAddr, [ nTimeout = FOREVER ] ) --> nBytesRecv - * HB_SOCKETSETBLOCKINGIO( hSocket, lValue ) --> nSuccess - * HB_SOCKETSETNODELAY( hSocket, lValue ) --> lSuccess - * HB_SOCKETSETEXCLUSIVEADDR( hSocket, lValue ) --> lSuccess - * HB_SOCKETSETREUSEADDR( hSocket, lValue ) --> lSuccess - * HB_SOCKETSETKEEPALIVE( hSocket, lValue ) --> lSuccess - * HB_SOCKETSETBROADCAST( hSocket, lValue ) --> lSuccess - * HB_SOCKETSETSNDBUFSIZE( hSocket, nValue ) --> lSuccess - * HB_SOCKETSETRCVBUFSIZE( hSocket, nValue ) --> lSuccess - * HB_SOCKETGETSNDBUFSIZE( hSocket, @nValue ) --> lSuccess - * HB_SOCKETGETRCVBUFSIZE( hSocket, @nValue ) --> lSuccess - * HB_SOCKETSETMULTICAST( hSocket, [ nFamily = HB_SOCKET_AF_INET ], cAddr ) --> lSuccess - * HB_SOCKETSELECTREAD( hSocket, [ nTimeout = FOREVER ] ) --> nRet - * HB_SOCKETSELECTWRITE( hSocket, [ nTimeout = FOREVER ] ) --> nRet - * HB_SOCKETSELECTWRITEEX( hSocket, [ nTimeout = FOREVER ] ) --> nRet - * HB_SOCKETSELECT( aRead, lSetRead, aWrite, lSetWrite, aExcep, lSetExcep, [ nTimeout = FOREVER ] ) --> nRet - * HB_SOCKETRESOLVEINETADDR( cAddr, nPort ) --> aAddr | NIL - * HB_SOCKETRESOLVEADDR( cAddr, [ nFamily = HB_SOCKET_AF_INET ] ) --> cResolved - * HB_SOCKETGETHOSTNAME( aAddr ) --> cHostName - * HB_SOCKETGETHOSTS( cAddr, [ nFamily = HB_SOCKET_AF_INET ] ) --> aHosts - * HB_SOCKETGETIFACES( [ nFamily ], [ lNoAliases ] ) --> aIfaces - * HB_SOCKETGETFD( hSocket ) --> nFD + * hb_socketGetError() --> nSocketError + * hb_socketGetOSError() --> nOSError + * hb_socketErrorString( [ nSocketErrror = hb_socketGetError() ] ) --> cError + * hb_socketGetSockName( hSocket ) --> aAddr | NIL + * hb_socketGetPeerName( hSocket ) --> aAddr | NIL + * hb_socketOpen( [ nDomain = HB_SOCKET_AF_INET ] , [ nType = HB_SOCKET_PT_STREAM ], [ nProtocol = 0 ] ) --> hSocket + * hb_socketClose( hSocket ) --> lSuccess + * hb_socketShutdown( hSocket, [ nMode = HB_SOCKET_SHUT_RDWR ] ) --> lSuccess + * hb_socketBind( hSocket, aAddr ) --> lSuccess + * hb_socketListen( hSocket, [ iQueueLen = 10 ] ) --> lSuccess + * hb_socketAccept( hSocket, [ @aAddr ], [ nTimeout = FOREVER ] ) --> hConnectionSocket + * hb_socketConnect( hSocket, aAddr, [ nTimeout = FOREVER ] ) --> lSuccess + * hb_socketSend( hSocket, cBuffer, [ nLen = Len( cBuffer ) ], [ nFlags = 0 ], [ nTimeout = FOREVER ] ) --> nBytesSent + * hb_socketSendTo( hSocket, cBuffer, [ nLen = Len( cBuffer ) ], [ nFlags = 0 ], aAddr, [ nTimeout = FOREVER ] ) --> nBytesSent + * hb_socketRecv( hSocket, @cBuffer, [ nLen = Len( cBuffer ) ], [ nFlags = 0 ], [ nTimeout = FOREVER ] ) --> nBytesRecv + * hb_socketRecvFrom( hSocket, @cBuffer, [ nLen = Len( cBuffer ) ], [ nFlags = 0 ], @aAddr, [ nTimeout = FOREVER ] ) --> nBytesRecv + * hb_socketSetBlockingIO( hSocket, lValue ) --> nSuccess + * hb_socketSetNoDelay( hSocket, lValue ) --> lSuccess + * hb_socketSetExclusiveAddr( hSocket, lValue ) --> lSuccess + * hb_socketSetReuseAddr( hSocket, lValue ) --> lSuccess + * hb_socketSetKeepAlive( hSocket, lValue ) --> lSuccess + * hb_socketSetBroadcast( hSocket, lValue ) --> lSuccess + * hb_socketSetSndBufSize( hSocket, nValue ) --> lSuccess + * hb_socketSetRcvBufSize( hSocket, nValue ) --> lSuccess + * hb_socketGetSndBufSize( hSocket, @nValue ) --> lSuccess + * hb_socketGetRcvBufSize( hSocket, @nValue ) --> lSuccess + * hb_socketSetMulticast( hSocket, [ nFamily = HB_SOCKET_AF_INET ], cAddr ) --> lSuccess + * hb_socketSelectRead( hSocket, [ nTimeout = FOREVER ] ) --> nRet + * hb_socketSelectWrite( hSocket, [ nTimeout = FOREVER ] ) --> nRet + * hb_socketSelectWriteEx( hSocket, [ nTimeout = FOREVER ] ) --> nRet + * hb_socketSelect( aRead, lSetRead, aWrite, lSetWrite, aExcep, lSetExcep, [ nTimeout = FOREVER ] ) --> nRet + * hb_socketResolveINetAddr( cAddr, nPort ) --> aAddr | NIL + * hb_socketResolveAddr( cAddr, [ nFamily = HB_SOCKET_AF_INET ] ) --> cResolved + * hb_socketGetHostName( aAddr ) --> cHostName + * hb_socketGetHosts( cAddr, [ nFamily = HB_SOCKET_AF_INET ] ) --> aHosts + * hb_socketGetIFaces( [ nFamily ], [ lNoAliases ] ) --> aIfaces + * hb_socketGetFD( hSocket ) --> nFD */ #include "hbapiitm.h" diff --git a/src/rtl/hbtoken.c b/src/rtl/hbtoken.c index 6b0f247069..facd9d89de 100644 --- a/src/rtl/hbtoken.c +++ b/src/rtl/hbtoken.c @@ -260,9 +260,9 @@ HB_FUNC( HB_TOKENGET ) hb_retc_null(); } -/* like HB_TOKENGET() but returns next token starting from passed position +/* like hb_tokenGet() but returns next token starting from passed position * (0 based) inside string, f.e.: - * HB_TOKENPTR( cString, @nTokPos, Chr( 9 ) ) -> cToken + * hb_tokenPtr( cString, @nTokPos, Chr( 9 ) ) -> cToken */ HB_FUNC( HB_TOKENPTR ) { diff --git a/src/rtl/hbzlib.c b/src/rtl/hbzlib.c index 407cdc9f90..813e9fe95e 100644 --- a/src/rtl/hbzlib.c +++ b/src/rtl/hbzlib.c @@ -189,7 +189,7 @@ static int hb_gz_compress( char ** pDstPtr, HB_SIZE * pnDst, } /* - * HB_ZLIBVERSION( [] ) -> + * hb_ZLibVersion( [] ) -> */ HB_FUNC( HB_ZLIBVERSION ) { @@ -205,7 +205,7 @@ HB_FUNC( HB_ZLIBVERSION ) } /* - * HB_ZCOMPRESSBOUND( | ) -> + * hb_ZCompressBound( | ) -> */ HB_FUNC( HB_ZCOMPRESSBOUND ) { @@ -218,7 +218,7 @@ HB_FUNC( HB_ZCOMPRESSBOUND ) } /* - * HB_ZUNCOMPRESSLEN( , [<@nResult>] ) + * hb_ZUncompressLen( , [<@nResult>] ) * -> or -1 on error */ HB_FUNC( HB_ZUNCOMPRESSLEN ) @@ -245,7 +245,7 @@ HB_FUNC( HB_ZUNCOMPRESSLEN ) } /* - * HB_ZCOMPRESS( , [|<@cBuffer>], [<@nResult>], [] ) + * hb_ZCompress( , [|<@cBuffer>], [<@nResult>], [] ) * => or NIL on Error */ HB_FUNC( HB_ZCOMPRESS ) @@ -310,7 +310,7 @@ HB_FUNC( HB_ZCOMPRESS ) } /* - * HB_ZUNCOMPRESS( , [|<@cBuffer>], [<@nResult>] ) + * hb_ZUncompress( , [|<@cBuffer>], [<@nResult>] ) * => or NIL on Error */ HB_FUNC( HB_ZUNCOMPRESS ) @@ -372,7 +372,7 @@ HB_FUNC( HB_ZUNCOMPRESS ) } /* - * HB_GZCOMPRESSBOUND( | ) -> + * hb_gzCompressBound( | ) -> */ HB_FUNC( HB_GZCOMPRESSBOUND ) { @@ -385,7 +385,7 @@ HB_FUNC( HB_GZCOMPRESSBOUND ) } /* - * HB_GZCOMPRESS( , [|<@cBuffer>], [<@nResult>], [] ) + * hb_gzCompress( , [|<@cBuffer>], [<@nResult>], [] ) * => or NIL on Error * * Note: this function does not create any references to gz* ZLIB functions @@ -457,7 +457,7 @@ HB_FUNC( HB_GZCOMPRESS ) } /* - * HB_ZERROR( ) => + * hb_ZError( ) => */ HB_FUNC( HB_ZERROR ) { diff --git a/src/rtl/hbzlibgz.c b/src/rtl/hbzlibgz.c index 20195216f9..adcfb2be86 100644 --- a/src/rtl/hbzlibgz.c +++ b/src/rtl/hbzlibgz.c @@ -86,7 +86,7 @@ static gzFile hb_gzParam( int iParam ) } /* - * HB_GZOPEN( , ) => or NIL on Error + * hb_gzOpen( , ) => or NIL on Error */ HB_FUNC( HB_GZOPEN ) { @@ -121,7 +121,7 @@ HB_FUNC( HB_GZOPEN ) } /* - * HB_GZDOPEN( , ) => or NIL on Error + * hb_gzDOpen( , ) => or NIL on Error */ HB_FUNC( HB_GZDOPEN ) { @@ -148,7 +148,7 @@ HB_FUNC( HB_GZDOPEN ) } /* - * HB_GZCLOSE( ) => + * hb_gzClose( ) => */ HB_FUNC( HB_GZCLOSE ) { @@ -172,7 +172,7 @@ HB_FUNC( HB_GZCLOSE ) } /* - * HB_GZSETPARAMS( , , ) => + * hb_gzSetParams( , , ) => */ HB_FUNC( HB_GZSETPARAMS ) { @@ -187,7 +187,7 @@ HB_FUNC( HB_GZSETPARAMS ) } /* - * HB_GZREAD( , <@cData>, [ ] ) => + * hb_gzRead( , <@cData>, [ ] ) => */ HB_FUNC( HB_GZREAD ) { @@ -221,7 +221,7 @@ HB_FUNC( HB_GZREAD ) } /* - * HB_GZWRITE( , , [ ] ) => + * hb_gzWrite( , , [ ] ) => */ HB_FUNC( HB_GZWRITE ) { @@ -248,7 +248,7 @@ HB_FUNC( HB_GZWRITE ) } /* - * HB_GZGETS( , ) => or NIL on error + * hb_gzGetS( , ) => or NIL on error */ HB_FUNC( HB_GZGETS ) { @@ -281,7 +281,7 @@ HB_FUNC( HB_GZGETS ) } /* - * HB_GZPUTS( , ) => + * hb_gzPutS( , ) => */ HB_FUNC( HB_GZPUTS ) { @@ -306,7 +306,7 @@ HB_FUNC( HB_GZPUTS ) } /* - * HB_GZPUTC( , ) => + * hb_gzPutC( , ) => */ HB_FUNC( HB_GZPUTC ) { @@ -329,7 +329,7 @@ HB_FUNC( HB_GZPUTC ) } /* - * HB_GZGETC( ) => + * hb_gzGetC( ) => */ HB_FUNC( HB_GZGETC ) { @@ -348,7 +348,7 @@ HB_FUNC( HB_GZGETC ) } /* - * HB_GZUNGETC( , ) => + * hb_gzUnGetC( , ) => */ HB_FUNC( HB_GZUNGETC ) { @@ -373,7 +373,7 @@ HB_FUNC( HB_GZUNGETC ) } /* - * HB_GZFLUSH( , [ ] ) => + * hb_gzFlush( , [ ] ) => */ HB_FUNC( HB_GZFLUSH ) { @@ -392,7 +392,7 @@ HB_FUNC( HB_GZFLUSH ) } /* - * HB_GZSEEK( , , [ ] ) => + * hb_gzSeek( , , [ ] ) => */ HB_FUNC( HB_GZSEEK ) { @@ -416,7 +416,7 @@ HB_FUNC( HB_GZSEEK ) } /* - * HB_GZREWIND( ) => + * hb_gzRewind( ) => */ HB_FUNC( HB_GZREWIND ) { @@ -435,7 +435,7 @@ HB_FUNC( HB_GZREWIND ) } /* - * HB_GZTELL( ) => + * hb_gzTell( ) => */ HB_FUNC( HB_GZTELL ) { @@ -454,7 +454,7 @@ HB_FUNC( HB_GZTELL ) } /* - * HB_GZEOF( ) => + * hb_gzEof( ) => */ HB_FUNC( HB_GZEOF ) { @@ -473,7 +473,7 @@ HB_FUNC( HB_GZEOF ) } /* - * HB_GZDIRECT( ) => + * hb_gzDirect( ) => */ HB_FUNC( HB_GZDIRECT ) { @@ -493,7 +493,7 @@ HB_FUNC( HB_GZDIRECT ) } /* - * HB_GZERROR( , [ <@nError> ] ) => + * hb_gzError( , [ <@nError> ] ) => */ HB_FUNC( HB_GZERROR ) { @@ -509,7 +509,7 @@ HB_FUNC( HB_GZERROR ) } /* - * HB_GZCLEARERR( ) => NIL + * hb_gzClearErr( ) => NIL */ HB_FUNC( HB_GZCLEARERR ) { diff --git a/src/rtl/langapi.c b/src/rtl/langapi.c index dcc5e4521f..37bf721e92 100644 --- a/src/rtl/langapi.c +++ b/src/rtl/langapi.c @@ -483,7 +483,7 @@ HB_FUNC( HB_LANGMESSAGE ) hb_retc_const( hb_langGetItem( hb_parc( 2 ), hb_parnl( 1 ) ) ); } -/* HB_LANGNEW( , , +/* hb_langNew( , , * , ) -> */ HB_FUNC( HB_LANGNEW ) diff --git a/src/rtl/mlcfunc.c b/src/rtl/mlcfunc.c index fdd522b2d1..d987ca7c75 100644 --- a/src/rtl/mlcfunc.c +++ b/src/rtl/mlcfunc.c @@ -301,7 +301,7 @@ static HB_SIZE hb_mlGetLine( PHB_MLC_INFO pMLC ) } -/* MEMOLINE( , [ =79 ], +/* MemoLine( , [ =79 ], * [ =1 ], * [ =4 ], [ =.T. ], * [ | ] ) -> @@ -329,7 +329,7 @@ HB_FUNC( MEMOLINE ) /* CA-Cl*pper also does not check if line exists and always * fill one line more, i.e.: * for i := 0 to 4 - * ? "[" + memoline( " ", 20, i ) + "]" + * ? "[" + MemoLine( " ", 20, i ) + "]" * next * [druzus] */ @@ -398,7 +398,7 @@ HB_FUNC( MEMOLINE ) hb_retclen_buffer( szLine, nLen ); } -/* MLCOUNT( , [ =79 ], +/* MLCount( , [ =79 ], * [ =4 ], [ =.T. ], * [ | ] ) -> */ @@ -416,7 +416,7 @@ HB_FUNC( MLCOUNT ) hb_retns( nLines ); } -/* MLPOS( , [ =79 ], +/* MLPos( , [ =79 ], * [ =1 ], * [ =4 ], [ =.T. ], * [ | ] ) -> @@ -444,7 +444,7 @@ HB_FUNC( MLPOS ) hb_retns( nOffset ); } -/* MLCTOPOS( , [ =79 ], +/* MLCToPos( , [ =79 ], * [ =1 ], [ =0 ], * [ =4 ], [ =.T. ], * [ | ] ) -> @@ -480,7 +480,7 @@ HB_FUNC( MLCTOPOS ) hb_retns( nOffset + 1 ); } -/* MPOSTOLC( , [ =79 ], +/* MPosToLC( , [ =79 ], * [ =1 ], * [ =4 ], [ =.T. ], * [ | ] ) -> diff --git a/src/rtl/philes.c b/src/rtl/philes.c index 757a49614a..d02ad22165 100644 --- a/src/rtl/philes.c +++ b/src/rtl/philes.c @@ -500,7 +500,7 @@ HB_FUNC( HB_FISDEVICE ) hb_fsSetFError( hb_fsError() ); } -/* HB_PREAD( , <@cBuffer>, [], [] ) +/* hb_PRead( , <@cBuffer>, [], [] ) -> */ HB_FUNC( HB_PREAD ) { diff --git a/src/rtl/soundex.c b/src/rtl/soundex.c index 2e93830828..dee550541c 100644 --- a/src/rtl/soundex.c +++ b/src/rtl/soundex.c @@ -74,7 +74,7 @@ HB_FUNC( SOUNDEX ) { char cChar = pszString[ nPos ]; - /* NOTE: Intentionally not using toupper()/isalpha() to be 100% + /* NOTE: Intentionally not using toupper()/IsAlpha() to be 100% Clipper compatible here, these ANSI C functions may behave differently for accented and national characters. It's also faster this way. [vszakats] */ @@ -83,7 +83,7 @@ HB_FUNC( SOUNDEX ) if( cChar >= 'a' && cChar <= 'z' ) cChar -= ( 'a' - 'A' ); - /* Check if isalpha() */ + /* Check if IsAlpha() */ if( cChar >= 'A' && cChar <= 'Z' ) { static const char s_szTable[] = "01230120022455012623010202"; /* NOTE: SoundEx result codes for letters from "A" to "Z" */ diff --git a/src/rtl/strzero.c b/src/rtl/strzero.c index b8dfed31f7..8bd3e731ad 100644 --- a/src/rtl/strzero.c +++ b/src/rtl/strzero.c @@ -113,8 +113,8 @@ HB_FUNC( STRZERO ) else #ifdef HB_CLP_STRICT /* NOTE: In CA-Cl*pper StrZero() is written in Clipper, and will call - STR() to do the job, the error (if any) will also be thrown - by STR(). [vszakats] */ + Str() to do the job, the error (if any) will also be thrown + by Str(). [vszakats] */ hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, "STR", HB_ERR_ARGS_BASEPARAMS ); #else hb_errRT_BASE_SubstR( EG_ARG, 6003, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); diff --git a/src/rtl/transfrm.c b/src/rtl/transfrm.c index 3e4556edcb..30ea8ae55f 100644 --- a/src/rtl/transfrm.c +++ b/src/rtl/transfrm.c @@ -366,9 +366,9 @@ HB_FUNC( TRANSFORM ) * one is smaller then 5 bytes then first two bytes are exchanged * with 4-5 bytes from previous result which was length enough, * f.e.: - * ? transform( "0123456789", "" ) - * ? transform( "AB", "@E" ) - * ? transform( "ab", "@E" ) + * ? Transform( "0123456789", "" ) + * ? Transform( "AB", "@E" ) + * ? Transform( "ab", "@E" ) * [druzus] */ if( HB_CDP_ISCHARIDX( cdp ) ) diff --git a/src/vm/arrayshb.c b/src/vm/arrayshb.c index 34aadd25e7..6f467db8a0 100644 --- a/src/vm/arrayshb.c +++ b/src/vm/arrayshb.c @@ -236,9 +236,9 @@ HB_FUNC( AFILL ) } else #ifdef HB_CLP_STRICT - /* NOTE: In CA-Cl*pper AFILL() is written in a manner that it will - call AEVAL() to do the job, so the error (if any) will also be - thrown by AEVAL(). [vszakats] */ + /* NOTE: In CA-Cl*pper AFill() is written in a manner that it will + call AEval() to do the job, so the error (if any) will also be + thrown by AEval(). [vszakats] */ hb_errRT_BASE( EG_ARG, 2017, NULL, "AEVAL", 0 ); #else hb_errRT_BASE( EG_ARG, 6004, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); @@ -264,7 +264,7 @@ HB_FUNC( ASCAN ) hb_retni( 0 ); } -/* Same as ASCAN() but has an additional parameter to force exact comparison. */ +/* Same as AScan() but has an additional parameter to force exact comparison. */ HB_FUNC( HB_ASCAN ) { PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY ); diff --git a/src/vm/classes.c b/src/vm/classes.c index 177b908384..676416be9e 100644 --- a/src/vm/classes.c +++ b/src/vm/classes.c @@ -4321,7 +4321,7 @@ HB_FUNC( __CLSPARENT ) hb_clsIsParent( ( HB_USHORT ) hb_parni( 1 ), szParentName ) ); } -/* __sender() -> | NIL +/* __Sender() -> | NIL * returns sender object */ HB_FUNC( __SENDER ) @@ -5082,7 +5082,7 @@ void hb_mthAddTime( HB_ULONG ulClockTicks ) } #endif -/* __getMsgPrf( , ) -> { { , }, ... } +/* __GetMsgPrf( , ) -> { { , }, ... } */ HB_FUNC( __GETMSGPRF ) /* profiler: returns a method called and consumed times */ { @@ -5380,7 +5380,7 @@ HB_FUNC( __OBJRESTOREIVARS ) } /* __clsGetProperties( , [] ) -> - * Notice that this function works quite similar to __CLASSSEL() + * Notice that this function works quite similar to __classSel() * except that just returns the name of the datas and methods * that have been declared as PROPERTY (PERSISTENT) or also EXPORTED * if second parameter is true and message has corresponding @@ -5507,7 +5507,7 @@ HB_FUNC( __CLSMSGTYPE ) * for MT programs which will allocate dynamically at runtime * more then 16386 classes. In practice rather impossible though * who knows ;-) - * __clsPreAllocate( [] ) -> + * __clsPreallocate( [] ) -> */ HB_FUNC( __CLSPREALLOCATE ) { diff --git a/src/vm/dynsym.c b/src/vm/dynsym.c index 3928f06571..6dfc703fe4 100644 --- a/src/vm/dynsym.c +++ b/src/vm/dynsym.c @@ -297,7 +297,7 @@ PHB_DYNS hb_dynsymNew( PHB_SYMB pSymbol ) /* It's dynamic module so we are guessing that HVM * intentionally not updated function address allowing * multiple functions, f.e. programmer asked about keeping - * local references using HB_LIBLOAD()/HB_HBRLOAD() parameter. + * local references using hb_libLoad()/HB_HBRLOAD() parameter. * In such case update pDynSym address in the new symbol but * do not register it as the main one */ diff --git a/src/vm/eval.c b/src/vm/eval.c index 41ea63a3a5..96ef8c70e2 100644 --- a/src/vm/eval.c +++ b/src/vm/eval.c @@ -388,18 +388,18 @@ HB_FUNC( HB_FORNEXT ) /* nStart, nEnd | bEnd, bCode, nStep */ } /* - * based on xHrbour's HB_ExecFromArray() by Giancarlo Niccolai + * based on xHrbour's hb_ExecFromArray() by Giancarlo Niccolai * This version supports the same syntax though it's independent * implementation [druzus] * * The following syntax is supported: - * hb_execFromArray( [, ] ) - * hb_execFromArray( @() [, ] ) - * hb_execFromArray( [, ] ) - * hb_execFromArray( , [, ] ) - * hb_execFromArray( , @() [, ] ) + * hb_ExecFromArray( [, ] ) + * hb_ExecFromArray( @() [, ] ) + * hb_ExecFromArray( [, ] ) + * hb_ExecFromArray( , [, ] ) + * hb_ExecFromArray( , @() [, ] ) * or: - * hb_execFromArray( ) + * hb_ExecFromArray( ) * where is in one of the following format: * { [, ] } * { @() [, ] } @@ -505,7 +505,7 @@ HB_FUNC( HB_EXECFROMARRAY ) hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -HB_BOOL hb_execFromArray( PHB_ITEM pParam ) +HB_BOOL hb_ExecFromArray( PHB_ITEM pParam ) { PHB_SYMB pExecSym = NULL; PHB_ITEM pArray = NULL; @@ -572,7 +572,7 @@ HB_BOOL hb_execFromArray( PHB_ITEM pParam ) return HB_FALSE; } -/* hb_execMsg( , , [] ) -> +/* hb_ExecMsg( , , [] ) -> * Execute with set as QSELF() value */ HB_FUNC( HB_EXECMSG ) diff --git a/src/vm/garbage.c b/src/vm/garbage.c index 517be18a7b..e273878982 100644 --- a/src/vm/garbage.c +++ b/src/vm/garbage.c @@ -792,7 +792,7 @@ HB_FUNC( HB_GCALL ) * try to retrieve returned value. It's safe and cost nearly * nothing in whole GC scan process. It may help when previously * called function returned complex item with cross references. - * It's quite common situation that people executes HB_GCALL() + * It's quite common situation that people executes hb_gcAll() * immediately after such function. [druzus] */ hb_ret(); diff --git a/src/vm/hvm.c b/src/vm/hvm.c index 6649304ae7..47a37fba25 100644 --- a/src/vm/hvm.c +++ b/src/vm/hvm.c @@ -143,10 +143,10 @@ static void hb_vmArrayGen( HB_SIZE nElements ); /* generates an nElements Arr static void hb_vmHashGen( HB_SIZE nElements ); /* generates an nElements Hash and fills it from the stack values */ /* macros */ -static void hb_vmMacroDo( HB_USHORT uiArgSets ); /* execute function passing arguments set(s) on HVM stack func( &var ) */ -static void hb_vmMacroFunc( HB_USHORT uiArgSets ); /* execute procedure passing arguments set(s) on HVM stack func( &var ) */ -static void hb_vmMacroSend( HB_USHORT uiArgSets ); /* execute procedure passing arguments set(s) on HVM stack func( &var ) */ -static void hb_vmMacroArrayGen( HB_USHORT uiArgSets ); /* generate array from arguments set(s) on HVM stack { &var } */ +static void hb_vmMacroDo( HB_USHORT uiArgSets ); /* execute function passing arguments Set(s) on HVM stack func( &var ) */ +static void hb_vmMacroFunc( HB_USHORT uiArgSets ); /* execute procedure passing arguments Set(s) on HVM stack func( &var ) */ +static void hb_vmMacroSend( HB_USHORT uiArgSets ); /* execute procedure passing arguments Set(s) on HVM stack func( &var ) */ +static void hb_vmMacroArrayGen( HB_USHORT uiArgSets ); /* generate array from arguments Set(s) on HVM stack { &var } */ static void hb_vmMacroPushIndex( void ); /* push macro array index {...}[ &var ] */ /* Database */ @@ -8707,7 +8707,7 @@ void hb_vmRequestBreak( PHB_ITEM pItem ) * immediately interrupted. Because Clipper does not check the * exception flag often enough then it's possible to execute one * function from first EXIT PROC. Using small trick with - * QOUT( TYPE( cPrivateVar ) ) in the EXIT procedure (TYPE() is + * QOut( Type( cPrivateVar ) ) in the EXIT procedure (Type() is * not normal function) we can also check that it tries to execute * EXIT procedures exactly here before leave current function. * So to be as close as possible the Clipper intentional behavior diff --git a/src/vm/macro.c b/src/vm/macro.c index 59c7a02c41..611a342b4a 100644 --- a/src/vm/macro.c +++ b/src/vm/macro.c @@ -412,7 +412,7 @@ static char * hb_macroTextSubst( const char * szString, HB_SIZE * pnStringLen ) * = HB_P_MACROPUSHPARE * * iContext contains HB_P_MACROPUSHPARE if a macro is used inside a codeblock - * EVAL( {|| ¯o} ) + * Eval( {|| ¯o} ) * */ @@ -444,7 +444,7 @@ void hb_macroGetValue( PHB_ITEM pItem, int iContext, int flags ) * M->v := "'B'" * ? "Macro:", cText * ? "Result:", &cText - * ? "Type:", type(cText) + * ? "Type:", Type(cText) * RETURN */ pszFree = hb_macroTextSubst( pItem->item.asString.value, &struMacro.length ); @@ -464,7 +464,7 @@ void hb_macroGetValue( PHB_ITEM pItem, int iContext, int flags ) * * Always: * macro := "1,2" - * EVAL( {|| ¯o} ) + * Eval( {|| ¯o} ) * */ struMacro.Flags |= HB_MACRO_GEN_LIST; @@ -1318,7 +1318,7 @@ static void hb_macroMemvarGenPCode( HB_BYTE bPCode, const char * szVarName, HB_C if( HB_MACRO_DATA->Flags & HB_MACRO_GEN_TYPE ) { - /* we are determining the type of expression (called from TYPE() function) + /* we are determining the type of expression (called from Type() function) * then we shouldn't create the requested variable if it doesn't exist */ pSym = hb_dynsymFind( szVarName ); @@ -1346,7 +1346,7 @@ void hb_macroGenPushSymbol( const char * szSymbolName, HB_BOOL bFunction, HB_COM if( HB_MACRO_DATA->Flags & HB_MACRO_GEN_TYPE ) { - /* we are determining the type of expression (called from TYPE() function) + /* we are determining the type of expression (called from Type() function) */ pSym = hb_dynsymFind( szSymbolName ); if( ! pSym ) @@ -1481,7 +1481,7 @@ void hb_macroGenPopVar( const char * szVarName, HB_COMP_DECL ) } else { - /* TODO: memvars created inside TYPE() function should have PUBLIC scope */ + /* TODO: memvars created inside Type() function should have PUBLIC scope */ hb_macroMemvarGenPCode( HB_P_MPOPMEMVAR, szVarName, HB_COMP_PARAM ); } } @@ -1512,7 +1512,7 @@ void hb_macroGenPopAliasedVar( const char * szVarName, ( iLen >= 4 && iLen <= 6 && strncmp( szAlias, "MEMVAR", iLen ) == 0 ) ) ) { /* M-> or MEMV-> or MEMVA-> or MEMVAR-> variable */ - /* TODO: memvars created inside TYPE() function should have PUBLIC scope */ + /* TODO: memvars created inside Type() function should have PUBLIC scope */ hb_macroMemvarGenPCode( HB_P_MPOPMEMVAR, szVarName, HB_COMP_PARAM ); } else if( iLen >= 4 && iLen <= 6 && @@ -1541,7 +1541,7 @@ void hb_macroGenPopAliasedVar( const char * szVarName, * NOTE: An alias will be determined at runtime then we cannot decide * here if passed name is either a field or a memvar */ - /* TODO: memvars created inside TYPE() function should have PUBLIC scope */ + /* TODO: memvars created inside Type() function should have PUBLIC scope */ hb_macroMemvarGenPCode( HB_P_MPOPALIASEDVAR, szVarName, HB_COMP_PARAM ); } } diff --git a/src/vm/memvars.c b/src/vm/memvars.c index 11d5215cc2..164dcaa9b0 100644 --- a/src/vm/memvars.c +++ b/src/vm/memvars.c @@ -63,8 +63,8 @@ #include "hbapi.h" #include "hbapiitm.h" #include "hbapierr.h" -#include "hbapifs.h" /* for __MVSAVE()/__MVRESTORE() */ -#include "hbdate.h" /* for __MVSAVE()/__MVRESTORE() */ +#include "hbapifs.h" /* for __mvSave()/__mvRestore() */ +#include "hbdate.h" /* for __mvSave()/__mvRestore() */ #include "hbcomp.h" /* for HB_VSCOMP_* macros */ #include "error.ch" #include "hbmemvar.ch" @@ -1714,7 +1714,7 @@ HB_FUNC( __MVRESTORE ) /* * This is a hacking function which changes base private offset so - * PRIVATE variables created in function which calls __MVSETBASE() + * PRIVATE variables created in function which calls __mvSetBase() * will not be released when the function exit but will be inherited * by its caller. [druzus] */ diff --git a/src/vm/runner.c b/src/vm/runner.c index 367d2c37c4..43075664ce 100644 --- a/src/vm/runner.c +++ b/src/vm/runner.c @@ -697,7 +697,7 @@ static void hb_hrbReturn( PHRB_BODY pHrbBody ) } /* - HB_HRBRUN( [ , ] [, ] ) -> + hb_hrbRun( [ , ] [, ] ) -> This program will get the data from the .hrb file and run the p-code contained in it. @@ -753,7 +753,7 @@ HB_FUNC( HB_HRBRUN ) hb_errRT_BASE( EG_ARG, 6103, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } -/* HB_HRBLOAD( [ , ] [, ] ) */ +/* hb_hrbLoad( [ , ] [, ] ) */ HB_FUNC( HB_HRBLOAD ) { diff --git a/src/vm/set.c b/src/vm/set.c index 1b0d40839f..dd4fc5097e 100644 --- a/src/vm/set.c +++ b/src/vm/set.c @@ -459,7 +459,7 @@ HB_BOOL hb_setSetCentury( HB_BOOL new_century_setting ) if( y_stop < format_len ) hb_strncat( szNewFormat, szDateFormat + y_stop, size ); /* DATE FORMAT is under direct control of SET, so notify when it - it is changed indirectly via __SETCENTURY() */ + it is changed indirectly via __SetCentury() */ hb_setListenerNotify( HB_SET_DATEFORMAT, HB_SET_LISTENER_BEFORE ); hb_xfree( szDateFormat ); pSet->HB_SET_DATEFORMAT = szNewFormat; @@ -487,7 +487,7 @@ HB_FUNC( SETCANCEL ) { HB_STACK_TLS_PRELOAD hb_retl( hb_setGetCancel() ); - /* SETCANCEL() accepts only logical parameters */ + /* SetCancel() accepts only logical parameters */ hb_setSetItem( HB_SET_CANCEL, hb_param( 1, HB_IT_LOGICAL ) ); } @@ -1074,9 +1074,9 @@ void hb_setInitialize( PHB_SET_STRUCT pSet ) pSet->HB_SET_TIMEFORMAT = hb_strdup( "hh:mm:ss.fff" ); /* * Tests shows that Clipper has two different flags to control ALT+D - * and ALTD() behavior and on startup these flags are not synchronized. + * and AltD() behavior and on startup these flags are not synchronized. * When application starts _SET_DEBUG is set to HB_FALSE but debugger - * can be activated by hitting K_ALT_D or calling ALTD() function without + * can be activated by hitting K_ALT_D or calling AltD() function without * parameter. It means that some other internal flag enables these * operations. * Because Harbour is using _SET_DEBUG flag only then we have to diff --git a/src/vm/thread.c b/src/vm/thread.c index 4f62ff14da..77a26efc29 100644 --- a/src/vm/thread.c +++ b/src/vm/thread.c @@ -51,7 +51,7 @@ hb_threadStart( [ ,] <@sStart()> | | [, ] ) -> hb_threadSelf() -> | NIL - hb_threadId( [ ] ) -> + hb_threadID( [ ] ) -> hb_threadJoin( [, @ ] ) -> hb_threadDetach( ) -> * hb_threadQuitRequest( ) -> @@ -69,7 +69,7 @@ hb_mutexSubscribeNow( , [ ] [, @ ] ) -> hb_mutexEval( , | <@sFunc()> [, ] ) -> ** hb_mutexQueueInfo( , [ @ ], [ @ ] ) -> .T. - hb_mtVM() -> + hb_mtvm() -> * - this function call can be ignored by the destination thread in some cases. HVM does not guaranties that the QUIT signal will be always @@ -240,7 +240,7 @@ void hb_threadReleaseCPU( void ) { /* * The following code is modified: - * hb_releaseCPU() + * hb_ReleaseCPU() * originally created by: * Copyright 1999 David G. Holm * and then updated by few Harbour developers diff --git a/tests/fixcase.hb b/tests/fixcase.hb index 7c0a5c444d..fe656d9ff2 100644 --- a/tests/fixcase.hb +++ b/tests/fixcase.hb @@ -96,7 +96,6 @@ PROCEDURE Main( cFile ) "contrib/3rd/*" , ; "contrib/*/3rd/*" , ; "contrib/xhb/thtm.prg" , ; - "contrib/hbnetio/readme.txt" , ; "contrib/hbnetio/tests/*" , ; "extras/httpsrv/home/*" , ; "tests/hbpptest/*" , ; @@ -148,9 +147,10 @@ STATIC PROCEDURE ProcFile( hAll, cFileName, lPartial ) IF Len( a[ 2 ] ) != 2 .OR. !( Left( a[ 2 ], 1 ) $ "D" /* "METHOD" */ ) cProper := ProperCase( hAll, hb_StrShrink( a[ 3 ] ) ) + "(" IF !( cProper == a[ 3 ] ) .AND. ; - !( Upper( cProper ) == Upper( "FILE(" ) ) .AND. ; /* interacts with "file(s)" text */ - !( Upper( cProper ) == Upper( "INT(" ) ) .AND. ; /* interacts with SQL statements */ - ( ! lPartial .OR. !( "|" + Lower( cProper ) + "|" $ Lower( "|max(|min(|fopen(|abs(|log10(|getenv(|sqrt(|rand(|" ) ) ) + !( Upper( cProper ) == Upper( "FILE(" ) ) .AND. ; /* interacts with "file(s)" text */ + !( Upper( cProper ) == Upper( "TOKEN(" ) ) .AND. ; /* interacts with "token(s)" text */ + !( Upper( cProper ) == Upper( "INT(" ) ) .AND. ; /* interacts with SQL statements */ + ( ! lPartial .OR. !( "|" + Lower( cProper ) + "|" $ Lower( "|Max(|Min(|FOpen(|Abs(|Log10(|GetEnv(|Sqrt(|Rand(|IsDigit(|IsAlpha(|" ) ) ) cFile := StrTran( cFile, a[ 1 ], StrTran( a[ 1 ], a[ 3 ], cProper ) ) ? cFileName, a[ 3 ], cProper, "|" + a[ 1 ] + "|" nChanged++