fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-06-20 09:59 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* 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]
This commit is contained in:
Viktor Szakats
2008-06-20 08:03:49 +00:00
parent 1de1cfa507
commit 17e5e2df1c
5 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -8,6 +8,18 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
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

2
harbour/contrib/examples/hscript/bld_b32.bat
View File

@@ -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

2
harbour/contrib/examples/hscript/hscript.prg
View File

@@ -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

17
harbour/contrib/examples/pe/editorhi.prg
View File

@@ -1,15 +1,16 @@
/*
* $Id$
*/
//#include "expand.ch"
//#include "windows.ch"
//#include "print.ch"
//#include "helpsys.ch"
#include <inkey.ch>
#include <setcurs.ch>
#include <fileio.ch>
#include <box.ch>
#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 )

2
harbour/contrib/hbmisc/spd.c
View File

@@ -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