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

2008-09-09 11:32 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
+ contrib/hbwhat32/hbwhat.h
  * contrib/hbwhat32/whtbmp.c
  * contrib/hbwhat32/whtbrsh.c
  * contrib/hbwhat32/whtcall.c
  * contrib/hbwhat32/whtcdlg.c
  * contrib/hbwhat32/whtclpb.c
  * contrib/hbwhat32/whtcomm.c
  * contrib/hbwhat32/whtcret.c
  * contrib/hbwhat32/whtdate.c
  * contrib/hbwhat32/whtdc.c
  * contrib/hbwhat32/whtdir.c
  * contrib/hbwhat32/whtdlg.c
  * contrib/hbwhat32/whtdll.c
  * contrib/hbwhat32/whtdraw.c
  * contrib/hbwhat32/whtfont.c
  * contrib/hbwhat32/whtgdi.c
  * contrib/hbwhat32/whthead.c
  * contrib/hbwhat32/whticon.c
  * contrib/hbwhat32/whtilst.c
  * contrib/hbwhat32/whtinet.c
  * contrib/hbwhat32/whtini.c
  * contrib/hbwhat32/whtkbrd.c
  * contrib/hbwhat32/whtlv.c
  * contrib/hbwhat32/whtmain.c
  * contrib/hbwhat32/whtmapi.c
  * contrib/hbwhat32/whtmem.c
  * contrib/hbwhat32/whtmenu.c
  * contrib/hbwhat32/whtmeta.c
  * contrib/hbwhat32/whtmisc.c
  * contrib/hbwhat32/whtmmcap.c
  * contrib/hbwhat32/whtmous.c
  * contrib/hbwhat32/whtmsg.c
  * contrib/hbwhat32/whtpen.c
  * contrib/hbwhat32/whtprn.c
  * contrib/hbwhat32/whtrect.c
  * contrib/hbwhat32/whtreg.c
  * contrib/hbwhat32/whtrgn.c
  * contrib/hbwhat32/whtscrlb.c
  * contrib/hbwhat32/whtseria.c
  * contrib/hbwhat32/whtshell.c
  * contrib/hbwhat32/whtsock.c
  * contrib/hbwhat32/whtsys.c
  * contrib/hbwhat32/whttab.c
  * contrib/hbwhat32/whttbar.c
  * contrib/hbwhat32/whttext.c
  * contrib/hbwhat32/whttree.c
  * contrib/hbwhat32/whtview.c
  * contrib/hbwhat32/whtwnd.c
  * contrib/hbwhat32/wincorec.c
    ! Changed pointer related hb_ret, hb_par and hb_stor calls 
      to ptr versions. This might create incompatibilities and 
      since there is no test package for this lib, it's difficult 
      to test if it works. I relied on MSVC warnings.
    ; There are still some calls to change. One other problem is 
      there is no public equivalent of hb_vmPushLong() for pointers, 
      so these VM specific parts should be changed to use some more 
      official Harbour APIs.
This commit is contained in:
Viktor Szakats
2008-09-09 09:33:35 +00:00
parent 7826484e06
commit 13fb2c3316
50 changed files with 1691 additions and 1702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
harbour/ChangeLog
View File

@@ -8,6 +8,65 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-09-09 11:32 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+ contrib/hbwhat32/hbwhat.h
* contrib/hbwhat32/whtbmp.c
* contrib/hbwhat32/whtbrsh.c
* contrib/hbwhat32/whtcall.c
* contrib/hbwhat32/whtcdlg.c
* contrib/hbwhat32/whtclpb.c
* contrib/hbwhat32/whtcomm.c
* contrib/hbwhat32/whtcret.c
* contrib/hbwhat32/whtdate.c
* contrib/hbwhat32/whtdc.c
* contrib/hbwhat32/whtdir.c
* contrib/hbwhat32/whtdlg.c
* contrib/hbwhat32/whtdll.c
* contrib/hbwhat32/whtdraw.c
* contrib/hbwhat32/whtfont.c
* contrib/hbwhat32/whtgdi.c
* contrib/hbwhat32/whthead.c
* contrib/hbwhat32/whticon.c
* contrib/hbwhat32/whtilst.c
* contrib/hbwhat32/whtinet.c
* contrib/hbwhat32/whtini.c
* contrib/hbwhat32/whtkbrd.c
* contrib/hbwhat32/whtlv.c
* contrib/hbwhat32/whtmain.c
* contrib/hbwhat32/whtmapi.c
* contrib/hbwhat32/whtmem.c
* contrib/hbwhat32/whtmenu.c
* contrib/hbwhat32/whtmeta.c
* contrib/hbwhat32/whtmisc.c
* contrib/hbwhat32/whtmmcap.c
* contrib/hbwhat32/whtmous.c
* contrib/hbwhat32/whtmsg.c
* contrib/hbwhat32/whtpen.c
* contrib/hbwhat32/whtprn.c
* contrib/hbwhat32/whtrect.c
* contrib/hbwhat32/whtreg.c
* contrib/hbwhat32/whtrgn.c
* contrib/hbwhat32/whtscrlb.c
* contrib/hbwhat32/whtseria.c
* contrib/hbwhat32/whtshell.c
* contrib/hbwhat32/whtsock.c
* contrib/hbwhat32/whtsys.c
* contrib/hbwhat32/whttab.c
* contrib/hbwhat32/whttbar.c
* contrib/hbwhat32/whttext.c
* contrib/hbwhat32/whttree.c
* contrib/hbwhat32/whtview.c
* contrib/hbwhat32/whtwnd.c
* contrib/hbwhat32/wincorec.c
! Changed pointer related hb_ret, hb_par and hb_stor calls
to ptr versions. This might create incompatibilities and
since there is no test package for this lib, it's difficult
to test if it works. I relied on MSVC warnings.
; There are still some calls to change. One other problem is
there is no public equivalent of hb_vmPushLong() for pointers,
so these VM specific parts should be changed to use some more
official Harbour APIs.
2008-09-09 09:33 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/mtpl_b32.mak
* contrib/mtpl_vc.mak

11
harbour/contrib/hbwhat32/hbwhat.h Normal file
View File

@@ -0,0 +1,11 @@
/*
* $Id$
*/
//#define HB_PARWH( x ) hb_parnl( x )
//#define HB_RETWH( x ) hb_retnl( ( LONG ) x )
//#define HB_STORWH( x, y ) hb_stornl( ( LONG ) x, y )
#define HB_PARWH( x ) hb_parptr( x )
#define HB_RETWH( x ) hb_retptr( x )
#define HB_STORWH( x, y ) hb_storptr( x, y )

193
harbour/contrib/hbwhat32/whtbmp.c
View File

@@ -19,7 +19,10 @@ Modified and non-API functions:
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include "hbapiitm.h"
#include "hbapi.h"
@@ -38,8 +41,8 @@ extern void Size2ArrayEx( SIZE *siz , PHB_ITEM aSize);
HB_FUNC( LOADBITMAP )
{
hb_retnl( (LONG) LoadBitmap(
ISNIL(1) ? GetModuleHandle( NULL ): (HINSTANCE) hb_parnl(1) ,
HB_RETWH( LoadBitmap(
ISNIL(1) ? GetModuleHandle( NULL ): (HINSTANCE) HB_PARWH(1) ,
hb_parinfo(2)==HB_IT_STRING ?
(LPCTSTR) hb_parcx( 2 ) :
MAKEINTRESOURCE( (WORD) hb_parni(2)) ) );
@@ -51,10 +54,10 @@ HB_FUNC( LOADBITMAP )
HB_FUNC( DRAWBITMAP )
{
HDC hDC = (HDC) hb_parnl( 1 );
HDC hDC = (HDC) HB_PARWH( 1 );
HDC hDCmem = CreateCompatibleDC( hDC );
DWORD dwraster = (ISNIL(3))? SRCCOPY : hb_parnl(3);
HBITMAP hBitmap = (HBITMAP) hb_parnl( 2 );
HBITMAP hBitmap = (HBITMAP) HB_PARWH( 2 );
BITMAP bitmap;
int nWidthDest = ( hb_pcount() >=5 && !ISNIL(6) )? hb_parni(6):0;
int nHeightDest = ( hb_pcount()>=6 && !ISNIL(7) )? hb_parni(7):0;
@@ -78,7 +81,7 @@ HB_FUNC( GETBITMAPSIZE )
{
PHB_ITEM aArray = hb_itemArrayNew( 2 );
BITMAP bm;
HBITMAP hBmp = ( HBITMAP ) hb_parnl( 1 );
HBITMAP hBmp = ( HBITMAP ) HB_PARWH( 1 );
GetObject( hBmp, sizeof( bm ), &bm );
@@ -98,7 +101,7 @@ HB_FUNC( GETBITMAPDIMENSIONEX )
{
SIZE Size;
if( GetBitmapDimensionEx( ( HBITMAP ) hb_parnl( 1 ), &Size ) )
if( GetBitmapDimensionEx( ( HBITMAP ) HB_PARWH( 1 ), &Size ) )
hb_itemReturnRelease( Size2Array( &Size ) );
}
@@ -114,7 +117,7 @@ HB_FUNC( SETBITMAPDIMENSIONEX )
{
SIZE Size;
if ( SetBitmapDimensionEx( (HBITMAP) hb_parnl( 1 ),
if ( SetBitmapDimensionEx( (HBITMAP) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
&Size
@@ -137,7 +140,7 @@ HB_FUNC( SETBITMAPDIMENSIONEX )
HB_FUNC( SETSTRETCHBLTMODE )
{
hb_retni( SetStretchBltMode( (HDC) hb_parnl( 1 ), hb_parni( 2 ) ) ) ;
hb_retni( SetStretchBltMode( (HDC) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -146,18 +149,18 @@ HB_FUNC( SETSTRETCHBLTMODE )
HB_FUNC( STRETCHBLT )
{
hb_retl( StretchBlt( (HDC) hb_parnl( 1 ) ,
hb_retl( StretchBlt( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 ) ,
(HDC) hb_parnl( 6 ) ,
(HDC) HB_PARWH( 6 ) ,
hb_parni( 7 ) ,
hb_parni( 8 ) ,
hb_parni( 9 ) ,
hb_parni( 10 ) ,
(DWORD) hb_parnl( 11 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -167,12 +170,12 @@ HB_FUNC( STRETCHBLT )
HB_FUNC( CREATEBITMAP )
{
hb_retnl( (LONG) CreateBitmap( hb_parni( 1 ) ,
hb_parni( 2 ) ,
(UINT) hb_parni( 3 ),
(UINT) hb_parni( 4 ),
hb_parcx(5)
) ) ;
HB_RETWH( CreateBitmap( hb_parni( 1 ) ,
hb_parni( 2 ) ,
(UINT) hb_parni( 3 ),
(UINT) hb_parni( 4 ),
hb_parcx(5)
) );
}
@@ -186,7 +189,7 @@ HB_FUNC( CREATEBITMAPINDIRECT )
{
CONST BITMAP *bmp = (BITMAP * ) hb_parc( 1 );//hb_param( 1,HB_IT_STRING )->item.asString.value;
hb_retnl( (LONG) CreateBitmapIndirect( bmp ) ) ;
HB_RETWH( CreateBitmapIndirect( bmp ) );
}
@@ -196,10 +199,10 @@ HB_FUNC( CREATEBITMAPINDIRECT )
HB_FUNC( CREATECOMPATIBLEBITMAP )
{
hb_retnl( (LONG) CreateCompatibleBitmap( (HDC) hb_parnl( 1 ),
HB_RETWH( CreateCompatibleBitmap( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -212,13 +215,13 @@ HB_FUNC( CREATEDIBITMAP )
BITMAPINFOHEADER *bmih = (BITMAPINFOHEADER *) hb_parc( 2 );//hb_param( 2, HB_IT_STRING )->item.asString.value ;
BITMAPINFO *bmi = (BITMAPINFO *) hb_parc( 5 );//hb_param( 5, HB_IT_STRING)->item.asString.value ;
hb_retnl( (LONG) CreateDIBitmap( (HDC) hb_parnl( 1 ) ,
HB_RETWH( CreateDIBitmap( (HDC) HB_PARWH( 1 ) ,
bmih ,
(DWORD) hb_parnl( 3 ),
(VOID *) hb_parcx( 3 ),
bmi ,
(UINT) hb_parni( 6 )
) ) ;
) );
}
@@ -233,15 +236,15 @@ HB_FUNC( CREATEDIBSECTION )
BITMAPINFO *bmi = (BITMAPINFO *) hb_parc( 2 );//hb_param( 2, HB_IT_STRING)->item.asString.value ;
VOID **ppBits = (VOID **) 0;
hb_retnl( (LONG) CreateDIBSection( (HDC) hb_parnl( 1 ) ,
HB_RETWH( CreateDIBSection( (HDC) HB_PARWH( 1 ) ,
bmi ,
(UINT) hb_parni( 3 ) ,
ppBits ,
(HANDLE) hb_parnl( 5 ),
(HANDLE) HB_PARWH( 5 ),
(DWORD) hb_parnl( 6 )
) ) ;
) );
hb_stornl((LONG) *ppBits, 4) ;
HB_STORWH( *ppBits, 4);
}
@@ -251,10 +254,10 @@ HB_FUNC( CREATEDIBSECTION )
HB_FUNC( CREATEDISCARDABLEBITMAP )
{
hb_retnl( (LONG) CreateDiscardableBitmap( (HDC) hb_parnl( 1 ),
HB_RETWH( CreateDiscardableBitmap( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -263,19 +266,19 @@ HB_FUNC( CREATEDISCARDABLEBITMAP )
HB_FUNC( MASKBLT )
{
hb_retl( MaskBlt( (HDC) hb_parnl( 1 ) ,
hb_retl( MaskBlt( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 ) ,
(HDC) hb_parnl( 6 ) ,
(HDC) HB_PARWH( 6 ) ,
hb_parni( 7 ) ,
hb_parni( 8 ) ,
(HBITMAP) hb_parnl( 9 ),
(HBITMAP) HB_PARWH( 9 ),
hb_parni( 10 ) ,
hb_parni( 11 ) ,
(DWORD) hb_parnl( 12 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -284,16 +287,16 @@ HB_FUNC( MASKBLT )
HB_FUNC( BITBLT )
{
hb_retl( BitBlt( (HDC) hb_parnl( 1 ) ,
hb_retl( BitBlt( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 ) ,
(HDC) hb_parnl( 6 ) ,
(HDC) HB_PARWH( 6 ) ,
hb_parni( 7 ) ,
hb_parni( 8 ) ,
(DWORD) hb_parnl( 9 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -302,13 +305,13 @@ HB_FUNC( BITBLT )
HB_FUNC( PATBLT )
{
hb_retl( PatBlt( (HDC) hb_parnl( 1 ) ,
hb_retl( PatBlt( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 ) ,
(DWORD) hb_parnl( 6 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -317,7 +320,7 @@ HB_FUNC( PATBLT )
HB_FUNC( SETROP2 )
{
hb_retni( SetROP2( (HDC) hb_parnl( 1 ), hb_parni( 2 ) ) ) ;
hb_retni( SetROP2( (HDC) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -328,11 +331,10 @@ HB_FUNC( SETROP2 )
HB_FUNC( SETBITMAPBITS )
{
hb_retnl( (LONG) SetBitmapBits( (HBITMAP) hb_parnl( 1 ),
hb_retnl( SetBitmapBits( (HBITMAP) HB_PARWH( 1 ),
(DWORD) hb_parclen( 2 ) ,
(VOID *) hb_parcx( 2 )
) ) ;
) );
}
@@ -348,14 +350,14 @@ HB_FUNC( SETDIBITS )
// Your code goes here
hb_retni( SetDIBits( (HDC) hb_parnl( 1 ) ,
(HBITMAP) hb_parnl( 2 ),
hb_retni( SetDIBits( (HDC) HB_PARWH( 1 ) ,
(HBITMAP) HB_PARWH( 2 ),
(UINT) hb_parni( 3 ) ,
(UINT) hb_parni( 4 ) ,
(VOID *) hb_parcx(5) ,
bmi ,
(UINT) hb_parni( 7 )
) ) ;
) );
}
@@ -365,7 +367,7 @@ HB_FUNC( SETDIBITS )
HB_FUNC( GETROP2 )
{
hb_retni( GetROP2( (HDC) hb_parnl( 1 ) ) ) ;
hb_retni( GetROP2( (HDC) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -374,7 +376,7 @@ HB_FUNC( GETROP2 )
HB_FUNC( GETSTRETCHBLTMODE )
{
hb_retni( GetStretchBltMode( (HDC) hb_parnl( 1 ) ) ) ;
hb_retni( GetStretchBltMode( (HDC) HB_PARWH( 1 ) ) );
}
@@ -388,7 +390,7 @@ HB_FUNC( SETDIBITSTODEVICE )
BITMAPINFO *bmi = (BITMAPINFO *) hb_parc( 11 );//hb_param( 11, HB_IT_STRING)->item.asString.value ;
hb_retni( SetDIBitsToDevice( (HDC) hb_parnl( 1 ) ,
hb_retni( SetDIBitsToDevice( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
(DWORD) hb_parnl( 4 ),
@@ -400,7 +402,7 @@ HB_FUNC( SETDIBITSTODEVICE )
(VOID *) hb_parcx(10) ,
bmi ,
(UINT) hb_parni( 12 )
) ) ;
) );
}
@@ -414,7 +416,7 @@ HB_FUNC( STRETCHDIBITS )
BITMAPINFO *bmi = (BITMAPINFO *) hb_parc( 11 );//hb_param( 11, HB_IT_STRING)->item.asString.value ;
hb_retni( StretchDIBits( (HDC) hb_parnl( 1 ) ,
hb_retni( StretchDIBits( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
@@ -427,7 +429,7 @@ HB_FUNC( STRETCHDIBITS )
bmi ,
(UINT) hb_parni( 12 ) ,
(DWORD) hb_parnl( 13 )
) ) ;
) );
}
@@ -449,41 +451,41 @@ void Pic(HDC hDC, int x , int y , int dx , int dy , HBITMAP hBmp , COLORREF rgbT
HBRUSH hOld ;
hDCMem = CreateCompatibleDC(hDC) ;
hDCMem2 = CreateCompatibleDC(hDC) ;
hbmTransMask = CreateBitmap(dx,dy,1,1,NULL) ;
hDCMem = CreateCompatibleDC(hDC);
hDCMem2 = CreateCompatibleDC(hDC);
hbmTransMask = CreateBitmap(dx,dy,1,1,NULL);
SetBkColor(hDC, RGB(255,255,255)) ; //White)
SetTextColor(hDC, RGB(0,0,0)) ; //Black)
SetBkColor(hDC, RGB(255,255,255)); //White)
SetTextColor(hDC, RGB(0,0,0)); //Black)
hbmDefault=(HBITMAP)SelectObject(hDCMem, hBmp);
SelectObject(hDCMem2, hbmTransMask) ;
// build mask based on transparent color.
SetBkColor(hDCMem, rgbTransparent) ;
BitBlt(hDCMem2, 0, 0, dx, dy, hDCMem, 0, 0, SRCCOPY) ;
SetBkColor(hDCMem, rgbTransparent);
BitBlt(hDCMem2, 0, 0, dx, dy, hDCMem, 0, 0, SRCCOPY);
if( disabled)
{
hBr=CreateSolidBrush(GetSysColor(COLOR_BTNHIGHLIGHT));
hOld=(HBRUSH)SelectObject(hDC,hBr) ;
BitBlt(hDC, x+1, y+1, dx-2, dy-2, hDCMem2, 0, 0, 12060490) ;
SelectObject(hDC,hOld) ;
BitBlt(hDC, x+1, y+1, dx-2, dy-2, hDCMem2, 0, 0, 12060490);
SelectObject(hDC,hOld);
DeleteObject(hBr) ;
hBr=CreateSolidBrush(GetSysColor(COLOR_BTNSHADOW)) ;
hOld=(HBRUSH)SelectObject(hDC,hBr) ;
BitBlt(hDC, x, y, dx-2, dy-2, hDCMem2, 0, 0, 12060490) ;
SelectObject(hDC,hOld) ;
DeleteObject(hBr) ;
hBr=CreateSolidBrush(GetSysColor(COLOR_BTNSHADOW));
hOld=(HBRUSH)SelectObject(hDC,hBr);
BitBlt(hDC, x, y, dx-2, dy-2, hDCMem2, 0, 0, 12060490);
SelectObject(hDC,hOld);
DeleteObject(hBr);
}
else
{
BitBlt(hDC, x, y, dx, dy, hDCMem, 0, 0, SRCINVERT) ;
BitBlt(hDC, x, y, dx, dy, hDCMem, 0, 0, SRCINVERT);
BitBlt(hDC, x, y, dx, dy, hDCMem2, 0, 0, SRCAND) ;
BitBlt(hDC, x, y, dx, dy, hDCMem, 0, 0, SRCINVERT) ;
BitBlt(hDC, x, y, dx, dy, hDCMem, 0, 0, SRCINVERT);
}
@@ -491,8 +493,8 @@ void Pic(HDC hDC, int x , int y , int dx , int dy , HBITMAP hBmp , COLORREF rgbT
SelectObject(hDCMem2, hbmDefault);
DeleteObject(hbmTransMask);
DeleteDC(hDCMem) ;
DeleteDC(hDCMem2) ;
DeleteDC(hDCMem);
DeleteDC(hDCMem2);
return ;
@@ -507,12 +509,12 @@ DrawGlyph(HDC hDC, int x , int y , int dx , int dy , HBITMAP hBmp , COLORREF rgb
HB_FUNC( DRAWGLYPH )
{
Pic( (HDC) hb_parni(1),
Pic( (HDC) HB_PARWH(1),
hb_parni(2),
hb_parni(3),
hb_parni(4),
hb_parni(5),
(HBITMAP) hb_parni(6),
(HBITMAP) HB_PARWH(6),
(COLORREF) hb_parnl(7),
hb_parl(8));
return;
@@ -536,8 +538,8 @@ HB_FUNC( DRAWSTATE )
// Your code goes here
hb_retl( DrawState( (HDC) hb_parnl( 1 ) ,
(HBRUSH) hb_parnl( 2 ),
hb_retl( DrawState( (HDC) HB_PARWH( 1 ) ,
(HBRUSH) HB_PARWH( 2 ),
drawstateProc ,
(LPARAM) hb_parnl( 4 ),
(WPARAM) hb_parnl( 5 ),
@@ -546,7 +548,7 @@ HB_FUNC( DRAWSTATE )
hb_parni( 8 ) ,
hb_parni( 9 ) ,
(UINT) hb_parni( 10 )
) ) ;
) );
}
*/
@@ -564,10 +566,10 @@ HB_FUNC( GETBITMAPBITS )
// Your code goes here
hb_retnl( (LONG) GetBitmapBits( (HBITMAP) hb_parnl( 1 ),
HB_RETWH( GetBitmapBits( (HBITMAP) HB_PARWH( 1 ),
hb_parnl( 2 ) ,
lpVoid
) ) ;
) );
}
*/
@@ -585,16 +587,16 @@ HB_FUNC( GETDIBITS )
VOID *lpvBits ;
BITMAPINFO *bmi = (BITMAPINFO *) hb_param( 6, HB_IT_STRING)->item.asString.value ;
hb_retni( GetDIBits( (HDC) hb_parnl( 1 ) ,
(HBITMAP) hb_parnl( 2 ) ,
hb_retni( GetDIBits( (HDC) HB_PARWH( 1 ) ,
(HBITMAP) HB_PARWH( 2 ) ,
(UINT) hb_parni( 3 ) ,
(UINT) hb_parni( 4 ) ,
ISNIL(5) ? NULL : lpvBits ,
bmi ,
(UINT) hb_parni( 7 )
) ) ;
) );
hb_storc( lpvBits, 5) ;
hb_storc( lpvBits, 5);
}
*/
@@ -610,12 +612,12 @@ HB_FUNC( GETGLYPHINDICESA )
// Your code goes here
hb_retnl( (LONG) GetGlyphIndicesA( (HDC) hb_parnl( 1 ) ,
HB_RETWH( GetGlyphIndicesA( (HDC) HB_PARWH( 1 ) ,
(LPCSTR) hb_parcx( 2 ),
hb_parni( 3 ) ,
lpWord ,
(DWORD) hb_parnl( 5 )
) ) ;
) );
}
*/
@@ -633,14 +635,14 @@ HB_FUNC( GETGLYPHOUTLINEA )
// Your code goes here
hb_retnl( (LONG) GetGlyphOutlineA( (HDC) hb_parnl( 1 ) ,
HB_RETWH( GetGlyphOutlineA( (HDC) HB_PARWH( 1 ) ,
(UINT) hb_parni( 2 ) ,
(UINT) hb_parni( 3 ) ,
lpglyphMetrics ,
(DWORD) hb_parnl( 5 ),
lpVoid ,
&MAT2
) ) ;
) );
}
*/
@@ -655,18 +657,18 @@ HB_FUNC( ALPHABLEND )
{
BLENDFUNCTION *bf = (BLENDFUNCTION *) hb_param( 11, HB_IT_STRING)->item.asString.value ;
hb_retl( AlphaBlend( (HDC) hb_parnl( 1 ),
hb_retl( AlphaBlend( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 ) ,
(HDC) hb_parnl( 6 ),
(HDC) HB_PARWH( 6 ),
hb_parni( 7 ) ,
hb_parni( 8 ) ,
hb_parni( 9 ) ,
hb_parni( 10 ) ,
*bf
) ) ;
) );
}
*/
@@ -681,17 +683,17 @@ HB_FUNC( PLGBLT )
// Your code goes here
hb_retl( PlgBlt( (HDC) hb_parnl( 1 ) ,
hb_retl( PlgBlt( (HDC) HB_PARWH( 1 ) ,
&POINT ,
(HDC) hb_parnl( 3 ) ,
(HDC) HB_PARWH( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 ) ,
hb_parni( 6 ) ,
hb_parni( 7 ) ,
(HBITMAP) hb_parnl( 8 ),
(HBITMAP) HB_PARWH( 8 ),
hb_parni( 9 ) ,
hb_parni( 10 )
) ) ;
) );
}
*/
@@ -708,11 +710,11 @@ HB_FUNC( SETDIBCOLORTABLE )
// Your code goes here
hb_retni( SetDIBColorTable( (HDC) hb_parnl( 1 ) ,
hb_retni( SetDIBColorTable( (HDC) HB_PARWH( 1 ) ,
(UINT) hb_parni( 2 ),
(UINT) hb_parni( 3 ),
&RGBQUAD
) ) ;
) );
}
*/
@@ -726,19 +728,18 @@ HB_FUNC( SETDIBCOLORTABLE )
/*
HB_FUNC( TRANSPARENTBLT )
{
hb_retl( TransparentBlt( (HDC) hb_parnl( 1 ) ,
hb_retl( TransparentBlt( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 ) ,
(HDC) hb_parnl( 6 ) ,
(HDC) HB_PARWH( 6 ) ,
hb_parni( 7 ) ,
hb_parni( 8 ) ,
hb_parni( 9 ) ,
hb_parni( 10 ) ,
(UINT) hb_parni( 11 )
) ) ;
) );
}
*/

36
harbour/contrib/hbwhat32/whtbrsh.c
View File

@@ -15,7 +15,10 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include "hbapiitm.h"
#include "hbapi.h"
@@ -24,7 +27,7 @@
HB_FUNC( CREATESOLIDBRUSH )
{
hb_retnl( (LONG) CreateSolidBrush( (COLORREF) hb_parnl( 1 ) ) ) ; // brush color
HB_RETWH( CreateSolidBrush( (COLORREF) hb_parnl( 1 ) ) ); // brush color
}
@@ -32,7 +35,7 @@ HB_FUNC( CREATESOLIDBRUSH )
HB_FUNC( CREATEPATTERNBRUSH )
{
hb_retnl( (LONG) CreatePatternBrush((HBITMAP) hb_parnl( 1 ) ) ) ; // bitmap handle
HB_RETWH( CreatePatternBrush((HBITMAP) HB_PARWH( 1 ) ) ); // bitmap handle
}
//-----------------------------------------------------------------------------
@@ -41,9 +44,9 @@ HB_FUNC( CREATEPATTERNBRUSH )
HB_FUNC( CREATEDIBPATTERNBRUSH )
{
hb_retnl( (LONG) CreateDIBPatternBrush( (HGLOBAL) hb_parnl( 1 ),
HB_RETWH( CreateDIBPatternBrush( (HGLOBAL) HB_PARWH( 1 ),
(UINT) hb_parni( 2 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -55,11 +58,11 @@ HB_FUNC( CREATEDIBPATTERNBRUSH )
HB_FUNC( CREATEBRUSHINDIRECT )
{
//PHB_ITEM br = hb_param( 1,HB_IT_STRING ) ;
//PHB_ITEM br = hb_param( 1,HB_IT_STRING );
//LOGBRUSH *lb = (LOGBRUSH * ) br->item.asString.value;
LOGBRUSH *lb = (LOGBRUSH * ) hb_parnl( 1 );
LOGBRUSH *lb = (LOGBRUSH * ) HB_PARWH( 1 );
hb_retnl( (LONG) CreateBrushIndirect( lb ) ) ;
HB_RETWH( CreateBrushIndirect( lb ) );
}
//-----------------------------------------------------------------------------
@@ -69,7 +72,7 @@ HB_FUNC( CREATEBRUSHINDIRECT )
HB_FUNC( CREATEHATCHBRUSH )
{
hb_retnl( (LONG) CreateHatchBrush( hb_parni( 1 ), (COLORREF) hb_parnl(2) ) ) ;
HB_RETWH( CreateHatchBrush( hb_parni( 1 ), (COLORREF) hb_parnl(2) ) );
}
@@ -83,7 +86,7 @@ HB_FUNC( CREATEHATCHBRUSH )
HB_FUNC( GETDCBRUSHCOLOR )
{
hb_retnl( (ULONG) GetDCBrushColor( (HDC) hb_parnl( 1 ) ) ) ;
hb_retnl( (ULONG) GetDCBrushColor( (HDC) HB_PARWH( 1 ) ) );
}
*/
@@ -98,7 +101,7 @@ HB_FUNC( GETDCBRUSHCOLOR )
HB_FUNC( SETDCBRUSHCOLOR )
{
hb_retnl( (ULONG) SetDCBrushColor( (HDC) hb_parnl( 1 ), (COLORREF) hb_parnl( 2 ) ) ) ;
hb_retnl( (ULONG) SetDCBrushColor( (HDC) HB_PARWH( 1 ), (COLORREF) hb_parnl( 2 ) ) );
}
*/
//-----------------------------------------------------------------------------
@@ -111,7 +114,7 @@ HB_FUNC( CREATEDIBPATTERNBRUSHPT )
{
BITMAPINFO *bmi = (BITMAPINFO *) hb_parc( 1 );//hb_param( 1,HB_IT_STRING )->item.asString.value;
hb_retnl( (LONG) CreateDIBPatternBrushPt( bmi, (UINT) hb_parni( 2 ) ) ) ;
HB_RETWH( CreateDIBPatternBrushPt( bmi, (UINT) hb_parni( 2 ) ) );
}
@@ -124,11 +127,11 @@ HB_FUNC( FIXBRUSHORGEX )
{
POINT *Point = (POINT *) hb_parc( 4 );//hb_param( 4,HB_IT_STRING )->item.asString.value;
hb_retl( FixBrushOrgEx( (HDC) hb_parnl( 1 ),
hb_retl( FixBrushOrgEx( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
Point
) ) ;
) );
}
@@ -140,7 +143,7 @@ HB_FUNC( GETBRUSHORGEX )
{
POINT Point;
if( GetBrushOrgEx( ( HDC ) hb_parnl( 1 ), &Point ) )
if( GetBrushOrgEx( ( HDC ) HB_PARWH( 1 ), &Point ) )
{
PHB_ITEM aPt = hb_itemArrayNew( 2 );
@@ -163,7 +166,7 @@ HB_FUNC( SETBRUSHORGEX )
POINT Point;
if( SetBrushOrgEx( ( HDC ) hb_parnl( 1 ), hb_parni( 2 ), hb_parni( 3 ), &Point ) )
if( SetBrushOrgEx( ( HDC ) HB_PARWH( 1 ), hb_parni( 2 ), hb_parni( 3 ), &Point ) )
{
PHB_ITEM aPt = hb_itemArrayNew( 2 );
@@ -173,6 +176,3 @@ HB_FUNC( SETBRUSHORGEX )
hb_itemReturnRelease( aPt );
}
}

2
harbour/contrib/hbwhat32/whtcall.c
View File

@@ -36,6 +36,8 @@ linking the VMGUI library code into it.
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>

53
harbour/contrib/hbwhat32/whtcdlg.c
View File

@@ -9,6 +9,8 @@
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commdlg.h>
@@ -33,7 +35,7 @@
HB_FUNC( COMMDLGEXTENDEDERROR )
{
hb_retnl( CommDlgExtendedError() ) ;
hb_retnl( CommDlgExtendedError() );
}
//---------------------------------------------------------------------
@@ -48,7 +50,7 @@ HB_FUNC( CHOOSEFONT )
cf->lStructSize = sizeof(CHOOSEFONT);
if (ChooseFont( cf ) )
hb_retclen( (char *) cf, sizeof( CHOOSEFONT )) ;
hb_retclen( (char *) cf, sizeof( CHOOSEFONT ));
}
//----------------------------------------------------------------------------
@@ -61,19 +63,19 @@ HB_FUNC( _FINDTEXT )
fr.lStructSize = sizeof( fr );
fr.hwndOwner = (HWND) hb_parnl( 1 ) ;
fr.hInstance = (HINSTANCE) hb_parnl( 2 ) ;
fr.Flags = (DWORD) hb_parnl( 3 ) ;
fr.lpstrFindWhat = (LPTSTR) hb_parcx( 4 ) ;
fr.hwndOwner = (HWND) HB_PARWH( 1 );
fr.hInstance = (HINSTANCE) HB_PARWH( 2 );
fr.Flags = (DWORD) hb_parnl( 3 );
fr.lpstrFindWhat = (LPTSTR) hb_parcx( 4 );
fr.lpstrReplaceWith = NULL ;
fr.wFindWhatLen = (WORD) hb_parclen(4) ;
fr.wFindWhatLen = (WORD) hb_parclen(4);
fr.wReplaceWithLen = 0 ;
fr.lCustData = 0 ;
// fr.lpfnHook = ISNIL(5) ? NULL : __DlgProc ;
fr.lpTemplateName = NULL ;
hb_retnl( (LONG) FindText( &fr ) ) ;
HB_RETWH( FindText( &fr ) );
}
//----------------------------------------------------------------------------
@@ -86,18 +88,18 @@ HB_FUNC( _REPLACETEXT )
fr.lStructSize = sizeof( fr );
fr.hwndOwner = (HWND) hb_parnl( 1 ) ;
fr.hInstance = (HINSTANCE) hb_parnl( 2 ) ;
fr.Flags = (DWORD) hb_parnl( 3 ) ;
fr.hwndOwner = (HWND) HB_PARWH( 1 );
fr.hInstance = (HINSTANCE) HB_PARWH( 2 );
fr.Flags = (DWORD) hb_parnl( 3 );
fr.lpstrFindWhat = (LPTSTR) hb_parcx( 4 ) ;
fr.lpstrReplaceWith = (LPTSTR) hb_parcx( 5 ) ;
fr.wFindWhatLen = (WORD) hb_parclen( 4 ) ;
fr.wReplaceWithLen = (WORD) hb_parclen( 5 ) ;
fr.wFindWhatLen = (WORD) hb_parclen( 4 );
fr.wReplaceWithLen = (WORD) hb_parclen( 5 );
fr.lCustData = 0 ;
// fr.lpfnHook = ISNIL(5) ? NULL : __DlgProc ;
fr.lpTemplateName = NULL ;
hb_retnl( (LONG) FindText( &fr ) ) ;
HB_RETWH( FindText( &fr ) );
}
@@ -175,14 +177,14 @@ HB_FUNC( CHOOSECOLOR )
int i ;
for( i = 0 ; i <16 ; i++ )
crCustClr[i] = (ISARRAY(3) ? hb_parnl(3,i+1) : RGB(0,0,0)) ;
// GetSysColor(COLOR_BTNFACE)) ;
crCustClr[i] = (ISARRAY(3) ? hb_parnl(3,i+1) : RGB(0,0,0));
// GetSysColor(COLOR_BTNFACE));
cc.lStructSize = sizeof( CHOOSECOLOR ) ;
cc.hwndOwner = ISNIL(1) ? GetActiveWindow():(HWND) hb_parnl(1) ;
cc.rgbResult = (COLORREF)ISNIL(2) ? 0 : hb_parnl(2) ;
cc.lStructSize = sizeof( CHOOSECOLOR );
cc.hwndOwner = ISNIL(1) ? GetActiveWindow():(HWND) HB_PARWH(1);
cc.rgbResult = (COLORREF)ISNIL(2) ? 0 : hb_parnl(2);
cc.lpCustColors = crCustClr ;
cc.Flags = (WORD) (ISNIL(4) ? CC_ANYCOLOR | CC_FULLOPEN | CC_RGBINIT : hb_parnl(4) ) ;
cc.Flags = (WORD) (ISNIL(4) ? CC_ANYCOLOR | CC_FULLOPEN | CC_RGBINIT : hb_parnl(4) );
if ( ChooseColorA( &cc ) )
{
hb_retnl( cc.rgbResult );
@@ -204,7 +206,7 @@ HB_FUNC( _GETOPENFILENAME )
ZeroMemory( &ofn, sizeof(ofn) );
ofn.hInstance = GetModuleHandle(NULL) ;
ofn.lStructSize = sizeof(ofn);
ofn.hwndOwner = (ISNIL (1) ? GetActiveWindow() : (HWND) hb_parnl(1));
ofn.hwndOwner = (ISNIL (1) ? GetActiveWindow() : (HWND) HB_PARWH(1));
ofn.lpstrTitle = hb_parc (3);
ofn.lpstrFilter = hb_parc (4);
ofn.Flags = (ISNIL (5) ? OFN_EXPLORER : hb_parnl(5) );
@@ -217,7 +219,7 @@ HB_FUNC( _GETOPENFILENAME )
if( GetOpenFileName( &ofn ) )
{
hb_stornl( ofn.nFilterIndex, 8 );
hb_storclen( szFileName, hb_parcsiz(2), 2 ) ;
hb_storclen( szFileName, hb_parcsiz(2), 2 );
hb_xfree( szFileName );
hb_retc( ( char * ) ofn.lpstrFile );
}
@@ -241,7 +243,7 @@ HB_FUNC( _GETSAVEFILENAME )
ZeroMemory( &ofn, sizeof( ofn ) );
ofn.hInstance = GetModuleHandle(NULL);
ofn.lStructSize = sizeof(ofn);
ofn.hwndOwner = ISNIL (1) ? GetActiveWindow() : (HWND) hb_parnl(1);
ofn.hwndOwner = ISNIL (1) ? GetActiveWindow() : (HWND) HB_PARWH(1);
ofn.lpstrTitle = hb_parc (3);
ofn.lpstrFilter = hb_parc (4);
ofn.Flags = (ISNIL (5) ? OFN_FILEMUSTEXIST|OFN_EXPLORER : hb_parnl(4) );
@@ -268,12 +270,12 @@ HB_FUNC( _GETSAVEFILENAME )
HB_FUNC( SHBROWSEFORFOLDER )
{
HWND hwnd = ISNIL (1) ? GetActiveWindow() : (HWND) hb_parnl(1);
HWND hwnd = ISNIL (1) ? GetActiveWindow() : (HWND) HB_PARWH(1);
BROWSEINFO BrowseInfo;
char *lpBuffer = (char*) hb_xgrab( MAX_PATH + 1 );
LPITEMIDLIST pidlBrowse;
SHGetSpecialFolderLocation(hwnd, ISNIL(4) ? CSIDL_DRIVES : hb_parni(4), &pidlBrowse) ;
SHGetSpecialFolderLocation(hwnd, ISNIL(4) ? CSIDL_DRIVES : hb_parni(4), &pidlBrowse);
BrowseInfo.hwndOwner = hwnd;
BrowseInfo.pidlRoot = pidlBrowse;
BrowseInfo.pszDisplayName = lpBuffer;
@@ -296,4 +298,3 @@ HB_FUNC( SHBROWSEFORFOLDER )
hb_xfree( lpBuffer);
}

24
harbour/contrib/hbwhat32/whtclpb.c
View File

@@ -16,6 +16,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
//----------------------------------------------------------------------------//
#include <windows.h>
@@ -62,7 +64,7 @@ HB_FUNC( ENUMCLIPBOARDFORMATS )
HB_FUNC( SETCLIPBOARDVIEWER )
{
hb_retnl( (ULONG) SetClipboardViewer( (HWND) hb_parnl(1) ) );
HB_RETWH( SetClipboardViewer( (HWND) HB_PARWH(1) ) );
}
//----------------------------------------------------------------------------//
@@ -71,7 +73,7 @@ HB_FUNC( SETCLIPBOARDVIEWER )
//
HB_FUNC( CHANGECLIPBOARDCHAIN )
{
hb_retl( ChangeClipboardChain( (HWND) hb_parnl( 1 ), (HWND) hb_parnl( 2 ) ) );
hb_retl( ChangeClipboardChain( (HWND) HB_PARWH( 1 ), (HWND) HB_PARWH( 2 ) ) );
}
@@ -81,7 +83,7 @@ HB_FUNC( CHANGECLIPBOARDCHAIN )
//
HB_FUNC( GETOPENCLIPBOARDWINDOW )
{
hb_retnl( (LONG) GetOpenClipboardWindow( ) );
HB_RETWH( GetOpenClipboardWindow( ) );
}
@@ -120,14 +122,14 @@ HB_FUNC( GETCLIPBOARDSEQUENCENUMBER )
HB_FUNC( GETCLIPBOARDOWNER )
{
hb_retnl( (ULONG) GetClipboardOwner() );
HB_RETWH( GetClipboardOwner() );
}
//----------------------------------------------------------------------------//
HB_FUNC( GETCLIPBOARDVIEWER )
{
hb_retnl( (ULONG) GetClipboardViewer() );
HB_RETWH( GetClipboardViewer() );
}
//----------------------------------------------------------------------------//
@@ -141,7 +143,7 @@ HB_FUNC( ISCLIPBOARDFORMATAVAILABLE )
HB_FUNC( OPENCLIPBOARD )
{
hb_retl( OpenClipboard( (HWND) hb_parnl(1) ) );
hb_retl( OpenClipboard( (HWND) HB_PARWH(1) ) );
}
//----------------------------------------------------------------------------//
@@ -192,9 +194,9 @@ HB_FUNC( GETCLIPBOARDDATA )
case CF_BITMAP:
if( IsClipboardFormatAvailable( CF_BITMAP ) )
hb_retnl( ( LONG ) DuplicateBitmap( ( HBITMAP ) GetClipboardData( CF_BITMAP ) ) );
HB_RETWH( DuplicateBitmap( ( HBITMAP ) GetClipboardData( CF_BITMAP ) ) );
else
hb_retnl( 0 );
HB_RETWH( 0 );
break;
default:
@@ -242,7 +244,7 @@ HB_FUNC( SETCLIPBOARDDATA )
pMem = GlobalLock( hMem);
memcpy(pMem, hb_parcx(2), dwLen );
GlobalUnlock( hMem );
hb_retnl( (ULONG) SetClipboardData( (UINT) hb_parni(1), hMem ) );
HB_RETWH( SetClipboardData( (UINT) hb_parni(1), hMem ) );
}
else
hb_retnl(0);
@@ -273,8 +275,8 @@ HB_FUNC( SETCLIPBOARDDATA )
case CF_BITMAP:
if( IsClipboardFormatAvailable( CF_BITMAP ) )
hb_retl( ( BOOL ) SetClipboardData( CF_BITMAP,
DuplicateBitmap( ( HBITMAP ) hb_parnl( 2 ) ) ) );
hb_retl( ( BOOL ) SetClipboardData( CF_BITMAP,
DuplicateBitmap( ( HBITMAP ) HB_PARWH( 2 ) ) ) );
else
hb_retnl( 0 );
break;

66
harbour/contrib/hbwhat32/whtcomm.c
View File

@@ -14,6 +14,8 @@
#define _WIN32_WINNT 0x0400
#define _WIN32_IE 0x0500
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
#include <commctrl.h>
@@ -31,7 +33,7 @@ extern PHB_ITEM Rect2Array( RECT *rc );
HB_FUNC( INITCOMMONCONTROLS )
{
InitCommonControls() ;
InitCommonControls();
}
//-----------------------------------------------------------------------------
@@ -52,13 +54,13 @@ HB_FUNC( INITCOMMONCONTROLSEX )
//----------------------------------------------------------------------------//
HB_FUNC( CREATESTATUSWINDOW )
{
hb_retnl( (ULONG) CreateStatusWindow (
HB_RETWH( CreateStatusWindow (
hb_parnl(1),
(LPCSTR) hb_parcx(2) ,
(HWND) hb_parnl(3) ,
(HWND) HB_PARWH(3) ,
(UINT) hb_parni(4)
)
) ;
);
}
@@ -68,13 +70,13 @@ HB_FUNC( DRAWSTATUSTEXT )
{
RECT rc ;
rc.left = hb_parnl( 2, 1 ) ;
rc.top = hb_parnl( 2, 2 ) ;
rc.right = hb_parnl( 2, 3 ) ;
rc.bottom = hb_parnl( 2, 4 ) ;
rc.left = hb_parnl( 2, 1 );
rc.top = hb_parnl( 2, 2 );
rc.right = hb_parnl( 2, 3 );
rc.bottom = hb_parnl( 2, 4 );
DrawStatusText(
(HDC) hb_parnl(1) ,
(HDC) HB_PARWH(1) ,
(LPRECT) &rc ,
(LPCTSTR) hb_parcx(3),
(UINT) hb_parni(4)
@@ -86,7 +88,7 @@ HB_FUNC( DRAWSTATUSTEXT )
HB_FUNC( WRITESTATUSWINDOW )
{
SendMessage( (HWND) hb_parnl( 1 ), SB_SETTEXT, hb_parni( 2 ), (LPARAM) hb_parcx( 3 ) );
SendMessage( (HWND) HB_PARWH( 1 ), SB_SETTEXT, hb_parni( 2 ), (LPARAM) hb_parcx( 3 ) );
}
@@ -94,7 +96,7 @@ HB_FUNC( STATUSBARGETRECT )
{
RECT rc;
PHB_ITEM aRect ;
HWND hWnd = (HWND) hb_parnl(1);
HWND hWnd = (HWND) HB_PARWH(1);
SendMessage ( hWnd, SB_GETRECT, hb_parnl(2), (LPARAM) &rc);
aRect = Rect2Array( &rc );
hb_itemReturn( aRect );
@@ -106,7 +108,7 @@ HB_FUNC( STATUSBARGETPARTS )
{
RECT rc;
PHB_ITEM aParts;
HWND hWnd = (HWND) hb_parnl(1);
HWND hWnd = (HWND) HB_PARWH(1);
SendMessage ( hWnd, SB_GETPARTS, hb_parni(2), (LPARAM) &rc);
aParts = Rect2Array( &rc );
hb_itemReturn( aParts );
@@ -127,9 +129,9 @@ HB_FUNC( MENUHELP )
(UINT) hb_parni(1) ,
(WPARAM) hb_parni(2),
(LPARAM)hb_parl(3) ,
(HMENU) hb_parnl(4) ,
(HINSTANCE) hb_parnl(5),
(HWND) hb_parnl(6),
(HMENU) HB_PARWH(4) ,
(HINSTANCE) HB_PARWH(5),
(HWND) HB_PARWH(6),
(LPUINT) lpwIDs
);
@@ -151,12 +153,12 @@ to load the appropriate Help string.
*/
HB_FUNC( CREATEPROGRESSBAR )
{
HWND hPBar, hParentWindow = (HWND) hb_parnl(1);
HWND hPBar, hParentWindow = (HWND) HB_PARWH(1);
RECT rcClient;
LONG ProgressBarStyle;
BOOL bBorder = ISNIL(7) ? FALSE : hb_parl(7);
int cyVScroll = ISNIL(6) ? GetSystemMetrics( SM_CYVSCROLL ): hb_parni(6) ;
LONG nStyle = ISNIL(8) ? 0 : hb_parnl(8) ;
int cyVScroll = ISNIL(6) ? GetSystemMetrics( SM_CYVSCROLL ): hb_parni(6);
LONG nStyle = ISNIL(8) ? 0 : hb_parnl(8);
int x1, y1, nwidth, nheight;
if( hb_pcount() > 2 )
@@ -195,7 +197,7 @@ HB_FUNC( CREATEPROGRESSBAR )
SetWindowLong(hPBar, GWL_EXSTYLE, ProgressBarStyle);
}
hb_retnl( (LONG) hPBar );
HB_RETWH( hPBar );
}
@@ -206,14 +208,14 @@ HB_FUNC( CREATEPROGRESSBAR )
*/
HB_FUNC( UPDATEPROGRESSBAR )
{
SendMessage( (HWND) hb_parnl(1), PBM_STEPIT, 0, 0 );
SendMessage( (HWND) HB_PARWH(1), PBM_STEPIT, 0, 0 );
}
//----------------------------------------------------------------------------//
HB_FUNC( SETPROGRESSBAR )
{
SendMessage( (HWND) hb_parnl(1), PBM_SETPOS, (WPARAM) hb_parni(2), 0 );
SendMessage( (HWND) HB_PARWH(1), PBM_SETPOS, (WPARAM) hb_parni(2), 0 );
}
@@ -267,21 +269,21 @@ HB_FUNC( INITLISTVIEW )
i.dwICC = ICC_DATE_CLASSES;
InitCommonControlsEx(&i);
hwnd = (HWND) hb_parnl (1);
hwnd = (HWND) HB_PARWH (1);
hbutton = CreateWindowEx(WS_EX_CLIENTEDGE,"SysListView32","",
LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_CHILD | WS_TABSTOP | WS_VISIBLE | WS_BORDER | LVS_REPORT,
hb_parni(3), hb_parni(4) , hb_parni(5), hb_parni(6) ,
hwnd,(HMENU)hb_parni(2) , GetModuleHandle(NULL) , NULL ) ;
hwnd,(HMENU)hb_parni(2) , GetModuleHandle(NULL) , NULL );
SendMessage(hbutton,LVM_SETEXTENDEDLISTVIEWSTYLE, 0,LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP );
if ( hb_parni(8) != 0)
{
//SendMessage(hbutton,(UINT)WM_SETFONT,(WPARAM) PrepareFont ( hb_parcx(7) , (LPARAM) hb_parni(8)) , 1 ) ;
//SendMessage(hbutton,(UINT)WM_SETFONT,(WPARAM) PrepareFont ( hb_parcx(7) , (LPARAM) hb_parni(8)) , 1 );
}
hb_retnl ( (LONG) hbutton );
HB_RETWH( hbutton );
}
//------------------------------------------------------------------------------------------
HB_FUNC( INITLISTVIEWCOLUMNS )
@@ -295,7 +297,7 @@ HB_FUNC( INITLISTVIEWCOLUMNS )
int s;
int vi;
hc = (HWND) hb_parnl( 1 ) ;
hc = (HWND) HB_PARWH( 1 );
l9 = hb_parinfa( 2, 0 ) - 1 ;
hArray = hb_param( 2, HB_IT_ARRAY );
@@ -332,7 +334,7 @@ HB_FUNC( ADDLISTVIEWITEMS )
int s;
int c;
h = (HWND) hb_parnl( 1 ) ;
h = (HWND) HB_PARWH( 1 );
l = hb_parinfa( 2, 0 ) - 1 ;
c = ListView_GetItemCount (h);
// hArray = hb_param( 2, HB_IT_ARRAY );
@@ -356,26 +358,26 @@ HB_FUNC( ADDLISTVIEWITEMS )
//------------------------------------------------------------------------------------------
HB_FUNC( LISTVIEW_SETCURSEL )
{
ListView_SetItemState((HWND) hb_parnl (1), (WPARAM) hb_parni(2)-1 ,LVIS_FOCUSED | LVIS_SELECTED , LVIS_FOCUSED | LVIS_SELECTED );
ListView_SetItemState((HWND) HB_PARWH (1), (WPARAM) hb_parni(2)-1 ,LVIS_FOCUSED | LVIS_SELECTED , LVIS_FOCUSED | LVIS_SELECTED );
}
//------------------------------------------------------------------------------------------
HB_FUNC( C_SETFOCUS )
{
hb_retnl( (LONG) SetFocus( (HWND) hb_parnl( 1 ) ) );
HB_RETWH( SetFocus( (HWND) HB_PARWH( 1 ) ) );
}
//------------------------------------------------------------------------------------------
HB_FUNC( LISTVIEWDELETESTRING )
{
SendMessage( (HWND) hb_parnl( 1 ),LVM_DELETEITEM , (WPARAM) hb_parni(2)-1, 0);
SendMessage( (HWND) HB_PARWH( 1 ),LVM_DELETEITEM , (WPARAM) hb_parni(2)-1, 0);
}
//------------------------------------------------------------------------------------------
HB_FUNC( LISTVIEWRESET )
{
SendMessage( (HWND) hb_parnl( 1 ), LVM_DELETEALLITEMS , 0, 0 );
SendMessage( (HWND) HB_PARWH( 1 ), LVM_DELETEALLITEMS , 0, 0 );
}
//------------------------------------------------------------------------------------------
HB_FUNC( LISTVIEW_GETFIRSTITEM )
{
hb_retni( ListView_GetNextItem( (HWND) hb_parnl( 1 ), -1, LVNI_ALL | LVNI_SELECTED ) + 1 );
hb_retni( ListView_GetNextItem( (HWND) HB_PARWH( 1 ), -1, LVNI_ALL | LVNI_SELECTED ) + 1 );
}
//------------------------------------------------------------------------------------------

27
harbour/contrib/hbwhat32/whtcret.c
View File

@@ -10,6 +10,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -45,7 +47,7 @@ HB_FUNC( SETCARETBLINKTIME )
HB_FUNC( GETCARETX )
{
POINT ptPoint ;
GetCaretPos( (LPPOINT) &ptPoint ) ;
GetCaretPos( (LPPOINT) &ptPoint );
hb_retnl( ptPoint.x );
}
@@ -54,7 +56,7 @@ HB_FUNC( GETCARETX )
HB_FUNC( GETCARETY )
{
POINT ptPoint ;
GetCaretPos( (LPPOINT) &ptPoint ) ;
GetCaretPos( (LPPOINT) &ptPoint );
hb_retnl( ptPoint.y );
}
@@ -68,7 +70,7 @@ HB_FUNC( GETCARETPOS )
if ( GetCaretPos( (LPPOINT) &Point ) )
{
aPt = Point2Array(&Point) ;
aPt = Point2Array(&Point);
hb_itemReturn( aPt );
hb_itemRelease( aPt );
}
@@ -88,7 +90,7 @@ HB_FUNC( SETCARETPOS )
HB_FUNC( SHOWCARET )
{
hb_retl( ShowCaret( (HWND) hb_parnl(1) ) ) ;
hb_retl( ShowCaret( (HWND) HB_PARWH(1) ) );
}
@@ -96,31 +98,24 @@ HB_FUNC( SHOWCARET )
HB_FUNC( HIDECARET )
{
hb_retl( HideCaret( (HWND) hb_parnl(1) ) );
hb_retl( HideCaret( (HWND) HB_PARWH(1) ) );
}
//-----------------------------------------------------------------------------
HB_FUNC( CREATECARET )
{
hb_retl( CreateCaret( (HWND) hb_parnl(1) ,
(HBITMAP) hb_parnl(2),
hb_retl( CreateCaret( (HWND) HB_PARWH(1) ,
(HBITMAP) HB_PARWH(2),
(int) hb_parni(3) ,
(int) hb_parni(4) ) ) ;
(int) hb_parni(4) ) );
}
//-----------------------------------------------------------------------------
HB_FUNC( DESTROYCARET )
{
hb_retl( DestroyCaret() ) ;
hb_retl( DestroyCaret() );
}
//-----------------------------------------------------------------------------

57
harbour/contrib/hbwhat32/whtdate.c
View File

@@ -9,6 +9,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -28,7 +30,7 @@
HB_FUNC( DATETIME_CREATE )
{
hb_retnl( (LONG) CreateWindowEx( ISNIL( 1 ) ? 0 : hb_parnl( 1 ) ,
HB_RETWH( CreateWindowEx( ISNIL( 1 ) ? 0 : hb_parnl( 1 ) ,
"SysDateTimePick32" , // CLASSNAME
0 , // Window Name // ????????
(DWORD) hb_parnl( 2 ) , // nStyle
@@ -36,10 +38,10 @@ HB_FUNC( DATETIME_CREATE )
hb_parni( 4 ) , // y
hb_parni( 5 ) , // nWidth
hb_parni( 6 ) , // nHeight
(HWND) hb_parnl( 7 ) , // hParent
(HMENU) hb_parni( 8 ) , // hMenu
(HWND) HB_PARWH( 7 ) , // hParent
(HMENU) HB_PARWH( 8 ) , // hMenu
GetModuleHandle(NULL) , // hInstance
ISNIL( 9 ) ? NULL : (void *) hb_parnl( 9 ) ) ) ; // lpParam
ISNIL( 9 ) ? NULL : (void *) HB_PARWH( 9 ) ) ); // lpParam
}
//-----------------------------------------------------------------------------
@@ -56,8 +58,8 @@ HB_FUNC( DATETIME_CREATE )
HB_FUNC( DATETIME_GETMONTHCAL )
{
hb_retnl( (LONG) DateTime_GetMonthCal(
(HWND) hb_parnl( 1 ) // Handle to a DTP control
HB_RETWH( DateTime_GetMonthCal(
(HWND) HB_PARWH( 1 ) // Handle to a DTP control
) );
}
@@ -74,8 +76,8 @@ HB_FUNC( DATETIME_GETMONTHCAL )
HB_FUNC( DATETIME_GETMONTHCALCOLOR )
{
hb_retnl( (LONG) DateTime_GetMonthCalColor(
(HWND) hb_parnl( 1 ), // Handle to a DTP control
hb_retnl( ( long ) DateTime_GetMonthCalColor(
(HWND) HB_PARWH( 1 ), // Handle to a DTP control
hb_parni( 2 ) // Value of type int specifying which month calendar color to retrieve.
) );
@@ -93,9 +95,9 @@ HB_FUNC( DATETIME_GETMONTHCALCOLOR )
HB_FUNC( DATETIME_GETMONTHCALFONT )
{
hb_retnl( (LONG) DateTime_GetMonthCalFont(
(HWND) hb_parnl( 1 ) // Handle to a DTP control
// QUESTION: Doc seems to say this returns a HFONT, but it's not on 64-bit.
hb_retnl( ( long ) DateTime_GetMonthCalFont(
(HWND) HB_PARWH( 1 ) // Handle to a DTP control
) );
}
@@ -117,7 +119,7 @@ HB_FUNC( DATETIME_GETRANGE )
PHB_ITEM aMinMaxDate, aMinDate, aMaxDate;
DWORD dwRet;
dwRet = DateTime_GetRange( (HWND) hb_parnl( 1 ), (SYSTEMTIME *)lpSysTimeArray );
dwRet = DateTime_GetRange( (HWND) HB_PARWH( 1 ), (SYSTEMTIME *)lpSysTimeArray );
if( ISBYREF( 2 ) )
hb_stornl( dwRet, 2 );
@@ -175,7 +177,7 @@ HB_FUNC( DATETIME_GETSYSTEMTIME )
long nRet;
nRet = DateTime_GetSystemtime(
(HWND) hb_parnl( 1 ), // Handle to a DTP control
(HWND) HB_PARWH( 1 ), // Handle to a DTP control
&SysTime // Pointer to a SYSTEMTIME structure. If DTM_GETSYSTEMTIME returns
// GDT_VALID, this structure will contain the system time.
// Otherwise, it will not contain valid information.
@@ -215,7 +217,7 @@ HB_FUNC( DATETIME_GETSYSTEMTIME )
HB_FUNC( DATETIME_SETFORMAT )
{
hb_retl( DateTime_SetFormat(
(HWND) hb_parnl( 1 ), // Handle to a DTP control
(HWND) HB_PARWH( 1 ), // Handle to a DTP control
(LPCTSTR) hb_parcx( 2 ) // Pointer to a zero-terminated format string that defines
// the desired display. Setting this parameter to NULL will
// reset the control to the default format string for the current style.
@@ -237,8 +239,8 @@ HB_FUNC( DATETIME_SETFORMAT )
HB_FUNC( DATETIME_SETMONTHCALCOLOR )
{
hb_retnl( (LONG) DateTime_SetMonthCalColor(
(HWND) hb_parnl( 1 ), // Handle to a DTP control
hb_retnl( ( long ) DateTime_SetMonthCalColor(
(HWND) HB_PARWH( 1 ), // Handle to a DTP control
hb_parni( 2 ), // Value of type int specifying which month calendar color to set.
(COLORREF) hb_parnl( 3 ) // COLORREF value that represents the color that will be set for the specified area of the month calendar.
) );
@@ -260,8 +262,8 @@ HB_FUNC( DATETIME_SETMONTHCALFONT )
{
DateTime_SetMonthCalFont(
(HWND) hb_parnl( 1 ), // Handle to a DTP control
(HFONT) hb_parnl( 2 ), // Handle to the font that will be set.
(HWND) HB_PARWH( 1 ), // Handle to a DTP control
(HFONT) HB_PARWH( 2 ), // Handle to the font that will be set.
(BOOL) hb_parl( 3 ) // Specifies whether the control should be redrawn
// immediately upon setting the font. Setting this
// parameter to TRUE causes the control to redraw itself.
@@ -289,14 +291,14 @@ HB_FUNC( DATETIME_SETSYSTEMTIME )
if ( ISARRAY( 3 ) ) // array
{
SysTime.wYear = (WORD) hb_parnl( 3, 1 );
SysTime.wMonth = (WORD) hb_parnl( 3, 2 );
SysTime.wDayOfWeek = (WORD) hb_parnl( 3, 3 );
SysTime.wDay = (WORD) hb_parnl( 3, 4 );
SysTime.wHour = (WORD) hb_parnl( 3, 5 );
SysTime.wMinute = (WORD) hb_parnl( 3, 6 );
SysTime.wSecond = (WORD) hb_parnl( 3, 7 );
SysTime.wMilliseconds = (WORD) hb_parnl( 3, 8 );
SysTime.wYear = (WORD) hb_parni( 3, 1 );
SysTime.wMonth = (WORD) hb_parni( 3, 2 );
SysTime.wDayOfWeek = (WORD) hb_parni( 3, 3 );
SysTime.wDay = (WORD) hb_parni( 3, 4 );
SysTime.wHour = (WORD) hb_parni( 3, 5 );
SysTime.wMinute = (WORD) hb_parni( 3, 6 );
SysTime.wSecond = (WORD) hb_parni( 3, 7 );
SysTime.wMilliseconds = (WORD) hb_parni( 3, 8 );
lpSysTime = &SysTime;
}
else
@@ -313,9 +315,8 @@ HB_FUNC( DATETIME_SETSYSTEMTIME )
}
hb_retl( DateTime_SetSystemtime(
(HWND) hb_parnl( 1 ) , // Handle to a DTP control
(HWND) HB_PARWH( 1 ) , // Handle to a DTP control
(DWORD) hb_parnl( 2 ), // Value that specifies the action that should be performed.
lpSysTime // Pointer to SYSTEMTIME structures
) );
}

48
harbour/contrib/hbwhat32/whtdc.c
View File

@@ -11,6 +11,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include "hbapiitm.h"
#include "hbapi.h"
@@ -29,7 +31,7 @@ extern void Size2ArrayEx( SIZE *siz , PHB_ITEM aSize);
HB_FUNC( GETDC )
{
hb_retnl( (ULONG) GetDC( (HWND) hb_parnl(1) ) ) ;
HB_RETWH( GetDC( (HWND) HB_PARWH(1) ) );
}
//-----------------------------------------------------------------------------
@@ -38,7 +40,7 @@ HB_FUNC( GETDC )
HB_FUNC( RESTOREDC )
{
hb_retl( RestoreDC( (HDC) hb_parnl( 1 ), hb_parni( 2 ) ) ) ;
hb_retl( RestoreDC( (HDC) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -47,7 +49,7 @@ HB_FUNC( RESTOREDC )
HB_FUNC( SAVEDC )
{
hb_retni( SaveDC( (HDC) hb_parnl( 1 ) ) ) ;
hb_retni( SaveDC( (HDC) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -55,17 +57,17 @@ HB_FUNC( SAVEDC )
HB_FUNC( GETDCEX )
{
hb_retnl( (LONG) GetDCEx( (HWND) hb_parnl( 1 ) ,
(HRGN) hb_parnl( 2 ) ,
HB_RETWH( GetDCEx( (HWND) HB_PARWH( 1 ) ,
(HRGN) HB_PARWH( 2 ) ,
(DWORD) hb_parnl( 3 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
HB_FUNC( RELEASEDC )
{
hb_retni( ReleaseDC( (HWND) hb_parnl(1), (HDC) hb_parnl(2) ) ) ;
hb_retni( ReleaseDC( (HWND) HB_PARWH(1), (HDC) HB_PARWH(2) ) );
}
//-----------------------------------------------------------------------------
@@ -73,7 +75,7 @@ HB_FUNC( RELEASEDC )
HB_FUNC( DELETEDC )
{
hb_retl( DeleteDC( (HDC) hb_parnl( 1 ) ) ) ;
hb_retl( DeleteDC( (HDC) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -81,7 +83,7 @@ HB_FUNC( DELETEDC )
HB_FUNC( CANCELDC )
{
hb_retl( CancelDC( (HDC) hb_parnl( 1 ) ) ) ;
hb_retl( CancelDC( (HDC) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -89,7 +91,7 @@ HB_FUNC( CANCELDC )
HB_FUNC( CREATECOMPATIBLEDC )
{
hb_retnl( (LONG) CreateCompatibleDC( (HDC) hb_parnl( 1 ) ) ) ;
HB_RETWH( CreateCompatibleDC( (HDC) HB_PARWH( 1 ) ) );
}
@@ -97,7 +99,7 @@ HB_FUNC( CREATECOMPATIBLEDC )
HB_FUNC( WINDOWFROMDC )
{
hb_retnl( (LONG) WindowFromDC( (HDC) hb_parnl( 1 ) ) );
HB_RETWH( WindowFromDC( (HDC) HB_PARWH( 1 ) ) );
}
@@ -107,7 +109,7 @@ HB_FUNC( WINDOWFROMDC )
HB_FUNC( GETWINDOWDC )
{
hb_retnl( (LONG) GetWindowDC( (HWND) hb_parnl( 1 ) ) ) ;
HB_RETWH( GetWindowDC( (HWND) HB_PARWH( 1 ) ) );
}
@@ -123,12 +125,12 @@ HB_FUNC( CREATEDC )
if ( ! ISNIL( 4 ) )
lpInitData = (DEVMODE *) hb_parc( 4 ); //hb_param( 4, HB_IT_STRING)->item.asString.value ;
hb_retnl( (ULONG) CreateDC((LPCTSTR) hb_parcx( 1 ) , // pointer to string specifying driver name
HB_RETWH( CreateDC((LPCTSTR) hb_parcx( 1 ) , // pointer to string specifying driver name
(LPCTSTR) hb_parcx( 2 ) , // pointer to string specifying device name
NULL , // do not use; set to NULL
ISNIL( 4 ) ? NULL : lpInitData // pointer to optional printer data
)
) ;
);
}
@@ -144,8 +146,8 @@ HB_FUNC( RESETDC )
if ( ! ISNIL( 2 ) )
lpInitData = (DEVMODE *) hb_parc( 2 ); //hb_param( 2, HB_IT_STRING)->item.asString.value ;
hb_retnl( (LONG) ResetDCA( (HDC) hb_parnl( 1 ),
ISNIL( 2 )? NULL : lpInitData ) ) ;
HB_RETWH( ResetDCA( (HDC) HB_PARWH( 1 ),
ISNIL( 2 )? NULL : lpInitData ) );
}
@@ -162,7 +164,7 @@ HB_FUNC( GETDCORGEX )
POINT Point ;
PHB_ITEM aPt;
if ( GetDCOrgEx( (HDC) hb_parnl( 1 ), &Point ) )
if ( GetDCOrgEx( (HDC) HB_PARWH( 1 ), &Point ) )
{
aPt = Point2Array(&Point);
hb_itemReturn( aPt );
@@ -192,12 +194,12 @@ HB_FUNC( SCROLLDC )
if( Array2Rect(hb_param( 4, HB_IT_ARRAY ) , &lprcScroll ) && Array2Rect(hb_param( 5, HB_IT_ARRAY ) , &lprcClip ) )
{
if( ScrollDC( (HDC) hb_parnl( 1 ) ,
if( ScrollDC( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
&lprcScroll ,
&lprcClip ,
(HRGN) hb_parnl( 6 ),
(HRGN) HB_PARWH( 6 ),
&lprcUpdate
) )
{
@@ -210,11 +212,3 @@ HB_FUNC( SCROLLDC )
else
hb_retl(FALSE);
}

48
harbour/contrib/hbwhat32/whtdir.c
View File

@@ -10,6 +10,8 @@
#define HB_OS_WIN_32_USED
//#define _WIN32_WINNT 0x0500
#include "hbwhat.h"
#include <windows.h>
#include "hbapi.h"
@@ -19,7 +21,7 @@
HB_FUNC( GETLOGICALDRIVES )
{
hb_retnl( (LONG) GetLogicalDrives( ) ) ;
hb_retnl( (LONG) GetLogicalDrives( ) );
}
@@ -29,7 +31,7 @@ HB_FUNC( GETLOGICALDRIVES )
HB_FUNC( GETDRIVETYPE )
{
hb_retni( GetDriveType( (LPCSTR) hb_parcx( 1 ) ) ) ;
hb_retni( GetDriveType( (LPCSTR) hb_parcx( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -80,7 +82,7 @@ HB_FUNC( GETTEMPFILENAME )
(LPCSTR) hb_parcx( 2 ),
(UINT) ( ISNIL(3) ? 0 : hb_parni( 3 ) ) ,
(LPSTR) cPath
) ;
);
hb_retc( cPath);
}
@@ -106,7 +108,7 @@ HB_FUNC( GETSYSTEMWINDOWSDIRECTORY )
{
char cPath[ MAX_PATH +1 ] = {0};
GetSystemWindowsDirectory( (LPSTR) cPath, MAX_PATH ) ;
GetSystemWindowsDirectory( (LPSTR) cPath, MAX_PATH );
hb_retc( cPath );
}
@@ -120,7 +122,7 @@ HB_FUNC( GETSYSTEMWINDOWSDIRECTORY )
HB_FUNC( SETCURRENTDIRECTORY )
{
hb_retl( SetCurrentDirectory( (LPCSTR) hb_parcx( 1 ) ) ) ;
hb_retl( SetCurrentDirectory( (LPCSTR) hb_parcx( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -130,7 +132,7 @@ HB_FUNC( SETCURRENTDIRECTORY )
HB_FUNC( GETCURRENTDIRECTORY )
{
char cPath[ MAX_PATH + 1 ] = {0};
GetCurrentDirectory( MAX_PATH , (LPSTR) cPath ) ;
GetCurrentDirectory( MAX_PATH , (LPSTR) cPath );
hb_retc( cPath );
}
@@ -140,7 +142,7 @@ HB_FUNC( GETCURRENTDIRECTORY )
HB_FUNC( SETFILEATTRIBUTES )
{
hb_retl( SetFileAttributes( (LPCSTR) hb_parcx( 1 ), (DWORD) hb_parnl( 2 ) ) ) ;
hb_retl( SetFileAttributes( (LPCSTR) hb_parcx( 1 ), (DWORD) hb_parnl( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -149,7 +151,7 @@ HB_FUNC( SETFILEATTRIBUTES )
HB_FUNC( GETFILEATTRIBUTES )
{
hb_retnl( (LONG) GetFileAttributes( (LPCSTR) hb_parcx( 1 ) ) ) ;
hb_retnl( (LONG) GetFileAttributes( (LPCSTR) hb_parcx( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -158,7 +160,7 @@ HB_FUNC( GETFILEATTRIBUTES )
HB_FUNC( DELETEFILE )
{
hb_retl( DeleteFile( (LPCSTR) hb_parcx( 1 ) ) ) ;
hb_retl( DeleteFile( (LPCSTR) hb_parcx( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -167,7 +169,7 @@ HB_FUNC( DELETEFILE )
HB_FUNC( SETVOLUMELABEL )
{
hb_retl( SetVolumeLabel( (LPCSTR) hb_parcx( 1 ), (LPCSTR) hb_parcx( 2 ) ) ) ;
hb_retl( SetVolumeLabel( (LPCSTR) hb_parcx( 1 ), (LPCSTR) hb_parcx( 2 ) ) );
}
@@ -182,7 +184,7 @@ HB_FUNC( CREATEDIRECTORY )
if (ISCHAR(2))
sa = (SECURITY_ATTRIBUTES *) hb_parc( 2 ); //hb_param(2, HB_IT_STRING)->item.asString.value;
hb_retl( CreateDirectoryA( (LPCSTR) hb_parcx( 1 ), sa ) ) ;
hb_retl( CreateDirectoryA( (LPCSTR) hb_parcx( 1 ), sa ) );
}
@@ -200,7 +202,7 @@ HB_FUNC( CREATEDIRECTORYEX )
hb_retl( CreateDirectoryExA( (LPCSTR) hb_parcx( 1 ),
(LPCSTR) hb_parcx( 2 ),
lpSecurityAttributes
) ) ;
) );
}
*/
@@ -211,7 +213,7 @@ HB_FUNC( CREATEDIRECTORYEX )
HB_FUNC( REMOVEDIRECTORY )
{
hb_retl( RemoveDirectory( (LPCSTR) hb_parcx( 1 ) ) ) ;
hb_retl( RemoveDirectory( (LPCSTR) hb_parcx( 1 ) ) );
}
@@ -235,9 +237,9 @@ HB_FUNC( GETFULLPATHNAME )
(LPSTR) buffer ,
&szBuffRet
) ;
hb_retnl( dwReq ) ;
hb_storc( szBuffRet , 4 ) ;
hb_storc( buffer ,3 ) ;
hb_retnl( dwReq );
hb_storc( szBuffRet , 4 );
hb_storc( buffer ,3 );
}
@@ -294,7 +296,7 @@ HB_FUNC( GETLONGPATHNAME )
hb_retnl( (LONG) GetLongPathName( (LPCSTR) hb_parcx( 1 ),
(LPSTR) hb_parcx( 2 ) ,
(DWORD) hb_parnl( 3 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -320,7 +322,7 @@ BOOL GetVolumeInformation(
HB_FUNC( GETVOLUMEINFORMATION )
{
char *VolumeNameBuffer = (char *) hb_xgrab( MAX_PATH ) ;
char *VolumeNameBuffer = (char *) hb_xgrab( MAX_PATH );
DWORD VolumeSerialNumber ;
DWORD MaximumComponentLength ;
DWORD FileSystemFlags ;
@@ -334,12 +336,12 @@ HB_FUNC( GETVOLUMEINFORMATION )
&MaximumComponentLength ,
&FileSystemFlags ,
(LPTSTR)FileSystemNameBuffer ,
MAX_PATH ) ;
MAX_PATH );
if ( bRet )
{
if ( ISBYREF( 2 ) ) hb_storc ((char *) VolumeNameBuffer, 2 ) ;
if ( ISBYREF( 3 ) ) hb_stornl( (LONG) VolumeSerialNumber, 3 ) ;
if ( ISBYREF( 4 ) ) hb_stornl( (LONG) MaximumComponentLength, 4 ) ;
if ( ISBYREF( 2 ) ) hb_storc ((char *) VolumeNameBuffer, 2 );
if ( ISBYREF( 3 ) ) hb_stornl( (LONG) VolumeSerialNumber, 3 );
if ( ISBYREF( 4 ) ) hb_stornl( (LONG) MaximumComponentLength, 4 );
if ( ISBYREF( 5 ) ) hb_stornl( (LONG) FileSystemFlags, 5 );
if ( ISBYREF( 6 ) ) hb_storc ((char *) FileSystemNameBuffer, 6 );
}
@@ -348,5 +350,3 @@ HB_FUNC( GETVOLUMEINFORMATION )
hb_xfree( VolumeNameBuffer );
hb_xfree( FileSystemNameBuffer );
}

52
harbour/contrib/hbwhat32/whtdlg.c
View File

@@ -17,6 +17,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -32,7 +34,7 @@
HB_FUNC( ENDDIALOG )
{
EndDialog( (HWND) hb_parnl(1) , hb_parni(2) );
EndDialog( (HWND) HB_PARWH(1) , hb_parni(2) );
}
//-----------------------------------------------------------------------------
@@ -40,10 +42,10 @@ HB_FUNC( ENDDIALOG )
HB_FUNC( GETDLGITEM )
{
HWND hWnd = GetDlgItem(
(HWND) hb_parnl( 1 ), // handle of dialog box
(HWND) HB_PARWH( 1 ), // handle of dialog box
hb_parni( 2 ) // identifier of control
);
hb_retnl( (LONG) hWnd );
HB_RETWH( hWnd );
}
@@ -53,8 +55,8 @@ HB_FUNC( GETDLGITEM )
HB_FUNC( GETNEXTDLGGROUPITEM )
{
hb_retnl( (LONG) GetNextDlgGroupItem( (HWND) hb_parnl( 1 ),
(HWND) hb_parnl( 2 ),
HB_RETWH( GetNextDlgGroupItem( (HWND) HB_PARWH( 1 ),
(HWND) HB_PARWH( 2 ),
hb_parl( 3 )
) );
}
@@ -65,8 +67,8 @@ HB_FUNC( GETNEXTDLGGROUPITEM )
HB_FUNC( GETNEXTDLGTABITEM )
{
hb_retnl( (LONG) GetNextDlgTabItem( (HWND) hb_parnl( 1 ),
(HWND) hb_parnl( 2 ),
HB_RETWH( GetNextDlgTabItem( (HWND) HB_PARWH( 1 ),
(HWND) HB_PARWH( 2 ),
hb_parl( 3 )
) );
}
@@ -77,7 +79,7 @@ HB_FUNC( GETNEXTDLGTABITEM )
HB_FUNC( GETDLGCTRLID )
{
hb_retni( GetDlgCtrlID( (HWND) hb_parnl( 1 ) ) );
hb_retni( GetDlgCtrlID( (HWND) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -96,7 +98,7 @@ HB_FUNC( GETDIALOGBASEUNITS )
HB_FUNC( SETDLGITEMINT )
{
hb_retl( SetDlgItemInt( (HWND) hb_parnl( 1 ),
hb_retl( SetDlgItemInt( (HWND) HB_PARWH( 1 ),
hb_parni( 2 ) ,
(UINT) hb_parni( 3 ),
hb_parl( 4 )
@@ -109,7 +111,7 @@ HB_FUNC( SETDLGITEMINT )
HB_FUNC( SETDLGITEMTEXT )
{
SetDlgItemText(
(HWND) hb_parnl( 1 ), // handle of dialog box
(HWND) HB_PARWH( 1 ), // handle of dialog box
hb_parni( 2 ), // identifier of control
(LPCTSTR) hb_parcx( 3 ) // text to set
);
@@ -121,11 +123,11 @@ HB_FUNC( SETDLGITEMTEXT )
HB_FUNC( GETDLGITEMTEXT ) // GETDLGITMTEXT
{
USHORT iLen = ( USHORT ) SendMessage( GetDlgItem( (HWND) hb_parnl( 1 ), hb_parni( 2 ) ), WM_GETTEXTLENGTH, 0, 0 )+1 ;
USHORT iLen = ( USHORT ) SendMessage( GetDlgItem( (HWND) HB_PARWH( 1 ), hb_parni( 2 ) ), WM_GETTEXTLENGTH, 0, 0 )+1 ;
char *cText = (char*) hb_xgrab( iLen );
GetDlgItemText(
(HWND) hb_parnl( 1 ), // handle of dialog box
(HWND) HB_PARWH( 1 ), // handle of dialog box
hb_parni( 2 ), // identifier of control
(LPTSTR) cText, // address of buffer for text
iLen // maximum size of string
@@ -146,7 +148,7 @@ HB_FUNC( GETLBITEMTEXT ) // GETDLGITMTEXT
char * cText = ( char * ) hb_xgrab( iLen + 1 );
SendMessage(
(HWND) hb_parnl( 1 ), // handle of dialog box
(HWND) HB_PARWH( 1 ), // handle of dialog box
LB_GETTEXT,
(WPARAM) hb_parni( 2 ), // item number
(LPARAM) (LPCSTR) cText // address of buffer for text
@@ -162,7 +164,7 @@ HB_FUNC( GETLBITEMTEXT ) // GETDLGITMTEXT
HB_FUNC( CHECKDLGBUTTON )
{
hb_retl( CheckDlgButton(
(HWND) hb_parnl( 1 ), // handle of dialog box
(HWND) HB_PARWH( 1 ), // handle of dialog box
hb_parni( 2 ), // identifier of control
ISNUM(3) ? hb_parni(3) : (UINT) hb_parl(3) ) );
}
@@ -172,7 +174,7 @@ HB_FUNC( CHECKDLGBUTTON )
HB_FUNC( CHECKRADIOBUTTON )
{
hb_retl( CheckRadioButton(
(HWND) hb_parnl( 1 ), // handle of dialog box
(HWND) HB_PARWH( 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
@@ -184,7 +186,7 @@ HB_FUNC( CHECKRADIOBUTTON )
HB_FUNC( ISDLGBUTTONCHECKED )
{
hb_retni( IsDlgButtonChecked(
(HWND) hb_parnl( 1 ), // handle of dialog box
(HWND) HB_PARWH( 1 ), // handle of dialog box
hb_parni( 2 ) // button identifier
) );
@@ -202,7 +204,7 @@ HB_FUNC( DLGDIRLIST )
char *cText = (char*) hb_xgrab( MAX_PATH+1 );
// cText = hb_parcx(2);
hb_retni( DlgDirList( (HWND) hb_parnl( 1 ),
hb_retni( DlgDirList( (HWND) HB_PARWH( 1 ),
(LPSTR) cText ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
@@ -225,7 +227,7 @@ HB_FUNC( DLGDIRSELECTEX )
USHORT iLen = ISNIL(3) ? MAX_PATH : ( USHORT ) hb_parni( 3 );
char *cText = (char*) hb_xgrab( iLen+1 );
hb_retl( DlgDirSelectEx( (HWND) hb_parnl( 1 ),
hb_retl( DlgDirSelectEx( (HWND) HB_PARWH( 1 ),
(LPSTR) cText ,
iLen ,
hb_parni( 4 )
@@ -244,7 +246,7 @@ HB_FUNC( DLGDIRLISTCOMBOBOX )
char *cText = (char*) hb_xgrab( MAX_PATH+1 );
//cText = hb_parcx(2);
hb_retni( DlgDirListComboBox( (HWND) hb_parnl( 1 ),
hb_retni( DlgDirListComboBox( (HWND) HB_PARWH( 1 ),
(LPSTR) cText ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
@@ -265,7 +267,7 @@ HB_FUNC( DLGDIRSELECTCOMBOBOXEX )
USHORT iLen = ISNIL(3) ? MAX_PATH : ( USHORT ) hb_parni( 3 );
char *cText = (char*) hb_xgrab( iLen+1 );
hb_retl( DlgDirSelectComboBoxEx( (HWND) hb_parnl( 1 ),
hb_retl( DlgDirSelectComboBoxEx( (HWND) HB_PARWH( 1 ),
(LPSTR) cText ,
iLen ,
hb_parni( 4 )
@@ -297,7 +299,7 @@ HB_FUNC( MAPDIALOGRECT )
lpRect.right = hb_arrayGetNL( pArray , 3 );
lpRect.bottom = hb_arrayGetNL( pArray , 4 );
hb_retl( MapDialogRect( (HWND) hb_parnl( 1 ), &lpRect ) );
hb_retl( MapDialogRect( (HWND) HB_PARWH( 1 ), &lpRect ) );
hb_stornl( lpRect.left , 2 , 1 );
hb_stornl( lpRect.top , 2 , 2 );
hb_stornl( lpRect.right , 2 , 3 );
@@ -320,7 +322,7 @@ HB_FUNC( GETCOMBOBOXINFO )
{
PCOMBOBOXINFO pcbi ;
hb_retl( GetComboBoxInfo( (HWND) hb_parnl( 1 ), pcbi ) );
hb_retl( GetComboBoxInfo( (HWND) HB_PARWH( 1 ), pcbi ) );
}
*/
@@ -336,7 +338,7 @@ HB_FUNC( GETALTTABINFO )
// Your code goes here
hb_retl( GetAltTabInfo( (HWND) hb_parnl( 1 ),
hb_retl( GetAltTabInfo( (HWND) HB_PARWH( 1 ),
hb_parni( 2 ) ,
pati ,
(LPSTR) hb_parcx( 4 ),
@@ -352,7 +354,7 @@ HB_FUNC( GETALTTABINFO )
/*
HB_FUNC( GETLISTBOXINFO )
{
hb_retnl( (LONG) GetListBoxInfo( (HWND) hb_parnl( 1 ) ) );
hb_retnl( (LONG) GetListBoxInfo( (HWND) HB_PARWH( 1 ) ) );
}
*/
@@ -360,7 +362,7 @@ HB_FUNC( GETLISTBOXINFO )
{
HINSTANCE h = LoadLibraryEx( "user32.dll", NULL, 0);
DWORD dwGLIRet = 0 ;
HWND hWnd = (HWND) hb_parnl( 1 );
HWND hWnd = (HWND) HB_PARWH( 1 );
if( h ){
typedef DWORD (WINAPI *xdwGetListBoxInfo)( HWND hWnd );

23
harbour/contrib/hbwhat32/whtdll.c
View File

@@ -8,6 +8,8 @@
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
@@ -41,7 +43,7 @@
HB_FUNC( LOADLIBRARY )
{
hb_retnl( (LONG) LoadLibraryA( (LPCSTR) hb_parcx( 1 ) ) );
HB_RETWH( LoadLibraryA( (LPCSTR) hb_parcx( 1 ) ) );
}
*/
//-----------------------------------------------------------------------------
@@ -50,8 +52,8 @@ HB_FUNC( LOADLIBRARY )
HB_FUNC( LOADLIBRARYEX )
{
hb_retnl( (LONG) LoadLibraryExA( (LPCSTR) hb_parcx( 1 ) ,
(HANDLE) hb_parnl( 2 ),
HB_RETWH( LoadLibraryExA( (LPCSTR) hb_parcx( 1 ) ,
(HANDLE) HB_PARWH( 2 ),
(DWORD) hb_parnl( 3 )
) );
}
@@ -63,7 +65,7 @@ HB_FUNC( LOADLIBRARYEX )
HB_FUNC( FREELIBRARY )
{
hb_retl( FreeLibrary( (HMODULE) hb_parnl( 1 ) ) );
hb_retl( FreeLibrary( (HMODULE) HB_PARWH( 1 ) ) );
}
*/
@@ -73,7 +75,7 @@ HB_FUNC( FREELIBRARY )
HB_FUNC( FREELIBRARYANDEXITTHREAD )
{
FreeLibraryAndExitThread( (HMODULE) hb_parnl( 1 ),
FreeLibraryAndExitThread( (HMODULE) HB_PARWH( 1 ),
(DWORD) hb_parnl( 2 )
);
}
@@ -86,7 +88,7 @@ HB_FUNC( GETPROCADDRESS )
ULONG dwProcAddr;
char cFuncName[ MAX_PATH + 1 ];
if ((dwProcAddr = (ULONG) GetProcAddress( (HMODULE) hb_parnl(1),
if ((dwProcAddr = (ULONG) GetProcAddress( (HMODULE) HB_PARWH(1),
ISCHAR( 2 ) ? (LPCSTR) hb_parcx(2) :
(LPCSTR) MAKELONG((WORD) hb_parni(2), 0) ) ) == 0 )
{
@@ -95,7 +97,7 @@ HB_FUNC( GETPROCADDRESS )
// try forced ANSI flavour ?
hb_strncpy( cFuncName, hb_parcx( 2 ), sizeof( cFuncName ) - 2 );
hb_strncat( cFuncName, "A", sizeof( cFuncName ) - 1 );
dwProcAddr = (ULONG) GetProcAddress((HMODULE) hb_parnl(1), cFuncName);
dwProcAddr = (ULONG) GetProcAddress((HMODULE) HB_PARWH(1), cFuncName);
}
}
@@ -259,8 +261,8 @@ HB_FUNC( CALLDLL )
int Flags;
double DblParms[15];
DYNAPARM Parm[15];
HINSTANCE hInst = (HINSTANCE) hb_parnl( 1 );
DWORD lpFunction = (DWORD) hb_parnl( 2 );
HINSTANCE hInst = (HINSTANCE) HB_PARWH( 1 );
DWORD lpFunction = (DWORD) HB_PARWH( 2 );
RESULT rc;
if ( hInst == NULL )
@@ -437,6 +439,3 @@ HB_FUNC( CALLDLL )
break;
}
}

200
harbour/contrib/hbwhat32/whtdraw.c
View File

@@ -8,6 +8,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include "hbapiitm.h"
#include "hbapi.h"
@@ -26,7 +28,7 @@ HB_FUNC( MOVETO )
{
hb_retl( MoveToEx(
(HDC) hb_parnl(1), // device context handle
(HDC) HB_PARWH(1), // device context handle
hb_parni(2) , // x-coordinate of line's ending point
hb_parni(3) , // y-coordinate of line's ending point
NULL
@@ -47,7 +49,7 @@ HB_FUNC( MOVETOEX )
if ( MoveToEx(
(HDC) hb_parnl(1), // device context handle
(HDC) HB_PARWH(1), // device context handle
hb_parni(2) , // x-coordinate of line's ending point
hb_parni(3) , // y-coordinate of line's ending point
&Point
@@ -55,7 +57,7 @@ HB_FUNC( MOVETOEX )
{
aPt = Point2Array(&Point) ;
aPt = Point2Array(&Point);
hb_itemReturn( aPt );
hb_itemRelease( aPt );
@@ -75,9 +77,9 @@ HB_FUNC( GETCURRENTPOSITIONEX )
POINT pt ;
PHB_ITEM aPt;
if ( GetCurrentPositionEx( (HDC) hb_parnl( 1 ), &pt ) )
if ( GetCurrentPositionEx( (HDC) HB_PARWH( 1 ), &pt ) )
{
aPt = Point2Array( &pt) ;
aPt = Point2Array( &pt);
hb_itemReturn( aPt );
hb_itemRelease( aPt );
@@ -90,7 +92,7 @@ HB_FUNC( GETCURRENTPOSITIONEX )
HB_FUNC( GETPIXELFORMAT )
{
hb_retni( GetPixelFormat( (HDC) hb_parnl( 1 ) ) ) ;
hb_retni( GetPixelFormat( (HDC) HB_PARWH( 1 ) ) );
}
@@ -103,10 +105,10 @@ HB_FUNC( SETPIXELFORMAT )
{
PIXELFORMATDESCRIPTOR *pfd = (PIXELFORMATDESCRIPTOR * ) hb_parc( 3 ); //hb_param( 3, HB_IT_STRING )->item.asString.value;
hb_retl( SetPixelFormat( (HDC) hb_parnl( 1 ) ,
hb_retl( SetPixelFormat( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
pfd
) ) ;
) );
}
@@ -123,13 +125,13 @@ HB_FUNC( DESCRIBEPIXELFORMAT )
PIXELFORMATDESCRIPTOR pfd ;
UINT nBytes = sizeof(pfd);
hb_retni( DescribePixelFormat( (HDC) hb_parnl( 1 ) ,
hb_retni( DescribePixelFormat( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
nBytes ,
&pfd
) ) ;
) );
if ( ISBYREF(3) )
hb_storclen( (char*) &pfd, sizeof(PIXELFORMATDESCRIPTOR), 3 ) ;
hb_storclen( (char*) &pfd, sizeof(PIXELFORMATDESCRIPTOR), 3 );
//hb_itemPutCRaw( hb_param( -1, HB_IT_ANY ), (char *) pfd , sizeof( PIXELFORMATDESCRIPTOR ) );
}
@@ -142,11 +144,11 @@ HB_FUNC( DESCRIBEPIXELFORMAT )
HB_FUNC( SETPIXEL )
{
hb_retnl( (ULONG) SetPixel( (HDC) hb_parnl( 1 ),
hb_retnl( (ULONG) SetPixel( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
(COLORREF) hb_parnl( 4 )
) ) ;
) );
}
@@ -156,7 +158,7 @@ HB_FUNC( SETPIXEL )
HB_FUNC( GETPIXEL )
{
hb_retnl( (ULONG) GetPixel( (HDC) hb_parnl( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) ) ;
hb_retnl( (ULONG) GetPixel( (HDC) HB_PARWH( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) );
}
@@ -166,11 +168,11 @@ HB_FUNC( GETPIXEL )
HB_FUNC( SETPIXELV )
{
hb_retl( SetPixelV( (HDC) hb_parnl( 1 ),
hb_retl( SetPixelV( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
(COLORREF) hb_parnl( 4 )
) ) ;
) );
}
@@ -186,7 +188,7 @@ HB_FUNC( SETPIXELV )
HB_FUNC( LINETO )
{
hb_retl( LineTo( (HDC) hb_parnl( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) ) ;
hb_retl( LineTo( (HDC) HB_PARWH( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) );
}
@@ -210,7 +212,7 @@ HB_FUNC( LINEDDA )
hb_parni( 4 ),
LineddaProc ,
lParam
) ) ;
) );
}
*/
@@ -223,7 +225,7 @@ HB_FUNC( LINEDDA )
HB_FUNC( GETARCDIRECTION )
{
hb_retni( GetArcDirection( (HDC) hb_parnl( 1 ) ) ) ;
hb_retni( GetArcDirection( (HDC) HB_PARWH( 1 ) ) );
}
@@ -235,7 +237,7 @@ HB_FUNC( GETARCDIRECTION )
HB_FUNC( SETARCDIRECTION )
{
hb_retni( SetArcDirection( (HDC) hb_parnl( 1 ), hb_parni( 2 ) ) ) ;
hb_retni( SetArcDirection( (HDC) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
@@ -246,7 +248,7 @@ HB_FUNC( SETARCDIRECTION )
HB_FUNC( ARC )
{
hb_retl( Arc( (HDC) hb_parnl( 1 ),
hb_retl( Arc( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
@@ -255,7 +257,7 @@ HB_FUNC( ARC )
hb_parni( 7 ) ,
hb_parni( 8 ) ,
hb_parni( 9 )
) ) ;
) );
}
@@ -269,7 +271,7 @@ HB_FUNC( ARC )
HB_FUNC( ARCTO )
{
hb_retl( ArcTo( (HDC) hb_parnl( 1 ),
hb_retl( ArcTo( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
@@ -278,7 +280,7 @@ HB_FUNC( ARCTO )
hb_parni( 7 ) ,
hb_parni( 8 ) ,
hb_parni( 9 )
) ) ;
) );
}
*/
@@ -301,8 +303,8 @@ HB_FUNC( POLYLINE )
if (ISARRAY( 2 ) )
{
iCount = (DWORD) hb_parinfa( 2, 0 ) ;
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) ) ;
iCount = (DWORD) hb_parinfa( 2, 0 );
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) );
aParam = hb_param(2,HB_IT_ARRAY);
for ( i = 0 ; i<iCount ; i++ )
@@ -323,7 +325,7 @@ HB_FUNC( POLYLINE )
}
}
hb_retl( Polyline( (HDC) hb_parnl( 1 ), Point, iCount ) ) ;
hb_retl( Polyline( (HDC) HB_PARWH( 1 ), Point, iCount ) );
hb_xfree(Point);
}
@@ -349,8 +351,8 @@ HB_FUNC( POLYLINETO )
if (ISARRAY( 2 ) )
{
iCount = (DWORD) hb_parinfa( 2, 0 ) ;
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) ) ;
iCount = (DWORD) hb_parinfa( 2, 0 );
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) );
aParam = hb_param(2,HB_IT_ARRAY);
for ( i = 0 ; i<iCount ; i++ )
@@ -371,7 +373,7 @@ HB_FUNC( POLYLINETO )
}
}
hb_retl( PolylineTo( (HDC) hb_parnl( 1 ), Point, iCount ) ) ;
hb_retl( PolylineTo( (HDC) HB_PARWH( 1 ), Point, iCount ) );
hb_xfree(Point);
}
@@ -400,16 +402,16 @@ HB_FUNC( POLYPOLYLINE )
if (ISARRAY( 2 ) && ISARRAY( 3 ) )
{
iPolyCount = hb_parinfa(3,0) ;
PolyPoints = (DWORD *) hb_xgrab( iPolyCount * sizeof( DWORD ) ) ;
iPolyCount = hb_parinfa(3,0);
PolyPoints = (DWORD *) hb_xgrab( iPolyCount * sizeof( DWORD ) );
for ( i=0 ; i < iPolyCount ; i++ )
{
*(PolyPoints+i) = hb_parnl( 3,i+1) ;
*(PolyPoints+i) = hb_parnl( 3,i+1);
}
iCount = hb_parinfa( 2, 0 ) ;
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) ) ;
iCount = hb_parinfa( 2, 0 );
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) );
aParam = hb_param(2,HB_IT_ARRAY);
for ( i = 0 ; i<iCount ; i++ )
@@ -432,7 +434,7 @@ HB_FUNC( POLYPOLYLINE )
}
}
hb_retl( PolyPolyline( (HDC) hb_parnl( 1 ), Point, PolyPoints, iPolyCount ) ) ;
hb_retl( PolyPolyline( (HDC) HB_PARWH( 1 ), Point, PolyPoints, iPolyCount ) );
hb_xfree(PolyPoints);
hb_xfree(Point);
@@ -469,10 +471,10 @@ HB_FUNC( POLYDRAW )
if (ISARRAY( 2 ) && ISCHAR( 3 ) )
{
iCount = hb_parinfa( 2, 0 ) ;
iCount = hb_parinfa( 2, 0 );
if ( iCount == hb_parclen( 3 ) )
{
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) ) ;
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) );
aParam = hb_param(2,HB_IT_ARRAY);
for ( i = 0 ; i<iCount ; i++ )
@@ -494,8 +496,8 @@ HB_FUNC( POLYDRAW )
}
}
hb_retl( PolyPolyline( (HDC) hb_parnl( 1 ), Point, PolyPoints, iPolyCount ) ) ;
hb_retl( PolyDraw( (HDC) hb_parnl( 1 ), Point, hb_parcx( 3 ) , iCount ) ) ;
hb_retl( PolyPolyline( (HDC) HB_PARWH( 1 ), Point, PolyPoints, iPolyCount ) );
hb_retl( PolyDraw( (HDC) HB_PARWH( 1 ), Point, hb_parcx( 3 ) , iCount ) );
hb_xfree(PolyPoints);
hb_xfree(Point);
}
@@ -528,8 +530,8 @@ HB_FUNC( POLYBEZIER )
if (ISARRAY( 2 ) )
{
iCount = (DWORD) hb_parinfa( 2, 0 ) ;
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) ) ;
iCount = (DWORD) hb_parinfa( 2, 0 );
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) );
aParam = hb_param(2,HB_IT_ARRAY);
for ( i = 0 ; i<iCount ; i++ )
@@ -550,7 +552,7 @@ HB_FUNC( POLYBEZIER )
}
}
hb_retl( PolyBezier( (HDC) hb_parnl( 1 ), Point, iCount ) ) ;
hb_retl( PolyBezier( (HDC) HB_PARWH( 1 ), Point, iCount ) );
hb_xfree(Point);
}
@@ -578,8 +580,8 @@ HB_FUNC( POLYBEZIERTO )
if (ISARRAY( 2 ) )
{
iCount = (DWORD) hb_parinfa( 2, 0 ) ;
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) ) ;
iCount = (DWORD) hb_parinfa( 2, 0 );
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) );
aParam = hb_param(2,HB_IT_ARRAY);
for ( i = 0 ; i<iCount ; i++ )
@@ -600,7 +602,7 @@ HB_FUNC( POLYBEZIERTO )
}
}
hb_retl( PolyBezierTo( (HDC) hb_parnl( 1 ), Point, iCount ) ) ;
hb_retl( PolyBezierTo( (HDC) HB_PARWH( 1 ), Point, iCount ) );
hb_xfree(Point);
}
@@ -625,12 +627,12 @@ HB_FUNC( POLYBEZIERTO )
HB_FUNC( RECTANGLE )
{
hb_retl( Rectangle( (HDC) hb_parnl( 1 ),
hb_retl( Rectangle( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 )
) ) ;
) );
}
@@ -640,14 +642,14 @@ HB_FUNC( RECTANGLE )
HB_FUNC( ROUNDRECT )
{
hb_retl( RoundRect( (HDC) hb_parnl( 1 ),
hb_retl( RoundRect( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 ) ,
hb_parni( 6 ) ,
hb_parni( 7 )
) ) ;
) );
}
@@ -659,7 +661,7 @@ HB_FUNC( ROUNDRECT )
HB_FUNC( CHORD )
{
hb_retl( Chord( (HDC) hb_parnl( 1 ),
hb_retl( Chord( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
@@ -668,7 +670,7 @@ HB_FUNC( CHORD )
hb_parni( 7 ) ,
hb_parni( 8 ) ,
hb_parni( 9 )
) ) ;
) );
}
@@ -678,7 +680,7 @@ HB_FUNC( CHORD )
HB_FUNC( PIE )
{
hb_retl( Pie( (HDC) hb_parnl( 1 ),
hb_retl( Pie( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
@@ -687,7 +689,7 @@ HB_FUNC( PIE )
hb_parni( 7 ) ,
hb_parni( 8 ) ,
hb_parni( 9 )
) ) ;
) );
}
@@ -697,12 +699,12 @@ HB_FUNC( PIE )
HB_FUNC( ELLIPSE )
{
hb_retl( Ellipse( (HDC) hb_parnl( 1 ),
hb_retl( Ellipse( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 )
) ) ;
) );
}
@@ -726,8 +728,8 @@ HB_FUNC( POLYGON )
if (ISARRAY( 2 ) )
{
iCount = (int) hb_parinfa( 2, 0 ) ;
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) ) ;
iCount = (int) hb_parinfa( 2, 0 );
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) );
aParam = hb_param(2,HB_IT_ARRAY);
for ( i = 0 ; i<iCount ; i++ )
@@ -748,7 +750,7 @@ HB_FUNC( POLYGON )
}
}
hb_retl( Polygon( (HDC) hb_parnl( 1 ), Point, iCount ) ) ;
hb_retl( Polygon( (HDC) HB_PARWH( 1 ), Point, iCount ) );
hb_xfree(Point);
}
@@ -777,16 +779,16 @@ HB_FUNC( POLYPOLYGON )
if (ISARRAY( 2 ) && ISARRAY( 3 ) )
{
iPolyCount = hb_parinfa(3,0) ;
PolyPoints = ( INT *) hb_xgrab( iPolyCount * sizeof( INT ) ) ;
iPolyCount = hb_parinfa(3,0);
PolyPoints = ( INT *) hb_xgrab( iPolyCount * sizeof( INT ) );
for ( i=0 ; i < iPolyCount ; i++ )
{
*(PolyPoints+i) = hb_parni( 3,i+1) ;
*(PolyPoints+i) = hb_parni( 3,i+1);
}
iCount = hb_parinfa( 2, 0 ) ;
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) ) ;
iCount = hb_parinfa( 2, 0 );
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) );
aParam = hb_param(2,HB_IT_ARRAY);
for ( i = 0 ; i<iCount ; i++ )
@@ -808,7 +810,7 @@ HB_FUNC( POLYPOLYGON )
}
}
hb_retl( PolyPolygon( (HDC) hb_parnl( 1 ), Point, PolyPoints, iPolyCount ) ) ;
hb_retl( PolyPolygon( (HDC) HB_PARWH( 1 ), Point, PolyPoints, iPolyCount ) );
hb_xfree(PolyPoints);
hb_xfree(Point);
@@ -831,7 +833,7 @@ HB_FUNC( FILLRECT )
RECT rc ;
if ( ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc ))
hb_retni( FillRect((HDC) hb_parnl( 1 ), &rc, (HBRUSH) hb_parnl( 3 ) ) ) ;
hb_retni( FillRect((HDC) HB_PARWH( 1 ), &rc, (HBRUSH) HB_PARWH( 3 ) ) );
else
hb_retni(0);
@@ -851,7 +853,7 @@ HB_FUNC( FRAMERECT )
RECT rc ;
if ( ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc ))
hb_retni( FrameRect((HDC) hb_parnl( 1 ), &rc, (HBRUSH) hb_parnl( 3 ) ) ) ;
hb_retni( FrameRect((HDC) HB_PARWH( 1 ), &rc, (HBRUSH) HB_PARWH( 3 ) ) );
else
hb_retni(0);
}
@@ -868,7 +870,7 @@ HB_FUNC( INVERTRECT )
RECT rc ;
if ( ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc ))
hb_retni( InvertRect((HDC) hb_parnl( 1 ), &rc ) ) ;
hb_retni( InvertRect((HDC) HB_PARWH( 1 ), &rc ) );
else
hb_retni(0);
}
@@ -885,7 +887,7 @@ HB_FUNC( INVERTRECT )
HB_FUNC( SETPOLYFILLMODE )
{
hb_retni( SetPolyFillMode( (HDC) hb_parnl( 1 ), hb_parni( 2 ) ) ) ;
hb_retni( SetPolyFillMode( (HDC) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
@@ -896,12 +898,12 @@ HB_FUNC( SETPOLYFILLMODE )
HB_FUNC( EXTFLOODFILL )
{
hb_retl( ExtFloodFill( (HDC) hb_parnl( 1 ) ,
hb_retl( ExtFloodFill( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
(COLORREF) hb_parnl( 4 ) ,
(UINT) hb_parni( 5 )
) ) ;
) );
}
@@ -911,7 +913,7 @@ HB_FUNC( EXTFLOODFILL )
HB_FUNC( FILLPATH )
{
hb_retl( FillPath( (HDC) hb_parnl( 1 ) ) ) ;
hb_retl( FillPath( (HDC) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -920,7 +922,7 @@ HB_FUNC( FILLPATH )
HB_FUNC( FLATTENPATH )
{
hb_retl( FlattenPath( (HDC) hb_parnl( 1 ) ) ) ;
hb_retl( FlattenPath( (HDC) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -929,11 +931,11 @@ HB_FUNC( FLATTENPATH )
HB_FUNC( FLOODFILL )
{
hb_retl( FloodFill( (HDC) hb_parnl( 1 ),
hb_retl( FloodFill( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
(COLORREF) hb_parnl( 4 )
) ) ;
) );
}
@@ -943,7 +945,7 @@ HB_FUNC( FLOODFILL )
HB_FUNC( GETPOLYFILLMODE )
{
hb_retni( GetPolyFillMode( (HDC) hb_parnl( 1 ) ) ) ;
hb_retni( GetPolyFillMode( (HDC) HB_PARWH( 1 ) ) );
}
@@ -962,56 +964,14 @@ HB_FUNC( GRADIENTFILL )
// Your code goes here
hb_retl( GradientFill( (HDC) hb_parnl( 1 ) ,
hb_retl( GradientFill( (HDC) HB_PARWH( 1 ) ,
tve ,
(ULONG) hb_parnl( 3 ),
pVoid ,
(ULONG) hb_parnl( 5 ),
(ULONG) hb_parnl( 6 )
) ) ;
) );
}
*/

61
harbour/contrib/hbwhat32/whtfont.c
View File

@@ -12,6 +12,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include "hbapiitm.h"
#include "hbapi.h"
@@ -37,7 +39,7 @@ HB_FUNC( CREATEFONT )
if ( ISARRAY(1))
{
hb_retnl( (LONG) CreateFont( hb_parni( 1, 1 ) , // nHeight
HB_RETWH( CreateFont( hb_parni( 1, 1 ) , // nHeight
hb_parni( 1, 2 ) , // nWidth
hb_parni( 1, 3 ) , // nEscapement
hb_parni( 1, 4 ) , // nOrientation
@@ -51,12 +53,12 @@ HB_FUNC( CREATEFONT )
(DWORD) hb_parnl( 1, 12 ), // fdwQuality
(DWORD) hb_parnl( 1, 13 ), // fdwPitchAndFamily
(LPCSTR) hb_parcx( 1, 14 ) // lpszFace
) ) ;
) );
}
else
{
hb_retnl( (LONG) CreateFont( ISNIL(1) ? 0 : hb_parni( 1 ) , // nHeight
HB_RETWH( CreateFont( ISNIL(1) ? 0 : hb_parni( 1 ) , // nHeight
ISNIL(2) ? 0 : hb_parni( 2 ) , // nWidth
ISNIL(3) ? 0 : hb_parni( 3 ) , // nEscapement
ISNIL(4) ? 0 : hb_parni( 4 ) , // nOrientation
@@ -70,7 +72,7 @@ HB_FUNC( CREATEFONT )
(DWORD) hb_parnl( 12 ), // fdwQuality
(DWORD) hb_parnl( 13 ), // fdwPitchAndFamily
(LPCSTR) hb_parcx( 14 ) // lpszFace
) ) ;
) );
}
@@ -81,7 +83,7 @@ HB_FUNC( CREATEFONT )
HB_FUNC( ADDFONTRESOURCE )
{
hb_retni( AddFontResource( (LPCSTR) hb_parcx( 1 ) ) ) ;
hb_retni( AddFontResource( (LPCSTR) hb_parcx( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -91,7 +93,7 @@ HB_FUNC( CREATEFONTINDIRECT )
{
LOGFONT *lf = (LOGFONT * ) hb_parc( 1 ); //hb_param( 1, HB_IT_STRING )->item.asString.value;
hb_retnl( (LONG) CreateFontIndirect( lf ) ) ;
HB_RETWH( CreateFontIndirect( lf ) );
}
//-----------------------------------------------------------------------------
@@ -107,7 +109,7 @@ HB_FUNC( CREATEFONTINDIRECTEX )
// Your code goes here
hb_retnl( (LONG) CreateFontIndirectEx( &ENUMLOGFONTEXDVA ) ) ;
HB_RETWH( CreateFontIndirectEx( &ENUMLOGFONTEXDVA ) );
}
*/
@@ -122,7 +124,7 @@ HB_FUNC( CREATESCALABLEFONTRESOURCE )
(LPCSTR) hb_parcx( 2 ),
(LPCSTR) hb_parcx( 3 ),
(LPCSTR) hb_parcx( 4 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -138,14 +140,14 @@ HB_FUNC( ENUMFONTFAMILIES )
if ( ISBLOCK( 3 ) )
{
lParam = (LPARAM) (PHB_ITEM ) hb_param( 3, HB_IT_BLOCK ) ;
lParam = (LPARAM) (PHB_ITEM ) hb_param( 3, HB_IT_BLOCK );
hb_retni( EnumFontFamilies( (HDC) hb_parnl( 1 ) ,
hb_retni( EnumFontFamilies( (HDC) HB_PARWH( 1 ) ,
(LPCSTR) hb_parcx( 2 ),
(FONTENUMPROC) GenericCallblockProc ,
lParam
) ) ;
) );
}
else
OutputDebugString("EnumFontFamilies(): No codeblock");
@@ -168,16 +170,16 @@ HB_FUNC( ENUMFONTFAMILIESEX )
if ( ISBLOCK( 3 ) )
{
lParam = (LPARAM) (PHB_ITEM ) hb_param( 3, HB_IT_BLOCK ) ;
lParam = (LPARAM) (PHB_ITEM ) hb_param( 3, HB_IT_BLOCK );
hb_retni( EnumFontFamiliesEx( (HDC) hb_parnl( 1 ) ,
hb_retni( EnumFontFamiliesEx( (HDC) HB_PARWH( 1 ) ,
LogFont ,
(FONTENUMPROC) GenericCallblockProc ,
lParam ,
0
) ) ;
) );
}
else
@@ -201,13 +203,13 @@ HB_FUNC( ENUMFONTS )
if ( ISBLOCK( 3 ) )
{
lParam = (LPARAM) (PHB_ITEM ) hb_param( 3, HB_IT_BLOCK ) ;
lParam = (LPARAM) (PHB_ITEM ) hb_param( 3, HB_IT_BLOCK );
hb_retni( EnumFonts( (HDC) hb_parnl( 1 ) ,
hb_retni( EnumFonts( (HDC) HB_PARWH( 1 ) ,
(LPCSTR) hb_parcx( 2 ),
(FONTENUMPROC) GenericCallblockProc ,
lParam
) ) ;
) );
}
else
OutputDebugString("EnumFonts(): No codeblock");
@@ -301,19 +303,19 @@ HB_FUNC( GETFONTDATA )
if ( ! ISNIL( 5 ) && ( hb_parnl( 5 ) > 0 ) )
cBuffer = (char *) hb_xgrab( hb_parnl(5));
dwRet = GetFontData( (HDC) hb_parnl( 1 ) ,
dwRet = GetFontData( (HDC) HB_PARWH( 1 ) ,
(DWORD) hb_parnl( 2 ),
(DWORD) hb_parnl( 3 ),
( ISNIL( 5 ) || ( hb_parnl( 5 ) <= 0 ) ) ? NULL :cBuffer ,
(DWORD) ISNIL( 5 ) ? 0 : hb_parnl( 5 )
) ;
);
hb_retnl( (LONG) dwRet ) ;
hb_retnl( (LONG) dwRet );
if ( ! ISNIL( 5 ) && ( hb_parnl( 5 ) > 0 ) )
{
hb_storclen(cBuffer, dwRet, 4 ) ;
hb_xfree( cBuffer ) ;
hb_storclen(cBuffer, dwRet, 4 );
hb_xfree( cBuffer );
}
}
@@ -325,7 +327,7 @@ HB_FUNC( GETFONTDATA )
HB_FUNC( GETFONTLANGUAGEINFO )
{
hb_retnl( (LONG) GetFontLanguageInfo( (HDC) hb_parnl( 1 ) ) ) ;
hb_retnl( (LONG) GetFontLanguageInfo( (HDC) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -341,7 +343,7 @@ HB_FUNC( GETFONTUNICODERANGES )
// Your code goes here
hb_retnl( (LONG) GetFontUnicodeRanges( (HDC) hb_parnl( 1 ), lpglyphSet ) ) ;
hb_retnl( (LONG) GetFontUnicodeRanges( (HDC) HB_PARWH( 1 ), lpglyphSet ) );
}
*/
@@ -365,7 +367,7 @@ HB_FUNC( ADDFONTMEMRESOURCEEX )
(DWORD) hb_parnl( 2 ),
pVoid2 ,
(DWORD) hb_parnl( 4 )
) ) ;
) );
}
*/
@@ -386,7 +388,7 @@ HB_FUNC( ADDFONTRESOURCEEXA )
hb_retni( AddFontResourceExA( (LPCSTR) hb_parcx( 1 ),
(DWORD) hb_parnl( 2 ),
pVoid
) ) ;
) );
}
*/
@@ -399,7 +401,7 @@ HB_FUNC( ADDFONTRESOURCEEXA )
/*
HB_FUNC( REMOVEFONTMEMRESOURCEEX )
{
hb_retl( RemoveFontMemResourceExA( (HANDLE) hb_parnl( 1 ) ) ) ;
hb_retl( RemoveFontMemResourceExA( (HANDLE) HB_PARWH( 1 ) ) );
}
*/
@@ -410,7 +412,7 @@ HB_FUNC( REMOVEFONTMEMRESOURCEEX )
HB_FUNC( REMOVEFONTRESOURCE )
{
hb_retl( RemoveFontResource( (LPCSTR) hb_parcx( 1 ) ) ) ;
hb_retl( RemoveFontResource( (LPCSTR) hb_parcx( 1 ) ) );
}
@@ -431,8 +433,7 @@ HB_FUNC( REMOVEFONTRESOURCEEXA )
hb_retl( RemoveFontResourceExA( (LPCSTR) hb_parcx( 1 ),
(DWORD) hb_parnl( 2 ),
pVoid
) ) ;
) );
}
*/

175
harbour/contrib/hbwhat32/whtgdi.c
View File

@@ -18,6 +18,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
//#include <shlobj.h>
#include <windows.h>
#include "hbapiitm.h"
@@ -57,7 +59,7 @@ HB_FUNC( GETGVALUE )
}
//-----------------------------------------------------------------------------
// BYTE GetBValue( WORD rgb ) ;
// BYTE GetBValue( WORD rgb );
HB_FUNC( GETBVALUE )
{
@@ -79,7 +81,7 @@ HB_FUNC( GETRVALUE )
HB_FUNC( SETTEXTCOLOR )
{
hb_retnl( (ULONG) SetTextColor( (HDC) hb_parnl( 1 ), (COLORREF) hb_parnl(2) ) ) ;
hb_retnl( (ULONG) SetTextColor( (HDC) HB_PARWH( 1 ), (COLORREF) hb_parnl(2) ) );
}
@@ -90,7 +92,7 @@ HB_FUNC( SETTEXTCOLOR )
HB_FUNC( GETTEXTCOLOR )
{
hb_retnl((ULONG) GetTextColor( (HDC) hb_parnl( 1 ) ) ) ;
hb_retnl((ULONG) GetTextColor( (HDC) HB_PARWH( 1 ) ) );
}
@@ -101,7 +103,7 @@ HB_FUNC( GETTEXTCOLOR )
HB_FUNC( GETBKCOLOR )
{
hb_retnl( (ULONG) GetBkColor( (HDC) hb_parnl( 1 ) ) ) ;
hb_retnl( (ULONG) GetBkColor( (HDC) HB_PARWH( 1 ) ) );
}
@@ -112,7 +114,7 @@ HB_FUNC( GETBKCOLOR )
HB_FUNC( SETBKCOLOR )
{
hb_retnl( (ULONG) SetBkColor( (HDC) hb_parnl( 1 ), (COLORREF) hb_parnl(2) ) ) ;
hb_retnl( (ULONG) SetBkColor( (HDC) HB_PARWH( 1 ), (COLORREF) hb_parnl(2) ) );
}
//-----------------------------------------------------------------------------
@@ -121,7 +123,7 @@ HB_FUNC( SETBKCOLOR )
HB_FUNC( UPDATECOLORS )
{
hb_retl( UpdateColors( (HDC) hb_parnl( 1 ) ) ) ;
hb_retl( UpdateColors( (HDC) HB_PARWH( 1 ) ) );
}
@@ -137,7 +139,7 @@ HB_FUNC( UPDATECOLORS )
HB_FUNC( GETSTOCKOBJECT )
{
hb_retnl( (LONG) GetStockObject( hb_parni( 1 ) ) ) ;
HB_RETWH( GetStockObject( hb_parni( 1 ) ) );
}
@@ -148,7 +150,7 @@ HB_FUNC( GETSTOCKOBJECT )
HB_FUNC( SELECTOBJECT )
{
hb_retnl( (LONG) SelectObject( (HDC) hb_parnl( 1 ), (HGDIOBJ) hb_parnl( 2 ) ) ) ;
HB_RETWH( SelectObject( (HDC) HB_PARWH( 1 ), (HGDIOBJ) HB_PARWH( 2 ) ) );
}
@@ -159,7 +161,7 @@ HB_FUNC( SELECTOBJECT )
HB_FUNC( DELETEOBJECT )
{
hb_retl( DeleteObject( (HGDIOBJ) hb_parnl( 1 ) ) ) ;
hb_retl( DeleteObject( (HGDIOBJ) HB_PARWH( 1 ) ) );
}
@@ -169,7 +171,7 @@ HB_FUNC( DELETEOBJECT )
HB_FUNC( UNREALIZEOBJECT )
{
hb_retl( UnrealizeObject( (HGDIOBJ) hb_parnl( 1 ) ) ) ;
hb_retl( UnrealizeObject( (HGDIOBJ) HB_PARWH( 1 ) ) );
}
@@ -181,7 +183,7 @@ HB_FUNC( UNREALIZEOBJECT )
HB_FUNC( GETOBJECTTYPE )
{
hb_retnl( (LONG) GetObjectType( (HGDIOBJ) hb_parnl( 1 ) ) ) ;
hb_retnl( ( long ) GetObjectType( (HGDIOBJ) HB_PARWH( 1 ) ) );
}
@@ -192,7 +194,7 @@ HB_FUNC( GETOBJECTTYPE )
HB_FUNC( GETCURRENTOBJECT )
{
hb_retnl( (LONG) GetCurrentObject( (HDC) hb_parnl( 1 ), (UINT) hb_parni( 2 ) ) ) ;
HB_RETWH( GetCurrentObject( (HDC) HB_PARWH( 1 ), (UINT) hb_parni( 2 ) ) );
}
@@ -205,12 +207,12 @@ HB_FUNC( GETCURRENTOBJECT )
HB_FUNC( GETOBJECT )
{
int nBytes = GetObject( (HGDIOBJ) hb_parnl( 1 ), 0, NULL );
LPVOID lpObj = (VOID *) hb_xgrab(nBytes) ;
int nBytes = GetObject( (HGDIOBJ) HB_PARWH( 1 ), 0, NULL );
LPVOID lpObj = (VOID *) hb_xgrab(nBytes);
nBytes = GetObject( (HGDIOBJ) hb_parnl( 1 ), nBytes, lpObj ) ;
nBytes = GetObject( (HGDIOBJ) HB_PARWH( 1 ), nBytes, lpObj ) ;
hb_retclen( (char *) lpObj,nBytes) ;
hb_retclen( (char *) lpObj,nBytes);
hb_xfree(lpObj);
}
@@ -228,11 +230,11 @@ HB_FUNC( ENUMOBJECTS )
// Your code goes here
hb_retni( EnumObjects( (HDC) hb_parnl( 1 ),
hb_retni( EnumObjects( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
gObjEnumProc ,
lpVoid
) ) ;
) );
}
*/
@@ -247,7 +249,7 @@ HB_FUNC( ENUMOBJECTS )
HB_FUNC( GETMAPMODE )
{
hb_retni( GetMapMode( (HDC) hb_parnl( 1 ) ) ) ;
hb_retni( GetMapMode( (HDC) HB_PARWH( 1 ) ) );
}
@@ -258,7 +260,7 @@ HB_FUNC( GETMAPMODE )
HB_FUNC( SETMAPMODE )
{
hb_retni( SetMapMode( (HDC) hb_parnl( 1 ), hb_parni( 2 ) ) ) ;
hb_retni( SetMapMode( (HDC) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -267,7 +269,7 @@ HB_FUNC( SETMAPMODE )
HB_FUNC( SETMAPPERFLAGS )
{
hb_retnl( (LONG) SetMapperFlags( (HDC) hb_parnl( 1 ), (DWORD) hb_parnl( 2 ) ) ) ;
hb_retnl( (LONG) SetMapperFlags( (HDC) HB_PARWH( 1 ), (DWORD) hb_parnl( 2 ) ) );
}
@@ -286,7 +288,7 @@ HB_FUNC( SETMAPPERFLAGS )
HB_FUNC( BEGINPAINT )
{
PAINTSTRUCT pps ;
hb_retnl( (LONG) BeginPaint( (HWND) hb_parnl( 1 ), &pps ) ) ;
HB_RETWH( BeginPaint( (HWND) HB_PARWH( 1 ), &pps ) );
hb_storclen( (char *) &pps, sizeof(PAINTSTRUCT), 2 );
}
@@ -298,7 +300,7 @@ HB_FUNC( BEGINPAINT )
HB_FUNC( ENDPAINT )
{
hb_retl( EndPaint( (HWND) hb_parnl( 1 ), (PAINTSTRUCT*) hb_parcx( 2 ) ) );
hb_retl( EndPaint( (HWND) HB_PARWH( 1 ), (PAINTSTRUCT*) hb_parcx( 2 ) ) );
}
@@ -308,7 +310,7 @@ HB_FUNC( ENDPAINT )
HB_FUNC( GETGRAPHICSMODE )
{
hb_retni( GetGraphicsMode( (HDC) hb_parnl( 1 ) ) ) ;
hb_retni( GetGraphicsMode( (HDC) HB_PARWH( 1 ) ) );
}
@@ -320,7 +322,7 @@ HB_FUNC( GETGRAPHICSMODE )
HB_FUNC( GDICOMMENT )
{
hb_retl( GdiComment( (HDC) hb_parnl( 1 ), (UINT) hb_parni( 2 ), ( const BYTE * ) hb_parcx( 3 ) ) ) ;
hb_retl( GdiComment( (HDC) HB_PARWH( 1 ), (UINT) hb_parni( 2 ), ( const BYTE * ) hb_parcx( 3 ) ) );
}
@@ -332,7 +334,7 @@ HB_FUNC( GDICOMMENT )
HB_FUNC( GDISETBATCHLIMIT )
{
hb_retnl( (LONG) GdiSetBatchLimit( (DWORD) hb_parnl( 1 ) ) ) ;
hb_retnl( (LONG) GdiSetBatchLimit( (DWORD) hb_parnl( 1 ) ) );
}
@@ -349,7 +351,7 @@ HB_FUNC( GDISETBATCHLIMIT )
HB_FUNC( SELECTCLIPPATH )
{
hb_retl( SelectClipPath( (HDC) hb_parnl( 1 ), hb_parni( 2 ) ) ) ;
hb_retl( SelectClipPath( (HDC) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
@@ -362,7 +364,7 @@ HB_FUNC( SELECTCLIPPATH )
HB_FUNC( WIDENPATH )
{
hb_retl( WidenPath( (HDC) hb_parnl( 1 ) ) ) ;
hb_retl( WidenPath( (HDC) HB_PARWH( 1 ) ) );
}
@@ -373,7 +375,7 @@ HB_FUNC( WIDENPATH )
HB_FUNC( STROKEANDFILLPATH )
{
hb_retl( StrokeAndFillPath( (HDC) hb_parnl( 1 ) ) ) ;
hb_retl( StrokeAndFillPath( (HDC) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -382,7 +384,7 @@ HB_FUNC( STROKEANDFILLPATH )
HB_FUNC( STROKEPATH )
{
hb_retl( StrokePath( (HDC) hb_parnl( 1 ) ) ) ;
hb_retl( StrokePath( (HDC) HB_PARWH( 1 ) ) );
}
@@ -393,7 +395,7 @@ HB_FUNC( STROKEPATH )
HB_FUNC( ENDPATH )
{
hb_retl( EndPath( (HDC) hb_parnl( 1 ) ) ) ;
hb_retl( EndPath( (HDC) HB_PARWH( 1 ) ) );
}
@@ -404,7 +406,7 @@ HB_FUNC( ENDPATH )
HB_FUNC( ABORTPATH )
{
hb_retl( AbortPath( (HDC) hb_parnl( 1 ) ) ) ;
hb_retl( AbortPath( (HDC) HB_PARWH( 1 ) ) );
}
@@ -421,7 +423,7 @@ HB_FUNC( GETPATH )
// Your code goes here
hb_retni( GetPath( (HDC) hb_parnl( 1 ), lpPoInt, lpByte, hb_parni( 4 ) ) ) ;
hb_retni( GetPath( (HDC) HB_PARWH( 1 ), lpPoInt, lpByte, hb_parni( 4 ) ) );
}
*/
@@ -447,8 +449,8 @@ HB_FUNC( LPTODP )
if (ISARRAY( 2 ) )
{
iCount = hb_parinfa( 2, 0 ) ;
Point = ( POINT *) hb_xgrab( iCount * sizeof (POINT) ) ;
iCount = hb_parinfa( 2, 0 );
Point = ( POINT *) hb_xgrab( iCount * sizeof (POINT) );
aParam = hb_param(2,HB_IT_ARRAY);
for ( i = 0 ; i<iCount ; i++ )
@@ -463,13 +465,13 @@ HB_FUNC( LPTODP )
}
}
if ( LPtoDP( (HDC) hb_parnl( 1 ), Point, iCount ) )
if ( LPtoDP( (HDC) HB_PARWH( 1 ), Point, iCount ) )
{
for ( i = 0 ; i < iCount ; i++ )
{
aSub = Point2Array(Point+i);
//hb_arraySet( aParam, i+1, hb_arrayClone(aSub, NULL ) ) ;
hb_arraySet( aParam, i+1, hb_arrayClone(aSub) ) ;
//hb_arraySet( aParam, i+1, hb_arrayClone(aSub, NULL ) );
hb_arraySet( aParam, i+1, hb_arrayClone(aSub) );
hb_itemRelease(aSub);
}
hb_retl(1);
@@ -477,11 +479,11 @@ HB_FUNC( LPTODP )
else
hb_retl(0);
hb_xfree(Point) ;
hb_xfree(Point);
}
else
hb_retl(0) ;
hb_retl(0);
}
@@ -505,8 +507,8 @@ HB_FUNC( DPTOLP )
if (ISARRAY( 2 ) )
{
iCount = hb_parinfa( 2, 0 ) ;
Point = ( POINT * ) hb_xgrab( iCount * sizeof (POINT) ) ;
iCount = hb_parinfa( 2, 0 );
Point = ( POINT * ) hb_xgrab( iCount * sizeof (POINT) );
aParam = hb_param(2,HB_IT_ARRAY);
for ( i = 0 ; i<iCount ; i++ )
@@ -521,12 +523,12 @@ HB_FUNC( DPTOLP )
}
}
if ( DPtoLP( (HDC) hb_parnl( 1 ), Point, iCount ) )
if ( DPtoLP( (HDC) HB_PARWH( 1 ), Point, iCount ) )
{
for ( i = 0 ; i < iCount ; i++ )
{
aSub = Point2Array(Point+i);
hb_arraySet( aParam, i+1, hb_arrayClone(aSub) ) ;
hb_arraySet( aParam, i+1, hb_arrayClone(aSub) );
hb_itemRelease(aSub);
}
hb_retl(1);
@@ -534,11 +536,11 @@ HB_FUNC( DPTOLP )
else
hb_retl(0);
hb_xfree(Point) ;
hb_xfree(Point);
}
else
hb_retl(0) ;
hb_retl(0);
}
@@ -549,7 +551,7 @@ HB_FUNC( DPTOLP )
HB_FUNC( GETDEVICECAPS )
{
hb_retni( GetDeviceCaps( (HDC) hb_parnl( 1 ), hb_parni( 2 ) ) ) ;
hb_retni( GetDeviceCaps( (HDC) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -559,7 +561,7 @@ HB_FUNC( GETDEVICECAPS )
HB_FUNC( PAINTDESKTOP )
{
hb_retl( PaintDesktop( (HDC) hb_parnl( 1 ) ) ) ;
hb_retl( PaintDesktop( (HDC) HB_PARWH( 1 ) ) );
}
@@ -573,9 +575,9 @@ HB_FUNC( PAINTDESKTOP )
HB_FUNC( GETGUIRESOURCES )
{
hb_retnl( (LONG) GetGuiResources( (HANDLE) hb_parnl( 1 ),
hb_retnl( (LONG) GetGuiResources( (HANDLE) HB_PARWH( 1 ),
(DWORD) hb_parnl( 2 )
) ) ;
) );
}
#endif
@@ -586,7 +588,7 @@ HB_FUNC( GETGUIRESOURCES )
HB_FUNC( PTVISIBLE )
{
hb_retl( PtVisible( (HDC) hb_parnl( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) ) ;
hb_retl( PtVisible( (HDC) HB_PARWH( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) );
}
@@ -596,7 +598,7 @@ HB_FUNC( PTVISIBLE )
HB_FUNC( SETGRAPHICSMODE )
{
hb_retni( SetGraphicsMode( (HDC) hb_parnl( 1 ), hb_parni( 2 ) ) ) ;
hb_retni( SetGraphicsMode( (HDC) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
@@ -606,7 +608,7 @@ HB_FUNC( SETGRAPHICSMODE )
/*
HB_FUNC( SETLAYOUT )
{
hb_retnl( (LONG) SetLayout( (HDC) hb_parnl( 1 ), (DWORD) hb_parnl( 2 ) ) ) ;
hb_retnl( (LONG) SetLayout( (HDC) HB_PARWH( 1 ), (DWORD) hb_parnl( 2 ) ) );
}
*/
@@ -616,7 +618,7 @@ HB_FUNC( SETLAYOUT )
HB_FUNC( SWAPBUFFERS )
{
hb_retl( SwapBuffers( (HDC) hb_parnl( 1 ) ) ) ;
hb_retl( SwapBuffers( (HDC) HB_PARWH( 1 ) ) );
}
@@ -631,9 +633,9 @@ HB_FUNC( GETCLIPBOX )
RECT Rect ;
PHB_ITEM aRect ;
hb_retni( GetClipBox( (HDC) hb_parnl( 1 ), &Rect ) ) ;
hb_retni( GetClipBox( (HDC) HB_PARWH( 1 ), &Rect ) );
aRect = Rect2Array( &Rect ) ;
aRect = Rect2Array( &Rect );
hb_itemReturn( aRect );
hb_itemRelease( aRect );
@@ -652,7 +654,7 @@ HB_FUNC( GETMITERLIMIT )
// Your code goes here
hb_retl( GetMiterLimit( (HDC) hb_parnl( 1 ), pFloat ) ) ;
hb_retl( GetMiterLimit( (HDC) HB_PARWH( 1 ), pFloat ) );
}
*/
@@ -667,7 +669,7 @@ HB_FUNC( GETRASTERIZERCAPS )
LPRASTERIZER_STATUS lprs = (LPRASTERIZER_STATUS) hb_parc(1); //hb_param( 1,HB_IT_STRING )->item.asString.value;
if( GetRasterizerCaps( lprs, (UINT) hb_parni( 2 ) ) )
hb_retclen( (char*) lprs, sizeof(RASTERIZER_STATUS) ) ;
hb_retclen( (char*) lprs, sizeof(RASTERIZER_STATUS) );
//hb_itemPutCRaw( hb_param( -1, HB_IT_ANY ), (char *) lprs, sizeof(RASTERIZER_STATUS ) );
}
@@ -686,7 +688,7 @@ HB_FUNC( GETASPECTRATIOFILTEREX )
PHB_ITEM pArray=hb_param(2,HB_IT_ARRAY);
// Your code goes here
if( GetAspectRatioFilterEx( (HDC) hb_parnl( 1 ), &lpSize ) )
if( GetAspectRatioFilterEx( (HDC) HB_PARWH( 1 ), &lpSize ) )
{
Size2ArrayEx(&lpSize,pArray);
hb_retl(TRUE);
@@ -717,7 +719,7 @@ HB_FUNC( DEVICECAPABILITIESA )
Word ,
(LPSTR) hb_parcx( 4 ) ,
&DEVMODEA
) ) ;
) );
}
*/
@@ -734,9 +736,9 @@ HB_FUNC( GETUPDATERECT )
RECT Rect ;
PHB_ITEM aRect ;
if ( GetUpdateRect( (HWND) hb_parnl( 1 ), &Rect, hb_parl( 2 ) ) )
if ( GetUpdateRect( (HWND) HB_PARWH( 1 ), &Rect, hb_parl( 2 ) ) )
{
aRect = Rect2Array( &Rect ) ;
aRect = Rect2Array( &Rect );
hb_itemReturn( aRect );
hb_itemRelease( aRect );
}
@@ -755,12 +757,12 @@ HB_FUNC( DRAGOBJECT )
// Your code goes here
hb_retnl( (LONG) DragObject( (HWND) hb_parnl( 1 ) ,
(HWND) hb_parnl( 2 ) ,
hb_retnl( (LONG) DragObject( (HWND) HB_PARWH( 1 ) ,
(HWND) HB_PARWH( 2 ) ,
(UINT) hb_parni( 3 ) ,
uLong_ptr ,
(HCURSOR) hb_parnl( 5 )
) ) ;
(HCURSOR) HB_PARWH( 5 )
) );
}
*/
@@ -780,9 +782,9 @@ HB_FUNC( DRAGDETECT )
PHB_ITEM pArray;
if (ISARRAY(2))
{
pArray = hb_param(2, HB_IT_ARRAY) ;
pArray = hb_param(2, HB_IT_ARRAY);
Array2Point(pArray,&PoInt);
hb_retl( DragDetect( (HWND) hb_parnl( 1 ), PoInt ) ) ;
hb_retl( DragDetect( (HWND) HB_PARWH( 1 ), PoInt ) );
}
else
hb_retl(FALSE);
@@ -795,7 +797,7 @@ HB_FUNC( DRAGDETECT )
HB_FUNC( GETDRAWITEMSTRUCT )
{
DRAWITEMSTRUCT * dis = ( DRAWITEMSTRUCT * ) hb_parnl( 1 );
DRAWITEMSTRUCT * dis = ( DRAWITEMSTRUCT * ) HB_PARWH( 1 );
PHB_ITEM arrDis = hb_itemArrayNew( 12 );
@@ -829,7 +831,7 @@ HB_FUNC( DRAWFRAMECONTROL )
// Your code goes here
if (Array2Rect(pArray,&lpRect))
{
if( DrawFrameControl( (HDC) hb_parnl( 1 ) ,
if( DrawFrameControl( (HDC) HB_PARWH( 1 ) ,
&lpRect ,
(UINT) hb_parni( 3 ),
(UINT) hb_parni( 4 )
@@ -861,7 +863,7 @@ HB_FUNC( DRAWANIMATEDRECTS )
// Your code goes here
if ( Array2Rect(hb_param(3,HB_IT_ARRAY),&lprcFrom ) && Array2Rect(hb_param(4,HB_IT_ARRAY) ,&lprcFrom ))
{
if(DrawAnimatedRects( (HWND) hb_parnl( 1 ),
if(DrawAnimatedRects( (HWND) HB_PARWH( 1 ),
hb_parni( 2 ) ,
&lprcFrom ,
&lprcTo
@@ -889,7 +891,7 @@ HB_FUNC( GETWINDOWORGEX )
PHB_ITEM pArray=hb_param(2,HB_IT_ARRAY);
if( GetWindowOrgEx( (HDC) hb_parnl( 1 ), &lpPoInt ) )
if( GetWindowOrgEx( (HDC) HB_PARWH( 1 ), &lpPoInt ) )
{
Point2ArrayEx(&lpPoInt,pArray);
hb_retl(TRUE);
@@ -911,7 +913,7 @@ HB_FUNC( GETWORLDTRANSFORM )
// Your code goes here
hb_retl( GetWorldTransform( (HDC) hb_parnl( 1 ), lpxForm ) ) ;
hb_retl( GetWorldTransform( (HDC) HB_PARWH( 1 ), lpxForm ) );
}
*/
@@ -928,10 +930,10 @@ HB_FUNC( MODIFYWORLDTRANSFORM )
// Your code goes here
hb_retl( ModifyWorldTransform( (HDC) hb_parnl( 1 ) ,
hb_retl( ModifyWorldTransform( (HDC) HB_PARWH( 1 ) ,
&XFORM ,
(DWORD) hb_parnl( 3 )
) ) ;
) );
}
*/
@@ -947,11 +949,11 @@ HB_FUNC( OFFSETVIEWPORTORGEX )
// Your code goes here
hb_retl( OffsetViewportOrgEx( (HDC) hb_parnl( 1 ),
hb_retl( OffsetViewportOrgEx( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
lpPoInt
) ) ;
) );
}
*/
@@ -967,11 +969,11 @@ HB_FUNC( OFFSETWINDOWORGEX )
// Your code goes here
hb_retl( OffsetWindowOrgEx( (HDC) hb_parnl( 1 ),
hb_retl( OffsetWindowOrgEx( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
lpPoInt
) ) ;
) );
}
*/
@@ -987,7 +989,7 @@ HB_FUNC( SCALEWINDOWEXTEX )
PHB_ITEM pArray=hb_param(6,HB_IT_ARRAY);
if( ScaleWindowExtEx( (HDC) hb_parnl( 1 ),
if( ScaleWindowExtEx( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
@@ -1015,7 +1017,7 @@ HB_FUNC( SETBOUNDSRECT )
// Your code goes here
hb_retni( SetBoundsRect( (HDC) hb_parnl( 1 ), &RECT, (UINT) hb_parni( 3 ) ) ) ;
hb_retni( SetBoundsRect( (HDC) HB_PARWH( 1 ), &RECT, (UINT) hb_parni( 3 ) ) );
}
*/
@@ -1033,7 +1035,7 @@ HB_FUNC( SETWORLDTRANSFORM )
// Your code goes here
hb_retl( SetWorldTransform( (HDC) hb_parnl( 1 ), &XFORM ) ) ;
hb_retl( SetWorldTransform( (HDC) HB_PARWH( 1 ), &XFORM ) );
}
*/
@@ -1049,14 +1051,7 @@ HB_FUNC( SETMITERLIMIT )
// Your code goes here
hb_retl( SetMiterLimit( (HDC) hb_parnl( 1 ), (FLOAT) hb_parnd( 2 ), pFloat ) ) ;
hb_retl( SetMiterLimit( (HDC) HB_PARWH( 1 ), (FLOAT) hb_parnd( 2 ), pFloat ) );
}
*/

68
harbour/contrib/hbwhat32/whthead.c
View File

@@ -8,6 +8,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
#include <commctrl.h>
@@ -30,17 +32,17 @@ extern BOOL Array2Point(PHB_ITEM aPoint, POINT *pt );
HB_FUNC( HEADER_CREATE )
{
hb_retnl( (LONG) CreateWindow( "SysHeader32" ,
HB_RETWH( CreateWindow( "SysHeader32" ,
"" ,
(DWORD) hb_parnl( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 ) ,
(HWND) hb_parnl( 6 ) ,
(HMENU) hb_parni( 7 ) ,
(HWND) HB_PARWH( 6 ) ,
(HMENU) HB_PARWH( 7 ) ,
GetModuleHandle(NULL) ,
NULL ) ) ;
NULL ) );
}
@@ -49,7 +51,7 @@ HB_FUNC( HEADER_CREATE )
HB_FUNC( HEADER_GETITEMCOUNT )
{
hb_retni( Header_GetItemCount( (HWND) hb_parnl(1) ) );
hb_retni( Header_GetItemCount( (HWND) HB_PARWH(1) ) );
}
@@ -59,7 +61,7 @@ HB_FUNC( HEADER_GETITEMCOUNT )
HB_FUNC( HEADER_INSERTITEM )
{
HDITEM *hdi = ( HDITEM *) hb_parc( 3 ); //hb_param( 3, HB_IT_STRING )->item.asString.value ;
hb_retni( Header_InsertItem( (HWND) hb_parnl(1), hb_parni(2), hdi ) ) ;
hb_retni( Header_InsertItem( (HWND) HB_PARWH(1), hb_parni(2), hdi ) );
}
@@ -68,7 +70,7 @@ HB_FUNC( HEADER_INSERTITEM )
HB_FUNC( HEADER_DELETEITEM )
{
hb_retl( Header_DeleteItem( (HWND) hb_parnl(1), hb_parni(2) ) ) ;
hb_retl( Header_DeleteItem( (HWND) HB_PARWH(1), hb_parni(2) ) );
}
@@ -81,9 +83,9 @@ HB_FUNC( HEADER_DELETEITEM )
HB_FUNC( HEADER_GETITEM )
{
HDITEM hdi ;
BOOL lRet = Header_GetItem( (HWND) hb_parnl(1), hb_parni(2), &hdi ) ;
BOOL lRet = Header_GetItem( (HWND) HB_PARWH(1), hb_parni(2), &hdi );
if ( lRet )
hb_retclen( (char*) &hdi, sizeof(HDITEM) ) ;
hb_retclen( (char*) &hdi, sizeof(HDITEM) );
//hb_itemPutCRaw( hb_param( -1, HB_IT_ANY ), (char *) hdi, sizeof( HDITEM ) );
}
@@ -95,7 +97,7 @@ HB_FUNC( HEADER_GETITEM )
HB_FUNC( HEADER_SETITEM )
{
HDITEM *hdi = ( HDITEM * ) hb_parc( 3 ); //hb_param( 3, HB_IT_STRING )->item.asString.value ;
hb_retl( Header_SetItem( (HWND) hb_parnl(1), hb_parni(2), hdi ) ) ;
hb_retl( Header_SetItem( (HWND) HB_PARWH(1), hb_parni(2), hdi ) );
}
@@ -105,7 +107,7 @@ HB_FUNC( HEADER_SETITEM )
HB_FUNC( HEADER_CREATEDRAGIMAGE )
{
hb_retnl( (ULONG) Header_CreateDragImage( (HWND) hb_parnl(1), hb_parni(2) ) ) ;
HB_RETWH( Header_CreateDragImage( (HWND) HB_PARWH(1), hb_parni(2) ) );
}
@@ -119,20 +121,20 @@ HB_FUNC( HEADER_CREATEDRAGIMAGE )
HB_FUNC( HEADER_GETORDERARRAY )
{
UINT iCount = Header_GetItemCount((HWND)hb_parnl(1) );
UINT iCount = Header_GetItemCount((HWND)HB_PARWH(1) );
PHB_ITEM aInt ;
INT *lpi = (INT*) hb_xgrab( iCount*sizeof(INT)) ;
BOOL lRet = Header_GetOrderArray((HWND) hb_parnl(1), iCount, lpi ) ;
INT *lpi = (INT*) hb_xgrab( iCount*sizeof(INT));
BOOL lRet = Header_GetOrderArray((HWND) HB_PARWH(1), iCount, lpi ) ;
UINT i;
if ( lRet )
{
aInt = hb_itemArrayNew(iCount ) ;
aInt = hb_itemArrayNew(iCount );
for ( i = 0; i<iCount ; i++)
hb_arraySetNL( aInt, i+1, lpi[i] );
hb_itemReturnRelease(aInt);
hb_xfree( lpi ) ;
hb_xfree( lpi );
}
}
@@ -160,13 +162,13 @@ HB_FUNC( HEADER_SETORDERARRAY )
{
iCount = hb_parinfa( 2, 0 );
lpi = (INT*) hb_xgrab( iCount*sizeof(INT) ) ;
lpi = (INT*) hb_xgrab( iCount*sizeof(INT) );
for ( i= 0 ; i<iCount ; i++ )
{
lpi[i] = hb_parni(2,i+1) ;
lpi[i] = hb_parni(2,i+1);
}
hb_retl( Header_SetOrderArray((HWND) hb_parnl(1), iCount, lpi ) ) ;
hb_retl( Header_SetOrderArray((HWND) HB_PARWH(1), iCount, lpi ) );
}
else
hb_retl( 0 );
@@ -186,7 +188,7 @@ HB_FUNC( HEADER_GETITEMRECT )
RECT rc ;
PHB_ITEM aRc ;
if ( Header_GetItemRect((HWND) hb_parnl(1), (WPARAM) hb_parni(2), &rc ) )
if ( Header_GetItemRect((HWND) HB_PARWH(1), (WPARAM) hb_parni(2), &rc ) )
{
aRc = Rect2Array( &rc );
hb_itemReturn( aRc );
@@ -204,7 +206,7 @@ HB_FUNC( HEADER_GETITEMRECT )
HB_FUNC( HEADER_GETIMAGELIST )
{
hb_retnl( (ULONG)Header_GetImageList((HWND) hb_parnl(1) ) ) ;
HB_RETWH(Header_GetImageList((HWND) HB_PARWH(1) ) );
}
@@ -215,7 +217,7 @@ HB_FUNC( HEADER_GETIMAGELIST )
HB_FUNC( HEADER_SETIMAGELIST )
{
hb_retnl( (ULONG) Header_SetImageList((HWND) hb_parnl(1), (LPARAM) hb_parnl(2) ) ) ;
HB_RETWH( Header_SetImageList((HWND) HB_PARWH(1), (LPARAM) hb_parnl(2) ) );
}
@@ -226,7 +228,7 @@ HB_FUNC( HEADER_SETIMAGELIST )
HB_FUNC( HEADER_ORDERTOINDEX )
{
hb_retni( Header_OrderToIndex((HWND) hb_parnl(1), hb_parni(2) ) ) ;
hb_retni( Header_OrderToIndex((HWND) HB_PARWH(1), hb_parni(2) ) );
}
@@ -241,7 +243,7 @@ HB_FUNC( HEADER_ORDERTOINDEX )
HB_FUNC( HEADER_SETHOTDIVIDER )
{
hb_retni( Header_SetHotDivider((HWND) hb_parnl(1), hb_parl(2), (LPARAM) hb_parnl(3)));
hb_retni( Header_SetHotDivider((HWND) HB_PARWH(1), hb_parl(2), (LPARAM) hb_parnl(3)));
}
@@ -252,7 +254,7 @@ HB_FUNC( HEADER_SETHOTDIVIDER )
HB_FUNC( HEADER_SETBITMAPMARGIN )
{
hb_retni( Header_SetBitmapMargin( (HWND) hb_parnl(1), hb_parni(2) ) ) ;
hb_retni( Header_SetBitmapMargin( (HWND) HB_PARWH(1), hb_parni(2) ) );
}
@@ -263,7 +265,7 @@ HB_FUNC( HEADER_SETBITMAPMARGIN )
HB_FUNC( HEADER_GETBITMAPMARGIN )
{
hb_retni( Header_GetBitmapMargin( (HWND) hb_parnl(1) ) ) ;
hb_retni( Header_GetBitmapMargin( (HWND) HB_PARWH(1) ) );
}
@@ -274,7 +276,7 @@ HB_FUNC( HEADER_GETBITMAPMARGIN )
HB_FUNC( HEADER_SETUNICODEFORMAT )
{
hb_retl( Header_SetUnicodeFormat( (HWND) hb_parnl(1), hb_parl( 2 ) ) ) ;
hb_retl( Header_SetUnicodeFormat( (HWND) HB_PARWH(1), hb_parl( 2 ) ) );
}
@@ -285,7 +287,7 @@ HB_FUNC( HEADER_SETUNICODEFORMAT )
HB_FUNC( HEADER_GETUNICODEFORMAT )
{
hb_retl( Header_GetUnicodeFormat((HWND) hb_parnl(1) ) ) ;
hb_retl( Header_GetUnicodeFormat((HWND) HB_PARWH(1) ) );
}
@@ -296,7 +298,7 @@ HB_FUNC( HEADER_GETUNICODEFORMAT )
HB_FUNC( HEADER_SETFILTERCHANGETIMEOUT )
{
hb_retni( Header_SetFilterChangeTimeout((HWND) hb_parnl(1), hb_parni( 2 ) ) ) ;
hb_retni( Header_SetFilterChangeTimeout((HWND) HB_PARWH(1), hb_parni( 2 ) ) );
}
@@ -307,7 +309,7 @@ HB_FUNC( HEADER_SETFILTERCHANGETIMEOUT )
HB_FUNC( HEADER_EDITFILTER )
{
hb_retni( Header_EditFilter( (HWND) hb_parnl(1), hb_parni( 2 ), hb_parl( 3 ) ) ) ;
hb_retni( Header_EditFilter( (HWND) HB_PARWH(1), hb_parni( 2 ), hb_parl( 3 ) ) );
}
@@ -318,7 +320,7 @@ HB_FUNC( HEADER_EDITFILTER )
HB_FUNC( HEADER_CLEARALLFILTERS )
{
hb_retni( Header_ClearAllFilters( (HWND) hb_parnl(1) ) ) ;
hb_retni( Header_ClearAllFilters( (HWND) HB_PARWH(1) ) );
}
@@ -332,7 +334,7 @@ HB_FUNC( HEADER_CLEARALLFILTERS )
HB_FUNC( HEADER_CLEARFILTER )
{
hb_retni( Header_ClearFilter( (HWND) hb_parnl(1), hb_parni( 2 ) ) ) ;
hb_retni( Header_ClearFilter( (HWND) HB_PARWH(1), hb_parni( 2 ) ) );
}
@@ -343,7 +345,7 @@ HB_FUNC( HEADER_CLEARFILTER )
HB_FUNC( HEADER_LAYOUT )
{
HD_LAYOUT *hdLayout = ( HD_LAYOUT *) hb_parc( 2 ); //hb_param( 2, HB_IT_STRING )->item.asString.value ;
hb_retl( Header_Layout( (HWND) hb_parnl(1), hdLayout ) );
hb_retl( Header_Layout( (HWND) HB_PARWH(1), hdLayout ) );
}

71
harbour/contrib/hbwhat32/whticon.c
View File

@@ -9,6 +9,8 @@
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
//#include <shlobj.h>
#include <windows.h>
//#include <commctrl.h>
@@ -27,8 +29,8 @@
HB_FUNC( LOADICON )
{
hb_retnl( (LONG) LoadIcon( ( ISNIL(1) ? NULL : (HINSTANCE) hb_parnl( 1 ) ) ,
(hb_parinfo(2)==HB_IT_STRING ? hb_parcx(2) : MAKEINTRESOURCE( (WORD) hb_parni(2))) ) ) ;
HB_RETWH( LoadIcon( ( ISNIL(1) ? NULL : (HINSTANCE) HB_PARWH( 1 ) ) ,
(hb_parinfo(2)==HB_IT_STRING ? hb_parcx(2) : MAKEINTRESOURCE( (WORD) hb_parni(2))) ) );
}
@@ -40,14 +42,14 @@ HB_FUNC( LOADICON )
HB_FUNC( CREATEICON )
{
hb_retnl( (LONG) CreateIcon( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) hb_parnl( 1 ),
HB_RETWH( CreateIcon( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
(BYTE) hb_parni( 4 ) ,
(BYTE) hb_parni( 5 ) ,
(BYTE *) hb_parcx( 5 ) ,
(BYTE *) hb_parcx( 6 )
) ) ;
) );
}
@@ -57,7 +59,7 @@ HB_FUNC( CREATEICON )
HB_FUNC( DESTROYICON )
{
hb_retl( DestroyIcon( (HICON) hb_parnl( 1 ) ) ) ;
hb_retl( DestroyIcon( (HICON) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -67,7 +69,7 @@ HB_FUNC( DESTROYICON )
HB_FUNC( LOOKUPICONIDFROMDIRECTORY )
{
hb_retni( LookupIconIdFromDirectory( (PBYTE) hb_parcx( 1 ), hb_parl( 2 ) ) ) ;
hb_retni( LookupIconIdFromDirectory( (PBYTE) hb_parcx( 1 ), hb_parl( 2 ) ) );
}
@@ -83,7 +85,7 @@ HB_FUNC( LOOKUPICONIDFROMDIRECTORYEX )
hb_parni( 3 ) ,
hb_parni( 4 ) ,
(UINT) hb_parni( 5 )
) ) ;
) );
}
@@ -93,11 +95,11 @@ HB_FUNC( LOOKUPICONIDFROMDIRECTORYEX )
HB_FUNC( CREATEICONFROMRESOURCE )
{
hb_retnl( (LONG) CreateIconFromResource( (PBYTE) hb_parcx( 1 ) ,
HB_RETWH( CreateIconFromResource( (PBYTE) hb_parcx( 1 ) ,
(DWORD) hb_parnl( 2 ),
hb_parl( 3 ) ,
(DWORD) hb_parnl( 4 )
) ) ;
) );
}
@@ -107,14 +109,14 @@ HB_FUNC( CREATEICONFROMRESOURCE )
HB_FUNC( CREATEICONFROMRESOURCEEX )
{
hb_retnl( (LONG) CreateIconFromResourceEx( (PBYTE) hb_parcx( 1 ) ,
HB_RETWH( CreateIconFromResourceEx( (PBYTE) hb_parcx( 1 ) ,
(DWORD) hb_parnl( 2 ) ,
hb_parl( 3 ) ,
(DWORD) hb_parnl( 4 ) ,
hb_parni( 5 ) ,
hb_parni( 6 ) ,
(UINT) hb_parni( 7 )
) ) ;
) );
}
@@ -124,13 +126,13 @@ HB_FUNC( CREATEICONFROMRESOURCEEX )
HB_FUNC( LOADIMAGE )
{
hb_retnl( (LONG) LoadImage( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) hb_parnl( 1 ),
HB_RETWH( LoadImage( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ),
(LPCSTR) hb_parcx( 2 ) ,
(UINT) hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 ) ,
(UINT) hb_parni( 6 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -139,12 +141,12 @@ HB_FUNC( LOADIMAGE )
HB_FUNC( COPYIMAGE )
{
hb_retnl( (LONG) CopyImage( (HANDLE) hb_parnl( 1 ),
HB_RETWH( CopyImage( (HANDLE) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
(UINT) hb_parni( 5 )
) ) ;
) );
}
@@ -153,11 +155,11 @@ HB_FUNC( COPYIMAGE )
HB_FUNC( DRAWICON )
{
hb_retl( DrawIcon( (HDC) hb_parnl( 1 ) ,
hb_retl( DrawIcon( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
(HICON) hb_parnl( 4 )
) ) ;
(HICON) HB_PARWH( 4 )
) );
}
@@ -167,16 +169,16 @@ HB_FUNC( DRAWICON )
HB_FUNC( DRAWICONEX )
{
hb_retl( DrawIconEx( (HDC) hb_parnl( 1 ) ,
hb_retl( DrawIconEx( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
(HICON) hb_parnl( 4 ) ,
(HICON) HB_PARWH( 4 ) ,
hb_parni( 5 ) ,
hb_parni( 6 ) ,
(UINT) hb_parni( 7 ) ,
(HBRUSH) hb_parnl( 8 ),
(HBRUSH) HB_PARWH( 8 ),
(UINT) hb_parni( 9 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -187,7 +189,7 @@ HB_FUNC( CREATEICONINDIRECT )
{
ICONINFO *ii = (ICONINFO * ) hb_parc( 1 ); //hb_param( 1, HB_IT_STRING )->item.asString.value;
hb_retnl( (LONG) CreateIconIndirect( ii ) ) ;
HB_RETWH( CreateIconIndirect( ii ) );
}
@@ -198,7 +200,7 @@ HB_FUNC( CREATEICONINDIRECT )
HB_FUNC( COPYICON )
{
hb_retnl( (LONG) CopyIcon( (HICON) hb_parnl( 1 ) ) ) ;
HB_RETWH( CopyIcon( (HICON) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -208,7 +210,7 @@ HB_FUNC( GETICONINFO )
{
ICONINFO ii;
hb_retl( GetIconInfo( (HICON) hb_parnl( 1 ), &ii ) ) ;
hb_retl( GetIconInfo( (HICON) HB_PARWH( 1 ), &ii ) );
// verify !!
// assign into structure
@@ -224,9 +226,9 @@ HB_FUNC( GETICONINFO )
#ifndef __WATCOMC__
HB_FUNC( DUPLICATEICON )
{
hb_retnl( (LONG) DuplicateIcon( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) hb_parnl( 1 ),
(HICON) hb_parnl( 2 )
) ) ;
HB_RETWH( DuplicateIcon( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ),
(HICON) HB_PARWH( 2 )
) );
}
#endif
//-----------------------------------------------------------------------------
@@ -239,15 +241,15 @@ HB_FUNC( EXTRACTASSOCIATEDICON )
lpiIcon = (WORD) hb_parni( 2 );
hiRet = ExtractAssociatedIcon( ( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) hb_parnl( 1 ) ) ,
hiRet = ExtractAssociatedIcon( ( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ) ) ,
(LPSTR) hb_parcx( 2 ) ,
&lpiIcon
) ;
);
if ( hiRet )
hb_storni( lpiIcon, 2 );
hb_retnl( (LONG) hiRet );
HB_RETWH( hiRet );
}
@@ -258,11 +260,8 @@ HB_FUNC( EXTRACTASSOCIATEDICON )
HB_FUNC( EXTRACTICON )
{
hb_retnl( (LONG) ExtractIcon( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) hb_parnl( 1 ),
HB_RETWH( ExtractIcon( ISNIL( 1 ) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH( 1 ),
(LPCSTR) hb_parcx( 2 ) ,
(UINT) hb_parni( 3 )
) ) ;
) );
}

80
harbour/contrib/hbwhat32/whtilst.c
View File

@@ -10,6 +10,8 @@
#define _WIN32_WINNT 0x0400
#define _WIN32_IE 0x0500
#include "hbwhat.h"
#include <windows.h>
#include <commctrl.h>
#include "hbapi.h"
@@ -31,9 +33,9 @@ HB_FUNC( IMAGELIST_CREATE )
HB_FUNC( IMAGELIST_REPLACEICON )
{
hb_retni( ImageList_ReplaceIcon( (HIMAGELIST) hb_parnl(1),
hb_retni( ImageList_ReplaceIcon( (HIMAGELIST) HB_PARWH(1),
(int) hb_parni(2) ,
(HICON) hb_parnl(3) ) ) ;
(HICON) HB_PARWH(3) ) ) ;
}
//-----------------------------------------------------------------------------
@@ -41,7 +43,7 @@ HB_FUNC( IMAGELIST_REPLACEICON )
HB_FUNC( IMAGELIST_ADDICON )
{
hb_retni( ImageList_AddIcon( (HIMAGELIST) hb_parnl(1), (HICON) hb_parnl(2) ) );
hb_retni( ImageList_AddIcon( (HIMAGELIST) HB_PARWH(1), (HICON) HB_PARWH(2) ) );
}
//-----------------------------------------------------------------------------
@@ -49,7 +51,7 @@ HB_FUNC( IMAGELIST_ADDICON )
HB_FUNC( IMAGELIST_DESTROY )
{
hb_retl( ImageList_Destroy( (HIMAGELIST) hb_parnl(1) ) );
hb_retl( ImageList_Destroy( (HIMAGELIST) HB_PARWH(1) ) );
}
//-----------------------------------------------------------------------------
@@ -58,7 +60,7 @@ HB_FUNC( IMAGELIST_DESTROY )
HB_FUNC( IMAGELIST_GETIMAGECOUNT )
{
hb_retni( ImageList_GetImageCount((HIMAGELIST) hb_parnl(1) ) );
hb_retni( ImageList_GetImageCount((HIMAGELIST) HB_PARWH(1) ) );
}
@@ -67,7 +69,7 @@ HB_FUNC( IMAGELIST_GETIMAGECOUNT )
HB_FUNC( IMAGELIST_SETIMAGECOUNT )
{
hb_retl( ImageList_SetImageCount((HIMAGELIST) hb_parnl( 1 ),
hb_retl( ImageList_SetImageCount((HIMAGELIST) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ) ) ;
}
@@ -76,9 +78,9 @@ HB_FUNC( IMAGELIST_SETIMAGECOUNT )
HB_FUNC( IMAGELIST_ADD )
{
hb_retni( ImageList_Add((HIMAGELIST) hb_parnl( 1 ),
(HBITMAP) hb_parnl( 2 ) ,
(HBITMAP) hb_parnl( 3 ))) ;
hb_retni( ImageList_Add((HIMAGELIST) HB_PARWH( 1 ),
(HBITMAP) HB_PARWH( 2 ) ,
(HBITMAP) HB_PARWH( 3 )));
}
//-----------------------------------------------------------------------------
@@ -86,7 +88,7 @@ HB_FUNC( IMAGELIST_ADD )
HB_FUNC( IMAGELIST_SETBKCOLOR )
{
hb_retnl( (LONG) ImageList_SetBkColor((HIMAGELIST) hb_parnl( 1 ),
hb_retnl( (LONG) ImageList_SetBkColor((HIMAGELIST) HB_PARWH( 1 ),
(COLORREF) hb_parnl( 2 )));
}
@@ -95,7 +97,7 @@ HB_FUNC( IMAGELIST_SETBKCOLOR )
HB_FUNC( IMAGELIST_GETBKCOLOR )
{
hb_retnl( (LONG) ImageList_GetBkColor((HIMAGELIST) hb_parnl( 1 )));
hb_retnl( (LONG) ImageList_GetBkColor((HIMAGELIST) HB_PARWH( 1 )));
}
//-----------------------------------------------------------------------------
@@ -103,7 +105,7 @@ HB_FUNC( IMAGELIST_GETBKCOLOR )
HB_FUNC( IMAGELIST_SETOVERLAYIMAGE )
{
hb_retl( ImageList_SetOverlayImage((HIMAGELIST) hb_parnl( 1 ) ,
hb_retl( ImageList_SetOverlayImage((HIMAGELIST) HB_PARWH( 1 ) ,
hb_parni(2), hb_parni(3)));
}
@@ -113,8 +115,8 @@ HB_FUNC( IMAGELIST_SETOVERLAYIMAGE )
HB_FUNC( IMAGELIST_DRAW )
{
hb_retl( ImageList_Draw((HIMAGELIST) hb_parnl( 1 ), hb_parni(2) ,
(HDC) hb_parnl(3), hb_parni(4), hb_parni(5),
hb_retl( ImageList_Draw((HIMAGELIST) HB_PARWH( 1 ), hb_parni(2) ,
(HDC) HB_PARWH(3), hb_parni(4), hb_parni(5),
(UINT) hb_parni(6))) ;
}
@@ -124,10 +126,10 @@ HB_FUNC( IMAGELIST_DRAW )
HB_FUNC( IMAGELIST_REPLACE )
{
hb_retl( ImageList_Replace((HIMAGELIST) hb_parnl( 1 ),
hb_retl( ImageList_Replace((HIMAGELIST) HB_PARWH( 1 ),
hb_parni( 2 ) ,
(HBITMAP) hb_parnl(3) ,
(HBITMAP) hb_parnl(4))) ;
(HBITMAP) HB_PARWH(3) ,
(HBITMAP) HB_PARWH(4))) ;
}
//-----------------------------------------------------------------------------
@@ -135,8 +137,8 @@ HB_FUNC( IMAGELIST_REPLACE )
HB_FUNC( IMAGELIST_ADDMASKED )
{
hb_retni( ImageList_AddMasked((HIMAGELIST) hb_parnl( 1 ) ,
(HBITMAP) hb_parnl( 2 ) ,
hb_retni( ImageList_AddMasked((HIMAGELIST) HB_PARWH( 1 ) ,
(HBITMAP) HB_PARWH( 2 ) ,
(COLORREF) hb_parnl( 3 )));
}
@@ -147,10 +149,10 @@ HB_FUNC( IMAGELIST_ADDMASKED )
HB_FUNC( IMAGELIST_DRAWEX )
{
hb_retl( ImageList_DrawEx((HIMAGELIST) hb_parnl( 1 ), hb_parni( 2 ) ,
(HDC) hb_parnl( 3 ), hb_parni(4), hb_parni(5) ,
hb_retl( ImageList_DrawEx((HIMAGELIST) HB_PARWH( 1 ), hb_parni( 2 ) ,
(HDC) HB_PARWH( 3 ), hb_parni(4), hb_parni(5) ,
hb_parni(6), hb_parni(7),(COLORREF)hb_parnl(8),
(COLORREF) hb_parnl(9), (UINT) hb_parni(10))) ;
(COLORREF) hb_parnl(9), (UINT) hb_parni(10)));
}
//-----------------------------------------------------------------------------
@@ -170,7 +172,7 @@ HB_FUNC( IMAGELIST_DRAWINDIRECT )
HB_FUNC( IMAGELIST_REMOVE )
{
hb_retl( ImageList_Remove((HIMAGELIST) hb_parnl( 1 ), hb_parni( 2 )));
hb_retl( ImageList_Remove((HIMAGELIST) HB_PARWH( 1 ), hb_parni( 2 )));
}
//-----------------------------------------------------------------------------
@@ -178,7 +180,7 @@ HB_FUNC( IMAGELIST_REMOVE )
HB_FUNC( IMAGELIST_GETICON )
{
hb_retnl( (LONG) ImageList_GetIcon((HIMAGELIST) hb_parnl( 1 ),
HB_RETWH( ImageList_GetIcon((HIMAGELIST) HB_PARWH( 1 ),
hb_parni( 2 ) ,
(UINT) hb_parni(3))) ;
}
@@ -189,7 +191,7 @@ HB_FUNC( IMAGELIST_GETICON )
HB_FUNC( IMAGELIST_LOADIMAGE )
{
hb_retnl( (LONG) ImageList_LoadImageA( (HINSTANCE) hb_parnl(1),
HB_RETWH( ImageList_LoadImageA( (HINSTANCE) HB_PARWH(1),
ISCHAR(2)?(LPCSTR) hb_parcx(2) : MAKEINTRESOURCE(hb_parni(2)) ,
hb_parni(3) ,
hb_parni(4) ,
@@ -203,9 +205,9 @@ HB_FUNC( IMAGELIST_LOADIMAGE )
HB_FUNC( IMAGELIST_COPY )
{
hb_retl( ImageList_Copy((HIMAGELIST) hb_parnl( 1 ),
hb_retl( ImageList_Copy((HIMAGELIST) HB_PARWH( 1 ),
hb_parni( 2 ) ,
(HIMAGELIST) hb_parnl( 3 ),
(HIMAGELIST) HB_PARWH( 3 ),
hb_parni( 4 ) ,
(UINT) hb_parni(5))) ;
}
@@ -215,7 +217,7 @@ HB_FUNC( IMAGELIST_COPY )
HB_FUNC( IMAGELIST_BEGINDRAG )
{
hb_retl( ImageList_BeginDrag((HIMAGELIST) hb_parnl( 1 ),
hb_retl( ImageList_BeginDrag((HIMAGELIST) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ))) ;
@@ -231,7 +233,7 @@ WINCOMMCTRLAPI void WINAPI ImageList_EndDrag(void);
HB_FUNC( IMAGELIST_ENDDRAG )
{
ImageList_EndDrag() ;
ImageList_EndDrag();
}
//-----------------------------------------------------------------------------
@@ -239,7 +241,7 @@ HB_FUNC( IMAGELIST_ENDDRAG )
HB_FUNC( IMAGELIST_DRAGENTER )
{
hb_retl( ImageList_DragEnter( (HWND) hb_parnl(1), hb_parni(2), hb_parni(3)));
hb_retl( ImageList_DragEnter( (HWND) HB_PARWH(1), hb_parni(2), hb_parni(3)));
}
//-----------------------------------------------------------------------------
@@ -247,7 +249,7 @@ HB_FUNC( IMAGELIST_DRAGENTER )
HB_FUNC( IMAGELIST_DRAGLEAVE )
{
hb_retl( ImageList_DragLeave( (HWND) hb_parnl(1)));
hb_retl( ImageList_DragLeave( (HWND) HB_PARWH(1)));
}
//-----------------------------------------------------------------------------
@@ -264,7 +266,7 @@ HB_FUNC( IMAGELIST_MOVE )
HB_FUNC( IMAGELIST_SETDRAGCURSORIMAGE )
{
hb_retl( ImageList_SetDragCursorImage((HIMAGELIST) hb_parnl( 1 ),
hb_retl( ImageList_SetDragCursorImage((HIMAGELIST) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ))) ;
@@ -291,7 +293,7 @@ HB_FUNC( IMAGELIST_GETDRAGIMAGE )
if ( Array2Point(aPt1,&pt) )
if( Array2Point(aPt2,&ptHotspot) )
hb_retnl( (LONG) ImageList_GetDragImage( &pt, &ptHotspot));
HB_RETWH( ImageList_GetDragImage( &pt, &ptHotspot));
}
@@ -303,7 +305,7 @@ HB_FUNC( IMAGELIST_GETICONSIZE )
int cx ;
int cy ;
if ( ImageList_GetIconSize((HIMAGELIST) hb_parnl( 1 ), &cx, &cy) )
if ( ImageList_GetIconSize((HIMAGELIST) HB_PARWH( 1 ), &cx, &cy) )
{
hb_storni( cx, 2 );
hb_storni( cy, 3 );
@@ -318,7 +320,7 @@ HB_FUNC( IMAGELIST_GETICONSIZE )
HB_FUNC( IMAGELIST_SETICONSIZE )
{
hb_retl( ImageList_SetIconSize((HIMAGELIST) hb_parnl( 1 ) ,
hb_retl( ImageList_SetIconSize((HIMAGELIST) HB_PARWH( 1 ) ,
hb_parni( 2 ), hb_parni( 3 ) ) );
}
@@ -332,7 +334,7 @@ HB_FUNC( IMAGELIST_GETIMAGEINFO )
{
IMAGEINFO ii ;
if ( ImageList_GetImageInfo((HIMAGELIST) hb_parnl( 1 ), hb_parni( 2 ), &ii ) )
if ( ImageList_GetImageInfo((HIMAGELIST) HB_PARWH( 1 ), hb_parni( 2 ), &ii ) )
hb_retclen( (char*) &ii, sizeof(IMAGEINFO));
}
@@ -343,9 +345,9 @@ HB_FUNC( IMAGELIST_GETIMAGEINFO )
HB_FUNC( IMAGELIST_MERGE )
{
hb_retnl( (LONG) ImageList_Merge((HIMAGELIST) hb_parnl( 1 ),
HB_RETWH( ImageList_Merge((HIMAGELIST) HB_PARWH( 1 ),
hb_parni( 2 ) ,
(HIMAGELIST) hb_parnl( 3 ),
(HIMAGELIST) HB_PARWH( 3 ),
hb_parni( 4 ) ,
hb_parni( 5 ) ,
hb_parni( 6 ))) ;
@@ -357,5 +359,5 @@ HB_FUNC( IMAGELIST_MERGE )
HB_FUNC( IMAGELIST_DUPLICATE )
{
hb_retnl( (LONG) ImageList_Duplicate((HIMAGELIST) hb_parnl( 1 )));
HB_RETWH( ImageList_Duplicate((HIMAGELIST) HB_PARWH( 1 )));
}

36
harbour/contrib/hbwhat32/whtinet.c
View File

@@ -20,6 +20,8 @@
#define _WIN32_WINNT 0x0400
#define _WIN32_IE 0x0500
#include "hbwhat.h"
#ifndef __MINGW32__
#ifndef __WATCOMC__
@@ -50,7 +52,7 @@
//
HB_FUNC( INTERNETDIAL )
{
HWND hWnd = ISNIL( 1 ) ? 0 : ( HWND ) hb_parnl( 1 );
HWND hWnd = ISNIL( 1 ) ? 0 : ( HWND ) HB_PARWH( 1 );
LPTSTR lpszId = ISNIL( 2 ) ? NULL : hb_parcx( 2 );
DWORD nFlags = INTERNET_AUTODIAL_FORCE_ONLINE ;
DWORD nRet = 0;
@@ -136,7 +138,7 @@ HB_FUNC( INTERNETOPEN )
//
HB_FUNC( INTERNETCONNECT )
{
HINTERNET hInternet = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 );
LPCTSTR lpszServerName = hb_parcx( 2 );
INTERNET_PORT nServerPort = ISNIL( 3 ) ? INTERNET_DEFAULT_HTTP_PORT : ( INTERNET_PORT ) hb_parni( 3 );
LPCTSTR lpszUserName = ISNIL( 4 ) ? NULL : hb_parcx( 4 );
@@ -167,7 +169,7 @@ HB_FUNC( INTERNETCONNECT )
//
HB_FUNC( FTPOPENFILE )
{
HINTERNET hFtp = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hFtp = ( HINTERNET ) HB_PARWH( 1 );
LPCTSTR lpszFileName = hb_parcx( 2 );
DWORD dwAccess = ISNIL( 3 ) ? GENERIC_READ : hb_parni( 3 );
DWORD dwFlags = ISNIL( 4 ) ? FTP_TRANSFER_TYPE_BINARY : hb_parni( 4 );
@@ -192,7 +194,7 @@ HB_FUNC( FTPOPENFILE )
//
HB_FUNC( INTERNETWRITEFILE )
{
HINTERNET hFile = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hFile = ( HINTERNET ) HB_PARWH( 1 );
LPCVOID lpBuffer = hb_parcx( 2 );
DWORD dwNumberOfBytesToWrite = ( DWORD ) hb_parnl( 3 );
LPDWORD lpdwNumberOfBytesWritten = ( LPDWORD ) 0 ;
@@ -220,7 +222,7 @@ HB_FUNC( INTERNETWRITEFILE )
//
HB_FUNC( INTERNETREADFILE )
{
HINTERNET hFile = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hFile = ( HINTERNET ) HB_PARWH( 1 );
LPVOID lpBuffer = hb_parcx( 2 );
DWORD dwNumberOfBytesToRead = ( DWORD ) hb_parnl( 3 );
LPDWORD lpdwNumberOfBytesRead = ( LPDWORD ) 0 ;
@@ -257,7 +259,7 @@ HB_FUNC( INTERNETREADFILE )
//
HB_FUNC( FTPCOMMAND )
{
HINTERNET hInternet = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 );
BOOL fExpectResponse = ISNIL( 2 ) ? 0 : hb_parl( 2 );
DWORD dwFlags = ISNIL( 3 ) ? FTP_TRANSFER_TYPE_BINARY : hb_parnl( 3 );
LPCTSTR lpszCommand = hb_parcx( 4 );
@@ -349,7 +351,7 @@ HB_FUNC( FTPCOMMAND )
//
HB_FUNC( FTPFINDFIRSTFILE )
{
HINTERNET hInternet = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 );
LPCTSTR lpszSearchFile = ISNIL( 2 ) ? TEXT ("*.*") : hb_parcx( 2 );
WIN32_FIND_DATA FindFileData ;
DWORD dwFlags = ISNIL( 4 ) ? INTERNET_FLAG_NEED_FILE : hb_parnl( 4 );
@@ -376,7 +378,7 @@ HB_FUNC( FTPFINDFIRSTFILE )
//
HB_FUNC( INTERNETFINDNEXTFILE )
{
HINTERNET hFind = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hFind = ( HINTERNET ) HB_PARWH( 1 );
WIN32_FIND_DATA FindFileData ;
if ( InternetFindNextFile( hFind, &FindFileData ) )
@@ -408,7 +410,7 @@ HB_FUNC( INTERNETFINDNEXTFILE )
//
HB_FUNC( FTPGETFILE )
{
HINTERNET hInternet = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 );
LPCTSTR lpszRemoteFile = hb_parcx( 2 );
LPCTSTR lpszLocalFile = hb_parcx( 3 );
BOOL fFailIfExist = ISNIL( 4 ) ? FALSE : hb_parl( 4 );
@@ -438,7 +440,7 @@ HB_FUNC( FTPGETFILE )
//
HB_FUNC( FTPPUTFILE )
{
HINTERNET hInternet = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 );
LPCTSTR lpszLocalFile = hb_parcx( 2 );
LPCTSTR lpszRemoteFile = hb_parcx( 3 );
DWORD dwFlags = ISNIL( 4 ) ? FTP_TRANSFER_TYPE_BINARY | INTERNET_FLAG_RELOAD : hb_parnl( 4 );
@@ -461,7 +463,7 @@ HB_FUNC( FTPPUTFILE )
//
HB_FUNC( FTPCREATEDIRECTORY )
{
HINTERNET hInternet = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 );
LPCTSTR lpszDirectory = hb_parcx( 2 );
hb_retl( FtpCreateDirectoryA( hInternet, lpszDirectory ) );
@@ -482,7 +484,7 @@ HB_FUNC( FTPCREATEDIRECTORY )
//
HB_FUNC( FTPREMOVEDIRECTORY )
{
HINTERNET hInternet = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 );
LPCTSTR lpszDirectory = hb_parcx( 2 );
hb_retl( FtpRemoveDirectoryA( hInternet, lpszDirectory ) );
@@ -503,7 +505,7 @@ HB_FUNC( FTPREMOVEDIRECTORY )
//
HB_FUNC( FTPDELETEFILE )
{
HINTERNET hInternet = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 );
LPCTSTR lpszFileName = hb_parcx( 2 );
hb_retl( FtpDeleteFile( hInternet, lpszFileName ) );
@@ -525,7 +527,7 @@ HB_FUNC( FTPDELETEFILE )
//
HB_FUNC( FTPRENAMEFILE )
{
HINTERNET hInternet = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 );
LPCTSTR lpszExisting = hb_parcx( 2 );
LPCTSTR lpszNew = hb_parcx( 3 );
@@ -548,7 +550,7 @@ HB_FUNC( FTPRENAMEFILE )
//
HB_FUNC( FTPGETCURRENTDIRECTORY )
{
HINTERNET hInternet = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 );
LPTSTR lpszCurrentDirectory = ( LPTSTR ) hb_xgrab( MAX_PATH );
DWORD dwCurrentDirectory = MAX_PATH;
BOOL bRet;
@@ -579,7 +581,7 @@ HB_FUNC( FTPGETCURRENTDIRECTORY )
//
HB_FUNC( FTPSETCURRENTDIRECTORY )
{
HINTERNET hInternet = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 );
LPTSTR lpszDirectory = hb_parcx( 2 );
hb_retl( FtpSetCurrentDirectoryA( hInternet, lpszDirectory ) );
@@ -598,7 +600,7 @@ HB_FUNC( FTPSETCURRENTDIRECTORY )
//
HB_FUNC( INTERNETCLOSEHANDLE )
{
HINTERNET hInternet = ( HINTERNET ) hb_parnl( 1 );
HINTERNET hInternet = ( HINTERNET ) HB_PARWH( 1 );
hb_retl( InternetCloseHandle( hInternet ) );
}

53
harbour/contrib/hbwhat32/whtini.c
View File

@@ -56,6 +56,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
//#include <shlobj.h>
#include <windows.h>
//#include <commctrl.h>
@@ -69,10 +71,10 @@
HB_FUNC( GETPROFILESTRING )
{
DWORD nSize = 1024 ;
LPTSTR bBuffer = (LPTSTR) hb_xgrab( nSize ) ;
LPTSTR bBuffer = (LPTSTR) hb_xgrab( nSize );
DWORD dwLen ;
char * lpSection = ISNIL( 1 ) ? NULL : hb_parcx( 1 ) ;
char * lpEntry = ISNIL( 2 ) ? NULL : hb_parcx( 2 ) ;
char * lpSection = ISNIL( 1 ) ? NULL : hb_parcx( 1 );
char * lpEntry = ISNIL( 2 ) ? NULL : hb_parcx( 2 );
char * lpDefault = hb_parc ( 3 );
while ( TRUE )
@@ -80,9 +82,9 @@ HB_FUNC( GETPROFILESTRING )
dwLen = GetProfileString( lpSection , lpEntry ,lpDefault , bBuffer, nSize );
if ( ( ( ( lpSection == NULL ) || ( lpEntry == NULL ) ) && ( nSize - dwLen == 2 ) ) || ( ( lpSection && lpEntry ) && ( nSize - dwLen == 1 ) ) )
{
hb_xfree( bBuffer ) ;
hb_xfree( bBuffer );
nSize *= 2 ;
bBuffer = (LPTSTR) hb_xgrab( nSize ) ;
bBuffer = (LPTSTR) hb_xgrab( nSize );
}
else
break ;
@@ -94,7 +96,7 @@ HB_FUNC( GETPROFILESTRING )
else
hb_retc( lpDefault );
hb_xfree( bBuffer ) ;
hb_xfree( bBuffer );
}
@@ -102,21 +104,21 @@ HB_FUNC( GETPROFILESTRING )
HB_FUNC( GETPRIVATEPROFILESTRING )
{
DWORD nSize = 1024 ;
LPTSTR bBuffer = (LPTSTR) hb_xgrab( nSize ) ;
LPTSTR bBuffer = (LPTSTR) hb_xgrab( nSize );
DWORD dwLen ;
char * lpSection = ISNIL( 1 ) ? NULL : hb_parcx( 1 );
char * lpEntry = ISNIL( 2 ) ? NULL : hb_parcx( 2 ) ;
char * lpEntry = ISNIL( 2 ) ? NULL : hb_parcx( 2 );
char * lpDefault = hb_parcx( 3 );
char * lpFileName = hb_parcx( 4 );
while ( TRUE )
{
dwLen = GetPrivateProfileString( lpSection , lpEntry ,lpDefault , bBuffer, nSize , lpFileName) ;
dwLen = GetPrivateProfileString( lpSection , lpEntry ,lpDefault , bBuffer, nSize , lpFileName);
if ( ( ( ( lpSection == NULL ) || ( lpEntry == NULL ) ) && ( nSize - dwLen == 2 ) ) || ( ( lpSection && lpEntry ) && ( nSize - dwLen == 1 ) ) )
{
hb_xfree( bBuffer ) ;
hb_xfree( bBuffer );
nSize *= 2 ;
bBuffer = (LPTSTR) hb_xgrab( nSize ) ;
bBuffer = (LPTSTR) hb_xgrab( nSize );
}
else
break ;
@@ -127,7 +129,7 @@ HB_FUNC( GETPRIVATEPROFILESTRING )
else
hb_retc( lpDefault );
hb_xfree( bBuffer ) ;
hb_xfree( bBuffer );
}
@@ -139,7 +141,7 @@ HB_FUNC( WRITEPROFILESTRING )
char * lpData = ISCHAR(3) ? hb_parcx( 3 ) : NULL ;
if ( WriteProfileString( lpSection , lpEntry , lpData) )
hb_retl( TRUE ) ;
hb_retl( TRUE );
else
hb_retl(FALSE);
}
@@ -153,7 +155,7 @@ HB_FUNC( WRITEPRIVATEPROFILESTRING )
char * lpFileName= hb_parcx( 4 );
if ( WritePrivateProfileString( lpSection , lpEntry , lpData , lpFileName ) )
hb_retl( TRUE ) ;
hb_retl( TRUE );
else
hb_retl(FALSE);
}
@@ -169,7 +171,7 @@ HB_FUNC( GETPRIVATEPROFILEINT )
(LPCSTR) hb_parcx( 2 ),
hb_parni( 3 ) ,
(LPCSTR) hb_parcx( 4 )
) ) ;
) );
}
@@ -182,7 +184,7 @@ HB_FUNC( GETPROFILEINT )
hb_retni( GetProfileIntA( (LPCSTR) hb_parcx( 1 ),
(LPCSTR) hb_parcx( 2 ),
hb_parni( 3 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -194,7 +196,7 @@ HB_FUNC( GETPROFILESECTION )
hb_retnl( (LONG) GetProfileSectionA( (LPCSTR) hb_parcx( 1 ),
(LPSTR) hb_parcx( 2 ) ,
(DWORD) hb_parnl( 3 )
) ) ;
) );
}
*/
@@ -204,7 +206,7 @@ HB_FUNC( GETPROFILESECTION )
HB_FUNC( WRITEPROFILESECTION )
{
hb_retl( WriteProfileSectionA( (LPCSTR) hb_parcx( 1 ), (LPCSTR) hb_parcx( 2 ) ) ) ;
hb_retl( WriteProfileSectionA( (LPCSTR) hb_parcx( 1 ), (LPCSTR) hb_parcx( 2 ) ) );
}
/*
@@ -218,7 +220,7 @@ HB_FUNC( GETPRIVATEPROFILESECTION )
(LPSTR) hb_parcx( 2 ) ,
(DWORD) hb_parnl( 3 ),
(LPCSTR) hb_parcx( 4 )
) ) ;
) );
}
*/
@@ -231,7 +233,7 @@ HB_FUNC( WRITEPRIVATEPROFILESECTION )
hb_retl( WritePrivateProfileSectionA( (LPCSTR) hb_parcx( 1 ),
(LPCSTR) hb_parcx( 2 ),
(LPCSTR) hb_parcx( 3 )
) ) ;
) );
}
/*
@@ -244,7 +246,7 @@ HB_FUNC( GETPRIVATEPROFILESECTIONNAMES )
hb_retnl( (LONG) GetPrivateProfileSectionNames( (LPSTR) hb_parcx( 1 ) ,
(DWORD) hb_parnl( 2 ),
(LPCSTR) hb_parcx( 3 )
) ) ;
) );
}
*/
//-----------------------------------------------------------------------------
@@ -263,7 +265,7 @@ HB_FUNC( GETPRIVATEPROFILESTRUCT )
lpStruct ,
(UINT) hb_parni( 4 ) ,
(LPCSTR) hb_parcx( 5 )
) ) ;
) );
}
*/
@@ -284,12 +286,7 @@ HB_FUNC( WRITEPRIVATEPROFILESTRUCT )
lpStruct ,
(UINT) hb_parni( 4 ) ,
(LPCSTR) hb_parcx( 5 )
) ) ;
) );
}
*/

78
harbour/contrib/hbwhat32/whtkbrd.c
View File

@@ -20,6 +20,8 @@ Modified functions:
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
//#include <commctrl.h>
//#include <winuser.h>
@@ -33,7 +35,7 @@ Modified functions:
HB_FUNC( OEMKEYSCAN )
{
hb_retnl( OemKeyScan( (WORD) hb_parni(1) ) ) ;
hb_retnl( OemKeyScan( (WORD) hb_parni(1) ) );
}
@@ -45,7 +47,7 @@ HB_FUNC( VKKEYSCAN )
char *Buffer ;
Buffer =hb_parcx( 1 );
hb_retni( VkKeyScan( *Buffer ) ) ;
hb_retni( VkKeyScan( *Buffer ) );
}
@@ -55,9 +57,9 @@ HB_FUNC( VKKEYSCAN )
HB_FUNC( VKKEYSCANEX )
{
char *Buffer ;
Buffer = hb_parcx( 1 ) ;
Buffer = hb_parcx( 1 );
hb_retni( VkKeyScanEx( *Buffer, (HKL) hb_parnl( 2 ) ) ) ;
hb_retni( VkKeyScanEx( *Buffer, (HKL) HB_PARWH( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -66,7 +68,7 @@ HB_FUNC( VKKEYSCANEX )
HB_FUNC( GETKBCODEPAGE )
{
hb_retni( GetKBCodePage( ) ) ;
hb_retni( GetKBCodePage( ) );
}
//-----------------------------------------------------------------------------
@@ -75,7 +77,7 @@ HB_FUNC( GETKBCODEPAGE )
HB_FUNC( GETKEYSTATE )
{
hb_retni( GetKeyState( hb_parni( 1 ) ) ) ;
hb_retni( GetKeyState( hb_parni( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -84,7 +86,7 @@ HB_FUNC( GETKEYSTATE )
HB_FUNC( GETASYNCKEYSTATE )
{
hb_retni( GetAsyncKeyState( hb_parni( 1 ) ) ) ;
hb_retni( GetAsyncKeyState( hb_parni( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -98,7 +100,7 @@ HB_FUNC( GETKEYBOARDSTATE )
BYTE lpKeyState[256] ;
if ( GetKeyboardState( lpKeyState ))
hb_retclen( ( char *) lpKeyState, 256 ) ;
hb_retclen( ( char *) lpKeyState, 256 );
}
@@ -111,7 +113,7 @@ HB_FUNC( GETKEYBOARDSTATE )
HB_FUNC( SETKEYBOARDSTATE )
{
hb_retl( SetKeyboardState( (LPBYTE) hb_parcx(1) ) ) ;
hb_retl( SetKeyboardState( (LPBYTE) hb_parcx(1) ) );
}
@@ -125,9 +127,9 @@ HB_FUNC( GETKEYNAMETEXT )
{
char cText[MAX_PATH] ;
int iRet = GetKeyNameText( hb_parnl( 1 ), cText, MAX_PATH ) ;
int iRet = GetKeyNameText( hb_parnl( 1 ), cText, MAX_PATH );
if ( iRet )
hb_retclen( cText, iRet ) ;
hb_retclen( cText, iRet );
}
@@ -138,7 +140,7 @@ HB_FUNC( GETKEYNAMETEXT )
HB_FUNC( GETKEYBOARDTYPE )
{
hb_retni( GetKeyboardType( hb_parni( 1 ) ) ) ;
hb_retni( GetKeyboardType( hb_parni( 1 ) ) );
}
@@ -148,7 +150,7 @@ HB_FUNC( GETKEYBOARDTYPE )
HB_FUNC( MAPVIRTUALKEY )
{
hb_retni( MapVirtualKey( (UINT) hb_parni( 1 ), (UINT) hb_parni( 2 ) ) ) ;
hb_retni( MapVirtualKey( (UINT) hb_parni( 1 ), (UINT) hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -159,8 +161,8 @@ HB_FUNC( MAPVIRTUALKEYEX )
{
hb_retni( MapVirtualKeyEx( (UINT) hb_parni( 1 ),
(UINT) hb_parni( 2 ),
(HKL) hb_parnl( 3 )
) ) ;
(HKL) HB_PARWH( 3 )
) );
}
//-----------------------------------------------------------------------------
@@ -168,7 +170,7 @@ HB_FUNC( MAPVIRTUALKEYEX )
HB_FUNC( GETINPUTSTATE )
{
hb_retl( GetInputState( ) ) ;
hb_retl( GetInputState( ) );
}
//-----------------------------------------------------------------------------
@@ -177,7 +179,7 @@ HB_FUNC( GETINPUTSTATE )
HB_FUNC( GETQUEUESTATUS )
{
hb_retnl( (LONG) GetQueueStatus( (UINT) hb_parni( 1 ) ) ) ;
hb_retnl( (LONG) GetQueueStatus( (UINT) hb_parni( 1 ) ) );
}
@@ -187,9 +189,9 @@ HB_FUNC( GETQUEUESTATUS )
HB_FUNC( LOADACCELERATORS )
{
hb_retnl( (LONG) LoadAccelerators( (HINSTANCE) hb_parnl( 1 ),
HB_RETWH( LoadAccelerators( (HINSTANCE) HB_PARWH( 1 ),
(LPCSTR) hb_parcx( 2 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -214,17 +216,17 @@ HB_FUNC( CREATEACCELERATORTABLE )
if ( hb_parinfo( 1 ) == HB_IT_ARRAY )
{
iCount = hb_parinfa( 1, 0 );
aAccel = (ACCEL *) hb_xgrab( iCount*sizeof(ACCEL) ) ;
aParam = hb_param( 1, HB_IT_ARRAY ) ;
aAccel = (ACCEL *) hb_xgrab( iCount*sizeof(ACCEL) );
aParam = hb_param( 1, HB_IT_ARRAY );
for ( i= 0 ; i<iCount ; i++ )
{
aSub = hb_itemArrayGet( aParam, i+1 ) ;
aAccel[i].fVirt = (BYTE) hb_arrayGetNI(aSub,1) ;
aAccel[i].key = (WORD) hb_arrayGetNI(aSub,2) ;
aAccel[i].cmd = (WORD) hb_arrayGetNI(aSub,3) ;
aSub = hb_itemArrayGet( aParam, i+1 );
aAccel[i].fVirt = (BYTE) hb_arrayGetNI(aSub,1);
aAccel[i].key = (WORD) hb_arrayGetNI(aSub,2);
aAccel[i].cmd = (WORD) hb_arrayGetNI(aSub,3);
}
hb_retnl( (LONG) CreateAcceleratorTable( aAccel, iCount ) ) ;
hb_xfree(aAccel) ;
HB_RETWH( CreateAcceleratorTable( aAccel, iCount ) );
hb_xfree(aAccel);
}
else
hb_retnl(0);
@@ -236,7 +238,7 @@ HB_FUNC( CREATEACCELERATORTABLE )
HB_FUNC( DESTROYACCELERATORTABLE )
{
hb_retl( DestroyAcceleratorTable( (HACCEL) hb_parnl( 1 ) ) ) ;
hb_retl( DestroyAcceleratorTable( (HACCEL) HB_PARWH( 1 ) ) );
}
@@ -258,9 +260,9 @@ HB_FUNC( COPYACCELERATORTABLE )
int i ;
if ( ISARRAY(2) && ((iCount=hb_parinfa(2,0)) > 0 ) )
lpAccelDst = (LPACCEL) hb_xgrab( iCount * sizeof(ACCEL) ) ;
lpAccelDst = (LPACCEL) hb_xgrab( iCount * sizeof(ACCEL) );
iRet = CopyAcceleratorTable( (HACCEL) hb_parnl( 1 ) ,
iRet = CopyAcceleratorTable( (HACCEL) HB_PARWH( 1 ) ,
(iCount==0 ? NULL : lpAccelDst ) ,
iCount
);
@@ -270,8 +272,8 @@ HB_FUNC( COPYACCELERATORTABLE )
// read accelerator table elements into a subarrays
// and store them into the original array elements
aParam = hb_param( 2, HB_IT_ARRAY ) ;
aSub = hb_itemArrayNew( 3 ) ;
aParam = hb_param( 2, HB_IT_ARRAY );
aSub = hb_itemArrayNew( 3 );
for ( i = 0 ; i < iCount ; i++ )
{
hb_arraySetNI( aSub, 1, lpAccelDst->fVirt );
@@ -295,10 +297,10 @@ HB_FUNC( COPYACCELERATORTABLE )
HB_FUNC( TRANSLATEACCELERATOR )
{
LPMSG lpMsg = ( MSG * ) hb_parc( 3 ); //hb_param(3, HB_IT_STRING)->item.asString.value;
hb_retni( TranslateAccelerator( (HWND) hb_parnl( 1 ) ,
(HACCEL) hb_parnl( 2 ),
hb_retni( TranslateAccelerator( (HWND) HB_PARWH( 1 ) ,
(HACCEL) HB_PARWH( 2 ),
lpMsg
) ) ;
) );
}
/*
@@ -328,12 +330,12 @@ HB_FUNC( CALLNEXTHOOKEX )
HB_FUNC( SETWINDOWSHOOKEX )
{
SetWindowsHookEx( (int) hb_parni(1), (HOOKPROC) hb_parnl(2), (HINSTANCE) hb_parnl(3), (DWORD) hb_parnl(4) );
SetWindowsHookEx( (int) hb_parni(1), (HOOKPROC) HB_PARWH(2), (HINSTANCE) HB_PARWH(3), (DWORD) hb_parnl(4) );
}
HB_FUNC( MAKEPROCINSTANCE )
{
hb_retc( (FARPROC) MakeProcInstance( (FARPROC) hb_parcx(1), (HINSTANCE) hb_parnl(2) ) );
hb_retc( (FARPROC) MakeProcInstance( (FARPROC) hb_parcx(1), (HINSTANCE) HB_PARWH(2) ) );
}
@@ -343,7 +345,7 @@ HB_FUNC( MAKEPROCINSTANCE )
HB_FUNC( UNHOOKWINDOWSHOOKEX )
{
UnhookWindowsHookEx( (HHOOK) hb_parni(1) );
UnhookWindowsHookEx( (HHOOK) HB_PARWH(1) );
}

22
harbour/contrib/hbwhat32/whtlv.c
View File

@@ -4,6 +4,8 @@
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -18,33 +20,33 @@
HB_FUNC( LISTVIEW_DELETEALLITEMS )
{
ListView_DeleteAllItems( (HWND) hb_parnl(1) );
ListView_DeleteAllItems( (HWND) HB_PARWH(1) );
}
HB_FUNC( LISTVIEW_DELETECOLUMN )
{
ListView_DeleteColumn( (HWND) hb_parnl(1), (INT) hb_parni(2) );
ListView_DeleteColumn( (HWND) HB_PARWH(1), (INT) hb_parni(2) );
}
HB_FUNC( LISTVIEW_ENSUREVISIBLE )
{
hb_retl(ListView_EnsureVisible( (HWND) hb_parnl(1), hb_parni(2), hb_parl(3) ));
hb_retl(ListView_EnsureVisible( (HWND) HB_PARWH(1), hb_parni(2), hb_parl(3) ));
}
HB_FUNC( LISTVIEW_INSERTCOLUMN )
{
LV_COLUMN *lvColumn = ( LV_COLUMN *) hb_parc( 3 ); //hb_param( 3, HB_IT_STRING )->item.asString.value ;
ListView_InsertColumn( (HWND)hb_parnl(1), hb_parni(2), lvColumn );
ListView_InsertColumn( (HWND)HB_PARWH(1), hb_parni(2), lvColumn );
}
HB_FUNC( LISTVIEW_SETITEMCOUNT )
{
ListView_SetItemCount( (HWND) hb_parnl(1), hb_parnl(2) );
ListView_SetItemCount( (HWND) HB_PARWH(1), hb_parnl(2) );
}
HB_FUNC( LISTVIEW_GETNEXTITEM )
{
hb_retnl(ListView_GetNextItem( (HWND) hb_parnl(1), hb_parni(2), hb_parnl(3) ));
hb_retni( ListView_GetNextItem( (HWND) HB_PARWH(1), hb_parni(2), hb_parnl(3) ));
}
HB_FUNC( LISTVIEWNOTIFY )
@@ -70,8 +72,8 @@ HB_FUNC( LISTVIEWNOTIFY )
pSymTest = hb_dynsymFind( "_WINLVGETDBINFO" );
if ( pSymTest )
{
pArray = hb_param( 3, HB_IT_ARRAY ) ;
DArray = hb_param( 4, HB_IT_ARRAY ) ;
pArray = hb_param( 3, HB_IT_ARRAY );
DArray = hb_param( 4, HB_IT_ARRAY );
cAlias = hb_parcx(5);
hb_vmPushSymbol( hb_itemGetSymbol( pSymTest ) ); //pSymTest->pSymbol );
hb_vmPushNil();
@@ -95,8 +97,8 @@ HB_FUNC( LISTVIEWNOTIFY )
pSymTest = hb_dynsymFind( "_WINLVGETDBINFO" );
if ( pSymTest )
{
pArray = hb_param( 3, HB_IT_ARRAY ) ;
DArray = hb_param( 4, HB_IT_ARRAY ) ;
pArray = hb_param( 3, HB_IT_ARRAY );
DArray = hb_param( 4, HB_IT_ARRAY );
cAlias = hb_parcx(5);
hb_vmPushSymbol( hb_itemGetSymbol( pSymTest ) ); //pSymTest->pSymbol );
hb_vmPushNil();

6
harbour/contrib/hbwhat32/whtmain.c
View File

@@ -52,6 +52,8 @@
#define HB_OS_WIN_32_USED
#include "hbwhat.h"
#include "hbapi.h"
#if defined(HB_OS_WIN_32)
@@ -63,7 +65,7 @@ HB_FUNC( HINSTANCE )
hb_winmainArgGet( &hInstance, NULL, NULL );
hb_retnl( ( LONG ) hInstance );
HB_RETWH( hInstance );
}
HB_FUNC( HPREVINSTANCE )
@@ -72,7 +74,7 @@ HB_FUNC( HPREVINSTANCE )
hb_winmainArgGet( NULL, &hPrevInstance, NULL );
hb_retnl( ( LONG ) hPrevInstance );
HB_RETWH( hPrevInstance );
}
HB_FUNC( NCMDSHOW )

2
harbour/contrib/hbwhat32/whtmapi.c
View File

@@ -2,6 +2,8 @@
* $Id$
*/
#include "hbwhat.h"
#include <windows.h>
#include <mapi.h>
#include "hbapi.h"

59
harbour/contrib/hbwhat32/whtmem.c
View File

@@ -7,6 +7,8 @@
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -22,7 +24,7 @@
HB_FUNC( GLOBALALLOC )
{
hb_retnl( (LONG) GlobalAlloc( (UINT) hb_parni( 1 ),(SIZE_T) hb_parnl(2) ) ) ;
HB_RETWH( GlobalAlloc( (UINT) hb_parni( 1 ),(SIZE_T) hb_parnl(2) ) );
}
@@ -32,10 +34,10 @@ HB_FUNC( GLOBALALLOC )
HB_FUNC( GLOBALREALLOC )
{
hb_retnl( (LONG) GlobalReAlloc( (HGLOBAL) hb_parnl( 1 ),
HB_RETWH( GlobalReAlloc( (HGLOBAL) HB_PARWH( 1 ),
(SIZE_T) hb_parnl( 2 ) ,
(UINT) hb_parni( 3 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -43,7 +45,7 @@ HB_FUNC( GLOBALREALLOC )
HB_FUNC( GLOBALSIZE )
{
hb_retnl( (LONG) GlobalSize( (HGLOBAL) hb_parnl( 1 ) ) ) ;
hb_retnl( (LONG) GlobalSize( (HGLOBAL) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -51,7 +53,7 @@ HB_FUNC( GLOBALSIZE )
HB_FUNC( GLOBALFLAGS )
{
hb_retni( (UINT) GlobalFlags( (HGLOBAL) hb_parnl( 1 ) ) ) ;
hb_retni( (UINT) GlobalFlags( (HGLOBAL) HB_PARWH( 1 ) ) );
}
@@ -60,7 +62,7 @@ HB_FUNC( GLOBALFLAGS )
HB_FUNC( GLOBALLOCK )
{
hb_retnl( (LONG) GlobalLock( (HGLOBAL) hb_parnl( 1 ) ) ) ;
HB_RETWH( GlobalLock( (HGLOBAL) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -68,7 +70,7 @@ HB_FUNC( GLOBALLOCK )
HB_FUNC( GLOBALHANDLE )
{
hb_retnl( (LONG) GlobalHandle( (LPCVOID) hb_parnl(1) ) ) ;
HB_RETWH( GlobalHandle( (LPCVOID) HB_PARWH(1) ) );
}
@@ -78,7 +80,7 @@ HB_FUNC( GLOBALHANDLE )
HB_FUNC( GLOBALUNLOCK )
{
hb_retl( GlobalUnlock( (HGLOBAL) hb_parnl( 1 ) ) ) ;
hb_retl( GlobalUnlock( (HGLOBAL) HB_PARWH( 1 ) ) );
}
@@ -88,7 +90,7 @@ HB_FUNC( GLOBALUNLOCK )
HB_FUNC( GLOBALFREE )
{
hb_retnl( (LONG) GlobalFree( (HGLOBAL) hb_parnl( 1 ) ) ) ;
HB_RETWH( GlobalFree( (HGLOBAL) HB_PARWH( 1 ) ) );
}
@@ -99,7 +101,7 @@ HB_FUNC( GLOBALFREE )
HB_FUNC( GLOBALCOMPACT )
{
// (SIZE_T) GlobalCompact( (DWORD) hb_parnl( 1 ) ) ) ;
// (SIZE_T) GlobalCompact( (DWORD) hb_parnl( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -109,7 +111,7 @@ HB_FUNC( GLOBALCOMPACT )
HB_FUNC( GLOBALFIX )
{
GlobalFix( (HGLOBAL) hb_parnl( 1 ) ) ;
GlobalFix( (HGLOBAL) HB_PARWH( 1 ) );
}
//-----------------------------------------------------------------------------
@@ -119,7 +121,7 @@ HB_FUNC( GLOBALFIX )
HB_FUNC( GLOBALUNFIX )
{
GlobalUnfix( (HGLOBAL) hb_parnl( 1 ) ) ;
GlobalUnfix( (HGLOBAL) HB_PARWH( 1 ) );
}
//-----------------------------------------------------------------------------
@@ -129,7 +131,7 @@ HB_FUNC( GLOBALUNFIX )
HB_FUNC( GLOBALWIRE )
{
hb_retnl( (LONG) GlobalWire( (HGLOBAL) hb_parnl( 1 ) ) ) ;
HB_RETWH( GlobalWire( (HGLOBAL) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -139,7 +141,7 @@ HB_FUNC( GLOBALWIRE )
HB_FUNC( GLOBALUNWIRE )
{
hb_retl( GlobalUnWire( (HGLOBAL) hb_parnl( 1 ) ) ) ;
hb_retl( GlobalUnWire( (HGLOBAL) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -157,7 +159,7 @@ HB_FUNC( GLOBALMEMORYSTATUS )
// Your code goes here
GlobalMemoryStatus( lpBuffer ) ;
GlobalMemoryStatus( lpBuffer );
}
Last change: WN 29 May 2002 11:26 pm
@@ -177,7 +179,7 @@ HB_FUNC( GLOBALMEMORYSTATUSEX )
// Your code goes here
hb_retl( GlobalMemoryStatusEx( lpBuffer ) ) ;
hb_retl( GlobalMemoryStatusEx( lpBuffer ) );
}
*/
@@ -187,7 +189,7 @@ HB_FUNC( GLOBALMEMORYSTATUSEX )
HB_FUNC( LOCALALLOC )
{
hb_retnl( (LONG) LocalAlloc( (UINT) hb_parni( 1 ), (SIZE_T) hb_parni( 2 ) ) ) ;
HB_RETWH( LocalAlloc( (UINT) hb_parni( 1 ), (SIZE_T) hb_parni( 2 ) ) );
}
@@ -197,10 +199,10 @@ HB_FUNC( LOCALALLOC )
HB_FUNC( LOCALREALLOC )
{
hb_retnl( (LONG) LocalReAlloc( (HLOCAL) hb_parnl( 1 ),
HB_RETWH( LocalReAlloc( (HLOCAL) HB_PARWH( 1 ),
(SIZE_T) hb_parni( 2 ) ,
(UINT) hb_parni( 3 )
) ) ;
) );
}
@@ -210,7 +212,7 @@ HB_FUNC( LOCALREALLOC )
HB_FUNC( LOCALLOCK )
{
hb_retnl( (LONG) LocalLock( (HLOCAL) hb_parnl( 1 ) ) ) ;
HB_RETWH( LocalLock( (HLOCAL) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -219,7 +221,7 @@ HB_FUNC( LOCALLOCK )
HB_FUNC( LOCALHANDLE )
{
hb_retnl( (LONG) LocalHandle( (LPCVOID) hb_parnl(1) ) ) ;
HB_RETWH( LocalHandle( (LPCVOID) HB_PARWH(1) ) );
}
@@ -229,7 +231,7 @@ HB_FUNC( LOCALHANDLE )
HB_FUNC( LOCALUNLOCK )
{
hb_retl( LocalUnlock( (HLOCAL) hb_parnl( 1 ) ) ) ;
hb_retl( LocalUnlock( (HLOCAL) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -238,7 +240,7 @@ HB_FUNC( LOCALUNLOCK )
HB_FUNC( LOCALSIZE )
{
hb_retni( LocalSize( (HLOCAL) hb_parnl( 1 ) ) ) ;
hb_retni( LocalSize( (HLOCAL) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -247,7 +249,7 @@ HB_FUNC( LOCALSIZE )
HB_FUNC( LOCALFLAGS )
{
hb_retni( LocalFlags( (HLOCAL) hb_parnl( 1 ) ) ) ;
hb_retni( LocalFlags( (HLOCAL) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -256,7 +258,7 @@ HB_FUNC( LOCALFLAGS )
HB_FUNC( LOCALFREE )
{
hb_retnl( (LONG) LocalFree( (HLOCAL) hb_parnl( 1 ) ) ) ;
HB_RETWH( LocalFree( (HLOCAL) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -265,7 +267,7 @@ HB_FUNC( LOCALFREE )
HB_FUNC( LOCALSHRINK )
{
hb_retni( LocalShrink( (HLOCAL) hb_parnl( 1 ), (UINT) hb_parni( 2 ) ) ) ;
hb_retni( LocalShrink( (HLOCAL) HB_PARWH( 1 ), (UINT) hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -274,8 +276,5 @@ HB_FUNC( LOCALSHRINK )
HB_FUNC( LOCALCOMPACT )
{
hb_retni( LocalCompact( (UINT) hb_parni( 1 ) ) ) ;
hb_retni( LocalCompact( (UINT) hb_parni( 1 ) ) );
}

93
harbour/contrib/hbwhat32/whtmenu.c
View File

@@ -8,6 +8,8 @@
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -22,7 +24,7 @@
HB_FUNC( APPENDMENU )
{
hb_retl( AppendMenu( (HMENU) hb_parnl(1), hb_parni(2), hb_parni(3), hb_parcx(4)) ) ;
hb_retl( AppendMenu( (HMENU) HB_PARWH(1), hb_parni(2), hb_parni(3), hb_parcx(4)) );
}
@@ -30,28 +32,28 @@ HB_FUNC( APPENDMENU )
HB_FUNC( CHECKMENUITEM )
{
hb_retnl( CheckMenuItem((HMENU) hb_parnl(1), hb_parni(2), hb_parni(3)) ) ;
hb_retnl( CheckMenuItem((HMENU) HB_PARWH(1), hb_parni(2), hb_parni(3)) );
}
//-----------------------------------------------------------------------------
HB_FUNC( CREATEMENU )
{
hb_retnl( (LONG) CreateMenu() ) ;
HB_RETWH( CreateMenu() );
}
//-----------------------------------------------------------------------------
HB_FUNC( CREATEPOPUPMENU )
{
hb_retnl( (LONG) CreatePopupMenu() ) ;
HB_RETWH( CreatePopupMenu() );
}
//-----------------------------------------------------------------------------
HB_FUNC( DELETEMENU )
{
hb_retl( DeleteMenu( (HMENU) hb_parnl(1), hb_parni(2), hb_parni(3) ) );
hb_retl( DeleteMenu( (HMENU) HB_PARWH(1), hb_parni(2), hb_parni(3) ) );
}
//-----------------------------------------------------------------------------
@@ -59,7 +61,7 @@ HB_FUNC( DELETEMENU )
HB_FUNC( DESTROYMENU )
{
hb_retl( DestroyMenu( (HMENU) hb_parnl(1) ) ) ;
hb_retl( DestroyMenu( (HMENU) HB_PARWH(1) ) );
}
//-----------------------------------------------------------------------------
@@ -67,7 +69,7 @@ HB_FUNC( DESTROYMENU )
HB_FUNC( GETMENU )
{
hb_retnl( (LONG) GetMenu( (HWND) hb_parnl(1) ) ) ;
HB_RETWH( GetMenu( (HWND) HB_PARWH(1) ) );
}
//-----------------------------------------------------------------------------
@@ -75,30 +77,30 @@ HB_FUNC( GETMENU )
HB_FUNC( GETMENUITEMID )
{
hb_retni( GetMenuItemID(
(HMENU) hb_parnl( 1 ), // handle to menu
(HMENU) HB_PARWH( 1 ), // handle to menu
(int) hb_parni( 2 ) // position of menu item
) ) ;
) );
}
//-----------------------------------------------------------------------------
HB_FUNC( DRAWMENUBAR )
{
hb_retl( DrawMenuBar( (HWND) hb_parnl(1))) ;
hb_retl( DrawMenuBar( (HWND) HB_PARWH(1)));
}
//-----------------------------------------------------------------------------
HB_FUNC( ENABLEMENUITEM )
{
hb_retl( EnableMenuItem( (HMENU) hb_parnl(1), hb_parni(2), hb_parni(3) ) ) ;
hb_retl( EnableMenuItem( (HMENU) HB_PARWH(1), hb_parni(2), hb_parni(3) ) );
}
//-----------------------------------------------------------------------------
HB_FUNC( GETMENUSTATE )
{
hb_retni( GetMenuState( (HMENU) hb_parnl(1), hb_parni(2), hb_parni(3)) ) ;
hb_retni( GetMenuState( (HMENU) HB_PARWH(1), hb_parni(2), hb_parni(3)) );
}
//-----------------------------------------------------------------------------
@@ -107,7 +109,7 @@ HB_FUNC( GETMENUSTRING )
{
char cText[MAX_PATH+1] ={0};
GetMenuString( (HMENU) hb_parnl(1), hb_parni(2),(LPSTR) cText, MAX_PATH, hb_parni(3) );
GetMenuString( (HMENU) HB_PARWH(1), hb_parni(2),(LPSTR) cText, MAX_PATH, hb_parni(3) );
hb_retc( cText );
@@ -117,42 +119,42 @@ HB_FUNC( GETMENUSTRING )
HB_FUNC( HILITEMENUITEM )
{
hb_retl( HiliteMenuItem( (HWND) hb_parnl(1), (HMENU) hb_parnl(2), hb_parni(3), hb_parni(4)) ) ;
hb_retl( HiliteMenuItem( (HWND) HB_PARWH(1), (HMENU) HB_PARWH(2), hb_parni(3), hb_parni(4)) );
}
//-----------------------------------------------------------------------------
HB_FUNC( INSERTMENU )
{
hb_retl( InsertMenu( (HMENU) hb_parnl(1), hb_parni(2), hb_parni(3), hb_parni(4), hb_parcx(5)) );
hb_retl( InsertMenu( (HMENU) HB_PARWH(1), hb_parni(2), hb_parni(3), hb_parni(4), hb_parcx(5)) );
}
//-----------------------------------------------------------------------------
HB_FUNC( SETMENUITEMBITMAPS )
{
hb_retl( SetMenuItemBitmaps( (HMENU) hb_parnl(1), hb_parni(2), hb_parni(3), (HBITMAP) hb_parnl(4), (HBITMAP) hb_parnl(5)) );
hb_retl( SetMenuItemBitmaps( (HMENU) HB_PARWH(1), hb_parni(2), hb_parni(3), (HBITMAP) HB_PARWH(4), (HBITMAP) HB_PARWH(5)) );
}
//-----------------------------------------------------------------------------
HB_FUNC( GETMENUITEMCOUNT )
{
hb_retni( GetMenuItemCount( (HMENU) hb_parnl(1) )) ;
hb_retni( GetMenuItemCount( (HMENU) HB_PARWH(1) ));
}
//-----------------------------------------------------------------------------
HB_FUNC( SETMENU )
{
hb_retl( SetMenu ((HWND) hb_parnl(1), (HMENU) hb_parnl(2) ) );
hb_retl( SetMenu ((HWND) HB_PARWH(1), (HMENU) HB_PARWH(2) ) );
}
//-----------------------------------------------------------------------------
HB_FUNC( GETSUBMENU )
{
hb_retnl( (LONG) GetSubMenu( (HMENU) hb_parnl(1), hb_parni(2)) );
HB_RETWH( GetSubMenu( (HMENU) HB_PARWH(1), hb_parni(2)) );
}
//-----------------------------------------------------------------------------
@@ -167,15 +169,15 @@ HB_FUNC( TRACKPOPUPMENU )
rc.right = hb_parni(7,3);
rc.bottom = hb_parni(7,4);
}
hb_retnl( TrackPopupMenu((HMENU) hb_parnl(1), hb_parni(2), hb_parni(3), hb_parni(4),
hb_parni(5), (HWND) hb_parnl(6), (ISNIL(7) ? NULL : &rc) ) ) ;
hb_retnl( TrackPopupMenu((HMENU) HB_PARWH(1), hb_parni(2), hb_parni(3), hb_parni(4),
hb_parni(5), (HWND) HB_PARWH(6), (ISNIL(7) ? NULL : &rc) ) );
}
//-----------------------------------------------------------------------------
HB_FUNC( GETSYSTEMMENU )
{
hb_retnl( (LONG) GetSystemMenu( (HWND) hb_parnl(1), hb_parl(2) ) );
HB_RETWH( GetSystemMenu( (HWND) HB_PARWH(1), hb_parl(2) ) );
}
@@ -185,7 +187,7 @@ HB_FUNC( GETSYSTEMMENU )
HB_FUNC( LOADMENU )
{
hb_retnl( (LONG) LoadMenu( (HINSTANCE) hb_parnl( 1 ), (LPCSTR) hb_parcx( 2 ) ) ) ;
HB_RETWH( LoadMenu( (HINSTANCE) HB_PARWH( 1 ), (LPCSTR) hb_parcx( 2 ) ) );
}
@@ -197,7 +199,7 @@ HB_FUNC( LOADMENUINDIRECT )
{
MENUTEMPLATE *mt =(MENUTEMPLATE * ) hb_parc( 1 ); //hb_param( 1, HB_IT_STRING )->item.asString.value;
hb_retnl( (LONG) LoadMenuIndirect( mt ) ) ;
HB_RETWH( LoadMenuIndirect( mt ) );
}
@@ -206,12 +208,12 @@ HB_FUNC( LOADMENUINDIRECT )
HB_FUNC( CHANGEMENU )
{
hb_retl( ChangeMenu( (HMENU) hb_parnl( 1 ),
hb_retl( ChangeMenu( (HMENU) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ,
(LPCSTR) hb_parcx( 3 ),
(UINT) hb_parni( 4 ) ,
(UINT) hb_parni( 5 )
) ) ;
) );
}
@@ -220,10 +222,10 @@ HB_FUNC( CHANGEMENU )
HB_FUNC( REMOVEMENU )
{
hb_retl( RemoveMenu( (HMENU) hb_parnl( 1 ),
hb_retl( RemoveMenu( (HMENU) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ,
(UINT) hb_parni( 3 )
) ) ;
) );
}
@@ -233,7 +235,7 @@ HB_FUNC( REMOVEMENU )
HB_FUNC( GETMENUCHECKMARKDIMENSIONS )
{
hb_retnl( (LONG) GetMenuCheckMarkDimensions( ) ) ;
hb_retnl( (LONG) GetMenuCheckMarkDimensions( ) );
}
@@ -249,12 +251,12 @@ HB_FUNC( MODIFYMENU )
// Your code goes here
hb_retl( ModifyMenu( (HMENU) hb_parnl( 1 ),
hb_retl( ModifyMenu( (HMENU) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ,
(UINT) hb_parni( 3 ) ,
uIDNewItem ,
(LPCSTR) hb_parcx( 5 )
) ) ;
) );
}
*/
@@ -273,7 +275,7 @@ HB_FUNC( GETMENUINFO )
// Your code goes here
hb_retl( GetMenuInfo( (HMENU) hb_parnl( 1 ), lpmenuInfo ) ) ;
hb_retl( GetMenuInfo( (HMENU) HB_PARWH( 1 ), lpmenuInfo ) );
}
*/
@@ -286,7 +288,7 @@ HB_FUNC( GETMENUINFO )
HB_FUNC( SETMENUINFO )
{
LPCMENUINFO lpcmenuInfo =(LPCMENUINFO) hb_param( 2, HB_IT_STRING )->item.asString.value;
hb_retl( SetMenuInfo( (HMENU) hb_parnl( 1 ), lpcmenuInfo ) ) ;
hb_retl( SetMenuInfo( (HMENU) HB_PARWH( 1 ), lpcmenuInfo ) );
}
*/
@@ -297,7 +299,7 @@ HB_FUNC( SETMENUINFO )
#if (WINVER >=0x0500)
HB_FUNC( ENDMENU )
{
hb_retl( EndMenu() ) ;
hb_retl( EndMenu() );
}
#endif
//-----------------------------------------------------------------------------
@@ -309,11 +311,11 @@ HB_FUNC( INSERTMENUITEM )
{
LPCMENUITEMINFOA lpcmenuitemInfoa =(LPCMENUITEMINFOA) hb_parc( 4 ); //hb_param( 4, HB_IT_STRING )->item.asString.value;
hb_retl( InsertMenuItem( (HMENU) hb_parnl( 1 ),
hb_retl( InsertMenuItem( (HMENU) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ,
hb_parl( 3 ) ,
lpcmenuitemInfoa
) ) ;
) );
}
@@ -326,11 +328,11 @@ HB_FUNC( INSERTMENUITEM )
HB_FUNC( GETMENUITEMINFO )
{
LPCMENUITEMINFOA lpcmenuitemInfoa =(LPCMENUITEMINFOA) hb_parc( 4 ); //hb_param( 4, HB_IT_STRING )->item.asString.value;
hb_retl( GetMenuItemInfo( (HMENU) hb_parnl( 1 ),
hb_retl( GetMenuItemInfo( (HMENU) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ,
hb_parl( 3 ) ,
( struct tagMENUITEMINFOA * ) lpcmenuitemInfoa
) ) ;
) );
}
@@ -343,11 +345,11 @@ HB_FUNC( GETMENUITEMINFO )
HB_FUNC( SETMENUITEMINFO )
{
LPCMENUITEMINFOA lpcmenuitemInfoa =(LPCMENUITEMINFOA) hb_parc( 4 ); //hb_param( 4, HB_IT_STRING )->item.asString.value;
hb_retl( SetMenuItemInfo( (HMENU) hb_parnl( 1 ),
hb_retl( SetMenuItemInfo( (HMENU) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ,
hb_parl( 3 ) ,
lpcmenuitemInfoa
) ) ;
) );
}
@@ -364,11 +366,11 @@ HB_FUNC( GETMENUBARINFO )
// Your code goes here
hb_retl( GetMenuBarInfo( (HWND) hb_parnl( 1 ),
hb_retl( GetMenuBarInfo( (HWND) HB_PARWH( 1 ),
hb_parnl( 2 ) ,
hb_parnl( 3 ) ,
pmbi
) ) ;
) );
}
*/
@@ -383,12 +385,11 @@ HB_FUNC( GETMENUBARINFO )
HB_FUNC( CHECKMENURADIOITEM )
{
hb_retl( CheckMenuRadioItem( (HMENU) hb_parnl( 1 ), (UINT) hb_parni(2),
(UINT) hb_parni(3), (UINT) hb_parni(4), (UINT) hb_parni(5) ) ) ;
hb_retl( CheckMenuRadioItem( (HMENU) HB_PARWH( 1 ), (UINT) hb_parni(2),
(UINT) hb_parni(3), (UINT) hb_parni(4), (UINT) hb_parni(5) ) );
}
HB_FUNC( ISMENU )
{
hb_retl( IsMenu((HMENU) hb_parnl(1) ) );
hb_retl( IsMenu((HMENU) HB_PARWH(1) ) );
}

105
harbour/contrib/hbwhat32/whtmeta.c
View File

@@ -9,6 +9,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -40,7 +42,7 @@ extern BOOL Array2Point(PHB_ITEM aPoint, POINT *pt );
HB_FUNC( CREATEMETAFILE )
{
hb_retnl( (LONG) CreateMetaFile( (LPCSTR) hb_parcx( 1 ) ) ) ;
HB_RETWH( CreateMetaFile( (LPCSTR) hb_parcx( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -49,9 +51,9 @@ HB_FUNC( CREATEMETAFILE )
HB_FUNC( COPYMETAFILE )
{
hb_retnl( (LONG) CopyMetaFile( (HMETAFILE) hb_parnl( 1 ),
HB_RETWH( CopyMetaFile( (HMETAFILE) HB_PARWH( 1 ),
(LPCSTR) hb_parcx( 2 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -60,7 +62,7 @@ HB_FUNC( COPYMETAFILE )
HB_FUNC( CLOSEMETAFILE )
{
hb_retnl( (LONG) CloseMetaFile( (HDC) hb_parnl( 1 ) ) ) ;
HB_RETWH( CloseMetaFile( (HDC) HB_PARWH( 1 ) ) );
}
@@ -70,7 +72,7 @@ HB_FUNC( CLOSEMETAFILE )
HB_FUNC( DELETEMETAFILE )
{
hb_retl( DeleteMetaFile( (HMETAFILE) hb_parnl( 1 ) ) ) ;
hb_retl( DeleteMetaFile( (HMETAFILE) HB_PARWH( 1 ) ) );
}
@@ -80,7 +82,7 @@ HB_FUNC( DELETEMETAFILE )
HB_FUNC( GETMETAFILE )
{
hb_retnl( (LONG) GetMetaFile( (LPCSTR) hb_parcx( 1 ) ) ) ;
HB_RETWH( GetMetaFile( (LPCSTR) hb_parcx( 1 ) ) );
}
@@ -94,7 +96,7 @@ HB_FUNC( GETMETAFILE )
HB_FUNC( PLAYMETAFILE )
{
hb_retl( PlayMetaFile( (HDC) hb_parnl( 1 ), (HMETAFILE) hb_parnl( 2 ) ) ) ;
hb_retl( PlayMetaFile( (HDC) HB_PARWH( 1 ), (HMETAFILE) HB_PARWH( 2 ) ) );
}
@@ -109,10 +111,10 @@ HB_FUNC( GETMETAFILEBITSEX )
// Your code goes here
hb_retni( GetMetaFileBitsEx( (HMETAFILE) hb_parnl( 1 ),
hb_retni( GetMetaFileBitsEx( (HMETAFILE) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ,
lpVoid
) ) ;
) );
}
*/
@@ -131,11 +133,11 @@ HB_FUNC( ENUMMETAFILE )
// Your code goes here
hb_retl( EnumMetaFile( (HDC) hb_parnl( 1 ) ,
(HMETAFILE) hb_parnl( 2 ),
hb_retl( EnumMetaFile( (HDC) HB_PARWH( 1 ) ,
(HMETAFILE) HB_PARWH( 2 ),
mfEnumProc ,
lParam
) ) ;
) );
}
*/
@@ -151,7 +153,7 @@ HB_FUNC( SETMETAFILEBITSEX )
// Your code goes here
hb_retnl( (LONG) SetMetaFileBitsEx( (UINT) hb_parni( 1 ), &BYTE ) ) ;
HB_RETWH( SetMetaFileBitsEx( (UINT) hb_parni( 1 ), &BYTE ) );
}
*/
@@ -172,11 +174,11 @@ HB_FUNC( CREATEENHMETAFILE )
RECT rc ;
if ( ISARRAY(3) && Array2Rect( hb_param(3,HB_IT_ARRAY), &rc ))
hb_retnl( (LONG) CreateEnhMetaFile( (HDC) hb_parnl( 1 ) ,
HB_RETWH( CreateEnhMetaFile( (HDC) HB_PARWH( 1 ) ,
(LPCSTR) hb_parcx( 2 ),
&rc ,
ISNIL(4) ? NULL : (LPCSTR) hb_parcx( 4 )
) ) ;
) );
}
@@ -187,7 +189,7 @@ HB_FUNC( CREATEENHMETAFILE )
HB_FUNC( GETENHMETAFILE )
{
hb_retnl( (LONG) GetEnhMetaFile( (LPCSTR) hb_parcx( 1 ) ) ) ;
HB_RETWH( GetEnhMetaFile( (LPCSTR) hb_parcx( 1 ) ) );
}
@@ -196,7 +198,7 @@ HB_FUNC( GETENHMETAFILE )
HB_FUNC( GETMETARGN )
{
hb_retni( GetMetaRgn( (HDC) hb_parnl( 1 ), (HRGN) hb_parnl( 2 ) ) ) ;
hb_retni( GetMetaRgn( (HDC) HB_PARWH( 1 ), (HRGN) HB_PARWH( 2 ) ) );
}
@@ -206,7 +208,7 @@ HB_FUNC( GETMETARGN )
HB_FUNC( SETMETARGN )
{
hb_retni( SetMetaRgn( (HDC) hb_parnl( 1 ) ) ) ;
hb_retni( SetMetaRgn( (HDC) HB_PARWH( 1 ) ) );
}
@@ -214,7 +216,7 @@ HB_FUNC( SETMETARGN )
HB_FUNC( CLOSEENHMETAFILE )
{
hb_retnl( (LONG) CloseEnhMetaFile( (HDC) hb_parnl(1) ) );
HB_RETWH( CloseEnhMetaFile( (HDC) HB_PARWH(1) ) );
}
@@ -225,7 +227,7 @@ HB_FUNC( CLOSEENHMETAFILE )
HB_FUNC( DELETEENHMETAFILE )
{
hb_retl( DeleteEnhMetaFile( (HENHMETAFILE) hb_parnl( 1 ) ) ) ;
hb_retl( DeleteEnhMetaFile( (HENHMETAFILE) HB_PARWH( 1 ) ) );
}
@@ -238,10 +240,10 @@ HB_FUNC( PLAYENHMETAFILE )
RECT rc ;
if ( ISARRAY(3) && Array2Rect( hb_param(3,HB_IT_ARRAY), &rc ))
hb_retl( PlayEnhMetaFile( (HDC) hb_parnl( 1 ) ,
(HENHMETAFILE) hb_parnl( 2 ),
hb_retl( PlayEnhMetaFile( (HDC) HB_PARWH( 1 ) ,
(HENHMETAFILE) HB_PARWH( 2 ),
&rc
) ) ;
) );
}
@@ -251,9 +253,9 @@ HB_FUNC( PLAYENHMETAFILE )
HB_FUNC( COPYENHMETAFILEA )
{
hb_retnl( (LONG) CopyEnhMetaFileA( (HENHMETAFILE) hb_parnl( 1 ),
HB_RETWH( CopyEnhMetaFileA( (HENHMETAFILE) HB_PARWH( 1 ),
(LPCSTR) hb_parcx( 2 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -269,17 +271,17 @@ HB_FUNC( GETWINMETAFILEBITS )
UINT nBytes ;
nBytes = GetWinMetaFileBits( (HENHMETAFILE) hb_parnl( 1 ),
0 , NULL, hb_parni( 2 ), (HDC) hb_parnl( 3 ) ) ;
nBytes = GetWinMetaFileBits( (HENHMETAFILE) HB_PARWH( 1 ),
0 , NULL, hb_parni( 2 ), (HDC) HB_PARWH( 3 ) );
if ( nBytes )
{
Buffer = (BYTE *) hb_xgrab( nBytes) ;
Buffer = (BYTE *) hb_xgrab( nBytes);
if ( GetWinMetaFileBits( (HENHMETAFILE) hb_parnl( 1 ) ,
if ( GetWinMetaFileBits( (HENHMETAFILE) HB_PARWH( 1 ) ,
nBytes , Buffer ,
hb_parni( 2 ) ,
(HDC) hb_parnl( 3 )
(HDC) HB_PARWH( 3 )
) )
hb_retclen( ( char *)Buffer, nBytes );
@@ -301,11 +303,11 @@ HB_FUNC( PLAYENHMETAFILERECORD )
// Your code goes here
hb_retl( PlayEnhMetaFileRecord( (HDC) hb_parnl( 1 ) ,
hb_retl( PlayEnhMetaFileRecord( (HDC) HB_PARWH( 1 ) ,
lpHandleTable ,
&emfr ,
(UINT) hb_parni( 4 )
) ) ;
) );
}
*/
@@ -316,10 +318,10 @@ HB_FUNC( PLAYENHMETAFILERECORD )
HB_FUNC( GETENHMETAFILEDESCRIPTION )
{
hb_retni( GetEnhMetaFileDescription( (HENHMETAFILE) hb_parnl( 1 ),
hb_retni( GetEnhMetaFileDescription( (HENHMETAFILE) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ,
(LPSTR) hb_parcx( 3 )
) ) ;
) );
}
@@ -335,11 +337,11 @@ HB_FUNC( PLAYMETAFILERECORD )
// Your code goes here
hb_retl( PlayMetaFileRecord( (HDC) hb_parnl( 1 ) ,
hb_retl( PlayMetaFileRecord( (HDC) HB_PARWH( 1 ) ,
lpHandleTable ,
lpMetaRecord ,
(UINT) hb_parni( 4 )
) ) ;
) );
}
*/
@@ -355,7 +357,7 @@ HB_FUNC( SETENHMETAFILEBITS )
// Your code goes here
hb_retnl( (LONG) SetEnhMetaFileBits( (UINT) hb_parni( 1 ), &BYTE ) ) ;
HB_RETWH( SetEnhMetaFileBits( (UINT) hb_parni( 1 ), &BYTE ) );
}
*/
@@ -373,11 +375,11 @@ HB_FUNC( SETWINMETAFILEBITS )
// Your code goes here
hb_retnl( (LONG) SetWinMetaFileBits( (UINT) hb_parni( 1 ),
HB_RETWH( SetWinMetaFileBits( (UINT) hb_parni( 1 ),
&BYTE ,
(HDC) hb_parnl( 3 ) ,
(HDC) HB_PARWH( 3 ) ,
&&METAFILEPICT
) ) ;
) );
}
*/
@@ -397,12 +399,12 @@ HB_FUNC( ENUMENHMETAFILE )
if ( ISARRAY(5) && Array2Rect( hb_param(5,HB_IT_ARRAY), &rc ))
hb_retl( EnumEnhMetaFile( (HDC) hb_parnl( 1 ) ,
(HENHMETAFILE) hb_parnl( 2 ),
hb_retl( EnumEnhMetaFile( (HDC) HB_PARWH( 1 ) ,
(HENHMETAFILE) HB_PARWH( 2 ),
enhmfEnumProc ,
lpVoid ,
&rc
) ) ;
) );
}
*/
@@ -424,10 +426,10 @@ HB_FUNC( GETENHMETAFILEBITS )
// Your code goes here
hb_retni( GetEnhMetaFileBits( (HENHMETAFILE) hb_parnl( 1 ),
hb_retni( GetEnhMetaFileBits( (HENHMETAFILE) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ,
lpByte
) ) ;
) );
}
*/
@@ -444,10 +446,10 @@ HB_FUNC( GETENHMETAFILEHEADER )
// Your code goes here
hb_retni( GetEnhMetaFileHeader( (HENHMETAFILE) hb_parnl( 1 ),
hb_retni( GetEnhMetaFileHeader( (HENHMETAFILE) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ,
lPenhMetaHeader
) ) ;
) );
}
*/
@@ -463,10 +465,10 @@ HB_FUNC( GETENHMETAFILEPALETTEENTRIES )
// Your code goes here
hb_retni( GetEnhMetaFilePaletteEntries( (HENHMETAFILE) hb_parnl( 1 ),
hb_retni( GetEnhMetaFilePaletteEntries( (HENHMETAFILE) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ,
lpPaletteEntry
) ) ;
) );
}
*/
@@ -482,11 +484,10 @@ HB_FUNC( GETENHMETAFILEPIXELFORMAT )
// Your code goes here
hb_retni( GetEnhMetaFilePixelFormat( (HENHMETAFILE) hb_parnl( 1 ),
hb_retni( GetEnhMetaFilePixelFormat( (HENHMETAFILE) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ,
&PixelFormatdescriptor
) ) ;
) );
}
*/

36
harbour/contrib/hbwhat32/whtmisc.c
View File

@@ -11,6 +11,8 @@
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -34,35 +36,35 @@ HB_FUNC( STR2PTR )
HB_FUNC( PEEKW )
{
hb_retni( * ( LPWORD ) hb_parnl( 1 ) );
hb_retni( * ( LPWORD ) hb_parnint( 1 ) );
}
//-----------------------------------------------------------------------------
HB_FUNC( PEEKL )
{
hb_retnl( * (LPDWORD) hb_parnl( 1 ) );
hb_retnl( * (LPDWORD) hb_parnint( 1 ) );
}
//-----------------------------------------------------------------------------
HB_FUNC( PEEKB )
{
hb_retni( * ( LPBYTE ) hb_parnl( 1 ) );
hb_retni( * ( LPBYTE ) hb_parnint( 1 ) );
}
//-----------------------------------------------------------------------------
HB_FUNC( POKEW )
{
* ( LPWORD ) hb_parnl( 1 ) = (WORD) hb_parni( 2 );
* ( LPWORD ) hb_parnint( 1 ) = (WORD) hb_parni( 2 );
}
//-----------------------------------------------------------------------------
HB_FUNC( POKEL )
{
* ( LPLONG ) hb_parnl( 1 ) = (DWORD) hb_parnl( 2 );
* ( LPLONG ) hb_parnint( 1 ) = (DWORD) hb_parnl( 2 );
}
@@ -70,7 +72,7 @@ HB_FUNC( POKEL )
HB_FUNC( POKEB )
{
* ( LPBYTE ) hb_parnl( 1 ) = ( BYTE ) hb_parni( 2 );
* ( LPBYTE ) hb_parnint( 1 ) = ( BYTE ) hb_parni( 2 );
}
@@ -80,9 +82,9 @@ HB_FUNC( POKEB )
HB_FUNC( PEEK )
{
if ( hb_pcount()==2 )
hb_retclen( (char *) hb_parnl( 1 ), hb_parnl( 2 ) );
hb_retclen( (char *) hb_parnint( 1 ), hb_parnl( 2 ) );
else
hb_retc( (char *) hb_parnl( 1 ) );
hb_retc( (char *) hb_parnint( 1 ) );
}
//-----------------------------------------------------------------------------
@@ -91,9 +93,9 @@ HB_FUNC( PEEK )
HB_FUNC( POKE )
{
if( hb_pcount() ==3 )
hb_xmemcpy( (char *) hb_parnl(1), hb_parcx( 2 ), hb_parnl( 3 ) );
hb_xmemcpy( (char *) hb_parnint(1), hb_parcx( 2 ), hb_parnl( 3 ) );
else
hb_xmemcpy( (char *) hb_parnl(1), hb_parcx( 2 ), hb_parclen( 2 ) );
hb_xmemcpy( (char *) hb_parnint(1), hb_parcx( 2 ), hb_parclen( 2 ) );
}
@@ -337,7 +339,7 @@ HB_FUNC( MESSAGEBOX )
{
// LPCSTR lpCaption = hb_parcx(3);
hb_retnl( MessageBox( ISNIL(1) ? NULL : (HWND) hb_parnl(1) ,
hb_retnl( MessageBox( ISNIL(1) ? NULL : (HWND) HB_PARWH(1) ,
(LPCSTR) hb_parcx(2),
ISNIL(3) ? NULL : (LPCSTR) hb_parcx(3) ,
ISNIL(4) ? 0 : (UINT) hb_parnl(4) ) );
@@ -376,6 +378,7 @@ HB_FUNC( CHECKBIT )
HB_FUNC( GETENVIRONMENTSTRINGS )
{
// TOFIX
hb_retnl( (LONG) GetEnvironmentStrings( ) );
}
@@ -386,6 +389,7 @@ HB_FUNC( GETENVIRONMENTSTRINGS )
HB_FUNC( FREEENVIRONMENTSTRINGS )
{
// TOFIX
hb_retl( (LONG) FreeEnvironmentStrings( (LPTSTR) hb_parnl(1) ) );
}
@@ -528,7 +532,7 @@ HB_FUNC( OPENMUTEX )
HB_FUNC( RELEASEMUTEX )
{
hb_retl( ReleaseMutex( (HANDLE) hb_parnl( 1 ) ) );
hb_retl( ReleaseMutex( (HANDLE) HB_PARWH( 1 ) ) );
}
@@ -539,7 +543,7 @@ HB_FUNC( RELEASEMUTEX )
HB_FUNC( REGISTERHOTKEY )
{
hb_retl( RegisterHotKey( (HWND) hb_parnl( 1 ),
hb_retl( RegisterHotKey( (HWND) HB_PARWH( 1 ),
hb_parni( 2 ) ,
(UINT) hb_parni( 3 ),
(UINT) hb_parni( 4 )
@@ -552,7 +556,7 @@ HB_FUNC( REGISTERHOTKEY )
HB_FUNC( UNREGISTERHOTKEY )
{
hb_retl( UnregisterHotKey( (HWND) hb_parnl( 1 ), hb_parni( 2 ) ) );
hb_retl( UnregisterHotKey( (HWND) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
@@ -568,7 +572,7 @@ HB_FUNC( GETCLASSINFO )
{
WNDCLASS WndClass ;
if ( GetClassInfo( ISNIL(1) ? NULL : (HINSTANCE) hb_parnl( 1 ),
if ( GetClassInfo( ISNIL(1) ? NULL : (HINSTANCE) HB_PARWH( 1 ),
(LPCSTR) hb_parcx( 2 ), &WndClass ) )
@@ -593,7 +597,7 @@ HB_FUNC( GETCLASSINFOEX )
{
WNDCLASSEX WndClassEx ;
if ( GetClassInfoEx( ISNIL(1) ? NULL : (HINSTANCE) hb_parnl( 1 ),
if ( GetClassInfoEx( ISNIL(1) ? NULL : (HINSTANCE) HB_PARWH( 1 ),
(LPCSTR) hb_parcx( 2 ), &WndClassEx ) )
hb_retclen( (char*) &WndClassEx, sizeof(WNDCLASSEX) );

85
harbour/contrib/hbwhat32/whtmmcap.c
View File

@@ -14,6 +14,8 @@
#include "hbapi.h"
#include "hbwhat.h"
#include <windows.h>
#include <vfw.h>
@@ -34,11 +36,11 @@
int nID ); */
HB_FUNC( CAPCREATECAPTUREWINDOW )
{
hb_retnl( (LONG) capCreateCaptureWindow( (LPCSTR) hb_parc(1),
HB_RETWH( capCreateCaptureWindow( (LPCSTR) hb_parc(1),
(DWORD) hb_parnl(2),
hb_parni(3), hb_parni(4),
hb_parni(5), hb_parni(6),
(HWND) hb_parnl(7),
(HWND) HB_PARWH(7),
hb_parni(8) ) );
}
@@ -58,7 +60,7 @@ HB_FUNC( CAPGETDRIVERDESCRIPTION )
TCHAR lpszVer[255];
int cbVer = 255;
BOOL bRet;
bRet = capGetDriverDescription( (WORD) hb_parnl(1), lpszName, cbName, lpszVer, cbVer );
bRet = capGetDriverDescription( (WORD) hb_parni(1), lpszName, cbName, lpszVer, cbVer );
hb_storc( lpszName, 2 );
hb_storni( cbName, 3 );
hb_storc( lpszVer, 4 );
@@ -96,7 +98,7 @@ HB_FUNC( CAPGETDRIVERDESCRIPTION )
/* SendMessage( hwnd, WM_CAP_ABORT, 0, 0 ) */
HB_FUNC( CAPCAPTUREABORT )
{
hb_retl( capCaptureAbort( (HWND) hb_parnl(1) ) );
hb_retl( capCaptureAbort( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -113,7 +115,7 @@ HB_FUNC( CAPCAPTUREABORT )
/* SendMessage( hwnd, WM_CAP_SEQUENCE, 0, 0 ) */
HB_FUNC( CAPCAPTURESEQUENCE )
{
hb_retl( capCaptureSequence( (HWND) hb_parnl(1) ) );
hb_retl( capCaptureSequence( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -123,7 +125,7 @@ HB_FUNC( CAPCAPTURESEQUENCE )
/* SendMessage( hwnd, WM_CAP_SEQUENCE_NOFILE, 0, 0 ) */
HB_FUNC( CAPCAPTURESEQUENCENOFILE )
{
hb_retl( capCaptureSequenceNoFile( (HWND) hb_parnl(1) ) );
hb_retl( capCaptureSequenceNoFile( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -140,7 +142,7 @@ HB_FUNC( CAPCAPTURESEQUENCENOFILE )
/* SendMessage( hwnd, WM_CAP_SINGLE_FRAME, 0, 0 ) */
HB_FUNC( CAPCAPTURESINGLEFRAME )
{
hb_retl( capCaptureSingleFrame( (HWND) hb_parnl(1) ) );
hb_retl( capCaptureSingleFrame( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -150,7 +152,7 @@ HB_FUNC( CAPCAPTURESINGLEFRAME )
/* SendMessage( hwnd, WM_CAP_SINGLE_FRAME_CLOSE, 0, 0 ) */
HB_FUNC( CAPCAPTURESINGLEFRAMECLOSE )
{
hb_retl( capCaptureSingleFrameClose( (HWND) hb_parnl(1) ) );
hb_retl( capCaptureSingleFrameClose( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -160,7 +162,7 @@ HB_FUNC( CAPCAPTURESINGLEFRAMECLOSE )
/* SendMessage( hwnd, WM_CAP_SINGLE_FRAME_OPEN, 0, 0 ) */
HB_FUNC( CAPCAPTURESINGLEFRAMEOPEN )
{
hb_retl( capCaptureSingleFrameOpen( (HWND) hb_parnl(1) ) );
hb_retl( capCaptureSingleFrameOpen( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -170,7 +172,7 @@ HB_FUNC( CAPCAPTURESINGLEFRAMEOPEN )
/* SendMessage( hwnd, WM_CAP_STOP, 0, 0 ) */
HB_FUNC( CAPCAPTURESTOP )
{
hb_retl( capCaptureStop( (HWND) hb_parnl(1) ) );
hb_retl( capCaptureStop( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -180,7 +182,7 @@ HB_FUNC( CAPCAPTURESTOP )
/* SendMessage( hwnd, WM_CAP_DLG_VIDEOCOMPRESSION, 0, 0 ) */
HB_FUNC( CAPDLGVIDEOCOMPRESSION )
{
hb_retl( capDlgVideoCompression( (HWND) hb_parnl(1) ) );
hb_retl( capDlgVideoCompression( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -190,7 +192,7 @@ HB_FUNC( CAPDLGVIDEOCOMPRESSION )
/* SendMessage( hwnd, WM_CAP_DLG_VIDEODISPLAY, 0, 0 ) */
HB_FUNC( CAPDLGVIDEODISPLAY )
{
hb_retl( capDlgVideoDisplay( (HWND) hb_parnl(1) ) );
hb_retl( capDlgVideoDisplay( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -200,7 +202,7 @@ HB_FUNC( CAPDLGVIDEODISPLAY )
/* SendMessage( hwnd, WM_CAP_DLG_VIDEOFORMAT, 0, 0 ) */
HB_FUNC( CAPDLGVIDEOFORMAT )
{
hb_retl( capDlgVideoFormat( (HWND) hb_parnl(1) ) );
hb_retl( capDlgVideoFormat( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -210,7 +212,7 @@ HB_FUNC( CAPDLGVIDEOFORMAT )
/* SendMessage( hwnd, WM_CAP_DLG_VIDEOSOURCE, 0, 0 ) */
HB_FUNC( CAPDLGVIDEOSOURCE )
{
hb_retl( capDlgVideoSource( (HWND) hb_parnl(1) ) );
hb_retl( capDlgVideoSource( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -220,7 +222,7 @@ HB_FUNC( CAPDLGVIDEOSOURCE )
/* SendMessage( hwnd, WM_CAP_DRIVER_CONNECT, 0, 0 ) */
HB_FUNC( CAPDRIVERCONNECT )
{
hb_retl( capDriverConnect( (HWND) hb_parnl(1), hb_parni(2) ) );
hb_retl( capDriverConnect( (HWND) HB_PARWH(1), hb_parni(2) ) );
}
/* ------------------------------------------------------------------------ */
@@ -230,7 +232,7 @@ HB_FUNC( CAPDRIVERCONNECT )
/* SendMessage( hwnd, WM_CAP_DRIVER_DISCONNECT, 0, 0 ) */
HB_FUNC( CAPDRIVERDISCONNECT )
{
hb_retl( capDriverDisconnect( (HWND) hb_parnl(1) ) );
hb_retl( capDriverDisconnect( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -251,7 +253,7 @@ HB_FUNC( CAPDRIVERGETNAME )
TCHAR szName[255];
WORD wSize = 255;
BOOL bRet;
bRet = capDriverGetName( (HWND) hb_parnl(1), szName, &wSize );
bRet = capDriverGetName( (HWND) HB_PARWH(1), szName, &wSize );
hb_storc( szName, 2 );
hb_storni( wSize, 3 );
hb_retl(bRet);
@@ -269,7 +271,7 @@ HB_FUNC( CAPDRIVERGETVERSION )
TCHAR szVer[40];
WORD wSize = 40;
BOOL bRet;
bRet = capDriverGetVersion( (HWND) hb_parnl(1), szVer, &wSize );
bRet = capDriverGetVersion( (HWND) HB_PARWH(1), szVer, &wSize );
hb_storc( szVer, 2 );
hb_storni( wSize, 3 );
hb_retl(bRet);
@@ -283,7 +285,7 @@ HB_FUNC( CAPDRIVERGETVERSION )
/* SendMessage( hwnd, WM_CAP_EDIT_COPY, 0, 0 ) */
HB_FUNC( CAPEDITCOPY )
{
hb_retl( capEditCopy( (HWND) hb_parnl(1) ) );
hb_retl( capEditCopy( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -293,7 +295,7 @@ HB_FUNC( CAPEDITCOPY )
/* SendMessage( hwnd, WM_CAP_FILE_ALLOCATE, 0, 0 ) */
HB_FUNC( CAPFILEALLOC )
{
hb_retl( capFileAlloc( (HWND) hb_parnl(1), (DWORD) hb_parnl(2) ) );
hb_retl( capFileAlloc( (HWND) HB_PARWH(1), (DWORD) hb_parnl(2) ) );
}
/* ------------------------------------------------------------------------ */
@@ -307,7 +309,7 @@ HB_FUNC( CAPFILEGETCAPTUREFILE )
TCHAR szName[255];
WORD wSize = 255;
BOOL bRet;
bRet = capFileGetCaptureFile( (HWND) hb_parnl(1), szName, &wSize );
bRet = capFileGetCaptureFile( (HWND) HB_PARWH(1), szName, &wSize );
hb_storc( szName, 2 );
hb_storni( wSize, 3 );
hb_retl(bRet);
@@ -321,7 +323,7 @@ HB_FUNC( CAPFILEGETCAPTUREFILE )
/* SendMessage( hwnd, WM_CAP_FILE_SAVEAS, 0, 0 ) */
HB_FUNC( CAPFILESAVEAS )
{
hb_retl( capFileSaveAs( (HWND) hb_parnl(1), hb_parc(2) ) );
hb_retl( capFileSaveAs( (HWND) HB_PARWH(1), hb_parc(2) ) );
}
/* ------------------------------------------------------------------------ */
@@ -331,7 +333,7 @@ HB_FUNC( CAPFILESAVEAS )
/* SendMessage( hwnd, WM_CAP_FILE_SAVEDIB, 0, 0 ) */
HB_FUNC( CAPFILESAVEDIB )
{
hb_retl( capFileSaveDIB( (HWND) hb_parnl(1), hb_parc(2) ) );
hb_retl( capFileSaveDIB( (HWND) HB_PARWH(1), hb_parc(2) ) );
}
/* ------------------------------------------------------------------------ */
@@ -341,7 +343,7 @@ HB_FUNC( CAPFILESAVEDIB )
/* SendMessage( hwnd, WM_CAP_FILE_SET_CAPTURE_FILE, 0, 0 ) */
HB_FUNC( CAPFILESETCAPTUREFILE )
{
hb_retl( capFileSetCaptureFile( (HWND) hb_parnl(1), hb_parc(2) ) );
hb_retl( capFileSetCaptureFile( (HWND) HB_PARWH(1), hb_parc(2) ) );
}
/* ------------------------------------------------------------------------ */
@@ -365,7 +367,7 @@ HB_FUNC( CAPFILESETCAPTUREFILE )
/* SendMessage( hwnd, WM_CAP_GET_AUDIOFORMAT, 0, 0 ) */
HB_FUNC( CAPGETAUDIOFORMATSIZE )
{
hb_retnl( capGetAudioFormatSize( (HWND) hb_parnl(1) ) );
hb_retnl( capGetAudioFormatSize( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -379,7 +381,7 @@ HB_FUNC( CAPGETMCIDEVICENAME )
TCHAR szName[255];
WORD wSize = 255;
BOOL bRet;
bRet = capGetMCIDeviceName( (HWND) hb_parnl(1), szName, &wSize );
bRet = capGetMCIDeviceName( (HWND) HB_PARWH(1), szName, &wSize );
hb_storc( szName, 2 );
hb_storni( wSize, 3 );
hb_retl(bRet);
@@ -401,7 +403,7 @@ HB_FUNC( CAPGETMCIDEVICENAME )
/* To check: the return must be a LONG */
HB_FUNC( CAPGETUSERDATA )
{
hb_retl( capGetUserData( (HWND) hb_parnl(1) ) );
hb_retl( capGetUserData( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -418,7 +420,7 @@ HB_FUNC( CAPGETUSERDATA )
/* SendMessage( hwnd, WM_CAP_GET_VIDEOFORMAT, 0, 0 ) */
HB_FUNC( CAPGETVIDEOFORMATSIZE )
{
hb_retnl( capGetVideoFormatSize( (HWND) hb_parnl(1) ) );
hb_retnl( capGetVideoFormatSize( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -428,7 +430,7 @@ HB_FUNC( CAPGETVIDEOFORMATSIZE )
/* SendMessage( hwnd, WM_CAP_GRAB_FRAME, 0, 0 ) */
HB_FUNC( CAPGRABFRAME )
{
hb_retl( capGrabFrame( (HWND) hb_parnl(1) ) );
hb_retl( capGrabFrame( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -438,7 +440,7 @@ HB_FUNC( CAPGRABFRAME )
/* SendMessage( hwnd, WM_CAP_GRAB_FRAME_NOSTOP, 0, 0 ) */
HB_FUNC( CAPGRABFRAMENOSTOP )
{
hb_retl( capGrabFrameNoStop( (HWND) hb_parnl(1) ) );
hb_retl( capGrabFrameNoStop( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -448,7 +450,7 @@ HB_FUNC( CAPGRABFRAMENOSTOP )
/* SendMessage( hwnd, WM_CAP_SET_OVERLAY, 0, 0 ) */
HB_FUNC( CAPOVERLAY )
{
hb_retl( capOverlay( (HWND) hb_parnl(1), hb_parl(2) ) );
hb_retl( capOverlay( (HWND) HB_PARWH(1), hb_parl(2) ) );
}
/* ------------------------------------------------------------------------ */
@@ -458,7 +460,7 @@ HB_FUNC( CAPOVERLAY )
/* SendMessage( hwnd, WM_CAP_PAL_AUTOCREATE, 0, 0 ) */
HB_FUNC( CAPPALETTEAUTO )
{
hb_retl( capPaletteAuto( (HWND) hb_parnl(1), hb_parni(2), hb_parni(3) ) );
hb_retl( capPaletteAuto( (HWND) HB_PARWH(1), hb_parni(2), hb_parni(3) ) );
}
/* ------------------------------------------------------------------------ */
@@ -468,7 +470,7 @@ HB_FUNC( CAPPALETTEAUTO )
/* SendMessage( hwnd, WM_CAP_PAL_MANUALCREATE, 0, 0 ) */
HB_FUNC( CAPPALETTEMANUAL )
{
hb_retl( capPaletteManual( (HWND) hb_parnl(1), hb_parl(2), hb_parni(3) ) );
hb_retl( capPaletteManual( (HWND) HB_PARWH(1), hb_parl(2), hb_parni(3) ) );
}
/* ------------------------------------------------------------------------ */
@@ -478,7 +480,7 @@ HB_FUNC( CAPPALETTEMANUAL )
/* SendMessage( hwnd, WM_CAP_PAL_OPEN, 0, 0 ) */
HB_FUNC( CAPPALETTEOPEN )
{
hb_retl( capPaletteOpen( (HWND) hb_parnl(1), hb_parc(2) ) );
hb_retl( capPaletteOpen( (HWND) HB_PARWH(1), hb_parc(2) ) );
}
/* ------------------------------------------------------------------------ */
@@ -488,7 +490,7 @@ HB_FUNC( CAPPALETTEOPEN )
/* SendMessage( hwnd, WM_CAP_PAL_PASTE, 0, 0 ) */
HB_FUNC( CAPPALETTEPASTE )
{
hb_retl( capPalettePaste( (HWND) hb_parnl(1) ) );
hb_retl( capPalettePaste( (HWND) HB_PARWH(1) ) );
}
/* ------------------------------------------------------------------------ */
@@ -498,7 +500,7 @@ HB_FUNC( CAPPALETTEPASTE )
/* SendMessage( hwnd, WM_CAP_PAL_SAVE, 0, 0 ) */
HB_FUNC( CAPPALETTESAVE )
{
hb_retl( capPaletteSave( (HWND) hb_parnl(1), hb_parc(2) ) );
hb_retl( capPaletteSave( (HWND) HB_PARWH(1), hb_parc(2) ) );
}
/* ------------------------------------------------------------------------ */
@@ -508,7 +510,7 @@ HB_FUNC( CAPPALETTESAVE )
/* SendMessage( hwnd, WM_CAP_SET_PREVIEW, 0, 0 ) */
HB_FUNC( CAPPREVIEW )
{
hb_retl( capPreview( (HWND) hb_parnl(1), hb_parl(2) ) );
hb_retl( capPreview( (HWND) HB_PARWH(1), hb_parl(2) ) );
}
/* ------------------------------------------------------------------------ */
@@ -518,7 +520,7 @@ HB_FUNC( CAPPREVIEW )
/* SendMessage( hwnd, WM_CAP_SET_PREVIEWRATE, 0, 0 ) */
HB_FUNC( CAPPREVIEWRATE )
{
hb_retl( capPreviewRate( (HWND) hb_parnl(1), (WORD) hb_parnl(2) ) );
hb_retl( capPreviewRate( (HWND) HB_PARWH(1), (WORD) hb_parnl(2) ) );
}
/* ------------------------------------------------------------------------ */
@@ -528,7 +530,7 @@ HB_FUNC( CAPPREVIEWRATE )
/* SendMessage( hwnd, WM_CAP_SET_SCALE, 0, 0 ) */
HB_FUNC( CAPPREVIEWSCALE )
{
hb_retl( capPreviewScale( (HWND) hb_parnl(1), hb_parl(2) ) );
hb_retl( capPreviewScale( (HWND) HB_PARWH(1), hb_parl(2) ) );
}
/* ------------------------------------------------------------------------ */
@@ -594,7 +596,7 @@ HB_FUNC( CAPPREVIEWSCALE )
/* SendMessage( hwnd, WM_CAP_SET_MCI_DEVICE, 0, 0 ) */
HB_FUNC( CAPSETMCIDEVICENAME )
{
hb_retl( capSetMCIDeviceName( (HWND) hb_parnl(1), hb_parc(2) ) );
hb_retl( capSetMCIDeviceName( (HWND) HB_PARWH(1), hb_parc(2) ) );
}
/* ------------------------------------------------------------------------ */
@@ -611,7 +613,7 @@ HB_FUNC( CAPSETMCIDEVICENAME )
/* SendMessage( hwnd, WM_CAP_SET_USER_DATA, 0, 0 ) */
HB_FUNC( CAPSETUSERDATA )
{
hb_retl( capSetUserData( (HWND) hb_parnl(1), hb_parnl(2) ) );
hb_retl( capSetUserData( (HWND) HB_PARWH(1), hb_parnl(2) ) );
}
/* ------------------------------------------------------------------------ */
@@ -622,4 +624,3 @@ HB_FUNC( CAPSETUSERDATA )
/* To Do */
/* ======================================================================== */

39
harbour/contrib/hbwhat32/whtmous.c
View File

@@ -12,6 +12,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
//#include <shlobj.h>
#include <windows.h>
#include "hbapiitm.h"
@@ -36,7 +38,7 @@ extern void Size2ArrayEx( SIZE *siz , PHB_ITEM aSize);
HB_FUNC( LOADCURSOR )
{
hb_retnl( (LONG) LoadCursor( ISNIL(1) ? NULL : (HINSTANCE) hb_parnl(1) ,
HB_RETWH( LoadCursor( ISNIL(1) ? NULL : (HINSTANCE) HB_PARWH(1) ,
hb_parinfo(2)== HB_IT_STRING ? hb_parcx(2): MAKEINTRESOURCE( hb_parnl( 2 ) ) ) );
}
@@ -46,7 +48,7 @@ HB_FUNC( LOADCURSOR )
HB_FUNC( GETCAPTURE )
{
hb_retnl( (LONG) GetCapture( ) ) ;
HB_RETWH( GetCapture( ) );
}
//-----------------------------------------------------------------------------
@@ -55,7 +57,7 @@ HB_FUNC( GETCAPTURE )
HB_FUNC( SETCAPTURE )
{
hb_retnl( (LONG) SetCapture( (HWND) hb_parnl( 1 ) ) ) ;
HB_RETWH( SetCapture( (HWND) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -64,7 +66,7 @@ HB_FUNC( SETCAPTURE )
HB_FUNC( RELEASECAPTURE )
{
hb_retl( ReleaseCapture( ) ) ;
hb_retl( ReleaseCapture( ) );
}
@@ -74,7 +76,7 @@ HB_FUNC( RELEASECAPTURE )
HB_FUNC( GETDOUBLECLICKTIME )
{
hb_retni( GetDoubleClickTime( ) ) ;
hb_retni( GetDoubleClickTime( ) );
}
//-----------------------------------------------------------------------------
@@ -83,7 +85,7 @@ HB_FUNC( GETDOUBLECLICKTIME )
HB_FUNC( SETDOUBLECLICKTIME )
{
hb_retl( SetDoubleClickTime( (UINT) hb_parni( 1 ) ) ) ;
hb_retl( SetDoubleClickTime( (UINT) hb_parni( 1 ) ) );
}
@@ -93,7 +95,7 @@ HB_FUNC( SETDOUBLECLICKTIME )
HB_FUNC( SHOWCURSOR )
{
hb_retni( ShowCursor( hb_parl( 1 ) ) ) ;
hb_retni( ShowCursor( hb_parl( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -102,7 +104,7 @@ HB_FUNC( SHOWCURSOR )
HB_FUNC( SETCURSORPOS )
{
hb_retl( SetCursorPos( hb_parni( 1 ), hb_parni( 2 ) ) ) ;
hb_retl( SetCursorPos( hb_parni( 1 ), hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -116,7 +118,7 @@ HB_FUNC( SETCURSORPOS )
HB_FUNC( WINSETCURSOR )
{
hb_retnl( (LONG) SetCursor( (HCURSOR) hb_parnl( 1 ) ) ) ;
HB_RETWH( SetCursor( (HCURSOR) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -183,7 +185,7 @@ HB_FUNC( GETCLIPCURSOR )
HB_FUNC( GETCURSOR )
{
hb_retnl( (LONG) GetCursor( ) ) ;
HB_RETWH( GetCursor( ) );
}
@@ -193,7 +195,7 @@ HB_FUNC( GETCURSOR )
HB_FUNC( SWAPMOUSEBUTTON )
{
hb_retl( SwapMouseButton( hb_parl( 1 ) ) ) ;
hb_retl( SwapMouseButton( hb_parl( 1 ) ) );
}
@@ -203,7 +205,7 @@ HB_FUNC( SWAPMOUSEBUTTON )
HB_FUNC( LOADCURSORFROMFILE )
{
hb_retnl( (LONG) LoadCursorFromFile( (LPCSTR) hb_parcx( 1 ) ) ) ;
HB_RETWH( LoadCursorFromFile( (LPCSTR) hb_parcx( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -212,14 +214,14 @@ HB_FUNC( LOADCURSORFROMFILE )
HB_FUNC( CREATECURSOR )
{
hb_retnl( (LONG) CreateCursor( (HINSTANCE) hb_parnl( 1 ),
HB_RETWH( CreateCursor( (HINSTANCE) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 ) ,
hb_parcx( 6 ) ,
hb_parcx( 7 )
) ) ;
) );
}
@@ -229,7 +231,7 @@ HB_FUNC( CREATECURSOR )
HB_FUNC( DESTROYCURSOR )
{
hb_retl( DestroyCursor( (HCURSOR) hb_parnl( 1 ) ) ) ;
hb_retl( DestroyCursor( (HCURSOR) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -238,7 +240,7 @@ HB_FUNC( DESTROYCURSOR )
HB_FUNC( COPYCURSOR )
{
hb_retnl( (LONG) CopyCursor( (HCURSOR) hb_parnl( 1 ) ) ) ;
HB_RETWH( CopyCursor( (HCURSOR) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -247,7 +249,7 @@ HB_FUNC( COPYCURSOR )
HB_FUNC( SETSYSTEMCURSOR )
{
hb_retl( SetSystemCursor( (HCURSOR) hb_parnl( 1 ), (DWORD) hb_parnl( 2 ) ) ) ;
hb_retl( SetSystemCursor( (HCURSOR) HB_PARWH( 1 ), (DWORD) hb_parnl( 2 ) ) );
}
@@ -260,9 +262,8 @@ HB_FUNC( GETCURSORINFO )
if ( GetCursorInfo( &pci ) )
hb_retclen( (char *) &pci, sizeof( CURSORINFO ) ) ;
hb_retclen( (char *) &pci, sizeof( CURSORINFO ) );
}
#endif

120
harbour/contrib/hbwhat32/whtmsg.c
View File

@@ -7,6 +7,8 @@
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -24,7 +26,7 @@
HB_FUNC( _ISDIALOGMESSAGE )
{
hb_retl(IsDialogMessage( (HWND) hb_parnl(1), (MSG*) hb_parcx(2) )) ;
hb_retl(IsDialogMessage( (HWND) HB_PARWH(1), (MSG*) hb_parcx(2) ));
}
@@ -33,7 +35,7 @@ HB_FUNC( _ISDIALOGMESSAGE )
HB_FUNC( TRANSLATEMDISYSACCEL )
{
hb_retl( TranslateMDISysAccel( (HWND) hb_parnl( 1 ), (MSG*) hb_parcx( 2 ) ) ) ;
hb_retl( TranslateMDISysAccel( (HWND) HB_PARWH( 1 ), (MSG*) hb_parcx( 2 ) ) );
}
@@ -41,14 +43,14 @@ HB_FUNC( TRANSLATEMDISYSACCEL )
HB_FUNC( TRANSLATEMESSAGE )
{
hb_retl(TranslateMessage( (MSG*) hb_parcx(1))) ;
hb_retl(TranslateMessage( (MSG*) hb_parcx(1)));
}
//-----------------------------------------------------------------------------
HB_FUNC( DISPATCHMESSAGE )
{
hb_retnl(DispatchMessage( (MSG*) hb_parcx(1))) ;
hb_retnl(DispatchMessage( (MSG*) hb_parcx(1)));
}
//-----------------------------------------------------------------------------
@@ -73,7 +75,7 @@ HB_FUNC( POSTMESSAGE )
}
hb_retnl( (LONG) PostMessage( (HWND) hb_parnl( 1 ), (UINT) hb_parni( 2 ),
hb_retnl( (LONG) PostMessage( (HWND) HB_PARWH( 1 ), (UINT) hb_parni( 2 ),
(ISNIL(3) ? 0 : (WPARAM) hb_parnl( 3 )) ,
(ISNIL(4) ? 0 : ( ISBYREF(4)? (LPARAM) (LPSTR) cText : ( ISCHAR(4) ? (LPARAM)(LPSTR) hb_parcx(4) : (LPARAM) hb_parnl( 4 ))))
)
@@ -82,7 +84,7 @@ HB_FUNC( POSTMESSAGE )
if( ISBYREF( 4 ) )
{
hb_storclen( cText, hb_parcsiz(4), 4 ) ;
hb_storclen( cText, hb_parcsiz(4), 4 );
hb_xfree( cText );
}
}
@@ -101,7 +103,7 @@ HB_FUNC( SENDMESSAGE )
hb_xmemcpy( cText, hb_parcx(4), hb_parcsiz(4) );
}
hb_retnl( (ULONG) SendMessage( (HWND) hb_parnl( 1 ), (UINT) hb_parni( 2 ),
hb_retnl( (ULONG) SendMessage( (HWND) HB_PARWH( 1 ), (UINT) hb_parni( 2 ),
(ISNIL(3) ? 0 : (WPARAM) hb_parnl( 3 )) ,
(ISNIL(4) ? 0 : ( ISBYREF(4)? (LPARAM) (LPSTR) cText : ( ISCHAR(4) ? (LPARAM)(LPSTR) hb_parcx(4) : (LPARAM) hb_parnl( 4 ))))
)
@@ -110,7 +112,7 @@ HB_FUNC( SENDMESSAGE )
if (ISBYREF( 4 ))
{
hb_storclen( cText, hb_parcsiz(4), 4 ) ;
hb_storclen( cText, hb_parcsiz(4), 4 );
hb_xfree( cText );
}
}
@@ -134,7 +136,7 @@ HB_FUNC( SENDDLGITEMMESSAGE )
cText = NULL;
}
hb_retnl( (LONG) SendDlgItemMessage( (HWND) hb_parnl( 1 ) ,
hb_retnl( (LONG) SendDlgItemMessage( (HWND) HB_PARWH( 1 ) ,
(int) hb_parni( 2 ) ,
(UINT) hb_parni( 3 ) ,
(ISNIL(4) ? 0 : (WPARAM) hb_parnl( 4 )) ,
@@ -145,8 +147,8 @@ HB_FUNC( SENDDLGITEMMESSAGE )
// Will be ignored if not BYREF.
if( pText )
{
//hb_storclen( cText, pText->item.asString.length, 5 ) ;
hb_storclen( cText, hb_itemGetCLen( pText ), 5 ) ;
//hb_storclen( cText, pText->item.asString.length, 5 );
hb_storclen( cText, hb_itemGetCLen( pText ), 5 );
}
if( cText )
@@ -155,7 +157,7 @@ HB_FUNC( SENDDLGITEMMESSAGE )
}
/*
hb_retnl( SendDlgItemMessage( (HWND) hb_parnl(1) , // handle of dialog box
hb_retnl( SendDlgItemMessage( (HWND) HB_PARWH(1) , // handle of dialog box
(int) hb_parni(2) , // identifier of control
(UINT) hb_parni(3) , // message to send
(ISNIL(4) ? 0 : (WPARAM) hb_parni(4) ) , // first message parameter
@@ -177,15 +179,15 @@ HB_FUNC( GETMESSAGE )
MSG Msg ;
if (GetMessage( &Msg,
ISNIL(2) ? NULL : (HWND) hb_parnl(2),
ISNIL(2) ? NULL : (HWND) HB_PARWH(2),
ISNIL(3) ? 0 : hb_parnl(3),
ISNIL(4) ? 0 : hb_parnl(4) ) )
{
hb_storclen( (LPSTR) &Msg, sizeof(MSG), 1 ) ;
hb_retl( 1 ) ;
hb_storclen( (LPSTR) &Msg, sizeof(MSG), 1 );
hb_retl( 1 );
}
else
hb_retl ( 0 ) ;
hb_retl ( 0 );
}
//-----------------------------------------------------------------------------
@@ -195,16 +197,16 @@ HB_FUNC( PEEKMESSAGE )
MSG Msg ;
if (PeekMessage( (MSG*) &Msg,
ISNIL(2) ? NULL :(HWND) hb_parnl(2),
ISNIL(2) ? NULL :(HWND) HB_PARWH(2),
ISNIL(3) ? 0 : hb_parnl(3),
ISNIL(4) ? 0 : hb_parnl(4),
ISNIL(5) ? PM_NOREMOVE : hb_parnl(5)))
{
hb_storclen( (LPSTR) &Msg, sizeof(MSG),1) ;
hb_retl( 1 ) ;
hb_storclen( (LPSTR) &Msg, sizeof(MSG),1);
hb_retl( 1 );
}
else
hb_retl ( 0 ) ;
hb_retl ( 0 );
}
@@ -215,7 +217,7 @@ HB_FUNC( PEEKMESSAGE )
HB_FUNC( REGISTERWINDOWMESSAGE )
{
hb_retni( RegisterWindowMessageA( (LPCSTR) hb_parcx( 1 ) ) ) ;
hb_retni( RegisterWindowMessageA( (LPCSTR) hb_parcx( 1 ) ) );
}
@@ -225,7 +227,7 @@ HB_FUNC( REGISTERWINDOWMESSAGE )
HB_FUNC( SETMESSAGEQUEUE )
{
hb_retl( SetMessageQueue( hb_parni( 1 ) ) ) ;
hb_retl( SetMessageQueue( hb_parni( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -234,7 +236,7 @@ HB_FUNC( SETMESSAGEQUEUE )
HB_FUNC( GETMESSAGEPOS )
{
hb_retnl( (LONG) GetMessagePos( ) ) ;
hb_retnl( (LONG) GetMessagePos( ) );
}
//-----------------------------------------------------------------------------
@@ -243,7 +245,7 @@ HB_FUNC( GETMESSAGEPOS )
HB_FUNC( GETMESSAGETIME )
{
hb_retnl( (LONG) GetMessageTime( ) ) ;
hb_retnl( (LONG) GetMessageTime( ) );
}
//-----------------------------------------------------------------------------
@@ -252,7 +254,7 @@ HB_FUNC( GETMESSAGETIME )
HB_FUNC( GETMESSAGEEXTRAINFO )
{
hb_retnl( (LONG) GetMessageExtraInfo( ) ) ;
hb_retnl( (LONG) GetMessageExtraInfo( ) );
}
//-----------------------------------------------------------------------------
@@ -261,7 +263,7 @@ HB_FUNC( GETMESSAGEEXTRAINFO )
HB_FUNC( SETMESSAGEEXTRAINFO )
{
hb_retnl( (LONG) SetMessageExtraInfo( (LPARAM) hb_parnl( 1 ) ) ) ;
hb_retnl( (LONG) SetMessageExtraInfo( (LPARAM) hb_parnl( 1 ) ) );
}
@@ -276,14 +278,14 @@ HB_FUNC( SENDMESSAGETIMEOUT )
// Your code goes here
hb_retnl( (LONG) SendMessageTimeout( (HWND) hb_parnl( 1 ) ,
hb_retnl( (LONG) SendMessageTimeout( (HWND) HB_PARWH( 1 ) ,
(UINT) hb_parni( 2 ) ,
(WPARAM) hb_parnl( 3 ),
(LPARAM) hb_parnl( 4 ),
(UINT) hb_parni( 5 ) ,
(UINT) hb_parni( 6 ) ,
lpdwResult
) ) ;
) );
}
*/
@@ -294,11 +296,11 @@ HB_FUNC( SENDMESSAGETIMEOUT )
HB_FUNC( SENDNOTIFYMESSAGE )
{
hb_retl( SendNotifyMessage( (HWND) hb_parnl( 1 ) ,
hb_retl( SendNotifyMessage( (HWND) HB_PARWH( 1 ) ,
(UINT) hb_parni( 2 ) ,
(WPARAM) hb_parnl( 3 ),
(LPARAM) hb_parnl( 4 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -311,7 +313,7 @@ HB_FUNC( POSTTHREADMESSAGE )
(UINT) hb_parni( 2 ) ,
(WPARAM) hb_parnl( 3 ),
(LPARAM) hb_parnl( 4 )
) ) ;
) );
}
//----------------------------------------------------------------------------
@@ -319,7 +321,7 @@ HB_FUNC( POSTTHREADMESSAGE )
HB_FUNC( REPLYMESSAGE )
{
hb_retl( ReplyMessage( (LRESULT) hb_parnl( 1 ) ) ) ;
hb_retl( ReplyMessage( (LRESULT) hb_parnl( 1 ) ) );
}
@@ -328,7 +330,7 @@ HB_FUNC( REPLYMESSAGE )
HB_FUNC( WAITMESSAGE )
{
hb_retl( WaitMessage( ) ) ;
hb_retl( WaitMessage( ) );
}
//-----------------------------------------------------------------------------
@@ -336,9 +338,9 @@ HB_FUNC( WAITMESSAGE )
HB_FUNC( WAITFORINPUTIDLE )
{
hb_retnl( (LONG) WaitForInputIdle( (HANDLE) hb_parnl( 1 ),
hb_retnl( (LONG) WaitForInputIdle( (HANDLE) HB_PARWH( 1 ),
(DWORD) hb_parnl( 2 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -346,7 +348,7 @@ HB_FUNC( WAITFORINPUTIDLE )
HB_FUNC( INSENDMESSAGE )
{
hb_retl( InSendMessage( ) ) ;
hb_retl( InSendMessage( ) );
}
//-----------------------------------------------------------------------------
@@ -358,7 +360,7 @@ HB_FUNC( INSENDMESSAGE )
HB_FUNC( INSENDMESSAGEEX )
{
hb_retnl( (LONG) InSendMessageEx( NULL ) ) ; // param reserved must be NULL
hb_retnl( (LONG) InSendMessageEx( NULL ) ); // param reserved must be NULL
}
#endif
@@ -375,7 +377,7 @@ HB_FUNC( MSGWAITFORMULTIPLEOBJECTS )
hb_parl( 3 ) ,
(DWORD) hb_parnl( 4 ) ,
(DWORD) hb_parnl( 5 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -389,7 +391,7 @@ HB_FUNC( MSGWAITFORMULTIPLEOBJECTSEX )
(DWORD) hb_parnl( 3 ) ,
(DWORD) hb_parnl( 4 ) ,
(DWORD) hb_parnl( 5 )
) ) ;
) );
}
@@ -405,13 +407,13 @@ HB_FUNC( SENDMESSAGECALLBACK )
// Your code goes here
hb_retl( SendMessageCallback( (HWND) hb_parnl( 1 ) ,
hb_retl( SendMessageCallback( (HWND) HB_PARWH( 1 ) ,
(UINT) hb_parni( 2 ) ,
(WPARAM) hb_parnl( 3 ),
(LPARAM) hb_parnl( 4 ),
lpResultCallBack ,
dwData
) ) ;
) );
}
*/
@@ -432,7 +434,7 @@ HB_FUNC( BROADCASTSYSTEMMESSAGE )
(UINT) hb_parni( 3 ) ,
(WPARAM) hb_parnl( 4 ),
(LPARAM) hb_parnl( 5 )
) ) ;
) );
}
*/
@@ -453,7 +455,7 @@ HB_FUNC( BROADCASTSYSTEMMESSAGE )
(UINT) hb_parni( 3 ) ,
(WPARAM) hb_parnl( 4 ),
(LPARAM) hb_parnl( 5 )
) ) ;
) );
}
*/
@@ -469,10 +471,10 @@ HB_FUNC( REGISTERDEVICENOTIFICATION )
// Your code goes here
hb_retnl( (LONG) RegisterDeviceNotification( (HANDLE) hb_parnl( 1 ),
HB_RETWH( RegisterDeviceNotification( (HANDLE) HB_PARWH( 1 ),
NotificationFilter ,
(DWORD) hb_parnl( 3 )
) ) ;
) );
}
*/
@@ -484,7 +486,7 @@ HB_FUNC( REGISTERDEVICENOTIFICATION )
HB_FUNC( UNREGISTERDEVICENOTIFICATION )
{
hb_retl( UnregisterDeviceNotification( (HDEVNOTIFY) hb_parnl( 1 ) ) ) ;
hb_retl( UnregisterDeviceNotification( (HDEVNOTIFY) HB_PARWH( 1 ) ) );
}
#endif
@@ -499,7 +501,7 @@ HB_FUNC( ATTACHTHREADINPUT )
hb_retl( AttachThreadInput( (DWORD) hb_parnl( 1 ) ,
(DWORD) hb_parnl( 2 ) ,
hb_parl( 3 )
) ) ;
) );
}
@@ -510,27 +512,5 @@ HB_FUNC( CALLMSGFILTER )
{
MSG *Msg = (MSG * ) hb_parc( 1 ); //hb_param( 1, HB_IT_STRING )->item.asString.value;
hb_retl( CallMsgFilter( Msg, hb_parni( 2 ) ) ) ;
hb_retl( CallMsgFilter( Msg, hb_parni( 2 ) ) );
}

45
harbour/contrib/hbwhat32/whtpen.c
View File

@@ -10,6 +10,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
//#include <shlobj.h>
#include <windows.h>
#include "hbapiitm.h"
@@ -23,7 +25,7 @@
HB_FUNC( CREATEPEN )
{
hb_retnl( (LONG) CreatePen(
HB_RETWH( CreatePen(
hb_parni( 1 ), // pen style
hb_parni( 2 ), // pen width
(COLORREF) hb_parnl( 3 ) // pen color
@@ -41,7 +43,7 @@ HB_FUNC( CREATEPENINDIRECT )
// Your code goes here
hb_retnl( (LONG) CreatePenIndirect( &LOGPEN ) ) ;
HB_RETWH( CreatePenIndirect( &LOGPEN ) );
}
*/
@@ -55,7 +57,7 @@ HB_FUNC( CREATEPENINDIRECT )
HB_FUNC( GETDCPENCOLOR )
{
hb_retnl( (ULONG) GetDCPenColor( (HDC) hb_parnl( 1 ) ) ) ;
hb_retnl( (ULONG) GetDCPenColor( (HDC) HB_PARWH( 1 ) ) );
}
*/
@@ -70,7 +72,7 @@ HB_FUNC( GETDCPENCOLOR )
HB_FUNC( SETDCPENCOLOR )
{
hb_retnl( (ULONG) SetDCPenColor( (HDC) hb_parnl( 1 ), (COLORREF) hb_parnl( 2 ) ) ) ;
hb_retnl( (ULONG) SetDCPenColor( (HDC) HB_PARWH( 1 ), (COLORREF) hb_parnl( 2 ) ) );
}
*/
@@ -87,43 +89,12 @@ HB_FUNC( EXTCREATEPEN )
// Your code goes here
hb_retnl( (LONG) ExtCreatePen( (DWORD) hb_parnl( 1 ),
HB_RETWH( ExtCreatePen( (DWORD) hb_parnl( 1 ),
(DWORD) hb_parnl( 2 ),
&LOGBRUSH ,
(DWORD) hb_parnl( 4 ),
&&dWord4
) ) ;
) );
}
*/

28
harbour/contrib/hbwhat32/whtprn.c
View File

@@ -7,6 +7,8 @@
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -28,18 +30,18 @@ HB_FUNC( STARTDOC )
DOCINFO di;
di.cbSize = sizeof(DOCINFO);
di.lpszDocName = hb_parcx( 2 );
di.lpszOutput = (LPTSTR) ( ISNIL( 3 ) ? NULL : hb_parcx( 3 ) ) ;
di.lpszDatatype = (LPTSTR) ( ISNIL( 4 ) ? NULL : hb_parcx( 4 ) ) ;
di.lpszOutput = (LPTSTR) ( ISNIL( 3 ) ? NULL : hb_parcx( 3 ) );
di.lpszDatatype = (LPTSTR) ( ISNIL( 4 ) ? NULL : hb_parcx( 4 ) );
di.fwType = (DWORD) ( ISNIL( 5 ) ? 0 : hb_parnl( 5 ) );
hb_retnl( (LONG) StartDoc( (HDC) hb_parnl( 1 ), &di ) );
hb_retni( StartDoc( (HDC) HB_PARWH( 1 ), &di ) );
}
//-----------------------------------------------------------------------------
HB_FUNC( ENDDOC )
{
hb_retni(EndDoc( (HDC) hb_parnl( 1 ) ) );
hb_retni(EndDoc( (HDC) HB_PARWH( 1 ) ) );
}
@@ -49,7 +51,7 @@ HB_FUNC( ENDDOC )
HB_FUNC( ABORTDOC )
{
hb_retni( AbortDoc( (HDC) hb_parnl( 1 ) ) ) ;
hb_retni( AbortDoc( (HDC) HB_PARWH( 1 ) ) );
}
@@ -57,14 +59,14 @@ HB_FUNC( ABORTDOC )
HB_FUNC( STARTPAGE )
{
hb_retnl( (LONG) StartPage( (HDC) hb_parnl( 1 ) ) );
hb_retni( StartPage( (HDC) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
HB_FUNC( ENDPAGE )
{
hb_retnl( (LONG) EndPage( (HDC) hb_parnl( 1 ) ) );
hb_retni( EndPage( (HDC) HB_PARWH( 1 ) ) );
}
@@ -79,12 +81,12 @@ HB_FUNC( ESCAPE )
// Your code goes here
hb_retni( Escape( (HDC) hb_parnl( 1 ) ,
hb_retni( Escape( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
(LPCSTR) hb_parcx( 4 ),
lpVoid
) ) ;
) );
}
*/
@@ -94,17 +96,13 @@ HB_FUNC( ESCAPE )
/*
HB_FUNC( EXTESCAPE )
{
hb_retni( ExtEscape( (HDC) hb_parnl( 1 ) ,
hb_retni( ExtEscape( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
(LPCSTR) hb_parcx( 4 ),
hb_parni( 5 ) ,
(LPSTR) hb_parcx( 6 )
) ) ;
) );
}
*/

44
harbour/contrib/hbwhat32/whtrect.c
View File

@@ -10,6 +10,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
//#include <shlobj.h>
#include <windows.h>
#include "hbapiitm.h"
@@ -42,7 +44,7 @@ HB_FUNC( DRAWFOCUSRECT )
RECT lprc ;
if (ISARRAY(2) && Array2Rect( hb_param( 2 ,HB_IT_ARRAY ) , &lprc ) )
hb_retl( DrawFocusRect( (HDC) hb_parnl( 1 ), &lprc ) ) ;
hb_retl( DrawFocusRect( (HDC) HB_PARWH( 1 ), &lprc ) );
else
hb_retl(FALSE);
}
@@ -53,12 +55,12 @@ HB_FUNC( DRAWFOCUSRECT )
HB_FUNC( INTERSECTCLIPRECT )
{
hb_retni( IntersectClipRect( (HDC) hb_parnl( 1 ),
hb_retni( IntersectClipRect( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -73,9 +75,9 @@ HB_FUNC( FILLRECT )
if (Array2Rect( hb_param( 2 , HB_IT_ARRAY) , &rc) )
hb_retni( FillRect(
(HDC) hb_parnl( 1 ), // handle to device context
(HDC) HB_PARWH( 1 ), // handle to device context
&rc, // pointer to structure with rectangle
(HBRUSH) hb_parnl( 3 ) // handle to brush
(HBRUSH) HB_PARWH( 3 ) // handle to brush
) );
}
*/
@@ -100,7 +102,7 @@ HB_FUNC( FILLRECT )
PHB_ITEM pSrc1;
if (Array2Rect( hb_param( 2 , HB_IT_ARRAY) , &rc) )
hb_retni( FillRect( (HDC) hb_parnl( 1 ), &lprc, (HBRUSH) hb_parnl( 3 ) ) ) ;
hb_retni( FillRect( (HDC) HB_PARWH( 1 ), &lprc, (HBRUSH) HB_PARWH( 3 ) ) );
}
else
hb_retni(0);
@@ -127,7 +129,7 @@ HB_FUNC( FRAMERECT )
PHB_ITEM pSrc1;
if (Array2Rect( hb_param( 2 , HB_IT_ARRAY) , &lprc) )
hb_retni( FrameRect( (HDC) hb_parnl( 1 ), &lprc, (HBRUSH) hb_parnl( 3 ) ) ) ;
hb_retni( FrameRect( (HDC) HB_PARWH( 1 ), &lprc, (HBRUSH) HB_PARWH( 3 ) ) );
}
else
hb_retni( 0 );
@@ -152,7 +154,7 @@ HB_FUNC( INVERTRECT )
PHB_ITEM pSrc1;
if (Array2Rect( hb_param( 2 , HB_IT_ARRAY) , &lprc) )
hb_retl( InvertRect( (HDC) hb_parnl( 1 ), &lprc ) ) ;
hb_retl( InvertRect( (HDC) HB_PARWH( 1 ), &lprc ) );
}
else
hb_retl(FALSE);
@@ -182,7 +184,7 @@ HB_FUNC( SETRECT )
hb_itemRelease(hb_itemReturn(Rect2Array( &lprc)));
}
else
hb_ret( ) ;
hb_ret( );
}
@@ -258,7 +260,7 @@ HB_FUNC( INFLATERECT )
if ( InflateRect( &lprc, hb_parni( 2 ), hb_parni( 3 ) ) )
{
Rect2ArrayEx( &lprc,pArray );
hb_retl( TRUE ) ;
hb_retl( TRUE );
}
else
hb_retl(FALSE);
@@ -413,7 +415,7 @@ HB_FUNC( ISRECTEMPTY )
if (ISARRAY(1) && Array2Rect( pSrc1, &lprc))
{
hb_retl( IsRectEmpty( &lprc ) ) ;
hb_retl( IsRectEmpty( &lprc ) );
}
else
hb_retl(FALSE);
@@ -438,7 +440,7 @@ HB_FUNC( EQUALRECT )
if (Array2Rect( pSrc1, &lprc1) && Array2Rect( pSrc2, &lprc2))
{
hb_retl( EqualRect( &lprc1, &lprc2 ) ) ;
hb_retl( EqualRect( &lprc1, &lprc2 ) );
}
else
hb_retl(FALSE);
@@ -464,11 +466,11 @@ HB_FUNC( PTINRECT )
if (Array2Rect( pSrc1, &lprc) && Array2Point( pSrc2, &pt))
{
hb_retl( (BOOL) PtInRect( &lprc, pt ) ) ;
hb_retl( (BOOL) PtInRect( &lprc, pt ) );
}
else
hb_retl( FALSE) ;
hb_retl( FALSE);
}
@@ -480,12 +482,12 @@ HB_FUNC( PTINRECT )
HB_FUNC( EXCLUDECLIPRECT )
{
hb_retni( ExcludeClipRect( (HDC) hb_parnl( 1 ),
hb_retni( ExcludeClipRect( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 )
) ) ;
) );
}
@@ -499,7 +501,7 @@ HB_FUNC( RECTVISIBLE )
RECT rc;
if ( ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc ))
hb_retl( RectVisible( (HDC) hb_parnl( 1 ), &rc ) ) ;
hb_retl( RectVisible( (HDC) HB_PARWH( 1 ), &rc ) );
else
hb_retl(0);
@@ -515,7 +517,7 @@ HB_FUNC( GETBOUNDSRECT )
{
RECT rc ;
hb_retni( GetBoundsRect( (HDC) hb_parnl( 1 ), lpRect, (UINT) hb_parni( 3 ) ) ) ;
hb_retni( GetBoundsRect( (HDC) HB_PARWH( 1 ), lpRect, (UINT) hb_parni( 3 ) ) );
}
*/
@@ -530,9 +532,7 @@ HB_FUNC( VALIDATERECT )
RECT rc ;
if (ISARRAY( 2 ) && Array2Rect( hb_param( 2, HB_IT_ARRAY ), &rc ) )
hb_retl( ValidateRect( (HWND) hb_parnl( 1 ), &rc) ) ;
hb_retl( ValidateRect( (HWND) HB_PARWH( 1 ), &rc) );
else
hb_retl(ValidateRect( (HWND) hb_parnl( 1 ),NULL));
hb_retl(ValidateRect( (HWND) HB_PARWH( 1 ),NULL));
}

52
harbour/contrib/hbwhat32/whtreg.c
View File

@@ -7,6 +7,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -69,7 +71,7 @@
HB_FUNC( REGCLOSEKEY )
{
HKEY hwHandle = ( HKEY ) hb_parnl( 1 );
HKEY hwHandle = ( HKEY ) HB_PARWH( 1 );
if ( RegCloseKey( hwHandle ) == ERROR_SUCCESS )
{
@@ -86,7 +88,7 @@ HB_FUNC( REGCLOSEKEY )
HB_FUNC( REGOPENKEYEX )
{
HKEY hwKey = ( ( HKEY ) hb_parnl( 1 ) );
HKEY hwKey = ( ( HKEY ) HB_PARWH( 1 ) );
LPCTSTR lpValue=hb_parcx( 2 );
LONG lError;
HKEY phwHandle;
@@ -111,13 +113,13 @@ HB_FUNC( REGQUERYVALUEEX )
DWORD lpType=hb_parnl( 4 );
DWORD lpcbData=0;
lError=RegQueryValueExA( ( HKEY ) hb_parnl( 1 ) , ( LPTSTR ) hb_parcx( 2 ) , NULL , &lpType , NULL , &lpcbData );
lError=RegQueryValueExA( ( HKEY ) HB_PARWH( 1 ) , ( LPTSTR ) hb_parcx( 2 ) , NULL , &lpType , NULL , &lpcbData );
if ( lError == ERROR_SUCCESS )
{
BYTE *lpData;
lpData=(BYTE*)malloc( ( int ) lpcbData+1 );
lError= RegQueryValueExA( ( HKEY ) hb_parnl( 1 ) , ( LPTSTR ) hb_parcx( 2 ) , NULL , &lpType , ( BYTE* ) lpData , &lpcbData );
lError= RegQueryValueExA( ( HKEY ) HB_PARWH( 1 ) , ( LPTSTR ) hb_parcx( 2 ) , NULL , &lpType , ( BYTE* ) lpData , &lpcbData );
if ( lError > 0 )
{
@@ -145,7 +147,7 @@ HB_FUNC( REGENUMKEYEX )
TCHAR Class[255];
DWORD dwClass = 255;
bErr = RegEnumKeyEx( ( HKEY ) hb_parnl( 1 ) , hb_parnl( 2 ) , Buffer , &dwBuffSize , NULL , Class , &dwClass , &ft );
bErr = RegEnumKeyEx( ( HKEY ) HB_PARWH( 1 ) , hb_parnl( 2 ) , Buffer , &dwBuffSize , NULL , Class , &dwClass , &ft );
if ( bErr != ERROR_SUCCESS )
{
@@ -166,7 +168,7 @@ HB_FUNC( REGENUMKEYEX )
HB_FUNC( REGSETVALUEEX )
{
hb_retnl( RegSetValueExA( ( HKEY ) hb_parnl( 1 ), hb_parcx( 2 ), 0, hb_parnl( 4 ), ( BYTE * const ) hb_parcx( 5 ), ( strlen( hb_parcx( 5 ) ) + 1 ) ) ) ;
hb_retnl( RegSetValueExA( ( HKEY ) HB_PARWH( 1 ), hb_parcx( 2 ), 0, hb_parnl( 4 ), ( BYTE * const ) hb_parcx( 5 ), ( strlen( hb_parcx( 5 ) ) + 1 ) ) );
}
@@ -175,7 +177,7 @@ HB_FUNC( REGCREATEKEY )
HKEY hKey;
LONG nErr;
nErr = RegCreateKey( ( HKEY ) hb_parnl( 1 ) , hb_parcx( 2 ) , &hKey );
nErr = RegCreateKey( ( HKEY ) HB_PARWH( 1 ) , hb_parcx( 2 ) , &hKey );
if ( nErr == ERROR_SUCCESS )
{
hb_stornl( PtrToLong( hKey ) , 3 );
@@ -212,7 +214,7 @@ HB_FUNC( REGCREATEKEYEX )
if (ISCHAR(7))
sa = (SECURITY_ATTRIBUTES *) hb_parc( 7 ); //hb_param(7, HB_IT_STRING)->item.asString.value;
nErr = RegCreateKeyEx( (HKEY) hb_parnl( 1 ) ,
nErr = RegCreateKeyEx( (HKEY) HB_PARWH( 1 ) ,
(LPCSTR) hb_parcx( 2 ) ,
(DWORD) 0 ,
(LPSTR) hb_parcx( 4 ) ,
@@ -224,25 +226,20 @@ HB_FUNC( REGCREATEKEYEX )
if ( nErr == ERROR_SUCCESS )
{
hb_stornl( (LONG) hkResult, 8 ) ;
hb_stornl( (LONG) dwDisposition, 9 ) ;
HB_STORWH( hkResult, 8 );
hb_stornl( (LONG) dwDisposition, 9 );
}
hb_retnl( nErr ) ;
hb_retnl( nErr );
}
HB_FUNC( REGDELETEKEY )
{
if ( RegDeleteKeyA( ( HKEY ) hb_parnl( 1 ), ( LPCTSTR ) hb_parcx( 2 ) ) == ERROR_SUCCESS )
{
hb_retnl( 0 );
}
else
{
hb_retnl( -1 );
}
if ( RegDeleteKeyA( ( HKEY ) HB_PARWH( 1 ), ( LPCTSTR ) hb_parcx( 2 ) ) == ERROR_SUCCESS )
hb_retnl( 0 );
else
hb_retnl( -1 );
}
// For strange reasons this function is not working properly
@@ -250,15 +247,8 @@ HB_FUNC( REGDELETEKEY )
HB_FUNC( REGDELETEVALUE )
{
if ( RegDeleteValue( ( HKEY ) hb_parnl( 1 ), hb_parcx( 2 ) ) == ERROR_SUCCESS )
{
hb_retnl( 0 );
}
else
{
hb_retnl( -1 );
}
if ( RegDeleteValue( ( HKEY ) HB_PARWH( 1 ), hb_parcx( 2 ) ) == ERROR_SUCCESS )
hb_retnl( 0 );
else
hb_retnl( -1 );
}

136
harbour/contrib/hbwhat32/whtrgn.c
View File

@@ -11,6 +11,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include "hbapiitm.h"
#include "hbapi.h"
@@ -26,11 +28,11 @@ extern BOOL Array2Point(PHB_ITEM aPoint, POINT *pt );
HB_FUNC( CREATEELLIPTICRGN )
{
hb_retnl( (LONG) CreateEllipticRgn( hb_parni( 1 ),
HB_RETWH( CreateEllipticRgn( hb_parni( 1 ),
hb_parni( 2 ),
hb_parni( 3 ),
hb_parni( 4 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -44,9 +46,9 @@ HB_FUNC( CREATEELLIPTICRGNINDIRECT )
RECT rc;
if (ISARRAY( 1 ) && Array2Rect( hb_param( 1, HB_IT_ARRAY ), &rc ) )
hb_retnl( (LONG) CreateEllipticRgnIndirect( &rc ) ) ;
HB_RETWH( CreateEllipticRgnIndirect( &rc ) );
else
hb_retnl( 0 ) ;
hb_retnl( 0 );
}
//-----------------------------------------------------------------------------
@@ -55,10 +57,10 @@ HB_FUNC( CREATEELLIPTICRGNINDIRECT )
HB_FUNC( FILLRGN )
{
hb_retl( FillRgn( (HDC) hb_parnl( 1 ) ,
(HRGN) hb_parnl( 2 ) ,
(HBRUSH) hb_parnl( 3 )
) ) ;
hb_retl( FillRgn( (HDC) HB_PARWH( 1 ) ,
(HRGN) HB_PARWH( 2 ) ,
(HBRUSH) HB_PARWH( 3 )
) );
}
//-----------------------------------------------------------------------------
@@ -78,8 +80,8 @@ HB_FUNC( CREATEPOLYGONRGN )
if (ISARRAY( 1 ) )
{
iCount = (int) hb_parinfa( 1, 0 ) ;
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) ) ;
iCount = (int) hb_parinfa( 1, 0 );
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) );
aParam = hb_param(1,HB_IT_ARRAY);
for ( i = 0 ; i<iCount ; i++ )
@@ -95,7 +97,7 @@ HB_FUNC( CREATEPOLYGONRGN )
}
}
hb_retnl( (LONG) CreatePolygonRgn( Point, iCount, hb_parni( 2 ) ) ) ;
HB_RETWH( CreatePolygonRgn( Point, iCount, hb_parni( 2 ) ) );
hb_xfree(Point);
}
@@ -123,16 +125,16 @@ HB_FUNC( CREATEPOLYPOLYGONRGN )
if (ISARRAY( 1 ) && ISARRAY( 2 ) )
{
iPolyCount = hb_parinfa(2,0) ;
PolyPoints = ( INT *) hb_xgrab( iPolyCount * sizeof( INT ) ) ;
iPolyCount = hb_parinfa(2,0);
PolyPoints = ( INT *) hb_xgrab( iPolyCount * sizeof( INT ) );
for ( i=0 ; i < iPolyCount ; i++ )
{
*(PolyPoints+i) = hb_parni( 2,i+1) ;
*(PolyPoints+i) = hb_parni( 2,i+1);
}
iCount = hb_parinfa( 1, 0 ) ;
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) ) ;
iCount = hb_parinfa( 1, 0 );
Point = (POINT *) hb_xgrab( iCount * sizeof (POINT) );
aParam = hb_param(1,HB_IT_ARRAY);
for ( i = 0 ; i<iCount ; i++ )
@@ -149,7 +151,7 @@ HB_FUNC( CREATEPOLYPOLYGONRGN )
}
}
hb_retnl( (LONG) CreatePolyPolygonRgn( Point, PolyPoints, iPolyCount, hb_parni( 3 ) ) ) ;
HB_RETWH( CreatePolyPolygonRgn( Point, PolyPoints, iPolyCount, hb_parni( 3 ) ) );
hb_xfree(PolyPoints);
hb_xfree(Point);
@@ -169,11 +171,11 @@ HB_FUNC( CREATEPOLYPOLYGONRGN )
HB_FUNC( CREATERECTRGN )
{
hb_retnl( (LONG) CreateRectRgn( hb_parni( 1 ),
HB_RETWH( CreateRectRgn( hb_parni( 1 ),
hb_parni( 2 ),
hb_parni( 3 ),
hb_parni( 4 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -188,9 +190,9 @@ HB_FUNC( CREATERECTRGNINDIRECT )
RECT rc;
if (ISARRAY( 1 ) && Array2Rect( hb_param( 1, HB_IT_ARRAY ), &rc ) )
hb_retnl( (LONG) CreateRectRgnIndirect( &rc ) ) ;
HB_RETWH( CreateRectRgnIndirect( &rc ) );
else
hb_retnl( 0 ) ;
hb_retnl( 0 );
}
@@ -201,13 +203,13 @@ HB_FUNC( CREATERECTRGNINDIRECT )
HB_FUNC( CREATEROUNDRECTRGN )
{
hb_retnl( (LONG) CreateRoundRectRgn( hb_parni( 1 ),
HB_RETWH( CreateRoundRectRgn( hb_parni( 1 ),
hb_parni( 2 ),
hb_parni( 3 ),
hb_parni( 4 ),
hb_parni( 5 ),
hb_parni( 6 )
) ) ;
) );
}
@@ -220,8 +222,8 @@ HB_FUNC( CREATEROUNDRECTRGN )
HB_FUNC( COMBINERGN )
{
hb_retni( CombineRgn( (HRGN) hb_parnl(1), (HRGN) hb_parnl(2),
(HRGN) hb_parnl(3), hb_parni(4) ) ) ;
hb_retni( CombineRgn( (HRGN) HB_PARWH(1), (HRGN) HB_PARWH(2),
(HRGN) HB_PARWH(3), hb_parni(4) ) );
}
@@ -236,20 +238,20 @@ HB_FUNC( COMBINERGN )
HB_FUNC( GETREGIONDATA )
{
RGNDATA *RgnData ;
DWORD nBytes = GetRegionData( (HRGN) hb_parnl( 1 ) , 0, NULL ) ;
DWORD nBytes = GetRegionData( (HRGN) HB_PARWH( 1 ) , 0, NULL );
DWORD nRet ;
if ( nBytes )
{
RgnData = (RGNDATA *) hb_xgrab( nBytes ) ;
nRet = GetRegionData( (HRGN) hb_parnl( 1 ) ,
RgnData = (RGNDATA *) hb_xgrab( nBytes );
nRet = GetRegionData( (HRGN) HB_PARWH( 1 ) ,
nBytes ,
RgnData
) ;
);
if ( nRet == 1 )
hb_retclen( ( char *) RgnData,nBytes ) ;
hb_retclen( ( char *) RgnData,nBytes );
hb_xfree( RgnData) ;
hb_xfree( RgnData);
}
}
@@ -261,10 +263,10 @@ HB_FUNC( GETREGIONDATA )
HB_FUNC( EXTSELECTCLIPRGN )
{
hb_retni( ExtSelectClipRgn( (HDC) hb_parnl( 1 ) ,
(HRGN) hb_parnl( 2 ),
hb_retni( ExtSelectClipRgn( (HDC) HB_PARWH( 1 ) ,
(HRGN) HB_PARWH( 2 ),
hb_parni( 3 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -278,7 +280,7 @@ HB_FUNC( RECTINREGION )
RECT rc;
if (ISARRAY( 2 ) && Array2Rect( hb_param( 2, HB_IT_ARRAY ), &rc ) )
hb_retl( RectInRegion( (HRGN) hb_parnl( 1 ), &rc ) ) ;
hb_retl( RectInRegion( (HRGN) HB_PARWH( 1 ), &rc ) );
}
@@ -288,10 +290,10 @@ HB_FUNC( RECTINREGION )
HB_FUNC( GETRANDOMRGN )
{
hb_retni( GetRandomRgn( (HDC) hb_parnl( 1 ) ,
(HRGN) hb_parnl( 2 ),
hb_retni( GetRandomRgn( (HDC) HB_PARWH( 1 ) ,
(HRGN) HB_PARWH( 2 ),
hb_parni( 3 )
) ) ;
) );
}
@@ -301,7 +303,7 @@ HB_FUNC( GETRANDOMRGN )
HB_FUNC( GETCLIPRGN )
{
hb_retni( GetClipRgn( (HDC) hb_parnl( 1 ), (HRGN) hb_parnl( 2 ) ) ) ;
hb_retni( GetClipRgn( (HDC) HB_PARWH( 1 ), (HRGN) HB_PARWH( 2 ) ) );
}
@@ -311,12 +313,12 @@ HB_FUNC( GETCLIPRGN )
HB_FUNC( FRAMERGN )
{
hb_retl( FrameRgn( (HDC) hb_parnl( 1 ) ,
(HRGN) hb_parnl( 2 ) ,
(HBRUSH) hb_parnl( 3 ),
hb_retl( FrameRgn( (HDC) HB_PARWH( 1 ) ,
(HRGN) HB_PARWH( 2 ) ,
(HBRUSH) HB_PARWH( 3 ),
hb_parni( 4 ) ,
hb_parni( 5 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -325,7 +327,7 @@ HB_FUNC( FRAMERGN )
HB_FUNC( EQUALRGN )
{
hb_retl( EqualRgn( (HRGN) hb_parnl( 1 ), (HRGN) hb_parnl( 2 ) ) ) ;
hb_retl( EqualRgn( (HRGN) HB_PARWH( 1 ), (HRGN) HB_PARWH( 2 ) ) );
}
/*
@@ -340,9 +342,9 @@ HB_FUNC( VALIDATERECT )
RECT rc ;
if (ISARRAY( 2 ) && Array2Rect( hb_param( 2, HB_IT_ARRAY ), &rc ) )
hb_retl( ValidateRect( (HWND) hb_parnl( 1 ), &rc ) ) ;
hb_retl( ValidateRect( (HWND) HB_PARWH( 1 ), &rc ) );
else
hb_retl( ValidateRect( (HWND) hb_parnl( 1 ), NULL) ) ;
hb_retl( ValidateRect( (HWND) HB_PARWH( 1 ), NULL) );
}
*/
@@ -354,10 +356,10 @@ HB_FUNC( VALIDATERECT )
HB_FUNC( INVALIDATERGN )
{
hb_retl( InvalidateRgn( (HWND) hb_parnl( 1 ),
(HRGN) hb_parnl( 2 ),
hb_retl( InvalidateRgn( (HWND) HB_PARWH( 1 ),
(HRGN) HB_PARWH( 2 ),
hb_parl( 3 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -366,7 +368,7 @@ HB_FUNC( INVALIDATERGN )
HB_FUNC( VALIDATERGN )
{
hb_retl( ValidateRgn( (HWND) hb_parnl( 1 ), (HRGN) hb_parnl( 2 ) ) ) ;
hb_retl( ValidateRgn( (HWND) HB_PARWH( 1 ), (HRGN) HB_PARWH( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -375,7 +377,7 @@ HB_FUNC( VALIDATERGN )
HB_FUNC( INVERTRGN )
{
hb_retl( InvertRgn( (HDC) hb_parnl( 1 ), (HRGN) hb_parnl( 2 ) ) ) ;
hb_retl( InvertRgn( (HDC) HB_PARWH( 1 ), (HRGN) HB_PARWH( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -384,7 +386,7 @@ HB_FUNC( INVERTRGN )
HB_FUNC( OFFSETCLIPRGN )
{
hb_retni( OffsetClipRgn( (HDC) hb_parnl( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) ) ;
hb_retni( OffsetClipRgn( (HDC) HB_PARWH( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) );
}
//-----------------------------------------------------------------------------
@@ -393,7 +395,7 @@ HB_FUNC( OFFSETCLIPRGN )
HB_FUNC( OFFSETRGN )
{
hb_retni( OffsetRgn( (HRGN) hb_parnl( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) ) ;
hb_retni( OffsetRgn( (HRGN) HB_PARWH( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) );
}
//-----------------------------------------------------------------------------
@@ -402,7 +404,7 @@ HB_FUNC( OFFSETRGN )
HB_FUNC( PAINTRGN )
{
hb_retl( PaintRgn( (HDC) hb_parnl( 1 ), (HRGN) hb_parnl( 2 ) ) ) ;
hb_retl( PaintRgn( (HDC) HB_PARWH( 1 ), (HRGN) HB_PARWH( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -411,7 +413,7 @@ HB_FUNC( PAINTRGN )
HB_FUNC( PATHTOREGION )
{
hb_retnl( (LONG) PathToRegion( (HDC) hb_parnl( 1 ) ) ) ;
HB_RETWH( PathToRegion( (HDC) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -420,7 +422,7 @@ HB_FUNC( PATHTOREGION )
HB_FUNC( PTINREGION )
{
hb_retl( PtInRegion( (HRGN) hb_parnl( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) ) ;
hb_retl( PtInRegion( (HRGN) HB_PARWH( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) );
}
@@ -431,7 +433,7 @@ HB_FUNC( PTINREGION )
HB_FUNC( SELECTCLIPRGN )
{
hb_retni( SelectClipRgn( (HDC) hb_parnl( 1 ), (HRGN) hb_parnl( 2 ) ) ) ;
hb_retni( SelectClipRgn( (HDC) HB_PARWH( 1 ), (HRGN) HB_PARWH( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -440,12 +442,12 @@ HB_FUNC( SELECTCLIPRGN )
HB_FUNC( SETRECTRGN )
{
hb_retl( SetRectRgn( (HRGN) hb_parnl( 1 ),
hb_retl( SetRectRgn( (HRGN) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 )
) ) ;
) );
}
@@ -455,10 +457,10 @@ HB_FUNC( SETRECTRGN )
HB_FUNC( GETUPDATERGN )
{
hb_retni( GetUpdateRgn( (HWND) hb_parnl( 1 ),
(HRGN) hb_parnl( 2 ),
hb_retni( GetUpdateRgn( (HWND) HB_PARWH( 1 ),
(HRGN) HB_PARWH( 2 ),
hb_parl( 3 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -467,7 +469,7 @@ HB_FUNC( GETUPDATERGN )
HB_FUNC( EXCLUDEUPDATERGN )
{
hb_retni( ExcludeUpdateRgn( (HDC) hb_parnl( 1 ), (HWND) hb_parnl( 2 ) ) ) ;
hb_retni( ExcludeUpdateRgn( (HDC) HB_PARWH( 1 ), (HWND) HB_PARWH( 2 ) ) );
}
@@ -487,7 +489,7 @@ HB_FUNC( GETRGNBOX )
RECT *rc ;
hb_retni( GetRgnBox( (HRGN) hb_parnl( 1 ), lpRect ) ) ;
hb_retni( GetRgnBox( (HRGN) HB_PARWH( 1 ), lpRect ) );
}
@@ -506,11 +508,7 @@ HB_FUNC( EXTCREATEREGION )
// Your code goes here
hb_retnl( (LONG) ExtCreateRegion( &XFORM, (DWORD) hb_parnl( 2 ), &&RGNDATA ) ) ;
HB_RETWH( ExtCreateRegion( &XFORM, (DWORD) hb_parnl( 2 ), &&RGNDATA ) );
}
*/

39
harbour/contrib/hbwhat32/whtscrlb.c
View File

@@ -6,6 +6,9 @@
// Scrollbar API functions
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include "hbapi.h"
@@ -17,11 +20,11 @@
HB_FUNC( SETSCROLLPOS )
{
hb_retni( SetScrollPos( (HWND) hb_parnl( 1 ),
hb_retni( SetScrollPos( (HWND) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parl( 4 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -30,7 +33,7 @@ HB_FUNC( SETSCROLLPOS )
HB_FUNC( GETSCROLLPOS )
{
hb_retni( GetScrollPos( (HWND) hb_parnl( 1 ), hb_parni( 2 ) ) ) ;
hb_retni( GetScrollPos( (HWND) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -39,12 +42,12 @@ HB_FUNC( GETSCROLLPOS )
HB_FUNC( SETSCROLLRANGE )
{
hb_retl( SetScrollRange( (HWND) hb_parnl( 1 ),
hb_retl( SetScrollRange( (HWND) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parl( 5 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -59,19 +62,19 @@ HB_FUNC( GETSCROLLRANGE )
LPINT lpMinPos = 0 ;
LPINT lpMaxPos = 0 ;
if ( GetScrollRange( (HWND) hb_parnl( 1 ), hb_parni( 2 ), lpMinPos, lpMaxPos ) )
if ( GetScrollRange( (HWND) HB_PARWH( 1 ), hb_parni( 2 ), lpMinPos, lpMaxPos ) )
{
if ( ISBYREF(3) && ISBYREF(4) )
{
hb_storni(3,*lpMinPos) ;
hb_storni(4,*lpMaxPos) ;
hb_retl(1) ;
hb_storni(3,*lpMinPos);
hb_storni(4,*lpMaxPos);
hb_retl(1);
}
else
hb_retl(0);
}
else
hb_retl(0) ;
hb_retl(0);
}
@@ -82,7 +85,7 @@ HB_FUNC( GETSCROLLRANGE )
HB_FUNC( SHOWSCROLLBAR )
{
hb_retl( ShowScrollBar( (HWND) hb_parnl( 1 ), hb_parni( 2 ), hb_parl( 3 ) ) ) ;
hb_retl( ShowScrollBar( (HWND) HB_PARWH( 1 ), hb_parni( 2 ), hb_parl( 3 ) ) );
}
//-----------------------------------------------------------------------------
@@ -91,10 +94,10 @@ HB_FUNC( SHOWSCROLLBAR )
HB_FUNC( ENABLESCROLLBAR )
{
hb_retl( EnableScrollBar( (HWND) hb_parnl( 1 ),
hb_retl( EnableScrollBar( (HWND) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ),
(UINT) hb_parni( 3 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -108,11 +111,11 @@ HB_FUNC( SETSCROLLINFO )
{
SCROLLINFO * scrollInfo = (SCROLLINFO * ) hb_parc( 3 ); //hb_param( 3, HB_IT_STRING )->item.asString.value;
hb_retni( SetScrollInfo( (HWND) hb_parnl( 1 ),
hb_retni( SetScrollInfo( (HWND) HB_PARWH( 1 ),
hb_parni( 2 ) ,
scrollInfo ,
hb_parl( 4 )
) ) ;
) );
}
@@ -125,10 +128,10 @@ HB_FUNC( SETSCROLLINFO )
HB_FUNC( GETSCROLLINFO )
{
SCROLLINFO si ;
si.cbSize = sizeof(SCROLLINFO) ;
si.cbSize = sizeof(SCROLLINFO);
si.fMask = SIF_ALL ;
if ( GetScrollInfo( (HWND) hb_parnl( 1 ), hb_parni( 2 ), &si ) )
if ( GetScrollInfo( (HWND) HB_PARWH( 1 ), hb_parni( 2 ), &si ) )
hb_retclen( (char *) &si, sizeof( SCROLLINFO ) );
// problem
@@ -149,7 +152,7 @@ HB_FUNC( GETSCROLLBARINFO )
{
SCROLLBARINFO sbi ;
if ( GetScrollBarInfo( (HWND) hb_parnl( 1 ), hb_parnl( 2 ), &sbi ) )
if ( GetScrollBarInfo( (HWND) HB_PARWH( 1 ), hb_parnl( 2 ), &sbi ) )
hb_retclen( (char *) &sbi, sizeof( SCROLLBARINFO ) );
// problem

85
harbour/contrib/hbwhat32/whtseria.c
View File

@@ -15,6 +15,8 @@
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
//-------------------------------------------------------------------//
#include <windows.h>
@@ -44,7 +46,7 @@ HB_FUNC( BUILDCOMMDCB )
hb_retl( BuildCommDCB( ( LPCTSTR ) hb_parcx( 1 ), &dcb ) );
hb_storclen( ( char * ) &dcb, sizeof( DCB ), 2 ) ;
hb_storclen( ( char * ) &dcb, sizeof( DCB ), 2 );
}
//-------------------------------------------------------------------//
@@ -67,9 +69,9 @@ HB_FUNC( BUILDCOMMDCBANDTIMEOUTS )
{
DCB dcb ;
LPCOMMTIMEOUTS lptimeouts = ( LPCOMMTIMEOUTS ) hb_parcx( 3 );
hb_retl( BuildCommDCBAndTimeouts( ( LPCTSTR ) hb_parcx( 1 ), &dcb, lptimeouts ) ) ;
hb_retl( BuildCommDCBAndTimeouts( ( LPCTSTR ) hb_parcx( 1 ), &dcb, lptimeouts ) );
hb_storclen( ( char * ) &dcb, sizeof( DCB ), 2 ) ;
hb_storclen( ( char * ) &dcb, sizeof( DCB ), 2 );
}
//-------------------------------------------------------------------//
@@ -85,7 +87,7 @@ endif
*/
HB_FUNC( CLEARCOMMBREAK )
{
hb_retl( ClearCommBreak( ( HANDLE ) hb_parnl( 1 ) ) );
hb_retl( ClearCommBreak( ( HANDLE ) HB_PARWH( 1 ) ) );
}
//-------------------------------------------------------------------//
@@ -104,10 +106,10 @@ HB_FUNC( CLEARCOMMERROR )
DWORD err = 0 ;
COMSTAT Stat ;
hb_retl( ClearCommError( ( HANDLE ) hb_parnl( 1 ), &err, &Stat ) );
hb_retl( ClearCommError( ( HANDLE ) HB_PARWH( 1 ), &err, &Stat ) );
hb_stornl( err, 2 );
hb_storclen( ( char * ) &Stat, sizeof( COMSTAT ), 3 ) ;
hb_storclen( ( char * ) &Stat, sizeof( COMSTAT ), 3 );
}
//-------------------------------------------------------------------//
@@ -130,12 +132,12 @@ endif
HB_FUNC( COMMCONFIGDIALOG )
{
LPCTSTR lpszName = ( LPCTSTR ) hb_parcx( 1 );
HWND hwnd = ISNIL( 2 ) ? NULL : ( HWND ) hb_parnl( 2 );
LPCOMMCONFIG lpCC = ( LPCOMMCONFIG ) hb_parcx( 3 ) ;
HWND hwnd = ISNIL( 2 ) ? NULL : ( HWND ) HB_PARWH( 2 );
LPCOMMCONFIG lpCC = ( LPCOMMCONFIG ) hb_parcx( 3 );
hb_retl( CommConfigDialog( lpszName, hwnd, lpCC ) );
hb_storclen( ( char * ) lpCC, sizeof( COMMCONFIG ), 3 ) ;
hb_storclen( ( char * ) lpCC, sizeof( COMMCONFIG ), 3 );
}
//-------------------------------------------------------------------//
@@ -152,7 +154,7 @@ endif
*/
HB_FUNC( ESCAPECOMMFUNCTION )
{
hb_retl( EscapeCommFunction( ( HANDLE ) hb_parnl( 1 ), hb_parnl( 2 ) ) );
hb_retl( EscapeCommFunction( ( HANDLE ) HB_PARWH( 1 ), hb_parnl( 2 ) ) );
}
//-------------------------------------------------------------------//
@@ -171,9 +173,9 @@ HB_FUNC( GETCOMMCONFIG )
COMMCONFIG lpCC ; // = ( LPCOMMCONFIG ) hb_parcx( 2 );
DWORD size = sizeof( COMMCONFIG );
hb_retl( GetCommConfig( ( HANDLE ) hb_parnl( 1 ), &lpCC, &size ) ) ;
hb_retl( GetCommConfig( ( HANDLE ) HB_PARWH( 1 ), &lpCC, &size ) );
hb_storclen( ( char * ) &lpCC, size, 2 ) ;
hb_storclen( ( char * ) &lpCC, size, 2 );
}
//-------------------------------------------------------------------//
@@ -190,8 +192,8 @@ endif
HB_FUNC( GETCOMMMASK )
{
DWORD mask;
hb_retl( GetCommMask( ( HANDLE ) hb_parnl( 1 ), &mask ) ) ;
hb_stornl( ( ULONG ) mask, 2 ) ;
hb_retl( GetCommMask( ( HANDLE ) HB_PARWH( 1 ), &mask ) );
hb_stornl( ( ULONG ) mask, 2 );
}
//-------------------------------------------------------------------//
@@ -208,8 +210,8 @@ endif
HB_FUNC( GETCOMMMODEMSTATUS )
{
DWORD modemStat ;
hb_retl( GetCommModemStatus( ( HANDLE ) hb_parnl( 1 ), &modemStat ) ) ;
hb_stornl( ( ULONG ) modemStat, 2 ) ;
hb_retl( GetCommModemStatus( ( HANDLE ) HB_PARWH( 1 ), &modemStat ) );
hb_stornl( ( ULONG ) modemStat, 2 );
}
//-------------------------------------------------------------------//
@@ -228,9 +230,9 @@ HB_FUNC( GETCOMMPROPERTIES )
COMMPROP CommProp ;
CommProp.wPacketLength = sizeof( COMMPROP );
hb_retl( GetCommProperties( ( HANDLE ) hb_parnl( 1 ), &CommProp ) );
hb_retl( GetCommProperties( ( HANDLE ) HB_PARWH( 1 ), &CommProp ) );
hb_storclen( ( char * ) &CommProp, sizeof( COMMPROP ), 2 ) ;
hb_storclen( ( char * ) &CommProp, sizeof( COMMPROP ), 2 );
}
//-------------------------------------------------------------------//
@@ -245,11 +247,11 @@ dcb:buffer( cDcb )
HB_FUNC( GETCOMMSTATE )
{
DCB dcb ;
dcb.DCBlength = sizeof( DCB ) ;
dcb.DCBlength = sizeof( DCB );
hb_retl( GetCommState( ( HANDLE ) hb_parnl( 1 ), &dcb ) );
hb_retl( GetCommState( ( HANDLE ) HB_PARWH( 1 ), &dcb ) );
hb_storclen( ( char * ) &dcb, sizeof( DCB ), 2 ) ;
hb_storclen( ( char * ) &dcb, sizeof( DCB ), 2 );
}
//-------------------------------------------------------------------//
@@ -265,9 +267,9 @@ HB_FUNC( GETCOMMTIMEOUTS )
{
COMMTIMEOUTS Timeouts ;
hb_retl( GetCommTimeouts( ( HANDLE ) hb_parnl( 1 ), &Timeouts ) );
hb_retl( GetCommTimeouts( ( HANDLE ) HB_PARWH( 1 ), &Timeouts ) );
hb_storclen( ( char * ) &Timeouts, sizeof( COMMTIMEOUTS ), 2 ) ;
hb_storclen( ( char * ) &Timeouts, sizeof( COMMTIMEOUTS ), 2 );
}
//-------------------------------------------------------------------//
@@ -287,17 +289,17 @@ HB_FUNC( GETDEFAULTCOMMCONFIG )
if ( GetDefaultCommConfig( ( LPCTSTR ) hb_parcx( 1 ), ( COMMCONFIG * ) Buffer, &size ) == 0 )
{
hb_xfree( Buffer ) ;
Buffer = (char *) hb_xgrab( size ) ;
hb_xfree( Buffer );
Buffer = (char *) hb_xgrab( size );
if ( GetDefaultCommConfig( ( LPCTSTR ) hb_parcx( 1 ), ( COMMCONFIG * ) Buffer, &size ) == 0 )
{
hb_xfree( Buffer ) ;
hb_retl( FALSE ) ;
hb_xfree( Buffer );
hb_retl( FALSE );
return ;
}
}
hb_retl( TRUE );
hb_storclen( ( char * ) Buffer, size, 2 ) ;
hb_storclen( ( char * ) Buffer, size, 2 );
hb_xfree( Buffer );
}
//-------------------------------------------------------------------//
@@ -312,7 +314,7 @@ endif
*/
HB_FUNC( PURGECOMM )
{
hb_retl( PurgeComm( ( HANDLE ) hb_parnl( 1 ), hb_parnl( 2 ) ) ) ;
hb_retl( PurgeComm( ( HANDLE ) HB_PARWH( 1 ), hb_parnl( 2 ) ) );
}
//-------------------------------------------------------------------//
@@ -323,7 +325,7 @@ BOOL SetCommBreak(
*/
HB_FUNC( SETCOMMBREAK )
{
hb_retl( SetCommBreak( ( HANDLE ) hb_parnl( 1 ) ) );
hb_retl( SetCommBreak( ( HANDLE ) HB_PARWH( 1 ) ) );
}
//-------------------------------------------------------------------//
@@ -340,7 +342,7 @@ HB_FUNC( SETCOMMCONFIG )
LPCOMMCONFIG lpCC = ( LPCOMMCONFIG ) hb_parcx( 2 );
DWORD size = ISNIL( 3 ) ? sizeof( COMMCONFIG ) : hb_parnl( 3 );
hb_retl( SetCommConfig( ( HANDLE ) hb_parnl( 1 ), lpCC, size ) );
hb_retl( SetCommConfig( ( HANDLE ) HB_PARWH( 1 ), lpCC, size ) );
}
//-------------------------------------------------------------------//
@@ -354,7 +356,7 @@ endif
*/
HB_FUNC( SETCOMMMASK )
{
hb_retl( SetCommMask( ( HANDLE ) hb_parnl( 1 ), hb_parnl( 2 ) ) );
hb_retl( SetCommMask( ( HANDLE ) HB_PARWH( 1 ), hb_parnl( 2 ) ) );
}
//-------------------------------------------------------------------//
@@ -368,7 +370,7 @@ HB_FUNC( SETCOMMSTATE )
{
LPDCB lpDCB = ( LPDCB ) hb_parcx( 2 );
hb_retl( SetCommState( ( HANDLE ) hb_parnl( 1 ), lpDCB ) ) ;
hb_retl( SetCommState( ( HANDLE ) HB_PARWH( 1 ), lpDCB ) );
}
//-------------------------------------------------------------------//
@@ -380,9 +382,9 @@ BOOL SetCommTimeouts(
*/
HB_FUNC( SETCOMMTIMEOUTS )
{
LPCOMMTIMEOUTS lptimeouts = ( LPCOMMTIMEOUTS ) hb_parcx( 2 ) ;
LPCOMMTIMEOUTS lptimeouts = ( LPCOMMTIMEOUTS ) hb_parcx( 2 );
hb_retl( SetCommTimeouts( ( HANDLE ) hb_parnl( 1 ), lptimeouts ) );
hb_retl( SetCommTimeouts( ( HANDLE ) HB_PARWH( 1 ), lptimeouts ) );
}
//-------------------------------------------------------------------//
@@ -396,7 +398,7 @@ BOOL SetDefaultCommConfig(
HB_FUNC( SETDEFAULTCOMMCONFIG )
{
LPCOMMCONFIG lpCC = ( LPCOMMCONFIG ) hb_parcx( 2 );
DWORD size = sizeof( COMMCONFIG ) ;
DWORD size = sizeof( COMMCONFIG );
hb_retl( SetDefaultCommConfig( ( LPCTSTR ) hb_parcx( 1 ), lpCC, size ) );
}
@@ -411,7 +413,7 @@ BOOL SetupComm(
*/
HB_FUNC( SETUPCOMM )
{
hb_retl( SetupComm( ( HANDLE ) hb_parnl( 1 ), hb_parnl( 2 ), hb_parnl( 3 ) ) );
hb_retl( SetupComm( ( HANDLE ) HB_PARWH( 1 ), hb_parnl( 2 ), hb_parnl( 3 ) ) );
}
//-------------------------------------------------------------------//
@@ -423,7 +425,7 @@ BOOL TransmitCommChar(
*/
HB_FUNC( TRANSMITCOMMCHAR )
{
hb_retl( TransmitCommChar( ( HANDLE ) hb_parnl( 1 ), ( char ) hb_parni( 2 ) ) );
hb_retl( TransmitCommChar( ( HANDLE ) HB_PARWH( 1 ), ( char ) hb_parni( 2 ) ) );
}
//-------------------------------------------------------------------//
@@ -443,13 +445,10 @@ HB_FUNC( WAITCOMMEVENT )
{
DWORD evMask ;
hb_retl( WaitCommEvent( ( HANDLE ) hb_parnl( 1 ), &evMask, NULL ) );
hb_stornl( ( ULONG ) evMask, 2 ) ;
hb_retl( WaitCommEvent( ( HANDLE ) HB_PARWH( 1 ), &evMask, NULL ) );
hb_stornl( ( ULONG ) evMask, 2 );
}
//-------------------------------------------------------------------//
//-------------------------------------------------------------------//
//-------------------------------------------------------------------//

74
harbour/contrib/hbwhat32/whtshell.c
View File

@@ -7,6 +7,8 @@
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -33,18 +35,18 @@ HB_FUNC( DRAGQUERYFILE )
cFile = (char*) hb_xgrab( strlen( hb_parcx(3) ) + 1 );
iRet = DragQueryFile( (HDROP) hb_parnl( 1 ),
iRet = DragQueryFile( (HDROP) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ) ,
hb_parni(4) > 0 ? cFile : NULL ,
(UINT) hb_parni( 4 )
) ;
);
if (hb_parni( 4 ) > 0)
{
hb_storclen( cFile, iRet, 3 ) ;
hb_storclen( cFile, iRet, 3 );
hb_xfree( cFile );
}
hb_retni( iRet ) ;
hb_retni( iRet );
}
@@ -56,12 +58,12 @@ HB_FUNC( DRAGQUERYPOINT )
{
POINT lpPoInt ;
BOOL lRet ;
lRet = DragQueryPoint( (HDROP) hb_parnl( 1 ),(LPPOINT) &lpPoInt ) ;
lRet = DragQueryPoint( (HDROP) HB_PARWH( 1 ),(LPPOINT) &lpPoInt ) ;
if (ISBYREF( 2 ) ){
hb_stornl(2,lpPoInt.x,1);
hb_stornl(2,lpPoInt.y,2);
}
hb_retl( lRet ) ;
hb_retl( lRet );
}
@@ -72,7 +74,7 @@ HB_FUNC( DRAGQUERYPOINT )
HB_FUNC( DRAGFINISH )
{
DragFinish( (HDROP) hb_parnl( 1 ) ) ;
DragFinish( (HDROP) HB_PARWH( 1 ) );
}
//-----------------------------------------------------------------------------
@@ -81,7 +83,7 @@ HB_FUNC( DRAGFINISH )
HB_FUNC( DRAGACCEPTFILES )
{
DragAcceptFiles( (HWND) hb_parnl( 1 ), hb_parl( 2 ) ) ;
DragAcceptFiles( (HWND) HB_PARWH( 1 ), hb_parl( 2 ) );
}
//-----------------------------------------------------------------------------
@@ -90,13 +92,13 @@ HB_FUNC( DRAGACCEPTFILES )
HB_FUNC( SHELLEXECUTE )
{
hb_retnl( (LONG) ShellExecute( (HWND) hb_parnl( 1 ) ,
HB_RETWH( ShellExecute( (HWND) HB_PARWH( 1 ) ,
(LPCSTR) hb_parcx( 2 ) ,
(LPCSTR) hb_parcx( 3 ) ,
ISNIL(4) ? NULL : (LPCSTR) hb_parcx( 4 ) ,
(LPCSTR) hb_parcx( 5 ) ,
hb_parni( 6 )
) ) ;
) );
}
//-----------------------------------------------------------------------------
@@ -112,12 +114,12 @@ HB_FUNC( FINDEXECUTABLE )
hInst = FindExecutable( (LPCSTR) hb_parcx( 1 ) ,
(LPCSTR) hb_parcx( 2 ) ,
(LPSTR) cBuffer
) ;
);
hb_retnl( (LONG) hInst) ;
HB_RETWH( hInst);
if ( (LONG) hInst > 32 )
hb_storc( cBuffer, 3 ) ;
if( ( HB_PTRDIFF ) hInst > 32 )
hb_storc( cBuffer, 3 );
}
@@ -136,7 +138,7 @@ HB_FUNC( COMMANDLINETOARGVW )
// () CommandLineToArgvW( (LPWSTR) hb_parcx( 1 ) ,
(LPCWSTR) hb_parcx( 2 ),
&Intpnumargs
) ) ;
) );
}
*/
@@ -146,10 +148,10 @@ HB_FUNC( COMMANDLINETOARGVW )
HB_FUNC( SHELLABOUT )
{
hb_retni( ShellAbout( (HWND) hb_parnl(1),
hb_retni( ShellAbout( (HWND) HB_PARWH(1),
(LPCSTR) hb_parcx(2),
(LPCSTR) hb_parcx(3),
(ISNIL(4) ? NULL : (HICON) hb_parnl(4) )
(ISNIL(4) ? NULL : (HICON) HB_PARWH(4) )
) );
}
@@ -165,7 +167,7 @@ HB_FUNC( SHAPPBARMESSAGE )
// Your code goes here
// () SHAppBarMessage( (DWORD) hb_parnl( 1 ), pData ) ) ;
// () SHAppBarMessage( (DWORD) hb_parnl( 1 ), pData ) );
}
*/
@@ -178,7 +180,7 @@ HB_FUNC( DOENVIRONMENTSUBST )
{
hb_retnl((LONG) DoEnvironmentSubst( (LPSTR) hb_parcx( 1 ) ,
(UINT) hb_parni( 2 )
) ) ;
) );
}
#endif
//-----------------------------------------------------------------------------
@@ -196,7 +198,7 @@ HB_FUNC( EXTRACTICONEX )
&iLarge ,
&iSmall ,
nIcons ,
) ) ;
) );
// unfinished
@@ -211,7 +213,7 @@ HB_FUNC( EXTRACTICONEX )
HB_FUNC( SHFILEOPERATION )
{
SHFILEOPSTRUCT *sfo = (SHFILEOPSTRUCT *) hb_parc( 1 ); //hb_param(1, HB_IT_STRING)->item.asString.value;
hb_retni( SHFileOperation( sfo ) ) ;
hb_retni( SHFileOperation( sfo ) );
}
//-----------------------------------------------------------------------------
@@ -219,7 +221,7 @@ HB_FUNC( SHFILEOPERATION )
HB_FUNC( SHFREENAMEMAPPINGS )
{
SHFreeNameMappings( (HANDLE) hb_parnl( 1 ) ) ;
SHFreeNameMappings( (HANDLE) HB_PARWH( 1 ) );
}
//-----------------------------------------------------------------------------
@@ -230,7 +232,7 @@ HB_FUNC( SHFREENAMEMAPPINGS )
HB_FUNC( SHELLEXECUTEEX )
{
SHELLEXECUTEINFO *ExecInfo = (SHELLEXECUTEINFO *) hb_parc( 1 ); //hb_param(1, HB_IT_STRING)->item.asString.value;
hb_retl( ShellExecuteEx( ExecInfo ) ) ;
hb_retl( ShellExecuteEx( ExecInfo ) );
}
@@ -245,11 +247,11 @@ HB_FUNC( SHELLEXECUTEEX )
HB_FUNC( WINEXECERROR )
{
WinExecError( (HWND) hb_parnl( 1 ) ,
WinExecError( (HWND) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
(LPCSTR) hb_parcx( 3 ),
(LPCSTR) hb_parcx( 4 )
) ;
);
}
*/
@@ -264,7 +266,7 @@ HB_FUNC( SHCREATEPROCESSASUSERW )
// Your code goes here
hb_retl( SHCreateProcessAsUserW( pscpi ) ) ;
hb_retl( SHCreateProcessAsUserW( pscpi ) );
}
*/
@@ -282,7 +284,7 @@ HB_FUNC( SHQUERYRECYCLEBIN )
// Your code goes here
// (SHSTDAPI) SHQueryRecycleBin( (LPCSTR) hb_parcx( 1 ), pSHQueryRBInfo ) ) ;
// (SHSTDAPI) SHQueryRecycleBin( (LPCSTR) hb_parcx( 1 ), pSHQueryRBInfo ) );
}
*/
@@ -297,10 +299,10 @@ HB_FUNC( SHQUERYRECYCLEBIN )
HB_FUNC( SHEMPTYRECYCLEBIN )
{
hb_retnl( SHEmptyRecycleBin( (HWND) hb_parnl( 1 ) ,
hb_retnl( SHEmptyRecycleBin( (HWND) HB_PARWH( 1 ) ,
(LPCSTR) hb_parcx( 2 ),
(DWORD) hb_parnl( 3 )
) ) ;
) );
}
#endif
@@ -313,7 +315,7 @@ HB_FUNC( SHEMPTYRECYCLEBIN )
HB_FUNC( SHELL_NOTIFYICON )
{
NOTIFYICONDATA * Data = (NOTIFYICONDATA * ) hb_parc( 2 ); //hb_param(2, HB_IT_STRING)->item.asString.value;
hb_retl( Shell_NotifyIcon( (DWORD) hb_parnl( 1 ), Data ) ) ;
hb_retl( Shell_NotifyIcon( (DWORD) hb_parnl( 1 ), Data ) );
}
@@ -334,7 +336,7 @@ HB_FUNC( SHGETFILEINFO )
&psfi ,
(UINT) hb_parni( 4 ) ,
(UINT) hb_parni( 5 )
) ) ;
) );
}
*/
@@ -356,7 +358,7 @@ HB_FUNC( SHGETDISKFREESPACEEX )
&pulFreeBytesAvailableToCaller,
&pulTotalNumberOfBytes ,
&pulTotalNumberOfFreeBytes
) ) ;
) );
}
*/
@@ -372,7 +374,7 @@ HB_FUNC( SHGETNEWLINKINFO )
(LPSTR) hb_parcx( 3 ) ,
hb_parl( 4 ) ,
(UINT) hb_parni( 5 )
) ) ;
) );
}
*/
@@ -384,12 +386,12 @@ HB_FUNC( SHGETNEWLINKINFO )
HB_FUNC( SHINVOKEPRINTERCOMMAND )
{
hb_retl( SHInvokePrinterCommand( (HWND) hb_parnl( 1 ) ,
hb_retl( SHInvokePrinterCommand( (HWND) HB_PARWH( 1 ) ,
(UINT) hb_parni( 2 ) ,
(LPCSTR) hb_parcx( 3 ),
(LPCSTR) hb_parcx( 4 ),
hb_parl( 5 )
) ) ;
) );
}
#endif
@@ -402,7 +404,7 @@ HB_FUNC( SHINVOKEPRINTERCOMMAND )
/*
HB_FUNC( SHLOADNONLOADEDICONOVERLAYIDENTIFIERS )
{
// (SHSTDAPI) SHLoadNonloadedIconOverlayIdentifiers( ) ) ;
// (SHSTDAPI) SHLoadNonloadedIconOverlayIdentifiers( ) );
}
*/

35
harbour/contrib/hbwhat32/whtsock.c
View File

@@ -12,6 +12,8 @@
#define _WINSOCKAPI_ // Prevents inclusion of Winsock.h in Windows.h
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -565,7 +567,7 @@ HB_FUNC( WSAASYNCGETSERVBYNAME )
char * buf = ( char *) hb_xgrab( MAXGETHOSTSTRUCT );
HANDLE hRet ;
if( ( hRet = WSAAsyncGetServByName( (HWND) hb_parnl( 1 ),
if( ( hRet = WSAAsyncGetServByName( (HWND) HB_PARWH( 1 ),
(unsigned int) hb_parni( 2 ),
( char *) hb_parcx( 3 ) ,
ISNIL( 4 ) ? NULL : ( char *) hb_parcx( 4 ) ,
@@ -574,7 +576,7 @@ HB_FUNC( WSAASYNCGETSERVBYNAME )
hb_storclen( buf, sizeof(SERVENT), 5 );
hb_retnl( (ULONG ) hRet );
HB_RETWH( hRet );
hb_xfree( buf );
}
@@ -593,7 +595,7 @@ HB_FUNC( WSAASYNCGETSERVBYPORT )
char * buf = (char *) hb_xgrab( MAXGETHOSTSTRUCT );
HANDLE hRet ;
if( ( hRet = WSAAsyncGetServByPort( (HWND) hb_parnl( 1 ) ,
if( ( hRet = WSAAsyncGetServByPort( (HWND) HB_PARWH( 1 ) ,
(unsigned int) hb_parni( 2 ),
hb_parni( 3 ) ,
ISNIL( 4 ) ? NULL : ( char *) hb_parcx( 4 ) ,
@@ -602,7 +604,7 @@ HB_FUNC( WSAASYNCGETSERVBYPORT )
hb_storclen( buf, sizeof(SERVENT), 5 );
hb_retnl( (ULONG ) hRet );
HB_RETWH( hRet );
hb_xfree( buf );
}
@@ -622,7 +624,7 @@ HB_FUNC( WSAASYNCGETPROTOBYNAME )
char * buf = ( char * ) hb_xgrab( MAXGETHOSTSTRUCT );
HANDLE hRet ;
if( ( hRet = WSAAsyncGetProtoByName( (HWND) hb_parnl( 1 ),
if( ( hRet = WSAAsyncGetProtoByName( (HWND) HB_PARWH( 1 ),
(unsigned int) hb_parni( 2 ),
( char *) hb_parcx( 3 ) ,
( char *) buf ,
@@ -630,7 +632,7 @@ HB_FUNC( WSAASYNCGETPROTOBYNAME )
hb_storclen( buf, sizeof(PROTOENT), 4);
hb_retnl( (ULONG ) hRet );
HB_RETWH( hRet );
hb_xfree( buf );
}
@@ -650,7 +652,7 @@ HB_FUNC( WSAASYNCGETPROTOBYNUMBER )
char * buf = ( char *) hb_xgrab( MAXGETHOSTSTRUCT );
HANDLE hRet ;
if( ( hRet = WSAAsyncGetProtoByNumber( (HWND) hb_parnl( 1 ),
if( ( hRet = WSAAsyncGetProtoByNumber( (HWND) HB_PARWH( 1 ),
(unsigned int) hb_parni( 2 ),
(int) hb_parni( 3 ),
( char *) buf ,
@@ -658,7 +660,7 @@ HB_FUNC( WSAASYNCGETPROTOBYNUMBER )
hb_storclen( buf, sizeof(PROTOENT), 4);
hb_retnl( (ULONG ) hRet );
HB_RETWH( hRet );
hb_xfree( buf );
}
@@ -676,7 +678,7 @@ HB_FUNC( WSAASYNCGETHOSTBYNAME )
char * buf = ( char *) hb_xgrab( MAXGETHOSTSTRUCT );
HANDLE hRet ;
if( ( hRet = WSAAsyncGetHostByName( (HWND) hb_parnl( 1 ),
if( ( hRet = WSAAsyncGetHostByName( (HWND) HB_PARWH( 1 ),
(unsigned int) hb_parni( 2 ),
( char *) hb_parcx( 3 ) ,
( char *) buf ,
@@ -684,7 +686,7 @@ HB_FUNC( WSAASYNCGETHOSTBYNAME )
hb_storclen( buf, sizeof(HOSTENT), 4);
hb_retnl( (ULONG ) hRet );
HB_RETWH( hRet );
hb_xfree( buf );
}
@@ -705,7 +707,7 @@ HB_FUNC( WSAASYNCGETHOSTBYADDR )
char * buf = ( char *) hb_xgrab( MAXGETHOSTSTRUCT );
HANDLE hRet ;
if( ( hRet = WSAAsyncGetHostByAddr( (HWND) hb_parnl( 1 ) ,
if( ( hRet = WSAAsyncGetHostByAddr( (HWND) HB_PARWH( 1 ) ,
(unsigned int) hb_parni( 2 ) ,
( char *) hb_parcx( 3 ) ,
( int ) hb_parclen( 3),
@@ -715,7 +717,7 @@ HB_FUNC( WSAASYNCGETHOSTBYADDR )
hb_storclen( buf, sizeof(HOSTENT), 5);
hb_retnl( (ULONG ) hRet );
HB_RETWH( hRet );
hb_xfree( buf );
@@ -727,7 +729,7 @@ HB_FUNC( WSAASYNCGETHOSTBYADDR )
HB_FUNC( WSACANCELASYNCREQUEST )
{
hb_retni( (int) WSACancelAsyncRequest( (HANDLE) hb_parnl( 1 ) ) );
hb_retni( (int) WSACancelAsyncRequest( (HANDLE) HB_PARWH( 1 ) ) );
}
@@ -737,7 +739,7 @@ HB_FUNC( WSACANCELASYNCREQUEST )
HB_FUNC( WSAASYNCSELECT )
{
hb_retni( (int ) WSAAsyncSelect( (SOCKET) hb_parnl( 1 ) ,
(HWND) hb_parnl( 2 ) ,
(HWND) HB_PARWH( 2 ) ,
(UINT) hb_parni( 3 ) ,
hb_parnl( 4 )
) );
@@ -1454,7 +1456,7 @@ HB_FUNC( WSALOOKUPSERVICENEXT )
// Your code goes here
// hb_retni( (int ) WSALookupServiceNext( (HANDLE) hb_parnl( 1 ),
// hb_retni( (int ) WSALookupServiceNext( (HANDLE) HB_PARWH( 1 ),
(DWORD) hb_parnl( 2 ) ,
lpdwBufferLength ,
lpqsResults
@@ -1470,7 +1472,7 @@ HB_FUNC( WSALOOKUPSERVICENEXT )
HB_FUNC( WSALOOKUPSERVICEEND )
{
hb_retni( (int ) WSALookupServiceEnd( (HANDLE) hb_parnl( 1 ) ) );
hb_retni( (int ) WSALookupServiceEnd( (HANDLE) HB_PARWH( 1 ) ) );
}
@@ -1616,6 +1618,5 @@ HB_FUNC( WSAPROVIDERCONFIGCHANGE )
*/
//-----------------------------------------------------------------------------
// End.

208
harbour/contrib/hbwhat32/whtsys.c
View File

@@ -35,6 +35,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
//-------------------------------------------------------------------//
#include <shlobj.h>
@@ -58,14 +60,14 @@ BOOL PASCAL enable_privilege( LPCTSTR privilege_name );
//
HB_FUNC( GETFREESPACE )
{
hb_retnl( (LONG) GetFreeSpace( (UINT) hb_parni( 1 ) ) ) ;
hb_retnl( (LONG) GetFreeSpace( (UINT) hb_parni( 1 ) ) );
}
//-------------------------------------------------------------------//
HB_FUNC( OUTPUTDEBUGSTRING )
{
OutputDebugString( (LPCSTR) hb_parcx( 1 ) ) ;
OutputDebugString( (LPCSTR) hb_parcx( 1 ) );
}
//-------------------------------------------------------------------//
@@ -81,7 +83,7 @@ HB_FUNC( GETTIMEZONEINFORMATION )
{
TIME_ZONE_INFORMATION tzi;
hb_retnl( GetTimeZoneInformation( &tzi ) ) ;
hb_retnl( GetTimeZoneInformation( &tzi ) );
if ( ISBYREF(1) )
hb_storclen( (char*) &tzi, sizeof(tzi), 1);
@@ -97,7 +99,7 @@ HB_FUNC( SETTIMEZONEINFORMATION )
{
TIME_ZONE_INFORMATION *tzi = ( TIME_ZONE_INFORMATION *) hb_parc( 1 ); //hb_param( 1, HB_IT_STRING )->item.asString.value ;
hb_retl( SetTimeZoneInformation( tzi ) ) ;
hb_retl( SetTimeZoneInformation( tzi ) );
}
@@ -107,7 +109,7 @@ HB_FUNC( SETTIMEZONEINFORMATION )
/*
HB_FUNC( ISDEBUGGERPRESENT )
{
hb_retl( IsDebuggerPresent() ) ;
hb_retl( IsDebuggerPresent() );
}
*/
//-------------------------------------------------------------------//
@@ -116,7 +118,7 @@ HB_FUNC( ISDEBUGGERPRESENT )
//
HB_FUNC( DEBUGBREAK )
{
DebugBreak( ) ;
DebugBreak( );
}
//-------------------------------------------------------------------//
@@ -127,7 +129,7 @@ HB_FUNC( DEBUGBREAK )
/*
HB_FUNC( ENCRYPTFILE )
{
hb_retl( EncryptFileA( (LPCSTR) hb_parcx( 1 ) ) ) ;
hb_retl( EncryptFileA( (LPCSTR) hb_parcx( 1 ) ) );
}
*/
@@ -139,7 +141,7 @@ HB_FUNC( ENCRYPTFILE )
/*
HB_FUNC( DECRYPTFILE )
{
hb_retl( DecryptFileA( (LPCSTR) hb_parcx( 1 ), 0 ) ) ; //(DWORD) hb_parnl( 2 ) ) ) ;
hb_retl( DecryptFileA( (LPCSTR) hb_parcx( 1 ), 0 ) ); //(DWORD) hb_parnl( 2 ) ) );
}
*/
@@ -155,7 +157,7 @@ HB_FUNC( FILEENCRYPTIONSTATUSA )
// Your code goes here
hb_retl( FileEncryptionStatusA( (LPCSTR) hb_parcx( 1 ), lpStatus ) ) ;
hb_retl( FileEncryptionStatusA( (LPCSTR) hb_parcx( 1 ), lpStatus ) );
}
*/
//-------------------------------------------------------------------//
@@ -164,7 +166,7 @@ HB_FUNC( FILEENCRYPTIONSTATUSA )
//
HB_FUNC( ISPROCESSORFEATUREPRESENT )
{
hb_retl( IsProcessorFeaturePresent( (DWORD) hb_parnl( 1 ) ) ) ;
hb_retl( IsProcessorFeaturePresent( (DWORD) hb_parnl( 1 ) ) );
}
//-------------------------------------------------------------------//
@@ -173,7 +175,7 @@ HB_FUNC( ISPROCESSORFEATUREPRESENT )
HB_FUNC( MULDIV )
{
hb_retni( MulDiv( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) ) ;
hb_retni( MulDiv( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) );
}
//-------------------------------------------------------------------//
@@ -218,7 +220,7 @@ HB_FUNC( SYSTEMPARAMETERSINFO )
//
HB_FUNC( FREERESOURCE )
{
hb_retl( FreeResource( (HGLOBAL) hb_parnl( 6 )) ) ;
hb_retl( FreeResource( (HGLOBAL) HB_PARWH( 6 )) );
}
//-------------------------------------------------------------------//
@@ -227,7 +229,7 @@ HB_FUNC( FREERESOURCE )
//
HB_FUNC( SETDEBUGERRORLEVEL )
{
SetDebugErrorLevel( (DWORD) hb_parnl( 1 ) ) ;
SetDebugErrorLevel( (DWORD) hb_parnl( 1 ) );
}
//-------------------------------------------------------------------//
@@ -236,7 +238,7 @@ HB_FUNC( SETDEBUGERRORLEVEL )
//
HB_FUNC( SETLASTERROREX )
{
SetLastErrorEx( (DWORD) hb_parnl( 1 ), (DWORD) hb_parnl( 2 ) ) ;
SetLastErrorEx( (DWORD) hb_parnl( 1 ), (DWORD) hb_parnl( 2 ) );
}
//-------------------------------------------------------------------//
@@ -246,7 +248,7 @@ HANDLE GetStdHandle(DWORD nStdHandle ) // input, output, or error device
HB_FUNC( GETSTDHANDLE )
{
hb_retnl( (LONG) GetStdHandle( (DWORD) hb_parnl(1) ) ) ;
HB_RETWH( GetStdHandle( (DWORD) hb_parnl(1) ) );
}
//-------------------------------------------------------------------//
@@ -259,7 +261,7 @@ BOOL SetStdHandle(
HB_FUNC( SETSTDHANDLE )
{
hb_retl( SetStdHandle( (DWORD) hb_parnl(1), (HANDLE) hb_parnl(2) ) ) ;
hb_retl( SetStdHandle( (DWORD) hb_parnl(1), (HANDLE) HB_PARWH(2) ) );
}
//-------------------------------------------------------------------//
@@ -269,7 +271,7 @@ BOOL SetConsoleTitle(LPCSTR szTitle )
HB_FUNC( SETCONSOLETITLE )
{
hb_retnl( ( LONG ) SetConsoleTitle( ( LPCSTR ) hb_parcx( 1 ) ) ) ;
hb_retnl( ( LONG ) SetConsoleTitle( ( LPCSTR ) hb_parcx( 1 ) ) );
}
//-------------------------------------------------------------------//
@@ -288,7 +290,7 @@ HB_FUNC( GETCONSOLEWINDOW )
GetConsoleTitle( realtitle,MAX_PATH );
SetConsoleTitle( "Finding Handle" );
hb_retnl( ( LONG ) FindWindow( NULL,"Finding Handle" ) );
HB_RETWH( FindWindow( NULL,"Finding Handle" ) );
SetConsoleTitle( realtitle );
}
@@ -298,7 +300,7 @@ HB_FUNC( GETCONSOLEWINDOW )
//
HB_FUNC( GETSYSTEMMETRICS )
{
hb_retni( GetSystemMetrics( hb_parni( 1 ) ) ) ;
hb_retni( GetSystemMetrics( hb_parni( 1 ) ) );
}
//-------------------------------------------------------------------//
@@ -307,11 +309,11 @@ HB_FUNC( GETSYSTEMMETRICS )
//
HB_FUNC( SETTIMER )
{
hb_retni( SetTimer( (HWND) hb_parnl( 1 ),
hb_retni( SetTimer( (HWND) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ),
(UINT) hb_parni( 3 ),
ISNIL(4) ? NULL : (TIMERPROC) hb_parnl(4)
) ) ;
ISNIL(4) ? NULL : (TIMERPROC) HB_PARWH(4)
) );
}
//-------------------------------------------------------------------//
@@ -320,14 +322,14 @@ HB_FUNC( SETTIMER )
//
HB_FUNC( KILLTIMER )
{
hb_retl( KillTimer( (HWND) hb_parnl( 1 ), (UINT) hb_parni(2) ) ) ;
hb_retl( KillTimer( (HWND) HB_PARWH( 1 ), (UINT) hb_parni(2) ) );
}
//-------------------------------------------------------------------//
HB_FUNC( GETSYSCOLOR )
{
hb_retnl( GetSysColor( hb_parni(1) ) ) ;
hb_retnl( GetSysColor( hb_parni(1) ) );
}
//-------------------------------------------------------------------//
@@ -336,7 +338,7 @@ HB_FUNC( GETSYSCOLOR )
//
HB_FUNC( EXITWINDOWSEX )
{
hb_retl( ExitWindowsEx( (UINT) hb_parni( 1 ), (DWORD) hb_parnl( 2 ) ) ) ;
hb_retl( ExitWindowsEx( (UINT) hb_parni( 1 ), (DWORD) hb_parnl( 2 ) ) );
}
//-------------------------------------------------------------------//
@@ -345,7 +347,7 @@ HB_FUNC( EXITWINDOWSEX )
//
HB_FUNC( GETSYSCOLORBRUSH )
{
hb_retnl( (LONG) GetSysColorBrush( hb_parni( 1 ) ) ) ;
HB_RETWH( GetSysColorBrush( hb_parni( 1 ) ) );
}
//-------------------------------------------------------------------//
@@ -358,35 +360,35 @@ HB_FUNC( SETSYSCOLORS )
// Your code goes here
hb_retl( SetSysColors( hb_parni( 1 ), hb_parni( 2 ), &lpaRgbValues ) ) ;
hb_retl( SetSysColors( hb_parni( 1 ), hb_parni( 2 ), &lpaRgbValues ) );
}
*/
//-------------------------------------------------------------------//
HB_FUNC( AND )
{
hb_retnl( hb_parnl(1) & hb_parnl(2) ) ;
hb_retnl( hb_parnl(1) & hb_parnl(2) );
}
//-------------------------------------------------------------------//
HB_FUNC( OR )
{
hb_retnl( hb_parnl(1) | hb_parnl(2) ) ;
hb_retnl( hb_parnl(1) | hb_parnl(2) );
}
//-------------------------------------------------------------------//
HB_FUNC( NOT )
{
hb_retnl( ~( hb_parnl(1) ) ) ;
hb_retnl( ~( hb_parnl(1) ) );
}
//-------------------------------------------------------------------//
HB_FUNC( _GETINSTANCE )
{
hb_retnl( (LONG) GetModuleHandle( NULL ) );
HB_RETWH( GetModuleHandle( NULL ) );
}
//-------------------------------------------------------------------//
@@ -407,14 +409,14 @@ HB_FUNC( HIWORD )
HB_FUNC( MAKELONG )
{
hb_retnl( (LONG) (((WORD) (hb_parni(1))) | (((DWORD) ((WORD) (hb_parni(2)))) << 16)) ) ;
hb_retnl( (LONG) (((WORD) (hb_parni(1))) | (((DWORD) ((WORD) (hb_parni(2)))) << 16)) );
}
//-------------------------------------------------------------------//
/*
HB_FUNC( GETLASTERROR )
{
hb_retnl( ( LONG ) GetLastError() ) ;
hb_retnl( ( LONG ) GetLastError() );
}
*/
//-------------------------------------------------------------------//
@@ -442,7 +444,7 @@ HB_FUNC( FORMATMESSAGE)
/*
HB_FUNC( SETLASTERROR )
{
SetLastError( (DWORD) hb_parnl( 1 ) ) ;
SetLastError( (DWORD) hb_parnl( 1 ) );
}
*/
//-------------------------------------------------------------------//
@@ -451,7 +453,7 @@ HB_FUNC( SETLASTERROR )
//
HB_FUNC( SETERRORMODE )
{
hb_retni( SetErrorMode( (UINT) hb_parni( 1 ) ) ) ;
hb_retni( SetErrorMode( (UINT) hb_parni( 1 ) ) );
}
//-------------------------------------------------------------------//
@@ -496,7 +498,7 @@ HB_FUNCNAME( CHARTOOEM )();
HB_FUNC( GETVERSION )
{
hb_retnl( (LONG) GetVersion( ) ) ;
hb_retnl( (LONG) GetVersion( ) );
}
//-------------------------------------------------------------------//
@@ -505,10 +507,10 @@ HB_FUNC( GETVERSION )
//
HB_FUNC( FINDRESOURCE )
{
hb_retnl( (LONG) FindResourceA( (HMODULE) hb_parnl( 1 ),
HB_RETWH( FindResourceA( (HMODULE) HB_PARWH( 1 ),
(LPCSTR) hb_parcx( 2 ) ,
(LPCSTR) hb_parcx( 3 )
) ) ;
) );
}
//-------------------------------------------------------------------//
@@ -517,11 +519,11 @@ HB_FUNC( FINDRESOURCE )
//
HB_FUNC( FINDRESOURCEEX )
{
hb_retnl( (LONG) FindResourceExA( (HMODULE) hb_parnl( 1 ),
HB_RETWH( FindResourceExA( (HMODULE) HB_PARWH( 1 ),
(LPCSTR) hb_parcx( 2 ) ,
(LPCSTR) hb_parcx( 3 ) ,
(WORD) hb_parni( 4 )
) ) ;
) );
}
//-------------------------------------------------------------------//
@@ -530,9 +532,9 @@ HB_FUNC( FINDRESOURCEEX )
//
HB_FUNC( LOADRESOURCE )
{
hb_retnl( (LONG) LoadResource( (HMODULE) hb_parnl( 1 ),
(HRSRC) hb_parnl( 2 )
) ) ;
HB_RETWH( LoadResource( (HMODULE) HB_PARWH( 1 ),
(HRSRC) HB_PARWH( 2 )
) );
}
//-------------------------------------------------------------------//
@@ -550,10 +552,10 @@ HB_FUNC( LOADSTRING )
ULONG iLen = ISNIL(3) ? MAX_PATH : (ULONG) hb_parclen( 3 );
LPTSTR cText = (char*) hb_xgrab( iLen+1 );
iLen = LoadString( ( ISNIL(1) ? GetModuleHandle(NULL) : (HINSTANCE) hb_parnl(1) ),
iLen = LoadString( ( ISNIL(1) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH(1) ),
(UINT) hb_parni(2) ,
(LPTSTR) cText ,
iLen ) ;
iLen );
hb_retclen( cText, iLen );
hb_xfree( cText );
@@ -565,9 +567,9 @@ HB_FUNC( LOADSTRING )
//
HB_FUNC( SIZEOFRESOURCE )
{
hb_retnl( (LONG) SizeofResource( (HMODULE) hb_parnl( 1 ),
(HRSRC) hb_parnl( 2 )
) ) ;
hb_retnl( (LONG) SizeofResource( (HMODULE) HB_PARWH( 1 ),
(HRSRC) HB_PARWH( 2 )
) );
}
//-------------------------------------------------------------------//
@@ -576,7 +578,7 @@ HB_FUNC( SIZEOFRESOURCE )
//
HB_FUNC( LOCKRESOURCE )
{
hb_retnl( (LONG) LockResource( (HGLOBAL) hb_parnl( 1 ) ) ) ;
HB_RETWH( LockResource( (HGLOBAL) HB_PARWH( 1 ) ) );
}
//-------------------------------------------------------------------//
@@ -589,7 +591,7 @@ HB_FUNC( LOADMODULE )
// Your code goes here
hb_retnl( (LONG) LoadModule( (LPCSTR) hb_parcx( 1 ), lpParameterBlock ) ) ;
hb_retnl( (LONG) LoadModule( (LPCSTR) hb_parcx( 1 ), lpParameterBlock ) );
}
*/
@@ -599,7 +601,7 @@ HB_FUNC( LOADMODULE )
//
HB_FUNC( TONE )
{
hb_retl( Beep( (DWORD) hb_parnl( 1 ), (DWORD) hb_parnl( 2 ) ) ) ;
hb_retl( Beep( (DWORD) hb_parnl( 1 ), (DWORD) hb_parnl( 2 ) ) );
}
//-------------------------------------------------------------------//
@@ -609,10 +611,10 @@ HB_FUNC( TONE )
HB_FUNC( GETMODULEFILENAME )
{
char szBuffer[ MAX_PATH + 1 ] = {0} ;
GetModuleFileNameA( ISNIL(1) ? GetModuleHandle(NULL) : (HMODULE) hb_parnl( 1 ),
GetModuleFileNameA( ISNIL(1) ? GetModuleHandle(NULL) : (HMODULE) HB_PARWH( 1 ),
szBuffer ,
MAX_PATH
) ;
);
hb_retc(szBuffer);
}
@@ -622,7 +624,7 @@ HB_FUNC( GETMODULEFILENAME )
//
HB_FUNC( GETMODULEHANDLE )
{
hb_retnl( (LONG) GetModuleHandleA( (ISNIL(1) ? NULL : (LPCSTR) hb_parcx( 1 ) ) ) ) ;
HB_RETWH( GetModuleHandleA( (ISNIL(1) ? NULL : (LPCSTR) hb_parcx( 1 ) ) ) );
}
//-------------------------------------------------------------------//
@@ -644,7 +646,7 @@ HB_FUNC( GETSYSTEMTIME )
// Your code goes here
GetSystemTime( lpSystemTime ) ;
GetSystemTime( lpSystemTime );
}
*/
//-------------------------------------------------------------------//
@@ -658,7 +660,7 @@ HB_FUNC( SETSYSTEMTIME )
// Your code goes here
hb_retl( SetSystemTime( &lpSystemTime ) ) ;
hb_retl( SetSystemTime( &lpSystemTime ) );
}
*/
//-------------------------------------------------------------------//
@@ -671,7 +673,7 @@ HB_FUNC( GETLOCALTIME )
// Your code goes here
GetLocalTime( lpSystemTime ) ;
GetLocalTime( lpSystemTime );
}
*/
//-------------------------------------------------------------------//
@@ -684,7 +686,7 @@ HB_FUNC( SETLOCALTIME )
// Your code goes here
hb_retl( SetLocalTime( &lpSystemTime ) ) ;
hb_retl( SetLocalTime( &lpSystemTime ) );
}
*/
//-------------------------------------------------------------------//
@@ -697,7 +699,7 @@ HB_FUNC( GETSYSTEMINFO )
// Your code goes here
GetSystemInfo( lpSystemInfo ) ;
GetSystemInfo( lpSystemInfo );
}
*/
//-------------------------------------------------------------------//
@@ -706,7 +708,7 @@ HB_FUNC( GETSYSTEMINFO )
//
HB_FUNC( GETTICKCOUNT )
{
hb_retnl( (LONG) GetTickCount( ) ) ;
hb_retnl( (LONG) GetTickCount( ) );
}
//-------------------------------------------------------------------//
@@ -717,7 +719,7 @@ HB_FUNC( GETLOGICALDRIVESTRINGS )
{
hb_retnl( (LONG) GetLogicalDriveStrings( (DWORD) hb_parnl( 1 ),
(LPSTR) hb_parcx( 2 )
) ) ;
) );
}
//-------------------------------------------------------------------//
@@ -730,10 +732,10 @@ HB_FUNC( GETCOMPUTERNAME )
char cText[MAX_COMPUTERNAME_LENGTH+1] ;
DWORD nSize = MAX_COMPUTERNAME_LENGTH+1;
hb_retl( GetComputerNameA( (LPSTR) &cText, &nSize ) ) ;
hb_retl( GetComputerNameA( (LPSTR) &cText, &nSize ) );
hb_storc( cText, 1 ) ;
hb_stornl( nSize, 2 ) ;
hb_storc( cText, 1 );
hb_stornl( nSize, 2 );
}
//-------------------------------------------------------------------//
@@ -742,7 +744,7 @@ HB_FUNC( GETCOMPUTERNAME )
//
HB_FUNC( SETCOMPUTERNAME )
{
hb_retl( SetComputerNameA( (LPCSTR) hb_parcx( 1 ) ) ) ;
hb_retl( SetComputerNameA( (LPCSTR) hb_parcx( 1 ) ) );
}
//-------------------------------------------------------------------//
@@ -756,7 +758,7 @@ HB_FUNC( GETCOMPUTERNAMEEX )
// Your code goes here
hb_retl( GetComputerNameExA( NameType, (LPSTR) hb_parcx( 2 ), nSize ) ) ;
hb_retl( GetComputerNameExA( NameType, (LPSTR) hb_parcx( 2 ), nSize ) );
}
*/
//-------------------------------------------------------------------//
@@ -769,7 +771,7 @@ HB_FUNC( SETCOMPUTERNAMEEX )
// Your code goes here
hb_retl( SetComputerNameExA( NameType, (LPCSTR) hb_parcx( 2 ) ) ) ;
hb_retl( SetComputerNameExA( NameType, (LPCSTR) hb_parcx( 2 ) ) );
}
*/
//-------------------------------------------------------------------//
@@ -781,9 +783,9 @@ HB_FUNC( GETUSERNAME )
DWORD nSize ;
char *szUser = hb_parcx( 1 );
hb_retl( GetUserNameA( szUser, &nSize ) ) ;
hb_storc( szUser , 1 ) ;
hb_stornl( ( LONG ) nSize , 2 ) ;
hb_retl( GetUserNameA( szUser, &nSize ) );
hb_storc( szUser , 1 );
hb_stornl( ( LONG ) nSize , 2 );
}
//-------------------------------------------------------------------//
@@ -815,7 +817,7 @@ HB_FUNC( VERIFYVERSIONINFO )
hb_retl( VerifyVersionInfoA( lpVersionInformation ,
(DWORD) hb_parnl( 2 ) ,
(DWORDLONG) hb_parnl( 3 )
) ) ;
) );
}
*/
//-------------------------------------------------------------------//
@@ -828,7 +830,7 @@ HB_FUNC( VERIFYVERSIONINFO )
//
HB_FUNC( ARRANGEICONICWINDOWS )
{
hb_retni( ArrangeIconicWindows( (HWND) hb_parnl( 1 ) ) ) ;
hb_retni( ArrangeIconicWindows( (HWND) HB_PARWH( 1 ) ) );
}
@@ -844,12 +846,12 @@ HB_FUNC( TILEWINDOWS )
// Your code goes here
hb_retni( TileWindows( (HWND) hb_parnl( 1 ),
hb_retni( TileWindows( (HWND) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ),
&lpRect ,
(UINT) hb_parni( 4 ),
(HWND) hb_parnl( 5 )
) ) ;
(HWND) HB_PARWH( 5 )
) );
}
*/
//-------------------------------------------------------------------//
@@ -865,12 +867,12 @@ HB_FUNC( CASCADEWINDOWS )
// Your code goes here
hb_retni( CascadeWindows( (HWND) hb_parnl( 1 ),
hb_retni( CascadeWindows( (HWND) HB_PARWH( 1 ),
(UINT) hb_parni( 2 ),
&lpRect ,
(UINT) hb_parni( 4 ),
(HWND) hb_parnl( 5 )
) ) ;
(HWND) HB_PARWH( 5 )
) );
}
*/
//-------------------------------------------------------------------//
@@ -881,11 +883,11 @@ HB_FUNC( CASCADEWINDOWS )
//
HB_FUNC( WINHELP )
{
hb_retl( WinHelp( (HWND) hb_parnl( 1 ) ,
hb_retl( WinHelp( (HWND) HB_PARWH( 1 ) ,
(LPCSTR) hb_parcx( 2 ),
(UINT) hb_parni( 3 ) ,
(ULONG) hb_parnl( 4 )
) ) ;
) );
}
//-------------------------------------------------------------------//
@@ -906,12 +908,12 @@ HB_FUNC( WINHELP )
HB_FUNC( HTMLHELP )
{
hb_retnl( (LONG) HtmlHelp( (HWND) hb_parnl( 1 ) ,
HB_RETWH( HtmlHelp( (HWND) HB_PARWH( 1 ) ,
(LPCSTR) hb_parcx( 2 ) ,
(UINT) ISNIL(3) ? HH_DISPLAY_TOPIC : hb_parni( 3 ) ,
(DWORD) ISNIL(4) ? NULL : hb_parnl( 4 )
)
) ;
);
}
*/
//-------------------------------------------------------------------//
@@ -936,13 +938,13 @@ HB_FUNC( CREATEFILE )
if( ISCHAR( 4 ) )
sa = ( SECURITY_ATTRIBUTES *) hb_parc( 4 ); //hb_param( 4, HB_IT_STRING )->item.asString.value ;
hb_retnl( (LONG) CreateFile( (LPCTSTR) hb_parcx(1),
HB_RETWH( CreateFile( (LPCTSTR) hb_parcx(1),
(DWORD) hb_parnl(2),
(DWORD) hb_parnl(3),
ISCHAR( 4 ) ? (SECURITY_ATTRIBUTES *) sa : NULL ,
(DWORD) hb_parnl(5),
(DWORD) hb_parnl(6),
ISNIL( 7 ) ? NULL : (HANDLE) hb_parnl(7) ) ) ;
ISNIL( 7 ) ? NULL : (HANDLE) HB_PARWH(7) ) );
}
@@ -954,7 +956,7 @@ BOOL CloseHandle(
*/
HB_FUNC( CLOSEHANDLE )
{
hb_retl( CloseHandle( (HANDLE) hb_parnl(1) ) );
hb_retl( CloseHandle( (HANDLE) HB_PARWH(1) ) );
}
//-------------------------------------------------------------------//
@@ -969,7 +971,7 @@ HB_FUNC( CLOSEHANDLE )
*/
HB_FUNC( READFILE )
{
char * Buffer = ( char * ) hb_xgrab( hb_parnl( 3 ) ) ;
char * Buffer = ( char * ) hb_xgrab( hb_parnl( 3 ) );
DWORD nRead = 0 ;
BOOL bRet ;
OVERLAPPED *Overlapped = NULL;
@@ -978,19 +980,19 @@ HB_FUNC( READFILE )
Overlapped = ( OVERLAPPED *) hb_parc( 5 ); //hb_param( 5, HB_IT_STRING )->item.asString.value ;
bRet = ReadFile( (HANDLE) hb_parnl( 1 ) ,
bRet = ReadFile( (HANDLE) HB_PARWH( 1 ) ,
Buffer ,
(DWORD) hb_parnl( 3 ) ,
&nRead ,
ISCHAR( 5 ) ? Overlapped : NULL ) ;
ISCHAR( 5 ) ? Overlapped : NULL );
if ( bRet )
{
hb_storclen( ( char * ) Buffer, nRead, 2 ) ;
hb_storclen( ( char * ) Buffer, nRead, 2 );
}
hb_stornl( nRead, 4 ) ;
hb_retl( bRet ) ;
hb_stornl( nRead, 4 );
hb_retl( bRet );
}
//-------------------------------------------------------------------//
@@ -1012,13 +1014,13 @@ HB_FUNC( WRITEFILE )
if( ISCHAR( 4 ))
Overlapped = ( OVERLAPPED *) hb_parc( 4 ); //hb_param( 4, HB_IT_STRING )->item.asString.value ;
hb_retl ( WriteFile( (HANDLE) hb_parnl( 1 ) ,
hb_retl ( WriteFile( (HANDLE) HB_PARWH( 1 ) ,
hb_parcx( 2 ) ,
hb_parclen( 2 ) ,
&nWritten ,
ISCHAR( 4 ) ? Overlapped : NULL ) ) ;
ISCHAR( 4 ) ? Overlapped : NULL ) );
hb_stornl( nWritten, 3 ) ;
hb_stornl( nWritten, 3 );
}
//-------------------------------------------------------------------//
@@ -1059,7 +1061,7 @@ HB_FUNC( GETPROCESSWORKINGSETSIZE )
PSIZE_T MinimumWorkingSetSize = NULL;
PSIZE_T MaximumWorkingSetSize = NULL;
hb_retl(GetProcessWorkingSetSize(ISNIL(1) ? GetCurrentProcess() : (HANDLE) hb_parnl( 1 ),
hb_retl(GetProcessWorkingSetSize(ISNIL(1) ? GetCurrentProcess() : (HANDLE) HB_PARWH( 1 ),
MinimumWorkingSetSize, MaximumWorkingSetSize ));
hb_stornl( MinimumWorkingSetSize ? ( long ) *MinimumWorkingSetSize : 0, 2 );
@@ -1075,7 +1077,7 @@ NOTE: This function is not supported and returns .F. under Windows 9x
*/
HB_FUNC( SETPROCESSWORKINGSETSIZE )
{
hb_retl(SetProcessWorkingSetSize(ISNIL(1) ? GetCurrentProcess() : (HANDLE) hb_parnl( 1 ),
hb_retl(SetProcessWorkingSetSize(ISNIL(1) ? GetCurrentProcess() : (HANDLE) HB_PARWH( 1 ),
hb_parnl( 2 ), hb_parnl( 3 ) ));
}
@@ -1088,7 +1090,7 @@ HB_FUNC( VIRTUALQUERY )
{
if( hb_parni(1) >= sizeof(MEMORY_BASIC_INFORMATION) )
{
hb_retl(VirtualQuery((void *) hb_parnl(1), (struct _MEMORY_BASIC_INFORMATION *) hb_parnl(2), sizeof(MEMORY_BASIC_INFORMATION)));
hb_retl(VirtualQuery((void *) HB_PARWH(1), (struct _MEMORY_BASIC_INFORMATION *) HB_PARWH(2), sizeof(MEMORY_BASIC_INFORMATION)));
}
else
{
@@ -1104,7 +1106,7 @@ BOOL VirtualLock(LPVOID lpAddress, SIZE_T dwSize );
*/
HB_FUNC( VIRTUALLOCK )
{
hb_retl( VirtualLock( ( void * ) hb_parnl( 1 ), hb_parni( 2 ) ) );
hb_retl( VirtualLock( ( void * ) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
//-------------------------------------------------------------------//
@@ -1134,16 +1136,16 @@ HB_FUNC( FILETIMETOSYSTEMTIME )
if ( FileTimeToSystemTime( FileTime, &SystemTime ) )
{
hb_retl( TRUE ) ;
hb_retl( TRUE );
if ( ISBYREF( 2 ) )
{
hb_storclen( ( char * ) &SystemTime , sizeof( SYSTEMTIME ), 2 ) ;
hb_storclen( ( char * ) &SystemTime , sizeof( SYSTEMTIME ), 2 );
}
}
else
{
hb_retl( FALSE ) ;
hb_retl( FALSE );
}
}
@@ -1151,7 +1153,5 @@ HB_FUNC( FILETIMETOSYSTEMTIME )
// BOOL SetConsoleOutputCP( UINT wCodePageID ) // code page to set;
HB_FUNC( SETCONSOLEOUTPUTCP )
{
hb_retl( SetConsoleOutputCP( (UINT) hb_parnl( 1 ) ) ) ;
hb_retl( SetConsoleOutputCP( (UINT) hb_parnl( 1 ) ) );
}

82
harbour/contrib/hbwhat32/whttab.c
View File

@@ -7,6 +7,8 @@
#ifndef __WATCOMC__
#include "hbwhat.h"
#include <windows.h>
#include <commctrl.h>
#include <shlobj.h>
@@ -26,11 +28,11 @@ HB_FUNC( TABCTRL_CREATE )
LONG hFont;
LONG style;
style = ISNIL(6) ? 0 : (LONG) hb_parnl(6);
hwnd = (HWND) hb_parnl (1);
hwnd = (HWND) HB_PARWH (1);
hFont = SendMessage( hwnd, WM_GETFONT, 0, 0);
hbutton = CreateWindowEx(0, WC_TABCONTROL, NULL , style, hb_parni(2), hb_parni(3) , hb_parni(4), hb_parni(5) , hwnd,NULL, GetModuleHandle(NULL) , NULL ) ;
SendMessage(hbutton,(UINT)WM_SETFONT, (WPARAM) hFont, 1 ) ;
hb_retnl ( (LONG) hbutton );
hbutton = CreateWindowEx(0, WC_TABCONTROL, NULL , style, hb_parni(2), hb_parni(3) , hb_parni(4), hb_parni(5) , hwnd,NULL, GetModuleHandle(NULL) , NULL );
SendMessage(hbutton,(UINT)WM_SETFONT, (WPARAM) hFont, 1 );
HB_RETWH( hbutton );
}
//---------------------------------------------------------------------------//
@@ -39,14 +41,14 @@ HB_FUNC( TABCTRL_CREATE )
HB_FUNC( TABCTRL_ADDITEM )
{
int iCount = TabCtrl_GetItemCount( (HWND) hb_parnl(1) );
int iCount = TabCtrl_GetItemCount( (HWND) HB_PARWH(1) );
TC_ITEM item;
item.mask = TCIF_TEXT | TCIF_IMAGE;
item.iImage = ISNIL(3) ? -1 : (LONG) hb_parnl(3);
item.pszText = (LPSTR) hb_parcx(2);
hb_retni( TabCtrl_InsertItem( (HWND) hb_parnl(1), iCount, &item) );
hb_retni( TabCtrl_InsertItem( (HWND) HB_PARWH(1), iCount, &item) );
}
//---------------------------------------------------------------------------//
@@ -57,21 +59,21 @@ HB_FUNC( TABCTRL_INSERTITEM )
item.mask = TCIF_TEXT | TCIF_IMAGE;
item.iImage = ISNIL(4) ? -1 : (LONG) hb_parnl(4);
item.pszText = (LPSTR) hb_parcx(2);
hb_retni( TabCtrl_InsertItem( (HWND) hb_parnl(1), (INT) hb_parni(3), &item) );
hb_retni( TabCtrl_InsertItem( (HWND) HB_PARWH(1), (INT) hb_parni(3), &item) );
}
//---------------------------------------------------------------------------//
HB_FUNC( TABCTRL_SETCURSEL )
{
hb_retni( TabCtrl_SetCurSel( (HWND) hb_parnl(1) , hb_parni (2) ) );
hb_retni( TabCtrl_SetCurSel( (HWND) HB_PARWH(1) , hb_parni (2) ) );
}
//---------------------------------------------------------------------------//
HB_FUNC( TABCTRL_GETCURSEL )
{
hb_retni ( TabCtrl_GetCurSel( (HWND) hb_parnl (1) ) ) ;
hb_retni ( TabCtrl_GetCurSel( (HWND) HB_PARWH (1) ) );
}
//---------------------------------------------------------------------------//
@@ -79,7 +81,7 @@ HB_FUNC( TABCTRL_GETCURSEL )
HB_FUNC( TABCTRL_GETITEM )
{
TC_ITEM item;
hb_retl(TabCtrl_GetItem( (HWND) hb_parnl (1), (int) hb_parni(2) , &item ) );
hb_retl(TabCtrl_GetItem( (HWND) HB_PARWH (1), (int) hb_parni(2) , &item ) );
// assign item to param 3
}
@@ -88,7 +90,7 @@ HB_FUNC( TABCTRL_GETITEM )
HB_FUNC( TABCTRL_GETITEMCOUNT )
{
hb_retni( TabCtrl_GetItemCount( (HWND) hb_parnl(1) ) ) ;
hb_retni( TabCtrl_GetItemCount( (HWND) HB_PARWH(1) ) );
}
//---------------------------------------------------------------------------//
@@ -98,7 +100,7 @@ HB_FUNC( TABCTRL_GETITEMRECT )
RECT rc;
PHB_ITEM aRect = hb_itemArrayNew( 4 );
TabCtrl_GetItemRect((HWND) hb_parnl (1), hb_parni(2), &rc);
TabCtrl_GetItemRect((HWND) HB_PARWH (1), hb_parni(2), &rc);
hb_arraySetNL( aRect, 1, rc.left );
hb_arraySetNL( aRect, 2, rc.top );
@@ -112,7 +114,7 @@ HB_FUNC( TABCTRL_GETITEMRECT )
HB_FUNC( TABCTRL_GETROWCOUNT )
{
hb_retni( TabCtrl_GetRowCount( (HWND) hb_parnl(1) ) ) ;
hb_retni( TabCtrl_GetRowCount( (HWND) HB_PARWH(1) ) );
}
@@ -123,7 +125,7 @@ HB_FUNC( TABCTRL_GETROWCOUNT )
HB_FUNC( TABCTRL_GETIMAGELIST )
{
hb_retnl( (LONG) TabCtrl_GetImageList( (HWND) hb_parnl(1) ) ) ;
HB_RETWH( TabCtrl_GetImageList( (HWND) HB_PARWH(1) ) );
}
@@ -133,8 +135,8 @@ HB_FUNC( TABCTRL_GETIMAGELIST )
HB_FUNC( TABCTRL_SETIMAGELIST )
{
hb_retnl( (LONG) TabCtrl_SetImageList( (HWND) hb_parnl( 1 ),
(LPARAM)(HIMAGELIST) hb_parnl( 2 ) ) ) ;
HB_RETWH( TabCtrl_SetImageList( (HWND) HB_PARWH( 1 ),
(LPARAM)(HIMAGELIST) hb_parnl( 2 ) ) );
}
@@ -148,7 +150,7 @@ HB_FUNC( TABCTRL_SETITEM )
item.mask = TCIF_TEXT | TCIF_IMAGE;
item.iImage = -1;
item.pszText = (LPSTR) hb_parcx( 3 );
hb_retl( TabCtrl_SetItem( (HWND) hb_parnl( 1 ), hb_parni( 2 ), &item) ) ;
hb_retl( TabCtrl_SetItem( (HWND) HB_PARWH( 1 ), hb_parni( 2 ), &item) );
}
//---------------------------------------------------------------------------//
@@ -157,7 +159,7 @@ HB_FUNC( TABCTRL_SETITEM )
HB_FUNC( TABCTRL_DELETEALLITEMS )
{
hb_retl(TabCtrl_DeleteAllItems((HWND) hb_parnl(1)));
hb_retl(TabCtrl_DeleteAllItems((HWND) HB_PARWH(1)));
}
//---------------------------------------------------------------------------//
@@ -166,7 +168,7 @@ HB_FUNC( TABCTRL_DELETEALLITEMS )
HB_FUNC( TABCTRL_DELETEITEM )
{
hb_retl(TabCtrl_DeleteItem((HWND) hb_parnl(1), (WPARAM) hb_parni(2)));
hb_retl(TabCtrl_DeleteItem((HWND) HB_PARWH(1), (WPARAM) hb_parni(2)));
}
//---------------------------------------------------------------------------//
@@ -179,7 +181,7 @@ HB_FUNC( TABCTRL_HITTEST )
{
TCHITTESTINFO tcht ;
hb_parni( TabCtrl_HitTest( (HWND) hb_parnl(1), &tcht ) ) ;
hb_parni( TabCtrl_HitTest( (HWND) HB_PARWH(1), &tcht ) );
// assign to structure in param 2
@@ -192,7 +194,7 @@ HB_FUNC( TABCTRL_HITTEST )
HB_FUNC( TABCTRL_SETITEMEXTRA )
{
hb_retl( TabCtrl_SetItemExtra( (HWND) hb_parnl(1), (int) hb_parni(2) ) ) ;
hb_retl( TabCtrl_SetItemExtra( (HWND) HB_PARWH(1), (int) hb_parni(2) ) );
}
//---------------------------------------------------------------------------//
@@ -210,12 +212,12 @@ HB_FUNC( TABCTRL_ADJUSTRECT )
rc.right = hb_parnl(3,3);
rc.bottom = hb_parnl(3,4);
TabCtrl_AdjustRect( (HWND) hb_parnl(1), (BOOL) hb_parl(2), &rc );
TabCtrl_AdjustRect( (HWND) HB_PARWH(1), (BOOL) hb_parl(2), &rc );
hb_stornl( rc.left , 3 ,1 ) ;
hb_stornl( rc.top , 3, 2 ) ;
hb_stornl( rc.right , 3 ,3 ) ;
hb_stornl( rc.bottom, 3, 4 ) ;
hb_stornl( rc.left , 3 ,1 );
hb_stornl( rc.top , 3, 2 );
hb_stornl( rc.right , 3 ,3 );
hb_stornl( rc.bottom, 3, 4 );
}
}
@@ -226,7 +228,7 @@ HB_FUNC( TABCTRL_ADJUSTRECT )
HB_FUNC( TABCTRL_SETITEMSIZE )
{
hb_retnl( TabCtrl_SetItemSize( (HWND) hb_parnl(1), (int) hb_parni(2), (int) hb_parni(3) ) );
hb_retnl( TabCtrl_SetItemSize( (HWND) HB_PARWH(1), (int) hb_parni(2), (int) hb_parni(3) ) );
}
//---------------------------------------------------------------------------//
@@ -235,7 +237,7 @@ HB_FUNC( TABCTRL_SETITEMSIZE )
HB_FUNC( TABCTRL_REMOVEIMAGE )
{
TabCtrl_RemoveImage( (HWND) hb_parnl(1), (int) hb_parni(2) ) ;
TabCtrl_RemoveImage( (HWND) HB_PARWH(1), (int) hb_parni(2) );
}
//---------------------------------------------------------------------------//
@@ -244,7 +246,7 @@ HB_FUNC( TABCTRL_REMOVEIMAGE )
HB_FUNC( TABCTRL_SETPADDING )
{
TabCtrl_SetPadding( (HWND) hb_parnl(1), (int) hb_parni(2), (int) hb_parni(3) ) ;
TabCtrl_SetPadding( (HWND) HB_PARWH(1), (int) hb_parni(2), (int) hb_parni(3) );
}
//---------------------------------------------------------------------------//
@@ -253,7 +255,7 @@ HB_FUNC( TABCTRL_SETPADDING )
HB_FUNC( TABCTRL_GETTOOLTIPS )
{
hb_retnl( (LONG) TabCtrl_GetToolTips( (HWND) hb_parnl( 1 ) ) );
HB_RETWH( TabCtrl_GetToolTips( (HWND) HB_PARWH( 1 ) ) );
}
//---------------------------------------------------------------------------//
@@ -262,7 +264,7 @@ HB_FUNC( TABCTRL_GETTOOLTIPS )
HB_FUNC( TABCTRL_SETTOOLTIPS )
{
TabCtrl_SetToolTips( (HWND) hb_parnl(1), (HWND) hb_parnl(2) ) ;
TabCtrl_SetToolTips( (HWND) HB_PARWH(1), (HWND) HB_PARWH(2) );
}
//---------------------------------------------------------------------------//
@@ -271,7 +273,7 @@ HB_FUNC( TABCTRL_SETTOOLTIPS )
HB_FUNC( TABCTRL_GETCURFOCUS )
{
hb_retni( TabCtrl_GetCurFocus( (HWND) hb_parnl(1) ) );
hb_retni( TabCtrl_GetCurFocus( (HWND) HB_PARWH(1) ) );
}
//---------------------------------------------------------------------------//
@@ -280,7 +282,7 @@ HB_FUNC( TABCTRL_GETCURFOCUS )
HB_FUNC( TABCTRL_SETCURFOCUS )
{
TabCtrl_SetCurFocus( (HWND) hb_parnl(1), (int) hb_parni(2) );
TabCtrl_SetCurFocus( (HWND) HB_PARWH(1), (int) hb_parni(2) );
hb_ret();
}
@@ -290,7 +292,7 @@ HB_FUNC( TABCTRL_SETCURFOCUS )
HB_FUNC( TABCTRL_SETMINTABWIDTH )
{
hb_retni( TabCtrl_SetMinTabWidth( (HWND) hb_parnl(1), (int) hb_parni(2) ) );
hb_retni( TabCtrl_SetMinTabWidth( (HWND) HB_PARWH(1), (int) hb_parni(2) ) );
}
//---------------------------------------------------------------------------//
@@ -299,7 +301,7 @@ HB_FUNC( TABCTRL_SETMINTABWIDTH )
HB_FUNC( TABCTRL_DESELECTALL )
{
TabCtrl_DeselectAll( (HWND) hb_parnl(1), (UINT) hb_parni( 2 ) ) ;
TabCtrl_DeselectAll( (HWND) HB_PARWH(1), (UINT) hb_parni( 2 ) );
}
//---------------------------------------------------------------------------//
@@ -308,7 +310,7 @@ HB_FUNC( TABCTRL_DESELECTALL )
HB_FUNC( TABCTRL_HIGHLIGHTITEM )
{
hb_retl( TabCtrl_HighlightItem( (HWND) hb_parnl(1), (int) hb_parni(2), (WORD) hb_parni(3) ) );
hb_retl( TabCtrl_HighlightItem( (HWND) HB_PARWH(1), (int) hb_parni(2), (WORD) hb_parni(3) ) );
}
//---------------------------------------------------------------------------//
@@ -317,7 +319,7 @@ HB_FUNC( TABCTRL_HIGHLIGHTITEM )
HB_FUNC( TABCTRL_SETEXTENDEDSTYLE )
{
hb_retnl( TabCtrl_SetExtendedStyle( (HWND) hb_parnl(1), (DWORD) hb_parnl(2) ) ) ;
hb_retnl( TabCtrl_SetExtendedStyle( (HWND) HB_PARWH(1), (DWORD) hb_parnl(2) ) );
}
//---------------------------------------------------------------------------//
@@ -326,7 +328,7 @@ HB_FUNC( TABCTRL_SETEXTENDEDSTYLE )
HB_FUNC( TABCTRL_GETEXTENDEDSTYLE )
{
hb_retnl( TabCtrl_GetExtendedStyle( (HWND) hb_parnl(1) ) ) ;
hb_retnl( TabCtrl_GetExtendedStyle( (HWND) HB_PARWH(1) ) );
}
//---------------------------------------------------------------------------//
@@ -335,7 +337,7 @@ HB_FUNC( TABCTRL_GETEXTENDEDSTYLE )
HB_FUNC( TABCTRL_SETUNICODEFORMAT )
{
hb_retl( TabCtrl_SetUnicodeFormat( (HWND) hb_parnl(1), hb_parl(2) ) );
hb_retl( TabCtrl_SetUnicodeFormat( (HWND) HB_PARWH(1), hb_parl(2) ) );
}
//---------------------------------------------------------------------------//
@@ -344,7 +346,7 @@ HB_FUNC( TABCTRL_SETUNICODEFORMAT )
HB_FUNC( TABCTRL_GETUNICODEFORMAT )
{
hb_retl( TabCtrl_GetUnicodeFormat( (HWND) hb_parnl(1) ) ) ;
hb_retl( TabCtrl_GetUnicodeFormat( (HWND) HB_PARWH(1) ) );
}
//---------------------------------------------------------------------------//

15
harbour/contrib/hbwhat32/whttbar.c
View File

@@ -9,6 +9,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
//#include <shlobj.h>
#include <windows.h>
#include "hbapiitm.h"
@@ -37,7 +39,7 @@ HB_FUNC( CREATEMAPPEDBITMAP )
{
COLORMAP *cm = (COLORMAP *) hb_parc( 4 ); //hb_param(4, HB_IT_STRING)->item.asString.value;
hb_retnl( (LONG) CreateMappedBitmap( (HINSTANCE) hb_parnl(1),
HB_RETWH( CreateMappedBitmap( (HINSTANCE) HB_PARWH(1),
(int) hb_parni(2),
(UINT) hb_parni(3),
ISNIL(4) ? NULL : (COLORMAP *) cm ,
@@ -52,11 +54,11 @@ HB_FUNC( CREATEMAPPEDBITMAP )
HB_FUNC( CREATETOOLBAREX )
{
hb_retnl( (LONG) CreateToolbarEx( (HWND) hb_parnl(1), // parent
HB_RETWH( CreateToolbarEx( (HWND) HB_PARWH(1), // parent
(DWORD)hb_parnl(2), // style
(UINT) hb_parni(3), // id,
(int) hb_parni(4), // number of btn images in bmp
ISNIL(5) ? NULL : (HINSTANCE) hb_parnl(5), // hInst of bmp
ISNIL(5) ? NULL : (HINSTANCE) HB_PARWH(5), // hInst of bmp
(UINT) hb_parnl(6), // resource id, or hBmp handle
(LPCTBBUTTON) hb_parcx(7),// array of button structures
(int) hb_parni(8), // number of buttons to add
@@ -76,8 +78,8 @@ HB_FUNC( GETTOOLBARITEMRECT )
{
RECT rc = {0,0,0,0};
PHB_ITEM aRect ;
SendMessage((HWND) hb_parnl(1), TB_GETITEMRECT, hb_parni(2), (LPARAM)&rc);
// MapWindowPoints((HWND) hb_parnl(1), HWND_DESKTOP, (POINT*)&rc, 2);
SendMessage((HWND) HB_PARWH(1), TB_GETITEMRECT, hb_parni(2), (LPARAM)&rc);
// MapWindowPoints((HWND) HB_PARWH(1), HWND_DESKTOP, (POINT*)&rc, 2);
aRect = Rect2Array( &rc );
hb_itemReturn( aRect );
hb_itemRelease( aRect );
@@ -85,6 +87,3 @@ HB_FUNC( GETTOOLBARITEMRECT )
//-----------------------------------------------------------------------------

160
harbour/contrib/hbwhat32/whttext.c
View File

@@ -8,6 +8,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
//#include <shlobj.h>
#include <windows.h>
#include "hbapiitm.h"
@@ -37,7 +39,7 @@ extern void Size2ArrayEx( SIZE *siz , PHB_ITEM aSize);
HB_FUNC( TEXTOUT )
{
hb_retl( TextOut((HDC) hb_parnl( 1 ) , // handle of device context
hb_retl( TextOut((HDC) HB_PARWH( 1 ) , // handle of device context
hb_parni( 2 ) , // x-coordinate of starting position
hb_parni( 3 ) , // y-coordinate of starting position
(LPCTSTR) hb_parcx( 4 ), // address of string
@@ -56,7 +58,7 @@ HB_FUNC( POLYTEXTOUTA )
// Your code goes here
hb_retl( PolyTextOutA( (HDC) hb_parnl( 1 ), &POLYTEXTA, hb_parni( 3 ) ) ) ;
hb_retl( PolyTextOutA( (HDC) HB_PARWH( 1 ), &POLYTEXTA, hb_parni( 3 ) ) );
}
*/
@@ -78,19 +80,19 @@ HB_FUNC( EXTTEXTOUT )
UINT i ;
char * cText = hb_parcx( 6 );
rcOk = ( ISARRAY(5) && Array2Rect(hb_param(5, HB_IT_ARRAY), &rc) ) ;
rcOk = ( ISARRAY(5) && Array2Rect(hb_param(5, HB_IT_ARRAY), &rc) );
if ( ISARRAY(7) )
{
iCount = hb_parinfa(7,0) ;
lpDx = (INT *) hb_xgrab( iCount * sizeof( INT ) ) ;
iCount = hb_parinfa(7,0);
lpDx = (INT *) hb_xgrab( iCount * sizeof( INT ) );
for ( i=0 ; i < iCount ; i++ )
{
*(lpDx+i) = hb_parni( 7,i+1) ;
*(lpDx+i) = hb_parni( 7,i+1);
}
}
hb_retl( ExtTextOut( (HDC) hb_parnl( 1 ) ,
hb_retl( ExtTextOut( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
(UINT) hb_parni( 4 ) ,
@@ -98,10 +100,10 @@ HB_FUNC( EXTTEXTOUT )
(LPCSTR) cText ,
(UINT) strlen( cText ) ,
ISARRAY(7) ? lpDx : NULL
) ) ;
) );
if (ISARRAY(7))
hb_xfree(lpDx) ;
hb_xfree(lpDx);
}
@@ -118,11 +120,11 @@ HB_FUNC( DRAWTEXT )
if ( ISARRAY( 3 ) && Array2Rect( hb_param( 3, HB_IT_ARRAY ), &rc ) )
hb_retni( DrawText(
(HDC) hb_parnl( 1 ), // handle of device context
(HDC) HB_PARWH( 1 ), // handle of device context
(LPCTSTR) cText, // address of string
strlen( cText ), // number of characters in string
&rc,
ISNIL(4) ? DT_LEFT : hb_parni( 4 ) ) ) ;
ISNIL(4) ? DT_LEFT : hb_parni( 4 ) ) );
else
hb_retni( 0 );
}
@@ -143,15 +145,15 @@ HB_FUNC( DRAWTEXTEX )
dtp = (DRAWTEXTPARAMS *) hb_parc( 5 ); //hb_param( 5, HB_IT_STRING )->item.asString.value;
if ( ISARRAY( 3 ) && Array2Rect( hb_param( 3, HB_IT_ARRAY ), &rc ) )
hb_retni( DrawTextEx( (HDC) hb_parnl( 1 ), // handle of device context
hb_retni( DrawTextEx( (HDC) HB_PARWH( 1 ), // handle of device context
(LPTSTR) cText , // address of string
strlen( cText ) , // number of characters in string
(LPRECT) &rc,
ISNIL(4) ? DT_LEFT : hb_parni( 4 ) ,
ISCHAR(5) ? (LPDRAWTEXTPARAMS) dtp : NULL
) ) ;
) );
else
hb_retni( 0 ) ;
hb_retni( 0 );
}
@@ -170,14 +172,14 @@ HB_FUNC( TABBEDTEXTOUT )
if ( ISARRAY( 5 ) )
{
iCount = hb_parinfa(5,0) ;
aiTabs = (INT *) hb_xgrab( iCount * sizeof( INT ) ) ;
iCount = hb_parinfa(5,0);
aiTabs = (INT *) hb_xgrab( iCount * sizeof( INT ) );
for ( i=0 ; i < iCount ; i++ )
{
*(aiTabs+i) = hb_parni( 5, i+1 ) ;
*(aiTabs+i) = hb_parni( 5, i+1 );
}
hb_retnl( (LONG) TabbedTextOut( (HDC) hb_parnl( 1 ) ,
hb_retnl( (LONG) TabbedTextOut( (HDC) HB_PARWH( 1 ) ,
hb_parni( 2 ) ,
hb_parni( 3 ) ,
(LPCSTR) cText ,
@@ -185,12 +187,12 @@ HB_FUNC( TABBEDTEXTOUT )
iCount ,
aiTabs ,
hb_parni( 6 )
) ) ;
hb_xfree( aiTabs ) ;
) );
hb_xfree( aiTabs );
}
else
hb_retnl( 0 ) ;
hb_retnl( 0 );
}
//-----------------------------------------------------------------------------
@@ -204,11 +206,11 @@ HB_FUNC( GETTEXTFACE )
char *cText = (char*) hb_xgrab(MAX_PATH);
int iRet ;
iRet = GetTextFace( (HDC) hb_parnl( 1 ), MAX_PATH , cText );
iRet = GetTextFace( (HDC) HB_PARWH( 1 ), MAX_PATH , cText );
if ( iRet )
hb_retclen( cText, iRet ) ;
hb_retclen( cText, iRet );
hb_xfree( cText ) ;
hb_xfree( cText );
}
@@ -229,26 +231,26 @@ HB_FUNC( GETTABBEDTEXTEXTENT )
if ( ISARRAY( 3 ) )
{
iCount = hb_parinfa(3,0) ;
aiTabs = (INT *) hb_xgrab( iCount * sizeof( INT ) ) ;
iCount = hb_parinfa(3,0);
aiTabs = (INT *) hb_xgrab( iCount * sizeof( INT ) );
for ( i=0 ; i < iCount ; i++ )
{
*(aiTabs+i) = hb_parni( 3, i+1 ) ;
*(aiTabs+i) = hb_parni( 3, i+1 );
}
cText = hb_parcx( 2 );
hb_retnl( (LONG) GetTabbedTextExtent( (HDC) hb_parnl( 1 ) ,
hb_retnl( (LONG) GetTabbedTextExtent( (HDC) HB_PARWH( 1 ) ,
(LPCTSTR) cText ,
strlen(cText) ,
iCount ,
aiTabs
) ) ;
) );
hb_xfree( aiTabs ) ;
hb_xfree( aiTabs );
}
else
hb_retnl( 0 ) ;
hb_retnl( 0 );
}
//-----------------------------------------------------------------------------
@@ -261,8 +263,8 @@ HB_FUNC( GETTEXTMETRICS )
{
TEXTMETRIC tm ;
if ( GetTextMetrics( (HDC) hb_parnl( 1 ), &tm ) )
hb_retclen( (char *) &tm, sizeof( TEXTMETRIC ) ) ;
if ( GetTextMetrics( (HDC) HB_PARWH( 1 ), &tm ) )
hb_retclen( (char *) &tm, sizeof( TEXTMETRIC ) );
}
//-----------------------------------------------------------------------------
@@ -276,10 +278,10 @@ HB_FUNC( GETOUTLINETEXTMETRICSA )
// Your code goes here
hb_retni( GetOutlineTextMetricsA( (HDC) hb_parnl( 1 ) ,
hb_retni( GetOutlineTextMetricsA( (HDC) HB_PARWH( 1 ) ,
(UINT) hb_parni( 2 ),
lpoutLinetExtMetrica
) ) ;
) );
}
*/
@@ -294,9 +296,9 @@ HB_FUNC( GETTEXTEXTENTPOINT32 )
SIZE sz;
PHB_ITEM aMetr ;
if ( GetTextExtentPoint32( (HDC) hb_parnl(1), pstr, strlen( pstr ), &sz ) )
if ( GetTextExtentPoint32( (HDC) HB_PARWH(1), pstr, strlen( pstr ), &sz ) )
{
aMetr = Size2Array( &sz ) ;
aMetr = Size2Array( &sz );
hb_itemReturn( aMetr );
hb_itemRelease( aMetr );
}
@@ -310,7 +312,7 @@ HB_FUNC( GETTEXTEXTENTPOINT32 )
HB_FUNC( GETBKMODE )
{
hb_retni( GetBkMode( (HDC) hb_parnl( 1 ) ) ) ;
hb_retni( GetBkMode( (HDC) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -319,7 +321,7 @@ HB_FUNC( GETBKMODE )
HB_FUNC( SETBKMODE )
{
hb_retni( SetBkMode( (HDC) hb_parnl( 1 ), hb_parni( 2 ) ) ) ;
hb_retni( SetBkMode( (HDC) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -328,7 +330,7 @@ HB_FUNC( SETBKMODE )
HB_FUNC( GETTEXTALIGN )
{
hb_retni( GetTextAlign( (HDC) hb_parnl( 1 ) ) ) ;
hb_retni( GetTextAlign( (HDC) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -337,7 +339,7 @@ HB_FUNC( GETTEXTALIGN )
HB_FUNC( SETTEXTALIGN )
{
hb_retni( SetTextAlign( (HDC) hb_parnl( 1 ), (UINT) hb_parni( 2 ) ) ) ;
hb_retni( SetTextAlign( (HDC) HB_PARWH( 1 ), (UINT) hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -346,10 +348,10 @@ HB_FUNC( SETTEXTALIGN )
HB_FUNC( SETTEXTJUSTIFICATION )
{
hb_retl( SetTextJustification( (HDC) hb_parnl( 1 ),
hb_retl( SetTextJustification( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 )
) ) ;
) );
}
@@ -359,7 +361,7 @@ HB_FUNC( SETTEXTJUSTIFICATION )
HB_FUNC( GETTEXTCHARACTEREXTRA )
{
hb_retni( GetTextCharacterExtra( (HDC) hb_parnl( 1 ) ) ) ;
hb_retni( GetTextCharacterExtra( (HDC) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -368,7 +370,7 @@ HB_FUNC( GETTEXTCHARACTEREXTRA )
HB_FUNC( SETTEXTCHARACTEREXTRA )
{
hb_retni( SetTextCharacterExtra( (HDC) hb_parnl( 1 ), hb_parni( 2 ) ) ) ;
hb_retni( SetTextCharacterExtra( (HDC) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
@@ -379,7 +381,7 @@ HB_FUNC( SETTEXTCHARACTEREXTRA )
HB_FUNC( GETTEXTCHARSET )
{
hb_retni( GetTextCharset( (HDC) hb_parnl( 1 ) ) ) ;
hb_retni( GetTextCharset( (HDC) HB_PARWH( 1 ) ) );
}
@@ -396,8 +398,8 @@ HB_FUNC( GRAYSTRING )
// Your code goes here
hb_retl( GrayString( (HDC) hb_parnl( 1 ) ,
(HBRUSH) hb_parnl( 2 ),
hb_retl( GrayString( (HDC) HB_PARWH( 1 ) ,
(HBRUSH) HB_PARWH( 2 ),
lpOutputFunc ,
(LPARAM) hb_parnl( 4 ),
hb_parni( 5 ) ,
@@ -405,7 +407,7 @@ HB_FUNC( GRAYSTRING )
hb_parni( 7 ) ,
hb_parni( 8 ) ,
hb_parni( 9 )
) ) ;
) );
}
*/
@@ -422,11 +424,11 @@ HB_FUNC( GETCHARABCWIDTHSA )
// Your code goes here
hb_retl( GetCharABCWidthsA( (HDC) hb_parnl( 1 ) ,
hb_retl( GetCharABCWidthsA( (HDC) HB_PARWH( 1 ) ,
(UINT) hb_parni( 2 ),
(UINT) hb_parni( 3 ),
lpabc
) ) ;
) );
}
*/
@@ -442,11 +444,11 @@ HB_FUNC( GETCHARABCWIDTHSFLOATA )
// Your code goes here
hb_retl( GetCharABCWidthsFloatA( (HDC) hb_parnl( 1 ) ,
hb_retl( GetCharABCWidthsFloatA( (HDC) HB_PARWH( 1 ) ,
(UINT) hb_parni( 2 ),
(UINT) hb_parni( 3 ),
lpabcFloat
) ) ;
) );
}
*/
@@ -463,12 +465,12 @@ HB_FUNC( GETCHARABCWIDTHSI )
// Your code goes here
hb_retl( GetCharABCWidthsI( (HDC) hb_parnl( 1 ) ,
hb_retl( GetCharABCWidthsI( (HDC) HB_PARWH( 1 ) ,
(UINT) hb_parni( 2 ),
(UINT) hb_parni( 3 ),
lpWord ,
lpabc
) ) ;
) );
}
*/
@@ -484,13 +486,13 @@ HB_FUNC( GETCHARACTERPLACEMENTA )
// Your code goes here
hb_retnl( (LONG) GetCharacterPlacementA( (HDC) hb_parnl( 1 ) ,
hb_retnl( (LONG) GetCharacterPlacementA( (HDC) HB_PARWH( 1 ) ,
(LPCSTR) hb_parcx( 2 ),
hb_parni( 3 ) ,
hb_parni( 4 ) ,
lpgcp_resultsa ,
(DWORD) hb_parnl( 6 )
) ) ;
) );
}
*/
@@ -506,11 +508,11 @@ HB_FUNC( GETCHARWIDTH32A )
// Your code goes here
hb_retl( GetCharWidth32A( (HDC) hb_parnl( 1 ) ,
hb_retl( GetCharWidth32A( (HDC) HB_PARWH( 1 ) ,
(UINT) hb_parni( 2 ),
(UINT) hb_parni( 3 ),
lpInt
) ) ;
) );
}
*/
@@ -526,11 +528,11 @@ HB_FUNC( GETCHARWIDTHA )
// Your code goes here
hb_retl( GetCharWidthA( (HDC) hb_parnl( 1 ) ,
hb_retl( GetCharWidthA( (HDC) HB_PARWH( 1 ) ,
(UINT) hb_parni( 2 ),
(UINT) hb_parni( 3 ),
lpInt
) ) ;
) );
}
*/
@@ -546,11 +548,11 @@ HB_FUNC( GETCHARWIDTHFLOATA )
// Your code goes here
hb_retl( GetCharWidthFloatA( (HDC) hb_parnl( 1 ) ,
hb_retl( GetCharWidthFloatA( (HDC) HB_PARWH( 1 ) ,
(UINT) hb_parni( 2 ),
(UINT) hb_parni( 3 ),
pFloat
) ) ;
) );
}
*/
@@ -567,12 +569,12 @@ HB_FUNC( GETCHARWIDTHI )
// Your code goes here
hb_retl( GetCharWidthI( (HDC) hb_parnl( 1 ) ,
hb_retl( GetCharWidthI( (HDC) HB_PARWH( 1 ) ,
(UINT) hb_parni( 2 ),
(UINT) hb_parni( 3 ),
lpWord ,
lpInt
) ) ;
) );
}
*/
@@ -588,10 +590,10 @@ HB_FUNC( GETKERNINGPAIRSA )
// Your code goes here
hb_retnl( (LONG) GetKerningPairsA( (HDC) hb_parnl( 1 ) ,
hb_retnl( (LONG) GetKerningPairsA( (HDC) HB_PARWH( 1 ) ,
(DWORD) hb_parnl( 2 ),
lpkerningpair
) ) ;
) );
}
*/
@@ -607,10 +609,10 @@ HB_FUNC( GETTEXTCHARSETINFO )
// Your code goes here
hb_retni( GetTextCharsetInfo( (HDC) hb_parnl( 1 ) ,
hb_retni( GetTextCharsetInfo( (HDC) HB_PARWH( 1 ) ,
lpSig ,
(DWORD) hb_parnl( 3 )
) ) ;
) );
}
*/
@@ -628,14 +630,14 @@ HB_FUNC( GETTEXTEXTENTEXPOINTA )
// Your code goes here
hb_retl( GetTextExtentExPointA( (HDC) hb_parnl( 1 ) ,
hb_retl( GetTextExtentExPointA( (HDC) HB_PARWH( 1 ) ,
(LPCSTR) hb_parcx( 2 ),
hb_parni( 3 ) ,
hb_parni( 4 ) ,
lpInt1 ,
lpInt2 ,
lpSize
) ) ;
) );
}
*/
@@ -654,14 +656,14 @@ HB_FUNC( GETTEXTEXTENTEXPOINTI )
// Your code goes here
hb_retl( GetTextExtentExPointI( (HDC) hb_parnl( 1 ),
hb_retl( GetTextExtentExPointI( (HDC) HB_PARWH( 1 ),
lpWord ,
hb_parni( 3 ) ,
hb_parni( 4 ) ,
lpInt1 ,
lpInt2 ,
lpSize
) ) ;
) );
}
*/
@@ -678,11 +680,11 @@ HB_FUNC( GETTEXTEXTENTPOINTA )
// Your code goes here
hb_retl( GetTextExtentPointA( (HDC) hb_parnl( 1 ) ,
hb_retl( GetTextExtentPointA( (HDC) HB_PARWH( 1 ) ,
(LPCSTR) hb_parcx( 2 ),
hb_parni( 3 ) ,
lpSize
) ) ;
) );
}
*/
@@ -699,11 +701,11 @@ HB_FUNC( GETTEXTEXTENTPOINTI )
// Your code goes here
hb_retl( GetTextExtentPointI( (HDC) hb_parnl( 1 ),
hb_retl( GetTextExtentPointI( (HDC) HB_PARWH( 1 ),
lpWord ,
hb_parni( 3 ) ,
lpSize
) ) ;
) );
}
*/
@@ -724,9 +726,7 @@ HB_FUNC( TRANSLATECHARSETINFO )
hb_retl( TranslateCharsetInfo( (DWORD) hb_parnl( 1 ),
&lpCs ,
(DWORD) hb_parnl( 3 )
) ) ;
) );
}
*/

16
harbour/contrib/hbwhat32/whttree.c
View File

@@ -2,6 +2,8 @@
* $Id$
*/
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -14,7 +16,7 @@ HB_FUNC( TVINSERTITEM )
{
TV_INSERTSTRUCT is;
is.hParent = ( HTREEITEM ) hb_parnl( 3 );
is.hParent = ( HTREEITEM ) HB_PARWH( 3 );
is.hInsertAfter = TVI_LAST;
#if (_WIN32_IE >= 0x0400) && !defined(_MSC_VER)
@@ -29,29 +31,29 @@ HB_FUNC( TVINSERTITEM )
is.item.iSelectedImage = hb_parnl( 4 );
#endif
hb_retnl( SendMessage( ( HWND ) hb_parnl( 1 ), TVM_INSERTITEM, 0,
hb_retnl( SendMessage( ( HWND ) HB_PARWH( 1 ), TVM_INSERTITEM, 0,
( LPARAM )( LPTV_INSERTSTRUCT )( &is ) ) );
}
//-------------------------------------------------------------------------//
HB_FUNC( TVDELETEITEM )
{
TreeView_DeleteItem( (HWND) hb_parnl( 1 ), ( HTREEITEM ) hb_parnl( 2 ) );
TreeView_DeleteItem( (HWND) HB_PARWH( 1 ), ( HTREEITEM ) HB_PARWH( 2 ) );
}
//-------------------------------------------------------------------------//
HB_FUNC( TVSETIMAGELIST ) // ( hWnd, hImageList, nType )
{
hb_retnl( ( LONG ) TreeView_SetImageList( ( HWND ) hb_parnl( 1 ),
( HIMAGELIST ) hb_parnl( 2 ), hb_parnl( 3 ) ) );
hb_retnl( ( LONG ) TreeView_SetImageList( ( HWND ) HB_PARWH( 1 ),
( HIMAGELIST ) HB_PARWH( 2 ), hb_parnl( 3 ) ) );
}
//-------------------------------------------------------------------------//
HB_FUNC( TVGETSELTEXT ) // ( hWnd ) --> cText
{
HWND hWnd = ( HWND ) hb_parnl( 1 );
HWND hWnd = ( HWND ) HB_PARWH( 1 );
HTREEITEM hItem = TreeView_GetSelection( hWnd );
TV_ITEM tvi;
BYTE buffer[ 100 ];
@@ -72,7 +74,7 @@ HB_FUNC( TVGETSELTEXT ) // ( hWnd ) --> cText
HB_FUNC( TVGETSELECTED ) // ( hWnd ) --> hItem
{
hb_retnl( ( LONG ) TreeView_GetSelection( ( HWND ) hb_parnl( 1 ) ) );
hb_retnl( ( LONG ) TreeView_GetSelection( ( HWND ) HB_PARWH( 1 ) ) );
}
//-------------------------------------------------------------------------//

16
harbour/contrib/hbwhat32/whtview.c
View File

@@ -8,6 +8,8 @@
#define HB_OS_WIN_32_USED
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include "hbapiitm.h"
#include "hbapi.h"
@@ -30,7 +32,7 @@ HB_FUNC( GETVIEWPORTEXTEX )
SIZE siz ;
PHB_ITEM aSize ;
if ( GetViewportExtEx( (HDC) hb_parnl( 1 ), &siz ) )
if ( GetViewportExtEx( (HDC) HB_PARWH( 1 ), &siz ) )
{
aSize = Size2Array( &siz );
hb_itemReturn( aSize );
@@ -51,7 +53,7 @@ HB_FUNC( GETVIEWPORTORGEX )
POINT pt ;
PHB_ITEM aPoint;
if ( GetViewportOrgEx( (HDC) hb_parnl( 1 ), &pt ) )
if ( GetViewportOrgEx( (HDC) HB_PARWH( 1 ), &pt ) )
{
aPoint = Point2Array( &pt );
hb_itemReturn( aPoint );
@@ -72,7 +74,7 @@ HB_FUNC( GETWINDOWEXTEX )
SIZE siz ;
PHB_ITEM aSize ;
if ( GetWindowExtEx( (HDC) hb_parnl( 1 ), &siz ) )
if ( GetWindowExtEx( (HDC) HB_PARWH( 1 ), &siz ) )
{
aSize = Size2Array( &siz );
hb_itemReturn( aSize );
@@ -92,7 +94,7 @@ HB_FUNC( SCALEVIEWPORTEXTEX )
SIZE siz ;
PHB_ITEM aSize ;
if ( ScaleViewportExtEx( (HDC) hb_parnl( 1 ), hb_parni( 2 ), hb_parni( 3 ),
if ( ScaleViewportExtEx( (HDC) HB_PARWH( 1 ), hb_parni( 2 ), hb_parni( 3 ),
hb_parni( 4 ) , hb_parni( 5 ), &siz ) )
{
aSize = Size2Array( &siz );
@@ -114,7 +116,7 @@ HB_FUNC( SETVIEWPORTEXTEX )
SIZE siz ;
PHB_ITEM aSize ;
if ( SetViewportExtEx( (HDC) hb_parnl( 1 ), hb_parni( 2 ), hb_parni( 3 ), &siz ) )
if ( SetViewportExtEx( (HDC) HB_PARWH( 1 ), hb_parni( 2 ), hb_parni( 3 ), &siz ) )
{
aSize = Size2Array( &siz );
hb_itemReturn( aSize );
@@ -135,7 +137,7 @@ HB_FUNC( SETVIEWPORTORGEX )
POINT pt ;
PHB_ITEM aPoint ;
if ( SetViewportOrgEx( (HDC) hb_parnl( 1 ),hb_parni( 2 ), hb_parni( 3 ), &pt ) )
if ( SetViewportOrgEx( (HDC) HB_PARWH( 1 ),hb_parni( 2 ), hb_parni( 3 ), &pt ) )
{
aPoint = Point2Array( &pt );
hb_itemReturn( aPoint );
@@ -143,5 +145,3 @@ HB_FUNC( SETVIEWPORTORGEX )
}
}

222
harbour/contrib/hbwhat32/whtwnd.c
View File

@@ -4,6 +4,8 @@
#define HB_OS_WIN_32_USED
#include "hbwhat.h"
#include <windows.h>
#include <winuser.h>
#include "hbapiitm.h"
@@ -23,21 +25,21 @@ extern void Size2ArrayEx( SIZE *siz , PHB_ITEM aSize);
HB_FUNC( ISICONIC )
{
hb_retl( IsIconic( (HWND) hb_parnl( 1 ) ) );
hb_retl( IsIconic( (HWND) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
HB_FUNC( ISWINDOWVISIBLE )
{
hb_retl( IsWindowVisible( (HWND) hb_parnl( 1 ) ) );
hb_retl( IsWindowVisible( (HWND) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
HB_FUNC( ISZOOMED )
{
hb_retl( IsZoomed( (HWND) hb_parnl( 1 ) ) );
hb_retl( IsZoomed( (HWND) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -46,7 +48,7 @@ HB_FUNC( ISZOOMED )
HB_FUNC( ISWINDOWUNICODE )
{
hb_retl( IsWindowUnicode( (HWND) hb_parnl( 1 ) ) );
hb_retl( IsWindowUnicode( (HWND) HB_PARWH( 1 ) ) );
}
@@ -55,7 +57,7 @@ HB_FUNC( ISWINDOWUNICODE )
HB_FUNC( CLOSEWINDOW )
{
hb_retl( CloseWindow( (HWND) hb_parnl(1) ) );
hb_retl( CloseWindow( (HWND) HB_PARWH(1) ) );
}
//-----------------------------------------------------------------------------
@@ -72,8 +74,8 @@ HB_FUNC( FINDWINDOW )
HB_FUNC( FINDWINDOWEX )
{
hb_retnl( (LONG) FindWindowEx( (HWND) hb_parnl( 1 ) ,
(HWND) hb_parnl( 2 ) ,
HB_RETWH( FindWindowEx( (HWND) HB_PARWH( 1 ) ,
(HWND) HB_PARWH( 2 ) ,
(LPCSTR) hb_parcx( 3 ),
(LPCSTR) hb_parcx( 4 )
) );
@@ -84,28 +86,28 @@ HB_FUNC( FINDWINDOWEX )
HB_FUNC( ISCHILD )
{
hb_retl( ( BOOL ) IsChild( (HWND) hb_parnl(1), (HWND) hb_parnl(2) ) );
hb_retl( ( BOOL ) IsChild( (HWND) HB_PARWH(1), (HWND) HB_PARWH(2) ) );
}
//-----------------------------------------------------------------------------
HB_FUNC( UPDATEWINDOW )
{
hb_retl( UpdateWindow( (HWND) hb_parnl(1)) );
hb_retl( UpdateWindow( (HWND) HB_PARWH(1)) );
}
//-----------------------------------------------------------------------------
HB_FUNC( GETWINDOWLONG )
{
hb_retnl( GetWindowLong( (HWND) hb_parnl(1), hb_parni(2) ));
hb_retnl( GetWindowLong( (HWND) HB_PARWH(1), hb_parni(2) ));
}
//-----------------------------------------------------------------------------
HB_FUNC( SETWINDOWLONG )
{
hb_retnl( SetWindowLong( (HWND) hb_parnl(1), hb_parni(2), hb_parnl(3) ));
hb_retnl( SetWindowLong( (HWND) HB_PARWH(1), hb_parni(2), hb_parnl(3) ));
}
@@ -113,7 +115,7 @@ HB_FUNC( SETWINDOWLONG )
HB_FUNC( ENABLEWINDOW )
{
EnableWindow( (HWND) hb_parnl(1), hb_parl(2) );
EnableWindow( (HWND) HB_PARWH(1), hb_parl(2) );
}
//-----------------------------------------------------------------------------
@@ -122,35 +124,35 @@ HB_FUNC( ENABLEWINDOW )
HB_FUNC( ISWINDOWENABLED )
{
hb_retl( IsWindowEnabled( (HWND) hb_parnl( 1 ) ) );
hb_retl( IsWindowEnabled( (HWND) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
HB_FUNC( DESTROYWINDOW )
{
hb_retl( DestroyWindow( (HWND) hb_parnl( 1 )) );
hb_retl( DestroyWindow( (HWND) HB_PARWH( 1 )) );
}
//-----------------------------------------------------------------------------
HB_FUNC( ISWINDOW )
{
hb_retl( IsWindow( (HWND) hb_parnl( 1 )) );
hb_retl( IsWindow( (HWND) HB_PARWH( 1 )) );
}
//-----------------------------------------------------------------------------
HB_FUNC( SHOWWINDOW )
{
hb_retl( ShowWindow( (HWND) hb_parnl( 1 ), hb_parni(2) ));
hb_retl( ShowWindow( (HWND) HB_PARWH( 1 ), hb_parni(2) ));
}
//-----------------------------------------------------------------------------
HB_FUNC( MOVEWINDOW )
{
hb_retl( MoveWindow(
(HWND) hb_parnl(1),
(HWND) HB_PARWH(1),
hb_parni(2),
hb_parni(3),
hb_parni(4),
@@ -163,28 +165,28 @@ HB_FUNC( MOVEWINDOW )
HB_FUNC( DEFWINDOWPROC )
{
hb_retnl( DefWindowProc( (HWND) hb_parnl(1), hb_parnl(2), hb_parnl(3), hb_parnl(4)));
hb_retnl( DefWindowProc( (HWND) HB_PARWH(1), hb_parnl(2), hb_parnl(3), hb_parnl(4)));
}
//-----------------------------------------------------------------------------
HB_FUNC( DEFDLGPROC )
{
hb_retnl( DefDlgProc( (HWND) hb_parnl(1), hb_parnl(2), hb_parnl(3), hb_parnl(4)));
hb_retnl( DefDlgProc( (HWND) HB_PARWH(1), hb_parnl(2), hb_parnl(3), hb_parnl(4)));
}
//-----------------------------------------------------------------------------
HB_FUNC( DEFMDICHILDPROC )
{
hb_retnl( DefMDIChildProc( (HWND) hb_parnl(1), hb_parnl(2), hb_parnl(3), hb_parnl(4)));
hb_retnl( DefMDIChildProc( (HWND) HB_PARWH(1), hb_parnl(2), hb_parnl(3), hb_parnl(4)));
}
//-----------------------------------------------------------------------------
HB_FUNC( DEFFRAMEPROC )
{
hb_retnl( DefFrameProc( (HWND) hb_parnl(1), (HWND) hb_parnl(2), hb_parnl(3), hb_parnl(4), hb_parnl(5)));
hb_retnl( DefFrameProc( (HWND) HB_PARWH(1), (HWND) HB_PARWH(2), hb_parnl(3), hb_parnl(4), hb_parnl(5)));
}
@@ -192,7 +194,7 @@ HB_FUNC( DEFFRAMEPROC )
HB_FUNC( CALLWINDOWPROC )
{
hb_retnl( CallWindowProc( (WNDPROC) hb_parptr(1), (HWND) hb_parnl(2), hb_parni(3), hb_parnl(4), hb_parnl(5)));
hb_retnl( CallWindowProc( (WNDPROC) hb_parptr(1), (HWND) HB_PARWH(2), hb_parni(3), hb_parnl(4), hb_parnl(5)));
}
//-----------------------------------------------------------------------------
@@ -208,7 +210,7 @@ HB_FUNC( INVALIDATERECT )
bRectOk = ( ISARRAY( 2 ) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc ) );
hb_retl( InvalidateRect(
ISNIL(1) ? NULL : (HWND) hb_parnl( 1 ) , // handle of window with changed update region
ISNIL(1) ? NULL : (HWND) HB_PARWH( 1 ) , // handle of window with changed update region
bRectOk ? &rc : NULL , // address of rectangle coordinates
ISLOG(3) ? hb_parl( 3 ) : TRUE // erase-background flag
) );
@@ -226,9 +228,9 @@ HB_FUNC( REDRAWWINDOW )
bRectOk = ( ISARRAY(2) && Array2Rect( hb_param(2,HB_IT_ARRAY), &rc ) );
hb_retl( RedrawWindow(
(HWND) hb_parnl( 1 ) , // handle of window
(HWND) HB_PARWH( 1 ) , // handle of window
bRectOk ? &rc : NULL , // address of structure with update rectangle
ISNIL( 3 ) ? NULL : (HRGN) hb_parnl( 3 ) , // handle of update region
ISNIL( 3 ) ? NULL : (HRGN) HB_PARWH( 3 ) , // handle of update region
hb_parni( 4 ) // array of redraw flags
) );
@@ -244,7 +246,7 @@ HB_FUNC( GETCLIENTRECT )
RECT rc;
PHB_ITEM aMetr ;
GetClientRect( (HWND) hb_parnl( 1 ), &rc );
GetClientRect( (HWND) HB_PARWH( 1 ), &rc );
aMetr = Rect2Array( &rc );
@@ -262,7 +264,7 @@ HB_FUNC( GETWINDOWRECT )
RECT rc;
PHB_ITEM aMetr ;
GetWindowRect( (HWND) hb_parnl( 1 ), &rc );
GetWindowRect( (HWND) HB_PARWH( 1 ), &rc );
aMetr = Rect2Array( &rc );
hb_itemReturn( aMetr );
@@ -276,7 +278,7 @@ HB_FUNC( GETWINDOWRECT )
HB_FUNC( SHOWOWNEDPOPUPS )
{
hb_retl( ShowOwnedPopups( (HWND) hb_parnl( 1 ), hb_parl( 2 ) ) );
hb_retl( ShowOwnedPopups( (HWND) HB_PARWH( 1 ), hb_parl( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -285,7 +287,7 @@ HB_FUNC( SHOWOWNEDPOPUPS )
HB_FUNC( OPENICON )
{
hb_retl( OpenIcon( (HWND) hb_parnl( 1 ) ) );
hb_retl( OpenIcon( (HWND) HB_PARWH( 1 ) ) );
}
@@ -295,7 +297,7 @@ HB_FUNC( OPENICON )
HB_FUNC( BEGINDEFERWINDOWPOS )
{
hb_retnl( (LONG) BeginDeferWindowPos( hb_parni( 1 ) ) );
HB_RETWH( BeginDeferWindowPos( hb_parni( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -304,9 +306,9 @@ HB_FUNC( BEGINDEFERWINDOWPOS )
HB_FUNC( DEFERWINDOWPOS )
{
hb_retnl( (LONG) DeferWindowPos( (HDWP) hb_parnl( 1 ),
(HWND) hb_parnl( 2 ),
(HWND) hb_parnl( 3 ),
HB_RETWH( DeferWindowPos( (HDWP) HB_PARWH( 1 ),
(HWND) HB_PARWH( 2 ),
(HWND) HB_PARWH( 3 ),
hb_parni( 4 ) ,
hb_parni( 5 ) ,
hb_parni( 6 ) ,
@@ -321,7 +323,7 @@ HB_FUNC( DEFERWINDOWPOS )
HB_FUNC( ENDDEFERWINDOWPOS )
{
hb_retl( EndDeferWindowPos( (HDWP) hb_parnl( 1 ) ) );
hb_retl( EndDeferWindowPos( (HDWP) HB_PARWH( 1 ) ) );
}
@@ -331,8 +333,8 @@ HB_FUNC( ENDDEFERWINDOWPOS )
HB_FUNC( SETWINDOWPOS )
{
hb_retl( SetWindowPos( (HWND) hb_parnl( 1 ),
(HWND) hb_parnl( 2 ),
hb_retl( SetWindowPos( (HWND) HB_PARWH( 1 ),
(HWND) HB_PARWH( 2 ),
hb_parni( 3 ) ,
hb_parni( 4 ) ,
hb_parni( 5 ) ,
@@ -348,7 +350,7 @@ HB_FUNC( SETWINDOWPOS )
HB_FUNC( SETFOCUS )
{
hb_retnl( (LONG) SetFocus( (HWND) hb_parnl( 1 ) ) );
HB_RETWH( SetFocus( (HWND) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -357,7 +359,7 @@ HB_FUNC( SETFOCUS )
HB_FUNC( GETACTIVEWINDOW )
{
hb_retnl( (LONG) GetActiveWindow( ) );
HB_RETWH( GetActiveWindow( ) );
}
//-----------------------------------------------------------------------------
@@ -367,7 +369,7 @@ HB_FUNC( GETACTIVEWINDOW )
HB_FUNC( SETACTIVEWINDOW )
{
hb_retnl( (LONG) SetActiveWindow( (HWND) hb_parnl( 1 ) ) );
HB_RETWH( SetActiveWindow( (HWND) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -377,7 +379,7 @@ HB_FUNC( SETACTIVEWINDOW )
HB_FUNC( GETFOREGROUNDWINDOW )
{
hb_retnl( (LONG) GetForegroundWindow( ) );
HB_RETWH( GetForegroundWindow( ) );
}
@@ -387,7 +389,7 @@ HB_FUNC( GETFOREGROUNDWINDOW )
HB_FUNC( GETFOCUS )
{
hb_retnl( (LONG) GetFocus( ) );
HB_RETWH( GetFocus( ) );
}
@@ -397,7 +399,7 @@ HB_FUNC( GETFOCUS )
HB_FUNC( SETFOREGROUNDWINDOW )
{
hb_retl( SetForegroundWindow( (HWND) hb_parnl( 1 ) ) );
hb_retl( SetForegroundWindow( (HWND) HB_PARWH( 1 ) ) );
}
@@ -416,7 +418,7 @@ HB_FUNC( ANYPOPUP )
HB_FUNC( BRINGWINDOWTOTOP )
{
hb_retl( BringWindowToTop( (HWND) hb_parnl( 1 ) ) );
hb_retl( BringWindowToTop( (HWND) HB_PARWH( 1 ) ) );
}
@@ -428,7 +430,7 @@ HB_FUNC( GETCLASSNAME )
{
char *cText= (char*) hb_xgrab( MAX_PATH+1 );
GetClassName( (HWND) hb_parnl( 1 ),
GetClassName( (HWND) HB_PARWH( 1 ),
(LPSTR) cText ,
MAX_PATH
);
@@ -445,7 +447,7 @@ HB_FUNC( GETCLASSNAME )
HB_FUNC( GETTOPWINDOW )
{
hb_retnl( (LONG) GetTopWindow( (HWND) hb_parnl( 1 ) ) );
HB_RETWH( GetTopWindow( (HWND) HB_PARWH( 1 ) ) );
}
@@ -460,7 +462,7 @@ HB_FUNC( SCROLLWINDOW )
Array2Rect( hb_param( 4 , HB_IT_ARRAY ) , &lpRect );
Array2Rect( hb_param( 5 , HB_IT_ARRAY ) , &lpClipRect );
hb_retl( ScrollWindow( (HWND) hb_parnl( 1 ),
hb_retl( ScrollWindow( (HWND) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
&lpRect ,
@@ -475,7 +477,7 @@ HB_FUNC( SCROLLWINDOW )
HB_FUNC( SETWINDOWTEXT )
{
hb_retl( SetWindowText( (HWND) hb_parnl( 1 ), (LPSTR) hb_parcx( 2 ) ) );
hb_retl( SetWindowText( (HWND) HB_PARWH( 1 ), (LPSTR) hb_parcx( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -485,9 +487,9 @@ HB_FUNC( SETWINDOWTEXT )
HB_FUNC( GETWINDOWTEXT )
{
int iLen = GetWindowTextLength( (HWND) hb_parnl( 1 ) ) ;
int iLen = GetWindowTextLength( (HWND) HB_PARWH( 1 ) ) ;
char *cText = (char*) hb_xgrab( iLen+1 );
int iRet = GetWindowText( (HWND) hb_parnl( 1 ) ,
int iRet = GetWindowText( (HWND) HB_PARWH( 1 ) ,
(LPSTR) cText ,
iLen+1
);
@@ -502,7 +504,7 @@ HB_FUNC( GETWINDOWTEXT )
HB_FUNC( GETWINDOWTEXTLENGTH )
{
hb_retni( GetWindowTextLength( (HWND) hb_parnl( 1 ) ) );
hb_retni( GetWindowTextLength( (HWND) HB_PARWH( 1 ) ) );
}
@@ -512,7 +514,7 @@ HB_FUNC( GETWINDOWTEXTLENGTH )
HB_FUNC( SETWINDOWCONTEXTHELPID )
{
hb_retl( SetWindowContextHelpId( (HWND) hb_parnl( 1 ), (DWORD) hb_parnl( 2 ) ) );
hb_retl( SetWindowContextHelpId( (HWND) HB_PARWH( 1 ), (DWORD) hb_parnl( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -521,7 +523,7 @@ HB_FUNC( SETWINDOWCONTEXTHELPID )
HB_FUNC( GETWINDOWCONTEXTHELPID )
{
hb_retnl( (LONG) GetWindowContextHelpId( (HWND) hb_parnl( 1 ) ) );
hb_retnl( (LONG) GetWindowContextHelpId( (HWND) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -530,7 +532,7 @@ HB_FUNC( GETWINDOWCONTEXTHELPID )
HB_FUNC( SETMENUCONTEXTHELPID )
{
hb_retl( SetMenuContextHelpId( (HMENU) hb_parnl( 1 ), (DWORD) hb_parnl( 2 ) ) );
hb_retl( SetMenuContextHelpId( (HMENU) HB_PARWH( 1 ), (DWORD) hb_parnl( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -539,7 +541,7 @@ HB_FUNC( SETMENUCONTEXTHELPID )
HB_FUNC( GETMENUCONTEXTHELPID )
{
hb_retnl( (LONG) GetMenuContextHelpId( (HMENU) hb_parnl( 1 ) ) );
hb_retnl( (LONG) GetMenuContextHelpId( (HMENU) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -548,7 +550,7 @@ HB_FUNC( GETMENUCONTEXTHELPID )
HB_FUNC( GETWINDOW )
{
hb_retnl( (LONG) GetWindow( (HWND)hb_parnl(1), (UINT) hb_parni( 2 ) ) );
HB_RETWH( GetWindow( (HWND)HB_PARWH(1), (UINT) hb_parni( 2 ) ) );
}
@@ -568,7 +570,7 @@ HB_FUNC( CLIENTTOSCREEN )
pArray= hb_param( 2 , HB_IT_ARRAY );
if (Array2Point( pArray ,&Point ) )
{
if (ClientToScreen( (HWND) hb_parnl( 1 ), &Point ))
if (ClientToScreen( (HWND) HB_PARWH( 1 ), &Point ))
{
Point2ArrayEx( &Point , pArray );
hb_retl( TRUE );
@@ -598,7 +600,7 @@ HB_FUNC( SCREENTOCLIENT )
if (Array2Point(pArray, &Point ) )
{
if( ScreenToClient( (HWND) hb_parnl( 1 ), &Point ) >0)
if( ScreenToClient( (HWND) HB_PARWH( 1 ), &Point ) >0)
{
Point2ArrayEx( &Point , pArray );
hb_retl( TRUE );
@@ -624,8 +626,8 @@ HB_FUNC( MAPWINDOWPOINTS )
PHB_ITEM pArray =hb_param( 3 , HB_IT_ARRAY );
Array2Point( pArray ,&lpPoints );
hb_retni( MapWindowPoints( (HWND) hb_parnl( 1 ),
(HWND) hb_parnl( 2 ),
hb_retni( MapWindowPoints( (HWND) HB_PARWH( 1 ),
(HWND) HB_PARWH( 2 ),
&lpPoints ,
(UINT) hb_parni( 4 )
) );
@@ -645,7 +647,7 @@ HB_FUNC( WINDOWFROMPOINT )
POINT Point ;
Array2Point( hb_param( 1 , HB_IT_ARRAY ), &Point );
hb_retnl( (LONG) WindowFromPoint( Point ) );
HB_RETWH( WindowFromPoint( Point ) );
}
@@ -661,7 +663,7 @@ HB_FUNC( CHILDWINDOWFROMPOINT )
Array2Point( hb_param( 2 , HB_IT_ARRAY ) ,&Point);
hb_retnl( (LONG) ChildWindowFromPoint( (HWND) hb_parnl( 1 ), Point ) );
HB_RETWH( ChildWindowFromPoint( (HWND) HB_PARWH( 1 ), Point ) );
}
@@ -676,7 +678,7 @@ HB_FUNC( CHILDWINDOWFROMPOINTEX )
Array2Point( hb_param( 2 , HB_IT_ARRAY ) ,&PoInt);
hb_retnl( (LONG) ChildWindowFromPointEx( (HWND) hb_parnl( 1 ),
HB_RETWH( ChildWindowFromPointEx( (HWND) HB_PARWH( 1 ),
PoInt ,
(UINT) hb_parni( 3 )
) );
@@ -689,7 +691,7 @@ HB_FUNC( CHILDWINDOWFROMPOINTEX )
HB_FUNC( GETWINDOWWORD )
{
hb_retni( GetWindowWord( (HWND) hb_parnl( 1 ), hb_parni( 2 ) ) );
hb_retni( GetWindowWord( (HWND) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -698,7 +700,7 @@ HB_FUNC( GETWINDOWWORD )
HB_FUNC( SETWINDOWWORD )
{
hb_retni( SetWindowWord( (HWND) hb_parnl( 1 ), hb_parni( 2 ), (WORD) hb_parni(3) ) );
hb_retni( SetWindowWord( (HWND) HB_PARWH( 1 ), hb_parni( 2 ), (WORD) hb_parni(3) ) );
}
@@ -707,7 +709,7 @@ HB_FUNC( SETWINDOWWORD )
HB_FUNC( GETDESKTOPWINDOW )
{
hb_retnl( (LONG) GetDesktopWindow( ) );
HB_RETWH( GetDesktopWindow( ) );
}
//-----------------------------------------------------------------------------
@@ -715,7 +717,7 @@ HB_FUNC( GETDESKTOPWINDOW )
HB_FUNC( GETPARENT )
{
hb_retnl( (LONG) GetParent( (HWND) hb_parnl( 1 ) ) );
HB_RETWH( GetParent( (HWND) HB_PARWH( 1 ) ) );
}
//-----------------------------------------------------------------------------
@@ -723,7 +725,7 @@ HB_FUNC( GETPARENT )
HB_FUNC( SETPARENT )
{
hb_retnl( (LONG) SetParent( (HWND) hb_parnl( 1 ), (HWND) hb_parnl( 2 ) ) );
HB_RETWH( SetParent( (HWND) HB_PARWH( 1 ), (HWND) HB_PARWH( 2 ) ) );
}
@@ -733,7 +735,7 @@ HB_FUNC( SETPARENT )
HB_FUNC( GETCLASSWORD )
{
hb_retni( GetClassWord( (HWND) hb_parnl( 1 ), hb_parni( 2 ) ) );
hb_retni( GetClassWord( (HWND) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -742,7 +744,7 @@ HB_FUNC( GETCLASSWORD )
HB_FUNC( SETCLASSWORD )
{
hb_retni( SetClassWord( (HWND) hb_parnl( 1 ), hb_parni( 2 ), (WORD) hb_parni( 3 ) ) );
hb_retni( SetClassWord( (HWND) HB_PARWH( 1 ), hb_parni( 2 ), (WORD) hb_parni( 3 ) ) );
}
@@ -751,7 +753,7 @@ HB_FUNC( SETCLASSWORD )
HB_FUNC( GETCLASSLONG )
{
hb_retnl( (LONG) GetClassLong( (HWND) hb_parnl( 1 ), hb_parni( 2 ) ) );
hb_retnl( (LONG) GetClassLong( (HWND) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -759,7 +761,7 @@ HB_FUNC( GETCLASSLONG )
HB_FUNC( SETCLASSLONG )
{
hb_retnl( (LONG) SetClassLong( (HWND) hb_parnl( 1 ),
hb_retnl( (LONG) SetClassLong( (HWND) HB_PARWH( 1 ),
hb_parni( 2 ) ,
hb_parnl( 3 )
) );
@@ -771,7 +773,7 @@ HB_FUNC( SETCLASSLONG )
HB_FUNC( GETANCESTOR )
{
hb_retnl( (LONG) GetAncestor( (HWND) hb_parnl( 1 ), (UINT) hb_parni( 2 ) ) );
HB_RETWH( GetAncestor( (HWND) HB_PARWH( 1 ), (UINT) hb_parni( 2 ) ) );
}
#endif
@@ -782,7 +784,7 @@ HB_FUNC( GETANCESTOR )
HB_FUNC( SHOWWINDOWASYNC )
{
hb_retl( ShowWindowAsync( (HWND) hb_parnl( 1 ), hb_parni( 2 ) ) );
hb_retl( ShowWindowAsync( (HWND) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -805,7 +807,7 @@ RETURN(nil)
HB_FUNC( FLASHWINDOW )
{
hb_retl( FlashWindow( (HWND) hb_parnl( 1 ), hb_parl( 2 ) ) );
hb_retl( FlashWindow( (HWND) HB_PARWH( 1 ), hb_parl( 2 ) ) );
}
@@ -814,7 +816,7 @@ HB_FUNC( FLASHWINDOW )
#if(WINVER >= 0x0500)
HB_FUNC( ANIMATEWINDOW )
{
hb_retl( AnimateWindow( (HWND) hb_parnl( 1 ) ,
hb_retl( AnimateWindow( (HWND) HB_PARWH( 1 ) ,
(DWORD) hb_parnl( 2 ),
(DWORD) hb_parnl( 3 )
) );
@@ -827,7 +829,7 @@ HB_FUNC( GETWINDOWPLACEMENT )
{
WINDOWPLACEMENT wndpl ;
wndpl.length=sizeof(WINDOWPLACEMENT);
if ( GetWindowPlacement( (HWND) hb_parnl( 1 ), &wndpl ) )
if ( GetWindowPlacement( (HWND) HB_PARWH( 1 ), &wndpl ) )
hb_retclen( ( char *) &wndpl, sizeof(WINDOWPLACEMENT) );
}
@@ -842,7 +844,7 @@ HB_FUNC( SETWINDOWPLACEMENT )
WINDOWPLACEMENT * lpwndpl = (WINDOWPLACEMENT *) hb_parc( 2 ); //hb_param( 2,HB_IT_STRING )->item.asString.value;
hb_retl( SetWindowPlacement( (HWND) hb_parnl( 1 ), lpwndpl ) );
hb_retl( SetWindowPlacement( (HWND) HB_PARWH( 1 ), lpwndpl ) );
}
#endif
@@ -851,8 +853,8 @@ HB_FUNC( SETWINDOWPLACEMENT )
HB_FUNC( SETWINDOWRGN )
{
hb_retni( SetWindowRgn( (HWND) hb_parnl( 1 ),
(HRGN) hb_parnl( 2 ),
hb_retni( SetWindowRgn( (HWND) HB_PARWH( 1 ),
(HRGN) HB_PARWH( 2 ),
hb_parl( 3 )
) );
}
@@ -862,7 +864,7 @@ HB_FUNC( SETWINDOWRGN )
HB_FUNC( GETWINDOWRGN )
{
hb_retni( GetWindowRgn( (HWND) hb_parnl( 1 ), (HRGN) hb_parnl( 2 ) ) );
hb_retni( GetWindowRgn( (HWND) HB_PARWH( 1 ), (HRGN) HB_PARWH( 2 ) ) );
}
@@ -872,9 +874,9 @@ HB_FUNC( GETWINDOWRGN )
HB_FUNC( SETPROP )
{
hb_retl( SetProp( (HWND) hb_parnl( 1 ) ,
hb_retl( SetProp( (HWND) HB_PARWH( 1 ) ,
(LPCSTR) hb_parcx( 2 ) ,
(HANDLE) hb_parnl( 3 )
(HANDLE) HB_PARWH( 3 )
) );
}
@@ -883,7 +885,7 @@ HB_FUNC( SETPROP )
HB_FUNC( GETPROP )
{
hb_retnl( (LONG) GetProp( (HWND) hb_parnl( 1 ), (LPCSTR) hb_parcx( 2 ) ) );
HB_RETWH( GetProp( (HWND) HB_PARWH( 1 ), (LPCSTR) hb_parcx( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -891,7 +893,7 @@ HB_FUNC( GETPROP )
HB_FUNC( REMOVEPROP )
{
hb_retnl( (LONG) RemoveProp( (HWND) hb_parnl( 1 ), (LPCSTR) hb_parcx( 2 ) ) );
HB_RETWH( RemoveProp( (HWND) HB_PARWH( 1 ), (LPCSTR) hb_parcx( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -908,7 +910,7 @@ HB_FUNC( ENUMPROPSEX )
// Your code goes here
hb_retni( EnumPropsEx( (HWND) hb_parnl( 1 ) ,
hb_retni( EnumPropsEx( (HWND) HB_PARWH( 1 ) ,
lpEnumFunc ,
(LPARAM) hb_parnl( 3 )
) );
@@ -928,7 +930,7 @@ HB_FUNC( ENUMPROPS )
// Your code goes here
hb_retni( EnumProps( (HWND) hb_parnl( 1 ), lpEnumFunc ) );
hb_retni( EnumProps( (HWND) HB_PARWH( 1 ), lpEnumFunc ) );
}
*/
@@ -1005,7 +1007,7 @@ HB_FUNC( ADJUSTWINDOWRECTEX )
HB_FUNC( GETWINDOWLONGPTR )
{
hb_retptr( ( void * ) GetWindowLongPtr( (HWND) hb_parnl( 1 ), hb_parni( 2 ) ) );
hb_retptr( ( void * ) GetWindowLongPtr( (HWND) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -1013,7 +1015,7 @@ HB_FUNC( GETWINDOWLONGPTR )
HB_FUNC( SETWINDOWLONGPTR )
{
hb_retnl( (LONG) SetWindowLongPtr( (HWND) hb_parnl( 1 ),
hb_retnl( (LONG) SetWindowLongPtr( (HWND) HB_PARWH( 1 ),
hb_parni( 2 ) ,
ISPOINTER( 3 ) ? (LONG_PTR) hb_parptr( 3 ) : (LONG_PTR) hb_parnl( 3 )
) );
@@ -1024,7 +1026,7 @@ HB_FUNC( SETWINDOWLONGPTR )
#ifndef __WATCOMC__
HB_FUNC( GETCLASSLONGPTR )
{
hb_retnl((ULONG_PTR) GetClassLongPtr( (HWND) hb_parnl( 1 ), hb_parni( 2 ) ) );
hb_retnl((ULONG_PTR) GetClassLongPtr( (HWND) HB_PARWH( 1 ), hb_parni( 2 ) ) );
}
//-----------------------------------------------------------------------------
@@ -1032,7 +1034,7 @@ HB_FUNC( GETCLASSLONGPTR )
HB_FUNC( SETCLASSLONGPTR )
{
hb_retnl( (ULONG_PTR) SetClassLongPtr( (HWND) hb_parnl( 1 ), hb_parni( 2 ), (LONG_PTR) hb_parnl(3) ) );
hb_retnl( (ULONG_PTR) SetClassLongPtr( (HWND) HB_PARWH( 1 ), hb_parni( 2 ), (LONG_PTR) hb_parnl(3) ) );
}
#endif
@@ -1045,7 +1047,7 @@ HB_FUNC( GETWINDOWINFO )
{
WINDOWINFO pwi ;
if ( GetWindowInfo( (HWND) hb_parnl( 1 ), &pwi ) )
if ( GetWindowInfo( (HWND) HB_PARWH( 1 ), &pwi ) )
hb_retclen( (char *) &pwi, sizeof( WINDOWINFO) );
@@ -1062,7 +1064,7 @@ HB_FUNC( GETTITLEBARINFO )
{
TITLEBARINFO pti ;
if ( GetTitleBarInfo( (HWND) hb_parnl( 1 ), &pti ) )
if ( GetTitleBarInfo( (HWND) HB_PARWH( 1 ), &pti ) )
hb_retclen( (char *) &pti, sizeof(TITLEBARINFO) );
}
@@ -1082,7 +1084,7 @@ HB_FUNC( ENUMCHILDWINDOWS )
// Your code goes here
hb_retl( EnumChildWindows( (HWND) hb_parnl( 1 ) ,
hb_retl( EnumChildWindows( (HWND) HB_PARWH( 1 ) ,
lpEnumFunc ,
(LPARAM) hb_parnl( 3 )
) );
@@ -1113,7 +1115,7 @@ HB_FUNC( ENUMWINDOWS )
/*
HB_FUNC( REALGETWINDOWCLASS )
{
hb_retni( RealGetWindowClass( (HWND) hb_parnl( 1 ),
hb_retni( RealGetWindowClass( (HWND) HB_PARWH( 1 ),
(LPSTR) hb_parcx( 2 ),
(UINT) hb_parni( 3 )
) );
@@ -1132,7 +1134,7 @@ HB_FUNC( REALCHILDWINDOWFROMPOINT )
POINT ptParentClientCoords ;
Array2Point( hb_param( 2 , HB_IT_ARRAY) , &ptParentClientCoords );
hb_retnl( (LONG) RealChildWindowFromPoint( (HWND) hb_parnl( 1 ),
HB_RETWH( RealChildWindowFromPoint( (HWND) HB_PARWH( 1 ),
ptParentClientCoords
) );
@@ -1152,11 +1154,11 @@ HB_FUNC( SETWINDOWEXTEX )
SIZE lpSize ;
PHB_ITEM pArray;
if( SetWindowExtEx( (HDC) hb_parnl( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
&lpSize
) >0)
if( SetWindowExtEx( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ),
hb_parni( 3 ),
&lpSize
) > 0 )
{
pArray = Size2Array(&lpSize);
@@ -1179,11 +1181,11 @@ HB_FUNC( SETWINDOWORGEX )
POINT lpPoint ;
PHB_ITEM pArray;
if( SetWindowOrgEx( (HDC) hb_parnl( 1 ),
hb_parni( 2 ) ,
hb_parni( 3 ) ,
&lpPoint
) >0)
if( SetWindowOrgEx( (HDC) HB_PARWH( 1 ),
hb_parni( 2 ),
hb_parni( 3 ),
&lpPoint
) > 0 )
{
pArray = Point2Array(&lpPoint);
@@ -1209,12 +1211,12 @@ HB_FUNC( SETWINDOWORGEX )
HB_FUNC( CREATEMDICLIENT )
{
HWND hwndClient;
HWND hFrame = (HWND) hb_parnl(1);
HWND hFrame = (HWND) HB_PARWH(1);
CLIENTCREATESTRUCT clientCreate ;
clientCreate.hWindowMenu = (HMENU)hb_parnl(2);
clientCreate.hWindowMenu = (HMENU)HB_PARWH(2);
clientCreate.idFirstChild = (INT)hb_parni(3);
hwndClient = CreateWindowEx(WS_EX_CLIENTEDGE,"MDICLIENT", NULL,WS_CHILD|WS_CLIPSIBLINGS|WS_VISIBLE,hb_parni(4), hb_parni(5), hb_parni(6), hb_parni(7), (HWND)hFrame,0,GetModuleHandle(NULL),&clientCreate);
hb_retnl((LONG)hwndClient);
HB_RETWH( hwndClient );
}
//-----------------------------------------------------------------------------
@@ -1223,7 +1225,7 @@ HB_FUNC( CREATEMDICLIENT )
HB_FUNC( SETMINMAXINFO )
{
MINMAXINFO *mmi = (MINMAXINFO *) hb_parnl(1);
MINMAXINFO *mmi = (MINMAXINFO *) HB_PARWH(1);
POINT pt ;
pt.x = hb_parni( 3, 1 );
@@ -1321,5 +1323,5 @@ HB_FUNC( LOCKSETFOREGROUNDWINDOW )
*/
HB_FUNC( LOCKWINDOWUPDATE )
{
hb_retl( LockWindowUpdate( (HWND) hb_parnl( 1 ) ) );
hb_retl( LockWindowUpdate( (HWND) HB_PARWH( 1 ) ) );
}

48
harbour/contrib/hbwhat32/wincorec.c
View File

@@ -16,6 +16,8 @@
#define _WIN32_WINNT 0x0400
#include "hbwhat.h"
#include <windows.h>
#include <shlobj.h>
//#include <commctrl.h>
@@ -57,10 +59,10 @@ HB_FUNC( _REGISTERCLASS )
wndclass.lpfnWndProc = __WndProc ;
wndclass.cbClsExtra = ( ISNIL(2) ? 0 : hb_parni(2));
wndclass.cbWndExtra = ( ISNIL(3) ? 0 : hb_parni(3));
wndclass.hInstance = ( ISNIL(4) ? GetModuleHandle(NULL) : (HANDLE) hb_parnl(4) );
wndclass.hIcon = ( ISNIL(5) ? LoadIcon(GetModuleHandle(NULL),"") : (HICON) hb_parnl(5) );
wndclass.hCursor = ( ISNIL(6) ? LoadCursor (NULL, IDC_ARROW) : (HCURSOR) hb_parnl(6) );
wndclass.hbrBackground = ( ISNIL(7) ? (INT) COLOR_WINDOW + 1 : (HBRUSH) hb_parnl(7) );
wndclass.hInstance = ( ISNIL(4) ? GetModuleHandle(NULL) : (HANDLE) HB_PARWH(4) );
wndclass.hIcon = ( ISNIL(5) ? LoadIcon(GetModuleHandle(NULL),"") : (HICON) HB_PARWH(5) );
wndclass.hCursor = ( ISNIL(6) ? LoadCursor (NULL, IDC_ARROW) : (HCURSOR) HB_PARWH(6) );
wndclass.hbrBackground = ( ISNIL(7) ? (INT) COLOR_WINDOW + 1 : (HBRUSH) HB_PARWH(7) );
wndclass.lpszMenuName = (LPCSTR) ( !ISNIL(8) ? hb_parc(8) : NULL );
wndclass.lpszClassName = (LPCSTR) hb_parc(9);
*/
@@ -73,7 +75,7 @@ HB_FUNC( _REGISTERCLASS )
HB_FUNC( _UNREGISTERCLASS )
{
HANDLE hInst = ( ISNIL(2) ? GetModuleHandle(NULL) : (HANDLE) hb_parnl(2) );
HANDLE hInst = ( ISNIL(2) ? GetModuleHandle(NULL) : (HANDLE) HB_PARWH(2) );
hb_retl( UnregisterClass( hb_parc(1), (HINSTANCE) hInst ) );
}
@@ -93,16 +95,16 @@ HB_FUNC( _CREATEWINDOWEX )
int y = (ISNIL(6) ? CW_USEDEFAULT : hb_parni(6));
int nWidth = (ISNIL(7) ? CW_USEDEFAULT : hb_parni(7));
int nHeight = (ISNIL(8) ? CW_USEDEFAULT : hb_parni(8));
HWND hWndParent = (ISNIL(9) ? (HWND) NULL : (HWND) hb_parnl(9));
HMENU hMenu = (ISNIL(10) ? (HMENU) NULL : (HMENU) hb_parni(10));
HANDLE hInstance = (ISNIL(11) ? GetModuleHandle( NULL ) : (HANDLE) hb_parnl(11));
LPVOID lParam = (ISNIL(12) ? NULL : (LPVOID) hb_parnl(12));
HWND hWndParent = (ISNIL(9) ? (HWND) NULL : (HWND) HB_PARWH(9));
HMENU hMenu = (ISNIL(10) ? (HMENU) NULL : (HMENU) HB_PARWH(10));
HANDLE hInstance = (ISNIL(11) ? GetModuleHandle( NULL ) : (HANDLE) HB_PARWH(11));
LPVOID lParam = (ISNIL(12) ? NULL : (LPVOID) HB_PARWH(12));
HWND hWnd = CreateWindowEx( dwExStyle, cClass, cTitle,
nStyle, x, y, nWidth, nHeight,
hWndParent, hMenu, (HINSTANCE) hInstance, lParam ) ;
hb_retnl( (LONG) hWnd );
HB_RETWH( hWnd );
}
//-----------------------------------------------------------------------------
@@ -118,14 +120,14 @@ HB_FUNC( _CREATEMDIWINDOW )
int y = (ISNIL(5) ? CW_USEDEFAULT : hb_parni(5));
int nWidth = (ISNIL(6) ? CW_USEDEFAULT : hb_parni(6));
int nHeight = (ISNIL(7) ? CW_USEDEFAULT : hb_parni(7));
HWND hWndParent = (ISNIL(8) ? (HWND) NULL : (HWND) hb_parnl(8));
HANDLE hInstance = (ISNIL(9) ? GetModuleHandle( NULL ) : (HANDLE) hb_parnl(9));
HWND hWndParent = (ISNIL(8) ? (HWND) NULL : (HWND) HB_PARWH(8));
HANDLE hInstance = (ISNIL(9) ? GetModuleHandle( NULL ) : (HANDLE) HB_PARWH(9));
LPARAM lParam = (ISNIL(10) ? 0 : (LPARAM) hb_parnl(10));
HWND hWnd = CreateMDIWindow( cClass, cTitle,nStyle,
x, y, nWidth, nHeight,
hWndParent, (HINSTANCE) hInstance, lParam );
hb_retnl( (LONG) hWnd );
HB_RETWH( hWnd );
}
@@ -520,9 +522,9 @@ HB_FUNC( _DIALOGBOX )
{
hb_retni( DialogBox( (ISNIL(1) ? GetModuleHandle(NULL) : (HINSTANCE) hb_parnl(1) ) ,
hb_retni( DialogBox( (ISNIL(1) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH(1) ) ,
(hb_parinfo(2)==HB_IT_STRING ? hb_parc(2) : MAKEINTRESOURCE( (WORD) hb_parni(2))) ,
(ISNIL(3) ? NULL : (HWND) hb_parnl(3) ) ,
(ISNIL(3) ? NULL : (HWND) HB_PARWH(3) ) ,
(DLGPROC) hb_parptr(4)
));
@@ -534,9 +536,9 @@ HB_FUNC( _DIALOGBOX )
HB_FUNC( _DIALOGBOXINDIRECT )
{
hb_retni( DialogBoxIndirect( (ISNIL(1) ? GetModuleHandle(NULL) : (HINSTANCE) hb_parnl(1) ),
hb_retni( DialogBoxIndirect( (ISNIL(1) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH(1) ),
(LPDLGTEMPLATE) hb_parc(2),
(ISNIL(3) ? NULL : (HWND) hb_parnl(3) ),
(ISNIL(3) ? NULL : (HWND) HB_PARWH(3) ),
(DLGPROC) hb_parptr(4)
));
}
@@ -547,9 +549,9 @@ HB_FUNC( _DIALOGBOXINDIRECT )
HB_FUNC( _CREATEDIALOG )
{
hb_retnl( (ULONG) CreateDialog( (ISNIL(1) ? GetModuleHandle(NULL) : (HINSTANCE) hb_parnl(1) ),
HB_RETWH( CreateDialog( (ISNIL(1) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH(1) ),
(hb_parinfo(2)==HB_IT_STRING ? hb_parc(2) : MAKEINTRESOURCE( (WORD) hb_parni(2))),
(ISNIL(3) ? NULL : (HWND) hb_parnl(3) ),
(ISNIL(3) ? NULL : (HWND) HB_PARWH(3) ),
(DLGPROC) hb_parptr(4)
) );
}
@@ -559,11 +561,10 @@ HB_FUNC( _CREATEDIALOG )
HB_FUNC( _CREATEDIALOGINDIRECT )
{
hb_retnl(
(ULONG) CreateDialogIndirect(
(ISNIL(1) ? GetModuleHandle(NULL) : (HINSTANCE) hb_parnl(1) ),
HB_RETWH( CreateDialogIndirect(
(ISNIL(1) ? GetModuleHandle(NULL) : (HINSTANCE) HB_PARWH(1) ),
(LPDLGTEMPLATE) hb_parc(2),
(ISNIL(3) ? NULL : (HWND) hb_parnl(3) ),
(ISNIL(3) ? NULL : (HWND) HB_PARWH(3) ),
(DLGPROC) hb_parptr(4)
));
}
@@ -688,5 +689,4 @@ HB_FUNC( _MAKEDLGTEMPLATE )
hb_retclen( (LPSTR) pdlgtemplate, ( (ULONG) p - (ULONG) pdlgtemplate ) );
LocalFree (LocalHandle (pdlgtemplate) );
}