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

2014-09-04 21:17 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* src/rtl/itemseri.c
    * minor update in comments

  * contrib/hbct/ctwin.c
  * src/rtl/hbgtcore.c
    ! fixed GTCTW window handle save/restore on debugger activation
      I broke in 107b36e847
      Thanks to Rolf for the info and patch.

  * contrib/hbziparc/ziparc.prg
    * synced with Viktor's branch.
      This code should contain Rolf fixes. Please test.
This commit is contained in:
Przemysław Czerpak
2014-09-04 21:17:02 +02:00
parent 169f5f3767
commit e41b3fa69a
5 changed files with 87 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog.txt
View File

@@ -10,6 +10,20 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2014-09-04 21:17 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rtl/itemseri.c
* minor update in comments
* contrib/hbct/ctwin.c
* src/rtl/hbgtcore.c
! fixed GTCTW window handle save/restore on debugger activation
I broke in 107b36e8477bed2db27d8627a081e657801ad560
Thanks to Rolf for the info and patch.
* contrib/hbziparc/ziparc.prg
* synced with Viktor's branch.
This code should contain Rolf fixes. Please test.
2014-09-03 20:21 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rtl/gtwin/gtwin.c
+ added support for disabling [x] button of console window in older

12
contrib/hbct/ctwin.c
View File

@@ -2069,10 +2069,10 @@ static HB_BOOL hb_ctw_gt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
hb_ctw_SelectWindow( HB_GTCTW_GET( pGT ), 0, HB_TRUE );
fResult = HB_GTSUPER_INFO( pGT, iType, pInfo );
if( fResult && hb_arrayLen( pInfo->pResult ) >= 8 )
if( fResult && hb_arrayLen( pInfo->pResult ) >= 7 )
{
PHB_GTCTW pCTW = HB_GTCTW_GET( pGT );
hb_arraySetNI( pInfo->pResult, 8, HB_CTW_GETCURRENT( pCTW ) );
hb_arraySetNI( pInfo->pResult, 7, HB_CTW_GETCURRENT( pCTW ) );
}
return fResult;
}
@@ -2084,8 +2084,8 @@ static HB_BOOL hb_ctw_gt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
hb_ctw_SelectWindow( pCTW, 0, HB_TRUE );
fResult = HB_GTSUPER_INFO( pGT, iType, pInfo );
if( fResult && hb_arrayLen( pInfo->pResult ) >= 8 )
hb_arraySetNI( pInfo->pResult, 8, iWindow );
if( fResult && hb_arrayLen( pInfo->pResult ) >= 7 )
hb_arraySetNI( pInfo->pResult, 7, iWindow );
return fResult;
}
case HB_GTI_SETWIN:
@@ -2095,8 +2095,8 @@ static HB_BOOL hb_ctw_gt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
hb_ctw_SelectWindow( pCTW, 0, HB_TRUE );
fResult = HB_GTSUPER_INFO( pGT, iType, pInfo );
if( fResult && hb_arrayLen( pInfo->pNewVal ) >= 8 )
hb_ctw_SelectWindow( pCTW, hb_arrayGetNI( pInfo->pNewVal, 8 ),
if( fResult && hb_arrayLen( pInfo->pNewVal ) >= 7 )
hb_ctw_SelectWindow( pCTW, hb_arrayGetNI( pInfo->pNewVal, 7 ),
HB_TRUE );
return fResult;
}

130
contrib/hbziparc/ziparc.prg
View File

