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

2010-02-20 01:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* include/hbsetup.h
    * Changed not to rely on _WIN32_WCE to detect WinCE.

  * config/wce/global.mk
  * utils/hbmk2/hbmk2.prg
    % Changed to not pre-define _WIN32_WCE to any value. This should
      be user choice.

  * contrib/hbfimage/fi_winfu.c
    ! Fixed for WinCE builds. Now only non-WinCE compatible parts
      are disabled and functions keep being defined on .prg level
      regardless.

  * contrib/hbfimage/fi_winfu.c
  * contrib/hbfimage/fi_wrp.c
    % Cleaned logic that guards '_WINDOWS_' definition.

  * contrib/hbwin/win_bmp.c
    ! Fixed to use hexadecimal notation instead of octal, because
      some compilers where getting confused and tried to match these
      with some codepages.

  * contrib/hbwin/win_prn1.c
    ! Fixed for poccarm, because Pelles C (even 6.0) forgets to
      map FONTENUMPROC to FONTENUMPROCW.

  * contrib/hbwin/win_prn3.c
    ! Added some extra WinCE guards to avoid warning for this platform.

  * src/debug/dbgentry.c
    * Formatting.
This commit is contained in:
Viktor Szakats
2010-02-20 00:11:43 +00:00
parent f13ea1836f
commit 1dae4e170f
10 changed files with 244 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
harbour/ChangeLog
View File

@@ -17,6 +17,39 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-02-20 01:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* include/hbsetup.h
* Changed not to rely on _WIN32_WCE to detect WinCE.
* config/wce/global.mk
* utils/hbmk2/hbmk2.prg
% Changed to not pre-define _WIN32_WCE to any value. This should
be user choice.
* contrib/hbfimage/fi_winfu.c
! Fixed for WinCE builds. Now only non-WinCE compatible parts
are disabled and functions keep being defined on .prg level
regardless.
* contrib/hbfimage/fi_winfu.c
* contrib/hbfimage/fi_wrp.c
% Cleaned logic that guards '_WINDOWS_' definition.
* contrib/hbwin/win_bmp.c
! Fixed to use hexadecimal notation instead of octal, because
some compilers where getting confused and tried to match these
with some codepages.
* contrib/hbwin/win_prn1.c
! Fixed for poccarm, because Pelles C (even 6.0) forgets to
map FONTENUMPROC to FONTENUMPROCW.
* contrib/hbwin/win_prn3.c
! Added some extra WinCE guards to avoid warning for this platform.
* src/debug/dbgentry.c
* Formatting.
2010-02-19 18:52 UTC+0100 Maurilio Longo (maurilio.longo@libero.it)
* source/rtl/tthreadx.prg
! fixed ::active iVar to be .F. while thread is not running / has ended.
@@ -69,7 +102,7 @@
anymore active to OS/2.
* examples/gtwvw/hbgtwvw.h
! Fixed to not override manually set WINVER.
! Fixed to not override manually WINVER.
! Fixed to not set _WIN32_WINNT.
2010-02-18 18:45 UTC+0100 Maurilio Longo (maurilio.longo@libero.it)

2
harbour/config/wce/global.mk
View File

@@ -9,7 +9,7 @@ DYN_EXT := .dll
HB_GT_LIBS += gtwvt gtgui
HB_CFLAGS += -D_WIN32_WCE=0x501 -DUNDER_CE
HB_CFLAGS += -DUNDER_CE
HB_BUILD_UNICODE := yes
SYSLIBS += coredll ws2

12
harbour/contrib/hbfimage/fi_winfu.c
View File

