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

2016-01-26 15:44 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* include/hbapierr.h
  * include/hbdefs.h
  * src/debug/dbgentry.c
  * src/rtl/filesys.c
  * src/rtl/gtcgi/gtcgi.c
  * src/rtl/gtcrs/gtcrs.c
  * src/rtl/gtos2/gtos2.c
  * src/rtl/gtpca/gtpca.c
  * src/rtl/gtsln/gtsln.c
  * src/rtl/gtstd/gtstd.c
  * src/rtl/gttrm/gttrm.c
  * src/rtl/gtwin/gtwin.c
  * src/rtl/gtwvt/gtwvt.c
  * src/rtl/gtxwc/gtxwc.c
  * src/rtl/hbhex.c
  * src/rtl/hbproces.c
  * src/rtl/hbsocket.c
  * src/vm/classes.c
  * src/vm/extrap.c
  * src/vm/itemapi.c
  * src/vm/runner.c
  * src/vm/task.c
  * contrib/gtalleg/gtallegd.c
  * contrib/gtqtc/gtqtc1.cpp
  * contrib/gtwvg/gtwgud.c
  * contrib/gtwvg/gtwvgd.c
  * contrib/gtwvg/wvgcore.c
  * contrib/gtwvg/wvgcuig.c
  * contrib/gtwvg/wvgutils.c
  * contrib/gtwvg/wvgwin.c
  * contrib/gtwvg/wvgwing.c
  * contrib/hbfbird/firebird.c
  * contrib/hbwin/axcore.c
  * contrib/hbwin/wapi_commctrl.c
  * contrib/hbwin/wapi_shellapi.c
  * contrib/hbwin/wapi_winbase.c
  * contrib/hbwin/wapi_wingdi.c
  * contrib/hbwin/win_misc.c
  * contrib/hbxdiff/core.c
  * contrib/rddads/ads1.c
  * contrib/rddads/adsx.c
  * contrib/xhb/cstructc.c
  * contrib/xhb/freadlin.c
  * extras/gtwvw/gtwvwd.c
  * extras/gtwvw/wvwfuncs.c
    * use HB_PTRUINT instead of HB_PTRDIFF in castings between pointers
      and numbers - it makes some C compilers happy and in few cases it
      also fixed bugs
This commit is contained in:
Przemysław Czerpak
2016-01-26 15:45:00 +01:00
parent dc0e4e093c
commit c6316a4578
46 changed files with 401 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ChangeLog.txt
View File

@@ -10,6 +10,56 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2016-01-26 15:44 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* include/hbapierr.h
* include/hbdefs.h
* src/debug/dbgentry.c
* src/rtl/filesys.c
* src/rtl/gtcgi/gtcgi.c
* src/rtl/gtcrs/gtcrs.c
* src/rtl/gtos2/gtos2.c
* src/rtl/gtpca/gtpca.c
* src/rtl/gtsln/gtsln.c
* src/rtl/gtstd/gtstd.c
* src/rtl/gttrm/gttrm.c
* src/rtl/gtwin/gtwin.c
* src/rtl/gtwvt/gtwvt.c
* src/rtl/gtxwc/gtxwc.c
* src/rtl/hbhex.c
* src/rtl/hbproces.c
* src/rtl/hbsocket.c
* src/vm/classes.c
* src/vm/extrap.c
* src/vm/itemapi.c
* src/vm/runner.c
* src/vm/task.c
* contrib/gtalleg/gtallegd.c
* contrib/gtqtc/gtqtc1.cpp
* contrib/gtwvg/gtwgud.c
* contrib/gtwvg/gtwvgd.c
* contrib/gtwvg/wvgcore.c
* contrib/gtwvg/wvgcuig.c
* contrib/gtwvg/wvgutils.c
* contrib/gtwvg/wvgwin.c
* contrib/gtwvg/wvgwing.c
* contrib/hbfbird/firebird.c
* contrib/hbwin/axcore.c
* contrib/hbwin/wapi_commctrl.c
* contrib/hbwin/wapi_shellapi.c
* contrib/hbwin/wapi_winbase.c
* contrib/hbwin/wapi_wingdi.c
* contrib/hbwin/win_misc.c
* contrib/hbxdiff/core.c
* contrib/rddads/ads1.c
* contrib/rddads/adsx.c
* contrib/xhb/cstructc.c
* contrib/xhb/freadlin.c
* extras/gtwvw/gtwvwd.c
* extras/gtwvw/wvwfuncs.c
* use HB_PTRUINT instead of HB_PTRDIFF in castings between pointers
and numbers - it makes some C compilers happy and in few cases it
also fixed bugs
2016-01-24 13:06 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rdd/delim1.c
! added missing casting - it fixes problem reported by Franček Prijatelj

2
contrib/gtalleg/gtallegd.c
View File

@@ -538,7 +538,7 @@ static void hb_gt_alleg_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hF
{
int iRet;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_alleg_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_alleg_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRUINT ) hFilenoStdin, ( void * ) ( HB_PTRUINT ) hFilenoStdout, ( void * ) ( HB_PTRUINT ) hFilenoStderr ) );
ssfCreateThinFont( &s_ssfDefaultFont );

2
contrib/gtqtc/gtqtc1.cpp
View File

@@ -1632,7 +1632,7 @@ static void hb_gt_qtc_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil
{
PHB_GTQTC pQTC;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_qtc_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_qtc_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRUINT ) hFilenoStdin, ( void * ) ( HB_PTRUINT ) hFilenoStdout, ( void * ) ( HB_PTRUINT ) hFilenoStderr ) );
if( ! s_qtapp )
{

38
contrib/gtwvg/gtwgud.c
View File

@@ -877,9 +877,9 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
PHB_ITEM pEvParams = hb_itemNew( NULL );
hb_arrayNew( pEvParams, 3 );
hb_arraySetNInt( pEvParams, 1, ( HB_PTRDIFF ) hWnd );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) wParam );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRDIFF ) lParam );
hb_arraySetNInt( pEvParams, 1, ( HB_PTRUINT ) hWnd );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRUINT ) wParam );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRUINT ) lParam );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_SETFOCUS, pEvParams );
return 0;
@@ -889,9 +889,9 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
PHB_ITEM pEvParams = hb_itemNew( NULL );
hb_arrayNew( pEvParams, 3 );
hb_arraySetNInt( pEvParams, 1, ( HB_PTRDIFF ) hWnd );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) wParam );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRDIFF ) lParam );
hb_arraySetNInt( pEvParams, 1, ( HB_PTRUINT ) hWnd );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRUINT ) wParam );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRUINT ) lParam );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_KILLFOCUS, pEvParams );
return 0;
@@ -1019,7 +1019,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
hb_arrayNew( pEvParams, 3 );
hb_arraySetNI( pEvParams, 1, iHi ); /* Notification Code */
hb_arraySetNI( pEvParams, 2, iLo ); /* Control identifier */
hb_arraySetNInt( pEvParams, 3, ( HB_PTRDIFF ) ( HWND ) lParam ); /* Controls hWnd */
hb_arraySetNInt( pEvParams, 3, ( HB_PTRUINT ) ( HWND ) lParam ); /* Controls hWnd */
hb_gt_wvt_FireEvent( pWVT, HB_GTE_COMMAND, pEvParams );
}
@@ -1031,7 +1031,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
hb_arrayNew( pEvParams, 2 );
hb_arraySetNI( pEvParams, 1, ( int ) wParam );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) lParam );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRUINT ) lParam );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_NOTIFY, pEvParams );
break;
@@ -1061,8 +1061,8 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
hb_arrayNew( pEvParams, 2 );
hb_arraySetNInt( pEvParams, 1, ( HB_PTRDIFF ) wParam );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) lParam );
hb_arraySetNInt( pEvParams, 1, ( HB_PTRUINT ) wParam );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRUINT ) lParam );
iResult = hb_gt_wvt_FireEvent( pWVT, HB_GTE_CTLCOLOR, pEvParams );
@@ -1079,7 +1079,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
hb_arraySetNL( pEvParams, 1, ( long ) LOWORD( wParam ) );
hb_arraySetNL( pEvParams, 2, ( long ) HIWORD( wParam ) );
hb_arraySetNInt( pEvParams, 3, ( HB_MAXINT ) ( HB_PTRDIFF ) lParam );
hb_arraySetNInt( pEvParams, 3, ( HB_MAXINT ) ( HB_PTRUINT ) lParam );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_HSCROLL, pEvParams );
return 0;
@@ -1092,7 +1092,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
hb_arraySetNL( pEvParams, 1, ( long ) LOWORD( wParam ) );
hb_arraySetNL( pEvParams, 2, ( long ) HIWORD( wParam ) );
hb_arraySetNInt( pEvParams, 3, ( HB_MAXINT ) ( HB_PTRDIFF ) lParam );
hb_arraySetNInt( pEvParams, 3, ( HB_MAXINT ) ( HB_PTRUINT ) lParam );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_VSCROLL, pEvParams );
return 0;
@@ -1206,7 +1206,7 @@ static void hb_gt_wvt_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil
int iCmdShow;
PHB_GTWVT pWVT;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRUINT ) hFilenoStdin, ( void * ) ( HB_PTRUINT ) hFilenoStdout, ( void * ) ( HB_PTRUINT ) hFilenoStderr ) );
if( ! hb_winmainArgGet( &hInstance, NULL, &iCmdShow ) )
{
@@ -1308,17 +1308,17 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
case HB_GTI_INPUTFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( HB_PTRDIFF ) GetStdHandle( STD_INPUT_HANDLE ) );
( HB_PTRUINT ) GetStdHandle( STD_INPUT_HANDLE ) );
break;
case HB_GTI_OUTPUTFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( HB_PTRDIFF ) GetStdHandle( STD_OUTPUT_HANDLE ) );
( HB_PTRUINT ) GetStdHandle( STD_OUTPUT_HANDLE ) );
break;
case HB_GTI_ERRORFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( HB_PTRDIFF ) GetStdHandle( STD_ERROR_HANDLE ) );
( HB_PTRUINT ) GetStdHandle( STD_ERROR_HANDLE ) );
break;
case HB_GTI_SETFONT:
@@ -1475,7 +1475,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
if( hIconToFree )
DestroyIcon( hIconToFree );
}
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRDIFF ) pWVT->hIcon );
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRUINT ) pWVT->hIcon );
break;
case HB_GTI_ICONRES:
@@ -1515,7 +1515,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
if( hIconToFree )
DestroyIcon( hIconToFree );
}
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRDIFF ) pWVT->hIcon );
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRUINT ) pWVT->hIcon );
break;
case HB_GTI_VIEWMAXWIDTH:
{
@@ -1709,7 +1709,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
{
case HB_GTS_WINDOWHANDLE:
if( pWVT->hWnd )
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRDIFF ) pWVT->hWnd );
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRUINT ) pWVT->hWnd );
break;
case HB_GTS_CENTERWINDOW:

50
contrib/gtwvg/gtwvgd.c
View File

@@ -2035,7 +2035,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
}
{ /* To evoke if that portion is covered by GUI control */
PHB_ITEM pEvParams = hb_itemNew( NULL );
hb_itemPutNInt( pEvParams, ( HB_MAXINT ) ( HB_PTRDIFF ) hWnd );
hb_itemPutNInt( pEvParams, ( HB_MAXINT ) ( HB_PTRUINT ) hWnd );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_PAINT, pEvParams );
}
return 0;
@@ -2048,7 +2048,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
hb_arraySetNL( pEvParams, 1, ( long ) LOWORD( wParam ) );
hb_arraySetNL( pEvParams, 2, ( long ) HIWORD( wParam ) );
hb_arraySetNInt( pEvParams, 3, ( HB_MAXINT ) ( HB_PTRDIFF ) lParam );
hb_arraySetNInt( pEvParams, 3, ( HB_MAXINT ) ( HB_PTRUINT ) lParam );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_HSCROLL, pEvParams );
return 0;
@@ -2061,7 +2061,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
hb_arraySetNL( pEvParams, 1, ( long ) LOWORD( wParam ) );
hb_arraySetNL( pEvParams, 2, ( long ) HIWORD( wParam ) );
hb_arraySetNInt( pEvParams, 3, ( HB_MAXINT ) ( HB_PTRDIFF ) lParam );
hb_arraySetNInt( pEvParams, 3, ( HB_MAXINT ) ( HB_PTRUINT ) lParam );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_VSCROLL, pEvParams );
return 0;
@@ -2083,7 +2083,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
{
hb_vmPushDynSym( pWVT->pSymWVT_SETFOCUS );
hb_vmPushNil();
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hWnd );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hWnd );
hb_vmDo( 1 );
hb_vmRequestRestore();
}
@@ -2097,9 +2097,9 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
PHB_ITEM pEvParams = hb_itemNew( NULL );
hb_arrayNew( pEvParams, 3 );
hb_arraySetNInt( pEvParams, 1, ( HB_PTRDIFF ) hWnd );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) wParam );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRDIFF ) lParam );
hb_arraySetNInt( pEvParams, 1, ( HB_PTRUINT ) hWnd );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRUINT ) wParam );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRUINT ) lParam );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_SETFOCUS, pEvParams );
}
@@ -2115,7 +2115,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
{
hb_vmPushDynSym( pWVT->pSymWVT_KILLFOCUS );
hb_vmPushNil();
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hWnd );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hWnd );
hb_vmDo( 1 );
hb_vmRequestRestore();
}
@@ -2124,9 +2124,9 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
PHB_ITEM pEvParams = hb_itemNew( NULL );
hb_arrayNew( pEvParams, 3 );
hb_arraySetNInt( pEvParams, 1, ( HB_PTRDIFF ) hWnd );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) wParam );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRDIFF ) lParam );
hb_arraySetNInt( pEvParams, 1, ( HB_PTRUINT ) hWnd );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRUINT ) wParam );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRUINT ) lParam );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_KILLFOCUS, pEvParams );
}
@@ -2285,7 +2285,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
hb_arrayNew( pEvParams, 3 );
hb_arraySetNI( pEvParams, 1, iHi ); /* Notification Code */
hb_arraySetNI( pEvParams, 2, iLo ); /* Control identifier */
hb_arraySetNInt( pEvParams, 3, ( HB_PTRDIFF ) ( HWND ) lParam ); /* Controls hWnd */
hb_arraySetNInt( pEvParams, 3, ( HB_PTRUINT ) ( HWND ) lParam ); /* Controls hWnd */
hb_gt_wvt_FireEvent( pWVT, HB_GTE_COMMAND, pEvParams );
}
@@ -2331,7 +2331,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
hb_arrayNew( pEvParams, 2 );
hb_arraySetNI( pEvParams, 1, ( int ) wParam );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) lParam );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRUINT ) lParam );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_NOTIFY, pEvParams );
break;
@@ -2349,8 +2349,8 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
hb_arrayNew( pEvParams, 2 );
hb_arraySetNInt( pEvParams, 1, ( HB_PTRDIFF ) wParam );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) lParam );
hb_arraySetNInt( pEvParams, 1, ( HB_PTRUINT ) wParam );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRUINT ) lParam );
iResult = hb_gt_wvt_FireEvent( pWVT, HB_GTE_CTLCOLOR, pEvParams );
@@ -2368,7 +2368,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
hb_arraySetNL( pEvParams, 1, ( long ) LOWORD( wParam ) );
hb_arraySetNL( pEvParams, 2, ( long ) HIWORD( wParam ) );
hb_arraySetNInt( pEvParams, 3, ( HB_MAXINT ) ( HB_PTRDIFF ) lParam );
hb_arraySetNInt( pEvParams, 3, ( HB_MAXINT ) ( HB_PTRUINT ) lParam );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_KEYTOITEM, pEvParams );
break;
@@ -2779,7 +2779,7 @@ static void hb_gt_wvt_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil
int iCmdShow;
PHB_GTWVT pWVT;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRUINT ) hFilenoStdin, ( void * ) ( HB_PTRUINT ) hFilenoStdout, ( void * ) ( HB_PTRUINT ) hFilenoStderr ) );
if( ! hb_winmainArgGet( &hInstance, NULL, &iCmdShow ) )
{
@@ -2814,7 +2814,7 @@ static void hb_gt_wvt_Exit( PHB_GT pGT )
{
PHB_ITEM pEvParams = hb_itemNew( NULL );
hb_arrayNew( pEvParams, 2 );
hb_arraySetNInt( pEvParams, 1, ( HB_MAXINT ) ( HB_PTRDIFF ) pWVT->hWnd );
hb_arraySetNInt( pEvParams, 1, ( HB_MAXINT ) ( HB_PTRUINT ) pWVT->hWnd );
hb_arraySetNInt( pEvParams, 2, pWVT->threadNO );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_CLOSED, pEvParams );
}
@@ -3038,17 +3038,17 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
case HB_GTI_INPUTFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( HB_PTRDIFF ) GetStdHandle( STD_INPUT_HANDLE ) );
( HB_PTRUINT ) GetStdHandle( STD_INPUT_HANDLE ) );
break;
case HB_GTI_OUTPUTFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( HB_PTRDIFF ) GetStdHandle( STD_OUTPUT_HANDLE ) );
( HB_PTRUINT ) GetStdHandle( STD_OUTPUT_HANDLE ) );
break;
case HB_GTI_ERRORFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( HB_PTRDIFF ) GetStdHandle( STD_ERROR_HANDLE ) );
( HB_PTRUINT ) GetStdHandle( STD_ERROR_HANDLE ) );
break;
case HB_GTI_SETFONT:
@@ -3376,7 +3376,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
if( hIconToFree )
DestroyIcon( hIconToFree );
}
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRDIFF ) pWVT->hIcon );
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRUINT ) pWVT->hIcon );
break;
case HB_GTI_ICONRES:
@@ -3417,7 +3417,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
if( hIconToFree )
DestroyIcon( hIconToFree );
}
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRDIFF ) pWVT->hIcon );
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRUINT ) pWVT->hIcon );
break;
case HB_GTI_VIEWMAXWIDTH:
@@ -3773,7 +3773,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
{
case HB_GTS_WINDOWHANDLE:
if( pWVT->hWnd )
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRDIFF ) pWVT->hWnd );
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRUINT ) pWVT->hWnd );
break;
case HB_GTS_CENTERWINDOW:
@@ -4305,7 +4305,7 @@ static void hb_gt_wvt_Refresh( PHB_GT pGT )
{
PHB_ITEM pEvParams = hb_itemNew( NULL );
hb_arrayNew( pEvParams, 2 );
hb_arraySetNInt( pEvParams, 1, ( HB_MAXINT ) ( HB_PTRDIFF ) pWVT->hWnd );
hb_arraySetNInt( pEvParams, 1, ( HB_MAXINT ) ( HB_PTRUINT ) pWVT->hWnd );
hb_arraySetNInt( pEvParams, 2, pWVT->threadNO );
hb_gt_wvt_FireEvent( pWVT, HB_GTE_CREATED, pEvParams );
}

