Modified:
MYODBCC/MYODBCCLib/MYODBCC.cpp
MYODBCC/include/MYODBCC.h
MYODBCDbg/MYODBCDbgTest/MYODBCDbgTest.pro
MYSQLPlus/MYSQLPlusLib/MConnection.cpp
defines.pri
dltest/dltest.c
Log:
- start of port to VS 2003 so as to defer assemblies in VS 2005 (a dist complication) and
to support VS 2003
Modified: MYODBCC/MYODBCCLib/MYODBCC.cpp
===================================================================
--- MYODBCC/MYODBCCLib/MYODBCC.cpp 2006-05-12 22:25:26 UTC (rev 228)
+++ MYODBCC/MYODBCCLib/MYODBCC.cpp 2006-05-13 06:24:56 UTC (rev 229)
@@ -38,10 +38,17 @@
return calloc( nRecords, nRecordBytes );
}
+#ifdef wcsnlen
size_t MYODBCC::getStrLen( const SQLWCHAR *psz, size_t nMaxChars )
{
return wcsnlen( psz, nMaxChars );
}
+#else
+size_t MYODBCC::getStrLen( const SQLWCHAR *psz, size_t )
+{
+ return wcslen( psz );
+}
+#endif
QString MYODBCC::getConnectAttrString( SQLINTEGER nAttribute )
{
@@ -1376,10 +1383,20 @@
return memcpy( pDest, pSrc, nBytes );
}
-errno_t MYODBCC::doStrNCpy( SQLWCHAR *pszDest, size_t nMaxChars, const SQLWCHAR *pszSrc,
size_t nChars )
+#ifdef wcsncpy_s
+BOOLEAN MYODBCC::doStrNCpy( SQLWCHAR *pszDest, size_t nSizeInWords, const SQLWCHAR
*pszSrc, size_t nChars )
{
- return wcsncpy_s( pszDest, nMaxChars, pszSrc, nChars );
+ if ( wcsncpy_s( pszDest, nSizeInWords, pszSrc, nChars ) )
+ return false;
+ return true;
}
+#else
+BOOLEAN MYODBCC::doStrNCpy( SQLWCHAR *pszDest, size_t nChars, const SQLWCHAR *pszSrc )
+{
+ wcsncpy( pszDest, pszSrc, nChars );
+ return true;
+}
+#endif
void MYODBCC::doFree( void *p )
{
Modified: MYODBCC/include/MYODBCC.h
===================================================================
--- MYODBCC/include/MYODBCC.h 2006-05-12 22:25:26 UTC (rev 228)
+++ MYODBCC/include/MYODBCC.h 2006-05-13 06:24:56 UTC (rev 229)
@@ -71,8 +71,6 @@
#include <windows.h>
#endif
-// #include <string.h>
-
#include <sqltypes.h>
#include <odbcinst.h>
#include <sqlext.h>
@@ -245,7 +243,11 @@
static QString getInstallerErrorString( RETCODE nRetCode );
static void * doMemCpy( void *pDest, const void *pSrc, size_t nBytes );
- static errno_t doStrNCpy( SQLWCHAR *pszDest, size_t nMaxChars, const SQLWCHAR
*pszSrc, size_t nChars = _TRUNCATE );
+#ifdef _TRUNCATE
+ static BOOLEAN doStrNCpy( SQLWCHAR *pszDest, size_t nSizeInWords, const SQLWCHAR
*pszSrc, size_t nChars = _TRUNCATE );
+#else
+ static BOOLEAN doStrNCpy( SQLWCHAR *pszDest, size_t nSizeInWords, const SQLWCHAR
*pszSrc );
+#endif
static void doFree( void *p );
static BOOLEAN isConnectAttr( SQLINTEGER nAttribute );
Modified: MYODBCDbg/MYODBCDbgTest/MYODBCDbgTest.pro
===================================================================
--- MYODBCDbg/MYODBCDbgTest/MYODBCDbgTest.pro 2006-05-12 22:25:26 UTC (rev 228)
+++ MYODBCDbg/MYODBCDbgTest/MYODBCDbgTest.pro 2006-05-13 06:24:56 UTC (rev 229)
@@ -14,8 +14,6 @@
LIBS += -lMYODBCDbg
LIBS += -lMYODBCC
-LIBS += /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcrtd.lib
-
# #########################################################
# FILES
# #########################################################
Modified: MYSQLPlus/MYSQLPlusLib/MConnection.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MConnection.cpp 2006-05-12 22:25:26 UTC (rev 228)
+++ MYSQLPlus/MYSQLPlusLib/MConnection.cpp 2006-05-13 06:24:56 UTC (rev 229)
@@ -306,15 +306,13 @@
/* copy string */
if ( pValue )
{
- errno_t nError;
-
if ( getCurrentCatalog().isNull() )
{
MYODBCDbgReturn( SQL_NO_DATA );
*pnLen = 0;
}
- else if ( nError = MYODBCC::doStrNCpy( (SQLWCHAR*)pValue, nBufferLength /
sizeof(SQLWCHAR), getCurrentCatalog().utf16() ) )
- MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY000,
nError, tr("doStrNCpy() failed.") ) );
+ else if ( !MYODBCC::doStrNCpy( (SQLWCHAR*)pValue, nBufferLength /
sizeof(SQLWCHAR), getCurrentCatalog().utf16() ) )
+ MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY000, 0,
tr("doStrNCpy() failed.") ) );
}
/* copy len */
@@ -373,15 +371,13 @@
/* copy string */
if ( pValue )
{
- errno_t nError;
-
if ( getTracefile().isNull() )
{
MYODBCDbgReturn( SQL_NO_DATA );
*pnLen = 0;
}
- else if ( nError = MYODBCC::doStrNCpy( (SQLWCHAR*)pValue, nBufferLength /
sizeof(SQLWCHAR), getTracefile().utf16() ) )
- MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY000,
nError, tr("doStrNCpy() failed.") ) );
+ else if ( !MYODBCC::doStrNCpy( (SQLWCHAR*)pValue, nBufferLength /
sizeof(SQLWCHAR), getTracefile().utf16() ) )
+ MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY000, 0,
tr("doStrNCpy() failed.") ) );
}
/* copy len */
@@ -404,15 +400,13 @@
/* copy string */
if ( pValue )
{
- errno_t nError;
-
if ( getTranslateLib().isNull() )
{
MYODBCDbgReturn( SQL_NO_DATA );
*pnLen = 0;
}
- else if ( nError = MYODBCC::doStrNCpy( (SQLWCHAR*)pValue, nBufferLength /
sizeof(SQLWCHAR), getTranslateLib().utf16() ) )
- MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY000,
nError, tr("doStrNCpy() failed.") ) );
+ else if ( !MYODBCC::doStrNCpy( (SQLWCHAR*)pValue, nBufferLength /
sizeof(SQLWCHAR), getTranslateLib().utf16() ) )
+ MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY000, 0,
tr("doStrNCpy() failed.") ) );
}
/* copy len */
Modified: defines.pri
===================================================================
--- defines.pri 2006-05-12 22:25:26 UTC (rev 228)
+++ defines.pri 2006-05-13 06:24:56 UTC (rev 229)
@@ -65,7 +65,7 @@
# #########################################################
# Enable/disable UNICODE build option.
# #########################################################
-# DEFINES -= UNICODE _UNICODE
+# DEFINES += UNICODE _UNICODE
# #########################################################
# LDFLAGS was brought in to get -ldl for Solaris 8 build
Modified: dltest/dltest.c
===================================================================
--- dltest/dltest.c 2006-05-12 22:25:26 UTC (rev 228)
+++ dltest/dltest.c 2006-05-13 06:24:56 UTC (rev 229)
@@ -8,6 +8,11 @@
#include <tchar.h>
#endif
+#ifndef _tprintf_s
+#define _tprintf_s _tprintf
+#endif
+
+
TCHAR *szSyntax =
_T("\n") \
_T("+--- \n") \
@@ -112,7 +117,7 @@
_tprintf_s( _T("[%s][%d] SUCCESS: Loaded %s\n"), _T(__FILE__), __LINE__, argv[1] );
if ( argc > 2 )
{
-#ifdef _UNICODE
+#ifdef UNICODE
char szProcName[500];
WideCharToMultiByte( CP_THREAD_ACP,
| Thread |
|---|
| • Connector/ODBC 5 commit: r229 - / MYODBCC/MYODBCCLib MYODBCC/include MYODBCDbg/MYODBCDbgTest MYSQLPlus/MYSQLPlusLib dltest | pharvey | 13 May |
