* 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.
235 lines
7.1 KiB
C
235 lines
7.1 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
*
|
|
* Copyright 2008-2009 Viktor Szakats (harbour.01 syenar.hu)
|
|
* Copyright 2004 Peter Rees <peter@rees.co.nz> Rees Software & Systems Ltd
|
|
* 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 "hbwin.h"
|
|
#include "hbapiitm.h"
|
|
|
|
static HKEY hb_regkeyconv( HB_PTRUINT nKey )
|
|
{
|
|
switch( nKey )
|
|
{
|
|
case 1:
|
|
return ( HKEY ) HKEY_CLASSES_ROOT;
|
|
/* NOTE: In xhb, zero value means HKEY_LOCAL_MACHINE. */
|
|
case 0:
|
|
case 2:
|
|
return ( HKEY ) HKEY_CURRENT_USER;
|
|
#if ! defined( HB_OS_WIN_CE )
|
|
case 3:
|
|
return ( HKEY ) HKEY_CURRENT_CONFIG;
|
|
#endif
|
|
case 4:
|
|
return ( HKEY ) HKEY_LOCAL_MACHINE;
|
|
case 5:
|
|
return ( HKEY ) HKEY_USERS;
|
|
}
|
|
|
|
return ( HKEY ) nKey;
|
|
}
|
|
|
|
HB_FUNC( WIN_REGCREATEKEYEX )
|
|
{
|
|
void * hKey;
|
|
HKEY hkResult = NULL;
|
|
DWORD dwDisposition = 0;
|
|
|
|
hb_retl( RegCreateKeyEx( hb_regkeyconv( ( HB_PTRUINT ) hb_parnint( 1 ) ),
|
|
HB_PARSTRDEF( 2, &hKey, NULL ),
|
|
0,
|
|
NULL,
|
|
hb_parnl( 5 ) /* dwOptions */,
|
|
hb_parnl( 6 ) /* samDesired */,
|
|
NULL /* lpSecurityAttributes */,
|
|
&hkResult,
|
|
&dwDisposition ) == ERROR_SUCCESS );
|
|
|
|
hb_storptr( hkResult, 8 );
|
|
hb_stornl( dwDisposition, 9 );
|
|
|
|
hb_strfree( hKey );
|
|
}
|
|
|
|
HB_FUNC( WIN_REGOPENKEYEX )
|
|
{
|
|
void * hKey;
|
|
HKEY hkResult = NULL;
|
|
|
|
hb_retl( RegOpenKeyEx( hb_regkeyconv( ( HB_PTRUINT ) hb_parnint( 1 ) ),
|
|
HB_PARSTRDEF( 2, &hKey, NULL ),
|
|
0 /* dwOptions */,
|
|
hb_parnl( 4 ) /* samDesired */,
|
|
&hkResult ) == ERROR_SUCCESS );
|
|
|
|
hb_storptr( hkResult, 5 );
|
|
|
|
hb_strfree( hKey );
|
|
}
|
|
|
|
HB_FUNC( WIN_REGQUERYVALUEEX )
|
|
{
|
|
void * hKey;
|
|
LPCTSTR lpKey = HB_PARSTRDEF( 2, &hKey, NULL );
|
|
DWORD dwType = 0;
|
|
DWORD dwSize = 0;
|
|
|
|
if( RegQueryValueEx( ( HKEY ) hb_parptr( 1 ),
|
|
lpKey,
|
|
NULL,
|
|
&dwType,
|
|
NULL,
|
|
&dwSize ) == ERROR_SUCCESS )
|
|
{
|
|
if( dwSize > 0 )
|
|
{
|
|
if( dwType == REG_SZ ||
|
|
dwType == REG_EXPAND_SZ ||
|
|
dwType == REG_MULTI_SZ )
|
|
{
|
|
LPBYTE lpValue = ( LPBYTE ) hb_xgrab( ( dwSize + 1 ) * sizeof( TCHAR ) );
|
|
|
|
RegQueryValueEx( ( HKEY ) hb_parptr( 1 ),
|
|
lpKey,
|
|
NULL,
|
|
&dwType,
|
|
lpValue,
|
|
&dwSize );
|
|
|
|
#if defined( UNICODE )
|
|
dwSize >>= 1;
|
|
#endif
|
|
|
|
HB_STORSTRLEN( ( LPTSTR ) lpValue, dwSize, 5 );
|
|
|
|
hb_xfree( lpValue );
|
|
}
|
|
else /* No translation for binary data */
|
|
{
|
|
LPBYTE lpValue = ( LPBYTE ) hb_xgrab( dwSize + 1 );
|
|
|
|
RegQueryValueEx( ( HKEY ) hb_parptr( 1 ),
|
|
lpKey,
|
|
NULL,
|
|
&dwType,
|
|
lpValue,
|
|
&dwSize );
|
|
|
|
if( ! hb_storclen_buffer( ( char * ) lpValue, dwSize, 5 ) )
|
|
hb_xfree( lpValue );
|
|
}
|
|
}
|
|
else
|
|
hb_storc( NULL, 5 );
|
|
}
|
|
else
|
|
hb_stor( 5 );
|
|
|
|
hb_stornl( dwType, 4 );
|
|
hb_retnl( dwSize );
|
|
|
|
hb_strfree( hKey );
|
|
}
|
|
|
|
HB_FUNC( WIN_REGSETVALUEEX )
|
|
{
|
|
void * hKey;
|
|
DWORD dwType = ( DWORD ) hb_parnl( 4 );
|
|
LPCTSTR lpKey = HB_PARSTRDEF( 2, &hKey, NULL );
|
|
|
|
if( dwType == REG_DWORD )
|
|
{
|
|
DWORD nSpace = ( DWORD ) hb_parnl( 5 );
|
|
hb_retl( RegSetValueEx( ( HKEY ) hb_parptr( 1 ),
|
|
lpKey,
|
|
0,
|
|
dwType,
|
|
( const BYTE * ) &nSpace,
|
|
sizeof( REG_DWORD ) ) == ERROR_SUCCESS );
|
|
}
|
|
else if( dwType == REG_SZ ||
|
|
dwType == REG_EXPAND_SZ ||
|
|
dwType == REG_MULTI_SZ )
|
|
{
|
|
void * hValue;
|
|
HB_SIZE nValueLen;
|
|
LPCTSTR lpValue = HB_PARSTR( 5, &hValue, &nValueLen );
|
|
|
|
++nValueLen;
|
|
|
|
#if defined( UNICODE )
|
|
nValueLen *= 2;
|
|
#endif
|
|
|
|
hb_retl( RegSetValueEx( ( HKEY ) hb_parptr( 1 ),
|
|
lpKey,
|
|
0,
|
|
dwType,
|
|
( const BYTE * ) lpValue,
|
|
( DWORD ) nValueLen ) == ERROR_SUCCESS );
|
|
|
|
hb_strfree( hValue );
|
|
}
|
|
else /* No translation for binary data */
|
|
hb_retl( RegSetValueEx( ( HKEY ) hb_parptr( 1 ),
|
|
lpKey,
|
|
0,
|
|
dwType,
|
|
( const BYTE * ) hb_parc( 5 ) /* cValue */,
|
|
( DWORD ) hb_parclen( 5 ) + 1 ) == ERROR_SUCCESS );
|
|
|
|
hb_strfree( hKey );
|
|
}
|
|
|
|
HB_FUNC( WIN_REGCLOSEKEY )
|
|
{
|
|
hb_retl( RegCloseKey( ( HKEY ) hb_parptr( 1 ) ) == ERROR_SUCCESS );
|
|
}
|