Updated odbc-remove-unixodbc patchset

Instead of removing unixODBC completely. Creating an wine ODBC driver for unixODBC.
This way native and unixODBC drivers can be used.

This is a WIP.

patches/odbc-remove-unixodbc/0002-wineodbc-Register-as-Driver.patch

@@ -0,0 +1,54 @@
+From 54841f013e3f88c885ad4bc252083e6aa5958472 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Sun, 23 Jun 2024 16:45:43 +1000
+Subject: [PATCH] wineodbc: Register as Driver
+
+---
+ dlls/wineodbc/rsrc.rc      |  3 +++
+ dlls/wineodbc/wineodbc.rgs | 23 +++++++++++++++++++++++
+ 2 files changed, 26 insertions(+)
+ create mode 100644 dlls/wineodbc/wineodbc.rgs
+
+diff --git a/dlls/wineodbc/rsrc.rc b/dlls/wineodbc/rsrc.rc
+index b8fad8fe35b..9bc9d2934ab 100644
+--- a/dlls/wineodbc/rsrc.rc
++++ b/dlls/wineodbc/rsrc.rc
+@@ -24,3 +24,6 @@
+ #define WINE_PRODUCTVERSION_STR "3.520.6301.0"
+ 
+ #include "wine/wine_common_ver.rc"
++
++/* @makedep: wineodbc.rgs */
++1 WINE_REGISTRY wineodbc.rgs
+diff --git a/dlls/wineodbc/wineodbc.rgs b/dlls/wineodbc/wineodbc.rgs
+new file mode 100644
+index 00000000000..c83d37976d7
+--- /dev/null
++++ b/dlls/wineodbc/wineodbc.rgs
+@@ -0,0 +1,23 @@
++HKLM
++{
++    NoRemove Software
++    {
++        NoRemove ODBC
++        {
++            NoRemove ODBCINST.INI
++            {
++                'Wine ODBC Driver'
++                {
++                    val 'Driver' = s '%MODULE%'
++                    val 'DriverODBCVer' = s '03.50'
++                    val 'Setup'  = s '%MODULE%'
++                }
++
++                NoRemove ODBC Drivers
++                {
++                    val 'Wine ODBC Driver' = s 'Installed'
++                }
++            }
++        }
++    }
++}
+-- 
+2.43.0
+

patches/odbc-remove-unixodbc/0003-odbc32-Implement-SQLAllocEnv-SQLFreeEnv.patch

@@ -1,14 +1,14 @@
-From b866665b60bc2c29105d45a0e071db8e259ac229 Mon Sep 17 00:00:00 2001
+From 4f4f45e8aad723b7372d422f01df15e2320d23d6 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 3 Feb 2023 11:44:19 +1100
-Subject: [PATCH 02/42] odbc32: Implement SQLAllocEnv/SQLFreeEnv
+Subject: [PATCH] odbc32: Implement SQLAllocEnv/SQLFreeEnv
 
 ---
  dlls/odbc32/proxyodbc.c | 31 +++++++++++++++++++++++++------
  1 file changed, 25 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index e8574430e74..24e84883aa5 100644
+index 89e4545f068..48ba33bb0f5 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
 @@ -43,6 +43,11 @@