32
contrib/gtwvg/wvgcore.c
View File

@@ -324,7 +324,7 @@ BOOL CALLBACK hb_wvt_gtDlgProcMLess( HWND hDlg, UINT message, WPARAM wParam, LPA
{
hb_vmPushDynSym( ( PHB_DYNS ) pFunc );
hb_vmPushNil();
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hDlg );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hDlg );
hb_vmPushNumInt( message );
hb_vmPushNumInt( wParam );
hb_vmPushNumInt( lParam );
@@ -342,7 +342,7 @@ BOOL CALLBACK hb_wvt_gtDlgProcMLess( HWND hDlg, UINT message, WPARAM wParam, LPA
{
hb_vmPushEvalSym();
hb_vmPush( _s->pFunc[ iIndex ] );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hDlg );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hDlg );
hb_vmPushNumInt( message );
hb_vmPushNumInt( wParam );
hb_vmPushNumInt( lParam );
@@ -433,7 +433,7 @@ BOOL CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPA
{
hb_vmPushDynSym( ( PHB_DYNS ) pFunc );
hb_vmPushNil();
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hDlg );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hDlg );
hb_vmPushNumInt( message );
hb_vmPushNumInt( wParam );
hb_vmPushNumInt( lParam );
@@ -451,7 +451,7 @@ BOOL CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPA
{
hb_vmPushEvalSym();
hb_vmPush( pFunc );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hDlg );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hDlg );
hb_vmPushNumInt( message );
hb_vmPushNumInt( wParam );
hb_vmPushNumInt( lParam );
@@ -1871,7 +1871,7 @@ HB_FUNC( WVT_DRAWPICTUREEX )
iBottom = xy.y - 1 + hb_parvni( 6, 3 );
iRight = xy.x - 1 + hb_parvni( 6, 4 );
hb_retl( hb_wvt_gtRenderPicture( iLeft, iTop, iRight - iLeft + 1, iBottom - iTop + 1, ( IPicture * ) ( HB_PTRDIFF ) hb_parnint( 5 ), hb_parl( 7 ) ) );
hb_retl( hb_wvt_gtRenderPicture( iLeft, iTop, iRight - iLeft + 1, iBottom - iTop + 1, ( IPicture * ) ( HB_PTRUINT ) hb_parnint( 5 ), hb_parl( 7 ) ) );
}
#endif
}
@@ -2172,7 +2172,7 @@ HB_FUNC( WVT_DRAWLABELOBJ )
SetTextColor( _s->hdc, fgClr );
SetBkColor( _s->hdc, bgClr );
SelectObject( _s->hdc, ( HFONT ) ( HB_PTRDIFF ) hb_parnint( 10 ) );
SelectObject( _s->hdc, ( HFONT ) ( HB_PTRUINT ) hb_parnint( 10 ) );
GetTextExtentPoint32( _s->hdc, text, lstrlen( text ), &sz );
@@ -2227,7 +2227,7 @@ HB_FUNC( WVT_DRAWLABELOBJ )
{
SetTextColor( _s->hGuiDC, fgClr );
SetBkColor( _s->hGuiDC, bgClr );
SelectObject( _s->hGuiDC, ( HFONT ) ( HB_PTRDIFF ) hb_parnint( 10 ) );
SelectObject( _s->hGuiDC, ( HFONT ) ( HB_PTRUINT ) hb_parnint( 10 ) );
SetTextAlign( _s->hGuiDC, iAlignH | iAlignV );
ExtTextOut( _s->hGuiDC, x, y, uiOptions, &rect, text, lstrlen( text ), NULL );
@@ -2577,7 +2577,7 @@ HB_FUNC( WVT_DRAWTEXTBOX )
SetTextColor( _s->hdc, fgClr );
SetBkColor( _s->hdc, bgClr );
SetBkMode( _s->hdc, hb_parnidef( 11, OPAQUE ) );
SelectObject( _s->hdc, ( HFONT ) ( HB_PTRDIFF ) hb_parnint( 12 ) );
SelectObject( _s->hdc, ( HFONT ) ( HB_PTRUINT ) hb_parnint( 12 ) );
DrawText( _s->hdc, text, lstrlen( text ), &rc, iAlignH | DT_WORDBREAK | DT_TOP );
#if defined( __SETGUI__ )
@@ -2587,7 +2587,7 @@ HB_FUNC( WVT_DRAWTEXTBOX )
SetTextColor( _s->hGuiDC, fgClr );
SetBkColor( _s->hGuiDC, bgClr );
SetBkMode( _s->hGuiDC, hb_parnidef( 11, OPAQUE ) );
SelectObject( _s->hGuiDC, ( HFONT ) ( HB_PTRDIFF ) hb_parnint( 12 ) );
SelectObject( _s->hGuiDC, ( HFONT ) ( HB_PTRUINT ) hb_parnint( 12 ) );
DrawText( _s->hGuiDC, text, lstrlen( text ), &rc, iAlignH | DT_WORDBREAK | DT_TOP );
}
@@ -2723,7 +2723,7 @@ HB_FUNC( WVT_CREATEFONT )
HB_STRNCPY( logfont.lfFaceName, ( ! HB_ISCHAR( 1 ) ? _s->fontFace : HB_PARSTR( 1, &hText, NULL ) ), HB_SIZEOFARRAY( logfont.lfFaceName ) - 1 );
hb_strfree( hText );
hb_retnint( ( HB_PTRDIFF ) CreateFontIndirect( &logfont ) );
hb_retnint( ( HB_PTRUINT ) CreateFontIndirect( &logfont ) );
}
/*
@@ -2753,7 +2753,7 @@ HB_FUNC( WVT_LOADPICTURE )
HB_FUNC( WVT_DESTROYPICTURE )
{
IPicture * iPicture = ( IPicture * ) ( HB_PTRDIFF ) hb_parnl( 1 );
IPicture * iPicture = ( IPicture * ) ( HB_PTRUINT ) hb_parnl( 1 );
hb_retl( hb_wvt_gtDestroyPicture( iPicture ) );
}
@@ -2769,7 +2769,7 @@ HB_FUNC( WVT_LOADPICTUREEX )
hb_strfree( hImage );
if( iPicture )
{
hb_retnint( ( HB_PTRDIFF ) iPicture );
hb_retnint( ( HB_PTRUINT ) iPicture );
}
#endif
}
@@ -2809,7 +2809,7 @@ HB_FUNC( WVT_LOADPICTUREFROMRESOURCEEX )
hb_strfree( hSection );
if( iPicture )
{
hb_retnint( ( HB_PTRDIFF ) iPicture );
hb_retnint( ( HB_PTRUINT ) iPicture );
}
#endif
}
@@ -2917,7 +2917,7 @@ HB_FUNC( WVT_SAVESCREEN )
hb_arraySetNI( info, 1, iWidth );
hb_arraySetNI( info, 2, iHeight );
hb_arraySetNInt( info, 3, ( HB_PTRDIFF ) hBmp );
hb_arraySetNInt( info, 3, ( HB_PTRUINT ) hBmp );
hb_itemReturnRelease( info );
}
@@ -2949,7 +2949,7 @@ HB_FUNC( WVT_RESTSCREEN )
iHeight = iBottom - iTop + 1;
hCompDC = CreateCompatibleDC( _s->hdc );
hBmp = ( HBITMAP ) SelectObject( hCompDC, ( HBITMAP ) ( HB_PTRDIFF ) hb_parvnint( 5, 3 ) );
hBmp = ( HBITMAP ) SelectObject( hCompDC, ( HBITMAP ) ( HB_PTRUINT ) hb_parvnint( 5, 3 ) );
if( hBmp )
{
if( ( iWidth == hb_parvni( 5, 1 ) ) && ( iHeight == hb_parvni( 5, 2 ) ) )
@@ -2978,7 +2978,7 @@ HB_FUNC( WVT_RESTSCREEN )
if( ! bDoNotDestroyBMP )
{
SelectObject( hCompDC, hBmp );
DeleteObject( ( HBITMAP ) ( HB_PTRDIFF ) hb_parvnint( 5, 3 ) );
DeleteObject( ( HBITMAP ) ( HB_PTRUINT ) hb_parvnint( 5, 3 ) );
}
hb_retl( bResult );
}

16
contrib/gtwvg/wvgcuig.c
View File

@@ -214,7 +214,7 @@ HB_FUNC( WVG_SETGOBJDATA )
#if ! defined( HB_OS_WIN_CE )
case GOBJ_OBJDATA_PICTUREEX:
if( HB_ISNUM( 3 ) )
gObj->iPicture = ( IPicture * ) ( HB_PTRDIFF ) hb_parni( 3 );
gObj->iPicture = ( IPicture * ) ( HB_PTRUINT ) hb_parni( 3 );
break;
case GOBJ_OBJDATA_PICTURE:
if( HB_ISNUM( 3 ) && hb_parni( 3 ) <= WVT_PICTURES_MAX )
@@ -256,29 +256,29 @@ HB_FUNC( WVG_SETGOBJDATA )
case GOBJ_OBJDATA_HFONT:
if( gObj->hFont && gObj->bDestroyFont )
DeleteObject( gObj->hFont );
gObj->hFont = ( HFONT ) ( HB_PTRDIFF ) hb_parnint( 3 );
gObj->hFont = ( HFONT ) ( HB_PTRUINT ) hb_parnint( 3 );
gObj->bDestroyFont = HB_FALSE;
break;
case GOBJ_OBJDATA_HPEN:
if( gObj->hPen && gObj->bDestroyPen )
DeleteObject( gObj->hPen );
gObj->hPen = ( HPEN ) ( HB_PTRDIFF ) hb_parnint( 3 );
gObj->hPen = ( HPEN ) ( HB_PTRUINT ) hb_parnint( 3 );
gObj->bDestroyPen = HB_FALSE;
break;
case GOBJ_OBJDATA_HBRUSH:
if( gObj->hBrush && gObj->bDestroyBrush )
DeleteObject( gObj->hBrush );
gObj->hBrush = ( HBRUSH ) ( HB_PTRDIFF ) hb_parnint( 3 );
gObj->hBrush = ( HBRUSH ) ( HB_PTRUINT ) hb_parnint( 3 );
gObj->bDestroyBrush = HB_TRUE;
break;
case GOBJ_OBJDATA_COLORTEXT:
if( HB_ISNUM( 3 ) )
gObj->crRGBText = ( COLORREF ) ( HB_PTRDIFF ) hb_parnint( 3 );
gObj->crRGBText = ( COLORREF ) ( HB_PTRUINT ) hb_parnint( 3 );
else
bSuccess = HB_FALSE;
break;
case GOBJ_OBJDATA_COLORBK:
gObj->crRGBBk = ( COLORREF ) ( HB_PTRDIFF ) hb_parnint( 3 );
gObj->crRGBBk = ( COLORREF ) ( HB_PTRUINT ) hb_parnint( 3 );
break;
case GOBJ_OBJDATA_BLOCK:
if( gObj->bBlock )
@@ -1334,7 +1334,7 @@ HB_FUNC( WVG_TEXTBOX )
gObj->crRGBText = ( COLORREF ) hb_parnint( 9 );
gObj->crRGBBk = ( COLORREF ) hb_parnint( 10 );
gObj->hFont = ( HFONT ) ( HB_PTRDIFF ) hb_parnint( 11 );
gObj->hFont = ( HFONT ) ( HB_PTRUINT ) hb_parnint( 11 );
gObj->bDestroyFont = HB_FALSE;
gObj->gObjNext = pWVT->gObjs;
@@ -1420,7 +1420,7 @@ HB_FUNC( WVG_PICTUREEX )
gObj->aOffset.iBottom = hb_parvni( 5, 3 );
gObj->aOffset.iRight = hb_parvni( 5, 4 );
gObj->iPicture = ( IPicture * ) ( HB_PTRDIFF ) hb_parnint( 6 );
gObj->iPicture = ( IPicture * ) ( HB_PTRUINT ) hb_parnint( 6 );
gObj->iData = ( hb_parl( 7 ) ? 1 : 0 );
gObj->bDestroyPicture = HB_FALSE;

52
contrib/gtwvg/wvgutils.c
View File

@@ -354,7 +354,7 @@ HB_FUNC( WVT_SETTOOLTIPWIDTH )
int iTipWidth = ( int ) SendMessage( _s->hWndTT, TTM_GETMAXTIPWIDTH, 0, 0 );
if( HB_ISNUM( 1 ) )
SendMessage( _s->hWndTT, TTM_SETMAXTIPWIDTH, 0, ( LPARAM ) ( HB_PTRDIFF ) hb_parnint( 1 ) );
SendMessage( _s->hWndTT, TTM_SETMAXTIPWIDTH, 0, ( LPARAM ) ( HB_PTRUINT ) hb_parnint( 1 ) );
hb_retni( iTipWidth );
#else
@@ -633,7 +633,7 @@ HB_FUNC( WVT_SETMENU )
RECT rc = { 0, 0, 0, 0 };
int height, width;
SetMenu( _s->hWnd, ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ) );
SetMenu( _s->hWnd, ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ) );
GetWindowRect( _s->hWnd, &wi );
GetClientRect( _s->hWnd, &ci );
@@ -658,38 +658,38 @@ HB_FUNC( WVT_SETPOPUPMENU )
HMENU hPopup = _s->hPopup;
_s->hPopup = ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 );
_s->hPopup = ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 );
if( hPopup )
{
hb_retnint( ( HB_PTRDIFF ) hPopup );
hb_retnint( ( HB_PTRUINT ) hPopup );
}
}
HB_FUNC( WVT_CREATEMENU )
{
hb_retnint( ( HB_PTRDIFF ) CreateMenu() );
hb_retnint( ( HB_PTRUINT ) CreateMenu() );
}
HB_FUNC( WVT_CREATEPOPUPMENU )
{
hb_retnint( ( HB_PTRDIFF ) CreatePopupMenu() );
hb_retnint( ( HB_PTRUINT ) CreatePopupMenu() );
}
HB_FUNC_TRANSLATE( WVT_APPENDMENU, WVG_APPENDMENU )
HB_FUNC( WVT_DELETEMENU )
{
hb_retl( DeleteMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
hb_retl( DeleteMenu( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
}
HB_FUNC( WVT_DESTROYMENU )
{
hb_retl( DestroyMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) );
hb_retl( DestroyMenu( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ) ) );
}
HB_FUNC( WVT_ENABLEMENUITEM )
{
hb_retni( EnableMenuItem( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
hb_retni( EnableMenuItem( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
}
HB_FUNC( WVT_GETLASTMENUEVENT )
@@ -802,7 +802,7 @@ HB_FUNC( WVT_TRACKPOPUPMENU )
GetCursorPos( &xy );
hb_retnl( TrackPopupMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ),
hb_retnl( TrackPopupMenu( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ),
TPM_CENTERALIGN | TPM_RETURNCMD,
xy.x,
xy.y,
@@ -815,7 +815,7 @@ HB_FUNC( WVT_GETMENU )
{
PHB_GTWVT _s = hb_wvt_gtGetWVT();
hb_retnint( ( HB_PTRDIFF ) GetMenu( _s->hWnd ) );
hb_retnint( ( HB_PTRUINT ) GetMenu( _s->hWnd ) );
}
/*
@@ -869,7 +869,7 @@ HB_FUNC( WVT_CREATEDIALOGDYNAMIC )
hDlg = CreateDialogIndirect( ( HINSTANCE ) wvg_hInstance(),
( LPDLGTEMPLATE ) HB_PARSTR( 1, &hTemplate, NULL ),
hb_parl( 2 ) ? _s->hWnd : NULL,
( DLGPROC ) ( HB_PTRDIFF ) hb_parnint( 3 ) );
( DLGPROC ) ( HB_PTRUINT ) hb_parnint( 3 ) );
hb_strfree( hTemplate );
}
else
@@ -934,7 +934,7 @@ HB_FUNC( WVT_CREATEDIALOGDYNAMIC )
}
}
hb_retnint( ( HB_PTRDIFF ) hDlg );
hb_retnint( ( HB_PTRUINT ) hDlg );
}
HB_FUNC( WVT_CREATEDIALOGMODAL )
@@ -947,7 +947,7 @@ HB_FUNC( WVT_CREATEDIALOGMODAL )
int iIndex;
int iResource = hb_parni( 4 );
HB_PTRDIFF iResult = 0;
HWND hParent = HB_ISNUM( 5 ) ? ( HWND ) ( HB_PTRDIFF ) hb_parnint( 5 ) : _s->hWnd;
HWND hParent = HB_ISNUM( 5 ) ? ( HWND ) ( HB_PTRUINT ) hb_parnint( 5 ) : _s->hWnd;
/* check if we still have room for a new dialog */
for( iIndex = 0; iIndex < WVT_DLGMD_MAX; iIndex++ )
@@ -1126,7 +1126,7 @@ HB_FUNC( WVT__MAKEDLGTEMPLATE )
p = lpwAlign( p );
hb_retclen( ( LPSTR ) pdlgtemplate, ( ( HB_PTRDIFF ) p - ( HB_PTRDIFF ) pdlgtemplate ) );
hb_retclen( ( LPSTR ) pdlgtemplate, ( ( HB_PTRUINT ) p - ( HB_PTRUINT ) pdlgtemplate ) );
LocalFree( LocalHandle( pdlgtemplate ) );
}
@@ -1137,7 +1137,7 @@ HB_FUNC( WVT__MAKEDLGTEMPLATE )
*/
LPWORD lpwAlign( LPWORD lpIn )
{
HB_PTRDIFF ul = ( HB_PTRDIFF ) lpIn;
HB_PTRUINT ul = ( HB_PTRUINT ) lpIn;
ul += 3;
ul >>= 2;
@@ -1163,36 +1163,36 @@ HB_FUNC( WVT_LBADDSTRING )
{
void * hText;
SendMessage( GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ), LB_ADDSTRING, 0, ( LPARAM ) HB_PARSTR( 3, &hText, NULL ) );
SendMessage( GetDlgItem( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ) ), LB_ADDSTRING, 0, ( LPARAM ) HB_PARSTR( 3, &hText, NULL ) );
hb_strfree( hText );
}
HB_FUNC( WVT_LBGETCOUNT )
{
hb_retnl( ( long ) SendMessage( GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ), LB_GETCOUNT, 0, 0 ) );
hb_retnl( ( long ) SendMessage( GetDlgItem( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ) ), LB_GETCOUNT, 0, 0 ) );
}
HB_FUNC( WVT_LBDELETESTRING )
{
SendMessage( GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ), LB_DELETESTRING, hb_parni( 3 ), 0 );
SendMessage( GetDlgItem( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ) ), LB_DELETESTRING, hb_parni( 3 ), 0 );
}
HB_FUNC( WVT_LBSETCURSEL )
{
SendMessage( GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ), LB_SETCURSEL, hb_parni( 3 ), 0 );
SendMessage( GetDlgItem( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ) ), LB_SETCURSEL, hb_parni( 3 ), 0 );
}
HB_FUNC( WVT_CBADDSTRING )
{
void * hText;
SendMessage( GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ), CB_ADDSTRING, 0, ( LPARAM ) HB_PARSTR( 3, &hText, NULL ) );
SendMessage( GetDlgItem( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ) ), CB_ADDSTRING, 0, ( LPARAM ) HB_PARSTR( 3, &hText, NULL ) );
hb_strfree( hText );
}
HB_FUNC( WVT_CBSETCURSEL )
{
SendMessage( GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ), CB_SETCURSEL, hb_parni( 3 ), 0 );
SendMessage( GetDlgItem( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ) ), CB_SETCURSEL, hb_parni( 3 ), 0 );
}
/*
@@ -1215,12 +1215,12 @@ HB_FUNC( WVT_DLGSETICON )
if( hIcon )
{
SendMessage( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), WM_SETICON, ICON_SMALL, ( LPARAM ) hIcon ); /* Set Title Bar ICON */
SendMessage( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), WM_SETICON, ICON_BIG, ( LPARAM ) hIcon ); /* Set Task List Icon */
SendMessage( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), WM_SETICON, ICON_SMALL, ( LPARAM ) hIcon ); /* Set Title Bar ICON */
SendMessage( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), WM_SETICON, ICON_BIG, ( LPARAM ) hIcon ); /* Set Task List Icon */
}
if( hIcon )
hb_retnint( ( HB_PTRDIFF ) hIcon );
hb_retnint( ( HB_PTRUINT ) hIcon );
}
HB_FUNC( WVT_GETFONTHANDLE )
@@ -1233,7 +1233,7 @@ HB_FUNC( WVT_GETFONTHANDLE )
if( iSlot >= 0 && iSlot < WVT_PICTURES_MAX )
hFont = _s->pGUI->hUserFonts[ iSlot ];
hb_retnint( ( HB_PTRDIFF ) hFont );
hb_retnint( ( HB_PTRUINT ) hFont );
}
/*

170
contrib/gtwvg/wvgwin.c
View File

@@ -76,15 +76,15 @@
#define WIN_STATUSBAR_MAX_PARTS 256
#define wvg_parwparam( n ) ( ( WPARAM ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parlparam( n ) ( ( LPARAM ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parhandle( n ) ( ( HANDLE ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parhwnd( n ) ( ( HWND ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parwndproc( n ) ( ( WNDPROC ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parhdc( n ) ( ( HDC ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parcolor( n ) ( ( COLORREF ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parwparam( n ) ( ( WPARAM ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_parlparam( n ) ( ( LPARAM ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_parhandle( n ) ( ( HANDLE ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_parhwnd( n ) ( ( HWND ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_parwndproc( n ) ( ( WNDPROC ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_parhdc( n ) ( ( HDC ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_parcolor( n ) ( ( COLORREF ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_rethandle( n ) ( hb_retnint( ( HB_PTRDIFF ) n ) )
#define wvg_rethandle( n ) ( hb_retnint( ( HB_PTRUINT ) n ) )
#if defined( __BORLANDC__ ) && ! defined( HB_ARCH_64BIT )
#undef MAKELONG
@@ -110,7 +110,7 @@ HB_FUNC( WVG_SENDMESSAGE )
if( lpText && HB_ISBYREF( 4 ) )
lpText = HB_STRUNSHARE( &hText, lpText, nLen );
hb_retnl( ( HB_ULONG ) SendMessage( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ),
hb_retnl( ( HB_ULONG ) SendMessage( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ),
( UINT ) hb_parni( 2 ),
( ! HB_ISNUM( 3 ) ? 0 : ( WPARAM ) hb_parnint( 3 ) ),
( lpText ? ( LPARAM ) lpText : ( LPARAM ) hb_parnint( 4 ) ) ) );
@@ -134,7 +134,7 @@ HB_FUNC( WVG_SENDDLGITEMMESSAGE )
hb_xmemcpy( cText, hb_itemGetCPtr( pText ), iLen + 1 );
}
hb_retnl( ( long ) SendDlgItemMessage( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ),
hb_retnl( ( long ) SendDlgItemMessage( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ),
( int ) hb_parni( 2 ),
( UINT ) hb_parni( 3 ),
( WPARAM ) hb_parnint( 4 ),
@@ -153,47 +153,47 @@ HB_FUNC( WVG_SENDDLGITEMMESSAGE )
*/
HB_FUNC( WVG_SETTIMER )
{
hb_retl( SetTimer( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ), hb_parni( 3 ), NULL ) != 0 );
hb_retl( SetTimer( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ), hb_parni( 3 ), NULL ) != 0 );
}
HB_FUNC( WVG_SETFOCUS )
{
SetFocus( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) );
SetFocus( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ) );
}
HB_FUNC( WVG_GETFOCUS )
{
hb_retnint( ( HB_PTRDIFF ) GetFocus() );
hb_retnint( ( HB_PTRUINT ) GetFocus() );
}
HB_FUNC( WVG_SETTEXTCOLOR )
{
hb_retnl( ( HB_ULONG ) SetTextColor( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( COLORREF ) hb_parnl( 2 ) ) );
hb_retnl( ( HB_ULONG ) SetTextColor( ( HDC ) ( HB_PTRUINT ) hb_parnint( 1 ), ( COLORREF ) hb_parnl( 2 ) ) );
}
HB_FUNC( WVG_SETBKCOLOR )
{
hb_retnl( ( HB_ULONG ) SetBkColor( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( COLORREF ) hb_parnl( 2 ) ) );
hb_retnl( ( HB_ULONG ) SetBkColor( ( HDC ) ( HB_PTRUINT ) hb_parnint( 1 ), ( COLORREF ) hb_parnl( 2 ) ) );
}
HB_FUNC( WVG_SETBKMODE )
{
hb_retni( ( int ) SetBkMode( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ) );
hb_retni( ( int ) SetBkMode( ( HDC ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ) ) );
}
HB_FUNC( WVG_GETSTOCKOBJECT )
{
hb_retnint( ( HB_PTRDIFF ) GetStockObject( hb_parni( 1 ) ) );
hb_retnint( ( HB_PTRUINT ) GetStockObject( hb_parni( 1 ) ) );
}
HB_FUNC( WVG_DELETEOBJECT )
{
hb_retl( DeleteObject( ( HGDIOBJ ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) );
hb_retl( DeleteObject( ( HGDIOBJ ) ( HB_PTRUINT ) hb_parnint( 1 ) ) );
}
HB_FUNC( WVG_SELECTOBJECT )
{
hb_retnint( ( HB_PTRDIFF ) SelectObject( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( HGDIOBJ ) ( HB_PTRDIFF ) hb_parnint( 2 ) ) );
hb_retnint( ( HB_PTRUINT ) SelectObject( ( HDC ) ( HB_PTRUINT ) hb_parnint( 1 ), ( HGDIOBJ ) ( HB_PTRUINT ) hb_parnint( 2 ) ) );
}
HB_FUNC( WVG_LOWORD )
@@ -215,17 +215,17 @@ HB_FUNC( WVG_SETDLGITEMTEXT )
{
void * hText;
SetDlgItemText( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ), HB_PARSTR( 3, &hText, NULL ) );
SetDlgItemText( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ), HB_PARSTR( 3, &hText, NULL ) );
hb_strfree( hText );
}
HB_FUNC( WVG_GETDLGITEMTEXT )
{
int iLen = ( int ) SendMessage( GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ), WM_GETTEXTLENGTH, 0, 0 ) + 1;
int iLen = ( int ) SendMessage( GetDlgItem( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ) ), WM_GETTEXTLENGTH, 0, 0 ) + 1;
LPTSTR cText = ( LPTSTR ) hb_xgrab( iLen * sizeof( TCHAR ) );
UINT iResult;
iResult = GetDlgItemText( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), /* handle of dialog box */
iResult = GetDlgItemText( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), /* handle of dialog box */
hb_parni( 2 ), /* identifier of control */
cText, /* address of buffer for text */
iLen /* maximum size of string */
@@ -238,18 +238,18 @@ HB_FUNC( WVG_GETDLGITEMTEXT )
HB_FUNC( WVG_CHECKDLGBUTTON )
{
hb_retl( CheckDlgButton( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ),
hb_retl( CheckDlgButton( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ),
( UINT ) ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : hb_parl( 3 ) ) ) );
}
HB_FUNC( WVG_ISDLGBUTTONCHECKED )
{
hb_retni( IsDlgButtonChecked( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ) );
hb_retni( IsDlgButtonChecked( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ) ) );
}
HB_FUNC( WVG_CHECKRADIOBUTTON )
{
hb_retl( CheckRadioButton( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), /* handle of dialog box */
hb_retl( CheckRadioButton( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), /* handle of dialog box */
hb_parni( 2 ), /* identifier of first radio button in group */
hb_parni( 3 ), /* identifier of last radio button in group */
hb_parni( 4 ) /* identifier of radio button to select */
@@ -258,12 +258,12 @@ HB_FUNC( WVG_CHECKRADIOBUTTON )
HB_FUNC( WVG_GETDLGITEM )
{
hb_retnint( ( HB_PTRDIFF ) GetDlgItem( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ) );
hb_retnint( ( HB_PTRUINT ) GetDlgItem( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ) ) );
}
HB_FUNC( WVG_MESSAGEBOX )
{
HWND hWnd = HB_ISNUM( 1 ) ? ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) : GetActiveWindow();
HWND hWnd = HB_ISNUM( 1 ) ? ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ) : GetActiveWindow();
void * hMsg;
void * hTitle;
@@ -283,10 +283,10 @@ HB_FUNC( WVG_INVALIDATERECT )
rc.right = hb_parvni( 2, 3 );
rc.bottom = hb_parvni( 2, 4 );
hb_retl( InvalidateRect( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), &rc, TRUE ) );
hb_retl( InvalidateRect( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), &rc, TRUE ) );
}
else
hb_retl( InvalidateRect( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), NULL, TRUE ) );
hb_retl( InvalidateRect( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), NULL, TRUE ) );
}
/*
@@ -307,7 +307,7 @@ HB_FUNC( WVG_LOADICON )
hb_strfree( hBuffer );
}
hb_retnint( ( HB_PTRDIFF ) hIcon );
hb_retnint( ( HB_PTRUINT ) hIcon );
}
/*
@@ -348,7 +348,7 @@ HB_FUNC( WVG_LOADIMAGE )
}
hb_strfree( hBuffer );
hb_retnint( ( HB_PTRDIFF ) hImage );
hb_retnint( ( HB_PTRUINT ) hImage );
}
HB_FUNC( WVG_GETCLIENTRECT )
@@ -356,7 +356,7 @@ HB_FUNC( WVG_GETCLIENTRECT )
RECT rc = { 0, 0, 0, 0 };
PHB_ITEM info = hb_itemArrayNew( 4 );
GetClientRect( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), &rc );
GetClientRect( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), &rc );
hb_arraySetNI( info, 1, rc.left );
hb_arraySetNI( info, 2, rc.top );
@@ -373,19 +373,19 @@ HB_FUNC( WVG_DRAWIMAGE )
{
void * hImage;
hb_retl( hb_wvt_DrawImage( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ), hb_parni( 3 ),
hb_retl( hb_wvt_DrawImage( ( HDC ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ), hb_parni( 3 ),
hb_parni( 4 ), hb_parni( 5 ), HB_PARSTR( 6, &hImage, NULL ), hb_parl( 7 ) ) );
hb_strfree( hImage );
}
HB_FUNC( WVG_GETDC )
{
hb_retnint( ( HB_PTRDIFF ) GetDC( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) );
hb_retnint( ( HB_PTRUINT ) GetDC( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ) ) );
}
HB_FUNC( WVG_RELEASEDC )
{
hb_retl( ReleaseDC( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( HDC ) ( HB_PTRDIFF ) hb_parnint( 2 ) ) );
hb_retl( ReleaseDC( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), ( HDC ) ( HB_PTRUINT ) hb_parnint( 2 ) ) );
}
HB_FUNC( WVG_CREATEBRUSH )
@@ -396,9 +396,9 @@ HB_FUNC( WVG_CREATEBRUSH )
lb.lbColor = ( COLORREF ) hb_parnldef( 2, RGB( 0, 0, 0 ) );
lb.lbHatch = hb_parni( 3 );
#if ! defined( HB_OS_WIN_CE )
hb_retnint( ( HB_PTRDIFF ) CreateBrushIndirect( &lb ) );
hb_retnint( ( HB_PTRUINT ) CreateBrushIndirect( &lb ) );
#else
hb_retnint( ( HB_PTRDIFF ) CreateSolidBrush( lb.lbColor ) );
hb_retnint( ( HB_PTRUINT ) CreateSolidBrush( lb.lbColor ) );
#endif
}
@@ -416,7 +416,7 @@ HB_FUNC( WVG_DRAWTEXT )
rc.right = hb_parvni( 3, 3 );
rc.bottom = hb_parvni( 3, 4 );
hb_retl( DrawText( ( HDC ) ( HB_PTRDIFF ) hb_parnint( 1 ), lpBuffer, lstrlen( lpBuffer ), &rc, hb_parni( 4 ) ) );
hb_retl( DrawText( ( HDC ) ( HB_PTRUINT ) hb_parnint( 1 ), lpBuffer, lstrlen( lpBuffer ), &rc, hb_parni( 4 ) ) );
hb_strfree( hBuffer );
}
@@ -425,7 +425,7 @@ HB_FUNC( WVG_GETWINDOWRECT )
RECT rc;
PHB_ITEM info = hb_itemArrayNew( 4 );
GetWindowRect( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), &rc );
GetWindowRect( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), &rc );
hb_arraySetNI( info, 1, rc.left );
hb_arraySetNI( info, 2, rc.top );
@@ -440,7 +440,7 @@ HB_FUNC( WVG_GETWINDOWRECT )
*/
HB_FUNC( WVG_MOVEWINDOW )
{
MoveWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parnl( 2 ), hb_parnl( 3 ), hb_parnl( 4 ), hb_parnl( 5 ), hb_parl( 6 ) );
MoveWindow( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parnl( 2 ), hb_parnl( 3 ), hb_parnl( 4 ), hb_parnl( 5 ), hb_parl( 6 ) );
}
HB_FUNC( WVG_GETDESKTOPWINDOW )
@@ -450,7 +450,7 @@ HB_FUNC( WVG_GETDESKTOPWINDOW )
HB_FUNC( WVG_SETPARENT )
{
hb_retnint( ( HB_PTRDIFF ) SetParent( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( HWND ) ( HB_PTRDIFF ) hb_parnint( 2 ) ) );
hb_retnint( ( HB_PTRUINT ) SetParent( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), ( HWND ) ( HB_PTRUINT ) hb_parnint( 2 ) ) );
}
HB_FUNC( WVG_BRINGWINDOWTOTOP )
@@ -473,12 +473,12 @@ HB_FUNC( WVG_SETWINDOWTEXT )
HB_FUNC( WVG_SETWINDOWLONG )
{
hb_retnl( SetWindowLong( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ), hb_parnl( 3 ) ) );
hb_retnl( SetWindowLong( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ), hb_parnl( 3 ) ) );
}
HB_FUNC( WVG_ISWINDOW )
{
hb_retl( IsWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) );
hb_retl( IsWindow( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ) ) );
}
HB_FUNC( WVG_ENABLEWINDOW )
@@ -488,7 +488,7 @@ HB_FUNC( WVG_ENABLEWINDOW )
HB_FUNC( WVG_DESTROYWINDOW )
{
hb_retl( DestroyWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) );
hb_retl( DestroyWindow( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ) ) );
}
HB_FUNC( WVG_CLIENTTOSCREEN )
@@ -498,7 +498,7 @@ HB_FUNC( WVG_CLIENTTOSCREEN )
if( wvt_Array2Point( pArray, &Point ) )
{
if( ClientToScreen( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), &Point ) )
if( ClientToScreen( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), &Point ) )
{
wvt_Point2ArrayEx( &Point, pArray );
hb_retl( HB_TRUE );
@@ -517,7 +517,7 @@ HB_FUNC( WVG_SCREENTOCLIENT )
if( wvt_Array2Point( pArray, &Point ) )
{
if( ScreenToClient( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), &Point ) > 0 )
if( ScreenToClient( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), &Point ) > 0 )
{
wvt_Point2ArrayEx( &Point, pArray );
hb_retl( HB_TRUE );
@@ -546,11 +546,11 @@ HB_FUNC( WVG_NOT )
HB_FUNC( WVG_TRACKPOPUPMENU )
{
HMENU hMenu = ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 );
HMENU hMenu = ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 );
UINT uFlags = hb_parnldef( 2, TPM_CENTERALIGN | TPM_RETURNCMD );
int x = hb_parni( 3 );
int y = hb_parni( 4 );
HWND hWnd = HB_ISNUM( 5 ) ? ( HWND ) ( HB_PTRDIFF ) hb_parnint( 5 ) : GetActiveWindow();
HWND hWnd = HB_ISNUM( 5 ) ? ( HWND ) ( HB_PTRUINT ) hb_parnint( 5 ) : GetActiveWindow();
POINT xy = { 0, 0 };
@@ -575,7 +575,7 @@ HB_FUNC( WVG_CHOOSECOLOR )
crCustClr[ i ] = ( HB_ISARRAY( 2 ) ? ( COLORREF ) hb_parvnl( 2, i + 1 ) : GetSysColor( COLOR_BTNFACE ) );
cc.lStructSize = sizeof( CHOOSECOLOR );
cc.hwndOwner = HB_ISNUM( 4 ) ? ( HWND ) ( HB_PTRDIFF ) hb_parnint( 4 ) : NULL;
cc.hwndOwner = HB_ISNUM( 4 ) ? ( HWND ) ( HB_PTRUINT ) hb_parnint( 4 ) : NULL;
cc.rgbResult = ( COLORREF ) hb_parnl( 1 );
cc.lpCustColors = crCustClr;
cc.Flags = ( WORD ) hb_parnldef( 3, CC_ANYCOLOR | CC_RGBINIT | CC_FULLOPEN );
@@ -595,7 +595,7 @@ HB_FUNC( WVG_FINDWINDOW )
hb_strfree( hText );
if( hwnd )
hb_retnint( ( HB_PTRDIFF ) hwnd );
hb_retnint( ( HB_PTRUINT ) hwnd );
else
hb_retnint( -1 );
}
@@ -609,7 +609,7 @@ HB_FUNC( WVG_SLEEP )
HB_FUNC( WVG_SETMENU )
{
HWND hWnd = ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 );
HWND hWnd = ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 );
#if 1
HB_BOOL bSet;
@@ -617,7 +617,7 @@ HB_FUNC( WVG_SETMENU )
RECT ci = { 0, 0, 0, 0 };
int height, width;
bSet = SetMenu( hWnd, ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 2 ) );
bSet = SetMenu( hWnd, ( HMENU ) ( HB_PTRUINT ) hb_parnint( 2 ) );
GetWindowRect( hWnd, &wi );
GetClientRect( hWnd, &ci );
@@ -633,18 +633,18 @@ HB_FUNC( WVG_SETMENU )
#endif
#if 0
hb_retl( SetMenu( hWnd, ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 2 ) ) );
hb_retl( SetMenu( hWnd, ( HMENU ) ( HB_PTRUINT ) hb_parnint( 2 ) ) );
#endif
}
HB_FUNC( WVG_CREATEMENU )
{
hb_retnint( ( HB_PTRDIFF ) CreateMenu() );
hb_retnint( ( HB_PTRUINT ) CreateMenu() );
}
HB_FUNC( WVG_CREATEPOPUPMENU )
{
hb_retnint( ( HB_PTRDIFF ) CreatePopupMenu() );
hb_retnint( ( HB_PTRUINT ) CreatePopupMenu() );
}
HB_FUNC( WVG_APPENDMENU )
@@ -652,13 +652,13 @@ HB_FUNC( WVG_APPENDMENU )
if( HB_ISCHAR( 4 ) )
{
void * hBuffer;
hb_retl( AppendMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( HB_PTRDIFF ) hb_parnint( 3 ), HB_PARSTR( 4, &hBuffer, NULL ) ) );
hb_retl( AppendMenu( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( HB_PTRUINT ) hb_parnint( 3 ), HB_PARSTR( 4, &hBuffer, NULL ) ) );
hb_strfree( hBuffer );
}
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 ) );
LPCTSTR lpszCaption = ( LPCTSTR ) ( HB_PTRUINT ) hb_parnint( 4 );
hb_retl( AppendMenu( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( HB_PTRUINT ) hb_parnint( 3 ), ( LPCTSTR ) lpszCaption ) );
}
}
@@ -669,36 +669,36 @@ HB_FUNC( WVG_INSERTMENU )
if( HB_ISCHAR( 5 ) )
{
void * hBuffer;
hb_retl( InsertMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ),
flags, ( HB_PTRDIFF ) hb_parnint( 4 ), HB_PARSTR( 5, &hBuffer, NULL ) ) );
hb_retl( InsertMenu( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ),
flags, ( HB_PTRUINT ) hb_parnint( 4 ), HB_PARSTR( 5, &hBuffer, NULL ) ) );
hb_strfree( hBuffer );
}
else /* It is a SEPARATOR or Submenu */
{
LPCTSTR lpszCaption = ( LPCTSTR ) ( HB_PTRDIFF ) hb_parnint( 5 );
hb_retl( InsertMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ),
flags, ( HB_PTRDIFF ) hb_parnint( 4 ), ( LPCTSTR ) lpszCaption ) );
LPCTSTR lpszCaption = ( LPCTSTR ) ( HB_PTRUINT ) hb_parnint( 5 );
hb_retl( InsertMenu( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ),
flags, ( HB_PTRUINT ) hb_parnint( 4 ), ( LPCTSTR ) lpszCaption ) );
}
}
HB_FUNC( WVG_DELETEMENU )
{
hb_retl( DeleteMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
hb_retl( DeleteMenu( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
}
HB_FUNC( WVG_DESTROYMENU )
{
hb_retl( DestroyMenu( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) );
hb_retl( DestroyMenu( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ) ) );
}
HB_FUNC( WVG_ENABLEMENUITEM )
{
hb_retl( EnableMenuItem( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
hb_retl( EnableMenuItem( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
}
HB_FUNC( WVG_CHECKMENUITEM )
{
hb_retni( CheckMenuItem( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
hb_retni( CheckMenuItem( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), ( UINT ) hb_parni( 3 ) ) );
}
HB_FUNC( WVG_ISMENUITEMCHECKED )
@@ -710,7 +710,7 @@ HB_FUNC( WVG_ISMENUITEMCHECKED )
lpmii.cbSize = sizeof( MENUITEMINFO );
lpmii.fMask = MIIM_STATE;
lSuccess = GetMenuItemInfo( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), TRUE, &lpmii );
lSuccess = GetMenuItemInfo( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), TRUE, &lpmii );
if( lSuccess )
hb_retl( lpmii.fState & MFS_CHECKED ? TRUE : FALSE );
else
@@ -725,7 +725,7 @@ HB_FUNC( WVG_ISMENUITEMENABLED )
lpmii.cbSize = sizeof( MENUITEMINFO );
lpmii.fMask = MIIM_STATE;
lSuccess = GetMenuItemInfo( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), TRUE, &lpmii );
lSuccess = GetMenuItemInfo( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), TRUE, &lpmii );
if( lSuccess )
hb_retl( lpmii.fState & MFS_DISABLED ? FALSE : TRUE );
else
@@ -744,7 +744,7 @@ HB_FUNC( WVG_SETMENUITEM )
if( hb_parl( 5 ) )
lpmii.dwTypeData = ( LPTSTR ) HB_PARSTR( 4, &hText, NULL );
lSuccess = SetMenuItemInfo( ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), TRUE, &lpmii );
lSuccess = SetMenuItemInfo( ( HMENU ) ( HB_PTRUINT ) hb_parnint( 1 ), ( UINT ) hb_parni( 2 ), TRUE, &lpmii );
hb_retl( lSuccess );
if( hText )
@@ -753,17 +753,17 @@ HB_FUNC( WVG_SETMENUITEM )
HB_FUNC( WVG_DRAWMENUBAR )
{
DrawMenuBar( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) );
DrawMenuBar( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ) );
}
HB_FUNC( WVG_UPDATEWINDOW )
{
hb_retl( UpdateWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ) );
hb_retl( UpdateWindow( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ) ) );
}
HB_FUNC( WVG_SHOWWINDOW )
{
hb_retl( ShowWindow( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), hb_parni( 2 ) ) );
hb_retl( ShowWindow( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ), hb_parni( 2 ) ) );
}
HB_FUNC( WVG_MAKELPARAM )
@@ -783,21 +783,21 @@ HB_FUNC( WVG_CREATEWINDOWEX )
( DWORD ) hb_parnint( 4 ),
hb_parni( 5 ), hb_parni( 6 ),
hb_parni( 7 ), hb_parni( 8 ),
( HWND ) ( HB_PTRDIFF ) hb_parnint( 9 ),
HB_ISNUM( 10 ) ? ( HMENU ) ( HB_PTRDIFF ) hb_parnint( 10 ) : NULL,
HB_ISNUM( 11 ) ? ( HINSTANCE ) ( HB_PTRDIFF ) hb_parnint( 11 ) : ( HINSTANCE ) wvg_hInstance(),
( HWND ) ( HB_PTRUINT ) hb_parnint( 9 ),
HB_ISNUM( 10 ) ? ( HMENU ) ( HB_PTRUINT ) hb_parnint( 10 ) : NULL,
HB_ISNUM( 11 ) ? ( HINSTANCE ) ( HB_PTRUINT ) hb_parnint( 11 ) : ( HINSTANCE ) wvg_hInstance(),
NULL );
hb_strfree( hClassName );
hb_strfree( hWinName );
hb_retnint( ( HB_PTRDIFF ) hWnd );
hb_retnint( ( HB_PTRUINT ) hWnd );
}
HB_FUNC( WVG_SENDMESSAGETEXT )
{
void * hBuffer;
SendMessage( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ),
SendMessage( ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ),
hb_parni( 2 ),
( WPARAM ) hb_parni( 3 ),
( LPARAM ) HB_PARSTR( 4, &hBuffer, NULL ) );
@@ -815,17 +815,17 @@ HB_FUNC( WVG_GETMESSAGETEXT )
HB_FUNC( WVG_SETWNDPROC )
{
HWND hWnd = ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 );
WNDPROC wndProc = ( WNDPROC ) ( HB_PTRDIFF ) hb_parnint( 2 );
HWND hWnd = ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 );
WNDPROC wndProc = ( WNDPROC ) ( HB_PTRUINT ) hb_parnint( 2 );
WNDPROC oldProc;
#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && ! defined( HB_ARCH_64BIT )
oldProc = ( WNDPROC ) SetWindowLong( hWnd, GWL_WNDPROC, ( long ) wndProc );
#else
oldProc = ( WNDPROC ) SetWindowLongPtr( hWnd, GWLP_WNDPROC, ( HB_PTRDIFF ) wndProc );
oldProc = ( WNDPROC ) SetWindowLongPtr( hWnd, GWLP_WNDPROC, ( HB_PTRUINT ) wndProc );
#endif
hb_retnint( ( HB_PTRDIFF ) oldProc );
hb_retnint( ( HB_PTRUINT ) oldProc );
}
HB_FUNC( WVG_DEFWINDOWPROC )
@@ -1309,9 +1309,9 @@ HB_FUNC( WVG_SENDCBMESSAGE )
hb_arraySet( pCbi, 2, pRc2 );
hb_arraySetNInt( pCbi, 3, cbi.stateButton );
hb_arraySetNInt( pCbi, 4, ( HB_PTRDIFF ) cbi.hwndCombo );
hb_arraySetNInt( pCbi, 5, ( HB_PTRDIFF ) cbi.hwndItem );
hb_arraySetNInt( pCbi, 6, ( HB_PTRDIFF ) cbi.hwndList );
hb_arraySetNInt( pCbi, 4, ( HB_PTRUINT ) cbi.hwndCombo );
hb_arraySetNInt( pCbi, 5, ( HB_PTRUINT ) cbi.hwndItem );
hb_arraySetNInt( pCbi, 6, ( HB_PTRUINT ) cbi.hwndList );
hb_itemReturnRelease( pCbi );
hb_itemRelease( pRc1 );

