From 587fef62a6f14e5a87e9511a3b97aa48e3f378e1 Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Fri, 29 Mar 2002 19:47:18 +0000 Subject: [PATCH] See ChangeLog 2002-03-29 14:45 UTC-0500 David G. Holm --- harbour/ChangeLog | 34 ++++++++++++++++++++++++++++-- harbour/contrib/libnf/calendar.prg | 3 ++- harbour/contrib/libnf/chdir.c | 4 +++- harbour/contrib/libnf/diskfunc.prg | 3 ++- harbour/contrib/libnf/dispmsg.prg | 3 ++- harbour/contrib/libnf/dosver.prg | 3 ++- harbour/contrib/libnf/floptst.prg | 3 ++- harbour/contrib/libnf/getver.c | 2 ++ harbour/contrib/libnf/getvid.c | 3 ++- harbour/contrib/libnf/isshare.prg | 3 ++- harbour/contrib/libnf/kspeed.c | 5 ++--- harbour/contrib/libnf/menuto.prg | 5 +++-- harbour/contrib/libnf/mkdir.c | 4 ++-- harbour/contrib/libnf/mouse.c | 15 +++---------- harbour/contrib/libnf/mouse2.prg | 3 ++- harbour/contrib/libnf/nwlstat.prg | 3 ++- harbour/contrib/libnf/nwuid.prg | 3 ++- harbour/contrib/libnf/page.prg | 3 ++- harbour/contrib/libnf/popadder.prg | 6 ++++-- harbour/contrib/libnf/pvid.prg | 3 ++- harbour/contrib/libnf/rmdir.c | 30 ++++++++++++-------------- harbour/contrib/libnf/scancode.prg | 3 ++- harbour/contrib/libnf/setdate.prg | 3 ++- harbour/contrib/libnf/settime.prg | 3 ++- harbour/contrib/libnf/sysmem.prg | 3 ++- harbour/contrib/libnf/tempfile.prg | 3 ++- harbour/contrib/libnf/vidcur.prg | 3 ++- harbour/contrib/libnf/vidmode.prg | 3 ++- 28 files changed, 103 insertions(+), 59 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 251abed870..259e06d5c9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,38 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ now respects scopes. + * Some fixes and cleanup + +2002-04-02 18:57 UTC+0300 Alexander Kresin + * contrib/rdd_ads/ads1.c + * contrib/rdd_ads/adsfunc.c + * contrib/rdd_ads/adsmgmnt.c + * contrib/rdd_ads/testmg.prg + * some changes for compatibility with Linux version + +2002-04-02 4:44 UTC-0300 Walter Negro + * source/rtl/menuto.prg + ! Fix recursive executions and exit without pressing key. + Now use local pointer and save static pointer. + ! Fix call to HitTest + +2002-03-31 14:00 UTC-0300 Luiz Rafael Culik + * source/rtl/tbrowse.prg + * Fixed an problem on SetColumnwidth() method that was Tbrowse not be properly show on screen + +2002-03-29 14:45 UTC-0500 David G. Holm + * contrib/libnf/calendar.prg + * contrib/libnf/chdir.c + * contrib/libnf/getver.c + * contrib/libnf/getvid.c + * contrib/libnf/kspeed.c + * contrib/libnf/mkdir.c + * contrib/libnf/mouse.c + * contrib/libnf/rmdir.c + ! Only include dos.h if building for a DOS platform. + + * contrib/libnf/diskfunc.prg + * contrib/libnf/dispmsg.prg * contrib/libnf/dosver.prg * contrib/libnf/floptst.prg * contrib/libnf/isshare.prg @@ -2252,8 +2284,6 @@ ed * Cleaned up the new Win32 API branches. 2001-12-21 12:54 UTC+0100 Antonio Linares - - * source/pp/pragma.c * contrib/dot/pp_harb.ch * tests/inline_c.prg diff --git a/harbour/contrib/libnf/calendar.prg b/harbour/contrib/libnf/calendar.prg index fb8ed3a2a8..2df18e32d9 100644 --- a/harbour/contrib/libnf/calendar.prg +++ b/harbour/contrib/libnf/calendar.prg @@ -114,7 +114,7 @@ #endif -#include "INKEY.CH" +#include "inkey.ch" FUNCTION FT_CALENDAR (nRow, nCol, cColor, lShadow, lShowHelp) @@ -227,3 +227,4 @@ FUNCTION FT_CALENDAR (nRow, nCol, cColor, lShadow, lShowHelp) RETURN ( VAL(SUBSTR(cString,nOffset,nChar)) ) * end of calendar.prg + diff --git a/harbour/contrib/libnf/chdir.c b/harbour/contrib/libnf/chdir.c index e6cf0028b8..bea56518d2 100644 --- a/harbour/contrib/libnf/chdir.c +++ b/harbour/contrib/libnf/chdir.c @@ -78,7 +78,9 @@ End /* This is the New one Rewriten in C*/ #include "extend.h" +#if defined(HB_OS_DOS) #include "dos.h" +#endif HB_FUNC( FT_CHDIR) { @@ -98,4 +100,4 @@ HB_FUNC( FT_CHDIR) hb_retl(Status); } #endif - } +} diff --git a/harbour/contrib/libnf/diskfunc.prg b/harbour/contrib/libnf/diskfunc.prg index 7956f0a412..0debfbc165 100644 --- a/harbour/contrib/libnf/diskfunc.prg +++ b/harbour/contrib/libnf/diskfunc.prg @@ -22,7 +22,7 @@ * */ -#include "FTINT86.CH" +#include "ftint86.ch" #define DRVTABLE "ABCDEFGHIJKLMNOPQRSTUVWXYZ" @@ -98,3 +98,4 @@ FUNCTION FT_DSKFREE( cDrive ) RETURN DISKSPACE(nDrive,1) + diff --git a/harbour/contrib/libnf/dispmsg.prg b/harbour/contrib/libnf/dispmsg.prg index ca47397311..d2cd02c945 100644 --- a/harbour/contrib/libnf/dispmsg.prg +++ b/harbour/contrib/libnf/dispmsg.prg @@ -117,7 +117,7 @@ */ -#include "INKEY.CH" +#include "inkey.ch" // beginning of demo program #ifdef FT_TEST @@ -331,3 +331,4 @@ FUNCTION FT_DispMsg( aInfo, cKey, nBoxTop, nBoxLeft, cnBoxString, lShadow ) SETCOLOR( cOldColor ) SETCURSOR( cOldCursor ) RETURN xRtnVal + diff --git a/harbour/contrib/libnf/dosver.prg b/harbour/contrib/libnf/dosver.prg index 06056c0b24..2ffe4d3d60 100644 --- a/harbour/contrib/libnf/dosver.prg +++ b/harbour/contrib/libnf/dosver.prg @@ -56,7 +56,7 @@ * $END$ */ -#include "FTINT86.CH" +#include "ftint86.ch" #define DOS 33 #define DOSVER 48 @@ -80,3 +80,4 @@ FUNCTION FT_DOSVER() */ cResult:= _get_dosver() RETURN ( cResult ) + diff --git a/harbour/contrib/libnf/floptst.prg b/harbour/contrib/libnf/floptst.prg index c200372707..239849995f 100644 --- a/harbour/contrib/libnf/floptst.prg +++ b/harbour/contrib/libnf/floptst.prg @@ -84,7 +84,7 @@ * */ -#include "FTINT86.CH" +#include "ftint86.ch" #define TRUE .T. #define FALSE .F. @@ -290,3 +290,4 @@ STATIC FUNCTION _CallInt13hRetry( ; // logical: did the interrupt succeed? RETURN lSuccess // EOF + diff --git a/harbour/contrib/libnf/getver.c b/harbour/contrib/libnf/getver.c index 29669ce6e9..e720fc68cf 100644 --- a/harbour/contrib/libnf/getver.c +++ b/harbour/contrib/libnf/getver.c @@ -53,7 +53,9 @@ #include "hbapi.h" #include "hbapiitm.h" +#if defined(HB_OS_DOS) #include "dos.h" +#endif #include "string.h" #include "stdlib.h" diff --git a/harbour/contrib/libnf/getvid.c b/harbour/contrib/libnf/getvid.c index 538364de91..8d473600fd 100644 --- a/harbour/contrib/libnf/getvid.c +++ b/harbour/contrib/libnf/getvid.c @@ -52,7 +52,9 @@ */ #include "hbapi.h" +#if defined(HB_OS_DOS) #include "dos.h" +#endif HB_FUNC(_FT_GETVPG) { @@ -87,4 +89,3 @@ HB_FUNC(_V_SETVPG) } #endif } - diff --git a/harbour/contrib/libnf/isshare.prg b/harbour/contrib/libnf/isshare.prg index a4c5269063..94356ad512 100644 --- a/harbour/contrib/libnf/isshare.prg +++ b/harbour/contrib/libnf/isshare.prg @@ -54,7 +54,7 @@ * $END$ */ -#include "FTINT86.CH" +#include "ftint86.ch" #ifdef FT_TEST function main() @@ -87,3 +87,4 @@ FUNCTION ft_isshare() RETURN lowbyte( aRegs[AX] ) */ RETURN _ft_isshare() + diff --git a/harbour/contrib/libnf/kspeed.c b/harbour/contrib/libnf/kspeed.c index 36786fe43c..fd0d1a58a5 100644 --- a/harbour/contrib/libnf/kspeed.c +++ b/harbour/contrib/libnf/kspeed.c @@ -144,7 +144,9 @@ _NanFor ENDS /* This is the New one Rewriten in C*/ #include "extend.h" +#if defined(HB_OS_DOS) #include "dos.h" +#endif HB_FUNC( FT_SETRATE) { @@ -172,6 +174,3 @@ HB_FUNC( FT_SETRATE) } #endif } - - - diff --git a/harbour/contrib/libnf/menuto.prg b/harbour/contrib/libnf/menuto.prg index 26a44b2ef1..0689a73204 100644 --- a/harbour/contrib/libnf/menuto.prg +++ b/harbour/contrib/libnf/menuto.prg @@ -178,8 +178,8 @@ * $END$ */ -#include "SETCURS.CH" -#include "INKEY.CH" +#include "setcurs.ch" +#include "inkey.ch" #xcommand if then => ; if ; ; end @@ -587,3 +587,4 @@ eval( bGetSet, nActive ) return nActive + diff --git a/harbour/contrib/libnf/mkdir.c b/harbour/contrib/libnf/mkdir.c index 4a1bf826cf..eb1f2d8559 100644 --- a/harbour/contrib/libnf/mkdir.c +++ b/harbour/contrib/libnf/mkdir.c @@ -81,13 +81,14 @@ End /* This is the New one Rewriten in C*/ #include "hbapi.h" +#if defined(HB_OS_DOS) #include "dos.h" +#endif HB_FUNC(FT_MKDIR) { #if defined(HB_OS_DOS) { - int Status; char *path=hb_parc(1); union REGS regs; @@ -102,4 +103,3 @@ HB_FUNC(FT_MKDIR) } #endif } - diff --git a/harbour/contrib/libnf/mouse.c b/harbour/contrib/libnf/mouse.c index be0b5e05cd..7bf3c00e93 100644 --- a/harbour/contrib/libnf/mouse.c +++ b/harbour/contrib/libnf/mouse.c @@ -52,7 +52,9 @@ */ #include "extend.h" +#if defined(HB_OS_DOS) #include "dos.h" +#endif #include "hbapiitm.h" #include "hbapigt.h" @@ -60,9 +62,7 @@ HB_FUNC(_MGET_PAGE) { int iPage; #if defined(HB_OS_DOS) - { - union REGS regs; regs.HB_XREGS.ax=0x1E; HB_DOS_INT86(0x33,®s,®s); @@ -75,10 +75,8 @@ HB_FUNC(_MGET_PAGE) { hb_retni(iPage); } - } - HB_FUNC(_MSET_PAGE) { #if defined(HB_OS_DOS) @@ -100,7 +98,6 @@ HB_FUNC(_MGET_MVERSION) int iMajor; #if defined(HB_OS_DOS) - { union REGS regs; @@ -112,16 +109,13 @@ HB_FUNC(_MGET_MVERSION) iIRQ = regs.h.cl; iMajor = regs.h.bh; } - #else - { iMinor = 0; iType = 0; iIRQ = 0; iMajor = 0; } - #endif { @@ -146,11 +140,8 @@ HB_FUNC(_MGET_MVERSION) hb_itemRelease( pArray ); } - - } - HB_FUNC(_MGET_HORISPEED) { int iSpeed; @@ -567,5 +558,5 @@ int inButton; hb_itemRelease(pnX); hb_itemRelease(pnButton); } - } + diff --git a/harbour/contrib/libnf/mouse2.prg b/harbour/contrib/libnf/mouse2.prg index c9e235e5f9..76b34b8486 100644 --- a/harbour/contrib/libnf/mouse2.prg +++ b/harbour/contrib/libnf/mouse2.prg @@ -62,7 +62,7 @@ // and fixes that I've given him sole credit. -- G. Scott -#include "FTINT86.CH" +#include "ftint86.ch" static aReg[10] static lCrsState:=.F. @@ -1001,3 +1001,4 @@ FUNCTION FT_MDEFCRS( nCurType, nScrMask, nCurMask ) // define text cursor type RETURN NIL // no function output */ + diff --git a/harbour/contrib/libnf/nwlstat.prg b/harbour/contrib/libnf/nwlstat.prg index 1a999372e0..f0bda788be 100644 --- a/harbour/contrib/libnf/nwlstat.prg +++ b/harbour/contrib/libnf/nwlstat.prg @@ -53,7 +53,7 @@ * $END$ */ -#include "FTINT86.CH" +#include "ftint86.ch" #define DOS 33 #define STATNUM 220 @@ -77,3 +77,4 @@ FUNCTION FT_NWLSTAT() endif RETURN nStation + diff --git a/harbour/contrib/libnf/nwuid.prg b/harbour/contrib/libnf/nwuid.prg index 985b219a4e..172dfdd8e4 100644 --- a/harbour/contrib/libnf/nwuid.prg +++ b/harbour/contrib/libnf/nwuid.prg @@ -73,7 +73,7 @@ * $END$ */ -#include "FTINT86.CH" +#include "ftint86.ch" #define DOS 33 #define NW_LOG 227 @@ -123,3 +123,4 @@ FUNCTION FT_NWUID( nConn ) RETURN alltrim( strtran( substr( aRegs[ ES ], 9, 48 ), chr(0) ) ) + diff --git a/harbour/contrib/libnf/page.prg b/harbour/contrib/libnf/page.prg index 0f68e605de..c7d5103707 100644 --- a/harbour/contrib/libnf/page.prg +++ b/harbour/contrib/libnf/page.prg @@ -23,7 +23,7 @@ * */ -#include "FTINT86.CH" +#include "ftint86.ch" #define VIDEO 16 @@ -108,3 +108,4 @@ FUNCTION FT_GETVPG() RETURN ( HIGHBYTE( aRegs[ BX ] ) ) */ Return _ft_getvpg() + diff --git a/harbour/contrib/libnf/popadder.prg b/harbour/contrib/libnf/popadder.prg index 839df7e0c7..6dfb4efec6 100644 --- a/harbour/contrib/libnf/popadder.prg +++ b/harbour/contrib/libnf/popadder.prg @@ -107,8 +107,8 @@ * $END$ */ -#include 'Inkey.ch' -#include 'SetCurs.ch' +#include 'inkey.ch' +#include 'setcurs.ch' #include 'achoice.ch' // Set up manifest constants to access the window colors in the array aWinColor @@ -1958,3 +1958,5 @@ RETURN LEN(cString)-LEN(LTRIM(cString)) */ STATIC FUNCTION _ftPosIns(cString,cChar,nPosit) RETURN LEFT(cString,nPosit-1)+cChar+SUBSTR(cString,nPosit) + + diff --git a/harbour/contrib/libnf/pvid.prg b/harbour/contrib/libnf/pvid.prg index f9ed7a7352..f1b25338a4 100644 --- a/harbour/contrib/libnf/pvid.prg +++ b/harbour/contrib/libnf/pvid.prg @@ -16,7 +16,7 @@ * Initial revision. */ -#include "SET.CH" +#include "set.ch" #define PV_ROW 1 #define PV_COL 2 @@ -125,3 +125,4 @@ endif return len( aVideo ) + diff --git a/harbour/contrib/libnf/rmdir.c b/harbour/contrib/libnf/rmdir.c index 567f4c5a73..32bc1cb5f4 100644 --- a/harbour/contrib/libnf/rmdir.c +++ b/harbour/contrib/libnf/rmdir.c @@ -80,25 +80,23 @@ End /* This is the New one Rewriten in C*/ #include "extend.h" +#if defined(HB_OS_DOS) #include "dos.h" +#endif HB_FUNC(FT_RMDIR) { #if defined(HB_OS_DOS) - { - - int Status; - char *path=hb_parc(1); - union REGS regs; - struct SREGS sregs; - segread(&sregs); - regs.h.ah=0x3A ; - sregs.ds=FP_SEG(path); - regs.HB_XREGS.dx=FP_OFF(path); - int86x(0x21,®s,®s,&sregs); - Status=regs.HB_XREGS.ax; - hb_retni(Status); -} + int Status; + char *path=hb_parc(1); + union REGS regs; + struct SREGS sregs; + segread(&sregs); + regs.h.ah=0x3A ; + sregs.ds=FP_SEG(path); + regs.HB_XREGS.dx=FP_OFF(path); + int86x(0x21,®s,®s,&sregs); + Status=regs.HB_XREGS.ax; + hb_retni(Status); #endif - } - +} diff --git a/harbour/contrib/libnf/scancode.prg b/harbour/contrib/libnf/scancode.prg index 2ac8512176..14d2fa3041 100644 --- a/harbour/contrib/libnf/scancode.prg +++ b/harbour/contrib/libnf/scancode.prg @@ -71,7 +71,7 @@ * $END$ */ -#include "FTINT86.CH" +#include "ftint86.ch" #define KEYB 22 @@ -101,3 +101,4 @@ FUNCTION FT_SCANCODE() aRegs[ AX ] = MAKEHI( 0 ) FT_INT86( KEYB, aRegs ) RETURN ( chr(LOWBYTE( aRegs[AX] )) + chr(HIGHBYTE( aRegs[AX] )) ) + diff --git a/harbour/contrib/libnf/setdate.prg b/harbour/contrib/libnf/setdate.prg index bd8897b8e9..95c5d9c882 100644 --- a/harbour/contrib/libnf/setdate.prg +++ b/harbour/contrib/libnf/setdate.prg @@ -67,7 +67,7 @@ * $END$ */ -#include "FTINT86.CH" +#include "ftint86.ch" #define DOS 33 #define SETDATE 43 @@ -94,3 +94,4 @@ function FT_SETDATE( dDate ) aregs[ DX ] = ( month( dDate ) * ( 2 ^ 8 ) ) + day( dDate ) return( FT_INT86( DOS, aRegs ) ) + diff --git a/harbour/contrib/libnf/settime.prg b/harbour/contrib/libnf/settime.prg index 819e6aeca6..584b11c38b 100644 --- a/harbour/contrib/libnf/settime.prg +++ b/harbour/contrib/libnf/settime.prg @@ -65,7 +65,7 @@ * $END$ */ -#include "FTINT86.CH" +#include "ftint86.ch" #define DOS 33 #define SETTIME 45 @@ -95,3 +95,4 @@ function FT_SETTIME( cTime ) aRegs[ DX ] = SECS( cTime ) * ( 2 ^ 8 ) return( FT_INT86( DOS, aRegs ) ) + diff --git a/harbour/contrib/libnf/sysmem.prg b/harbour/contrib/libnf/sysmem.prg index 94953544e8..3f54ce5385 100644 --- a/harbour/contrib/libnf/sysmem.prg +++ b/harbour/contrib/libnf/sysmem.prg @@ -53,7 +53,7 @@ * $END$ */ -#include "FTINT86.CH" +#include "ftint86.ch" #define MEMSIZE 18 @@ -70,3 +70,4 @@ FUNCTION FT_SYSMEM() FT_INT86( MEMSIZE, aRegs ) RETURN ( aRegs[ AX ] ) + diff --git a/harbour/contrib/libnf/tempfile.prg b/harbour/contrib/libnf/tempfile.prg index 8f4de03459..7a98ca5fe2 100644 --- a/harbour/contrib/libnf/tempfile.prg +++ b/harbour/contrib/libnf/tempfile.prg @@ -84,7 +84,7 @@ * $END$ */ -#include "FTINT86.CH" +#include "ftint86.ch" #define DOS 33 #define TEMPNAME 90 @@ -137,3 +137,4 @@ FUNCTION FT_TEMPFIL( cPath, lHide ) endif RETURN cRet + diff --git a/harbour/contrib/libnf/vidcur.prg b/harbour/contrib/libnf/vidcur.prg index 2942c68bb8..adf79511b6 100644 --- a/harbour/contrib/libnf/vidcur.prg +++ b/harbour/contrib/libnf/vidcur.prg @@ -24,7 +24,7 @@ * */ -#include "FTINT86.CH" +#include "ftint86.ch" #define VIDEO 16 @@ -134,3 +134,4 @@ FUNCTION FT_GETVCUR( nPage ) FT_INT86( VIDEO, aRegs ) RETURN ( { HIGHBYTE( aRegs[CX] ), LOWBYTE( aRegs[CX] ), HIGHBYTE( aRegs[DX] ), LOWBYTE( aRegs[DX] ) } ) + diff --git a/harbour/contrib/libnf/vidmode.prg b/harbour/contrib/libnf/vidmode.prg index 033bbb0a2a..67a3557118 100644 --- a/harbour/contrib/libnf/vidmode.prg +++ b/harbour/contrib/libnf/vidmode.prg @@ -24,7 +24,7 @@ * */ -#include "FTINT86.CH" +#include "ftint86.ch" #define VIDEO 16 #define GETMODE 15 @@ -124,3 +124,4 @@ FUNCTION FT_GETMODE() RETURN ( LOWBYTE( aRegs[ AX ] ) ) */ RETURN _ft_getmode() +