@@ -70,5 +70,5 @@ index e8574430e74..24e84883aa5 100644
  
  /*************************************************************************
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0004-odbc32-Support-SQL_ATTR_CONNECTION_POOLING-in-SQLGet.patch

@@ -1,7 +1,7 @@
-From cd4b544dc92159ca8c80e790c25a36e93b848145 Mon Sep 17 00:00:00 2001
+From 35c784055b2af9d8d19f69f1d46bb257d9a70de3 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 3 Feb 2023 13:41:20 +1100
-Subject: [PATCH 03/42] odbc32: Support SQL_ATTR_CONNECTION_POOLING in
+Subject: [PATCH] odbc32: Support SQL_ATTR_CONNECTION_POOLING in
  SQLGetEnvAttr/SQLSetEnvAttr
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 03/42] odbc32: Support SQL_ATTR_CONNECTION_POOLING in
  1 file changed, 57 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 24e84883aa5..1330c4c33fe 100644
+index 48ba33bb0f5..89b8663d888 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
 @@ -46,6 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(odbc);
@@ -110,5 +110,5 @@ index 24e84883aa5..1330c4c33fe 100644
  
  /*************************************************************************
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0005-odbc32-Add-initial-tests.patch

@@ -1,4 +1,4 @@
-From b129fd1a7b4de4959f8929f03ece4688b3e1a6fd Mon Sep 17 00:00:00 2001
+From 4e1a78cfdba25f67e93f40ce9d4881cd15abf180 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 3 Feb 2023 14:16:21 +1100
 Subject: [PATCH] odbc32: Add initial tests
@@ -8,7 +8,7 @@ Subject: [PATCH] odbc32: Add initial tests
  1 file changed, 51 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/tests/odbc32.c b/dlls/odbc32/tests/odbc32.c
-index 8a744f23834..7e1f62e559f 100644
+index 57bb17ef617..fa877c295d1 100644
 --- a/dlls/odbc32/tests/odbc32.c
 +++ b/dlls/odbc32/tests/odbc32.c
 @@ -28,7 +28,7 @@
@@ -42,7 +42,7 @@ index 8a744f23834..7e1f62e559f 100644
      ret = SQLFreeEnv( 0 );
      ok( ret == SQL_INVALID_HANDLE, "got %d\n", ret );
  }
-@@ -302,6 +310,47 @@ static void test_SQLExecDirect( void )
+@@ -393,6 +401,47 @@ static void test_SQLExecDirect( void )
      ok( ret == SQL_SUCCESS, "got %d\n", ret );
  }
  
@@ -90,7 +90,7 @@ index 8a744f23834..7e1f62e559f 100644
  START_TEST(odbc32)
  {
      test_SQLAllocHandle();
-@@ -309,4 +358,5 @@ START_TEST(odbc32)
+@@ -400,4 +449,5 @@ START_TEST(odbc32)
      test_SQLDataSources();
      test_SQLDrivers();
      test_SQLExecDirect();

patches/odbc-remove-unixodbc/0006-odbc32-Implement-SQLAllocConnect.patch

@@ -1,14 +1,14 @@
-From 8d5b34c895f776ed4944fa5aeed0df3ddc847015 Mon Sep 17 00:00:00 2001
+From 0f67768bd11cc1c58d9ad84640260e2ea66ea8ff Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 3 Feb 2023 14:40:03 +1100
-Subject: [PATCH 05/42] odbc32: Implement SQLAllocConnect
+Subject: [PATCH] odbc32: Implement SQLAllocConnect
 
 ---
  dlls/odbc32/proxyodbc.c | 41 +++++++++++++++++++++++++++++++++++------
  1 file changed, 35 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 1330c4c33fe..b3680b7759d 100644
+index 89b8663d888..8cc89f2c7ba 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
 @@ -49,17 +49,35 @@ struct SQLHENV_data
@@ -77,5 +77,5 @@ index 1330c4c33fe..b3680b7759d 100644
  
  /*************************************************************************
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0007-odbc32-SQLGetInfo-W-support-InfoType-SQL_ODBC_VER.patch

@@ -1,14 +1,14 @@
-From c4739858fb4397522f5e09e88400c5433a7cecf2 Mon Sep 17 00:00:00 2001
+From cb3c9bd4e9eae60f11dc97f3a1fd2cd76e430ed7 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 3 Feb 2023 14:46:44 +1100
-Subject: [PATCH 06/42] odbc32: SQLGetInfo/W support InfoType SQL_ODBC_VER
+Subject: [PATCH] odbc32: SQLGetInfo/W support InfoType SQL_ODBC_VER
 
 ---
  dlls/odbc32/proxyodbc.c | 36 ++++++++++++++++++++++++++++++------
  1 file changed, 30 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index b3680b7759d..c19f0248ef8 100644
+index 8cc89f2c7ba..7d654f1131b 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
 @@ -658,12 +658,24 @@ SQLRETURN WINAPI SQLGetFunctions(SQLHDBC ConnectionHandle, SQLUSMALLINT Function
@@ -68,5 +68,5 @@ index b3680b7759d..c19f0248ef8 100644
  
  /*************************************************************************
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0008-odbc32-Support-SQL_ATTR_LOGIN_TIMEOUT-in-SQLSetConne.patch

@@ -1,15 +1,14 @@
-From a6061eab04f7b9432acf1eb86eb47d3286d97f0e Mon Sep 17 00:00:00 2001
+From 7f9ebc7aec32bd0a6a53c94dbf96b39fe4cdd2ce Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 3 Feb 2023 15:18:21 +1100
-Subject: [PATCH 07/42] odbc32: Support SQL_ATTR_LOGIN_TIMEOUT in
- SQLSetConnectAttrW
+Subject: [PATCH] odbc32: Support SQL_ATTR_LOGIN_TIMEOUT in SQLSetConnectAttrW
 
 ---
  dlls/odbc32/proxyodbc.c | 28 +++++++++++++++++++++++++---
  1 file changed, 25 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index c19f0248ef8..b4ec548b09c 100644
+index 7d654f1131b..070f0197742 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
 @@ -53,6 +53,8 @@ struct SQLHDBC_data
@@ -65,5 +64,5 @@ index c19f0248ef8..b4ec548b09c 100644
  
  /*************************************************************************
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0009-odbc32-Implement-SQLDriverConnectW.patch

@@ -1,4 +1,4 @@
-From 64af6ff6f7ac46823bc98e5b70bff87c46652aab Mon Sep 17 00:00:00 2001
+From 63629981578a8ed97d1498b8c2e69484f3d85828 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sat, 4 Feb 2023 09:16:29 +1100
 Subject: [PATCH] odbc32: Implement SQLDriverConnectW

patches/odbc-remove-unixodbc/0010-odbc32-Foward-SQLGetInfo-W-requests-onto-the-driver.patch

@@ -1,17 +1,17 @@
-From 721fddbb419b2bdaf710c023b9d33851b77e1684 Mon Sep 17 00:00:00 2001
+From 55674ad31123cfdcf664d8f1c28710185aa0388d Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 08:47:46 +1100
-Subject: [PATCH 09/42] odbc32: Foward SQLGetInfo/W requests onto the driver
+Subject: [PATCH] odbc32: Foward SQLGetInfo/W requests onto the driver
 
 ---
  dlls/odbc32/proxyodbc.c | 32 ++++++++++++++++++++++++++------
  1 file changed, 26 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index ebb6b53d62d..6e4e1a68011 100644
+index 30baf1866a4..50083a23e25 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -911,7 +911,9 @@ SQLRETURN WINAPI SQLGetFunctions(SQLHDBC ConnectionHandle, SQLUSMALLINT Function
+@@ -902,7 +902,9 @@ SQLRETURN WINAPI SQLGetFunctions(SQLHDBC ConnectionHandle, SQLUSMALLINT Function
  SQLRETURN WINAPI SQLGetInfo(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQLPOINTER InfoValue,
                              SQLSMALLINT BufferLength, SQLSMALLINT *StringLength)
  {
@@ -21,7 +21,7 @@ index ebb6b53d62d..6e4e1a68011 100644
  
      TRACE("(ConnectionHandle, %p, InfoType %d, InfoValue %p, BufferLength %d, StringLength %p)\n", ConnectionHandle,
            InfoType, InfoValue, BufferLength, StringLength);
-@@ -924,11 +926,19 @@ SQLRETURN WINAPI SQLGetInfo(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQL
+@@ -915,11 +917,19 @@ SQLRETURN WINAPI SQLGetInfo(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQL
                  *StringLength = strlen(ptr);
              break;
          default:
@@ -44,7 +44,7 @@ index ebb6b53d62d..6e4e1a68011 100644
  }
  
  /*************************************************************************
-@@ -1973,7 +1983,9 @@ SQLRETURN WINAPI SQLGetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Opt
+@@ -1994,7 +2004,9 @@ SQLRETURN WINAPI SQLGetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Opt
  SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQLPOINTER InfoValue,
                               SQLSMALLINT BufferLength, SQLSMALLINT *StringLength)
  {
@@ -54,7 +54,7 @@ index ebb6b53d62d..6e4e1a68011 100644
  
      TRACE("(ConnectionHandle, %p, InfoType %d, InfoValue %p, BufferLength %d, StringLength %p)\n", ConnectionHandle,
            InfoType, InfoValue, BufferLength, StringLength);
-@@ -1986,11 +1998,19 @@ SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQ
+@@ -2007,11 +2019,19 @@ SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQ
                  *StringLength = wcslen(ptr);
              break;
          default:
@@ -78,5 +78,5 @@ index ebb6b53d62d..6e4e1a68011 100644
  
  /*************************************************************************
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0011-odbc32-Foward-SQLSetConnectAttr-requets-onto-the-dri.patch

@@ -1,4 +1,4 @@
-From 827ccc5a0ef8a1b1e1290d7225f25619ca11fcf0 Mon Sep 17 00:00:00 2001
+From 7db07cc12c6e62ab86b429d0c0b0f88426ddb681 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 08:55:12 +1100
 Subject: [PATCH] odbc32: Foward SQLSetConnectAttr requets onto the driver
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: Foward SQLSetConnectAttr requets onto the driver
  1 file changed, 44 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index e816caa0daa..00822d9d263 100644
+index 50083a23e25..f817b3b524c 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1042,11 +1042,40 @@ SQLRETURN WINAPI SQLRowCount(SQLHSTMT StatementHandle, SQLLEN *RowCount)
+@@ -1043,11 +1043,40 @@ SQLRETURN WINAPI SQLRowCount(SQLHSTMT StatementHandle, SQLLEN *RowCount)
  SQLRETURN WINAPI SQLSetConnectAttr(SQLHDBC ConnectionHandle, SQLINTEGER Attribute, SQLPOINTER Value,
                                     SQLINTEGER StringLength)
  {
@@ -54,7 +54,7 @@ index e816caa0daa..00822d9d263 100644
      return ret;
  }
  
-@@ -1802,6 +1831,7 @@ SQLRETURN WINAPI SQLSetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribu
+@@ -1803,6 +1832,7 @@ SQLRETURN WINAPI SQLSetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribu
                                      SQLINTEGER StringLength)
  {
      struct SQLHDBC_data *hdbc = ConnectionHandle;
@@ -62,7 +62,7 @@ index e816caa0daa..00822d9d263 100644
  
      TRACE("(ConnectionHandle %p, Attribute %d, Value %p, StringLength %d)\n", ConnectionHandle, Attribute, Value,
            StringLength);
-@@ -1821,11 +1851,20 @@ SQLRETURN WINAPI SQLSetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribu
+@@ -1822,11 +1852,20 @@ SQLRETURN WINAPI SQLSetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribu
                  hdbc->login_timeout = 0;
              break;
          default:

patches/odbc-remove-unixodbc/0012-odbc32-Forward-SQLGetFunctions-requets-onto-the-driv.patch

@@ -1,17 +1,17 @@
-From 8b3bcc595990b84b8632397707a3ba756f1b2892 Mon Sep 17 00:00:00 2001
+From 25b167b0027c64be079c7203b994dac1b5627446 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 09:02:34 +1100
-Subject: [PATCH 11/42] odbc32: Forward SQLGetFunctions requets onto the driver
+Subject: [PATCH] odbc32: Forward SQLGetFunctions requets onto the driver
 
 ---
  dlls/odbc32/proxyodbc.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 89062e9cadf..7e92b90b10c 100644
+index f817b3b524c..3ed0a484972 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -898,9 +898,15 @@ SQLRETURN WINAPI SQLGetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute,
+@@ -889,9 +889,15 @@ SQLRETURN WINAPI SQLGetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute,
   */
  SQLRETURN WINAPI SQLGetFunctions(SQLHDBC ConnectionHandle, SQLUSMALLINT FunctionId, SQLUSMALLINT *Supported)
  {
@@ -29,5 +29,5 @@ index 89062e9cadf..7e92b90b10c 100644
      return ret;
  }
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0013-odbc32-Forward-SQLGetConnectAttr-W-requets-onto-the-.patch

@@ -1,4 +1,4 @@
-From 618ae30847043d66cc952fd6a58c319a8eee698d Mon Sep 17 00:00:00 2001
+From 53e0846f51522be5a2f7574f12ff35d16c44d1de Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 09:08:27 +1100
 Subject: [PATCH] odbc32: Forward SQLGetConnectAttr/W requets onto the driver
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: Forward SQLGetConnectAttr/W requets onto the driver
  1 file changed, 40 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 3a1d8ba1d08..333d040be8c 100644
+index 3ed0a484972..886fe07efb9 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -729,11 +729,30 @@ SQLRETURN WINAPI SQLFreeStmt(SQLHSTMT StatementHandle, SQLUSMALLINT Option)
+@@ -730,11 +730,30 @@ SQLRETURN WINAPI SQLFreeStmt(SQLHSTMT StatementHandle, SQLUSMALLINT Option)
  SQLRETURN WINAPI SQLGetConnectAttr(SQLHDBC ConnectionHandle, SQLINTEGER Attribute, SQLPOINTER Value,
                                     SQLINTEGER BufferLength, SQLINTEGER *StringLength)
  {
@@ -43,7 +43,7 @@ index 3a1d8ba1d08..333d040be8c 100644
      return ret;
  }
  
