Modified:
trunk/MYODBCIns/include/MYODBCInsDataSource.h
trunk/MYODBCSetup/MYODBCSetupLib/MYODBCSetup.def
trunk/MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.vpj
trunk/MYSQLPlus/MYSQLPlusLib/MConnection.cpp
Log:
sqldriverconnect code clean compiles
Modified: trunk/MYODBCIns/include/MYODBCInsDataSource.h
===================================================================
--- trunk/MYODBCIns/include/MYODBCInsDataSource.h 2006-06-23 19:34:23 UTC (rev 366)
+++ trunk/MYODBCIns/include/MYODBCInsDataSource.h 2006-06-23 20:51:42 UTC (rev 367)
@@ -80,7 +80,6 @@
DATASOURCE_MODE_DSN_EDIT, /* For ConfigDSN() - ODBC_CONFIG_DSN.
*/
DATASOURCE_MODE_DSN_VIEW, /* For command-line tools to list DSN details.
*/
DATASOURCE_MODE_CONNECT /* For SQLDriverConnect().
*/
-
};
enum DATASOURCE_SCOPE
@@ -88,7 +87,6 @@
DATASOURCE_SCOPE_BOTH = ODBC_BOTH_DSN,
DATASOURCE_SCOPE_USER = ODBC_USER_DSN,
DATASOURCE_SCOPE_SYSTEM = ODBC_SYSTEM_DSN
-
};
BOOLEAN setAttributes( const QHash<QString,QString> &hashAttributes,
BOOLEAN bReplace = true, BOOLEAN bStrict = true );
Modified: trunk/MYODBCSetup/MYODBCSetupLib/MYODBCSetup.def
===================================================================
--- trunk/MYODBCSetup/MYODBCSetupLib/MYODBCSetup.def 2006-06-23 19:34:23 UTC (rev 366)
+++ trunk/MYODBCSetup/MYODBCSetupLib/MYODBCSetup.def 2006-06-23 20:51:42 UTC (rev 367)
@@ -7,3 +7,4 @@
+
Modified: trunk/MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.vpj
===================================================================
--- trunk/MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.vpj 2006-06-23 19:34:23 UTC (rev 366)
+++ trunk/MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.vpj 2006-06-23 20:51:42 UTC (rev 367)
@@ -189,6 +189,7 @@
<F N="MYODBCSetupDataSourceConfig.cpp"/>
<F N="MYODBCSetupDataSourceDialog.cpp"/>
<F N="MYODBCSetupDataSourceTab1.cpp"/>
+ <F N="MYODBCSetupDriverConnectPrompt.cpp"/>
</Folder>
<Folder
Name="Header Files"
Modified: trunk/MYSQLPlus/MYSQLPlusLib/MConnection.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MConnection.cpp 2006-06-23 19:34:23 UTC (rev 366)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MConnection.cpp 2006-06-23 20:51:42 UTC (rev 367)
@@ -2062,7 +2062,7 @@
/* failed to connect above so lets take it to another level */
if ( bPrompt )
{
- BOOL (*pFunc)( SQLHDBC, SQLHWND, MYODBCInsDriverConnect * );
+ BOOL (*pFunc)( SQLHWND, MYODBCInsDataSource * );
/*
At this point we should have a driver name (friendly name) either loaded
@@ -2084,33 +2084,30 @@
So a ncurses ver or a gtk ver etc could be created/used and this code is ok.
*/
MYODBCCInitLibrary();
- if ( !(hModule = MYODBCCLoadLibrary( pDriver->pszSETUP )) )
- {
- nReturn = getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0, "Could not
load the setup library." );
- goto MYODBCDrvDriverConnectExit1;
- }
+ if ( !(hModule = MYODBCCLoadLibrary( driver.getSETUP().utf16() )) )
+ MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
"Could not load the setup library." ) );
+
/*
The setup library should expose a MYODBCSetupDriverConnect() C entry point
for us to call.
*/
- pFunc = (BOOL (*)( SQLHDBC, SQLHWND, MYODBCInsDriverConnect * ))
MYODBCCGetProcAddress( hModule, "MYODBCSetupDriverConnect" );
+ pFunc = (BOOL (*)( SQLHWND, MYODBCInsDataSource * )) MYODBCCGetProcAddress(
hModule, "MYODBCSetupDataSourceConfig" );
if ( pFunc == NULL )
{
#ifdef WIN32
LPVOID pszMsg;
- FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
- NULL,
- GetLastError(),
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR) &pszMsg,
- 0,
- NULL );
-// MYODBCCfprintf( stderr, pszMsg );
- nReturn = getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0, pszMsg );
+ FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+ NULL,
+ GetLastError(),
+ MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ),
+ (LPTSTR)&pszMsg,
+ 0,
+ NULL );
+ nReturn = getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0,
QString::fromUtf16( (SQLWCHAR*)pszMsg ) );
LocalFree( pszMsg );
#else
- nReturn = getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0, "Could not
find MYODBCSetupDriverConnect in setup library." );
+ nReturn = getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0, "Could not
find MYODBCSetupDataSourceConfig in setup library." );
#endif
goto MYODBCDrvDriverConnectExit2;
}
@@ -2118,7 +2115,7 @@
/*
Prompt. Function returns false if user cancels.
*/
- if ( !pFunc( pDbc, hWnd, &driver ) )
+ if ( !pFunc( hWnd, &((MYODBCInsDataSource)driverconnect) ) )
{
nReturn = getDiagnostic()->doAppend( MDiagnostic::DIA_HY000, 0, "User
cancelled." );
goto MYODBCDrvDriverConnectExit2;
@@ -2131,6 +2128,8 @@
goto MYODBCDrvDriverConnectExit2;
MYODBCDrvDriverConnectExit3:
+ /* getting here means we have connected ok */
+
/*!
\internal ODBC Rule
@@ -2153,7 +2152,7 @@
{
QString stringConnectString = driverconnect.getConnectString();
- if ( !MYODBCC::doStringCopyOut( pszOutConnectionString, nBufferLength /
sizeof(SQLWCHAR), stringConnectString.utf16() ) )
+ if ( !MYODBCC::doStringCopyOut( pszOutConnectionString, nBufferLength /
sizeof(SQLWCHAR), (SQLWCHAR*)stringConnectString.utf16() ) )
{
getDiagnostic()->doAppend( MDiagnostic::DIA_01000, 0, "Something went
wrong while building the outgoing connect string." );
nReturn = SQL_SUCCESS_WITH_INFO;
@@ -2161,7 +2160,7 @@
}
if ( pnStringLength2Ptr )
- *pnStringLength2Ptr = strlen( pszOutConnectionString );
+ *pnStringLength2Ptr = wcslen( pszOutConnectionString );
}
MYODBCDrvDriverConnectExit2:
| Thread |
|---|
| • Connector/ODBC 5 commit: r367 - in trunk: MYODBCIns/include MYODBCSetup/MYODBCSetupLib MYSQLPlus/MYSQLPlusLib | pharvey | 23 Jun |
