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

2010-02-05 13:54 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/rtl/gttone.c
    + Using ANSI C types.
    ! ULONG -> DWORD for Windows API calls.

  * src/rtl/direct.c
    ! ULONG -> HB_FATTR

  * src/rtl/itemseri.c
  * include/hbapiitm.h
    * ULONG -> HB_SIZE

  * src/rtl/samples.c
    + Using ANSI C types. This fixes possible
      incompatibilities with original .prg implementation
      in Clipper.

  * contrib/hbhpdf/harupdf.c
    * Conversion to libharu BOOL value cleaned.

  * include/hbapicdp.h
  * utils/hbmk2/hbmk2.prg
    * Formatting.
This commit is contained in:
Viktor Szakats
2010-02-05 12:55:25 +00:00
parent 900ed57db1
commit f435054ba7
9 changed files with 168 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
harbour/ChangeLog
View File

@@ -17,6 +17,30 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-02-05 13:54 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/gttone.c
+ Using ANSI C types.
! ULONG -> DWORD for Windows API calls.
* src/rtl/direct.c
! ULONG -> HB_FATTR
* src/rtl/itemseri.c
* include/hbapiitm.h
* ULONG -> HB_SIZE
* src/rtl/samples.c
+ Using ANSI C types. This fixes possible
incompatibilities with original .prg implementation
in Clipper.
* contrib/hbhpdf/harupdf.c
* Conversion to libharu BOOL value cleaned.
* include/hbapicdp.h
* utils/hbmk2/hbmk2.prg
* Formatting.
2010-02-05 11:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/setpos.c
* src/rtl/console.c

12
harbour/contrib/hbhpdf/harupdf.c
View File

