From 2cc8ef44d588327470712213c86405e0de2e5365 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 6 Jan 2010 22:54:39 +0000 Subject: [PATCH] 2010-01-06 23:53 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/win_err.c ! Fixed GetLastError() in MT mode. * utils/hbmk2/hbmk2.prg % nSize++ -> nSize = 1 * contrib/hbide/hbide.hbp ! Typo in comment. --- harbour/ChangeLog | 10 ++++++++++ harbour/contrib/hbide/hbide.hbp | 2 +- harbour/contrib/hbwin/win_err.c | 3 ++- harbour/utils/hbmk2/hbmk2.prg | 4 ++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 251f50de87..a0c290238f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,16 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-01-06 23:53 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbwin/win_err.c + ! Fixed GetLastError() in MT mode. + + * utils/hbmk2/hbmk2.prg + % nSize++ -> nSize = 1 + + * contrib/hbide/hbide.hbp + ! Typo in comment. + 2010-01-06 22:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * INSTALL ! Fixed instructions for .deb binary build. diff --git a/harbour/contrib/hbide/hbide.hbp b/harbour/contrib/hbide/hbide.hbp index 60e8bb7324..4da8a0d78b 100644 --- a/harbour/contrib/hbide/hbide.hbp +++ b/harbour/contrib/hbide/hbide.hbp @@ -10,7 +10,7 @@ -ohbide -# Trick to make QT 4.6 link using default Harbour builds +# Trick to make QT 4.6 link using default Harbour build -ldflag={msvc}-nodefaultlib:msvcrt.lib -ldflag={msvc}-defaultlib:libcmt.lib diff --git a/harbour/contrib/hbwin/win_err.c b/harbour/contrib/hbwin/win_err.c index f2c5a01fa6..e32d8d6d6f 100644 --- a/harbour/contrib/hbwin/win_err.c +++ b/harbour/contrib/hbwin/win_err.c @@ -64,9 +64,10 @@ static HB_TSD_NEW( s_winerrData, sizeof( HB_WINERRDATA ), NULL, NULL ); void hbwin_SetLastError( void ) { + DWORD dwLastError = GetLastError(); PHB_WINERRDATA pWinErrData = ( PHB_WINERRDATA ) hb_stackGetTSD( &s_winerrData ); - pWinErrData->dwLastError = GetLastError(); + pWinErrData->dwLastError = dwLastError; } DWORD hbwin_GetLastError( void ) diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 3222b9fcbb..fdb8b817ad 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3883,14 +3883,14 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) 'void * operator new[]( size_t nSize )' + Chr( 10 ) +; '{' + Chr( 10 ) +; ' if( nSize == 0 )' + Chr( 10 ) +; - ' nSize++;' + Chr( 10 ) +; + ' nSize = 1;' + Chr( 10 ) +; ' return hb_xgrab( nSize );' + Chr( 10 ) +; '}' + Chr( 10 ) +; '' + Chr( 10 ) +; 'void * operator new( size_t nSize )' + Chr( 10 ) +; '{' + Chr( 10 ) +; ' if( nSize == 0 )' + Chr( 10 ) +; - ' nSize++;' + Chr( 10 ) +; + ' nSize = 1;' + Chr( 10 ) +; ' return hb_xgrab( nSize );' + Chr( 10 ) +; '}' + Chr( 10 ) +; '' + Chr( 10 ) +;