[PATCH v2 1/5] odbc32: Get rid of the wrappers for SQLGetDiagRecA() and SQLDataSourcesA().

[Hans Leidekker]

From: Hans Leidekker

---
 dlls/odbc32/odbc32.spec |  4 ++--
 dlls/odbc32/proxyodbc.c | 19 -------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/dlls/odbc32/odbc32.spec b/dlls/odbc32/odbc32.spec
index c42bf55c3eb..0de9bf2bf70 100644
--- a/dlls/odbc32/odbc32.spec
+++ b/dlls/odbc32/odbc32.spec
@@ -136,7 +136,7 @@
 233 stub    SQLGetDescFieldA
 234 stub    SQLGetDescRecA
 235 stub    SQLGetDiagFieldA
-236 stdcall SQLGetDiagRecA(long long long ptr ptr ptr long ptr)
+236 stdcall SQLGetDiagRecA(long long long ptr ptr ptr long ptr) SQLGetDiagRec
 238 stub    SQLGetStmtAttrA
 239 stub    SQLSetConnectAttrA
 240 stub    SQLColumnsA
@@ -150,7 +150,7 @@
 254 stub    SQLTablesA
 255 stub    SQLBrowseConnectA
 256 stub    SQLColumnPrivilegesA
-257 stdcall SQLDataSourcesA(long long str long ptr ptr long ptr)
+257 stdcall SQLDataSourcesA(long long str long ptr ptr long ptr) SQLDataSources
 260 stub    SQLForeignKeysA
 262 stub    SQLNativeSqlA
 265 stub    SQLPrimaryKeysA
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 08fdba52439..efc0a97acc2 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -1176,14 +1176,6 @@ done:
     return ret;
 }

-SQLRETURN WINAPI SQLDataSourcesA(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR *ServerName,
-                                 SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, SQLCHAR *Description,
-                                 SQLSMALLINT BufferLength2, SQLSMALLINT *NameLength2)
-{
-    return SQLDataSources( EnvironmentHandle, Direction, ServerName, BufferLength1, NameLength1, Description,
-                           BufferLength2, NameLength2 );
-}
-
 static SQLRETURN describe_col_unix_a( struct handle *handle, SQLUSMALLINT col_number, SQLCHAR *col_name,
                                       SQLSMALLINT buflen, SQLSMALLINT *retlen, SQLSMALLINT *data_type,
                                       SQLULEN *col_size, SQLSMALLINT *decimal_digits, SQLSMALLINT *nullable )
@@ -5480,17 +5472,6 @@ SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute,
     return ret;
 }

-/*************************************************************************
- *				SQLGetDiagRecA           [ODBC32.236]
- */
-SQLRETURN WINAPI SQLGetDiagRecA(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMALLINT RecNumber,
-                                SQLCHAR *SqlState, SQLINTEGER *NativeError, SQLCHAR *MessageText,
-                                SQLSMALLINT BufferLength, SQLSMALLINT *TextLength)
-{
-    return SQLGetDiagRec( HandleType, Handle, RecNumber, SqlState, NativeError, MessageText, BufferLength,
-                          TextLength );
-}
-
 /***********************************************************************
  * DllMain [Internal] Initializes the internal 'ODBC32.DLL'.
  */