dll/win32/odbc32/odbc32_ros.diff

   1 Index: proxyodbc.c
   2 ===================================================================
   3 --- proxyodbc.c (Revision 41027)
   4 +++ proxyodbc.c (Arbeitskopie)
   5 @@ -733,8 +733,8 @@
   6   */
   7  SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle,
   8                       SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
   9 -                     SQLPOINTER TargetValue, SQLINTEGER BufferLength,
  10 -                     SQLINTEGER *StrLen_or_Ind)
  11 +                     SQLPOINTER TargetValue, SQLLEN BufferLength,
  12 +                     SQLLEN *StrLen_or_Ind)
  13  {
  14          TRACE("\n");
  15
  16 @@ -756,9 +756,9 @@
  17   */
  18  SQLRETURN WINAPI SQLBindParam(SQLHSTMT StatementHandle,
  19               SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
  20 -             SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision,
  21 +             SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
  22               SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
  23 -             SQLINTEGER *StrLen_or_Ind)
  24 +             SQLLEN *StrLen_or_Ind)
  25  {
  26          TRACE("\n");
  27
  28 @@ -926,7 +926,7 @@
  29  SQLRETURN WINAPI SQLDescribeCol(SQLHSTMT StatementHandle,
  30               SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName,
  31               SQLSMALLINT BufferLength, SQLSMALLINT *NameLength,
  32 -             SQLSMALLINT *DataType, SQLUINTEGER *ColumnSize,
  33 +             SQLSMALLINT *DataType, SQLULEN *ColumnSize,
  34               SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable)
  35  {
  36          TRACE("\n");
  37 @@ -1040,7 +1040,7 @@
  38  /*************************************************************************
  39   *                             SQLFetchScroll          [ODBC32.030]
  40   */
  41 -SQLRETURN WINAPI SQLFetchScroll(SQLHSTMT StatementHandle, SQLSMALLINT FetchOrientation, SQLINTEGER FetchOffset)
  42 +SQLRETURN WINAPI SQLFetchScroll(SQLHSTMT StatementHandle, SQLSMALLINT FetchOrientation, SQLLEN FetchOffset)
  43  {
  44          TRACE("\n");
  45
  46 @@ -1177,8 +1177,8 @@
  47   */
  48  SQLRETURN WINAPI SQLGetData(SQLHSTMT StatementHandle,
  49               SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
  50 -             SQLPOINTER TargetValue, SQLINTEGER BufferLength,
  51 -             SQLINTEGER *StrLen_or_Ind)
  52 +             SQLPOINTER TargetValue, SQLLEN BufferLength,
  53 +             SQLLEN *StrLen_or_Ind)
  54  {
  55          TRACE("\n");
  56
  57 @@ -1217,7 +1217,7 @@
  58               SQLSMALLINT RecNumber, SQLCHAR *Name,
  59               SQLSMALLINT BufferLength, SQLSMALLINT *StringLength,
  60               SQLSMALLINT *Type, SQLSMALLINT *SubType,
  61 -             SQLINTEGER *Length, SQLSMALLINT *Precision,
  62 +             SQLLEN *Length, SQLSMALLINT *Precision,
  63               SQLSMALLINT *Scale, SQLSMALLINT *Nullable)
  64  {
  65          TRACE("\n");
  66 @@ -1413,7 +1413,7 @@
  67  /*************************************************************************
  68   *                             SQLPutData           [ODBC32.049]
  69   */
  70 -SQLRETURN WINAPI SQLPutData(SQLHSTMT StatementHandle, SQLPOINTER Data, SQLINTEGER StrLen_or_Ind)
  71 +SQLRETURN WINAPI SQLPutData(SQLHSTMT StatementHandle, SQLPOINTER Data, SQLLEN StrLen_or_Ind)
  72  {
  73          TRACE("\n");
  74
  75 @@ -1428,7 +1428,7 @@
  76  /*************************************************************************
  77   *                             SQLRowCount           [ODBC32.020]
  78   */
  79 -SQLRETURN WINAPI SQLRowCount(SQLHSTMT StatementHandle, SQLINTEGER *RowCount)
  80 +SQLRETURN WINAPI SQLRowCount(SQLHSTMT StatementHandle, SQLLEN *RowCount)
  81  {
  82          TRACE("\n");
  83
  84 @@ -1459,7 +1459,7 @@
  85  /*************************************************************************
  86   *                             SQLSetConnectOption           [ODBC32.050]
  87   */
  88 -SQLRETURN WINAPI SQLSetConnectOption(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLUINTEGER Value)
  89 +SQLRETURN WINAPI SQLSetConnectOption(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value)
  90  {
  91          TRACE("\n");
  92
  93 @@ -1508,10 +1508,10 @@
  94   */
  95  SQLRETURN WINAPI SQLSetDescRec(SQLHDESC DescriptorHandle,
  96               SQLSMALLINT RecNumber, SQLSMALLINT Type,
  97 -             SQLSMALLINT SubType, SQLINTEGER Length,
  98 +             SQLSMALLINT SubType, SQLLEN Length,
  99               SQLSMALLINT Precision, SQLSMALLINT Scale,
 100 -             SQLPOINTER Data, SQLINTEGER *StringLength,
 101 -             SQLINTEGER *Indicator)
 102 +             SQLPOINTER Data, SQLLEN *StringLength,
 103 +             SQLLEN *Indicator)
 104  {
 105          TRACE("\n");
 106
 107 @@ -1546,9 +1546,9 @@
 108   */
 109  SQLRETURN WINAPI SQLSetParam(SQLHSTMT StatementHandle,
 110               SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
 111 -             SQLSMALLINT ParameterType, SQLUINTEGER LengthPrecision,
 112 +             SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
 113               SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
 114 -             SQLINTEGER *StrLen_or_Ind)
 115 +             SQLLEN *StrLen_or_Ind)
 116  {
 117          TRACE("\n");
 118
 119 @@ -1581,7 +1581,7 @@
 120  /*************************************************************************
 121   *                             SQLSetStmtOption           [ODBC32.051]
 122   */
 123 -SQLRETURN WINAPI SQLSetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option, SQLUINTEGER Value)
 124 +SQLRETURN WINAPI SQLSetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option, SQLULEN Value)
 125  {
 126          TRACE("\n");
 127
 128 @@ -1717,7 +1717,7 @@
 129      SQLPOINTER         rgbDesc,
 130      SQLSMALLINT        cbDescMax,
 131      SQLSMALLINT           *pcbDesc,
 132 -    SQLINTEGER            *pfDesc)
 133 +    SQLLEN            *pfDesc)
 134  {
 135          TRACE("\n");
 136
 137 @@ -1761,7 +1761,7 @@
 138      SQLHSTMT           hstmt,
 139      SQLUSMALLINT       ipar,
 140      SQLSMALLINT           *pfSqlType,
 141 -    SQLUINTEGER           *pcbParamDef,
 142 +    SQLULEN           *pcbParamDef,
 143      SQLSMALLINT           *pibScale,
 144      SQLSMALLINT           *pfNullable)
 145  {
 146 @@ -2039,11 +2039,11 @@
 147      SQLSMALLINT        fParamType,
 148      SQLSMALLINT        fCType,
 149      SQLSMALLINT        fSqlType,
 150 -    SQLUINTEGER        cbColDef,
 151 +    SQLULEN        cbColDef,
 152      SQLSMALLINT        ibScale,
 153      SQLPOINTER         rgbValue,
 154 -    SQLINTEGER         cbValueMax,
 155 -    SQLINTEGER            *pcbValue)
 156 +    SQLLEN         cbValueMax,
 157 +    SQLLEN            *pcbValue)
 158  {
 159          TRACE("\n");
 160
 161 @@ -2086,7 +2086,7 @@
 162  SQLRETURN WINAPI SQLSetScrollOptions(
 163      SQLHSTMT           statement_handle,
 164      SQLUSMALLINT       f_concurrency,
 165 -    SQLINTEGER         crow_keyset,
 166 +    SQLLEN         crow_keyset,
 167      SQLUSMALLINT       crow_rowset )
 168  {
 169          TRACE("\n");
 170 @@ -2138,7 +2138,7 @@
 171      SQLPOINTER         rgbDesc,
 172      SQLSMALLINT        cbDescMax,
 173      SQLSMALLINT           *pcbDesc,
 174 -    SQLINTEGER            *pfDesc)
 175 +    SQLLEN            *pfDesc)
 176  {
 177          SQLRETURN iResult;
 178
 179 @@ -2200,9 +2200,9 @@
 180   *                             SQLDescribeColW          [ODBC32.108]
 181   */
 182  SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle,
 183 -             SQLUSMALLINT ColumnNumber, WCHAR *ColumnName,
 184 +             SQLUSMALLINT ColumnNumber, SQLWCHAR *ColumnName,
 185               SQLSMALLINT BufferLength, SQLSMALLINT *NameLength,
 186 -             SQLSMALLINT *DataType, SQLUINTEGER *ColumnSize,
 187 +             SQLSMALLINT *DataType, SQLULEN *ColumnSize,
 188               SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable)
 189  {
 190          SQLRETURN iResult;
 191 @@ -2378,10 +2378,10 @@
 192   *                             SQLGetDescRecW          [ODBC32.134]
 193   */
 194  SQLRETURN WINAPI SQLGetDescRecW(SQLHDESC DescriptorHandle,
 195 -             SQLSMALLINT RecNumber, WCHAR *Name,
 196 +             SQLSMALLINT RecNumber, SQLWCHAR *Name,
 197               SQLSMALLINT BufferLength, SQLSMALLINT *StringLength,
 198               SQLSMALLINT *Type, SQLSMALLINT *SubType,
 199 -             SQLINTEGER *Length, SQLSMALLINT *Precision,
 200 +             SQLLEN *Length, SQLSMALLINT *Precision,
 201               SQLSMALLINT *Scale, SQLSMALLINT *Nullable)
 202  {
 203          TRACE("\n");
 204 @@ -2573,7 +2573,7 @@
 205  /*************************************************************************
 206   *                             SQLSetConnectOptionW          [ODBC32.150]
 207   */
 208 -SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLUINTEGER Value)
 209 +SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value)
 210  {
 211          TRACE("\n");
 212
 213 @@ -2588,9 +2588,9 @@
 214   *                             SQLSpecialColumnsW          [ODBC32.152]
 215   */
 216  SQLRETURN WINAPI SQLSpecialColumnsW(SQLHSTMT StatementHandle,
 217 -             SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName,
 218 -             SQLSMALLINT NameLength1, SQLCHAR *SchemaName,
 219 -             SQLSMALLINT NameLength2, SQLCHAR *TableName,
 220 +             SQLUSMALLINT IdentifierType, SQLWCHAR *CatalogName,
 221 +             SQLSMALLINT NameLength1, SQLWCHAR *SchemaName,
 222 +             SQLSMALLINT NameLength2, SQLWCHAR *TableName,
 223               SQLSMALLINT NameLength3, SQLUSMALLINT Scope,
 224               SQLUSMALLINT Nullable)
 225  {
 226 @@ -2607,9 +2607,9 @@
 227   *                             SQLStatisticsW          [ODBC32.153]
 228   */
 229  SQLRETURN WINAPI SQLStatisticsW(SQLHSTMT StatementHandle,
 230 -             SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
 231 -             SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
 232 -             SQLCHAR *TableName, SQLSMALLINT NameLength3,
 233 +             SQLWCHAR *CatalogName, SQLSMALLINT NameLength1,
 234 +             SQLWCHAR *SchemaName, SQLSMALLINT NameLength2,
 235 +             SQLWCHAR *TableName, SQLSMALLINT NameLength3,
 236               SQLUSMALLINT Unique, SQLUSMALLINT Reserved)
 237  {
 238          TRACE("\n");
 239 @@ -2626,10 +2626,10 @@
 240   *                             SQLTablesW          [ODBC32.154]
 241   */
 242  SQLRETURN WINAPI SQLTablesW(SQLHSTMT StatementHandle,
 243 -             SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
 244 -             SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
 245 -             SQLCHAR *TableName, SQLSMALLINT NameLength3,
 246 -             SQLCHAR *TableType, SQLSMALLINT NameLength4)
 247 +             SQLWCHAR *CatalogName, SQLSMALLINT NameLength1,
 248 +             SQLWCHAR *SchemaName, SQLSMALLINT NameLength2,
 249 +             SQLWCHAR *TableName, SQLSMALLINT NameLength3,
 250 +             SQLWCHAR *TableType, SQLSMALLINT NameLength4)
 251  {
 252          TRACE("\n");
 253
 254 @@ -2646,9 +2646,9 @@
 255   */
 256  SQLRETURN WINAPI SQLBrowseConnectW(
 257      SQLHDBC            hdbc,
 258 -    SQLCHAR               *szConnStrIn,
 259 +    SQLWCHAR               *szConnStrIn,
 260      SQLSMALLINT        cbConnStrIn,
 261 -    SQLCHAR               *szConnStrOut,
 262 +    SQLWCHAR               *szConnStrOut,
 263      SQLSMALLINT        cbConnStrOutMax,
 264      SQLSMALLINT       *pcbConnStrOut)
 265  {
 266 @@ -2666,13 +2666,13 @@
 267   */
 268  SQLRETURN WINAPI SQLColumnPrivilegesW(
 269      SQLHSTMT           hstmt,
 270 -    SQLCHAR               *szCatalogName,
 271 +    SQLWCHAR               *szCatalogName,
 272      SQLSMALLINT        cbCatalogName,
 273 -    SQLCHAR               *szSchemaName,
 274 +    SQLWCHAR               *szSchemaName,
 275      SQLSMALLINT        cbSchemaName,
 276 -    SQLCHAR               *szTableName,
 277 +    SQLWCHAR               *szTableName,
 278      SQLSMALLINT        cbTableName,
 279 -    SQLCHAR               *szColumnName,
 280 +    SQLWCHAR               *szColumnName,
 281      SQLSMALLINT        cbColumnName)
 282  {
 283          TRACE("\n");
 284 @@ -2727,17 +2727,17 @@
 285   */
 286  SQLRETURN WINAPI SQLForeignKeysW(
 287      SQLHSTMT           hstmt,
 288 -    SQLCHAR               *szPkCatalogName,
 289 +    SQLWCHAR               *szPkCatalogName,
 290      SQLSMALLINT        cbPkCatalogName,
 291 -    SQLCHAR               *szPkSchemaName,
 292 +    SQLWCHAR               *szPkSchemaName,
 293      SQLSMALLINT        cbPkSchemaName,
 294 -    SQLCHAR               *szPkTableName,
 295 +    SQLWCHAR               *szPkTableName,
 296      SQLSMALLINT        cbPkTableName,
 297 -    SQLCHAR               *szFkCatalogName,
 298 +    SQLWCHAR               *szFkCatalogName,
 299      SQLSMALLINT        cbFkCatalogName,
 300 -    SQLCHAR               *szFkSchemaName,
 301 +    SQLWCHAR               *szFkSchemaName,
 302      SQLSMALLINT        cbFkSchemaName,
 303 -    SQLCHAR               *szFkTableName,
 304 +    SQLWCHAR               *szFkTableName,
 305      SQLSMALLINT        cbFkTableName)
 306  {
 307          TRACE("\n");
 308 @@ -2756,9 +2756,9 @@
 309   */
 310  SQLRETURN WINAPI SQLNativeSqlW(
 311      SQLHDBC            hdbc,
 312 -    SQLCHAR               *szSqlStrIn,
 313 +    SQLWCHAR               *szSqlStrIn,
 314      SQLINTEGER         cbSqlStrIn,
 315 -    SQLCHAR               *szSqlStr,
 316 +    SQLWCHAR               *szSqlStr,
 317      SQLINTEGER         cbSqlStrMax,
 318      SQLINTEGER            *pcbSqlStr)
 319  {
 320 @@ -2776,11 +2776,11 @@
 321   */
 322  SQLRETURN WINAPI SQLPrimaryKeysW(
 323      SQLHSTMT           hstmt,
 324 -    SQLCHAR               *szCatalogName,
 325 +    SQLWCHAR               *szCatalogName,
 326      SQLSMALLINT        cbCatalogName,
 327 -    SQLCHAR               *szSchemaName,
 328 +    SQLWCHAR               *szSchemaName,
 329      SQLSMALLINT        cbSchemaName,
 330 -    SQLCHAR               *szTableName,
 331 +    SQLWCHAR               *szTableName,
 332      SQLSMALLINT        cbTableName)
 333  {
 334          TRACE("\n");
 335 @@ -2798,13 +2798,13 @@
 336   */
 337  SQLRETURN WINAPI SQLProcedureColumnsW(
 338      SQLHSTMT           hstmt,
 339 -    SQLCHAR               *szCatalogName,
 340 +    SQLWCHAR               *szCatalogName,
 341      SQLSMALLINT        cbCatalogName,
 342 -    SQLCHAR               *szSchemaName,
 343 +    SQLWCHAR               *szSchemaName,
 344      SQLSMALLINT        cbSchemaName,
 345 -    SQLCHAR               *szProcName,
 346 +    SQLWCHAR               *szProcName,
 347      SQLSMALLINT        cbProcName,
 348 -    SQLCHAR               *szColumnName,
 349 +    SQLWCHAR               *szColumnName,
 350      SQLSMALLINT        cbColumnName)
 351  {
 352          TRACE("\n");
 353 @@ -2822,11 +2822,11 @@
 354   */
 355  SQLRETURN WINAPI SQLProceduresW(
 356      SQLHSTMT           hstmt,
 357 -    SQLCHAR               *szCatalogName,
 358 +    SQLWCHAR               *szCatalogName,
 359      SQLSMALLINT        cbCatalogName,
 360 -    SQLCHAR               *szSchemaName,
 361 +    SQLWCHAR               *szSchemaName,
 362      SQLSMALLINT        cbSchemaName,
 363 -    SQLCHAR               *szProcName,
 364 +    SQLWCHAR               *szProcName,
 365      SQLSMALLINT        cbProcName)
 366  {
 367          TRACE("\n");
 368 @@ -2844,11 +2844,11 @@
 369   */
 370  SQLRETURN WINAPI SQLTablePrivilegesW(
 371      SQLHSTMT           hstmt,
 372 -    SQLCHAR               *szCatalogName,
 373 +    SQLWCHAR               *szCatalogName,
 374      SQLSMALLINT        cbCatalogName,
 375 -    SQLCHAR               *szSchemaName,
 376 +    SQLWCHAR               *szSchemaName,
 377      SQLSMALLINT        cbSchemaName,
 378 -    SQLCHAR               *szTableName,
 379 +    SQLWCHAR               *szTableName,
 380      SQLSMALLINT        cbTableName)
 381  {
 382          TRACE("\n");
 383 @@ -2867,10 +2867,10 @@
 384  SQLRETURN WINAPI SQLDriversW(
 385      SQLHENV            henv,
 386      SQLUSMALLINT       fDirection,
 387 -    SQLCHAR               *szDriverDesc,
 388 +    SQLWCHAR               *szDriverDesc,
 389      SQLSMALLINT        cbDriverDescMax,
 390      SQLSMALLINT           *pcbDriverDesc,
 391 -    SQLCHAR               *szDriverAttributes,
 392 +    SQLWCHAR               *szDriverAttributes,
 393      SQLSMALLINT        cbDriverAttrMax,
 394      SQLSMALLINT           *pcbDriverAttr)
 395  {