diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 500d9e4ae0..95e22f3223 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,92 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-10-19 23:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/gtalleg/tests/hbmk.hbm + * contrib/hbmysql/utils/hbmk.hbm + * contrib/hbmysql/utils/dbf2mysq.prg + * contrib/hbmysql/tests/test.prg + * contrib/hbmysql/tests/hbmk.hbm + * contrib/hbct/tests/tab.prg + * contrib/hbct/tests/tokensep.prg + * contrib/hbct/tests/datetime.prg + * contrib/hbct/tests/hbmk.hbm + * contrib/hbct/tests/token2.prg + * contrib/hbct/tests/charhist.prg + * contrib/xhb/tests/hbmk.hbm + * contrib/hbodbc/tests/hbmk.hbm + * contrib/hbtpathy/tests/hbmk.hbm + * contrib/hbmzip/tests/hbmk.hbm + * contrib/hbsqlit3/tests/hbmk.hbm + * contrib/hbsqlit3/tests/authoriz.prg + * contrib/hbblat/tests/hbmk.hbm + * contrib/hbqt/tests/hbmk.hbm + * contrib/hbfbird/tests/simple.prg + * contrib/hbfbird/tests/test.prg + * contrib/hbfbird/tests/hbmk.hbm + * contrib/hbziparc/tests/hbmk.hbm + * contrib/hbxbp/tests/hbmk.hbm + * contrib/hbnf/tests/ftgete.prg + * contrib/hbnf/tests/hbmk.hbm + * contrib/hbcurl/tests/ftp_uldl.prg + * contrib/hbcurl/tests/hbmk.hbm + * contrib/hbmemio/tests/hbmk.hbm + * contrib/gtqtc/tests/demoqtc.prg + * contrib/gtqtc/tests/hbmk.hbm + * contrib/hbnetio/utils/hbmk.hbm + * contrib/hbnetio/tests/hbmk.hbm + * contrib/rddsql/tests/hbmk.hbm + * contrib/hbhpdf/tests/harupdf.prg + * contrib/hbhpdf/tests/hbmk.hbm + * contrib/rddado/tests/hbmk.hbm + * contrib/gtwvg/tests/hbmk.hbm + * contrib/hbpgsql/tests/async.prg + * contrib/hbpgsql/tests/test.prg + * contrib/hbpgsql/tests/hbmk.hbm + * contrib/hbpgsql/tests/cache.prg + * contrib/hbpgsql/tests/stress.prg + * contrib/hbpgsql/tests/dbf2pg.prg + * contrib/hbclipsm/tests/hbmk.hbm + * contrib/rddads/tests/datad.prg + * contrib/rddads/tests/hbmk.hbm + * contrib/rddads/tests/testmg.prg + * contrib/hbfimage/tests/fitest.prg + * contrib/hbfimage/tests/hbmk.hbm + * contrib/hbgd/tests/tostring.prg + * contrib/hbgd/tests/gdtestcl.prg + * contrib/hbgd/tests/gdtest.prg + * contrib/hbgd/tests/animgif.prg + * contrib/hbgd/tests/testdpi.prg + * contrib/hbgd/tests/hbmk.hbm + * contrib/hbgd/tests/counter.prg + * contrib/hbgd/tests/antialia.prg + * contrib/hbgd/tests/bartest.prg + * contrib/hbgd/tests/barms.prg + * contrib/hbgd/tests/test_out.prg + * contrib/hbmisc/tests/testhbf.prg + * contrib/hbmisc/tests/hbmk.hbm + * contrib/hbmisc/tests/twirl.prg + * contrib/hbtip/tests/dnldftp.prg + * contrib/hbtip/tests/upld_ftp.prg + * contrib/hbtip/tests/dbtohtml.prg + * contrib/hbtip/tests/hbmk.hbm + * contrib/hbwin/hbwin.h + * contrib/hbwin/hbwin.ch + * contrib/hbwin/tests/testsim.prg + * contrib/hbwin/tests/testole.prg + * contrib/hbwin/tests/testcom2.prg + * contrib/hbwin/win_com.c + * contrib/hbssl/tests/hbmk.hbm + * contrib/hbbtree/tests/hbmk.hbm + ! Fixed warnings and errors in test apps. + + Added -es2 option to test/util default options. + * Renamed few macros in hbwin / win_com implementation: + FCN* -> WIN_COM_FUN_* + WPDBG* -> WIN_COM_DBG_* + ; TOFIX: Some errors are left in hbgd/test_out.prg and + gtwvg to be fixed, now the can't be built. + Please do it. + 2009-10-19 22:13 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbextern.ch + added HB_TTOD() and HB_DTOT() functions @@ -82,7 +168,7 @@ (in few places just formatted because it was there) ; TOFIX: All tests should be eventually made fully warning free, so in the future expect -es2 - switch to be added as well. + switch to be added as well. [DONE] * contrib/hbwin/tests/testprn.prg ! Fixed two constant names. diff --git a/harbour/contrib/gtalleg/tests/hbmk.hbm b/harbour/contrib/gtalleg/tests/hbmk.hbm index 98f64e78f5..d5f4f3464b 100644 --- a/harbour/contrib/gtalleg/tests/hbmk.hbm +++ b/harbour/contrib/gtalleg/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../gtalleg.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/gtqtc/tests/demoqtc.prg b/harbour/contrib/gtqtc/tests/demoqtc.prg index e9c4836415..266a72f133 100644 --- a/harbour/contrib/gtqtc/tests/demoqtc.prg +++ b/harbour/contrib/gtqtc/tests/demoqtc.prg @@ -38,9 +38,11 @@ FUNCTION Main() LOCAL cVar := ' ' LOCAL cVar1 := ' ' LOCAL getlist := {} +#if 0 Local nHeight := 20 Local nWidth := Int( nHeight/2 ) Local cFont := 'Courier New' +#endif Local nn := 0 Local cc := 'abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmn' @@ -349,6 +351,8 @@ STATIC FUNCTION TBNext( oTbr ) LOCAL nSaveRecNum := recno() LOCAL lMoved := .T. + HB_SYMBOL_UNUSED( oTbr ) + if Eof() lMoved := .F. else @@ -365,6 +369,8 @@ STATIC FUNCTION TBPrev( oTbr ) LOCAL nSaveRecNum := Recno() LOCAL lMoved := .T. + HB_SYMBOL_UNUSED( oTbr ) + DBSkip( -1 ) if Bof() @@ -445,6 +451,8 @@ STATIC FUNCTION BrwHandleKey( oBrowse, nKey, lEnd ) FUNCTION Qtc_Out( cMsg ) + HB_SYMBOL_UNUSED( cMsg ) + //RETURN Qtc_OutputDebugString( cMsg ) RETURN NIL diff --git a/harbour/contrib/gtqtc/tests/hbmk.hbm b/harbour/contrib/gtqtc/tests/hbmk.hbm index cb43b4d478..a6756fce38 100644 --- a/harbour/contrib/gtqtc/tests/hbmk.hbm +++ b/harbour/contrib/gtqtc/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../gtqtc.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/gtwvg/tests/hbmk.hbm b/harbour/contrib/gtwvg/tests/hbmk.hbm index c3f18429fb..be8351e407 100644 --- a/harbour/contrib/gtwvg/tests/hbmk.hbm +++ b/harbour/contrib/gtwvg/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../gtwvg.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbblat/tests/hbmk.hbm b/harbour/contrib/hbblat/tests/hbmk.hbm index 3a28db00ee..ca7e8844e3 100644 --- a/harbour/contrib/hbblat/tests/hbmk.hbm +++ b/harbour/contrib/hbblat/tests/hbmk.hbm @@ -4,6 +4,6 @@ ../hbblat.hbc --w3 +-w3 -es2 -lhbwin diff --git a/harbour/contrib/hbbtree/tests/hbmk.hbm b/harbour/contrib/hbbtree/tests/hbmk.hbm index d3ae2759a1..a231d367f3 100644 --- a/harbour/contrib/hbbtree/tests/hbmk.hbm +++ b/harbour/contrib/hbbtree/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbbtree.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbclipsm/tests/hbmk.hbm b/harbour/contrib/hbclipsm/tests/hbmk.hbm index f0ed7ae7aa..a80d99ff41 100644 --- a/harbour/contrib/hbclipsm/tests/hbmk.hbm +++ b/harbour/contrib/hbclipsm/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbclipsm.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbct/tests/charhist.prg b/harbour/contrib/hbct/tests/charhist.prg index ece59b329e..630862d099 100644 --- a/harbour/contrib/hbct/tests/charhist.prg +++ b/harbour/contrib/hbct/tests/charhist.prg @@ -58,7 +58,6 @@ procedure main -local aArr local nTotal := 0 ctinit() diff --git a/harbour/contrib/hbct/tests/datetime.prg b/harbour/contrib/hbct/tests/datetime.prg index 61a73498d0..24c628a546 100644 --- a/harbour/contrib/hbct/tests/datetime.prg +++ b/harbour/contrib/hbct/tests/datetime.prg @@ -65,7 +65,6 @@ FUNCTION main () *:-------------------------------------------------------------------- local cScr -local cScr2 local nchoice local c := .T. local farr := { "addmonth ( ddate ) Add a month to ddate ", ; @@ -1170,7 +1169,6 @@ local nKey *:---------------------------------------------------------------- FUNCTION chkansi (cAnsidate) *:---------------------------------------------------------------- -local ddate local nYear local nMonth local nDay diff --git a/harbour/contrib/hbct/tests/hbmk.hbm b/harbour/contrib/hbct/tests/hbmk.hbm index 769402b35c..9a15468f65 100644 --- a/harbour/contrib/hbct/tests/hbmk.hbm +++ b/harbour/contrib/hbct/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbct.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbct/tests/tab.prg b/harbour/contrib/hbct/tests/tab.prg index 156e348f19..e4e27d0cdb 100644 --- a/harbour/contrib/hbct/tests/tab.prg +++ b/harbour/contrib/hbct/tests/tab.prg @@ -58,7 +58,7 @@ procedure main -local cStr, nLen, ni, cStr1 +local cStr, nLen ctinit() diff --git a/harbour/contrib/hbct/tests/token2.prg b/harbour/contrib/hbct/tests/token2.prg index 7042a1964a..4e582471dd 100644 --- a/harbour/contrib/hbct/tests/token2.prg +++ b/harbour/contrib/hbct/tests/token2.prg @@ -66,11 +66,10 @@ procedure main local cStr1 := "A,BB,CCC,DDDD,EEEEE,FFFFFF" -local cStr2 := "ZZZZZZ,YYYYY,XXXX,WWW,VV,U" +//local cStr2 := "ZZZZZZ,YYYYY,XXXX,WWW,VV,U" local cStr3 := "0123456789ABCDEFGHIJKLM" local cStr4 := "08:09:10:11:12" local cStr5 := "05:00+20:00+35:00+50:00" -local cStr6 local cTE1, cTE2 diff --git a/harbour/contrib/hbct/tests/tokensep.prg b/harbour/contrib/hbct/tests/tokensep.prg index 192834f9ee..509851ec8d 100644 --- a/harbour/contrib/hbct/tests/tokensep.prg +++ b/harbour/contrib/hbct/tests/tokensep.prg @@ -59,9 +59,7 @@ procedure main local cStr := ".,.This.,.is.,.a.,.test!" -local ni, npos -local cPre := " " -local cPost := " " +local ni ctinit() diff --git a/harbour/contrib/hbcurl/tests/ftp_uldl.prg b/harbour/contrib/hbcurl/tests/ftp_uldl.prg index a9da187461..2bec8a982b 100644 --- a/harbour/contrib/hbcurl/tests/ftp_uldl.prg +++ b/harbour/contrib/hbcurl/tests/ftp_uldl.prg @@ -21,6 +21,7 @@ FUNCTION Main( cDL, cUL ) LOCAL tmp LOCAL tmp1 LOCAL f + LOCAL a LOCAL lVerbose := .F. diff --git a/harbour/contrib/hbcurl/tests/hbmk.hbm b/harbour/contrib/hbcurl/tests/hbmk.hbm index ddfa9a9c22..3165d90da4 100644 --- a/harbour/contrib/hbcurl/tests/hbmk.hbm +++ b/harbour/contrib/hbcurl/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbcurl.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbfbird/tests/hbmk.hbm b/harbour/contrib/hbfbird/tests/hbmk.hbm index f054ac9417..59e99a2b34 100644 --- a/harbour/contrib/hbfbird/tests/hbmk.hbm +++ b/harbour/contrib/hbfbird/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbfbird.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbfbird/tests/simple.prg b/harbour/contrib/hbfbird/tests/simple.prg index a208cce1b4..2fe43cbd36 100644 --- a/harbour/contrib/hbfbird/tests/simple.prg +++ b/harbour/contrib/hbfbird/tests/simple.prg @@ -70,7 +70,7 @@ Function main() oServer:Commit() - oQuery := oServer:Query('SELECT code, dept, name, sales, salary, creation FROM test') + oServer:Query('SELECT code, dept, name, sales, salary, creation FROM test') wait diff --git a/harbour/contrib/hbfbird/tests/test.prg b/harbour/contrib/hbfbird/tests/test.prg index 68f41815d0..bf988e46a8 100644 --- a/harbour/contrib/hbfbird/tests/test.prg +++ b/harbour/contrib/hbfbird/tests/test.prg @@ -11,10 +11,15 @@ Function Main() LOCAL trans, qry + LOCAL db, x, y + LOCAL num_cols + LOCAL columns + LOCAL fetch_stat + hb_FNameSplit( hb_argv( 0 ), @cDir, @cName, NIL ) cDBName := hb_FNameMerge( cDir, cName, ".gdb" ) - if File( cDBName ) + if hb_FileExists( cDBName ) FErase( cDBName ) endif @@ -33,7 +38,7 @@ Function Main() ? FBClose(db) trans := FBStartTransaction(db) - qry := FBQuery(db, 'create table teste (code smallint)', nDialect, trans) + FBQuery(db, 'create table teste (code smallint)', nDialect, trans) FBCommit(trans) diff --git a/harbour/contrib/hbfimage/tests/fitest.prg b/harbour/contrib/hbfimage/tests/fitest.prg index 89bc5e1a11..56aaf3b9e1 100644 --- a/harbour/contrib/hbfimage/tests/fitest.prg +++ b/harbour/contrib/hbfimage/tests/fitest.prg @@ -19,12 +19,13 @@ PROCEDURE Main() LOCAL im, clone, rotated, rotatedEx, rescale, im2, im3 - LOCAL centerX, centerY, width, height, appo - LOCAL bmpinfoheader + LOCAL centerX, centerY, width, height +// LOCAL bmpinfoheader LOCAL bmpinfo - LOCAL bkcolor - LOCAL iccprofile - LOCAL x +// LOCAL bkcolor +// LOCAL iccprofile + LOCAL nH, nLen, cStr +// LOCAL appo //? "Press Alt-D + Enter to activate debug" //AltD( .T. ) @@ -155,6 +156,7 @@ PROCEDURE Main() //? bmpinfoheader:SayMembers(" ", .t., .t.) //bmpinfo:Pointer( fi_GetInfo( im ) ) + bmpinfo := NIL // To fix warning ? "Info :", ValToPrg( bmpinfo ) //? bmpinfo:SayMembers(" ", .t., .t.) ? "-----------------------------------------------------" diff --git a/harbour/contrib/hbfimage/tests/hbmk.hbm b/harbour/contrib/hbfimage/tests/hbmk.hbm index 76bd89dba6..7440f76d5d 100644 --- a/harbour/contrib/hbfimage/tests/hbmk.hbm +++ b/harbour/contrib/hbfimage/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbfimage.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbgd/tests/animgif.prg b/harbour/contrib/hbgd/tests/animgif.prg index 31a47e7e62..406235d777 100644 --- a/harbour/contrib/hbgd/tests/animgif.prg +++ b/harbour/contrib/hbgd/tests/animgif.prg @@ -19,7 +19,7 @@ PROCEDURE Main() LOCAL im, im2, im3 - LOCAL black, white, trans + LOCAL black, trans LOCAL hFile /* @@ -33,7 +33,7 @@ PROCEDURE Main() im := gdImageCreate(100, 100) /* Allocate background */ - white := gdImageColorAllocate(im, 255, 255, 255) +// white := gdImageColorAllocate(im, 255, 255, 255) /* Allocate drawing color */ black := gdImageColorAllocate(im, 0, 0, 0) diff --git a/harbour/contrib/hbgd/tests/antialia.prg b/harbour/contrib/hbgd/tests/antialia.prg index a23f48f7d6..7cb0799f25 100644 --- a/harbour/contrib/hbgd/tests/antialia.prg +++ b/harbour/contrib/hbgd/tests/antialia.prg @@ -17,7 +17,7 @@ PROCEDURE Main() LOCAL im - LOCAL white, blue, black + LOCAL white, blue /* // Check output directory @@ -47,7 +47,7 @@ PROCEDURE Main() im := gdImageCreatePalette(100, 100) // alias of gdImageCreate() /* First allocate color is Background color */ - black := gdImageColorAllocate(im, 0, 0, 0) +// black := gdImageColorAllocate(im, 0, 0, 0) /* set foreground color */ blue := gdImageColorAllocate(im, 0, 0, 255) diff --git a/harbour/contrib/hbgd/tests/barms.prg b/harbour/contrib/hbgd/tests/barms.prg index 61f8e877b2..2aecbc0763 100644 --- a/harbour/contrib/hbgd/tests/barms.prg +++ b/harbour/contrib/hbgd/tests/barms.prg @@ -12,16 +12,16 @@ Function Main() local black := {0,0,0} local white := {255,255,255} - local blue := {0,0,255} - local yellon := {255,255,128} +// local blue := {0,0,255} +// local yellon := {255,255,128} - local red := {255,0,0} +// local red := {255,0,0} local ccode13 := "P48WBQ7BX3M73X8V3WRT7F9JW" local ccode8 := "P48WBQ7BX3M73X8V3WRT7F9JW" local ccode128 := "P48WBQ7BX3M73X8V3WRT7F9JW" - local nlower := 1 , nhight := 50 +// local nlower := 1 , nhight := 50 /* here is the list of arguments 1- Barcode Type 13,8 and 128 diff --git a/harbour/contrib/hbgd/tests/bartest.prg b/harbour/contrib/hbgd/tests/bartest.prg index d4174485df..11a4dd542c 100644 --- a/harbour/contrib/hbgd/tests/bartest.prg +++ b/harbour/contrib/hbgd/tests/bartest.prg @@ -12,17 +12,17 @@ Function Main() local black := {0,0,0} local white := {255,255,255} - local blue := {0,0,255} - local yellon := {255,255,128} +// local blue := {0,0,255} +// local yellon := {255,255,128} - local red := {255,0,0} +// local red := {255,0,0} local ccode13 := "789136043666" local ccode8 := "0421000" // local ccode128 := "00011005100000000" local ccode128 := "Code 128" - local nlower := 1 , nhight := 50 +// local nlower := 1 , nhight := 50 /* here is the list of arguments 1- Barcode Type 13,8 and 128 diff --git a/harbour/contrib/hbgd/tests/counter.prg b/harbour/contrib/hbgd/tests/counter.prg index 1e899e9450..3b1e747fa9 100644 --- a/harbour/contrib/hbgd/tests/counter.prg +++ b/harbour/contrib/hbgd/tests/counter.prg @@ -25,8 +25,7 @@ PROCEDURE Main( cValue, cBaseImage ) LOCAL oI, oIDigits, nWidth, nHeight, nDigits, nNumWidth, oTemp - //LOCAL black, white, blue, red, green, cyan, gray - LOCAL white + //LOCAL black, blue, red, green, cyan, gray LOCAL aNumberImages := {} LOCAL n, nValue @@ -106,9 +105,6 @@ PROCEDURE Main( cValue, cBaseImage ) oI := GDImage():New( nNumWidth * DISPLAY_NUM, nHeight ) // the counter ? "Image dimensions: ", oI:Width(), oI:Height() - /* Allocate background */ - white := oI:SetColor( 255, 255, 255 ) - /* Allocate drawing color */ //black := oI:SetColor( 0, 0, 0 ) //blue := oI:SetColor( 0, 0, 255 ) diff --git a/harbour/contrib/hbgd/tests/gdtest.prg b/harbour/contrib/hbgd/tests/gdtest.prg index b2dad838a4..fcc2104a0a 100644 --- a/harbour/contrib/hbgd/tests/gdtest.prg +++ b/harbour/contrib/hbgd/tests/gdtest.prg @@ -17,8 +17,9 @@ PROCEDURE Main() LOCAL im, im2 - LOCAL black, white, blue, red, green, cyan - LOCAL aClip, color, font, aRect + LOCAL black, blue, red, green, cyan + LOCAL color, font +// LOCAL aClip // SET GDFONTPATH=C:\windows\fonts IF GetEnv( "GDFONTPATH" ) == "" @@ -44,9 +45,6 @@ PROCEDURE Main() /* Now work on first empty image */ - /* Allocate background */ - white := gdImageColorAllocate(im, 255, 255, 255) - /* Allocate drawing color */ black := gdImageColorAllocate(im, 0, 0, 0) blue := gdImageColorAllocate(im, 0, 0, 255) @@ -94,7 +92,7 @@ PROCEDURE Main() gdImageSetClip(im, 25, 25, 75, 75) /* Retrieve Clipping rectangle */ - aClip := gdImageGetClip(im) +// aClip := gdImageGetClip(im) // ? "Clipping rectangle values" // ? hb_DumpVar( aClip ) diff --git a/harbour/contrib/hbgd/tests/gdtestcl.prg b/harbour/contrib/hbgd/tests/gdtestcl.prg index 0486500296..3be9d085a7 100644 --- a/harbour/contrib/hbgd/tests/gdtestcl.prg +++ b/harbour/contrib/hbgd/tests/gdtestcl.prg @@ -16,12 +16,12 @@ PROCEDURE Main() - LOCAL im, im2 - LOCAL black, white, blue, red, green, cyan, gray - LOCAL aClip, color, font, aRect + LOCAL black, blue, red, green, cyan, gray + LOCAL color LOCAL oI, oI2, oI3, oI4, nThick, n, nSecs LOCAL oI5 LOCAL oB +// LOCAL aClip // To set fonts run this command: // for windows: SET GDFONTPATH=C:\windows\fonts @@ -50,9 +50,6 @@ PROCEDURE Main() /* Now work on first empty image */ - /* Allocate background */ - white := oI:SetColor( 255, 255, 255 ) - /* Allocate drawing color */ black := oI:SetColor( 0, 0, 0 ) blue := oI:SetColor( 0, 0, 255 ) @@ -130,7 +127,7 @@ PROCEDURE Main() oI:SetClippingArea(25, 25, 75, 75) /* Retrieve Clipping rectangle */ - aClip := oI:GetClippingArea() +// aClip := oI:GetClippingArea() ? "Clipping rectangle values" // ? hb_DumpVar( aClip ) @@ -166,7 +163,7 @@ PROCEDURE Main() nSecs := Seconds() ? "start clone & zoom" - oI4:= oI2:Clone():Zoom( 200 ) + oI2:Clone():Zoom( 200 ) ? "end", Seconds() - nSecs nSecs := Seconds() @@ -227,8 +224,6 @@ PROCEDURE Main() oI5 := GDChart():New( 400, 400 ) - // Set background - white := oI5:SetColor(255, 255, 255) // Define piece colors blue := oI5:SetColor(0, 0, 200) gray := oI5:SetColor(30, 30, 30) @@ -261,8 +256,6 @@ PROCEDURE Main() oI5:SaveJpeg( IMAGES_OUT + "pie.jpg" ) oI5 := GDChart():New( 640, 480 ) - // Set background - white := oI5:SetColor(255, 255, 255) // Define piece colors blue := oI5:SetColor(0, 0, 200) gray := oI5:SetColor(30, 30, 30) diff --git a/harbour/contrib/hbgd/tests/hbmk.hbm b/harbour/contrib/hbgd/tests/hbmk.hbm index 28f980b8e5..b950ca50c4 100644 --- a/harbour/contrib/hbgd/tests/hbmk.hbm +++ b/harbour/contrib/hbgd/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbgd.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbgd/tests/test_out.prg b/harbour/contrib/hbgd/tests/test_out.prg index 04eece36aa..b80cfaf78a 100644 --- a/harbour/contrib/hbgd/tests/test_out.prg +++ b/harbour/contrib/hbgd/tests/test_out.prg @@ -21,7 +21,7 @@ PROCEDURE Main(...) LOCAL cQuery := GetEnv( "QUERY_STRING" ) LOCAL hParams := hb_Hash() - LOCAL cText, cImg, nPt, nSize, nWidth, nHeight, cPhoto + LOCAL cText, cImg, nPt, nWidth, nHeight, cPhoto IF Empty( aParams ) IF !Empty( cQuery ) diff --git a/harbour/contrib/hbgd/tests/testdpi.prg b/harbour/contrib/hbgd/tests/testdpi.prg index 82ca2ffd95..aaea99faaf 100644 --- a/harbour/contrib/hbgd/tests/testdpi.prg +++ b/harbour/contrib/hbgd/tests/testdpi.prg @@ -17,10 +17,9 @@ PROCEDURE Main() - oI := GDImage():Create( 600, 300 ) + LOCAL oI := GDImage():Create( 600, 300 ) - white := oI:SetColor( 255, 255, 255 ) - black := oI:SetColor( 0, 0, 0 ) + LOCAL black := oI:SetColor( 0, 0, 0 ) oI:SetColor( black ) oI:SetFontName("C:\windows\fonts\arial.ttf") diff --git a/harbour/contrib/hbgd/tests/tostring.prg b/harbour/contrib/hbgd/tests/tostring.prg index 92e14f94c7..fad28c651e 100644 --- a/harbour/contrib/hbgd/tests/tostring.prg +++ b/harbour/contrib/hbgd/tests/tostring.prg @@ -17,12 +17,7 @@ PROCEDURE Main() - LOCAL im, im2 - LOCAL black, white, blue, red, green, cyan, gray - LOCAL aClip, color, font, aRect - LOCAL oI, oI2, oI3, oI4, nThick, n, nSecs - LOCAL oI5 - LOCAL oB + LOCAL oI /* // Check output directory diff --git a/harbour/contrib/hbhpdf/tests/harupdf.prg b/harbour/contrib/hbhpdf/tests/harupdf.prg index 56648c0a26..0b2467e553 100644 --- a/harbour/contrib/hbhpdf/tests/harupdf.prg +++ b/harbour/contrib/hbhpdf/tests/harupdf.prg @@ -184,7 +184,7 @@ Function DesignHaruPDF( cFileToSave ) //----------------------------------------------------------------------// Static Function Page_Lines( pdf ) Local page_title := "Line Example" - Local font, page, fname + Local font, page Local DASH_MODE1 := {3} Local DASH_MODE2 := {3, 7} @@ -466,9 +466,10 @@ Static Function draw_line2( page, x, y, label ) Return NIL //----------------------------------------------------------------------// Static Function Page_Text( pdf ) - Local page, page_height, font, rect := array( 4 ) + Local page, font, rect := array( 4 ) Local SAMP_TXT := "The quick brown fox jumps over the lazy dog. " Local angle1, angle2, rad1, rad2,i,x,y,buf +// Local page_height /* add a new page object. */ page := HPDF_AddPage(pdf) @@ -476,7 +477,7 @@ Static Function Page_Text( pdf ) //print_grid( pdf, page ) - page_height := HPDF_Page_GetHeight(page) +// page_height := HPDF_Page_GetHeight(page) font := HPDF_GetFont(pdf, "Helvetica", NIL) HPDF_Page_SetTextLeading(page, 20) @@ -722,8 +723,8 @@ Static Function Page_TextScaling( pdf ) /* measure the number of characters which included in the page. */ buf := samp_text - len := HPDF_Page_MeasureText(page, samp_text, ; - HPDF_Page_GetWidth(page) - 120, .F., NIL) + HPDF_Page_MeasureText(page, samp_text, ; + HPDF_Page_GetWidth(page) - 120, .F., NIL) HPDF_Page_ShowText(page, buf) @@ -965,7 +966,7 @@ static function show_description( page, x, y, text ) #define CELL_HEADER 10 Static function Page_CodePages( pdf ) - Local page, outline, font2, font_name, root, i, font, dst, fname + Local page, outline, font2, font_name, root, i, font, dst Local cResPath := "files" + hb_OSPathSeparator() Local cAfm := cResPath+"a010013l.afm" Local cPfb := cResPath+"a010013l.pfb" @@ -1159,7 +1160,7 @@ Static Function Page_Graphics( pdf ) HPDF_Page_MoveTo(page, 100, 100) HPDF_Page_LineTo(page, pos[1], pos[2]) HPDF_Page_Arc(page, 100, 100, 80, 360 * 0.85, 360) - pos := HPDF_Page_GetCurrentPos(page) +// pos := HPDF_Page_GetCurrentPos(page) HPDF_Page_LineTo(page, 100, 100) HPDF_Page_Fill(page) diff --git a/harbour/contrib/hbhpdf/tests/hbmk.hbm b/harbour/contrib/hbhpdf/tests/hbmk.hbm index d7c62ef685..a57fcdbb20 100644 --- a/harbour/contrib/hbhpdf/tests/hbmk.hbm +++ b/harbour/contrib/hbhpdf/tests/hbmk.hbm @@ -4,6 +4,6 @@ ../hbhpdf.hbc --w3 +-w3 -es2 -lhbct diff --git a/harbour/contrib/hbmemio/tests/hbmk.hbm b/harbour/contrib/hbmemio/tests/hbmk.hbm index 00998bd299..1c129591ee 100644 --- a/harbour/contrib/hbmemio/tests/hbmk.hbm +++ b/harbour/contrib/hbmemio/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbmemio.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbmisc/tests/hbmk.hbm b/harbour/contrib/hbmisc/tests/hbmk.hbm index 66e9236342..6a1c4f703b 100644 --- a/harbour/contrib/hbmisc/tests/hbmk.hbm +++ b/harbour/contrib/hbmisc/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbmisc.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbmisc/tests/testhbf.prg b/harbour/contrib/hbmisc/tests/testhbf.prg index e28e580231..a87598180d 100644 --- a/harbour/contrib/hbmisc/tests/testhbf.prg +++ b/harbour/contrib/hbmisc/tests/testhbf.prg @@ -20,8 +20,7 @@ tested with Borland 32bit only function main() // open a text file here -local handle -if ( handle := hb_fuse( "testhbf.prg", 0 ) ) > 1 +if hb_fuse( "testhbf.prg", 0 ) > 1 while !hb_feof() qout( "line " + str(hb_frecno(),2) + " " + hb_freadln() ) hb_fskip(1) diff --git a/harbour/contrib/hbmisc/tests/twirl.prg b/harbour/contrib/hbmisc/tests/twirl.prg index 993ea7e4e3..46570783ab 100644 --- a/harbour/contrib/hbmisc/tests/twirl.prg +++ b/harbour/contrib/hbmisc/tests/twirl.prg @@ -8,7 +8,7 @@ Donated to the public domain on 2001-03-15 by David G. Holm */ -PROCEDURE Main( cFile ) +PROCEDURE Main() LOCAL counter := 0, start_time, stop_time LOCAL twirl1 := Twirler():new( 2, 5, "One: " ) LOCAL twirl2 := Twirler():new( 2, 15, "Two: ", , 0.1 ) diff --git a/harbour/contrib/hbmysql/tests/hbmk.hbm b/harbour/contrib/hbmysql/tests/hbmk.hbm index 5e35039065..88006ad26e 100644 --- a/harbour/contrib/hbmysql/tests/hbmk.hbm +++ b/harbour/contrib/hbmysql/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbmysql.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbmysql/tests/test.prg b/harbour/contrib/hbmysql/tests/test.prg index 43555cb676..1d1f67eecd 100644 --- a/harbour/contrib/hbmysql/tests/test.prg +++ b/harbour/contrib/hbmysql/tests/test.prg @@ -54,7 +54,8 @@ procedure main(cArg) - local oServer, oQuery, oQuery2, oRow, i, aStru + local oServer, oQuery2, oRow, aStru + local oQuery SET CENTURY ON SET EPOCH TO 1960 @@ -65,8 +66,8 @@ procedure main(cArg) endif oServer:SelectDB("ims") - oQuery:=oServer:Query("SELECT * from maga limit 10") - oRow := oQuery:GetRow() +// oQuery := oServer:Query("SELECT * from maga limit 10") +// oRow := oQuery:GetRow() dbUseArea(.T.,, cArg, "wn", .F.) @@ -82,7 +83,7 @@ procedure main(cArg) endif oQuery:=oServer:Query("SELECT C111, C116, C134 from maga limit 10") - oRow := oQuery:GetRow() +// oRow := oQuery:GetRow() oServer:Destroy() diff --git a/harbour/contrib/hbmysql/utils/dbf2mysq.prg b/harbour/contrib/hbmysql/utils/dbf2mysq.prg index 78dd154b7e..f0530b5eef 100644 --- a/harbour/contrib/hbmysql/utils/dbf2mysq.prg +++ b/harbour/contrib/hbmysql/utils/dbf2mysq.prg @@ -52,9 +52,9 @@ #include "inkey.ch" -procedure main(c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14) +procedure main(...) - local cTok, nTok := 1 + local cTok local cHostName := "localhost" local cUser := "root" local cPassWord := "" diff --git a/harbour/contrib/hbmysql/utils/hbmk.hbm b/harbour/contrib/hbmysql/utils/hbmk.hbm index 5e35039065..88006ad26e 100644 --- a/harbour/contrib/hbmysql/utils/hbmk.hbm +++ b/harbour/contrib/hbmysql/utils/hbmk.hbm @@ -4,4 +4,4 @@ ../hbmysql.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbmzip/tests/hbmk.hbm b/harbour/contrib/hbmzip/tests/hbmk.hbm index d461c8a24c..d5a78cc0ab 100644 --- a/harbour/contrib/hbmzip/tests/hbmk.hbm +++ b/harbour/contrib/hbmzip/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbmzip.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbnetio/tests/hbmk.hbm b/harbour/contrib/hbnetio/tests/hbmk.hbm index eb4657d729..40fed33614 100644 --- a/harbour/contrib/hbnetio/tests/hbmk.hbm +++ b/harbour/contrib/hbnetio/tests/hbmk.hbm @@ -5,4 +5,4 @@ ../hbnetio.hbc -mt --w3 +-w3 -es2 diff --git a/harbour/contrib/hbnetio/utils/hbmk.hbm b/harbour/contrib/hbnetio/utils/hbmk.hbm index 731ba84084..6121b595c4 100644 --- a/harbour/contrib/hbnetio/utils/hbmk.hbm +++ b/harbour/contrib/hbnetio/utils/hbmk.hbm @@ -5,4 +5,4 @@ ../hbnetio.hbc -mt --w3 +-w3 -es2 diff --git a/harbour/contrib/hbnf/tests/ftgete.prg b/harbour/contrib/hbnf/tests/ftgete.prg index 64ab3f35df..0ca0105bab 100644 --- a/harbour/contrib/hbnf/tests/ftgete.prg +++ b/harbour/contrib/hbnf/tests/ftgete.prg @@ -4,11 +4,13 @@ #include "simpleio.ch" -function main() +PROCEDURE main() LOCAL a LOCAL c + LOCAL tmp + a := Array( FT_GETE() ) FT_GETE( @a ) FOR tmp := 1 TO Len( a ) diff --git a/harbour/contrib/hbnf/tests/hbmk.hbm b/harbour/contrib/hbnf/tests/hbmk.hbm index 920a9efa93..444b0d676a 100644 --- a/harbour/contrib/hbnf/tests/hbmk.hbm +++ b/harbour/contrib/hbnf/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbnf.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbodbc/tests/hbmk.hbm b/harbour/contrib/hbodbc/tests/hbmk.hbm index f43c664379..ff3533dc42 100644 --- a/harbour/contrib/hbodbc/tests/hbmk.hbm +++ b/harbour/contrib/hbodbc/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbodbc.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbpgsql/tests/async.prg b/harbour/contrib/hbpgsql/tests/async.prg index 7074077f4a..44ed9b44e8 100644 --- a/harbour/contrib/hbpgsql/tests/async.prg +++ b/harbour/contrib/hbpgsql/tests/async.prg @@ -24,7 +24,7 @@ Function Main( cServer, cDatabase, cUser, cPass ) Procedure Query( conn, cQuery, lCancel ) Local pCancel, cErrMsg := space(30) - Local res, aTemp, i, x, y, xTime + Local res, x, y, xTime ? "PQSendQuery", PQsendQuery(conn, cQuery) diff --git a/harbour/contrib/hbpgsql/tests/cache.prg b/harbour/contrib/hbpgsql/tests/cache.prg index e91c72a759..86c4e6c327 100644 --- a/harbour/contrib/hbpgsql/tests/cache.prg +++ b/harbour/contrib/hbpgsql/tests/cache.prg @@ -47,7 +47,6 @@ STATIC aTempDBF := {} Function Main( cServer, cDatabase, cUser, cPass ) Local i Local cQuery - Local conn, res SetMode( 25, 80 ) @@ -101,7 +100,6 @@ Return SQLGarbageCollector() Function SQLApplyUpdates() Local cAlias := Upper(Alias()) Local i, x - Local aField := {} Local oQuery Local oRow Local lUpdate @@ -280,12 +278,9 @@ Function SQLFetch( fetchall ) Local oRow Local cAlias := Upper(Alias()) Local i, x, y - Local nPos := 0 + Local nPos Local lEof := .F. - Local cString := "" - Local aStruct - Default Fetchall TO .f. /* Procura pela tabela no array */ @@ -333,15 +328,14 @@ Procedure SQLFetchAll() Return -Function SQLOpen( cAlias, cQuery, xFetch ) +Function SQLOpen( cAlias, cQuery, xFetch, cOrder ) Local cFile Local Result := .t. - Local i, x + Local x Local oServer Local oQuery Local aStrudbf Local lFetch - Local cOrder oServer := SQLCurrentServer() cAlias := Upper(cAlias) @@ -355,7 +349,10 @@ Function SQLOpen( cAlias, cQuery, xFetch ) ENDIF IF cQuery == NIL - cQuery := 'SELECT * FROM ' + cAlias + ' ORDER BY ' + cOrder + cQuery := 'SELECT * FROM ' + cAlias + IF ! Empty( cOrder ) + cQuery += ' ORDER BY ' + cOrder + ENDIF ENDIF cQuery := cQuery @@ -464,16 +461,7 @@ Function SQLExecQuery( cQuery ) Return result -Function SQLPrepare( cQuery, x01, x02, x03, x04, x05, x06, x07, x08, x09, x10,; - x11, x12, x13, x14, x15, x16, x17, x18, x19, x20,; - x21, x22, x23, x24, x25, x26, x27, x28, x29, x30,; - x31, x32, x33, x34, x35, x36, x37, x38, x39, x40,; - x41, x42, x43, x44, x45, x46, x47, x48, x49, x50,; - x51, x52, x53, x54, x55, x56, x57, x58, x59, x60,; - x61, x62, x63, x64, x65, x66, x67, x68, x69, x70,; - x71, x72, x73, x74, x75, x76, x77, x78, x79, x80,; - x81, x82, x83, x84, x85, x86, x87, x88, x89, x90,; - x91, x92, x93, x94, x95, x96, x97, x98, x99, x100) +Function SQLPrepare( cQuery, ... ) Local i, x if Pcount() >= 2 @@ -539,7 +527,7 @@ Function SQLStartTrans() Return nil -Function SQLInTrans( lStart ) +Function SQLInTrans() Local result result := (PQtransactionstatus(oServer:pDB) == PQTRANS_INTRANS) Return result diff --git a/harbour/contrib/hbpgsql/tests/dbf2pg.prg b/harbour/contrib/hbpgsql/tests/dbf2pg.prg index dd7a2cac69..466672a512 100644 --- a/harbour/contrib/hbpgsql/tests/dbf2pg.prg +++ b/harbour/contrib/hbpgsql/tests/dbf2pg.prg @@ -57,9 +57,9 @@ #define CRLF chr(13) + chr(10) -procedure main(c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15, c16, c17, c18, c19, c20) +procedure main(...) - local cTok, nTok := 1 + local cTok local cHostName := "localhost" local cUser := "postgres" local cPassWord := "" diff --git a/harbour/contrib/hbpgsql/tests/hbmk.hbm b/harbour/contrib/hbpgsql/tests/hbmk.hbm index 0ee3bed6ee..4780d028ff 100644 --- a/harbour/contrib/hbpgsql/tests/hbmk.hbm +++ b/harbour/contrib/hbpgsql/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbpgsql.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbpgsql/tests/stress.prg b/harbour/contrib/hbpgsql/tests/stress.prg index ae042a951a..08b2127298 100644 --- a/harbour/contrib/hbpgsql/tests/stress.prg +++ b/harbour/contrib/hbpgsql/tests/stress.prg @@ -10,7 +10,7 @@ #include "../postgres.ch" Function Main( cServer, cDatabase, cUser, cPass ) - Local conn, res, oRow, i, x + Local conn, res, i, x Local cQuery diff --git a/harbour/contrib/hbpgsql/tests/test.prg b/harbour/contrib/hbpgsql/tests/test.prg index 07da093abc..13d6d1ec55 100644 --- a/harbour/contrib/hbpgsql/tests/test.prg +++ b/harbour/contrib/hbpgsql/tests/test.prg @@ -5,7 +5,7 @@ #include "../postgres.ch" Function main() - Local conn, res, aTemp, i, x,y, pFile + Local conn, res, aTemp, x, y, pFile Local cDb := 'test' Local cUser := 'user' Local cPass := 'pass' diff --git a/harbour/contrib/hbqt/tests/hbmk.hbm b/harbour/contrib/hbqt/tests/hbmk.hbm index 5227dccb4b..62e31cbc05 100644 --- a/harbour/contrib/hbqt/tests/hbmk.hbm +++ b/harbour/contrib/hbqt/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbqt.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbsqlit3/tests/authoriz.prg b/harbour/contrib/hbsqlit3/tests/authoriz.prg index cf7539651a..41ed0f428e 100644 --- a/harbour/contrib/hbsqlit3/tests/authoriz.prg +++ b/harbour/contrib/hbsqlit3/tests/authoriz.prg @@ -139,6 +139,11 @@ RETURN iif( cName2 == "pasw", SQLITE_IGNORE, SQLITE_OK ) */ FUNCTION Authorizer3( nAction, cName1, cName2, cDatabaseName, cTriggerOrViewName ) // + HB_SYMBOL_UNUSED( cName1 ) + HB_SYMBOL_UNUSED( cName2 ) + HB_SYMBOL_UNUSED( cDatabaseName ) + HB_SYMBOL_UNUSED( cTriggerOrViewName ) + RETURN iif( nAction == SQLITE_SELECT, SQLITE_DENY, SQLITE_OK ) /** diff --git a/harbour/contrib/hbsqlit3/tests/hbmk.hbm b/harbour/contrib/hbsqlit3/tests/hbmk.hbm index 73f3c36caf..00cc9dd9ba 100644 --- a/harbour/contrib/hbsqlit3/tests/hbmk.hbm +++ b/harbour/contrib/hbsqlit3/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbsqlit3.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbssl/tests/hbmk.hbm b/harbour/contrib/hbssl/tests/hbmk.hbm index 1247484b7a..9f6824af02 100644 --- a/harbour/contrib/hbssl/tests/hbmk.hbm +++ b/harbour/contrib/hbssl/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbssl.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbtip/tests/dbtohtml.prg b/harbour/contrib/hbtip/tests/dbtohtml.prg index c6bcfb4929..815bdc2dff 100644 --- a/harbour/contrib/hbtip/tests/dbtohtml.prg +++ b/harbour/contrib/hbtip/tests/dbtohtml.prg @@ -7,7 +7,8 @@ PROCEDURE Main LOCAL oDoc, oNode, oTable, oRow, oCell - LOCAL nDll, pApi + LOCAL i, j + CLS BEGIN SEQUENCE diff --git a/harbour/contrib/hbtip/tests/dnldftp.prg b/harbour/contrib/hbtip/tests/dnldftp.prg index 1d437766e7..7b9599b8c7 100644 --- a/harbour/contrib/hbtip/tests/dnldftp.prg +++ b/harbour/contrib/hbtip/tests/dnldftp.prg @@ -23,7 +23,6 @@ RETURN STATIC FUNCTION TRP20FTPEnv( cCarpeta ) LOCAL aFiles - LOCAL n LOCAL cUrl LOCAL cStr LOCAL lRetorno := .T. @@ -33,9 +32,6 @@ STATIC FUNCTION TRP20FTPEnv( cCarpeta ) LOCAL cServer LOCAL cPassword LOCAL cFile := "" - LOCAL lElim - - DEFAULT lElim TO .F. cServer := "ftpserver" //change ftpserver to the real name or ip of your ftp server cUser := "ftpuser" // change ftpuser to an valid user on ftpserer diff --git a/harbour/contrib/hbtip/tests/hbmk.hbm b/harbour/contrib/hbtip/tests/hbmk.hbm index c07514ddc7..3e2c4372c0 100644 --- a/harbour/contrib/hbtip/tests/hbmk.hbm +++ b/harbour/contrib/hbtip/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbtip.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbtip/tests/upld_ftp.prg b/harbour/contrib/hbtip/tests/upld_ftp.prg index 24db2d5317..b1bb817a1a 100644 --- a/harbour/contrib/hbtip/tests/upld_ftp.prg +++ b/harbour/contrib/hbtip/tests/upld_ftp.prg @@ -27,7 +27,6 @@ RETURN nil STATIC FUNCTION TRP20FTPEnv( cCarpeta ) LOCAL aFiles - LOCAL n LOCAL cUrl LOCAL cStr LOCAL lRetorno := .T. @@ -37,9 +36,6 @@ STATIC FUNCTION TRP20FTPEnv( cCarpeta ) LOCAL cServer LOCAL cPassword LOCAL cFile := "" - LOCAL lElim - - DEFAULT lElim TO .F. cServer := "ftpserver" //change ftpserver to the real name or ip of your ftp server cUser := "ftpuser" // change ftpuser to an valid user on ftpserer diff --git a/harbour/contrib/hbtpathy/tests/hbmk.hbm b/harbour/contrib/hbtpathy/tests/hbmk.hbm index 483009bb47..9483ce5643 100644 --- a/harbour/contrib/hbtpathy/tests/hbmk.hbm +++ b/harbour/contrib/hbtpathy/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbtpathy.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbwin/hbwin.ch b/harbour/contrib/hbwin/hbwin.ch index 2c9ca29bd3..534f03c23f 100644 --- a/harbour/contrib/hbwin/hbwin.ch +++ b/harbour/contrib/hbwin/hbwin.ch @@ -106,6 +106,14 @@ #define RTS_CONTROL_HANDSHAKE 0x02 #define RTS_CONTROL_TOGGLE 0x03 +#define WIN_COM_DBGBASIC 0x01 +#define WIN_COM_DBGFLOW 0x02 +#define WIN_COM_DBGXTRAFLOW 0x04 +#define WIN_COM_DBGOTHER 0x08 +#define WIN_COM_DBGTIMEOUTS 0x10 +#define WIN_COM_DBGQUEUE 0x20 +#define WIN_COM_DBGALL 0x3F + /* win_Prn() related values */ #define FORM_A4 9 diff --git a/harbour/contrib/hbwin/hbwin.h b/harbour/contrib/hbwin/hbwin.h index 060b326f8a..f987ac15d5 100644 --- a/harbour/contrib/hbwin/hbwin.h +++ b/harbour/contrib/hbwin/hbwin.h @@ -50,26 +50,26 @@ * */ -#define FCNCREATEFILE 1 -#define FCNGETCOMMSTATE 2 -#define FCNSETCOMMSTATE 3 -#define FCNSETUPCOMM 4 -#define FCNGETCOMMTIMEOUTS 5 -#define FCNSETCOMMTIMEOUTS 6 -#define FCNCLOSEHANDLE 7 -#define FCNWRITEFILE 8 -#define FCNREADFILE 9 -#define FCNGETCOMMMODEMSTATUS 10 /* win_com:Status() */ -#define FCNPURGECOMM 11 -#define FCNCLEARCOMMERROR 12 /* win_com:QueueStatus() */ -#define ESCAPECOMMFUNCTION 13 -#define FCNGETCOMMPROPERTIES 14 -#define FCNMAX 14 +#define WIN_COM_FUN_CREATEFILE 1 +#define WIN_COM_FUN_GETCOMMSTATE 2 +#define WIN_COM_FUN_SETCOMMSTATE 3 +#define WIN_COM_FUN_SETUPCOMM 4 +#define WIN_COM_FUN_GETCOMMTIMEOUTS 5 +#define WIN_COM_FUN_SETCOMMTIMEOUTS 6 +#define WIN_COM_FUN_CLOSEHANDLE 7 +#define WIN_COM_FUN_WRITEFILE 8 +#define WIN_COM_FUN_READFILE 9 +#define WIN_COM_FUN_GETCOMMMODEMSTATUS 10 /* win_com:Status() */ +#define WIN_COM_FUN_PURGECOMM 11 +#define WIN_COM_FUN_CLEARCOMMERROR 12 /* win_com:QueueStatus() */ +#define WIN_COM_FUN_ESCAPECOMMFUNCTION 13 +#define WIN_COM_FUN_GETCOMMPROPERTIES 14 +#define WIN_COM_FUN_MAX 14 -#define WPDBGBASIC 0x01 -#define WPDBGFLOW 0x02 -#define WPDBGXTRAFLOW 0x04 -#define WPDBGOTHER 0x08 -#define WPDBGTIMEOUTS 0x10 -#define WPDBGQUEUE 0x20 -#define WPDBGALL 0x3F +#define WIN_COM_DBGBASIC 0x01 +#define WIN_COM_DBGFLOW 0x02 +#define WIN_COM_DBGXTRAFLOW 0x04 +#define WIN_COM_DBGOTHER 0x08 +#define WIN_COM_DBGTIMEOUTS 0x10 +#define WIN_COM_DBGQUEUE 0x20 +#define WIN_COM_DBGALL 0x3F diff --git a/harbour/contrib/hbwin/tests/testcom2.prg b/harbour/contrib/hbwin/tests/testcom2.prg index 295793a8e2..494728f47e 100644 --- a/harbour/contrib/hbwin/tests/testcom2.prg +++ b/harbour/contrib/hbwin/tests/testcom2.prg @@ -115,7 +115,7 @@ PROCEDURE Main( cPortName ) ELSE ? "RTSFlow( RTS_CONTROL_HANDSHAKE ) failed :", oWinPort:Error() ENDIF - ? oWinPort:DebugDCB(WPDBGFLOW) + ? oWinPort:DebugDCB( WIN_COM_DBGFLOW ) IF oWinPort:SetRTS( .F. ) ? "SetRTS( .F. ) succeeded (it shouldn't according to docs!)" ELSE @@ -127,7 +127,7 @@ PROCEDURE Main( cPortName ) ELSE ? "RTSFlow( RTS_CONTROL_DISABLE ) failed :", oWinPort:Error() ENDIF - ? oWinPort:DebugDCB( WPDBGFLOW ) + ? oWinPort:DebugDCB( WIN_COM_DBGFLOW ) IF oWinPort:SetRTS( .F. ) ? "SetRTS( .F. ) succeeded (it should)" ELSE @@ -164,7 +164,7 @@ PROCEDURE Main( cPortName ) ? "This is going to fail, so no device needed" Inkey( 0 ) - oWinPort := WinPort():Init( cPortName, CBR_9600, NOPARITY, 99, ONESTOPBIT ) + oWinPort := Win_Com():Init( cPortName, CBR_9600, NOPARITY, 99, ONESTOPBIT ) IF !oWinPort:Open ? "Open() failed :", oWinPort:Error() ELSE @@ -176,13 +176,13 @@ PROCEDURE Main( cPortName ) ? Inkey( 0 ) - oWinPort := WinPort():Init( cPortName, CBR_9600, NOPARITY, 8, ONESTOPBIT ) + oWinPort := Win_Com():Init( cPortName, CBR_9600, NOPARITY, 8, ONESTOPBIT ) IF ! oWinPort:Open ? "Open() failed :", oWinPort:Error() ELSE ? "Open succeeded" ? - ? oWinPort:DebugDCB( WPDBGFLOW ) + ? oWinPort:DebugDCB( WIN_COM_DBGFLOW ) ? "Printers will probably have CTS, DSR and DCD high, IF they are off they'll all be low" IF oWinPort:Status( @lCTS, @lDSR, @lRing, @lDCD ) ? "Status() succeeded : CTS ", lCTS, ", DSR ", lDSR, ", Ring ", lRing, ", DCD ", lDCD @@ -223,7 +223,7 @@ PROCEDURE Main( cPortName ) ? "XonXoffFlow( .T. ) failed :", oWinPort:Error() ENDIF ? - ? oWinPort:DebugDCB( WPDBGFLOW ) + ? oWinPort:DebugDCB( WIN_COM_DBGFLOW ) ? "If it's on then no Hold status should be on, IF off then probably CTS and DSR" IF oWinPort:QueueStatus( @lCTSHold, @lDSRHold, @lDCDHold, @lXoffHold, @lXoffSent, @nInQueue, @nOutQueue ) diff --git a/harbour/contrib/hbwin/tests/testole.prg b/harbour/contrib/hbwin/tests/testole.prg index bdc1c867f8..44f7997ec8 100644 --- a/harbour/contrib/hbwin/tests/testole.prg +++ b/harbour/contrib/hbwin/tests/testole.prg @@ -270,7 +270,7 @@ STATIC PROCEDURE Exm_OOCalc() STATIC PROCEDURE Exm_OOWriter() - LOCAL oServiceManager, oDesktop, oDoc, oText, oCursor, oTable, oRow, oCell, oCellCursor, oRows + LOCAL oServiceManager, oDesktop, oDoc, oText, oCursor, oTable, oRow, oCell, oRows IF ( oServiceManager := win_oleCreateObject( "com.sun.star.ServiceManager" ) ) != NIL oDesktop := oServiceManager:createInstance( "com.sun.star.frame.Desktop" ) diff --git a/harbour/contrib/hbwin/tests/testsim.prg b/harbour/contrib/hbwin/tests/testsim.prg index e336098a88..1d812d3f6b 100644 --- a/harbour/contrib/hbwin/tests/testsim.prg +++ b/harbour/contrib/hbwin/tests/testsim.prg @@ -10,7 +10,7 @@ * www - http://www.harbour-project.org */ -#include "sim.ch" +#include "hbsim.ch" PROCEDURE Main() diff --git a/harbour/contrib/hbwin/win_com.c b/harbour/contrib/hbwin/win_com.c index 47efa9cf18..cfb72d02e4 100644 --- a/harbour/contrib/hbwin/win_com.c +++ b/harbour/contrib/hbwin/win_com.c @@ -92,7 +92,7 @@ HB_FUNC( WIN_COMOPEN ) HB_TCHAR_CPTO( tszName, szName, sizeof( tszName ) - 1 ); s_PortData[ iPort ].hPort = INVALID_HANDLE_VALUE; - s_PortData[ iPort ].iFunction = FCNCREATEFILE; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_CREATEFILE; s_PortData[ iPort ].dwError = 0; if( ( hCommPort = CreateFile( tszName, @@ -143,7 +143,7 @@ HB_FUNC( WIN_COMOPEN ) /*NewDCB.EvtChar*/ /* function reinitializes all hardware and control settings, but it does not empty output or input queues */ - s_PortData[ iPort ].iFunction = FCNSETCOMMSTATE; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_SETCOMMSTATE; s_PortData[ iPort ].dwError = 0; if( ! SetCommState( hCommPort, &NewDCB ) ) { @@ -174,7 +174,7 @@ HB_FUNC( WIN_COMCLOSE ) s_PortData[ iPort ].hPort = INVALID_HANDLE_VALUE; - s_PortData[ iPort ].iFunction = FCNCLOSEHANDLE; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_CLOSEHANDLE; s_PortData[ iPort ].dwError = 0; hb_retl( CloseHandle( hCommPort ) != 0 ); @@ -195,7 +195,7 @@ HB_FUNC( WIN_COMWRITE ) DWORD dwNumberofBytesToWrite = ( DWORD ) hb_parclen( 2 ); DWORD dwNumberofBytesWritten; - s_PortData[ iPort ].iFunction = FCNWRITEFILE; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_WRITEFILE; s_PortData[ iPort ].dwError = 0; if( WriteFile( hCommPort, lpBuffer, dwNumberofBytesToWrite, &dwNumberofBytesWritten, NULL ) ) hb_retnl( dwNumberofBytesWritten ); @@ -221,7 +221,7 @@ HB_FUNC( WIN_COMREAD ) DWORD dwNumberOfBytesRead; lpBuffer = ( char * ) hb_xgrab( dwNumberOfBytesToRead + 1 ); - s_PortData[ iPort ].iFunction = FCNREADFILE; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_READFILE; s_PortData[ iPort ].dwError = 0; if( ReadFile( hCommPort, lpBuffer, dwNumberOfBytesToRead, &dwNumberOfBytesRead, NULL ) ) { @@ -253,7 +253,7 @@ HB_FUNC( WIN_COMRECV ) DWORD dwNumberOfBytesRead; lpBuffer = ( char * ) hb_xgrab( dwNumberOfBytesToRead + 1 ); - s_PortData[ iPort ].iFunction = FCNREADFILE; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_READFILE; s_PortData[ iPort ].dwError = 0; if( ReadFile( hCommPort, lpBuffer, dwNumberOfBytesToRead, &dwNumberOfBytesRead, NULL ) ) { @@ -281,7 +281,7 @@ HB_FUNC( WIN_COMSTATUS ) { DWORD dwModemStat = 0; - s_PortData[ iPort ].iFunction = FCNGETCOMMMODEMSTATUS; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_GETCOMMMODEMSTATUS; s_PortData[ iPort ].dwError = 0; if( GetCommModemStatus( hCommPort, &dwModemStat ) ) { @@ -318,7 +318,7 @@ HB_FUNC( WIN_COMPURGE ) DWORD dwFlags; dwFlags = ( hb_parl( 2 ) ? PURGE_RXCLEAR : 0 ) | ( hb_parl( 3 ) ? PURGE_TXCLEAR : 0 ); - s_PortData[ iPort ].iFunction = FCNPURGECOMM; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_PURGECOMM; s_PortData[ iPort ].dwError = 0; if( PurgeComm( hCommPort, dwFlags ) ) hb_retl( TRUE ); @@ -342,7 +342,7 @@ HB_FUNC( WIN_COMQUEUESTATUS ) DWORD dwErrors = 0; COMSTAT ComStat; - s_PortData[ iPort ].iFunction = FCNCLEARCOMMERROR; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_CLEARCOMMERROR; s_PortData[ iPort ].dwError = 0; if( ClearCommError( hCommPort, &dwErrors, &ComStat ) ) { @@ -387,7 +387,7 @@ HB_FUNC( WIN_COMSETRTS ) { DWORD dwFunc = hb_parl( 2 ) ? SETRTS : CLRRTS; - s_PortData[ iPort ].iFunction = ESCAPECOMMFUNCTION; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_ESCAPECOMMFUNCTION; s_PortData[ iPort ].dwError = 0; if( EscapeCommFunction( hCommPort, dwFunc ) ) hb_retl( TRUE ); @@ -413,7 +413,7 @@ HB_FUNC( WIN_COMSETDTR ) { DWORD dwFunc = hb_parl( 2 ) ? SETDTR : CLRDTR; - s_PortData[ iPort ].iFunction = ESCAPECOMMFUNCTION; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_ESCAPECOMMFUNCTION; s_PortData[ iPort ].dwError = 0; if( EscapeCommFunction( hCommPort, dwFunc ) ) hb_retl( TRUE ); @@ -437,7 +437,7 @@ HB_FUNC( WIN_COMRTSFLOW ) DCB CurDCB; int iRtsControl = hb_parni( 2 ); - s_PortData[ iPort ].iFunction = FCNGETCOMMSTATE; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_GETCOMMSTATE; s_PortData[ iPort ].dwError = 0; CurDCB.DCBlength = sizeof( DCB ); if( ! GetCommState( hCommPort, &CurDCB ) ) @@ -468,7 +468,7 @@ HB_FUNC( WIN_COMRTSFLOW ) return; } - s_PortData[ iPort ].iFunction = FCNSETCOMMSTATE; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_SETCOMMSTATE; s_PortData[ iPort ].dwError = 0; if( ! SetCommState( hCommPort, &CurDCB ) ) { @@ -492,7 +492,7 @@ HB_FUNC( WIN_COMDTRFLOW ) DCB CurDCB; int DtrControl = hb_parni( 2 ); - s_PortData[ iPort ].iFunction = FCNGETCOMMSTATE; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_GETCOMMSTATE; s_PortData[ iPort ].dwError = 0; CurDCB.DCBlength = sizeof( DCB ); if( ! GetCommState( hCommPort, &CurDCB ) ) @@ -523,7 +523,7 @@ HB_FUNC( WIN_COMDTRFLOW ) return; } - s_PortData[ iPort ].iFunction = FCNSETCOMMSTATE; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_SETCOMMSTATE; s_PortData[ iPort ].dwError = 0; if( ! SetCommState( hCommPort, &CurDCB ) ) { @@ -546,7 +546,7 @@ HB_FUNC( WIN_COMXONXOFFFLOW ) { DCB CurDCB; - s_PortData[ iPort ].iFunction = FCNGETCOMMSTATE; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_GETCOMMSTATE; s_PortData[ iPort ].dwError = 0; CurDCB.DCBlength = sizeof( DCB ); if( ! GetCommState( hCommPort, &CurDCB ) ) @@ -567,7 +567,7 @@ HB_FUNC( WIN_COMXONXOFFFLOW ) CurDCB.fOutX = 0; } - s_PortData[ iPort ].iFunction = FCNSETCOMMSTATE; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_SETCOMMSTATE; s_PortData[ iPort ].dwError = 0; if( ! SetCommState( hCommPort, &CurDCB ) ) { @@ -650,7 +650,7 @@ HB_FUNC( WIN_COMSETTIMEOUTS ) Timeouts.WriteTotalTimeoutMultiplier = HB_ISNUM( 5 ) ? ( DWORD ) hb_parnl( 5 ) : ( DWORD ) -1; Timeouts.WriteTotalTimeoutConstant = HB_ISNUM( 6 ) ? ( DWORD ) hb_parnl( 6 ) : ( DWORD ) -1; - s_PortData[ iPort ].iFunction = FCNGETCOMMSTATE; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_GETCOMMSTATE; s_PortData[ iPort ].dwError = 0; CurDCB.DCBlength = sizeof( DCB ); @@ -661,7 +661,7 @@ HB_FUNC( WIN_COMSETTIMEOUTS ) return; } - s_PortData[ iPort ].iFunction = FCNSETCOMMTIMEOUTS; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_SETCOMMTIMEOUTS; s_PortData[ iPort ].dwError = 0; if( ! hb_win_ComSetTimeouts( hCommPort, &Timeouts, CurDCB.BaudRate, CurDCB.Parity, CurDCB.ByteSize, CurDCB.StopBits ) ) { @@ -682,7 +682,7 @@ HB_FUNC( WIN_COMSETQUEUESIZE ) if( iPort >= 0 && iPort < ( int ) HB_SIZEOFARRAY( s_PortData ) && ( hCommPort = s_PortData[ iPort ].hPort ) != INVALID_HANDLE_VALUE && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) { - s_PortData[ iPort ].iFunction = FCNSETUPCOMM; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_SETUPCOMM; s_PortData[ iPort ].dwError = 0; if( ! SetupComm( hCommPort, hb_parni( 2 ), hb_parni( 3 ) ) ) { @@ -726,26 +726,26 @@ HB_FUNC( WIN_COMDEBUGDCB ) if( iPort >= 0 && iPort < ( int ) HB_SIZEOFARRAY( s_PortData ) && ( hCommPort = s_PortData[ iPort ].hPort ) != INVALID_HANDLE_VALUE ) { - int iDebugLevel = HB_ISNUM( 2 ) ? hb_parni( 2 ) : WPDBGBASIC; + int iDebugLevel = HB_ISNUM( 2 ) ? hb_parni( 2 ) : WIN_COM_DBGBASIC; DCB CurDCB; COMMTIMEOUTS CurCOMMTIMEOUTS; COMMPROP CurCOMMPROP; char szDebugString[ 1024 ] = ""; char buffer[ 80 ]; - s_PortData[ iPort ].iFunction = FCNGETCOMMSTATE; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_GETCOMMSTATE; s_PortData[ iPort ].dwError = 0; CurDCB.DCBlength = sizeof( DCB ); if( GetCommState( hCommPort, &CurDCB ) ) { - if( iDebugLevel & WPDBGBASIC ) + if( iDebugLevel & WIN_COM_DBGBASIC ) { hb_snprintf( buffer, sizeof( buffer ), "Baud : %lu\n", CurDCB.BaudRate ) ; hb_strncat( szDebugString, buffer, sizeof( szDebugString ) - 1 ); hb_snprintf( buffer, sizeof( buffer ), "ByteSize : %i\n" , CurDCB.ByteSize ) ; hb_strncat( szDebugString, buffer, sizeof( szDebugString ) - 1 ); hb_snprintf( buffer, sizeof( buffer ), "Parity : %i\n" , CurDCB.Parity ) ; hb_strncat( szDebugString, buffer, sizeof( szDebugString ) - 1 ); hb_snprintf( buffer, sizeof( buffer ), "StopBits : %i\n" , CurDCB.StopBits ) ; hb_strncat( szDebugString, buffer, sizeof( szDebugString ) - 1 ); } - if( iDebugLevel & WPDBGFLOW ) + if( iDebugLevel & WIN_COM_DBGFLOW ) { hb_strncat( szDebugString, "fRtsControl : ", sizeof( szDebugString ) - 1 ); hb_strncat( szDebugString, CurDCB.fRtsControl == RTS_CONTROL_DISABLE ? "RTS_CONTROL_DISABLE\n" : @@ -763,7 +763,7 @@ HB_FUNC( WIN_COMDEBUGDCB ) hb_strncat( szDebugString, "fOutxDsrFlow : ", sizeof( szDebugString ) - 1 ); hb_strncat( szDebugString, CurDCB.fOutxDsrFlow ? "true\n" : "false\n", sizeof( szDebugString ) - 1 ); } - if( iDebugLevel & WPDBGXTRAFLOW ) + if( iDebugLevel & WIN_COM_DBGXTRAFLOW ) { hb_strncat( szDebugString, "fDsrSensitivity : ", sizeof( szDebugString ) - 1 ); hb_strncat( szDebugString, CurDCB.fDsrSensitivity ? "true\n" : "false\n", sizeof( szDebugString ) - 1 ); @@ -774,7 +774,7 @@ HB_FUNC( WIN_COMDEBUGDCB ) hb_snprintf( buffer, sizeof( buffer ), "XonChar : 0x%i\n" , CurDCB.XonChar ) ; hb_strncat( szDebugString, buffer, sizeof( szDebugString ) - 1 ); hb_snprintf( buffer, sizeof( buffer ), "XoffChar : 0x%i\n", CurDCB.XoffChar ) ; hb_strncat( szDebugString, buffer, sizeof( szDebugString ) - 1 ); } - if( iDebugLevel & WPDBGOTHER ) + if( iDebugLevel & WIN_COM_DBGOTHER ) { hb_strncat( szDebugString, "fBinary : ", sizeof( szDebugString ) - 1 ); hb_strncat( szDebugString, CurDCB.fBinary ? "true\n" : "false\n", sizeof( szDebugString ) - 1 ); @@ -798,9 +798,9 @@ HB_FUNC( WIN_COMDEBUGDCB ) return; } - if( iDebugLevel & WPDBGTIMEOUTS ) + if( iDebugLevel & WIN_COM_DBGTIMEOUTS ) { - s_PortData[ iPort ].iFunction = FCNGETCOMMTIMEOUTS; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_GETCOMMTIMEOUTS; s_PortData[ iPort ].dwError = 0; if( GetCommTimeouts( hCommPort, &CurCOMMTIMEOUTS ) ) { @@ -818,9 +818,9 @@ HB_FUNC( WIN_COMDEBUGDCB ) } } - if( iDebugLevel & WPDBGQUEUE ) + if( iDebugLevel & WIN_COM_DBGQUEUE ) { - s_PortData[ iPort ].iFunction = FCNGETCOMMPROPERTIES; + s_PortData[ iPort ].iFunction = WIN_COM_FUN_GETCOMMPROPERTIES; s_PortData[ iPort ].dwError = 0; if( GetCommProperties( hCommPort, &CurCOMMPROP ) ) { diff --git a/harbour/contrib/hbxbp/tests/hbmk.hbm b/harbour/contrib/hbxbp/tests/hbmk.hbm index 9c95e1c8f8..49157a9645 100644 --- a/harbour/contrib/hbxbp/tests/hbmk.hbm +++ b/harbour/contrib/hbxbp/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbxbp.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/hbziparc/tests/hbmk.hbm b/harbour/contrib/hbziparc/tests/hbmk.hbm index 0c8da8270a..74bc077385 100644 --- a/harbour/contrib/hbziparc/tests/hbmk.hbm +++ b/harbour/contrib/hbziparc/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../hbziparc.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/rddado/tests/hbmk.hbm b/harbour/contrib/rddado/tests/hbmk.hbm index a8c918a41f..3cdb65dada 100644 --- a/harbour/contrib/rddado/tests/hbmk.hbm +++ b/harbour/contrib/rddado/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../rddado.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/rddads/tests/datad.prg b/harbour/contrib/rddads/tests/datad.prg index 8dc5d1208c..a1026f2fcc 100644 --- a/harbour/contrib/rddads/tests/datad.prg +++ b/harbour/contrib/rddads/tests/datad.prg @@ -14,8 +14,7 @@ FUNCTION MAIN local n local cErr, cStr local aStru := {{ "ID", "A", 1, 0}, {"Name", "C", 50, 0}, {"address", "C", 50, 0}, {"city", "C", 30, 0}, {"Age", "n", 3, 0}} - local hConnection1, hConnection2 - local lIsDict := .f. + local hConnection1 CLS @@ -50,11 +49,11 @@ FUNCTION MAIN DbCreate("Table2", aStru) //now create an index USE table1 new - INDEX ON id TAG codigo + INDEX ON FIELD->id TAG codigo USE USE table2 new - INDEX ON id TAG codigo + INDEX ON FIELD->id TAG codigo USE ENDIF diff --git a/harbour/contrib/rddads/tests/hbmk.hbm b/harbour/contrib/rddads/tests/hbmk.hbm index 2341c2f5f3..44aa611deb 100644 --- a/harbour/contrib/rddads/tests/hbmk.hbm +++ b/harbour/contrib/rddads/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../rddads.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/rddads/tests/testmg.prg b/harbour/contrib/rddads/tests/testmg.prg index cb27c62290..208bebbd63 100644 --- a/harbour/contrib/rddads/tests/testmg.prg +++ b/harbour/contrib/rddads/tests/testmg.prg @@ -60,6 +60,7 @@ REQUEST ADS function Main() local i + local aRay rddsetdefault( "ADS" ) SET SERVER LOCAL // REMOTE diff --git a/harbour/contrib/rddsql/tests/hbmk.hbm b/harbour/contrib/rddsql/tests/hbmk.hbm index efb0044a66..f849596447 100644 --- a/harbour/contrib/rddsql/tests/hbmk.hbm +++ b/harbour/contrib/rddsql/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../rddsql.hbc --w3 +-w3 -es2 diff --git a/harbour/contrib/xhb/tests/hbmk.hbm b/harbour/contrib/xhb/tests/hbmk.hbm index 61f6d428d8..53305fd67c 100644 --- a/harbour/contrib/xhb/tests/hbmk.hbm +++ b/harbour/contrib/xhb/tests/hbmk.hbm @@ -4,4 +4,4 @@ ../xhb.hbc --w3 +-w3 -es2