* src/vm/runner.c
! Minor to prev.
* include/hbapi.h
* src/vm/extend.c
+ Added hb_parnsize(), hb_retnsize(), hb_stornsize() functions.
; NOTE: These should be used in place of hb_parnl(), hb_retnl(),
hb_stornl() when passing HB_SIZE types.
; TODO: Use them all accross Harbour if they are correct and
after being finalized.
* src/vm/itemapi.c
+ Added hb_itemGetNSize(), hb_itemPutNSize() functions.
* DATETIME stuff in hb_itemGetNL() marked as HB_LEGACY_LEVEL3.
; QUESTION: It's marked as to be deleted in the TODO, so maybe we should
rather delete it.
* include/hbapiitm.h
* src/rtl/filesys.c
+ hb_fsReadAt(), hb_fsWriteAt(): Added support for Win64 HB_SIZE.
; QUESTION: I assume these functions have the purpose of being
atomic seek + read without moving the file pointer,
which means current modification isn't safe. How
can this be solved given Windows doesn't seem to have
64-bit read/write API calls?
! Fixed old copy-paste typos in Windows OVERLAPPED initialization,
where the lines were ended with command instead of semicolon,
they didn't cause any harm though in their former location.
% Reverted a minor change from prev commit to make it
possibly a little bit faster, like it was before.
* src/rtl/hbzlib.c
+ Added casts (at external interface calls) and other fixes to
make it build for Win64 without warnings.
* src/rdd/dbfntx/dbfntx1.c
* src/rdd/dbfnsx/dbfnsx1.c
* src/rdd/dbfcdx/dbfcdx1.c
* src/rdd/dbffpt/dbffpt1.c
* contrib/rddbmcdx/bmdbfcdx.c
* HB_ULONG -> HB_SIZE where appropriate to avoid Win64 errors
and some warnings. I'm still not comfortable to touch this
code, but it could certainly need a type cleanup.
* include/hbdefs.h
+ Added HB_PFS macro which holds the printf() format string
for HB_SIZE value.
; TODO: Use it all accross Harbour.
* contrib/hbmysql/mysql.c
* contrib/sddmy/sddmy.c
* contrib/hbmzip/hbmzip.c
* contrib/hbcurl/hbcurl.c
* contrib/hbhpdf/harupdf.c
* contrib/hbpgsql/postgres.c
* contrib/rddads/adsfunc.c
* contrib/rddads/ads1.c
* contrib/hbfimage/fi_wrp.c
* contrib/sddodbc/sddodbc.c
* contrib/hbgd/gdwrp.c
* contrib/hbwin/wapi_wingdi.c
* contrib/hbwin/wapi_winbase.c
* contrib/hbwin/wapi_winuser.c
* contrib/hbwin/win_bmp.c
* contrib/hbwin/win_prn1.c
* contrib/hbwin/win_regc.c
* contrib/hbssl/evpciph.c
* contrib/hbssl/ssl.c
* contrib/hbssl/bio.c
* contrib/hbssl/sslctx.c
* contrib/hbssl/evpenc.c
* contrib/hbssl/pem.c
* contrib/hbssl/rand.c
* contrib/hbssl/evp.c
+ Added necessary casts at external component boundaries to
make Win64 builds warning-free.
* contrib/hbct/ctstrfil.c
+ HB_ISIZ -> HB_FOFFSET, hb_fsSeek() usage, other type cleanup
to handle file offsets correctly.
* contrib/xhb/hbnxs.h
* contrib/xhb/hbcrypt.c
! Fixed warnings for Win64.
* contrib/hbwin/win_prn3.c
* contrib/xhb/dbf2txt.c
* contrib/xhb/fparse.c
* int -> HB_ISIZ for Win64.
* contrib/xhb/freadlin.c
* hb_fsSeek() -> hb_fsSeekLarge().
* contrib/sddfb/sddfb.c
* Minor type cleanup to make Win64 warning-free.
* contrib/hbsqlit3/hbsqlit3.c
+ Added necessary casts at external interface calls.
% Deleted one dummy operation from SQLITE3_FILE_TO_BUFF().
* contrib/rddsql/sqlmix.c
* contrib/rddads/adsx.c
* HB_ULONG -> HB_SIZE.
* contrib/gtwvg/gtwvg.c
* contrib/gtwvg/wvggui.c
* contrib/gtwvg/wvgcuig.c
* contrib/gtwvg/wvgwin.c
* contrib/gtwvg/wvgutils.c
* contrib/gtwvg/wvgcore.c
! int -> HB_ISIZ/HB_SIZE
+ Added necessary casts at external component boundaries to
make Win64 warning-free.
* contrib/rddads/ads1.c
* HB_ULONG -> HB_SIZE
* contrib/hbtip/utils.c
* int -> HB_ISIZ
! Fixed to use HB_FOFFSET type to save/restore file position.
* ChangeLog
+ Added missing item to previous log entry:
! Fixed hb_fsCurDirBuff() for Win64.
; It's quite large commit, nevertheless I'd highly appreciate
peer review, and certainly there will be places which need
better or different solution for Win64.
382 lines
11 KiB
C
382 lines
11 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Windows API functions (winbase)
|
|
*
|
|
* Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
|
|
* www - http://harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
#include "hbwapi.h"
|
|
#include "hbapierr.h"
|
|
|
|
/* For SetErrorMode() */
|
|
#if defined( HB_OS_WIN_CE )
|
|
#include "hbwince.h"
|
|
#endif
|
|
|
|
HB_FUNC( WAPI_GETCOMMANDLINE )
|
|
{
|
|
HB_RETSTR( GetCommandLine() );
|
|
}
|
|
|
|
HB_FUNC( WAPI_GETCURRENTPROCESS )
|
|
{
|
|
wapi_ret_HANDLE( GetCurrentProcess() );
|
|
}
|
|
|
|
HB_FUNC( WAPI_GETCURRENTPROCESSID )
|
|
{
|
|
hb_retnint( GetCurrentProcessId() );
|
|
}
|
|
|
|
HB_FUNC( WAPI_GETCURRENTTHREAD )
|
|
{
|
|
wapi_ret_HANDLE( GetCurrentThread() );
|
|
}
|
|
|
|
HB_FUNC( WAPI_WAITFORSINGLEOBJECT )
|
|
{
|
|
DWORD dwResult = WaitForSingleObject( wapi_par_HANDLE( 1 ), ( DWORD ) hb_parnl( 2 ) );
|
|
hbwapi_SetLastError( GetLastError() );
|
|
hb_retnl( dwResult );
|
|
}
|
|
|
|
HB_FUNC( WAPI_WAITFORSINGLEOBJECTEX )
|
|
{
|
|
DWORD dwResult;
|
|
DWORD dwLastError;
|
|
|
|
#if defined( HB_OS_WIN_CE )
|
|
/* WinCE (WinMobile6) does not support
|
|
* WaitFor{Single,Multiple}Object[Ex]() though it supports:
|
|
* MsgWaitFor{Single,Multiple}Object[Ex]()
|
|
*/
|
|
dwResult = 0;
|
|
dwLastError = ERROR_INVALID_FUNCTION;
|
|
#else
|
|
dwResult = WaitForSingleObjectEx( wapi_par_HANDLE( 1 ), ( DWORD ) hb_parnl( 2 ), hb_parl( 3 ) );
|
|
dwLastError = GetLastError();
|
|
#endif
|
|
|
|
hbwapi_SetLastError( dwLastError );
|
|
hb_retnl( dwResult );
|
|
}
|
|
|
|
HB_FUNC( WAPI_WAITFORMULTIPLEOBJECTS )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 2, HB_IT_ARRAY );
|
|
DWORD nCount = pArray ? ( DWORD ) hb_arrayLen( pArray ) : 0;
|
|
|
|
if( nCount > 0 && nCount <= MAXIMUM_WAIT_OBJECTS )
|
|
{
|
|
HANDLE * handles = ( HANDLE * ) hb_xgrab( nCount * sizeof( HANDLE ) );
|
|
DWORD nPos;
|
|
DWORD dwResult;
|
|
|
|
for( nPos = 0; nPos < nCount; ++nPos )
|
|
handles[ nPos ] = hb_arrayGetPtr( pArray, nPos + 1 );
|
|
|
|
dwResult = WaitForMultipleObjects( nCount, handles, hb_parl( 3 ), ( DWORD ) hb_parnl( 4 ) );
|
|
|
|
hbwapi_SetLastError( GetLastError() );
|
|
hb_retnl( dwResult );
|
|
|
|
hb_xfree( handles );
|
|
}
|
|
else
|
|
hb_errRT_BASE( EG_ARG, 1001, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( WAPI_WAITFORMULTIPLEOBJECTSEX )
|
|
{
|
|
#if ! defined( HB_OS_WIN_CE )
|
|
PHB_ITEM pArray = hb_param( 2, HB_IT_ARRAY );
|
|
DWORD nCount = pArray ? ( DWORD ) hb_arrayLen( pArray ) : 0;
|
|
|
|
if( nCount > 0 && nCount <= MAXIMUM_WAIT_OBJECTS )
|
|
{
|
|
HANDLE * handles = ( HANDLE * ) hb_xgrab( nCount * sizeof( HANDLE ) );
|
|
DWORD nPos;
|
|
DWORD dwResult;
|
|
|
|
for( nPos = 0; nPos < nCount; ++nPos )
|
|
handles[ nPos ] = hb_arrayGetPtr( pArray, nPos + 1 );
|
|
|
|
dwResult = WaitForMultipleObjectsEx( nCount, handles, hb_parl( 3 ), ( DWORD ) hb_parnl( 4 ), hb_parl( 5 ) );
|
|
|
|
hbwapi_SetLastError( GetLastError() );
|
|
hb_retnl( dwResult );
|
|
|
|
hb_xfree( handles );
|
|
}
|
|
else
|
|
hb_errRT_BASE( EG_ARG, 1001, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
#else
|
|
/* WinCE (WinMobile6) does not support
|
|
* WaitFor{Single,Multiple}Object[Ex]() though it supports:
|
|
* MsgWaitFor{Single,Multiple}Object[Ex]()
|
|
*/
|
|
hbwapi_SetLastError( ERROR_INVALID_FUNCTION );
|
|
hb_retnl( 0 );
|
|
#endif
|
|
}
|
|
|
|
HB_FUNC( WAPI_SETPROCESSWORKINGSETSIZE )
|
|
{
|
|
BOOL bResult;
|
|
DWORD dwLastError;
|
|
|
|
#if defined( HB_OS_WIN_CE )
|
|
/* WinCE (till WinMobile6) does not support Working Set functions */
|
|
bResult = FALSE;
|
|
dwLastError = ERROR_INVALID_FUNCTION;
|
|
#else
|
|
bResult = SetProcessWorkingSetSize(
|
|
wapi_par_HANDLE( 1 ) /* hProcess */,
|
|
( SIZE_T ) hb_parnint( 2 ) /* dwMinimumWorkingSetSize */,
|
|
( SIZE_T ) hb_parnint( 3 ) /* dwMaximumWorkingSetSize */ );
|
|
dwLastError = GetLastError();
|
|
#endif
|
|
|
|
hbwapi_SetLastError( dwLastError );
|
|
wapi_ret_L( bResult );
|
|
}
|
|
|
|
HB_FUNC( WAPI_GETLASTERROR )
|
|
{
|
|
hb_retnl( ( long ) hbwapi_GetLastError() );
|
|
}
|
|
|
|
HB_FUNC( WAPI_SETLASTERROR )
|
|
{
|
|
DWORD dwLastError = ( DWORD ) hb_parnl( 1 );
|
|
SetLastError( dwLastError );
|
|
hbwapi_SetLastError( dwLastError );
|
|
}
|
|
|
|
HB_FUNC( WAPI_SETERRORMODE )
|
|
{
|
|
hb_retni( SetErrorMode( ( UINT ) hb_parni( 1 ) ) );
|
|
}
|
|
|
|
HB_FUNC( WAPI_LOADLIBRARY )
|
|
{
|
|
void * hFileName;
|
|
HMODULE hResult = LoadLibrary( HB_PARSTRDEF( 1, &hFileName, NULL ) );
|
|
|
|
hbwapi_SetLastError( GetLastError() );
|
|
hb_retptr( hResult );
|
|
|
|
hb_strfree( hFileName );
|
|
}
|
|
|
|
HB_FUNC( WAPI_FREELIBRARY )
|
|
{
|
|
BOOL bResult = FreeLibrary( ( HMODULE ) hb_parptr( 1 ) );
|
|
hbwapi_SetLastError( GetLastError() );
|
|
wapi_ret_L( bResult );
|
|
}
|
|
|
|
HB_FUNC( WAPI_GETPROCADDRESS )
|
|
{
|
|
FARPROC pProc;
|
|
DWORD dwLastError;
|
|
pProc = GetProcAddress( ( HMODULE ) hb_parptr( 1 ), HB_ISCHAR( 2 ) ?
|
|
hb_parc( 2 ) : ( LPCSTR ) ( HB_PTRDIFF ) hb_parnint( 2 ) );
|
|
dwLastError = GetLastError();
|
|
hbwapi_SetLastError( dwLastError );
|
|
hb_retptr( ( void * ) pProc );
|
|
}
|
|
|
|
/* HMODULE WINAPI GetModuleHandle( __in_opt LPCTSTR lpModuleName ); */
|
|
HB_FUNC( WAPI_GETMODULEHANDLE )
|
|
{
|
|
void * hModuleName;
|
|
HMODULE hResult = GetModuleHandle( HB_PARSTR( 1, &hModuleName, NULL ) );
|
|
|
|
hbwapi_SetLastError( GetLastError() );
|
|
wapi_ret_HANDLE( hResult );
|
|
|
|
hb_strfree( hModuleName );
|
|
}
|
|
|
|
/* VOID WINAPI Sleep( __in DWORD dwMilliseconds ); */
|
|
HB_FUNC( WAPI_SLEEP )
|
|
{
|
|
Sleep( ( DWORD ) hb_parnl( 1 ) );
|
|
}
|
|
|
|
HB_FUNC( WAPI_OUTPUTDEBUGSTRING )
|
|
{
|
|
void * hOutputString;
|
|
|
|
OutputDebugString( HB_PARSTR( 1, &hOutputString, NULL ) );
|
|
|
|
hb_strfree( hOutputString );
|
|
}
|
|
|
|
HB_FUNC( WAPI_FORMATMESSAGE )
|
|
{
|
|
void * hSource = NULL;
|
|
void * hBuffer;
|
|
|
|
HB_SIZE nBufferLen;
|
|
|
|
LPTSTR lpBuffer;
|
|
DWORD dwRetVal;
|
|
|
|
( void ) HB_PARSTR( 5, &hBuffer, &nBufferLen );
|
|
|
|
lpBuffer = nBufferLen > 0 ? ( LPTSTR ) hb_xgrab( nBufferLen * sizeof( TCHAR ) ) : NULL;
|
|
|
|
dwRetVal = FormatMessage( ( DWORD ) hb_parnldef( 1, FORMAT_MESSAGE_FROM_SYSTEM ) /* dwFlags */,
|
|
HB_ISCHAR( 2 ) ? ( LPCVOID ) HB_PARSTR( 2, &hSource, NULL ) : hb_parptr( 2 ),
|
|
HB_ISNUM( 3 ) ? ( DWORD ) hb_parnl( 3 ) : GetLastError() /* dwMessageId */,
|
|
( DWORD ) hb_parnldef( 4, MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ) ) /* dwLanguageId */,
|
|
lpBuffer,
|
|
( DWORD ) nBufferLen,
|
|
NULL /* TODO: Add support for this parameter. */ );
|
|
|
|
hbwapi_SetLastError( GetLastError() );
|
|
hb_retnl( dwRetVal );
|
|
|
|
if( lpBuffer )
|
|
{
|
|
HB_STORSTR( dwRetVal ? lpBuffer : NULL, 5 );
|
|
hb_xfree( lpBuffer );
|
|
}
|
|
else
|
|
hb_storc( NULL, 5 );
|
|
|
|
hb_strfree( hSource );
|
|
hb_strfree( hBuffer );
|
|
}
|
|
|
|
HB_FUNC( WAPI_MULDIV )
|
|
{
|
|
hb_retni( MulDiv( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) );
|
|
}
|
|
|
|
#if !defined( HB_OS_WIN_CE )
|
|
|
|
/* WinCE does not support GetShortPathName()/GetLongPathName() functions */
|
|
|
|
typedef DWORD ( WINAPI * _HB_GETPATHNAME ) ( LPCTSTR, LPTSTR, DWORD );
|
|
|
|
static void s_getPathName( _HB_GETPATHNAME getPathName )
|
|
{
|
|
void * hLongPath;
|
|
DWORD length = 0;
|
|
LPCTSTR lpszLongPath = HB_PARSTR( 1, &hLongPath, NULL );
|
|
|
|
if( lpszLongPath )
|
|
{
|
|
if( HB_ISBYREF( 2 ) )
|
|
{
|
|
TCHAR buffer[ HB_PATH_MAX ];
|
|
DWORD cchBuffer = ( DWORD ) HB_SIZEOFARRAY( buffer );
|
|
LPTSTR lpszShortPath = buffer;
|
|
HB_BOOL fSize = HB_ISNUM( 3 );
|
|
|
|
if( fSize ) /* the size of buffer is limited by user */
|
|
{
|
|
cchBuffer = ( DWORD ) hb_parnl( 3 );
|
|
if( cchBuffer == 0 )
|
|
lpszShortPath = NULL;
|
|
else if( cchBuffer > ( DWORD ) HB_SIZEOFARRAY( buffer ) )
|
|
lpszShortPath = ( LPTSTR ) hb_xgrab( cchBuffer * sizeof( TCHAR ) );
|
|
}
|
|
|
|
length = getPathName( lpszLongPath, lpszShortPath, cchBuffer );
|
|
if( !fSize && length > cchBuffer ) /* default buffer size was too small */
|
|
{
|
|
cchBuffer = length;
|
|
lpszShortPath = ( LPTSTR ) hb_xgrab( cchBuffer * sizeof( TCHAR ) );
|
|
length = getPathName( lpszLongPath, lpszShortPath, cchBuffer );
|
|
}
|
|
hbwapi_SetLastError( GetLastError() );
|
|
HB_STORSTRLEN( lpszShortPath, length > cchBuffer ? 0 : length, 2 );
|
|
if( lpszShortPath && lpszShortPath != buffer )
|
|
hb_xfree( lpszShortPath );
|
|
}
|
|
else if( getPathName )
|
|
{
|
|
length = getPathName( lpszLongPath, NULL, 0 );
|
|
hbwapi_SetLastError( GetLastError() );
|
|
}
|
|
}
|
|
hb_retnl( length );
|
|
hb_strfree( hLongPath );
|
|
}
|
|
|
|
HB_FUNC( WAPI_GETSHORTPATHNAME )
|
|
{
|
|
s_getPathName( GetShortPathName );
|
|
}
|
|
|
|
HB_FUNC( WAPI_GETLONGPATHNAME )
|
|
{
|
|
static _HB_GETPATHNAME s_getPathNameAddr = NULL;
|
|
|
|
if( !s_getPathNameAddr )
|
|
{
|
|
s_getPathNameAddr = ( _HB_GETPATHNAME )
|
|
#if defined( UNICODE )
|
|
GetProcAddress( GetModuleHandle( hb_iswin9x() ? TEXT( "unicows.dll" ) : TEXT( "kernel32.dll" ) ),
|
|
"GetLongPathNameW" );
|
|
#else
|
|
GetProcAddress( GetModuleHandle( TEXT( "kernel32.dll" ) ),
|
|
"GetLongPathNameA" );
|
|
#endif
|
|
if( !s_getPathNameAddr )
|
|
s_getPathNameAddr = GetShortPathName;
|
|
}
|
|
s_getPathName( s_getPathNameAddr );
|
|
}
|
|
|
|
#endif
|