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

2009-02-25 21:08 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/source/vm/memvars.c
    + added support for reading FoxPro .mem files - Clipper compatibility
    ! fixed bug introduced in my recent modifications in .mem files writing
    ! fixed very old bug which disabled writing to .mem files strings
      longer then 32Kb
This commit is contained in:
Przemyslaw Czerpak
2009-02-25 20:03:05 +00:00
parent 6c88a6c549
commit 882ecaa59e
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -8,6 +8,13 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-25 21:08 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/vm/memvars.c
+ added support for reading FoxPro .mem files - Clipper compatibility
! fixed bug introduced in my recent modifications in .mem files writing
! fixed very old bug which disabled writing to .mem files strings
longer then 32Kb
2009-02-25 20:17 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/gtwvg/wvgwin.c
! added dirty hack for borland C compiler and #define NONAMELESSUNION

19
harbour/source/vm/memvars.c
View File

@@ -1323,18 +1323,24 @@ static HB_DYNS_FUNC( hb_memvarSave )
/* NOTE: Save only the first 10 characters of the name */
hb_strncpy( ( char * ) buffer, pDynSymbol->pSymbol->szName, 10 );
if( HB_IS_STRING( pMemvar ) && ( hb_itemGetCLen( pMemvar ) + 1 ) <= SHRT_MAX )
if( HB_IS_STRING( pMemvar ) )
{
/* Store the closing zero byte, too */
ULONG ulLen = hb_itemGetCLen( pMemvar );
ULONG ulLen = hb_itemGetCLen( pMemvar ) + 1;
int iOverFlow = 0;
/* Clipper support only 64KB strings */
if( ulLen > USHRT_MAX )
{
ulLen = USHRT_MAX;
iOverFlow = 1;
}
buffer[ 11 ] = 'C' + 128;
HB_PUT_LE_UINT16( &buffer[ 16 ], ulLen );
hb_fsWrite( fhnd, buffer, HB_MEM_REC_LEN );
hb_fsWriteLarge( fhnd, ( BYTE * ) hb_itemGetCPtr( pMemvar ), ulLen );
hb_fsWriteLarge( fhnd, ( BYTE * ) hb_itemGetCPtr( pMemvar ), ulLen - iOverFlow );
if( iOverFlow )
hb_fsWrite( fhnd, ( const BYTE * ) "\0", 1 );
}
else if( HB_IS_NUMERIC( pMemvar ) )
{
@@ -1354,7 +1360,7 @@ static HB_DYNS_FUNC( hb_memvarSave )
#endif
buffer[ 17 ] = ( BYTE ) iDec;
HB_PUT_LE_DOUBLE( &buffer[ HB_MEM_REC_LEN ], dNumber );
hb_fsWrite( fhnd, buffer, HB_MEM_REC_LEN );
hb_fsWrite( fhnd, buffer, HB_MEM_REC_LEN + HB_MEM_NUM_LEN );
}
else if( HB_IS_DATE( pMemvar ) )
{
@@ -1518,7 +1524,10 @@ HB_FUNC( __MVRESTORE )
while( hb_fsRead( fhnd, buffer, HB_MEM_REC_LEN ) == HB_MEM_REC_LEN )
{
USHORT uiType = ( USHORT ) ( buffer[ 11 ] - 128 );
/* FoxPro does not add 128 to item type: 'N', 'C', 'D', 'L'
* CA-Cl*pper respects it and read such files so we also should.
*/
USHORT uiType = ( USHORT ) ( buffer[ 11 ] & 0x7f );
USHORT uiWidth = ( USHORT ) buffer[ 16 ];
USHORT uiDec = ( USHORT ) buffer[ 17 ];