diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 95c1a00ef7..5c4e2ea732 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,23 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-09 20:58 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * include/hbdefs.h + * include/hbapigt.h + * source/common/hbfsapi.c + * source/rtl/console.c + * source/rtl/fserror.c + * source/rtl/fstemp.c + * source/rtl/gtstd/gtstd.c + * source/rtl/gtpca/gtpca.c + * source/rtl/filesys.c + * Macro rename: + - HB_WIN32_IO_OFF -> HB_IO_WIN_OFF + - HB_WIN32_IO -> HB_IO_WIN + ; NOTE: INCOMPATIBLE if someone happens to disable + Windows native IO. Users don't normally + needs this though. + 2008-11-09 20:49 UTC+0100 Viktor Szakats (harbour.01 syenar hu) - contrib/hbmysql/utils/bld_b32.bat - contrib/hbmysql/utils/bld_vc.bat diff --git a/harbour/include/hbapigt.h b/harbour/include/hbapigt.h index a30912a9ab..15f55f32f0 100644 --- a/harbour/include/hbapigt.h +++ b/harbour/include/hbapigt.h @@ -130,7 +130,7 @@ HB_EXTERN_BEGIN /* standard input/output handles - * when HB_WIN32_IO is set file handles with numbers 0, 1, 2 are + * when HB_IO_WIN is set file handles with numbers 0, 1, 2 are * transalted inside filesys to * GetStdHandle( STD_INPUT_HANDLE ) * GetStdHandle( STD_OUTPUT_HANDLE ) diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index fc49a68ed5..e95926aa18 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -93,15 +93,15 @@ #endif #endif - #if !defined( HB_WIN32_IO_OFF ) - #define HB_WIN32_IO + #if !defined( HB_IO_WIN_OFF ) + #define HB_IO_WIN #endif - #if defined( HB_WIN32_IO ) && !defined( HB_OS_WIN_32_USED ) + #if defined( HB_IO_WIN ) && !defined( HB_OS_WIN_32_USED ) /* disabled to avoid problems with windows.h */ /* #define HB_OS_WIN_32_USED */ #endif #else - #undef HB_WIN32_IO + #undef HB_IO_WIN #undef HB_OS_WIN_32_USED #endif @@ -546,7 +546,7 @@ typedef unsigned long HB_COUNTER; typedef LONGLONG HB_FOFFSET; #endif -#if defined( HB_WIN32_IO ) +#if defined( HB_IO_WIN ) #if 1 typedef HB_PTRDIFF HB_FHANDLE; #else diff --git a/harbour/source/common/hbfsapi.c b/harbour/source/common/hbfsapi.c index 1155141732..79c0c9429a 100644 --- a/harbour/source/common/hbfsapi.c +++ b/harbour/source/common/hbfsapi.c @@ -76,7 +76,7 @@ #include #include #endif -#if !defined( HB_WIN32_IO ) +#if !defined( HB_IO_WIN ) #include #endif @@ -465,7 +465,7 @@ BOOL hb_fsMaxFilesError( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsMaxFilesError()")); -#if defined( HB_WIN32_IO ) +#if defined( HB_IO_WIN ) return GetLastError() == ERROR_TOO_MANY_OPEN_FILES; #else return errno == EMFILE; diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c index 5e608d4124..9ec60a3ec7 100644 --- a/harbour/source/rtl/console.c +++ b/harbour/source/rtl/console.c @@ -120,8 +120,8 @@ void hb_conInit( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_conInit()")); -#if !defined( HB_WIN32_IO ) - /* when HB_WIN32_IO is set file handles with numbers 0, 1, 2 are +#if !defined( HB_IO_WIN ) + /* when HB_IO_WIN is set file handles with numbers 0, 1, 2 are transalted inside filesys to: GetStdHandle( STD_INPUT_HANDLE ), GetStdHandle( STD_OUTPUT_HANDLE ), GetStdHandle( STD_ERROR_HANDLE ) */ diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index 9f17464d47..60da8bb9a1 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -192,7 +192,7 @@ #ifndef SH_COMPAT #define SH_COMPAT 0x0000 #endif -#elif defined( HB_WIN32_IO ) +#elif defined( HB_IO_WIN ) #include #if !defined( INVALID_SET_FILE_POINTER ) && \ @@ -281,7 +281,7 @@ #endif -#if defined(HAVE_POSIX_IO) || defined( HB_WIN32_IO ) || defined(_MSC_VER) || defined(__MINGW32__) || defined(__LCC__) || defined(__DMC__) +#if defined(HAVE_POSIX_IO) || defined( HB_IO_WIN ) || defined(_MSC_VER) || defined(__MINGW32__) || defined(__LCC__) || defined(__DMC__) /* Only compilers with Posix or Posix-like I/O support are supported */ #define HB_FS_FILE_IO #endif @@ -302,7 +302,7 @@ static BOOL s_fUseWaitLocks = TRUE; #if defined(HB_FS_FILE_IO) -#if defined(HB_WIN32_IO) +#if defined(HB_IO_WIN) static HANDLE DosToWinHandle( HB_FHANDLE fHandle ) { @@ -540,7 +540,7 @@ HB_FHANDLE hb_fsGetOsHandle( HB_FHANDLE hFileHandle ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsGetOsHandle(%p)", hFileHandle)); -#if defined(HB_WIN32_IO) +#if defined(HB_IO_WIN) return ( HB_FHANDLE ) DosToWinHandle( hFileHandle ); #else return hFileHandle; @@ -661,7 +661,7 @@ HB_FHANDLE hb_fsOpen( BYTE * pFilename, USHORT uiFlags ) pFilename = hb_fsNameConv( pFilename, &fFree ); -#if defined(HB_WIN32_IO) +#if defined(HB_IO_WIN) { DWORD dwMode, dwShare, dwCreat, dwAttr; HANDLE hFile; @@ -721,7 +721,7 @@ HB_FHANDLE hb_fsCreate( BYTE * pFilename, ULONG ulAttr ) pFilename = hb_fsNameConv( pFilename, &fFree ); -#if defined(HB_WIN32_IO) +#if defined(HB_IO_WIN) { DWORD dwMode, dwShare, dwCreat, dwAttr; HANDLE hFile; @@ -781,7 +781,7 @@ HB_FHANDLE hb_fsCreateEx( BYTE * pFilename, ULONG ulAttr, USHORT uiFlags ) pFilename = hb_fsNameConv( pFilename, &fFree ); -#if defined( HB_WIN32_IO ) +#if defined( HB_IO_WIN ) { DWORD dwMode, dwShare, dwCreat, dwAttr; HANDLE hFile; @@ -831,7 +831,7 @@ void hb_fsClose( HB_FHANDLE hFileHandle ) #if defined(HB_FS_FILE_IO) hb_vmUnlock(); - #if defined(HB_WIN32_IO) + #if defined(HB_IO_WIN) hb_fsSetIOError( CloseHandle( DosToWinHandle( hFileHandle ) ), 0 ); #else hb_fsSetIOError( close( hFileHandle ) == 0, 0 ); @@ -849,14 +849,14 @@ BOOL hb_fsSetDevMode( HB_FHANDLE hFileHandle, USHORT uiDevMode ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsSetDevMode(%p, %hu)", hFileHandle, uiDevMode)); - /* TODO: HB_WIN32_IO support */ + /* TODO: HB_IO_WIN support */ #if defined(__BORLANDC__) || defined(__IBMCPP__) || defined(__DJGPP__) || \ defined(__CYGWIN__) || defined(__WATCOMC__) || defined(HB_OS_OS2) { int iRet = 0; -#if defined(HB_WIN32_IO) +#if defined(HB_IO_WIN) if( hFileHandle != ( HB_FHANDLE ) 0 && hFileHandle != ( HB_FHANDLE ) 1 && hFileHandle != ( HB_FHANDLE ) 2 ) @@ -883,7 +883,7 @@ BOOL hb_fsSetDevMode( HB_FHANDLE hFileHandle, USHORT uiDevMode ) { int iRet = 0; -#if defined(HB_WIN32_IO) +#if defined(HB_IO_WIN) if( hFileHandle != ( HB_FHANDLE ) 0 && hFileHandle != ( HB_FHANDLE ) 1 && hFileHandle != ( HB_FHANDLE ) 2 ) @@ -934,7 +934,7 @@ BOOL hb_fsGetFileTime( BYTE * pszFileName, LONG * plJulian, LONG * plMillisec ) fResult = FALSE; -#if defined( HB_WIN32_IO ) +#if defined( HB_IO_WIN ) { HB_FHANDLE hFile = hb_fsOpen( pszFileName, FO_READ | FO_SHARED ); @@ -1368,7 +1368,7 @@ USHORT hb_fsRead( HB_FHANDLE hFileHandle, BYTE * pBuff, USHORT uiCount ) #if defined(HB_FS_FILE_IO) - #if defined(HB_WIN32_IO) + #if defined(HB_IO_WIN) { DWORD dwRead; BOOL fResult; @@ -1408,7 +1408,7 @@ USHORT hb_fsWrite( HB_FHANDLE hFileHandle, const BYTE * pBuff, USHORT uiCount ) #if defined(HB_FS_FILE_IO) - #if defined(HB_WIN32_IO) + #if defined(HB_IO_WIN) { DWORD dwWritten = 0; BOOL fResult; @@ -1468,7 +1468,7 @@ ULONG hb_fsReadLarge( HB_FHANDLE hFileHandle, BYTE * pBuff, ULONG ulCount ) #if defined(HB_FS_FILE_IO) - #if defined(HB_WIN32_IO) + #if defined(HB_IO_WIN) { hb_vmUnlock(); hb_fsSetIOError( ReadFile( DosToWinHandle( hFileHandle ), @@ -1548,7 +1548,7 @@ ULONG hb_fsWriteLarge( HB_FHANDLE hFileHandle, const BYTE * pBuff, ULONG ulCount #if defined(HB_FS_FILE_IO) - #if defined(HB_WIN32_IO) + #if defined(HB_IO_WIN) { ulWritten = 0; hb_vmUnlock(); @@ -1664,7 +1664,7 @@ ULONG hb_fsReadAt( HB_FHANDLE hFileHandle, BYTE * pBuff, ULONG ulCount, HB_FOFFS hb_vmLock(); } #else - #if defined(HB_WIN32_IO) + #if defined(HB_IO_WIN) if( hb_iswinnt() ) { OVERLAPPED Overlapped; @@ -1723,7 +1723,7 @@ ULONG hb_fsWriteAt( HB_FHANDLE hFileHandle, const BYTE * pBuff, ULONG ulCount, H hb_vmLock(); } #else - #if defined(HB_WIN32_IO) + #if defined(HB_IO_WIN) if( hb_iswinnt() ) { OVERLAPPED Overlapped; @@ -1769,7 +1769,7 @@ BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset ) #if defined(HB_FS_FILE_IO) hb_vmUnlock(); - #if defined(HB_WIN32_IO) + #if defined(HB_IO_WIN) { ULONG ulOffsetLow = ( ULONG ) ( llOffset & ULONG_MAX ), ulOffsetHigh = ( ULONG ) ( llOffset >> 32 ); @@ -1812,7 +1812,7 @@ void hb_fsCommit( HB_FHANDLE hFileHandle ) #if defined(HB_OS_WIN_32) { hb_vmUnlock(); - #if defined(HB_WIN32_IO) + #if defined(HB_IO_WIN) hb_fsSetIOError( FlushFileBuffers( ( HANDLE ) DosToWinHandle( hFileHandle ) ), 0 ); #else #if defined(__WATCOMC__) @@ -1893,7 +1893,7 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart, HB_TRACE(HB_TR_DEBUG, ("hb_fsLock(%p, %lu, %lu, %hu)", hFileHandle, ulStart, ulLength, uiMode)); -#if defined(HB_WIN32_IO) +#if defined(HB_IO_WIN) hb_vmUnlock(); switch( uiMode & FL_MASK ) { @@ -2097,7 +2097,7 @@ BOOL hb_fsLockLarge( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart, HB_TRACE(HB_TR_DEBUG, ("hb_fsLockLarge(%p, %" PFHL "u, %" PFHL "u, %hu)", hFileHandle, ulStart, ulLength, uiMode)); -#if defined(HB_WIN32_IO) +#if defined(HB_IO_WIN) { DWORD dwOffsetLo = ( DWORD ) ( ulStart & 0xFFFFFFFF ), dwOffsetHi = ( DWORD ) ( ulStart >> 32 ), @@ -2242,7 +2242,7 @@ ULONG hb_fsSeek( HB_FHANDLE hFileHandle, LONG lOffset, USHORT uiFlags ) } } } - #elif defined(HB_WIN32_IO) + #elif defined(HB_IO_WIN) /* This DOS hack creates 2GB file size limit, Druzus */ if( lOffset < 0 && Flags == SEEK_SET ) { @@ -2296,7 +2296,7 @@ HB_FOFFSET hb_fsSeekLarge( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset, USHORT u HB_TRACE(HB_TR_DEBUG, ("hb_fsSeekLarge(%p, %" PFHL "u, %hu)", hFileHandle, llOffset, uiFlags)); -#if defined(HB_WIN32_IO) +#if defined(HB_IO_WIN) { USHORT Flags = convert_seek_flags( uiFlags ); @@ -3043,7 +3043,7 @@ BOOL hb_fsEof( HB_FHANDLE hFileHandle ) hb_vmUnlock(); #if defined(__DJGPP__) || defined(__CYGWIN__) || \ - defined(HB_WIN32_IO) || defined(HB_WINCE) || \ + defined(HB_IO_WIN) || defined(HB_WINCE) || \ defined(HB_OS_UNIX_COMPATIBLE) { HB_FOFFSET curPos; diff --git a/harbour/source/rtl/fserror.c b/harbour/source/rtl/fserror.c index 34c0781a34..ce84865ebb 100644 --- a/harbour/source/rtl/fserror.c +++ b/harbour/source/rtl/fserror.c @@ -56,13 +56,13 @@ #include "hbapifs.h" #include "hbstack.h" #include "hb_io.h" -#if !(defined(HB_WIN32_IO) || defined(HB_OS_WIN_32)) +#if !(defined(HB_IO_WIN) || defined(HB_OS_WIN_32)) # include #endif /* Try to translate C errno into DOS error code */ -#if !defined(HB_WIN32_IO) +#if !defined(HB_IO_WIN) static int hb_errnoToDosError( int ErrCode ) { int iResult; @@ -144,7 +144,7 @@ static int hb_errnoToDosError( int ErrCode ) } #endif -#if defined(HB_WIN32_IO) || defined(HB_OS_WIN_32) +#if defined(HB_IO_WIN) || defined(HB_OS_WIN_32) static int hb_WinToDosError( ULONG ulError ) { int iResult; @@ -235,7 +235,7 @@ void hb_fsSetIOError( BOOL fResult, USHORT uiOperation ) } else { -#if defined(HB_WIN32_IO) || defined(HB_OS_WIN_32) +#if defined(HB_IO_WIN) || defined(HB_OS_WIN_32) uiOsErrorLast = ( USHORT ) GetLastError(); uiErrorLast = ( USHORT ) hb_WinToDosError( uiOsErrorLast ); #elif defined(_MSC_VER) || defined(__DMC__) diff --git a/harbour/source/rtl/fstemp.c b/harbour/source/rtl/fstemp.c index 9de27070a7..26a38e2d91 100644 --- a/harbour/source/rtl/fstemp.c +++ b/harbour/source/rtl/fstemp.c @@ -72,7 +72,7 @@ static BOOL hb_fsTempName( BYTE * pszBuffer, const BYTE * pszDir, const BYTE * p hb_vmUnlock(); -#if defined(HB_WIN32_IO) +#if defined(HB_IO_WIN) { char cTempDir[ _POSIX_PATH_MAX + 1 ]; diff --git a/harbour/source/rtl/gtpca/gtpca.c b/harbour/source/rtl/gtpca/gtpca.c index 1b4a8aebdb..ee62f70dba 100644 --- a/harbour/source/rtl/gtpca/gtpca.c +++ b/harbour/source/rtl/gtpca/gtpca.c @@ -81,7 +81,7 @@ #include #include #else -# if defined( HB_WIN32_IO ) +# if defined( HB_IO_WIN ) # include # endif # if ( defined( _MSC_VER ) || defined( __WATCOMC__ ) ) && !defined( HB_WINCE ) @@ -624,7 +624,7 @@ static int hb_gt_pca_ReadKey( PHB_GT pGT, int iEventMask ) if( _read( s_hFilenoStdin, &bChar, 1 ) == 1 ) ch = s_keyTransTbl[ bChar ]; } -#elif defined( HB_WIN32_IO ) +#elif defined( HB_IO_WIN ) if( !s_bStdinConsole || WaitForSingleObject( ( HANDLE ) hb_fsGetOsHandle( s_hFilenoStdin ), 0 ) == 0x0000 ) { diff --git a/harbour/source/rtl/gtstd/gtstd.c b/harbour/source/rtl/gtstd/gtstd.c index f9a4d3f999..4a75f1dcc3 100644 --- a/harbour/source/rtl/gtstd/gtstd.c +++ b/harbour/source/rtl/gtstd/gtstd.c @@ -72,7 +72,7 @@ #include #include #else -# if defined( HB_WIN32_IO ) +# if defined( HB_IO_WIN ) # include # endif # if ( defined( _MSC_VER ) || defined( __WATCOMC__ ) ) && !defined( HB_WINCE ) @@ -279,7 +279,7 @@ static void hb_gt_std_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil } } #endif -#elif defined( HB_WIN32_IO ) && ! defined( HB_WINCE ) +#elif defined( HB_IO_WIN ) && ! defined( HB_WINCE ) if( pGTSTD->fStdinConsole ) { SetConsoleMode( ( HANDLE ) hb_fsGetOsHandle( pGTSTD->hStdin ), 0x0000 ); @@ -376,7 +376,7 @@ static int hb_gt_std_ReadKey( PHB_GT pGT, int iEventMask ) if( _read( pGTSTD->hStdin, &bChar, 1 ) == 1 ) ch = pGTSTD->keyTransTbl[ bChar ]; } -#elif defined( HB_WIN32_IO ) +#elif defined( HB_IO_WIN ) if( !pGTSTD->fStdinConsole || WaitForSingleObject( ( HANDLE ) hb_fsGetOsHandle( pGTSTD->hStdin ), 0 ) == 0x0000 ) {