From 17e5e2df1c288e35b77bfcc734e2b01676158c01 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 20 Jun 2008 08:03:49 +0000 Subject: [PATCH] 2008-06-20 09:59 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbmisc/spd.c ! Fix for OS/2 warning. * contrib/examples/pe/editorhi.prg * contrib/examples/hscript/hscript.prg * Cleanups. * contrib/examples/hscript/bld_b32.bat ! Fixed to have hbzlib.lib [TOMERGE RC1] --- harbour/ChangeLog | 12 ++++++++++++ harbour/contrib/examples/hscript/bld_b32.bat | 2 +- harbour/contrib/examples/hscript/hscript.prg | 2 +- harbour/contrib/examples/pe/editorhi.prg | 17 +++++++++-------- harbour/contrib/hbmisc/spd.c | 2 +- 5 files changed, 24 insertions(+), 11 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 137982ef89..e8db0c47a1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,18 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-20 09:59 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbmisc/spd.c + ! Fix for OS/2 warning. + + * contrib/examples/pe/editorhi.prg + * contrib/examples/hscript/hscript.prg + * Cleanups. + + * contrib/examples/hscript/bld_b32.bat + ! Fixed to have hbzlib.lib + [TOMERGE RC1] + 2008-06-19 18:26 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/examples/guestbk/guestbk.prg * contrib/examples/guestbk/inifiles.prg diff --git a/harbour/contrib/examples/hscript/bld_b32.bat b/harbour/contrib/examples/hscript/bld_b32.bat index 403e7dfac7..36a2442e2b 100644 --- a/harbour/contrib/examples/hscript/bld_b32.bat +++ b/harbour/contrib/examples/hscript/bld_b32.bat @@ -6,7 +6,7 @@ rem rem NOTE: This sample program needs hbnf.lib from contrib/hbnf ..\..\..\bin\harbour hscript /n /i..\..\..\include -bcc32 -O2 -I..\..\..\include -L..\..\..\lib -ehscript.exe hscript.c hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbcpage.lib hbsix.lib hbcommon.lib hbpcre.lib hbhsx.lib hbnf.lib +bcc32 -O2 -I..\..\..\include -L..\..\..\lib -ehscript.exe hscript.c hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbcpage.lib hbsix.lib hbcommon.lib hbpcre.lib hbhsx.lib hbnf.lib hbzlib.lib del hscript.c if not exist hscript.exe goto :EXIT diff --git a/harbour/contrib/examples/hscript/hscript.prg b/harbour/contrib/examples/hscript/hscript.prg index 30db55ef50..99986551b6 100644 --- a/harbour/contrib/examples/hscript/hscript.prg +++ b/harbour/contrib/examples/hscript/hscript.prg @@ -183,7 +183,7 @@ FUNCTION Main( cScript ) FClose( hFile ) // Creates the temporary HRB, erases the PRG - __Run( cHarbourDir + "harbour.exe " + cFile + " /q /n /gh /o" + Left( cHarbourDir, Len( cHarbourDir ) - 1 ) + iif( !Empty( Left( cHarbourDir, Len( cHarbourDir ) - 1 ) ), "\", "" ) ) + hb_Run( cHarbourDir + "harbour.exe " + cFile + " /q /n /gh /o" + Left( cHarbourDir, Len( cHarbourDir ) - 1 ) + iif( !Empty( Left( cHarbourDir, Len( cHarbourDir ) - 1 ) ), "\", "" ) ) FErase( cFile ) // Runs using Tugboat diff --git a/harbour/contrib/examples/pe/editorhi.prg b/harbour/contrib/examples/pe/editorhi.prg index 6b5899f9b9..2d0a785570 100644 --- a/harbour/contrib/examples/pe/editorhi.prg +++ b/harbour/contrib/examples/pe/editorhi.prg @@ -1,15 +1,16 @@ /* * $Id$ */ + //#include "expand.ch" //#include "windows.ch" //#include "print.ch" //#include "helpsys.ch" -#include -#include -#include -#include +#include "inkey.ch" +#include "setcurs.ch" +#include "fileio.ch" +#include "box.ch" #define EXPORT @@ -366,8 +367,8 @@ LOCAL lSaveAllowed, lSaved:=.F. //HELPSAVE( IIF(nHelp==NIL, H_EDITOR, nHelp ) ) oBox := SAVEBOX( oEdit[E_TOP], oEdit[E_LEFT], ; - oEdit[E_BOTTOM], oEdit[E_RIGHT], ; - oEdit[E_COLOR], oEdit[E_FRAME], oEdit[E_TITLE], .F. ) + oEdit[E_BOTTOM], oEdit[E_RIGHT], ; + oEdit[E_COLOR], oEdit[E_FRAME], oEdit[E_TITLE], .F. ) lInsert := SET( _SET_INSERT ) // SayInsert() @@ -598,7 +599,7 @@ LOCAL nHandle, cFile, cNew cFile := EditorCargo(oEdit) IF( EMPTY(cFile) ) - cFile := "TESTFILE.TXT" //GetFileName( 10, 10 ) + cFile := "testfile.txt" //GetFileName( 10, 10 ) ENDIF IF( EMPTY(cFile) ) @@ -607,7 +608,7 @@ LOCAL nHandle, cFile, cNew /* WorkStart( 75 ) IF( FILE(cFile) ) - cNew := FileExtension( cFile, "BAK" ) + cNew := FileExtension( cFile, "bak" ) DELETEFILE( cNew ) nHandle := RENAMEFILE( cFile, cNew ) IF( nHandle < 0 ) diff --git a/harbour/contrib/hbmisc/spd.c b/harbour/contrib/hbmisc/spd.c index 24e82dce31..2b99acd82d 100644 --- a/harbour/contrib/hbmisc/spd.c +++ b/harbour/contrib/hbmisc/spd.c @@ -170,7 +170,7 @@ static ULONG SCItm( char *cBuffer, ULONG ulMaxBuf, char *cParFrm, int iCOut, int * * Accepts conversion inside if variable is passed by reference. * Local xDate := Date(); Sql_sprintf('%s', @xDate) => xDate == '2008-05-19' -/******************************************************************************/ +*******************************************************************************/ #define DK_INCRES 1024 #define DK_INCBUF 512