* include/hbwince.h
- removed GetProcAddress() redefinition which forced ANSI
version not supported in recent Windows Mobile MSVC libraries
* include/hbwinuni.h
+ added new macros which hide differences between Windows systems
in GetProcAddress() usage: HB_WINAPI_GETPROCADDRESS() and
HB_WINAPI_GETPROCADDRESST()
The second one adds "W" or "A" suffix to function names.
- removed not longer used HB_WINAPI_FUNCTION_NAME() macro
* src/vm/dynlibhb.c
* updated hb_libSymAddr() to work with Unicode version of
GetProcAddress() in WinCE builds
* src/vm/maindllp/dllpcode.c
* updated hb_dllGetProcAddress() to work with Unicode version of
GetProcAddress() in WinCE builds
* contrib/hbwin/wapi_winbase.c
* updated WAPI_GetProcAddress() to work with Unicode version of
GetProcAddress() in WinCE builds
* src/common/hbdate.c
* src/common/hbver.c
* src/rtl/diskspac.c
* src/rtl/disksphb.c
* src/rtl/fslink.c
* src/rtl/gtwin/gtwin.c
* src/rtl/gtwvt/gtwvt.c
* src/vm/extrap.c
* contrib/gtwvg/gtwvgd.c
* contrib/gtwvg/wvgwin.c
* contrib/hbwin/axcore.c
* contrib/hbwin/mapi.c
* contrib/hbwin/wapi_shellapi.c
* contrib/hbwin/wapi_winbase.c
* contrib/hbwin/wapi_wingdi_font.c
* contrib/hbwin/win_prn2.c
* contrib/hbwin/win_prn3.c
* contrib/hbwin/win_rpc.c
* extras/gtwvw/gtwvwd.c
* use HB_WINAPI_GETPROCADDRESS*()
136 lines
8.2 KiB
C
136 lines
8.2 KiB
C
/*
|
|
* Harbour Project source code:
|
|
* Windows UNICODE helper macros
|
|
*
|
|
* Copyright 2009 Viktor Szakats (vszakats.net/harbour)
|
|
* 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.txt. 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.
|
|
*
|
|
*/
|
|
|
|
#ifndef HB_WINUNI_H_
|
|
#define HB_WINUNI_H_
|
|
|
|
#include "hbapistr.h"
|
|
|
|
#if defined( HB_OS_WIN )
|
|
|
|
#include "hbset.h"
|
|
|
|
#if defined( UNICODE )
|
|
#define HB_PARSTR( n, h, len ) hb_parstr_u16( n, HB_CDP_ENDIAN_NATIVE, h, len )
|
|
#define HB_PARSTRDEF( n, h, len ) hb_wstrnull( hb_parstr_u16( n, HB_CDP_ENDIAN_NATIVE, h, len ) )
|
|
#define HB_PARASTR( n, i, h, len ) hb_parastr_u16( n, i, HB_CDP_ENDIAN_NATIVE, h, len )
|
|
#define HB_PARASTRDEF( n, i, h, len ) hb_wstrnull( hb_parastr_u16( n, i, HB_CDP_ENDIAN_NATIVE, h, len ) )
|
|
#define HB_RETSTR( str ) hb_retstr_u16( HB_CDP_ENDIAN_NATIVE, str )
|
|
#define HB_RETSTRLEN( str, len ) hb_retstrlen_u16( HB_CDP_ENDIAN_NATIVE, str, len )
|
|
#define HB_STORSTR( str, n ) hb_storstr_u16( HB_CDP_ENDIAN_NATIVE, str, n )
|
|
#define HB_STORSTRLEN( str, len, n ) hb_storstrlen_u16( HB_CDP_ENDIAN_NATIVE, str, len, n )
|
|
#define HB_ARRAYGETSTR( arr, n, phstr, plen ) hb_arrayGetStrU16( arr, n, HB_CDP_ENDIAN_NATIVE, phstr, plen )
|
|
#define HB_ARRAYSETSTR( arr, n, str ) hb_arraySetStrU16( arr, n, HB_CDP_ENDIAN_NATIVE, str )
|
|
#define HB_ARRAYSETSTRLEN( arr, n, str, len ) hb_arraySetStrLenU16( arr, n, HB_CDP_ENDIAN_NATIVE, str, len )
|
|
#define HB_ITEMCOPYSTR( itm, str, len ) hb_itemCopyStrU16( itm, HB_CDP_ENDIAN_NATIVE, str, len )
|
|
#define HB_ITEMGETSTR( itm, phstr, plen ) hb_itemGetStrU16( itm, HB_CDP_ENDIAN_NATIVE, phstr, plen )
|
|
#define HB_ITEMPUTSTR( itm, str ) hb_itemPutStrU16( itm, HB_CDP_ENDIAN_NATIVE, str )
|
|
#define HB_ITEMPUTSTRLEN( itm, str, len ) hb_itemPutStrLenU16( itm, HB_CDP_ENDIAN_NATIVE, str, len )
|
|
#define HB_STRUNSHARE( h, str, len ) hb_wstrunshare( h, str, len )
|
|
#define HB_STRLEN( str ) hb_wstrlen( str )
|
|
#define HB_STRNLEN( str, len ) hb_wstrnlen( str, len )
|
|
#define HB_STRDUP( str ) hb_wstrdup( str )
|
|
#define HB_STRNDUP( str, len ) hb_wstrndup( str, len )
|
|
#define HB_STRNCPY( dst, src, len ) hb_wstrncpy( dst, src, len )
|
|
#define HB_STRNCAT( dst, src, len ) hb_wstrncat( dst, src, len )
|
|
#define HB_STRCMP( s1, s2 ) hb_wstrcmp( s1, s2 )
|
|
#define HB_STRNCMP( s1, s2, len ) hb_wstrncmp( s1, s2, len )
|
|
#define HB_FSNAMECONV( fname, pfree ) ( ( LPCTSTR ) ( *(pfree) = hb_fsNameConvU16( fname ) ) )
|
|
#define HB_CHARDUP( str ) hb_osStrU16Encode( str )
|
|
#define HB_CHARDUPN( str, len ) hb_osStrU16EncodeN( str, len )
|
|
#define HB_OSSTRDUP( str ) hb_osStrU16Decode( str )
|
|
#define HB_OSSTRDUP2( str, buf, len ) hb_osStrU16Decode2( str, buf, len )
|
|
#define HB_WINAPI_SYSTEM( cmd ) _wsystem( cmd )
|
|
#define HB_WINAPI_KERNEL32_DLL() ( hb_iswin9x() ? TEXT( "unicows.dll" ) : TEXT( "kernel32.dll" ) )
|
|
#if defined( HB_OS_WIN_CE )
|
|
#define HB_WINAPI_GETPROCADDRESS( h, n ) GetProcAddress( h, TEXT( n ) )
|
|
#define HB_WINAPI_GETPROCADDRESST( h, n ) GetProcAddress( h, TEXT( n ) TEXT( "W" ) )
|
|
#else
|
|
#define HB_WINAPI_GETPROCADDRESS( h, n ) GetProcAddress( h, n )
|
|
#define HB_WINAPI_GETPROCADDRESST( h, n ) GetProcAddress( h, n "W" )
|
|
#endif
|
|
#else
|
|
#define HB_PARSTR( n, h, len ) hb_parstr( n, hb_setGetOSCP(), h, len )
|
|
#define HB_PARSTRDEF( n, h, len ) hb_strnull( hb_parstr( n, hb_setGetOSCP(), h, len ) )
|
|
#define HB_PARASTR( n, i, h, len ) hb_parastr( n, i, hb_setGetOSCP(), h, len )
|
|
#define HB_PARASTRDEF( n, i, h, len ) hb_strnull( hb_parastr( n, i, hb_setGetOSCP(), h, len ) )
|
|
#define HB_RETSTR( str ) hb_retstr( hb_setGetOSCP(), str )
|
|
#define HB_RETSTRLEN( str, len ) hb_retstrlen( hb_setGetOSCP(), str, len )
|
|
#define HB_STORSTR( str, n ) hb_storstr( hb_setGetOSCP(), str, n )
|
|
#define HB_STORSTRLEN( str, len, n ) hb_storstrlen( hb_setGetOSCP(), str, len, n )
|
|
#define HB_ARRAYGETSTR( arr, n, phstr, plen ) hb_arrayGetStr( arr, n, hb_setGetOSCP(), phstr, plen )
|
|
#define HB_ARRAYSETSTR( arr, n, str ) hb_arraySetStr( arr, n, hb_setGetOSCP(), str )
|
|
#define HB_ARRAYSETSTRLEN( arr, n, str, len ) hb_arraySetStrLen( arr, n, hb_setGetOSCP(), str, len )
|
|
#define HB_ITEMCOPYSTR( itm, str, len ) hb_itemCopyStr( itm, hb_setGetOSCP(), str, len )
|
|
#define HB_ITEMGETSTR( itm, phstr, plen ) hb_itemGetStr( itm, hb_setGetOSCP(), phstr, plen )
|
|
#define HB_ITEMPUTSTR( itm, str ) hb_itemPutStr( itm, hb_setGetOSCP(), str )
|
|
#define HB_ITEMPUTSTRLEN( itm, str, len ) hb_itemPutStrLen( itm, hb_setGetOSCP(), str, len )
|
|
#define HB_STRUNSHARE( h, str, len ) hb_strunshare( h, str, len )
|
|
#define HB_STRLEN( str ) strlen( str )
|
|
#define HB_STRNLEN( str, len ) hb_strnlen( str, len )
|
|
#define HB_STRDUP( str ) hb_strdup( str )
|
|
#define HB_STRNDUP( str, len ) hb_strndup( str, len )
|
|
#define HB_STRNCPY( dst, src, len ) hb_strncpy( dst, src, len )
|
|
#define HB_STRNCAT( dst, src, len ) hb_strncat( dst, src, len )
|
|
#define HB_STRCMP( s1, s2 ) strcmp( s1, s2 )
|
|
#define HB_STRNCMP( s1, s2, len ) strncmp( s1, s2, len )
|
|
#define HB_FSNAMECONV( fname, pfree ) hb_fsNameConv( fname, pfree )
|
|
#define HB_CHARDUP( str ) hb_osStrEncode( str )
|
|
#define HB_CHARDUPN( str, len ) hb_osStrEncodeN( str, len )
|
|
#define HB_OSSTRDUP( str ) hb_osStrDecode( str )
|
|
#define HB_OSSTRDUP2( str, buf, len ) hb_osStrDecode2( str, buf, len )
|
|
#define HB_WINAPI_SYSTEM( cmd ) system( cmd )
|
|
#define HB_WINAPI_KERNEL32_DLL() ( TEXT( "kernel32.dll" ) )
|
|
#define HB_WINAPI_GETPROCADDRESS( h, n ) GetProcAddress( h, n )
|
|
#define HB_WINAPI_GETPROCADDRESST( h, n ) GetProcAddress( h, n "A" )
|
|
#endif
|
|
|
|
#endif /* HB_OS_WIN */
|
|
|
|
#endif /* HB_WINUNI_H_ */
|