* src/vm/runner.c
! Minor to prev.
* include/hbapi.h
* src/vm/extend.c
+ Added hb_parnsize(), hb_retnsize(), hb_stornsize() functions.
; NOTE: These should be used in place of hb_parnl(), hb_retnl(),
hb_stornl() when passing HB_SIZE types.
; TODO: Use them all accross Harbour if they are correct and
after being finalized.
* src/vm/itemapi.c
+ Added hb_itemGetNSize(), hb_itemPutNSize() functions.
* DATETIME stuff in hb_itemGetNL() marked as HB_LEGACY_LEVEL3.
; QUESTION: It's marked as to be deleted in the TODO, so maybe we should
rather delete it.
* include/hbapiitm.h
* src/rtl/filesys.c
+ hb_fsReadAt(), hb_fsWriteAt(): Added support for Win64 HB_SIZE.
; QUESTION: I assume these functions have the purpose of being
atomic seek + read without moving the file pointer,
which means current modification isn't safe. How
can this be solved given Windows doesn't seem to have
64-bit read/write API calls?
! Fixed old copy-paste typos in Windows OVERLAPPED initialization,
where the lines were ended with command instead of semicolon,
they didn't cause any harm though in their former location.
% Reverted a minor change from prev commit to make it
possibly a little bit faster, like it was before.
* src/rtl/hbzlib.c
+ Added casts (at external interface calls) and other fixes to
make it build for Win64 without warnings.
* src/rdd/dbfntx/dbfntx1.c
* src/rdd/dbfnsx/dbfnsx1.c
* src/rdd/dbfcdx/dbfcdx1.c
* src/rdd/dbffpt/dbffpt1.c
* contrib/rddbmcdx/bmdbfcdx.c
* HB_ULONG -> HB_SIZE where appropriate to avoid Win64 errors
and some warnings. I'm still not comfortable to touch this
code, but it could certainly need a type cleanup.
* include/hbdefs.h
+ Added HB_PFS macro which holds the printf() format string
for HB_SIZE value.
; TODO: Use it all accross Harbour.
* contrib/hbmysql/mysql.c
* contrib/sddmy/sddmy.c
* contrib/hbmzip/hbmzip.c
* contrib/hbcurl/hbcurl.c
* contrib/hbhpdf/harupdf.c
* contrib/hbpgsql/postgres.c
* contrib/rddads/adsfunc.c
* contrib/rddads/ads1.c
* contrib/hbfimage/fi_wrp.c
* contrib/sddodbc/sddodbc.c
* contrib/hbgd/gdwrp.c
* contrib/hbwin/wapi_wingdi.c
* contrib/hbwin/wapi_winbase.c
* contrib/hbwin/wapi_winuser.c
* contrib/hbwin/win_bmp.c
* contrib/hbwin/win_prn1.c
* contrib/hbwin/win_regc.c
* contrib/hbssl/evpciph.c
* contrib/hbssl/ssl.c
* contrib/hbssl/bio.c
* contrib/hbssl/sslctx.c
* contrib/hbssl/evpenc.c
* contrib/hbssl/pem.c
* contrib/hbssl/rand.c
* contrib/hbssl/evp.c
+ Added necessary casts at external component boundaries to
make Win64 builds warning-free.
* contrib/hbct/ctstrfil.c
+ HB_ISIZ -> HB_FOFFSET, hb_fsSeek() usage, other type cleanup
to handle file offsets correctly.
* contrib/xhb/hbnxs.h
* contrib/xhb/hbcrypt.c
! Fixed warnings for Win64.
* contrib/hbwin/win_prn3.c
* contrib/xhb/dbf2txt.c
* contrib/xhb/fparse.c
* int -> HB_ISIZ for Win64.
* contrib/xhb/freadlin.c
* hb_fsSeek() -> hb_fsSeekLarge().
* contrib/sddfb/sddfb.c
* Minor type cleanup to make Win64 warning-free.
* contrib/hbsqlit3/hbsqlit3.c
+ Added necessary casts at external interface calls.
% Deleted one dummy operation from SQLITE3_FILE_TO_BUFF().
* contrib/rddsql/sqlmix.c
* contrib/rddads/adsx.c
* HB_ULONG -> HB_SIZE.
* contrib/gtwvg/gtwvg.c
* contrib/gtwvg/wvggui.c
* contrib/gtwvg/wvgcuig.c
* contrib/gtwvg/wvgwin.c
* contrib/gtwvg/wvgutils.c
* contrib/gtwvg/wvgcore.c
! int -> HB_ISIZ/HB_SIZE
+ Added necessary casts at external component boundaries to
make Win64 warning-free.
* contrib/rddads/ads1.c
* HB_ULONG -> HB_SIZE
* contrib/hbtip/utils.c
* int -> HB_ISIZ
! Fixed to use HB_FOFFSET type to save/restore file position.
* ChangeLog
+ Added missing item to previous log entry:
! Fixed hb_fsCurDirBuff() for Win64.
; It's quite large commit, nevertheless I'd highly appreciate
peer review, and certainly there will be places which need
better or different solution for Win64.
247 lines
6.7 KiB
C
247 lines
6.7 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* xHarbour Project source code:
|
|
* Functions:
|
|
* SETFCREATE(), CSETSAFETY(), STRFILE(), FILESTR(), SCREENFILE()
|
|
* SCREENFILE(), FILESCREEN()
|
|
*
|
|
* Copyright 2004 Pavel Tsarenko <tpe2@mail.ru>
|
|
* www - http://www.xharbour.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
#include "hbapi.h"
|
|
#include "hbapifs.h"
|
|
#include "hbapigt.h"
|
|
|
|
#include "ctstrfil.h"
|
|
|
|
static int s_iFileAttr = HB_FA_NORMAL;
|
|
static HB_BOOL s_bSafety = 0;
|
|
|
|
void ct_setfcreate( int iFileAttr )
|
|
{
|
|
HB_TRACE( HB_TR_DEBUG, ( "ct_setfcreate(%i)", iFileAttr ) );
|
|
s_iFileAttr = iFileAttr;
|
|
}
|
|
|
|
int ct_getfcreate( void )
|
|
{
|
|
HB_TRACE( HB_TR_DEBUG, ( "ct_getfcreate()" ) );
|
|
return s_iFileAttr;
|
|
}
|
|
|
|
HB_FUNC( SETFCREATE )
|
|
{
|
|
hb_retni( ct_getfcreate() );
|
|
|
|
if( HB_ISNUM( 1 ) )
|
|
ct_setfcreate( hb_parni( 1 ) );
|
|
}
|
|
|
|
void ct_setsafety( HB_BOOL bSafety )
|
|
{
|
|
HB_TRACE( HB_TR_DEBUG, ( "ct_setsafety(%i)", bSafety ) );
|
|
s_bSafety = bSafety;
|
|
}
|
|
|
|
HB_BOOL ct_getsafety( void )
|
|
{
|
|
HB_TRACE( HB_TR_DEBUG, ( "ct_getsafety()" ) );
|
|
return s_bSafety;
|
|
}
|
|
|
|
HB_FUNC( CSETSAFETY )
|
|
{
|
|
hb_retni( ct_getsafety() );
|
|
|
|
if( HB_ISLOG( 1 ) )
|
|
ct_setsafety( hb_parnl( 1 ) );
|
|
}
|
|
|
|
static HB_SIZE ct_StrFile( const char * pFileName, const char * pcStr, HB_SIZE ulLen, HB_BOOL bOverwrite, HB_FOFFSET lOffset,
|
|
HB_BOOL bTrunc )
|
|
{
|
|
HB_FHANDLE hFile;
|
|
HB_BOOL bOpen = HB_FALSE;
|
|
HB_BOOL bFile = hb_fsFile( pFileName );
|
|
HB_SIZE ulWrite = 0;
|
|
|
|
if( bFile && bOverwrite )
|
|
{
|
|
hFile = hb_fsOpen( pFileName, FO_READWRITE );
|
|
bOpen = HB_TRUE;
|
|
}
|
|
else if( !bFile || !ct_getsafety() )
|
|
hFile = hb_fsCreate( pFileName, ct_getfcreate() );
|
|
else
|
|
hFile = FS_ERROR;
|
|
|
|
if( hFile != FS_ERROR )
|
|
{
|
|
if( lOffset )
|
|
hb_fsSeekLarge( hFile, lOffset, FS_SET );
|
|
else if( bOpen )
|
|
hb_fsSeek( hFile, 0, FS_END );
|
|
|
|
ulWrite = hb_fsWriteLarge( hFile, pcStr, ulLen );
|
|
if( ( ulWrite == ulLen ) && bOpen && bTrunc )
|
|
hb_fsWrite( hFile, NULL, 0 );
|
|
|
|
hb_fsClose( hFile );
|
|
}
|
|
return ulWrite;
|
|
}
|
|
|
|
HB_FUNC( STRFILE )
|
|
{
|
|
if( HB_ISCHAR( 1 ) && HB_ISCHAR( 2 ) )
|
|
{
|
|
hb_retnl( ct_StrFile( hb_parc( 2 ), hb_parc( 1 ),
|
|
hb_parclen( 1 ), hb_parl( 3 ),
|
|
( HB_FOFFSET ) hb_parnint( 4 ), hb_parl( 5 ) ) );
|
|
}
|
|
else
|
|
hb_retni( 0 );
|
|
}
|
|
|
|
HB_FUNC( FILESTR )
|
|
{
|
|
if( HB_ISCHAR( 1 ) )
|
|
{
|
|
HB_FHANDLE hFile = hb_fsOpen( hb_parc( 1 ), FO_READ );
|
|
|
|
if( hFile != FS_ERROR )
|
|
{
|
|
HB_FOFFSET lFileSize = hb_fsSeekLarge( hFile, 0, FS_END );
|
|
HB_FOFFSET lPos = hb_fsSeekLarge( hFile, ( HB_FOFFSET ) hb_parnint( 3 ), FS_SET );
|
|
HB_ISIZ lLength;
|
|
char * pcResult, * pCtrlZ;
|
|
HB_BOOL bCtrlZ = hb_parl( 4 );
|
|
|
|
if( HB_ISNUM( 2 ) )
|
|
{
|
|
lLength = hb_parnl( 2 );
|
|
if( lLength > ( HB_ISIZ ) ( lFileSize - lPos ) )
|
|
lLength = ( HB_ISIZ ) ( lFileSize - lPos );
|
|
}
|
|
else
|
|
lLength = ( HB_ISIZ ) ( lFileSize - lPos );
|
|
|
|
pcResult = ( char * ) hb_xgrab( lLength + 1 );
|
|
if( lLength > 0 )
|
|
lLength = hb_fsReadLarge( hFile, pcResult, ( HB_SIZE ) lLength );
|
|
|
|
if( bCtrlZ )
|
|
{
|
|
pCtrlZ = ( char * ) memchr( pcResult, 26, lLength );
|
|
if( pCtrlZ )
|
|
lLength = pCtrlZ - pcResult;
|
|
}
|
|
|
|
hb_fsClose( hFile );
|
|
hb_retclen_buffer( pcResult, lLength );
|
|
}
|
|
else
|
|
hb_retc_null();
|
|
}
|
|
else
|
|
hb_retc_null();
|
|
}
|
|
|
|
HB_FUNC( SCREENFILE )
|
|
{
|
|
if( HB_ISCHAR( 1 ) )
|
|
{
|
|
char * pBuffer;
|
|
HB_SIZE ulSize;
|
|
|
|
hb_gtRectSize( 0, 0, hb_gtMaxRow(), hb_gtMaxCol(), &ulSize );
|
|
pBuffer = ( char * ) hb_xgrab( ulSize );
|
|
|
|
hb_gtSave( 0, 0, hb_gtMaxRow(), hb_gtMaxCol(), pBuffer );
|
|
|
|
hb_retnl( ct_StrFile( hb_parc( 1 ), pBuffer,
|
|
ulSize, hb_parl( 2 ),
|
|
( HB_FOFFSET ) hb_parnint( 3 ), hb_parl( 4 ) ) );
|
|
hb_xfree( pBuffer );
|
|
}
|
|
else
|
|
hb_retni( 0 );
|
|
}
|
|
|
|
HB_FUNC( FILESCREEN )
|
|
{
|
|
if( HB_ISCHAR( 1 ) )
|
|
{
|
|
HB_FHANDLE hFile = hb_fsOpen( hb_parc( 1 ), FO_READ );
|
|
|
|
if( hFile != FS_ERROR )
|
|
{
|
|
char * pBuffer;
|
|
HB_SIZE ulSize;
|
|
HB_SIZE lLength;
|
|
|
|
if( HB_ISNUM( 2 ) )
|
|
hb_fsSeekLarge( hFile, ( HB_FOFFSET ) hb_parnint( 2 ), FS_SET );
|
|
|
|
hb_gtRectSize( 0, 0, hb_gtMaxRow(), hb_gtMaxCol(), &ulSize );
|
|
pBuffer = ( char * ) hb_xgrab( ulSize );
|
|
|
|
lLength = hb_fsReadLarge( hFile, pBuffer, ulSize );
|
|
hb_gtRest( 0, 0, hb_gtMaxRow(), hb_gtMaxCol(), pBuffer );
|
|
|
|
hb_xfree( pBuffer );
|
|
|
|
hb_fsClose( hFile );
|
|
hb_retnl( lLength );
|
|
}
|
|
else
|
|
hb_retni( 0 );
|
|
}
|
|
else
|
|
hb_retni( 0 );
|
|
}
|