-@@ -1711,11 +1730,30 @@ SQLRETURN WINAPI SQLColAttributeW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnN
+@@ -1741,11 +1760,30 @@ SQLRETURN WINAPI SQLColAttributeW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnN
  SQLRETURN WINAPI SQLGetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribute, SQLPOINTER Value,
                                      SQLINTEGER BufferLength, SQLINTEGER *StringLength)
  {

patches/odbc-remove-unixodbc/0014-odbc32-Foward-SQLDisconnect-request-onto-driver.patch

@@ -1,17 +1,17 @@
-From 3a815fdc2731ffe21a617668e7cd4570196e02c5 Mon Sep 17 00:00:00 2001
+From fc34342d52977928717c0b9f45bff99613461201 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 09:26:57 +1100
-Subject: [PATCH 13/42] odbc32: Foward SQLDisconnect request onto driver
+Subject: [PATCH] odbc32: Foward SQLDisconnect request onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 16 +++++++++++++++-
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 96357cd3f1d..65f882968c6 100644
+index 886fe07efb9..eb274c5da5b 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -583,9 +583,23 @@ SQLRETURN WINAPI SQLDescribeCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNum
+@@ -574,9 +574,23 @@ SQLRETURN WINAPI SQLDescribeCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNum
   */
  SQLRETURN WINAPI SQLDisconnect(SQLHDBC ConnectionHandle)
  {
@@ -37,5 +37,5 @@ index 96357cd3f1d..65f882968c6 100644
      return ret;
  }
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0015-odbc32-Implement-SQLAllocStmt.patch

@@ -1,17 +1,17 @@
-From 2bda5feb6297ec6c01a022a3c13338c2c6f6ff27 Mon Sep 17 00:00:00 2001
+From a09926caf2fd91460ab75d75c3aba98a153f97fa Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 09:53:34 +1100
-Subject: [PATCH 14/42] odbc32: Implement SQLAllocStmt
+Subject: [PATCH] odbc32: Implement SQLAllocStmt
 
 ---
  dlls/odbc32/proxyodbc.c | 39 ++++++++++++++++++++++++++++++++++++++-
  1 file changed, 38 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 65f882968c6..4ec5ecfcb83 100644
+index eb274c5da5b..1e6ee80c03d 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -178,6 +178,13 @@ struct SQLHDBC_data
+@@ -174,6 +174,13 @@ struct SQLHDBC_data
      SQLUINTEGER login_timeout;
  };
  
