diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ac51fb581e..2422bb9b34 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,20 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-25 09:29 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * include/hbapirdd.h + ! Typos in comments. + + * contrib/hbct/print.c + + Rewritten PRINTREADY() to work on all platforms the core + supports. + + * contrib/sddoci/sddoci.c + + Added 'nullable' flag support. By the name it's right, + but it's foggy which flag constants belong to which + structure and rdd code suggest this flag does something + else depsite the name. Pls look at it. + 2010-03-25 09:10 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbbz2/hbbz2.c * use hb_xalloc()/hb_xfree() inside BZIP2 code to allocate/free memory diff --git a/harbour/contrib/hbct/print.c b/harbour/contrib/hbct/print.c index d7d0310eae..011bef649c 100644 --- a/harbour/contrib/hbct/print.c +++ b/harbour/contrib/hbct/print.c @@ -6,12 +6,9 @@ * Harbour Project source code: * CT3 Printer functions: * - * PRINTSTAT(), PRINTREADY() - * Copyright 2001 Walter Negro - FOEESITRA" - * - * PRINTSEND() - * Copyright 2004 Phil Krylov - * + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) (PRINTREADY()) + * Copyright 2004 Phil Krylov (PRINTSEND()) + * Copyright 2001 Walter Negro - FOEESITRA" (PRINTSTAT()) * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -138,34 +135,18 @@ HB_FUNC( PRINTSTAT ) * $PLATFORMS$ * DOS * $FILES$ - * Source is print.c, library is libct. + * Library is libct. * $SEEALSO$ * $END$ */ HB_FUNC( PRINTREADY ) { - HB_USHORT uiPort = HB_ISNUM( 1 ) ? ( HB_USHORT ) hb_parni( 1 ) : 1; - int Status = 0; + char szLPT[ 8 ]; -#if defined( HB_OS_DOS ) + hb_snprintf( szLPT, sizeof( szLPT ), "LPT%hu", HB_ISNUM( 1 ) ? ( HB_USHORT ) hb_parni( 1 ) : 1 ); - /* NOTE: DOS specific solution, using BIOS interrupt */ - - union REGS regs; - - regs.h.ah = 2; - regs.HB_XREGS.dx = uiPort - 1; - - HB_DOS_INT86( 0x17, ®s, ®s ); - - Status = regs.h.ah; - -#else - HB_SYMBOL_UNUSED( uiPort ); -#endif - - hb_retl( Status == 0x90 ); + hb_retl( hb_printerIsReady( szLPT ) ); } diff --git a/harbour/contrib/sddoci/sddoci.c b/harbour/contrib/sddoci/sddoci.c index 40f5760b2e..62095e6182 100644 --- a/harbour/contrib/sddoci/sddoci.c +++ b/harbour/contrib/sddoci/sddoci.c @@ -374,7 +374,8 @@ static HB_ERRCODE ocilibOpen( SQLBASEAREAP pArea ) iDec = OCI_ColumnGetPrecision( col ); bNullable = ( HB_BOOL ) OCI_ColumnGetNullable( col ); - HB_SYMBOL_UNUSED( bNullable ); + if( bNullable ) + pFieldInfo.uiFlags |= HB_FF_NULLABLE; pFieldInfo.uiLen = ( HB_USHORT ) uiSize; pFieldInfo.uiDec = ( HB_USHORT ) iDec; diff --git a/harbour/include/hbapirdd.h b/harbour/include/hbapirdd.h index fd78c156bd..b84f591bc7 100644 --- a/harbour/include/hbapirdd.h +++ b/harbour/include/hbapirdd.h @@ -87,7 +87,7 @@ HB_EXTERN_BEGIN -/* FIeld types */ +/* Field types */ #define HB_FT_NONE 0 #define HB_FT_STRING 1 /* "C" */ @@ -113,7 +113,7 @@ HB_EXTERN_BEGIN -/* FIeld flags */ +/* Field flags */ #define HB_FF_HIDDEN 0x0001 /* System Column (not visible to user) */ #define HB_FF_NULLABLE 0x0002 /* Column can store null values */