From 5b5183359f8b5488b248ecc43c7d3bd8384cbfb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Sat, 1 Feb 2014 11:00:22 +0100 Subject: [PATCH] 2014-02-01 11:00 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * include/hbwince.h * added WINBASEAPI in declaration of redefined functions ; NOTE: if recent MSVC releases support above functions then they should be covered by some macros * src/rdd/dbfcdx/dbfcdx1.c * minor cleanup: EDBF_CREATE -> EDBF_CREATE_INDEX --- ChangeLog.txt | 9 +++++++ include/hbwince.h | 54 ++++++++++++++++++++-------------------- src/rdd/dbfcdx/dbfcdx1.c | 2 +- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 06ddb24047..340572c7e3 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,15 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2014-02-01 11:00 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * include/hbwince.h + * added WINBASEAPI in declaration of redefined functions + ; NOTE: if recent MSVC releases support above functions then they + should be covered by some macros + + * src/rdd/dbfcdx/dbfcdx1.c + * minor cleanup: EDBF_CREATE -> EDBF_CREATE_INDEX + 2014-02-01 09:11 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * include/hbwince.h - removed GetProcAddress() redefinition which forced ANSI diff --git a/include/hbwince.h b/include/hbwince.h index c25e53b449..cd97d6eafb 100644 --- a/include/hbwince.h +++ b/include/hbwince.h @@ -79,37 +79,37 @@ HB_EXTERN_BEGIN #endif #endif - BOOL WINAPI GetProcessTimes( HANDLE hprocess, - LPFILETIME lpCreationTime, LPFILETIME lpExitTime, - LPFILETIME lpKernelTime, LPFILETIME lpUserTime ); - BOOL WINAPI LockFile( HANDLE hFile, - DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh, - DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh ); - BOOL WINAPI LockFileEx( HANDLE hFile, - DWORD dwFlags, DWORD dwReserved, - DWORD nNumberOfBytesToLockLow, - DWORD nNumberOfBytesToLockHigh, LPOVERLAPPED lpOverlapped ); - BOOL WINAPI UnlockFile( HANDLE hFile, - DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh, - DWORD nNumberOfBytesToUnlockLow, DWORD nNumberOfBytesToUnlockHigh ); - BOOL WINAPI UnlockFileEx( HANDLE hFile, DWORD dwReserved, - DWORD nNumberOfBytesToUnlockLow, - DWORD nNumberOfBytesToUnlockHigh, LPOVERLAPPED lpOverlapped ); - UINT WINAPI SetErrorMode( UINT mode ); - HANDLE WINAPI GetStdHandle( DWORD nStdHandle ); - DWORD WINAPI GetFileType( HANDLE handle ); - BOOL WINAPI Beep( DWORD dwFreq, DWORD dwDurat ); - int WINAPI SetTextCharacterExtra( HDC hdc, int i ); - BOOL WINAPI GetKeyboardState( PBYTE p ); - BOOL WINAPI SetKeyboardState( PBYTE p ); + WINBASEAPI BOOL WINAPI GetProcessTimes( HANDLE hprocess, + LPFILETIME lpCreationTime, LPFILETIME lpExitTime, + LPFILETIME lpKernelTime, LPFILETIME lpUserTime ); + WINBASEAPI BOOL WINAPI LockFile( HANDLE hFile, + DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh, + DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh ); + WINBASEAPI BOOL WINAPI LockFileEx( HANDLE hFile, + DWORD dwFlags, DWORD dwReserved, + DWORD nNumberOfBytesToLockLow, + DWORD nNumberOfBytesToLockHigh, LPOVERLAPPED lpOverlapped ); + WINBASEAPI BOOL WINAPI UnlockFile( HANDLE hFile, + DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh, + DWORD nNumberOfBytesToUnlockLow, DWORD nNumberOfBytesToUnlockHigh ); + WINBASEAPI BOOL WINAPI UnlockFileEx( HANDLE hFile, DWORD dwReserved, + DWORD nNumberOfBytesToUnlockLow, + DWORD nNumberOfBytesToUnlockHigh, LPOVERLAPPED lpOverlapped ); + WINBASEAPI UINT WINAPI SetErrorMode( UINT mode ); + WINBASEAPI HANDLE WINAPI GetStdHandle( DWORD nStdHandle ); + WINBASEAPI DWORD WINAPI GetFileType( HANDLE handle ); + WINBASEAPI BOOL WINAPI Beep( DWORD dwFreq, DWORD dwDurat ); + WINBASEAPI int WINAPI SetTextCharacterExtra( HDC hdc, int i ); + WINBASEAPI BOOL WINAPI GetKeyboardState( PBYTE p ); + WINBASEAPI BOOL WINAPI SetKeyboardState( PBYTE p ); - int WINAPI FrameRect( HDC hDC, CONST RECT * lprc, HBRUSH hbr ); - BOOL WINAPI FloodFill( HDC hdc, int x, int y, COLORREF color); - BOOL WINAPI Arc( HDC hdc, int x1, int y1, int x2, int y2, int x3, int y3, int x4, int y4); + WINBASEAPI int WINAPI FrameRect( HDC hDC, CONST RECT * lprc, HBRUSH hbr ); + WINBASEAPI BOOL WINAPI FloodFill( HDC hdc, int x, int y, COLORREF color); + WINBASEAPI BOOL WINAPI Arc( HDC hdc, int x1, int y1, int x2, int y2, int x3, int y3, int x4, int y4); #endif /* _MSC_VER */ #if defined( _MSC_VER ) && ( _MSC_VER <= 1310 ) - int WINAPI MulDiv( int nNumber, int nNumerator, int nDenominator ); + WINBASEAPI int WINAPI MulDiv( int nNumber, int nNumerator, int nDenominator ); #endif #if defined( __POCC__ ) || ( defined( _MSC_VER ) && ( _MSC_VER <= 1500 ) ) diff --git a/src/rdd/dbfcdx/dbfcdx1.c b/src/rdd/dbfcdx/dbfcdx1.c index e77709b925..8f0f882fda 100644 --- a/src/rdd/dbfcdx/dbfcdx1.c +++ b/src/rdd/dbfcdx/dbfcdx1.c @@ -7677,7 +7677,7 @@ static HB_ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderI NULL, pError ); } if( ! pFile ) - bRetry = hb_cdxErrorRT( pArea, EG_CREATE, EDBF_CREATE, szFileName, + bRetry = hb_cdxErrorRT( pArea, EG_CREATE, EDBF_CREATE_INDEX, szFileName, hb_fsError(), EF_CANRETRY | EF_CANDEFAULT, &pError ) == E_RETRY; else