You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by ar...@apache.org on 2015/11/23 22:05:23 UTC

[1/2] incubator-trafodion git commit: [TRAFODION-1557]connot connect using Tableau

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 1baeae616 -> d2c47ec52


[TRAFODION-1557]connot connect using Tableau

[TRAOFDION-1557] DataSource cannot connect using Tableau
using LONG_PTR instead of long to cast a point in some MFC function.
in Windows 10 x64 , Visual Stduio 2013, long is 4 bytes and point is 8 bytes.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/20a50306
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/20a50306
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/20a50306

Branch: refs/heads/master
Commit: 20a503063eb8898e02abbea3e812daff0412b648
Parents: 64bffa7
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Fri Nov 20 18:02:09 2015 +0800
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Fri Nov 20 18:02:09 2015 +0800

----------------------------------------------------------------------
 win-odbc64/odbcclient/drvr35/cconnect.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/20a50306/win-odbc64/odbcclient/drvr35/cconnect.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/cconnect.cpp b/win-odbc64/odbcclient/drvr35/cconnect.cpp
index b8e9b79..53786ac 100644
--- a/win-odbc64/odbcclient/drvr35/cconnect.cpp
+++ b/win-odbc64/odbcclient/drvr35/cconnect.cpp
@@ -928,7 +928,7 @@ INT_PTR CALLBACK ConnectDialogProc(
 	{
 	case WM_INITDIALOG:
 		connectFieldItems = (CONNECT_FIELD_ITEMS *)lParam;
-		SetWindowLongPtr(hwndDlg,GWLP_USERDATA,(long)connectFieldItems);
+		SetWindowLongPtr(hwndDlg,GWLP_USERDATA,(LONG_PTR)connectFieldItems);
 	    retCode = SetDlgItemText(hwndDlg, IDC_LOGIN_ID, connectFieldItems->loginId);
   		retCode = SetDlgItemText(hwndDlg, IDC_PASSWORD, connectFieldItems->password);
   		retCode = SetDlgItemText(hwndDlg, IDC_CATALOG, connectFieldItems->catalog);
@@ -1123,7 +1123,7 @@ INT_PTR CALLBACK ChangePwdProc(
 	{
 	case WM_INITDIALOG:
 		connectFieldItems = (CONNECT_FIELD_ITEMS *)lParam;
-		SetWindowLongPtr(hwndDlg,GWLP_USERDATA,(long)connectFieldItems);
+		SetWindowLongPtr(hwndDlg,GWLP_USERDATA,(LONG_PTR)connectFieldItems);
   		retCode = SetDlgItemText(hwndDlg, IDC_USERNAME, connectFieldItems->loginId);
 		hwndOwner = GetDesktopWindow(); 
 
@@ -1789,13 +1789,13 @@ SQLRETURN CConnect::DriverConnect(SQLHWND WindowHandle,
 			if (hinst != NULL) {
 				DialogRetCode = DialogBoxParam(hinst,
 					MAKEINTRESOURCE(IDD_CONNECT_DIALOG),
-					WindowHandle, ConnectDialogProc, (long)&connectFieldItems);
+					WindowHandle, ConnectDialogProc, (LONG_PTR)&connectFieldItems);
 				FreeLibrary(hinst);
 			}
 			else {
 				DialogRetCode = DialogBoxParam(gDrvrGlobal.gModuleHandle,
 					MAKEINTRESOURCE(IDD_CONNECT_DIALOG),
-					WindowHandle, ConnectDialogProc, (long)&connectFieldItems);
+					WindowHandle, ConnectDialogProc, (LONG_PTR)&connectFieldItems);
 			}
 		}
 


[2/2] incubator-trafodion git commit: Merge [TRAFODION-1557]PR 183 Cannot connect using Tableau

Posted by ar...@apache.org.
Merge [TRAFODION-1557]PR 183 Cannot connect using Tableau


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d2c47ec5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d2c47ec5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d2c47ec5

Branch: refs/heads/master
Commit: d2c47ec5293222f2a9761338b5cd4e8b396334c0
Parents: 1baeae6 20a5030
Author: Arvind Narain <ar...@apache.org>
Authored: Mon Nov 23 21:03:42 2015 +0000
Committer: Arvind Narain <ar...@apache.org>
Committed: Mon Nov 23 21:03:42 2015 +0000

----------------------------------------------------------------------
 win-odbc64/odbcclient/drvr35/cconnect.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------