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

2010-03-20 13:07 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/contrib/hbwin/wapi_winuser.c
    * cleaned some code to use wapi_par_*() and wapi_ret_*() macros
    + added WAPI_*() functions to create and manipolate menus (HMENU)
    + added WAPI_CREATEACCELERATORTABLE( <aAccels> ) -> <hAccel>
      and WAPI_DESTROYACCELERATORTABLE( <hAccel> )

  * harbour/contrib/hbwin/hbwin.ch
    + added new constant values for WAPI manu functions
      (WIN_MF_* and WIN_TPM_*)

  * harbour/contrib/hbwin/hbwapi.h
    + added few new wapi_par_*() and wapi_ret_*() macros
    ! fixed wapi_ret_UINT() and wapi_ret_DWORD() macros to not make
      conversion which can create negative values
This commit is contained in:
Przemyslaw Czerpak
2010-03-20 12:07:46 +00:00
parent 5e706af37a
commit bcd9de8158
4 changed files with 480 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

@@ -17,6 +17,22 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-03-20 13:07 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/hbwin/wapi_winuser.c
* cleaned some code to use wapi_par_*() and wapi_ret_*() macros
+ added WAPI_*() functions to create and manipolate menus (HMENU)
+ added WAPI_CREATEACCELERATORTABLE( <aAccels> ) -> <hAccel>
and WAPI_DESTROYACCELERATORTABLE( <hAccel> )
* harbour/contrib/hbwin/hbwin.ch
+ added new constant values for WAPI manu functions
(WIN_MF_* and WIN_TPM_*)
* harbour/contrib/hbwin/hbwapi.h
+ added few new wapi_par_*() and wapi_ret_*() macros
! fixed wapi_ret_UINT() and wapi_ret_DWORD() macros to not make
conversion which can create negative values
2010-03-20 10:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbbz2/Makefile
- contrib/hbbz2/hbbzip2.ch

9
harbour/contrib/hbwin/hbwapi.h
View File

@@ -70,6 +70,8 @@
#define wapi_par_HBRUSH( n ) ( ( HBRUSH ) hb_parptr( n ) )
#define wapi_par_HBITMAP( n ) ( ( HBITMAP ) hb_parptr( n ) )
#define wapi_par_HICON( n ) ( ( HICON ) hb_parptr( n ) )
#define wapi_par_HMENU( n ) ( ( HMENU ) hb_parptr( n ) )
#define wapi_par_HACCEL( n ) ( ( HACCEL ) hb_parptr( n ) )
#define wapi_par_HIMAGELIST( n ) ( ( HIMAGELIST ) hb_parptr( n ) )
#define wapi_par_HFONT( n ) ( ( HFONT ) hb_parptr( n ) )
#define wapi_par_HINSTANCE( n ) ( ( HINSTANCE ) hb_parptr( n ) )
@@ -94,12 +96,15 @@
#define wapi_ret_NINT( i ) ( hb_retnint( i ) )
#define wapi_ret_NI( i ) ( hb_retni( i ) )
#define wapi_ret_L( b ) ( hb_retl( b ? HB_TRUE : HB_FALSE ) )
#define wapi_ret_UINT( n ) ( hb_retni( n ) )
#define wapi_ret_UINT( n ) ( hb_retnint( n ) )
#define wapi_ret_LONG( n ) ( hb_retnl( n ) )
#define wapi_ret_WORD( n ) ( hb_retnl( n ) )
#define wapi_ret_DWORD( n ) ( hb_retnl( n ) )
#define wapi_ret_DWORD( n ) ( hb_retnint( n ) )
#define wapi_ret_HANDLE( h ) ( hb_retptr( h ) )
#define wapi_ret_HWND( h ) ( hb_retptr( h ) )
#define wapi_ret_HMENU( h ) ( hb_retptr( h ) )
#define wapi_ret_HACCEL( h ) ( hb_retptr( h ) )
#define wapi_ret_HRESULT( hr ) ( hb_retnint( hr ) )
#define wapi_ret_LRESULT( hr ) ( hb_retnint( hr ) )
#define wapi_ret_COLORREF( cr ) ( hb_retnint( cr ) )

