From ae62f2effe3489622eb76cea0a311ce01e68095a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Sun, 28 Jan 2024 12:50:51 +0100 Subject: [PATCH] 2024-01-28 12:50 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/hbfimage/core.c * use FreeImage_Rotate() instead of FreeImage_RotateClassic() in new FreeImage versions which do not support this function * contrib/hbsqlit3/core.c * added missing casting reported as bug in C++ mode * contrib/hbssl/hbssl.h * contrib/hbssl/rsa.c * added HB_SSL_CONST_BYTE() macro to pacify unconst warnings in old SSL versions * src/rdd/wacore.c * inlined macro to pacify still returning false warning --- ChangeLog.txt | 16 ++++++++++++++++ contrib/hbfimage/core.c | 4 ++++ contrib/hbsqlit3/core.c | 4 ++-- contrib/hbssl/hbssl.h | 4 +++- contrib/hbssl/rsa.c | 8 ++++---- src/rdd/wacore.c | 3 ++- 6 files changed, 31 insertions(+), 8 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 35ddd0a104..dbc1e94229 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,22 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2024-01-28 12:50 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * contrib/hbfimage/core.c + * use FreeImage_Rotate() instead of FreeImage_RotateClassic() in new + FreeImage versions which do not support this function + + * contrib/hbsqlit3/core.c + * added missing casting reported as bug in C++ mode + + * contrib/hbssl/hbssl.h + * contrib/hbssl/rsa.c + * added HB_SSL_CONST_BYTE() macro to pacify unconst warnings + in old SSL versions + + * src/rdd/wacore.c + * inlined macro to pacify still returning false warning + 2023-12-08 23:17 UTC+0100 Phil Krylov (phil a t krylov.eu) * contrib/sddsqlt3/core.c ! Fixed a different signedness compare warning. diff --git a/contrib/hbfimage/core.c b/contrib/hbfimage/core.c index 32c8b1c484..16b621d034 100644 --- a/contrib/hbfimage/core.c +++ b/contrib/hbfimage/core.c @@ -1231,7 +1231,11 @@ HB_FUNC( FI_ROTATECLASSIC ) FIBITMAP * dib = hb_FIBITMAP_par( 1 ); double angle = hb_parnd( 2 ); +#if FREEIMAGE_MAJOR_VERSION > 3 || ( FREEIMAGE_MAJOR_VERSION >= 3 && FREEIMAGE_MINOR_VERSION >= 18 ) + hb_FIBITMAP_ret( FreeImage_Rotate( dib, angle, NULL ), HB_TRUE ); +#else hb_FIBITMAP_ret( FreeImage_RotateClassic( dib, angle ), HB_TRUE ); +#endif } else hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); diff --git a/contrib/hbsqlit3/core.c b/contrib/hbsqlit3/core.c index 5b71e2836f..804d320416 100644 --- a/contrib/hbsqlit3/core.c +++ b/contrib/hbsqlit3/core.c @@ -1830,7 +1830,7 @@ static int trace_handler( unsigned uType, void *cbTraceHandler, void * p, void * { case SQLITE_TRACE_STMT: hb_vmPushPointer( p ); - hb_vmPushString( x, strlen( x ) ); + hb_vmPushString( ( const char * ) x, strlen( ( char * ) x ) ); hb_vmSend( 3 ); break; case SQLITE_TRACE_PROFILE: @@ -1849,7 +1849,7 @@ static int trace_handler( unsigned uType, void *cbTraceHandler, void * p, void * HB_SQLITE3 * hbsqlite3 = ( HB_SQLITE3 * ) hb_xgrabz( sizeof( HB_SQLITE3 ) ); HB_SYMBOL_UNUSED( x ); - hbsqlite3->db = p; + hbsqlite3->db = ( sqlite3 * ) p; hb_sqlite3_itemPut( pItem, hbsqlite3, HB_SQLITE3_DB ); hb_vmPush( pItem ); hb_vmSend( 2 ); diff --git a/contrib/hbssl/hbssl.h b/contrib/hbssl/hbssl.h index 1ea030dd7f..154eb95deb 100644 --- a/contrib/hbssl/hbssl.h +++ b/contrib/hbssl/hbssl.h @@ -169,8 +169,10 @@ declarations in OpenSSL prior 0.9.8 */ #if OPENSSL_VERSION_NUMBER < 0x0090800fL #define HB_SSL_CONST + #define HB_SSL_CONST_BYTE( x ) ( ( unsigned char * ) ( x ) ) #else - #define HB_SSL_CONST const + #define HB_SSL_CONST const + #define HB_SSL_CONST_BYTE( x ) ( ( const unsigned char * ) ( x ) ) #endif HB_EXTERN_BEGIN diff --git a/contrib/hbssl/rsa.c b/contrib/hbssl/rsa.c index 039c9e5636..ff60137e47 100644 --- a/contrib/hbssl/rsa.c +++ b/contrib/hbssl/rsa.c @@ -114,7 +114,7 @@ HB_FUNC( RSA_PUBLIC_ENCRYPT ) buffer = ( unsigned char * ) hb_xgrab( RSA_size( rsa ) + 1 ); - ret = RSA_public_encrypt( flen, HB_UNCONST( from ), buffer, rsa, padding ); + ret = RSA_public_encrypt( flen, HB_SSL_CONST_BYTE( from ), buffer, rsa, padding ); if( ret > 0 ) { if( ! hb_storclen_buffer( ( char * ) buffer, ret, 3 ) ) @@ -146,7 +146,7 @@ HB_FUNC( RSA_PRIVATE_DECRYPT ) buffer = ( unsigned char * ) hb_xgrab( RSA_size( rsa ) + 1 ); - ret = RSA_private_decrypt( flen, HB_UNCONST( from ), buffer, rsa, padding ); + ret = RSA_private_decrypt( flen, HB_SSL_CONST_BYTE( from ), buffer, rsa, padding ); if( ret > 0 ) { buffer = ( unsigned char * ) hb_xrealloc( buffer, ret + 1 ); @@ -179,7 +179,7 @@ HB_FUNC( RSA_PRIVATE_ENCRYPT ) buffer = ( unsigned char * ) hb_xgrab( RSA_size( rsa ) + 1 ); - ret = RSA_private_encrypt( flen, HB_UNCONST( from ), buffer, rsa, padding ); + ret = RSA_private_encrypt( flen, HB_SSL_CONST_BYTE( from ), buffer, rsa, padding ); if( ret > 0 ) { if( ! hb_storclen_buffer( ( char * ) buffer, ret, 3 ) ) @@ -211,7 +211,7 @@ HB_FUNC( RSA_PUBLIC_DECRYPT ) buffer = ( unsigned char * ) hb_xgrab( RSA_size( rsa ) + 1 ); - ret = RSA_public_decrypt( flen, HB_UNCONST( from ), buffer, rsa, padding ); + ret = RSA_public_decrypt( flen, HB_SSL_CONST_BYTE( from ), buffer, rsa, padding ); if( ret > 0 ) { buffer = ( unsigned char * ) hb_xrealloc( buffer, ret + 1 ); diff --git a/src/rdd/wacore.c b/src/rdd/wacore.c index 5e2a4179fe..7f8991dc02 100644 --- a/src/rdd/wacore.c +++ b/src/rdd/wacore.c @@ -297,7 +297,8 @@ void hb_rddCloseAll( void ) hb_xfree( pRddInfo->waNums ); pRddInfo->waList = NULL; pRddInfo->waNums = NULL; - HB_SET_WA( 1 ); + pRddInfo->uiCurrArea = 1; + pRddInfo->pCurrArea = NULL; } }