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

2009-02-11 16:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/gtwvg/wvgutils.c
    ! Applied fixes done to WIN_APPENDMENU() to the exact
      same function named WVT_APPENDMENU().
    % Converted WVT_APPENDMENU() to a simple stub redirecting
      the call to WIN_APPENDMENU().
This commit is contained in:
Viktor Szakats
2009-02-11 15:34:30 +00:00
parent 4065e2a35a
commit 155977236e
2 changed files with 10 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -8,6 +8,13 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-11 16:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/gtwvg/wvgutils.c
! Applied fixes done to WIN_APPENDMENU() to the exact
same function named WVT_APPENDMENU().
% Converted WVT_APPENDMENU() to a simple stub redirecting
the call to WIN_APPENDMENU().
2009-02-11 15:33 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/gtwvg/wvgwin.c
! Fixed to use hb_snprintf() instead of unsafe sprintf().

72
harbour/contrib/gtwvg/wvgutils.c
View File

@@ -733,77 +733,11 @@ HB_FUNC( WVT_CREATEPOPUPMENU )
//-------------------------------------------------------------------//
HB_FUNC_EXTERN( WIN_APPENDMENU );
HB_FUNC( WVT_APPENDMENU )
{
#if 0
char ucBuf[ 256 ];
int i,iLen;
LPTSTR lpszCaption;
if ( ISCHAR( 4 ) )
{
iLen = hb_parclen( 4 );
if ( iLen > 0 && iLen < 256 ) // Translate '~' to '&'
{
lpszCaption = HB_TCHAR_CONVTO( hb_parc( 4 ) );
for ( i = 0; i < iLen; i++ )
{
ucBuf[ i ] = ( *lpszCaption == '~' ) ? '&' : ( char ) *lpszCaption;
lpszCaption++;
}
ucBuf[ iLen ]= '\0';
lpszCaption = HB_TCHAR_CONVTO( ucBuf );
hb_retl( AppendMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( HB_PTRDIFF ) hb_parnint( 3 ), ( LPCTSTR ) lpszCaption ) ) ;
HB_TCHAR_FREE( lpszCaption );
}
else
{
lpszCaption = HB_TCHAR_CONVTO( hb_parc( 4 ) );
hb_retl( AppendMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( HB_PTRDIFF ) hb_parnint( 3 ), ( LPCTSTR ) lpszCaption ) ) ;
HB_TCHAR_FREE( lpszCaption );
}
}
else
{
lpszCaption = ( LPTSTR ) ( HB_PTRDIFF ) hb_parnint( 4 ) ; // It is a SEPARATOR or Submenu
hb_retl( AppendMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( HB_PTRDIFF ) hb_parnint( 3 ), ( LPCTSTR ) lpszCaption ) ) ;
}
#endif
LPTSTR buffer;
int i,iLen ;
if ( ISCHAR( 4 ) )
{
iLen = hb_parclen( 4 );
if ( iLen > 0 && iLen < 256 ) // Translate '~' to '&'
{
LPTSTR pDest;
buffer = HB_TCHAR_CONVTO( hb_parc( 4 ) );
pDest = buffer;
for ( i = 0; i < iLen; i++ )
{
pDest[ i ] = ( *buffer == '~' ) ? '&' : ( char ) *buffer;
buffer++;
}
buffer = pDest;
hb_retl( AppendMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( HB_PTRDIFF ) hb_parnint( 3 ), buffer ) ) ;
HB_TCHAR_FREE( buffer );
}
else
{
buffer = HB_TCHAR_CONVTO( hb_parc( 4 ) );
hb_retl( AppendMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( HB_PTRDIFF ) hb_parnint( 3 ), buffer ) ) ;
HB_TCHAR_FREE( buffer );
}
}
else
{ // It is a SEPARATOR or Submenu
LPCTSTR lpszCaption = ( LPCTSTR ) ( HB_PTRDIFF ) hb_parnint( 4 ) ;
hb_retl( AppendMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( HB_PTRDIFF ) hb_parnint( 3 ), ( LPCTSTR ) lpszCaption ) ) ;
}
HB_FUNC_EXEC( WIN_APPENDMENU );
}
//-------------------------------------------------------------------//