@@ -3,7 +3,7 @@
*/
/*
* xHarbour Project source code:
* Harbour Project source code:
* FreeImage windows specific functions.
*
* Copyright 2005 Francesco Saverio Giudice <info@fsgiudice.com>
@@ -55,11 +55,11 @@
#include "hbapi.h"
#include "hbapierr.h"
#if defined( HB_OS_WIN ) && ! ( defined( HB_OS_WIN_CE ) && defined( __POCC__ ) )
#if defined( HB_OS_WIN )
#include <windows.h>
#if !defined( _WINDOWS_ ) && ( defined( __GNUC__ ) || defined( __POCC__ ) || defined( __XCC__ ) ) || defined( __WATCOMC__ )
#if !defined( _WINDOWS_ )
# define _WINDOWS_
#endif
@@ -80,6 +80,7 @@ HB_FUNC( FI_FITOBITMAP )
HB_ISPOINTER( 1 )
)
{
#if ! defined( HB_OS_WIN_CE )
FIBITMAP *dib;
HBITMAP bitmap;
HDC hDC;
@@ -97,6 +98,7 @@ HB_FUNC( FI_FITOBITMAP )
/* return value */
if( bitmap )
hb_retptr( bitmap );
#endif
}
else
{
@@ -119,6 +121,7 @@ HB_FUNC( FI_BITMAPTOFI )
HB_ISPOINTER( 1 )
)
{
#if ! defined( HB_OS_WIN_CE )
FIBITMAP * dib;
HBITMAP bitmap;
@@ -144,6 +147,7 @@ HB_FUNC( FI_BITMAPTOFI )
/* return value */
if( dib )
hb_retptr( dib );
#endif
}
else
{
@@ -185,7 +189,9 @@ HB_FUNC( FI_WINDRAW )
rcDest.right = hb_parni( 6 );
/* run function */
#if ! defined( HB_OS_WIN_CE )
SetStretchBltMode( hDC, COLORONCOLOR );
#endif
scanlines = StretchDIBits( hDC, rcDest.left,
rcDest.top,

4
harbour/contrib/hbfimage/fi_wrp.c
View File

@@ -3,7 +3,7 @@
*/
/*
* xHarbour Project source code:
* Harbour Project source code:
* FreeImage graphic library low level (client api) interface code.
*
* Copyright 2005 Francesco Saverio Giudice <info@fsgiudice.com>
@@ -59,7 +59,7 @@
#if defined( HB_OS_WIN )
# include <windows.h>
# if !defined( _WINDOWS_ ) && ( defined( __GNUC__ ) || defined( __POCC__ ) || defined( __XCC__ ) ) || defined( __WATCOMC__ )
# if !defined( _WINDOWS_ )
# define _WINDOWS_
# endif
#endif

4
harbour/contrib/hbwin/win_bmp.c
View File

@@ -77,9 +77,9 @@ int hbwin_bitmapType( const void * pImgBuf, HB_SIZE size )
{
if( size > 2 && memcmp( pImgBuf, "BM", 2 ) == 0 )
iType = HB_WIN_BITMAP_BMP;
else if( size > 3 && memcmp( pImgBuf, "\377\330\377", 3 ) == 0 )
else if( size > 3 && memcmp( pImgBuf, "\xFF\xD8\xFF", 3 ) == 0 )
iType = HB_WIN_BITMAP_JPEG;
else if( size > 4 && memcmp( pImgBuf, "\211PNG", 4 ) == 0 )
else if( size > 4 && memcmp( pImgBuf, "\x89PNG", 4 ) == 0 )
iType = HB_WIN_BITMAP_PNG;
}

5
harbour/contrib/hbwin/win_prn1.c
View File

@@ -74,6 +74,11 @@
/* For Arc() */
#if defined( HB_OS_WIN_CE )
#include "hbwince.h"
/* Pelles C requires this */
#ifndef FONTENUMPROC
#define FONTENUMPROC FONTENUMPROCW
#endif
#endif
HB_FUNC( WIN_CREATEDC )

5
harbour/contrib/hbwin/win_prn3.c
View File

@@ -52,6 +52,8 @@
#include "hbwin.h"
#if ! defined( HB_OS_WIN_CE )
/* NOTE: Based on hb_strncat() */
static TCHAR * hb_tstrncat( TCHAR * pDest, const TCHAR * pSource, HB_SIZE nLen )
{
@@ -85,6 +87,8 @@ static HB_SIZE hb_tstrlen( const TCHAR * pText )
return nLen;
}
#endif
static HB_BOOL hb_SetDefaultPrinter( LPCTSTR lpPrinterName )
{
#if ! defined( HB_OS_WIN_CE )
@@ -259,6 +263,7 @@ static HB_BOOL hb_SetDefaultPrinter( LPCTSTR lpPrinterName )
return HB_TRUE;
#else
HB_SYMBOL_UNUSED( lpPrinterName );
return HB_FALSE;
#endif
}

2
harbour/include/hbsetup.h
View File

@@ -228,7 +228,7 @@
/* Sub-option inside HB_OS_WIN */
#ifndef HB_OS_WIN_CE
#if defined( UNDER_CE ) || defined( _WIN32_WCE ) || defined( __CEGCC__ ) || defined( __MINGW32CE__ )
#if defined( UNDER_CE ) || defined( __CEGCC__ ) || defined( __MINGW32CE__ )
#define HB_OS_WIN_CE
#endif
#endif

405
harbour/src/debug/dbgentry.c
View File

File diff suppressed because it is too large Load Diff

12
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -2620,8 +2620,8 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
l_aLIBSYS := ArrayAJoin( { l_aLIBSYS, l_aLIBSYSCORE, l_aLIBSYSMISC } )
IF hbmk[ _HBMK_cPLAT ] == "wce"
AAdd( hbmk[ _HBMK_aOPTC ], "-DUNICODE" )
AAdd( hbmk[ _HBMK_aOPTC ], "-D_WIN32_WCE=0x501 -DUNDER_CE" )
AAdd( hbmk[ _HBMK_aOPTRES ], "-D_WIN32_WCE=0x501 -DUNDER_CE" )
AAdd( hbmk[ _HBMK_aOPTC ], "-DUNDER_CE" )
AAdd( hbmk[ _HBMK_aOPTRES ], "-DUNDER_CE" )
ENDIF
DO CASE
CASE hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB
@@ -3202,8 +3202,8 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
ENDIF
IF hbmk[ _HBMK_cPLAT ] == "wce"
AAdd( hbmk[ _HBMK_aOPTC ], "-DUNICODE" )
AAdd( hbmk[ _HBMK_aOPTC ], "-D_WIN32_WCE=0x501 -DUNDER_CE" )
AAdd( hbmk[ _HBMK_aOPTRES ], "-D_WIN32_WCE=0x501 -DUNDER_CE" )
AAdd( hbmk[ _HBMK_aOPTC ], "-DUNDER_CE" )
AAdd( hbmk[ _HBMK_aOPTRES ], "-DUNDER_CE" )
DO CASE
CASE hbmk[ _HBMK_cCOMP ] == "msvcarm"
AAdd( hbmk[ _HBMK_aOPTC ], "-D_M_ARM -DARM" )
@@ -3306,8 +3306,8 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
IF hbmk[ _HBMK_cPLAT ] == "wce"
AAdd( hbmk[ _HBMK_aOPTC ], "-DUNICODE" )
AAdd( hbmk[ _HBMK_aOPTC ], "-D_WINCE" ) /* Required by pocc Windows headers */
AAdd( hbmk[ _HBMK_aOPTC ], "-D_WIN32_WCE=0x501 -DUNDER_CE" )
AAdd( hbmk[ _HBMK_aOPTRES ], "-D_WIN32_WCE=0x501 -DUNDER_CE" )
AAdd( hbmk[ _HBMK_aOPTC ], "-DUNDER_CE" )
AAdd( hbmk[ _HBMK_aOPTRES ], "-DUNDER_CE" )
ENDIF
DO CASE
CASE hbmk[ _HBMK_cCOMP ] == "pocc"