From e094b59e07e2d41af597caca06f230e35c6d809d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 13 Jun 2009 22:47:30 +0000 Subject: [PATCH] 2009-06-14 00:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * examples/hbdoc/hbdfrdln.c * examples/hbgf/hbgfos2/os2pm.c * examples/hbgf/hbgfwin/winapi.c * examples/hbmake/hbmakec.c * examples/hboleold/win_ole.c * examples/hbwhat/whtbmp.c * examples/hbwhat/whtcdlg.c * examples/hbwhat/whtclpb.c * examples/hbwhat/whtcomm.c * examples/hbwhat/whtdate.c * examples/hbwhat/whtdc.c * examples/hbwhat/whtdir.c * examples/hbwhat/whtdlg.c * examples/hbwhat/whtdraw.c * examples/hbwhat/whtfont.c * examples/hbwhat/whticon.c * examples/hbwhat/whtilst.c * examples/hbwhat/whtinet.c * examples/hbwhat/whtini.c * examples/hbwhat/whtkbrd.c * examples/hbwhat/whtmenu.c * examples/hbwhat/whtmeta.c * examples/hbwhat/whtmisc.c * examples/hbwhat/whtmous.c * examples/hbwhat/whtmsg.c * examples/hbwhat/whtprn.c * examples/hbwhat/whtrect.c * examples/hbwhat/whtrgn.c * examples/hbwhat/whtscrlb.c * examples/hbwhat/whtseria.c * examples/hbwhat/whtshell.c * examples/hbwhat/whtsock.c * examples/hbwhat/whtsys.c * examples/hbwhat/whttab.c * examples/hbwhat/whttbar.c * examples/hbwhat/whttext.c * examples/hbwhat/whtwnd.c * examples/hbwhat/wincorec.c * examples/uhttpd/socket.c * IS*() -> HB_IS*() macro rename. (pass 2) --- harbour/ChangeLog | 43 ++++++++++++++++ harbour/examples/hbdoc/hbdfrdln.c | 6 +-- harbour/examples/hbgf/hbgfos2/os2pm.c | 8 +-- harbour/examples/hbgf/hbgfwin/winapi.c | 6 +-- harbour/examples/hbmake/hbmakec.c | 22 ++++----- harbour/examples/hboleold/win_ole.c | 8 +-- harbour/examples/hbwhat/whtbmp.c | 8 +-- harbour/examples/hbwhat/whtcdlg.c | 8 +-- harbour/examples/hbwhat/whtclpb.c | 2 +- harbour/examples/hbwhat/whtcomm.c | 6 +-- harbour/examples/hbwhat/whtdate.c | 10 ++-- harbour/examples/hbwhat/whtdc.c | 8 +-- harbour/examples/hbwhat/whtdir.c | 16 +++--- harbour/examples/hbwhat/whtdlg.c | 8 +-- harbour/examples/hbwhat/whtdraw.c | 14 +++--- harbour/examples/hbwhat/whtfont.c | 26 +++++----- harbour/examples/hbwhat/whticon.c | 12 ++--- harbour/examples/hbwhat/whtilst.c | 2 +- harbour/examples/hbwhat/whtinet.c | 68 +++++++++++++------------- harbour/examples/hbwhat/whtini.c | 16 +++--- harbour/examples/hbwhat/whtkbrd.c | 2 +- harbour/examples/hbwhat/whtmenu.c | 2 +- harbour/examples/hbwhat/whtmeta.c | 8 +-- harbour/examples/hbwhat/whtmisc.c | 16 +++--- harbour/examples/hbwhat/whtmous.c | 4 +- harbour/examples/hbwhat/whtmsg.c | 22 ++++----- harbour/examples/hbwhat/whtprn.c | 6 +-- harbour/examples/hbwhat/whtrect.c | 2 +- harbour/examples/hbwhat/whtrgn.c | 2 +- harbour/examples/hbwhat/whtscrlb.c | 2 +- harbour/examples/hbwhat/whtseria.c | 4 +- harbour/examples/hbwhat/whtshell.c | 2 +- harbour/examples/hbwhat/whtsock.c | 48 +++++++++--------- harbour/examples/hbwhat/whtsys.c | 34 ++++++------- harbour/examples/hbwhat/whttab.c | 8 +-- harbour/examples/hbwhat/whttbar.c | 4 +- harbour/examples/hbwhat/whttext.c | 22 ++++----- harbour/examples/hbwhat/whtwnd.c | 14 +++--- harbour/examples/hbwhat/wincorec.c | 16 +++--- harbour/examples/uhttpd/socket.c | 18 +++---- 40 files changed, 288 insertions(+), 245 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a708ff4b23..d88151db35 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,49 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-14 00:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * examples/hbdoc/hbdfrdln.c + * examples/hbgf/hbgfos2/os2pm.c + * examples/hbgf/hbgfwin/winapi.c + * examples/hbmake/hbmakec.c + * examples/hboleold/win_ole.c + * examples/hbwhat/whtbmp.c + * examples/hbwhat/whtcdlg.c + * examples/hbwhat/whtclpb.c + * examples/hbwhat/whtcomm.c + * examples/hbwhat/whtdate.c + * examples/hbwhat/whtdc.c + * examples/hbwhat/whtdir.c + * examples/hbwhat/whtdlg.c + * examples/hbwhat/whtdraw.c + * examples/hbwhat/whtfont.c + * examples/hbwhat/whticon.c + * examples/hbwhat/whtilst.c + * examples/hbwhat/whtinet.c + * examples/hbwhat/whtini.c + * examples/hbwhat/whtkbrd.c + * examples/hbwhat/whtmenu.c + * examples/hbwhat/whtmeta.c + * examples/hbwhat/whtmisc.c + * examples/hbwhat/whtmous.c + * examples/hbwhat/whtmsg.c + * examples/hbwhat/whtprn.c + * examples/hbwhat/whtrect.c + * examples/hbwhat/whtrgn.c + * examples/hbwhat/whtscrlb.c + * examples/hbwhat/whtseria.c + * examples/hbwhat/whtshell.c + * examples/hbwhat/whtsock.c + * examples/hbwhat/whtsys.c + * examples/hbwhat/whttab.c + * examples/hbwhat/whttbar.c + * examples/hbwhat/whttext.c + * examples/hbwhat/whtwnd.c + * examples/hbwhat/wincorec.c + * examples/uhttpd/socket.c + * IS*() -> HB_IS*() macro rename. + (pass 2) + 2009-06-13 23:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbxbp/hbxbp.hbc + Added gtgui as default GT on win/wce systems. diff --git a/harbour/examples/hbdoc/hbdfrdln.c b/harbour/examples/hbdoc/hbdfrdln.c index 9d55e2b538..db3fcc17b9 100644 --- a/harbour/examples/hbdoc/hbdfrdln.c +++ b/harbour/examples/hbdoc/hbdfrdln.c @@ -173,7 +173,7 @@ HB_FUNC( HB_FREADLINE ) USHORT i, iTerms; BOOL bFound, bEOF; - if( ( !ISBYREF( 2 ) ) || ( !ISNUM( 1 ) ) ) + if( ( !HB_ISBYREF( 2 ) ) || ( !HB_ISNUM( 1 ) ) ) { hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, 4, hb_paramError( 1 ), @@ -183,9 +183,9 @@ HB_FUNC( HB_FREADLINE ) return; } - if( ISARRAY( 3 ) || ISCHAR( 3 ) ) + if( HB_ISARRAY( 3 ) || HB_ISCHAR( 3 ) ) { - if( ISARRAY( 3 ) ) + if( HB_ISARRAY( 3 ) ) { pTerm1 = hb_param( 3, HB_IT_ARRAY ); iTerms = ( USHORT ) hb_arrayLen( pTerm1 ); diff --git a/harbour/examples/hbgf/hbgfos2/os2pm.c b/harbour/examples/hbgf/hbgfos2/os2pm.c index 597bee2f84..fac0d23422 100644 --- a/harbour/examples/hbgf/hbgfos2/os2pm.c +++ b/harbour/examples/hbgf/hbgfos2/os2pm.c @@ -193,7 +193,7 @@ HB_FUNC( WINGETTEXT ) HB_FUNC( MSGINFO ) { HWND hWnd = WinQueryActiveWindow( HWND_DESKTOP); - PCSZ szCaption = ISCHAR( 2 ) ? ( PCSZ ) hb_parc( 2 ) : ( PCSZ ) "Information"; + PCSZ szCaption = HB_ISCHAR( 2 ) ? ( PCSZ ) hb_parc( 2 ) : ( PCSZ ) "Information"; hb_retnl( WinMessageBox( HWND_DESKTOP, hWnd, ( PCSZ ) hb_parc( 1 ), szCaption, 0, MB_INFORMATION | MB_OK | MB_MOVEABLE | MB_APPLMODAL ) ); @@ -228,7 +228,7 @@ HB_FUNC( WINADDMENUITEM ) MENUITEM mit; mit.iPosition = hb_parni( 3 ); - mit.afStyle = IIF( ISCHAR( 2 ), MIS_TEXT, MIS_SEPARATOR ); + mit.afStyle = IIF( HB_ISCHAR( 2 ), MIS_TEXT, MIS_SEPARATOR ); mit.afAttribute = IIF( ! hb_parl( 6 ), MIA_DISABLED, 0 ); mit.id = hb_parni( 5 ); mit.hwndSubMenu = hb_parnl( 4 ); @@ -279,8 +279,8 @@ HB_FUNC( WINSETOWNER ) HB_FUNC( WINSENDMSG ) { hb_retnl( ( LONG ) WinSendMsg( ( HWND ) hb_parnl( 1 ), hb_parnl( 2 ), - ( MPARAM ) IIF( ISCHAR( 3 ), (ULONG) hb_parc( 3 ), (ULONG) hb_parnl( 3 ) ), - ( MPARAM ) IIF( ISCHAR( 4 ), (ULONG) hb_parc( 4 ), (ULONG) hb_parnl( 4 ) ) ) ); + ( MPARAM ) IIF( HB_ISCHAR( 3 ), (ULONG) hb_parc( 3 ), (ULONG) hb_parnl( 3 ) ), + ( MPARAM ) IIF( HB_ISCHAR( 4 ), (ULONG) hb_parc( 4 ), (ULONG) hb_parnl( 4 ) ) ) ); } diff --git a/harbour/examples/hbgf/hbgfwin/winapi.c b/harbour/examples/hbgf/hbgfwin/winapi.c index de7cb2e1b5..1dcce48c67 100644 --- a/harbour/examples/hbgf/hbgfwin/winapi.c +++ b/harbour/examples/hbgf/hbgfwin/winapi.c @@ -151,7 +151,7 @@ HB_FUNC( WINGETTEXT ) HB_FUNC( MSGINFO ) { LPTSTR lpStr1 = HB_TCHAR_CONVTO( hb_parcx( 2 ) ), - lpStr2 = HB_TCHAR_CONVTO( ISCHAR( 2 ) ? hb_parc( 3 ) : ( char * ) "Information" ); + lpStr2 = HB_TCHAR_CONVTO( HB_ISCHAR( 2 ) ? hb_parc( 3 ) : ( char * ) "Information" ); hb_retni( MessageBox( GetActiveWindow(), lpStr1, lpStr2, MB_OK | MB_ICONINFORMATION ) ); @@ -170,14 +170,14 @@ HB_FUNC( WINADDMENUITEM ) { LPTSTR lpszText = NULL; MENUITEMINFO mii; - HMENU hSubMenu = ( ! ISNIL( 4 ) ) ? ( HMENU ) hb_parptr( 4 ) : 0; + HMENU hSubMenu = ( ! HB_ISNIL( 4 ) ) ? ( HMENU ) hb_parptr( 4 ) : 0; mii.cbSize = sizeof( MENUITEMINFO ); mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_ID | ( hSubMenu ? MIIM_SUBMENU : 0 ); mii.fState = ! hb_parl( 6 ) ? MFS_DISABLED : 0; mii.wID = hb_parni( 5 ); mii.hSubMenu = hSubMenu; - if( ISCHAR( 2 ) ) + if( HB_ISCHAR( 2 ) ) { lpszText = HB_TCHAR_CONVTO( hb_parc( 1 ) ); mii.dwTypeData = lpszText; diff --git a/harbour/examples/hbmake/hbmakec.c b/harbour/examples/hbmake/hbmakec.c index 5519e453dd..7f322ac415 100644 --- a/harbour/examples/hbmake/hbmakec.c +++ b/harbour/examples/hbmake/hbmakec.c @@ -130,20 +130,20 @@ HB_FUNC( GAUGENEW ) hb_arraySetNL( pReturn, B_TOP, hb_parni( B_TOP ) ); hb_arraySetNL( pReturn, B_LEFT, hb_parni( B_LEFT ) ); hb_arraySetNL( pReturn, B_BOTTOM, - ISNUM( B_BOTTOM ) ? + HB_ISNUM( B_BOTTOM ) ? ( hb_parni( B_BOTTOM ) < hb_parni( B_TOP ) + 2 ? hb_parni( B_TOP ) + 2 : hb_parni( B_BOTTOM ) ) : 0 ); hb_arraySetNL( pReturn, B_RIGHT, - ISNUM( B_RIGHT ) ? + HB_ISNUM( B_RIGHT ) ? ( hb_parni( B_RIGHT ) < hb_parni( B_LEFT ) + 4 ? hb_parni( B_LEFT ) + 4 : hb_parni( B_RIGHT ) ) : 0 ); - hb_arraySetC( pReturn, B_BACKCOLOR, ISCHAR( B_BACKCOLOR ) ? hb_parc( B_BACKCOLOR ) : "W/N" ); - hb_arraySetC( pReturn, B_BARCOLOR, ISCHAR( B_BARCOLOR ) ? hb_parc( B_BARCOLOR ) : "W+/N" ); + hb_arraySetC( pReturn, B_BACKCOLOR, HB_ISCHAR( B_BACKCOLOR ) ? hb_parc( B_BACKCOLOR ) : "W/N" ); + hb_arraySetC( pReturn, B_BARCOLOR, HB_ISCHAR( B_BARCOLOR ) ? hb_parc( B_BARCOLOR ) : "W+/N" ); hb_arraySetL( pReturn, B_DISPLAYNUM, - !( ISNUM( B_RIGHT ) && - ISNUM( B_LEFT ) && + !( HB_ISNUM( B_RIGHT ) && + HB_ISNUM( B_LEFT ) && ( hb_parni( B_RIGHT ) < hb_parni( B_LEFT ) + 9 ) ) ); - hb_arraySetC( pReturn, B_BARCHAR, ISCHAR( B_BARCHAR ) ? hb_parc( B_BARCHAR ) : "\xdb" ); + hb_arraySetC( pReturn, B_BARCHAR, HB_ISCHAR( B_BARCHAR ) ? hb_parc( B_BARCHAR ) : "\xdb" ); hb_arraySetNL( pReturn, B_PERCENT, 0 ); hb_itemReturnRelease( pReturn ); @@ -197,7 +197,7 @@ HB_FUNC( GAUGEUPDATE ) if( pArray ) { - hb_gaugeUpdate( pArray, ISNUM( 2 ) ? ( float ) hb_parnd( 2 ) : 0 ); + hb_gaugeUpdate( pArray, HB_ISNUM( 2 ) ? ( float ) hb_parnd( 2 ) : 0 ); hb_itemReturn( pArray ); } @@ -320,7 +320,7 @@ HB_FUNC( HB_FREADLINE ) USHORT i, iTerms; BOOL bFound, bEOF; - if( ( !ISBYREF( 2 ) ) || ( !ISNUM( 1 ) ) ) + if( ( !HB_ISBYREF( 2 ) ) || ( !HB_ISNUM( 1 ) ) ) { hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, 4, hb_paramError( 1 ), @@ -330,9 +330,9 @@ HB_FUNC( HB_FREADLINE ) return; } - if( ISARRAY( 3 ) || ISCHAR( 3 ) ) + if( HB_ISARRAY( 3 ) || HB_ISCHAR( 3 ) ) { - if( ISARRAY( 3 ) ) + if( HB_ISARRAY( 3 ) ) { pTerm1 = hb_param( 3, HB_IT_ARRAY ); iTerms = ( USHORT ) hb_arrayLen( pTerm1 ); diff --git a/harbour/examples/hboleold/win_ole.c b/harbour/examples/hboleold/win_ole.c index 1cbdaafa10..36e6f28f68 100644 --- a/harbour/examples/hboleold/win_ole.c +++ b/harbour/examples/hboleold/win_ole.c @@ -1374,7 +1374,7 @@ HB_FUNC( MESSAGEBOX ) { LPTSTR lpStr1 = HB_TCHAR_CONVTO( hb_parcx( 2 ) ); LPTSTR lpStr2 = HB_TCHAR_CONVTO( hb_parcx( 3 ) ); - HWND hWnd = ISNUM( 1 ) ? ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ) : + HWND hWnd = HB_ISNUM( 1 ) ? ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ) : ( HWND ) hb_parptr( 1 ); hb_retni( MessageBox( hWnd, lpStr1, lpStr2, hb_parni( 4 ) ) ); HB_TCHAR_FREE( lpStr1 ); @@ -1403,7 +1403,7 @@ HB_FUNC( CREATEOLEOBJECT ) /* ( cOleName | cCLSID [, cIID ] [, cLicense ] ) */ /*HB_TRACE(HB_TR_INFO, ("Result: %p\n", s_nOleError));*/ - if( ISCHAR( 2 ) ) + if( HB_ISCHAR( 2 ) ) { if( hb_parcx( 2 )[ 0 ] == '{' ) { @@ -1419,7 +1419,7 @@ HB_FUNC( CREATEOLEOBJECT ) /* ( cOleName | cCLSID [, cIID ] [, cLicense ] ) */ if( SUCCEEDED( s_nOleError ) ) { - if( ISCHAR( 3 ) ) + if( HB_ISCHAR( 3 ) ) { LPVOID * pCFPtr = NULL; @@ -1533,7 +1533,7 @@ static HRESULT OleSetProperty( IDispatch *pDisp, DISPID DispID, DISPPARAMS *pDis pDispParams->cNamedArgs = 1; /* 1 Based!!! */ - if( ( ISBYREF( 1 ) ) || ISARRAY( 1 ) ) + if( ( HB_ISBYREF( 1 ) ) || HB_ISARRAY( 1 ) ) { memset( ( LPBYTE ) &s_excep, 0, sizeof( s_excep ) ); diff --git a/harbour/examples/hbwhat/whtbmp.c b/harbour/examples/hbwhat/whtbmp.c index 158e5bf882..e7b853a64d 100644 --- a/harbour/examples/hbwhat/whtbmp.c +++ b/harbour/examples/hbwhat/whtbmp.c @@ -43,7 +43,7 @@ extern void Size2ArrayEx( SIZE *siz , PHB_ITEM aSize); HB_FUNC( VWN_LOADBITMAP ) { HB_RETWH( LoadBitmap( - ISNIL(1) ? GetModuleHandle( NULL ): (HINSTANCE) HB_PARWH(1) , + HB_ISNIL(1) ? GetModuleHandle( NULL ): (HINSTANCE) HB_PARWH(1) , hb_parinfo(2)==HB_IT_STRING ? (LPCTSTR) hb_parcx( 2 ) : MAKEINTRESOURCE( (WORD) hb_parni(2)) ) ); @@ -60,8 +60,8 @@ HB_FUNC( VWN_DRAWBITMAP ) DWORD dwraster = (ISNIL(3))? SRCCOPY : hb_parnl(3); HBITMAP hBitmap = (HBITMAP) HB_PARWH( 2 ); BITMAP bitmap; - int nWidthDest = ( hb_pcount() >=5 && !ISNIL(6) )? hb_parni(6):0; - int nHeightDest = ( hb_pcount()>=6 && !ISNIL(7) )? hb_parni(7):0; + int nWidthDest = ( hb_pcount() >=5 && !HB_ISNIL(6) )? hb_parni(6):0; + int nHeightDest = ( hb_pcount()>=6 && !HB_ISNIL(7) )? hb_parni(7):0; SelectObject( hDCmem, hBitmap ); GetObject( hBitmap, sizeof( BITMAP ), ( LPVOID ) &bitmap ); @@ -592,7 +592,7 @@ HB_FUNC( VWN_GETDIBITS ) (HBITMAP) HB_PARWH( 2 ) , (UINT) hb_parni( 3 ) , (UINT) hb_parni( 4 ) , - ISNIL(5) ? NULL : lpvBits , + HB_ISNIL(5) ? NULL : lpvBits , bmi , (UINT) hb_parni( 7 ) ) ); diff --git a/harbour/examples/hbwhat/whtcdlg.c b/harbour/examples/hbwhat/whtcdlg.c index 2d700a03bf..38fb302be5 100644 --- a/harbour/examples/hbwhat/whtcdlg.c +++ b/harbour/examples/hbwhat/whtcdlg.c @@ -72,7 +72,7 @@ HB_FUNC( VWN__FINDTEXT ) fr.wFindWhatLen = (WORD) hb_parclen(4); fr.wReplaceWithLen = 0 ; fr.lCustData = 0 ; -// fr.lpfnHook = ISNIL(5) ? NULL : __DlgProc ; +// fr.lpfnHook = HB_ISNIL(5) ? NULL : __DlgProc ; fr.lpTemplateName = NULL ; @@ -97,7 +97,7 @@ HB_FUNC( VWN__REPLACETEXT ) fr.wFindWhatLen = (WORD) hb_parclen( 4 ); fr.wReplaceWithLen = (WORD) hb_parclen( 5 ); fr.lCustData = 0 ; -// fr.lpfnHook = ISNIL(5) ? NULL : __DlgProc ; +// fr.lpfnHook = HB_ISNIL(5) ? NULL : __DlgProc ; fr.lpTemplateName = NULL ; HB_RETWH( FindText( &fr ) ); @@ -182,7 +182,7 @@ HB_FUNC( VWN_CHOOSECOLOR ) // GetSysColor(COLOR_BTNFACE)); cc.lStructSize = sizeof( CHOOSECOLOR ); - cc.hwndOwner = ISNIL(1) ? GetActiveWindow():(HWND) HB_PARWH(1); + cc.hwndOwner = HB_ISNIL(1) ? GetActiveWindow():(HWND) HB_PARWH(1); cc.rgbResult = (COLORREF)ISNIL(2) ? 0 : hb_parnl(2); cc.lpCustColors = crCustClr ; cc.Flags = (WORD) (ISNIL(4) ? CC_ANYCOLOR | CC_FULLOPEN | CC_RGBINIT : hb_parnl(4) ); @@ -275,7 +275,7 @@ HB_FUNC( VWN_SHBROWSEFORFOLDER ) char *lpBuffer = (char*) hb_xgrab( MAX_PATH + 1 ); LPITEMIDLIST pidlBrowse; - SHGetSpecialFolderLocation(hwnd, ISNIL(4) ? CSIDL_DRIVES : hb_parni(4), &pidlBrowse); + SHGetSpecialFolderLocation(hwnd, HB_ISNIL(4) ? CSIDL_DRIVES : hb_parni(4), &pidlBrowse); BrowseInfo.hwndOwner = hwnd; BrowseInfo.pidlRoot = pidlBrowse; BrowseInfo.pszDisplayName = lpBuffer; diff --git a/harbour/examples/hbwhat/whtclpb.c b/harbour/examples/hbwhat/whtclpb.c index 65cd80b894..e0aadf62ae 100644 --- a/harbour/examples/hbwhat/whtclpb.c +++ b/harbour/examples/hbwhat/whtclpb.c @@ -175,7 +175,7 @@ HB_FUNC( VWN_GETCLIPBOARDDATA ) HB_FUNC( VWN_GETCLIPBOARDDATA ) { - WORD wType = ( ISNIL( 1 ) ? CF_TEXT : ( WORD ) hb_parni( 1 ) ); + WORD wType = ( HB_ISNIL( 1 ) ? CF_TEXT : ( WORD ) hb_parni( 1 ) ); HGLOBAL hMem ; HANDLE hClipMem ; LPSTR lpClip ; diff --git a/harbour/examples/hbwhat/whtcomm.c b/harbour/examples/hbwhat/whtcomm.c index d6c42a8864..afcb2c9413 100644 --- a/harbour/examples/hbwhat/whtcomm.c +++ b/harbour/examples/hbwhat/whtcomm.c @@ -158,9 +158,9 @@ HB_FUNC( VWN_CREATEPROGRESSBAR ) HWND hPBar, hParentWindow = (HWND) HB_PARWH(1); RECT rcClient; LONG ProgressBarStyle; - BOOL bBorder = ISNIL(7) ? FALSE : hb_parl(7); - int cyVScroll = ISNIL(6) ? GetSystemMetrics( SM_CYVSCROLL ): hb_parni(6); - LONG nStyle = ISNIL(8) ? 0 : hb_parnl(8); + BOOL bBorder = HB_ISNIL(7) ? FALSE : hb_parl(7); + int cyVScroll = HB_ISNIL(6) ? GetSystemMetrics( SM_CYVSCROLL ): hb_parni(6); + LONG nStyle = HB_ISNIL(8) ? 0 : hb_parnl(8); int x1, y1, nwidth, nheight; if( hb_pcount() > 2 ) diff --git a/harbour/examples/hbwhat/whtdate.c b/harbour/examples/hbwhat/whtdate.c index f3c12e6ce9..38a7b15ef0 100644 --- a/harbour/examples/hbwhat/whtdate.c +++ b/harbour/examples/hbwhat/whtdate.c @@ -30,7 +30,7 @@ HB_FUNC( VWN_DATETIME_CREATE ) { - HB_RETWH( CreateWindowEx( ISNIL( 1 ) ? 0 : hb_parnl( 1 ) , + HB_RETWH( CreateWindowEx( HB_ISNIL( 1 ) ? 0 : hb_parnl( 1 ) , "SysDateTimePick32" , // CLASSNAME 0 , // Window Name // ???????? (DWORD) hb_parnl( 2 ) , // nStyle @@ -41,7 +41,7 @@ HB_FUNC( VWN_DATETIME_CREATE ) (HWND) HB_PARWH( 7 ) , // hParent (HMENU) HB_PARWH( 8 ) , // hMenu GetModuleHandle(NULL) , // hInstance - ISNIL( 9 ) ? NULL : (void *) HB_PARWH( 9 ) ) ); // lpParam + HB_ISNIL( 9 ) ? NULL : (void *) HB_PARWH( 9 ) ) ); // lpParam } //----------------------------------------------------------------------------- @@ -122,7 +122,7 @@ HB_FUNC( VWN_DATETIME_GETRANGE ) dwRet = DateTime_GetRange( (HWND) HB_PARWH( 1 ), (SYSTEMTIME *)lpSysTimeArray ); - if( ISBYREF( 2 ) ) + if( HB_ISBYREF( 2 ) ) hb_stornl( dwRet, 2 ); aMinMaxDate = hb_itemArrayNew( 2 ); @@ -290,7 +290,7 @@ HB_FUNC( VWN_DATETIME_SETSYSTEMTIME ) { SYSTEMTIME SysTime, *lpSysTime ; - if ( ISARRAY( 3 ) ) // array + if ( HB_ISARRAY( 3 ) ) // array { SysTime.wYear = (WORD) hb_parni( 3, 1 ); SysTime.wMonth = (WORD) hb_parni( 3, 2 ); @@ -304,7 +304,7 @@ HB_FUNC( VWN_DATETIME_SETSYSTEMTIME ) } else { - if ( ISCHAR(2) ) // xHarbour structure + if ( HB_ISCHAR(2) ) // xHarbour structure { lpSysTime =( SYSTEMTIME *) hb_parc( 3 ); //hb_param( 3, HB_IT_STRING)->item.asString.value; } diff --git a/harbour/examples/hbwhat/whtdc.c b/harbour/examples/hbwhat/whtdc.c index 7fce262deb..f49651b848 100644 --- a/harbour/examples/hbwhat/whtdc.c +++ b/harbour/examples/hbwhat/whtdc.c @@ -123,13 +123,13 @@ HB_FUNC( VWN_CREATEDC ) { DEVMODE *lpInitData = NULL; - if ( ! ISNIL( 4 ) ) + if ( ! HB_ISNIL( 4 ) ) lpInitData = (DEVMODE *) hb_parc( 4 ); //hb_param( 4, HB_IT_STRING)->item.asString.value ; HB_RETWH( CreateDC((LPCTSTR) hb_parcx( 1 ) , // pointer to string specifying driver name (LPCTSTR) hb_parcx( 2 ) , // pointer to string specifying device name NULL , // do not use; set to NULL - ISNIL( 4 ) ? NULL : lpInitData // pointer to optional printer data + HB_ISNIL( 4 ) ? NULL : lpInitData // pointer to optional printer data ) ); } @@ -144,11 +144,11 @@ HB_FUNC( VWN_RESETDC ) DEVMODE *lpInitData = NULL; - if ( ! ISNIL( 2 ) ) + if ( ! HB_ISNIL( 2 ) ) lpInitData = (DEVMODE *) hb_parc( 2 ); //hb_param( 2, HB_IT_STRING)->item.asString.value ; HB_RETWH( ResetDCA( (HDC) HB_PARWH( 1 ), - ISNIL( 2 )? NULL : lpInitData ) ); + HB_ISNIL( 2 )? NULL : lpInitData ) ); } diff --git a/harbour/examples/hbwhat/whtdir.c b/harbour/examples/hbwhat/whtdir.c index a6f2cb188a..efce0fff15 100644 --- a/harbour/examples/hbwhat/whtdir.c +++ b/harbour/examples/hbwhat/whtdir.c @@ -81,7 +81,7 @@ HB_FUNC( VWN_GETTEMPFILENAME ) GetTempFileName( (LPCSTR) hb_parcx( 1 ), (LPCSTR) hb_parcx( 2 ), - (UINT) ( ISNIL(3) ? 0 : hb_parni( 3 ) ) , + (UINT) ( HB_ISNIL(3) ? 0 : hb_parni( 3 ) ) , (LPSTR) cPath ); hb_retc( cPath); @@ -266,7 +266,7 @@ HB_FUNC( VWN_GETVOLUMEPATHNAME ) bResult = pGVPN( (LPCSTR) hb_parcx( 1 ), buffer, MAX_PATH ); } hb_retl( bResult ); - if ( ISBYREF( 2 ) ) + if ( HB_ISBYREF( 2 ) ) { hb_storc( buffer ,2 ); } @@ -330,7 +330,7 @@ HB_FUNC( VWN_GETVOLUMEINFORMATION ) char *FileSystemNameBuffer = (char *) hb_xgrab( MAX_PATH ) ; BOOL bRet; - bRet = GetVolumeInformation( ISNIL(1) ? NULL : (LPCTSTR) hb_parcx(1) , + bRet = GetVolumeInformation( HB_ISNIL(1) ? NULL : (LPCTSTR) hb_parcx(1) , (LPTSTR) VolumeNameBuffer , MAX_PATH , &VolumeSerialNumber , @@ -340,11 +340,11 @@ HB_FUNC( VWN_GETVOLUMEINFORMATION ) MAX_PATH ); if ( bRet ) { - if ( ISBYREF( 2 ) ) hb_storc ((char *) VolumeNameBuffer, 2 ); - if ( ISBYREF( 3 ) ) hb_stornl( (LONG) VolumeSerialNumber, 3 ); - if ( ISBYREF( 4 ) ) hb_stornl( (LONG) MaximumComponentLength, 4 ); - if ( ISBYREF( 5 ) ) hb_stornl( (LONG) FileSystemFlags, 5 ); - if ( ISBYREF( 6 ) ) hb_storc ((char *) FileSystemNameBuffer, 6 ); + if ( HB_ISBYREF( 2 ) ) hb_storc ((char *) VolumeNameBuffer, 2 ); + if ( HB_ISBYREF( 3 ) ) hb_stornl( (LONG) VolumeSerialNumber, 3 ); + if ( HB_ISBYREF( 4 ) ) hb_stornl( (LONG) MaximumComponentLength, 4 ); + if ( HB_ISBYREF( 5 ) ) hb_stornl( (LONG) FileSystemFlags, 5 ); + if ( HB_ISBYREF( 6 ) ) hb_storc ((char *) FileSystemNameBuffer, 6 ); } hb_retl(bRet); diff --git a/harbour/examples/hbwhat/whtdlg.c b/harbour/examples/hbwhat/whtdlg.c index 5c5540b545..d27c6b854a 100644 --- a/harbour/examples/hbwhat/whtdlg.c +++ b/harbour/examples/hbwhat/whtdlg.c @@ -145,7 +145,7 @@ HB_FUNC( VWN_GETDLGITEMTEXT ) // GETDLGITMTEXT HB_FUNC( VWN_GETLBITEMTEXT ) // GETDLGITMTEXT { - USHORT iLen = ISNIL(3) ? 255 : ( USHORT ) hb_parni( 3 ); + USHORT iLen = HB_ISNIL(3) ? 255 : ( USHORT ) hb_parni( 3 ); char * cText = ( char * ) hb_xgrab( iLen + 1 ); SendMessage( @@ -167,7 +167,7 @@ HB_FUNC( VWN_CHECKDLGBUTTON ) hb_retl( CheckDlgButton( (HWND) HB_PARWH( 1 ), // handle of dialog box hb_parni( 2 ), // identifier of control - ISNUM(3) ? ( UINT ) hb_parni(3) : (UINT) hb_parl(3) ) ); + HB_ISNUM(3) ? ( UINT ) hb_parni(3) : (UINT) hb_parl(3) ) ); } //----------------------------------------------------------------------------- @@ -225,7 +225,7 @@ HB_FUNC( VWN_DLGDIRLIST ) HB_FUNC( VWN_DLGDIRSELECTEX ) { - USHORT iLen = ISNIL(3) ? MAX_PATH : ( USHORT ) hb_parni( 3 ); + USHORT iLen = HB_ISNIL(3) ? MAX_PATH : ( USHORT ) hb_parni( 3 ); char *cText = (char*) hb_xgrab( iLen+1 ); hb_retl( DlgDirSelectEx( (HWND) HB_PARWH( 1 ), @@ -265,7 +265,7 @@ HB_FUNC( VWN_DLGDIRLISTCOMBOBOX ) HB_FUNC( VWN_DLGDIRSELECTCOMBOBOXEX ) { - USHORT iLen = ISNIL(3) ? MAX_PATH : ( USHORT ) hb_parni( 3 ); + USHORT iLen = HB_ISNIL(3) ? MAX_PATH : ( USHORT ) hb_parni( 3 ); char *cText = (char*) hb_xgrab( iLen+1 ); hb_retl( DlgDirSelectComboBoxEx( (HWND) HB_PARWH( 1 ), diff --git a/harbour/examples/hbwhat/whtdraw.c b/harbour/examples/hbwhat/whtdraw.c index da854eefd4..f3fe3df870 100644 --- a/harbour/examples/hbwhat/whtdraw.c +++ b/harbour/examples/hbwhat/whtdraw.c @@ -131,7 +131,7 @@ HB_FUNC( VWN_DESCRIBEPIXELFORMAT ) nBytes , &pfd ) ); - if ( ISBYREF(3) ) + if ( HB_ISBYREF(3) ) hb_storclen( (char*) &pfd, sizeof(PIXELFORMATDESCRIPTOR), 3 ); //hb_itemPutCRaw( hb_param( -1, HB_IT_ANY ), (char *) pfd , sizeof( PIXELFORMATDESCRIPTOR ) ); @@ -401,7 +401,7 @@ HB_FUNC( VWN_POLYPOLYLINE ) PHB_ITEM aParam ; PHB_ITEM aSub ; - if (ISARRAY( 2 ) && ISARRAY( 3 ) ) + if (ISARRAY( 2 ) && HB_ISARRAY( 3 ) ) { iPolyCount = hb_parinfa(3,0); PolyPoints = (DWORD *) hb_xgrab( iPolyCount * sizeof( DWORD ) ); @@ -470,7 +470,7 @@ HB_FUNC( VWN_POLYDRAW ) PHB_ITEM aParam ; PHB_ITEM aSub ; - if (ISARRAY( 2 ) && ISCHAR( 3 ) ) + if (ISARRAY( 2 ) && HB_ISCHAR( 3 ) ) { iCount = hb_parinfa( 2, 0 ); if ( iCount == hb_parclen( 3 ) ) @@ -778,7 +778,7 @@ HB_FUNC( VWN_POLYPOLYGON ) PHB_ITEM aParam ; PHB_ITEM aSub ; - if (ISARRAY( 2 ) && ISARRAY( 3 ) ) + if (ISARRAY( 2 ) && HB_ISARRAY( 3 ) ) { iPolyCount = hb_parinfa(3,0); PolyPoints = ( INT *) hb_xgrab( iPolyCount * sizeof( INT ) ); @@ -833,7 +833,7 @@ HB_FUNC( VWN_FILLRECT ) { RECT rc ; - if ( ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc )) + if ( HB_ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc )) hb_retni( FillRect((HDC) HB_PARWH( 1 ), &rc, (HBRUSH) HB_PARWH( 3 ) ) ); else hb_retni(0); @@ -853,7 +853,7 @@ HB_FUNC( VWN_FRAMERECT ) { RECT rc ; - if ( ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc )) + if ( HB_ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc )) hb_retni( FrameRect((HDC) HB_PARWH( 1 ), &rc, (HBRUSH) HB_PARWH( 3 ) ) ); else hb_retni(0); @@ -870,7 +870,7 @@ HB_FUNC( VWN_INVERTRECT ) { RECT rc ; - if ( ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc )) + if ( HB_ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc )) hb_retni( InvertRect((HDC) HB_PARWH( 1 ), &rc ) ); else hb_retni(0); diff --git a/harbour/examples/hbwhat/whtfont.c b/harbour/examples/hbwhat/whtfont.c index 2e04aa762b..f73ad3304d 100644 --- a/harbour/examples/hbwhat/whtfont.c +++ b/harbour/examples/hbwhat/whtfont.c @@ -38,7 +38,7 @@ int CALLBACK GenericCallblockProc( LONG param1, LONG param2, int wParam, LPARAM HB_FUNC( VWN_CREATEFONT ) { - if ( ISARRAY(1)) + if ( HB_ISARRAY(1)) { HB_RETWH( CreateFont( hb_parni( 1, 1 ) , // nHeight hb_parni( 1, 2 ) , // nWidth @@ -59,11 +59,11 @@ HB_FUNC( VWN_CREATEFONT ) } else { - HB_RETWH( CreateFont( ISNIL(1) ? 0 : hb_parni( 1 ) , // nHeight - ISNIL(2) ? 0 : hb_parni( 2 ) , // nWidth - ISNIL(3) ? 0 : hb_parni( 3 ) , // nEscapement - ISNIL(4) ? 0 : hb_parni( 4 ) , // nOrientation - ISNIL(5) ? 0 : hb_parni( 5 ) , // fnWeight + HB_RETWH( CreateFont( HB_ISNIL(1) ? 0 : hb_parni( 1 ) , // nHeight + HB_ISNIL(2) ? 0 : hb_parni( 2 ) , // nWidth + HB_ISNIL(3) ? 0 : hb_parni( 3 ) , // nEscapement + HB_ISNIL(4) ? 0 : hb_parni( 4 ) , // nOrientation + HB_ISNIL(5) ? 0 : hb_parni( 5 ) , // fnWeight (DWORD) hb_parnl( 6 ) , // fdwItalic (DWORD) hb_parnl( 7 ) , // fdwUnderline (DWORD) hb_parnl( 8 ) , // fdwStrikeOut @@ -139,7 +139,7 @@ HB_FUNC( VWN_ENUMFONTFAMILIES ) { LPARAM lParam ; - if ( ISBLOCK( 3 ) ) + if ( HB_ISBLOCK( 3 ) ) { lParam = (LPARAM) (PHB_ITEM ) hb_param( 3, HB_IT_BLOCK ); @@ -169,7 +169,7 @@ HB_FUNC( VWN_ENUMFONTFAMILIESEX ) LOGFONT *LogFont = (LOGFONT * ) hb_parc( 2 ); //hb_param( 2, HB_IT_STRING )->item.asString.value ; LPARAM lParam ; - if ( ISBLOCK( 3 ) ) + if ( HB_ISBLOCK( 3 ) ) { lParam = (LPARAM) (PHB_ITEM ) hb_param( 3, HB_IT_BLOCK ); @@ -202,7 +202,7 @@ HB_FUNC( VWN_ENUMFONTS ) { LPARAM lParam ; - if ( ISBLOCK( 3 ) ) + if ( HB_ISBLOCK( 3 ) ) { lParam = (LPARAM) (PHB_ITEM ) hb_param( 3, HB_IT_BLOCK ); @@ -301,19 +301,19 @@ HB_FUNC( VWN_GETFONTDATA ) { char * cBuffer = NULL; DWORD dwRet ; - if ( ! ISNIL( 5 ) && ( hb_parnl( 5 ) > 0 ) ) + if ( ! HB_ISNIL( 5 ) && ( hb_parnl( 5 ) > 0 ) ) cBuffer = (char *) hb_xgrab( hb_parnl(5)); dwRet = GetFontData( (HDC) HB_PARWH( 1 ) , (DWORD) hb_parnl( 2 ), (DWORD) hb_parnl( 3 ), - ( ISNIL( 5 ) || ( hb_parnl( 5 ) <= 0 ) ) ? NULL :cBuffer , - (DWORD) ISNIL( 5 ) ? 0 : hb_parnl( 5 ) + ( HB_ISNIL( 5 ) || ( hb_parnl( 5 ) <= 0 ) ) ? NULL :cBuffer , + (DWORD) HB_ISNIL( 5 ) ? 0 : hb_parnl( 5 ) ); hb_retnl( (LONG) dwRet ); - if ( ! ISNIL( 5 ) && ( hb_parnl( 5 ) > 0 ) ) + if ( ! HB_ISNIL( 5 ) && ( hb_parnl( 5 ) > 0 ) ) { hb_storclen(cBuffer, dwRet, 4 ); hb_xfree( cBuffer ); diff --git a/harbour/examples/hbwhat/whticon.c b/harbour/examples/hbwhat/whticon.c index 0cefa0397c..637b68c8a5 100644 --- a/harbour/examples/hbwhat/whticon.c +++ b/harbour/examples/hbwhat/whticon.c @@ -30,7 +30,7 @@ HB_FUNC( VWN_LOADICON ) { - HB_RETWH( LoadIcon( ( ISNIL(1) ? NULL : (HINSTANCE) HB_PARWH( 1 ) ) , + HB_RETWH( LoadIcon( ( HB_ISNIL(1) ? NULL : (HINSTANCE) HB_PARWH( 1 ) ) , (hb_parinfo(2)==HB_IT_STRING ? hb_parcx(2) : MAKEINTRESOURCE( (WORD) hb_parni(2))) ) ); } @@ -43,7 +43,7 @@ HB_FUNC( VWN_LOADICON ) HB_FUNC( VWN_CREATEICON ) { - HB_RETWH( CreateIcon( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ), + HB_RETWH( CreateIcon( HB_ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ), hb_parni( 2 ) , hb_parni( 3 ) , (BYTE) hb_parni( 4 ) , @@ -127,7 +127,7 @@ HB_FUNC( VWN_CREATEICONFROMRESOURCEEX ) HB_FUNC( VWN_LOADIMAGE ) { - HB_RETWH( LoadImage( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ), + HB_RETWH( LoadImage( HB_ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ), (LPCSTR) hb_parcx( 2 ) , (UINT) hb_parni( 3 ) , hb_parni( 4 ) , @@ -227,7 +227,7 @@ HB_FUNC( VWN_GETICONINFO ) #ifndef __WATCOMC__ HB_FUNC( VWN_DUPLICATEICON ) { - HB_RETWH( DuplicateIcon( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ), + HB_RETWH( DuplicateIcon( HB_ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ), (HICON) HB_PARWH( 2 ) ) ); } @@ -242,7 +242,7 @@ HB_FUNC( VWN_EXTRACTASSOCIATEDICON ) lpiIcon = (WORD) hb_parni( 2 ); - hiRet = ExtractAssociatedIcon( ( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ) ) , + hiRet = ExtractAssociatedIcon( ( HB_ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ) ) , (LPSTR) hb_parcx( 2 ) , &lpiIcon ); @@ -261,7 +261,7 @@ HB_FUNC( VWN_EXTRACTASSOCIATEDICON ) HB_FUNC( VWN_EXTRACTICON ) { - HB_RETWH( ExtractIcon( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ), + HB_RETWH( ExtractIcon( HB_ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ), (LPCSTR) hb_parcx( 2 ) , (UINT) hb_parni( 3 ) ) ); diff --git a/harbour/examples/hbwhat/whtilst.c b/harbour/examples/hbwhat/whtilst.c index 2f8c884b84..8daee3c240 100644 --- a/harbour/examples/hbwhat/whtilst.c +++ b/harbour/examples/hbwhat/whtilst.c @@ -194,7 +194,7 @@ HB_FUNC( VWN_IMAGELIST_GETICON ) HB_FUNC( VWN_IMAGELIST_LOADIMAGE ) { HB_RETWH( ImageList_LoadImageA( (HINSTANCE) HB_PARWH(1), - ISCHAR(2)?(LPCSTR) hb_parcx(2) : MAKEINTRESOURCE(hb_parni(2)) , + HB_ISCHAR(2)?(LPCSTR) hb_parcx(2) : MAKEINTRESOURCE(hb_parni(2)) , hb_parni(3) , hb_parni(4) , (COLORREF) hb_parnl(5), diff --git a/harbour/examples/hbwhat/whtinet.c b/harbour/examples/hbwhat/whtinet.c index 630a480752..01da3e1361 100644 --- a/harbour/examples/hbwhat/whtinet.c +++ b/harbour/examples/hbwhat/whtinet.c @@ -59,8 +59,8 @@ // HB_FUNC( VWN_INTERNETDIAL ) { - HWND hWnd = ISNIL( 1 ) ? 0 : ( HWND ) HB_PARWH( 1 ); - LPTSTR lpszId = ISNIL( 2 ) ? NULL : hb_parcx( 2 ); + HWND hWnd = HB_ISNIL( 1 ) ? 0 : ( HWND ) HB_PARWH( 1 ); + LPTSTR lpszId = HB_ISNIL( 2 ) ? NULL : hb_parcx( 2 ); DWORD nFlags = INTERNET_AUTODIAL_FORCE_ONLINE ; DWORD nRet = 0; @@ -116,11 +116,11 @@ HB_FUNC( VWN_INTERNETGETCONNECTEDSTATE ) // HB_FUNC( VWN_INTERNETOPEN ) { - LPCTSTR lpszAgent = ISNIL( 1 ) ? NULL : hb_parcx( 1 ); - DWORD dwAccessType = ISNIL( 2 ) ? INTERNET_OPEN_TYPE_DIRECT : hb_parnl( 2 ); - LPCTSTR lpszProxyName = ISNIL( 3 ) ? NULL : hb_parcx( 3 ); - LPCTSTR lpszProxyBypass = ISNIL( 4 ) ? NULL : hb_parcx( 4 ); - DWORD dwFlags = ISNIL( 5 ) ? 0 : hb_parnl( 5 ); + LPCTSTR lpszAgent = HB_ISNIL( 1 ) ? NULL : hb_parcx( 1 ); + DWORD dwAccessType = HB_ISNIL( 2 ) ? INTERNET_OPEN_TYPE_DIRECT : hb_parnl( 2 ); + LPCTSTR lpszProxyName = HB_ISNIL( 3 ) ? NULL : hb_parcx( 3 ); + LPCTSTR lpszProxyBypass = HB_ISNIL( 4 ) ? NULL : hb_parcx( 4 ); + DWORD dwFlags = HB_ISNIL( 5 ) ? 0 : hb_parnl( 5 ); HB_RETWH( InternetOpen( lpszAgent, dwAccessType, lpszProxyName, lpszProxyBypass, dwFlags ) ); } @@ -147,12 +147,12 @@ HB_FUNC( VWN_INTERNETCONNECT ) { HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 ); LPCTSTR lpszServerName = hb_parcx( 2 ); - INTERNET_PORT nServerPort = ISNIL( 3 ) ? INTERNET_DEFAULT_HTTP_PORT : ( INTERNET_PORT ) hb_parni( 3 ); - LPCTSTR lpszUserName = ISNIL( 4 ) ? NULL : hb_parcx( 4 ); - LPCTSTR lpszPassword = ISNIL( 5 ) ? NULL : hb_parcx( 5 ); - DWORD dwService = ISNIL( 6 ) ? INTERNET_SERVICE_HTTP : hb_parnl( 6 ); - DWORD dwFlags = ISNIL( 7 ) ? 0 : hb_parnl( 7 ); - DWORD_PTR dwContext = ISNIL( 8 ) ? 0 : hb_parnl( 8 ); + INTERNET_PORT nServerPort = HB_ISNIL( 3 ) ? INTERNET_DEFAULT_HTTP_PORT : ( INTERNET_PORT ) hb_parni( 3 ); + LPCTSTR lpszUserName = HB_ISNIL( 4 ) ? NULL : hb_parcx( 4 ); + LPCTSTR lpszPassword = HB_ISNIL( 5 ) ? NULL : hb_parcx( 5 ); + DWORD dwService = HB_ISNIL( 6 ) ? INTERNET_SERVICE_HTTP : hb_parnl( 6 ); + DWORD dwFlags = HB_ISNIL( 7 ) ? 0 : hb_parnl( 7 ); + DWORD_PTR dwContext = HB_ISNIL( 8 ) ? 0 : hb_parnl( 8 ); HB_RETWH( InternetConnect( hInternet, lpszServerName, nServerPort, lpszUserName, lpszPassword, @@ -178,9 +178,9 @@ HB_FUNC( VWN_FTPOPENFILE ) { HINTERNET hFtp = ( HINTERNET ) HB_PARWH( 1 ); LPCTSTR lpszFileName = hb_parcx( 2 ); - DWORD dwAccess = ISNIL( 3 ) ? GENERIC_READ : ( DWORD ) hb_parni( 3 ); - DWORD dwFlags = ISNIL( 4 ) ? FTP_TRANSFER_TYPE_BINARY : hb_parni( 4 ); - DWORD_PTR dwContext = ISNIL( 5 ) ? 0 : hb_parnl( 5 ); + DWORD dwAccess = HB_ISNIL( 3 ) ? GENERIC_READ : ( DWORD ) hb_parni( 3 ); + DWORD dwFlags = HB_ISNIL( 4 ) ? FTP_TRANSFER_TYPE_BINARY : hb_parni( 4 ); + DWORD_PTR dwContext = HB_ISNIL( 5 ) ? 0 : hb_parnl( 5 ); hb_retl( FtpOpenFile( hFtp, lpszFileName, dwAccess, dwFlags, dwContext ) != NULL ); } @@ -209,7 +209,7 @@ HB_FUNC( VWN_INTERNETWRITEFILE ) hb_retl( InternetWriteFile( hFile, lpBuffer, dwNumberOfBytesToWrite, &dwNumberOfBytesWritten ) ); - if ISBYREF( 4 ) + if HB_ISBYREF( 4 ) hb_stornl( ( ULONG ) dwNumberOfBytesWritten, 4 ); } @@ -242,7 +242,7 @@ HB_FUNC( VWN_INTERNETREADFILE ) if( bRet ) { - if ISBYREF( 4 ) + if HB_ISBYREF( 4 ) { hb_stornl( ( ULONG ) dwNumberOfBytesRead, 4 ); } @@ -267,10 +267,10 @@ HB_FUNC( VWN_INTERNETREADFILE ) HB_FUNC( VWN_FTPCOMMAND ) { HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 ); - BOOL fExpectResponse = ISNIL( 2 ) ? 0 : hb_parl( 2 ); - DWORD dwFlags = ISNIL( 3 ) ? FTP_TRANSFER_TYPE_BINARY : hb_parnl( 3 ); + BOOL fExpectResponse = HB_ISNIL( 2 ) ? 0 : hb_parl( 2 ); + DWORD dwFlags = HB_ISNIL( 3 ) ? FTP_TRANSFER_TYPE_BINARY : hb_parnl( 3 ); LPCTSTR lpszCommand = hb_parcx( 4 ); - DWORD_PTR dwContext = ISNIL( 5 ) ? 0 : hb_parnl( 5 ); + DWORD_PTR dwContext = HB_ISNIL( 5 ) ? 0 : hb_parnl( 5 ); HINTERNET phFtpCommand ; BOOL bRet ; @@ -282,7 +282,7 @@ HB_FUNC( VWN_FTPCOMMAND ) if ( bRet ) { - if ( ISBYREF( 6 ) ) + if ( HB_ISBYREF( 6 ) ) HB_STORWH( phFtpCommand, 6 ); } } @@ -359,17 +359,17 @@ HB_FUNC( VWN_FTPCOMMAND ) HB_FUNC( VWN_FTPFINDFIRSTFILE ) { HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 ); - LPCTSTR lpszSearchFile = ISNIL( 2 ) ? TEXT ("*.*") : hb_parcx( 2 ); + LPCTSTR lpszSearchFile = HB_ISNIL( 2 ) ? TEXT ("*.*") : hb_parcx( 2 ); WIN32_FIND_DATA FindFileData ; - DWORD dwFlags = ISNIL( 4 ) ? INTERNET_FLAG_NEED_FILE : hb_parnl( 4 ); - DWORD_PTR dwContext = ISNIL( 5 ) ? 0 : hb_parnl( 5 ); + DWORD dwFlags = HB_ISNIL( 4 ) ? INTERNET_FLAG_NEED_FILE : hb_parnl( 4 ); + DWORD_PTR dwContext = HB_ISNIL( 5 ) ? 0 : hb_parnl( 5 ); HINTERNET hResult ; hResult = FtpFindFirstFile( hInternet, lpszSearchFile, &FindFileData, dwFlags, dwContext ); if ( hResult ) - if ( ISBYREF( 3 ) ) + if ( HB_ISBYREF( 3 ) ) hb_storclen( (char *) &FindFileData , sizeof( WIN32_FIND_DATA ), 3 ); HB_RETWH( hResult ); @@ -391,7 +391,7 @@ HB_FUNC( VWN_INTERNETFINDNEXTFILE ) if ( InternetFindNextFile( hFind, &FindFileData ) ) { hb_retl( TRUE ); - if ( ISBYREF( 2 ) ) + if ( HB_ISBYREF( 2 ) ) hb_storclen( ( char * ) &FindFileData, sizeof( WIN32_FIND_DATA ), 2 ); } else @@ -420,10 +420,10 @@ HB_FUNC( VWN_FTPGETFILE ) HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 ); LPCTSTR lpszRemoteFile = hb_parcx( 2 ); LPCTSTR lpszLocalFile = hb_parcx( 3 ); - BOOL fFailIfExist = ISNIL( 4 ) ? FALSE : hb_parl( 4 ); - DWORD dwFlagsAndAttributes = ISNIL( 5 ) ? FILE_ATTRIBUTE_NORMAL : hb_parnl( 5 ); - DWORD dwFlags = ISNIL( 6 ) ? FTP_TRANSFER_TYPE_BINARY | INTERNET_FLAG_RELOAD : ( DWORD ) hb_parnl( 6 ); - DWORD_PTR dwContext = ISNIL( 7 ) ? 0 : hb_parnl( 7 ); + BOOL fFailIfExist = HB_ISNIL( 4 ) ? FALSE : hb_parl( 4 ); + DWORD dwFlagsAndAttributes = HB_ISNIL( 5 ) ? FILE_ATTRIBUTE_NORMAL : hb_parnl( 5 ); + DWORD dwFlags = HB_ISNIL( 6 ) ? FTP_TRANSFER_TYPE_BINARY | INTERNET_FLAG_RELOAD : ( DWORD ) hb_parnl( 6 ); + DWORD_PTR dwContext = HB_ISNIL( 7 ) ? 0 : hb_parnl( 7 ); hb_retl( FtpGetFile( hInternet, lpszRemoteFile, lpszLocalFile, fFailIfExist, dwFlagsAndAttributes, @@ -450,8 +450,8 @@ HB_FUNC( VWN_FTPPUTFILE ) HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 ); LPCTSTR lpszLocalFile = hb_parcx( 2 ); LPCTSTR lpszRemoteFile = hb_parcx( 3 ); - DWORD dwFlags = ISNIL( 4 ) ? FTP_TRANSFER_TYPE_BINARY | INTERNET_FLAG_RELOAD : ( DWORD ) hb_parnl( 4 ); - DWORD_PTR dwContext = ISNIL( 5 ) ? 0 : hb_parnl( 5 ); + DWORD dwFlags = HB_ISNIL( 4 ) ? FTP_TRANSFER_TYPE_BINARY | INTERNET_FLAG_RELOAD : ( DWORD ) hb_parnl( 4 ); + DWORD_PTR dwContext = HB_ISNIL( 5 ) ? 0 : hb_parnl( 5 ); hb_retl( FtpPutFile( hInternet, lpszLocalFile, lpszRemoteFile, dwFlags, dwContext ) ); } @@ -567,7 +567,7 @@ HB_FUNC( VWN_FTPGETCURRENTDIRECTORY ) if ( bRet ) { - if ( ISBYREF( 2 ) ) + if ( HB_ISBYREF( 2 ) ) hb_storclen( ( char * ) lpszCurrentDirectory, ( ULONG ) dwCurrentDirectory, 2 ); } diff --git a/harbour/examples/hbwhat/whtini.c b/harbour/examples/hbwhat/whtini.c index afbf2d4ff0..b8feb6c3e8 100644 --- a/harbour/examples/hbwhat/whtini.c +++ b/harbour/examples/hbwhat/whtini.c @@ -69,8 +69,8 @@ HB_FUNC( VWN_GETPROFILESTRING ) DWORD nSize = 1024 ; LPTSTR bBuffer = (LPTSTR) hb_xgrab( nSize ); DWORD dwLen ; - char * lpSection = ISNIL( 1 ) ? NULL : hb_parcx( 1 ); - char * lpEntry = ISNIL( 2 ) ? NULL : hb_parcx( 2 ); + char * lpSection = HB_ISNIL( 1 ) ? NULL : hb_parcx( 1 ); + char * lpEntry = HB_ISNIL( 2 ) ? NULL : hb_parcx( 2 ); char * lpDefault = hb_parc ( 3 ); for( ;; ) @@ -101,8 +101,8 @@ HB_FUNC( VWN_GETPRIVATEPROFILESTRING ) DWORD nSize = 1024 ; LPTSTR bBuffer = (LPTSTR) hb_xgrab( nSize ); DWORD dwLen ; - char * lpSection = ISNIL( 1 ) ? NULL : hb_parcx( 1 ); - char * lpEntry = ISNIL( 2 ) ? NULL : hb_parcx( 2 ); + char * lpSection = HB_ISNIL( 1 ) ? NULL : hb_parcx( 1 ); + char * lpEntry = HB_ISNIL( 2 ) ? NULL : hb_parcx( 2 ); char * lpDefault = hb_parcx( 3 ); char * lpFileName = hb_parcx( 4 ); @@ -133,8 +133,8 @@ HB_FUNC( VWN_GETPRIVATEPROFILESTRING ) HB_FUNC( VWN_WRITEPROFILESTRING ) { char * lpSection = hb_parcx( 1 ); - char * lpEntry = ISCHAR(2) ? hb_parcx( 2 ) : NULL ; - char * lpData = ISCHAR(3) ? hb_parcx( 3 ) : NULL ; + char * lpEntry = HB_ISCHAR(2) ? hb_parcx( 2 ) : NULL ; + char * lpData = HB_ISCHAR(3) ? hb_parcx( 3 ) : NULL ; if ( WriteProfileString( lpSection , lpEntry , lpData) ) hb_retl( TRUE ); @@ -146,8 +146,8 @@ HB_FUNC( VWN_WRITEPROFILESTRING ) HB_FUNC( VWN_WRITEPRIVATEPROFILESTRING ) { char * lpSection = hb_parcx( 1 ); - char * lpEntry = ISCHAR(2) ? hb_parcx( 2 ) : NULL ; - char * lpData = ISCHAR(3) ? hb_parcx( 3 ) : NULL ; + char * lpEntry = HB_ISCHAR(2) ? hb_parcx( 2 ) : NULL ; + char * lpData = HB_ISCHAR(3) ? hb_parcx( 3 ) : NULL ; char * lpFileName= hb_parcx( 4 ); if ( WritePrivateProfileString( lpSection , lpEntry , lpData , lpFileName ) ) diff --git a/harbour/examples/hbwhat/whtkbrd.c b/harbour/examples/hbwhat/whtkbrd.c index d0224c4be4..d62e399626 100644 --- a/harbour/examples/hbwhat/whtkbrd.c +++ b/harbour/examples/hbwhat/whtkbrd.c @@ -260,7 +260,7 @@ HB_FUNC( VWN_COPYACCELERATORTABLE ) PHB_ITEM aSub ; int i ; - if ( ISARRAY(2) && ((iCount=hb_parinfa(2,0)) > 0 ) ) + if ( HB_ISARRAY(2) && ((iCount=hb_parinfa(2,0)) > 0 ) ) lpAccelDst = (LPACCEL) hb_xgrab( iCount * sizeof(ACCEL) ); iRet = CopyAcceleratorTable( (HACCEL) HB_PARWH( 1 ) , diff --git a/harbour/examples/hbwhat/whtmenu.c b/harbour/examples/hbwhat/whtmenu.c index ff2f09e54f..850e1c8e0a 100644 --- a/harbour/examples/hbwhat/whtmenu.c +++ b/harbour/examples/hbwhat/whtmenu.c @@ -164,7 +164,7 @@ HB_FUNC( VWN_TRACKPOPUPMENU ) { RECT rc ; - if (!ISNIL(7)) { + if (!HB_ISNIL(7)) { rc.left = hb_parni(7,1); rc.top = hb_parni(7,2); rc.right = hb_parni(7,3); diff --git a/harbour/examples/hbwhat/whtmeta.c b/harbour/examples/hbwhat/whtmeta.c index 0d5ac42935..690817b235 100644 --- a/harbour/examples/hbwhat/whtmeta.c +++ b/harbour/examples/hbwhat/whtmeta.c @@ -174,11 +174,11 @@ HB_FUNC( VWN_CREATEENHMETAFILE ) { RECT rc ; - if ( ISARRAY(3) && Array2Rect( hb_param(3,HB_IT_ARRAY), &rc )) + if ( HB_ISARRAY(3) && Array2Rect( hb_param(3,HB_IT_ARRAY), &rc )) HB_RETWH( CreateEnhMetaFile( (HDC) HB_PARWH( 1 ) , (LPCSTR) hb_parcx( 2 ), &rc , - ISNIL(4) ? NULL : (LPCSTR) hb_parcx( 4 ) + HB_ISNIL(4) ? NULL : (LPCSTR) hb_parcx( 4 ) ) ); @@ -240,7 +240,7 @@ HB_FUNC( VWN_PLAYENHMETAFILE ) { RECT rc ; - if ( ISARRAY(3) && Array2Rect( hb_param(3,HB_IT_ARRAY), &rc )) + if ( HB_ISARRAY(3) && Array2Rect( hb_param(3,HB_IT_ARRAY), &rc )) hb_retl( PlayEnhMetaFile( (HDC) HB_PARWH( 1 ) , (HENHMETAFILE) HB_PARWH( 2 ), &rc @@ -398,7 +398,7 @@ HB_FUNC( VWN_ENUMENHMETAFILE ) RECT rc ; - if ( ISARRAY(5) && Array2Rect( hb_param(5,HB_IT_ARRAY), &rc )) + if ( HB_ISARRAY(5) && Array2Rect( hb_param(5,HB_IT_ARRAY), &rc )) hb_retl( EnumEnhMetaFile( (HDC) HB_PARWH( 1 ) , (HENHMETAFILE) HB_PARWH( 2 ), diff --git a/harbour/examples/hbwhat/whtmisc.c b/harbour/examples/hbwhat/whtmisc.c index 01db0a9f4d..c8cbe3315d 100644 --- a/harbour/examples/hbwhat/whtmisc.c +++ b/harbour/examples/hbwhat/whtmisc.c @@ -335,17 +335,17 @@ HB_FUNC( VWN_MESSAGEBOX ) { // LPCSTR lpCaption = hb_parcx(3); - hb_retnl( MessageBox( ISNIL(1) ? NULL : (HWND) HB_PARWH(1) , + hb_retnl( MessageBox( HB_ISNIL(1) ? NULL : (HWND) HB_PARWH(1) , (LPCSTR) hb_parcx(2), - ISNIL(3) ? NULL : (LPCSTR) hb_parcx(3) , - ISNIL(4) ? 0 : (UINT) hb_parnl(4) ) ); + HB_ISNIL(3) ? NULL : (LPCSTR) hb_parcx(3) , + HB_ISNIL(4) ? 0 : (UINT) hb_parnl(4) ) ); } //----------------------------------------------------------------------------- HB_FUNC( VWN_MESSAGEBEEP ) { - hb_retl( MessageBeep( ISNIL(1) ? ( UINT ) 0xFFFFFFFF : ( UINT ) hb_parnl(1) ) ); + hb_retl( MessageBeep( HB_ISNIL(1) ? ( UINT ) 0xFFFFFFFF : ( UINT ) hb_parnl(1) ) ); } //----------------------------------------------------------------------------- @@ -456,12 +456,12 @@ HB_FUNC( VWN_CREATEMUTEX ) { SECURITY_ATTRIBUTES *sa = NULL; - if( ISCHAR(1) ) + if( HB_ISCHAR(1) ) { sa = (SECURITY_ATTRIBUTES *) hb_parc( 1 ); //hb_param( 1, HB_IT_STRING )->item.asString.value; } - HB_RETWH( CreateMutex( ISNIL( 1 ) ? NULL : sa, hb_parnl( 2 ), hb_parcx( 3 ) ) ); + HB_RETWH( CreateMutex( HB_ISNIL( 1 ) ? NULL : sa, hb_parnl( 2 ), hb_parcx( 3 ) ) ); } //---------------------------------------------------------------------------- @@ -517,7 +517,7 @@ HB_FUNC( VWN_GETCLASSINFO ) { WNDCLASS WndClass ; - if ( GetClassInfo( ISNIL(1) ? NULL : (HINSTANCE) HB_PARWH( 1 ), + if ( GetClassInfo( HB_ISNIL(1) ? NULL : (HINSTANCE) HB_PARWH( 1 ), (LPCSTR) hb_parcx( 2 ), &WndClass ) ) @@ -542,7 +542,7 @@ HB_FUNC( VWN_GETCLASSINFOEX ) { WNDCLASSEX WndClassEx ; - if ( GetClassInfoEx( ISNIL(1) ? NULL : (HINSTANCE) HB_PARWH( 1 ), + if ( GetClassInfoEx( HB_ISNIL(1) ? NULL : (HINSTANCE) HB_PARWH( 1 ), (LPCSTR) hb_parcx( 2 ), &WndClassEx ) ) hb_retclen( (char*) &WndClassEx, sizeof(WNDCLASSEX) ); diff --git a/harbour/examples/hbwhat/whtmous.c b/harbour/examples/hbwhat/whtmous.c index 5367e414b2..4d53a0d509 100644 --- a/harbour/examples/hbwhat/whtmous.c +++ b/harbour/examples/hbwhat/whtmous.c @@ -39,7 +39,7 @@ extern void Size2ArrayEx( SIZE *siz , PHB_ITEM aSize); HB_FUNC( VWN_LOADCURSOR ) { - HB_RETWH( LoadCursor( ISNIL(1) ? NULL : (HINSTANCE) HB_PARWH(1) , + HB_RETWH( LoadCursor( HB_ISNIL(1) ? NULL : (HINSTANCE) HB_PARWH(1) , hb_parinfo(2)== HB_IT_STRING ? hb_parcx(2): MAKEINTRESOURCE( hb_parnl( 2 ) ) ) ); } @@ -160,7 +160,7 @@ HB_FUNC( VWN_CLIPCURSOR ) RECT rc ; BOOL bRectOk ; - bRectOk = ( ISARRAY( 2 ) && Array2Rect( hb_param(1,HB_IT_ARRAY), &rc ) ); + bRectOk = ( HB_ISARRAY( 2 ) && Array2Rect( hb_param(1,HB_IT_ARRAY), &rc ) ); hb_retl( ClipCursor( bRectOk ? &rc : NULL ) ); diff --git a/harbour/examples/hbwhat/whtmsg.c b/harbour/examples/hbwhat/whtmsg.c index 2e10ac3066..a36915f384 100644 --- a/harbour/examples/hbwhat/whtmsg.c +++ b/harbour/examples/hbwhat/whtmsg.c @@ -78,12 +78,12 @@ HB_FUNC( VWN_POSTMESSAGE ) hb_retnl( (LONG) PostMessage( (HWND) HB_PARWH( 1 ), (UINT) hb_parni( 2 ), (ISNIL(3) ? 0 : (WPARAM) hb_parnint( 3 )) , - (ISNIL(4) ? 0 : ( ISBYREF(4)? (LPARAM) (LPSTR) cText : ( ISCHAR(4) ? (LPARAM)(LPSTR) hb_parcx(4) : (LPARAM) hb_parnint( 4 )))) + (ISNIL(4) ? 0 : ( HB_ISBYREF(4)? (LPARAM) (LPSTR) cText : ( HB_ISCHAR(4) ? (LPARAM)(LPSTR) hb_parcx(4) : (LPARAM) hb_parnint( 4 )))) ) ); - if( ISBYREF( 4 ) ) + if( HB_ISBYREF( 4 ) ) { hb_storclen( cText, hb_parcsiz(4), 4 ); hb_xfree( cText ); @@ -98,7 +98,7 @@ HB_FUNC( VWN_SENDMESSAGE ) char *cText = NULL; - if( ISBYREF(4) ) + if( HB_ISBYREF(4) ) { cText = (char*) hb_xgrab( hb_parcsiz(4) ); hb_xmemcpy( cText, hb_parcx(4), hb_parcsiz(4) ); @@ -106,7 +106,7 @@ HB_FUNC( VWN_SENDMESSAGE ) hb_retnl( (ULONG) SendMessage( (HWND) HB_PARWH( 1 ), (UINT) hb_parni( 2 ), (ISNIL(3) ? 0 : (WPARAM) hb_parnint( 3 )) , - (ISNIL(4) ? 0 : ( ISBYREF(4)? (LPARAM) (LPSTR) cText : ( ISCHAR(4) ? (LPARAM)(LPSTR) hb_parcx(4) : (LPARAM) hb_parnint( 4 )))) + (ISNIL(4) ? 0 : ( HB_ISBYREF(4)? (LPARAM) (LPSTR) cText : ( HB_ISCHAR(4) ? (LPARAM)(LPSTR) hb_parcx(4) : (LPARAM) hb_parnint( 4 )))) ) ); @@ -180,9 +180,9 @@ HB_FUNC( VWN_GETMESSAGE ) MSG Msg ; if (GetMessage( &Msg, - ISNIL(2) ? NULL : (HWND) HB_PARWH(2), - ISNIL(3) ? 0 : hb_parnl(3), - ISNIL(4) ? 0 : hb_parnl(4) ) ) + HB_ISNIL(2) ? NULL : (HWND) HB_PARWH(2), + HB_ISNIL(3) ? 0 : hb_parnl(3), + HB_ISNIL(4) ? 0 : hb_parnl(4) ) ) { hb_storclen( (LPSTR) &Msg, sizeof(MSG), 1 ); hb_retl( 1 ); @@ -198,10 +198,10 @@ HB_FUNC( VWN_PEEKMESSAGE ) MSG Msg ; if (PeekMessage( (MSG*) &Msg, - ISNIL(2) ? NULL :(HWND) HB_PARWH(2), - ISNIL(3) ? 0 : hb_parnl(3), - ISNIL(4) ? 0 : hb_parnl(4), - ISNIL(5) ? PM_NOREMOVE : hb_parnl(5))) + HB_ISNIL(2) ? NULL :(HWND) HB_PARWH(2), + HB_ISNIL(3) ? 0 : hb_parnl(3), + HB_ISNIL(4) ? 0 : hb_parnl(4), + HB_ISNIL(5) ? PM_NOREMOVE : hb_parnl(5))) { hb_storclen( (LPSTR) &Msg, sizeof(MSG),1); hb_retl( 1 ); diff --git a/harbour/examples/hbwhat/whtprn.c b/harbour/examples/hbwhat/whtprn.c index 724bae071a..8e9e90c3b4 100644 --- a/harbour/examples/hbwhat/whtprn.c +++ b/harbour/examples/hbwhat/whtprn.c @@ -31,9 +31,9 @@ HB_FUNC( VWN_STARTDOC ) DOCINFO di; di.cbSize = sizeof(DOCINFO); di.lpszDocName = hb_parcx( 2 ); - di.lpszOutput = (LPTSTR) ( ISNIL( 3 ) ? NULL : hb_parcx( 3 ) ); - di.lpszDatatype = (LPTSTR) ( ISNIL( 4 ) ? NULL : hb_parcx( 4 ) ); - di.fwType = (DWORD) ( ISNIL( 5 ) ? 0 : hb_parnl( 5 ) ); + di.lpszOutput = (LPTSTR) ( HB_ISNIL( 3 ) ? NULL : hb_parcx( 3 ) ); + di.lpszDatatype = (LPTSTR) ( HB_ISNIL( 4 ) ? NULL : hb_parcx( 4 ) ); + di.fwType = (DWORD) ( HB_ISNIL( 5 ) ? 0 : hb_parnl( 5 ) ); hb_retni( StartDoc( (HDC) HB_PARWH( 1 ), &di ) ); } diff --git a/harbour/examples/hbwhat/whtrect.c b/harbour/examples/hbwhat/whtrect.c index 7f4c0e9d78..90d5d0072f 100644 --- a/harbour/examples/hbwhat/whtrect.c +++ b/harbour/examples/hbwhat/whtrect.c @@ -501,7 +501,7 @@ HB_FUNC( VWN_RECTVISIBLE ) { RECT rc; - if ( ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc )) + if ( HB_ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc )) hb_retl( RectVisible( (HDC) HB_PARWH( 1 ), &rc ) ); else hb_retl(0); diff --git a/harbour/examples/hbwhat/whtrgn.c b/harbour/examples/hbwhat/whtrgn.c index 7576114337..58985cb5ae 100644 --- a/harbour/examples/hbwhat/whtrgn.c +++ b/harbour/examples/hbwhat/whtrgn.c @@ -124,7 +124,7 @@ HB_FUNC( VWN_CREATEPOLYPOLYGONRGN ) PHB_ITEM aParam ; PHB_ITEM aSub ; - if (ISARRAY( 1 ) && ISARRAY( 2 ) ) + if (ISARRAY( 1 ) && HB_ISARRAY( 2 ) ) { iPolyCount = hb_parinfa(2,0); PolyPoints = ( INT *) hb_xgrab( iPolyCount * sizeof( INT ) ); diff --git a/harbour/examples/hbwhat/whtscrlb.c b/harbour/examples/hbwhat/whtscrlb.c index 5ad795593d..5d62824e03 100644 --- a/harbour/examples/hbwhat/whtscrlb.c +++ b/harbour/examples/hbwhat/whtscrlb.c @@ -65,7 +65,7 @@ HB_FUNC( VWN_GETSCROLLRANGE ) if ( GetScrollRange( (HWND) HB_PARWH( 1 ), hb_parni( 2 ), lpMinPos, lpMaxPos ) ) { - if ( ISBYREF(3) && ISBYREF(4) ) + if ( HB_ISBYREF(3) && HB_ISBYREF(4) ) { hb_storni(3,*lpMinPos); hb_storni(4,*lpMaxPos); diff --git a/harbour/examples/hbwhat/whtseria.c b/harbour/examples/hbwhat/whtseria.c index d625534ba2..092280a6d9 100644 --- a/harbour/examples/hbwhat/whtseria.c +++ b/harbour/examples/hbwhat/whtseria.c @@ -132,7 +132,7 @@ endif HB_FUNC( VWN_COMMCONFIGDIALOG ) { LPCTSTR lpszName = ( LPCTSTR ) hb_parcx( 1 ); - HWND hwnd = ISNIL( 2 ) ? NULL : ( HWND ) HB_PARWH( 2 ); + HWND hwnd = HB_ISNIL( 2 ) ? NULL : ( HWND ) HB_PARWH( 2 ); LPCOMMCONFIG lpCC = ( LPCOMMCONFIG ) hb_parcx( 3 ); hb_retl( CommConfigDialog( lpszName, hwnd, lpCC ) ); @@ -340,7 +340,7 @@ SetCommConfig( hFile, CommConfig:Value, nSize ) HB_FUNC( VWN_SETCOMMCONFIG ) { LPCOMMCONFIG lpCC = ( LPCOMMCONFIG ) hb_parcx( 2 ); - DWORD size = ISNIL( 3 ) ? ( DWORD ) sizeof( COMMCONFIG ) : ( DWORD ) hb_parnl( 3 ); + DWORD size = HB_ISNIL( 3 ) ? ( DWORD ) sizeof( COMMCONFIG ) : ( DWORD ) hb_parnl( 3 ); hb_retl( SetCommConfig( ( HANDLE ) HB_PARWH( 1 ), lpCC, size ) ); } diff --git a/harbour/examples/hbwhat/whtshell.c b/harbour/examples/hbwhat/whtshell.c index 020e4dacf6..8aa0c7cd97 100644 --- a/harbour/examples/hbwhat/whtshell.c +++ b/harbour/examples/hbwhat/whtshell.c @@ -95,7 +95,7 @@ HB_FUNC( VWN_SHELLEXECUTE ) HB_RETWH( ShellExecute( (HWND) HB_PARWH( 1 ) , (LPCSTR) hb_parcx( 2 ) , (LPCSTR) hb_parcx( 3 ) , - ISNIL(4) ? NULL : (LPCSTR) hb_parcx( 4 ) , + HB_ISNIL(4) ? NULL : (LPCSTR) hb_parcx( 4 ) , (LPCSTR) hb_parcx( 5 ) , hb_parni( 6 ) ) ); diff --git a/harbour/examples/hbwhat/whtsock.c b/harbour/examples/hbwhat/whtsock.c index 3e0eace34f..17f944eb07 100644 --- a/harbour/examples/hbwhat/whtsock.c +++ b/harbour/examples/hbwhat/whtsock.c @@ -42,12 +42,12 @@ HB_FUNC( VWN_ACCEPT ) char *addr ; int addrlen ; - if ( ISNIL(2) ) + if ( HB_ISNIL(2) ) hb_retnl( (LONG) accept( (SOCKET) hb_parnl(1), NULL, NULL ) ); else { addr = hb_parcx(2); - addrlen = ISNIL(3) ? hb_parni(3) : ( int ) hb_parclen(2); + addrlen = HB_ISNIL(3) ? hb_parni(3) : ( int ) hb_parclen(2); hb_retnl( (LONG) accept( (SOCKET) hb_parnl(1), ( struct sockaddr *) addr, &addrlen ) ); hb_storclen( addr, addrlen, 2 ); hb_storni( addrlen, 3); @@ -112,7 +112,7 @@ HB_FUNC( VWN_IOCTLSOCKET ) HB_FUNC( VWN_GETPEERNAME ) { char *name = (char *) hb_parc( 2 ); //hb_param( 2, HB_IT_STRING )->item.asString.value ; - int addrlen = ISNIL(3) ? hb_parni(3) : ( int ) hb_parclen(2); + int addrlen = HB_ISNIL(3) ? hb_parni(3) : ( int ) hb_parclen(2); hb_retni( (int ) getpeername((SOCKET) hb_parnl( 1 ), ( struct sockaddr *) name, &addrlen ) ); hb_storclen( name, addrlen, 2 ); @@ -128,7 +128,7 @@ HB_FUNC( VWN_GETPEERNAME ) HB_FUNC( VWN_GETSOCKNAME ) { char *name = (char *) hb_parc( 2 ); //hb_param( 2, HB_IT_STRING )->item.asString.value ; - int addrlen = ISNIL(3) ? hb_parni(3) : ( int ) hb_parclen(2); + int addrlen = HB_ISNIL(3) ? hb_parni(3) : ( int ) hb_parclen(2); hb_retni( (int ) getsockname((SOCKET) hb_parnl( 1 ), ( struct sockaddr *) name, &addrlen ) ); hb_storclen( name, addrlen, 2 ); @@ -235,7 +235,7 @@ HB_FUNC( VWN_RECV ) int iRet; iRet = recv((SOCKET) hb_parnl( 1 ), buf, iBuffLen, hb_parni( 4 ) ); - if ( iRet && ISBYREF( 2 ) ) + if ( iRet && HB_ISBYREF( 2 ) ) hb_storclen( buf, iRet, 2 ); hb_retni( iRet ); @@ -264,10 +264,10 @@ HB_FUNC( VWN_RECVFROM ) &iAddrLen ); - if ( iRet && ISBYREF( 2 ) ) + if ( iRet && HB_ISBYREF( 2 ) ) hb_storclen( buf, iRet, 2 ); - if ( iAddrLen && ISBYREF(5) ) + if ( iAddrLen && HB_ISBYREF(5) ) hb_storclen(from, iAddrLen, 5 ); hb_retni( iRet ); @@ -288,16 +288,16 @@ HB_FUNC( VWN_SOCKSELECT ) fd_set *exceptfds = NULL; struct timeval *timeout = NULL; - if ( ISCHAR( 2 ) ) + if ( HB_ISCHAR( 2 ) ) readfds = (fd_set *) hb_parc( 2 ); //hb_param( 2, HB_IT_STRING )->item.asString.value ; - if ( ISCHAR( 3 ) ) + if ( HB_ISCHAR( 3 ) ) writefds = (fd_set *) hb_parc( 3 ); //hb_param( 3, HB_IT_STRING )->item.asString.value ; - if ( ISCHAR( 4 ) ) + if ( HB_ISCHAR( 4 ) ) exceptfds = (fd_set *) hb_parc( 4 ); //hb_param( 4, HB_IT_STRING )->item.asString.value ; - if ( ISCHAR( 5 ) ) + if ( HB_ISCHAR( 5 ) ) timeout = (struct timeval *) hb_parc( 4 ); //hb_param( 4, HB_IT_STRING )->item.asString.value ; hb_retni(( int ) select( hb_parni( 1 ), @@ -307,11 +307,11 @@ HB_FUNC( VWN_SOCKSELECT ) timeout ) ); - if ( ISCHAR( 2 ) && ISBYREF( 2 ) ) + if ( HB_ISCHAR( 2 ) && HB_ISBYREF( 2 ) ) hb_storclen( ( char *) readfds, sizeof(fd_set), 2 ); - if ( ISCHAR( 3 ) && ISBYREF( 3 ) ) + if ( HB_ISCHAR( 3 ) && HB_ISBYREF( 3 ) ) hb_storclen( ( char *) writefds, sizeof(fd_set), 3 ); - if ( ISCHAR( 4 ) && ISBYREF( 4 ) ) + if ( HB_ISCHAR( 4 ) && HB_ISBYREF( 4 ) ) hb_storclen( ( char *) exceptfds, sizeof(fd_set), 4 ); } @@ -335,11 +335,11 @@ HB_FUNC( VWN_SEND ) HB_FUNC( VWN_SENDTO ) { - int iBuffLen = (ISNIL(3) ? ( ISNIL(2) ? 0 : ( int ) hb_parclen(2) ) : hb_parni(3)); + int iBuffLen = (ISNIL(3) ? ( HB_ISNIL(2) ? 0 : ( int ) hb_parclen(2) ) : hb_parni(3)); struct sockaddr *to = NULL; int iToLen = 0 ; - if ( ISCHAR( 5 ) ) + if ( HB_ISCHAR( 5 ) ) { to = (struct sockaddr *) hb_parc( 5 ); //hb_param( 5, HB_IT_STRING )->item.asString.value ; iToLen = (ISNIL(6) ? (ISNIL(5) ? 0 : ( int ) hb_parclen(5) ) : hb_parni(6)); @@ -479,7 +479,7 @@ HB_FUNC( VWN_WSASTARTUP ) hb_retni( (int ) WSAStartup( ( WORD ) hb_parni( 1 ), &WSAData ) ); - if ( ISBYREF( 2 ) ) + if ( HB_ISBYREF( 2 ) ) hb_storclen( ( char * ) &WSAData, sizeof( WSADATA ), 2 ); } @@ -577,7 +577,7 @@ HB_FUNC( VWN_WSAASYNCGETSERVBYNAME ) if( ( hRet = WSAAsyncGetServByName( (HWND) HB_PARWH( 1 ), (unsigned int) hb_parni( 2 ), ( char *) hb_parcx( 3 ) , - ISNIL( 4 ) ? NULL : ( char *) hb_parcx( 4 ) , + HB_ISNIL( 4 ) ? NULL : ( char *) hb_parcx( 4 ) , ( char *) buf , ( int) MAXGETHOSTSTRUCT ) ) != 0 ) @@ -605,7 +605,7 @@ HB_FUNC( VWN_WSAASYNCGETSERVBYPORT ) if( ( hRet = WSAAsyncGetServByPort( (HWND) HB_PARWH( 1 ) , (unsigned int) hb_parni( 2 ), hb_parni( 3 ) , - ISNIL( 4 ) ? NULL : ( char *) hb_parcx( 4 ) , + HB_ISNIL( 4 ) ? NULL : ( char *) hb_parcx( 4 ) , ( char *) buf , ( int) MAXGETHOSTSTRUCT ) ) != 0 ) @@ -811,16 +811,16 @@ HB_FUNC( VWN_WSAACCEPT ) { // SOCKET s ; struct sockaddr addr ; - INT addrlen = ISBYREF( 2 ) ? 0 : sizeof(addr) ; + INT addrlen = HB_ISBYREF( 2 ) ? 0 : sizeof(addr) ; SOCKET sRet ; sRet = WSAAccept( (SOCKET) hb_parnl( 1 ) , &addr , &addrlen , _WSACondFunc , - ISNIL( 3 ) ? 0 : (DWORD_PTR) hb_parnl( 3 ) ); + HB_ISNIL( 3 ) ? 0 : (DWORD_PTR) hb_parnl( 3 ) ); - if( ( sRet != INVALID_SOCKET ) && ISBYREF( 2 ) ) + if( ( sRet != INVALID_SOCKET ) && HB_ISBYREF( 2 ) ) hb_storclen( ( char * ) &addr, addrlen, 2 ); hb_retnl( ( ULONG ) sRet ); @@ -855,7 +855,7 @@ HB_FUNC( VWN_WSACONNECT ) int iRet ; - if( !ISNIL( 3 ) ) + if( !HB_ISNIL( 3 ) ) { CallerData.len = CallerData.buf = @@ -865,7 +865,7 @@ HB_FUNC( VWN_WSACONNECT ) iRet = WSAConnect( (SOCKET) hb_parnl( 1 ) , name , hb_parclen( 2 ), - ISNIL( 3 ) ? NULL : CallerData , + HB_ISNIL( 3 ) ? NULL : CallerData , lpCalleeData , lpSQOS , lpGQOS diff --git a/harbour/examples/hbwhat/whtsys.c b/harbour/examples/hbwhat/whtsys.c index 7e10f80e21..c53e886ea1 100644 --- a/harbour/examples/hbwhat/whtsys.c +++ b/harbour/examples/hbwhat/whtsys.c @@ -83,7 +83,7 @@ HB_FUNC( VWN_GETTIMEZONEINFORMATION ) hb_retnl( GetTimeZoneInformation( &tzi ) ); - if ( ISBYREF(1) ) + if ( HB_ISBYREF(1) ) hb_storclen( (char*) &tzi, sizeof(tzi), 1); } @@ -196,7 +196,7 @@ HB_FUNC( VWN_SYSTEMPARAMETERSINFO ) cText, (UINT) hb_parni( 4 ) ) ) { - if( ISBYREF( 3 ) ) + if( HB_ISBYREF( 3 ) ) { if( ! hb_storclen_buffer( cText, hb_itemGetCLen( pBuffer ), 3 ) ) hb_xfree( cText ); @@ -310,7 +310,7 @@ HB_FUNC( VWN_SETTIMER ) HB_RETWI( SetTimer( (HWND) HB_PARWH( 1 ), ( UINT_PTR ) HB_PARWI( 2 ), (UINT) hb_parni( 3 ), - ISNIL(4) ? NULL : (TIMERPROC) HB_PARWH(4) + HB_ISNIL(4) ? NULL : (TIMERPROC) HB_PARWH(4) ) ); } @@ -425,7 +425,7 @@ HB_FUNC( VWN_GETLASTERROR ) HB_FUNC( VWN_FORMATMESSAGE) { hb_retnl( FormatMessage( (DWORD) hb_parnl( 1 ) , // source and processing options - ISNIL( 2) ? NULL : hb_parcx( 2 ) , // pointer to message source + HB_ISNIL( 2) ? NULL : hb_parcx( 2 ) , // pointer to message source (DWORD) hb_parnl( 3 ) , // requested message identifier (DWORD) hb_parnl( 4 ) , // language identifier for requested message LPTSTR lpBuffer , // pointer to message buffer @@ -547,10 +547,10 @@ HB_FUNC( VWN_LOADRESOURCE ) // HB_FUNC( VWN_LOADSTRING ) { - ULONG iLen = ISNIL(3) ? MAX_PATH : (ULONG) hb_parclen( 3 ); + ULONG iLen = HB_ISNIL(3) ? MAX_PATH : (ULONG) hb_parclen( 3 ); LPTSTR cText = (char*) hb_xgrab( iLen+1 ); - iLen = LoadString( ( ISNIL(1) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH(1) ), + iLen = LoadString( ( HB_ISNIL(1) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH(1) ), (UINT) hb_parni(2) , (LPTSTR) cText , iLen ); @@ -609,7 +609,7 @@ HB_FUNC( VWN_TONE ) HB_FUNC( VWN_GETMODULEFILENAME ) { char szBuffer[ MAX_PATH + 1 ] = {0} ; - GetModuleFileNameA( ISNIL(1) ? GetModuleHandle(NULL) : (HMODULE) HB_PARWH( 1 ), + GetModuleFileNameA( HB_ISNIL(1) ? GetModuleHandle(NULL) : (HMODULE) HB_PARWH( 1 ), szBuffer , MAX_PATH ); @@ -908,8 +908,8 @@ HB_FUNC( VWN_HTMLHELP ) HB_RETWH( HtmlHelp( (HWND) HB_PARWH( 1 ) , (LPCSTR) hb_parcx( 2 ) , - (UINT) ISNIL(3) ? HH_DISPLAY_TOPIC : hb_parni( 3 ) , - (DWORD) ISNIL(4) ? NULL : hb_parnl( 4 ) + (UINT) HB_ISNIL(3) ? HH_DISPLAY_TOPIC : hb_parni( 3 ) , + (DWORD) HB_ISNIL(4) ? NULL : hb_parnl( 4 ) ) ); } @@ -933,16 +933,16 @@ HB_FUNC( VWN_CREATEFILE ) SECURITY_ATTRIBUTES *sa = NULL; - if( ISCHAR( 4 ) ) + if( HB_ISCHAR( 4 ) ) sa = ( SECURITY_ATTRIBUTES *) hb_parc( 4 ); //hb_param( 4, HB_IT_STRING )->item.asString.value ; HB_RETWH( CreateFile( (LPCTSTR) hb_parcx(1), (DWORD) hb_parnl(2), (DWORD) hb_parnl(3), - ISCHAR( 4 ) ? (SECURITY_ATTRIBUTES *) sa : NULL , + HB_ISCHAR( 4 ) ? (SECURITY_ATTRIBUTES *) sa : NULL , (DWORD) hb_parnl(5), (DWORD) hb_parnl(6), - ISNIL( 7 ) ? NULL : (HANDLE) HB_PARWH(7) ) ); + HB_ISNIL( 7 ) ? NULL : (HANDLE) HB_PARWH(7) ) ); } @@ -974,7 +974,7 @@ HB_FUNC( VWN_READFILE ) BOOL bRet ; OVERLAPPED *Overlapped = NULL; - if( ISCHAR( 5 ) ) + if( HB_ISCHAR( 5 ) ) Overlapped = ( OVERLAPPED *) hb_parc( 5 ); //hb_param( 5, HB_IT_STRING )->item.asString.value ; @@ -982,7 +982,7 @@ HB_FUNC( VWN_READFILE ) Buffer , (DWORD) hb_parnl( 3 ) , &nRead , - ISCHAR( 5 ) ? Overlapped : NULL ); + HB_ISCHAR( 5 ) ? Overlapped : NULL ); if ( bRet ) { @@ -1009,14 +1009,14 @@ HB_FUNC( VWN_WRITEFILE ) DWORD nWritten = 0; OVERLAPPED *Overlapped = NULL; - if( ISCHAR( 4 )) + if( HB_ISCHAR( 4 )) Overlapped = ( OVERLAPPED *) hb_parc( 4 ); //hb_param( 4, HB_IT_STRING )->item.asString.value ; hb_retl ( WriteFile( (HANDLE) HB_PARWH( 1 ) , hb_parcx( 2 ) , hb_parclen( 2 ) , &nWritten , - ISCHAR( 4 ) ? Overlapped : NULL ) ); + HB_ISCHAR( 4 ) ? Overlapped : NULL ) ); hb_stornl( nWritten, 3 ); } @@ -1136,7 +1136,7 @@ HB_FUNC( VWN_FILETIMETOSYSTEMTIME ) { hb_retl( TRUE ); - if ( ISBYREF( 2 ) ) + if ( HB_ISBYREF( 2 ) ) { hb_storclen( ( char * ) &SystemTime , sizeof( SYSTEMTIME ), 2 ); } diff --git a/harbour/examples/hbwhat/whttab.c b/harbour/examples/hbwhat/whttab.c index 833e9db7c0..89424e7c41 100644 --- a/harbour/examples/hbwhat/whttab.c +++ b/harbour/examples/hbwhat/whttab.c @@ -29,7 +29,7 @@ HB_FUNC( VWN_TABCTRL_CREATE ) HWND hbutton; LRESULT hFont; LONG style; - style = ISNIL(6) ? 0 : (LONG) hb_parnl(6); + style = HB_ISNIL(6) ? 0 : (LONG) hb_parnl(6); hwnd = (HWND) HB_PARWH (1); hFont = SendMessage( hwnd, WM_GETFONT, 0, 0); hbutton = CreateWindowEx(0, WC_TABCONTROL, NULL , style, hb_parni(2), hb_parni(3) , hb_parni(4), hb_parni(5) , hwnd,NULL, GetModuleHandle(NULL) , NULL ); @@ -47,7 +47,7 @@ HB_FUNC( VWN_TABCTRL_ADDITEM ) TC_ITEM item; item.mask = TCIF_TEXT | TCIF_IMAGE; - item.iImage = ISNIL(3) ? -1 : (LONG) hb_parnl(3); + item.iImage = HB_ISNIL(3) ? -1 : (LONG) hb_parnl(3); item.pszText = (LPSTR) hb_parcx(2); hb_retni( TabCtrl_InsertItem( (HWND) HB_PARWH(1), iCount, &item) ); @@ -59,7 +59,7 @@ HB_FUNC( VWN_TABCTRL_INSERTITEM ) { TC_ITEM item; item.mask = TCIF_TEXT | TCIF_IMAGE; - item.iImage = ISNIL(4) ? -1 : (LONG) hb_parnl(4); + item.iImage = HB_ISNIL(4) ? -1 : (LONG) hb_parnl(4); item.pszText = (LPSTR) hb_parcx(2); hb_retni( TabCtrl_InsertItem( (HWND) HB_PARWH(1), (INT) hb_parni(3), &item) ); } @@ -207,7 +207,7 @@ HB_FUNC( VWN_TABCTRL_ADJUSTRECT ) { RECT rc; - if ( ISARRAY(3) ) + if ( HB_ISARRAY(3) ) { rc.left = hb_parnl(3,1); rc.top = hb_parnl(3,2); diff --git a/harbour/examples/hbwhat/whttbar.c b/harbour/examples/hbwhat/whttbar.c index a70c1ea20a..f83041541e 100644 --- a/harbour/examples/hbwhat/whttbar.c +++ b/harbour/examples/hbwhat/whttbar.c @@ -43,7 +43,7 @@ HB_FUNC( VWN_CREATEMAPPEDBITMAP ) HB_RETWH( CreateMappedBitmap( (HINSTANCE) HB_PARWH(1), (int) hb_parni(2), (UINT) hb_parni(3), - ISNIL(4) ? NULL : (COLORMAP *) cm , + HB_ISNIL(4) ? NULL : (COLORMAP *) cm , (int) hb_parni(5) ) ); } @@ -59,7 +59,7 @@ HB_FUNC( VWN_CREATETOOLBAREX ) (DWORD)hb_parnl(2), // style (UINT) hb_parni(3), // id, (int) hb_parni(4), // number of btn images in bmp - ISNIL(5) ? NULL : (HINSTANCE) HB_PARWH(5), // hInst of bmp + HB_ISNIL(5) ? NULL : (HINSTANCE) HB_PARWH(5), // hInst of bmp (UINT) hb_parnl(6), // resource id, or hBmp handle (LPCTBBUTTON) hb_parcx(7),// array of button structures (int) hb_parni(8), // number of buttons to add diff --git a/harbour/examples/hbwhat/whttext.c b/harbour/examples/hbwhat/whttext.c index 50227933b0..b10e3ca3af 100644 --- a/harbour/examples/hbwhat/whttext.c +++ b/harbour/examples/hbwhat/whttext.c @@ -81,9 +81,9 @@ HB_FUNC( VWN_EXTTEXTOUT ) UINT i ; char * cText = hb_parcx( 6 ); - rcOk = ( ISARRAY(5) && Array2Rect(hb_param(5, HB_IT_ARRAY), &rc) ); + rcOk = ( HB_ISARRAY(5) && Array2Rect(hb_param(5, HB_IT_ARRAY), &rc) ); - if ( ISARRAY(7) ) + if ( HB_ISARRAY(7) ) { iCount = hb_parinfa(7,0); lpDx = (INT *) hb_xgrab( iCount * sizeof( INT ) ); @@ -100,7 +100,7 @@ HB_FUNC( VWN_EXTTEXTOUT ) rcOk ? &rc : NULL , (LPCSTR) cText , (UINT) strlen( cText ) , - ISARRAY(7) ? lpDx : NULL + HB_ISARRAY(7) ? lpDx : NULL ) ); if (ISARRAY(7)) @@ -119,13 +119,13 @@ HB_FUNC( VWN_DRAWTEXT ) char *cText = hb_parcx( 2 ); RECT rc; - if ( ISARRAY( 3 ) && Array2Rect( hb_param( 3, HB_IT_ARRAY ), &rc ) ) + if ( HB_ISARRAY( 3 ) && Array2Rect( hb_param( 3, HB_IT_ARRAY ), &rc ) ) hb_retni( DrawText( (HDC) HB_PARWH( 1 ), // handle of device context (LPCTSTR) cText, // address of string strlen( cText ), // number of characters in string &rc, - ISNIL(4) ? DT_LEFT : hb_parni( 4 ) ) ); + HB_ISNIL(4) ? DT_LEFT : hb_parni( 4 ) ) ); else hb_retni( 0 ); } @@ -142,16 +142,16 @@ HB_FUNC( VWN_DRAWTEXTEX ) RECT rc; DRAWTEXTPARAMS *dtp = NULL; - if ( ISCHAR( 5 )) + if ( HB_ISCHAR( 5 )) dtp = (DRAWTEXTPARAMS *) hb_parc( 5 ); //hb_param( 5, HB_IT_STRING )->item.asString.value; - if ( ISARRAY( 3 ) && Array2Rect( hb_param( 3, HB_IT_ARRAY ), &rc ) ) + if ( HB_ISARRAY( 3 ) && Array2Rect( hb_param( 3, HB_IT_ARRAY ), &rc ) ) hb_retni( DrawTextEx( (HDC) HB_PARWH( 1 ), // handle of device context (LPTSTR) cText , // address of string strlen( cText ) , // number of characters in string (LPRECT) &rc, - ISNIL(4) ? DT_LEFT : hb_parni( 4 ) , - ISCHAR(5) ? (LPDRAWTEXTPARAMS) dtp : NULL + HB_ISNIL(4) ? DT_LEFT : hb_parni( 4 ) , + HB_ISCHAR(5) ? (LPDRAWTEXTPARAMS) dtp : NULL ) ); else hb_retni( 0 ); @@ -171,7 +171,7 @@ HB_FUNC( VWN_TABBEDTEXTOUT ) int *aiTabs ; int i ; - if ( ISARRAY( 5 ) ) + if ( HB_ISARRAY( 5 ) ) { iCount = hb_parinfa(5,0); aiTabs = (INT *) hb_xgrab( iCount * sizeof( INT ) ); @@ -230,7 +230,7 @@ HB_FUNC( VWN_GETTABBEDTEXTEXTENT ) int *aiTabs ; int i ; - if ( ISARRAY( 3 ) ) + if ( HB_ISARRAY( 3 ) ) { iCount = hb_parinfa(3,0); aiTabs = (INT *) hb_xgrab( iCount * sizeof( INT ) ); diff --git a/harbour/examples/hbwhat/whtwnd.c b/harbour/examples/hbwhat/whtwnd.c index 2d01b530b5..5e5a84b05a 100644 --- a/harbour/examples/hbwhat/whtwnd.c +++ b/harbour/examples/hbwhat/whtwnd.c @@ -65,7 +65,7 @@ HB_FUNC( VWN_CLOSEWINDOW ) HB_FUNC( VWN_FINDWINDOW ) { - HB_RETWH( FindWindow( (LPCSTR) hb_parcx(1), ISCHAR(2) ? hb_parcx(2):NULL ) ); + HB_RETWH( FindWindow( (LPCSTR) hb_parcx(1), HB_ISCHAR(2) ? hb_parcx(2):NULL ) ); } //----------------------------------------------------------------------------- @@ -207,12 +207,12 @@ HB_FUNC( VWN_INVALIDATERECT ) RECT rc; BOOL bRectOk ; - bRectOk = ( ISARRAY( 2 ) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc ) ); + bRectOk = ( HB_ISARRAY( 2 ) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc ) ); hb_retl( InvalidateRect( - ISNIL(1) ? NULL : (HWND) HB_PARWH( 1 ) , // handle of window with changed update region + HB_ISNIL(1) ? NULL : (HWND) HB_PARWH( 1 ) , // handle of window with changed update region bRectOk ? &rc : NULL , // address of rectangle coordinates - ISLOG(3) ? hb_parl( 3 ) : TRUE // erase-background flag + HB_ISLOG(3) ? hb_parl( 3 ) : TRUE // erase-background flag ) ); } @@ -225,12 +225,12 @@ HB_FUNC( VWN_REDRAWWINDOW ) RECT rc ; BOOL bRectOk ; - bRectOk = ( ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc ) ); + bRectOk = ( HB_ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc ) ); hb_retl( RedrawWindow( (HWND) HB_PARWH( 1 ) , // handle of window bRectOk ? &rc : NULL , // address of structure with update rectangle - ISNIL( 3 ) ? NULL : (HRGN) HB_PARWH( 3 ) , // handle of update region + HB_ISNIL( 3 ) ? NULL : (HRGN) HB_PARWH( 3 ) , // handle of update region hb_parni( 4 ) // array of redraw flags ) ); @@ -1287,7 +1287,7 @@ HB_FUNC( VWN_ALLOWSETFOREGROUNDWINDOW ) HINSTANCE h = LoadLibraryEx( "user32.dll", NULL, 0 ); BOOL bASFWRet = (BOOL) FALSE ; - DWORD dwProcessId = ISNIL( 1 ) ? ASFW_ANY : (DWORD) hb_parnl( 1 ); + DWORD dwProcessId = HB_ISNIL( 1 ) ? ASFW_ANY : (DWORD) hb_parnl( 1 ); if( h ) { diff --git a/harbour/examples/hbwhat/wincorec.c b/harbour/examples/hbwhat/wincorec.c index 076b335e7c..5827191979 100644 --- a/harbour/examples/hbwhat/wincorec.c +++ b/harbour/examples/hbwhat/wincorec.c @@ -97,13 +97,13 @@ HB_FUNC( WHT__REGISTERCLASS ) /* wndclass.style = (ISNIL(1) ? (CS_HREDRAW | CS_VREDRAW | CS_OWNDC | CS_DBLCLKS) : hb_parni(1) ); wndclass.lpfnWndProc = __WndProc ; - wndclass.cbClsExtra = ( ISNIL(2) ? 0 : hb_parni(2)); - wndclass.cbWndExtra = ( ISNIL(3) ? 0 : hb_parni(3)); - wndclass.hInstance = ( ISNIL(4) ? GetModuleHandle(NULL) : (HANDLE) HB_PARWH(4) ); - wndclass.hIcon = ( ISNIL(5) ? LoadIcon(GetModuleHandle(NULL),"") : (HICON) HB_PARWH(5) ); - wndclass.hCursor = ( ISNIL(6) ? LoadCursor (NULL, IDC_ARROW) : (HCURSOR) HB_PARWH(6) ); - wndclass.hbrBackground = ( ISNIL(7) ? (INT) COLOR_WINDOW + 1 : (HBRUSH) HB_PARWH(7) ); - wndclass.lpszMenuName = (LPCSTR) ( !ISNIL(8) ? hb_parc(8) : NULL ); + wndclass.cbClsExtra = ( HB_ISNIL(2) ? 0 : hb_parni(2)); + wndclass.cbWndExtra = ( HB_ISNIL(3) ? 0 : hb_parni(3)); + wndclass.hInstance = ( HB_ISNIL(4) ? GetModuleHandle(NULL) : (HANDLE) HB_PARWH(4) ); + wndclass.hIcon = ( HB_ISNIL(5) ? LoadIcon(GetModuleHandle(NULL),"") : (HICON) HB_PARWH(5) ); + wndclass.hCursor = ( HB_ISNIL(6) ? LoadCursor (NULL, IDC_ARROW) : (HCURSOR) HB_PARWH(6) ); + wndclass.hbrBackground = ( HB_ISNIL(7) ? (INT) COLOR_WINDOW + 1 : (HBRUSH) HB_PARWH(7) ); + wndclass.lpszMenuName = (LPCSTR) ( !HB_ISNIL(8) ? hb_parc(8) : NULL ); wndclass.lpszClassName = (LPCSTR) hb_parc(9); */ @@ -112,7 +112,7 @@ HB_FUNC( WHT__REGISTERCLASS ) //----------------------------------------------------------------------// HB_FUNC( WHT__UNREGISTERCLASS ) { - HANDLE hInst = ( ISNIL(2) ? GetModuleHandle(NULL) : (HANDLE) HB_PARWH(2) ); + HANDLE hInst = ( HB_ISNIL(2) ? GetModuleHandle(NULL) : (HANDLE) HB_PARWH(2) ); hb_retl( UnregisterClass( hb_parc(1), (HINSTANCE) hInst ) ); } diff --git a/harbour/examples/uhttpd/socket.c b/harbour/examples/uhttpd/socket.c index 027636c839..6db1aac9f7 100644 --- a/harbour/examples/uhttpd/socket.c +++ b/harbour/examples/uhttpd/socket.c @@ -58,13 +58,13 @@ static int hb_parnidef( int iParam, int iValue ) { - return ISNUM( iParam ) ? hb_parni( iParam ) : iValue; + return HB_ISNUM( iParam ) ? hb_parni( iParam ) : iValue; } static SOCKET hb_parsocket( int iParam ) { - return ISPOINTER( iParam ) ? ( SOCKET ) hb_parptr( 1 ) : INVALID_SOCKET; + return HB_ISPOINTER( iParam ) ? ( SOCKET ) hb_parptr( 1 ) : INVALID_SOCKET; } @@ -200,7 +200,7 @@ HB_FUNC ( SOCKET_ACCEPT ) hb_retsocket( accept( hb_parsocket( 1 ), &saddr, &iSize ) ); - if( ISBYREF( 2 ) ) + if( HB_ISBYREF( 2 ) ) { PHB_ITEM pItem = hb_itemPutSockaddr( NULL, &saddr ); hb_itemParamStoreForward( 2, pItem ); @@ -309,7 +309,7 @@ HB_FUNC ( SOCKET_SELECT ) } /* Default forever */ - lTimeout = ISNUM( 4 ) ? hb_parnl( 4 ) : -1; + lTimeout = HB_ISNUM( 4 ) ? hb_parnl( 4 ) : -1; if( lTimeout == -1 ) { @@ -325,7 +325,7 @@ HB_FUNC ( SOCKET_SELECT ) } pArray = hb_param( 1, HB_IT_ARRAY ); - if( pArray && ISBYREF( 1 ) ) + if( pArray && HB_ISBYREF( 1 ) ) { ulLen = hb_arrayLen( pArray ); pItem = hb_itemNew( NULL ); @@ -346,7 +346,7 @@ HB_FUNC ( SOCKET_SELECT ) } pArray = hb_param( 2, HB_IT_ARRAY ); - if( pArray && ISBYREF( 2 ) ) + if( pArray && HB_ISBYREF( 2 ) ) { ulLen = hb_arrayLen( pArray ); pItem = hb_itemNew( NULL ); @@ -367,7 +367,7 @@ HB_FUNC ( SOCKET_SELECT ) } pArray = hb_param( 3, HB_IT_ARRAY ); - if( pArray && ISBYREF( 3 ) ) + if( pArray && HB_ISBYREF( 3 ) ) { ulLen = hb_arrayLen( pArray ); pItem = hb_itemNew( NULL ); @@ -397,7 +397,7 @@ HB_FUNC ( SOCKET_GETSOCKNAME ) int iSize = sizeof( struct sockaddr ); hb_retni( getsockname( hb_parsocket( 1 ), &saddr, &iSize ) ); - if( ISBYREF( 2 ) ) + if( HB_ISBYREF( 2 ) ) { PHB_ITEM pItem = hb_itemPutSockaddr( NULL, &saddr ); hb_itemParamStoreForward( 2, pItem ); @@ -412,7 +412,7 @@ HB_FUNC ( SOCKET_GETPEERNAME ) int iSize = sizeof( struct sockaddr ); hb_retni( getpeername( hb_parsocket( 1 ), &saddr, &iSize ) ); - if( ISBYREF( 2 ) ) + if( HB_ISBYREF( 2 ) ) { PHB_ITEM pItem = hb_itemPutSockaddr( NULL, &saddr ); hb_itemParamStoreForward( 2, pItem );