Rebase against 5f7b9a5b837a77a85754b3b55b974e39e199f817.

patches/odbc-remove-unixodbc/0001-odbc32-Remove-unixODBC-support.patch

@@ -1,4 +1,4 @@
-From a2aef9e7d59d7f967fa7a0d341a6b13dd52a2ce0 Mon Sep 17 00:00:00 2001
+From 26584146fbac7cbb91cf497812033bfe0ab01445 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 2 Feb 2023 14:20:44 +1100
 Subject: [PATCH] odbc32: Remove unixODBC support
@@ -51,7 +51,7 @@ index 0ec0ae8eaf4..a42f1473d67 100644
 -	unixlib.c
 +	rsrc.rc
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index d5c271bdfa2..3927d00673e 100644
+index a3732c001be..0604d928366 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
 @@ -40,36 +40,19 @@
@@ -2680,7 +2680,7 @@ index d5c271bdfa2..3927d00673e 100644
  
 @@ -2490,17 +1523,10 @@ SQLRETURN WINAPI SQLGetTypeInfoW(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
   */
- SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLLEN Value)
+ SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value)
  {
 -    struct SQLSetConnectOptionW_params params = { 0, Option, Value };
 -    struct handle *handle = ConnectionHandle;

staging/upstream-commit

@@ -1 +1 @@
-d41a1f0183f5686fa3ed1b42c4de07e393833925
+5f7b9a5b837a77a85754b3b55b974e39e199f817