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

2010-02-13 15:57 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/ChangeLog
    ! fixed typo

  * harbour/contrib/hbwin/wapi_winbase.c
    ! fixed WAPI_GETLONGPATHNAME() to compile and work with older header
      files and windows versions. When GetLongPathName() is not available
      then this function is redirected to GetShortPathName()
This commit is contained in:
Przemyslaw Czerpak
2010-02-13 14:57:10 +00:00
parent 9f9ec6db78
commit dabe6901a6
2 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -17,6 +17,15 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-02-13 15:57 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/ChangeLog
! fixed typo
* harbour/contrib/hbwin/wapi_winbase.c
! fixed WAPI_GETLONGPATHNAME() to compile and work with older header
files and windows versions. When GetLongPathName() is not available
then this function is redirected to GetShortPathName()
2010-02-13 13:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbwin/win_dll.c
% Further simplification of internal structures.
@@ -175,7 +184,7 @@
[<acFilter>], [[@]<nFilterIndex>], ;
[<nBufferSize>] )
-> <cFilePath> | <cPath> + e"\0" + <cFile1> [ + e"\0" + <cFileN> ] | ""
+ added WIN_GETSAFEFILENAME( [[@]<nFlags>], [<cTitle>], ;
+ added WIN_GETSAVEFILENAME( [[@]<nFlags>], [<cTitle>], ;
[<cInitDir>], [<cDefExt>], ;
[<acFilter>], [[@]<nFilterIndex>], ;
[<nBufferSize>] )

78
harbour/contrib/hbwin/wapi_winbase.c
View File

@@ -217,10 +217,16 @@ HB_FUNC( WAPI_GETPROCADDRESS )
FARPROC pProc;
DWORD dwLastError;
#if defined( HB_OS_WIN_CE )
pProc = NULL;
dwLastError = ERROR_INVALID_FUNCTION;
void * hProcName;
pProc = GetProcAddress( ( HMODULE ) hb_parptr( 1 ), HB_ISCHAR( 2 ) ?
hb_parstr_u16( 2, HB_CDP_ENDIAN_NATIVE, &hProcName, NULL ) :
( LPCTSTR ) ( HB_PTRDIFF ) hb_parnint( 2 ) );
dwLastError = GetLastError();
hb_strfree( hProcName );
#else
pProc = GetProcAddress( ( HMODULE ) hb_parptr( 1 ), HB_ISCHAR( 2 ) ? ( LPCSTR ) hb_parc( 2 ) : ( LPCSTR ) ( HB_PTRDIFF ) hb_parnint( 2 ) );
pProc = GetProcAddress( ( HMODULE ) hb_parptr( 1 ), HB_ISCHAR( 2 ) ?
hb_parc( 2 ) : ( LPCSTR ) ( HB_PTRDIFF ) hb_parnint( 2 ) );
dwLastError = GetLastError();
#endif
hbwapi_SetLastError( dwLastError );
@@ -296,7 +302,9 @@ HB_FUNC( WAPI_MULDIV )
hb_retni( MulDiv( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) );
}
HB_FUNC( WAPI_GETSHORTPATHNAME )
typedef DWORD ( WINAPI * _HB_GETPATHNAME ) ( LPCTSTR, LPTSTR, DWORD );
static void s_getPathName( _HB_GETPATHNAME getPathName )
{
void * hLongPath;
DWORD length = 0;
@@ -320,21 +328,21 @@ HB_FUNC( WAPI_GETSHORTPATHNAME )
lpszShortPath = ( LPTSTR ) hb_xgrab( cchBuffer * sizeof( TCHAR ) );
}
length = GetShortPathName( lpszLongPath, lpszShortPath, cchBuffer );
length = getPathName( lpszLongPath, lpszShortPath, cchBuffer );
if( !fSize && length > cchBuffer ) /* default buffer size was too small */
{
cchBuffer = length;
lpszShortPath = ( LPTSTR ) hb_xgrab( cchBuffer * sizeof( TCHAR ) );
length = GetShortPathName( lpszLongPath, lpszShortPath, cchBuffer );
length = getPathName( lpszLongPath, lpszShortPath, cchBuffer );
}
hbwapi_SetLastError( GetLastError() );
HB_STORSTRLEN( lpszShortPath, length > cchBuffer ? 0 : length, 2 );
if( lpszShortPath && lpszShortPath != buffer )
hb_xfree( lpszShortPath );
}
else
else if( getPathName )
{
length = GetShortPathName( lpszLongPath, NULL, 0 );
length = getPathName( lpszLongPath, NULL, 0 );
hbwapi_SetLastError( GetLastError() );
}
}
@@ -342,48 +350,24 @@ HB_FUNC( WAPI_GETSHORTPATHNAME )
hb_strfree( hLongPath );
}
HB_FUNC( WAPI_GETSHORTPATHNAME )
{
s_getPathName( GetShortPathName );
}
HB_FUNC( WAPI_GETLONGPATHNAME )
{
void * hLongPath;
DWORD length = 0;
LPCTSTR lpszLongPath = HB_PARSTR( 1, &hLongPath, NULL );
_HB_GETPATHNAME getPathName = NULL;
HMODULE hLib = LoadLibrary( TEXT( "kernel32.dll" ) );
if( lpszLongPath )
if( hLib )
{
if( HB_ISBYREF( 2 ) )
{
TCHAR buffer[ HB_PATH_MAX ];
DWORD cchBuffer = ( DWORD ) HB_SIZEOFARRAY( buffer );
LPTSTR lpszShortPath = buffer;
HB_BOOL fSize = HB_ISNUM( 3 );
if( fSize ) /* the size of buffer is limited by user */
{
cchBuffer = ( DWORD ) hb_parnl( 3 );
if( cchBuffer == 0 )
lpszShortPath = NULL;
else if( cchBuffer > ( DWORD ) HB_SIZEOFARRAY( buffer ) )
lpszShortPath = ( LPTSTR ) hb_xgrab( cchBuffer * sizeof( TCHAR ) );
}
length = GetLongPathName( lpszLongPath, lpszShortPath, cchBuffer );
if( !fSize && length > cchBuffer ) /* default buffer size was too small */
{
cchBuffer = length;
lpszShortPath = ( LPTSTR ) hb_xgrab( cchBuffer * sizeof( TCHAR ) );
length = GetLongPathName( lpszLongPath, lpszShortPath, cchBuffer );
}
hbwapi_SetLastError( GetLastError() );
HB_STORSTRLEN( lpszShortPath, length > cchBuffer ? 0 : length, 2 );
if( lpszShortPath && lpszShortPath != buffer )
hb_xfree( lpszShortPath );
}
else
{
length = GetLongPathName( lpszLongPath, NULL, 0 );
hbwapi_SetLastError( GetLastError() );
}
getPathName = ( _HB_GETPATHNAME )
GetProcAddress( hLib, HBTEXT( "GetLongPathName" ) );
FreeLibrary( hLib );
}
hb_retnl( length );
hb_strfree( hLongPath );
if( !getPathName )
getPathName = GetShortPathName;
s_getPathName( getPathName );
}