@@ -335,7 +335,7 @@ HB_FUNC( HPDF_LOADTTFONTFROMFILE )
char * pszFree;
const char * pszFileName = hb_fsNameConv( hb_parcx( 2 ), &pszFree );
hb_retc( HPDF_LoadTTFontFromFile( HPDF_Doc_par( 1 ), pszFileName, hb_parl( 3 ) ) );
hb_retc( HPDF_LoadTTFontFromFile( HPDF_Doc_par( 1 ), pszFileName, hb_parl( 3 ) ? HPDF_TRUE : HPDF_FALSE ) );
if( pszFree )
hb_xfree( pszFree );
@@ -348,7 +348,7 @@ HB_FUNC( HPDF_LOADTTFONTFROMFILE2 )
char * pszFree;
const char * pszFileName = hb_fsNameConv( hb_parcx( 2 ), &pszFree );
hb_retc( HPDF_LoadTTFontFromFile2( HPDF_Doc_par( 1 ), pszFileName, hb_parni( 3 ), hb_parl( 4 ) ) );
hb_retc( HPDF_LoadTTFontFromFile2( HPDF_Doc_par( 1 ), pszFileName, hb_parni( 3 ), hb_parl( 4 ) ? HPDF_TRUE : HPDF_FALSE ) );
if( pszFree )
hb_xfree( pszFree );
@@ -705,7 +705,7 @@ HB_FUNC( HPDF_PAGE_TEXTWIDTH )
*/
HB_FUNC( HPDF_PAGE_MEASURETEXT )
{
hb_retnl( ( long ) HPDF_Page_MeasureText( ( HPDF_Page ) hb_parptr( 1 ), hb_parc( 2 ), ( HPDF_REAL ) hb_parnd( 3 ), hb_parl( 4 ), NULL ) );
hb_retnl( ( long ) HPDF_Page_MeasureText( ( HPDF_Page ) hb_parptr( 1 ), hb_parc( 2 ), ( HPDF_REAL ) hb_parnd( 3 ), hb_parl( 4 ) ? HPDF_TRUE : HPDF_FALSE, NULL ) );
}
/*----------------------------------------------------------------------*/
/* HPdf_Page_GetMode( hPage ) -> nGraphicMode
@@ -1548,7 +1548,7 @@ HB_FUNC( HPDF_FONT_MEASURETEXT )
( HPDF_REAL ) hb_parnd( 5 ),
( HPDF_REAL ) hb_parnd( 6 ),
( HPDF_REAL ) hb_parnd( 7 ),
hb_parl( 8 ),
hb_parl( 8 ) ? HPDF_TRUE : HPDF_FALSE,
NULL ) );
}
/*----------------------------------------------------------------------*/
@@ -1643,7 +1643,7 @@ HB_FUNC( HPDF_TEXTANNOT_SETICON )
*/
HB_FUNC( HPDF_TEXTANNOT_SETOPENED )
{
hb_retnl( ( long ) HPDF_TextAnnot_SetOpened( ( HPDF_Annotation ) hb_parptr( 1 ), hb_parl( 2 ) ) );
hb_retnl( ( long ) HPDF_TextAnnot_SetOpened( ( HPDF_Annotation ) hb_parptr( 1 ), hb_parl( 2 ) ? HPDF_TRUE : HPDF_FALSE ) );
}
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
@@ -1656,7 +1656,7 @@ HB_FUNC( HPDF_TEXTANNOT_SETOPENED )
*/
HB_FUNC( HPDF_OUTLINE_SETOPENED )
{
hb_retnl( ( long ) HPDF_Outline_SetOpened( ( HPDF_Outline ) hb_parptr( 1 ), hb_parl( 2 ) ) );
hb_retnl( ( long ) HPDF_Outline_SetOpened( ( HPDF_Outline ) hb_parptr( 1 ), hb_parl( 2 ) ? HPDF_TRUE : HPDF_FALSE ) );
}
/*----------------------------------------------------------------------*/
/* HPDF_Outline_SetDestination( hOutline, hDestn ) -> hStatus

2
harbour/include/hbapicdp.h
View File

@@ -384,7 +384,7 @@ extern HB_EXPORT int hb_cdpU16CharToUTF8( char * szUTF8, HB_WCHAR wc );
extern HB_EXPORT HB_BOOL hb_cdpUTF8ToU16NextChar( unsigned char ucChar, int * n, HB_WCHAR * pwc );
extern HB_EXPORT PHB_ITEM hb_itemDeserializeCP( const char ** pBufferPtr, HB_SIZE * pulSize, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut );
extern HB_EXPORT char * hb_itemSerializeCP( PHB_ITEM pItem, HB_BOOL fNumSize, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut, HB_SIZE *pulSize );
extern HB_EXPORT char * hb_itemSerializeCP( PHB_ITEM pItem, HB_BOOL fNumSize, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut, HB_SIZE * pulSize );
#ifdef HB_LEGACY_LEVEL2
extern HB_EXPORT void hb_cdpTranslate( char *, PHB_CODEPAGE, PHB_CODEPAGE );

4
harbour/include/hbapiitm.h
View File

@@ -179,8 +179,8 @@ extern HB_EXPORT PHB_ITEM hb_itemValToStr ( PHB_ITEM pItem ); /* Convert an
extern HB_EXPORT char * hb_itemPadConv ( PHB_ITEM pItem, HB_SIZE * pulSize, HB_BOOL * bFreeReq );
extern HB_EXPORT void hb_itemSwap ( PHB_ITEM pItem1, PHB_ITEM pItem2 );
extern HB_EXPORT char * hb_itemSerialize( PHB_ITEM pItem, HB_BOOL fNumSize, ULONG * pulSize );
extern HB_EXPORT PHB_ITEM hb_itemDeserialize( const char ** pBufferPtr, ULONG * pulSize );
extern HB_EXPORT char * hb_itemSerialize( PHB_ITEM pItem, HB_BOOL fNumSize, HB_SIZE * pulSize );
extern HB_EXPORT PHB_ITEM hb_itemDeserialize( const char ** pBufferPtr, HB_SIZE * pulSize );
#if defined( _HB_API_INTERNAL_ )

2
harbour/src/rtl/direct.c
View File

@@ -108,7 +108,7 @@ HB_FUNC( DIRECTORY )
const char * szDirSpec = hb_parc( 1 );
const char * szAttributes = hb_parc( 2 );
char * pszFree = NULL;
ULONG ulMask;
HB_FATTR ulMask;
PHB_ITEM pDir = hb_itemArrayNew( 0 );
PHB_FFIND ffind;

28
harbour/src/rtl/gttone.c
View File

@@ -78,9 +78,9 @@
#include <conio.h>
#endif
static int hb_Inp9x( USHORT usPort )
static int hb_Inp9x( unsigned short int usPort )
{
USHORT usVal;
unsigned short int usVal;
HB_TRACE(HB_TR_DEBUG, ("hb_Inp9x(%hu)", usPort));
@@ -105,11 +105,11 @@ static int hb_Inp9x( USHORT usPort )
#elif defined( __WATCOMC__ )
usVal = ( USHORT ) inp( usPort );
usVal = ( unsigned short int ) inp( usPort );
#else
usVal = ( USHORT ) _inp( usPort );
usVal = ( unsigned short int ) _inp( usPort );
#endif
@@ -118,7 +118,7 @@ static int hb_Inp9x( USHORT usPort )
/* *********************************************************************** */
static int hb_Outp9x( USHORT usPort, USHORT usVal )
static int hb_Outp9x( unsigned short int usPort, unsigned short int usVal )
{
HB_TRACE(HB_TR_DEBUG, ("hb_Outp9x(%hu, %hu)", usPort, usVal));
@@ -157,8 +157,8 @@ static int hb_Outp9x( USHORT usPort, USHORT usVal )
/* dDurat is in seconds */
static void hb_gt_w9xTone( double dFreq, double dDurat )
{
INT uLSB, uMSB;
ULONG lAdjFreq;
int uLSB, uMSB;
unsigned long lAdjFreq;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_w9xtone(%lf, %lf)", dFreq, dDurat));
@@ -173,29 +173,29 @@ static void hb_gt_w9xTone( double dFreq, double dDurat )
/* Setup Sound Control Port Registers and timer channel 2 */
hb_Outp9x( 67, 182 );
lAdjFreq = ( ULONG ) ( 1193180 / dFreq );
lAdjFreq = ( unsigned long ) ( 1193180 / dFreq );
if( ( LONG ) lAdjFreq < 0 )
if( ( long ) lAdjFreq < 0 )
uLSB = lAdjFreq + 65536;
else
uLSB = lAdjFreq % 256;
if( ( LONG ) lAdjFreq < 0 )
if( ( long ) lAdjFreq < 0 )
uMSB = lAdjFreq + 65536;
else
uMSB = lAdjFreq / 256;
/* set the frequency ( LSB, MSB ) */
hb_Outp9x( 66, ( USHORT ) uLSB );
hb_Outp9x( 66, ( USHORT ) uMSB );
hb_Outp9x( 66, ( unsigned short int ) uLSB );
hb_Outp9x( 66, ( unsigned short int ) uMSB );
/* Get current Port setting */
/* enable Speaker Data & Timer gate bits */
/* (00000011B is bitmask to enable sound) */
/* Turn on Speaker - sound Tone for duration.. */
hb_Outp9x( 97, ( USHORT ) hb_Inp9x( 97 ) | 3 );
hb_Outp9x( 97, ( unsigned short int ) hb_Inp9x( 97 ) | 3 );
hb_idleSleep( dDurat );
@@ -222,7 +222,7 @@ static void hb_gt_wNtTone( double dFreq, double dDurat )
less than < 20 hz. Windows NT minimum is 37... */
if( dFreq >= 37.0 )
Beep( ( ULONG ) dFreq, ( ULONG ) ( dDurat * 1000 ) ); /* Beep wants Milliseconds */
Beep( ( DWORD ) dFreq, ( DWORD ) ( dDurat * 1000 ) ); /* Beep wants Milliseconds */
else
hb_idleSleep( dDurat );
}

92
harbour/src/rtl/itemseri.c
View File

@@ -145,23 +145,23 @@ UCHAR [ 1 ] - item type
#define HB_SERIAL_HASHFLAGS 40
#define HB_SERIAL_HASHDEFVAL 41
#define HB_SERIAL_DUMMYOFFSET ( ( ULONG ) -1 )
#define HB_SERIAL_DUMMYOFFSET ( ( HB_SIZE ) -1 )
typedef struct _HB_CYCLIC_REF
{
void * value;
ULONG ulOffset;
HB_SIZE ulOffset;
HB_BOOL fRef;
struct _HB_CYCLIC_REF * pNext;
} HB_CYCLIC_REF, * PHB_CYCLIC_REF;
static ULONG hb_deserializeItem( PHB_ITEM pItem,
PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut,
const UCHAR * pBuffer, ULONG ulOffset,
PHB_CYCLIC_REF pRef );
static HB_SIZE hb_deserializeItem( PHB_ITEM pItem,
PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut,
const UCHAR * pBuffer, HB_SIZE ulOffset,
PHB_CYCLIC_REF pRef );
static HB_BOOL hb_itemSerialValueRef( PHB_CYCLIC_REF * pRefPtr, void * value,
ULONG ulOffset )
HB_SIZE ulOffset )
{
while( * pRefPtr )
{
@@ -200,7 +200,7 @@ static void hb_itemSerialUnRefFree( PHB_CYCLIC_REF * pRefPtr )
}
static HB_BOOL hb_itemSerialValueOffset( PHB_CYCLIC_REF pRef, void * value,
ULONG ulOffset, ULONG * pulRef )
HB_SIZE ulOffset, HB_SIZE * pulRef )
{
while( pRef )
{
@@ -217,7 +217,7 @@ static HB_BOOL hb_itemSerialValueOffset( PHB_CYCLIC_REF pRef, void * value,
}
static HB_BOOL hb_itemSerialOffsetRef( PHB_CYCLIC_REF * pRefPtr, void * value,
ULONG ulOffset )
HB_SIZE ulOffset )
{
while( * pRefPtr )
{
@@ -236,7 +236,7 @@ static HB_BOOL hb_itemSerialOffsetRef( PHB_CYCLIC_REF * pRefPtr, void * value,
}
static void hb_itemSerialOffsetSet( PHB_CYCLIC_REF pRef, PHB_ITEM pItem,
ULONG ulOffset )
HB_SIZE ulOffset )
{
while( pRef )
{
@@ -250,7 +250,7 @@ static void hb_itemSerialOffsetSet( PHB_CYCLIC_REF pRef, PHB_ITEM pItem,
}
static void hb_itemSerialOffsetGet( PHB_CYCLIC_REF pRef, PHB_ITEM pItem,
ULONG ulOffset )
HB_SIZE ulOffset )
{
while( pRef )
{
@@ -273,11 +273,11 @@ static void hb_itemSerialRefFree( PHB_CYCLIC_REF pRef )
}
}
static ULONG hb_itemSerialSize( PHB_ITEM pItem, HB_BOOL fNumSize,
PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut,
PHB_CYCLIC_REF * pRefPtr, ULONG ulOffset )
static HB_SIZE hb_itemSerialSize( PHB_ITEM pItem, HB_BOOL fNumSize,
PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut,
PHB_CYCLIC_REF * pRefPtr, HB_SIZE ulOffset )
{
ULONG ulSize, ulLen, u;
HB_SIZE ulSize, ulLen, u;
HB_LONG lVal;
USHORT uiClass;
PHB_ITEM pDefVal;
@@ -425,17 +425,17 @@ static ULONG hb_itemSerialSize( PHB_ITEM pItem, HB_BOOL fNumSize,
return ulSize;
}
static ULONG hb_serializeItem( PHB_ITEM pItem, HB_BOOL fNumSize,
PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut,
UCHAR * pBuffer, ULONG ulOffset,
PHB_CYCLIC_REF pRef )
static HB_SIZE hb_serializeItem( PHB_ITEM pItem, HB_BOOL fNumSize,
PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut,
UCHAR * pBuffer, HB_SIZE ulOffset,
PHB_CYCLIC_REF pRef )
{
HB_LONG lVal;
double d;
int iWidth, iDecimal;
LONG l, l2;
long l, l2;
const char * szVal;
ULONG ulRef, ulLen, ulSize, u;
HB_SIZE ulRef, ulLen, ulSize, u;
if( HB_IS_BYREF( pItem ) )
pItem = hb_itemUnRef( pItem );
@@ -764,10 +764,10 @@ static ULONG hb_serializeItem( PHB_ITEM pItem, HB_BOOL fNumSize,
return ulOffset;
}
static ULONG hb_deserializeHash( PHB_ITEM pItem,
PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut,
const UCHAR * pBuffer, ULONG ulOffset,
ULONG ulLen, PHB_CYCLIC_REF pRef )
static HB_SIZE hb_deserializeHash( PHB_ITEM pItem,
PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut,
const UCHAR * pBuffer, HB_SIZE ulOffset,
HB_SIZE ulLen, PHB_CYCLIC_REF pRef )
{
hb_hashNew( pItem );
@@ -805,12 +805,12 @@ static ULONG hb_deserializeHash( PHB_ITEM pItem,
return ulOffset;
}
static ULONG hb_deserializeArray( PHB_ITEM pItem,
PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut,
const UCHAR * pBuffer, ULONG ulOffset,
ULONG ulLen, PHB_CYCLIC_REF pRef )
static HB_SIZE hb_deserializeArray( PHB_ITEM pItem,
PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut,
const UCHAR * pBuffer, HB_SIZE ulOffset,
HB_SIZE ulLen, PHB_CYCLIC_REF pRef )
{
ULONG u;
HB_SIZE u;
hb_arrayNew( pItem, ulLen );
for( u = 1; u <= ulLen; u++ )
@@ -820,12 +820,12 @@ static ULONG hb_deserializeArray( PHB_ITEM pItem,
return ulOffset;
}
static ULONG hb_deserializeItem( PHB_ITEM pItem,
PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut,
const UCHAR * pBuffer, ULONG ulOffset,
PHB_CYCLIC_REF pRef )
static HB_SIZE hb_deserializeItem( PHB_ITEM pItem,
PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut,
const UCHAR * pBuffer, HB_SIZE ulOffset,
PHB_CYCLIC_REF pRef )
{
ULONG ulLen, ulPad, ulSize;
HB_SIZE ulLen, ulPad, ulSize;
char * szVal;
switch( pBuffer[ ulOffset++ ] )
@@ -1085,11 +1085,11 @@ static ULONG hb_deserializeItem( PHB_ITEM pItem,
return ulOffset;
}
static HB_BOOL hb_deserializeTest( const UCHAR ** pBufferPtr, ULONG * pulSize,
ULONG ulOffset, PHB_CYCLIC_REF * pRefPtr )
static HB_BOOL hb_deserializeTest( const UCHAR ** pBufferPtr, HB_SIZE * pulSize,
HB_SIZE ulOffset, PHB_CYCLIC_REF * pRefPtr )
{
const UCHAR * pBuffer = * pBufferPtr;
ULONG ulSize = * pulSize, ulLen = 0;
HB_SIZE ulSize = * pulSize, ulLen = 0;
if( ulSize == 0 )
return HB_FALSE;
@@ -1278,10 +1278,10 @@ static HB_BOOL hb_deserializeTest( const UCHAR ** pBufferPtr, ULONG * pulSize,
/*
* public API functions
*/
char * hb_itemSerialize( PHB_ITEM pItem, HB_BOOL fNumSize, ULONG *pulSize )
char * hb_itemSerialize( PHB_ITEM pItem, HB_BOOL fNumSize, HB_SIZE *pulSize )
{
PHB_CYCLIC_REF pRef = NULL;
ULONG ulSize = hb_itemSerialSize( pItem, fNumSize, NULL, NULL, &pRef, 0 );
HB_SIZE ulSize = hb_itemSerialSize( pItem, fNumSize, NULL, NULL, &pRef, 0 );
UCHAR * pBuffer = ( UCHAR * ) hb_xgrab( ulSize + 1 );
hb_itemSerialUnRefFree( &pRef );
@@ -1297,10 +1297,10 @@ char * hb_itemSerialize( PHB_ITEM pItem, HB_BOOL fNumSize, ULONG *pulSize )
char * hb_itemSerializeCP( PHB_ITEM pItem, HB_BOOL fNumSize,
PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut,
ULONG *pulSize )
HB_SIZE * pulSize )
{
PHB_CYCLIC_REF pRef = NULL;
ULONG ulSize = hb_itemSerialSize( pItem, fNumSize, cdpIn, cdpOut, &pRef, 0 );
HB_SIZE ulSize = hb_itemSerialSize( pItem, fNumSize, cdpIn, cdpOut, &pRef, 0 );
UCHAR * pBuffer = ( UCHAR * ) hb_xgrab( ulSize + 1 );
hb_itemSerialUnRefFree( &pRef );
@@ -1314,7 +1314,7 @@ char * hb_itemSerializeCP( PHB_ITEM pItem, HB_BOOL fNumSize,
return ( char * ) pBuffer;
}
PHB_ITEM hb_itemDeserialize( const char ** pBufferPtr, ULONG * pulSize )
PHB_ITEM hb_itemDeserialize( const char ** pBufferPtr, HB_SIZE * pulSize )
{
PHB_CYCLIC_REF pRef = NULL;
const UCHAR * pBuffer = ( const UCHAR * ) *pBufferPtr;
@@ -1330,7 +1330,7 @@ PHB_ITEM hb_itemDeserialize( const char ** pBufferPtr, ULONG * pulSize )
return pItem;
}
PHB_ITEM hb_itemDeserializeCP( const char ** pBufferPtr, ULONG * pulSize,
PHB_ITEM hb_itemDeserializeCP( const char ** pBufferPtr, HB_SIZE * pulSize,
PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut )
{
PHB_CYCLIC_REF pRef = NULL;
@@ -1356,7 +1356,7 @@ HB_FUNC( HB_SERIALIZE )
PHB_CODEPAGE cdpIn, cdpOut;
const char * pszCdpIn, * pszCdpOut;
char * pBuffer;
ULONG ulSize;
HB_SIZE ulSize;
pszCdpIn = hb_parc( 3 );
pszCdpOut = hb_parc( 4 );
@@ -1372,7 +1372,7 @@ HB_FUNC( HB_SERIALIZE )
HB_FUNC( HB_DESERIALIZE )
{
PHB_ITEM pItem, pParam = hb_param( 1, HB_IT_BYREF );
ULONG ulSize = hb_parclen( 1 );
HB_SIZE ulSize = hb_parclen( 1 );
if( ulSize )
{

28
harbour/src/rtl/samples.c
View File

@@ -54,21 +54,21 @@
/* NOTE: szTime must be 9 chars large. */
static char * hb_SecToTimeStr( char * pszTime, ULONG ulTime )
static char * hb_SecToTimeStr( char * pszTime, long lTime )
{
int iValue;
HB_TRACE(HB_TR_DEBUG, ("hb_SecToTimeStr(%p, %lu)", pszTime, ulTime));
HB_TRACE(HB_TR_DEBUG, ("hb_SecToTimeStr(%p, %ld)", pszTime, lTime));
iValue = ( int ) ( ( ulTime / 3600 ) % 24 );
iValue = ( int ) ( ( lTime / 3600 ) % 24 );
pszTime[ 0 ] = ( char ) ( iValue / 10 ) + '0';
pszTime[ 1 ] = ( char ) ( iValue % 10 ) + '0';
pszTime[ 2 ] = ':';
iValue = ( int ) ( ( ulTime / 60 ) % 60 );
iValue = ( int ) ( ( lTime / 60 ) % 60 );
pszTime[ 3 ] = ( char ) ( iValue / 10 ) + '0';
pszTime[ 4 ] = ( char ) ( iValue % 10 ) + '0';
pszTime[ 5 ] = ':';
iValue = ( int ) ( ulTime % 60 );
iValue = ( int ) ( lTime % 60 );
pszTime[ 6 ] = ( char ) ( iValue / 10 ) + '0';
pszTime[ 7 ] = ( char ) ( iValue % 10 ) + '0';
pszTime[ 8 ] = '\0';
@@ -76,25 +76,25 @@ static char * hb_SecToTimeStr( char * pszTime, ULONG ulTime )
return pszTime;
}
static ULONG hb_TimeStrToSec( const char * pszTime )
static long hb_TimeStrToSec( const char * pszTime )
{
HB_SIZE ulLen;
ULONG ulTime = 0;
long lTime = 0;
HB_TRACE(HB_TR_DEBUG, ("hb_TimeStrToSec(%s)", pszTime));
ulLen = strlen( pszTime );
if( ulLen >= 1 )
ulTime += ( ULONG ) hb_strVal( pszTime, ulLen ) * 3600;
lTime += ( long ) hb_strVal( pszTime, ulLen ) * 3600;
if( ulLen >= 4 )
ulTime += ( ULONG ) hb_strVal( pszTime + 3, ulLen - 3 ) * 60;
lTime += ( long ) hb_strVal( pszTime + 3, ulLen - 3 ) * 60;
if( ulLen >= 7 )
ulTime += ( ULONG ) hb_strVal( pszTime + 6, ulLen - 6 );
lTime += ( long ) hb_strVal( pszTime + 6, ulLen - 6 );
return ulTime;
return lTime;
}
HB_FUNC( DAYS )
@@ -104,11 +104,11 @@ HB_FUNC( DAYS )
HB_FUNC( ELAPTIME )
{
ULONG ulStart = hb_TimeStrToSec( hb_parcx( 1 ) );
ULONG ulEnd = hb_TimeStrToSec( hb_parcx( 2 ) );
long lStart = hb_TimeStrToSec( hb_parcx( 1 ) );
long lEnd = hb_TimeStrToSec( hb_parcx( 2 ) );
char szTime[ 9 ];
hb_retc( hb_SecToTimeStr( szTime, ( ulEnd < ulStart ? 86400 : 0 ) + ulEnd - ulStart ) );
hb_retc( hb_SecToTimeStr( szTime, ( lEnd < lStart ? 86400 : 0 ) + lEnd - lStart ) );
}
HB_FUNC( SECS )

120
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -5847,7 +5847,7 @@ FUNCTION hbmk2_PathMakeRelative( cPathBase, cPathTarget, lForceRelative )
RETURN FN_FromArray( aPathTarget, tmp, NIL, cTargetFileName )
ENDIF
/* Different drive spec. There is way to solve that using relative dirs. */
/* Different drive spec. There is no way to solve that using relative dirs. */
IF ! Empty( hb_osDriveSeparator() ) .AND. ;
tmp == 1 .AND. ;
( Right( aPathBase[ 1 ] , 1 ) == hb_osDriveSeparator() .OR. ;
@@ -6889,104 +6889,104 @@ STATIC FUNCTION getFirstFunc( hbmk, cFile )
RETURN cFuncName
STATIC PROCEDURE PlatformPRGFlags( hbmk, aOPTPRG )
LOCAL aUnd
LOCAL aDef
LOCAL aUn
LOCAL aDf
LOCAL cMacro
LOCAL nPos
IF !( hbmk[ _HBMK_cPLAT ] == hb_Version( HB_VERSION_BUILD_PLAT ) ) .OR. ;
!( hbmk[ _HBMK_cCOMP ] == hb_Version( HB_VERSION_BUILD_COMP ) )
aUnd := {}
aDef := {}
aUn := {}
aDf := {}
AAdd( aUnd, ".ARCH." )
AAdd( aUn, ".ARCH." )
IF hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB
#if defined( __PLATFORM__WINDOWS )
AAdd( aUnd, "__PLATFORM__Windows" )
AAdd( aUn, "__PLATFORM__Windows" )
#if defined( __PLATFORM__WINCE )
AAdd( aUnd, "__PLATFORM__WINCE" )
AAdd( aUn, "__PLATFORM__WINCE" )
#endif
/* This is defined with Cygwin */
#if defined( __PLATFORM__UNIX )
AAdd( aUnd, "__PLATFORM__UNIX" )
AAdd( aUn, "__PLATFORM__UNIX" )
#endif
#elif defined( __PLATFORM__DOS )
AAdd( aUnd, "__PLATFORM__DOS" )
AAdd( aUn, "__PLATFORM__DOS" )
#elif defined( __PLATFORM__OS2 )
AAdd( aUnd, "__PLATFORM__OS2" )
AAdd( aUn, "__PLATFORM__OS2" )
#elif defined( __PLATFORM__LINUX )
AAdd( aUnd, "__PLATFORM__Linux" )
AAdd( aUnd, "__PLATFORM__UNIX" )
AAdd( aUn, "__PLATFORM__Linux" )
AAdd( aUn, "__PLATFORM__UNIX" )
#elif defined( __PLATFORM__DARWIN )
AAdd( aUnd, "__PLATFORM__DARWIN" )
AAdd( aUnd, "__PLATFORM__UNIX" )
AAdd( aUn, "__PLATFORM__DARWIN" )
AAdd( aUn, "__PLATFORM__UNIX" )
#elif defined( __PLATFORM__BSD )
AAdd( aUnd, "__PLATFORM__BSD" )
AAdd( aUnd, "__PLATFORM__UNIX" )
AAdd( aUn, "__PLATFORM__BSD" )
AAdd( aUn, "__PLATFORM__UNIX" )
#elif defined( __PLATFORM__SUNOS )
AAdd( aUnd, "__PLATFORM__SUNOS" )
AAdd( aUnd, "__PLATFORM__UNIX" )
AAdd( aUn, "__PLATFORM__SUNOS" )
AAdd( aUn, "__PLATFORM__UNIX" )
#elif defined( __PLATFORM__HPUX )
AAdd( aUnd, "__PLATFORM__HPUX" )
AAdd( aUnd, "__PLATFORM__UNIX" )
AAdd( aUn, "__PLATFORM__HPUX" )
AAdd( aUn, "__PLATFORM__UNIX" )
#endif
#if defined( __ARCH16BIT__ )
AAdd( aUnd, "__ARCH16BIT__" )
AAdd( aUn, "__ARCH16BIT__" )
#elif defined( __ARCH32BIT__ )
AAdd( aUnd, "__ARCH32BIT__" )
AAdd( aUn, "__ARCH32BIT__" )
#elif defined( __ARCH64BIT__ )
AAdd( aUnd, "__ARCH64BIT__" )
AAdd( aUn, "__ARCH64BIT__" )
#endif
#if defined( __LITTLE_ENDIAN__ )
AAdd( aUnd, "__LITTLE_ENDIAN__" )
AAdd( aUn, "__LITTLE_ENDIAN__" )
#elif defined( __BIG_ENDIAN__ )
AAdd( aUnd, "__BIG_ENDIAN__" )
AAdd( aUn, "__BIG_ENDIAN__" )
#elif defined( __PDP_ENDIAN__ )
AAdd( aUnd, "__PDP_ENDIAN__" )
AAdd( aUn, "__PDP_ENDIAN__" )
#endif
ENDIF
DO CASE
CASE hbmk[ _HBMK_cPLAT ] == "wce"
AAdd( aDef, "__PLATFORM__WINDOWS" )
AAdd( aDef, "__PLATFORM__WINCE" )
AAdd( aDf, "__PLATFORM__WINDOWS" )
AAdd( aDf, "__PLATFORM__WINCE" )
IF hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB
AAdd( aDef, "__PLATFORM__Windows" )
AAdd( aDf, "__PLATFORM__Windows" )
ENDIF
CASE hbmk[ _HBMK_cPLAT ] == "win"
AAdd( aDef, "__PLATFORM__WINDOWS" )
AAdd( aDf, "__PLATFORM__WINDOWS" )
IF hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB
AAdd( aDef, "__PLATFORM__Windows" )
AAdd( aDf, "__PLATFORM__Windows" )
ENDIF
CASE hbmk[ _HBMK_cPLAT ] == "dos"
AAdd( aDef, "__PLATFORM__DOS" )
AAdd( aDf, "__PLATFORM__DOS" )
CASE hbmk[ _HBMK_cPLAT ] == "os2"
AAdd( aDef, "__PLATFORM__OS2" )
AAdd( aDf, "__PLATFORM__OS2" )
CASE hbmk[ _HBMK_cPLAT ] == "linux"
AAdd( aDef, "__PLATFORM__LINUX" )
AAdd( aDef, "__PLATFORM__UNIX" )
AAdd( aDf, "__PLATFORM__LINUX" )
AAdd( aDf, "__PLATFORM__UNIX" )
IF hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB
AAdd( aDef, "__PLATFORM__Linux" )
AAdd( aDf, "__PLATFORM__Linux" )
ENDIF
CASE hbmk[ _HBMK_cPLAT ] == "darwin"
AAdd( aDef, "__PLATFORM__DARWIN" )
AAdd( aDef, "__PLATFORM__UNIX" )
AAdd( aDf, "__PLATFORM__DARWIN" )
AAdd( aDf, "__PLATFORM__UNIX" )
CASE hbmk[ _HBMK_cPLAT ] == "bsd"
AAdd( aDef, "__PLATFORM__BSD" )
AAdd( aDef, "__PLATFORM__UNIX" )
AAdd( aDf, "__PLATFORM__BSD" )
AAdd( aDf, "__PLATFORM__UNIX" )
CASE hbmk[ _HBMK_cPLAT ] == "sunos"
AAdd( aDef, "__PLATFORM__SUNOS" )
AAdd( aDef, "__PLATFORM__UNIX" )
AAdd( aDf, "__PLATFORM__SUNOS" )
AAdd( aDf, "__PLATFORM__UNIX" )
CASE hbmk[ _HBMK_cPLAT ] == "hpux"
AAdd( aDef, "__PLATFORM__HPUX" )
AAdd( aDef, "__PLATFORM__UNIX" )
AAdd( aDf, "__PLATFORM__HPUX" )
AAdd( aDf, "__PLATFORM__UNIX" )
CASE hbmk[ _HBMK_cPLAT ] == "beos"
AAdd( aDef, "__PLATFORM__BEOS" )
AAdd( aDef, "__PLATFORM__UNIX" )
AAdd( aDf, "__PLATFORM__BEOS" )
AAdd( aDf, "__PLATFORM__UNIX" )
ENDCASE
/* Setup those CPU flags which we can be sure about.
@@ -6996,39 +6996,39 @@ STATIC PROCEDURE PlatformPRGFlags( hbmk, aOPTPRG )
[vszakats] */
DO CASE
CASE hbmk[ _HBMK_cPLAT ] $ "dos|os2"
AAdd( aDef, "__LITTLE_ENDIAN__" )
AAdd( aDef, "__ARCH32BIT__" )
AAdd( aDf, "__LITTLE_ENDIAN__" )
AAdd( aDf, "__ARCH32BIT__" )
CASE hbmk[ _HBMK_cPLAT ] $ "wce|win"
AAdd( aDef, "__LITTLE_ENDIAN__" ) /* Windows is currently little-endian on all supported CPUs. */
AAdd( aDf, "__LITTLE_ENDIAN__" ) /* Windows is currently little-endian on all supported CPUs. */
IF hbmk[ _HBMK_cCOMP ] == "mingw64" .OR. ;
hbmk[ _HBMK_cCOMP ] == "msvc64" .OR. ;
hbmk[ _HBMK_cCOMP ] == "pocc64" .OR. ;
hbmk[ _HBMK_cCOMP ] == "msvcia64" .OR. ;
hbmk[ _HBMK_cCOMP ] == "iccia64"
AAdd( aDef, "__ARCH64BIT__" )
AAdd( aDf, "__ARCH64BIT__" )
ELSE
AAdd( aDef, "__ARCH32BIT__" )
AAdd( aDf, "__ARCH32BIT__" )
ENDIF
OTHERWISE
/* NOTE: Users will have to manually #define fitting macros for
given platform + compiler settings. We could only guess.
Let's assume the most probable CPU platform (as of 2009). */
AAdd( aDef, "__LITTLE_ENDIAN__" )
AAdd( aDef, "__ARCH32BIT__" )
AAdd( aDf, "__LITTLE_ENDIAN__" )
AAdd( aDf, "__ARCH32BIT__" )
ENDCASE
/* Delete macros present in both lists */
FOR EACH cMacro IN aUnd DESCEND
IF ( nPos := AScan( aDef, {| tmp | tmp == cMacro } ) ) > 0
hb_ADel( aUnd, cMacro:__enumIndex(), .T. )
hb_ADel( aDef, nPos, .T. )
FOR EACH cMacro IN aUn DESCEND
IF ( nPos := AScan( aDf, {| tmp | tmp == cMacro } ) ) > 0
hb_ADel( aUn, cMacro:__enumIndex(), .T. )
hb_ADel( aDf, nPos, .T. )
ENDIF
NEXT
FOR EACH cMacro IN aUnd
FOR EACH cMacro IN aUn
AAdd( aOPTPRG, "-undef:" + cMacro )
NEXT
FOR EACH cMacro IN aDef
FOR EACH cMacro IN aDf
AAdd( aOPTPRG, "-D" + cMacro )
NEXT
ENDIF