Headers diff for odbc32.dll between 6.0.6002.18005-Windows 6.0 and 6.1.7601.17514-Windows 7.0 versions



 sql.h (6.0.6002.18005-Windows 6.0)   sql.h (6.1.7601.17514-Windows 7.0) 
skipping to change at line 16 skipping to change at line 16
// Contents: This is the the main include for ODBC Core functions. // Contents: This is the the main include for ODBC Core functions.
// //
// Comments: preconditions: #include "windows.h" // Comments: preconditions: #include "windows.h"
// //
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef __SQL #ifndef __SQL
#define __SQL #define __SQL
/* /*
* ODBCVER ODBC version number (0x0351). To exclude * ODBCVER Default to ODBC version number (0x0380). To exclude
* definitions introduced in version 3.5 (or above) * definitions introduced in version 3.8 (or above)
* #define ODBCVER 0x0300 before #including <sql.h> * #define ODBCVER 0x0351 before #including <sql.h>
*/ */
#ifndef ODBCVER #ifndef ODBCVER
#define ODBCVER 0x0351 #define ODBCVER 0x0380
#endif #endif
#ifndef __SQLTYPES #ifndef __SQLTYPES
#include "sqltypes.h" #include "sqltypes.h"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */ extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */ #endif /* __cplusplus */
/* special length/indicator values */ /* special length/indicator values */
#define SQL_NULL_DATA (-1) #define SQL_NULL_DATA (-1)
#define SQL_DATA_AT_EXEC (-2) #define SQL_DATA_AT_EXEC (-2)
/* return values from functions */ /* return values from functions */
#define SQL_SUCCESS 0 #define SQL_SUCCESS 0
#define SQL_SUCCESS_WITH_INFO 1 #define SQL_SUCCESS_WITH_INFO 1
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
#define SQL_NO_DATA 100 #define SQL_NO_DATA 100
#endif #endif
#define SQL_ERROR (-1)
#define SQL_INVALID_HANDLE (-2)
#define SQL_STILL_EXECUTING 2 #if (ODBCVER >= 0x0380)
#define SQL_NEED_DATA 99 #define SQL_PARAM_DATA_AVAILABLE 101
#endif
#define SQL_ERROR (-1)
#define SQL_INVALID_HANDLE (-2)
#define SQL_STILL_EXECUTING 2
#define SQL_NEED_DATA 99
/* test for SQL_SUCCESS or SQL_SUCCESS_WITH_INFO */ /* test for SQL_SUCCESS or SQL_SUCCESS_WITH_INFO */
#define SQL_SUCCEEDED(rc) (((rc)&(~1))==0) #define SQL_SUCCEEDED(rc) (((rc)&(~1))==0)
/* flags for null-terminated string */ /* flags for null-terminated string */
#define SQL_NTS (-3) #define SQL_NTS (-3)
#define SQL_NTSL (-3L) #define SQL_NTSL (-3L)
/* maximum message length */ /* maximum message length */
#define SQL_MAX_MESSAGE_LENGTH 512 #define SQL_MAX_MESSAGE_LENGTH 512
skipping to change at line 212 skipping to change at line 217
#define SQL_DEFAULT 99 #define SQL_DEFAULT 99
#endif #endif
/* SQLSQLLEN GetData() code indicating that the application row descriptor /* SQLSQLLEN GetData() code indicating that the application row descriptor
* specifies the data type * specifies the data type
*/ */
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
#define SQL_ARD_TYPE (-99) #define SQL_ARD_TYPE (-99)
#endif #endif
#if (ODBCVER >= 0x0380)
#define SQL_APD_TYPE (-100)
#endif
/* SQL date/time type subcodes */ /* SQL date/time type subcodes */
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
#define SQL_CODE_DATE 1 #define SQL_CODE_DATE 1
#define SQL_CODE_TIME 2 #define SQL_CODE_TIME 2
#define SQL_CODE_TIMESTAMP 3 #define SQL_CODE_TIMESTAMP 3
#endif #endif
/* CLI option values */ /* CLI option values */
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
#define SQL_FALSE 0 #define SQL_FALSE 0
skipping to change at line 400 skipping to change at line 409
#define SQL_API_SQLSETPARAM 22 #define SQL_API_SQLSETPARAM 22
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
#define SQL_API_SQLSETSTMTATTR 1020 #define SQL_API_SQLSETSTMTATTR 1020
#endif #endif
#define SQL_API_SQLSETSTMTOPTION 51 #define SQL_API_SQLSETSTMTOPTION 51
#define SQL_API_SQLSPECIALCOLUMNS 52 #define SQL_API_SQLSPECIALCOLUMNS 52
#define SQL_API_SQLSTATISTICS 53 #define SQL_API_SQLSTATISTICS 53
#define SQL_API_SQLTABLES 54 #define SQL_API_SQLTABLES 54
#define SQL_API_SQLTRANSACT 23 #define SQL_API_SQLTRANSACT 23
#if (ODBCVER >= 0x0380)
#define SQL_API_SQLCANCELHANDLE 1022
#endif
/* Information requested by SQLGetInfo() */ /* Information requested by SQLGetInfo() */
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
#define SQL_MAX_DRIVER_CONNECTIONS 0 #define SQL_MAX_DRIVER_CONNECTIONS 0
#define SQL_MAXIMUM_DRIVER_CONNECTIONS SQL_MAX_DRIVER_CONNECTIONS #define SQL_MAXIMUM_DRIVER_CONNECTIONS SQL_MAX_DRIVER_CONNECTIONS
#define SQL_MAX_CONCURRENT_ACTIVITIES 1 #define SQL_MAX_CONCURRENT_ACTIVITIES 1
#define SQL_MAXIMUM_CONCURRENT_ACTIVITIES SQL_MAX_CONCURRENT_ACTIVITIES #define SQL_MAXIMUM_CONCURRENT_ACTIVITIES SQL_MAX_CONCURRENT_ACTIVITIES
#endif #endif
#define SQL_DATA_SOURCE_NAME 2 #define SQL_DATA_SOURCE_NAME 2
#define SQL_FETCH_DIRECTION 8 #define SQL_FETCH_DIRECTION 8
#define SQL_SERVER_NAME 13 #define SQL_SERVER_NAME 13
skipping to change at line 576 skipping to change at line 589
#define SQL_TXN_SERIALIZABLE 0x00000008L #define SQL_TXN_SERIALIZABLE 0x00000008L
#define SQL_TRANSACTION_SERIALIZABLE SQL_TXN_SERIALIZABLE #define SQL_TRANSACTION_SERIALIZABLE SQL_TXN_SERIALIZABLE
/* SQL_NULL_COLLATION values */ /* SQL_NULL_COLLATION values */
#define SQL_NC_HIGH 0 #define SQL_NC_HIGH 0
#define SQL_NC_LOW 1 #define SQL_NC_LOW 1
#ifndef RC_INVOKED #ifndef RC_INVOKED
SQLRETURN SQL_API SQLAllocConnect(SQLHENV EnvironmentHandle, SQLRETURN SQL_API SQLAllocConnect(SQLHENV EnvironmentHandle,
SQLHDBC *ConnectionHandle); __out SQLHDBC *ConnectionHandle);
SQLRETURN SQL_API SQLAllocEnv(SQLHENV *EnvironmentHandle); SQLRETURN SQL_API SQLAllocEnv(__out SQLHENV *EnvironmentHandle);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLAllocHandle(SQLSMALLINT HandleType, SQLRETURN SQL_API SQLAllocHandle(SQLSMALLINT HandleType,
SQLHANDLE InputHandle, SQLHANDLE *OutputHandle); SQLHANDLE InputHandle, __out SQLHANDLE *OutputHandle);
#endif #endif
SQLRETURN SQL_API SQLAllocStmt(SQLHDBC ConnectionHandle, SQLRETURN SQL_API SQLAllocStmt(SQLHDBC ConnectionHandle,
SQLHSTMT *StatementHandle); __out SQLHSTMT *StatementHandle);
SQLRETURN SQL_API SQLBindCol(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLBindCol(SQLHSTMT StatementHandle,
SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
SQLPOINTER TargetValue, SQLLEN BufferLength, __inout_xcount_opt(BufferLength) SQLPOINTER TargetValue,
SQLLEN *StrLen_or_Ind); SQLLEN BufferLength, __inout_opt SQLLEN *StrLen_or_Ind);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLBindParam(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLBindParam(SQLHSTMT StatementHandle,
SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
SQLSMALLINT ParameterType, SQLULEN LengthPrecision, SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue, SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
SQLLEN *StrLen_or_Ind); SQLLEN *StrLen_or_Ind);
#endif #endif
SQLRETURN SQL_API SQLCancel(SQLHSTMT StatementHandle); SQLRETURN SQL_API SQLCancel(SQLHSTMT StatementHandle);
#if (ODBCVER >= 0x0380)
SQLRETURN SQL_API SQLCancelHandle(SQLSMALLINT HandleType, SQLHANDLE InputHandle
);
#endif // ODBCVER >= 0x0380
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLCloseCursor(SQLHSTMT StatementHandle); SQLRETURN SQL_API SQLCloseCursor(SQLHSTMT StatementHandle);
#ifdef _WIN64 #ifdef _WIN64
SQLRETURN SQL_API SQLColAttribute (SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLColAttribute (SQLHSTMT StatementHandle,
SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier, SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier,
SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength, __out_bcount_opt(BufferLength) SQLPOINTER CharacterAttribute, SQLSMAL
SQLSMALLINT *StringLength, SQLLEN *NumericAttribute); LINT BufferLength,
__out_opt SQLSMALLINT *StringLength, __out_opt SQLLEN *NumericAttribu
te);
#else #else
SQLRETURN SQL_API SQLColAttribute (SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLColAttribute (SQLHSTMT StatementHandle,
SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier, SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier,
SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength, __out_bcount_opt(BufferLength) SQLPOINTER CharacterAttribute, SQLSMAL
SQLSMALLINT *StringLength, SQLPOINTER NumericAttribute); LINT BufferLength,
__out_opt SQLSMALLINT *StringLength, __out_opt SQLPOINTER NumericAttr
ibute);
#endif #endif
#endif #endif
SQLRETURN SQL_API SQLColumns(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLColumns(SQLHSTMT StatementHandle,
SQLCHAR *CatalogName, SQLSMALLINT NameLength1, __in_ecount_opt(NameLength1) SQLCHAR *CatalogName, SQLSMALLINT NameLe
SQLCHAR *SchemaName, SQLSMALLINT NameLength2, ngth1,
SQLCHAR *TableName, SQLSMALLINT NameLength3, __in_ecount_opt(NameLength2) SQLCHAR *SchemaName, SQLSMALLINT NameLen
SQLCHAR *ColumnName, SQLSMALLINT NameLength4); gth2,
__in_ecount_opt(NameLength3) SQLCHAR *TableName, SQLSMALLINT NameLeng
th3,
__in_ecount_opt(NameLength4) SQLCHAR *ColumnName, SQLSMALLINT NameLen
gth4);
SQLRETURN SQL_API SQLConnect(SQLHDBC ConnectionHandle, SQLRETURN SQL_API SQLConnect(SQLHDBC ConnectionHandle,
SQLCHAR *ServerName, SQLSMALLINT NameLength1, __in_ecount(NameLength1) SQLCHAR *ServerName, SQLSMALLINT NameLength1
SQLCHAR *UserName, SQLSMALLINT NameLength2, ,
SQLCHAR *Authentication, SQLSMALLINT NameLength3); __in_ecount(NameLength2) SQLCHAR *UserName, SQLSMALLINT NameLength2,
__in_ecount(NameLength3) SQLCHAR *Authentication, SQLSMALLINT NameLen
gth3);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLCopyDesc(SQLHDESC SourceDescHandle, SQLRETURN SQL_API SQLCopyDesc(SQLHDESC SourceDescHandle,
SQLHDESC TargetDescHandle); SQLHDESC TargetDescHandle);
#endif #endif
SQLRETURN SQL_API SQLDataSources(SQLHENV EnvironmentHandle, SQLRETURN SQL_API SQLDataSources(SQLHENV EnvironmentHandle,
SQLUSMALLINT Direction, SQLCHAR *ServerName, SQLUSMALLINT Direction, __out_ecount_opt(BufferLength1) SQLCHAR *Serv
SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, erName,
SQLCHAR *Description, SQLSMALLINT BufferLength2, SQLSMALLINT BufferLength1, __out_opt SQLSMALLINT *NameLength1Ptr,
SQLSMALLINT *NameLength2); __out_ecount_opt(BufferLength2) SQLCHAR *Description, SQLSMALLINT Buf
ferLength2,
__out_opt SQLSMALLINT *NameLength2Ptr);
SQLRETURN SQL_API SQLDescribeCol(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLDescribeCol(SQLHSTMT StatementHandle,
SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName, SQLUSMALLINT ColumnNumber, __out_ecount_opt(BufferLength) SQLCHAR *Co
SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, lumnName,
SQLSMALLINT *DataType, SQLULEN *ColumnSize, SQLSMALLINT BufferLength, __out_opt SQLSMALLINT *NameLength,
SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable); __out_opt SQLSMALLINT *DataType, __out_opt SQLULEN *ColumnSize,
__out_opt SQLSMALLINT *DecimalDigits, __out_opt SQLSMALLINT *Nullable
);
SQLRETURN SQL_API SQLDisconnect(SQLHDBC ConnectionHandle); SQLRETURN SQL_API SQLDisconnect(SQLHDBC ConnectionHandle);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLRETURN SQL_API SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle,
SQLSMALLINT CompletionType); SQLSMALLINT CompletionType);
#endif #endif
SQLRETURN SQL_API SQLError(SQLHENV EnvironmentHandle, SQLRETURN SQL_API SQLError(SQLHENV EnvironmentHandle,
SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle, SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle,
SQLCHAR *Sqlstate, SQLINTEGER *NativeError, __out_ecount(6) SQLCHAR *Sqlstate, __out_opt SQLINTEGER *NativeError,
SQLCHAR *MessageText, SQLSMALLINT BufferLength, __out_ecount_opt(BufferLength) SQLCHAR *MessageText, SQLSMALLINT Buff
SQLSMALLINT *TextLength); erLength,
__out_opt SQLSMALLINT *TextLength);
SQLRETURN SQL_API SQLExecDirect SQLRETURN SQL_API SQLExecDirect
( (
SQLHSTMT StatementHandle, SQLHSTMT StatementHandle,
__in_ecount_opt(TextLength) SQLCHAR* StatementText, __in_ecount_opt(TextLength) SQLCHAR* StatementText,
SQLINTEGER TextLength SQLINTEGER TextLength
); );
SQLRETURN SQL_API SQLExecute(SQLHSTMT StatementHandle); SQLRETURN SQL_API SQLExecute(SQLHSTMT StatementHandle);
skipping to change at line 689 skipping to change at line 706
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle); SQLRETURN SQL_API SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle);
#endif #endif
SQLRETURN SQL_API SQLFreeStmt(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLFreeStmt(SQLHSTMT StatementHandle,
SQLUSMALLINT Option); SQLUSMALLINT Option);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLGetConnectAttr(SQLHDBC ConnectionHandle, SQLRETURN SQL_API SQLGetConnectAttr(SQLHDBC ConnectionHandle,
SQLINTEGER Attribute, SQLPOINTER Value, SQLINTEGER Attribute, __out_xcount_opt(BufferLength) SQLPOINTER Value
SQLINTEGER BufferLength, SQLINTEGER *StringLength); ,
SQLINTEGER BufferLength, __out_opt SQLINTEGER *StringLengthPtr);
#endif #endif
SQLRETURN SQL_API SQLGetConnectOption(SQLHDBC ConnectionHandle, SQLRETURN SQL_API SQLGetConnectOption(SQLHDBC ConnectionHandle,
SQLUSMALLINT Option, SQLPOINTER Value); SQLUSMALLINT Option, SQLPOINTER Value);
SQLRETURN SQL_API SQLGetCursorName SQLRETURN SQL_API SQLGetCursorName
( (
SQLHSTMT StatementHandle, SQLHSTMT StatementHandle,
__out_ecount_opt(BufferLength) SQLCHAR *CursorName, __out_ecount_opt(BufferLength) SQLCHAR *CursorName,
SQLSMALLINT BufferLength, SQLSMALLINT BufferLength,
SQLSMALLINT *NameLength __out_opt
SQLSMALLINT *NameLengthPtr
); );
SQLRETURN SQL_API SQLGetData(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLGetData(SQLHSTMT StatementHandle,
SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
SQLPOINTER TargetValue, SQLLEN BufferLength, __out_xcount_opt(BufferLength) SQLPOINTER TargetValue, SQLLEN BufferL
SQLLEN *StrLen_or_Ind); ength,
__out_opt SQLLEN *StrLen_or_IndPtr);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLGetDescField(SQLHDESC DescriptorHandle, SQLRETURN SQL_API SQLGetDescField(SQLHDESC DescriptorHandle,
SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
SQLPOINTER Value, SQLINTEGER BufferLength, __out_xcount_opt(BufferLength) SQLPOINTER Value, SQLINTEGER BufferLen
SQLINTEGER *StringLength); gth,
__out_opt SQLINTEGER *StringLength);
SQLRETURN SQL_API SQLGetDescRec(SQLHDESC DescriptorHandle, SQLRETURN SQL_API SQLGetDescRec(SQLHDESC DescriptorHandle,
SQLSMALLINT RecNumber, SQLCHAR *Name, SQLSMALLINT RecNumber, __out_ecount_opt(BufferLength) SQLCHAR *Name,
SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, SQLSMALLINT BufferLength, __out_opt SQLSMALLINT *StringLengthPtr,
SQLSMALLINT *Type, SQLSMALLINT *SubType, __out_opt SQLSMALLINT *TypePtr, __out_opt SQLSMALLINT *SubTypePtr,
SQLLEN *Length, SQLSMALLINT *Precision, __out_opt SQLLEN *LengthPtr, __out_opt SQLSMALLINT *PrecisionPtr,
SQLSMALLINT *Scale, SQLSMALLINT *Nullable); __out_opt SQLSMALLINT *ScalePtr, __out_opt SQLSMALLINT *NullablePtr);
SQLRETURN SQL_API SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLRETURN SQL_API SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle,
SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier, SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier,
SQLPOINTER DiagInfo, SQLSMALLINT BufferLength, __out_xcount_opt(BufferLength) SQLPOINTER DiagInfo, SQLSMALLINT Buffe
SQLSMALLINT *StringLength); rLength,
__out_opt SQLSMALLINT *StringLength);
SQLRETURN SQL_API SQLGetDiagRec SQLRETURN SQL_API SQLGetDiagRec
( (
SQLSMALLINT HandleType, SQLSMALLINT HandleType,
SQLHANDLE Handle, SQLHANDLE Handle,
SQLSMALLINT RecNumber, SQLSMALLINT RecNumber,
__out_ecount_opt(6) SQLCHAR *Sqlstate, __out_ecount_opt(6) SQLCHAR *Sqlstate,
SQLINTEGER *NativeError, SQLINTEGER *NativeError,
__out_ecount_opt(BufferLength) SQLCHAR* MessageText, __out_ecount_opt(BufferLength) SQLCHAR* MessageText,
SQLSMALLINT BufferLength, SQLSMALLINT BufferLength,
__out_opt
SQLSMALLINT *TextLength SQLSMALLINT *TextLength
); );
SQLRETURN SQL_API SQLGetEnvAttr(SQLHENV EnvironmentHandle, SQLRETURN SQL_API SQLGetEnvAttr(SQLHENV EnvironmentHandle,
SQLINTEGER Attribute, SQLPOINTER Value, SQLINTEGER Attribute, __out_xcount(BufferLength) SQLPOINTER Value,
SQLINTEGER BufferLength, SQLINTEGER *StringLength); SQLINTEGER BufferLength, __out_opt SQLINTEGER *StringLength);
#endif /* ODBCVER >= 0x0300 */ #endif /* ODBCVER >= 0x0300 */
SQLRETURN SQL_API SQLGetFunctions(SQLHDBC ConnectionHandle, SQLRETURN SQL_API SQLGetFunctions(SQLHDBC ConnectionHandle,
SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported); SQLUSMALLINT FunctionId,
__out_xcount_opt("Buffer length pfExists points to depends on fFuncti
on value.")
SQLUSMALLINT *Supported);
__success(return == SQL_SUCCESS)
SQLRETURN SQL_API SQLGetInfo(SQLHDBC ConnectionHandle, SQLRETURN SQL_API SQLGetInfo(SQLHDBC ConnectionHandle,
SQLUSMALLINT InfoType, __out_bcount_part(BufferLength, *StringLength) SQLUSMALLINT InfoType, __out_bcount_opt(BufferLength) SQLPOINTER Info
SQLPOINTER InfoValue, Value,
SQLSMALLINT BufferLength, SQLSMALLINT *StringLength); SQLSMALLINT BufferLength, __out_opt SQLSMALLINT *StringLengthPtr);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLGetStmtAttr(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLGetStmtAttr(SQLHSTMT StatementHandle,
SQLINTEGER Attribute, SQLPOINTER Value, SQLINTEGER Attribute, __out_xcount_opt(BufferLength) SQLPOINTER Value
SQLINTEGER BufferLength, SQLINTEGER *StringLength); ,
SQLINTEGER BufferLength, __out_opt SQLINTEGER *StringLength);
#endif /* ODBCVER >= 0x0300 */ #endif /* ODBCVER >= 0x0300 */
SQLRETURN SQL_API SQLGetStmtOption(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLGetStmtOption(SQLHSTMT StatementHandle,
SQLUSMALLINT Option, SQLPOINTER Value); SQLUSMALLINT Option, SQLPOINTER Value);
SQLRETURN SQL_API SQLGetTypeInfo(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLGetTypeInfo(SQLHSTMT StatementHandle,
SQLSMALLINT DataType); SQLSMALLINT DataType);
SQLRETURN SQL_API SQLNumResultCols(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLNumResultCols(SQLHSTMT StatementHandle,
SQLSMALLINT *ColumnCount); __out SQLSMALLINT *ColumnCount);
SQLRETURN SQL_API SQLParamData(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLParamData(SQLHSTMT StatementHandle,
SQLPOINTER *Value); __out_opt SQLPOINTER *Value);
SQLRETURN SQL_API SQLPrepare SQLRETURN SQL_API SQLPrepare
( (
SQLHSTMT StatementHandle, SQLHSTMT StatementHandle,
__in_ecount(TextLength) SQLCHAR* StatementText, __in_ecount(TextLength) SQLCHAR* StatementText,
SQLINTEGER TextLength SQLINTEGER TextLength
); );
SQLRETURN SQL_API SQLPutData(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLPutData(SQLHSTMT StatementHandle,
SQLPOINTER Data, SQLLEN StrLen_or_Ind); __in_xcount(StrLen_or_Ind) SQLPOINTER Data, SQLLEN StrLen_or_Ind);
SQLRETURN SQL_API SQLRowCount(__in SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLRowCount(__in SQLHSTMT StatementHandle,
__out SQLLEN* RowCount); __out SQLLEN* RowCount);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLSetConnectAttr(SQLHDBC ConnectionHandle, SQLRETURN SQL_API SQLSetConnectAttr(SQLHDBC ConnectionHandle,
SQLINTEGER Attribute, SQLPOINTER Value, SQLINTEGER Attribute, __in_bcount_opt(StringLength) SQLPOINTER Value,
SQLINTEGER StringLength); SQLINTEGER StringLength);
#endif /* ODBCVER >= 0x0300 */ #endif /* ODBCVER >= 0x0300 */
SQLRETURN SQL_API SQLSetConnectOption(SQLHDBC ConnectionHandle, SQLRETURN SQL_API SQLSetConnectOption(SQLHDBC ConnectionHandle,
SQLUSMALLINT Option, SQLULEN Value); SQLUSMALLINT Option, SQLULEN Value);
SQLRETURN SQL_API SQLSetCursorName SQLRETURN SQL_API SQLSetCursorName
( (
SQLHSTMT StatementHandle, SQLHSTMT StatementHandle,
__in_ecount(NameLength) SQLCHAR* CursorName, __in_ecount(NameLength) SQLCHAR* CursorName,
SQLSMALLINT NameLength SQLSMALLINT NameLength
); );
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLSetDescField(SQLHDESC DescriptorHandle, SQLRETURN SQL_API SQLSetDescField(SQLHDESC DescriptorHandle,
SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
SQLPOINTER Value, SQLINTEGER BufferLength); __in_xcount(BufferLength) SQLPOINTER Value, SQLINTEGER BufferLength);
SQLRETURN SQL_API SQLSetDescRec(SQLHDESC DescriptorHandle, SQLRETURN SQL_API SQLSetDescRec(SQLHDESC DescriptorHandle,
SQLSMALLINT RecNumber, SQLSMALLINT Type, SQLSMALLINT RecNumber, SQLSMALLINT Type,
SQLSMALLINT SubType, SQLLEN Length, SQLSMALLINT SubType, SQLLEN Length,
SQLSMALLINT Precision, SQLSMALLINT Scale, SQLSMALLINT Precision, SQLSMALLINT Scale,
SQLPOINTER Data, SQLLEN *StringLength, __inout_bcount_opt(Length) SQLPOINTER Data, __inout_opt SQLLEN *Strin
SQLLEN *Indicator); gLength,
__inout_opt SQLLEN *Indicator);
SQLRETURN SQL_API SQLSetEnvAttr(SQLHENV EnvironmentHandle, SQLRETURN SQL_API SQLSetEnvAttr(SQLHENV EnvironmentHandle,
SQLINTEGER Attribute, SQLPOINTER Value, SQLINTEGER Attribute, __in_bcount(StringLength) SQLPOINTER Value,
SQLINTEGER StringLength); SQLINTEGER StringLength);
#endif /* ODBCVER >= 0x0300 */ #endif /* ODBCVER >= 0x0300 */
SQLRETURN SQL_API SQLSetParam(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLSetParam(SQLHSTMT StatementHandle,
SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
SQLSMALLINT ParameterType, SQLULEN LengthPrecision, SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue, SQLSMALLINT ParameterScale, __in_xcount(*StrLen_or_Ind) SQLPOINTER Pa
SQLLEN *StrLen_or_Ind); rameterValue,
__inout SQLLEN *StrLen_or_Ind);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLSetStmtAttr(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLSetStmtAttr(SQLHSTMT StatementHandle,
SQLINTEGER Attribute, SQLPOINTER Value, SQLINTEGER Attribute, __in_xcount(StringLength) SQLPOINTER Value,
SQLINTEGER StringLength); SQLINTEGER StringLength);
#endif #endif
SQLRETURN SQL_API SQLSetStmtOption(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLSetStmtOption(SQLHSTMT StatementHandle,
SQLUSMALLINT Option, SQLULEN Value); SQLUSMALLINT Option, SQLULEN Value);
SQLRETURN SQL_API SQLSpecialColumns(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLSpecialColumns(SQLHSTMT StatementHandle,
SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName, SQLUSMALLINT IdentifierType,
SQLSMALLINT NameLength1, SQLCHAR *SchemaName, __in_ecount_opt(NameLength1) SQLCHAR *CatalogName, SQLSMALLINT NameLe
SQLSMALLINT NameLength2, SQLCHAR *TableName, ngth1,
SQLSMALLINT NameLength3, SQLUSMALLINT Scope, __in_ecount_opt(NameLength2) SQLCHAR *SchemaName, SQLSMALLINT NameLen
SQLUSMALLINT Nullable); gth2,
__in_ecount_opt(NameLength3) SQLCHAR *TableName, SQLSMALLINT NameLeng
th3,
SQLUSMALLINT Scope, SQLUSMALLINT Nullable);
SQLRETURN SQL_API SQLStatistics(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLStatistics(SQLHSTMT StatementHandle,
SQLCHAR *CatalogName, SQLSMALLINT NameLength1, __in_ecount_opt(NameLength1) SQLCHAR *CatalogName, SQLSMALLINT NameLe
SQLCHAR *SchemaName, SQLSMALLINT NameLength2, ngth1,
SQLCHAR *TableName, SQLSMALLINT NameLength3, __in_ecount_opt(NameLength2) SQLCHAR *SchemaName, SQLSMALLINT NameLen
gth2,
__in_ecount_opt(NameLength3) SQLCHAR *TableName, SQLSMALLINT NameLeng
th3,
SQLUSMALLINT Unique, SQLUSMALLINT Reserved); SQLUSMALLINT Unique, SQLUSMALLINT Reserved);
SQLRETURN SQL_API SQLTables(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLTables(SQLHSTMT StatementHandle,
SQLCHAR *CatalogName, SQLSMALLINT NameLength1, __in_ecount_opt(NameLength1) SQLCHAR *CatalogName, SQLSMALLINT NameLe
SQLCHAR *SchemaName, SQLSMALLINT NameLength2, ngth1,
SQLCHAR *TableName, SQLSMALLINT NameLength3, __in_ecount_opt(NameLength2) SQLCHAR *SchemaName, SQLSMALLINT NameLen
SQLCHAR *TableType, SQLSMALLINT NameLength4); gth2,
__in_ecount_opt(NameLength3) SQLCHAR *TableName, SQLSMALLINT NameLeng
th3,
__in_ecount_opt(NameLength4) SQLCHAR *TableType, SQLSMALLINT NameLeng
th4);
SQLRETURN SQL_API SQLTransact(SQLHENV EnvironmentHandle, SQLRETURN SQL_API SQLTransact(SQLHENV EnvironmentHandle,
SQLHDBC ConnectionHandle, SQLUSMALLINT CompletionType); SQLHDBC ConnectionHandle, SQLUSMALLINT CompletionType);
#endif /* RC_INVOKED */ #endif /* RC_INVOKED */
#ifdef __cplusplus #ifdef __cplusplus
} /* End of extern "C" { */ } /* End of extern "C" { */
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* #ifndef __SQL */ #endif /* #ifndef __SQL */
 End of changes. 45 change blocks. 