70
contrib/gtwvg/wvgwing.c
View File

@@ -103,16 +103,16 @@
#define WIN_STATUSBAR_MAX_PARTS 256
#define wvg_parwparam( n ) ( ( WPARAM ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parlparam( n ) ( ( LPARAM ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parhandle( n ) ( ( HANDLE ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parhwnd( n ) ( ( HWND ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parwndproc( n ) ( ( WNDPROC ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parhbrush( n ) ( ( HBRUSH ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parhdc( n ) ( ( HDC ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parcolor( n ) ( ( COLORREF ) ( HB_PTRDIFF ) hb_parnint( n ) )
#define wvg_parwparam( n ) ( ( WPARAM ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_parlparam( n ) ( ( LPARAM ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_parhandle( n ) ( ( HANDLE ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_parhwnd( n ) ( ( HWND ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_parwndproc( n ) ( ( WNDPROC ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_parhbrush( n ) ( ( HBRUSH ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_parhdc( n ) ( ( HDC ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_parcolor( n ) ( ( COLORREF ) ( HB_PTRUINT ) hb_parnint( n ) )
#define wvg_rethandle( n ) ( hb_retnint( ( HB_PTRDIFF ) n ) )
#define wvg_rethandle( n ) ( hb_retnint( ( HB_PTRUINT ) n ) )
#if defined( __BORLANDC__ ) && ! defined( HB_ARCH_64BIT )
#undef MAKELONG
@@ -420,7 +420,7 @@ HB_FUNC( WVG_PREPAREBITMAPFROMFILE )
void * hText;
hBitmap = hPrepareBitmap( HB_PARSTR( 1, &hText, NULL ), 0, hb_parni( 2 ), hb_parni( 3 ), hb_parl( 4 ),
( HWND ) ( HB_PTRDIFF ) hb_parnint( 5 ), 0 );
( HWND ) ( HB_PTRUINT ) hb_parnint( 5 ), 0 );
hb_strfree( hText );
hb_retptr( ( void * ) hBitmap );
}
@@ -430,7 +430,7 @@ HB_FUNC( WVG_PREPAREBITMAPFROMRESOURCEID )
HBITMAP hBitmap;
hBitmap = hPrepareBitmap( NULL, hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parl( 4 ),
( HWND ) ( HB_PTRDIFF ) hb_parnint( 5 ), 2 );
( HWND ) ( HB_PTRUINT ) hb_parnint( 5 ), 2 );
hb_retptr( ( void * ) hBitmap );
}
@@ -441,14 +441,14 @@ HB_FUNC( WVG_PREPAREBITMAPFROMRESOURCENAME )
void * hText;
hBitmap = hPrepareBitmap( HB_PARSTR( 1, &hText, NULL ), 0, hb_parni( 2 ), hb_parni( 3 ), hb_parl( 4 ),
( HWND ) ( HB_PTRDIFF ) hb_parnint( 5 ), 1 );
( HWND ) ( HB_PTRUINT ) hb_parnint( 5 ), 1 );
hb_strfree( hText );
hb_retptr( ( void * ) hBitmap );
}
HB_FUNC( WVG_STATUSBARCREATEPANEL )
{
HWND hWndSB = ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 );
HWND hWndSB = ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 );
int iMode = hb_parni( 2 );
if( hWndSB == NULL || ! IsWindow( hWndSB ) )
@@ -504,7 +504,7 @@ HB_FUNC( WVG_STATUSBARCREATEPANEL )
HB_FUNC( WVG_STATUSBARSETTEXT )
{
HWND hWndSB = ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 );
HWND hWndSB = ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 );
if( hWndSB && IsWindow( hWndSB ) )
{
@@ -526,7 +526,7 @@ HB_FUNC( WVG_STATUSBARSETTEXT )
HB_FUNC( WVG_STATUSBARREFRESH )
{
#if 0
HWND hWndSB = ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 );
HWND hWndSB = ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 );
if( hWndSB && IsWindow( hWndSB ) )
{
@@ -558,8 +558,8 @@ HB_FUNC( WVG_GETNMHDRINFO )
hb_arrayNew( pEvParams, 3 );
hb_arraySetNI( pEvParams, 1, lpnmh->code );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) lpnmh->idFrom );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRDIFF ) lpnmh->hwndFrom );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRUINT ) lpnmh->idFrom );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRUINT ) lpnmh->hwndFrom );
hb_itemReturnRelease( pEvParams );
}
@@ -576,9 +576,9 @@ HB_FUNC( WVG_GETNMMOUSEINFO )
hb_arrayNew( pEvParams, 4 );
hb_arraySetNI( pEvParams, 1, nmh.code );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) nmh.idFrom );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRDIFF ) nmh.hwndFrom );
hb_arraySetNInt( pEvParams, 4, ( HB_PTRDIFF ) nmm->dwItemSpec );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRUINT ) nmh.idFrom );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRUINT ) nmh.hwndFrom );
hb_arraySetNInt( pEvParams, 4, ( HB_PTRUINT ) nmm->dwItemSpec );
hb_itemReturnRelease( pEvParams );
}
@@ -596,8 +596,8 @@ HB_FUNC( WVG_GETNMTREEVIEWINFO )
hb_arrayNew( pEvParams, 4 );
hb_arraySetNI( pEvParams, 1, nmh.code );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRDIFF ) nmh.idFrom );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRDIFF ) nmh.hwndFrom );
hb_arraySetNInt( pEvParams, 2, ( HB_PTRUINT ) nmh.idFrom );
hb_arraySetNInt( pEvParams, 3, ( HB_PTRUINT ) nmh.hwndFrom );
hb_arraySetNI( pEvParams, 4, pnmtv->action );
hb_itemReturnRelease( pEvParams );
@@ -618,7 +618,7 @@ HB_FUNC( WVG_TREEVIEW_GETSELECTIONINFO )
TV_ITEM item;
HTREEITEM hParent;
hb_stornint( ( HB_PTRDIFF ) hSelected, 6 );
hb_stornint( ( HB_PTRUINT ) hSelected, 6 );
item.mask = TVIF_HANDLE | TVIF_TEXT | TVIF_IMAGE;
item.hItem = hSelected;
@@ -629,7 +629,7 @@ HB_FUNC( WVG_TREEVIEW_GETSELECTIONINFO )
HB_STORSTR( text, 4 );
hParent = TreeView_GetParent( wvg_parhwnd( 1 ), hSelected );
hb_stornint( ( HB_PTRDIFF ) hParent, 5 );
hb_stornint( ( HB_PTRUINT ) hParent, 5 );
item.mask = TVIF_HANDLE | TVIF_TEXT;
item.hItem = hParent;
@@ -661,7 +661,7 @@ HB_FUNC( WVG_TREEVIEW_ADDITEM )
tvis.hParent = HB_ISNUM( 2 ) ? ( HTREEITEM ) wvg_parhandle( 2 ) : NULL;
HB_WIN_V_UNION( tvis, item.pszText ) = ( LPTSTR ) HB_PARSTRDEF( 3, &hText, NULL );
hb_retnint( ( HB_PTRDIFF ) TreeView_InsertItem( wvg_parhwnd( 1 ), &tvis ) );
hb_retnint( ( HB_PTRUINT ) TreeView_InsertItem( wvg_parhwnd( 1 ), &tvis ) );
hb_strfree( hText );
}
@@ -785,10 +785,10 @@ BOOL CALLBACK WvgDialogProcChooseFont( HWND hwnd, UINT msg, WPARAM wParam, LPARA
{
hb_vmPushEvalSym();
hb_vmPush( block );
hb_vmPushNumInt( ( HB_PTRDIFF ) hwnd );
hb_vmPushNumInt( ( HB_PTRUINT ) hwnd );
hb_vmPushInteger( msg );
hb_vmPushNumInt( ( HB_PTRDIFF ) wParam );
hb_vmPushNumInt( ( HB_PTRDIFF ) lParam );
hb_vmPushNumInt( ( HB_PTRUINT ) wParam );
hb_vmPushNumInt( ( HB_PTRUINT ) lParam );
hb_vmDo( 4 );
bret = hb_parnl( -1 );
@@ -864,7 +864,7 @@ HB_FUNC( WVG_CHOOSEFONT )
cf.Flags = Flags;
cf.rgbColors = RGB( 0, 0, 0 );
cf.lCustData = ( HB_PTRDIFF ) hb_param( 2, HB_IT_BLOCK );
cf.lCustData = ( HB_PTRUINT ) hb_param( 2, HB_IT_BLOCK );
cf.lpfnHook = ( LPCFHOOKPROC ) WvgDialogProcChooseFont;
cf.lpTemplateName = ( LPTSTR ) NULL;
@@ -942,7 +942,7 @@ HB_FUNC( WVG_FONTCREATE )
if( hFont )
{
aFont = wvg_logfontTOarray( &lf, HB_FALSE );
hb_arraySetNInt( aFont, 15, ( HB_PTRDIFF ) hFont );
hb_arraySetNInt( aFont, 15, ( HB_PTRUINT ) hFont );
}
else
aFont = wvg_logfontTOarray( &lf, HB_TRUE );
@@ -1119,10 +1119,10 @@ LRESULT CALLBACK ControlWindowProcedure( HWND hwnd, UINT msg, WPARAM wParam, LPA
hb_vmPushEvalSym();
hb_vmPush( pBlock );
}
hb_vmPushNumInt( ( HB_PTRDIFF ) hwnd );
hb_vmPushNumInt( ( HB_PTRUINT ) hwnd );
hb_vmPushInteger( msg );
hb_vmPushNumInt( ( HB_PTRDIFF ) wParam );
hb_vmPushNumInt( ( HB_PTRDIFF ) lParam );
hb_vmPushNumInt( ( HB_PTRUINT ) wParam );
hb_vmPushNumInt( ( HB_PTRUINT ) lParam );
hb_vmDo( 4 );
lRet = ( long ) hb_parnint( -1 );
return lRet;
@@ -1141,10 +1141,10 @@ HB_FUNC( WVG_SETWINDOWPROCBLOCK )
#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && ! defined( HB_ARCH_64BIT )
oldProc = ( WNDPROC ) SetWindowLong( hWnd, GWL_WNDPROC, ( long ) ControlWindowProcedure );
#else
oldProc = ( WNDPROC ) SetWindowLongPtr( hWnd, GWLP_WNDPROC, ( HB_PTRDIFF ) ControlWindowProcedure );
oldProc = ( WNDPROC ) SetWindowLongPtr( hWnd, GWLP_WNDPROC, ( HB_PTRUINT ) ControlWindowProcedure );
#endif
hb_retnint( ( HB_PTRDIFF ) oldProc );
hb_retnint( ( HB_PTRUINT ) oldProc );
}
HB_FUNC( WVG_RELEASEWINDOWPROCBLOCK )

24
contrib/hbfbird/firebird.c
View File

@@ -218,7 +218,7 @@ HB_FUNC( FBSTARTTRANSACTION )
if( isc_start_transaction( status, &trans, 1, &db, 0, NULL ) )
hb_retnl( isc_sqlcode( status ) );
else
hb_retptr( ( void * ) ( HB_PTRDIFF ) trans );
hb_retptr( ( void * ) ( HB_PTRUINT ) trans );
}
else
hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
@@ -226,7 +226,7 @@ HB_FUNC( FBSTARTTRANSACTION )
HB_FUNC( FBCOMMIT )
{
isc_tr_handle trans = ( isc_tr_handle ) ( HB_PTRDIFF ) hb_parptr( 1 );
isc_tr_handle trans = ( isc_tr_handle ) ( HB_PTRUINT ) hb_parptr( 1 );
if( trans )
{
@@ -243,7 +243,7 @@ HB_FUNC( FBCOMMIT )
HB_FUNC( FBROLLBACK )
{
isc_tr_handle trans = ( isc_tr_handle ) ( HB_PTRDIFF ) hb_parptr( 1 );
isc_tr_handle trans = ( isc_tr_handle ) ( HB_PTRUINT ) hb_parptr( 1 );
if( trans )
{
@@ -271,7 +271,7 @@ HB_FUNC( FBEXECUTE )
unsigned short dialect = ( unsigned short ) hb_parni( 3 );
if( HB_ISPOINTER( 4 ) )
trans = ( isc_tr_handle ) ( HB_PTRDIFF ) hb_parptr( 4 );
trans = ( isc_tr_handle ) ( HB_PTRUINT ) hb_parptr( 4 );
else
{
if( isc_start_transaction( status, &trans, 1, &db, 0, NULL ) )
@@ -326,7 +326,7 @@ HB_FUNC( FBQUERY )
PHB_ITEM aTemp;
if( HB_ISPOINTER( 4 ) )
trans = ( isc_tr_handle ) ( HB_PTRDIFF ) hb_parptr( 4 );
trans = ( isc_tr_handle ) ( HB_PTRUINT ) hb_parptr( 4 );
else if( isc_start_transaction( status, &trans, 1, &db, 0, NULL ) )
{
hb_retnl( isc_sqlcode( status ) );
@@ -443,11 +443,11 @@ HB_FUNC( FBQUERY )
qry_handle = hb_itemArrayNew( 6 );
hb_arraySetPtr( qry_handle, 1, ( void * ) ( HB_PTRDIFF ) stmt );
hb_arraySetPtr( qry_handle, 2, ( void * ) ( HB_PTRDIFF ) sqlda );
hb_arraySetPtr( qry_handle, 1, ( void * ) ( HB_PTRUINT ) stmt );
hb_arraySetPtr( qry_handle, 2, ( void * ) ( HB_PTRUINT ) sqlda );
if( ! HB_ISPOINTER( 4 ) )
hb_arraySetPtr( qry_handle, 3, ( void * ) ( HB_PTRDIFF ) trans );
hb_arraySetPtr( qry_handle, 3, ( void * ) ( HB_PTRUINT ) trans );
hb_arraySetNL( qry_handle, 4, ( long ) num_cols );
hb_arraySetNI( qry_handle, 5, ( int ) dialect );
@@ -466,7 +466,7 @@ HB_FUNC( FBFETCH )
if( aParam )
{
isc_stmt_handle stmt = ( isc_stmt_handle ) ( HB_PTRDIFF ) hb_itemGetPtr( hb_itemArrayGet( aParam, 1 ) );
isc_stmt_handle stmt = ( isc_stmt_handle ) ( HB_PTRUINT ) hb_itemGetPtr( hb_itemArrayGet( aParam, 1 ) );
XSQLDA * sqlda = ( XSQLDA * ) hb_itemGetPtr( hb_itemArrayGet( aParam, 2 ) );
ISC_STATUS_ARRAY status;
unsigned short dialect = ( unsigned short ) hb_itemGetNI( hb_itemArrayGet( aParam, 5 ) );
@@ -487,9 +487,9 @@ HB_FUNC( FBFREE )
if( aParam )
{
isc_stmt_handle stmt = ( isc_stmt_handle ) ( HB_PTRDIFF ) hb_itemGetPtr( hb_itemArrayGet( aParam, 1 ) );
isc_stmt_handle stmt = ( isc_stmt_handle ) ( HB_PTRUINT ) hb_itemGetPtr( hb_itemArrayGet( aParam, 1 ) );
XSQLDA * sqlda = ( XSQLDA * ) hb_itemGetPtr( hb_itemArrayGet( aParam, 2 ) );
isc_tr_handle trans = ( isc_tr_handle ) ( HB_PTRDIFF ) hb_itemGetPtr( hb_itemArrayGet( aParam, 3 ) );
isc_tr_handle trans = ( isc_tr_handle ) ( HB_PTRUINT ) hb_itemGetPtr( hb_itemArrayGet( aParam, 3 ) );
ISC_STATUS_ARRAY status;
if( isc_dsql_free_statement( status, &stmt, DSQL_drop ) )
@@ -695,7 +695,7 @@ HB_FUNC( FBGETBLOB )
ISC_STATUS blob_stat;
if( HB_ISPOINTER( 3 ) )
trans = ( isc_tr_handle ) ( HB_PTRDIFF ) hb_parptr( 3 );
trans = ( isc_tr_handle ) ( HB_PTRUINT ) hb_parptr( 3 );
else
{
if( isc_start_transaction( status, &trans, 1, &db, 0, NULL ) )

2
contrib/hbwin/axcore.c
View File

@@ -102,7 +102,7 @@ HB_BOOL hb_oleAxInit( void )
PHB_AX_WININIT pAtlAxWinInit;
s_hLib = hbwapi_LoadLibrarySystem( TEXT( "atl.dll" ) );
if( ( unsigned long ) ( HB_PTRDIFF ) s_hLib <= 32 )
if( ( HB_PTRUINT ) s_hLib <= 32 )
{
s_hLib = NULL;
return HB_FALSE;

6
contrib/hbwin/wapi_commctrl.c
View File

@@ -542,7 +542,7 @@ HB_FUNC( WAPI_TABCTRL_GETROWCOUNT )
HB_FUNC( WAPI_TABCTRL_GETIMAGELIST )
{
hbwapi_ret_NINT( ( HB_PTRDIFF ) TabCtrl_GetImageList( hbwapi_par_raw_HWND( 1 ) ) );
hbwapi_ret_NINT( ( HB_PTRUINT ) TabCtrl_GetImageList( hbwapi_par_raw_HWND( 1 ) ) );
}
/* #define TabCtrl_SetImageList(hwnd, himl) */
@@ -550,7 +550,7 @@ HB_FUNC( WAPI_TABCTRL_GETIMAGELIST )
HB_FUNC( WAPI_TABCTRL_SETIMAGELIST )
{
hbwapi_ret_NINT( ( HB_PTRDIFF ) TabCtrl_SetImageList( hbwapi_par_raw_HWND( 1 ),
hbwapi_ret_NINT( ( HB_PTRUINT ) TabCtrl_SetImageList( hbwapi_par_raw_HWND( 1 ),
hbwapi_par_raw_HIMAGELIST( 2 ) ) );
}
@@ -661,7 +661,7 @@ HB_FUNC( WAPI_TABCTRL_SETPADDING )
HB_FUNC( WAPI_TABCTRL_GETTOOLTIPS )
{
#if ! defined( HB_OS_WIN_CE )
hbwapi_ret_NINT( ( HB_PTRDIFF ) TabCtrl_GetToolTips( hbwapi_par_raw_HWND( 1 ) ) );
hbwapi_ret_NINT( ( HB_PTRUINT ) TabCtrl_GetToolTips( hbwapi_par_raw_HWND( 1 ) ) );
#else
hbwapi_ret_NINT( -1 );
#endif

2
contrib/hbwin/wapi_shellapi.c
View File

@@ -61,7 +61,7 @@ HB_FUNC( WAPI_SHELLEXECUTE )
void * hParameters;
void * hDirectory;
hb_retnint( ( HB_PTRDIFF ) ShellExecute( ( HWND ) hb_parptr( 1 ),
hb_retnint( ( HB_PTRUINT ) ShellExecute( ( HWND ) hb_parptr( 1 ),
HB_PARSTR( 2, &hOperation, NULL ), /* edit, explore, open, print, play?, properties? */
HB_PARSTRDEF( 3, &hFile, NULL ),
HB_PARSTR( 4, &hParameters, NULL ),

6
contrib/hbwin/wapi_winbase.c
View File

@@ -232,17 +232,17 @@ HB_FUNC( WAPI_GETPROCADDRESS )
LPCTSTR lpProcName = HB_PARSTR( 2, &hProcName, NULL );
pProc = GetProcAddress( ( HMODULE ) hb_parptr( 1 ),
lpProcName ? lpProcName :
( LPCTSTR ) ( HB_PTRDIFF ) hb_parnint( 2 ) );
( LPCTSTR ) ( HB_PTRUINT ) hb_parnint( 2 ) );
dwLastError = GetLastError();
hb_strfree( hProcName );
#else
pProc = GetProcAddress( ( HMODULE ) hb_parptr( 1 ),
HB_ISCHAR( 2 ) ? hb_parc( 2 ) :
( LPCSTR ) ( HB_PTRDIFF ) hb_parnint( 2 ) );
( LPCSTR ) ( HB_PTRUINT ) hb_parnint( 2 ) );
dwLastError = GetLastError();
#endif
hbwapi_SetLastError( dwLastError );
hb_retptr( ( void * ) ( HB_PTRDIFF ) pProc );
hb_retptr( ( void * ) ( HB_PTRUINT ) pProc );
}
/* HMODULE WINAPI GetModuleHandle( __in_opt LPCTSTR lpModuleName ); */

2
contrib/hbwin/wapi_wingdi.c
View File

@@ -749,7 +749,7 @@ HB_FUNC( WAPI_SELECTOBJECT )
{
/* TODO: Solve reference counting to 'h' handle. Also for returned one. */
if( bRegion )
hb_retnint( ( HB_PTRDIFF ) SelectObject( hDC, h ) );
hb_retnint( ( HB_PTRUINT ) SelectObject( hDC, h ) );
else
hb_retl( SelectObject( hDC, h ) != NULL ); /* NOTE: We don't return a raw pointer. */
}

4
contrib/hbwin/win_misc.c
View File

@@ -210,12 +210,12 @@ HB_FUNC( WIN_UNICODE )
HB_FUNC( WIN_N2P )
{
hb_retptr( ( void * ) ( HB_PTRDIFF ) hb_parnint( 1 ) );
hb_retptr( ( void * ) ( HB_PTRUINT ) hb_parnint( 1 ) );
}
HB_FUNC( WIN_P2N )
{
hb_retnint( ( HB_PTRDIFF ) hb_parptr( 1 ) );
hb_retnint( ( HB_PTRUINT ) hb_parptr( 1 ) );
}
HB_FUNC( WIN_HINSTANCE )

4
contrib/hbxdiff/core.c
View File

@@ -358,8 +358,8 @@ HB_FUNC( XDL_MMFILE_COMPACT )
/* callbacks */
#define hb_ptrToHandle( p ) ( ( HB_FHANDLE ) ( HB_PTRDIFF ) ( p ) )
#define hb_parHandlePtr( n ) ( ( void * ) ( HB_PTRDIFF ) hb_numToHandle( hb_parnint( n ) ) )
#define hb_ptrToHandle( p ) ( ( HB_FHANDLE ) ( HB_PTRUINT ) ( p ) )
#define hb_parHandlePtr( n ) ( ( void * ) ( HB_PTRUINT ) hb_numToHandle( hb_parnint( n ) ) )
static int xdlt_outf( void * priv, mmbuffer_t * mb, int nbuf )
{

2
contrib/rddads/ads1.c
View File

@@ -3769,7 +3769,7 @@ static HB_ERRCODE adsSysName( ADSAREAP pArea, HB_BYTE * pBuffer )
u32RetVal = AdsGetTableType( pArea->hTable, &u16TableType );
if( u32RetVal != AE_SUCCESS )
{
HB_TRACE( HB_TR_DEBUG, ( "Error in adsSysName: %lu pArea->hTable %p", ( HB_ULONG ) u32RetVal, ( void * ) ( HB_PTRDIFF ) pArea->hTable ) );
HB_TRACE( HB_TR_DEBUG, ( "Error in adsSysName: %lu pArea->hTable %p", ( HB_ULONG ) u32RetVal, ( void * ) ( HB_PTRUINT ) pArea->hTable ) );
u16TableType = ( UNSIGNED16 ) pArea->iFileType;
}
}

2
contrib/rddads/adsx.c
View File

@@ -1026,7 +1026,7 @@ static HB_ERRCODE adsxSysName( ADSXAREAP pArea, HB_BYTE * pBuffer )
u32RetVal = AdsGetTableType( pArea->adsarea.hTable, &u16TableType );
if( u32RetVal != AE_SUCCESS )
{
HB_TRACE( HB_TR_DEBUG, ( "Error in adsxSysName: %lu pArea->adsarea.hTable %p", ( HB_ULONG ) u32RetVal, ( void * ) ( HB_PTRDIFF ) pArea->adsarea.hTable ) );
HB_TRACE( HB_TR_DEBUG, ( "Error in adsxSysName: %lu pArea->adsarea.hTable %p", ( HB_ULONG ) u32RetVal, ( void * ) ( HB_PTRUINT ) pArea->adsarea.hTable ) );
u16TableType = ( UNSIGNED16 ) pArea->adsarea.iFileType;
}
}

60
contrib/xhb/cstructc.c
View File

@@ -524,11 +524,11 @@ static HB_BYTE * ArrayToStructure( PHB_ITEM aVar, PHB_ITEM aDef, HB_UINT uiAlign
break;
#if UINT_MAX == ULONG_MAX
case HB_IT_INTEGER:
*( ( char ** ) ( Buffer + uiOffset ) ) = ( char * ) ( HB_PTRDIFF ) ( pBaseVar->pItems + nIndex )->item.asInteger.value;
*( ( char ** ) ( Buffer + uiOffset ) ) = ( char * ) ( HB_PTRUINT ) ( pBaseVar->pItems + nIndex )->item.asInteger.value;
break;
#endif
case HB_IT_LONG:
*( ( char ** ) ( Buffer + uiOffset ) ) = ( char * ) ( HB_PTRDIFF ) ( pBaseVar->pItems + nIndex )->item.asLong.value;
*( ( char ** ) ( Buffer + uiOffset ) ) = ( char * ) ( HB_PTRUINT ) ( pBaseVar->pItems + nIndex )->item.asLong.value;
break;
default:
@@ -550,11 +550,11 @@ static HB_BYTE * ArrayToStructure( PHB_ITEM aVar, PHB_ITEM aDef, HB_UINT uiAlign
#if UINT_MAX == ULONG_MAX
case HB_IT_INTEGER:
*( ( HB_BYTE ** ) ( Buffer + uiOffset ) ) = ( HB_BYTE * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
*( ( HB_BYTE ** ) ( Buffer + uiOffset ) ) = ( HB_BYTE * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
break;
#endif
case HB_IT_LONG:
*( ( HB_BYTE ** ) ( Buffer + uiOffset ) ) = ( HB_BYTE * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
*( ( HB_BYTE ** ) ( Buffer + uiOffset ) ) = ( HB_BYTE * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
break;
default:
@@ -620,11 +620,11 @@ static HB_BYTE * ArrayToStructure( PHB_ITEM aVar, PHB_ITEM aDef, HB_UINT uiAlign
#if UINT_MAX == ULONG_MAX
case HB_IT_INTEGER:
*( ( short ** ) ( Buffer + uiOffset ) ) = ( short * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
*( ( short ** ) ( Buffer + uiOffset ) ) = ( short * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
break;
#endif
case HB_IT_LONG:
*( ( short ** ) ( Buffer + uiOffset ) ) = ( short * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
*( ( short ** ) ( Buffer + uiOffset ) ) = ( short * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
break;
default:
@@ -642,11 +642,11 @@ static HB_BYTE * ArrayToStructure( PHB_ITEM aVar, PHB_ITEM aDef, HB_UINT uiAlign
#if UINT_MAX == ULONG_MAX
case HB_IT_INTEGER:
*( ( unsigned short ** ) ( Buffer + uiOffset ) ) = ( unsigned short * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
*( ( unsigned short ** ) ( Buffer + uiOffset ) ) = ( unsigned short * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
break;
#endif
case HB_IT_LONG:
*( ( unsigned short ** ) ( Buffer + uiOffset ) ) = ( unsigned short * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
*( ( unsigned short ** ) ( Buffer + uiOffset ) ) = ( unsigned short * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
break;
default:
@@ -713,11 +713,11 @@ static HB_BYTE * ArrayToStructure( PHB_ITEM aVar, PHB_ITEM aDef, HB_UINT uiAlign
#if UINT_MAX == ULONG_MAX
case HB_IT_INTEGER:
*( ( int ** ) ( Buffer + uiOffset ) ) = ( int * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
*( ( int ** ) ( Buffer + uiOffset ) ) = ( int * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
break;
#endif
case HB_IT_LONG:
*( ( int ** ) ( Buffer + uiOffset ) ) = ( int * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
*( ( int ** ) ( Buffer + uiOffset ) ) = ( int * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
break;
default:
@@ -735,11 +735,11 @@ static HB_BYTE * ArrayToStructure( PHB_ITEM aVar, PHB_ITEM aDef, HB_UINT uiAlign
#if UINT_MAX == ULONG_MAX
case HB_IT_INTEGER:
*( ( unsigned int ** ) ( Buffer + uiOffset ) ) = ( unsigned int * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
*( ( unsigned int ** ) ( Buffer + uiOffset ) ) = ( unsigned int * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
break;
#endif
case HB_IT_LONG:
*( ( unsigned int ** ) ( Buffer + uiOffset ) ) = ( unsigned int * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
*( ( unsigned int ** ) ( Buffer + uiOffset ) ) = ( unsigned int * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
break;
default:
@@ -805,11 +805,11 @@ static HB_BYTE * ArrayToStructure( PHB_ITEM aVar, PHB_ITEM aDef, HB_UINT uiAlign
#if UINT_MAX == ULONG_MAX
case HB_IT_INTEGER:
*( ( long ** ) ( Buffer + uiOffset ) ) = ( long * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
*( ( long ** ) ( Buffer + uiOffset ) ) = ( long * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
break;
#endif
case HB_IT_LONG:
*( ( long ** ) ( Buffer + uiOffset ) ) = ( long * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
*( ( long ** ) ( Buffer + uiOffset ) ) = ( long * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
break;
default:
@@ -827,11 +827,11 @@ static HB_BYTE * ArrayToStructure( PHB_ITEM aVar, PHB_ITEM aDef, HB_UINT uiAlign
#if UINT_MAX == ULONG_MAX
case HB_IT_INTEGER:
*( ( unsigned long ** ) ( Buffer + uiOffset ) ) = ( unsigned long * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
*( ( unsigned long ** ) ( Buffer + uiOffset ) ) = ( unsigned long * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
break;
#endif
case HB_IT_LONG:
*( ( unsigned long ** ) ( Buffer + uiOffset ) ) = ( unsigned long * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
*( ( unsigned long ** ) ( Buffer + uiOffset ) ) = ( unsigned long * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
break;
default:
@@ -860,11 +860,11 @@ static HB_BYTE * ArrayToStructure( PHB_ITEM aVar, PHB_ITEM aDef, HB_UINT uiAlign
#if UINT_MAX == ULONG_MAX
case HB_IT_INTEGER:
*( ( float ** ) ( Buffer + uiOffset ) ) = ( float * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
*( ( float ** ) ( Buffer + uiOffset ) ) = ( float * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
break;
#endif
case HB_IT_LONG:
*( ( float ** ) ( Buffer + uiOffset ) ) = ( float * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
*( ( float ** ) ( Buffer + uiOffset ) ) = ( float * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
break;
/* Is this correct??? IMHO It's a bug */
@@ -898,11 +898,11 @@ static HB_BYTE * ArrayToStructure( PHB_ITEM aVar, PHB_ITEM aDef, HB_UINT uiAlign
#if UINT_MAX == ULONG_MAX
case HB_IT_INTEGER:
*( ( double ** ) ( Buffer + uiOffset ) ) = ( double * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
*( ( double ** ) ( Buffer + uiOffset ) ) = ( double * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
break;
#endif
case HB_IT_LONG:
*( ( double ** ) ( Buffer + uiOffset ) ) = ( double * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
*( ( double ** ) ( Buffer + uiOffset ) ) = ( double * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
break;
/* Is this correct??? IMHO It's a bug */
@@ -925,11 +925,11 @@ static HB_BYTE * ArrayToStructure( PHB_ITEM aVar, PHB_ITEM aDef, HB_UINT uiAlign
#if UINT_MAX == ULONG_MAX
case HB_IT_INTEGER:
*( ( void ** ) ( Buffer + uiOffset ) ) = ( void * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
*( ( void ** ) ( Buffer + uiOffset ) ) = ( void * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asInteger.value );
break;
#endif
case HB_IT_LONG:
*( ( void ** ) ( Buffer + uiOffset ) ) = ( void * ) ( HB_PTRDIFF ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
*( ( void ** ) ( Buffer + uiOffset ) ) = ( void * ) ( HB_PTRUINT ) ( ( pBaseVar->pItems + nIndex )->item.asLong.value );
break;
default:
@@ -947,11 +947,11 @@ static HB_BYTE * ArrayToStructure( PHB_ITEM aVar, PHB_ITEM aDef, HB_UINT uiAlign
{
if( ( pBaseDef->pItems + nIndex )->item.asInteger.value > CTYPE_STRUCTURE_PTR )
{
*( ( void ** ) ( Buffer + uiOffset ) ) = ( void * ) ( HB_PTRDIFF ) pStructure->item.asLong.value;
*( ( void ** ) ( Buffer + uiOffset ) ) = ( void * ) ( HB_PTRUINT ) pStructure->item.asLong.value;
}
else
{
memcpy( ( void * ) ( Buffer + uiOffset ), ( void * ) ( HB_PTRDIFF ) pStructure->item.asLong.value, uiMemberSize );
memcpy( ( void * ) ( Buffer + uiOffset ), ( void * ) ( HB_PTRUINT ) pStructure->item.asLong.value, uiMemberSize );
}
}
#if UINT_MAX == ULONG_MAX
@@ -959,11 +959,11 @@ static HB_BYTE * ArrayToStructure( PHB_ITEM aVar, PHB_ITEM aDef, HB_UINT uiAlign
{
if( ( pBaseDef->pItems + nIndex )->item.asInteger.value > CTYPE_STRUCTURE_PTR )
{
*( ( void ** ) ( Buffer + uiOffset ) ) = ( void * ) ( HB_PTRDIFF ) pStructure->item.asInteger.value;
*( ( void ** ) ( Buffer + uiOffset ) ) = ( void * ) ( HB_PTRUINT ) pStructure->item.asInteger.value;
}
else
{
memcpy( ( void * ) ( Buffer + uiOffset ), ( void * ) ( HB_PTRDIFF ) pStructure->item.asInteger.value, uiMemberSize );
memcpy( ( void * ) ( Buffer + uiOffset ), ( void * ) ( HB_PTRUINT ) pStructure->item.asInteger.value, uiMemberSize );
}
}
#endif
@@ -1397,11 +1397,11 @@ HB_FUNC( HB_POINTER2STRING )
}
else if( HB_IS_INTEGER( pPointer ) && pLen )
{
hb_retclen( ( char * ) ( HB_PTRDIFF ) hb_itemGetNI( pPointer ), hb_itemGetNS( pLen ) );
hb_retclen( ( char * ) ( HB_PTRUINT ) hb_itemGetNI( pPointer ), hb_itemGetNS( pLen ) );
}
else if( HB_IS_LONG( pPointer ) && pLen )
{
hb_retclen( ( char * ) ( HB_PTRDIFF ) hb_itemGetNL( pPointer ), hb_itemGetNS( pLen ) );
hb_retclen( ( char * ) ( HB_PTRUINT ) hb_itemGetNL( pPointer ), hb_itemGetNS( pLen ) );
}
else
hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) );
@@ -1429,10 +1429,10 @@ HB_FUNC( __CSTR_COPYTO )
s_pVALUE = hb_dynsymGetCase( "VALUE" );
if( HB_IS_LONG( pTarget ) )
pPointer = ( void * ) ( HB_PTRDIFF ) hb_itemGetNInt( pTarget );
pPointer = ( void * ) ( HB_PTRUINT ) hb_itemGetNInt( pTarget );
#if UINT_MAX == ULONG_MAX
else if( HB_IS_INTEGER( pTarget ) )
pPointer = ( void * ) ( HB_PTRDIFF ) hb_itemGetNInt( pTarget );
pPointer = ( void * ) ( HB_PTRUINT ) hb_itemGetNInt( pTarget );
#endif
else if( HB_IS_POINTER( pTarget ) )
pPointer = hb_itemGetPtr( pTarget );

2
contrib/xhb/freadlin.c
View File

@@ -60,7 +60,7 @@ static char * hb_fsReadLine( HB_FHANDLE hFileHandle, HB_ISIZ * plBuffLen, const
HB_ISIZ nRead = 0, nOffset, nSize;
char * pBuff;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsReadLine(%p, %" HB_PFS "d, %p, %p, %" HB_PFS "d, %p, %p)", ( void * ) ( HB_PTRDIFF ) hFileHandle, *plBuffLen, pTerm, pnTermSizes, nTerms, pbFound, pbEOF ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsReadLine(%p, %" HB_PFS "d, %p, %p, %" HB_PFS "d, %p, %p)", ( void * ) ( HB_PTRUINT ) hFileHandle, *plBuffLen, pTerm, pnTermSizes, nTerms, pbFound, pbEOF ) );
*pbFound = HB_FALSE;
*pbEOF = HB_FALSE;

20
extras/gtwvw/gtwvwd.c
View File

@@ -1913,7 +1913,7 @@ BOOL CALLBACK hb_gt_wvwDlgProcMLess( HWND hDlg, UINT message, WPARAM wParam, LPA
{
hb_vmPushDynSym( ( PHB_DYNS ) pFunc );
hb_vmPushNil();
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hDlg );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hDlg );
hb_vmPushNumInt( message );
hb_vmPushNumInt( wParam );
hb_vmPushNumInt( lParam );
@@ -1960,7 +1960,7 @@ BOOL CALLBACK hb_gt_wvwDlgProcMLess( HWND hDlg, UINT message, WPARAM wParam, LPA
{
hb_vmPushEvalSym();
hb_vmPush( s_pWvwData->s_sApp->pFunc[ iIndex ] );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hDlg );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hDlg );
hb_vmPushNumInt( message );
hb_vmPushNumInt( wParam );
hb_vmPushNumInt( lParam );
@@ -2054,7 +2054,7 @@ BOOL CALLBACK hb_gt_wvwDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPA
hb_vmPushDynSym( ( PHB_DYNS ) pFunc );
hb_vmPushNil();
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hDlg );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hDlg );
hb_vmPushNumInt( message );
hb_vmPushNumInt( wParam );
hb_vmPushNumInt( lParam );
@@ -2096,7 +2096,7 @@ BOOL CALLBACK hb_gt_wvwDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPA
{
hb_vmPushEvalSym();
hb_vmPush( pFunc );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hDlg );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hDlg );
hb_vmPushNumInt( message );
hb_vmPushNumInt( wParam );
hb_vmPushNumInt( lParam );
@@ -2569,7 +2569,7 @@ static void xUserTimerNow( UINT usWinNum, HWND hWnd, UINT message, WPARAM wParam
hb_vmPushDynSym( s_pWvwData->s_sApp->pSymWVW_TIMER );
hb_vmPushNil();
hb_vmPushInteger( ( int ) ( usWinNum ) );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hWnd );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hWnd );
hb_vmPushNumInt( message );
hb_vmPushNumInt( wParam );
hb_vmPushNumInt( lParam );
@@ -2770,7 +2770,7 @@ static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam
hb_vmPushDynSym( s_pWvwData->s_sApp->pSymWVW_MENUSELECT );
hb_vmPushNil();
hb_vmPushInteger( ( int ) ( usWinNum ) );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hWnd );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hWnd );
hb_vmPushNumInt( message );
hb_vmPushNumInt( wParam );
hb_vmPushNumInt( lParam );
@@ -3077,7 +3077,7 @@ static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam
hb_vmPushDynSym( s_pWvwData->s_sApp->pSymWVW_SETFOCUS );
hb_vmPushNil();
hb_vmPushInteger( ( int ) ( usWinNum ) );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hWnd );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hWnd );
hb_vmDo( 2 );
hb_vmRequestRestore();
}
@@ -3105,7 +3105,7 @@ static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam
hb_vmPushDynSym( s_pWvwData->s_sApp->pSymWVW_KILLFOCUS );
hb_vmPushNil();
hb_vmPushInteger( ( int ) ( usWinNum ) );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hWnd );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hWnd );
hb_vmDo( 2 );
hb_vmRequestRestore();
}
@@ -3571,7 +3571,7 @@ static LRESULT CALLBACK hb_gt_wvwWndProc( HWND hWnd, UINT message, WPARAM wParam
hb_vmPushDynSym( s_pWvwData->s_sApp->pSymWVW_SIZE );
hb_vmPushNil();
hb_vmPushInteger( ( int ) ( usWinNum ) );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) hWnd );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) hWnd );
hb_vmPushNumInt( message );
hb_vmPushNumInt( wParam );
hb_vmPushNumInt( lParam );
@@ -5346,7 +5346,7 @@ static void hb_gt_wvwInputNotAllowed( UINT usWinNum, UINT message, WPARAM wParam
hb_vmPushDynSym( s_pWvwData->s_sApp->pSymWVW_INPUTFOCUS );
hb_vmPushNil();
hb_vmPushInteger( ( int ) ( usWinNum ) );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRDIFF ) s_pWvwData->s_pWindows[ usWinNum ]->hWnd );
hb_vmPushNumInt( ( HB_MAXINT ) ( HB_PTRUINT ) s_pWvwData->s_pWindows[ usWinNum ]->hWnd );
hb_vmPushNumInt( message );
hb_vmPushNumInt( wParam );
hb_vmPushNumInt( lParam );

4
extras/gtwvw/wvwfuncs.c
View File

@@ -1123,7 +1123,7 @@ HB_FUNC( SELECTFONT )
hfont = CreateFontIndirect( cf.lpLogFont );
hb_arraySetNInt( aMetr, 1, ( HB_PTRDIFF ) hfont );
hb_arraySetNInt( aMetr, 1, ( HB_PTRUINT ) hfont );
hb_arraySetC( aMetr, 2, lf.lfFaceName );
hb_arraySetNL( aMetr, 3, lf.lfWidth );
hb_arraySetNL( aMetr, 4, lf.lfHeight );
@@ -2411,7 +2411,7 @@ HB_FUNC( WVW_SAVESCREEN )
hb_arraySetNI( info, 1, iWidth );
hb_arraySetNI( info, 2, iHeight );
hb_arraySetNInt( info, 3, ( HB_PTRDIFF ) hBmp );
hb_arraySetNInt( info, 3, ( HB_PTRUINT ) hBmp );
hb_itemReturnRelease( info );
}

2
include/hbapierr.h
View File

@@ -89,7 +89,7 @@ HB_EXTERN_BEGIN
#define HB_ERR_ARGS_BASEPARAMS 0xFFFFFFFF
#define HB_ERR_ARGS_SELFPARAMS 0xFFFFFFFE
#define HB_ERR_FUNCNAME ( ( const char * ) ( HB_PTRDIFF ) 1 )
#define HB_ERR_FUNCNAME ( ( const char * ) ( HB_PTRUINT ) 1 )
/* Standard API */

2
include/hbdefs.h
View File

@@ -1464,7 +1464,7 @@ typedef HB_U32 HB_FATTR;
#define HB_SIZEOFARRAY( var ) ( sizeof( var ) / sizeof( *var ) )
#define HB_UNCONST( p ) ( ( void * ) ( HB_PTRUINT ) ( const void * ) ( p ) )
#define HB_DECONST( c, p ) ( ( c ) HB_UNCONST( p ) )
#define HB_DECONST( c, p ) ( ( c ) HB_UNCONST( p ) )
#if defined( __POCC__ ) || defined( __XCC__ )

2
src/debug/dbgentry.c
View File

@@ -62,7 +62,7 @@ static HB_BOOL hb_clsSetScope( HB_BOOL fScope )
return fScope;
}
#define HB_DBGINFO_DISABLE ( ( HB_DEBUGINFO * ) ( HB_PTRDIFF ) 0x01 )
#define HB_DBGINFO_DISABLE ( ( HB_DEBUGINFO * ) ( HB_PTRUINT ) 0x01 )
#if defined( HB_OS_UNIX )
#define FILENAME_EQUAL( s1, s2 ) ( ! strcmp( ( s1 ), ( s2 ) ) )

46
src/rtl/filesys.c
View File

@@ -701,7 +701,7 @@ static HB_USHORT convert_seek_flags( HB_USHORT uiFlags )
HB_FHANDLE hb_fsGetOsHandle( HB_FHANDLE hFileHandle )
{
HB_TRACE( HB_TR_DEBUG, ( "hb_fsGetOsHandle(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsGetOsHandle(%p)", ( void * ) ( HB_PTRUINT ) hFileHandle ) );
#if defined( HB_OS_WIN )
return ( HB_FHANDLE ) DosToWinHandle( hFileHandle );
@@ -969,7 +969,7 @@ HB_BOOL hb_fsPipeCreate( HB_FHANDLE hPipe[ 2 ] )
int hb_fsIsPipeOrSock( HB_FHANDLE hPipeHandle )
{
HB_TRACE( HB_TR_DEBUG, ( "hb_fsIsPipeOrSock(%p)", ( void * ) ( HB_PTRDIFF ) hPipeHandle ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsIsPipeOrSock(%p)", ( void * ) ( HB_PTRUINT ) hPipeHandle ) );
#if defined( HB_OS_UNIX )
{
@@ -1009,7 +1009,7 @@ int hb_fsIsPipeOrSock( HB_FHANDLE hPipeHandle )
HB_BOOL hb_fsPipeUnblock( HB_FHANDLE hPipeHandle )
{
HB_TRACE( HB_TR_DEBUG, ( "hb_fsPipeUnblock(%p)", ( void * ) ( HB_PTRDIFF ) hPipeHandle ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsPipeUnblock(%p)", ( void * ) ( HB_PTRUINT ) hPipeHandle ) );
#if defined( HB_OS_WIN ) && ! defined( HB_OS_WIN_CE )
{
@@ -1054,7 +1054,7 @@ HB_SIZE hb_fsPipeIsData( HB_FHANDLE hPipeHandle, HB_SIZE nBufferSize,
{
HB_SIZE nToRead = 0;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsPipeIsData(%p,%" HB_PFS "u,%" PFHL "d)", ( void * ) ( HB_PTRDIFF ) hPipeHandle, nBufferSize, nTimeOut ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsPipeIsData(%p,%" HB_PFS "u,%" PFHL "d)", ( void * ) ( HB_PTRUINT ) hPipeHandle, nBufferSize, nTimeOut ) );
hb_vmUnlock();
@@ -1209,7 +1209,7 @@ HB_SIZE hb_fsPipeRead( HB_FHANDLE hPipeHandle, void * buffer, HB_SIZE nSize,
{
HB_SIZE nRead;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsPipeRead(%p,%p,%" HB_PFS "u,%" PFHL "d)", ( void * ) ( HB_PTRDIFF ) hPipeHandle, buffer, nSize, nTimeOut ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsPipeRead(%p,%p,%" HB_PFS "u,%" PFHL "d)", ( void * ) ( HB_PTRUINT ) hPipeHandle, buffer, nSize, nTimeOut ) );
nRead = hb_fsPipeIsData( hPipeHandle, nSize, nTimeOut );
if( nRead != ( HB_SIZE ) FS_ERROR && nRead > 0 )
@@ -1227,7 +1227,7 @@ HB_SIZE hb_fsPipeWrite( HB_FHANDLE hPipeHandle, const void * buffer, HB_SIZE nSi
{
HB_SIZE nWritten;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsPipeWrite(%p,%p,%" HB_PFS "u,%" PFHL "d)", ( void * ) ( HB_PTRDIFF ) hPipeHandle, buffer, nSize, nTimeOut ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsPipeWrite(%p,%p,%" HB_PFS "u,%" PFHL "d)", ( void * ) ( HB_PTRUINT ) hPipeHandle, buffer, nSize, nTimeOut ) );
hb_vmUnlock();
@@ -1659,7 +1659,7 @@ HB_FHANDLE hb_fsCreateEx( const char * pszFileName, HB_FATTR nAttr, HB_USHORT ui
void hb_fsClose( HB_FHANDLE hFileHandle )
{
HB_TRACE( HB_TR_DEBUG, ( "hb_fsClose(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsClose(%p)", ( void * ) ( HB_PTRUINT ) hFileHandle ) );
hb_vmUnlock();
#if defined( HB_OS_WIN )
@@ -1697,7 +1697,7 @@ void hb_fsClose( HB_FHANDLE hFileHandle )
int hb_fsSetDevMode( HB_FHANDLE hFileHandle, int iDevMode )
{
HB_TRACE( HB_TR_DEBUG, ( "hb_fsSetDevMode(%p, %d)", ( void * ) ( HB_PTRDIFF ) hFileHandle, iDevMode ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsSetDevMode(%p, %d)", ( void * ) ( HB_PTRUINT ) hFileHandle, iDevMode ) );
#if defined( HB_OS_DOS )
{
@@ -2274,7 +2274,7 @@ HB_USHORT hb_fsRead( HB_FHANDLE hFileHandle, void * pBuff, HB_USHORT uiCount )
{
HB_USHORT uiRead;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsRead(%p, %p, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, uiCount ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsRead(%p, %p, %hu)", ( void * ) ( HB_PTRUINT ) hFileHandle, pBuff, uiCount ) );
hb_vmUnlock();
@@ -2314,7 +2314,7 @@ HB_USHORT hb_fsWrite( HB_FHANDLE hFileHandle, const void * pBuff, HB_USHORT uiCo
{
HB_USHORT uiWritten = 0;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsWrite(%p, %p, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, uiCount ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsWrite(%p, %p, %hu)", ( void * ) ( HB_PTRUINT ) hFileHandle, pBuff, uiCount ) );
hb_vmUnlock();
@@ -2379,7 +2379,7 @@ HB_SIZE hb_fsReadLarge( HB_FHANDLE hFileHandle, void * pBuff, HB_SIZE nCount )
{
HB_SIZE nRead;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsReadLarge(%p, %p, %" HB_PFS "u)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, nCount ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsReadLarge(%p, %p, %" HB_PFS "u)", ( void * ) ( HB_PTRUINT ) hFileHandle, pBuff, nCount ) );
hb_vmUnlock();
@@ -2485,7 +2485,7 @@ HB_SIZE hb_fsWriteLarge( HB_FHANDLE hFileHandle, const void * pBuff, HB_SIZE nCo
{
HB_SIZE nWritten = 0;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsWriteLarge(%p, %p, %" HB_PFS "u)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, nCount ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsWriteLarge(%p, %p, %" HB_PFS "u)", ( void * ) ( HB_PTRUINT ) hFileHandle, pBuff, nCount ) );
hb_vmUnlock();
@@ -2616,7 +2616,7 @@ HB_SIZE hb_fsReadAt( HB_FHANDLE hFileHandle, void * pBuff, HB_SIZE nCount, HB_FO
{
HB_SIZE nRead;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsReadAt(%p, %p, %" HB_PFS "u, %" PFHL "i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, nCount, nOffset ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsReadAt(%p, %p, %" HB_PFS "u, %" PFHL "i)", ( void * ) ( HB_PTRUINT ) hFileHandle, pBuff, nCount, nOffset ) );
hb_vmUnlock();
@@ -2757,7 +2757,7 @@ HB_SIZE hb_fsWriteAt( HB_FHANDLE hFileHandle, const void * pBuff, HB_SIZE nCount
{
HB_SIZE nWritten;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsWriteAt(%p, %p, %" HB_PFS "u, %" PFHL "i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, nCount, nOffset ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsWriteAt(%p, %p, %" HB_PFS "u, %" PFHL "i)", ( void * ) ( HB_PTRUINT ) hFileHandle, pBuff, nCount, nOffset ) );
hb_vmUnlock();
@@ -2898,7 +2898,7 @@ HB_BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET nOffset )
{
HB_BOOL fResult;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsTruncAt(%p, %" PFHL "i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, nOffset ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsTruncAt(%p, %" PFHL "i)", ( void * ) ( HB_PTRUINT ) hFileHandle, nOffset ) );
hb_vmUnlock();
@@ -2948,7 +2948,7 @@ HB_BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET nOffset )
void hb_fsCommit( HB_FHANDLE hFileHandle )
{
HB_TRACE( HB_TR_DEBUG, ( "hb_fsCommit(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsCommit(%p)", ( void * ) ( HB_PTRUINT ) hFileHandle ) );
hb_vmUnlock();
@@ -3019,7 +3019,7 @@ HB_BOOL hb_fsLock( HB_FHANDLE hFileHandle, HB_ULONG ulStart,
{
HB_BOOL fResult;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsLock(%p, %lu, %lu, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, ulStart, ulLength, uiMode ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsLock(%p, %lu, %lu, %hu)", ( void * ) ( HB_PTRUINT ) hFileHandle, ulStart, ulLength, uiMode ) );
hb_vmUnlock();
@@ -3212,7 +3212,7 @@ HB_BOOL hb_fsLockLarge( HB_FHANDLE hFileHandle, HB_FOFFSET nStart,
{
HB_BOOL fResult;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsLockLarge(%p, %" PFHL "u, %" PFHL "i, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, nStart, nLength, uiMode ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsLockLarge(%p, %" PFHL "u, %" PFHL "i, %hu)", ( void * ) ( HB_PTRUINT ) hFileHandle, nStart, nLength, uiMode ) );
#if defined( HB_OS_WIN )
{
@@ -3364,7 +3364,7 @@ int hb_fsLockTest( HB_FHANDLE hFileHandle, HB_FOFFSET nStart,
{
int iResult;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsLockTest(%p, %" PFHL "u, %" PFHL "i, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, nStart, nLength, uiMode ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsLockTest(%p, %" PFHL "u, %" PFHL "i, %hu)", ( void * ) ( HB_PTRUINT ) hFileHandle, nStart, nLength, uiMode ) );
#if defined( HB_OS_UNIX )
{
@@ -3410,7 +3410,7 @@ HB_ULONG hb_fsSeek( HB_FHANDLE hFileHandle, HB_LONG lOffset, HB_USHORT uiFlags )
HB_ULONG ulPos;
HB_USHORT nFlags;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsSeek(%p, %ld, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, lOffset, uiFlags ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsSeek(%p, %ld, %hu)", ( void * ) ( HB_PTRUINT ) hFileHandle, lOffset, uiFlags ) );
nFlags = convert_seek_flags( uiFlags );
@@ -3491,7 +3491,7 @@ HB_FOFFSET hb_fsSeekLarge( HB_FHANDLE hFileHandle, HB_FOFFSET nOffset, HB_USHORT
{
HB_FOFFSET nPos;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsSeekLarge(%p, %" PFHL "i, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, nOffset, uiFlags ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsSeekLarge(%p, %" PFHL "i, %hu)", ( void * ) ( HB_PTRUINT ) hFileHandle, nOffset, uiFlags ) );
#if defined( HB_OS_WIN )
{
@@ -3589,7 +3589,7 @@ HB_FOFFSET hb_fsSeekLarge( HB_FHANDLE hFileHandle, HB_FOFFSET nOffset, HB_USHORT
HB_FOFFSET hb_fsTell( HB_FHANDLE hFileHandle )
{
HB_TRACE( HB_TR_DEBUG, ( "hb_fsTell(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsTell(%p)", ( void * ) ( HB_PTRUINT ) hFileHandle ) );
return hb_fsSeekLarge( hFileHandle, 0, FS_RELATIVE );
}
@@ -4399,7 +4399,7 @@ HB_BOOL hb_fsIsDevice( HB_FHANDLE hFileHandle )
{
HB_BOOL fResult;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsIsDevice(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsIsDevice(%p)", ( void * ) ( HB_PTRUINT ) hFileHandle ) );
hb_vmUnlock();

2
src/rtl/gtcgi/gtcgi.c
View File

@@ -105,7 +105,7 @@ static void hb_gt_cgi_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil
{
PHB_GTCGI pGTCGI;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_cgi_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_cgi_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRUINT ) hFilenoStdin, ( void * ) ( HB_PTRUINT ) hFilenoStdout, ( void * ) ( HB_PTRUINT ) hFilenoStderr ) );
HB_GTLOCAL( pGT ) = pGTCGI = ( PHB_GTCGI ) hb_xgrabz( sizeof( HB_GTCGI ) );

2
src/rtl/gtcrs/gtcrs.c
View File

@@ -2348,7 +2348,7 @@ static void hb_gt_crs_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil
{
InOutBase * ioBase;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_crs_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_crs_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRUINT ) hFilenoStdin, ( void * ) ( HB_PTRUINT ) hFilenoStdout, ( void * ) ( HB_PTRUINT ) hFilenoStderr ) );
if( ! s_ioBase )
{

2
src/rtl/gtos2/gtos2.c
View File

@@ -600,7 +600,7 @@ static PVOID hb_gt_os2_allocMem( int iSize )
static void hb_gt_os2_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFilenoStdout, HB_FHANDLE hFilenoStderr )
{
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_os2_Init(%p,%p,%p,%p)", pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_os2_Init(%p,%p,%p,%p)", pGT, ( HB_PTRUINT ) hFilenoStdin, ( HB_PTRUINT ) hFilenoStdout, ( HB_PTRUINT ) hFilenoStderr ) );
s_vi.cb = sizeof( VIOMODEINFO );
VioGetMode( &s_vi, 0 ); /* fill structure with current video mode settings */

2
src/rtl/gtpca/gtpca.c
View File

@@ -455,7 +455,7 @@ static void hb_gt_pca_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil
{
int iRows = 25, iCols = 80;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_pca_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_pca_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRUINT ) hFilenoStdin, ( void * ) ( HB_PTRUINT ) hFilenoStdout, ( void * ) ( HB_PTRUINT ) hFilenoStderr ) );
s_hFilenoStdin = hFilenoStdin;
s_hFilenoStdout = hFilenoStdout;

2
src/rtl/gtsln/gtsln.c
View File

@@ -560,7 +560,7 @@ static void hb_gt_sln_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil
{
HB_BOOL gt_Inited = HB_FALSE;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_sln_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_sln_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRUINT ) hFilenoStdin, ( void * ) ( HB_PTRUINT ) hFilenoStdout, ( void * ) ( HB_PTRUINT ) hFilenoStderr ) );
/* stdin && stdout && stderr */
s_hStdIn = hFilenoStdin;

2
src/rtl/gtstd/gtstd.c
View File

@@ -189,7 +189,7 @@ static void hb_gt_std_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil
{
PHB_GTSTD pGTSTD;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_std_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_std_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRUINT ) hFilenoStdin, ( void * ) ( HB_PTRUINT ) hFilenoStdout, ( void * ) ( HB_PTRUINT ) hFilenoStderr ) );
HB_GTLOCAL( pGT ) = pGTSTD = ( PHB_GTSTD ) hb_xgrabz( sizeof( HB_GTSTD ) );

2
src/rtl/gttrm/gttrm.c
View File

@@ -3307,7 +3307,7 @@ static void hb_gt_trm_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil
int iRows = 24, iCols = 80;
PHB_GTTRM pTerm;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_trm_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_trm_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRUINT ) hFilenoStdin, ( void * ) ( HB_PTRUINT ) hFilenoStdout, ( void * ) ( HB_PTRUINT ) hFilenoStderr ) );
HB_GTLOCAL( pGT ) = pTerm = ( PHB_GTTRM ) hb_xgrabz( sizeof( HB_GTTRM ) );

2
src/rtl/gtwin/gtwin.c
View File

@@ -726,7 +726,7 @@ static HB_BOOL hb_gt_win_SetCloseButton( HB_BOOL bSet, HB_BOOL bClosable )
static void hb_gt_win_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFilenoStdout, HB_FHANDLE hFilenoStderr )
{
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_win_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_win_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRUINT ) hFilenoStdin, ( void * ) ( HB_PTRUINT ) hFilenoStdout, ( void * ) ( HB_PTRUINT ) hFilenoStderr ) );
s_fWin9x = hb_iswin9x();

10
src/rtl/gtwvt/gtwvt.c
View File

@@ -3187,7 +3187,7 @@ static void hb_gt_wvt_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil
int iCmdShow;
PHB_GTWVT pWVT;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRUINT ) hFilenoStdin, ( void * ) ( HB_PTRUINT ) hFilenoStdout, ( void * ) ( HB_PTRUINT ) hFilenoStderr ) );
if( ! hb_winmainArgGet( &hInstance, NULL, &iCmdShow ) )
{
@@ -3450,17 +3450,17 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
case HB_GTI_INPUTFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( HB_PTRDIFF ) GetStdHandle( STD_INPUT_HANDLE ) );
( HB_PTRUINT ) GetStdHandle( STD_INPUT_HANDLE ) );
break;
case HB_GTI_OUTPUTFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( HB_PTRDIFF ) GetStdHandle( STD_OUTPUT_HANDLE ) );
( HB_PTRUINT ) GetStdHandle( STD_OUTPUT_HANDLE ) );
break;
case HB_GTI_ERRORFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( HB_PTRDIFF ) GetStdHandle( STD_ERROR_HANDLE ) );
( HB_PTRUINT ) GetStdHandle( STD_ERROR_HANDLE ) );
break;
case HB_GTI_FONTSIZE:
@@ -3830,7 +3830,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pWVT->hIconToFree = hIconToFree;
pWVT->hIcon = hIcon;
}
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRDIFF ) pWVT->hIcon );
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( HB_PTRUINT ) pWVT->hIcon );
break;
}
case HB_GTI_VIEWPORTWIDTH:

2
src/rtl/gtxwc/gtxwc.c
View File

@@ -4895,7 +4895,7 @@ static void hb_gt_xwc_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil
{
PXWND_DEF wnd;
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_xwc_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_gt_xwc_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRUINT ) hFilenoStdin, ( void * ) ( HB_PTRUINT ) hFilenoStdout, ( void * ) ( HB_PTRUINT ) hFilenoStderr ) );
#ifdef HB_XWC_USE_LOCALE
setlocale( LC_CTYPE, "" );

20
src/rtl/hbhex.c
View File

@@ -54,7 +54,7 @@ HB_FUNC( HB_HEXTONUM )
if( szHex )
{
HB_MAXUINT ulNum = 0;
HB_MAXUINT nNum = 0;
while( *szHex == ' ' )
szHex++;
@@ -70,12 +70,12 @@ HB_FUNC( HB_HEXTONUM )
iDigit = c - ( 'a' - 10 );
else
{
ulNum = 0;
nNum = 0;
break;
}
ulNum = ( ulNum << 4 ) + iDigit;
nNum = ( nNum << 4 ) + iDigit;
}
hb_retnint( ulNum );
hb_retnint( nNum );
}
else
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
@@ -83,7 +83,7 @@ HB_FUNC( HB_HEXTONUM )
HB_FUNC( HB_NUMTOHEX )
{
HB_MAXUINT ulNum;
HB_MAXUINT nNum;
int iLen;
HB_BOOL fDefaultLen;
char ret[ 33 ];
@@ -101,9 +101,9 @@ HB_FUNC( HB_NUMTOHEX )
}
if( HB_ISNUM( 1 ) )
ulNum = hb_parnint( 1 );
nNum = hb_parnint( 1 );
else if( HB_ISPOINTER( 1 ) )
ulNum = ( HB_PTRDIFF ) hb_parptr( 1 );
nNum = ( HB_PTRUINT ) hb_parptr( 1 );
else
{
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
@@ -113,11 +113,11 @@ HB_FUNC( HB_NUMTOHEX )
ret[ iLen ] = '\0';
do
{
int iDigit = ( int ) ( ulNum & 0x0F );
int iDigit = ( int ) ( nNum & 0x0F );
ret[ --iLen ] = ( char ) ( iDigit + ( iDigit < 10 ? '0' : 'A' - 10 ) );
ulNum >>= 4;
nNum >>= 4;
}
while( fDefaultLen ? ulNum != 0 : iLen != 0 );
while( fDefaultLen ? nNum != 0 : iLen != 0 );
hb_retc( &ret[ iLen ] );
}

6
src/rtl/hbproces.c
View File

@@ -319,7 +319,7 @@ static int hb_fsProcessExec( const char * pszFileName,
{
int iResult = FS_ERROR;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsProcessExec(%s, %p, %p, %p)", pszFileName, ( void * ) ( HB_PTRDIFF ) hStdin, ( void * ) ( HB_PTRDIFF ) hStdout, ( void * ) ( HB_PTRDIFF ) hStderr ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsProcessExec(%s, %p, %p, %p)", pszFileName, ( void * ) ( HB_PTRUINT ) hStdin, ( void * ) ( HB_PTRUINT ) hStdout, ( void * ) ( HB_PTRUINT ) hStderr ) );
#if defined( HB_OS_WIN_CE )
{
@@ -949,7 +949,7 @@ int hb_fsProcessValue( HB_FHANDLE hProcess, HB_BOOL fWait )
{
int iRetStatus = -1;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsProcessValue(%p, %d)", ( void * ) ( HB_PTRDIFF ) hProcess, fWait ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsProcessValue(%p, %d)", ( void * ) ( HB_PTRUINT ) hProcess, fWait ) );
#if defined( HB_OS_WIN )
{
@@ -1040,7 +1040,7 @@ HB_BOOL hb_fsProcessClose( HB_FHANDLE hProcess, HB_BOOL fGentle )
{
HB_BOOL fResult = HB_FALSE;
HB_TRACE( HB_TR_DEBUG, ( "hb_fsProcessClose(%p, %d)", ( void * ) ( HB_PTRDIFF ) hProcess, fGentle ) );
HB_TRACE( HB_TR_DEBUG, ( "hb_fsProcessClose(%p, %d)", ( void * ) ( HB_PTRUINT ) hProcess, fGentle ) );
#if defined( HB_OS_WIN )
{

2
src/rtl/hbsocket.c
View File

@@ -2776,7 +2776,7 @@ static HB_SOCKET s_socketSelectCallback( PHB_ITEM pItem )
{
sd = hb_socketItemGet( pItem );
if( sd == HB_NO_SOCKET )
sd = ( HB_SOCKET ) ( HB_PTRDIFF ) hb_itemGetPtr( pItem );
sd = ( HB_SOCKET ) ( HB_PTRUINT ) hb_itemGetPtr( pItem );
}
}
return sd;

2
src/vm/classes.c
View File

@@ -428,7 +428,7 @@ static HB_USHORT hb_clsBucketPos( PHB_DYNS pMsg, HB_USHORT uiMask )
* HB_DYNS structure
*/
/*
return ( ( HB_USHORT ) ( ( HB_PTRDIFF ) pMsg >> 4 ) & uiMask ) << BUCKETBITS;
return ( ( HB_USHORT ) ( ( HB_PTRUINT ) pMsg >> 4 ) & uiMask ) << BUCKETBITS;
*/
/* Using continuous symbol numbers we are 100% sure that we will cover

6
src/vm/extrap.c
View File

@@ -139,7 +139,7 @@ static LONG WINAPI hb_winExceptionHandler( struct _EXCEPTION_POINTERS * pExcepti
" DS:%04X ES:%04X FS:%04X GS:%04X\n"
" Flags:%08X\n",
( HB_U32 ) pExceptionInfo->ExceptionRecord->ExceptionCode, szCode,
( HB_PTRDIFF ) pExceptionInfo->ExceptionRecord->ExceptionAddress,
( HB_PTRUINT ) pExceptionInfo->ExceptionRecord->ExceptionAddress,
pCtx->Rax, pCtx->Rbx, pCtx->Rcx, pCtx->Rdx,
pCtx->Rsi, pCtx->Rdi, pCtx->Rbp,
pCtx->R8 , pCtx->R9 , pCtx->R10, pCtx->R11,
@@ -461,7 +461,7 @@ static LONG WINAPI hb_winExceptionHandler( struct _EXCEPTION_POINTERS * pExcepti
char buf[ 256 ];
#if defined( HB_OS_WIN_64 )
/* TOFIX: me32.szExePath seemed trashed in some (standalone) tests. */
hb_snprintf( buf, sizeof( buf ), "%016" PFLL "X %016" PFLL "X %s\n", ( HB_PTRDIFF ) me32.modBaseAddr, ( HB_PTRDIFF ) me32.modBaseSize, me32.szExePath );
hb_snprintf( buf, sizeof( buf ), "%016" PFLL "X %016" PFLL "X %s\n", ( HB_PTRUINT ) me32.modBaseAddr, ( HB_PTRUINT ) me32.modBaseSize, me32.szExePath );
#else
char szBuffer[ MAX_PATH ];
#if defined( HB_OS_WIN_CE )
@@ -469,7 +469,7 @@ static LONG WINAPI hb_winExceptionHandler( struct _EXCEPTION_POINTERS * pExcepti
#else
hb_strncpy( szBuffer, me32.szExePath, HB_SIZEOFARRAY( szBuffer ) - 1 );
#endif
hb_snprintf( buf, sizeof( buf ), "%08lX %08lX %s\n", ( HB_PTRDIFF ) me32.modBaseAddr, ( HB_PTRDIFF ) me32.modBaseSize, szBuffer );
hb_snprintf( buf, sizeof( buf ), "%08lX %08lX %s\n", ( HB_PTRUINT ) me32.modBaseAddr, ( HB_PTRUINT ) me32.modBaseSize, szBuffer );
#endif
hb_strncat( errmsg, buf, errmsglen );
}

2
src/vm/itemapi.c
View File

@@ -2875,7 +2875,7 @@ char * hb_itemString( PHB_ITEM pItem, HB_SIZE * nLen, HB_BOOL * bFreeReq )
case HB_IT_POINTER:
{
int size = ( sizeof( void * ) << 1 ) + 3; /* n bytes for address + 0x + \0 */
HB_PTRDIFF addr = ( HB_PTRDIFF ) hb_itemGetPtr( pItem );
HB_PTRUINT addr = ( HB_PTRUINT ) hb_itemGetPtr( pItem );
*nLen = size - 1;
*bFreeReq = HB_TRUE;

2
src/vm/runner.c
View File

@@ -396,7 +396,7 @@ static PHRB_BODY hb_hrbLoad( const char * szHrbBody, HB_SIZE nBodySize, HB_USHOR
}
while( ch );
pSymRead[ ul ].scope.value = ( HB_BYTE ) szHrbBody[ nBodyOffset++ ];
pSymRead[ ul ].value.pCodeFunc = ( PHB_PCODEFUNC ) ( HB_PTRDIFF ) szHrbBody[ nBodyOffset++ ];
pSymRead[ ul ].value.pCodeFunc = ( PHB_PCODEFUNC ) ( HB_PTRUINT ) szHrbBody[ nBodyOffset++ ];
pSymRead[ ul ].pDynSym = NULL;
if( pHrbBody->lSymStart == -1 &&

9
src/vm/task.c
View File

@@ -501,6 +501,7 @@ static void hb_taskRun( void )
static PHB_TASKINFO hb_taskNew( long stack_size )
{
PHB_TASKINFO pTask;
HB_PTRUINT new_size;
if( stack_size < HB_TASK_STACK_MIN )
stack_size = HB_TASK_STACK_MIN;
@@ -508,11 +509,11 @@ static PHB_TASKINFO hb_taskNew( long stack_size )
pTask = ( PHB_TASKINFO ) hb_xgrabz( sizeof( HB_TASKINFO ) );
pTask->stack = ( char * ) hb_xgrab( stack_size );
stack_size += ( HB_PTRDIFF ) pTask->stack;
stack_size &= ~( HB_TASK_STACK_ALIGN - 1 );
stack_size -= ( HB_PTRDIFF ) pTask->stack;
new_size = ( HB_PTRUINT ) pTask->stack + stack_size;
new_size &= ~ ( HB_PTRUINT ) ( HB_TASK_STACK_ALIGN - 1 );
new_size -= ( HB_PTRUINT ) pTask->stack;
pTask->stack_size = stack_size;
pTask->stack_size = ( long ) new_size;
pTask->id = ++s_iTaskID;
pTask->state = TASK_INIT;