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

2009-02-11 14:51 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/contrib/gtwvg/wvgwin.c
  * harbour/contrib/gtwvg/wvgsink.c
    * pacified MinGW warnings. This one:
      ../../wvgsink.c:368: warning: comparison of unsigned expression < 0
                                    is always false
      Should be checked by author. Pritpal can you look at it?
      'count' is declared as WORD so it cannot be negative.
This commit is contained in:
Przemyslaw Czerpak
2009-02-11 13:47:02 +00:00
parent d71eb670f8
commit 5ddefa0f45
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -8,6 +8,15 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-11 14:51 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/gtwvg/wvgwin.c
* harbour/contrib/gtwvg/wvgsink.c
* pacified MinGW warnings. This one:
../../wvgsink.c:368: warning: comparison of unsigned expression < 0
is always false
Should be checked by author. Pritpal can you look at it?
'count' is declared as WORD so it cannot be negative.
2009-02-11 13:10 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/ChangeLog
* add missing information about optimized hb_fsExtName() in previous

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

@@ -589,10 +589,10 @@ static HRESULT SetupConnectionPoint( device_interface* pdevice_interface, REFIID
( ( MyRealIEventHandler * ) thisobj )->count = 0;
( ( MyRealIEventHandler * ) thisobj )->iID_riid = 0;
hr = thisobj->lpVtbl->QueryInterface( thisobj, &IID_IUnknown, (void**) &pIUnknown);
hr = thisobj->lpVtbl->QueryInterface( thisobj, &IID_IUnknown, (void **) (void*) &pIUnknown );
if (hr == S_OK && pIUnknown)
{
hr = pdevice_interface->lpVtbl->QueryInterface( pdevice_interface, &IID_IConnectionPointContainer, (void**) &pIConnectionPointContainerTemp);
hr = pdevice_interface->lpVtbl->QueryInterface( pdevice_interface, &IID_IConnectionPointContainer, (void**) (void*) &pIConnectionPointContainerTemp);
if ( hr == S_OK && pIConnectionPointContainerTemp )
{
hr = pIConnectionPointContainerTemp->lpVtbl->EnumConnectionPoints( pIConnectionPointContainerTemp, &m_pIEnumConnectionPoints );
@@ -644,7 +644,7 @@ static HRESULT SetupConnectionPoint( device_interface* pdevice_interface, REFIID
//----------------------------------------------------------------------//
HB_FUNC( HB_AX_SHUTDOWNCONNECTIONPOINT )
{
MyRealIEventHandler* hSink = ( MyRealIEventHandler * ) hb_parnint( 1 );
MyRealIEventHandler* hSink = ( MyRealIEventHandler * ) ( HB_PTRDIFF ) hb_parnint( 1 );
//hb_ToOutDebug( "---------------------------------------------" );
#if 1
@@ -674,7 +674,7 @@ HB_FUNC( HB_AX_SHUTDOWNCONNECTIONPOINT )
//----------------------------------------------------------------------//
HB_FUNC( HB_AX_RELEASEOBJECT )
{
IDispatch * pDisp = ( IDispatch * ) hb_parnint( 1 );
IDispatch * pDisp = ( IDispatch * ) ( HB_PTRDIFF ) hb_parnint( 1 );
s_nOleError = pDisp->lpVtbl->Release( pDisp );
}
//---------------------------------------------------------------------------//
@@ -683,9 +683,9 @@ HB_FUNC( HB_AX_SETUPCONNECTIONPOINT )
HRESULT hr;
MyRealIEventHandler* hSink = NULL;
LPIID riid = ( LPIID ) &IID_IDispatch;
int n;
int n = 0;
hr = SetupConnectionPoint( ( device_interface* ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( REFIID ) riid, ( void** ) &hSink, &n ) ;
hr = SetupConnectionPoint( ( device_interface* ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( REFIID ) riid, ( void** ) (void*) &hSink, &n ) ;
hSink->pEvents = hb_itemNew( hb_param( 4, HB_IT_ANY ) );
@@ -785,7 +785,7 @@ HB_FUNC( HB_AX_ATLAXCREATECONTROL )
BSTR wString;
UINT uLen;
PATLAXCREATECONTROL AtlAxCreateControl;
HWND hContainer;
HWND hContainer = NULL;
RECT rc;
char *class = hb_parc( 1 );
HWND hParent = ( HWND ) hb_parnl(2);
@@ -819,7 +819,7 @@ HB_FUNC( HB_AX_ATLAXCREATECONTROL )
free( wString );
pUnk->lpVtbl->QueryInterface( pUnk, &IID_IDispatch, ( void** ) &obj );
pUnk->lpVtbl->QueryInterface( pUnk, &IID_IDispatch, ( void** ) (void*) &obj );
pUnk->lpVtbl->Release( pUnk );
hb_retnl( ( long ) obj );
@@ -880,7 +880,7 @@ HB_FUNC( HB_AX_ATLAXGETCONTROL ) // HWND hWnd = handle of control container wind
if( pUnk )
{
pUnk->lpVtbl->QueryInterface( pUnk, &IID_IDispatch, ( void** ) &obj );
pUnk->lpVtbl->QueryInterface( pUnk, &IID_IDispatch, ( void** ) (void*) &obj );
pUnk->lpVtbl->Release( pUnk );
GetClientRect( hParent, &rc );
MoveWindow( GetDlgItem( hParent, ( int ) id ), 0, 0, rc.right-rc.left, rc.bottom-rc.top, TRUE );

12
harbour/contrib/gtwvg/wvgwin.c
View File

@@ -1617,7 +1617,7 @@ HB_FUNC( WVG_TREEVIEW_ADDITEM )
TVIS_EXPANDEDONCE | TVIS_SELECTED | TVIS_EXPANDPARTIAL |
TVIS_OVERLAYMASK | TVIS_STATEIMAGEMASK | TVIS_USERMASK ;
tvis.item.state = NULL; // TVI_BOLD
tvis.item.state = 0; // TVI_BOLD
tvis.hParent = ISNIL( 2 ) ? NULL : wvg_parhandle( 2 );
tvis.item.pszText = text;
@@ -1750,7 +1750,11 @@ HB_FUNC( WIN_ISZOOMED )
//
HB_FUNC( WIN_SETDCBRUSHCOLOR )
{
#if ( _WIN32_WINNT >= 0x0500 )
wvg_rethandle( SetDCBrushColor( wvg_parhdc( 1 ), wvg_parcolor( 2 ) ) );
#else
wvg_rethandle( NULL );
#endif
}
//----------------------------------------------------------------------//
@@ -1758,7 +1762,11 @@ HB_FUNC( WIN_SETDCBRUSHCOLOR )
//
HB_FUNC( WIN_SETDCPENCOLOR )
{
#if ( _WIN32_WINNT >= 0x0500 )
wvg_rethandle( SetDCPenColor( wvg_parhdc( 1 ), wvg_parcolor( 2 ) ) );
#else
wvg_rethandle( NULL );
#endif
}
//----------------------------------------------------------------------//
@@ -1805,7 +1813,7 @@ HB_FUNC( WIN_SETWINDOWPOSTOTOP )
HB_FUNC( WIN_SETWINDOWSIZE )
{
hb_retl( SetWindowPos( wvg_parhwnd( 1 ), NULL, NULL, NULL, hb_parni( 2 ), hb_parni( 3 ),
hb_retl( SetWindowPos( wvg_parhwnd( 1 ), NULL, 0, 0, hb_parni( 2 ), hb_parni( 3 ),
hb_parl( 4 ) ? 0 : SWP_NOREDRAW | SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE ) );
}