84 lines changed or deleted 140 lines changed or added


 sqlext.h (6.0.6002.18005-Windows 6.0)   sqlext.h (6.1.7601.17514-Windows 7.0) 
skipping to change at line 25 skipping to change at line 25
#ifndef __SQL #ifndef __SQL
#include "sql.h" #include "sql.h"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { /* Assume C declarations for C++ */ extern "C" { /* Assume C declarations for C++ */
#endif /* __cplusplus */ #endif /* __cplusplus */
/* generally useful constants */ /* generally useful constants */
#define SQL_SPEC_MAJOR 3 /* Major version of specification */ #define SQL_SPEC_MAJOR 3 /* Major version of specification */
#define SQL_SPEC_MINOR 52 /* Minor version of specification */ #define SQL_SPEC_MINOR 80 /* Minor version of specification */
#define SQL_SPEC_STRING "03.52" /* String constant for version */ #define SQL_SPEC_STRING "03.80" /* String constant for version */
#define SQL_SQLSTATE_SIZE 5 /* size of SQLSTATE */ #define SQL_SQLSTATE_SIZE 5 /* size of SQLSTATE */
typedef SQLTCHAR SQLSTATE[SQL_SQLSTATE_SIZE+1]; typedef SQLTCHAR SQLSTATE[SQL_SQLSTATE_SIZE+1];
#define SQL_MAX_DSN_LENGTH 32 /* maximum data source name size */ #define SQL_MAX_DSN_LENGTH 32 /* maximum data source name size */
#define SQL_MAX_OPTION_STRING_LENGTH 256 #define SQL_MAX_OPTION_STRING_LENGTH 256
/* return code SQL_NO_DATA_FOUND is the same as SQL_NO_DATA */ /* return code SQL_NO_DATA_FOUND is the same as SQL_NO_DATA */
skipping to change at line 72 skipping to change at line 72
/* values for SQL_ATTR_CP_MATCH */ /* values for SQL_ATTR_CP_MATCH */
#define SQL_CP_STRICT_MATCH 0UL #define SQL_CP_STRICT_MATCH 0UL
#define SQL_CP_RELAXED_MATCH 1UL #define SQL_CP_RELAXED_MATCH 1UL
#define SQL_CP_MATCH_DEFAULT SQL_CP_STRICT_MATCH #define SQL_CP_MATCH_DEFAULT SQL_CP_STRICT_MATCH
/* values for SQL_ATTR_ODBC_VERSION */ /* values for SQL_ATTR_ODBC_VERSION */
#define SQL_OV_ODBC2 2UL #define SQL_OV_ODBC2 2UL
#define SQL_OV_ODBC3 3UL #define SQL_OV_ODBC3 3UL
#endif /* ODBCVER >= 0x0300 */ #endif /* ODBCVER >= 0x0300 */
#if (ODBCVER >= 0x0380)
// new values for SQL_ATTR_ODBC_VERSION
// From ODBC 3.8 onwards, we should use <major version> * 100 + <minor version>
#define SQL_OV_ODBC3_80 380UL
#endif /* ODBCVER >= 0x0380
/* connection attributes */ /* connection attributes */
#define SQL_ACCESS_MODE 101 #define SQL_ACCESS_MODE 101
#define SQL_AUTOCOMMIT 102 #define SQL_AUTOCOMMIT 102
#define SQL_LOGIN_TIMEOUT 103 #define SQL_LOGIN_TIMEOUT 103
#define SQL_OPT_TRACE 104 #define SQL_OPT_TRACE 104
#define SQL_OPT_TRACEFILE 105 #define SQL_OPT_TRACEFILE 105
#define SQL_TRANSLATE_DLL 106 #define SQL_TRANSLATE_DLL 106
#define SQL_TRANSLATE_OPTION 107 #define SQL_TRANSLATE_OPTION 107
#define SQL_TXN_ISOLATION 108 #define SQL_TXN_ISOLATION 108
#define SQL_CURRENT_QUALIFIER 109 #define SQL_CURRENT_QUALIFIER 109
skipping to change at line 124 skipping to change at line 130
need to behave differently on ANSI or Unicode applications. A unicode need to behave differently on ANSI or Unicode applications. A unicode
driver, which has same behavior for both ANSI or Unicode applications, driver, which has same behavior for both ANSI or Unicode applications,
should return SQL_ERROR when the driver manager sets this connection should return SQL_ERROR when the driver manager sets this connection
attribute. When a unicode driver returns SQL_SUCCESS on this attribute, attribute. When a unicode driver returns SQL_SUCCESS on this attribute,
the driver manager treates ANSI and Unicode connections differently in the driver manager treates ANSI and Unicode connections differently in
connection pooling. connection pooling.
*/ */
#define SQL_ATTR_ANSI_APP 115 #define SQL_ATTR_ANSI_APP 115
#endif #endif
#if (ODBCVER >= 0x0380)
#define SQL_ATTR_RESET_CONNECTION 116
#define SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE 117
#endif
/* SQL_CONNECT_OPT_DRVR_START is not meaningful for 3.0 driver */ /* SQL_CONNECT_OPT_DRVR_START is not meaningful for 3.0 driver */
#if (ODBCVER < 0x0300) #if (ODBCVER < 0x0300)
#define SQL_CONNECT_OPT_DRVR_START 1000 #define SQL_CONNECT_OPT_DRVR_START 1000
#endif /* ODBCVER < 0x0300 */ #endif /* ODBCVER < 0x0300 */
#if (ODBCVER < 0x0300) #if (ODBCVER < 0x0300)
#define SQL_CONN_OPT_MAX SQL_PACKET_SIZE #define SQL_CONN_OPT_MAX SQL_PACKET_SIZE
#define SQL_CONN_OPT_MIN SQL_ACCESS_MODE #define SQL_CONN_OPT_MIN SQL_ACCESS_MODE
#endif /* ODBCVER < 0x0300 */ #endif /* ODBCVER < 0x0300 */
skipping to change at line 170 skipping to change at line 181
/* values for SQL_ATTR_DISCONNECT_BEHAVIOR */ /* values for SQL_ATTR_DISCONNECT_BEHAVIOR */
#define SQL_DB_RETURN_TO_POOL 0UL #define SQL_DB_RETURN_TO_POOL 0UL
#define SQL_DB_DISCONNECT 1UL #define SQL_DB_DISCONNECT 1UL
#define SQL_DB_DEFAULT SQL_DB_RETURN_TO_POOL #define SQL_DB_DEFAULT SQL_DB_RETURN_TO_POOL
/* values for SQL_ATTR_ENLIST_IN_DTC */ /* values for SQL_ATTR_ENLIST_IN_DTC */
#define SQL_DTC_DONE 0L #define SQL_DTC_DONE 0L
#endif /* ODBCVER >= 0x0300 */ #endif /* ODBCVER >= 0x0300 */
/* values for SQL_ATTR_CONNECTION_DEAD */ /* values for SQL_ATTR_CONNECTION_DEAD */
#define SQL_CD_TRUE 1L /* Connection is closed/dead */ #define SQL_CD_TRUE 1L /* Connection is closed/dead */
#define SQL_CD_FALSE 0L /* Connection is open/available */ #define SQL_CD_FALSE 0L /* Connection is open/available
*/
/* values for SQL_ATTR_ANSI_APP */ /* values for SQL_ATTR_ANSI_APP */
#if (ODBCVER >= 0x0351) #if (ODBCVER >= 0x0351)
#define SQL_AA_TRUE 1L /* the application is an ANSI app */ #define SQL_AA_TRUE 1L /* the application is an ANSI app */
#define SQL_AA_FALSE 0L /* the application is a Unicode app */ #define SQL_AA_FALSE 0L /* the application is a Unicode app */
#endif #endif
/* values for SQL_ATTR_RESET_CONNECTION */
#if (ODBCVER >= 0x0380)
#define SQL_RESET_CONNECTION_YES 1UL
#endif
/* values for SQL_ATTR_ASYNC_DBC_FUNCTIONS_ENABLE */
#if (ODBCVER >= 0x0380)
#define SQL_ASYNC_DBC_ENABLE_ON 1UL
#define SQL_ASYNC_DBC_ENABLE_OFF 0UL
#define SQL_ASYNC_DBC_ENABLE_DEFAULT SQL_ASYNC_DBC_ENABLE_OFF
#endif // ODBCVER >= 0x0380
/* statement attributes */ /* statement attributes */
#define SQL_QUERY_TIMEOUT 0 #define SQL_QUERY_TIMEOUT 0
#define SQL_MAX_ROWS 1 #define SQL_MAX_ROWS 1
#define SQL_NOSCAN 2 #define SQL_NOSCAN 2
#define SQL_MAX_LENGTH 3 #define SQL_MAX_LENGTH 3
#define SQL_ASYNC_ENABLE 4 /* same as SQL_ATTR_ASYNC_ENABLE */ #define SQL_ASYNC_ENABLE 4 /* same as SQL_ATTR_ASYNC_ENABLE */
#define SQL_BIND_TYPE 5 #define SQL_BIND_TYPE 5
#define SQL_CURSOR_TYPE 6 #define SQL_CURSOR_TYPE 6
#define SQL_CONCURRENCY 7 #define SQL_CONCURRENCY 7
#define SQL_KEYSET_SIZE 8 #define SQL_KEYSET_SIZE 8
skipping to change at line 511 skipping to change at line 534
#if (ODBCVER >= 0x0350) #if (ODBCVER >= 0x0350)
#define SQL_C_GUID SQL_GUID #define SQL_C_GUID SQL_GUID
#endif /* ODBCVER >= 0x0350 */ #endif /* ODBCVER >= 0x0350 */
#define SQL_TYPE_NULL 0 #define SQL_TYPE_NULL 0
#if (ODBCVER < 0x0300) #if (ODBCVER < 0x0300)
#define SQL_TYPE_MIN SQL_BIT #define SQL_TYPE_MIN SQL_BIT
#define SQL_TYPE_MAX SQL_VARCHAR #define SQL_TYPE_MAX SQL_VARCHAR
#endif #endif
// base value of driver-specific C-Type (max is 0x7fff)
// define driver-specific C-Type, named as SQL_DRIVER_C_TYPE_BASE,
// SQL_DRIVER_C_TYPE_BASE+1, SQL_DRIVER_C_TYPE_BASE+2, etc.
#if (ODBCVER >= 0x380)
#define SQL_DRIVER_C_TYPE_BASE 0x4000
#endif
// base value of driver-specific fields/attributes (max are 0x7fff [16-bit] or 0
x00007fff [32-bit])
// define driver-specific SQL-Type, named as SQL_DRIVER_SQL_TYPE_BASE,
// SQL_DRIVER_SQL_TYPE_BASE+1, SQL_DRIVER_SQL_TYPE_BASE+2, etc.
//
// Please note that there is no runtime change in this version of DM.
// However, we suggest that driver manufacturers adhere to this range
// as future versions of the DM may enforce these constraints
#if (ODBCVER >= 0x380)
#define SQL_DRIVER_SQL_TYPE_BASE 0x4000
#define SQL_DRIVER_DESC_FIELD_BASE 0x4000
#define SQL_DRIVER_DIAG_FIELD_BASE 0x4000
#define SQL_DRIVER_INFO_TYPE_BASE 0x4000
#define SQL_DRIVER_CONN_ATTR_BASE 0x00004000 // 32-bit
#define SQL_DRIVER_STMT_ATTR_BASE 0x00004000 // 32-bit
#endif
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
#define SQL_C_VARBOOKMARK SQL_C_BINARY #define SQL_C_VARBOOKMARK SQL_C_BINARY
#endif /* ODBCVER >= 0x0300 */ #endif /* ODBCVER >= 0x0300 */
/* define for SQL_DIAG_ROW_NUMBER and SQL_DIAG_COLUMN_NUMBER */ /* define for SQL_DIAG_ROW_NUMBER and SQL_DIAG_COLUMN_NUMBER */
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
#define SQL_NO_ROW_NUMBER (-1) #define SQL_NO_ROW_NUMBER (-1)
#define SQL_NO_COLUMN_NUMBER (-1) #define SQL_NO_COLUMN_NUMBER (-1)
#define SQL_ROW_NUMBER_UNKNOWN (-2) #define SQL_ROW_NUMBER_UNKNOWN (-2)
#define SQL_COLUMN_NUMBER_UNKNOWN (-2) #define SQL_COLUMN_NUMBER_UNKNOWN (-2)
skipping to change at line 855 skipping to change at line 901
#define SQL_STANDARD_CLI_CONFORMANCE 166 #define SQL_STANDARD_CLI_CONFORMANCE 166
#define SQL_STATIC_CURSOR_ATTRIBUTES1 167 #define SQL_STATIC_CURSOR_ATTRIBUTES1 167
#define SQL_STATIC_CURSOR_ATTRIBUTES2 168 #define SQL_STATIC_CURSOR_ATTRIBUTES2 168
#define SQL_AGGREGATE_FUNCTIONS 169 #define SQL_AGGREGATE_FUNCTIONS 169
#define SQL_DDL_INDEX 170 #define SQL_DDL_INDEX 170
#define SQL_DM_VER 171 #define SQL_DM_VER 171
#define SQL_INSERT_STATEMENT 172 #define SQL_INSERT_STATEMENT 172
#define SQL_CONVERT_GUID 173 #define SQL_CONVERT_GUID 173
#define SQL_UNION_STATEMENT SQL_UNION #define SQL_UNION_STATEMENT SQL_UNION
#if (ODBCVER >= 0x0380)
// Info Types
#define SQL_ASYNC_DBC_FUNCTIONS 10023
#endif // ODBCVER >= 0x0380
#endif /* ODBCVER >= 0x0300 */ #endif /* ODBCVER >= 0x0300 */
#define SQL_DTC_TRANSITION_COST 1750 #define SQL_DTC_TRANSITION_COST 1750
/* SQL_ALTER_TABLE bitmasks */ /* SQL_ALTER_TABLE bitmasks */
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
/* the following 5 bitmasks are defined in sql.h /* the following 5 bitmasks are defined in sql.h
*#define SQL_AT_ADD_COLUMN 0x00000001L *#define SQL_AT_ADD_COLUMN 0x00000001L
*#define SQL_AT_DROP_COLUMN 0x00000002L *#define SQL_AT_DROP_COLUMN 0x00000002L
*#define SQL_AT_ADD_CONSTRAINT 0x00000008L *#define SQL_AT_ADD_CONSTRAINT 0x00000008L
skipping to change at line 1188 skipping to change at line 1240
#define SQL_FILE_NOT_SUPPORTED 0x0000 #define SQL_FILE_NOT_SUPPORTED 0x0000
#define SQL_FILE_TABLE 0x0001 #define SQL_FILE_TABLE 0x0001
#define SQL_FILE_QUALIFIER 0x0002 #define SQL_FILE_QUALIFIER 0x0002
#define SQL_FILE_CATALOG SQL_FILE_QUALIFIER // ODBC 3.0 #define SQL_FILE_CATALOG SQL_FILE_QUALIFIER // ODBC 3.0
/* SQL_GETDATA_EXTENSIONS values */ /* SQL_GETDATA_EXTENSIONS values */
#define SQL_GD_BLOCK 0x00000004L #define SQL_GD_BLOCK 0x00000004L
#define SQL_GD_BOUND 0x00000008L #define SQL_GD_BOUND 0x00000008L
#if (ODBCVER >= 0x0380)
#define SQL_GD_OUTPUT_PARAMS 0x00000010L
#endif
/* SQL_POSITIONED_STATEMENTS masks */ /* SQL_POSITIONED_STATEMENTS masks */
#define SQL_PS_POSITIONED_DELETE 0x00000001L #define SQL_PS_POSITIONED_DELETE 0x00000001L
#define SQL_PS_POSITIONED_UPDATE 0x00000002L #define SQL_PS_POSITIONED_UPDATE 0x00000002L
#define SQL_PS_SELECT_FOR_UPDATE 0x00000004L #define SQL_PS_SELECT_FOR_UPDATE 0x00000004L
/* SQL_GROUP_BY values */ /* SQL_GROUP_BY values */
#define SQL_GB_NOT_SUPPORTED 0x0000 #define SQL_GB_NOT_SUPPORTED 0x0000
skipping to change at line 1590 skipping to change at line 1645
#define SQL_SVE_COALESCE 0x00000004L #define SQL_SVE_COALESCE 0x00000004L
#define SQL_SVE_NULLIF 0x00000008L #define SQL_SVE_NULLIF 0x00000008L
/* SQL_STANDARD_CLI_CONFORMANCE bitmasks */ /* SQL_STANDARD_CLI_CONFORMANCE bitmasks */
#define SQL_SCC_XOPEN_CLI_VERSION1 0x00000001L #define SQL_SCC_XOPEN_CLI_VERSION1 0x00000001L
#define SQL_SCC_ISO92_CLI 0x00000002L #define SQL_SCC_ISO92_CLI 0x00000002L
/* SQL_UNION_STATEMENT bitmasks */ /* SQL_UNION_STATEMENT bitmasks */
#define SQL_US_UNION SQL_U_UNION #define SQL_US_UNION SQL_U_UNION
#define SQL_US_UNION_ALL SQL_U_UNION_ALL #define SQL_US_UNION_ALL SQL_U_UNION_ALL
#endif /* ODBCVER >= 0x0300 */ #endif /* ODBCVER >= 0x0300 */
/* SQL_DTC_TRANSITION_COST bitmasks */ /* SQL_DTC_TRANSITION_COST bitmasks */
#define SQL_DTC_ENLIST_EXPENSIVE 0x00000001L #define SQL_DTC_ENLIST_EXPENSIVE 0x00000001L
#define SQL_DTC_UNENLIST_EXPENSIVE 0x00000002L #define SQL_DTC_UNENLIST_EXPENSIVE 0x00000002L
#if (ODBCVER >= 0x0380)
// possible values for SQL_ASYNC_DBC_FUNCTIONS
#define SQL_ASYNC_DBC_NOT_CAPABLE 0x00000000L
#define SQL_ASYNC_DBC_CAPABLE 0x00000001L
#endif // ODBCVER >= 0x0380
/* additional SQLDataSources fetch directions */ /* additional SQLDataSources fetch directions */
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
#define SQL_FETCH_FIRST_USER 31 #define SQL_FETCH_FIRST_USER 31
#define SQL_FETCH_FIRST_SYSTEM 32 #define SQL_FETCH_FIRST_SYSTEM 32
#endif /* ODBCVER >= 0x0300 */ #endif /* ODBCVER >= 0x0300 */
/* Defines for SQLSetPos */ /* Defines for SQLSetPos */
#define SQL_ENTIRE_ROWSET 0 #define SQL_ENTIRE_ROWSET 0
/* Operations in SQLSetPos */ /* Operations in SQLSetPos */
skipping to change at line 1672 skipping to change at line 1732
#define SQL_DRIVER_NOPROMPT 0 #define SQL_DRIVER_NOPROMPT 0
#define SQL_DRIVER_COMPLETE 1 #define SQL_DRIVER_COMPLETE 1
#define SQL_DRIVER_PROMPT 2 #define SQL_DRIVER_PROMPT 2
#define SQL_DRIVER_COMPLETE_REQUIRED 3 #define SQL_DRIVER_COMPLETE_REQUIRED 3
#ifndef RC_INVOKED #ifndef RC_INVOKED
SQLRETURN SQL_API SQLDriverConnect( SQLRETURN SQL_API SQLDriverConnect(
SQLHDBC hdbc, SQLHDBC hdbc,
SQLHWND hwnd, SQLHWND hwnd,
__in_ecount(cchConnStrIn)
SQLCHAR *szConnStrIn, SQLCHAR *szConnStrIn,
SQLSMALLINT cbConnStrIn, SQLSMALLINT cchConnStrIn,
__out_ecount_opt(cchConnStrOutMax)
SQLCHAR *szConnStrOut, SQLCHAR *szConnStrOut,
SQLSMALLINT cbConnStrOutMax, SQLSMALLINT cchConnStrOutMax,
SQLSMALLINT *pcbConnStrOut, __out_opt
SQLSMALLINT *pcchConnStrOut,
SQLUSMALLINT fDriverCompletion); SQLUSMALLINT fDriverCompletion);
#endif /* RC_INVOKED */ #endif /* RC_INVOKED */
/* Level 2 Functions */ /* Level 2 Functions */
/* SQLExtendedFetch "fFetchType" values */ /* SQLExtendedFetch "fFetchType" values */
#define SQL_FETCH_BOOKMARK 8 #define SQL_FETCH_BOOKMARK 8
/* SQLExtendedFetch "rgfRowStatus" element values */ /* SQLExtendedFetch "rgfRowStatus" element values */
skipping to change at line 1732 skipping to change at line 1795
/* the previous #defines. These are for DEFERRABILITY. */ /* the previous #defines. These are for DEFERRABILITY. */
#define SQL_INITIALLY_DEFERRED 5 #define SQL_INITIALLY_DEFERRED 5
#define SQL_INITIALLY_IMMEDIATE 6 #define SQL_INITIALLY_IMMEDIATE 6
#define SQL_NOT_DEFERRABLE 7 #define SQL_NOT_DEFERRABLE 7
#endif /* ODBCVER >= 0x0300 */ #endif /* ODBCVER >= 0x0300 */
/* Defines for SQLBindParameter and /* Defines for SQLBindParameter and
SQLProcedureColumns (returned in the result set) */ SQLProcedureColumns (returned in the result set) */
#define SQL_PARAM_TYPE_UNKNOWN 0 #define SQL_PARAM_TYPE_UNKNOWN 0
#define SQL_PARAM_INPUT 1 #define SQL_PARAM_INPUT 1
#define SQL_PARAM_INPUT_OUTPUT 2 #define SQL_PARAM_INPUT_OUTPUT 2
#define SQL_RESULT_COL 3 #define SQL_RESULT_COL 3
#define SQL_PARAM_OUTPUT 4 #define SQL_PARAM_OUTPUT 4
#define SQL_RETURN_VALUE 5 #define SQL_RETURN_VALUE 5
#if (ODBCVER >= 0x0380)
#define SQL_PARAM_INPUT_OUTPUT_STREAM 8
#define SQL_PARAM_OUTPUT_STREAM 16
#endif
/* Defines for SQLProcedures (returned in the result set) */ /* Defines for SQLProcedures (returned in the result set) */
#define SQL_PT_UNKNOWN 0 #define SQL_PT_UNKNOWN 0
#define SQL_PT_PROCEDURE 1 #define SQL_PT_PROCEDURE 1
#define SQL_PT_FUNCTION 2 #define SQL_PT_FUNCTION 2
#ifndef RC_INVOKED #ifndef RC_INVOKED
/* This define is too large for RC */ /* This define is too large for RC */
#define SQL_ODBC_KEYWORDS \ #define SQL_ODBC_KEYWORDS \
skipping to change at line 1782 skipping to change at line 1849
"SMALLINT,SOME,SPACE,SQL,SQLCA,SQLCODE,SQLERROR,SQLSTATE,SQLWARNING,"\ "SMALLINT,SOME,SPACE,SQL,SQLCA,SQLCODE,SQLERROR,SQLSTATE,SQLWARNING,"\
"SUBSTRING,SUM,SYSTEM_USER,"\ "SUBSTRING,SUM,SYSTEM_USER,"\
"TABLE,TEMPORARY,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,TIMEZONE_MINUTE,"\ "TABLE,TEMPORARY,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,TIMEZONE_MINUTE,"\
"TO,TRAILING,TRANSACTION,TRANSLATE,TRANSLATION,TRIM,TRUE,"\ "TO,TRAILING,TRANSACTION,TRANSLATE,TRANSLATION,TRIM,TRUE,"\
"UNION,UNIQUE,UNKNOWN,UPDATE,UPPER,USAGE,USER,USING,"\ "UNION,UNIQUE,UNKNOWN,UPDATE,UPPER,USAGE,USER,USING,"\
"VALUE,VALUES,VARCHAR,VARYING,VIEW,WHEN,WHENEVER,WHERE,WITH,WORK,WRITE,"\ "VALUE,VALUES,VARCHAR,VARYING,VIEW,WHEN,WHENEVER,WHERE,WITH,WORK,WRITE,"\
"YEAR,ZONE" "YEAR,ZONE"
SQLRETURN SQL_API SQLBrowseConnect( SQLRETURN SQL_API SQLBrowseConnect(
SQLHDBC hdbc, SQLHDBC hdbc,
__in_ecount(cchConnStrIn)
SQLCHAR *szConnStrIn, SQLCHAR *szConnStrIn,
SQLSMALLINT cbConnStrIn, SQLSMALLINT cchConnStrIn,
__out_ecount_opt(cchConnStrOutMax)
SQLCHAR *szConnStrOut, SQLCHAR *szConnStrOut,
SQLSMALLINT cbConnStrOutMax, SQLSMALLINT cchConnStrOutMax,
SQLSMALLINT *pcbConnStrOut); __out_opt
SQLSMALLINT *pcchConnStrOut);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLBulkOperations( SQLRETURN SQL_API SQLBulkOperations(
SQLHSTMT StatementHandle, SQLHSTMT StatementHandle,
SQLSMALLINT Operation); SQLSMALLINT Operation);
#endif /* ODBCVER >= 0x0300 */ #endif /* ODBCVER >= 0x0300 */
SQLRETURN SQL_API SQLColAttributes( SQLRETURN SQL_API SQLColAttributes(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT icol, SQLUSMALLINT icol,
SQLUSMALLINT fDescType, SQLUSMALLINT fDescType,
SQLPOINTER rgbDesc, SQLPOINTER rgbDesc,
SQLSMALLINT cbDescMax, SQLSMALLINT cbDescMax,
SQLSMALLINT *pcbDesc, SQLSMALLINT *pcbDesc,
SQLLEN * pfDesc); SQLLEN * pfDesc);
SQLRETURN SQL_API SQLColumnPrivileges( SQLRETURN SQL_API SQLColumnPrivileges(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cchCatalogName)
SQLCHAR *szCatalogName, SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName, SQLSMALLINT cchCatalogName,
__in_ecount_opt(cchSchemaName)
SQLCHAR *szSchemaName, SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName, SQLSMALLINT cchSchemaName,
__in_ecount_opt(cchTableName)
SQLCHAR *szTableName, SQLCHAR *szTableName,
SQLSMALLINT cbTableName, SQLSMALLINT cchTableName,
__in_ecount_opt(cchColumnName)
SQLCHAR *szColumnName, SQLCHAR *szColumnName,
SQLSMALLINT cbColumnName); SQLSMALLINT cchColumnName);
SQLRETURN SQL_API SQLDescribeParam( SQLRETURN SQL_API SQLDescribeParam(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT ipar, SQLUSMALLINT ipar,
__out_opt
SQLSMALLINT *pfSqlType, SQLSMALLINT *pfSqlType,
__out_opt
SQLULEN *pcbParamDef, SQLULEN *pcbParamDef,
__out_opt
SQLSMALLINT *pibScale, SQLSMALLINT *pibScale,
__out_opt
SQLSMALLINT *pfNullable); SQLSMALLINT *pfNullable);
SQLRETURN SQL_API SQLExtendedFetch( SQLRETURN SQL_API SQLExtendedFetch(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT fFetchType, SQLUSMALLINT fFetchType,
SQLLEN irow, SQLLEN irow,
__out_opt
SQLULEN *pcrow, SQLULEN *pcrow,
__out_opt
SQLUSMALLINT *rgfRowStatus); SQLUSMALLINT *rgfRowStatus);
SQLRETURN SQL_API SQLForeignKeys( SQLRETURN SQL_API SQLForeignKeys(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cchPkCatalogName)
SQLCHAR *szPkCatalogName, SQLCHAR *szPkCatalogName,
SQLSMALLINT cbPkCatalogName, SQLSMALLINT cchPkCatalogName,
__in_ecount_opt(cchPkSchemaName)
SQLCHAR *szPkSchemaName, SQLCHAR *szPkSchemaName,
SQLSMALLINT cbPkSchemaName, SQLSMALLINT cchPkSchemaName,
__in_ecount_opt(cchPkTableName)
SQLCHAR *szPkTableName, SQLCHAR *szPkTableName,
SQLSMALLINT cbPkTableName, SQLSMALLINT cchPkTableName,
__in_ecount_opt(cchFkCatalogName)
SQLCHAR *szFkCatalogName, SQLCHAR *szFkCatalogName,
SQLSMALLINT cbFkCatalogName, SQLSMALLINT cchFkCatalogName,
__in_ecount_opt(cchFkSchemaName)
SQLCHAR *szFkSchemaName, SQLCHAR *szFkSchemaName,
SQLSMALLINT cbFkSchemaName, SQLSMALLINT cchFkSchemaName,
__in_ecount_opt(cchFkTableName)
SQLCHAR *szFkTableName, SQLCHAR *szFkTableName,
SQLSMALLINT cbFkTableName); SQLSMALLINT cchFkTableName);
SQLRETURN SQL_API SQLMoreResults( SQLRETURN SQL_API SQLMoreResults(
SQLHSTMT hstmt); SQLHSTMT hstmt);
SQLRETURN SQL_API SQLNativeSql SQLRETURN SQL_API SQLNativeSql
( (
SQLHDBC hdbc, SQLHDBC hdbc,
__in_ecount(cchSqlStrIn) SQLCHAR* szSqlStrIn, __in_ecount(cchSqlStrIn) SQLCHAR* szSqlStrIn,
SQLINTEGER cchSqlStrIn, SQLINTEGER cchSqlStrIn,
__out_ecount_opt(cchSqlStrMax) SQLCHAR* szSqlStr, __out_ecount_opt(cchSqlStrMax) SQLCHAR* szSqlStr,
SQLINTEGER cchSqlStrMax, SQLINTEGER cchSqlStrMax,
SQLINTEGER *pcbSqlStr SQLINTEGER *pcbSqlStr
); );
SQLRETURN SQL_API SQLNumParams( SQLRETURN SQL_API SQLNumParams(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__out_opt
SQLSMALLINT *pcpar); SQLSMALLINT *pcpar);
SQLRETURN SQL_API SQLParamOptions( SQLRETURN SQL_API SQLParamOptions(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLULEN crow, SQLULEN crow,
SQLULEN *pirow); SQLULEN *pirow);
SQLRETURN SQL_API SQLPrimaryKeys( SQLRETURN SQL_API SQLPrimaryKeys(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cchCatalogName)
SQLCHAR *szCatalogName, SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName, SQLSMALLINT cchCatalogName,
__in_ecount_opt(cchSchemaName)
SQLCHAR *szSchemaName, SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName, SQLSMALLINT cchSchemaName,
__in_ecount_opt(cchTableName)
SQLCHAR *szTableName, SQLCHAR *szTableName,
SQLSMALLINT cbTableName); SQLSMALLINT cchTableName);
SQLRETURN SQL_API SQLProcedureColumns( SQLRETURN SQL_API SQLProcedureColumns(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cchCatalogName)
SQLCHAR *szCatalogName, SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName, SQLSMALLINT cchCatalogName,
__in_ecount_opt(cchSchemaName)
SQLCHAR *szSchemaName, SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName, SQLSMALLINT cchSchemaName,
__in_ecount_opt(cchProcName)
SQLCHAR *szProcName, SQLCHAR *szProcName,
SQLSMALLINT cbProcName, SQLSMALLINT cchProcName,
__in_ecount_opt(cchColumnName)
SQLCHAR *szColumnName, SQLCHAR *szColumnName,
SQLSMALLINT cbColumnName); SQLSMALLINT cchColumnName);
SQLRETURN SQL_API SQLProcedures( SQLRETURN SQL_API SQLProcedures(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cchCatalogName)
SQLCHAR *szCatalogName, SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName, SQLSMALLINT cchCatalogName,
__in_ecount_opt(cchSchemaName)
SQLCHAR *szSchemaName, SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName, SQLSMALLINT cchSchemaName,
__in_ecount_opt(cchProcName)
SQLCHAR *szProcName, SQLCHAR *szProcName,
SQLSMALLINT cbProcName); SQLSMALLINT cchProcName);
SQLRETURN SQL_API SQLSetPos( SQLRETURN SQL_API SQLSetPos(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLSETPOSIROW irow, SQLSETPOSIROW irow,
SQLUSMALLINT fOption, SQLUSMALLINT fOption,
SQLUSMALLINT fLock); SQLUSMALLINT fLock);
SQLRETURN SQL_API SQLTablePrivileges( SQLRETURN SQL_API SQLTablePrivileges(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cchCatalogName)
SQLCHAR *szCatalogName, SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName, SQLSMALLINT cchCatalogName,
__in_ecount_opt(cchSchemaName)
SQLCHAR *szSchemaName, SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName, SQLSMALLINT cchSchemaName,
__in_ecount_opt(cchTableName)
SQLCHAR *szTableName, SQLCHAR *szTableName,
SQLSMALLINT cbTableName); SQLSMALLINT cchTableName);
SQLRETURN SQL_API SQLDrivers( SQLRETURN SQL_API SQLDrivers(
SQLHENV henv, SQLHENV henv,
SQLUSMALLINT fDirection, SQLUSMALLINT fDirection,
__out_ecount_opt(cchDriverDescMax)
SQLCHAR *szDriverDesc, SQLCHAR *szDriverDesc,
SQLSMALLINT cbDriverDescMax, SQLSMALLINT cchDriverDescMax,
SQLSMALLINT *pcbDriverDesc, __out_opt
SQLSMALLINT *pcchDriverDesc,
__out_ecount_opt(cchDrvrAttrMax)
SQLCHAR *szDriverAttributes, SQLCHAR *szDriverAttributes,
SQLSMALLINT cbDrvrAttrMax, SQLSMALLINT cchDrvrAttrMax,
SQLSMALLINT *pcbDrvrAttr); __out_opt
SQLSMALLINT *pcchDrvrAttr);
SQLRETURN SQL_API SQLBindParameter( SQLRETURN SQL_API SQLBindParameter(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT ipar, SQLUSMALLINT ipar,
SQLSMALLINT fParamType, SQLSMALLINT fParamType,
SQLSMALLINT fCType, SQLSMALLINT fCType,
SQLSMALLINT fSqlType, SQLSMALLINT fSqlType,
SQLULEN cbColDef, SQLULEN cbColDef,
SQLSMALLINT ibScale, SQLSMALLINT ibScale,
SQLPOINTER rgbValue, SQLPOINTER rgbValue,
skipping to change at line 1964 skipping to change at line 2068
#define SQL_HOUR_TO_MINUTE SQL_CODE_HOUR_TO_MINUTE #define SQL_HOUR_TO_MINUTE SQL_CODE_HOUR_TO_MINUTE
#define SQL_HOUR_TO_SECOND SQL_CODE_HOUR_TO_SECOND #define SQL_HOUR_TO_SECOND SQL_CODE_HOUR_TO_SECOND
#define SQL_MINUTE_TO_SECOND SQL_CODE_MINUTE_TO_SECOND #define SQL_MINUTE_TO_SECOND SQL_CODE_MINUTE_TO_SECOND
#endif /* ODBC_STD */ #endif /* ODBC_STD */
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
#ifndef RC_INVOKED #ifndef RC_INVOKED
SQLRETURN SQL_API SQLAllocHandleStd( SQLRETURN SQL_API SQLAllocHandleStd(
SQLSMALLINT fHandleType, SQLSMALLINT fHandleType,
SQLHANDLE hInput, SQLHANDLE hInput,
__out
SQLHANDLE *phOutput); SQLHANDLE *phOutput);
#endif /* RC_INVOKED */ #endif /* RC_INVOKED */
#endif #endif
/* Deprecated defines from prior versions of ODBC */ /* Deprecated defines from prior versions of ODBC */
#define SQL_DATABASE_NAME 16 /* Use SQLGetConnectOption/SQL_CUR RENT_QUALIFIER */ #define SQL_DATABASE_NAME 16 /* Use SQLGetConnectOption/SQL_CUR RENT_QUALIFIER */
#define SQL_FD_FETCH_PREV SQL_FD_FETCH_PRIOR #define SQL_FD_FETCH_PREV SQL_FD_FETCH_PRIOR
#define SQL_FETCH_PREV SQL_FETCH_PRIOR #define SQL_FETCH_PREV SQL_FETCH_PRIOR
#define SQL_CONCUR_TIMESTAMP SQL_CONCUR_ROWVER #define SQL_CONCUR_TIMESTAMP SQL_CONCUR_ROWVER
#define SQL_SCCO_OPT_TIMESTAMP SQL_SCCO_OPT_ROWVER #define SQL_SCCO_OPT_TIMESTAMP SQL_SCCO_OPT_ROWVER
 End of changes. 58 change blocks. 
45 lines changed or deleted 152 lines changed or added


 sqlucode.h (6.0.6002.18005-Windows 6.0)   sqlucode.h (6.1.7601.17514-Windows 7.0) 
skipping to change at line 43 skipping to change at line 43
#ifndef RC_INVOKED #ifndef RC_INVOKED
// UNICODE versions // UNICODE versions
#ifdef _WIN64 #ifdef _WIN64
SQLRETURN SQL_API SQLColAttributeW SQLRETURN SQL_API SQLColAttributeW
( (
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT iCol, SQLUSMALLINT iCol,
SQLUSMALLINT iField, SQLUSMALLINT iField,
__out_bcount_opt(cbDescMax)
SQLPOINTER pCharAttr, SQLPOINTER pCharAttr,
SQLSMALLINT cbCharAttrMax, SQLSMALLINT cbDescMax,
__out_opt
SQLSMALLINT *pcbCharAttr, SQLSMALLINT *pcbCharAttr,
__out_opt
SQLLEN *pNumAttr SQLLEN *pNumAttr
); );
#else #else
SQLRETURN SQL_API SQLColAttributeW( SQLRETURN SQL_API SQLColAttributeW(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT iCol, SQLUSMALLINT iCol,
SQLUSMALLINT iField, SQLUSMALLINT iField,
__out_bcount_opt(cbDescMax)
SQLPOINTER pCharAttr, SQLPOINTER pCharAttr,
SQLSMALLINT cbCharAttrMax, SQLSMALLINT cbDescMax,
__out_opt
SQLSMALLINT *pcbCharAttr, SQLSMALLINT *pcbCharAttr,
__out_opt
SQLPOINTER pNumAttr); SQLPOINTER pNumAttr);
#endif #endif
SQLRETURN SQL_API SQLColAttributesW SQLRETURN SQL_API SQLColAttributesW
( (
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT icol, SQLUSMALLINT icol,
SQLUSMALLINT fDescType, SQLUSMALLINT fDescType,
__out_bcount_opt(cbDescMax)
SQLPOINTER rgbDesc, SQLPOINTER rgbDesc,
SQLSMALLINT cbDescMax, SQLSMALLINT cbDescMax,
__out_opt
SQLSMALLINT *pcbDesc, SQLSMALLINT *pcbDesc,
__out_opt
SQLLEN *pfDesc SQLLEN *pfDesc
); );
SQLRETURN SQL_API SQLConnectW SQLRETURN SQL_API SQLConnectW
( (
SQLHDBC hdbc, SQLHDBC hdbc,
__in_ecount(cchDSN) SQLWCHAR* szDSN, __in_ecount(cchDSN) SQLWCHAR* szDSN,
SQLSMALLINT cchDSN, SQLSMALLINT cchDSN,
__in_ecount(cchUID) SQLWCHAR* szUID, __in_ecount(cchUID) SQLWCHAR* szUID,
SQLSMALLINT cchUID, SQLSMALLINT cchUID,
__in_ecount(cchAuthStr) SQLWCHAR* szAuthStr, __in_ecount(cchAuthStr) SQLWCHAR* szAuthStr,
SQLSMALLINT cchAuthStr SQLSMALLINT cchAuthStr
); );
SQLRETURN SQL_API SQLDescribeColW SQLRETURN SQL_API SQLDescribeColW
( (
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT icol, SQLUSMALLINT icol,
__out_ecount_opt(cchColNameMax) SQLWCHAR* szColName, __out_ecount_opt(cchColNameMax) SQLWCHAR* szColName,
SQLSMALLINT cchColNameMax, SQLSMALLINT cchColNameMax,
__out_opt
SQLSMALLINT* pcchColName, SQLSMALLINT* pcchColName,
__out_opt
SQLSMALLINT* pfSqlType, SQLSMALLINT* pfSqlType,
__out_opt
SQLULEN* pcbColDef, SQLULEN* pcbColDef,
__out_opt
SQLSMALLINT* pibScale, SQLSMALLINT* pibScale,
__out_opt
SQLSMALLINT* pfNullable SQLSMALLINT* pfNullable
); );
SQLRETURN SQL_API SQLErrorW SQLRETURN SQL_API SQLErrorW
( (
SQLHENV henv, SQLHENV henv,
SQLHDBC hdbc, SQLHDBC hdbc,
SQLHSTMT hstmt, SQLHSTMT hstmt,
__out_ecount(6) SQLWCHAR* wszSqlState, __out_ecount(6) SQLWCHAR* wszSqlState,
__out SQLINTEGER* pfNativeError, __out_opt SQLINTEGER* pfNativeError,
__out_ecount_opt(cchErrorMsgMax) SQLWCHAR* wszErrorMsg, __out_ecount_opt(cchErrorMsgMax) SQLWCHAR* wszErrorMsg,
SQLSMALLINT cchErrorMsgMax, SQLSMALLINT cchErrorMsgMax,
__out SQLSMALLINT* pcchErrorMsg __out_opt SQLSMALLINT* pcchErrorMsg
); );
SQLRETURN SQL_API SQLExecDirectW SQLRETURN SQL_API SQLExecDirectW
( (
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cchSqlStr) SQLWCHAR* szSqlStr, __in_ecount_opt(TextLength) SQLWCHAR* szSqlStr,
SQLINTEGER cchSqlStr SQLINTEGER TextLength
); );
SQLRETURN SQL_API SQLGetConnectAttrW SQLRETURN SQL_API SQLGetConnectAttrW
( (
SQLHDBC hdbc, SQLHDBC hdbc,
SQLINTEGER fAttribute, SQLINTEGER fAttribute,
__out_xcount_opt(cbValueMax)
SQLPOINTER rgbValue, SQLPOINTER rgbValue,
SQLINTEGER cbValueMax, SQLINTEGER cbValueMax,
__out_opt
SQLINTEGER* pcbValue SQLINTEGER* pcbValue
); );
SQLRETURN SQL_API SQLGetCursorNameW SQLRETURN SQL_API SQLGetCursorNameW
( (
SQLHSTMT hstmt, SQLHSTMT hstmt,
__out_ecount_opt(cchCursorMax) SQLWCHAR* szCursor, __out_ecount_opt(cchCursorMax) SQLWCHAR* szCursor,
SQLSMALLINT cchCursorMax, SQLSMALLINT cchCursorMax,
__out_opt
SQLSMALLINT* pcchCursor SQLSMALLINT* pcchCursor
); );
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLSetDescFieldW SQLRETURN SQL_API SQLSetDescFieldW
( (
SQLHDESC DescriptorHandle, SQLHDESC DescriptorHandle,
SQLSMALLINT RecNumber, SQLSMALLINT RecNumber,
SQLSMALLINT FieldIdentifier, SQLSMALLINT FieldIdentifier,
SQLPOINTER Value, SQLPOINTER Value,
SQLINTEGER BufferLength SQLINTEGER BufferLength
); );
SQLRETURN SQL_API SQLGetDescFieldW SQLRETURN SQL_API SQLGetDescFieldW
( (
SQLHDESC hdesc, SQLHDESC hdesc,
SQLSMALLINT iRecord, SQLSMALLINT iRecord,
SQLSMALLINT iField, SQLSMALLINT iField,
__out_xcount_opt(cbBufferLength)
SQLPOINTER rgbValue, SQLPOINTER rgbValue,
SQLINTEGER cbValueMax, SQLINTEGER cbBufferLength,
SQLINTEGER *pcbValue __out_opt
SQLINTEGER *StringLength
); );
SQLRETURN SQL_API SQLGetDescRecW SQLRETURN SQL_API SQLGetDescRecW
( (
SQLHDESC hdesc, SQLHDESC hdesc,
SQLSMALLINT iRecord, SQLSMALLINT iRecord,
__out_ecount_opt(cchNameMax) SQLWCHAR* szName, __out_ecount_opt(cchNameMax) SQLWCHAR* szName,
SQLSMALLINT cchNameMax, SQLSMALLINT cchNameMax,
__out_opt
SQLSMALLINT *pcchName, SQLSMALLINT *pcchName,
__out_opt
SQLSMALLINT *pfType, SQLSMALLINT *pfType,
__out_opt
SQLSMALLINT *pfSubType, SQLSMALLINT *pfSubType,
__out_opt
SQLLEN *pLength, SQLLEN *pLength,
__out_opt
SQLSMALLINT *pPrecision, SQLSMALLINT *pPrecision,
__out_opt
SQLSMALLINT *pScale, SQLSMALLINT *pScale,
__out_opt
SQLSMALLINT *pNullable SQLSMALLINT *pNullable
); );
SQLRETURN SQL_API SQLGetDiagFieldW SQLRETURN SQL_API SQLGetDiagFieldW
( (
SQLSMALLINT fHandleType, SQLSMALLINT fHandleType,
SQLHANDLE handle, SQLHANDLE handle,
SQLSMALLINT iRecord, SQLSMALLINT iRecord,
SQLSMALLINT fDiagField, SQLSMALLINT fDiagField,
__out_xcount_opt(cbBufferLength)
SQLPOINTER rgbDiagInfo, SQLPOINTER rgbDiagInfo,
SQLSMALLINT cbDiagInfoMax, SQLSMALLINT cbBufferLength,
SQLSMALLINT *pcbDiagInfo __out_opt
SQLSMALLINT *pcbStringLength
); );
SQLRETURN SQL_API SQLGetDiagRecW SQLRETURN SQL_API SQLGetDiagRecW
( (
SQLSMALLINT fHandleType, SQLSMALLINT fHandleType,
SQLHANDLE handle, SQLHANDLE handle,
SQLSMALLINT iRecord, SQLSMALLINT iRecord,
__out_ecount_opt(6) SQLWCHAR* szSqlState, __out_ecount_opt(6) SQLWCHAR* szSqlState,
SQLINTEGER* pfNativeError, SQLINTEGER* pfNativeError,
__out_ecount_opt(cchErrorMsgMax) SQLWCHAR* szErrorMsg, __out_ecount_opt(cchErrorMsgMax) SQLWCHAR* szErrorMsg,
skipping to change at line 199 skipping to change at line 227
SQLRETURN SQL_API SQLPrepareW SQLRETURN SQL_API SQLPrepareW
( (
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount(cchSqlStr) SQLWCHAR* szSqlStr, __in_ecount(cchSqlStr) SQLWCHAR* szSqlStr,
SQLINTEGER cchSqlStr SQLINTEGER cchSqlStr
); );
SQLRETURN SQL_API SQLSetConnectAttrW( SQLRETURN SQL_API SQLSetConnectAttrW(
SQLHDBC hdbc, SQLHDBC hdbc,
SQLINTEGER fAttribute, SQLINTEGER fAttribute,
__in_bcount_opt(cbValue)
SQLPOINTER rgbValue, SQLPOINTER rgbValue,
SQLINTEGER cbValue); SQLINTEGER cbValue);
SQLRETURN SQL_API SQLSetCursorNameW SQLRETURN SQL_API SQLSetCursorNameW
( (
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount(cchCursor) SQLWCHAR* szCursor, __in_ecount(cchCursor) SQLWCHAR* szCursor,
SQLSMALLINT cchCursor SQLSMALLINT cchCursor
); );
skipping to change at line 228 skipping to change at line 257
__in_ecount_opt(cchColumnName) SQLWCHAR* szColumnName, __in_ecount_opt(cchColumnName) SQLWCHAR* szColumnName,
SQLSMALLINT cchColumnName SQLSMALLINT cchColumnName
); );
SQLRETURN SQL_API SQLGetConnectOptionW( SQLRETURN SQL_API SQLGetConnectOptionW(
SQLHDBC hdbc, SQLHDBC hdbc,
SQLUSMALLINT fOption, SQLUSMALLINT fOption,
SQLPOINTER pvParam); SQLPOINTER pvParam);
SQLRETURN SQL_API SQLGetInfoW( SQLRETURN SQL_API SQLGetInfoW(
SQLHDBC hdbc, SQLHDBC hdbc,
SQLUSMALLINT fInfoType, SQLUSMALLINT fInfoType,
__out_bcount_opt(cbInfoValueMax) SQLPOINTER rgbInfoValue, __out_bcount_opt(cbInfoValueMax) SQLPOINTER rgbInfoValue,
__in_opt SQLSMALLINT cbInfoValueMax, SQLSMALLINT cbInfoValueMax,
SQLSMALLINT* pcbInfoValue); __out_opt
SQLSMALLINT* pcbInfoValue);
SQLRETURN SQL_API SQLGetTypeInfoW( SQLRETURN SQL_API SQLGetTypeInfoW(
SQLHSTMT StatementHandle, SQLHSTMT StatementHandle,
SQLSMALLINT DataType); SQLSMALLINT DataType);
SQLRETURN SQL_API SQLSetConnectOptionW( SQLRETURN SQL_API SQLSetConnectOptionW(
SQLHDBC hdbc, SQLHDBC hdbc,
SQLUSMALLINT fOption, SQLUSMALLINT fOption,
SQLULEN vParam); SQLULEN vParam);
skipping to change at line 289 skipping to change at line 319
__in_ecount_opt(cchTableType) SQLWCHAR* szTableType, __in_ecount_opt(cchTableType) SQLWCHAR* szTableType,
SQLSMALLINT cchTableType SQLSMALLINT cchTableType
); );
SQLRETURN SQL_API SQLDataSourcesW SQLRETURN SQL_API SQLDataSourcesW
( (
SQLHENV henv, SQLHENV henv,
SQLUSMALLINT fDirection, SQLUSMALLINT fDirection,
__out_ecount_opt(cchDSNMax) SQLWCHAR* szDSN, __out_ecount_opt(cchDSNMax) SQLWCHAR* szDSN,
SQLSMALLINT cchDSNMax, SQLSMALLINT cchDSNMax,
__out_opt
SQLSMALLINT* pcchDSN, SQLSMALLINT* pcchDSN,
__out_ecount_opt(cchDescriptionMax) SQLWCHAR* wszDescription, __out_ecount_opt(cchDescriptionMax) SQLWCHAR* wszDescription,
SQLSMALLINT cchDescriptionMax, SQLSMALLINT cchDescriptionMax,
__out_opt
SQLSMALLINT* pcchDescription SQLSMALLINT* pcchDescription
); );
SQLRETURN SQL_API SQLDriverConnectW SQLRETURN SQL_API SQLDriverConnectW
( (
SQLHDBC hdbc, SQLHDBC hdbc,
SQLHWND hwnd, SQLHWND hwnd,
__in_ecount(cchConnStrIn) SQLWCHAR* szConnStrIn, __in_ecount(cchConnStrIn) SQLWCHAR* szConnStrIn,
SQLSMALLINT cchConnStrIn, SQLSMALLINT cchConnStrIn,
__out_ecount_opt(cchConnStrOutMax) SQLWCHAR* szConnStrOut, __out_ecount_opt(cchConnStrOutMax) SQLWCHAR* szConnStrOut,
SQLSMALLINT cchConnStrOutMax, SQLSMALLINT cchConnStrOutMax,
__out SQLSMALLINT* pcchConnStrOut, __out_opt SQLSMALLINT* pcchConnStrOut,
SQLUSMALLINT fDriverCompletion SQLUSMALLINT fDriverCompletion
); );
SQLRETURN SQL_API SQLBrowseConnectW SQLRETURN SQL_API SQLBrowseConnectW
( (
SQLHDBC hdbc, SQLHDBC hdbc,
__in_ecount(cchConnStrIn) SQLWCHAR* szConnStrIn, __in_ecount(cchConnStrIn) SQLWCHAR* szConnStrIn,
SQLSMALLINT cchConnStrIn, SQLSMALLINT cchConnStrIn,
__out_ecount_opt(cchConnStrOutMax) SQLWCHAR* szConnStrOut, __out_ecount_opt(cchConnStrOutMax) SQLWCHAR* szConnStrOut,
SQLSMALLINT cchConnStrOutMax, SQLSMALLINT cchConnStrOutMax,
__out_opt
SQLSMALLINT* pcchConnStrOut SQLSMALLINT* pcchConnStrOut
); );
SQLRETURN SQL_API SQLColumnPrivilegesW( SQLRETURN SQL_API SQLColumnPrivilegesW(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cchCatalogName) SQLWCHAR* szCatalogName, __in_ecount_opt(cchCatalogName) SQLWCHAR* szCatalogName,
SQLSMALLINT cchCatalogName, SQLSMALLINT cchCatalogName,
__in_ecount_opt(cchSchemaName) SQLWCHAR* szSchemaName, __in_ecount_opt(cchSchemaName) SQLWCHAR* szSchemaName,
SQLSMALLINT cchSchemaName, SQLSMALLINT cchSchemaName,
__in_ecount_opt(cchTableName) SQLWCHAR* szTableName, __in_ecount_opt(cchTableName) SQLWCHAR* szTableName,
skipping to change at line 421 skipping to change at line 454
__in_ecount_opt(cchTableName) SQLWCHAR* szTableName, __in_ecount_opt(cchTableName) SQLWCHAR* szTableName,
SQLSMALLINT cchTableName SQLSMALLINT cchTableName
); );
SQLRETURN SQL_API SQLDriversW SQLRETURN SQL_API SQLDriversW
( (
SQLHENV henv, SQLHENV henv,
SQLUSMALLINT fDirection, SQLUSMALLINT fDirection,
__out_ecount_opt(cchDriverDescMax) SQLWCHAR* szDriverDesc, __out_ecount_opt(cchDriverDescMax) SQLWCHAR* szDriverDesc,
SQLSMALLINT cchDriverDescMax, SQLSMALLINT cchDriverDescMax,
__out_opt
SQLSMALLINT* pcchDriverDesc, SQLSMALLINT* pcchDriverDesc,
__out_ecount_opt(cchDrvrAttrMax) SQLWCHAR* szDriverAttributes, __out_ecount_opt(cchDrvrAttrMax) SQLWCHAR* szDriverAttributes,
SQLSMALLINT cchDrvrAttrMax, SQLSMALLINT cchDrvrAttrMax,
__out_opt
SQLSMALLINT* pcchDrvrAttr SQLSMALLINT* pcchDrvrAttr
); );
// ANSI versions // ANSI versions
#ifdef _WIN64 #ifdef _WIN64
SQLRETURN SQL_API SQLColAttributeA( SQLRETURN SQL_API SQLColAttributeA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLSMALLINT iCol, SQLSMALLINT iCol,
SQLSMALLINT iField, SQLSMALLINT iField,
__out_bcount_opt(cbCharAttrMax)
SQLPOINTER pCharAttr, SQLPOINTER pCharAttr,
SQLSMALLINT cbCharAttrMax, SQLSMALLINT cbCharAttrMax,
__out_opt
SQLSMALLINT *pcbCharAttr, SQLSMALLINT *pcbCharAttr,
__out_opt
SQLLEN *pNumAttr); SQLLEN *pNumAttr);
#else #else
SQLRETURN SQL_API SQLColAttributeA( SQLRETURN SQL_API SQLColAttributeA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLSMALLINT iCol, SQLSMALLINT iCol,
SQLSMALLINT iField, SQLSMALLINT iField,
__out_bcount_opt(cbCharAttrMax)
SQLPOINTER pCharAttr, SQLPOINTER pCharAttr,
SQLSMALLINT cbCharAttrMax, SQLSMALLINT cbCharAttrMax,
__out_opt
SQLSMALLINT *pcbCharAttr, SQLSMALLINT *pcbCharAttr,
__out_opt
SQLPOINTER pNumAttr); SQLPOINTER pNumAttr);
#endif #endif
SQLRETURN SQL_API SQLColAttributesA( SQLRETURN SQL_API SQLColAttributesA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT icol, SQLUSMALLINT icol,
SQLUSMALLINT fDescType, SQLUSMALLINT fDescType,
__out_bcount_opt(cbDescMax)
SQLPOINTER rgbDesc, SQLPOINTER rgbDesc,
SQLSMALLINT cbDescMax, SQLSMALLINT cbDescMax,
__out_opt
SQLSMALLINT *pcbDesc, SQLSMALLINT *pcbDesc,
__out_opt
SQLLEN *pfDesc); SQLLEN *pfDesc);
SQLRETURN SQL_API SQLConnectA( SQLRETURN SQL_API SQLConnectA(
SQLHDBC hdbc, SQLHDBC hdbc,
__in_ecount(cbDSN)
SQLCHAR *szDSN, SQLCHAR *szDSN,
SQLSMALLINT cbDSN, SQLSMALLINT cbDSN,
__in_ecount(cbUID)
SQLCHAR *szUID, SQLCHAR *szUID,
SQLSMALLINT cbUID, SQLSMALLINT cbUID,
__in_ecount(cbAuthStr)
SQLCHAR *szAuthStr, SQLCHAR *szAuthStr,
SQLSMALLINT cbAuthStr); SQLSMALLINT cbAuthStr);
SQLRETURN SQL_API SQLDescribeColA( SQLRETURN SQL_API SQLDescribeColA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT icol, SQLUSMALLINT icol,
__out_ecount_opt(cbColNameMax)
SQLCHAR *szColName, SQLCHAR *szColName,
SQLSMALLINT cbColNameMax, SQLSMALLINT cbColNameMax,
__out_opt
SQLSMALLINT *pcbColName, SQLSMALLINT *pcbColName,
__out_opt
SQLSMALLINT *pfSqlType, SQLSMALLINT *pfSqlType,
__out_opt
SQLULEN *pcbColDef, SQLULEN *pcbColDef,
__out_opt
SQLSMALLINT *pibScale, SQLSMALLINT *pibScale,
__out_opt
SQLSMALLINT *pfNullable); SQLSMALLINT *pfNullable);
SQLRETURN SQL_API SQLErrorA( SQLRETURN SQL_API SQLErrorA(
SQLHENV henv, SQLHENV henv,
SQLHDBC hdbc, SQLHDBC hdbc,
SQLHSTMT hstmt, SQLHSTMT hstmt,
__out_ecount(SQL_SQLSTATE_SIZE + 1)
SQLCHAR *szSqlState, SQLCHAR *szSqlState,
__out_opt
SQLINTEGER *pfNativeError, SQLINTEGER *pfNativeError,
__out_ecount_opt(cbErrorMsgMax)
SQLCHAR *szErrorMsg, SQLCHAR *szErrorMsg,
SQLSMALLINT cbErrorMsgMax, SQLSMALLINT cbErrorMsgMax,
__out_opt
SQLSMALLINT *pcbErrorMsg); SQLSMALLINT *pcbErrorMsg);
SQLRETURN SQL_API SQLExecDirectA( SQLRETURN SQL_API SQLExecDirectA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cbSqlStr)
SQLCHAR *szSqlStr, SQLCHAR *szSqlStr,
SQLINTEGER cbSqlStr); SQLINTEGER cbSqlStr);
SQLRETURN SQL_API SQLGetConnectAttrA( SQLRETURN SQL_API SQLGetConnectAttrA(
SQLHDBC hdbc, SQLHDBC hdbc,
SQLINTEGER fAttribute, SQLINTEGER fAttribute,
__out_xcount_opt(cbValueMax)
SQLPOINTER rgbValue, SQLPOINTER rgbValue,
SQLINTEGER cbValueMax, SQLINTEGER cbValueMax,
__out_opt
SQLINTEGER *pcbValue); SQLINTEGER *pcbValue);
SQLRETURN SQL_API SQLGetCursorNameA( SQLRETURN SQL_API SQLGetCursorNameA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__out_ecount_opt(cbCursorMax)
SQLCHAR *szCursor, SQLCHAR *szCursor,
SQLSMALLINT cbCursorMax, SQLSMALLINT cbCursorMax,
__out_opt
SQLSMALLINT *pcbCursor); SQLSMALLINT *pcbCursor);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLGetDescFieldA( SQLRETURN SQL_API SQLGetDescFieldA(
SQLHDESC hdesc, SQLHDESC hdesc,
SQLSMALLINT iRecord, SQLSMALLINT iRecord,
SQLSMALLINT iField, SQLSMALLINT iField,
__out_xcount_opt(cbBufferLength)
SQLPOINTER rgbValue, SQLPOINTER rgbValue,
SQLINTEGER cbValueMax, SQLINTEGER cbBufferLength,
SQLINTEGER *pcbValue); __out_opt
SQLINTEGER *StringLength);
SQLRETURN SQL_API SQLGetDescRecA( SQLRETURN SQL_API SQLGetDescRecA(
SQLHDESC hdesc, SQLHDESC hdesc,
SQLSMALLINT iRecord, SQLSMALLINT iRecord,
__out_ecount_opt(cbNameMax)
SQLCHAR *szName, SQLCHAR *szName,
SQLSMALLINT cbNameMax, SQLSMALLINT cbNameMax,
__out_opt
SQLSMALLINT *pcbName, SQLSMALLINT *pcbName,
__out_opt
SQLSMALLINT *pfType, SQLSMALLINT *pfType,
__out_opt
SQLSMALLINT *pfSubType, SQLSMALLINT *pfSubType,
__out_opt
SQLLEN *pLength, SQLLEN *pLength,
__out_opt
SQLSMALLINT *pPrecision, SQLSMALLINT *pPrecision,
__out_opt
SQLSMALLINT *pScale, SQLSMALLINT *pScale,
__out_opt
SQLSMALLINT *pNullable); SQLSMALLINT *pNullable);
SQLRETURN SQL_API SQLGetDiagFieldA( SQLRETURN SQL_API SQLGetDiagFieldA(
SQLSMALLINT fHandleType, SQLSMALLINT fHandleType,
SQLHANDLE handle, SQLHANDLE handle,
SQLSMALLINT iRecord, SQLSMALLINT iRecord,
SQLSMALLINT fDiagField, SQLSMALLINT fDiagField,
__out_xcount_opt(cbDiagInfoMax)
SQLPOINTER rgbDiagInfo, SQLPOINTER rgbDiagInfo,
SQLSMALLINT cbDiagInfoMax, SQLSMALLINT cbDiagInfoMax,
__out_opt
SQLSMALLINT *pcbDiagInfo); SQLSMALLINT *pcbDiagInfo);
SQLRETURN SQL_API SQLGetDiagRecA( SQLRETURN SQL_API SQLGetDiagRecA(
SQLSMALLINT fHandleType, SQLSMALLINT fHandleType,
SQLHANDLE handle, SQLHANDLE handle,
SQLSMALLINT iRecord, SQLSMALLINT iRecord,
__out_ecount_opt(6)
SQLCHAR *szSqlState, SQLCHAR *szSqlState,
SQLINTEGER *pfNativeError, SQLINTEGER *pfNativeError,
__out_ecount_opt(cbErrorMsgMax)
SQLCHAR *szErrorMsg, SQLCHAR *szErrorMsg,
SQLSMALLINT cbErrorMsgMax, SQLSMALLINT cbErrorMsgMax,
SQLSMALLINT *pcbErrorMsg); SQLSMALLINT *pcbErrorMsg);
SQLRETURN SQL_API SQLGetStmtAttrA( SQLRETURN SQL_API SQLGetStmtAttrA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLINTEGER fAttribute, SQLINTEGER fAttribute,
SQLPOINTER rgbValue, SQLPOINTER rgbValue,
SQLINTEGER cbValueMax, SQLINTEGER cbValueMax,
SQLINTEGER *pcbValue); SQLINTEGER *pcbValue);
#endif #endif
SQLRETURN SQL_API SQLGetTypeInfoA( SQLRETURN SQL_API SQLGetTypeInfoA(
SQLHSTMT StatementHandle, SQLHSTMT StatementHandle,
SQLSMALLINT DataType); SQLSMALLINT DataType);
SQLRETURN SQL_API SQLPrepareA( SQLRETURN SQL_API SQLPrepareA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount(cbSqlStr)
SQLCHAR *szSqlStr, SQLCHAR *szSqlStr,
SQLINTEGER cbSqlStr); SQLINTEGER cbSqlStr);
SQLRETURN SQL_API SQLSetConnectAttrA( SQLRETURN SQL_API SQLSetConnectAttrA(
SQLHDBC hdbc, SQLHDBC hdbc,
SQLINTEGER fAttribute, SQLINTEGER fAttribute,
__in_bcount_opt(cbValue)
SQLPOINTER rgbValue, SQLPOINTER rgbValue,
SQLINTEGER cbValue); SQLINTEGER cbValue);
SQLRETURN SQL_API SQLSetCursorNameA( SQLRETURN SQL_API SQLSetCursorNameA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount(cbCursor)
SQLCHAR *szCursor, SQLCHAR *szCursor,
SQLSMALLINT cbCursor); SQLSMALLINT cbCursor);
SQLRETURN SQL_API SQLColumnsA( SQLRETURN SQL_API SQLColumnsA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cbCatalogName)
SQLCHAR *szCatalogName, SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName, SQLSMALLINT cbCatalogName,
__in_ecount_opt(cbSchemaName)
SQLCHAR *szSchemaName, SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName, SQLSMALLINT cbSchemaName,
__in_ecount_opt(cbTableName)
SQLCHAR *szTableName, SQLCHAR *szTableName,
SQLSMALLINT cbTableName, SQLSMALLINT cbTableName,
__in_ecount_opt(cbColumnName)
SQLCHAR *szColumnName, SQLCHAR *szColumnName,
SQLSMALLINT cbColumnName); SQLSMALLINT cbColumnName);
SQLRETURN SQL_API SQLGetConnectOptionA( SQLRETURN SQL_API SQLGetConnectOptionA(
SQLHDBC hdbc, SQLHDBC hdbc,
SQLUSMALLINT fOption, SQLUSMALLINT fOption,
SQLPOINTER pvParam); SQLPOINTER pvParam);
SQLRETURN SQL_API SQLGetInfoA( SQLRETURN SQL_API SQLGetInfoA(
SQLHDBC hdbc, SQLHDBC hdbc,
SQLUSMALLINT fInfoType, SQLUSMALLINT fInfoType,
__out_bcount_opt(cbInfoValueMax)
SQLPOINTER rgbInfoValue, SQLPOINTER rgbInfoValue,
SQLSMALLINT cbInfoValueMax, SQLSMALLINT cbInfoValueMax,
__out_opt
SQLSMALLINT* pcbInfoValue); SQLSMALLINT* pcbInfoValue);
SQLRETURN SQL_API SQLGetStmtOptionA( SQLRETURN SQL_API SQLGetStmtOptionA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT fOption, SQLUSMALLINT fOption,
SQLPOINTER pvParam); SQLPOINTER pvParam);
SQLRETURN SQL_API SQLSetConnectOptionA( SQLRETURN SQL_API SQLSetConnectOptionA(
SQLHDBC hdbc, SQLHDBC hdbc,
SQLUSMALLINT fOption, SQLUSMALLINT fOption,
SQLULEN vParam); SQLULEN vParam);
SQLRETURN SQL_API SQLSetStmtOptionA( SQLRETURN SQL_API SQLSetStmtOptionA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT fOption, SQLUSMALLINT fOption,
SQLULEN vParam); SQLULEN vParam);
SQLRETURN SQL_API SQLSpecialColumnsA( SQLRETURN SQL_API SQLSpecialColumnsA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT fColType, SQLUSMALLINT fColType,
__in_ecount_opt(cbCatalogName)
SQLCHAR *szCatalogName, SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName, SQLSMALLINT cbCatalogName,
__in_ecount_opt(cbSchemaName)
SQLCHAR *szSchemaName, SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName, SQLSMALLINT cbSchemaName,
__in_ecount_opt(cbTableName)
SQLCHAR *szTableName, SQLCHAR *szTableName,
SQLSMALLINT cbTableName, SQLSMALLINT cbTableName,
SQLUSMALLINT fScope, SQLUSMALLINT fScope,
SQLUSMALLINT fNullable); SQLUSMALLINT fNullable);
SQLRETURN SQL_API SQLStatisticsA( SQLRETURN SQL_API SQLStatisticsA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cbCatalogName)
SQLCHAR *szCatalogName, SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName, SQLSMALLINT cbCatalogName,
__in_ecount_opt(cbSchemaName)
SQLCHAR *szSchemaName, SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName, SQLSMALLINT cbSchemaName,
__in_ecount_opt(cbTableName)
SQLCHAR *szTableName, SQLCHAR *szTableName,
SQLSMALLINT cbTableName, SQLSMALLINT cbTableName,
SQLUSMALLINT fUnique, SQLUSMALLINT fUnique,
SQLUSMALLINT fAccuracy); SQLUSMALLINT fAccuracy);
SQLRETURN SQL_API SQLTablesA( SQLRETURN SQL_API SQLTablesA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cbCatalogName)
SQLCHAR *szCatalogName, SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName, SQLSMALLINT cbCatalogName,
__in_ecount_opt(cbSchemaName)
SQLCHAR *szSchemaName, SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName, SQLSMALLINT cbSchemaName,
__in_ecount_opt(cbTableName)
SQLCHAR *szTableName, SQLCHAR *szTableName,
SQLSMALLINT cbTableName, SQLSMALLINT cbTableName,
__in_ecount_opt(cbTableType)
SQLCHAR *szTableType, SQLCHAR *szTableType,
SQLSMALLINT cbTableType); SQLSMALLINT cbTableType);
SQLRETURN SQL_API SQLDataSourcesA( SQLRETURN SQL_API SQLDataSourcesA(
SQLHENV henv, SQLHENV henv,
SQLUSMALLINT fDirection, SQLUSMALLINT fDirection,
__out_ecount_opt(cbDSNMax)
SQLCHAR *szDSN, SQLCHAR *szDSN,
SQLSMALLINT cbDSNMax, SQLSMALLINT cbDSNMax,
SQLSMALLINT *pcbDSN, SQLSMALLINT *pcbDSN,
__out_ecount_opt(cbDescriptionMax)
SQLCHAR *szDescription, SQLCHAR *szDescription,
SQLSMALLINT cbDescriptionMax, SQLSMALLINT cbDescriptionMax,
SQLSMALLINT *pcbDescription); SQLSMALLINT *pcbDescription);
SQLRETURN SQL_API SQLDriverConnectA( SQLRETURN SQL_API SQLDriverConnectA(
SQLHDBC hdbc, SQLHDBC hdbc,
SQLHWND hwnd, SQLHWND hwnd,
__in_ecount(cbConnStrIn)
SQLCHAR *szConnStrIn, SQLCHAR *szConnStrIn,
SQLSMALLINT cbConnStrIn, SQLSMALLINT cbConnStrIn,
__out_ecount_opt(cbConnStrOutMax)
SQLCHAR *szConnStrOut, SQLCHAR *szConnStrOut,
SQLSMALLINT cbConnStrOutMax, SQLSMALLINT cbConnStrOutMax,
__out_opt
SQLSMALLINT *pcbConnStrOut, SQLSMALLINT *pcbConnStrOut,
SQLUSMALLINT fDriverCompletion); SQLUSMALLINT fDriverCompletion);
SQLRETURN SQL_API SQLBrowseConnectA( SQLRETURN SQL_API SQLBrowseConnectA(
SQLHDBC hdbc, SQLHDBC hdbc,
__in_ecount(cbConnStrIn)
SQLCHAR *szConnStrIn, SQLCHAR *szConnStrIn,
SQLSMALLINT cbConnStrIn, SQLSMALLINT cbConnStrIn,
__out_ecount_opt(cbConnStrOutMax)
SQLCHAR *szConnStrOut, SQLCHAR *szConnStrOut,
SQLSMALLINT cbConnStrOutMax, SQLSMALLINT cbConnStrOutMax,
__out_opt
SQLSMALLINT *pcbConnStrOut); SQLSMALLINT *pcbConnStrOut);
SQLRETURN SQL_API SQLColumnPrivilegesA( SQLRETURN SQL_API SQLColumnPrivilegesA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cbCatalogName)
SQLCHAR *szCatalogName, SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName, SQLSMALLINT cbCatalogName,
__in_ecount_opt(cbSchemaName)
SQLCHAR *szSchemaName, SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName, SQLSMALLINT cbSchemaName,
__in_ecount_opt(cbTableName)
SQLCHAR *szTableName, SQLCHAR *szTableName,
SQLSMALLINT cbTableName, SQLSMALLINT cbTableName,
__in_ecount_opt(cbColumnName)
SQLCHAR *szColumnName, SQLCHAR *szColumnName,
SQLSMALLINT cbColumnName); SQLSMALLINT cbColumnName);
SQLRETURN SQL_API SQLDescribeParamA( SQLRETURN SQL_API SQLDescribeParamA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT ipar, SQLUSMALLINT ipar,
__out_opt
SQLSMALLINT *pfSqlType, SQLSMALLINT *pfSqlType,
__out_opt
SQLUINTEGER *pcbParamDef, SQLUINTEGER *pcbParamDef,
__out_opt
SQLSMALLINT *pibScale, SQLSMALLINT *pibScale,
__out_opt
SQLSMALLINT *pfNullable); SQLSMALLINT *pfNullable);
SQLRETURN SQL_API SQLForeignKeysA( SQLRETURN SQL_API SQLForeignKeysA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cbPkCatalogName)
SQLCHAR *szPkCatalogName, SQLCHAR *szPkCatalogName,
SQLSMALLINT cbPkCatalogName, SQLSMALLINT cbPkCatalogName,
__in_ecount_opt(cbPkSchemaName)
SQLCHAR *szPkSchemaName, SQLCHAR *szPkSchemaName,
SQLSMALLINT cbPkSchemaName, SQLSMALLINT cbPkSchemaName,
__in_ecount_opt(cbPkTableName)
SQLCHAR *szPkTableName, SQLCHAR *szPkTableName,
SQLSMALLINT cbPkTableName, SQLSMALLINT cbPkTableName,
__in_ecount_opt(cbFkCatalogName)
SQLCHAR *szFkCatalogName, SQLCHAR *szFkCatalogName,
SQLSMALLINT cbFkCatalogName, SQLSMALLINT cbFkCatalogName,
__in_ecount_opt(cbFkSchemaName)
SQLCHAR *szFkSchemaName, SQLCHAR *szFkSchemaName,
SQLSMALLINT cbFkSchemaName, SQLSMALLINT cbFkSchemaName,
__in_ecount_opt(cbFkTableName)
SQLCHAR *szFkTableName, SQLCHAR *szFkTableName,
SQLSMALLINT cbFkTableName); SQLSMALLINT cbFkTableName);
SQLRETURN SQL_API SQLNativeSqlA( SQLRETURN SQL_API SQLNativeSqlA(
SQLHDBC hdbc, SQLHDBC hdbc,
__in_ecount(cbSqlStrIn)
SQLCHAR *szSqlStrIn, SQLCHAR *szSqlStrIn,
SQLINTEGER cbSqlStrIn, SQLINTEGER cbSqlStrIn,
__out_ecount_opt(cbSqlStrMax)
SQLCHAR *szSqlStr, SQLCHAR *szSqlStr,
SQLINTEGER cbSqlStrMax, SQLINTEGER cbSqlStrMax,
SQLINTEGER *pcbSqlStr); SQLINTEGER *pcbSqlStr);
SQLRETURN SQL_API SQLPrimaryKeysA( SQLRETURN SQL_API SQLPrimaryKeysA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cbCatalogName)
SQLCHAR *szCatalogName, SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName, SQLSMALLINT cbCatalogName,
__in_ecount_opt(cbSchemaName)
SQLCHAR *szSchemaName, SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName, SQLSMALLINT cbSchemaName,
__in_ecount_opt(cbTableName)
SQLCHAR *szTableName, SQLCHAR *szTableName,
SQLSMALLINT cbTableName); SQLSMALLINT cbTableName);
SQLRETURN SQL_API SQLProcedureColumnsA( SQLRETURN SQL_API SQLProcedureColumnsA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cbCatalogName)
SQLCHAR *szCatalogName, SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName, SQLSMALLINT cbCatalogName,
__in_ecount_opt(cbSchemaName)
SQLCHAR *szSchemaName, SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName, SQLSMALLINT cbSchemaName,
__in_ecount_opt(cbProcName)
SQLCHAR *szProcName, SQLCHAR *szProcName,
SQLSMALLINT cbProcName, SQLSMALLINT cbProcName,
__in_ecount_opt(cbColumnName)
SQLCHAR *szColumnName, SQLCHAR *szColumnName,
SQLSMALLINT cbColumnName); SQLSMALLINT cbColumnName);
SQLRETURN SQL_API SQLProceduresA( SQLRETURN SQL_API SQLProceduresA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cbCatalogName)
SQLCHAR *szCatalogName, SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName, SQLSMALLINT cbCatalogName,
__in_ecount_opt(cbSchemaName)
SQLCHAR *szSchemaName, SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName, SQLSMALLINT cbSchemaName,
__in_ecount_opt(cbProcName)
SQLCHAR *szProcName, SQLCHAR *szProcName,
SQLSMALLINT cbProcName); SQLSMALLINT cbProcName);
SQLRETURN SQL_API SQLTablePrivilegesA( SQLRETURN SQL_API SQLTablePrivilegesA(
SQLHSTMT hstmt, SQLHSTMT hstmt,
__in_ecount_opt(cbCatalogName)
SQLCHAR *szCatalogName, SQLCHAR *szCatalogName,
SQLSMALLINT cbCatalogName, SQLSMALLINT cbCatalogName,
__in_ecount_opt(cbSchemaName)
SQLCHAR *szSchemaName, SQLCHAR *szSchemaName,
SQLSMALLINT cbSchemaName, SQLSMALLINT cbSchemaName,
__in_ecount_opt(cbTableName)
SQLCHAR *szTableName, SQLCHAR *szTableName,
SQLSMALLINT cbTableName); SQLSMALLINT cbTableName);
SQLRETURN SQL_API SQLDriversA( SQLRETURN SQL_API SQLDriversA(
SQLHENV henv, SQLHENV henv,
SQLUSMALLINT fDirection, SQLUSMALLINT fDirection,
__out_ecount_opt(cbDriverDescMax)
SQLCHAR *szDriverDesc, SQLCHAR *szDriverDesc,
SQLSMALLINT cbDriverDescMax, SQLSMALLINT cbDriverDescMax,
__out_opt
SQLSMALLINT *pcbDriverDesc, SQLSMALLINT *pcbDriverDesc,
__out_ecount_opt(cbDrvrAttrMax)
SQLCHAR *szDriverAttributes, SQLCHAR *szDriverAttributes,
SQLSMALLINT cbDrvrAttrMax, SQLSMALLINT cbDrvrAttrMax,
__out_opt
SQLSMALLINT *pcbDrvrAttr); SQLSMALLINT *pcbDrvrAttr);
//--------------------------------------------- //---------------------------------------------
// Mapping macros for Unicode // Mapping macros for Unicode
//--------------------------------------------- //---------------------------------------------
#ifndef SQL_NOUNICODEMAP // define this to disable the mapping #ifndef SQL_NOUNICODEMAP // define this to disable the mapping
#ifdef UNICODE #ifdef UNICODE
#define SQLColAttribute SQLColAttributeW #define SQLColAttribute SQLColAttributeW
#define SQLColAttributes SQLColAttributesW #define SQLColAttributes SQLColAttributesW
 End of changes. 141 change blocks. 
17 lines changed or deleted 153 lines changed or added

This html diff was produced by rfcdiff 1.41.