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

2011-03-17 09:23 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbct/disk.c
    ! Fixed regression in prev patch. [via Andi]
This commit is contained in:
Viktor Szakats
2011-03-17 08:24:21 +00:00
parent f090632668
commit 86a4b2e48f
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -16,6 +16,10 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-03-17 09:23 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbct/disk.c
! Fixed regression in prev patch. [via Andi]
2011-03-17 08:46 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/common/hbver.c
+ New Intel compiler version detection. [Tamas Tevesz]

8
harbour/contrib/hbct/disk.c
View File

@@ -206,6 +206,8 @@ HB_FUNC( VOLUME )
char * sVolName = NULL;
char sRootBuf[ 4 ], sVolNameBuf[ 12 ];
char * pszFree;
LPTSTR lpRoot;
LPTSTR lpVolName;
if( hb_parclen( 1 ) > 0 )
{
@@ -218,6 +220,7 @@ HB_FUNC( VOLUME )
hb_strncpy( sRootBuf, fname->szPath, sizeof( sRootBuf ) - 1 );
sRoot = sRootBuf;
}
if( fname->szName )
{
hb_strncpy( sVolNameBuf, fname->szName, sizeof( sVolNameBuf ) - 1 );
@@ -231,12 +234,13 @@ HB_FUNC( VOLUME )
hb_strncpy( sVolNameBuf, sDiskName, sizeof( sVolNameBuf ) - 1 );
sVolName = sVolNameBuf;
}
if( pszFree )
hb_xfree( pszFree );
}
LPTSTR lpRoot = sRoot ? HB_TCHAR_CONVTO( sRoot ) : NULL;
LPTSTR lpVolName = sVolName ? HB_TCHAR_CONVTO( sVolName ) : NULL;
lpRoot = sRoot ? HB_TCHAR_CONVTO( sRoot ) : NULL;
lpVolName = sVolName ? HB_TCHAR_CONVTO( sVolName ) : NULL;
bReturn = SetVolumeLabel( lpRoot, lpVolName );