@@ -60,9 +60,7 @@ THREAD STATIC t_lReadOnly := .F.
PROCEDURE SetZipReadOnly( lReadOnly )
hb_default( @lReadOnly, .F. )
t_lReadOnly := lReadOnly
t_lReadOnly := hb_defaultValue( lReadOnly, .F. )
/* TODO: Implement. */
@@ -85,11 +83,11 @@ FUNCTION hb_GetZipComment( cFileName )
cFileName := hb_FNameExtSetDef( cFileName, ".zip" )
ENDIF
IF ! Empty( hUnzip := hb_unzipOpen( cFileName ) )
hb_unzipGlobalInfo( hUnzip, NIL, @cComment )
hb_unzipClose( hUnzip )
ELSE
IF Empty( hUnzip := hb_unzipOpen( cFileName ) )
cComment := ""
ELSE
hb_unzipGlobalInfo( hUnzip,, @cComment )
hb_unzipClose( hUnzip )
ENDIF
RETURN cComment
@@ -103,11 +101,11 @@ FUNCTION hb_GetFileCount( cFileName )
cFileName := hb_FNameExtSetDef( cFileName, ".zip" )
ENDIF
IF ! Empty( hUnzip := hb_unzipOpen( cFileName ) )
hb_unzipGlobalInfo( hUnzip, @nEntries, NIL )
hb_unzipClose( hUnzip )
ELSE
IF Empty( hUnzip := hb_unzipOpen( cFileName ) )
nEntries := 0
ELSE
hb_unzipGlobalInfo( hUnzip, @nEntries )
hb_unzipClose( hUnzip )
ENDIF
RETURN nEntries
@@ -124,7 +122,7 @@ FUNCTION hb_ZipWithPassword( cFileName )
IF ! Empty( hUnzip := hb_unzipOpen( cFileName ) )
IF hb_unzipFileFirst( hUnzip ) == 0
hb_unzipFileInfo( hUnzip, NIL, NIL, NIL, NIL, NIL, NIL, NIL, NIL, @lCrypted )
hb_unzipFileInfo( hUnzip,,,,,,,,, @lCrypted )
ENDIF
hb_unzipClose( hUnzip )
@@ -161,7 +159,7 @@ FUNCTION hb_GetFilesInZip( cFileName, lVerbose )
nErr := hb_unzipFileFirst( hUnzip )
DO WHILE nErr == 0
hb_unzipFileInfo( hUnzip, @cFileName, @dDate, @cTime, @nInternalAttr, NIL, @nMethod, @nSize, @nCompSize, @lCrypted, @cComment, @nCRC )
hb_unzipFileInfo( hUnzip, @cFileName, @dDate, @cTime, @nInternalAttr,, @nMethod, @nSize, @nCompSize, @lCrypted, @cComment, @nCRC )
IF lVerbose
@@ -220,24 +218,21 @@ PROCEDURE hb_SetBuffer( nWriteBuffer, nExtractBuffer, nReadBuffer )
HB_SYMBOL_UNUSED( nWriteBuffer )
HB_SYMBOL_UNUSED( nExtractBuffer )
IF ! Empty( nReadBuffer )
IF HB_ISNUMERIC( nReadBuffer ) .AND. nReadBuffer >= 1
t_nReadBuffer := Min( nReadBuffer, 32768 )
ENDIF
RETURN
/* NOTE: Spanning not supported. */
FUNCTION hb_ZipFileByTDSpan( cFileName, aFileToCompress, nLevel, bUpdate, lOverwrite, cPassword, nSpanSize, lWithPath, lWithDrive, bProgress, lFullPath, acExclude )
HB_SYMBOL_UNUSED( nSpanSize )
/* NOTE: Spanning not supported. */
RETURN hb_ZipFile( cFileName, aFileToCompress, nLevel, bUpdate, lOverwrite, cPassword, lWithPath, lWithDrive, bProgress, lFullPath, acExclude )
/* NOTE: Spanning not supported. */
FUNCTION hb_ZipFileByPKSpan( ... )
/* NOTE: Spanning not supported. */
RETURN hb_ZipFile( ... )
FUNCTION hb_ZipFile( ;
@@ -253,8 +248,6 @@ FUNCTION hb_ZipFile( ;
lFullPath, ;
acExclude )
LOCAL lRetVal := .T.
LOCAL hZip
LOCAL hHandle
LOCAL nLen
@@ -265,19 +258,15 @@ FUNCTION hb_ZipFile( ;
LOCAL cName, cExt, cDrive, cPath
LOCAL nSize
LOCAL tTime
LOCAL nAttr
LOCAL aExclFile
LOCAL aProcFile
LOCAL cFN
LOCAL aFile
LOCAL tmp
hb_default( @lOverwrite, .F. )
hb_default( @lFullPath, .T. )
/* TODO: Implement */
HB_SYMBOL_UNUSED( lFullPath )
HB_SYMBOL_UNUSED( acExclude )
hb_default( @lFullPath, .F. )
IF Set( _SET_DEFEXTENSIONS )
cFileName := hb_FNameExtSetDef( cFileName, ".zip" )
@@ -296,20 +285,11 @@ FUNCTION hb_ZipFile( ;
acExclude := { acExclude }
ENDIF
hb_default( @acFiles, {} )
hb_default( @acExclude, {} )
hb_default( @lWithPath, .F. )
hb_default( @lWithDrive, .F. )
// ;
/* NOTE: Try not to add the .zip file to itself. */
hb_FNameSplit( cFileName, NIL, @cName, @cExt )
aExclFile := { hb_FNameMerge( NIL, cName, cExt ) }
FOR EACH cFN IN acExclude
aExclFile := { hb_FNameNameExt( cFileName ) }
FOR EACH cFN IN hb_defaultValue( acExclude, {} )
IF "?" $ cFN .OR. "*" $ cFN
tmp := Directory( cFN )
FOR EACH aFile IN tmp
FOR EACH aFile IN Directory( cFN )
AAdd( aExclFile, aFile[ F_NAME ] )
NEXT
ELSE
@@ -318,32 +298,43 @@ FUNCTION hb_ZipFile( ;
NEXT
aProcFile := {}
FOR EACH cFN IN acFiles
FOR EACH cFN IN hb_defaultValue( acFiles, {} )
hb_FNameSplit( cFN, @cPath, NIL, NIL, @cDrive )
IF hb_LeftEq( cPath, "." + hb_ps() ) /* strip current dir if any */
cPath := SubStr( cPath, Len( "." + hb_ps() ) + 1 )
ENDIF
IF "?" $ cFN .OR. "*" $ cFN
tmp := Directory( cFN )
FOR EACH aFile IN tmp
IF lFullPath
cPath := hb_PathJoin( hb_cwd(), cPath )
ENDIF
FOR EACH aFile IN Directory( cFN )
IF AScan( aExclFile, {| cExclFile | hb_FileMatch( aFile[ F_NAME ], cExclFile ) } ) == 0
AAdd( aProcFile, aFile[ F_NAME ] )
AAdd( aProcFile, cPath + aFile[ F_NAME ] )
ENDIF
NEXT
ELSE
hb_FNameSplit( cFN, NIL, @cName, @cExt )
IF AScan( aExclFile, {| cExclFile | hb_FileMatch( hb_FNameMerge( NIL, cName, cExt ), cExclFile ) } ) == 0
AAdd( aProcFile, cFN )
cName := hb_FNameNameExt( cFN )
IF AScan( aExclFile, {| cExclFile | hb_FileMatch( cName, cExclFile ) } ) == 0
IF hb_FileExists( cFN )
AAdd( aProcFile, iif( lFullPath, hb_PathJoin( hb_cwd(), cFN ), cFN ) )
ENDIF
ENDIF
ENDIF
NEXT
aExclFile := NIL
// ;
hb_default( @lWithPath, .F. )
hb_default( @lWithDrive, .F. )
//
nPos := 1
FOR EACH cFileToZip IN aProcFile
IF ( hHandle := FOpen( cFileToZip, FO_READ ) ) != F_ERROR
IF ( hHandle := FOpen( cFileToZip ) ) != F_ERROR
IF HB_ISBLOCK( bUpdate )
IF HB_ISEVALITEM( bUpdate )
Eval( bUpdate, cFileToZip, nPos++ )
ENDIF
@@ -353,12 +344,15 @@ FUNCTION hb_ZipFile( ;
hb_FGetDateTime( cFileToZip, @tTime )
hb_FNameSplit( cFileToZip, @cPath, @cName, @cExt, @cDrive )
hb_zipFileCreate( hZip, hb_FNameMerge( iif( lWithPath, cPath, NIL ), cName, cExt, iif( lWithDrive, cDrive, NIL ) ), ;
tTime, NIL, NIL, NIL, NIL, nLevel, cPassword, iif( Empty( cPassword ), NIL, hb_zipFileCRC32( cFileToZip ) ), NIL )
IF ! lWithDrive .AND. ! Empty( cDrive ) .AND. hb_LeftEq( cPath, cDrive + hb_osDriveSeparator() )
cPath := SubStr( cPath, Len( cDrive + hb_osDriveSeparator() ) + 1 )
ENDIF
hb_zipFileCreate( hZip, StrTran( hb_FNameMerge( iif( lWithPath, cPath, NIL ), cName, cExt ), "\", "/" ), ;
tTime,,,,, nLevel, cPassword, iif( Empty( cPassword ), NIL, hb_zipFileCRC32( cFileToZip ) ), NIL )
DO WHILE ( nLen := FRead( hHandle, @cBuffer, hb_BLen( cBuffer ) ) ) > 0
IF HB_ISBLOCK( bProgress )
IF HB_ISEVALITEM( bProgress )
nRead += nLen
Eval( bProgress, nRead, nSize )
ENDIF
@@ -370,16 +364,18 @@ FUNCTION hb_ZipFile( ;
FClose( hHandle )
/* TODO: Clear ARCHIVE bit. */
IF hb_FGetAttr( cFileToZip, @nAttr )
hb_FSetAttr( cFileToZip, hb_bitAnd( nAttr, hb_bitNot( HB_FA_ARCHIVE ) ) )
ENDIF
ENDIF
NEXT
hb_zipClose( hZip, t_cComment )
ELSE
lRetVal := .F.
RETURN .T.
ENDIF
RETURN lRetVal
RETURN .F.
FUNCTION hb_UnzipFile( cFileName, bUpdate, lWithPath, cPassword, cPath, acFiles, bProgress )
@@ -399,9 +395,7 @@ FUNCTION hb_UnzipFile( cFileName, bUpdate, lWithPath, cPassword, cPath, acFiles,
LOCAL cTime
LOCAL cBuffer := Space( t_nReadBuffer )
hb_default( @lWithPath, .F. )
IF lWithPath .AND. ! hb_DirExists( cPath ) .AND. hb_DirCreate( cPath ) != 0
IF hb_defaultValue( lWithPath, .F. ) .AND. ! hb_DirExists( cPath ) .AND. hb_DirCreate( cPath ) != 0
lRetVal := .F.
ENDIF
@@ -413,15 +407,16 @@ FUNCTION hb_UnzipFile( cFileName, bUpdate, lWithPath, cPassword, cPath, acFiles,
cFileName := hb_FNameExtSetDef( cFileName, ".zip" )
ENDIF
IF ! Empty( hUnzip := hb_unzipOpen( cFileName ) )
IF Empty( hUnzip := hb_unzipOpen( cFileName ) )
lRetVal := .F.
ELSE
IF HB_ISNUMERIC( acFiles ) .OR. ;
HB_ISSTRING( acFiles )
acFiles := { acFiles }
ENDIF
IF Empty( cPath )
hb_FNameSplit( cFileName, @cPath )
cPath := hb_FNameDir( cFileName )
ENDIF
cPath := hb_DirSepAdd( cPath )
@@ -432,15 +427,14 @@ FUNCTION hb_UnzipFile( cFileName, bUpdate, lWithPath, cPassword, cPath, acFiles,
nPos++
IF hb_unzipFileInfo( hUnzip, @cZipName, @dDate, @cTime, , , , @nSize ) == 0
IF hb_unzipFileInfo( hUnzip, @cZipName, @dDate, @cTime,,,, @nSize ) == 0
/* NOTE: As opposed to original hbziparch we don't do a second match without path. */
lExtract := Empty( acFiles ) .OR. ;
AScan( acFiles, nPos ) > 0 .OR. ;
AScan( acFiles, {| cMask | hb_FileMatch( cZipName, cMask ) } ) > 0
IF lExtract .AND. ;
( hHandle := FCreate( cPath + cZipName ) ) != F_ERROR
IF lExtract .AND. ( hHandle := FCreate( cPath + cZipName ) ) != F_ERROR
IF hb_unzipFileOpen( hUnzip, cPassword ) != UNZ_OK
lRetVal := .F.
@@ -449,7 +443,7 @@ FUNCTION hb_UnzipFile( cFileName, bUpdate, lWithPath, cPassword, cPath, acFiles,
nRead := 0
DO WHILE ( nLen := hb_unzipFileRead( hUnzip, @cBuffer, hb_BLen( cBuffer ) ) ) > 0
IF HB_ISBLOCK( bProgress )
IF HB_ISEVALITEM( bProgress )
nRead += nLen
Eval( bProgress, nRead, nSize )
ENDIF
@@ -461,7 +455,7 @@ FUNCTION hb_UnzipFile( cFileName, bUpdate, lWithPath, cPassword, cPath, acFiles,
hb_FSetDateTime( cPath + cZipName, dDate, cTime )
IF HB_ISBLOCK( bUpdate )
IF HB_ISEVALITEM( bUpdate )
Eval( bUpdate, cZipName, nPos )
ENDIF
ENDIF
@@ -471,8 +465,6 @@ FUNCTION hb_UnzipFile( cFileName, bUpdate, lWithPath, cPassword, cPath, acFiles,
ENDDO
hb_unzipClose( hUnzip )
ELSE
lRetVal := .F.
ENDIF
RETURN lRetVal

9
src/rtl/hbgtcore.c
View File

@@ -1874,7 +1874,8 @@ static HB_BOOL hb_gt_def_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
if( ! pInfo->pResult )
pInfo->pResult = hb_itemNew( NULL );
hb_arrayNew( pInfo->pResult, 6 );
hb_arrayNew( pInfo->pResult, 7 );
/* 7-th item is allocated for GTCTW window number */
HB_GTSELF_GETPOS( pGT, &iRow, &iCol );
hb_arraySetNI( pInfo->pResult, 1, iRow );
hb_arraySetNI( pInfo->pResult, 2, iCol );
@@ -1897,9 +1898,9 @@ static HB_BOOL hb_gt_def_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
HB_GTSELF_SETFLAG( pGT, HB_GTI_COMPATBUFFER, iFlag );
break;
}
case HB_GTI_SETWIN: /* restore screen buffer, cursor shape and possition */
case HB_GTI_SETWIN: /* restore screen buffer, cursor shape and position */
if( ( hb_itemType( pInfo->pNewVal ) & HB_IT_ARRAY ) &&
hb_arrayLen( pInfo->pNewVal ) == 6 )
hb_arrayLen( pInfo->pNewVal ) == 7 )
{
HB_GTSELF_DISPBEGIN( pGT );
if( hb_arrayGetCLen( pInfo->pNewVal, 6 ) > 0 )
@@ -3192,8 +3193,6 @@ static void hb_gt_def_MouseSetBounds( PHB_GT pGT, int iTop, int iLeft, int iBott
static void hb_gt_def_MouseGetBounds( PHB_GT pGT, int * piTop, int * piLeft, int * piBottom, int * piRight )
{
HB_SYMBOL_UNUSED( pGT );
*piTop = *piLeft = 0;
HB_GTSELF_GETSIZE( pGT, piBottom, piRight );
--( *piBottom );

3
src/rtl/itemseri.c
View File

@@ -1238,6 +1238,7 @@ static HB_BOOL hb_deserializeTest( const HB_UCHAR ** pBufferPtr, HB_SIZE * pnSiz
hb_itemSerialTypedRef( pRefList, pBuffer[ 0 ],
( HB_SIZE ) HB_GET_BE_UINT64( &pBuffer[ 1 ] ) );
case HB_SERIAL_XHB_B:
/* we do not support xHarbour codeblock deserialization: HB_RestoreBlock( pItem ) */
nSize = 10;
break;
}
@@ -1676,7 +1677,7 @@ static HB_SIZE hb_deserializeItem( PHB_ITEM pItem,
case HB_SERIAL_XHB_B:
nOffset = hb_deserializeItem( pItem, cdpIn, cdpOut, pBuffer,
nOffset, pRefList );
/* we do not support codeblock deserialization: HB_RestoreBlock( pItem ) */
/* we do not support xHarbour codeblock deserialization: HB_RestoreBlock( pItem ) */
/* hb_itemSerialTypedSet( pRefList, pItem, HB_SERIAL_XHB_B ); */
hb_itemClear( pItem );
break;