Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unicode build fixes for GTK not knowing what SQL_WCHAR and SQL_WVARCHAR are in non-unicode builds

Browse Source 
Buffer overrun fix


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2005-02-02 14:38:05 +00:00
parent 580820e398
commit 69baadbbd1
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/db.cpp
View File

@@ -85,7 +85,7 @@ static wxString SQLLOGfn = SQL_LOG_FILENAME;
// will overwrite the errors of the previously destroyed wxDb object in // will overwrite the errors of the previously destroyed wxDb object in
// this variable. NOTE: This occurs during a CLOSE, not a FREEing of the // this variable. NOTE: This occurs during a CLOSE, not a FREEing of the
// connection // connection
wxChar DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN]; wxChar DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN+1];
// This type defines the return row-struct form // This type defines the return row-struct form
@@ -287,8 +287,16 @@ int wxDbColFor::Format(int Nation, int dbDataType, SWORD sqlDataType,
if (i_dbDataType == 0) // Filter unsupported dbDataTypes if (i_dbDataType == 0) // Filter unsupported dbDataTypes
{ {
if ((i_sqlDataType == SQL_VARCHAR) || (i_sqlDataType == SQL_LONGVARCHAR) || if ((i_sqlDataType == SQL_VARCHAR)
(i_sqlDataType == SQL_WCHAR) || (i_sqlDataType == SQL_WVARCHAR)) #if wxUSE_UNICODE
#if defined(SQL_WCHAR)
|| (i_sqlDataType == SQL_WCHAR)
#endif
#if defined(SQL_WVARCHAR)
|| (i_sqlDataType == SQL_WVARCHAR)
#endif
#endif
|| (i_sqlDataType == SQL_LONGVARCHAR))
i_dbDataType = DB_DATA_TYPE_VARCHAR; i_dbDataType = DB_DATA_TYPE_VARCHAR;
if ((i_sqlDataType == SQL_C_DATE) || (i_sqlDataType == SQL_C_TIMESTAMP)) if ((i_sqlDataType == SQL_C_DATE) || (i_sqlDataType == SQL_C_TIMESTAMP))
i_dbDataType = DB_DATA_TYPE_DATE; i_dbDataType = DB_DATA_TYPE_DATE;
@@ -2272,8 +2280,14 @@ bool wxDb::ExecSql(const wxString &pSqlStmt, wxDbColInf** columns, short& numcol
switch (Sdword) switch (Sdword)
{ {
#if wxUSE_UNICODE
#if defined(SQL_WCHAR)
case SQL_WCHAR: case SQL_WCHAR:
#endif
#if defined(SQL_WVARCHAR)
case SQL_WVARCHAR: case SQL_WVARCHAR:
#endif
#endif
case SQL_VARCHAR: case SQL_VARCHAR:
case SQL_CHAR: case SQL_CHAR:
pColInf[colNum].dbDataType = DB_DATA_TYPE_VARCHAR; pColInf[colNum].dbDataType = DB_DATA_TYPE_VARCHAR;
@@ -3049,8 +3063,14 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh
// Get the intern datatype // Get the intern datatype
switch (colInf[colNo].sqlDataType) switch (colInf[colNo].sqlDataType)
{ {
#if wxUSE_UNICODE
#if defined(SQL_WCHAR)
case SQL_WCHAR: case SQL_WCHAR:
#endif
#if defined(SQL_WVARCHAR)
case SQL_WVARCHAR: case SQL_WVARCHAR:
#endif
#endif
case SQL_VARCHAR: case SQL_VARCHAR:
case SQL_CHAR: case SQL_CHAR:
colInf[colNo].dbDataType = DB_DATA_TYPE_VARCHAR; colInf[colNo].dbDataType = DB_DATA_TYPE_VARCHAR;