diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 84eea325bf..a763dd75c5 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,21 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-23 01:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbwin/win_prn2.c + + Added support for fifth 'share' element to GETPRINTERS() + returned array. This syncs it with xhb. + + - contrib/hbide/hbide.hbm + + contrib/hbide/hbide.hbp + * Renamed project file to have .hbp extension. + + - contrib/hbide/hbmk.hbm + - Not needed anymore. Deleted. + + * contrib/hbide/ideparseexpr.c + ! strnicmp() -> hb_strnicmp() + 2009-11-22 15:45 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbide/hbide.hbm ! Call hbmk2 hbid.hbm which includes all required files. @@ -26,12 +41,12 @@ + contrib/hbide/idetags.prg + contrib/hbide/ideparseexpr.c - + Code provided by Andy Wos almost an year back. Never thought + + Code provided by Andy Wos almost an year back. Never thought it will be of much use for this purpose. Big thank you Andy. + contrib/hbide/freadlin.c ! Pulled from contrib/xhb. There may be a better option. - + * contrib/hbqt/hbqt.ch + Added more constants. @@ -51,7 +66,7 @@ You can start real-time editing if you want to. Open many sources, change the tabs, press s or edit and save. - Let me know if this behavior is ok. Note: after last tab is closed, hbide.exe + Let me know if this behavior is ok. Note: after last tab is closed, hbide.exe terminates. 2009-11-23 01:04 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) diff --git a/harbour/contrib/hbide/hbide.hbm b/harbour/contrib/hbide/hbide.hbp similarity index 90% rename from harbour/contrib/hbide/hbide.hbm rename to harbour/contrib/hbide/hbide.hbp index 05497a3d1b..7a2747c0fc 100644 --- a/harbour/contrib/hbide/hbide.hbm +++ b/harbour/contrib/hbide/hbide.hbp @@ -6,8 +6,7 @@ -inc --w3 --es2 +-w3 -es2 -ohbide @@ -17,5 +16,3 @@ idetags.prg freadlin.c ideparseexpr.c - - diff --git a/harbour/contrib/hbide/hbmk.hbm b/harbour/contrib/hbide/hbmk.hbm deleted file mode 100644 index 9d9c3f7056..0000000000 --- a/harbour/contrib/hbide/hbmk.hbm +++ /dev/null @@ -1,7 +0,0 @@ -# -# $Id$ -# - -../hbxbp/hbxbp.hbc - --w3 -es2 diff --git a/harbour/contrib/hbide/ideparseexpr.c b/harbour/contrib/hbide/ideparseexpr.c index 3d1970812c..cd1465df4b 100644 --- a/harbour/contrib/hbide/ideparseexpr.c +++ b/harbour/contrib/hbide/ideparseexpr.c @@ -100,9 +100,9 @@ UINT linearfind( char** array, char* cText, UINT lenarray, UINT lentext, int lMa { for( i = 0 ; i < lenarray ; i++ ) { - if( strnicmp( cText, array[ i ], lentext + 1 ) == 0 ) + if( hb_strnicmp( cText, array[ i ], lentext + 1 ) == 0 ) { - return( i++ ); + return( i++ ); } } @@ -354,4 +354,3 @@ HB_FUNC( PARSEXPR ) } /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/hbwin/win_prn2.c b/harbour/contrib/hbwin/win_prn2.c index 7ad7fb1f42..f7a45ce785 100644 --- a/harbour/contrib/hbwin/win_prn2.c +++ b/harbour/contrib/hbwin/win_prn2.c @@ -456,7 +456,8 @@ HB_FUNC( PRINTFILERAW ) #define HB_WINPRN_PORT 2 #define HB_WINPRN_TYPE 3 #define HB_WINPRN_DRIVER 4 -#define HB_WINPRN_LEN_ 4 +#define HB_WINPRN_SHARE 5 +#define HB_WINPRN_LEN_ 5 HB_FUNC( GETPRINTERS ) { @@ -514,11 +515,15 @@ HB_FUNC( GETPRINTERS ) pszData = HB_TCHAR_CONVFROM( pPrinterInfo2->pDriverName ); hb_arraySetC( pTempItem, HB_WINPRN_DRIVER, pszData ); HB_TCHAR_FREE( pszData ); + pszData = HB_TCHAR_CONVFROM( pPrinterInfo2->pShareName ); + hb_arraySetC( pTempItem, HB_WINPRN_SHARE, pszData ); + HB_TCHAR_FREE( pszData ); } else { hb_arraySetC( pTempItem, HB_WINPRN_PORT, NULL ); hb_arraySetC( pTempItem, HB_WINPRN_DRIVER, NULL ); + hb_arraySetC( pTempItem, HB_WINPRN_SHARE, NULL ); } hb_xfree( pPrinterInfo2 );