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

2008-08-31 16:26 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* utils/hbdoc/bld_vc.bat
   * utils/hbmake/bld_vc.bat
     % Minor cleanup.

   * contrib/hbwhat32/whticon.c
   * contrib/hbwhat32/whtcret.c
   * contrib/hbwhat32/whthead.c
   * contrib/hbwhat32/whtmous.c
   * contrib/hbwhat32/whtmeta.c
   * contrib/hbwhat32/whtrgn.c
   * contrib/hbwhat32/whttbar.c
   * contrib/hbwhat32/whtrect.c
   * contrib/hbwhat32/whtbrsh.c
   * contrib/hbwhat32/whtgdi.c
   * contrib/hbwhat32/whtview.c
   * contrib/hbwhat32/whtlv.c
   * contrib/hbwhat32/whtwnd.c
   * contrib/hbwhat32/whtcomm.c
   * contrib/hbwhat32/whtprn.c
   * contrib/hbwhat32/whttab.c
   * contrib/hbwhat32/whtfont.c
   * contrib/hbwhat32/whtbmp.c
   * contrib/hbwhat32/whtpen.c
   * contrib/hbwhat32/whtkbrd.c
   * contrib/hbwhat32/whttext.c
   * contrib/hbwhat32/whtdc.c
   * contrib/hbwhat32/whtdraw.c
   * contrib/hbnf/fttext.c
   * contrib/hbnf/peek.c
   * contrib/hbnf/ontick.c
   * contrib/hbnf/origin.c
   * contrib/hbnf/mouse.c
   * contrib/hbnf/poke.c
     ! Fixed to use Harbour API instead of legacy Clipper API.

   + contrib/hbbtree/tests/bld_b32.bat
   + contrib/hbbtree/tests/bld_vc.bat
   + contrib/hbbtree/tests/bld_djgp.bat
   - contrib/hbbtree/tests/mktest.bat
   * contrib/hbbtree/tests/ctest.c
     + Added make files.
     * Minor cleanups.
     ; One of the tests fail.

   * contrib/hbbtree/tbtree.prg
     ! Fixed crash due to scope problem in class declaration.

   * contrib/examples/pe/editorlo.c
     ! #include <x> -> #include "x" for Harbour headers.
This commit is contained in:
Viktor Szakats
2008-08-31 14:29:27 +00:00
parent edc7abc792
commit 0e8db70888
38 changed files with 612 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
harbour/ChangeLog
View File

@@ -8,6 +8,57 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-08-31 16:26 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbdoc/bld_vc.bat
* utils/hbmake/bld_vc.bat
% Minor cleanup.
* contrib/hbwhat32/whticon.c
* contrib/hbwhat32/whtcret.c
* contrib/hbwhat32/whthead.c
* contrib/hbwhat32/whtmous.c
* contrib/hbwhat32/whtmeta.c
* contrib/hbwhat32/whtrgn.c
* contrib/hbwhat32/whttbar.c
* contrib/hbwhat32/whtrect.c
* contrib/hbwhat32/whtbrsh.c
* contrib/hbwhat32/whtgdi.c
* contrib/hbwhat32/whtview.c
* contrib/hbwhat32/whtlv.c
* contrib/hbwhat32/whtwnd.c
* contrib/hbwhat32/whtcomm.c
* contrib/hbwhat32/whtprn.c
* contrib/hbwhat32/whttab.c
* contrib/hbwhat32/whtfont.c
* contrib/hbwhat32/whtbmp.c
* contrib/hbwhat32/whtpen.c
* contrib/hbwhat32/whtkbrd.c
* contrib/hbwhat32/whttext.c
* contrib/hbwhat32/whtdc.c
* contrib/hbwhat32/whtdraw.c
* contrib/hbnf/fttext.c
* contrib/hbnf/peek.c
* contrib/hbnf/ontick.c
* contrib/hbnf/origin.c
* contrib/hbnf/mouse.c
* contrib/hbnf/poke.c
! Fixed to use Harbour API instead of legacy Clipper API.
+ contrib/hbbtree/tests/bld_b32.bat
+ contrib/hbbtree/tests/bld_vc.bat
+ contrib/hbbtree/tests/bld_djgp.bat
- contrib/hbbtree/tests/mktest.bat
* contrib/hbbtree/tests/ctest.c
+ Added make files.
* Minor cleanups.
; One of the tests fail.
* contrib/hbbtree/tbtree.prg
! Fixed crash due to scope problem in class declaration.
* contrib/examples/pe/editorlo.c
! #include <x> -> #include "x" for Harbour headers.
2008-08-31 10:53 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbole/oleauto.prg
* contrib/hbw32/w32_tole.prg

11
harbour/contrib/examples/pe/editorlo.c
View File

@@ -1,6 +1,7 @@
/*
* $Id$
*/
#include <stdio.h>
#include <io.h>
#include <fcntl.h>
@@ -15,11 +16,11 @@
#define mc51
#ifdef mc51
#include <extend.api>
#include <fm.api>
#include <gt.api>
#include <filesys.api>
#include <vm.api>
#include "extend.api"
#include "fm.api"
#include "gt.api"
#include "filesys.api"
#include "vm.api"
#else
#include "rvideo.h"
#include <dos.h>

2
harbour/contrib/hbbtree/tbtree.prg
View File

@@ -41,10 +41,10 @@ CLASS TBTree STATIC
HIDDEN:
DATA nHandle /* hb_btree handle */
METHOD New( cFileName, nPageSize, nKeySize, nFlags, nBuffers )
METHOD Open( cFileName, nFlags, nBuffers )
EXPORTED:
METHOD New( cFileName, nPageSize, nKeySize, nFlags, nBuffers )
METHOD Close() INLINE hb_BTreeClose( ::nHandle )
METHOD Insert( cKey, lData ) INLINE hb_BTreeInsert( ::nHandle, cKey, lData )
METHOD Delete( cKey, lData ) INLINE hb_BTreeDelete( ::nHandle, cKey, lData )

26
harbour/contrib/hbbtree/tests/bld_b32.bat Normal file
View File

@@ -0,0 +1,26 @@
@echo off
rem
rem $Id$
rem
..\..\..\bin\harbour /w3 /q /n /km /i..\..\..\include test ttest
echo -O2 -I..\..\..\include -L..\..\..\lib > build.tmp
echo test.c >> build.tmp
echo ttest.c >> build.tmp
echo ctest.c >> build.tmp
echo hbvm.lib >> build.tmp
echo hbrtl.lib >> build.tmp
echo gtwin.lib >> build.tmp
echo hbnulrdd.lib >> build.tmp
echo hbmacro.lib >> build.tmp
echo hbcommon.lib >> build.tmp
echo hbbtree.lib >> build.tmp
echo hbct.lib >> build.tmp
bcc32 @build.tmp
del build.tmp
del *.obj
del test.c ttest.c

0
harbour/contrib/hbbtree/tests/mktest.bat → harbour/contrib/hbbtree/tests/bld_djgp.bat
View File

11
harbour/contrib/hbbtree/tests/bld_vc.bat Normal file
View File

@@ -0,0 +1,11 @@
@echo off
rem
rem $Id$
rem
..\..\..\bin\harbour /w3 /q /n /km /i..\..\..\include test ttest
cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\..\include test.c ttest.c ctest.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib hbct.lib hbbtree.lib
del *.obj
del test.c ttest.c

393
harbour/contrib/hbbtree/tests/ctest.c
View File

