2014-02-01 09:11 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* 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*()
This commit is contained in:
@@ -54,12 +54,6 @@
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
/* use ASCII version of GetProcAddress() to keep the same code for desktop
|
||||
* windows and WinCE/Mobile. It's supported by WinCE 3.0 and later versions.
|
||||
*/
|
||||
#undef GetProcAddress
|
||||
#define GetProcAddress GetProcAddressA
|
||||
|
||||
HB_EXTERN_BEGIN
|
||||
|
||||
#if defined( _MSC_VER )
|
||||
|
||||
@@ -86,8 +86,14 @@
|
||||
#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_FUNCTION_NAME( a ) ( a "W" )
|
||||
#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 ) )
|
||||
@@ -119,8 +125,9 @@
|
||||
#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_FUNCTION_NAME( a ) ( a "A" )
|
||||
#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 */
|
||||
|
||||
Reference in New Issue
Block a user