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

2008-06-22 12:24 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/hbw32ddr/w32_ddrw.cpp
   * contrib/hbodbc/odbc.c
     ! Fixed to compile with MSVS2008 in AMD64 mode.
       [1.0.0RC1]
This commit is contained in:
Viktor Szakats
2008-06-22 10:26:06 +00:00
parent 7bc6379636
commit 2f234938d9
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -8,6 +8,12 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-06-22 12:24 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbw32ddr/w32_ddrw.cpp
* contrib/hbodbc/odbc.c
! Fixed to compile with MSVS2008 in AMD64 mode.
[1.0.0RC1]
2008-06-22 10:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/mtpl_b32.mak
* contrib/mtpl_gcc.mak

21
harbour/contrib/hbodbc/odbc.c
View File

@@ -240,7 +240,7 @@ HB_FUNC( SQLFETCH ) /* HB_SQLFETCH( hStmt ) --> nRetCode */
HB_FUNC( SQLGETDATA ) /* HB_SQLGETDATA( hStmt, nField, nType, nLen, @cBuffer ) --> nRetCode */
{
SDWORD lLen, lInitBuff;
SQLLEN lLen, lInitBuff;
PTR bBuffer, bOut;
WORD wType, wResult;
int iReallocs = 0;
@@ -317,7 +317,7 @@ HB_FUNC( SQLDESCRIB )
SDWORD lLen = ( SDWORD ) hb_parnl( 4 );
SQLSMALLINT wBufLen = hb_parni( 5 );
SQLSMALLINT wDataType = hb_parni( 6 );
SQLUINTEGER wColSize = hb_parni( 7 );
SQLULEN wColSize = hb_parni( 7 );
SQLSMALLINT wDecimals = hb_parni( 8 );
SQLSMALLINT wNullable = hb_parni( 9 );
#if defined( HB_OS_WIN_32 ) && defined( UNICODE )
@@ -327,9 +327,14 @@ HB_FUNC( SQLDESCRIB )
#endif
WORD wResult;
wResult = SQLDescribeCol( ( HSTMT ) hb_parnl( 1 ), hb_parni( 2 ),
buffer, ( SQLSMALLINT ) lLen, &wBufLen,
&wDataType, &wColSize, &wDecimals,
wResult = SQLDescribeCol( ( HSTMT ) hb_parnl( 1 ),
hb_parni( 2 ),
buffer,
( SQLSMALLINT ) lLen,
&wBufLen,
&wDataType,
&wColSize,
&wDecimals,
&wNullable );
if( wResult == SQL_SUCCESS || wResult == SQL_SUCCESS_WITH_INFO )
@@ -367,7 +372,7 @@ HB_FUNC( SQLCOLATTRIBUTE )
#if defined(__DMC__)
(SQLINTEGER FAR*) &wNumPtr );
#else
(SQLPOINTER) &wNumPtr );
(SQLLEN *) &wNumPtr );
#endif
if( wResult == SQL_SUCCESS || wResult == SQL_SUCCESS_WITH_INFO )
@@ -385,7 +390,7 @@ HB_FUNC( SQLCOLATTRIBUTE )
/* HB_SQLEXTENDEDFETCH( hStmt, nOrientation, nOffset, @nRows, @nRowStatus ) */
HB_FUNC( SQLEXTENDE )
{
SQLUINTEGER uiRowCountPtr = hb_parni( 4 );
SQLULEN uiRowCountPtr = hb_parni( 4 );
SQLUSMALLINT siRowStatus = hb_parni( 5 );
WORD wResult = SQLExtendedFetch( ( HSTMT ) hb_parnl( 1 ),
( USHORT )hb_parnl( 2 ),
@@ -535,7 +540,7 @@ HB_FUNC( SQLEXECUTE ) /* HB_SQLEXECUTE( hStmt ) --> nRetCode */
HB_FUNC( SQLEXECUTESCALAR )
{
HSTMT hStmt;
SDWORD lLen;
SQLLEN lLen;
BYTE bBuffer[ 256 ];
SWORD wResult;

5
harbour/contrib/hbw32ddr/w32_ddrw.cpp
View File

@@ -372,7 +372,7 @@ void hb_dd_RenderSprites( long control )
//------------------------------------------------------------------//
long _stdcall hb_dd_DDWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
LRESULT _stdcall hb_dd_DDWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
{
HRESULT hRet;
int nVirtKey;
@@ -780,12 +780,11 @@ HB_FUNC( DD_CREATEWINDOW )
hb_dd_g_xWindow = x;
hb_dd_g_yWindow = y;
WNDCLASS wndClass = { CS_HREDRAW | CS_VREDRAW, hb_dd_DDWndProc, 0, 0, m_hInstance,
NULL,
LoadCursor(NULL, IDC_ARROW),
(HBRUSH)GetStockObject(BLACK_BRUSH),
NULL,
NULL,
TEXT("4dNow") };
RegisterClass( &wndClass );