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

2009-04-10 08:00 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* harbour/contrib/hbqt/generator/hbqtgen.prg
    - Removed WIN specific castings.
  * harbour/contrib/gtwvg/wvgsink.c
    ! Commented out calls to hb_ToOutDebug().
This commit is contained in:
Pritpal Bedi
2009-04-10 15:04:46 +00:00
parent 0ec1dafdaa
commit 981ba2c123
3 changed files with 53 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -8,6 +8,12 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-04-10 08:00 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* harbour/contrib/hbqt/generator/hbqtgen.prg
- Removed WIN specific castings.
* harbour/contrib/gtwvg/wvgsink.c
! Commented out calls to hb_ToOutDebug().
2009-04-10 16:45 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
* harbour/contrib/rddsql/sddfb/fbirddd.c
* fixed msvc64 compile warnings and errors

17
harbour/contrib/gtwvg/wvgsink.c
View File

@@ -143,8 +143,14 @@ HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem );
HRESULT hb_oleVariantToItem( PHB_ITEM pItem, VARIANT *pVariant );
void HB_EXPORT hb_ToOutDebug( const char * sTraceMsg, ... );
/* Switch it on when required tracing. While committing switch it off */
#if 0
#define __HBTOOUT__
#endif
#ifdef __HBTOOUT__
void hb_ToOutDebug( const char * sTraceMsg, ... );
#endif
/*----------------------------------------------------------------------*/
#if !defined( StringCchCat )
@@ -316,7 +322,9 @@ static HRESULT STDMETHODCALLTYPE QueryInterface( IEventHandler *self, REFIID vTa
{
*ppv = ( IUnknown * ) self;
/* Increment the count of callers who have an outstanding pointer to self object */
#ifdef __HBTOOUT__
hb_ToOutDebug( ".................................if ( IsEqualIID( vTableGuid, HB_ID_REF( IID_IUnknown ) ) )" );
#endif
self->lpVtbl->AddRef( self );
return S_OK;
}
@@ -324,7 +332,9 @@ hb_ToOutDebug( ".................................if ( IsEqualIID( vTableGuid, HB
if ( IsEqualIID( vTableGuid, HB_ID_REF( IID_IDispatch ) ) )
{
*ppv = ( IDispatch * ) self;
#ifdef __HBTOOUT__
hb_ToOutDebug( ".................................if ( IsEqualIID( vTableGuid, HB_ID_REF( IID_IDispatch ) ) )" );
#endif
self->lpVtbl->AddRef( self );
return S_OK;
}
@@ -334,7 +344,9 @@ hb_ToOutDebug( ".................................if ( IsEqualIID( vTableGuid, HB
if( ++( ( ( MyRealIEventHandler * ) self )->iID_riid ) == 1 )
{
*ppv = ( IDispatch* ) self;
#ifdef __HBTOOUT__
hb_ToOutDebug( ".................................if ( IsEqualIID( vTableGuid, HB_ID_REF( ( ( MyRealIEventHandler * ) self )->device_event_interface_iid ) ) )" );
#endif
self->lpVtbl->AddRef( self );
}
return S_OK;
@@ -1122,8 +1134,9 @@ int LoadTypeInformation( IDispatch* pDisp ) /* pass dispatch interface */
*wsprintf( cBuffer, "typeinfocount: %i", i );
*OutputDebugString( cBuffer);
*/
#ifdef __HBTOOUT__
hb_ToOutDebug( "---------------- start ------------------" );
#endif
hr = pDisp->lpVtbl->GetTypeInfo( pDisp, 0, LOCALE_SYSTEM_DEFAULT, &pTypeInfo );
if( hr != S_OK || pTypeInfo == NULL )
{

64
harbour/contrib/hbqt/generator/hbqtgen.prg
View File

@@ -658,22 +658,6 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
aA[ PRT_BODY ] := 'hbqt_par_QString( '+ cHBIdx +' )'
aA[ PRT_DOC ] := 'c'+ cDocNM
CASE aA[ PRT_CAST ] == 'HFONT'
aA[ PRT_BODY ] := IF( aA[ PRT_L_CONST ], '*','' ) +'hbqt_par_HFONT( '+ cHBIdx +' )'
aA[ PRT_DOC ] := 'h'+ cDocNM
CASE aA[ PRT_CAST ] == 'HDC'
aA[ PRT_BODY ] := '*hbqt_par_HDC( '+ cHBIdx +' )'
aA[ PRT_DOC ] := 'h'+ cDocNM
CASE aA[ PRT_CAST ] == 'WId'
aA[ PRT_BODY ] := 'hbqt_par_WId( '+ cHBIdx +' )'
aA[ PRT_DOC ] := 'h'+ cDocNM
CASE aA[ PRT_CAST ] == 'HRGN'
aA[ PRT_BODY ] := 'hbqt_par_HRGN( '+ cHBIdx +' )'
aA[ PRT_DOC ] := 'h'+ cDocNM
CASE aA[ PRT_CAST ] == 'FT_Face'
aA[ PRT_BODY ] := 'hbqt_par_FT_Face( '+ cHBIdx +' )'
aA[ PRT_DOC ] := 'c'+ cDocNM
@@ -698,6 +682,22 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
#endif
aA[ PRT_DOC ] := 'p'+ cDocNM
#if 0
CASE aA[ PRT_CAST ] == 'HFONT'
aA[ PRT_BODY ] := IF( aA[ PRT_L_CONST ], '*','' ) +'hbqt_par_HFONT( '+ cHBIdx +' )'
aA[ PRT_DOC ] := 'h'+ cDocNM
CASE aA[ PRT_CAST ] == 'HDC'
aA[ PRT_BODY ] := '*hbqt_par_HDC( '+ cHBIdx +' )'
aA[ PRT_DOC ] := 'h'+ cDocNM
CASE aA[ PRT_CAST ] == 'WId'
aA[ PRT_BODY ] := 'hbqt_par_WId( '+ cHBIdx +' )'
aA[ PRT_DOC ] := 'h'+ cDocNM
CASE aA[ PRT_CAST ] == 'HRGN'
aA[ PRT_BODY ] := 'hbqt_par_HRGN( '+ cHBIdx +' )'
aA[ PRT_DOC ] := 'h'+ cDocNM
CASE aA[ PRT_CAST ] == 'QRect'
aA[ PRT_BODY ] := 'hbqt_const_QRect( ' + cHBIdx + ' )'
aA[ PRT_DOC ] := 'a'+ cDocNM
@@ -778,22 +778,6 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
cCmd := 'hb_retc( '+ cCmn +'.toLatin1().data()' +' )'
cPrgRet := 'c'+cDocNM
CASE aA[ PRT_CAST ] == 'HFONT'
cCmd := 'hb_retptr( ( HFONT ) '+ cCmn +' )'
cPrgRet := 'h'+cDocNM
CASE aA[ PRT_CAST ] == 'HDC'
cCmd := 'hb_retptr( ( HDC ) '+ cCmn +' )'
cPrgRet := 'h'+cDocNM
CASE aA[ PRT_CAST ] == 'WId'
cCmd := 'hb_retptr( ( HWND ) '+ cCmn +' )'
cPrgRet := 'h'+cDocNM
CASE aA[ PRT_CAST ] == 'HRGN'
cCmd := 'hb_retptr( ( HRGN ) '+ cCmn +' )'
cPrgRet := 'h'+cDocNM
CASE aA[ PRT_CAST ] == 'FT_Face'
cCmd := 'hb_retc( '+ cCmn +' )'
cPrgRet := 'c'+cDocNM
@@ -822,6 +806,22 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
cCmd := 'hb_retptr( ( '+ aA[ PRT_CAST ] + '* ) ' + cCmn + ' )'
cPrgRet := 'p'+cDocNM
#if 0
CASE aA[ PRT_CAST ] == 'HFONT'
cCmd := 'hb_retptr( ( HFONT ) '+ cCmn +' )'
cPrgRet := 'h'+cDocNM
CASE aA[ PRT_CAST ] == 'HDC'
cCmd := 'hb_retptr( ( HDC ) '+ cCmn +' )'
cPrgRet := 'h'+cDocNM
CASE aA[ PRT_CAST ] == 'WId'
cCmd := 'hb_retptr( ( HWND ) '+ cCmn +' )'
cPrgRet := 'h'+cDocNM
CASE aA[ PRT_CAST ] == 'HRGN'
cCmd := 'hb_retptr( ( HRGN ) '+ cCmn +' )'
cPrgRet := 'h'+cDocNM
CASE aA[ PRT_CAST ] == 'QRect'
cCmd := 'hbqt_ret_QRect( '+ cCmn +' )'
cPrgRet := 'a'+cDocNM