@@ -2,209 +2,6 @@
* $Id$
*/
#include "hbdefs.h"
#include "hbapi.h"
#include "extend.api"
#include "item.api"
#include "hb_btree.api"
static void insertdata( struct hb_BTree * pBTree );
static void display( const BYTE *cKey, LONG lData, BOOL NewLine );
HB_FUNC( CTEST )
{
struct hb_BTree * pBTree;
display( "Harbour API test", 0, TRUE );
pBTree = hb_BTreeNew( "test_3.out", 2048, 90, HB_BTREE_UNIQUE, 0 );
if ( pBTree != NULL )
{
/*
a := hb_BTreeInfo( pBTree );
display( "File", a[ hb_BTreeINFO_FILENAME ], FALSE );
display( "Page", a[ hb_BTreeINFO_PAGESIZE ], FALSE );
display( "Key ", a[ hb_BTreeINFO_KEYSIZE ], FALSE );
display( "Max ", a[ hb_BTreeINFO_MAXKEYS ], FALSE );
display( "Min ", a[ hb_BTreeINFO_MINKEYS ], FALSE );
display( "Flag", a[ hb_BTreeINFO_FLAGS ], FALSE );
display( "Keys", a[ hb_BTreeINFO_KEYCOUNT ], TRUE );
*/
insertdata( pBTree );
/*
display( "Keys", hb_BTreeInfo( pBTree, hb_BTreeINFO_KEYCOUNT ), TRUE );
*/
display( "Forward traversal", 0, TRUE );
hb_BTreeGoTop( pBTree );
while ( TRUE )
{
display( hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
if ( 1 != hb_BTreeSkip( pBTree, 1 ) )
{
break;
}
}
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Reverse traversal", 0, TRUE );
hb_BTreeGoBottom( pBTree );
while ( TRUE )
{
display( hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
if ( -1 != hb_BTreeSkip( pBTree, -1 ) )
{
break;
}
}
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Test SEEK", 0, TRUE );
display( hb_BTreeSeek( pBTree, "cdntyzrf", 36, FALSE ) == 1 ? ".T." : ".F.", 0, TRUE );
display( hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
hb_BTreeSkip( pBTree, 1 );
display( hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), FALSE );
display( " dmfmivqb ?", 0, TRUE );
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Test soft SEEK of a short key", 0, TRUE );
display( hb_BTreeSeek( pBTree, "cd", 0, TRUE ) == 1 ? ".T." : ".F.", 0, TRUE );
display( hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
hb_BTreeSkip( pBTree, 1 );
display( hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), FALSE );
display( " dmfmivqb ?", 0, TRUE );
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Test soft SEEK of an existing key", 0, TRUE );
display( hb_BTreeSeek( pBTree, "cdntyzrf", 0, TRUE ) == 1 ? ".T." : ".F.", 0, TRUE );
display( hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
hb_BTreeSkip( pBTree, 1 );
display( hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), FALSE );
display( " dmfmivqb ?", 0, TRUE );
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Test soft SEEK of a missing key, that should force EOF", 0, TRUE );
display( hb_BTreeSeek( pBTree, "zzzzzz", 0, FALSE ) == 1 ? ".T." : ".F.", 0, TRUE );
display( hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
hb_BTreeSkip( pBTree, 1 );
display( hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), FALSE );
display( " dmfmivqb ?", 0, TRUE );
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
hb_BTreeClose( pBTree );
}
else
{
display( "error / failure", 0, TRUE );
}
}
static void display( const BYTE *cKey, LONG lData, BOOL NewLine )
{
int n;
BYTE buffer[ 80 ];
if ( *cKey )
{
n = sprintf( buffer, "%s %ld", cKey, lData );
}
else
{
n = sprintf( buffer, "%ld", lData );
}
hb_conOutStd( buffer, n );
if ( NewLine )
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
}
static void insertdata( struct hb_BTree * pBTree )
{
PHB_ITEM data = hb_itemNew( NULL );
hb_BTreeInsert( pBTree, "fuweqgsz", hb_itemPutNL( data, 1 ) );
hb_BTreeInsert( pBTree, "sjruexrd", hb_itemPutNL( data, 2 ) );
hb_BTreeInsert( pBTree, "fvveitnz", hb_itemPutNL( data, 3 ) );
hb_BTreeInsert( pBTree, "aqgksjxe", hb_itemPutNL( data, 4 ) );
hb_BTreeInsert( pBTree, "oonrehvj", hb_itemPutNL( data, 5 ) );
hb_BTreeInsert( pBTree, "gvowjwtr", hb_itemPutNL( data, 6 ) );
hb_BTreeInsert( pBTree, "xxidwtvn", hb_itemPutNL( data, 7 ) );
hb_BTreeInsert( pBTree, "rwjbxesd", hb_itemPutNL( data, 8 ) );
hb_BTreeInsert( pBTree, "yaznsaek", hb_itemPutNL( data, 9 ) );
hb_BTreeInsert( pBTree, "wbdhfkfy", hb_itemPutNL( data, 10 ) );
hb_BTreeInsert( pBTree, "lryaezia", hb_itemPutNL( data, 11 ) );
hb_BTreeInsert( pBTree, "tspmnrvk", hb_itemPutNL( data, 12 ) );
hb_BTreeInsert( pBTree, "hpxryhdj", hb_itemPutNL( data, 13 ) );
hb_BTreeInsert( pBTree, "sztcqaby", hb_itemPutNL( data, 14 ) );
hb_BTreeInsert( pBTree, "fcyzsqja", hb_itemPutNL( data, 15 ) );
hb_BTreeInsert( pBTree, "uccxumvg", hb_itemPutNL( data, 16 ) );
hb_BTreeInsert( pBTree, "amwuoout", hb_itemPutNL( data, 17 ) );
hb_BTreeInsert( pBTree, "yaytseln", hb_itemPutNL( data, 18 ) );
hb_BTreeInsert( pBTree, "sfiiozej", hb_itemPutNL( data, 19 ) );
hb_BTreeInsert( pBTree, "xuvsoljy", hb_itemPutNL( data, 20 ) );
hb_BTreeInsert( pBTree, "qmqjbedm", hb_itemPutNL( data, 21 ) );
hb_BTreeInsert( pBTree, "cctzzrkz", hb_itemPutNL( data, 22 ) );
hb_BTreeInsert( pBTree, "ikytgdon", hb_itemPutNL( data, 23 ) );
hb_BTreeInsert( pBTree, "pksobcwu", hb_itemPutNL( data, 24 ) );
hb_BTreeInsert( pBTree, "vmurindj", hb_itemPutNL( data, 25 ) );
hb_BTreeInsert( pBTree, "elvybqwg", hb_itemPutNL( data, 26 ) );
hb_BTreeInsert( pBTree, "ixchaztx", hb_itemPutNL( data, 27 ) );
hb_BTreeInsert( pBTree, "nzpztlhd", hb_itemPutNL( data, 28 ) );
hb_BTreeInsert( pBTree, "aucrchiw", hb_itemPutNL( data, 29 ) );
hb_BTreeInsert( pBTree, "munrytse", hb_itemPutNL( data, 30 ) );
hb_BTreeInsert( pBTree, "kqkhcmls", hb_itemPutNL( data, 31 ) );
hb_BTreeInsert( pBTree, "abqhurbi", hb_itemPutNL( data, 32 ) );
hb_BTreeInsert( pBTree, "ymrldckr", hb_itemPutNL( data, 33 ) );
hb_BTreeInsert( pBTree, "rhsmfflc", hb_itemPutNL( data, 34 ) );
hb_BTreeInsert( pBTree, "apyfkvee", hb_itemPutNL( data, 35 ) );
hb_BTreeInsert( pBTree, "cdntyzrf", hb_itemPutNL( data, 36 ) );
hb_BTreeInsert( pBTree, "iacblqrh", hb_itemPutNL( data, 37 ) );
hb_BTreeInsert( pBTree, "xvewqana", hb_itemPutNL( data, 38 ) );
hb_BTreeInsert( pBTree, "xmybqytj", hb_itemPutNL( data, 39 ) );
hb_BTreeInsert( pBTree, "dnowympf", hb_itemPutNL( data, 40 ) );
hb_BTreeInsert( pBTree, "smloihft", hb_itemPutNL( data, 41 ) );
hb_BTreeInsert( pBTree, "zumppmis", hb_itemPutNL( data, 42 ) );
hb_BTreeInsert( pBTree, "jirucnxu", hb_itemPutNL( data, 43 ) );
hb_BTreeInsert( pBTree, "ecdzikcv", hb_itemPutNL( data, 44 ) );
hb_BTreeInsert( pBTree, "slbwvnpg", hb_itemPutNL( data, 45 ) );
hb_BTreeInsert( pBTree, "yaftlkmz", hb_itemPutNL( data, 46 ) );
hb_BTreeInsert( pBTree, "blcepksd", hb_itemPutNL( data, 47 ) );
hb_BTreeInsert( pBTree, "xufowlpl", hb_itemPutNL( data, 48 ) );
hb_BTreeInsert( pBTree, "xegtjtqc", hb_itemPutNL( data, 49 ) );
hb_BTreeInsert( pBTree, "yplcqumq", hb_itemPutNL( data, 50 ) );
hb_BTreeInsert( pBTree, "vdoycauz", hb_itemPutNL( data, 51 ) );
hb_BTreeInsert( pBTree, "uhqkjuph", hb_itemPutNL( data, 52 ) );
hb_BTreeInsert( pBTree, "prllaeyi", hb_itemPutNL( data, 53 ) );
hb_BTreeInsert( pBTree, "ybzgmwzm", hb_itemPutNL( data, 54 ) );
hb_BTreeInsert( pBTree, "kkvyllnp", hb_itemPutNL( data, 55 ) );
hb_BTreeInsert( pBTree, "nberwsrb", hb_itemPutNL( data, 56 ) );
hb_BTreeInsert( pBTree, "wgetahua", hb_itemPutNL( data, 57 ) );
hb_BTreeInsert( pBTree, "yxcyehcv", hb_itemPutNL( data, 58 ) );
hb_BTreeInsert( pBTree, "oacormks", hb_itemPutNL( data, 59 ) );
hb_BTreeInsert( pBTree, "mcadkdxo", hb_itemPutNL( data, 60 ) );
hb_BTreeInsert( pBTree, "ycsalwqw", hb_itemPutNL( data, 61 ) );
hb_BTreeInsert( pBTree, "qmpysvjl", hb_itemPutNL( data, 62 ) );
hb_BTreeInsert( pBTree, "iqikamew", hb_itemPutNL( data, 63 ) );
hb_BTreeInsert( pBTree, "iaparrva", hb_itemPutNL( data, 64 ) );
hb_BTreeInsert( pBTree, "casbvtay", hb_itemPutNL( data, 65 ) );
hb_BTreeInsert( pBTree, "blaksexr", hb_itemPutNL( data, 66 ) );
hb_BTreeInsert( pBTree, "tbosrbql", hb_itemPutNL( data, 67 ) );
hb_BTreeInsert( pBTree, "ifkywsyt", hb_itemPutNL( data, 68 ) );
hb_BTreeInsert( pBTree, "gvklwevy", hb_itemPutNL( data, 69 ) );
hb_BTreeInsert( pBTree, "krpmpbud", hb_itemPutNL( data, 70 ) );
hb_BTreeInsert( pBTree, "rdvlwbwm", hb_itemPutNL( data, 71 ) );
hb_BTreeInsert( pBTree, "apnvdkww", hb_itemPutNL( data, 72 ) );
hb_BTreeInsert( pBTree, "euqdocvm", hb_itemPutNL( data, 73 ) );
hb_BTreeInsert( pBTree, "ksmkjcwp", hb_itemPutNL( data, 74 ) );
hb_BTreeInsert( pBTree, "bztgclzc", hb_itemPutNL( data, 75 ) );
hb_BTreeInsert( pBTree, "awkdnuxa", hb_itemPutNL( data, 76 ) );
hb_BTreeInsert( pBTree, "abavnpod", hb_itemPutNL( data, 77 ) );
hb_BTreeInsert( pBTree, "dvwvhjmh", hb_itemPutNL( data, 78 ) );
hb_BTreeInsert( pBTree, "dmfmivqb", hb_itemPutNL( data, 79 ) );
hb_BTreeInsert( pBTree, "ewsxanon", hb_itemPutNL( data, 80 ) );
hb_itemRelease( data );
}
/*
* Harbour Project source code:
* hb_BTree api test
@@ -235,3 +32,193 @@ static void insertdata( struct hb_BTree * pBTree )
* their web site at http://www.gnu.org/).
*
*/
#include "hbapi.h"
#include "hbapiitm.h"
#include "hb_btree.api"
static void display( const char *cKey, LONG lData, BOOL NewLine )
{
int n;
char buffer[ 80 ];
if( *cKey )
n = sprintf( buffer, "%s %ld", cKey, lData );
else
n = sprintf( buffer, "%ld", lData );
hb_conOutStd( buffer, n );
if( NewLine )
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
}
static void insertdata( struct hb_BTree * pBTree )
{
PHB_ITEM data = hb_itemNew( NULL );
hb_BTreeInsert( pBTree, ( BYTE * ) "fuweqgsz", hb_itemPutNL( data, 1 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "sjruexrd", hb_itemPutNL( data, 2 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "fvveitnz", hb_itemPutNL( data, 3 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "aqgksjxe", hb_itemPutNL( data, 4 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "oonrehvj", hb_itemPutNL( data, 5 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "gvowjwtr", hb_itemPutNL( data, 6 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "xxidwtvn", hb_itemPutNL( data, 7 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "rwjbxesd", hb_itemPutNL( data, 8 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "yaznsaek", hb_itemPutNL( data, 9 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "wbdhfkfy", hb_itemPutNL( data, 10 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "lryaezia", hb_itemPutNL( data, 11 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "tspmnrvk", hb_itemPutNL( data, 12 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "hpxryhdj", hb_itemPutNL( data, 13 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "sztcqaby", hb_itemPutNL( data, 14 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "fcyzsqja", hb_itemPutNL( data, 15 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "uccxumvg", hb_itemPutNL( data, 16 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "amwuoout", hb_itemPutNL( data, 17 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "yaytseln", hb_itemPutNL( data, 18 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "sfiiozej", hb_itemPutNL( data, 19 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "xuvsoljy", hb_itemPutNL( data, 20 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "qmqjbedm", hb_itemPutNL( data, 21 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "cctzzrkz", hb_itemPutNL( data, 22 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "ikytgdon", hb_itemPutNL( data, 23 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "pksobcwu", hb_itemPutNL( data, 24 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "vmurindj", hb_itemPutNL( data, 25 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "elvybqwg", hb_itemPutNL( data, 26 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "ixchaztx", hb_itemPutNL( data, 27 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "nzpztlhd", hb_itemPutNL( data, 28 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "aucrchiw", hb_itemPutNL( data, 29 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "munrytse", hb_itemPutNL( data, 30 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "kqkhcmls", hb_itemPutNL( data, 31 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "abqhurbi", hb_itemPutNL( data, 32 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "ymrldckr", hb_itemPutNL( data, 33 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "rhsmfflc", hb_itemPutNL( data, 34 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "apyfkvee", hb_itemPutNL( data, 35 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "cdntyzrf", hb_itemPutNL( data, 36 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "iacblqrh", hb_itemPutNL( data, 37 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "xvewqana", hb_itemPutNL( data, 38 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "xmybqytj", hb_itemPutNL( data, 39 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "dnowympf", hb_itemPutNL( data, 40 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "smloihft", hb_itemPutNL( data, 41 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "zumppmis", hb_itemPutNL( data, 42 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "jirucnxu", hb_itemPutNL( data, 43 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "ecdzikcv", hb_itemPutNL( data, 44 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "slbwvnpg", hb_itemPutNL( data, 45 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "yaftlkmz", hb_itemPutNL( data, 46 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "blcepksd", hb_itemPutNL( data, 47 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "xufowlpl", hb_itemPutNL( data, 48 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "xegtjtqc", hb_itemPutNL( data, 49 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "yplcqumq", hb_itemPutNL( data, 50 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "vdoycauz", hb_itemPutNL( data, 51 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "uhqkjuph", hb_itemPutNL( data, 52 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "prllaeyi", hb_itemPutNL( data, 53 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "ybzgmwzm", hb_itemPutNL( data, 54 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "kkvyllnp", hb_itemPutNL( data, 55 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "nberwsrb", hb_itemPutNL( data, 56 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "wgetahua", hb_itemPutNL( data, 57 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "yxcyehcv", hb_itemPutNL( data, 58 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "oacormks", hb_itemPutNL( data, 59 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "mcadkdxo", hb_itemPutNL( data, 60 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "ycsalwqw", hb_itemPutNL( data, 61 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "qmpysvjl", hb_itemPutNL( data, 62 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "iqikamew", hb_itemPutNL( data, 63 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "iaparrva", hb_itemPutNL( data, 64 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "casbvtay", hb_itemPutNL( data, 65 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "blaksexr", hb_itemPutNL( data, 66 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "tbosrbql", hb_itemPutNL( data, 67 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "ifkywsyt", hb_itemPutNL( data, 68 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "gvklwevy", hb_itemPutNL( data, 69 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "krpmpbud", hb_itemPutNL( data, 70 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "rdvlwbwm", hb_itemPutNL( data, 71 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "apnvdkww", hb_itemPutNL( data, 72 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "euqdocvm", hb_itemPutNL( data, 73 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "ksmkjcwp", hb_itemPutNL( data, 74 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "bztgclzc", hb_itemPutNL( data, 75 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "awkdnuxa", hb_itemPutNL( data, 76 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "abavnpod", hb_itemPutNL( data, 77 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "dvwvhjmh", hb_itemPutNL( data, 78 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "dmfmivqb", hb_itemPutNL( data, 79 ) );
hb_BTreeInsert( pBTree, ( BYTE * ) "ewsxanon", hb_itemPutNL( data, 80 ) );
hb_itemRelease( data );
}
HB_FUNC( CTEST )
{
struct hb_BTree * pBTree;
display( "Harbour API test", 0, TRUE );
pBTree = hb_BTreeNew( ( BYTE * ) "test_3.out", 2048, 90, HB_BTREE_UNIQUE, 0 );
if ( pBTree != NULL )
{
/*
a := hb_BTreeInfo( pBTree );
display( "File", a[ hb_BTreeINFO_FILENAME ], FALSE );
display( "Page", a[ hb_BTreeINFO_PAGESIZE ], FALSE );
display( "Key ", a[ hb_BTreeINFO_KEYSIZE ], FALSE );
display( "Max ", a[ hb_BTreeINFO_MAXKEYS ], FALSE );
display( "Min ", a[ hb_BTreeINFO_MINKEYS ], FALSE );
display( "Flag", a[ hb_BTreeINFO_FLAGS ], FALSE );
display( "Keys", a[ hb_BTreeINFO_KEYCOUNT ], TRUE );
*/
insertdata( pBTree );
/*
display( "Keys", hb_BTreeInfo( pBTree, hb_BTreeINFO_KEYCOUNT ), TRUE );
*/
display( "Forward traversal", 0, TRUE );
hb_BTreeGoTop( pBTree );
while ( TRUE )
{
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
if ( 1 != hb_BTreeSkip( pBTree, 1 ) )
break;
}
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Reverse traversal", 0, TRUE );
hb_BTreeGoBottom( pBTree );
while ( TRUE )
{
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
if ( -1 != hb_BTreeSkip( pBTree, -1 ) )
break;
}
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Test SEEK", 0, TRUE );
display( hb_BTreeSeek( pBTree, ( BYTE * ) "cdntyzrf", 36, FALSE ) == 1 ? ".T." : ".F.", 0, TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
hb_BTreeSkip( pBTree, 1 );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), FALSE );
display( " dmfmivqb ?", 0, TRUE );
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Test soft SEEK of a short key", 0, TRUE );
display( hb_BTreeSeek( pBTree, ( BYTE * ) "cd", 0, TRUE ) == 1 ? ".T." : ".F.", 0, TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
hb_BTreeSkip( pBTree, 1 );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), FALSE );
display( " dmfmivqb ?", 0, TRUE );
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Test soft SEEK of an existing key", 0, TRUE );
display( hb_BTreeSeek( pBTree, ( BYTE * ) "cdntyzrf", 0, TRUE ) == 1 ? ".T." : ".F.", 0, TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
hb_BTreeSkip( pBTree, 1 );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), FALSE );
display( " dmfmivqb ?", 0, TRUE );
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
display( "Test soft SEEK of a missing key, that should force EOF", 0, TRUE );
display( hb_BTreeSeek( pBTree, ( BYTE * ) "zzzzzz", 0, FALSE ) == 1 ? ".T." : ".F.", 0, TRUE );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), TRUE );
hb_BTreeSkip( pBTree, 1 );
display( ( char * ) hb_BTreeKey( pBTree ), hb_BTreeData( pBTree ), FALSE );
display( " dmfmivqb ?", 0, TRUE );
hb_conOutStd( hb_conNewLine(), strlen( hb_conNewLine() ) );
hb_BTreeClose( pBTree );
}
else
display( "error / failure", 0, TRUE );
}

234
harbour/contrib/hbnf/fttext.c
View File

@@ -174,9 +174,8 @@
#define BUFFSIZE 4096
#include "extend.h"
#include "vm.api"
#include "filesys.api"
#include "hbapi.h"
#include "hbapifs.h"
/* MSC compiler switch */
#if defined(_MSC_VER)
@@ -187,12 +186,12 @@
#define VALLOC_FLAG 0
/* routines internal to this module */
static int _findeol( BYTEP buf, int buf_len );
static int _findbol( BYTEP buf, int buf_len );
static int _findeol( BYTE * buf, int buf_len );
static int _findbol( BYTE * buf, int buf_len );
static int _ins_buff( int bytes );
static int _del_buff( int bytes );
static long _ft_skip( long recs );
static int _writeLine( char * theData, int iDataLen );
static int _writeLine( BYTE * theData, int iDataLen );
static BOOL _writeeol( HB_FHANDLE fhnd );
/* arrays used by the text workareas */
@@ -219,7 +218,7 @@ HB_FUNC( FTSETINT )
HB_FUNC( FT_FOFFSET )
{
_retnl( offset[area] );
hb_retnl( offset[area] );
}
/* standard macros */
@@ -299,26 +298,26 @@ HB_FUNC( FT_FOFFSET )
HB_FUNC( FT_FUSE )
{
int attr = ISNUM( 2 ) ? _parni(2) : FO_READWRITE|FO_DENYNONE;
int attr = ISNUM( 2 ) ? hb_parni(2) : FO_READWRITE|FO_DENYNONE;
error[area] = 0;
if ( ISCHAR(1) )
{
handles[area] = _fsOpen( ( BYTEP ) _parc(1), attr ) ;
handles[area] = hb_fsOpen( ( BYTE * ) hb_parc(1), attr ) ;
if( handles[area] <= 0 )
error[area] = _fsError();
error[area] = hb_fsError();
offset[area] = 0 ;
recno[area] = 1;
lastbyte[area] = _fsSeek( handles[area], 0L, FS_END );
_retni( handles[area] );
lastbyte[area] = hb_fsSeek( handles[area], 0L, FS_END );
hb_retni( handles[area] );
}
else
{
if ( handles[area] != 0 )
{
_fsClose( handles[area] );
_retni(0);
hb_fsClose( handles[area] );
hb_retni(0);
recno[area] = 0L;
offset[area] = 0L;
handles[area] = 0;
@@ -397,7 +396,7 @@ HB_FUNC( FT_FSELECT )
if ( ISNUM(1) )
{
newArea = _parni(1);
newArea = hb_parni(1);
if( newArea <= TEXT_WORKAREAS )
{
if ( newArea == 0 )
@@ -415,7 +414,7 @@ HB_FUNC( FT_FSELECT )
area = newArea - 1;
}
}
_retni( oldarea );
hb_retni( oldarea );
}
/* $DOC$
@@ -519,7 +518,7 @@ HB_FUNC( FT_FGOTOP )
HB_FUNC( FT_FERROR )
{
_retni( error[area] );
hb_retni( error[area] );
}
@@ -574,7 +573,7 @@ HB_FUNC( FT_FERROR )
HB_FUNC( FT_FRECNO )
{
_retnl( recno[area] );
hb_retnl( recno[area] );
}
@@ -698,13 +697,13 @@ HB_FUNC( FT_FSKIP )
{
if ( ISNUM(1) )
{
if( _parnl(1) )
_retnl( _ft_skip( _parnl(1) ) );
if( hb_parnl(1) )
hb_retnl( _ft_skip( hb_parnl(1) ) );
else
_retnl( 0L );
hb_retnl( 0L );
}
else
_retnl( _ft_skip(1L) );
hb_retnl( _ft_skip(1L) );
}
@@ -717,10 +716,10 @@ static long _ft_skip( long iRecs )
int iByteCount;
int iBytesRead, iBytesRemaining;
BYTEP cPtr;
BYTE * cPtr;
long iSkipped = 0;
BYTEP cBuff = ( BYTEP ) hb_xgrab( BUFFSIZE );
BYTE * cBuff = ( BYTE * ) hb_xgrab( BUFFSIZE );
long fpOffset = offset[area];
isBof[area] = FALSE;
@@ -740,10 +739,10 @@ static long _ft_skip( long iRecs )
cPtr = cBuff;
/* position file pointer to beginning of current record */
_fsSeek( handles[area], fpOffset, FS_SET );
hb_fsSeek( handles[area], fpOffset, FS_SET );
/* read a chunk */
iBytesRead = _fsRead( handles[area], cBuff, BUFFSIZE );
iBytesRead = hb_fsRead( handles[area], cBuff, BUFFSIZE );
if( !iBytesRead )
{
@@ -751,7 +750,7 @@ static long _ft_skip( long iRecs )
isEof[area] = TRUE;
last_rec[area] = recno[ area];
last_off[area] = offset[area];
error[area] = _fsError();
error[area] = hb_fsError();
break;
}
@@ -797,7 +796,7 @@ static long _ft_skip( long iRecs )
/* buffer was full, so probably not EOF, but maybe
CRLF straddled end of buffer, so back up pointer a bit
before doing the next read */
fpOffset = _fsSeek( handles[area], 0, FS_RELATIVE ) - 1;
fpOffset = hb_fsSeek( handles[area], 0, FS_RELATIVE ) - 1;
iBytesRemaining = 0;
}
}
@@ -817,11 +816,11 @@ static long _ft_skip( long iRecs )
fpOffset = __max( offset[area] - BUFFSIZE, 0L );
/* move file pointer */
_fsSeek( handles[area], fpOffset, FS_SET );
hb_fsSeek( handles[area], fpOffset, FS_SET );
/* read a chunk */
iBytesRead =
_fsRead( handles[area], cBuff, BUFFSIZE );
hb_fsRead( handles[area], cBuff, BUFFSIZE );
if( !iBytesRead )
{
@@ -831,7 +830,7 @@ static long _ft_skip( long iRecs )
recno[area] = 0;
offset[area] = 0;
last_rec[area] = 0;
error[area] = _fsError();
error[area] = hb_fsError();
break;
}
@@ -957,24 +956,24 @@ HB_FUNC( FT_FREADLN )
USHORT iByteCount;
USHORT iBytesRead;
BYTEP cPtr = ( BYTEP ) hb_xgrab( BUFFSIZE );
BYTE * cPtr = ( BYTE * ) hb_xgrab( BUFFSIZE );
_fsSeek( handles[area], offset[area], FS_SET );
iBytesRead = (int) _fsRead( handles[area], cPtr, BUFFSIZE );
hb_fsSeek( handles[area], offset[area], FS_SET );
iBytesRead = (int) hb_fsRead( handles[area], cPtr, BUFFSIZE );
error[area] = 0;
if( !iBytesRead )
{
error[area] = _fsError();
error[area] = hb_fsError();
}
iByteCount = _findeol( cPtr, iBytesRead );
if( iByteCount )
_retclen( ( char * ) cPtr, iByteCount-2 );
hb_retclen( ( char * ) cPtr, iByteCount-2 );
else
_retclen( ( char * ) cPtr, iBytesRead );
hb_retclen( ( char * ) cPtr, iBytesRead );
hb_xfree( ( void * ) cPtr );
}
@@ -1029,38 +1028,38 @@ HB_FUNC( FT_FDELETE )
long destPtr ;
long cur_rec = recno[area];
long cur_off = offset[area];
BYTEP Buff = ( BYTEP ) _xgrab( BUFFSIZE );
BYTE * Buff = ( BYTE * ) hb_xgrab( BUFFSIZE );
/* save address to current record ( first record to be deleted ) */
destPtr = offset[area] ;
/* skip over deleted records, point to first 'to be retained' record */
_ft_skip( ( ISNUM( 1 ) ? _parni( 1 ) : 1 ) ) ;
srcPtr = _fsSeek( handles[area], offset[area], FS_SET );
_ft_skip( ( ISNUM( 1 ) ? hb_parni( 1 ) : 1 ) ) ;
srcPtr = hb_fsSeek( handles[area], offset[area], FS_SET );
/* buffer read retained data, write atop old data */
do
{
_fsSeek( handles[area], srcPtr, FS_SET );
iBytesRead = _fsRead( handles[area], Buff , BUFFSIZE ); /* now read in a big glob */
hb_fsSeek( handles[area], srcPtr, FS_SET );
iBytesRead = hb_fsRead( handles[area], Buff , BUFFSIZE ); /* now read in a big glob */
srcPtr += iBytesRead;
_fsSeek( handles[area], destPtr, FS_SET );
destPtr += _fsWrite( handles[area], Buff, iBytesRead );
hb_fsSeek( handles[area], destPtr, FS_SET );
destPtr += hb_fsWrite( handles[area], Buff, iBytesRead );
} while( iBytesRead > 0 );
/* move DOS EOF marker */
_fsSeek( handles[area], srcPtr, FS_SET );
_fsWrite( handles[area], Buff, 0 );
hb_fsSeek( handles[area], srcPtr, FS_SET );
hb_fsWrite( handles[area], Buff, 0 );
error[area] = _fsError();
error[area] = hb_fsError();
/* restore pointers */
recno[area] = cur_rec;
offset[area]= cur_off;
/* re_calc EOF */
lastbyte[area] = _fsSeek( handles[area], 0L, FS_END );
lastbyte[area] = hb_fsSeek( handles[area], 0L, FS_END );
_ft_skip( 0 );
/* restore pointers again */
@@ -1073,7 +1072,7 @@ HB_FUNC( FT_FDELETE )
hb_xfree( ( void * ) Buff );
_retl( (error[area]) ? 0 : 1 );
hb_retl( (error[area]) ? 0 : 1 );
}
@@ -1127,7 +1126,7 @@ HB_FUNC( FT_FDELETE )
HB_FUNC( FT_FINSERT )
{
int no_lines = ( ISNUM( 1 ) ? _parni( 1 ) : 1 );
int no_lines = ( ISNUM( 1 ) ? hb_parni( 1 ) : 1 );
int no_bytes = no_lines * 2 ;
int err = 1;
@@ -1138,13 +1137,13 @@ HB_FUNC( FT_FINSERT )
while( no_lines-- )
if( !_writeeol( handles[area] ) )
{
error[area] = _fsError();
error[area] = hb_fsError();
err = 0;
break;
}
}
_retl( err );
hb_retl( err );
}
@@ -1209,11 +1208,11 @@ HB_FUNC( FT_FINSERT )
HB_FUNC( FT_FAPPEND )
{
int no_lines = ( ISNUM( 1 ) ? _parni( 1 ) : 1 );
int no_lines = ( ISNUM( 1 ) ? hb_parni( 1 ) : 1 );
int iRead;
int iByteCount;
char * buff = ( char * ) hb_xgrab( BUFFSIZE );
BYTE * buff = ( BYTE * ) hb_xgrab( BUFFSIZE );
error[area] = 0;
@@ -1223,18 +1222,18 @@ HB_FUNC( FT_FAPPEND )
/* find end of record */
_fsSeek( handles[area], offset[area], FS_SET );
iRead = _fsRead( handles[area], buff, BUFFSIZE ); /* now read in a big glob */
hb_fsSeek( handles[area], offset[area], FS_SET );
iRead = hb_fsRead( handles[area], buff, BUFFSIZE ); /* now read in a big glob */
/* determine if CRLF pair exists, if not, add one */
/* get count of chars in this line */
iByteCount = _findeol( ( BYTEP ) buff, iRead );
iByteCount = _findeol( ( BYTE * ) buff, iRead );
if( iByteCount == 0 )
_fsSeek( handles[area], 0, FS_END );
hb_fsSeek( handles[area], 0, FS_END );
else
{
offset[area] = _fsSeek( handles[area], offset[area] + iByteCount, FS_SET );
offset[area] = hb_fsSeek( handles[area], offset[area] + iByteCount, FS_SET );
recno[area]++;
no_lines--;
}
@@ -1243,19 +1242,19 @@ HB_FUNC( FT_FAPPEND )
{
if( !_writeeol( handles[area] ) )
{
error[area] = _fsError();
error[area] = hb_fsError();
break;
}
recno[area]++;
offset[area] = _fsSeek( handles[area], 0, FS_RELATIVE );
offset[area] = hb_fsSeek( handles[area], 0, FS_RELATIVE );
/* no_lines--; !Harbour FIX! */
}
if( !error[area] )
{
/* move DOS eof marker */
_fsWrite( handles[area], (void *) buff, 0 );
error[area] = _fsError();
hb_fsWrite( handles[area], (void *) buff, 0 );
error[area] = hb_fsError();
}
/* force recalc of last record/offset */
@@ -1263,7 +1262,7 @@ HB_FUNC( FT_FAPPEND )
hb_xfree( ( void * ) buff );
_retl( (error[area]) ? 0 : 1 );
hb_retl( (error[area]) ? 0 : 1 );
}
@@ -1331,18 +1330,18 @@ HB_FUNC( FT_FAPPEND )
HB_FUNC( FT_FWRITEL )
{
char * theData = _parc( 1 );
int iDataLen = _parclen( 1 );
int lInsert = ( ISLOG( 2 ) ? _parl( 2 ) : 0 );
BYTE * theData = ( BYTE * ) hb_parc( 1 );
int iDataLen = hb_parclen( 1 );
int lInsert = ( ISLOG( 2 ) ? hb_parl( 2 ) : 0 );
int err;
int iLineLen = 0;
int iRead, iEOL;
char * buffer ;
BYTE * buffer;
/* position file pointer to insertion point */
_fsSeek( handles[area], offset[area], FS_SET );
hb_fsSeek( handles[area], offset[area], FS_SET );
if( lInsert )
{
@@ -1351,20 +1350,20 @@ HB_FUNC( FT_FWRITEL )
if( !err )
{
_fsSeek( handles[area], offset[area], FS_SET );
hb_fsSeek( handles[area], offset[area], FS_SET );
err = _writeLine( theData, iDataLen );
}
}
else
{
/* overwrite mode, determine how many bytes over/under */
buffer = ( char * ) hb_xgrab( BUFFSIZE );
buffer = ( BYTE * ) hb_xgrab( BUFFSIZE );
/* find length of current line, loop if longer than buffer */
do
{
iRead = _fsRead( handles[area], buffer, BUFFSIZE );
iEOL = _findeol( ( BYTEP ) buffer, iRead );
iRead = hb_fsRead( handles[area], buffer, BUFFSIZE );
iEOL = _findeol( ( BYTE * ) buffer, iRead );
if( iEOL == 0 )
{
iLineLen += iRead;
@@ -1384,7 +1383,7 @@ HB_FUNC( FT_FWRITEL )
_del_buff( iLineLen - iDataLen - 2 );
/* write the new record's contents */
_fsWrite( handles[area], theData, iDataLen );
hb_fsWrite( handles[area], theData, iDataLen );
}
else
{
@@ -1392,12 +1391,12 @@ HB_FUNC( FT_FWRITEL )
_ins_buff( iDataLen - iLineLen + 2 );
/* write the new record's contents */
_fsWrite( handles[area], theData, iDataLen );
hb_fsWrite( handles[area], theData, iDataLen );
}
error[area] = _fsError();
error[area] = hb_fsError();
err = (error[area]) ? 0 : 1;
}
_retl( err );
hb_retl( err );
}
@@ -1448,7 +1447,7 @@ HB_FUNC( FT_FLASTRE )
cur_offset = offset[area];
HB_FUNC_EXEC( FT_FGOBOT );
_retnl( last_rec[area] );
hb_retnl( last_rec[area] );
recno[area] = cur_rec;
offset[area] = cur_offset;
@@ -1498,7 +1497,7 @@ HB_FUNC( FT_FLASTRE )
HB_FUNC( FT_FEOF )
{
_retl( isEof[area] );
hb_retl( isEof[area] );
}
@@ -1548,7 +1547,7 @@ HB_FUNC( FT_FEOF )
HB_FUNC( FT_FBOF )
{
_retl( isBof[area] );
hb_retl( isBof[area] );
}
@@ -1608,7 +1607,7 @@ HB_FUNC( FT_FBOF )
HB_FUNC( FT_FGOTO )
{
long target = _parnl(1);
long target = hb_parnl(1);
/* if a recno was passed, do a relative skip */
if( target )
@@ -1632,7 +1631,7 @@ HB_FUNC( FT_FGOTO )
if( --target )
_ft_skip( target );
}
error[area] = _fsError();
error[area] = hb_fsError();
}
/*----------------------------------------------------------------------
@@ -1649,7 +1648,7 @@ HB_FUNC( FT_FGOTO )
line is longer than buffer end)
------------------------------------------------------------------------*/
static int _findeol( BYTEP buf, int buf_len )
static int _findeol( BYTE * buf, int buf_len )
{
int tmp;
@@ -1708,13 +1707,13 @@ _feoldone:
the preceding CRLF pair (beginning of line).
------------------------------------------------------------------------*/
static int _findbol( BYTEP buf, int buf_len )
static int _findbol( BYTE * buf, int buf_len )
{
int tmp = buf_len - 1;
if( tmp != 0 )
{
BYTEP p = buf - 1;
BYTE * p = buf - 1;
BYTE b = *p;
if( b == FT_CHR_EOF )
@@ -1807,9 +1806,9 @@ _fbolerr:
static int _ins_buff( int iLen )
{
char * ReadBuff = ( char * ) hb_xgrab( BUFFSIZE );
char * WriteBuff = ( char * ) hb_xgrab( BUFFSIZE );
char * SaveBuff;
BYTE * ReadBuff = ( BYTE * ) hb_xgrab( BUFFSIZE );
BYTE * WriteBuff = ( BYTE * ) hb_xgrab( BUFFSIZE );
BYTE * SaveBuff;
long fpRead, fpWrite;
int WriteLen, ReadLen;
int SaveLen;
@@ -1825,11 +1824,11 @@ static int _ins_buff( int iLen )
fpWrite= offset[area] + iLen;
/* do initial load of both buffers */
_fsSeek( handles[area], fpRead, FS_SET );
WriteLen = _fsRead( handles[area], WriteBuff, BUFFSIZE );
hb_fsSeek( handles[area], fpRead, FS_SET );
WriteLen = hb_fsRead( handles[area], WriteBuff, BUFFSIZE );
fpRead += WriteLen;
ReadLen = _fsRead( handles[area], ReadBuff, BUFFSIZE );
ReadLen = hb_fsRead( handles[area], ReadBuff, BUFFSIZE );
fpRead += ReadLen;
error[area] = 0;
@@ -1839,17 +1838,17 @@ static int _ins_buff( int iLen )
while( WriteLen > 0 )
{
/* position to beginning of write area */
if( _fsSeek( handles[area], fpWrite, FS_SET ) != (unsigned long) fpWrite )
if( hb_fsSeek( handles[area], fpWrite, FS_SET ) != (unsigned long) fpWrite )
{
error[area] = _fsError();
error[area] = hb_fsError();
break;
}
SaveLen = _fsWrite( handles[area], WriteBuff, WriteLen );
SaveLen = hb_fsWrite( handles[area], WriteBuff, WriteLen );
if( !SaveLen )
{
error[area] = _fsError();
error[area] = hb_fsError();
break;
}
@@ -1859,7 +1858,7 @@ static int _ins_buff( int iLen )
if( SaveLen != WriteLen )
{
/* error, fetch errcode and quit */
error[area] = _fsError();
error[area] = hb_fsError();
break;
}
/* WriteLen = SaveLen; */
@@ -1871,8 +1870,8 @@ static int _ins_buff( int iLen )
WriteLen = ReadLen ;
/* return to read area and read another buffer */
_fsSeek( handles[area], fpRead, FS_SET );
ReadLen = _fsRead( handles[area], ReadBuff, BUFFSIZE );
hb_fsSeek( handles[area], fpRead, FS_SET );
ReadLen = hb_fsRead( handles[area], ReadBuff, BUFFSIZE );
fpRead += ReadLen;
}
@@ -1881,12 +1880,12 @@ static int _ins_buff( int iLen )
}
/* store length in bytes, set EOF marker for DOS */
lastbyte[area] = _fsSeek( handles[area], fpWrite, FS_SET );
_fsWrite( handles[area], WriteBuff, 0 );
lastbyte[area] = hb_fsSeek( handles[area], fpWrite, FS_SET );
hb_fsWrite( handles[area], WriteBuff, 0 );
/* clear last_rec so next gobot will recount the records */
last_rec[area] = 0L;
_fsSeek( handles[area], offset[area], FS_SET );
hb_fsSeek( handles[area], offset[area], FS_SET );
hb_xfree( ( void * ) ReadBuff );
hb_xfree( ( void * ) WriteBuff );
@@ -1901,8 +1900,7 @@ static int _ins_buff( int iLen )
/* deletes xxx bytes from the current file, beginning at the current record */
static int _del_buff( int iLen )
{
char * WriteBuff = ( char * ) hb_xgrab( BUFFSIZE );
BYTE * WriteBuff = ( BYTE * ) hb_xgrab( BUFFSIZE );
long fpRead, fpWrite;
int WriteLen;
int SaveLen;
@@ -1912,8 +1910,8 @@ static int _del_buff( int iLen )
fpRead = offset[area] + iLen;
/* do initial load of buffer */
_fsSeek( handles[area], fpRead, FS_SET );
WriteLen = _fsRead( handles[area], WriteBuff, BUFFSIZE );
hb_fsSeek( handles[area], fpRead, FS_SET );
WriteLen = hb_fsRead( handles[area], WriteBuff, BUFFSIZE );
fpRead += WriteLen;
error[area] = 0;
@@ -1921,8 +1919,8 @@ static int _del_buff( int iLen )
while( WriteLen > 0 )
{
/* position to beginning of write area */
_fsSeek( handles[area], fpWrite, FS_SET );
SaveLen = _fsWrite( handles[area], WriteBuff, WriteLen );
hb_fsSeek( handles[area], fpWrite, FS_SET );
SaveLen = hb_fsWrite( handles[area], WriteBuff, WriteLen );
/* move write pointer */
fpWrite += SaveLen;
@@ -1930,24 +1928,24 @@ static int _del_buff( int iLen )
if( SaveLen != WriteLen )
{
/* error, fetch errcode and quit */
error[area] = _fsError();
error[area] = hb_fsError();
break;
}
/* return to read area and read another buffer */
_fsSeek( handles[area], fpRead, FS_SET );
WriteLen = _fsRead( handles[area], WriteBuff, BUFFSIZE );
hb_fsSeek( handles[area], fpRead, FS_SET );
WriteLen = hb_fsRead( handles[area], WriteBuff, BUFFSIZE );
fpRead += WriteLen;
}
/* store length in bytes, set EOF marker for DOS */
lastbyte[area] = _fsSeek( handles[area], fpWrite, FS_SET );
_fsWrite( handles[area], WriteBuff, 0 );
lastbyte[area] = hb_fsSeek( handles[area], fpWrite, FS_SET );
hb_fsWrite( handles[area], WriteBuff, 0 );
/* clear last_rec so next gobot will recount the records */
last_rec[area] = 0L;
_fsSeek( handles[area], offset[area], FS_SET );
hb_fsSeek( handles[area], offset[area], FS_SET );
hb_xfree( ( void * ) WriteBuff );
@@ -1958,20 +1956,20 @@ static int _del_buff( int iLen )
/*ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ*/
/* writes a line of data to the file, including the terminating CRLF */
static int _writeLine( char * theData, int iDataLen )
static int _writeLine( BYTE * theData, int iDataLen )
{
int err = 0;
if( !( _fsWrite( handles[area], theData, iDataLen ) == iDataLen ) )
if( !( hb_fsWrite( handles[area], theData, iDataLen ) == iDataLen ) )
{
err = 1;
error[area] = _fsError();
error[area] = hb_fsError();
}
else
if( !_writeeol( handles[area] ) )
{
err = 1;
error[area] = _fsError();
error[area] = hb_fsError();
}
return err;
}
@@ -1981,7 +1979,7 @@ static BOOL _writeeol( HB_FHANDLE fhnd )
char * crlf = hb_conNewLine();
int len = strlen( crlf );
return ( _fsWrite( fhnd, crlf, len ) == len );
return hb_fsWrite( fhnd, ( BYTE * ) crlf, len ) == len;
}
/* fttext.c eof */

2
harbour/contrib/hbnf/mouse.c
View File

@@ -51,7 +51,7 @@
*
*/
#include "extend.h"
#include "hbapi.h"
#if defined(HB_OS_DOS)
#include "dos.h"
#endif

21
harbour/contrib/hbnf/ontick.c
View File

@@ -64,9 +64,8 @@
* $END$
*/
#include "extend.api"
#include "item.api"
#include "hbundoc.api"
#include "hbapi.h"
#include "hbapiitm.h"
#include "cpmi.h"
@@ -84,14 +83,14 @@ void cdecl _evLow( unsigned int, void *, unsigned int );
static long far Ticks = 0;
static long far Interval = 1;
static ITEM far codeBlock;
static PHB_ITEM far codeBlock;
static char inProgress = 0;
static void cdecl TickTock( void )
{
auto unsigned int ProtMode = cpmiIsProtected();
auto LONGPTR Timer;
auto EVALINFO eval;
auto HB_EVALINFO eval;
if ( inProgress ) return;
@@ -112,9 +111,9 @@ static void cdecl TickTock( void )
{
Ticks = *Timer.Address;
_evalNew( &eval, codeBlock );
hb_evalNew( &eval, codeBlock );
_itemRelease( _evalLaunch( &eval ) );
hb_itemRelease( hb_evalLaunch( &eval ) );
}
if ( ProtMode ) cpmiFreeSelector( Timer.Pointer.Segment );
@@ -127,13 +126,13 @@ static void cdecl TickTock( void )
CLIPPER FT_OnTick( void )
{
if ( _itemType( codeBlock ) == BLOCK ) _itemRelease( codeBlock );
if ( hb_itemType( codeBlock ) == BLOCK ) hb_itemRelease( codeBlock );
codeBlock = _itemParam( 1 );
codeBlock = hb_itemParam( 1 );
if ( _itemType( codeBlock ) == BLOCK )
if ( hb_itemType( codeBlock ) == BLOCK )
{
Interval = _parnl( 2 );
Interval = hb_parnl( 2 );
_evLow( 5, TickTock, TRUE );
}

4
harbour/contrib/hbnf/origin.c
View File

@@ -49,12 +49,10 @@
* $EXAMPLES$
* cMyFile := FT_ORIGIN()
*
* IF cMyFile <> "C:\appdir\myfile.exe"
* IF cMyFile != "C:\appdir\myfile.exe"
* ?"Incorrect startup file. Please remove/rename and start again"
* QUIT
* ENDIF
* $INCLUDE$
* extend.h
* $SEEALSO$
* FT_WHEREIS() FT_TREE()
* $END$

9
harbour/contrib/hbnf/peek.c
View File

@@ -59,7 +59,8 @@
* $END$
*/
#include "extend.api"
#include "hbapi.h"
#include "cpmi.h"
#define FP_SEG( fp ) ( *( ( unsigned int * ) &( fp ) + 1 ) )
@@ -72,8 +73,8 @@ HB_FUNC(FT_PEEK)
if ( ( PCOUNT >= 2 ) && ( ISNUM( 1 ) ) && ( ISNUM( 2 ) ) )
{
FP_SEG( bytePtr ) = _parni( 1 );
FP_OFF( bytePtr ) = _parni( 2 );
FP_SEG( bytePtr ) = hb_parni( 1 );
FP_OFF( bytePtr ) = hb_parni( 2 );
if ( ProtMode )
{
@@ -88,7 +89,7 @@ HB_FUNC(FT_PEEK)
if ( ProtMode ) hb_cpmiFreeSelector( FP_SEG( bytePtr ) );
}
else
Bogus: _retni( -1 );
Bogus: hb_retni( -1 );
return;
}

13
harbour/contrib/hbnf/poke.c
View File

@@ -62,7 +62,8 @@
* $END$
*/
#include "extend.api"
#include "hbapi.h"
#include "cpmi.h"
#define FP_SEG( fp ) ( *( ( unsigned int * ) &( fp ) + 1 ) )
@@ -75,8 +76,8 @@ HB_FUNC( FT_POKE )
if ( ( PCOUNT >= 3 ) && ( ISNUM( 1 ) ) && ( ISNUM( 2 ) ) && ( ISNUM( 3 ) ) )
{
FP_SEG( bytePtr ) = _parni( 1 );
FP_OFF( bytePtr ) = _parni( 2 );
FP_SEG( bytePtr ) = hb_parni( 1 );
FP_OFF( bytePtr ) = hb_parni( 2 );
if ( ProtMode )
{
@@ -86,14 +87,14 @@ HB_FUNC( FT_POKE )
if ( FP_SEG( bytePtr ) == 0 ) goto Bogus;
}
*bytePtr = ( unsigned char ) _parni( 3 );
*bytePtr = ( unsigned char ) hb_parni( 3 );
if ( ProtMode ) hb_cpmiFreeSelector( FP_SEG( bytePtr ) );
_retl( TRUE );
hb_retl( TRUE );
}
else
Bogus: _retl( FALSE );
Bogus: hb_retl( FALSE );
return;
}

24
harbour/contrib/hbwhat32/whtbmp.c
View File

@@ -20,7 +20,7 @@ Modified and non-API functions:
#define _WIN32_WINNT 0x0400
#include <windows.h>
#include "item.api"
#include "hbapiitm.h"
#include "hbapi.h"
extern PHB_ITEM Rect2Array( RECT *rc );
@@ -76,23 +76,23 @@ HB_FUNC( DRAWBITMAP )
HB_FUNC( GETBITMAPSIZE )
{
PHB_ITEM aArray = _itemArrayNew(2) ;
PHB_ITEM aArray = hb_itemArrayNew(2) ;
PHB_ITEM tmp ;
BITMAP bm;
HBITMAP hBmp = (HBITMAP) hb_parnl(1);
GetObject(hBmp, sizeof(bm), &bm);
tmp = _itemPutNL( NULL, bm.bmWidth );
tmp = hb_itemPutNL( NULL, bm.bmWidth );
hb_arraySet( aArray, 1, tmp );
_itemRelease( tmp );
hb_itemRelease( tmp );
tmp = _itemPutNL( NULL, bm.bmHeight );
tmp = hb_itemPutNL( NULL, bm.bmHeight );
hb_arraySet( aArray, 2, tmp );
_itemRelease( tmp );
hb_itemRelease( tmp );
_itemReturn( aArray );
_itemRelease( aArray );
hb_itemReturn( aArray );
hb_itemRelease( aArray );
}
//-----------------------------------------------------------------------------
@@ -109,8 +109,8 @@ HB_FUNC( GETBITMAPDIMENSIONEX )
if ( GetBitmapDimensionEx( (HBITMAP) hb_parnl( 1 ), &Size ) )
{
aSize = Size2Array( &Size ) ;
_itemReturn( aSize );
_itemRelease( aSize );
hb_itemReturn( aSize );
hb_itemRelease( aSize );
}
}
@@ -138,11 +138,11 @@ HB_FUNC( SETBITMAPDIMENSIONEX )
aSize = hb_itemArrayNew(2);
temp = _itemPutNL( NULL, Size.cx );
temp = hb_itemPutNL( NULL, Size.cx );
hb_arraySet( aSize, 1, temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, Size.cy );
temp = hb_itemPutNL( NULL, Size.cy );
hb_arraySet( aSize, 2, temp );
hb_itemRelease( temp );

30
harbour/contrib/hbwhat32/whtbrsh.c
View File

@@ -16,7 +16,7 @@
#define _WIN32_WINNT 0x0400
#include <windows.h>
#include "item.api"
#include "hbapiitm.h"
#include "hbapi.h"
@@ -144,18 +144,18 @@ HB_FUNC( GETBRUSHORGEX )
if ( GetBrushOrgEx( (HDC) hb_parnl( 1 ), &Point ) )
{
aPt = _itemArrayNew( 2 );
aPt = hb_itemArrayNew( 2 );
temp = _itemPutNL( NULL, Point.x );
temp = hb_itemPutNL( NULL, Point.x );
hb_arraySet( aPt, 1, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, Point.y );
temp = hb_itemPutNL( NULL, Point.y );
hb_arraySet( aPt, 2, temp );
_itemRelease( temp );
hb_itemRelease( temp );
_itemReturn( aPt );
_itemRelease( aPt );
hb_itemReturn( aPt );
hb_itemRelease( aPt );
}
}
@@ -175,18 +175,18 @@ HB_FUNC( SETBRUSHORGEX )
if ( SetBrushOrgEx( (HDC) hb_parnl( 1 ), hb_parni( 2 ), hb_parni( 3 ), &Point) )
{
aPt = _itemArrayNew( 2 );
aPt = hb_itemArrayNew( 2 );
temp = _itemPutNL( NULL, Point.x );
temp = hb_itemPutNL( NULL, Point.x );
hb_arraySet( aPt, 1, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, Point.y );
temp = hb_itemPutNL( NULL, Point.y );
hb_arraySet( aPt, 2, temp );
_itemRelease( temp );
hb_itemRelease( temp );
_itemReturn( aPt );
_itemRelease( aPt );
hb_itemReturn( aPt );
hb_itemRelease( aPt );
}

10
harbour/contrib/hbwhat32/whtcomm.c
View File

@@ -23,7 +23,7 @@
#include "hbvm.h"
#include "hbstack.h"
#include "hbapiitm.h"
#include "item.api"
#include "hbapiitm.h"
extern PHB_ITEM Rect2Array( RECT *rc );
@@ -97,8 +97,8 @@ HB_FUNC( STATUSBARGETRECT )
HWND hWnd = (HWND) hb_parnl(1);
SendMessage ( hWnd, SB_GETRECT, hb_parnl(2), (LPARAM) &rc);
aRect = Rect2Array( &rc );
_itemReturn( aRect );
_itemRelease( aRect );
hb_itemReturn( aRect );
hb_itemRelease( aRect );
}
@@ -109,8 +109,8 @@ HB_FUNC( STATUSBARGETPARTS )
HWND hWnd = (HWND) hb_parnl(1);
SendMessage ( hWnd, SB_GETPARTS, hb_parni(2), (LPARAM) &rc);
aParts = Rect2Array( &rc );
_itemReturn( aParts );
_itemRelease( aParts );
hb_itemReturn( aParts );
hb_itemRelease( aParts );
}
//----------------------------------------------------------------------------//

12
harbour/contrib/hbwhat32/whtcret.c
View File

@@ -18,7 +18,7 @@
#include "hbvm.h"
#include "hbstack.h"
#include "hbapiitm.h"
#include "item.api"
#include "hbapiitm.h"
extern PHB_ITEM Rect2Array( RECT *rc );
extern BOOL Array2Rect(PHB_ITEM aRect, RECT *rc );
@@ -65,14 +65,14 @@ HB_FUNC( GETCARETPOS )
{
POINT Point ;
PHB_ITEM aPt;
if ( GetCaretPos( (LPPOINT) &Point ) )
if ( GetCaretPos( (LPPOINT) &Point ) )
{
aPt = Point2Array(&Point) ;
_itemReturn( aPt );
_itemRelease( aPt );
hb_itemReturn( aPt );
hb_itemRelease( aPt );
}
}

6
harbour/contrib/hbwhat32/whtdc.c
View File

@@ -12,7 +12,7 @@
#define _WIN32_WINNT 0x0400
#include <windows.h>
#include "item.api"
#include "hbapiitm.h"
#include "hbapi.h"
extern PHB_ITEM Rect2Array( RECT *rc );
extern BOOL Array2Rect(PHB_ITEM aRect, RECT *rc );
@@ -165,8 +165,8 @@ HB_FUNC( GETDCORGEX )
if ( GetDCOrgEx( (HDC) hb_parnl( 1 ), &Point ) )
{
aPt = Point2Array(&Point);
_itemReturn( aPt );
_itemRelease( aPt );
hb_itemReturn( aPt );
hb_itemRelease( aPt );
}
}

42
harbour/contrib/hbwhat32/whtdraw.c
View File

@@ -9,7 +9,7 @@
#define _WIN32_WINNT 0x0400
#include <windows.h>
#include "item.api"
#include "hbapiitm.h"
#include "hbapi.h"
extern PHB_ITEM Rect2Array( RECT *rc );
@@ -56,8 +56,8 @@ HB_FUNC( MOVETOEX )
{
aPt = Point2Array(&Point) ;
_itemReturn( aPt );
_itemRelease( aPt );
hb_itemReturn( aPt );
hb_itemRelease( aPt );
}
@@ -78,8 +78,8 @@ HB_FUNC( GETCURRENTPOSITIONEX )
if ( GetCurrentPositionEx( (HDC) hb_parnl( 1 ), &pt ) )
{
aPt = Point2Array( &pt) ;
_itemReturn( aPt );
_itemRelease( aPt );
hb_itemReturn( aPt );
hb_itemRelease( aPt );
}
}
@@ -312,13 +312,13 @@ HB_FUNC( POLYLINE )
if ( Array2Point(aSub, &pt ))
{
*(Point+i) = pt ;
_itemRelease( aSub );
hb_itemRelease( aSub );
}
else
{
hb_retl(0);
hb_xfree(Point);
_itemRelease( aSub );
hb_itemRelease( aSub );
return ;
}
}
@@ -360,13 +360,13 @@ HB_FUNC( POLYLINETO )
if ( Array2Point(aSub, &pt ))
{
*(Point+i) = pt ;
_itemRelease( aSub );
hb_itemRelease( aSub );
}
else
{
hb_retl(0);
hb_xfree(Point);
_itemRelease( aSub );
hb_itemRelease( aSub );
return ;
}
}
@@ -419,7 +419,7 @@ HB_FUNC( POLYPOLYLINE )
if ( Array2Point(aSub, &pt ))
{
*(Point+i) = pt ;
_itemRelease( aSub );
hb_itemRelease( aSub );
}
else
@@ -427,7 +427,7 @@ HB_FUNC( POLYPOLYLINE )
hb_retl(0);
hb_xfree(PolyPoints);
hb_xfree(Point);
_itemRelease( aSub );
hb_itemRelease( aSub );
return ;
}
}
@@ -482,14 +482,14 @@ HB_FUNC( POLYDRAW )
if ( Array2Point(aSub, &pt ))
{
*(Point+i) = pt ;
_itemRelease( aSub );
hb_itemRelease( aSub );
}
else
{
hb_retl(0);
hb_xfree(PolyPoints);
hb_xfree(Point);
_itemRelease( aSub );
hb_itemRelease( aSub );
return ;
}
}
@@ -539,13 +539,13 @@ HB_FUNC( POLYBEZIER )
if ( Array2Point(aSub, &pt ))
{
*(Point+i) = pt ;
_itemRelease( aSub );
hb_itemRelease( aSub );
}
else
{
hb_retl(0);
hb_xfree(Point);
_itemRelease( aSub );
hb_itemRelease( aSub );
return ;
}
}
@@ -589,13 +589,13 @@ HB_FUNC( POLYBEZIERTO )
if ( Array2Point(aSub, &pt ))
{
*(Point+i) = pt ;
_itemRelease( aSub );
hb_itemRelease( aSub );
}
else
{
hb_retl(0);
hb_xfree(Point);
_itemRelease( aSub );
hb_itemRelease( aSub );
return ;
}
}
@@ -737,13 +737,13 @@ HB_FUNC( POLYGON )
if ( Array2Point(aSub, &pt ))
{
*(Point+i) = pt ;
_itemRelease( aSub );
hb_itemRelease( aSub );
}
else
{
hb_retl(0);
hb_xfree(Point);
_itemRelease( aSub );
hb_itemRelease( aSub );
return ;
}
}
@@ -796,14 +796,14 @@ HB_FUNC( POLYPOLYGON )
if ( Array2Point(aSub, &pt ))
{
*(Point+i) = pt ;
_itemRelease( aSub );
hb_itemRelease( aSub );
}
else
{
hb_retl(0);
hb_xfree(PolyPoints);
hb_xfree(Point);
_itemRelease( aSub );
hb_itemRelease( aSub );
return ;
}
}

2
harbour/contrib/hbwhat32/whtfont.c
View File

@@ -13,7 +13,7 @@
#define _WIN32_WINNT 0x0400
#include <windows.h>
#include "item.api"
#include "hbapiitm.h"
#include "hbapi.h"
#include "hbvm.h"
#include "hbstack.h"

64
harbour/contrib/hbwhat32/whtgdi.c
View File

@@ -20,7 +20,7 @@
//#include <shlobj.h>
#include <windows.h>
#include "item.api"
#include "hbapiitm.h"
//#include "hbapiitm.h"
#include "hbapi.h"
//#include "hbvm.h"
@@ -634,8 +634,8 @@ HB_FUNC( GETCLIPBOX )
hb_retni( GetClipBox( (HDC) hb_parnl( 1 ), &Rect ) ) ;
aRect = Rect2Array( &Rect ) ;
_itemReturn( aRect );
_itemRelease( aRect );
hb_itemReturn( aRect );
hb_itemRelease( aRect );
}
@@ -737,8 +737,8 @@ HB_FUNC( GETUPDATERECT )
if ( GetUpdateRect( (HWND) hb_parnl( 1 ), &Rect, hb_parl( 2 ) ) )
{
aRect = Rect2Array( &Rect ) ;
_itemReturn( aRect );
_itemRelease( aRect );
hb_itemReturn( aRect );
hb_itemRelease( aRect );
}
}
@@ -797,59 +797,59 @@ HB_FUNC( GETDRAWITEMSTRUCT )
DRAWITEMSTRUCT *dis =(DRAWITEMSTRUCT*) hb_parnl( 1 ) ;
PHB_ITEM arrDis = _itemArrayNew(12) ;
PHB_ITEM arrDis = hb_itemArrayNew(12) ;
PHB_ITEM temp ;
temp = _itemPutNL( NULL, dis->CtlType );
temp = hb_itemPutNL( NULL, dis->CtlType );
hb_arraySet( arrDis, 1, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, dis->CtlID );
temp = hb_itemPutNL( NULL, dis->CtlID );
hb_arraySet( arrDis, 2, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, dis->itemID );
temp = hb_itemPutNL( NULL, dis->itemID );
hb_arraySet( arrDis, 3, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, dis->itemAction );
temp = hb_itemPutNL( NULL, dis->itemAction );
hb_arraySet( arrDis, 4, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, dis->itemState );
temp = hb_itemPutNL( NULL, dis->itemState );
hb_arraySet( arrDis, 5, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, (LONG) dis->hwndItem );
temp = hb_itemPutNL( NULL, (LONG) dis->hwndItem );
hb_arraySet( arrDis, 6, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, (LONG) dis->hDC );
temp = hb_itemPutNL( NULL, (LONG) dis->hDC );
hb_arraySet( arrDis, 7, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, dis->rcItem.left );
temp = hb_itemPutNL( NULL, dis->rcItem.left );
hb_arraySet( arrDis, 8, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, dis->rcItem.top );
temp = hb_itemPutNL( NULL, dis->rcItem.top );
hb_arraySet( arrDis, 9, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, dis->rcItem.right );
temp = hb_itemPutNL( NULL, dis->rcItem.right );
hb_arraySet( arrDis, 10, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, dis->rcItem.bottom );
temp = hb_itemPutNL( NULL, dis->rcItem.bottom );
hb_arraySet( arrDis, 11, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, dis->itemData );
temp = hb_itemPutNL( NULL, dis->itemData );
hb_arraySet( arrDis, 12, temp );
_itemRelease( temp );
hb_itemRelease( temp );
_itemReturn( arrDis );
_itemRelease( arrDis );
hb_itemReturn( arrDis );
hb_itemRelease( arrDis );
}

16
harbour/contrib/hbwhat32/whthead.c
View File

@@ -12,7 +12,7 @@
#include <shlobj.h>
#include <commctrl.h>
#include "item.api"
#include "hbapiitm.h"
#include "hbapi.h"
extern PHB_ITEM Rect2Array( RECT *rc );
@@ -128,16 +128,16 @@ HB_FUNC( HEADER_GETORDERARRAY )
if ( lRet )
{
aInt = _itemArrayNew(iCount ) ;
aInt = hb_itemArrayNew(iCount ) ;
for ( i = 0; i<iCount ; i++)
{
temp = _itemPutNL( NULL, lpi[i] );
temp = hb_itemPutNL( NULL, lpi[i] );
hb_arraySet( aInt, i+1, temp );
_itemRelease( temp );
hb_itemRelease( temp );
}
_itemReturn(aInt);
_itemRelease(aInt);
hb_itemReturn(aInt);
hb_itemRelease(aInt);
hb_xfree( lpi ) ;
}
}
@@ -195,8 +195,8 @@ HB_FUNC( HEADER_GETITEMRECT )
if ( Header_GetItemRect((HWND) hb_parnl(1), (WPARAM) hb_parni(2), &rc ) )
{
aRc = Rect2Array( &rc );
_itemReturn( aRc );
_itemRelease( aRc );
hb_itemReturn( aRc );
hb_itemRelease( aRc );
}

2
harbour/contrib/hbwhat32/whticon.c
View File

@@ -12,7 +12,7 @@
//#include <shlobj.h>
#include <windows.h>
//#include <commctrl.h>
#include "item.api"
#include "hbapiitm.h"
//#include "hbapiitm.h"
#include "hbapi.h"
//#include "hbvm.h"

2
harbour/contrib/hbwhat32/whtkbrd.c
View File

@@ -23,7 +23,7 @@ Modified functions:
#include <windows.h>
//#include <commctrl.h>
//#include <winuser.h>
#include "item.api"
#include "hbapiitm.h"
#include "hbapi.h"
//#include "commctrl.h"

2
harbour/contrib/hbwhat32/whtlv.c
View File

@@ -8,7 +8,7 @@
#include <shlobj.h>
//#include <commctrl.h>
#include "item.api"
#include "hbapiitm.h"
#include "hbapi.h"
#include "commctrl.h"
#include "hbvm.h"

2
harbour/contrib/hbwhat32/whtmeta.c
View File

@@ -13,7 +13,7 @@
#include <shlobj.h>
//#include <commctrl.h>
#include "item.api"
#include "hbapiitm.h"
#include "hbapiitm.h"
#include "hbapi.h"
#include "hbvm.h"

6
harbour/contrib/hbwhat32/whtmous.c
View File

@@ -14,7 +14,7 @@
//#include <shlobj.h>
#include <windows.h>
#include "item.api"
#include "hbapiitm.h"
//#include "hbapiitm.h"
#include "hbapi.h"
//#include "hbvm.h"
@@ -142,8 +142,8 @@ HB_FUNC( GETCURSORPOS )
if ( GetCursorPos( &Point ) )
{
gcPos = Point2Array( &Point);
_itemReturn( gcPos );
_itemRelease( gcPos );
hb_itemReturn( gcPos );
hb_itemRelease( gcPos );
}
}

10
harbour/contrib/hbwhat32/whtpen.c
View File

@@ -12,7 +12,7 @@
//#include <shlobj.h>
#include <windows.h>
#include "item.api"
#include "hbapiitm.h"
//#include "hbapiitm.h"
#include "hbapi.h"
//#include "hbvm.h"
@@ -24,9 +24,9 @@
HB_FUNC( CREATEPEN )
{
hb_retnl( (LONG) CreatePen(
hb_parni( 1 ), // pen style
hb_parni( 2 ), // pen width
(COLORREF) hb_parnl( 3 ) // pen color
hb_parni( 1 ), // pen style
hb_parni( 2 ), // pen width
(COLORREF) hb_parnl( 3 ) // pen color
) );
}
@@ -91,7 +91,7 @@ HB_FUNC( EXTCREATEPEN )
(DWORD) hb_parnl( 2 ),
&LOGBRUSH ,
(DWORD) hb_parnl( 4 ),
&&dWord4
&&dWord4
) ) ;
}

2
harbour/contrib/hbwhat32/whtprn.c
View File

@@ -11,7 +11,7 @@
#include <shlobj.h>
//#include <commctrl.h>
#include "item.api"
#include "hbapiitm.h"
#include "hbapiitm.h"
#include "hbapi.h"
#include "hbvm.h"

34
harbour/contrib/hbwhat32/whtrect.c
View File

@@ -12,7 +12,7 @@
//#include <shlobj.h>
#include <windows.h>
#include "item.api"
#include "hbapiitm.h"
//#include "hbapiitm.h"
#include "hbapi.h"
//#include "hbvm.h"
@@ -41,8 +41,8 @@ HB_FUNC( DRAWFOCUSRECT )
{
RECT lprc ;
if (ISARRAY(2) && Array2Rect( hb_param( 2 ,HB_IT_ARRAY ) , &lprc ) )
hb_retl( DrawFocusRect( (HDC) hb_parnl( 1 ), &lprc ) ) ;
if (ISARRAY(2) && Array2Rect( hb_param( 2 ,HB_IT_ARRAY ) , &lprc ) )
hb_retl( DrawFocusRect( (HDC) hb_parnl( 1 ), &lprc ) ) ;
else
hb_retl(FALSE);
}
@@ -57,7 +57,7 @@ HB_FUNC( INTERSECTCLIPRECT )
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 )
hb_parni( 5 )
) ) ;
}
@@ -73,9 +73,9 @@ HB_FUNC( FILLRECT )
if (Array2Rect( hb_param( 2 , HB_IT_ARRAY) , &rc) )
hb_retni( FillRect(
(HDC) hb_parnl( 1 ), // handle to device context
&rc, // pointer to structure with rectangle
(HBRUSH) hb_parnl( 3 ) // handle to brush
(HDC) hb_parnl( 1 ), // handle to device context
&rc, // pointer to structure with rectangle
(HBRUSH) hb_parnl( 3 ) // handle to brush
) );
}
*/
@@ -172,7 +172,7 @@ aSrc := SETRECT(2 ,3,41,60)
HB_FUNC( SETRECT )
{
RECT lprc ;
if ( SetRect( &lprc ,
hb_parni( 1 ),
hb_parni( 2 ),
@@ -182,8 +182,8 @@ HB_FUNC( SETRECT )
hb_itemRelease(hb_itemReturn(Rect2Array( &lprc)));
}
else
hb_ret( ) ;
hb_ret( ) ;
}
@@ -192,7 +192,7 @@ HB_FUNC( SETRECT )
// WINUSERAPI BOOL WINAPI SetRectEmpty( OUT LPRECT lprc);
/* Call as
Local aSrc
Local aSrc
aSrc :=SETRECTEMPTY(aSrc)
*/
@@ -225,7 +225,7 @@ HB_FUNC( COPYRECT )
RECT lprcDst ;
RECT lprcSrc ;
if ( Array2Rect(hb_param( 1, HB_IT_ARRAY ) , &lprcSrc ))
{
{
if ( CopyRect( &lprcDst, &lprcSrc ) ){
hb_itemRelease(hb_itemReturn(Rect2Array( &lprcDst)));
@@ -274,7 +274,7 @@ HB_FUNC( INFLATERECT )
// WINUSERAPI BOOL WINAPI IntersectRect( OUT LPRECT lprcDst, IN CONST RECT *lprcSrc1, IN CONST RECT *lprcSrc2);
/* Call as
Local aDest
Local aDest
local aSrc1 := { 1 , 5 , 4 , 6 }
Local asrc2 := { 10 , 50 , 24 , 66 }
aDest := INTERSECTRECT(,aSrc1,aSrc2)
@@ -465,9 +465,9 @@ HB_FUNC( PTINRECT )
if (Array2Rect( pSrc1, &lprc) && Array2Point( pSrc2, &pt))
{
hb_retl( (BOOL) PtInRect( &lprc, pt ) ) ;
}
else
else
hb_retl( FALSE) ;
}
@@ -484,7 +484,7 @@ HB_FUNC( EXCLUDECLIPRECT )
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 )
hb_parni( 5 )
) ) ;
}
@@ -497,7 +497,7 @@ HB_FUNC( EXCLUDECLIPRECT )
HB_FUNC( RECTVISIBLE )
{
RECT rc;
if ( ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc ))
hb_retl( RectVisible( (HDC) hb_parnl( 1 ), &rc ) ) ;
else

22
harbour/contrib/hbwhat32/whtrgn.c
View File

@@ -12,7 +12,7 @@
#define _WIN32_WINNT 0x0400
#include <windows.h>
#include "item.api"
#include "hbapiitm.h"
#include "hbapi.h"
extern PHB_ITEM Rect2Array( RECT *rc );
@@ -81,7 +81,7 @@ HB_FUNC( CREATEPOLYGONRGN )
iCount = (int) hb_parinfa( 1, 0 ) ;
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) ) ;
aParam = hb_param(1,HB_IT_ARRAY);
for ( i = 0 ; i<iCount ; i++ )
{
aSub = hb_itemArrayGet( aParam, i+1 );
@@ -134,7 +134,7 @@ HB_FUNC( CREATEPOLYPOLYGONRGN )
iCount = hb_parinfa( 1, 0 ) ;
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) ) ;
aParam = hb_param(1,HB_IT_ARRAY);
for ( i = 0 ; i<iCount ; i++ )
{
aSub = hb_itemArrayGet( aParam, i+1 );
@@ -263,7 +263,7 @@ HB_FUNC( EXTSELECTCLIPRGN )
{
hb_retni( ExtSelectClipRgn( (HDC) hb_parnl( 1 ) ,
(HRGN) hb_parnl( 2 ),
hb_parni( 3 )
hb_parni( 3 )
) ) ;
}
@@ -290,7 +290,7 @@ HB_FUNC( GETRANDOMRGN )
{
hb_retni( GetRandomRgn( (HDC) hb_parnl( 1 ) ,
(HRGN) hb_parnl( 2 ),
hb_parni( 3 )
hb_parni( 3 )
) ) ;
}
@@ -315,7 +315,7 @@ HB_FUNC( FRAMERGN )
(HRGN) hb_parnl( 2 ) ,
(HBRUSH) hb_parnl( 3 ),
hb_parni( 4 ) ,
hb_parni( 5 )
hb_parni( 5 )
) ) ;
}
@@ -343,7 +343,7 @@ HB_FUNC( VALIDATERECT )
hb_retl( ValidateRect( (HWND) hb_parnl( 1 ), &rc ) ) ;
else
hb_retl( ValidateRect( (HWND) hb_parnl( 1 ), NULL) ) ;
}
*/
@@ -356,7 +356,7 @@ HB_FUNC( INVALIDATERGN )
{
hb_retl( InvalidateRgn( (HWND) hb_parnl( 1 ),
(HRGN) hb_parnl( 2 ),
hb_parl( 3 )
hb_parl( 3 )
) ) ;
}
@@ -444,7 +444,7 @@ HB_FUNC( SETRECTRGN )
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 )
hb_parni( 5 )
) ) ;
}
@@ -457,7 +457,7 @@ HB_FUNC( GETUPDATERGN )
{
hb_retni( GetUpdateRgn( (HWND) hb_parnl( 1 ),
(HRGN) hb_parnl( 2 ),
hb_parl( 3 )
hb_parl( 3 )
) ) ;
}
@@ -481,7 +481,7 @@ HB_FUNC( EXCLUDEUPDATERGN )
/*
HB_FUNC( GETRGNBOX )
{
RECT *rc ;

26
harbour/contrib/hbwhat32/whttab.c
View File

@@ -11,7 +11,7 @@
#include <commctrl.h>
#include <shlobj.h>
#include "item.api"
#include "hbapiitm.h"
#include "hbapi.h"
#include "hbvm.h"
#include "hbstack.h"
@@ -96,29 +96,29 @@ HB_FUNC( TABCTRL_GETITEMCOUNT )
HB_FUNC( TABCTRL_GETITEMRECT )
{
RECT rc;
PHB_ITEM aRect = _itemArrayNew( 4 );
PHB_ITEM aRect = hb_itemArrayNew( 4 );
PHB_ITEM temp;
TabCtrl_GetItemRect((HWND) hb_parnl (1), hb_parni(2), &rc);
temp = _itemPutNL( NULL, rc.left );
temp = hb_itemPutNL( NULL, rc.left );
hb_arraySet( aRect, 1, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, rc.top );
temp = hb_itemPutNL( NULL, rc.top );
hb_arraySet( aRect, 2, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, rc.right );
temp = hb_itemPutNL( NULL, rc.right );
hb_arraySet( aRect, 3, temp );
_itemRelease( temp );
hb_itemRelease( temp );
temp = _itemPutNL( NULL, rc.bottom );
temp = hb_itemPutNL( NULL, rc.bottom );
hb_arraySet( aRect, 4, temp );
_itemRelease( temp );
hb_itemRelease( temp );
_itemReturn( aRect );
_itemRelease( aRect );
hb_itemReturn( aRect );
hb_itemRelease( aRect );
}
//---------------------------------------------------------------------------//
@@ -293,7 +293,7 @@ HB_FUNC( TABCTRL_GETCURFOCUS )
HB_FUNC( TABCTRL_SETCURFOCUS )
{
TabCtrl_SetCurFocus( (HWND) hb_parnl(1), (int) hb_parni(2) );
TabCtrl_SetCurFocus( (HWND) hb_parnl(1), (int) hb_parni(2) );
hb_ret();
}

6
harbour/contrib/hbwhat32/whttbar.c
View File

@@ -11,7 +11,7 @@
//#include <shlobj.h>
#include <windows.h>
#include "item.api"
#include "hbapiitm.h"
#include <commctrl.h>
//#include "hbapiitm.h"
#include "hbapi.h"
@@ -79,8 +79,8 @@ HB_FUNC( GETTOOLBARITEMRECT )
SendMessage((HWND) hb_parnl(1), TB_GETITEMRECT, hb_parni(2), (LPARAM)&rc);
// MapWindowPoints((HWND) hb_parnl(1), HWND_DESKTOP, (POINT*)&rc, 2);
aRect = Rect2Array( &rc );
_itemReturn( aRect );
_itemRelease( aRect );
hb_itemReturn( aRect );
hb_itemRelease( aRect );
}

6
harbour/contrib/hbwhat32/whttext.c
View File

@@ -10,7 +10,7 @@
//#include <shlobj.h>
#include <windows.h>
#include "item.api"
#include "hbapiitm.h"
//#include "hbapiitm.h"
#include "hbapi.h"
//#include "hbvm.h"
@@ -297,8 +297,8 @@ HB_FUNC( GETTEXTEXTENTPOINT32 )
if ( GetTextExtentPoint32( (HDC) hb_parnl(1), pstr, strlen( pstr ), &sz ) )
{
aMetr = Size2Array( &sz ) ;
_itemReturn( aMetr );
_itemRelease( aMetr );
hb_itemReturn( aMetr );
hb_itemRelease( aMetr );
}
}

26
harbour/contrib/hbwhat32/whtview.c
View File

@@ -9,7 +9,7 @@
#define _WIN32_WINNT 0x0400
#include <windows.h>
#include "item.api"
#include "hbapiitm.h"
#include "hbapi.h"
extern PHB_ITEM Rect2Array( RECT *rc );
@@ -33,8 +33,8 @@ HB_FUNC( GETVIEWPORTEXTEX )
if ( GetViewportExtEx( (HDC) hb_parnl( 1 ), &siz ) )
{
aSize = Size2Array( &siz );
_itemReturn( aSize );
_itemRelease( aSize );
hb_itemReturn( aSize );
hb_itemRelease( aSize );
}
}
@@ -54,8 +54,8 @@ HB_FUNC( GETVIEWPORTORGEX )
if ( GetViewportOrgEx( (HDC) hb_parnl( 1 ), &pt ) )
{
aPoint = Point2Array( &pt );
_itemReturn( aPoint );
_itemRelease( aPoint );
hb_itemReturn( aPoint );
hb_itemRelease( aPoint );
}
}
@@ -75,8 +75,8 @@ HB_FUNC( GETWINDOWEXTEX )
if ( GetWindowExtEx( (HDC) hb_parnl( 1 ), &siz ) )
{
aSize = Size2Array( &siz );
_itemReturn( aSize );
_itemRelease( aSize );
hb_itemReturn( aSize );
hb_itemRelease( aSize );
}
}
@@ -96,8 +96,8 @@ HB_FUNC( SCALEVIEWPORTEXTEX )
hb_parni( 4 ) , hb_parni( 5 ), &siz ) )
{
aSize = Size2Array( &siz );
_itemReturn( aSize );
_itemRelease( aSize );
hb_itemReturn( aSize );
hb_itemRelease( aSize );
}
}
@@ -117,8 +117,8 @@ HB_FUNC( SETVIEWPORTEXTEX )
if ( SetViewportExtEx( (HDC) hb_parnl( 1 ), hb_parni( 2 ), hb_parni( 3 ), &siz ) )
{
aSize = Size2Array( &siz );
_itemReturn( aSize );
_itemRelease( aSize );
hb_itemReturn( aSize );
hb_itemRelease( aSize );
}
}
@@ -138,8 +138,8 @@ HB_FUNC( SETVIEWPORTORGEX )
if ( SetViewportOrgEx( (HDC) hb_parnl( 1 ),hb_parni( 2 ), hb_parni( 3 ), &pt ) )
{
aPoint = Point2Array( &pt );
_itemReturn( aPoint );
_itemRelease( aPoint );
hb_itemReturn( aPoint );
hb_itemRelease( aPoint );
}
}

18
harbour/contrib/hbwhat32/whtwnd.c
View File

@@ -6,7 +6,7 @@
#include <windows.h>
#include <winuser.h>
#include "item.api"
#include "hbapiitm.h"
#include "hbapi.h"
extern PHB_ITEM Rect2Array( RECT *rc );
@@ -248,8 +248,8 @@ HB_FUNC( GETCLIENTRECT )
aMetr = Rect2Array( &rc );
_itemReturn( aMetr );
_itemRelease( aMetr );
hb_itemReturn( aMetr );
hb_itemRelease( aMetr );
}
//-----------------------------------------------------------------------------
@@ -265,8 +265,8 @@ HB_FUNC( GETWINDOWRECT )
GetWindowRect( (HWND) hb_parnl( 1 ), &rc );
aMetr = Rect2Array( &rc );
_itemReturn( aMetr );
_itemRelease( aMetr );
hb_itemReturn( aMetr );
hb_itemRelease( aMetr );
}
@@ -1160,8 +1160,8 @@ HB_FUNC( SETWINDOWEXTEX )
{
pArray = Size2Array(&lpSize) ;
_itemReturn( pArray );
_itemRelease( pArray );
hb_itemReturn( pArray );
hb_itemRelease( pArray );
}
}
@@ -1187,8 +1187,8 @@ HB_FUNC( SETWINDOWORGEX )
{
pArray = Point2Array(&lpPoint) ;
_itemReturn( pArray );
_itemRelease( pArray );
hb_itemReturn( pArray );
hb_itemRelease( pArray );
}
}

2
harbour/utils/hbdoc/bld_vc.bat
View File

@@ -5,7 +5,7 @@ rem
..\..\bin\harbour /w3 /q /n /km /i..\..\include hbdoc ft_funcs genasc genchm genhpc genhtm genng genos2 genpdf1 genrtf gentrf
cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\include hbdoc.c ft_funcs.c genasc.c genchm.c genhpc.c genhtm.c genng.c genos2.c genpdf1.c genrtf.c gentrf.c hbdfrdln.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib winspool.lib
cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\include hbdoc.c ft_funcs.c genasc.c genchm.c genhpc.c genhtm.c genng.c genos2.c genpdf1.c genrtf.c gentrf.c hbdfrdln.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib
del *.obj
del hbdoc.c ft_funcs.c genasc.c genchm.c genhpc.c genhtm.c genng.c genos2.c genpdf1.c genrtf.c gentrf.c

2
harbour/utils/hbmake/bld_vc.bat
View File

@@ -5,7 +5,7 @@ rem
..\..\bin\harbour /w3 /q /n /km /i..\..\include hbmake
cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\include hbmake.c hbmfrdln.c hbmgauge.c hbmlang.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib winspool.lib
cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -TP -W3 -I..\..\include hbmake.c hbmfrdln.c hbmgauge.c hbmlang.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib
del *.obj
del hbmake.c