47
harbour/contrib/hbwin/hbwin.ch
View File

@@ -493,9 +493,56 @@
#define WIN_IMAGE_CURSOR 2
#define WIN_IMAGE_ENHMETAFILE 3
/* constants for MENU functions */
#define WIN_MF_ENABLED 0x0000
#define WIN_MF_GRAYED 0x0001
#define WIN_MF_DISABLED 0x0002
#define WIN_MF_BITMAP 0x0004
#define WIN_MF_UNCHECKED 0x0000
#define WIN_MF_CHECKED 0x0008
#define WIN_MF_POPUP 0x0010
#define WIN_MF_MENUBARBREAK 0x0020
#define WIN_MF_MENUBREAK 0x0040
#define WIN_MF_OWNERDRAW 0x0100
#define WIN_MF_SEPARATOR 0x0800
#define WIN_MF_STRING 0x0000
#define WIN_MF_DEFAULT 0x1000
#define WIN_MF_SYSMENU 0x2000
#define WIN_MF_HELP 0x4000
#define WIN_MF_END 0x0080
#define WIN_MF_RIGHTJUSTIFY 0x4000
#define WIN_MF_MOUSESELECT 0x8000
#define WIN_MF_INSERT 0x0000
#define WIN_MF_CHANGE 0x0080
#define WIN_MF_APPEND 0x0100
#define WIN_MF_DELETE 0x0200
#define WIN_MF_REMOVE 0x1000
#define WIN_MF_USECHECKBITMAPS 0x0200
#define WIN_MF_UNHILITE 0x0000
#define WIN_MF_HILITE 0x0080
#define WIN_MF_BYCOMMAND 0x0000
#define WIN_MF_BYPOSITION 0x0400
/* TrackPopupMenu() */
#define WIN_TPM_CENTERALIGN 4
#define WIN_TPM_LEFTALIGN 0
#define WIN_TPM_RIGHTALIGN 8
#define WIN_TPM_LEFTBUTTON 0
#define WIN_TPM_RIGHTBUTTON 2
#define WIN_TPM_HORIZONTAL 0
#define WIN_TPM_VERTICAL 64
#define WIN_TPM_TOPALIGN 0
#define WIN_TPM_VCENTERALIGN 16
#define WIN_TPM_BOTTOMALIGN 32
#define WIN_TPM_NONOTIFY 128
#define WIN_TPM_RETURNCMD 256
#define WIN_TPM_RECURSE 1
/* window messages WM_* */
#define WIN_WM_USER 1024
/* ------------------------------- */
/* Deprecated constants and macros */
/* ------------------------------- */

451
harbour/contrib/hbwin/wapi_winuser.c
View File

