Connector/ODBC 3.51 commit: r847 - in branches/guffert: . driver util

[jbalint]

Modified:
   branches/guffert/CMakeLists.txt
   branches/guffert/ChangeLog
   branches/guffert/driver/connect.c
   branches/guffert/util/CMakeLists.txt
Log:
fixed SQLDriverConnect() to copy the in->out if a connection is made without prompting
(was causing -7778 in Access)
completed build changes to make the native gui default on windows builds

Modified: branches/guffert/CMakeLists.txt
===================================================================
--- branches/guffert/CMakeLists.txt	2007-11-09 20:58:16 UTC (rev 846)
+++ branches/guffert/CMakeLists.txt	2007-11-09 22:13:15 UTC (rev 847)
@@ -27,6 +27,7 @@
 
 #-------------- find qt and mysql --------------------
 IF(NOT DISABLE_GUI)
+IF(USE_LEGACY_ODBC_GUI)
 	INCLUDE(FindQt)
 
 	INCLUDE_DIRECTORIES(${QT_INCLUDES})
@@ -60,6 +61,7 @@
 					${QT_CORE_LIB_DEPENDENCIES} ${QT_GUI_LIB_DEPENDENCIES})
 		ENDIF (NOT QT_LIBRARIES)
 	ENDIF (CMAKE_BUILD_TYPE STREQUAL Debug)
+ENDIF(USE_LEGACY_ODBC_GUI)
 ENDIF(NOT DISABLE_GUI)
 
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/FindMySQL.cmake)
@@ -145,20 +147,27 @@
 SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
 SET(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/lib")
 
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
+
+IF(USE_LEGACY_ODBC_GUI)
+	ADD_DEFINITIONS(-DUSE_LEGACY_ODBC_GUI)
+ENDIF(USE_LEGACY_ODBC_GUI)
+
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(driver)
 
 IF(NOT DISABLE_GUI)
-	ADD_SUBDIRECTORY(setup)
+	IF(USE_LEGACY_ODBC_GUI)
+		ADD_SUBDIRECTORY(setup)
+		ADD_SUBDIRECTORY(dsn-editor)
+	ELSE(USE_LEGACY_ODBC_GUI)
+		ADD_SUBDIRECTORY(wingui)
+	ENDIF(USE_LEGACY_ODBC_GUI)
 ENDIF(NOT DISABLE_GUI)
 
 ADD_SUBDIRECTORY(dltest)
 ADD_SUBDIRECTORY(installer)
 ADD_SUBDIRECTORY(monitor)
 
-IF(NOT DISABLE_GUI)
-	ADD_SUBDIRECTORY(dsn-editor)
-ENDIF(NOT DISABLE_GUI)
-
 ADD_SUBDIRECTORY(test)
 

Modified: branches/guffert/ChangeLog
===================================================================
--- branches/guffert/ChangeLog	2007-11-09 20:58:16 UTC (rev 846)
+++ branches/guffert/ChangeLog	2007-11-09 22:13:15 UTC (rev 847)
@@ -3,7 +3,6 @@
   Functionality to add or change:
   * Add support for SQL_NUMERIC_STRUCT (Bug #3028):
     http://msdn2.microsoft.com/en-us/library/ms714556.aspx
-  * Implement native Windows setup library
   * Implement native Mac OS X setup library
   * Replace OPTIONS flags with individual DSN settings (but support OPTIONS
     for backwards-compatibility)
@@ -29,6 +28,7 @@
   * Replaced the internal library which handles creation and loading
     of DSN information. The new library, which was originally a part of
     Connector/ODBC 5.0, supports Unicode option values.
+  * Implement native Windows setup library
 
   Bugs fixed:
   * SQL statements limited to 64k. (Bug #30983)

Modified: branches/guffert/driver/connect.c
===================================================================
--- branches/guffert/driver/connect.c	2007-11-09 20:58:16 UTC (rev 846)
+++ branches/guffert/driver/connect.c	2007-11-09 22:13:15 UTC (rev 847)
@@ -43,8 +43,6 @@
 # define CLIENT_NO_SCHEMA      16
 #endif
 
-#define USE_LEGACY_ODBC_GUI
-
 #ifndef USE_LEGACY_ODBC_GUI
 typedef BOOL (*PromptFunc)(SQLHWND, SQLWCHAR *, SQLUSMALLINT,
                            SQLWCHAR *, SQLSMALLINT, SQLSMALLINT *);
@@ -768,7 +766,17 @@
 connected:
 
 #ifndef USE_LEGACY_ODBC_GUI
-  /* return SQL_SUCCESS_WITH_INFO if truncated */
+  /* copy input to output if connected without prompting */
+  if (!bPrompt)
+  {
+    size_t inlen= (sqlwcharlen(szConnStrIn) + 1) * sizeof(SQLWCHAR);
+    size_t copylen= min((size_t)cbConnStrOutMax, inlen);
+    memcpy(szConnStrOut, szConnStrIn, copylen);
+    if (pcbConnStrOut)
+      *pcbConnStrOut= copylen;
+  }
+
+  /* return SQL_SUCCESS_WITH_INFO if truncated output string */
   if (pcbConnStrOut && cbConnStrOutMax > *pcbConnStrOut)
   {
     set_dbc_error(hdbc, "01004", "String data, right truncated.", 0);

Modified: branches/guffert/util/CMakeLists.txt
===================================================================
--- branches/guffert/util/CMakeLists.txt	2007-11-09 20:58:16 UTC (rev 846)
+++ branches/guffert/util/CMakeLists.txt	2007-11-09 22:13:15 UTC (rev 847)
@@ -26,7 +26,7 @@
                   installer.c
                   installer.h)
 
-#IF(NOT WIN32)
+#IF(USE_LEGACY_ODBC_GUI)
   SET(myodbc3u_SRCS ${myodbc3u_SRCS}
                         MYODBCUtilAllocDataSource.c
                         MYODBCUtilAllocDriver.c
@@ -48,7 +48,7 @@
                         MYODBCUtilWriteDataSource.c
                         MYODBCUtilWriteDataSourceStr.c
                         MYODBCUtilWriteDriver.c)
-#ENDIF(NOT WIN32)
+#ENDIF(USE_LEGACY_ODBC_GUI)
 
 ADD_LIBRARY(myodbc3u STATIC ${myodbc3u_SRCS})