[PATCH 2/5] odbc32: Remove unused Unix calls.

[Hans Leidekker]

From: Hans Leidekker

---
 dlls/odbc32/unixlib.c | 40 ----------------------------------------
 dlls/odbc32/unixlib.h | 32 --------------------------------
 2 files changed, 72 deletions(-)

diff --git a/dlls/odbc32/unixlib.c b/dlls/odbc32/unixlib.c
index dace2c30c99..aa3e952c994 100644
--- a/dlls/odbc32/unixlib.c
+++ b/dlls/odbc32/unixlib.c
@@ -442,18 +442,6 @@ static NTSTATUS odbc_process_attach( void *args )
     return STATUS_SUCCESS;
 }

-static NTSTATUS wrap_SQLAllocConnect( void *args )
-{
-    struct SQLAllocConnect_params *params = args;
-    return SQLAllocConnect( (SQLHENV)(ULONG_PTR)params->EnvironmentHandle, (SQLHDBC *)params->ConnectionHandle );
-}
-
-static NTSTATUS wrap_SQLAllocEnv( void *args )
-{
-    struct SQLAllocEnv_params *params = args;
-    return SQLAllocEnv( (SQLHENV *)params->EnvironmentHandle );
-}
-
 static NTSTATUS wrap_SQLAllocHandle( void *args )
 {
     struct SQLAllocHandle_params *params = args;
@@ -468,12 +456,6 @@ static NTSTATUS wrap_SQLAllocHandleStd( void *args )
                               (SQLHANDLE *)params->OutputHandle );
 }

-static NTSTATUS wrap_SQLAllocStmt( void *args )
-{
-    struct SQLAllocStmt_params *params = args;
-    return SQLAllocStmt( (SQLHDBC)(ULONG_PTR)params->ConnectionHandle, (SQLHSTMT *)params->StatementHandle );
-}
-
 static NTSTATUS wrap_SQLBindCol( void *args )
 {
     struct SQLBindCol_params *params = args;
@@ -734,18 +716,6 @@ static NTSTATUS wrap_SQLForeignKeysW( void *args )
                             params->FkTableName, params->NameLength6 );
 }

-static NTSTATUS wrap_SQLFreeConnect( void *args )
-{
-    struct SQLFreeConnect_params *params = args;
-    return SQLFreeConnect( (SQLHDBC)(ULONG_PTR)params->ConnectionHandle );
-}
-
-static NTSTATUS wrap_SQLFreeEnv( void *args )
-{
-    struct SQLFreeEnv_params *params = args;
-    return SQLFreeEnv( (SQLHENV)(ULONG_PTR)params->EnvironmentHandle );
-}
-
 static NTSTATUS wrap_SQLFreeHandle( void *args )
 {
     struct SQLFreeHandle_params *params = args;
@@ -1219,11 +1189,8 @@ static NTSTATUS wrap_SQLTransact( void *args )
 const unixlib_entry_t __wine_unix_call_funcs[] =
 {
     odbc_process_attach,
-    wrap_SQLAllocConnect,
-    wrap_SQLAllocEnv,
     wrap_SQLAllocHandle,
     wrap_SQLAllocHandleStd,
-    wrap_SQLAllocStmt,
     wrap_SQLBindCol,
     wrap_SQLBindParameter,
     wrap_SQLBrowseConnect,
@@ -1259,8 +1226,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
     wrap_SQLFetchScroll,
     wrap_SQLForeignKeys,
     wrap_SQLForeignKeysW,
-    wrap_SQLFreeConnect,
-    wrap_SQLFreeEnv,
     wrap_SQLFreeHandle,
     wrap_SQLFreeStmt,
     wrap_SQLGetConnectAttr,
@@ -3471,11 +3436,8 @@ static NTSTATUS wow64_SQLTablesW( void *args )
 const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
 {
     odbc_process_attach,
-    wrap_SQLAllocConnect,
-    wrap_SQLAllocEnv,
     wrap_SQLAllocHandle,
     wrap_SQLAllocHandleStd,
-    wrap_SQLAllocStmt,
     wow64_SQLBindCol,
     wow64_SQLBindParameter,
     wow64_SQLBrowseConnect,
@@ -3511,8 +3473,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] =
     wrap_SQLFetchScroll,
     wow64_SQLForeignKeys,
     wow64_SQLForeignKeysW,
-    wrap_SQLFreeConnect,
-    wrap_SQLFreeEnv,
     wrap_SQLFreeHandle,
     wrap_SQLFreeStmt,
     wow64_SQLGetConnectAttr,
diff --git a/dlls/odbc32/unixlib.h b/dlls/odbc32/unixlib.h
index 66891573ea3..df58046c060 100644
--- a/dlls/odbc32/unixlib.h
+++ b/dlls/odbc32/unixlib.h
@@ -34,11 +34,8 @@ static inline BOOL SUCCESS( SQLRETURN ret ) { return ret == SQL_SUCCESS || ret =
 enum sql_funcs
 {
     process_attach,
-    unix_SQLAllocConnect,
-    unix_SQLAllocEnv,
     unix_SQLAllocHandle,
     unix_SQLAllocHandleStd,
-    unix_SQLAllocStmt,
     unix_SQLBindCol,
     unix_SQLBindParameter,
     unix_SQLBrowseConnect,
@@ -74,8 +71,6 @@ enum sql_funcs
     unix_SQLFetchScroll,
     unix_SQLForeignKeys,
     unix_SQLForeignKeysW,
-    unix_SQLFreeConnect,
-    unix_SQLFreeEnv,
     unix_SQLFreeHandle,
     unix_SQLFreeStmt,
     unix_SQLGetConnectAttr,
@@ -229,17 +224,6 @@ struct descriptor
     struct object hdr;
 };

-struct SQLAllocConnect_params
-{
-    UINT64  EnvironmentHandle;
-    UINT64 *ConnectionHandle;
-};
-
-struct SQLAllocEnv_params
-{
-    UINT64 *EnvironmentHandle;
-};
-
 struct SQLAllocHandle_params
 {
     INT16   HandleType;
@@ -254,12 +238,6 @@ struct SQLAllocHandleStd_params
     UINT64 *OutputHandle;
 };

-struct SQLAllocStmt_params
-{
-    UINT64  ConnectionHandle;
-    UINT64 *StatementHandle;
-};
-
 struct SQLBindCol_params
 {
     UINT64 StatementHandle;
@@ -614,16 +592,6 @@ struct SQLForeignKeysW_params
     INT16  NameLength6;
 };

-struct SQLFreeConnect_params
-{
-    UINT64 ConnectionHandle;
-};
-
-struct SQLFreeEnv_params
-{
-    UINT64 EnvironmentHandle;
-};
-
 struct SQLFreeHandle_params
 {
     INT16  HandleType;