@@ -25,7 +25,7 @@ index 65f882968c6..4ec5ecfcb83 100644
  static void connection_bind_sql_funcs(struct SQLHDBC_data *connection)
  {
  #define LOAD_FUNCPTR(f) if((connection->p##f = (void*)GetProcAddress(connection->module, #f)) == NULL) \
-@@ -374,11 +381,41 @@ SQLRETURN WINAPI SQLAllocHandle(SQLSMALLINT HandleType, SQLHANDLE InputHandle, S
+@@ -365,11 +372,41 @@ SQLRETURN WINAPI SQLAllocHandle(SQLSMALLINT HandleType, SQLHANDLE InputHandle, S
   */
  SQLRETURN WINAPI SQLAllocStmt(SQLHDBC ConnectionHandle, SQLHSTMT *StatementHandle)
  {
@@ -69,5 +69,5 @@ index 65f882968c6..4ec5ecfcb83 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0016-odbc32-Forward-SQLSetStmtAttr-W-request-to-driver.patch

@@ -1,4 +1,4 @@
-From ae3542748782dea8b9213c0d015f09ac94c13bf9 Mon Sep 17 00:00:00 2001
+From 2f3d8481978439bdc657f5f020e255c9c2c634d1 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 09:59:14 +1100
 Subject: [PATCH] odbc32: Forward SQLSetStmtAttr/W request to driver
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: Forward SQLSetStmtAttr/W request to driver
  1 file changed, 36 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index b3b10917660..0f868331ac9 100644
+index 1e6ee80c03d..999d1e64916 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1265,11 +1265,28 @@ SQLRETURN WINAPI SQLSetParam(SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNum
+@@ -1266,11 +1266,28 @@ SQLRETURN WINAPI SQLSetParam(SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNum
  SQLRETURN WINAPI SQLSetStmtAttr(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value,
                                  SQLINTEGER StringLength)
  {
@@ -41,7 +41,7 @@ index b3b10917660..0f868331ac9 100644
      return ret;
  }
  
-@@ -2430,11 +2447,28 @@ SQLRETURN WINAPI SQLSetDescFieldW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumb
+@@ -2438,11 +2455,28 @@ SQLRETURN WINAPI SQLSetDescFieldW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumb
  SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value,
                                   SQLINTEGER StringLength)
  {

patches/odbc-remove-unixodbc/0017-odbc32-Forward-SQLParamOptions-request-onto-driver.patch

@@ -1,17 +1,17 @@
-From e93822d6974d17a4f649228222fb6cd2f513d2a4 Mon Sep 17 00:00:00 2001
+From e2dcd4d6536d1ad99549920cdda96b4ce23b7b05 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 10:50:26 +1100
-Subject: [PATCH 16/42] odbc32: Forward SQLParamOptions request onto driver
+Subject: [PATCH] odbc32: Forward SQLParamOptions request onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index d0be7b600bf..10de992e83e 100644
+index 999d1e64916..2b1db217467 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1501,10 +1501,23 @@ SQLRETURN WINAPI SQLNumParams(SQLHSTMT hstmt, SQLSMALLINT *pcpar)
+@@ -1529,10 +1529,23 @@ SQLRETURN WINAPI SQLNumParams(SQLHSTMT hstmt, SQLSMALLINT *pcpar)
   */
  SQLRETURN WINAPI SQLParamOptions(SQLHSTMT hstmt, SQLULEN crow, SQLULEN *pirow)
  {
@@ -37,5 +37,5 @@ index d0be7b600bf..10de992e83e 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0018-odbc32-Forward-SQLExecDirect-W-request-onto-driver.patch

@@ -1,14 +1,17 @@
-From 7b0b4f665836d2008dd679d27c9995c25895f1bb Mon Sep 17 00:00:00 2001
+From c7285c3ce19b3e5ff0d6a90ff84fa3c497776511 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 10:53:29 +1100
-Subject: odbc32: Forward SQLExecDirect/W request onto driver
+Subject: [PATCH] odbc32: Forward SQLExecDirect/W request onto driver
 
+---
+ dlls/odbc32/proxyodbc.c | 36 ++++++++++++++++++++++++++++++++----
+ 1 file changed, 32 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 10de992e83e..bbcaa2487db 100644
+index 2b1db217467..6508c9b1d73 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -674,11 +674,25 @@ SQLRETURN WINAPI SQLError(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, S
+@@ -665,11 +665,25 @@ SQLRETURN WINAPI SQLError(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, S
   */
  SQLRETURN WINAPI SQLExecDirect(SQLHSTMT StatementHandle, SQLCHAR *StatementText, SQLINTEGER TextLength)
  {
@@ -36,7 +39,7 @@ index 10de992e83e..bbcaa2487db 100644
      return ret;
  }
  
-@@ -1742,11 +1756,25 @@ SQLRETURN WINAPI SQLErrorW(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle,
+@@ -1770,11 +1784,25 @@ SQLRETURN WINAPI SQLErrorW(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle,
   */
  SQLRETURN WINAPI SQLExecDirectW(SQLHSTMT StatementHandle, WCHAR *StatementText, SQLINTEGER TextLength)
  {
@@ -64,3 +67,6 @@ index 10de992e83e..bbcaa2487db 100644
      return ret;
  }
  
+-- 
+2.43.0
+

patches/odbc-remove-unixodbc/0019-odbc32-Forward-SQLGetStmtAttr-W-onto-driver.patch

@@ -1,17 +1,17 @@
-From e1399a4847627be9772aa411c24f3c9a7269c18d Mon Sep 17 00:00:00 2001
+From 2f915fc78edc974c6ef926ec3b3b4da81b64b72a Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 11:04:32 +1100
-Subject: [PATCH 18/42] odbc32: Forward SQLGetStmtAttr/W onto driver
+Subject: [PATCH] odbc32: Forward SQLGetStmtAttr/W onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 32 ++++++++++++++++++++++++++++++--
  1 file changed, 30 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index b43f2a0f876..ae790cd3651 100644
+index 6508c9b1d73..ecc208ac21b 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1032,17 +1032,31 @@ SQLRETURN WINAPI SQLGetInfo(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQL
+@@ -1028,17 +1028,31 @@ SQLRETURN WINAPI SQLGetInfo(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQL
  SQLRETURN WINAPI SQLGetStmtAttr(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value,
                                  SQLINTEGER BufferLength, SQLINTEGER *StringLength)
  {
@@ -44,7 +44,7 @@ index b43f2a0f876..ae790cd3651 100644
      return ret;
  }
  
-@@ -1930,17 +1944,31 @@ SQLRETURN WINAPI SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMA
+@@ -1964,17 +1978,31 @@ SQLRETURN WINAPI SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMA
  SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value,
                                   SQLINTEGER BufferLength, SQLINTEGER *StringLength)
  {
@@ -78,5 +78,5 @@ index b43f2a0f876..ae790cd3651 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0020-odbc32-Forward-SQLRowCount-onto-driver.patch

@@ -1,17 +1,17 @@
-From 31d7dbc51491735cfadd4732d1a8cc64be18de14 Mon Sep 17 00:00:00 2001
+From 711377cb7cad345eda0432fdf035b6f5466ef1c4 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 11:08:41 +1100
-Subject: [PATCH 19/42] odbc32: Forward SQLRowCount onto driver
+Subject: [PATCH] odbc32: Forward SQLRowCount onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index ae790cd3651..32c61eea427 100644
+index ecc208ac21b..c76b8ff3c2a 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1138,10 +1138,23 @@ SQLRETURN WINAPI SQLPutData(SQLHSTMT StatementHandle, SQLPOINTER Data, SQLLEN St
+@@ -1134,10 +1134,23 @@ SQLRETURN WINAPI SQLPutData(SQLHSTMT StatementHandle, SQLPOINTER Data, SQLLEN St
   */
  SQLRETURN WINAPI SQLRowCount(SQLHSTMT StatementHandle, SQLLEN *RowCount)
  {
@@ -37,5 +37,5 @@ index ae790cd3651..32c61eea427 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0021-odbc32-Forward-SQLNumResultCols-onto-driver.patch

@@ -1,17 +1,17 @@
-From 7359117d8a80ac80ca0602ca81a3b2b3ce2d26c1 Mon Sep 17 00:00:00 2001
+From 1a21b4f8c22e0b8911a9ebd43cc4a5f665192494 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 11:10:54 +1100
-Subject: [PATCH 20/42] odbc32: Forward SQLNumResultCols onto driver
+Subject: [PATCH] odbc32: Forward SQLNumResultCols onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 32c61eea427..1d1c575ca11 100644
+index c76b8ff3c2a..12b6e9e113b 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1089,10 +1089,23 @@ SQLRETURN WINAPI SQLGetTypeInfo(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
+@@ -1085,10 +1085,23 @@ SQLRETURN WINAPI SQLGetTypeInfo(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
   */
  SQLRETURN WINAPI SQLNumResultCols(SQLHSTMT StatementHandle, SQLSMALLINT *ColumnCount)
  {
@@ -37,5 +37,5 @@ index 32c61eea427..1d1c575ca11 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0022-odbc32-Forward-SQLMoreResults-request-onto-driver.patch

@@ -1,17 +1,17 @@
-From 7c1897a48423d319430c3bea7252d2335a1148d5 Mon Sep 17 00:00:00 2001
+From cdebd6c62d542e1c4a3e6edd3885e7a14bb796cc Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 11:12:20 +1100
-Subject: [PATCH 21/42] odbc32: Forward SQLMoreResults request onto driver
+Subject: [PATCH] odbc32: Forward SQLMoreResults request onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 1d1c575ca11..e5b0ae63afb 100644
+index 12b6e9e113b..61877bfb4a7 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1516,10 +1516,23 @@ SQLRETURN WINAPI SQLForeignKeys(SQLHSTMT hstmt, SQLCHAR *szPkCatalogName, SQLSMA
+@@ -1545,10 +1545,23 @@ SQLRETURN WINAPI SQLForeignKeys(SQLHSTMT hstmt, SQLCHAR *szPkCatalogName, SQLSMA
   */
  SQLRETURN WINAPI SQLMoreResults(SQLHSTMT StatementHandle)
  {
@@ -37,5 +37,5 @@ index 1d1c575ca11..e5b0ae63afb 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0023-odbc32-Forward-SQLDescribeCol-w-request-onto-driver.patch

@@ -1,17 +1,17 @@
-From 4f1d0d9509469e410e151671da2a8baf53df09b3 Mon Sep 17 00:00:00 2001
+From af020a2a8380fc6640ae91385840d624842a428e Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 11:17:59 +1100
-Subject: [PATCH 22/42] odbc32: Forward SQLDescribeCol/w request onto driver
+Subject: [PATCH] odbc32: Forward SQLDescribeCol/w request onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 35 +++++++++++++++++++++++++++++++++--
  1 file changed, 33 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index e5b0ae63afb..318aba1cc48 100644
+index 61877bfb4a7..ae7794917f3 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -606,12 +606,29 @@ SQLRETURN WINAPI SQLDescribeCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNum
+@@ -597,12 +597,29 @@ SQLRETURN WINAPI SQLDescribeCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNum
                                  SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, SQLSMALLINT *DataType,
                                  SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable)
  {
@@ -42,7 +42,7 @@ index e5b0ae63afb..318aba1cc48 100644
      return ret;
  }
  
-@@ -1775,15 +1792,29 @@ SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNu
+@@ -1804,15 +1821,29 @@ SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNu
                                   SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, SQLSMALLINT *DataType,
                                   SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable)
  {
@@ -74,5 +74,5 @@ index e5b0ae63afb..318aba1cc48 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0024-odbc32-Forward-SQLColAttributes-W-request-onto-drive.patch

@@ -1,17 +1,17 @@
-From 85be83ac84dea5b5e5aa43770d1c7e78ad07dbd5 Mon Sep 17 00:00:00 2001
+From 575797d61cb119102a9db030ee57e20e0ce466c6 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 11:30:58 +1100
-Subject: [PATCH 23/42] odbc32: Forward SQLColAttributes/W request onto driver
+Subject: [PATCH] odbc32: Forward SQLColAttributes/W request onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 55 +++++++++++++++++++++++++++++++++++++++--
  1 file changed, 53 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 318aba1cc48..8360cd0684f 100644
+index ae7794917f3..b4f143dab45 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1449,11 +1449,26 @@ SQLRETURN WINAPI SQLColAttributes(SQLHSTMT hstmt, SQLUSMALLINT icol, SQLUSMALLIN
+@@ -1478,11 +1478,26 @@ SQLRETURN WINAPI SQLColAttributes(SQLHSTMT hstmt, SQLUSMALLINT icol, SQLUSMALLIN
                                    SQLPOINTER rgbDesc, SQLSMALLINT cbDescMax, SQLSMALLINT *pcbDesc,
                                    SQLLEN *pfDesc)
  {
@@ -39,7 +39,7 @@ index 318aba1cc48..8360cd0684f 100644
      return ret;
  }
  
-@@ -1754,6 +1769,21 @@ SQLRETURN WINAPI SQLSetScrollOptions(SQLHSTMT statement_handle, SQLUSMALLINT f_c
+@@ -1783,6 +1798,21 @@ SQLRETURN WINAPI SQLSetScrollOptions(SQLHSTMT statement_handle, SQLUSMALLINT f_c
      return ret;
  }
  
@@ -61,7 +61,7 @@ index 318aba1cc48..8360cd0684f 100644
  /*************************************************************************
   *				SQLColAttributesW          [ODBC32.106]
   */
-@@ -1761,11 +1791,32 @@ SQLRETURN WINAPI SQLColAttributesW(SQLHSTMT hstmt, SQLUSMALLINT icol, SQLUSMALLI
+@@ -1790,11 +1820,32 @@ SQLRETURN WINAPI SQLColAttributesW(SQLHSTMT hstmt, SQLUSMALLINT icol, SQLUSMALLI
                                     SQLPOINTER rgbDesc, SQLSMALLINT cbDescMax, SQLSMALLINT *pcbDesc,
                                     SQLLEN *pfDesc)
  {
@@ -96,5 +96,5 @@ index 318aba1cc48..8360cd0684f 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0025-odbc32-Forward-SQLNativeSql-W-request-onto-driver.patch

@@ -1,17 +1,17 @@
-From 04b5940c19de8c92269f9da73e6d98d9777a3020 Mon Sep 17 00:00:00 2001
+From 3bd355283d087071c17eab5f4799f092dd42d8d1 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 11:36:33 +1100
-Subject: [PATCH 24/42] odbc32: Forward SQLNativeSql/W request onto driver
+Subject: [PATCH] odbc32: Forward SQLNativeSql/W request onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 32 ++++++++++++++++++++++++++++++--
  1 file changed, 30 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 8360cd0684f..5b63fded654 100644
+index b4f143dab45..6e599a385a1 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1574,11 +1574,25 @@ SQLRETURN WINAPI SQLMoreResults(SQLHSTMT StatementHandle)
+@@ -1603,11 +1603,25 @@ SQLRETURN WINAPI SQLMoreResults(SQLHSTMT StatementHandle)
  SQLRETURN WINAPI SQLNativeSql(SQLHDBC hdbc, SQLCHAR *szSqlStrIn, SQLINTEGER cbSqlStrIn, SQLCHAR *szSqlStr,
                                SQLINTEGER cbSqlStrMax, SQLINTEGER *pcbSqlStr)
  {
@@ -38,7 +38,7 @@ index 8360cd0684f..5b63fded654 100644
      return ret;
  }
  
-@@ -2465,11 +2479,25 @@ SQLRETURN WINAPI SQLForeignKeysW(SQLHSTMT hstmt, SQLWCHAR *szPkCatalogName, SQLS
+@@ -2531,11 +2545,25 @@ SQLRETURN WINAPI SQLForeignKeysW(SQLHSTMT hstmt, SQLWCHAR *szPkCatalogName, SQLS
  SQLRETURN WINAPI SQLNativeSqlW(SQLHDBC hdbc, SQLWCHAR *szSqlStrIn, SQLINTEGER cbSqlStrIn, SQLWCHAR *szSqlStr,
                                 SQLINTEGER cbSqlStrMax, SQLINTEGER *pcbSqlStr)
  {
@@ -66,5 +66,5 @@ index 8360cd0684f..5b63fded654 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0026-odbc32-Forward-SQLPrepare-W-request-onto-driver.patch

@@ -1,14 +1,17 @@
-From 95d92cec6ceebb2f3fc7624180f89e7764e2430f Mon Sep 17 00:00:00 2001
+From 69dc39b9dbf854da2f2b21069ca6407de8fc77e0 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 11:44:00 +1100
-Subject: odbc32: Forward SQLPrepare/W request onto driver
+Subject: [PATCH] odbc32: Forward SQLPrepare/W request onto driver
 
+---
+ dlls/odbc32/proxyodbc.c | 34 +++++++++++++++++++++++++++++++---
+ 1 file changed, 31 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 5b63fded654..fae384ca411 100644
+index 6e599a385a1..12d75fd1fcc 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1143,11 +1143,25 @@ SQLRETURN WINAPI SQLParamData(SQLHSTMT StatementHandle, SQLPOINTER *Value)
+@@ -1139,11 +1139,25 @@ SQLRETURN WINAPI SQLParamData(SQLHSTMT StatementHandle, SQLPOINTER *Value)
   */
  SQLRETURN WINAPI SQLPrepare(SQLHSTMT StatementHandle, SQLCHAR *StatementText, SQLINTEGER TextLength)
  {
@@ -25,17 +28,17 @@ index 5b63fded654..fae384ca411 100644
 +        WARN("Wrong handle type %d\n", statement->type);
 +        return SQL_ERROR;
 +    }
- 
++
 +    if (statement->connection->pSQLPrepare)
 +    {
 +        ret = statement->connection->pSQLPrepare(statement->driver_stmt, StatementText, TextLength);
 +    }
-+
+ 
 +    TRACE("ret %d\n", ret);
      return ret;
  }
  
-@@ -1944,11 +1958,25 @@ SQLRETURN WINAPI SQLGetCursorNameW(SQLHSTMT StatementHandle, WCHAR *CursorName,
+@@ -1974,11 +1988,25 @@ SQLRETURN WINAPI SQLGetCursorNameW(SQLHSTMT StatementHandle, WCHAR *CursorName,
   */
  SQLRETURN WINAPI SQLPrepareW(SQLHSTMT StatementHandle, WCHAR *StatementText, SQLINTEGER TextLength)
  {
@@ -47,13 +50,13 @@ index 5b63fded654..fae384ca411 100644
 +    TRACE("(StatementHandle %p, StatementText %s, TextLength %d)\n", StatementHandle,
 +          TextLength > 0 ? debugstr_wn(StatementText, TextLength) : debugstr_w(StatementText),
 +          TextLength);
-+
+ 
 +    if (statement->type != SQL_HANDLE_STMT)
 +    {
 +        WARN("Wrong handle type %d\n", statement->type);
 +        return SQL_ERROR;
 +    }
- 
++
 +    if (statement->connection->pSQLPrepareW)
 +    {
 +        ret = statement->connection->pSQLPrepareW(statement->driver_stmt, StatementText, TextLength);
@@ -63,3 +66,6 @@ index 5b63fded654..fae384ca411 100644
      return ret;
  }
  
+-- 
+2.43.0
+

patches/odbc-remove-unixodbc/0027-odbc32-Implement-SQLFreeStmt.patch

@@ -1,17 +1,17 @@
-From 20e5843387fd2daf28414b529dddd83dafa23cae Mon Sep 17 00:00:00 2001
+From bf680aa668ce942e0f7d37333c3680561ec45b84 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 11:47:40 +1100
-Subject: [PATCH 26/42] odbc32: Implement SQLFreeStmt
+Subject: [PATCH] odbc32: Implement SQLFreeStmt
 
 ---
  dlls/odbc32/proxyodbc.c | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 821c769c865..18efa222945 100644
+index 12d75fd1fcc..c457c4ac203 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -807,10 +807,23 @@ SQLRETURN WINAPI SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle)
+@@ -799,10 +799,23 @@ SQLRETURN WINAPI SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle)
   */
  SQLRETURN WINAPI SQLFreeStmt(SQLHSTMT StatementHandle, SQLUSMALLINT Option)
  {
@@ -37,5 +37,5 @@ index 821c769c865..18efa222945 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0028-odbc32-Forward-SQLBindCol-requets-onto-driver.patch

@@ -1,17 +1,17 @@
-From 2eed70f4cf636fc2f3e6549d480e8be80b8fcaca Mon Sep 17 00:00:00 2001
+From 3a2481213f3f96ab6befa4b052d1c7266cb82af6 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 11:57:00 +1100
-Subject: [PATCH 27/42] odbc32: Forward SQLBindCol requets onto driver
+Subject: [PATCH] odbc32: Forward SQLBindCol requets onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 16 +++++++++++++++-
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 18efa222945..48b89731ed0 100644
+index c457c4ac203..257375f568a 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -447,11 +447,25 @@ static const char *debugstr_sqllen( SQLLEN len )
+@@ -438,11 +438,25 @@ static const char *debugstr_sqllen( SQLLEN len )
  SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType,
                              SQLPOINTER TargetValue, SQLLEN BufferLength, SQLLEN *StrLen_or_Ind)
  {
@@ -39,5 +39,5 @@ index 18efa222945..48b89731ed0 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0029-odbc32-Forward-SQLExtendedFetch-request-onto-driver.patch

@@ -1,17 +1,17 @@
-From 2ad199088b8f666c3d7418eac6ec35e639f8260b Mon Sep 17 00:00:00 2001
+From 4b29416728af78c52d707adacc3d8ca7ffa01cd6 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 12:35:26 +1100
-Subject: [PATCH 28/42] odbc32: Forward SQLExtendedFetch request onto driver
+Subject: [PATCH] odbc32: Forward SQLExtendedFetch request onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 16 +++++++++++++++-
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 48b89731ed0..5a03ea3d757 100644
+index 257375f568a..de63be77ce2 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1551,11 +1551,25 @@ SQLRETURN WINAPI SQLDescribeParam(SQLHSTMT hstmt, SQLUSMALLINT ipar, SQLSMALLINT
+@@ -1581,11 +1581,25 @@ SQLRETURN WINAPI SQLDescribeParam(SQLHSTMT hstmt, SQLUSMALLINT ipar, SQLSMALLINT
  SQLRETURN WINAPI SQLExtendedFetch(SQLHSTMT hstmt, SQLUSMALLINT fFetchType, SQLLEN irow, SQLULEN *pcrow,
                                    SQLUSMALLINT *rgfRowStatus)
  {
@@ -39,5 +39,5 @@ index 48b89731ed0..5a03ea3d757 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0030-odbc32-Forward-SQLExecute-request-onto-driver.patch

@@ -1,17 +1,17 @@
-From 04ef2a6e51678a60daac117cec90ed48d5fb3fa6 Mon Sep 17 00:00:00 2001
+From 3af824cbff508603882029571b0799fa61c6526f Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 13:14:19 +1100
-Subject: [PATCH 29/42] odbc32: Forward SQLExecute request onto driver
+Subject: [PATCH] odbc32: Forward SQLExecute request onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 5a03ea3d757..846b788b76b 100644
+index de63be77ce2..6dd8f9ac0fb 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -743,10 +743,23 @@ SQLRETURN WINAPI SQLExecute(SQLHSTMT StatementHandle)
+@@ -735,10 +735,23 @@ SQLRETURN WINAPI SQLExecute(SQLHSTMT StatementHandle)
   */
  SQLRETURN WINAPI SQLFetch(SQLHSTMT StatementHandle)
  {
@@ -37,5 +37,5 @@ index 5a03ea3d757..846b788b76b 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0031-odbc32-Forward-SQLGetDiagField-W-request-onto-driver.patch

@@ -1,4 +1,4 @@
-From a760ceac67ab2ba73b7a5245793a9b720da3ec49 Mon Sep 17 00:00:00 2001
+From 3c2a0b102b6525589dfc58a481a9b769f2d40c57 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 13:15:48 +1100
 Subject: [PATCH] odbc32: Forward SQLGetDiagField/W request onto driver
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: Forward SQLGetDiagField/W request onto driver
  1 file changed, 46 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 407da1e4c1a..cc907f4fc2e 100644
+index 6dd8f9ac0fb..ac30e8aed81 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -958,9 +958,31 @@ SQLRETURN WINAPI SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSM
+@@ -959,9 +959,31 @@ SQLRETURN WINAPI SQLGetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSM
  {
      SQLRETURN ret = SQL_NO_DATA;
  
@@ -44,7 +44,7 @@ index 407da1e4c1a..cc907f4fc2e 100644
      return ret;
  }
  
-@@ -2166,9 +2188,31 @@ SQLRETURN WINAPI SQLGetDiagFieldW(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLS
+@@ -2167,9 +2189,31 @@ SQLRETURN WINAPI SQLGetDiagFieldW(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLS
  {
      SQLRETURN ret = SQL_NO_DATA;
  

patches/odbc-remove-unixodbc/0032-odbc32-SQLGetStmtAttr-store-some-driver-HDESC-values.patch

@@ -1,17 +1,17 @@
-From a3e0c12cbbdc7a8a81b5d7278659104d6b4d325a Mon Sep 17 00:00:00 2001
+From 9da2063aee1a4ffc92b76e204392bad4fcb63431 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 14:00:41 +1100
-Subject: [PATCH 31/42] odbc32: SQLGetStmtAttr store some driver HDESC values
+Subject: [PATCH] odbc32: SQLGetStmtAttr store some driver HDESC values
 
 ---
  dlls/odbc32/proxyodbc.c | 81 +++++++++++++++++++++++++++++++++++++++--
  1 file changed, 78 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 74e5d70cfef..27e4f1a4baa 100644
+index ac30e8aed81..62f8fdc40a5 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -178,11 +178,22 @@ struct SQLHDBC_data
+@@ -174,11 +174,22 @@ struct SQLHDBC_data
      SQLUINTEGER login_timeout;
  };
  
@@ -34,7 +34,7 @@ index 74e5d70cfef..27e4f1a4baa 100644
  };
  
  static void connection_bind_sql_funcs(struct SQLHDBC_data *connection)
-@@ -1130,8 +1141,40 @@ SQLRETURN WINAPI SQLGetStmtAttr(SQLHSTMT StatementHandle, SQLINTEGER Attribute,
+@@ -1127,8 +1138,40 @@ SQLRETURN WINAPI SQLGetStmtAttr(SQLHSTMT StatementHandle, SQLINTEGER Attribute,
  
      if (statement->connection->pSQLGetStmtAttr)
      {
@@ -76,7 +76,7 @@ index 74e5d70cfef..27e4f1a4baa 100644
      }
  
      TRACE("ret %d\n", ret);
-@@ -2221,8 +2264,40 @@ SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute,
+@@ -2259,8 +2302,40 @@ SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute,
  
      if (statement->connection->pSQLGetStmtAttrW)
      {
@@ -120,5 +120,5 @@ index 74e5d70cfef..27e4f1a4baa 100644
  
      TRACE("ret %d\n", ret);
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0033-odbc32-Forward-SQLSetDescFieldW-request-onto-driver.patch

@@ -1,4 +1,4 @@
-From 9023d5ee59640a56a4015db678e9630e32d168b6 Mon Sep 17 00:00:00 2001
+From 2a12908474e8cbd6c032d0af426f66b0c3ac2f7f Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 14:11:44 +1100
 Subject: [PATCH] odbc32: Forward SQLSetDescFieldW request onto driver
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: Forward SQLSetDescFieldW request onto driver
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index d06683f1852..4ea07470b05 100644
+index 62f8fdc40a5..f7032a66ca6 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -2185,6 +2185,7 @@ SQLRETURN WINAPI SQLGetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribu
+@@ -2186,6 +2186,7 @@ SQLRETURN WINAPI SQLGetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribu
      {
          ret = connection->pSQLGetConnectOptionW(connection->driver_hdbc, Attribute, Value);
      }
@@ -19,7 +19,7 @@ index d06683f1852..4ea07470b05 100644
  
      TRACE("ret %d\n", ret);
  
-@@ -2852,11 +2853,17 @@ SQLRETURN WINAPI SQLDriversW(SQLHENV EnvironmentHandle, SQLUSMALLINT fDirection,
+@@ -2860,11 +2861,17 @@ SQLRETURN WINAPI SQLDriversW(SQLHENV EnvironmentHandle, SQLUSMALLINT fDirection,
  SQLRETURN WINAPI SQLSetDescFieldW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
                                    SQLPOINTER Value, SQLINTEGER BufferLength)
  {

patches/odbc-remove-unixodbc/0034-odbc32-Forward-SQLGetData-request-onto-driver.patch

@@ -1,4 +1,4 @@
-From 204e31dd1d93a967f57b35678e196c3271b2cd49 Mon Sep 17 00:00:00 2001
+From cd89d8e94f385756bc6c5505c44401cf2e69abb1 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 15:13:09 +1100
 Subject: [PATCH] odbc32: Forward SQLGetData request onto driver

patches/odbc-remove-unixodbc/0035-odbc32-Forward-SQLGetTypeInfo-W-request-onto-driver.patch

@@ -1,17 +1,17 @@
-From edf0a873027a3b95e1bf84750efbb29939aee60e Mon Sep 17 00:00:00 2001
+From d84771b086426a52b39dff76e07530eda7096072 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 15:23:30 +1100
-Subject: [PATCH 34/42] odbc32: Forward SQLGetTypeInfo/W request onto driver
+Subject: [PATCH] odbc32: Forward SQLGetTypeInfo/W request onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 30 ++++++++++++++++++++++++++++--
  1 file changed, 28 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 4e98c8c7caa..7f8cc57e968 100644
+index c8e715bdd67..fd8e78f451b 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1212,10 +1212,23 @@ SQLRETURN WINAPI SQLGetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option,
+@@ -1219,10 +1219,23 @@ SQLRETURN WINAPI SQLGetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option,
   */
  SQLRETURN WINAPI SQLGetTypeInfo(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
  {
@@ -36,7 +36,7 @@ index 4e98c8c7caa..7f8cc57e968 100644
      return ret;
  }
  
-@@ -2540,10 +2553,23 @@ SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQ
+@@ -2620,10 +2633,23 @@ SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQ
   */
  SQLRETURN WINAPI SQLGetTypeInfoW(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
  {
@@ -62,5 +62,5 @@ index 4e98c8c7caa..7f8cc57e968 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0036-odbc32-Forward-SQLBindParameter-request-onto-driver.patch

@@ -1,4 +1,4 @@
-From b6d2054d5cd0787c18631e520594e9442c76781d Mon Sep 17 00:00:00 2001
+From dc9fe6444cb0c42d70cf78032cdb4808fed5eb68 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 15:40:24 +1100
 Subject: [PATCH] odbc32: Forward SQLBindParameter request onto driver
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: Forward SQLBindParameter request onto driver
  1 file changed, 36 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 40128395b32..4d2f472740c 100644
+index fd8e78f451b..f2ece198084 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1893,12 +1893,47 @@ SQLRETURN WINAPI SQLBindParameter(SQLHSTMT hstmt, SQLUSMALLINT ipar, SQLSMALLINT
+@@ -1942,12 +1942,47 @@ SQLRETURN WINAPI SQLBindParameter(SQLHSTMT hstmt, SQLUSMALLINT ipar, SQLSMALLINT
                                    SQLSMALLINT ibScale, SQLPOINTER rgbValue, SQLLEN cbValueMax,
                                    SQLLEN *pcbValue)
  {

patches/odbc-remove-unixodbc/0037-odbc32-Forward-SQLTransact-request-onto-driver.patch

@@ -1,17 +1,17 @@
-From 0930c5f0fe4e4608957cc5c16c2d8e63d805d5e4 Mon Sep 17 00:00:00 2001
+From 931936f51db30da1b5d0583a9be3231b0f7678f0 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 6 Feb 2023 16:03:58 +1100
-Subject: [PATCH 36/42] odbc32: Forward SQLTransact request onto driver
+Subject: [PATCH] odbc32: Forward SQLTransact request onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index f73daad254f..c73912b38cf 100644
+index f2ece198084..e78b51d7486 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1550,11 +1550,24 @@ SQLRETURN WINAPI SQLTables(SQLHSTMT StatementHandle, SQLCHAR *CatalogName, SQLSM
+@@ -1591,11 +1591,24 @@ SQLRETURN WINAPI SQLTables(SQLHSTMT StatementHandle, SQLCHAR *CatalogName, SQLSM
   */
  SQLRETURN WINAPI SQLTransact(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, SQLUSMALLINT CompletionType)
  {
@@ -38,5 +38,5 @@ index f73daad254f..c73912b38cf 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0038-odbc32-Forward-SQLGetDiagRecW-request-onto-driver.patch

@@ -1,4 +1,4 @@
-From 76850074a3e3f4a1de4503eb81748af85e4bdd13 Mon Sep 17 00:00:00 2001
+From 76ed07ea89b4375d721fb993e04b4c99b3592996 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 7 Feb 2023 14:18:20 +1100
 Subject: [PATCH] odbc32: Forward SQLGetDiagRecW request onto driver
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: Forward SQLGetDiagRecW request onto driver
  1 file changed, 41 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index a5a3c0186eb..692324a93a3 100644
+index e78b51d7486..b8c2eb43055 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -2280,10 +2280,50 @@ SQLRETURN WINAPI SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMA
+@@ -2355,10 +2355,50 @@ SQLRETURN WINAPI SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMA
  {
      SQLRETURN ret = SQL_ERROR;
  

patches/odbc-remove-unixodbc/0039-odbc32-SQLGetEnvAttr-Support-SQL_ATTR_ODBC_VERSION-a.patch

@@ -1,7 +1,7 @@
-From 99696a933b6393903df0aa314190a220cea635ac Mon Sep 17 00:00:00 2001
+From 14e00b2574f64b47ee25028cc59476949db6cf84 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 8 Feb 2023 08:39:26 +1100
-Subject: [PATCH 38/42] odbc32: SQLGetEnvAttr: Support SQL_ATTR_ODBC_VERSION
+Subject: [PATCH] odbc32: SQLGetEnvAttr: Support SQL_ATTR_ODBC_VERSION
  attribute
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 38/42] odbc32: SQLGetEnvAttr: Support SQL_ATTR_ODBC_VERSION
  1 file changed, 16 insertions(+)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index bdd8361d221..46872add8b0 100644
+index b8c2eb43055..cf3455c45b4 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
 @@ -47,6 +47,7 @@ struct SQLHENV_data
@@ -20,7 +20,7 @@ index bdd8361d221..46872add8b0 100644
  };
  
  struct SQLHDBC_data
-@@ -368,6 +369,7 @@ SQLRETURN WINAPI SQLAllocEnv(SQLHENV *EnvironmentHandle)
+@@ -359,6 +360,7 @@ SQLRETURN WINAPI SQLAllocEnv(SQLHENV *EnvironmentHandle)
  
      henv->type = SQL_HANDLE_ENV;
      henv->pooling = SQL_CP_OFF;
@@ -28,7 +28,7 @@ index bdd8361d221..46872add8b0 100644
  
      *EnvironmentHandle = henv;
  
-@@ -1067,6 +1069,14 @@ SQLRETURN WINAPI SQLGetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute,
+@@ -1074,6 +1076,14 @@ SQLRETURN WINAPI SQLGetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute,
              }
              *(SQLUINTEGER*)Value = data->pooling;
              break;
@@ -43,7 +43,7 @@ index bdd8361d221..46872add8b0 100644
          default:
              FIXME("Unhandle attribute %d\n", Attribute);
              return SQL_ERROR;
-@@ -1426,6 +1436,12 @@ SQLRETURN WINAPI SQLSetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute,
+@@ -1463,6 +1473,12 @@ SQLRETURN WINAPI SQLSetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute,
              else
                  data->pooling = SQL_CP_OFF;
              break;
@@ -57,5 +57,5 @@ index bdd8361d221..46872add8b0 100644
              FIXME("Unhandle attribute %d\n", Attribute);
              return SQL_ERROR;
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0040-odbc32-Pass-ODBC-version-when-creating-driver-enviro.patch

@@ -1,14 +1,17 @@
-From b05ebe79d74d84c7354cecb3072812697839a61f Mon Sep 17 00:00:00 2001
+From 014cadef9d41657c315f140daa0cbed19d43f02a Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 8 Feb 2023 09:03:40 +1100
-Subject: odbc32: Pass ODBC version when creating driver environment
+Subject: [PATCH] odbc32: Pass ODBC version when creating driver environment
 
+---
+ dlls/odbc32/proxyodbc.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index d590a5af0fe..389148b625a 100644
+index cf3455c45b4..6e02d37548c 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -2644,11 +2644,15 @@ SQLRETURN WINAPI SQLDriverConnectW(SQLHDBC ConnectionHandle, SQLHWND WindowHandl
+@@ -2654,11 +2654,15 @@ SQLRETURN WINAPI SQLDriverConnectW(SQLHDBC ConnectionHandle, SQLHWND WindowHandl
      if (connection->pSQLAllocHandle)
      {
          connection->pSQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &connection->driver_env);
@@ -25,3 +28,6 @@ index d590a5af0fe..389148b625a 100644
      }
      /* ODBC 2.x */
      else if(connection->pSQLAllocConnect && connection->pSQLAllocEnv)
+-- 
+2.43.0
+

patches/odbc-remove-unixodbc/0041-odbc32-SQLBindCol-convert-to-ODBC2-types-if-required.patch

@@ -1,17 +1,17 @@
-From e73aae5f26b1af29ce14f3edaa84569bd3c86bc4 Mon Sep 17 00:00:00 2001
+From c9f90dfeff20eb7faa55bdc00add8f4d18fbb1b5 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 8 Feb 2023 14:16:24 +1100
-Subject: [PATCH 40/42] odbc32: SQLBindCol convert to ODBC2 types if required
+Subject: [PATCH] odbc32: SQLBindCol convert to ODBC2 types if required
 
 ---
  dlls/odbc32/proxyodbc.c | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 851d2535ca1..c6d19b58e1c 100644
+index 6e02d37548c..d760481fa9b 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -474,6 +474,20 @@ SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber,
+@@ -465,6 +465,20 @@ SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber,
  
      if (statement->connection->pSQLBindCol)
      {
@@ -33,5 +33,5 @@ index 851d2535ca1..c6d19b58e1c 100644
                              TargetValue, BufferLength, StrLen_or_Ind);
      }
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0042-odbc32-Implement-SQLAllocHandle.patch

@@ -1,17 +1,17 @@
-From dca052a02225fb151237d0ba36dbf35d3fdab4fe Mon Sep 17 00:00:00 2001
+From 0a67d651b40335e9b8ee09e47c8f54845101c6f7 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 8 Feb 2023 15:22:00 +1100
-Subject: [PATCH 41/42] odbc32: Implement SQLAllocHandle
+Subject: [PATCH] odbc32: Implement SQLAllocHandle
 
 ---
  dlls/odbc32/proxyodbc.c | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index c6d19b58e1c..15171a0d028 100644
+index d760481fa9b..879808add00 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -383,9 +383,22 @@ SQLRETURN WINAPI SQLAllocHandle(SQLSMALLINT HandleType, SQLHANDLE InputHandle, S
+@@ -374,9 +374,22 @@ SQLRETURN WINAPI SQLAllocHandle(SQLSMALLINT HandleType, SQLHANDLE InputHandle, S
  {
      SQLRETURN ret = SQL_ERROR;
  
@@ -36,5 +36,5 @@ index c6d19b58e1c..15171a0d028 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0043-odbc32-Forward-SQLConnectW-request-onto-driver.patch

@@ -1,17 +1,17 @@
-From ec35258befb2b050e2cd2087dc6ea9ea66155403 Mon Sep 17 00:00:00 2001
+From bbad2699c06c230f2fddecfc4a8159b763e6d233 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 8 Feb 2023 15:34:18 +1100
-Subject: [PATCH 42/42] odbc32: Forward SQLConnectW request onto driver
+Subject: [PATCH] odbc32: Forward SQLConnectW request onto driver
 
 ---
  dlls/odbc32/proxyodbc.c | 22 +++++++++++++++++++---
  1 file changed, 19 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 15171a0d028..6f6d502e772 100644
+index 879808add00..89ebf0e5141 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -2069,12 +2069,28 @@ SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle, WCHAR *ServerName, SQLSMA
+@@ -2131,12 +2131,28 @@ SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle, WCHAR *ServerName, SQLSMA
                               WCHAR *UserName, SQLSMALLINT NameLength2, WCHAR *Authentication,
                               SQLSMALLINT NameLength3)
  {
@@ -44,5 +44,5 @@ index 15171a0d028..6f6d502e772 100644
  }
  
 -- 
-2.39.1
+2.43.0
 

patches/odbc-remove-unixodbc/0044-odbc32-Forward-SQLColAttribute-W-request-onto-driver.patch

@@ -1,4 +1,4 @@
-From d3bfdb5fc584ae6a2bab70056f0cad11e4b741cd Mon Sep 17 00:00:00 2001
+From 46c661c38a41172cd11430bfa266f7e0cddf1f8d Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 8 Feb 2023 20:19:44 +1100
 Subject: [PATCH] odbc32: Forward SQLColAttribute/W request onto driver
@@ -8,7 +8,7 @@ Subject: [PATCH] odbc32: Forward SQLColAttribute/W request onto driver
  1 file changed, 102 insertions(+), 17 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 3eca2ce9999..25e8249f8fc 100644
+index 89ebf0e5141..409bc428230 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
 @@ -314,6 +314,36 @@ static void connection_bind_sql_funcs(struct SQLHDBC_data *connection)
@@ -97,7 +97,7 @@ index 3eca2ce9999..25e8249f8fc 100644
      return ret;
  }
  
-@@ -2063,21 +2128,6 @@ SQLRETURN WINAPI SQLSetScrollOptions(SQLHSTMT statement_handle, SQLUSMALLINT f_c
+@@ -2073,21 +2138,6 @@ SQLRETURN WINAPI SQLSetScrollOptions(SQLHSTMT statement_handle, SQLUSMALLINT f_c
      return ret;
  }
  
@@ -119,7 +119,7 @@ index 3eca2ce9999..25e8249f8fc 100644
  /*************************************************************************
   *				SQLColAttributesW          [ODBC32.106]
   */
-@@ -2284,12 +2334,47 @@ SQLRETURN WINAPI SQLColAttributeW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnN
+@@ -2294,12 +2344,47 @@ SQLRETURN WINAPI SQLColAttributeW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnN
                                    SQLSMALLINT BufferLength, SQLSMALLINT *StringLength,
                                    SQLLEN *NumericAttribute)
  {

patches/odbc-remove-unixodbc/0045-odbc32-Forward-SQLGetDiagRec-request-to-driver.patch

@@ -1,4 +1,4 @@
-From 2d319fb624bf217beded8f6e40b942331ea7670d Mon Sep 17 00:00:00 2001
+From 8e284b4208c85a42e4aa1723876aaba208cea3d3 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 8 Feb 2023 21:03:47 +1100
 Subject: [PATCH] odbc32: Forward SQLGetDiagRec request to driver
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: Forward SQLGetDiagRec request to driver
  1 file changed, 33 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 5389579d3ae..ab843b9ecb9 100644
+index 409bc428230..25e9d5651cd 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -3147,9 +3147,41 @@ SQLRETURN WINAPI SQLGetDiagRecA(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMA
+@@ -3201,9 +3201,41 @@ SQLRETURN WINAPI SQLGetDiagRecA(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMA
  {
      SQLRETURN ret = SQL_ERROR;
  

patches/odbc-remove-unixodbc/0046-odbc32-Forward-SQLPrimaryKeysW-request-to-driver.patch

@@ -1,4 +1,4 @@
-From ef625c118f33b0056161d72e8caabe9dc76fca31 Mon Sep 17 00:00:00 2001
+From 0bf2bde719089038889e6001991eaacc93718daa Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 4 Oct 2023 15:09:56 +1100
 Subject: [PATCH] odbc32: Forward SQLPrimaryKeysW request to driver.
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: Forward SQLPrimaryKeysW request to driver.
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index f4798febbf1..5ee63893e06 100644
+index 25e9d5651cd..b3e4ebfe450 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -2927,14 +2927,28 @@ SQLRETURN WINAPI SQLPrimaryKeysW(SQLHSTMT hstmt, SQLWCHAR *szCatalogName, SQLSMA
+@@ -3062,14 +3062,28 @@ SQLRETURN WINAPI SQLPrimaryKeysW(SQLHSTMT hstmt, SQLWCHAR *szCatalogName, SQLSMA
                                   SQLWCHAR *szSchemaName, SQLSMALLINT cbSchemaName, SQLWCHAR *szTableName,
                                   SQLSMALLINT cbTableName)
  {
@@ -42,5 +42,5 @@ index f4798febbf1..5ee63893e06 100644
  }
  
 -- 
-2.42.0
+2.43.0
 

patches/odbc-remove-unixodbc/0047-odbc32-Forward-SQLStatisticsW-request-to-driver.patch

@@ -1,4 +1,4 @@
-From 851b22050c35cc6a94bd2d19f509b5402f9cacd1 Mon Sep 17 00:00:00 2001
+From 4d2d26b889f8ce32d774df667625401eceb9b694 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 4 Oct 2023 15:30:49 +1100
 Subject: [PATCH] odbc32: Forward SQLStatisticsW request to driver.
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: Forward SQLStatisticsW request to driver.
  1 file changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 5ee63893e06..32d061411e5 100644
+index b3e4ebfe450..35ddd14e49f 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -2791,13 +2791,30 @@ SQLRETURN WINAPI SQLStatisticsW(SQLHSTMT StatementHandle, SQLWCHAR *CatalogName,
+@@ -2926,13 +2926,30 @@ SQLRETURN WINAPI SQLStatisticsW(SQLHSTMT StatementHandle, SQLWCHAR *CatalogName,
                                  SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, SQLWCHAR *TableName,
                                  SQLSMALLINT NameLength3, SQLUSMALLINT Unique, SQLUSMALLINT Reserved)
  {
@@ -44,5 +44,5 @@ index 5ee63893e06..32d061411e5 100644
  }
  
 -- 
-2.42.0
+2.43.0
 

patches/odbc-remove-unixodbc/0048-odbc32-Forward-SQLError-W-onto-driver.patch

@@ -1,4 +1,4 @@
-From 0ea6cb924d626265873019518672111b7c0fb963 Mon Sep 17 00:00:00 2001
+From d417f9fe271eb9b84e0afb9fd1a9c3950f1fb9b0 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 10 Jun 2024 08:40:09 +1000
 Subject: [PATCH] odbc32: Forward SQLError/W onto driver
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: Forward SQLError/W onto driver
  1 file changed, 18 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 89aaf1e8417..19027fdb83e 100644
+index 35ddd14e49f..ce2a74310bb 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -735,12 +735,20 @@ SQLRETURN WINAPI SQLError(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, S
+@@ -787,12 +787,20 @@ SQLRETURN WINAPI SQLError(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, S
                            SQLCHAR *Sqlstate, SQLINTEGER *NativeError, SQLCHAR *MessageText,
                            SQLSMALLINT BufferLength, SQLSMALLINT *TextLength)
  {
@@ -33,7 +33,7 @@ index 89aaf1e8417..19027fdb83e 100644
      return ret;
  }
  
-@@ -2240,12 +2248,20 @@ SQLRETURN WINAPI SQLErrorW(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle,
+@@ -2246,12 +2254,20 @@ SQLRETURN WINAPI SQLErrorW(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle,
                             WCHAR *Sqlstate, SQLINTEGER *NativeError, WCHAR *MessageText,
                             SQLSMALLINT BufferLength, SQLSMALLINT *TextLength)
  {

patches/odbc-remove-unixodbc/0049-odbc32-Implement-SQLFreeHandle.patch

@@ -1,4 +1,4 @@
-From f7460292e7db5cc684ab8a59d90b7bd30a0ddf02 Mon Sep 17 00:00:00 2001
+From 506812cfd989ab515dd0c0fd11bc64dc4cdcdae7 Mon Sep 17 00:00:00 2001
 From: Steve Fawcett <steve.fawcett@bitnosis.com>
 Date: Wed, 12 Jun 2024 09:27:31 +1000
 Subject: [PATCH] odbc32: Implement SQLFreeHandle