diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0af89cb24a..f06e40f0f9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,16 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-08-07 03:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/gtwvg/gtwvg.c + * contrib/gtwvg/wvgutils.c + * contrib/gtwvg/wvgcore.c + ! Fixed 64 bit (MSVS 2008 64 bit and Pelles C 5 64 bit) related + problems shown as warnings. + ; Please review and test, especially WinCE and older MSVC builds. + ; NOTE: There are many other 64 bit related problems not + shown as compiler warnings. + 2008-08-06 23:07 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbapollo/Makefile ! Excluded from DOS builds. diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c index 4a57381e2c..a74bca46c1 100644 --- a/harbour/contrib/gtwvg/gtwvg.c +++ b/harbour/contrib/gtwvg/gtwvg.c @@ -1093,7 +1093,7 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA break; case VK_F4: if( pWVT->AltF4Close && bAlt ) - return DefWindowProc( pWVT->hWnd, message, wParam, lParam ); + return DefWindowProc( pWVT->hWnd, message, wParam, lParam ) != 0; hb_gt_wvt_TranslateKey( pWVT, K_F4 , K_SH_F4, K_ALT_F4 , K_CTRL_F4 ); break; case VK_F5: @@ -1175,7 +1175,7 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA } else if( pWVT->EnableShortCuts ) { - return DefWindowProc( pWVT->hWnd, message, wParam, lParam ); + return DefWindowProc( pWVT->hWnd, message, wParam, lParam ) != 0; } } } @@ -1772,7 +1772,7 @@ static DWORD hb_gt_wvt_ProcessMessages( PHB_GTWVT pWVT ) } } - return msg.wParam; + return ( DWORD ) msg.wParam; } static BOOL hb_gt_wvt_ValidWindowSize( HWND hWnd, int rows, int cols, HFONT hFont, int iWidth ) @@ -2626,7 +2626,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) switch( iMessage ) { case HB_GTS_WINDOWHANDLE: - pInfo->pResult = hb_itemPutNL( pInfo->pResult, ( LONG ) pWVT->hWnd ); + pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( LONG_PTR ) pWVT->hWnd ); break; case HB_GTS_CENTERWINDOW: @@ -3314,13 +3314,13 @@ static void hb_wvt_gtCreateObjects( PHB_GTWVT pWVT ) { pWVT->hDlgModeless[ iIndex ] = NULL; pWVT->pFunc[ iIndex ] = NULL; - pWVT->iType[ iIndex ] = ( int ) NULL; + pWVT->iType[ iIndex ] = 0; } for( iIndex = 0; iIndex < WVT_DLGMD_MAX; iIndex++ ) { pWVT->hDlgModal[ iIndex ] = NULL; pWVT->pFuncModal[ iIndex ] = NULL; - pWVT->iTypeModal[ iIndex ] = ( int ) NULL; + pWVT->iTypeModal[ iIndex ] = 0; } pWVT->bGui = FALSE; diff --git a/harbour/contrib/gtwvg/wvgcore.c b/harbour/contrib/gtwvg/wvgcore.c index ad07b9c245..34cc19d16e 100644 --- a/harbour/contrib/gtwvg/wvgcore.c +++ b/harbour/contrib/gtwvg/wvgcore.c @@ -362,7 +362,7 @@ HB_EXPORT BOOL CALLBACK hb_wvt_gtDlgProcMLess( HWND hDlg, UINT message, WPARAM w long int lReturn = 0; PHB_ITEM pFunc = NULL; - iType = (int) NULL; + iType = 0; for ( iIndex = 0; iIndex < WVT_DLGML_MAX; iIndex++ ) { @@ -450,7 +450,7 @@ HB_EXPORT BOOL CALLBACK hb_wvt_gtDlgProcMLess( HWND hDlg, UINT message, WPARAM w } _s->hDlgModeless[ iIndex ] = NULL; _s->pFunc[ iIndex ] = NULL; - _s->iType[ iIndex ] = (int) NULL; + _s->iType[ iIndex ] = 0; lReturn = 0; break; } @@ -476,7 +476,7 @@ HB_EXPORT BOOL CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM w return lReturn; } - iType = ( int ) NULL; + iType = 0; for ( iIndex = 0; iIndex < WVT_DLGMD_MAX; iIndex++ ) { @@ -564,7 +564,7 @@ HB_EXPORT BOOL CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM w } _s->hDlgModal[ iIndex ] = NULL; _s->pFuncModal[ iIndex ] = NULL; - _s->iTypeModal[ iIndex ] = ( int ) NULL; + _s->iTypeModal[ iIndex ] = 0; lReturn = 0; break; } @@ -2828,7 +2828,6 @@ HB_FUNC( WVT_CREATEFONT ) PHB_GTWVT _s = hb_wvt_gtGetWVT(); LOGFONT logfont;// = { 0,0,0 }; - HFONT hFont; logfont.lfEscapement = ( ISNIL( 10 ) ? 0 : ( hb_parni( 10 ) * 10 ) ); logfont.lfOrientation = 0; @@ -2847,15 +2846,7 @@ HB_FUNC( WVT_CREATEFONT ) //strcpy( logfont.lfFaceName, ( ISNIL( 1 ) ? _s->fontFace : hb_parcx( 1 ) ) ); HB_TCHAR_CPTO( logfont.lfFaceName, ( ISNIL( 1 ) ? _s->fontFace : hb_parcx( 1 ) ), sizeof( logfont.lfFaceName )-1 ); - hFont = CreateFontIndirect( &logfont ); - if ( hFont ) - { - hb_retnl( ( ULONG ) hFont ); - } - else - { - hb_retnl( 0 ); - } + hb_retnint( ( LONG_PTR ) CreateFontIndirect( &logfont ) ); } //-------------------------------------------------------------------// @@ -3013,7 +3004,7 @@ HB_FUNC( WVT_SAVESCREEN ) hb_arraySetNI( info, 1, iWidth ); hb_arraySetNI( info, 2, iHeight ); - hb_arraySetNL( info, 3, ( ULONG ) hBmp ); + hb_arraySetNInt( info, 3, ( LONG_PTR ) hBmp ); hb_itemReturnRelease( info ); } diff --git a/harbour/contrib/gtwvg/wvgutils.c b/harbour/contrib/gtwvg/wvgutils.c index af2429e9ed..9c4722b077 100644 --- a/harbour/contrib/gtwvg/wvgutils.c +++ b/harbour/contrib/gtwvg/wvgutils.c @@ -364,7 +364,7 @@ HB_FUNC( WVT_SETTOOLTIPWIDTH ) #if !defined( __WINCE__ ) PHB_GTWVT _s = hb_wvt_gtGetWVT(); - int iTipWidth = SendMessage( _s->hWndTT, TTM_GETMAXTIPWIDTH, 0, 0 ); + int iTipWidth = ( int ) SendMessage( _s->hWndTT, TTM_GETMAXTIPWIDTH, 0, 0 ); if ( ISNUM( 1 ) ) { @@ -382,7 +382,7 @@ HB_FUNC( WVT_SETTOOLTIPBKCOLOR ) #if !defined( __WINCE__ ) PHB_GTWVT _s = hb_wvt_gtGetWVT(); - COLORREF cr = SendMessage( _s->hWndTT, TTM_GETTIPBKCOLOR, 0, 0 ); + COLORREF cr = ( COLORREF ) SendMessage( _s->hWndTT, TTM_GETTIPBKCOLOR, 0, 0 ); if ( ISNUM( 1 ) ) { @@ -399,7 +399,7 @@ HB_FUNC( WVT_SETTOOLTIPTEXTCOLOR ) #if !defined( __WINCE__ ) PHB_GTWVT _s = hb_wvt_gtGetWVT(); - COLORREF cr = SendMessage( _s->hWndTT, TTM_GETTIPTEXTCOLOR, 0, 0 ); + COLORREF cr = ( COLORREF ) SendMessage( _s->hWndTT, TTM_GETTIPTEXTCOLOR, 0, 0 ); if ( ISNUM( 1 ) ) { @@ -440,7 +440,7 @@ HB_FUNC( WVT_GETTOOLTIPWIDTH ) #if !defined( __WINCE__ ) PHB_GTWVT _s = hb_wvt_gtGetWVT(); - hb_retni( SendMessage( _s->hWndTT, TTM_GETMAXTIPWIDTH, 0, 0 ) ); + hb_retni( ( int ) SendMessage( _s->hWndTT, TTM_GETMAXTIPWIDTH, 0, 0 ) ); #endif } @@ -600,7 +600,7 @@ HB_FUNC( WVT_SETPOINTER ) break; } - SetClassLong( _s->hWnd, GCLP_HCURSOR, ( DWORD ) hCursor ); + SetClassLongPtr( _s->hWnd, GCLP_HCURSOR, ( LONG_PTR ) hCursor ); } //-------------------------------------------------------------------// @@ -700,7 +700,7 @@ HB_FUNC( WVT_SETPOPUPMENU ) _s->hPopup = ( HMENU ) hb_parnl( 1 ); if ( hPopup ) { - hb_retnl( ( LONG ) hPopup ); + hb_retnint( ( LONG_PTR ) hPopup ); } } @@ -708,14 +708,14 @@ HB_FUNC( WVT_SETPOPUPMENU ) HB_FUNC( WVT_CREATEMENU ) { - hb_retnl( ( LONG ) CreateMenu() ) ; + hb_retnint( ( LONG_PTR ) CreateMenu() ); } //-------------------------------------------------------------------// HB_FUNC( WVT_CREATEPOPUPMENU ) { - hb_retnl( ( LONG ) CreatePopupMenu() ) ; + hb_retnint( ( LONG_PTR ) CreatePopupMenu() ); } //-------------------------------------------------------------------// @@ -921,7 +921,7 @@ HB_FUNC( WVT_GETMENU ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); - hb_retnl( ( ULONG ) GetMenu( _s->hWnd ) ); + hb_retnint( ( LONG_PTR ) GetMenu( _s->hWnd ) ); } //-------------------------------------------------------------------// @@ -958,7 +958,7 @@ HB_FUNC( WVT_CREATEDIALOGDYNAMIC ) if ( iIndex >= WVT_DLGML_MAX ) { /* no more room */ - hb_retnl( (ULONG) NULL ); + hb_retnint( 0 ); return; } @@ -1063,7 +1063,7 @@ HB_FUNC( WVT_CREATEDIALOGDYNAMIC ) } } - hb_retnl( ( ULONG ) hDlg ); + hb_retnint( ( LONG_PTR ) hDlg ); } //-------------------------------------------------------------------// @@ -1092,7 +1092,7 @@ HB_FUNC( WVT_CREATEDIALOGMODAL ) if ( iIndex >= WVT_DLGMD_MAX ) { /* no more room */ - hb_retni( ( int ) NULL ); + hb_retnint( 0 ); return; } @@ -1272,13 +1272,13 @@ HB_FUNC( WVT__MAKEDLGTEMPLATE ) } *p++ = 0x00 ; // extras ( in array 12 ) - } ; + }; - p = lpwAlign( p ) ; + p = lpwAlign( p ); - hb_retclen( ( LPSTR ) pdlgtemplate, ( ( ULONG ) p - ( ULONG ) pdlgtemplate ) ) ; + hb_retclen( ( LPSTR ) pdlgtemplate, ( ULONG ) ( p - pdlgtemplate ) ); - LocalFree( LocalHandle( pdlgtemplate ) ) ; + LocalFree( LocalHandle( pdlgtemplate ) ); } //-------------------------------------------------------------------// @@ -1288,12 +1288,11 @@ HB_FUNC( WVT__MAKEDLGTEMPLATE ) // HB_EXPORT LPWORD lpwAlign( LPWORD lpIn ) { - ULONG ul; - ul = ( ULONG ) lpIn; + LONG_PTR ul = ( LONG_PTR ) lpIn; ul += 3; ul >>=2; ul <<=2; - return ( LPWORD ) ul; + return ( LPWORD ) ul; } //----------------------------------------------------------------------------- @@ -1325,7 +1324,7 @@ HB_FUNC( WVT_LBADDSTRING ) HB_FUNC( WVT_LBGETCOUNT ) { - hb_retnl( SendMessage( GetDlgItem( ( HWND ) hb_parnl( 1 ), hb_parni( 2 ) ), LB_GETCOUNT, 0, 0 ) ); + hb_retnl( ( long ) SendMessage( GetDlgItem( ( HWND ) hb_parnl( 1 ), hb_parni( 2 ) ), LB_GETCOUNT, 0, 0 ) ); } //-------------------------------------------------------------------// @@ -1385,7 +1384,7 @@ HB_FUNC( WVT_DLGSETICON ) if ( hIcon ) { - hb_retnl( ( ULONG ) hIcon ); + hb_retnint( ( LONG_PTR ) hIcon ); } } @@ -1498,21 +1497,21 @@ HB_FUNC( WIN_SETBKMODE ) HB_FUNC( WIN_GETSTOCKOBJECT ) { - hb_retnl( ( ULONG ) GetStockObject( hb_parnl( 1 ) ) ); + hb_retnint( ( LONG_PTR ) GetStockObject( hb_parnl( 1 ) ) ); } //-------------------------------------------------------------------// HB_FUNC( WIN_DELETEOBJECT ) { - hb_retl( DeleteObject( ( HGDIOBJ ) hb_parnl( 1 ) ) ); + hb_retl( DeleteObject( ( HGDIOBJ ) hb_parnint( 1 ) ) ); } //-------------------------------------------------------------------// HB_FUNC( WIN_SELECTOBJECT ) { - hb_retnl( ( ULONG ) SelectObject( ( HDC ) hb_parnl( 1 ), ( HGDIOBJ ) hb_parnl( 2 ) ) ); + hb_retnint( ( LONG_PTR ) SelectObject( ( HDC ) hb_parnint( 1 ), ( HGDIOBJ ) hb_parnint( 2 ) ) ); } //-------------------------------------------------------------------// @@ -1611,7 +1610,7 @@ HB_FUNC( WIN_CHECKRADIOBUTTON ) HB_FUNC( WIN_GETDLGITEM ) { - hb_retnl( ( ULONG ) GetDlgItem( ( HWND ) hb_parnl( 1 ), hb_parni( 2 ) ) ); + hb_retnint( ( LONG_PTR ) GetDlgItem( ( HWND ) hb_parnint( 1 ), hb_parni( 2 ) ) ); } //-------------------------------------------------------------------// @@ -1621,7 +1620,7 @@ HB_FUNC( WIN_MESSAGEBOX ) LPTSTR lpBuffer = HB_TCHAR_CONVTO( hb_parc( 2 ) ); LPTSTR lpBuffer2 = HB_TCHAR_CONVTO( hb_parc( 3 ) ); - hb_retni( MessageBox( ( HWND ) hb_parnl( 1 ), lpBuffer, lpBuffer2, ISNIL( 4 ) ? MB_OK : hb_parni( 4 ) ) ) ; + hb_retni( MessageBox( ( HWND ) hb_parnint( 1 ), lpBuffer, lpBuffer2, ISNIL( 4 ) ? MB_OK : hb_parni( 4 ) ) ) ; HB_TCHAR_FREE( lpBuffer ); HB_TCHAR_FREE( lpBuffer2 ); @@ -1653,7 +1652,7 @@ HB_FUNC( WIN_LOADICON ) HB_TCHAR_FREE( lpBuffer ); } - hb_retnl( ( ULONG ) hIcon ) ; + hb_retnint( ( LONG_PTR ) hIcon ); } //-------------------------------------------------------------------// @@ -1685,7 +1684,7 @@ HB_FUNC( WIN_LOADIMAGE ) } HB_TCHAR_FREE( lpBuffer ); - hb_retnl( ( ULONG ) hImage ) ; + hb_retnint( ( LONG_PTR ) hImage ); } //-------------------------------------------------------------------// @@ -1719,7 +1718,7 @@ HB_FUNC( WIN_DRAWIMAGE ) HB_FUNC( WIN_GETDC ) { - hb_retnl( ( ULONG ) GetDC( ( HWND ) hb_parnl( 1 ) ) ); + hb_retnint( ( LONG_PTR ) GetDC( ( HWND ) hb_parnl( 1 ) ) ); } //-------------------------------------------------------------------// @@ -1743,10 +1742,10 @@ HB_FUNC( WIN_CREATEBRUSH ) LOGBRUSH lb = { 0,0,0 }; lb.lbStyle = hb_parni( 1 ); - lb.lbColor = ISNIL( 2 ) ? RGB( 0,0,0 ) : ( COLORREF ) hb_parnl( 2 ) ; + lb.lbColor = ISNIL( 2 ) ? RGB( 0, 0, 0 ) : ( COLORREF ) hb_parnl( 2 ) ; lb.lbHatch = ISNIL( 3 ) ? 0 : hb_parni( 3 ); - hb_retnl( ( ULONG ) CreateBrushIndirect( &lb ) ); + hb_retnint( ( LONG_PTR ) CreateBrushIndirect( &lb ) ); } //-------------------------------------------------------------------// @@ -1774,7 +1773,7 @@ HB_FUNC( WIN_GETWINDOWRECT ) RECT rc; PHB_ITEM info = hb_itemArrayNew( 4 ); - GetWindowRect( ( HWND ) hb_parnl( 1 ), &rc ); + GetWindowRect( ( HWND ) hb_parnint( 1 ), &rc ); hb_arraySetNI( info, 1, rc.left ); hb_arraySetNI( info, 2, rc.top ); @@ -1795,14 +1794,14 @@ HB_FUNC( WIN_MOVEWINDOW ) HB_FUNC( WIN_SETPARENT ) { - hb_retnl( ( long ) SetParent( (HWND) hb_parnl( 1 ), (HWND) hb_parnl( 2 ) ) ); + hb_retnint( ( LONG_PTR ) SetParent( (HWND) hb_parnint( 1 ), (HWND) hb_parnint( 2 ) ) ); } //-------------------------------------------------------------------// HB_FUNC( WIN_SETWINDOWLONG ) { - hb_retnl( SetWindowLong( ( HWND ) hb_parnl( 1 ), hb_parni( 2 ), hb_parnl( 3 ) ) ); + hb_retnl( SetWindowLong( ( HWND ) hb_parnint( 1 ), hb_parni( 2 ), hb_parnl( 3 ) ) ); } //-------------------------------------------------------------------// @@ -1824,7 +1823,7 @@ HB_FUNC( WVT_GETFONTHANDLE ) if ( iSlot >= 0 && iSlot < WVT_PICTURES_MAX ) hFont = _s->hUserFonts[ iSlot ]; - hb_retnl( ( ULONG ) hFont ); + hb_retnint( ( LONG_PTR ) hFont ); } //-------------------------------------------------------------------// @@ -2162,11 +2161,11 @@ HB_FUNC( WIN_FINDWINDOW ) if ( hwnd ) { - hb_retnl( (LONG) hwnd ); + hb_retnint( ( LONG_PTR ) hwnd ); } else { - hb_retnl( -1 ); + hb_retnint( -1 ); } }