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

2008-06-07 20:41 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/hbodbc/make_vc.bat
     ! Removed .dll -> .lib conversion for MSVC, 
       since the .lib is provided by the MS SDK anyway.
     ; [TOMERGE RC1]

   * contrib/hbcurl/hbcurl.c
   * contrib/hbcurl/hbcurl.ch
   * contrib/hbcurl/tests/ftp_uldl.prg
     ! Cleanup the rare case when curl_easy_init() returns NULL.
       Functions always return the same type, even in case libcurl 
       failed to initialize.
     + Returns value for above cases is now HB_CURLE_ERROR (== -1).
     ! CURL_*() passed pointers now are also checked for the pointer's 
       type, and RTE is thrown if they are not HBCURL ones. So for 
       example in the very rare case that any hbcurl functions would 
       get passed a GC pointer returned by another API, an argument 
       error would be thrown now.
     ! CURL_ESCAPE()/CURL_UNESCAPE() fixed picked parameter ordinal.
     + CURL_ESCAPE()/CURL_UNESCAPE() added parameter checking.
     ; [TOMERGE RC1]

   * contrib/rddads/adsmgmnt.c
     * Minor formatting.
This commit is contained in:
Viktor Szakats
2008-06-07 18:43:25 +00:00
parent caa03f145e
commit 9f86f649ab
6 changed files with 359 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
harbour/ChangeLog
View File

@@ -8,6 +8,31 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-06-07 20:41 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbodbc/make_vc.bat
! Removed .dll -> .lib conversion for MSVC,
since the .lib is provided by the MS SDK anyway.
; [TOMERGE RC1]
* contrib/hbcurl/hbcurl.c
* contrib/hbcurl/hbcurl.ch
* contrib/hbcurl/tests/ftp_uldl.prg
! Cleanup the rare case when curl_easy_init() returns NULL.
Functions always return the same type, even in case libcurl
failed to initialize.
+ Returns value for above cases is now HB_CURLE_ERROR (== -1).
! CURL_*() passed pointers now are also checked for the pointer's
type, and RTE is thrown if they are not HBCURL ones. So for
example in the very rare case that any hbcurl functions would
get passed a GC pointer returned by another API, an argument
error would be thrown now.
! CURL_ESCAPE()/CURL_UNESCAPE() fixed picked parameter ordinal.
+ CURL_ESCAPE()/CURL_UNESCAPE() added parameter checking.
; [TOMERGE RC1]
* contrib/rddads/adsmgmnt.c
* Minor formatting.
2008-06-07 13:26 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbmisc/common.mak
* contrib/hbmisc/Makefile

632
harbour/contrib/hbcurl/hbcurl.c
View File

File diff suppressed because it is too large Load Diff

1
harbour/contrib/hbcurl/hbcurl.ch
View File

@@ -362,6 +362,7 @@
/* curl result codes. */
#define HB_CURLE_ERROR -1 /* request not passed to libcurl (libcurl not initialized or unknown parameter) */
#define HB_CURLE_OK 0
#define HB_CURLE_UNSUPPORTED_PROTOCOL 1 /* */
#define HB_CURLE_FAILED_INIT 2 /* */

10
harbour/contrib/hbcurl/tests/ftp_uldl.prg
View File

@@ -70,8 +70,8 @@ FUNCTION Main( cDL, cUL )
? curl_easy_getinfo( curl, HB_CURLINFO_EFFECTIVE_URL )
? curl_easy_getinfo( curl, HB_CURLINFO_TOTAL_TIME )
info := curl_easy_getinfo( curl, HB_CURLINFO_SSL_ENGINES )
?
info := curl_easy_getinfo( curl, HB_CURLINFO_SSL_ENGINES, @tmp )
? "SSL ENGINES: ", tmp, Len( info )
FOR tmp := 1 TO Len( info )
?? info[ tmp ] + " "
NEXT
@@ -116,12 +116,6 @@ FUNCTION Main( cDL, cUL )
? curl_easy_getinfo( curl, HB_CURLINFO_EFFECTIVE_URL )
? curl_easy_getinfo( curl, HB_CURLINFO_TOTAL_TIME )
info := curl_easy_getinfo( curl, HB_CURLINFO_SSL_ENGINES )
?
FOR tmp := 1 TO Len( info )
?? info[ tmp ] + " "
NEXT
curl_easy_reset( curl )
? "Press key..."

