From 2f234938d95f819d86265cf3b5ce3b32bea47d24 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 22 Jun 2008 10:26:06 +0000
Subject: [PATCH] 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]

---
 harbour/ChangeLog                     |  6 ++++++
 harbour/contrib/hbodbc/odbc.c         | 21 +++++++++++++--------
 harbour/contrib/hbw32ddr/w32_ddrw.cpp |  5 ++---
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 744dd3696c..3c021f1f4e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -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
diff --git a/harbour/contrib/hbodbc/odbc.c b/harbour/contrib/hbodbc/odbc.c
index d686c43b80..660eee364e 100644
--- a/harbour/contrib/hbodbc/odbc.c
+++ b/harbour/contrib/hbodbc/odbc.c
@@ -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;
 
diff --git a/harbour/contrib/hbw32ddr/w32_ddrw.cpp b/harbour/contrib/hbw32ddr/w32_ddrw.cpp
index 48b9ea1de1..41f8eedddc 100644
--- a/harbour/contrib/hbw32ddr/w32_ddrw.cpp
+++ b/harbour/contrib/hbw32ddr/w32_ddrw.cpp
@@ -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 );