Skip to content

Commit

Permalink
2023-11-07 14:11 Phil Krylov (phil a t krylov.eu)
Browse files Browse the repository at this point in the history
  * include/hbwinuni.h
  * src/vm/maindllp/dllpcode.c
    * In `HB_WINAPI_GETPROCADDRESS[T]`, cast the return value to `void *`
      to pacify further cast warnings, as the exact function signature is almost
      never a `FARPROC` anyway.
  * src/compiler/harbour.yyc
  * src/macro/macro.yyc
    * Added `HB_SYMBOL_UNUSED( yynerrs )` to pacify compiler warnings.
  * src/rtl/replic.c
    * Added a cast to a comparison to pacify compiler warning.
  * src/vm/classes.c
    ! Fixed outdated format specifier in a trace message.
  • Loading branch information
tuffnatty committed Nov 7, 2023
1 parent a57a6c8 commit 956f1b7
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 10 deletions.
12 changes: 6 additions & 6 deletions include/hbwinuni.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@
#define HB_WINAPI_SYSTEM( cmd ) _wsystem( cmd )
#define HB_WINAPI_KERNEL32_DLL() ( hb_iswin9x() ? TEXT( "unicows.dll" ) : TEXT( "kernel32.dll" ) )
#if defined( HB_OS_WIN_CE )
#define HB_WINAPI_GETPROCADDRESS( h, n ) GetProcAddress( h, TEXT( n ) )
#define HB_WINAPI_GETPROCADDRESST( h, n ) GetProcAddress( h, TEXT( n ) TEXT( "W" ) )
#define HB_WINAPI_GETPROCADDRESS( h, n ) ( void * ) GetProcAddress( h, TEXT( n ) )
#define HB_WINAPI_GETPROCADDRESST( h, n ) ( void * ) GetProcAddress( h, TEXT( n ) TEXT( "W" ) )
#else
#define HB_WINAPI_GETPROCADDRESS( h, n ) GetProcAddress( h, n )
#define HB_WINAPI_GETPROCADDRESST( h, n ) GetProcAddress( h, n "W" )
#define HB_WINAPI_GETPROCADDRESS( h, n ) ( void * ) GetProcAddress( h, n )
#define HB_WINAPI_GETPROCADDRESST( h, n ) ( void * ) GetProcAddress( h, n "W" )
#endif
#else
#define HB_PARSTR( n, h, len ) hb_parstr( n, hb_setGetOSCP(), h, len )
Expand Down Expand Up @@ -126,8 +126,8 @@
#define HB_OSSTRDUP2( str, buf, len ) hb_osStrDecode2( str, buf, len )
#define HB_WINAPI_SYSTEM( cmd ) system( cmd )
#define HB_WINAPI_KERNEL32_DLL() ( TEXT( "kernel32.dll" ) )
#define HB_WINAPI_GETPROCADDRESS( h, n ) GetProcAddress( h, n )
#define HB_WINAPI_GETPROCADDRESST( h, n ) GetProcAddress( h, n "A" )
#define HB_WINAPI_GETPROCADDRESS( h, n ) ( void * ) GetProcAddress( h, n )
#define HB_WINAPI_GETPROCADDRESST( h, n ) ( void * ) GetProcAddress( h, n "A" )
#endif

#endif /* HB_OS_WIN */
Expand Down
3 changes: 3 additions & 0 deletions src/compiler/harbour.yyc
Original file line number Diff line number Diff line change
Expand Up @@ -3574,7 +3574,10 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);

yystate = 0;
yyerrstatus = 0;

yynerrs = 0;
HB_SYMBOL_UNUSED( yynerrs );

yychar = YYEMPTY; /* Cause a token to be read. */
goto yysetstate;

Expand Down
3 changes: 3 additions & 0 deletions src/macro/macro.yyc
Original file line number Diff line number Diff line change
Expand Up @@ -1668,7 +1668,10 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);

yystate = 0;
yyerrstatus = 0;

yynerrs = 0;
HB_SYMBOL_UNUSED( yynerrs );

yychar = YYEMPTY; /* Cause a token to be read. */
goto yysetstate;

Expand Down
2 changes: 1 addition & 1 deletion src/rtl/replic.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ HB_FUNC( REPLICATE )
{
if( nTimes == 1 )
hb_itemReturn( pItem );
else if( ( double ) nLen * nTimes < HB_SIZE_MAX )
else if( ( double ) nLen * nTimes < ( double ) HB_SIZE_MAX )
{
const char * szText = hb_itemGetCPtr( pItem );
HB_SIZE nSize = nLen * nTimes;
Expand Down
2 changes: 1 addition & 1 deletion src/vm/classes.c
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ static void hb_clsDictInit( PCLASS pClass, HB_SYMCNT uiHashKey )
{
HB_SIZE nSize;

HB_TRACE( HB_TR_DEBUG, ( "hb_clsDictInit(%p,%hu)", ( void * ) pClass, uiHashKey ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_clsDictInit(%p,%u)", ( void * ) pClass, uiHashKey ) );

pClass->uiHashKey = uiHashKey;
#ifdef HB_MSG_POOL
Expand Down
4 changes: 2 additions & 2 deletions src/vm/maindllp/dllpcode.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ PHB_FUNC hb_dllGetProcAddress( const char * szProcName )
{
#if defined( HB_OS_WIN_CE )
LPCTSTR s_lpGetProcAddr = TEXT( "_dll_hb_vmProcAddress" );
s_pProcGet = ( HB_PROC_GET ) GetProcAddress( s_hModule, s_lpGetProcAddr + i );
s_pProcGet = ( HB_PROC_GET ) ( void * ) GetProcAddress( s_hModule, s_lpGetProcAddr + i );
#else
static const char * s_szGetProcAddr = "_dll_hb_vmProcAddress";
s_pProcGet = ( HB_PROC_GET ) GetProcAddress( s_hModule, s_szGetProcAddr + i );
s_pProcGet = ( HB_PROC_GET ) ( void * ) GetProcAddress( s_hModule, s_szGetProcAddr + i );
#endif
}
while( s_pProcGet == NULL && ( i -= i == 4 ? 3 : 1 ) >= 0 );
Expand Down

0 comments on commit 956f1b7

Please sign in to comment.