18
harbour/contrib/hbodbc/make_vc.bat
View File

@@ -26,24 +26,6 @@ if "%1" == "INSTALL" goto POST_INSTALL
:POST_BUILD
rem ---------------------------------------------------------------
rem This .dll to .lib conversion needs GNU sed.exe in the path
rem ---------------------------------------------------------------
echo./[ \t]*ordinal hint/,/^^[ \t]*Summary/{> _temp.sed
echo. /^^[ \t]\+[0-9]\+/{>> _temp.sed
echo. s/^^[ \t]\+[0-9]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+[0-9A-Fa-f]\+[ \t]\+\(.*\)/\1/p>> _temp.sed
echo. }>> _temp.sed
echo.}>> _temp.sed
DUMPBIN /EXPORTS "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" > _dump.tmp
echo.LIBRARY "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" > _temp.def
echo.EXPORTS >> _temp.def
sed -nf _temp.sed < _dump.tmp >> _temp.def
LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib >> %_HB_MAKELOG%
del _dump.tmp
del _temp.def
del _temp.sed
rem ---------------------------------------------------------------
goto POST_EXIT
:POST_CLEAN

28
harbour/contrib/rddads/adsmgmnt.c
View File

@@ -367,9 +367,7 @@ HB_FUNC( ADSMGGETUSERNAMES )
{
UNSIGNED16 usArrayLen = ISNUM( 2 ) ? ( UNSIGNED16 ) hb_parni( 2 ) : 2000; /* needed for array memory allocation; caller can set with 2nd arg */
UNSIGNED16 usStructSize = sizeof( ADS_MGMT_USER_INFO );
ADS_MGMT_USER_INFO * pastUserInfo;
pastUserInfo = ( ADS_MGMT_USER_INFO * ) hb_xgrab( sizeof( ADS_MGMT_USER_INFO ) * usArrayLen );
ADS_MGMT_USER_INFO * pastUserInfo = ( ADS_MGMT_USER_INFO * ) hb_xgrab( sizeof( ADS_MGMT_USER_INFO ) * usArrayLen );
if( AdsMgGetUserNames( s_hMgmtHandle,
( UNSIGNED8 * ) hb_parc( 1 ) /* pucFileName */,
@@ -433,9 +431,7 @@ HB_FUNC( ADSMGGETLOCKOWNER )
{
UNSIGNED16 pusLockType = 0;
UNSIGNED16 usStructSize = sizeof( ADS_MGMT_USER_INFO );
ADS_MGMT_USER_INFO * pstUserInfo;
pstUserInfo = ( ADS_MGMT_USER_INFO * ) hb_xgrab( sizeof( ADS_MGMT_USER_INFO ) );
ADS_MGMT_USER_INFO * pstUserInfo = ( ADS_MGMT_USER_INFO * ) hb_xgrab( sizeof( ADS_MGMT_USER_INFO ) );
if( AdsMgGetLockOwner( s_hMgmtHandle,
( UNSIGNED8 * ) hb_parcx( 1 ) /* pucTableName */,
@@ -473,9 +469,7 @@ HB_FUNC( ADSMGGETOPENTABLES ) /* nMaxNumberOfFilesToReturn, cUserName, nConnecti
{
UNSIGNED16 usArrayLen = ISNUM( 1 ) ? ( UNSIGNED16 ) hb_parni( 1 ) : 300;
UNSIGNED16 usStructSize = sizeof( ADS_MGMT_TABLE_INFO );
ADS_MGMT_TABLE_INFO * astOpenTableInfo;
astOpenTableInfo = ( ADS_MGMT_TABLE_INFO * ) hb_xgrab( sizeof( ADS_MGMT_TABLE_INFO ) * usArrayLen );
ADS_MGMT_TABLE_INFO * astOpenTableInfo = ( ADS_MGMT_TABLE_INFO * ) hb_xgrab( sizeof( ADS_MGMT_TABLE_INFO ) * usArrayLen );
if( AdsMgGetOpenTables( s_hMgmtHandle,
( UNSIGNED8 * ) ( hb_parclen( 2 ) > 0 ? hb_parc( 2 ) : NULL ) /* pucUserName */,
@@ -507,9 +501,7 @@ HB_FUNC( ADSMGGETOPENTABLES2 ) /* nMaxNumberOfFilesToReturn, cUserName, nConnect
{
UNSIGNED16 usArrayLen = ISNUM( 1 ) ? ( UNSIGNED16 ) hb_parni( 1 ) : 300;
UNSIGNED16 usStructSize = sizeof( ADS_MGMT_TABLE_INFO );
ADS_MGMT_TABLE_INFO * astOpenTableInfo;
astOpenTableInfo = ( ADS_MGMT_TABLE_INFO * ) hb_xgrab( sizeof( ADS_MGMT_TABLE_INFO ) * usArrayLen );
ADS_MGMT_TABLE_INFO * astOpenTableInfo = ( ADS_MGMT_TABLE_INFO * ) hb_xgrab( sizeof( ADS_MGMT_TABLE_INFO ) * usArrayLen );
if( AdsMgGetOpenTables( s_hMgmtHandle,
( UNSIGNED8 * ) ( hb_parclen( 2 ) > 0 ? hb_parc( 2 ) : NULL ) /* pucUserName */,
@@ -547,9 +539,7 @@ HB_FUNC( ADSMGGETOPENINDEXES ) /* nMaxNumberOfFilesToReturn, cTableName, cUserNa
{
UNSIGNED16 usArrayLen = ISNUM( 1 ) ? ( UNSIGNED16 ) hb_parni( 1 ) : 300;
UNSIGNED16 usStructSize = sizeof( ADS_MGMT_INDEX_INFO );
ADS_MGMT_INDEX_INFO * astOpenIndexInfo;
astOpenIndexInfo = ( ADS_MGMT_INDEX_INFO * ) hb_xgrab( sizeof( ADS_MGMT_INDEX_INFO ) * usArrayLen );
ADS_MGMT_INDEX_INFO * astOpenIndexInfo = ( ADS_MGMT_INDEX_INFO * ) hb_xgrab( sizeof( ADS_MGMT_INDEX_INFO ) * usArrayLen );
if( AdsMgGetOpenIndexes( s_hMgmtHandle,
( UNSIGNED8 * ) ( hb_parclen( 2 ) > 0 ? hb_parc( 2 ) : NULL ) /* pucTableName */, /* fully qualified path to that table */
@@ -582,9 +572,7 @@ HB_FUNC( ADSMGGETLOCKS )
{
UNSIGNED16 usArrayLen = ISNUM( 1 ) ? ( UNSIGNED16 ) hb_parni( 1 ) : 2000;
UNSIGNED16 usStructSize = sizeof( ADS_MGMT_RECORD_INFO );
ADS_MGMT_RECORD_INFO * astRecordInfo;
astRecordInfo = ( ADS_MGMT_RECORD_INFO * ) hb_xgrab( sizeof( ADS_MGMT_RECORD_INFO ) * usArrayLen );
ADS_MGMT_RECORD_INFO * astRecordInfo = ( ADS_MGMT_RECORD_INFO * ) hb_xgrab( sizeof( ADS_MGMT_RECORD_INFO ) * usArrayLen );
if( AdsMgGetLocks( s_hMgmtHandle,
( UNSIGNED8 * ) ( hb_parclen( 2 ) > 0 ? hb_parc( 2 ) : NULL ) /* pucTableName */, /* fully qualified path to that table */
@@ -617,9 +605,7 @@ HB_FUNC( ADSMGGETWORKERTHREADACTIVITY )
{
UNSIGNED16 usArrayLen = ISNUM( 1 ) ? ( UNSIGNED16 ) hb_parni( 1 ) : 2000;
UNSIGNED16 usStructSize = sizeof( ADS_MGMT_THREAD_ACTIVITY );
ADS_MGMT_THREAD_ACTIVITY * astWorkerThreadActivity;
astWorkerThreadActivity = ( ADS_MGMT_THREAD_ACTIVITY * ) hb_xgrab( sizeof( ADS_MGMT_THREAD_ACTIVITY ) * usArrayLen );
ADS_MGMT_THREAD_ACTIVITY * astWorkerThreadActivity = ( ADS_MGMT_THREAD_ACTIVITY * ) hb_xgrab( sizeof( ADS_MGMT_THREAD_ACTIVITY ) * usArrayLen );
if( AdsMgGetWorkerThreadActivity( s_hMgmtHandle,
astWorkerThreadActivity,