Skip to content

W
wine-winehq
Commit 0dd43e9b authored by Andreas Damm's avatar Andreas Damm Committed by Alexandre Julliard
Browse files
Options

odbc32: Made ODBC function signatures 64-bit compliant.

Signed-off-by: 's avatarAndreas Damm <andreas.damm@insightsoftware.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 2233fb37
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
include/sql.h
View file @ 0dd43e9b
...@@ -506,15 +506,15 @@ SQLRETURN WINAPI SQLAllocStmt(SQLHDBC ConnectionHandle, ...@@ -506,15 +506,15 @@ SQLRETURN WINAPI SQLAllocStmt(SQLHDBC ConnectionHandle,
SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle,
SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
SQLPOINTER TargetValue, SQLINTEGER BufferLength, SQLPOINTER TargetValue, SQLLEN BufferLength,
SQLLEN *StrLen_or_Ind); SQLLEN *StrLen_or_Ind);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN WINAPI SQLBindParam(SQLHSTMT StatementHandle, SQLRETURN WINAPI SQLBindParam(SQLHSTMT StatementHandle,
SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision, SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue, SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
SQLINTEGER *StrLen_or_Ind); SQLLEN *StrLen_or_Ind);
#endif #endif
SQLRETURN WINAPI SQLCancel(SQLHSTMT StatementHandle); SQLRETURN WINAPI SQLCancel(SQLHSTMT StatementHandle);
...@@ -525,7 +525,7 @@ SQLRETURN WINAPI SQLCloseCursor(SQLHSTMT StatementHandle); ...@@ -525,7 +525,7 @@ SQLRETURN WINAPI SQLCloseCursor(SQLHSTMT StatementHandle);
SQLRETURN WINAPI SQLColAttribute (SQLHSTMT StatementHandle, SQLRETURN WINAPI SQLColAttribute (SQLHSTMT StatementHandle,
SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier, SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier,
SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength, SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength,
SQLSMALLINT *StringLength, SQLPOINTER NumericAttribute); SQLSMALLINT *StringLength, SQLLEN *NumericAttribute);
#endif #endif
...@@ -555,7 +555,7 @@ SQLRETURN WINAPI SQLDataSources(SQLHENV EnvironmentHandle, ...@@ -555,7 +555,7 @@ SQLRETURN WINAPI SQLDataSources(SQLHENV EnvironmentHandle,
SQLRETURN WINAPI SQLDescribeCol(SQLHSTMT StatementHandle, SQLRETURN WINAPI SQLDescribeCol(SQLHSTMT StatementHandle,
SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName, SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName,
SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, SQLSMALLINT BufferLength, SQLSMALLINT *NameLength,
SQLSMALLINT *DataType, SQLUINTEGER *ColumnSize, SQLSMALLINT *DataType, SQLULEN *ColumnSize,
SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable); SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable);
SQLRETURN WINAPI SQLDisconnect(SQLHDBC ConnectionHandle); SQLRETURN WINAPI SQLDisconnect(SQLHDBC ConnectionHandle);
...@@ -580,7 +580,7 @@ SQLRETURN WINAPI SQLFetch(SQLHSTMT StatementHandle); ...@@ -580,7 +580,7 @@ SQLRETURN WINAPI SQLFetch(SQLHSTMT StatementHandle);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN WINAPI SQLFetchScroll(SQLHSTMT StatementHandle, SQLRETURN WINAPI SQLFetchScroll(SQLHSTMT StatementHandle,
SQLSMALLINT FetchOrientation, SQLINTEGER FetchOffset); SQLSMALLINT FetchOrientation, SQLLEN FetchOffset);
#endif #endif
SQLRETURN WINAPI SQLFreeConnect(SQLHDBC ConnectionHandle); SQLRETURN WINAPI SQLFreeConnect(SQLHDBC ConnectionHandle);
...@@ -609,8 +609,8 @@ SQLRETURN WINAPI SQLGetCursorName(SQLHSTMT StatementHandle, ...@@ -609,8 +609,8 @@ SQLRETURN WINAPI SQLGetCursorName(SQLHSTMT StatementHandle,
SQLRETURN WINAPI SQLGetData(SQLHSTMT StatementHandle, SQLRETURN WINAPI SQLGetData(SQLHSTMT StatementHandle,
SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
SQLPOINTER TargetValue, SQLINTEGER BufferLength, SQLPOINTER TargetValue, SQLLEN BufferLength,
SQLINTEGER *StrLen_or_Ind); SQLLEN *StrLen_or_Ind);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN WINAPI SQLGetDescField(SQLHDESC DescriptorHandle, SQLRETURN WINAPI SQLGetDescField(SQLHDESC DescriptorHandle,
...@@ -622,7 +622,7 @@ SQLRETURN WINAPI SQLGetDescRec(SQLHDESC DescriptorHandle, ...@@ -622,7 +622,7 @@ SQLRETURN WINAPI SQLGetDescRec(SQLHDESC DescriptorHandle,
SQLSMALLINT RecNumber, SQLCHAR *Name, SQLSMALLINT RecNumber, SQLCHAR *Name,
SQLSMALLINT BufferLength, SQLSMALLINT *StringLength, SQLSMALLINT BufferLength, SQLSMALLINT *StringLength,
SQLSMALLINT *Type, SQLSMALLINT *SubType, SQLSMALLINT *Type, SQLSMALLINT *SubType,
SQLINTEGER *Length, SQLSMALLINT *Precision, SQLLEN *Length, SQLSMALLINT *Precision,
SQLSMALLINT *Scale, SQLSMALLINT *Nullable); SQLSMALLINT *Scale, SQLSMALLINT *Nullable);
SQLRETURN WINAPI SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLRETURN WINAPI SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle,
...@@ -669,10 +669,10 @@ SQLRETURN WINAPI SQLPrepare(SQLHSTMT StatementHandle, ...@@ -669,10 +669,10 @@ SQLRETURN WINAPI SQLPrepare(SQLHSTMT StatementHandle,
SQLCHAR *StatementText, SQLINTEGER TextLength); SQLCHAR *StatementText, SQLINTEGER TextLength);
SQLRETURN WINAPI SQLPutData(SQLHSTMT StatementHandle, SQLRETURN WINAPI SQLPutData(SQLHSTMT StatementHandle,
SQLPOINTER Data, SQLINTEGER StrLen_or_Ind); SQLPOINTER Data, SQLLEN StrLen_or_Ind);
SQLRETURN WINAPI SQLRowCount(SQLHSTMT StatementHandle, SQLRETURN WINAPI SQLRowCount(SQLHSTMT StatementHandle,
SQLINTEGER *RowCount); SQLLEN *RowCount);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN WINAPI SQLSetConnectAttr(SQLHDBC ConnectionHandle, SQLRETURN WINAPI SQLSetConnectAttr(SQLHDBC ConnectionHandle,
...@@ -681,7 +681,7 @@ SQLRETURN WINAPI SQLSetConnectAttr(SQLHDBC ConnectionHandle, ...@@ -681,7 +681,7 @@ SQLRETURN WINAPI SQLSetConnectAttr(SQLHDBC ConnectionHandle,
#endif #endif
SQLRETURN WINAPI SQLSetConnectOption(SQLHDBC ConnectionHandle, SQLRETURN WINAPI SQLSetConnectOption(SQLHDBC ConnectionHandle,
SQLUSMALLINT Option, SQLUINTEGER Value); SQLUSMALLINT Option, SQLULEN Value);
SQLRETURN WINAPI SQLSetCursorName(SQLHSTMT StatementHandle, SQLRETURN WINAPI SQLSetCursorName(SQLHSTMT StatementHandle,
SQLCHAR *CursorName, SQLSMALLINT NameLength); SQLCHAR *CursorName, SQLSMALLINT NameLength);
...@@ -693,10 +693,10 @@ SQLRETURN WINAPI SQLSetDescField(SQLHDESC DescriptorHandle, ...@@ -693,10 +693,10 @@ SQLRETURN WINAPI SQLSetDescField(SQLHDESC DescriptorHandle,
SQLRETURN WINAPI SQLSetDescRec(SQLHDESC DescriptorHandle, SQLRETURN WINAPI SQLSetDescRec(SQLHDESC DescriptorHandle,
SQLSMALLINT RecNumber, SQLSMALLINT Type, SQLSMALLINT RecNumber, SQLSMALLINT Type,
SQLSMALLINT SubType, SQLINTEGER Length, SQLSMALLINT SubType, SQLLEN Length,
SQLSMALLINT Precision, SQLSMALLINT Scale, SQLSMALLINT Precision, SQLSMALLINT Scale,
SQLPOINTER Data, SQLINTEGER *StringLength, SQLPOINTER Data, SQLLEN *StringLength,
SQLINTEGER *Indicator); SQLLEN *Indicator);
SQLRETURN WINAPI SQLSetEnvAttr(SQLHENV EnvironmentHandle, SQLRETURN WINAPI SQLSetEnvAttr(SQLHENV EnvironmentHandle,
SQLINTEGER Attribute, SQLPOINTER Value, SQLINTEGER Attribute, SQLPOINTER Value,
...@@ -705,9 +705,9 @@ SQLRETURN WINAPI SQLSetEnvAttr(SQLHENV EnvironmentHandle, ...@@ -705,9 +705,9 @@ SQLRETURN WINAPI SQLSetEnvAttr(SQLHENV EnvironmentHandle,
SQLRETURN WINAPI SQLSetParam(SQLHSTMT StatementHandle, SQLRETURN WINAPI SQLSetParam(SQLHSTMT StatementHandle,
SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType, SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision, SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue, SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
SQLINTEGER *StrLen_or_Ind); SQLLEN *StrLen_or_Ind);
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN WINAPI SQLSetStmtAttr(SQLHSTMT StatementHandle, SQLRETURN WINAPI SQLSetStmtAttr(SQLHSTMT StatementHandle,
...@@ -716,7 +716,7 @@ SQLRETURN WINAPI SQLSetStmtAttr(SQLHSTMT StatementHandle, ...@@ -716,7 +716,7 @@ SQLRETURN WINAPI SQLSetStmtAttr(SQLHSTMT StatementHandle,
#endif #endif
SQLRETURN WINAPI SQLSetStmtOption(SQLHSTMT StatementHandle, SQLRETURN WINAPI SQLSetStmtOption(SQLHSTMT StatementHandle,
SQLUSMALLINT Option, SQLUINTEGER Value); SQLUSMALLINT Option, SQLULEN Value);
SQLRETURN WINAPI SQLSpecialColumns(SQLHSTMT StatementHandle, SQLRETURN WINAPI SQLSpecialColumns(SQLHSTMT StatementHandle,
SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName, SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName,
......
include/sqlext.h
View file @ 0dd43e9b
...@@ -1455,7 +1455,7 @@ SQLRETURN WINAPI SQLColAttributes( ...@@ -1455,7 +1455,7 @@ SQLRETURN WINAPI SQLColAttributes(
SQLPOINTER rgbDesc, SQLPOINTER rgbDesc,
SQLSMALLINT cbDescMax, SQLSMALLINT cbDescMax,
SQLSMALLINT *pcbDesc, SQLSMALLINT *pcbDesc,
SQLINTEGER *pfDesc); SQLLEN *pfDesc);
SQLRETURN WINAPI SQLColumnPrivileges( SQLRETURN WINAPI SQLColumnPrivileges(
SQLHSTMT hstmt, SQLHSTMT hstmt,
...@@ -1472,15 +1472,15 @@ SQLRETURN WINAPI SQLDescribeParam( ...@@ -1472,15 +1472,15 @@ SQLRETURN WINAPI SQLDescribeParam(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT ipar, SQLUSMALLINT ipar,
SQLSMALLINT *pfSqlType, SQLSMALLINT *pfSqlType,
SQLUINTEGER *pcbParamDef, SQLULEN *pcbParamDef,
SQLSMALLINT *pibScale, SQLSMALLINT *pibScale,
SQLSMALLINT *pfNullable); SQLSMALLINT *pfNullable);
SQLRETURN WINAPI SQLExtendedFetch( SQLRETURN WINAPI SQLExtendedFetch(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT fFetchType, SQLUSMALLINT fFetchType,
SQLINTEGER irow, SQLLEN irow,
SQLUINTEGER *pcrow, SQLULEN *pcrow,
SQLUSMALLINT *rgfRowStatus); SQLUSMALLINT *rgfRowStatus);
SQLRETURN WINAPI SQLForeignKeys( SQLRETURN WINAPI SQLForeignKeys(
...@@ -1515,8 +1515,8 @@ SQLRETURN WINAPI SQLNumParams( ...@@ -1515,8 +1515,8 @@ SQLRETURN WINAPI SQLNumParams(
SQLRETURN WINAPI SQLParamOptions( SQLRETURN WINAPI SQLParamOptions(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUINTEGER crow, SQLULEN crow,
SQLUINTEGER *pirow); SQLULEN *pirow);
SQLRETURN WINAPI SQLPrimaryKeys( SQLRETURN WINAPI SQLPrimaryKeys(
SQLHSTMT hstmt, SQLHSTMT hstmt,
...@@ -1549,7 +1549,7 @@ SQLRETURN WINAPI SQLProcedures( ...@@ -1549,7 +1549,7 @@ SQLRETURN WINAPI SQLProcedures(
SQLRETURN WINAPI SQLSetPos( SQLRETURN WINAPI SQLSetPos(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT irow, SQLSETPOSIROW irow,
SQLUSMALLINT fOption, SQLUSMALLINT fOption,
SQLUSMALLINT fLock); SQLUSMALLINT fLock);
...@@ -1578,11 +1578,11 @@ SQLRETURN WINAPI SQLBindParameter( ...@@ -1578,11 +1578,11 @@ SQLRETURN WINAPI SQLBindParameter(
SQLSMALLINT fParamType, SQLSMALLINT fParamType,
SQLSMALLINT fCType, SQLSMALLINT fCType,
SQLSMALLINT fSqlType, SQLSMALLINT fSqlType,
SQLUINTEGER cbColDef, SQLULEN cbColDef,
SQLSMALLINT ibScale, SQLSMALLINT ibScale,
SQLPOINTER rgbValue, SQLPOINTER rgbValue,
SQLINTEGER cbValueMax, SQLLEN cbValueMax,
SQLINTEGER *pcbValue); SQLLEN *pcbValue);
#ifdef ODBC_STD #ifdef ODBC_STD
#define SQLAllocHandle SQLAllocHandleStd #define SQLAllocHandle SQLAllocHandleStd
...@@ -1629,7 +1629,7 @@ SQLRETURN WINAPI SQLAllocHandleStd( ...@@ -1629,7 +1629,7 @@ SQLRETURN WINAPI SQLAllocHandleStd(
SQLRETURN WINAPI SQLSetScrollOptions( SQLRETURN WINAPI SQLSetScrollOptions(
SQLHSTMT hstmt, SQLHSTMT hstmt,
SQLUSMALLINT fConcurrency, SQLUSMALLINT fConcurrency,
SQLINTEGER crowKeyset, SQLLEN crowKeyset,
SQLUSMALLINT crowRowset); SQLUSMALLINT crowRowset);
#define TRACE_VERSION 1000 #define TRACE_VERSION 1000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment