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