From be56aaa8b8f31c4f8f98b16f4dd397e0cec393eb Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 16 Nov 2008 22:08:33 +0000 Subject: [PATCH] 2008-11-16 23:05 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/gtwvg/wvgsink.c * Minor cleanup to hb_strncat() (it's best to use 'sizeof( target ) - 1' for size, if target is a char array. The buffer was off by one on the good direction.) * ChangeLog ! ChangeLog was again saved as Unicode. Please guys TURN THIS OFF for good. --- harbour/ChangeLog | 13 ++++++++++++- harbour/contrib/gtwvg/wvgsink.c | 6 +++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1429a7c39b..45dab03153 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,4 +1,4 @@ -/* +/* * $Id$ */ @@ -8,6 +8,17 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-16 23:05 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * contrib/gtwvg/wvgsink.c + * Minor cleanup to hb_strncat() (it's best to use + 'sizeof( target ) - 1' for size, if target is a char + array. The buffer was off by one on the good direction.) + + * ChangeLog + ! ChangeLog was again saved as Unicode. Please guys TURN + THIS OFF for good. (fixed in prev commit, but I've left + this here anyway) + 2008-11-16 13:00 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/gtwvg/gtwvg.c ! Slight fix in WM_PAINT message. diff --git a/harbour/contrib/gtwvg/wvgsink.c b/harbour/contrib/gtwvg/wvgsink.c index e24a710194..712f9a3cd1 100644 --- a/harbour/contrib/gtwvg/wvgsink.c +++ b/harbour/contrib/gtwvg/wvgsink.c @@ -622,13 +622,13 @@ HB_FUNC( HB_AX_SETUPCONNECTIONPOINT ) HB_FUNC( HB_AX_ATLAXWININIT ) { PATLAXWININIT AtlAxWinInit; - char szLibName[ MAX_PATH + 1 ] = { 0 } ; + char szLibName[ MAX_PATH + 1 ] = { 0 }; BOOL bRet = FALSE; if( !hLib ) { GetSystemDirectory( szLibName, MAX_PATH ); - hb_strncat( szLibName, "\\atl.dll", MAX_PATH -1 ); + hb_strncat( szLibName, "\\atl.dll", sizeof( szLibName ) - 1 ); hLib = LoadLibrary( ( LPCSTR ) szLibName ); if( hLib ) @@ -654,7 +654,7 @@ HB_FUNC( HB_AX_ATLAXWININIT ) bRet = TRUE; } - hb_retl( bRet); + hb_retl( bRet ); } //---------------------------------------------------------------------------// HB_FUNC( HB_AX_ATLAXCREATECONTROL )