@@ -61,28 +61,31 @@
HB_FUNC( WAPI_GETSYSTEMMETRICS )
{
int iResult = GetSystemMetrics( hb_parni( 1 ) );
int iResult = GetSystemMetrics( wapi_par_INT( 1 ) );
hbwapi_SetLastError( GetLastError() );
hb_retni( iResult );
wapi_ret_NI( iResult );
}
HB_FUNC( WAPI_GETKEYSTATE )
{
hb_retni( GetKeyState( hb_parni( 1 ) ) );
wapi_ret_NI( GetKeyState( wapi_par_INT( 1 ) ) );
}
HB_FUNC( WAPI_GETDESKTOPWINDOW )
{
hb_retptr( GetDesktopWindow() );
wapi_ret_HWND( GetDesktopWindow() );
}
HB_FUNC( WAPI_MESSAGEBOX )
{
void * hStr1;
void * hStr2;
int iResult = MessageBox( ( HWND ) hb_parptr( 1 ), HB_PARSTR( 2, &hStr1, NULL ), HB_PARSTR( 3, &hStr2, NULL ), hb_parni( 4 ) );
int iResult = MessageBox( wapi_par_HWND( 1 ),
HB_PARSTR( 2, &hStr1, NULL ),
HB_PARSTR( 3, &hStr2, NULL ),
wapi_par_INT( 4 ) );
hbwapi_SetLastError( GetLastError() );
hb_retni( iResult );
wapi_ret_NI( iResult );
hb_strfree( hStr1 );
hb_strfree( hStr2 );
}
@@ -93,21 +96,21 @@ HB_FUNC( WAPI_CREATEWINDOWEX )
void * hWindowName;
HWND hResult = CreateWindowEx(
( DWORD ) hb_parnl( 1 ) /* dwExStyle */,
wapi_par_DWORD( 1 ), /* dwExStyle */
HB_PARSTRDEF( 2, &hClassName, NULL ),
HB_PARSTRDEF( 3, &hWindowName, NULL ),
HB_ISNUM( 4 ) ? ( DWORD ) hb_parnl( 4 ) : WS_OVERLAPPEDWINDOW /* dwStyle */,
HB_ISNUM( 5 ) ? ( int ) hb_parni( 5 ) : ( int ) CW_USEDEFAULT /* x */,
HB_ISNUM( 6 ) ? ( int ) hb_parni( 6 ) : ( int ) CW_USEDEFAULT /* y */,
( int ) hb_parni( 7 ) /* nWidth */,
( int ) hb_parni( 8 ) /* nHeight */,
HB_ISPOINTER( 9 ) ? ( HWND ) hb_parptr( 9 ) : HWND_DESKTOP /* hWndParent */,
( HMENU ) hb_parptr( 10 ) /* hMenu */,
( HINSTANCE ) hb_parptr( 11 ) /* hInstance */,
( LPVOID ) hb_parptr( 12 ) /* lpParam */ );
HB_ISNUM( 4 ) ? wapi_par_DWORD( 4 ) : WS_OVERLAPPEDWINDOW, /* dwStyle */
HB_ISNUM( 5 ) ? wapi_par_INT( 5 ) : ( int ) CW_USEDEFAULT, /* x */
HB_ISNUM( 6 ) ? wapi_par_INT( 6 ) : ( int ) CW_USEDEFAULT, /* y */
wapi_par_INT( 7 ), /* nWidth */
wapi_par_INT( 8 ), /* nHeight */
wapi_par_HWND( 9 ), /* hWndParent, default to HWND_DESKTOP */
wapi_par_HMENU( 10 ), /* hMenu */
wapi_par_HINSTANCE( 11 ), /* hInstance */
( LPVOID ) hb_parptr( 12 ) /* lpParam */ );
hbwapi_SetLastError( GetLastError() );
hb_retptr( hResult );
wapi_ret_HWND( hResult );
hb_strfree( hClassName );
hb_strfree( hWindowName );
@@ -115,9 +118,9 @@ HB_FUNC( WAPI_CREATEWINDOWEX )
HB_FUNC( WAPI_DESTROYWINDOW )
{
BOOL bResult = DestroyWindow( ( HWND ) hb_parptr( 1 ) );
BOOL bResult = DestroyWindow( wapi_par_HWND( 1 ) );
hbwapi_SetLastError( GetLastError() );
hb_retl( bResult );
wapi_ret_L( bResult );
}
HB_FUNC( WAPI_DRAWTEXT )
@@ -131,11 +134,11 @@ HB_FUNC( WAPI_DRAWTEXT )
HB_SIZE nTextLen;
LPCTSTR lpText = HB_PARSTR( 2, &hText, &nTextLen );
hb_retni( DrawText( hDC,
lpText,
nTextLen,
&rect,
( UINT ) hb_parni( 4 ) ) );
wapi_ret_NI( DrawText( hDC,
lpText,
nTextLen,
&rect,
wapi_par_UINT( 4 ) ) );
hb_strfree( hText );
@@ -368,14 +371,23 @@ HB_FUNC( WAPI_SHOWSCROLLBAR )
wapi_ret_L( bResult );
}
/*----------------------------------------------------------------------*/
/*
HWND SetFocus( HWND hWnd );
*/
HB_FUNC( WAPI_SETFOCUS )
{
HWND hResult = SetFocus( wapi_par_HWND( 1 ) );
HWND hWnd = SetFocus( wapi_par_HWND( 1 ) );
hbwapi_SetLastError( GetLastError() );
wapi_ret_HANDLE( hResult );
wapi_ret_HWND( hWnd );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WAPI_GETACTIVEWINDOW )
{
wapi_ret_HWND( GetActiveWindow() );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WAPI_SETACTIVEWINDOW )
{
HWND hWnd = SetActiveWindow( wapi_par_HWND( 1 ) );
hbwapi_SetLastError( GetLastError() );
wapi_ret_HWND( hWnd );
}
/*----------------------------------------------------------------------*/
#if 0
@@ -392,18 +404,6 @@ HB_FUNC( WAPI_LOADBITMAP )
}
#endif
/*----------------------------------------------------------------------*/
HB_FUNC( WAPI_GETACTIVEWINDOW )
{
hb_retptr( GetActiveWindow() );
}
/*----------------------------------------------------------------------*/
HB_FUNC( WAPI_SETACTIVEWINDOW )
{
HWND hResult = SetActiveWindow( wapi_par_HWND( 1 ) );
hbwapi_SetLastError( GetLastError() );
hb_retptr( hResult );
}
/*----------------------------------------------------------------------*/
/* WAPI_LoadImage( [<hInstance>], <cName>, [<nType>],
[<nWidth>], [<nHeight>], [<nFlags>] ) -> <hImage> */
HB_FUNC( WAPI_LOADIMAGE )
@@ -418,6 +418,375 @@ HB_FUNC( WAPI_LOADIMAGE )
wapi_par_INT( 4 ), // desired width
wapi_par_INT( 5 ), // desired height
wapi_par_UINT( 6 ) ); // load flags
hbwapi_SetLastError( GetLastError() );
hb_strfree( hString );
wapi_ret_HANDLE( hImage );
}
/*
* MENU functions
*/
HB_FUNC( WAPI_LOADMENU )
{
void * hMenuName = NULL;
HMENU hMenu;
hMenu = LoadMenu( wapi_par_HINSTANCE( 1 ),
HB_ISNUM( 2 ) ?
( LPTSTR ) MAKEINTRESOURCE( wapi_par_INT( 2 ) ) :
HB_PARSTRDEF( 2, &hMenuName, NULL ) );
hbwapi_SetLastError( GetLastError() );
hb_strfree( hMenuName );
wapi_ret_HMENU( hMenu );
}
HB_FUNC( WAPI_CREATEMENU )
{
HMENU hMenu = CreateMenu();
hbwapi_SetLastError( GetLastError() );
wapi_ret_HMENU( hMenu );
}
HB_FUNC( WAPI_CREATEPOPUPMENU )
{
HMENU hMenu = CreatePopupMenu();
hbwapi_SetLastError( GetLastError() );
wapi_ret_HMENU( hMenu );
}
HB_FUNC( WAPI_DESTROYMENU )
{
BOOL fResult = DestroyMenu( wapi_par_HMENU( 1 ) );
hbwapi_SetLastError( GetLastError() );
wapi_ret_L( fResult );
}
HB_FUNC( WAPI_GETSYSTEMMENU )
{
HWND hWnd = wapi_par_HWND( 1 );
HMENU hMenu = GetSystemMenu( hWnd ? hWnd : GetActiveWindow(),
wapi_par_BOOL( 2 ) );
hbwapi_SetLastError( GetLastError() );
wapi_ret_HMENU( hMenu );
}
HB_FUNC( WAPI_GETSUBMENU )
{
HMENU hMenu = GetSubMenu( wapi_par_HMENU( 1 ), wapi_par_INT( 2 ) );
hbwapi_SetLastError( GetLastError() );
wapi_ret_HMENU( hMenu );
}
HB_FUNC( WAPI_DRAWMENUBAR )
{
HWND hWnd = wapi_par_HWND( 1 );
BOOL fResult = DrawMenuBar( hWnd ? hWnd : GetActiveWindow() );
hbwapi_SetLastError( GetLastError() );
wapi_ret_L( fResult );
}
HB_FUNC( WAPI_TRACKPOPUPMENU )
{
HWND hWnd = wapi_par_HWND( 6 );
UINT uiResult;
uiResult = TrackPopupMenu( wapi_par_HMENU( 1 ), /* hMenu */
wapi_par_UINT( 2 ), /* uFlags */
wapi_par_INT( 3 ), /* x */
wapi_par_INT( 4 ), /* y */
wapi_par_INT( 5 ), /* nReserved */
hWnd ? hWnd : GetActiveWindow(), /* hWnd */
NULL /* prcRect */ );
hbwapi_SetLastError( GetLastError() );
wapi_ret_UINT( uiResult );
}
HB_FUNC( WAPI_ENABLEMENUITEM )
{
int iResult;
iResult = EnableMenuItem( wapi_par_HMENU( 1 ),
wapi_par_UINT( 2 ), wapi_par_UINT( 3 ) );
hbwapi_SetLastError( GetLastError() );
wapi_ret_NI( iResult );
}
HB_FUNC( WAPI_CHECKMENUITEM )
{
DWORD dwResult;
dwResult = CheckMenuItem( wapi_par_HMENU( 1 ),
wapi_par_UINT( 2 ), wapi_par_UINT( 3 ) );
hbwapi_SetLastError( GetLastError() );
if( dwResult == ( DWORD ) -1 )
wapi_ret_NI( -1 );
else
wapi_ret_DWORD( dwResult );
}
HB_FUNC( WAPI_CHECKMENURADIOITEM )
{
BOOL fResult;
fResult = CheckMenuRadioItem( wapi_par_HMENU( 1 ), /* hMenu */
wapi_par_UINT( 2 ), /* idFirst */
wapi_par_UINT( 3 ), /* idLast */
wapi_par_UINT( 4 ), /* idCheck */
wapi_par_UINT( 5 ) /* uFlags */ );
hbwapi_SetLastError( GetLastError() );
wapi_ret_L( fResult );
}
HB_FUNC( WAPI_DELETEMENU )
{
BOOL fResult;
fResult = DeleteMenu( wapi_par_HMENU( 1 ),
wapi_par_UINT( 2 ), wapi_par_UINT( 3 ) );
hbwapi_SetLastError( GetLastError() );
wapi_ret_L( fResult );
}
HB_FUNC( WAPI_REMOVEMENU )
{
BOOL fResult;
fResult = RemoveMenu( wapi_par_HMENU( 1 ),
wapi_par_UINT( 2 ), wapi_par_UINT( 3 ) );
hbwapi_SetLastError( GetLastError() );
wapi_ret_L( fResult );
}
HB_FUNC( WAPI_INSERTMENU )
{
BOOL fResult;
HMENU hMenu = wapi_par_HMENU( 1 ),
hSubMenu = wapi_par_HMENU( 4 );
UINT uPosition = wapi_par_UINT( 2 ),
uFlags = wapi_par_UINT( 3 );
HB_PTRUINT uIDNewItem;
void * hNewItemStr;
LPCTSTR lpNewItem = HB_PARSTR( 5, &hNewItemStr, NULL );
if( hSubMenu )
{
uFlags |= MF_POPUP;
uIDNewItem = ( HB_PTRUINT ) hSubMenu;
}
else
uIDNewItem = HB_ISPOINTER( 4 ) ? ( HB_PTRUINT ) hb_parptr( 4 ) :
( HB_PTRUINT ) hb_parnint( 4 );
if( lpNewItem )
uFlags |= MF_STRING;
else
lpNewItem = ( LPCTSTR ) hb_parptr( 5 );
fResult = InsertMenu( hMenu, uPosition, uFlags, uIDNewItem, lpNewItem );
hbwapi_SetLastError( GetLastError() );
wapi_ret_L( fResult );
hb_strfree( hNewItemStr );
}
HB_FUNC( WAPI_APPENDMENU )
{
BOOL fResult;
HMENU hMenu = wapi_par_HMENU( 1 ),
hSubMenu = wapi_par_HMENU( 3 );
UINT uFlags = wapi_par_UINT( 2 );
HB_PTRUINT uIDNewItem;
void * hNewItemStr;
LPCTSTR lpNewItem = HB_PARSTR( 4, &hNewItemStr, NULL );
if( hSubMenu )
{
uFlags |= MF_POPUP;
uIDNewItem = ( HB_PTRUINT ) hSubMenu;
}
else
uIDNewItem = HB_ISPOINTER( 3 ) ? ( HB_PTRUINT ) hb_parptr( 3 ) :
( HB_PTRUINT ) hb_parnint( 3 );
if( lpNewItem )
uFlags |= MF_STRING;
else
lpNewItem = ( LPCTSTR ) hb_parptr( 4 );
fResult = AppendMenu( hMenu, uFlags, uIDNewItem, lpNewItem );
hbwapi_SetLastError( GetLastError() );
wapi_ret_L( fResult );
hb_strfree( hNewItemStr );
}
#if 0
HB_FUNC( WAPI_GETMENUITEMINFO )
{
/* GetMenuItemInfo(); */
}
HB_FUNC( WAPI_SETMENUITEMINFO )
{
/* SetMenuItemInfo(); */
}
#endif
HB_FUNC( WAPI_ISMENU )
{
#if defined( HB_OS_WIN_CE )
hbwapi_SetLastError( ERROR_INVALID_FUNCTION );
wapi_ret_L( FALSE );
#else
wapi_ret_L( IsMenu( wapi_par_HMENU( 1 ) ) );
#endif
}
HB_FUNC( WAPI_GETMENU )
{
#if defined( HB_OS_WIN_CE )
hbwapi_SetLastError( ERROR_INVALID_FUNCTION );
wapi_ret_HMENU( NULL );
#else
HWND hWnd = wapi_par_HWND( 1 );
HMENU hMenu = GetMenu( hWnd ? hWnd : GetActiveWindow() );
hbwapi_SetLastError( GetLastError() );
wapi_ret_HMENU( hMenu );
#endif
}
HB_FUNC( WAPI_SETMENU )
{
#if defined( HB_OS_WIN_CE )
hbwapi_SetLastError( ERROR_INVALID_FUNCTION );
wapi_ret_L( FALSE );
#else
HWND hWnd = wapi_par_HWND( 1 );
BOOL fResult = SetMenu( hWnd ? hWnd : GetActiveWindow(),
wapi_par_HMENU( 2 ) );
hbwapi_SetLastError( GetLastError() );
wapi_ret_L( fResult );
#endif
}
HB_FUNC( WAPI_GETMENUSTATE )
{
#if defined( HB_OS_WIN_CE )
hbwapi_SetLastError( ERROR_INVALID_FUNCTION );
wapi_ret_NI( -1 );
#else
UINT uiResult;
uiResult = GetMenuState( wapi_par_HMENU( 1 ),
wapi_par_UINT( 2 ),
wapi_par_UINT( 3 ) );
hbwapi_SetLastError( GetLastError() );
if( uiResult == ( UINT ) -1 )
wapi_ret_NI( -1 );
else
wapi_ret_UINT( uiResult );
#endif
}
HB_FUNC( WAPI_GETMENUITEMCOUNT )
{
#if defined( HB_OS_WIN_CE )
hbwapi_SetLastError( ERROR_INVALID_FUNCTION );
wapi_ret_NI( -1 );
#else
int iResult;
iResult = GetMenuItemCount( wapi_par_HMENU( 1 ) );
hbwapi_SetLastError( GetLastError() );
wapi_ret_NI( iResult );
#endif
}
HB_FUNC( WAPI_GETMENUITEMID )
{
#if defined( HB_OS_WIN_CE )
hbwapi_SetLastError( ERROR_INVALID_FUNCTION );
wapi_ret_NI( -1 );
#else
UINT uiResult;
uiResult = GetMenuItemID( wapi_par_HMENU( 1 ), wapi_par_UINT( 2 ) );
hbwapi_SetLastError( GetLastError() );
if( uiResult == ( UINT ) -1 )
wapi_ret_NI( -1 );
else
wapi_ret_UINT( uiResult );
#endif
}
HB_FUNC( WAPI_SETMENUDEFAULTITEM )
{
#if defined( HB_OS_WIN_CE )
hbwapi_SetLastError( ERROR_INVALID_FUNCTION );
wapi_ret_L( FALSE );
#else
BOOL fResult;
fResult = SetMenuDefaultItem( wapi_par_HMENU( 1 ),
wapi_par_UINT( 2 ),
HB_ISNUM( 3 ) ? wapi_par_INT( 3 ) :
wapi_par_BOOL( 3 ) );
hbwapi_SetLastError( GetLastError() );
wapi_ret_L( fResult );
#endif
}
HB_FUNC( WAPI_GETMENUDEFAULTITEM )
{
#if defined( HB_OS_WIN_CE )
hbwapi_SetLastError( ERROR_INVALID_FUNCTION );
wapi_ret_NI( -1 );
#else
UINT uiResult;
uiResult = GetMenuDefaultItem( wapi_par_HMENU( 1 ),
HB_ISNUM( 2 ) ? wapi_par_INT( 2 ) :
wapi_par_BOOL( 2 ),
wapi_par_UINT( 3 ) );
hbwapi_SetLastError( GetLastError() );
if( uiResult == ( UINT ) -1 )
wapi_ret_NI( -1 );
else
wapi_ret_UINT( uiResult );
#endif
}
/* WAPI_CreateAcceleratorTable( <aAccelTable> ) -> <hAccel> */
HB_FUNC( WAPI_CREATEACCELERATORTABLE )
{
HACCEL hAccel = NULL;
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
int iEntries = pArray ? ( int ) hb_arrayLen( pArray ) : 0, i;
if( iEntries > 0 )
{
LPACCEL lpAccel = ( LPACCEL ) hb_xgrab( sizeof( ACCEL ) * iEntries );
for( i = 0; i < iEntries; ++i )
{
PHB_ITEM pAccItem = hb_arrayGetItemPtr( pArray, i + 1 );
lpAccel[ i ].fVirt = ( BYTE ) hb_arrayGetNI( pAccItem, 1 );
lpAccel[ i ].key = ( WORD ) hb_arrayGetNI( pAccItem, 2 );
lpAccel[ i ].cmd = ( WORD ) hb_arrayGetNI( pAccItem, 3 );
}
hAccel = CreateAcceleratorTable( lpAccel, iEntries );
hbwapi_SetLastError( GetLastError() );
hb_xfree( lpAccel );
}
else
hbwapi_SetLastError( ERROR_INVALID_PARAMETER );
wapi_ret_HACCEL( hAccel );
}
HB_FUNC( WAPI_DESTROYACCELERATORTABLE )
{
BOOL fResult = DestroyAcceleratorTable( wapi_par_HACCEL( 1 ) );
hbwapi_SetLastError( GetLastError() );
wapi_ret_L( fResult );
}