huwcampbell.com
Reactos
[ODBC32] Sync with Wine Staging 4.0. CORE-15682
+263
-239
+117
-117
dll/win32/odbc32/odbc32.spec
+117
-117
dll/win32/odbc32/odbc32.spec
···
1
-
1 stdcall SQLAllocConnect(long ptr)
2
-
2 stdcall SQLAllocEnv(ptr)
3
-
3 stdcall SQLAllocStmt(long ptr)
4
-
4 stdcall SQLBindCol(long long long ptr long ptr)
5
-
5 stdcall SQLCancel(long)
6
-
6 stdcall SQLColAttributes(long long long ptr long ptr ptr)
7
-
7 stdcall SQLConnect(long str long str long str long)
8
-
8 stdcall SQLDescribeCol(long long str long ptr ptr ptr ptr ptr)
9
-
9 stdcall SQLDisconnect(long)
10
-
10 stdcall SQLError(long long long str ptr str long ptr)
11
-
11 stdcall SQLExecDirect(long str long)
12
-
12 stdcall SQLExecute(long)
13
-
13 stdcall SQLFetch(long)
14
-
14 stdcall SQLFreeConnect(long)
15
-
15 stdcall SQLFreeEnv(long)
16
-
16 stdcall SQLFreeStmt(long long )
17
-
17 stdcall SQLGetCursorName(long str long ptr)
18
-
18 stdcall SQLNumResultCols(long ptr)
19
-
19 stdcall SQLPrepare(long str long)
20
-
20 stdcall SQLRowCount(long ptr)
21
-
21 stdcall SQLSetCursorName(long str long)
22
-
22 stdcall SQLSetParam(long long long long long long ptr ptr)
23
-
23 stdcall SQLTransact(long long long)
24
-
24 stdcall SQLAllocHandle(long long ptr)
25
-
25 stdcall SQLBindParam(long long long long long long ptr ptr)
26
-
26 stdcall SQLCloseCursor(long)
27
-
27 stdcall SQLColAttribute(long long long ptr long ptr ptr)
28
-
28 stdcall SQLCopyDesc(long long)
29
-
29 stdcall SQLEndTran(long long long)
30
-
30 stdcall SQLFetchScroll(long long long)
31
-
31 stdcall SQLFreeHandle(long long)
32
-
32 stdcall SQLGetConnectAttr(long long ptr long ptr)
33
-
33 stdcall SQLGetDescField(long long long ptr long ptr)
34
-
34 stdcall SQLGetDescRec(long long str long ptr ptr ptr ptr ptr ptr ptr)
35
-
35 stdcall SQLGetDiagField(long long long long ptr long ptr)
36
-
36 stdcall SQLGetDiagRec(long long long str ptr str long ptr)
37
-
37 stdcall SQLGetEnvAttr(long long ptr long ptr)
38
-
38 stdcall SQLGetStmtAttr(long long ptr long ptr)
39
-
39 stdcall SQLSetConnectAttr(long long ptr long)
40
-
40 stdcall SQLColumns(long str long str long str long str long)
41
-
41 stdcall SQLDriverConnect(long long str long str long ptr long)
42
-
42 stdcall SQLGetConnectOption(long long ptr)
43
-
43 stdcall SQLGetData(long long long ptr long ptr)
44
-
44 stdcall SQLGetFunctions(long long ptr)
45
-
45 stdcall SQLGetInfo(long long ptr long ptr)
46
-
46 stdcall SQLGetStmtOption(long long ptr)
47
-
47 stdcall SQLGetTypeInfo(long long)
48
-
48 stdcall SQLParamData(long ptr)
49
-
49 stdcall SQLPutData(long ptr long)
50
-
50 stdcall SQLSetConnectOption(long long long)
51
-
51 stdcall SQLSetStmtOption(long long long)
52
-
52 stdcall SQLSpecialColumns(long long str long str long str long long long)
53
-
53 stdcall SQLStatistics(long str long str long str long long long)
54
-
54 stdcall SQLTables(long str long str long str long str long)
55
-
55 stdcall SQLBrowseConnect(long str long str long ptr)
56
-
56 stdcall SQLColumnPrivileges(long str long str long str long str long)
57
-
57 stdcall SQLDataSources(long long str long ptr str long ptr)
58
-
58 stdcall SQLDescribeParam(long long ptr ptr ptr ptr)
59
-
59 stdcall SQLExtendedFetch(long long long ptr ptr)
60
-
60 stdcall SQLForeignKeys(long str long str long str long str long str long str long)
61
-
61 stdcall SQLMoreResults(long)
62
-
62 stdcall SQLNativeSql(long str long str long ptr)
63
-
63 stdcall SQLNumParams(long ptr)
64
-
64 stdcall SQLParamOptions(long long ptr)
65
-
65 stdcall SQLPrimaryKeys(long str long str long str long)
66
-
66 stdcall SQLProcedureColumns(long str long str long str long str long)
67
-
67 stdcall SQLProcedures(long str long str long str long)
68
-
68 stdcall SQLSetPos(long long long long)
69
-
69 stdcall SQLSetScrollOptions(long long long long)
70
-
70 stdcall SQLTablePrivileges(long str long str long str long)
71
-
71 stdcall SQLDrivers(long long str long ptr str long ptr)
72
-
72 stdcall SQLBindParameter(long long long long long long long ptr long ptr)
73
-
73 stdcall SQLSetDescField(long long long ptr long)
74
-
74 stdcall SQLSetDescRec(long long long long long long long ptr ptr ptr)
75
-
75 stdcall SQLSetEnvAttr(long long ptr long)
76
-
76 stdcall SQLSetStmtAttr(long long ptr long)
77
-
77 stdcall SQLAllocHandleStd(long long ptr)
78
-
78 stdcall SQLBulkOperations(long long)
1
+
1 stdcall SQLAllocConnect(long ptr) ODBC32_SQLAllocConnect
2
+
2 stdcall SQLAllocEnv(ptr) ODBC32_SQLAllocEnv
3
+
3 stdcall SQLAllocStmt(long ptr) ODBC32_SQLAllocStmt
4
+
4 stdcall SQLBindCol(long long long ptr long ptr) ODBC32_SQLBindCol
5
+
5 stdcall SQLCancel(long) ODBC32_SQLCancel
6
+
6 stdcall SQLColAttributes(long long long ptr long ptr ptr) ODBC32_SQLColAttributes
7
+
7 stdcall SQLConnect(long str long str long str long) ODBC32_SQLConnect
8
+
8 stdcall SQLDescribeCol(long long str long ptr ptr ptr ptr ptr) ODBC32_SQLDescribeCol
9
+
9 stdcall SQLDisconnect(long) ODBC32_SQLDisconnect
10
+
10 stdcall SQLError(long long long str ptr str long ptr) ODBC32_SQLError
11
+
11 stdcall SQLExecDirect(long str long) ODBC32_SQLExecDirect
12
+
12 stdcall SQLExecute(long) ODBC32_SQLExecute
13
+
13 stdcall SQLFetch(long) ODBC32_SQLFetch
14
+
14 stdcall SQLFreeConnect(long) ODBC32_SQLFreeConnect
15
+
15 stdcall SQLFreeEnv(long) ODBC32_SQLFreeEnv
16
+
16 stdcall SQLFreeStmt(long long ) ODBC32_SQLFreeStmt
17
+
17 stdcall SQLGetCursorName(long str long ptr) ODBC32_SQLGetCursorName
18
+
18 stdcall SQLNumResultCols(long ptr) ODBC32_SQLNumResultCols
19
+
19 stdcall SQLPrepare(long str long) ODBC32_SQLPrepare
20
+
20 stdcall SQLRowCount(long ptr) ODBC32_SQLRowCount
21
+
21 stdcall SQLSetCursorName(long str long) ODBC32_SQLSetCursorName
22
+
22 stdcall SQLSetParam(long long long long long long ptr ptr) ODBC32_SQLSetParam
23
+
23 stdcall SQLTransact(long long long) ODBC32_SQLTransact
24
+
24 stdcall SQLAllocHandle(long long ptr) ODBC32_SQLAllocHandle
25
+
25 stdcall SQLBindParam(long long long long long long ptr ptr) ODBC32_SQLBindParam
26
+
26 stdcall SQLCloseCursor(long) ODBC32_SQLCloseCursor
27
+
27 stdcall SQLColAttribute(long long long ptr long ptr ptr) ODBC32_SQLColAttribute
28
+
28 stdcall SQLCopyDesc(long long) ODBC32_SQLCopyDesc
29
+
29 stdcall SQLEndTran(long long long) ODBC32_SQLEndTran
30
+
30 stdcall SQLFetchScroll(long long long) ODBC32_SQLFetchScroll
31
+
31 stdcall SQLFreeHandle(long long) ODBC32_SQLFreeHandle
32
+
32 stdcall SQLGetConnectAttr(long long ptr long ptr) ODBC32_SQLGetConnectAttr
33
+
33 stdcall SQLGetDescField(long long long ptr long ptr) ODBC32_SQLGetDescField
34
+
34 stdcall SQLGetDescRec(long long str long ptr ptr ptr ptr ptr ptr ptr) ODBC32_SQLGetDescRec
35
+
35 stdcall SQLGetDiagField(long long long long ptr long ptr) ODBC32_SQLGetDiagField
36
+
36 stdcall SQLGetDiagRec(long long long str ptr str long ptr) ODBC32_SQLGetDiagRec
37
+
37 stdcall SQLGetEnvAttr(long long ptr long ptr) ODBC32_SQLGetEnvAttr
38
+
38 stdcall SQLGetStmtAttr(long long ptr long ptr) ODBC32_SQLGetStmtAttr
39
+
39 stdcall SQLSetConnectAttr(long long ptr long) ODBC32_SQLSetConnectAttr
40
+
40 stdcall SQLColumns(long str long str long str long str long) ODBC32_SQLColumns
41
+
41 stdcall SQLDriverConnect(long long str long str long ptr long) ODBC32_SQLDriverConnect
42
+
42 stdcall SQLGetConnectOption(long long ptr) ODBC32_SQLGetConnectOption
43
+
43 stdcall SQLGetData(long long long ptr long ptr) ODBC32_SQLGetData
44
+
44 stdcall SQLGetFunctions(long long ptr) ODBC32_SQLGetFunctions
45
+
45 stdcall SQLGetInfo(long long ptr long ptr) ODBC32_SQLGetInfo
46
+
46 stdcall SQLGetStmtOption(long long ptr) ODBC32_SQLGetStmtOption
47
+
47 stdcall SQLGetTypeInfo(long long) ODBC32_SQLGetTypeInfo
48
+
48 stdcall SQLParamData(long ptr) ODBC32_SQLParamData
49
+
49 stdcall SQLPutData(long ptr long) ODBC32_SQLPutData
50
+
50 stdcall SQLSetConnectOption(long long long) ODBC32_SQLSetConnectOption
51
+
51 stdcall SQLSetStmtOption(long long long) ODBC32_SQLSetStmtOption
52
+
52 stdcall SQLSpecialColumns(long long str long str long str long long long) ODBC32_SQLSpecialColumns
53
+
53 stdcall SQLStatistics(long str long str long str long long long) ODBC32_SQLStatistics
54
+
54 stdcall SQLTables(long str long str long str long str long) ODBC32_SQLTables
55
+
55 stdcall SQLBrowseConnect(long str long str long ptr) ODBC32_SQLBrowseConnect
56
+
56 stdcall SQLColumnPrivileges(long str long str long str long str long) ODBC32_SQLColumnPrivileges
57
+
57 stdcall SQLDataSources(long long str long ptr str long ptr) ODBC32_SQLDataSources
58
+
58 stdcall SQLDescribeParam(long long ptr ptr ptr ptr) ODBC32_SQLDescribeParam
59
+
59 stdcall SQLExtendedFetch(long long long ptr ptr) ODBC32_SQLExtendedFetch
60
+
60 stdcall SQLForeignKeys(long str long str long str long str long str long str long) ODBC32_SQLForeignKeys
61
+
61 stdcall SQLMoreResults(long) ODBC32_SQLMoreResults
62
+
62 stdcall SQLNativeSql(long str long str long ptr) ODBC32_SQLNativeSql
63
+
63 stdcall SQLNumParams(long ptr) ODBC32_SQLNumParams
64
+
64 stdcall SQLParamOptions(long long ptr) ODBC32_SQLParamOptions
65
+
65 stdcall SQLPrimaryKeys(long str long str long str long) ODBC32_SQLPrimaryKeys
66
+
66 stdcall SQLProcedureColumns(long str long str long str long str long) ODBC32_SQLProcedureColumns
67
+
67 stdcall SQLProcedures(long str long str long str long) ODBC32_SQLProcedures
68
+
68 stdcall SQLSetPos(long long long long) ODBC32_SQLSetPos
69
+
69 stdcall SQLSetScrollOptions(long long long long) ODBC32_SQLSetScrollOptions
70
+
70 stdcall SQLTablePrivileges(long str long str long str long) ODBC32_SQLTablePrivileges
71
+
71 stdcall SQLDrivers(long long str long ptr str long ptr) ODBC32_SQLDrivers
72
+
72 stdcall SQLBindParameter(long long long long long long long ptr long ptr) ODBC32_SQLBindParameter
73
+
73 stdcall SQLSetDescField(long long long ptr long) ODBC32_SQLSetDescField
74
+
74 stdcall SQLSetDescRec(long long long long long long long ptr ptr ptr) ODBC32_SQLSetDescRec
75
+
75 stdcall SQLSetEnvAttr(long long ptr long) ODBC32_SQLSetEnvAttr
76
+
76 stdcall SQLSetStmtAttr(long long ptr long) ODBC32_SQLSetStmtAttr
77
+
77 stdcall SQLAllocHandleStd(long long ptr) ODBC32_SQLAllocHandleStd
78
+
78 stdcall SQLBulkOperations(long long) ODBC32_SQLBulkOperations
79
79
79 stub CloseODBCPerfData
80
80
80 stub CollectODBCPerfData
81
81
81 stub CursorLibLockDbc
···
86
86
86 stub ODBSetTryWaitValue
87
87
89 stub ODBCSharedPerfMon
88
88
90 stub ODBCSharedVSFlag
89
-
106 stdcall SQLColAttributesW(long long long ptr long ptr ptr)
90
-
107 stdcall SQLConnectW(long wstr long wstr long wstr long)
91
-
108 stdcall SQLDescribeColW(long long wstr long ptr ptr ptr ptr ptr)
92
-
110 stdcall SQLErrorW(long long long wstr ptr wstr long ptr)
93
-
111 stdcall SQLExecDirectW(long wstr long)
94
-
117 stdcall SQLGetCursorNameW(long wstr long ptr)
95
-
119 stdcall SQLPrepareW(long wstr long)
96
-
121 stdcall SQLSetCursorNameW(long wstr long)
97
-
127 stdcall SQLColAttributeW(long long long ptr long ptr ptr)
98
-
132 stdcall SQLGetConnectAttrW(long long ptr long ptr)
99
-
133 stdcall SQLGetDescFieldW(long long long ptr long ptr)
100
-
134 stdcall SQLGetDescRecW(long long wstr long ptr ptr ptr ptr ptr ptr ptr)
101
-
135 stdcall SQLGetDiagFieldW(long long long long ptr long ptr)
102
-
136 stdcall SQLGetDiagRecW(long long long wstr ptr wstr long ptr)
103
-
138 stdcall SQLGetStmtAttrW(long long ptr long ptr)
104
-
139 stdcall SQLSetConnectAttrW(long long ptr long)
105
-
140 stdcall SQLColumnsW(long wstr long wstr long wstr long wstr long)
106
-
141 stdcall SQLDriverConnectW(long long wstr long wstr long ptr long)
107
-
142 stdcall SQLGetConnectOptionW(long long ptr)
108
-
145 stdcall SQLGetInfoW(long long ptr long ptr)
109
-
147 stdcall SQLGetTypeInfoW(long long)
110
-
150 stdcall SQLSetConnectOptionW(long long long)
111
-
152 stdcall SQLSpecialColumnsW(long long wstr long wstr long wstr long long long)
112
-
153 stdcall SQLStatisticsW(long wstr long wstr long wstr long long long)
113
-
154 stdcall SQLTablesW(long wstr long wstr long wstr long wstr long)
114
-
155 stdcall SQLBrowseConnectW(long wstr long wstr long ptr)
115
-
156 stdcall SQLColumnPrivilegesW(long wstr long wstr long wstr long wstr long)
116
-
157 stdcall SQLDataSourcesW(long long wstr long ptr wstr long ptr)
117
-
160 stdcall SQLForeignKeysW(long wstr long wstr long wstr long wstr long wstr long wstr long)
118
-
162 stdcall SQLNativeSqlW(long wstr long wstr long ptr)
119
-
165 stdcall SQLPrimaryKeysW(long wstr long wstr long wstr long)
120
-
166 stdcall SQLProcedureColumnsW(long wstr long wstr long wstr long wstr long)
121
-
167 stdcall SQLProceduresW(long wstr long wstr long wstr long)
122
-
170 stdcall SQLTablePrivilegesW(long wstr long wstr long wstr long)
123
-
171 stdcall SQLDriversW(long long wstr long ptr wstr long ptr)
124
-
173 stdcall SQLSetDescFieldW(long long long ptr long)
125
-
176 stdcall SQLSetStmtAttrW(long long ptr long)
89
+
106 stdcall SQLColAttributesW(long long long ptr long ptr ptr) ODBC32_SQLColAttributesW
90
+
107 stdcall SQLConnectW(long wstr long wstr long wstr long) ODBC32_SQLConnectW
91
+
108 stdcall SQLDescribeColW(long long wstr long ptr ptr ptr ptr ptr) ODBC32_SQLDescribeColW
92
+
110 stdcall SQLErrorW(long long long wstr ptr wstr long ptr) ODBC32_SQLErrorW
93
+
111 stdcall SQLExecDirectW(long wstr long) ODBC32_SQLExecDirectW
94
+
117 stdcall SQLGetCursorNameW(long wstr long ptr) ODBC32_SQLGetCursorNameW
95
+
119 stdcall SQLPrepareW(long wstr long) ODBC32_SQLPrepareW
96
+
121 stdcall SQLSetCursorNameW(long wstr long) ODBC32_SQLSetCursorNameW
97
+
127 stdcall SQLColAttributeW(long long long ptr long ptr ptr) ODBC32_SQLColAttributeW
98
+
132 stdcall SQLGetConnectAttrW(long long ptr long ptr) ODBC32_SQLGetConnectAttrW
99
+
133 stdcall SQLGetDescFieldW(long long long ptr long ptr) ODBC32_SQLGetDescFieldW
100
+
134 stdcall SQLGetDescRecW(long long wstr long ptr ptr ptr ptr ptr ptr ptr) ODBC32_SQLGetDescRecW
101
+
135 stdcall SQLGetDiagFieldW(long long long long ptr long ptr) ODBC32_SQLGetDiagFieldW
102
+
136 stdcall SQLGetDiagRecW(long long long wstr ptr wstr long ptr) ODBC32_SQLGetDiagRecW
103
+
138 stdcall SQLGetStmtAttrW(long long ptr long ptr) ODBC32_SQLGetStmtAttrW
104
+
139 stdcall SQLSetConnectAttrW(long long ptr long) ODBC32_SQLSetConnectAttrW
105
+
140 stdcall SQLColumnsW(long wstr long wstr long wstr long wstr long) ODBC32_SQLColumnsW
106
+
141 stdcall SQLDriverConnectW(long long wstr long wstr long ptr long) ODBC32_SQLDriverConnectW
107
+
142 stdcall SQLGetConnectOptionW(long long ptr) ODBC32_SQLGetConnectOptionW
108
+
145 stdcall SQLGetInfoW(long long ptr long ptr) ODBC32_SQLGetInfoW
109
+
147 stdcall SQLGetTypeInfoW(long long) ODBC32_SQLGetTypeInfoW
110
+
150 stdcall SQLSetConnectOptionW(long long long) ODBC32_SQLSetConnectOptionW
111
+
152 stdcall SQLSpecialColumnsW(long long wstr long wstr long wstr long long long) ODBC32_SQLSpecialColumnsW
112
+
153 stdcall SQLStatisticsW(long wstr long wstr long wstr long long long) ODBC32_SQLStatisticsW
113
+
154 stdcall SQLTablesW(long wstr long wstr long wstr long wstr long) ODBC32_SQLTablesW
114
+
155 stdcall SQLBrowseConnectW(long wstr long wstr long ptr) ODBC32_SQLBrowseConnectW
115
+
156 stdcall SQLColumnPrivilegesW(long wstr long wstr long wstr long wstr long) ODBC32_SQLColumnPrivilegesW
116
+
157 stdcall SQLDataSourcesW(long long wstr long ptr wstr long ptr) ODBC32_SQLDataSourcesW
117
+
160 stdcall SQLForeignKeysW(long wstr long wstr long wstr long wstr long wstr long wstr long) ODBC32_SQLForeignKeysW
118
+
162 stdcall SQLNativeSqlW(long wstr long wstr long ptr) ODBC32_SQLNativeSqlW
119
+
165 stdcall SQLPrimaryKeysW(long wstr long wstr long wstr long) ODBC32_SQLPrimaryKeysW
120
+
166 stdcall SQLProcedureColumnsW(long wstr long wstr long wstr long wstr long) ODBC32_SQLProcedureColumnsW
121
+
167 stdcall SQLProceduresW(long wstr long wstr long wstr long) ODBC32_SQLProceduresW
122
+
170 stdcall SQLTablePrivilegesW(long wstr long wstr long wstr long) ODBC32_SQLTablePrivilegesW
123
+
171 stdcall SQLDriversW(long long wstr long ptr wstr long ptr) ODBC32_SQLDriversW
124
+
173 stdcall SQLSetDescFieldW(long long long ptr long) ODBC32_SQLSetDescFieldW
125
+
176 stdcall SQLSetStmtAttrW(long long ptr long) ODBC32_SQLSetStmtAttrW
126
126
206 stub SQLColAttributesA
127
127
207 stub SQLConnectA
128
128
208 stub SQLDescribeColA
···
136
136
233 stub SQLGetDescFieldA
137
137
234 stub SQLGetDescRecA
138
138
235 stub SQLGetDiagFieldA
139
-
236 stub SQLGetDiagRecA
139
+
236 stdcall SQLGetDiagRecA(long long long ptr ptr ptr long ptr) ODBC32_SQLGetDiagRecA
140
140
238 stub SQLGetStmtAttrA
141
141
239 stub SQLSetConnectAttrA
142
142
240 stub SQLColumnsA
···
150
150
254 stub SQLTablesA
151
151
255 stub SQLBrowseConnectA
152
152
256 stub SQLColumnPrivilegesA
153
-
257 stdcall SQLDataSourcesA(long long str long ptr str long ptr)
153
+
257 stdcall SQLDataSourcesA(long long str long ptr str long ptr) ODBC32_SQLDataSourcesA
154
154
260 stub SQLForeignKeysA
155
155
262 stub SQLNativeSqlA
156
156
265 stub SQLPrimaryKeysA
+145
-121
dll/win32/odbc32/proxyodbc.c
+145
-121
dll/win32/odbc32/proxyodbc.c
···
174
174
static SQLRETURN (*pSQLTables)(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
175
175
static SQLRETURN (*pSQLTablesW)(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT);
176
176
static SQLRETURN (*pSQLTransact)(SQLHENV,SQLHDBC,SQLUSMALLINT);
177
+
static SQLRETURN (*pSQLGetDiagRecA)(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLCHAR*,SQLINTEGER*,
178
+
SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
177
179
178
180
#define ERROR_FREE 0
179
181
#define ERROR_SQLERROR 1
···
181
183
182
184
static void *dmHandle;
183
185
static int nErrorType;
186
+
187
+
SQLRETURN WINAPI ODBC32_SQLAllocEnv(SQLHENV *);
188
+
SQLRETURN WINAPI ODBC32_SQLFreeEnv(SQLHENV);
189
+
SQLRETURN WINAPI ODBC32_SQLDataSources(SQLHENV, SQLUSMALLINT, SQLCHAR *, SQLSMALLINT,
190
+
SQLSMALLINT *, SQLCHAR *, SQLSMALLINT, SQLSMALLINT *);
191
+
SQLRETURN WINAPI ODBC32_SQLDrivers(SQLHENV, SQLUSMALLINT, SQLCHAR *, SQLSMALLINT, SQLSMALLINT *,
192
+
SQLCHAR *, SQLSMALLINT, SQLSMALLINT *);
184
193
185
194
/***********************************************************************
186
195
* ODBC_ReplicateODBCInstToRegistry
···
225
234
226
235
success = TRUE;
227
236
dirn = SQL_FETCH_FIRST;
228
-
while ((sql_ret = SQLDrivers (hEnv, dirn, (SQLCHAR*)desc, sizeof(desc),
237
+
while ((sql_ret = ODBC32_SQLDrivers (hEnv, dirn, (SQLCHAR*)desc, sizeof(desc),
229
238
&sizedesc, NULL, 0, NULL)) == SQL_SUCCESS ||
230
239
sql_ret == SQL_SUCCESS_WITH_INFO)
231
240
{
···
352
361
{
353
362
success = TRUE;
354
363
dirn = is_user ? SQL_FETCH_FIRST_USER : SQL_FETCH_FIRST_SYSTEM;
355
-
while ((sql_ret = SQLDataSources (hEnv, dirn,
364
+
while ((sql_ret = ODBC32_SQLDataSources (hEnv, dirn,
356
365
(SQLCHAR*)dsn, sizeof(dsn), &sizedsn,
357
366
(SQLCHAR*)desc, sizeof(desc), &sizedesc)) == SQL_SUCCESS
358
367
|| sql_ret == SQL_SUCCESS_WITH_INFO)
···
452
461
SQLRETURN sql_ret;
453
462
SQLHENV hEnv;
454
463
455
-
if ((sql_ret = SQLAllocEnv (&hEnv)) == SQL_SUCCESS)
464
+
if ((sql_ret = ODBC32_SQLAllocEnv (&hEnv)) == SQL_SUCCESS)
456
465
{
457
466
ODBC_ReplicateODBCInstToRegistry (hEnv);
458
467
ODBC_ReplicateODBCToRegistry (FALSE /* system dsns */, hEnv);
459
468
ODBC_ReplicateODBCToRegistry (TRUE /* user dsns */, hEnv);
460
469
461
-
if ((sql_ret = SQLFreeEnv (hEnv)) != SQL_SUCCESS)
470
+
if ((sql_ret = ODBC32_SQLFreeEnv (hEnv)) != SQL_SUCCESS)
462
471
{
463
472
TRACE ("Error %d freeing the SQL environment.\n", (int)sql_ret);
464
473
}
···
617
626
LOAD_FUNC(SQLGetDiagField);
618
627
LOAD_FUNC(SQLGetDiagFieldW);
619
628
LOAD_FUNC(SQLGetDiagRec);
629
+
LOAD_FUNC(SQLGetDiagRecA);
620
630
LOAD_FUNC(SQLGetDiagRecW);
621
631
LOAD_FUNC(SQLGetEnvAttr);
622
632
LOAD_FUNC(SQLGetFunctions);
···
678
688
/*************************************************************************
679
689
* SQLAllocConnect [ODBC32.001]
680
690
*/
681
-
SQLRETURN WINAPI SQLAllocConnect(SQLHENV EnvironmentHandle, SQLHDBC *ConnectionHandle)
691
+
SQLRETURN WINAPI ODBC32_SQLAllocConnect(SQLHENV EnvironmentHandle, SQLHDBC *ConnectionHandle)
682
692
{
683
693
SQLRETURN ret;
684
694
TRACE("(EnvironmentHandle %p)\n",EnvironmentHandle);
···
699
709
/*************************************************************************
700
710
* SQLAllocEnv [ODBC32.002]
701
711
*/
702
-
SQLRETURN WINAPI SQLAllocEnv(SQLHENV *EnvironmentHandle)
712
+
SQLRETURN WINAPI ODBC32_SQLAllocEnv(SQLHENV *EnvironmentHandle)
703
713
{
704
714
SQLRETURN ret;
705
715
TRACE("\n");
···
720
730
/*************************************************************************
721
731
* SQLAllocHandle [ODBC32.024]
722
732
*/
723
-
SQLRETURN WINAPI SQLAllocHandle(SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE *OutputHandle)
733
+
SQLRETURN WINAPI ODBC32_SQLAllocHandle(SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE *OutputHandle)
724
734
{
725
735
SQLRETURN ret;
726
736
TRACE("(Type %d, Handle %p)\n", HandleType, InputHandle);
···
752
762
/*************************************************************************
753
763
* SQLAllocStmt [ODBC32.003]
754
764
*/
755
-
SQLRETURN WINAPI SQLAllocStmt(SQLHDBC ConnectionHandle, SQLHSTMT *StatementHandle)
765
+
SQLRETURN WINAPI ODBC32_SQLAllocStmt(SQLHDBC ConnectionHandle, SQLHSTMT *StatementHandle)
756
766
{
757
767
SQLRETURN ret;
758
768
···
774
784
/*************************************************************************
775
785
* SQLAllocHandleStd [ODBC32.077]
776
786
*/
777
-
SQLRETURN WINAPI SQLAllocHandleStd( SQLSMALLINT HandleType,
787
+
SQLRETURN WINAPI ODBC32_SQLAllocHandleStd( SQLSMALLINT HandleType,
778
788
SQLHANDLE InputHandle, SQLHANDLE *OutputHandle)
779
789
{
780
790
TRACE("ProxyODBC: SQLAllocHandleStd.\n");
···
803
813
/*************************************************************************
804
814
* SQLBindCol [ODBC32.004]
805
815
*/
806
-
SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle,
816
+
SQLRETURN WINAPI ODBC32_SQLBindCol(SQLHSTMT StatementHandle,
807
817
SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
808
818
SQLPOINTER TargetValue, SQLLEN BufferLength,
809
819
SQLLEN *StrLen_or_Ind)
···
824
834
/*************************************************************************
825
835
* SQLBindParam [ODBC32.025]
826
836
*/
827
-
SQLRETURN WINAPI SQLBindParam(SQLHSTMT StatementHandle,
837
+
SQLRETURN WINAPI ODBC32_SQLBindParam(SQLHSTMT StatementHandle,
828
838
SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
829
839
SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
830
840
SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
···
842
852
/*************************************************************************
843
853
* SQLCancel [ODBC32.005]
844
854
*/
845
-
SQLRETURN WINAPI SQLCancel(SQLHSTMT StatementHandle)
855
+
SQLRETURN WINAPI ODBC32_SQLCancel(SQLHSTMT StatementHandle)
846
856
{
847
857
TRACE("\n");
848
858
···
854
864
/*************************************************************************
855
865
* SQLCloseCursor [ODBC32.026]
856
866
*/
857
-
SQLRETURN WINAPI SQLCloseCursor(SQLHSTMT StatementHandle)
867
+
SQLRETURN WINAPI ODBC32_SQLCloseCursor(SQLHSTMT StatementHandle)
858
868
{
859
869
SQLRETURN ret;
860
870
TRACE("(Handle %p)\n", StatementHandle);
···
870
880
/*************************************************************************
871
881
* SQLColAttribute [ODBC32.027]
872
882
*/
873
-
SQLRETURN WINAPI SQLColAttribute (SQLHSTMT StatementHandle,
883
+
SQLRETURN WINAPI ODBC32_SQLColAttribute (SQLHSTMT StatementHandle,
874
884
SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier,
875
885
SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength,
876
886
SQLSMALLINT *StringLength, SQLLEN *NumericAttribute)
···
886
896
/*************************************************************************
887
897
* SQLColumns [ODBC32.040]
888
898
*/
889
-
SQLRETURN WINAPI SQLColumns(SQLHSTMT StatementHandle,
899
+
SQLRETURN WINAPI ODBC32_SQLColumns(SQLHSTMT StatementHandle,
890
900
SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
891
901
SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
892
902
SQLCHAR *TableName, SQLSMALLINT NameLength3,
···
903
913
/*************************************************************************
904
914
* SQLConnect [ODBC32.007]
905
915
*/
906
-
SQLRETURN WINAPI SQLConnect(SQLHDBC ConnectionHandle,
916
+
SQLRETURN WINAPI ODBC32_SQLConnect(SQLHDBC ConnectionHandle,
907
917
SQLCHAR *ServerName, SQLSMALLINT NameLength1,
908
918
SQLCHAR *UserName, SQLSMALLINT NameLength2,
909
919
SQLCHAR *Authentication, SQLSMALLINT NameLength3)
···
924
934
/*************************************************************************
925
935
* SQLCopyDesc [ODBC32.028]
926
936
*/
927
-
SQLRETURN WINAPI SQLCopyDesc(SQLHDESC SourceDescHandle, SQLHDESC TargetDescHandle)
937
+
SQLRETURN WINAPI ODBC32_SQLCopyDesc(SQLHDESC SourceDescHandle, SQLHDESC TargetDescHandle)
928
938
{
929
939
TRACE("\n");
930
940
···
936
946
/*************************************************************************
937
947
* SQLDataSources [ODBC32.057]
938
948
*/
939
-
SQLRETURN WINAPI SQLDataSources(SQLHENV EnvironmentHandle,
949
+
SQLRETURN WINAPI ODBC32_SQLDataSources(SQLHENV EnvironmentHandle,
940
950
SQLUSMALLINT Direction, SQLCHAR *ServerName,
941
951
SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1,
942
952
SQLCHAR *Description, SQLSMALLINT BufferLength2,
···
964
974
return ret;
965
975
}
966
976
967
-
SQLRETURN WINAPI SQLDataSourcesA(SQLHENV EnvironmentHandle,
977
+
SQLRETURN WINAPI ODBC32_SQLDataSourcesA(SQLHENV EnvironmentHandle,
968
978
SQLUSMALLINT Direction, SQLCHAR *ServerName,
969
979
SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1,
970
980
SQLCHAR *Description, SQLSMALLINT BufferLength2,
···
994
1004
/*************************************************************************
995
1005
* SQLDescribeCol [ODBC32.008]
996
1006
*/
997
-
SQLRETURN WINAPI SQLDescribeCol(SQLHSTMT StatementHandle,
1007
+
SQLRETURN WINAPI ODBC32_SQLDescribeCol(SQLHSTMT StatementHandle,
998
1008
SQLUSMALLINT ColumnNumber, SQLCHAR *ColumnName,
999
1009
SQLSMALLINT BufferLength, SQLSMALLINT *NameLength,
1000
1010
SQLSMALLINT *DataType, SQLULEN *ColumnSize,
···
1011
1021
/*************************************************************************
1012
1022
* SQLDisconnect [ODBC32.009]
1013
1023
*/
1014
-
SQLRETURN WINAPI SQLDisconnect(SQLHDBC ConnectionHandle)
1024
+
SQLRETURN WINAPI ODBC32_SQLDisconnect(SQLHDBC ConnectionHandle)
1015
1025
{
1016
1026
SQLRETURN ret;
1017
1027
TRACE("(Handle %p)\n", ConnectionHandle);
···
1027
1037
/*************************************************************************
1028
1038
* SQLEndTran [ODBC32.029]
1029
1039
*/
1030
-
SQLRETURN WINAPI SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMALLINT CompletionType)
1040
+
SQLRETURN WINAPI ODBC32_SQLEndTran(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMALLINT CompletionType)
1031
1041
{
1032
1042
TRACE("\n");
1033
1043
···
1039
1049
/*************************************************************************
1040
1050
* SQLError [ODBC32.010]
1041
1051
*/
1042
-
SQLRETURN WINAPI SQLError(SQLHENV EnvironmentHandle,
1052
+
SQLRETURN WINAPI ODBC32_SQLError(SQLHENV EnvironmentHandle,
1043
1053
SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle,
1044
1054
SQLCHAR *Sqlstate, SQLINTEGER *NativeError,
1045
1055
SQLCHAR *MessageText, SQLSMALLINT BufferLength,
···
1066
1076
/*************************************************************************
1067
1077
* SQLExecDirect [ODBC32.011]
1068
1078
*/
1069
-
SQLRETURN WINAPI SQLExecDirect(SQLHSTMT StatementHandle, SQLCHAR *StatementText, SQLINTEGER TextLength)
1079
+
SQLRETURN WINAPI ODBC32_SQLExecDirect(SQLHSTMT StatementHandle, SQLCHAR *StatementText, SQLINTEGER TextLength)
1070
1080
{
1071
1081
TRACE("\n");
1072
1082
···
1078
1088
/*************************************************************************
1079
1089
* SQLExecute [ODBC32.012]
1080
1090
*/
1081
-
SQLRETURN WINAPI SQLExecute(SQLHSTMT StatementHandle)
1091
+
SQLRETURN WINAPI ODBC32_SQLExecute(SQLHSTMT StatementHandle)
1082
1092
{
1083
1093
TRACE("\n");
1084
1094
···
1090
1100
/*************************************************************************
1091
1101
* SQLFetch [ODBC32.013]
1092
1102
*/
1093
-
SQLRETURN WINAPI SQLFetch(SQLHSTMT StatementHandle)
1103
+
SQLRETURN WINAPI ODBC32_SQLFetch(SQLHSTMT StatementHandle)
1094
1104
{
1095
1105
TRACE("\n");
1096
1106
···
1102
1112
/*************************************************************************
1103
1113
* SQLFetchScroll [ODBC32.030]
1104
1114
*/
1105
-
SQLRETURN WINAPI SQLFetchScroll(SQLHSTMT StatementHandle, SQLSMALLINT FetchOrientation, SQLLEN FetchOffset)
1115
+
SQLRETURN WINAPI ODBC32_SQLFetchScroll(SQLHSTMT StatementHandle, SQLSMALLINT FetchOrientation, SQLLEN FetchOffset)
1106
1116
{
1107
1117
TRACE("\n");
1108
1118
···
1114
1124
/*************************************************************************
1115
1125
* SQLFreeConnect [ODBC32.014]
1116
1126
*/
1117
-
SQLRETURN WINAPI SQLFreeConnect(SQLHDBC ConnectionHandle)
1127
+
SQLRETURN WINAPI ODBC32_SQLFreeConnect(SQLHDBC ConnectionHandle)
1118
1128
{
1119
1129
SQLRETURN ret;
1120
1130
TRACE("(Handle %p)\n", ConnectionHandle);
···
1130
1140
/*************************************************************************
1131
1141
* SQLFreeEnv [ODBC32.015]
1132
1142
*/
1133
-
SQLRETURN WINAPI SQLFreeEnv(SQLHENV EnvironmentHandle)
1143
+
SQLRETURN WINAPI ODBC32_SQLFreeEnv(SQLHENV EnvironmentHandle)
1134
1144
{
1135
1145
SQLRETURN ret;
1136
1146
TRACE("(EnvironmentHandle %p)\n",EnvironmentHandle);
···
1146
1156
/*************************************************************************
1147
1157
* SQLFreeHandle [ODBC32.031]
1148
1158
*/
1149
-
SQLRETURN WINAPI SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle)
1159
+
SQLRETURN WINAPI ODBC32_SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle)
1150
1160
{
1151
1161
SQLRETURN ret;
1152
1162
TRACE("(Type %d, Handle %p)\n", HandleType, Handle);
···
1162
1172
/*************************************************************************
1163
1173
* SQLFreeStmt [ODBC32.016]
1164
1174
*/
1165
-
SQLRETURN WINAPI SQLFreeStmt(SQLHSTMT StatementHandle, SQLUSMALLINT Option)
1175
+
SQLRETURN WINAPI ODBC32_SQLFreeStmt(SQLHSTMT StatementHandle, SQLUSMALLINT Option)
1166
1176
{
1167
1177
SQLRETURN ret;
1168
1178
TRACE("(Handle %p, Option %d)\n", StatementHandle, Option);
···
1178
1188
/*************************************************************************
1179
1189
* SQLGetConnectAttr [ODBC32.032]
1180
1190
*/
1181
-
SQLRETURN WINAPI SQLGetConnectAttr(SQLHDBC ConnectionHandle,
1191
+
SQLRETURN WINAPI ODBC32_SQLGetConnectAttr(SQLHDBC ConnectionHandle,
1182
1192
SQLINTEGER Attribute, SQLPOINTER Value,
1183
1193
SQLINTEGER BufferLength, SQLINTEGER *StringLength)
1184
1194
{
···
1193
1203
/*************************************************************************
1194
1204
* SQLGetConnectOption [ODBC32.042]
1195
1205
*/
1196
-
SQLRETURN WINAPI SQLGetConnectOption(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLPOINTER Value)
1206
+
SQLRETURN WINAPI ODBC32_SQLGetConnectOption(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLPOINTER Value)
1197
1207
{
1198
1208
TRACE("\n");
1199
1209
···
1205
1215
/*************************************************************************
1206
1216
* SQLGetCursorName [ODBC32.017]
1207
1217
*/
1208
-
SQLRETURN WINAPI SQLGetCursorName(SQLHSTMT StatementHandle,
1218
+
SQLRETURN WINAPI ODBC32_SQLGetCursorName(SQLHSTMT StatementHandle,
1209
1219
SQLCHAR *CursorName, SQLSMALLINT BufferLength,
1210
1220
SQLSMALLINT *NameLength)
1211
1221
{
···
1219
1229
/*************************************************************************
1220
1230
* SQLGetData [ODBC32.043]
1221
1231
*/
1222
-
SQLRETURN WINAPI SQLGetData(SQLHSTMT StatementHandle,
1232
+
SQLRETURN WINAPI ODBC32_SQLGetData(SQLHSTMT StatementHandle,
1223
1233
SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
1224
1234
SQLPOINTER TargetValue, SQLLEN BufferLength,
1225
1235
SQLLEN *StrLen_or_Ind)
···
1235
1245
/*************************************************************************
1236
1246
* SQLGetDescField [ODBC32.033]
1237
1247
*/
1238
-
SQLRETURN WINAPI SQLGetDescField(SQLHDESC DescriptorHandle,
1248
+
SQLRETURN WINAPI ODBC32_SQLGetDescField(SQLHDESC DescriptorHandle,
1239
1249
SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
1240
1250
SQLPOINTER Value, SQLINTEGER BufferLength,
1241
1251
SQLINTEGER *StringLength)
···
1251
1261
/*************************************************************************
1252
1262
* SQLGetDescRec [ODBC32.034]
1253
1263
*/
1254
-
SQLRETURN WINAPI SQLGetDescRec(SQLHDESC DescriptorHandle,
1264
+
SQLRETURN WINAPI ODBC32_SQLGetDescRec(SQLHDESC DescriptorHandle,
1255
1265
SQLSMALLINT RecNumber, SQLCHAR *Name,
1256
1266
SQLSMALLINT BufferLength, SQLSMALLINT *StringLength,
1257
1267
SQLSMALLINT *Type, SQLSMALLINT *SubType,
···
1269
1279
/*************************************************************************
1270
1280
* SQLGetDiagField [ODBC32.035]
1271
1281
*/
1272
-
SQLRETURN WINAPI SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle,
1282
+
SQLRETURN WINAPI ODBC32_SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle,
1273
1283
SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier,
1274
1284
SQLPOINTER DiagInfo, SQLSMALLINT BufferLength,
1275
1285
SQLSMALLINT *StringLength)
···
1285
1295
/*************************************************************************
1286
1296
* SQLGetDiagRec [ODBC32.036]
1287
1297
*/
1288
-
SQLRETURN WINAPI SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle,
1298
+
SQLRETURN WINAPI ODBC32_SQLGetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle,
1289
1299
SQLSMALLINT RecNumber, SQLCHAR *Sqlstate,
1290
1300
SQLINTEGER *NativeError, SQLCHAR *MessageText,
1291
1301
SQLSMALLINT BufferLength, SQLSMALLINT *TextLength)
···
1301
1311
/*************************************************************************
1302
1312
* SQLGetEnvAttr [ODBC32.037]
1303
1313
*/
1304
-
SQLRETURN WINAPI SQLGetEnvAttr(SQLHENV EnvironmentHandle,
1314
+
SQLRETURN WINAPI ODBC32_SQLGetEnvAttr(SQLHENV EnvironmentHandle,
1305
1315
SQLINTEGER Attribute, SQLPOINTER Value,
1306
1316
SQLINTEGER BufferLength, SQLINTEGER *StringLength)
1307
1317
{
···
1315
1325
/*************************************************************************
1316
1326
* SQLGetFunctions [ODBC32.044]
1317
1327
*/
1318
-
SQLRETURN WINAPI SQLGetFunctions(SQLHDBC ConnectionHandle, SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported)
1328
+
SQLRETURN WINAPI ODBC32_SQLGetFunctions(SQLHDBC ConnectionHandle, SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported)
1319
1329
{
1320
1330
TRACE("\n");
1321
1331
···
1327
1337
/*************************************************************************
1328
1338
* SQLGetInfo [ODBC32.045]
1329
1339
*/
1330
-
SQLRETURN WINAPI SQLGetInfo(SQLHDBC ConnectionHandle,
1340
+
SQLRETURN WINAPI ODBC32_SQLGetInfo(SQLHDBC ConnectionHandle,
1331
1341
SQLUSMALLINT InfoType, SQLPOINTER InfoValue,
1332
1342
SQLSMALLINT BufferLength, SQLSMALLINT *StringLength)
1333
1343
{
···
1341
1351
/*************************************************************************
1342
1352
* SQLGetStmtAttr [ODBC32.038]
1343
1353
*/
1344
-
SQLRETURN WINAPI SQLGetStmtAttr(SQLHSTMT StatementHandle,
1354
+
SQLRETURN WINAPI ODBC32_SQLGetStmtAttr(SQLHSTMT StatementHandle,
1345
1355
SQLINTEGER Attribute, SQLPOINTER Value,
1346
1356
SQLINTEGER BufferLength, SQLINTEGER *StringLength)
1347
1357
{
···
1355
1365
/*************************************************************************
1356
1366
* SQLGetStmtOption [ODBC32.046]
1357
1367
*/
1358
-
SQLRETURN WINAPI SQLGetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option, SQLPOINTER Value)
1368
+
SQLRETURN WINAPI ODBC32_SQLGetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option, SQLPOINTER Value)
1359
1369
{
1360
1370
TRACE("\n");
1361
1371
···
1367
1377
/*************************************************************************
1368
1378
* SQLGetTypeInfo [ODBC32.047]
1369
1379
*/
1370
-
SQLRETURN WINAPI SQLGetTypeInfo(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
1380
+
SQLRETURN WINAPI ODBC32_SQLGetTypeInfo(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
1371
1381
{
1372
1382
TRACE("\n");
1373
1383
···
1379
1389
/*************************************************************************
1380
1390
* SQLNumResultCols [ODBC32.018]
1381
1391
*/
1382
-
SQLRETURN WINAPI SQLNumResultCols(SQLHSTMT StatementHandle, SQLSMALLINT *ColumnCount)
1392
+
SQLRETURN WINAPI ODBC32_SQLNumResultCols(SQLHSTMT StatementHandle, SQLSMALLINT *ColumnCount)
1383
1393
{
1384
1394
TRACE("\n");
1385
1395
···
1391
1401
/*************************************************************************
1392
1402
* SQLParamData [ODBC32.048]
1393
1403
*/
1394
-
SQLRETURN WINAPI SQLParamData(SQLHSTMT StatementHandle, SQLPOINTER *Value)
1404
+
SQLRETURN WINAPI ODBC32_SQLParamData(SQLHSTMT StatementHandle, SQLPOINTER *Value)
1395
1405
{
1396
1406
TRACE("\n");
1397
1407
···
1403
1413
/*************************************************************************
1404
1414
* SQLPrepare [ODBC32.019]
1405
1415
*/
1406
-
SQLRETURN WINAPI SQLPrepare(SQLHSTMT StatementHandle, SQLCHAR *StatementText, SQLINTEGER TextLength)
1416
+
SQLRETURN WINAPI ODBC32_SQLPrepare(SQLHSTMT StatementHandle, SQLCHAR *StatementText, SQLINTEGER TextLength)
1407
1417
{
1408
1418
TRACE("\n");
1409
1419
···
1415
1425
/*************************************************************************
1416
1426
* SQLPutData [ODBC32.049]
1417
1427
*/
1418
-
SQLRETURN WINAPI SQLPutData(SQLHSTMT StatementHandle, SQLPOINTER Data, SQLLEN StrLen_or_Ind)
1428
+
SQLRETURN WINAPI ODBC32_SQLPutData(SQLHSTMT StatementHandle, SQLPOINTER Data, SQLLEN StrLen_or_Ind)
1419
1429
{
1420
1430
TRACE("\n");
1421
1431
···
1427
1437
/*************************************************************************
1428
1438
* SQLRowCount [ODBC32.020]
1429
1439
*/
1430
-
SQLRETURN WINAPI SQLRowCount(SQLHSTMT StatementHandle, SQLLEN *RowCount)
1440
+
SQLRETURN WINAPI ODBC32_SQLRowCount(SQLHSTMT StatementHandle, SQLLEN *RowCount)
1431
1441
{
1432
1442
TRACE("\n");
1433
1443
···
1439
1449
/*************************************************************************
1440
1450
* SQLSetConnectAttr [ODBC32.039]
1441
1451
*/
1442
-
SQLRETURN WINAPI SQLSetConnectAttr(SQLHDBC ConnectionHandle, SQLINTEGER Attribute,
1452
+
SQLRETURN WINAPI ODBC32_SQLSetConnectAttr(SQLHDBC ConnectionHandle, SQLINTEGER Attribute,
1443
1453
SQLPOINTER Value, SQLINTEGER StringLength)
1444
1454
{
1445
1455
TRACE("\n");
···
1452
1462
/*************************************************************************
1453
1463
* SQLSetConnectOption [ODBC32.050]
1454
1464
*/
1455
-
SQLRETURN WINAPI SQLSetConnectOption(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value)
1465
+
SQLRETURN WINAPI ODBC32_SQLSetConnectOption(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value)
1456
1466
{
1457
1467
TRACE("\n");
1458
1468
···
1464
1474
/*************************************************************************
1465
1475
* SQLSetCursorName [ODBC32.021]
1466
1476
*/
1467
-
SQLRETURN WINAPI SQLSetCursorName(SQLHSTMT StatementHandle, SQLCHAR *CursorName, SQLSMALLINT NameLength)
1477
+
SQLRETURN WINAPI ODBC32_SQLSetCursorName(SQLHSTMT StatementHandle, SQLCHAR *CursorName, SQLSMALLINT NameLength)
1468
1478
{
1469
1479
TRACE("\n");
1470
1480
···
1476
1486
/*************************************************************************
1477
1487
* SQLSetDescField [ODBC32.073]
1478
1488
*/
1479
-
SQLRETURN WINAPI SQLSetDescField(SQLHDESC DescriptorHandle,
1489
+
SQLRETURN WINAPI ODBC32_SQLSetDescField(SQLHDESC DescriptorHandle,
1480
1490
SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
1481
1491
SQLPOINTER Value, SQLINTEGER BufferLength)
1482
1492
{
···
1490
1500
/*************************************************************************
1491
1501
* SQLSetDescRec [ODBC32.074]
1492
1502
*/
1493
-
SQLRETURN WINAPI SQLSetDescRec(SQLHDESC DescriptorHandle,
1503
+
SQLRETURN WINAPI ODBC32_SQLSetDescRec(SQLHDESC DescriptorHandle,
1494
1504
SQLSMALLINT RecNumber, SQLSMALLINT Type,
1495
1505
SQLSMALLINT SubType, SQLLEN Length,
1496
1506
SQLSMALLINT Precision, SQLSMALLINT Scale,
···
1508
1518
/*************************************************************************
1509
1519
* SQLSetEnvAttr [ODBC32.075]
1510
1520
*/
1511
-
SQLRETURN WINAPI SQLSetEnvAttr(SQLHENV EnvironmentHandle,
1521
+
SQLRETURN WINAPI ODBC32_SQLSetEnvAttr(SQLHENV EnvironmentHandle,
1512
1522
SQLINTEGER Attribute, SQLPOINTER Value,
1513
1523
SQLINTEGER StringLength)
1514
1524
{
···
1522
1532
/*************************************************************************
1523
1533
* SQLSetParam [ODBC32.022]
1524
1534
*/
1525
-
SQLRETURN WINAPI SQLSetParam(SQLHSTMT StatementHandle,
1535
+
SQLRETURN WINAPI ODBC32_SQLSetParam(SQLHSTMT StatementHandle,
1526
1536
SQLUSMALLINT ParameterNumber, SQLSMALLINT ValueType,
1527
1537
SQLSMALLINT ParameterType, SQLULEN LengthPrecision,
1528
1538
SQLSMALLINT ParameterScale, SQLPOINTER ParameterValue,
···
1539
1549
/*************************************************************************
1540
1550
* SQLSetStmtAttr [ODBC32.076]
1541
1551
*/
1542
-
SQLRETURN WINAPI SQLSetStmtAttr(SQLHSTMT StatementHandle,
1552
+
SQLRETURN WINAPI ODBC32_SQLSetStmtAttr(SQLHSTMT StatementHandle,
1543
1553
SQLINTEGER Attribute, SQLPOINTER Value,
1544
1554
SQLINTEGER StringLength)
1545
1555
{
···
1553
1563
/*************************************************************************
1554
1564
* SQLSetStmtOption [ODBC32.051]
1555
1565
*/
1556
-
SQLRETURN WINAPI SQLSetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option, SQLULEN Value)
1566
+
SQLRETURN WINAPI ODBC32_SQLSetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option, SQLULEN Value)
1557
1567
{
1558
1568
TRACE("\n");
1559
1569
···
1565
1575
/*************************************************************************
1566
1576
* SQLSpecialColumns [ODBC32.052]
1567
1577
*/
1568
-
SQLRETURN WINAPI SQLSpecialColumns(SQLHSTMT StatementHandle,
1578
+
SQLRETURN WINAPI ODBC32_SQLSpecialColumns(SQLHSTMT StatementHandle,
1569
1579
SQLUSMALLINT IdentifierType, SQLCHAR *CatalogName,
1570
1580
SQLSMALLINT NameLength1, SQLCHAR *SchemaName,
1571
1581
SQLSMALLINT NameLength2, SQLCHAR *TableName,
···
1582
1592
/*************************************************************************
1583
1593
* SQLStatistics [ODBC32.053]
1584
1594
*/
1585
-
SQLRETURN WINAPI SQLStatistics(SQLHSTMT StatementHandle,
1595
+
SQLRETURN WINAPI ODBC32_SQLStatistics(SQLHSTMT StatementHandle,
1586
1596
SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
1587
1597
SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
1588
1598
SQLCHAR *TableName, SQLSMALLINT NameLength3,
···
1599
1609
/*************************************************************************
1600
1610
* SQLTables [ODBC32.054]
1601
1611
*/
1602
-
SQLRETURN WINAPI SQLTables(SQLHSTMT StatementHandle,
1612
+
SQLRETURN WINAPI ODBC32_SQLTables(SQLHSTMT StatementHandle,
1603
1613
SQLCHAR *CatalogName, SQLSMALLINT NameLength1,
1604
1614
SQLCHAR *SchemaName, SQLSMALLINT NameLength2,
1605
1615
SQLCHAR *TableName, SQLSMALLINT NameLength3,
···
1616
1626
/*************************************************************************
1617
1627
* SQLTransact [ODBC32.023]
1618
1628
*/
1619
-
SQLRETURN WINAPI SQLTransact(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle,
1629
+
SQLRETURN WINAPI ODBC32_SQLTransact(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle,
1620
1630
SQLUSMALLINT CompletionType)
1621
1631
{
1622
1632
TRACE("\n");
···
1629
1639
/*************************************************************************
1630
1640
* SQLBrowseConnect [ODBC32.055]
1631
1641
*/
1632
-
SQLRETURN WINAPI SQLBrowseConnect(
1642
+
SQLRETURN WINAPI ODBC32_SQLBrowseConnect(
1633
1643
SQLHDBC hdbc,
1634
1644
SQLCHAR *szConnStrIn,
1635
1645
SQLSMALLINT cbConnStrIn,
···
1647
1657
/*************************************************************************
1648
1658
* SQLBulkOperations [ODBC32.078]
1649
1659
*/
1650
-
SQLRETURN WINAPI SQLBulkOperations(
1660
+
SQLRETURN WINAPI ODBC32_SQLBulkOperations(
1651
1661
SQLHSTMT StatementHandle,
1652
1662
SQLSMALLINT Operation)
1653
1663
{
···
1661
1671
/*************************************************************************
1662
1672
* SQLColAttributes [ODBC32.006]
1663
1673
*/
1664
-
SQLRETURN WINAPI SQLColAttributes(
1674
+
SQLRETURN WINAPI ODBC32_SQLColAttributes(
1665
1675
SQLHSTMT hstmt,
1666
1676
SQLUSMALLINT icol,
1667
1677
SQLUSMALLINT fDescType,
···
1680
1690
/*************************************************************************
1681
1691
* SQLColumnPrivileges [ODBC32.056]
1682
1692
*/
1683
-
SQLRETURN WINAPI SQLColumnPrivileges(
1693
+
SQLRETURN WINAPI ODBC32_SQLColumnPrivileges(
1684
1694
SQLHSTMT hstmt,
1685
1695
SQLCHAR *szCatalogName,
1686
1696
SQLSMALLINT cbCatalogName,
···
1702
1712
/*************************************************************************
1703
1713
* SQLDescribeParam [ODBC32.058]
1704
1714
*/
1705
-
SQLRETURN WINAPI SQLDescribeParam(
1715
+
SQLRETURN WINAPI ODBC32_SQLDescribeParam(
1706
1716
SQLHSTMT hstmt,
1707
1717
SQLUSMALLINT ipar,
1708
1718
SQLSMALLINT *pfSqlType,
···
1720
1730
/*************************************************************************
1721
1731
* SQLExtendedFetch [ODBC32.059]
1722
1732
*/
1723
-
SQLRETURN WINAPI SQLExtendedFetch(
1733
+
SQLRETURN WINAPI ODBC32_SQLExtendedFetch(
1724
1734
SQLHSTMT hstmt,
1725
1735
SQLUSMALLINT fFetchType,
1726
1736
SQLLEN irow,
···
1737
1747
/*************************************************************************
1738
1748
* SQLForeignKeys [ODBC32.060]
1739
1749
*/
1740
-
SQLRETURN WINAPI SQLForeignKeys(
1750
+
SQLRETURN WINAPI ODBC32_SQLForeignKeys(
1741
1751
SQLHSTMT hstmt,
1742
1752
SQLCHAR *szPkCatalogName,
1743
1753
SQLSMALLINT cbPkCatalogName,
···
1764
1774
/*************************************************************************
1765
1775
* SQLMoreResults [ODBC32.061]
1766
1776
*/
1767
-
SQLRETURN WINAPI SQLMoreResults(SQLHSTMT hstmt)
1777
+
SQLRETURN WINAPI ODBC32_SQLMoreResults(SQLHSTMT hstmt)
1768
1778
{
1769
1779
TRACE("\n");
1770
1780
···
1776
1786
/*************************************************************************
1777
1787
* SQLNativeSql [ODBC32.062]
1778
1788
*/
1779
-
SQLRETURN WINAPI SQLNativeSql(
1789
+
SQLRETURN WINAPI ODBC32_SQLNativeSql(
1780
1790
SQLHDBC hdbc,
1781
1791
SQLCHAR *szSqlStrIn,
1782
1792
SQLINTEGER cbSqlStrIn,
···
1794
1804
/*************************************************************************
1795
1805
* SQLNumParams [ODBC32.063]
1796
1806
*/
1797
-
SQLRETURN WINAPI SQLNumParams(
1807
+
SQLRETURN WINAPI ODBC32_SQLNumParams(
1798
1808
SQLHSTMT hstmt,
1799
1809
SQLSMALLINT *pcpar)
1800
1810
{
···
1808
1818
/*************************************************************************
1809
1819
* SQLParamOptions [ODBC32.064]
1810
1820
*/
1811
-
SQLRETURN WINAPI SQLParamOptions(
1821
+
SQLRETURN WINAPI ODBC32_SQLParamOptions(
1812
1822
SQLHSTMT hstmt,
1813
1823
SQLULEN crow,
1814
1824
SQLULEN *pirow)
···
1823
1833
/*************************************************************************
1824
1834
* SQLPrimaryKeys [ODBC32.065]
1825
1835
*/
1826
-
SQLRETURN WINAPI SQLPrimaryKeys(
1836
+
SQLRETURN WINAPI ODBC32_SQLPrimaryKeys(
1827
1837
SQLHSTMT hstmt,
1828
1838
SQLCHAR *szCatalogName,
1829
1839
SQLSMALLINT cbCatalogName,
···
1843
1853
/*************************************************************************
1844
1854
* SQLProcedureColumns [ODBC32.066]
1845
1855
*/
1846
-
SQLRETURN WINAPI SQLProcedureColumns(
1856
+
SQLRETURN WINAPI ODBC32_SQLProcedureColumns(
1847
1857
SQLHSTMT hstmt,
1848
1858
SQLCHAR *szCatalogName,
1849
1859
SQLSMALLINT cbCatalogName,
···
1865
1875
/*************************************************************************
1866
1876
* SQLProcedures [ODBC32.067]
1867
1877
*/
1868
-
SQLRETURN WINAPI SQLProcedures(
1878
+
SQLRETURN WINAPI ODBC32_SQLProcedures(
1869
1879
SQLHSTMT hstmt,
1870
1880
SQLCHAR *szCatalogName,
1871
1881
SQLSMALLINT cbCatalogName,
···
1885
1895
/*************************************************************************
1886
1896
* SQLSetPos [ODBC32.068]
1887
1897
*/
1888
-
SQLRETURN WINAPI SQLSetPos(
1898
+
SQLRETURN WINAPI ODBC32_SQLSetPos(
1889
1899
SQLHSTMT hstmt,
1890
1900
SQLSETPOSIROW irow,
1891
1901
SQLUSMALLINT fOption,
···
1901
1911
/*************************************************************************
1902
1912
* SQLTablePrivileges [ODBC32.070]
1903
1913
*/
1904
-
SQLRETURN WINAPI SQLTablePrivileges(
1914
+
SQLRETURN WINAPI ODBC32_SQLTablePrivileges(
1905
1915
SQLHSTMT hstmt,
1906
1916
SQLCHAR *szCatalogName,
1907
1917
SQLSMALLINT cbCatalogName,
···
1921
1931
/*************************************************************************
1922
1932
* SQLDrivers [ODBC32.071]
1923
1933
*/
1924
-
SQLRETURN WINAPI SQLDrivers(
1934
+
SQLRETURN WINAPI ODBC32_SQLDrivers(
1925
1935
SQLHENV henv,
1926
1936
SQLUSMALLINT fDirection,
1927
1937
SQLCHAR *szDriverDesc,
···
1950
1960
/*************************************************************************
1951
1961
* SQLBindParameter [ODBC32.072]
1952
1962
*/
1953
-
SQLRETURN WINAPI SQLBindParameter(
1963
+
SQLRETURN WINAPI ODBC32_SQLBindParameter(
1954
1964
SQLHSTMT hstmt,
1955
1965
SQLUSMALLINT ipar,
1956
1966
SQLSMALLINT fParamType,
···
1973
1983
/*************************************************************************
1974
1984
* SQLDriverConnect [ODBC32.041]
1975
1985
*/
1976
-
SQLRETURN WINAPI SQLDriverConnect(
1986
+
SQLRETURN WINAPI ODBC32_SQLDriverConnect(
1977
1987
SQLHDBC hdbc,
1978
1988
SQLHWND hwnd,
1979
1989
SQLCHAR *conn_str_in,
···
1999
2009
/*************************************************************************
2000
2010
* SQLSetScrollOptions [ODBC32.069]
2001
2011
*/
2002
-
SQLRETURN WINAPI SQLSetScrollOptions(
2012
+
SQLRETURN WINAPI ODBC32_SQLSetScrollOptions(
2003
2013
SQLHSTMT statement_handle,
2004
2014
SQLUSMALLINT f_concurrency,
2005
2015
SQLLEN crow_keyset,
···
2035
2045
};
2036
2046
unsigned int i;
2037
2047
2038
-
for (i = 0; i < sizeof(attrList) / sizeof(SQLUSMALLINT); i++) {
2048
+
for (i = 0; i < ARRAY_SIZE(attrList); i++) {
2039
2049
if (attrList[i] == fDescType) return TRUE;
2040
2050
}
2041
2051
return FALSE;
···
2044
2054
/*************************************************************************
2045
2055
* SQLColAttributesW [ODBC32.106]
2046
2056
*/
2047
-
SQLRETURN WINAPI SQLColAttributesW(
2057
+
SQLRETURN WINAPI ODBC32_SQLColAttributesW(
2048
2058
SQLHSTMT hstmt,
2049
2059
SQLUSMALLINT icol,
2050
2060
SQLUSMALLINT fDescType,
···
2078
2088
/*************************************************************************
2079
2089
* SQLConnectW [ODBC32.107]
2080
2090
*/
2081
-
SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle,
2091
+
SQLRETURN WINAPI ODBC32_SQLConnectW(SQLHDBC ConnectionHandle,
2082
2092
WCHAR *ServerName, SQLSMALLINT NameLength1,
2083
2093
WCHAR *UserName, SQLSMALLINT NameLength2,
2084
2094
WCHAR *Authentication, SQLSMALLINT NameLength3)
···
2098
2108
/*************************************************************************
2099
2109
* SQLDescribeColW [ODBC32.108]
2100
2110
*/
2101
-
SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle,
2111
+
SQLRETURN WINAPI ODBC32_SQLDescribeColW(SQLHSTMT StatementHandle,
2102
2112
SQLUSMALLINT ColumnNumber, WCHAR *ColumnName,
2103
2113
SQLSMALLINT BufferLength, SQLSMALLINT *NameLength,
2104
2114
SQLSMALLINT *DataType, SQLULEN *ColumnSize,
···
2127
2137
/*************************************************************************
2128
2138
* SQLErrorW [ODBC32.110]
2129
2139
*/
2130
-
SQLRETURN WINAPI SQLErrorW(SQLHENV EnvironmentHandle,
2140
+
SQLRETURN WINAPI ODBC32_SQLErrorW(SQLHENV EnvironmentHandle,
2131
2141
SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle,
2132
2142
WCHAR *Sqlstate, SQLINTEGER *NativeError,
2133
2143
WCHAR *MessageText, SQLSMALLINT BufferLength,
···
2143
2153
/*************************************************************************
2144
2154
* SQLExecDirectW [ODBC32.111]
2145
2155
*/
2146
-
SQLRETURN WINAPI SQLExecDirectW(SQLHSTMT StatementHandle,
2156
+
SQLRETURN WINAPI ODBC32_SQLExecDirectW(SQLHSTMT StatementHandle,
2147
2157
WCHAR *StatementText, SQLINTEGER TextLength)
2148
2158
{
2149
2159
TRACE("\n");
···
2155
2165
/*************************************************************************
2156
2166
* SQLGetCursorNameW [ODBC32.117]
2157
2167
*/
2158
-
SQLRETURN WINAPI SQLGetCursorNameW(SQLHSTMT StatementHandle,
2168
+
SQLRETURN WINAPI ODBC32_SQLGetCursorNameW(SQLHSTMT StatementHandle,
2159
2169
WCHAR *CursorName, SQLSMALLINT BufferLength,
2160
2170
SQLSMALLINT *NameLength)
2161
2171
{
···
2168
2178
/*************************************************************************
2169
2179
* SQLPrepareW [ODBC32.119]
2170
2180
*/
2171
-
SQLRETURN WINAPI SQLPrepareW(SQLHSTMT StatementHandle,
2181
+
SQLRETURN WINAPI ODBC32_SQLPrepareW(SQLHSTMT StatementHandle,
2172
2182
WCHAR *StatementText, SQLINTEGER TextLength)
2173
2183
{
2174
2184
TRACE("\n");
···
2180
2190
/*************************************************************************
2181
2191
* SQLSetCursorNameW [ODBC32.121]
2182
2192
*/
2183
-
SQLRETURN WINAPI SQLSetCursorNameW(SQLHSTMT StatementHandle, WCHAR *CursorName, SQLSMALLINT NameLength)
2193
+
SQLRETURN WINAPI ODBC32_SQLSetCursorNameW(SQLHSTMT StatementHandle, WCHAR *CursorName, SQLSMALLINT NameLength)
2184
2194
{
2185
2195
TRACE("\n");
2186
2196
···
2191
2201
/*************************************************************************
2192
2202
* SQLColAttributeW [ODBC32.127]
2193
2203
*/
2194
-
SQLRETURN WINAPI SQLColAttributeW (SQLHSTMT StatementHandle,
2204
+
SQLRETURN WINAPI ODBC32_SQLColAttributeW (SQLHSTMT StatementHandle,
2195
2205
SQLUSMALLINT ColumnNumber, SQLUSMALLINT FieldIdentifier,
2196
2206
SQLPOINTER CharacterAttribute, SQLSMALLINT BufferLength,
2197
2207
SQLSMALLINT *StringLength, SQLLEN *NumericAttribute)
···
2223
2233
/*************************************************************************
2224
2234
* SQLGetConnectAttrW [ODBC32.132]
2225
2235
*/
2226
-
SQLRETURN WINAPI SQLGetConnectAttrW(SQLHDBC ConnectionHandle,
2236
+
SQLRETURN WINAPI ODBC32_SQLGetConnectAttrW(SQLHDBC ConnectionHandle,
2227
2237
SQLINTEGER Attribute, SQLPOINTER Value,
2228
2238
SQLINTEGER BufferLength, SQLINTEGER *StringLength)
2229
2239
{
···
2237
2247
/*************************************************************************
2238
2248
* SQLGetDescFieldW [ODBC32.133]
2239
2249
*/
2240
-
SQLRETURN WINAPI SQLGetDescFieldW(SQLHDESC DescriptorHandle,
2250
+
SQLRETURN WINAPI ODBC32_SQLGetDescFieldW(SQLHDESC DescriptorHandle,
2241
2251
SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
2242
2252
SQLPOINTER Value, SQLINTEGER BufferLength,
2243
2253
SQLINTEGER *StringLength)
···
2252
2262
/*************************************************************************
2253
2263
* SQLGetDescRecW [ODBC32.134]
2254
2264
*/
2255
-
SQLRETURN WINAPI SQLGetDescRecW(SQLHDESC DescriptorHandle,
2265
+
SQLRETURN WINAPI ODBC32_SQLGetDescRecW(SQLHDESC DescriptorHandle,
2256
2266
SQLSMALLINT RecNumber, WCHAR *Name,
2257
2267
SQLSMALLINT BufferLength, SQLSMALLINT *StringLength,
2258
2268
SQLSMALLINT *Type, SQLSMALLINT *SubType,
···
2269
2279
/*************************************************************************
2270
2280
* SQLGetDiagFieldW [ODBC32.135]
2271
2281
*/
2272
-
SQLRETURN WINAPI SQLGetDiagFieldW(SQLSMALLINT HandleType, SQLHANDLE Handle,
2282
+
SQLRETURN WINAPI ODBC32_SQLGetDiagFieldW(SQLSMALLINT HandleType, SQLHANDLE Handle,
2273
2283
SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier,
2274
2284
SQLPOINTER DiagInfo, SQLSMALLINT BufferLength,
2275
2285
SQLSMALLINT *StringLength)
···
2284
2294
/*************************************************************************
2285
2295
* SQLGetDiagRecW [ODBC32.136]
2286
2296
*/
2287
-
SQLRETURN WINAPI SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle,
2297
+
SQLRETURN WINAPI ODBC32_SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle,
2288
2298
SQLSMALLINT RecNumber, WCHAR *Sqlstate,
2289
2299
SQLINTEGER *NativeError, WCHAR *MessageText,
2290
2300
SQLSMALLINT BufferLength, SQLSMALLINT *TextLength)
···
2299
2309
/*************************************************************************
2300
2310
* SQLGetStmtAttrW [ODBC32.138]
2301
2311
*/
2302
-
SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT StatementHandle,
2312
+
SQLRETURN WINAPI ODBC32_SQLGetStmtAttrW(SQLHSTMT StatementHandle,
2303
2313
SQLINTEGER Attribute, SQLPOINTER Value,
2304
2314
SQLINTEGER BufferLength, SQLINTEGER *StringLength)
2305
2315
{
···
2327
2337
/*************************************************************************
2328
2338
* SQLSetConnectAttrW [ODBC32.139]
2329
2339
*/
2330
-
SQLRETURN WINAPI SQLSetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribute,
2340
+
SQLRETURN WINAPI ODBC32_SQLSetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribute,
2331
2341
SQLPOINTER Value, SQLINTEGER StringLength)
2332
2342
{
2333
2343
TRACE("\n");
···
2339
2349
/*************************************************************************
2340
2350
* SQLColumnsW [ODBC32.140]
2341
2351
*/
2342
-
SQLRETURN WINAPI SQLColumnsW(SQLHSTMT StatementHandle,
2352
+
SQLRETURN WINAPI ODBC32_SQLColumnsW(SQLHSTMT StatementHandle,
2343
2353
WCHAR *CatalogName, SQLSMALLINT NameLength1,
2344
2354
WCHAR *SchemaName, SQLSMALLINT NameLength2,
2345
2355
WCHAR *TableName, SQLSMALLINT NameLength3,
···
2355
2365
/*************************************************************************
2356
2366
* SQLDriverConnectW [ODBC32.141]
2357
2367
*/
2358
-
SQLRETURN WINAPI SQLDriverConnectW(
2368
+
SQLRETURN WINAPI ODBC32_SQLDriverConnectW(
2359
2369
SQLHDBC hdbc,
2360
2370
SQLHWND hwnd,
2361
2371
WCHAR *conn_str_in,
···
2376
2386
/*************************************************************************
2377
2387
* SQLGetConnectOptionW [ODBC32.142]
2378
2388
*/
2379
-
SQLRETURN WINAPI SQLGetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLPOINTER Value)
2389
+
SQLRETURN WINAPI ODBC32_SQLGetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLPOINTER Value)
2380
2390
{
2381
2391
TRACE("\n");
2382
2392
···
2387
2397
/*************************************************************************
2388
2398
* SQLGetInfoW [ODBC32.145]
2389
2399
*/
2390
-
SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle,
2400
+
SQLRETURN WINAPI ODBC32_SQLGetInfoW(SQLHDBC ConnectionHandle,
2391
2401
SQLUSMALLINT InfoType, SQLPOINTER InfoValue,
2392
2402
SQLSMALLINT BufferLength, SQLSMALLINT *StringLength)
2393
2403
{
···
2408
2418
/*************************************************************************
2409
2419
* SQLGetTypeInfoW [ODBC32.147]
2410
2420
*/
2411
-
SQLRETURN WINAPI SQLGetTypeInfoW(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
2421
+
SQLRETURN WINAPI ODBC32_SQLGetTypeInfoW(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
2412
2422
{
2413
2423
TRACE("\n");
2414
2424
···
2419
2429
/*************************************************************************
2420
2430
* SQLSetConnectOptionW [ODBC32.150]
2421
2431
*/
2422
-
SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value)
2432
+
SQLRETURN WINAPI ODBC32_SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value)
2423
2433
{
2424
2434
TRACE("\n");
2425
2435
···
2430
2440
/*************************************************************************
2431
2441
* SQLSpecialColumnsW [ODBC32.152]
2432
2442
*/
2433
-
SQLRETURN WINAPI SQLSpecialColumnsW(SQLHSTMT StatementHandle,
2443
+
SQLRETURN WINAPI ODBC32_SQLSpecialColumnsW(SQLHSTMT StatementHandle,
2434
2444
SQLUSMALLINT IdentifierType, SQLWCHAR *CatalogName,
2435
2445
SQLSMALLINT NameLength1, SQLWCHAR *SchemaName,
2436
2446
SQLSMALLINT NameLength2, SQLWCHAR *TableName,
···
2445
2455
/*************************************************************************
2446
2456
* SQLStatisticsW [ODBC32.153]
2447
2457
*/
2448
-
SQLRETURN WINAPI SQLStatisticsW(SQLHSTMT StatementHandle,
2458
+
SQLRETURN WINAPI ODBC32_SQLStatisticsW(SQLHSTMT StatementHandle,
2449
2459
SQLWCHAR *CatalogName, SQLSMALLINT NameLength1,
2450
2460
SQLWCHAR *SchemaName, SQLSMALLINT NameLength2,
2451
2461
SQLWCHAR *TableName, SQLSMALLINT NameLength3,
···
2461
2471
/*************************************************************************
2462
2472
* SQLTablesW [ODBC32.154]
2463
2473
*/
2464
-
SQLRETURN WINAPI SQLTablesW(SQLHSTMT StatementHandle,
2474
+
SQLRETURN WINAPI ODBC32_SQLTablesW(SQLHSTMT StatementHandle,
2465
2475
SQLWCHAR *CatalogName, SQLSMALLINT NameLength1,
2466
2476
SQLWCHAR *SchemaName, SQLSMALLINT NameLength2,
2467
2477
SQLWCHAR *TableName, SQLSMALLINT NameLength3,
···
2477
2487
/*************************************************************************
2478
2488
* SQLBrowseConnectW [ODBC32.155]
2479
2489
*/
2480
-
SQLRETURN WINAPI SQLBrowseConnectW(
2490
+
SQLRETURN WINAPI ODBC32_SQLBrowseConnectW(
2481
2491
SQLHDBC hdbc,
2482
2492
SQLWCHAR *szConnStrIn,
2483
2493
SQLSMALLINT cbConnStrIn,
···
2495
2505
/*************************************************************************
2496
2506
* SQLColumnPrivilegesW [ODBC32.156]
2497
2507
*/
2498
-
SQLRETURN WINAPI SQLColumnPrivilegesW(
2508
+
SQLRETURN WINAPI ODBC32_SQLColumnPrivilegesW(
2499
2509
SQLHSTMT hstmt,
2500
2510
SQLWCHAR *szCatalogName,
2501
2511
SQLSMALLINT cbCatalogName,
···
2516
2526
/*************************************************************************
2517
2527
* SQLDataSourcesW [ODBC32.157]
2518
2528
*/
2519
-
SQLRETURN WINAPI SQLDataSourcesW(SQLHENV EnvironmentHandle,
2529
+
SQLRETURN WINAPI ODBC32_SQLDataSourcesW(SQLHENV EnvironmentHandle,
2520
2530
SQLUSMALLINT Direction, WCHAR *ServerName,
2521
2531
SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1,
2522
2532
WCHAR *Description, SQLSMALLINT BufferLength2,
···
2547
2557
/*************************************************************************
2548
2558
* SQLForeignKeysW [ODBC32.160]
2549
2559
*/
2550
-
SQLRETURN WINAPI SQLForeignKeysW(
2560
+
SQLRETURN WINAPI ODBC32_SQLForeignKeysW(
2551
2561
SQLHSTMT hstmt,
2552
2562
SQLWCHAR *szPkCatalogName,
2553
2563
SQLSMALLINT cbPkCatalogName,
···
2573
2583
/*************************************************************************
2574
2584
* SQLNativeSqlW [ODBC32.162]
2575
2585
*/
2576
-
SQLRETURN WINAPI SQLNativeSqlW(
2586
+
SQLRETURN WINAPI ODBC32_SQLNativeSqlW(
2577
2587
SQLHDBC hdbc,
2578
2588
SQLWCHAR *szSqlStrIn,
2579
2589
SQLINTEGER cbSqlStrIn,
···
2590
2600
/*************************************************************************
2591
2601
* SQLPrimaryKeysW [ODBC32.165]
2592
2602
*/
2593
-
SQLRETURN WINAPI SQLPrimaryKeysW(
2603
+
SQLRETURN WINAPI ODBC32_SQLPrimaryKeysW(
2594
2604
SQLHSTMT hstmt,
2595
2605
SQLWCHAR *szCatalogName,
2596
2606
SQLSMALLINT cbCatalogName,
···
2609
2619
/*************************************************************************
2610
2620
* SQLProcedureColumnsW [ODBC32.166]
2611
2621
*/
2612
-
SQLRETURN WINAPI SQLProcedureColumnsW(
2622
+
SQLRETURN WINAPI ODBC32_SQLProcedureColumnsW(
2613
2623
SQLHSTMT hstmt,
2614
2624
SQLWCHAR *szCatalogName,
2615
2625
SQLSMALLINT cbCatalogName,
···
2630
2640
/*************************************************************************
2631
2641
* SQLProceduresW [ODBC32.167]
2632
2642
*/
2633
-
SQLRETURN WINAPI SQLProceduresW(
2643
+
SQLRETURN WINAPI ODBC32_SQLProceduresW(
2634
2644
SQLHSTMT hstmt,
2635
2645
SQLWCHAR *szCatalogName,
2636
2646
SQLSMALLINT cbCatalogName,
···
2649
2659
/*************************************************************************
2650
2660
* SQLTablePrivilegesW [ODBC32.170]
2651
2661
*/
2652
-
SQLRETURN WINAPI SQLTablePrivilegesW(
2662
+
SQLRETURN WINAPI ODBC32_SQLTablePrivilegesW(
2653
2663
SQLHSTMT hstmt,
2654
2664
SQLWCHAR *szCatalogName,
2655
2665
SQLSMALLINT cbCatalogName,
···
2668
2678
/*************************************************************************
2669
2679
* SQLDriversW [ODBC32.171]
2670
2680
*/
2671
-
SQLRETURN WINAPI SQLDriversW(
2681
+
SQLRETURN WINAPI ODBC32_SQLDriversW(
2672
2682
SQLHENV henv,
2673
2683
SQLUSMALLINT fDirection,
2674
2684
SQLWCHAR *szDriverDesc,
···
2696
2706
/*************************************************************************
2697
2707
* SQLSetDescFieldW [ODBC32.173]
2698
2708
*/
2699
-
SQLRETURN WINAPI SQLSetDescFieldW(SQLHDESC DescriptorHandle,
2709
+
SQLRETURN WINAPI ODBC32_SQLSetDescFieldW(SQLHDESC DescriptorHandle,
2700
2710
SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
2701
2711
SQLPOINTER Value, SQLINTEGER BufferLength)
2702
2712
{
···
2709
2719
/*************************************************************************
2710
2720
* SQLSetStmtAttrW [ODBC32.176]
2711
2721
*/
2712
-
SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle,
2722
+
SQLRETURN WINAPI ODBC32_SQLSetStmtAttrW(SQLHSTMT StatementHandle,
2713
2723
SQLINTEGER Attribute, SQLPOINTER Value,
2714
2724
SQLINTEGER StringLength)
2715
2725
{
···
2728
2738
return iResult;
2729
2739
}
2730
2740
2741
+
/*************************************************************************
2742
+
* SQLGetDiagRecA [ODBC32.236]
2743
+
*/
2744
+
SQLRETURN WINAPI ODBC32_SQLGetDiagRecA(SQLSMALLINT handle_type, SQLHANDLE handle, SQLSMALLINT record,
2745
+
SQLCHAR *sql_state, SQLINTEGER *native_error,
2746
+
SQLCHAR *error_msg, SQLSMALLINT error_msg_max,
2747
+
SQLSMALLINT *error_msg_size)
2748
+
{
2749
+
TRACE("\n");
2750
+
2751
+
if (!pSQLGetDiagRecA) return SQL_ERROR;
2752
+
return pSQLGetDiagRecA(handle_type, handle, record, sql_state, native_error, error_msg,
2753
+
error_msg_max, error_msg_size);
2754
+
}
2731
2755
2732
2756
/* End of file */
+1
-1
media/doc/README.WINE
+1
-1
media/doc/README.WINE
···
137
137
reactos/dll/win32/npptools # Synced to WineStaging-3.3
138
138
reactos/dll/win32/ntdsapi # Synced to WineStaging-3.9
139
139
reactos/dll/win32/objsel # Synced to WineStaging-3.3
140
-
reactos/dll/win32/odbc32 # Synced to WineStaging-3.3. Depends on port of Linux ODBC.
140
+
reactos/dll/win32/odbc32 # Synced to WineStaging-4.0. Depends on port of Linux ODBC.
141
141
reactos/dll/win32/odbccp32 # Synced to WineStaging-3.9
142
142
reactos/dll/win32/ole32 # Synced to WineStaging-3.9
143
143
reactos/dll/win32/oleacc # Synced to WineStaging-3.3