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

2009-12-01 01:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/include/hbwince.h
  * harbour/contrib/hbwin/axcore.c
    * moved HBTEXT macro definition from axcore.c to hbwince.h

  * harbour/contrib/hbwin/wapi_shellapi.c
    ! use HBTEXT() macro for literal constants used as second parameter
      of GetProcAddress(). It fixes WINCE builds where whole API uses
      only UNICODE strings.
This commit is contained in:
Przemyslaw Czerpak
2009-12-01 00:19:27 +00:00
parent 648567c886
commit 449d3de17d
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -17,6 +17,16 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-12-01 01:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbwince.h
* harbour/contrib/hbwin/axcore.c
* moved HBTEXT macro definition from axcore.c to hbwince.h
* harbour/contrib/hbwin/wapi_shellapi.c
! use HBTEXT() macro for literal constants used as second parameter
of GetProcAddress(). It fixes WINCE builds where whole API uses
only UNICODE strings.
2009-12-01 00:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
+ Added cairo links.

6
harbour/contrib/hbwin/axcore.c
View File

@@ -53,12 +53,6 @@
#include "hbwinole.h"
#if defined( HB_OS_WIN_CE )
#define HBTEXT( x ) TEXT( x )
#else
#define HBTEXT( x ) x
#endif
typedef BOOL ( CALLBACK * PHB_AX_WININIT )( void );
typedef HRESULT ( CALLBACK * PHB_AX_GETCTRL )( HWND, IUnknown** );

2
harbour/contrib/hbwin/wapi_shellapi.c
View File

@@ -105,7 +105,7 @@ HB_FUNC( WAPI_USERISANADMIN )
if( hLib )
{
typedef int ( WINAPI * ISUSERANADMIN )( void );
ISUSERANADMIN pIsUserAnAdmin = ( ISUSERANADMIN ) GetProcAddress( hLib, "IsUserAnAdmin" );
ISUSERANADMIN pIsUserAnAdmin = ( ISUSERANADMIN ) GetProcAddress( hLib, HBTEXT( "IsUserAnAdmin" ) );
if( pIsUserAnAdmin )
bResult = ( pIsUserAnAdmin )();

6
harbour/include/hbwince.h
View File

@@ -193,6 +193,12 @@ extern HB_EXPORT void hb_mbtowccpy( wchar_t *dstW, const char *srcA, unsigned lo
extern HB_EXPORT void hb_mbtowcset( wchar_t *dstW, const char *srcA, unsigned long ulLen );
extern HB_EXPORT void hb_wctombget( char *dstA, const wchar_t *srcW, unsigned long ulLen );
#if defined( HB_OS_WIN_CE )
#define HBTEXT( x ) TEXT( x )
#else
#define HBTEXT( x ) x
#endif
#if defined( UNICODE )
#define HB_TCHAR_CPTO(d,s,l) hb_mbtowccpy(d,s,l)