Nikolay Sivov : odbc32: Implement SQLDataSourcesA() forward.
Alexandre Julliard
julliard at winehq.org
Tue Nov 20 13:52:22 CST 2012
Module: wine
Branch: master
Commit: b5ee2079e22d4e2ff4175471e9780b1d88d3f197
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ee2079e22d4e2ff4175471e9780b1d88d3f197
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon Nov 19 22:56:50 2012 -0500
odbc32: Implement SQLDataSourcesA() forward.
---
dlls/odbc32/odbc32.spec | 2 +-
dlls/odbc32/proxyodbc.c | 28 ++++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/dlls/odbc32/odbc32.spec b/dlls/odbc32/odbc32.spec
index 8e54e2b..766eec0 100644
--- a/dlls/odbc32/odbc32.spec
+++ b/dlls/odbc32/odbc32.spec
@@ -150,7 +150,7 @@
254 stub SQLTablesA
255 stub SQLBrowseConnectA
256 stub SQLColumnPrivilegesA
-257 stub SQLDataSourcesA
+257 stdcall SQLDataSourcesA(long long str long ptr str long ptr)
260 stub SQLForeignKeysA
262 stub SQLNativeSqlA
265 stub SQLPrimaryKeysA
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 50a2f99..10adf16 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -75,6 +75,7 @@ static SQLRETURN (*pSQLConnect)(SQLHDBC,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLIN
static SQLRETURN (*pSQLConnectW)(SQLHDBC,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT);
static SQLRETURN (*pSQLCopyDesc)(SQLHDESC,SQLHDESC);
static SQLRETURN (*pSQLDataSources)(SQLHENV,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
+static SQLRETURN (*pSQLDataSourcesA)(SQLHENV,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
static SQLRETURN (*pSQLDataSourcesW)(SQLHENV,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*);
static SQLRETURN (*pSQLDescribeCol)(SQLHSTMT,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLUINTEGER*,SQLSMALLINT*,SQLSMALLINT*);
static SQLRETURN (*pSQLDescribeColW)(SQLHSTMT,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLULEN*,SQLSMALLINT*,SQLSMALLINT*);
@@ -584,6 +585,7 @@ static BOOL ODBC_LoadDMFunctions(void)
LOAD_FUNC(SQLConnectW);
LOAD_FUNC(SQLCopyDesc);
LOAD_FUNC(SQLDataSources);
+ LOAD_FUNC(SQLDataSourcesA);
LOAD_FUNC(SQLDataSourcesW);
LOAD_FUNC(SQLDescribeCol);
LOAD_FUNC(SQLDescribeColW);
@@ -969,6 +971,32 @@ SQLRETURN WINAPI SQLDataSources(SQLHENV EnvironmentHandle,
return ret;
}
+SQLRETURN WINAPI SQLDataSourcesA(SQLHENV EnvironmentHandle,
+ SQLUSMALLINT Direction, SQLCHAR *ServerName,
+ SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1,
+ SQLCHAR *Description, SQLSMALLINT BufferLength2,
+ SQLSMALLINT *NameLength2)
+{
+ SQLRETURN ret;
+
+ TRACE("EnvironmentHandle = %p\n", (void*)EnvironmentHandle);
+
+ if (!pSQLDataSourcesA) return SQL_ERROR;
+
+ ret = pSQLDataSourcesA(EnvironmentHandle, Direction, ServerName,
+ BufferLength1, NameLength1, Description, BufferLength2, NameLength2);
+ if (TRACE_ON(odbc))
+ {
+ TRACE("returns: %d \t", ret);
+ if (NameLength1 && *NameLength1 > 0)
+ TRACE("DataSource = %s,", ServerName);
+ if (NameLength2 && *NameLength2 > 0)
+ TRACE(" Description = %s", Description);
+ TRACE("\n");
+ }
+
+ return ret;
+}
/*************************************************************************
* SQLDescribeCol [ODBC32.008]
More information about the wine-cvs
mailing list