Updated odbc32-fixes patchset

Corrected Commit ascii to ANSI.
Reset patch numbers.
Convert SQL_C_WCHAR to SQL_CHAR when required for ANSI driver.

patches/odbc32-fixes/0001-odbc32-Load-function-pointer-for-SQLBindParam.patch

@@ -1,14 +1,14 @@
-From cace313e628d0edd434f6f30c911f7bd91062adb Mon Sep 17 00:00:00 2001
+From cbca8076ac6f6efe8d6832775b56cdd40fe8108b Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 12 Jul 2024 14:44:43 +1000
-Subject: [PATCH 07/15] odbc32: Load function pointer for SQLBindParam
+Subject: [PATCH] odbc32: Load function pointer for SQLBindParam
 
 ---
  dlls/odbc32/proxyodbc.c | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index c4e1c046edc..6eb15687f92 100644
+index d11b4122776..9a079175d42 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
 @@ -50,6 +50,7 @@ struct win32_funcs
@@ -28,5 +28,5 @@ index c4e1c046edc..6eb15687f92 100644
      LOAD_FUNCPTR( SQLBrowseConnect )
      LOAD_FUNCPTR( SQLBrowseConnectW )
 -- 
-2.43.0
+2.47.2
 

patches/odbc32-fixes/0002-odbc32-SQLBindParameter-handle-fallback-function.patch

@@ -1,4 +1,4 @@
-From 6159b0b10211094af4f0d5b8e6bff5c589664025 Mon Sep 17 00:00:00 2001
+From 1a1b88dd5a0a23c64bf4aee2e64f30c418181be0 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 12 Jul 2024 14:40:32 +1000
 Subject: [PATCH] odbc32: SQLBindParameter handle fallback function
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: SQLBindParameter handle fallback function
  1 file changed, 28 insertions(+)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index d11b4122776..3eb53288c65 100644
+index 9a079175d42..aa886d01e33 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -5522,9 +5522,37 @@ static SQLRETURN bind_parameter_win32( struct statement *stmt, SQLUSMALLINT para
+@@ -5524,9 +5524,37 @@ static SQLRETURN bind_parameter_win32( struct statement *stmt, SQLUSMALLINT para
                                         SQLSMALLINT value_type, SQLSMALLINT param_type, SQLULEN size,
                                         SQLSMALLINT digits, SQLPOINTER value, SQLLEN buflen, SQLLEN *len )
  {

patches/odbc32-fixes/0003-odbc32-SQLSetConnectAttr-W-handle-fallback-function.patch

@@ -1,4 +1,4 @@
-From 1b5f6b996f8a1f314e935657f5e205717ace23b4 Mon Sep 17 00:00:00 2001
+From 987b50c3a705029e222f444caa453729483eac67 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 12 Jul 2024 14:55:47 +1000
 Subject: [PATCH] odbc32: SQLSetConnectAttr/W handle fallback function
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: SQLSetConnectAttr/W handle fallback function
  1 file changed, 5 insertions(+)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 7099027c2b4..632738b9533 100644
+index aa886d01e33..4fdd242f3b5 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -6334,6 +6334,11 @@ static SQLRETURN set_connect_attr_win32_w( struct connection *con, SQLINTEGER at
+@@ -6713,6 +6713,11 @@ static SQLRETURN set_connect_attr_win32_w( struct connection *con, SQLINTEGER at
      if (con->hdr.win32_funcs->SQLSetConnectAttrW)
          return con->hdr.win32_funcs->SQLSetConnectAttrW( con->hdr.win32_handle, attr, value, len );
      if (con->hdr.win32_funcs->SQLSetConnectAttr) FIXME( "Unicode to ANSI conversion not handled\n" );
@@ -24,5 +24,5 @@ index 7099027c2b4..632738b9533 100644
  }
  
 -- 
-2.43.0
+2.47.2
 

patches/odbc32-fixes/0004-odbc32-Record-loaded-driver-SQL_ATTR_ODBC_VERSION.patch

@@ -1,4 +1,4 @@
-From 02836ce54a6a32a72cc696f783f6241da23fa385 Mon Sep 17 00:00:00 2001
+From 7d25d7fa0ee65c209e8c58f6ce276416931d8052 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 18 Jul 2024 07:13:48 +1000
 Subject: [PATCH] odbc32: Record loaded driver SQL_ATTR_ODBC_VERSION
@@ -9,10 +9,10 @@ Subject: [PATCH] odbc32: Record loaded driver SQL_ATTR_ODBC_VERSION
  2 files changed, 5 insertions(+)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index d48c3d822fa..1977e766950 100644
+index 4fdd242f3b5..c0ab9db9879 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -463,6 +463,7 @@ static struct environment *create_environment( void )
+@@ -464,6 +464,7 @@ static struct environment *create_environment( void )
      if (!(ret = calloc( 1, sizeof(*ret) ))) return NULL;
      init_object( &ret->hdr, SQL_HANDLE_ENV, NULL );
      ret->attr_version = SQL_OV_ODBC2;
@@ -20,7 +20,7 @@ index d48c3d822fa..1977e766950 100644
      return ret;
  }
  
-@@ -1173,6 +1174,9 @@ static SQLRETURN set_env_attr( struct environment *env, SQLINTEGER attr, SQLPOIN
+@@ -1265,6 +1266,9 @@ static SQLRETURN set_env_attr( struct environment *env, SQLINTEGER attr, SQLPOIN
      }
      else if (env->hdr.win32_handle)
      {
@@ -31,10 +31,10 @@ index d48c3d822fa..1977e766950 100644
              ret = env->hdr.win32_funcs->SQLSetEnvAttr( env->hdr.win32_handle, attr, value, len );
      }
 diff --git a/dlls/odbc32/unixlib.h b/dlls/odbc32/unixlib.h
-index c771e16f9e3..05ee89c57db 100644
+index c865a83711d..4ff13a68add 100644
 --- a/dlls/odbc32/unixlib.h
 +++ b/dlls/odbc32/unixlib.h
-@@ -211,6 +211,7 @@ struct environment
+@@ -205,6 +205,7 @@ struct environment
      UINT32 sources_idx;
      void  *sources_key;
      BOOL   sources_system;
@@ -43,5 +43,5 @@ index c771e16f9e3..05ee89c57db 100644
  
  struct connection
 -- 
-2.43.0
+2.47.2
 

patches/odbc32-fixes/0005-odbc32-SQLGetData-support-ODBC-v2.0.patch

@@ -1,4 +1,4 @@
-From f16a96be2b219f8e7733a36dc147f5247b618870 Mon Sep 17 00:00:00 2001
+From bf0ca6561dde86d00f9362e07c2ceb4fb7001c5f Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 17 Jul 2024 21:55:20 +1000
 Subject: [PATCH] odbc32: SQLGetData support ODBC v2.0
@@ -8,7 +8,7 @@ Subject: [PATCH] odbc32: SQLGetData support ODBC v2.0
  1 file changed, 24 insertions(+)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index c16c9a6da69..18d3df1007f 100644
+index c0ab9db9879..64740bd5169 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
 @@ -2468,11 +2468,35 @@ static SQLRETURN get_data_unix( struct statement *stmt, SQLUSMALLINT column, SQL

patches/odbc32-fixes/0006-odbc32-SQLColAttributesW-support-ODBC-v2.0.patch

@@ -1,4 +1,4 @@
-From 5874cf0a309a0ecfa97206b8b15734485920c325 Mon Sep 17 00:00:00 2001
+From 476b2f23b33d64138ca90073f3d88d91856d3bb1 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 17 Jul 2024 22:03:03 +1000
 Subject: [PATCH] odbc32: SQLColAttributesW support ODBC v2.0
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: SQLColAttributesW support ODBC v2.0
  1 file changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 18d3df1007f..8d51ad37176 100644
+index 64740bd5169..742823cf08d 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -6256,6 +6256,9 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
+@@ -6261,6 +6261,9 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
                                          SQLPOINTER char_attr, SQLSMALLINT buflen, SQLSMALLINT *retlen,
                                          SQLLEN *num_attr )
  {
@@ -21,7 +21,7 @@ index 18d3df1007f..8d51ad37176 100644
      if (stmt->hdr.win32_funcs->SQLColAttributeW)
          return stmt->hdr.win32_funcs->SQLColAttributeW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen,
                                                         retlen, num_attr );
-@@ -6315,11 +6318,23 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
+@@ -6320,11 +6323,23 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
              return SQL_ERROR;
          }
  

patches/odbc32-fixes/0007-odbc32-SQLSetStmtAttrW-support-fallback-for-ODBC-v2..patch

@@ -1,4 +1,4 @@
-From 2003987040ac9ac13d899c299b1375024a18a1dc Mon Sep 17 00:00:00 2001
+From 2a020e9d35ae25858e0642b06c025dc686594fec Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 17 Jul 2024 22:04:39 +1000
 Subject: [PATCH] odbc32: SQLSetStmtAttrW support fallback for ODBC v2.0
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: SQLSetStmtAttrW support fallback for ODBC v2.0
  1 file changed, 5 insertions(+)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index f7a6535db37..d0661406fae 100644
+index 742823cf08d..d0f3a837745 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -7585,6 +7585,11 @@ static SQLRETURN set_stmt_attr_win32_w( struct statement *stmt, SQLINTEGER attr,
+@@ -7948,6 +7948,11 @@ static SQLRETURN set_stmt_attr_win32_w( struct statement *stmt, SQLINTEGER attr,
      if (stmt->hdr.win32_funcs->SQLSetStmtAttrW)
          return stmt->hdr.win32_funcs->SQLSetStmtAttrW( stmt->hdr.win32_handle, attr, value, len );
      if (stmt->hdr.win32_funcs->SQLSetStmtAttr) FIXME( "Unicode to ANSI conversion not handled\n" );
@@ -24,5 +24,5 @@ index f7a6535db37..d0661406fae 100644
  }
  
 -- 
-2.43.0
+2.47.2
 

patches/odbc32-fixes/0008-odbc32-SQLColAttributes-W-fall-throught-for-unknown-.patch

@@ -1,4 +1,4 @@
-From 2e310f42d27c6b26631124bc3622a7fc6c80167e Mon Sep 17 00:00:00 2001
+From aab4645ff5f308dcbd696f29720247ac8f07ae69 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 28 Aug 2024 07:57:17 +1000
 Subject: [PATCH] odbc32: SQLColAttributes/W fall throught for unknown field
@@ -9,10 +9,10 @@ Subject: [PATCH] odbc32: SQLColAttributes/W fall throught for unknown field
  1 file changed, 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index c2dcf76de07..4daa19140a3 100644
+index d0f3a837745..5d2c4a19915 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -1027,7 +1027,6 @@ static SQLRETURN col_attribute_win32_a( struct statement *stmt, SQLUSMALLINT col
+@@ -1035,7 +1035,6 @@ static SQLRETURN col_attribute_win32_a( struct statement *stmt, SQLUSMALLINT col
  
          default:
              FIXME( "field id %u not handled\n", field_id );
@@ -20,7 +20,7 @@ index c2dcf76de07..4daa19140a3 100644
          }
  
          return stmt->hdr.win32_funcs->SQLColAttributes( stmt->hdr.win32_handle, col, field_id, char_attr, buflen,
-@@ -6270,7 +6269,6 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
+@@ -6320,7 +6319,6 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
  
          default:
              FIXME( "field id %u not handled\n", field_id );
@@ -29,5 +29,5 @@ index c2dcf76de07..4daa19140a3 100644
  
          ret = stmt->hdr.win32_funcs->SQLColAttributesW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen,
 -- 
-2.45.2
+2.47.2
 

patches/odbc32-fixes/0009-odbc32-SQLDriverConnectW-fallback-to-SQLDriverConnec.patch

@@ -1,4 +1,4 @@
-From 518a165d51be822ae34c89146cd6a0d75e41852b Mon Sep 17 00:00:00 2001
+From 9afd532ca391aa96bde3afdebcccdb9bc486ae2c Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sat, 26 Apr 2025 12:33:23 +1000
 Subject: [PATCH] odbc32: SQLDriverConnectW fallback to SQLDriverConnect when
@@ -9,10 +9,10 @@ Subject: [PATCH] odbc32: SQLDriverConnectW fallback to SQLDriverConnect when
  1 file changed, 35 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index cf9d72e8452..e26fdcb8620 100644
+index 5d2c4a19915..56556bbdac9 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -6861,11 +6861,44 @@ static SQLRETURN driver_connect_win32_w( struct connection *con, SQLHWND window,
+@@ -6866,11 +6866,44 @@ static SQLRETURN driver_connect_win32_w( struct connection *con, SQLHWND window,
                                           SQLSMALLINT len, SQLWCHAR *out_conn_str, SQLSMALLINT buflen, SQLSMALLINT *len2,
                                           SQLUSMALLINT completion )
  {

patches/odbc32-fixes/0010-odbc32-SQLGetInfoW-support-ANSI-fallback.patch

@@ -1,17 +1,17 @@
-From 53904cea4cd192552ab26c247593c91ca0b81993 Mon Sep 17 00:00:00 2001
+From f9722335c423390f60e2cd72dc4a9d60c8846990 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sat, 26 Apr 2025 16:27:58 +1000
-Subject: [PATCH] odbc32: SQLGetInfoW support ascii fallback.
+Subject: [PATCH] odbc32: SQLGetInfoW support ANSI fallback.
 
 ---
  dlls/odbc32/proxyodbc.c | 72 +++++++++++++++++++++++++++++++++++++++--
  1 file changed, 70 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index d11b4122776..cc7b9309562 100644
+index 56556bbdac9..63539882a61 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -6924,13 +6924,81 @@ static SQLRETURN get_info_unix_w( struct connection *con, SQLUSMALLINT type, SQL
+@@ -7033,13 +7033,81 @@ static SQLRETURN get_info_unix_w( struct connection *con, SQLUSMALLINT type, SQL
      return ODBC_CALL( SQLGetInfoW, &params );
  }
  

patches/odbc32-fixes/0011-odbc32-SQLExecDirectW-call-fallback-SQLExecDirect.patch

@@ -1,4 +1,4 @@
-From 6beecab75df0c60ccde26fe8571172166efd5d72 Mon Sep 17 00:00:00 2001
+From c78b5e8e4749612b72f2c838ba124c9469ed39e9 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sat, 26 Apr 2025 17:07:21 +1000
 Subject: [PATCH] odbc32: SQLExecDirectW call fallback SQLExecDirect
@@ -8,7 +8,7 @@ Subject: [PATCH] odbc32: SQLExecDirectW call fallback SQLExecDirect
  1 file changed, 23 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index e8b05a7b9ec..b792fcbe603 100644
+index 63539882a61..25a76c8d111 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
 @@ -1099,6 +1099,20 @@ static SQLWCHAR *strnAtoW( const SQLCHAR *str, int len )
@@ -32,7 +32,7 @@ index e8b05a7b9ec..b792fcbe603 100644
  static SQLRETURN columns_unix_a( struct statement *stmt, SQLCHAR *catalog, SQLSMALLINT len1, SQLCHAR *schema,
                                   SQLSMALLINT len2, SQLCHAR *table, SQLSMALLINT len3, SQLCHAR *column,
                                   SQLSMALLINT len4 )
-@@ -6073,10 +6087,17 @@ static SQLRETURN exec_direct_unix_w( struct statement *stmt, SQLWCHAR *text, SQL
+@@ -6078,10 +6092,17 @@ static SQLRETURN exec_direct_unix_w( struct statement *stmt, SQLWCHAR *text, SQL
  
  static SQLRETURN exec_direct_win32_w( struct statement *stmt, SQLWCHAR *text, SQLINTEGER len )
  {

patches/odbc32-fixes/0012-odbc32-SQLDescribeColW-add-ANSI-fallback.patch

@@ -1,17 +1,17 @@
-From ff127c9da0bcfe90fbf2c9d6bcbd63e11366b43c Mon Sep 17 00:00:00 2001
+From c17cf464a5d168c530dacaa64d888226fbf9f8e2 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sat, 26 Apr 2025 17:32:49 +1000
-Subject: [PATCH] odbc32: SQLDescribeColW add ascii fallback
+Subject: [PATCH] odbc32: SQLDescribeColW add ANSI fallback
 
 ---
  dlls/odbc32/proxyodbc.c | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index b792fcbe603..c81ab1f39d3 100644
+index 25a76c8d111..0014bb0439f 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -5975,11 +5975,21 @@ static SQLRETURN describe_col_win32_w( struct statement *stmt, SQLUSMALLINT col_
+@@ -5980,11 +5980,21 @@ static SQLRETURN describe_col_win32_w( struct statement *stmt, SQLUSMALLINT col_
                                         SQLSMALLINT buf_len, SQLSMALLINT *name_len, SQLSMALLINT *data_type,
                                         SQLULEN *col_size, SQLSMALLINT *decimal_digits, SQLSMALLINT *nullable )
  {

patches/odbc32-fixes/0013-odbc32-SQLGetStmtAttrW-add-ANSI-fallback.patch

@@ -1,17 +1,17 @@
-From a559a392ee8ff765c9784e9fe5f05c899e38c76e Mon Sep 17 00:00:00 2001
+From ae7d0e7650782a8a577ef9130b8cb84061db7f51 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sat, 26 Apr 2025 17:35:38 +1000
-Subject: [PATCH] odbc32: SQLGetStmtAttrW add ascii fallback
+Subject: [PATCH] odbc32: SQLGetStmtAttrW add ANSI fallback
 
 ---
  dlls/odbc32/proxyodbc.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index c81ab1f39d3..1036e6cfa96 100644
+index 0014bb0439f..ca5cd3214cd 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -6709,7 +6709,8 @@ static SQLRETURN get_stmt_attr_win32_w( struct statement *stmt, SQLINTEGER attr,
+@@ -6714,7 +6714,8 @@ static SQLRETURN get_stmt_attr_win32_w( struct statement *stmt, SQLINTEGER attr,
  {
      if (stmt->hdr.win32_funcs->SQLGetStmtAttrW)
          return stmt->hdr.win32_funcs->SQLGetStmtAttrW( stmt->hdr.win32_handle, attr, value, buflen, retlen );

patches/odbc32-fixes/0014-odbc32-SQLSetStmtAttrW-add-ANSI-fallback.patch

@@ -1,17 +1,17 @@
-From cbf28db0610f67e37193b8c7d773614a3f0674db Mon Sep 17 00:00:00 2001
+From 99f47c28203a9f80e3575fa15c424f1dee320cab Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sat, 26 Apr 2025 17:51:54 +1000
-Subject: [PATCH] odbc32: SQLSetStmtAttrW add ascii fallback
+Subject: [PATCH] odbc32: SQLSetStmtAttrW add ANSI fallback
 
 ---
  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 e8ce1fa944c..d72c6ff4b01 100644
+index ca5cd3214cd..d8ec78d5ca7 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -8032,7 +8032,13 @@ static SQLRETURN set_stmt_attr_win32_w( struct statement *stmt, SQLINTEGER attr,
+@@ -8078,7 +8078,13 @@ static SQLRETURN set_stmt_attr_win32_w( struct statement *stmt, SQLINTEGER attr,
  {
      if (stmt->hdr.win32_funcs->SQLSetStmtAttrW)
          return stmt->hdr.win32_funcs->SQLSetStmtAttrW( stmt->hdr.win32_handle, attr, value, len );

patches/odbc32-fixes/0015-odbc32-Various-ANSI-fallback.patch

@@ -1,18 +1,18 @@
-From 74f21e527480e68e05913e5fa09fb5fa9d042e04 Mon Sep 17 00:00:00 2001
+From fc10681276f35a614958e2aae518676b30ba4d63 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sat, 26 Apr 2025 19:18:17 +1000
-Subject: [PATCH] odbc32: Various ascii fallback
+Subject: [PATCH] odbc32: Various ANSI fallback
 
 Needs spliting.
 ---
- dlls/odbc32/proxyodbc.c | 40 +++++++++++++++++++++++++++++++++++-----
- 1 file changed, 35 insertions(+), 5 deletions(-)
+ dlls/odbc32/proxyodbc.c | 31 +++++++++++++++++++++++++++----
+ 1 file changed, 27 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 81f5cb9a799..e965a86bf15 100644
+index d8ec78d5ca7..8a5d91fb2a9 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -6411,7 +6411,13 @@ static SQLRETURN get_connect_attr_win32_w( struct connection *con, SQLINTEGER at
+@@ -6416,7 +6416,13 @@ static SQLRETURN get_connect_attr_win32_w( struct connection *con, SQLINTEGER at
  {
      if (con->hdr.win32_funcs->SQLGetConnectAttrW)
          return con->hdr.win32_funcs->SQLGetConnectAttrW( con->hdr.win32_handle, attr, value, buflen, retlen );
@@ -27,7 +27,7 @@ index 81f5cb9a799..e965a86bf15 100644
      return SQL_ERROR;
  }
  
-@@ -6577,7 +6583,12 @@ static SQLRETURN get_diag_field_win32_w( SQLSMALLINT type, struct object *obj, S
+@@ -6582,7 +6588,12 @@ static SQLRETURN get_diag_field_win32_w( SQLSMALLINT type, struct object *obj, S
      if (obj->win32_funcs->SQLGetDiagFieldW)
          return obj->win32_funcs->SQLGetDiagFieldW( type, obj->win32_handle, rec_num, diag_id, diag_info, buflen,
                                                     retlen );
@@ -41,7 +41,7 @@ index 81f5cb9a799..e965a86bf15 100644
      return SQL_ERROR;
  }
  
-@@ -6780,7 +6791,13 @@ static SQLRETURN set_connect_attr_win32_w( struct connection *con, SQLINTEGER at
+@@ -6785,7 +6796,13 @@ static SQLRETURN set_connect_attr_win32_w( struct connection *con, SQLINTEGER at
  {
      if (con->hdr.win32_funcs->SQLSetConnectAttrW)
          return con->hdr.win32_funcs->SQLSetConnectAttrW( con->hdr.win32_handle, attr, value, len );
@@ -56,7 +56,7 @@ index 81f5cb9a799..e965a86bf15 100644
      else if(con->hdr.win32_funcs->SQLSetConnectOptionW)
      {
          /* ODBC v2 */
-@@ -7978,7 +8002,13 @@ static SQLRETURN set_desc_field_win32_w( struct descriptor *desc, SQLSMALLINT re
+@@ -8024,7 +8041,13 @@ static SQLRETURN set_desc_field_win32_w( struct descriptor *desc, SQLSMALLINT re
  {
      if (desc->hdr.win32_funcs->SQLSetDescFieldW)
          return desc->hdr.win32_funcs->SQLSetDescFieldW( desc->hdr.win32_handle, record, id, value, len );

patches/odbc32-fixes/0016-odbc32-SQLColAttributesW-support-ANSI-fallback.patch

@@ -1,14 +1,14 @@
-From 085539732d3dcd3aadfda4fc022de8f33be1e509 Mon Sep 17 00:00:00 2001
+From 43cae804e03b3554f1e5058264c6f16a1eaebf8b Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 28 Apr 2025 10:54:55 +1000
-Subject: [PATCH] odbc32: SQLColAttributesW support ascii fallback
+Subject: [PATCH] odbc32: SQLColAttributesW support ANSI fallback
 
 ---
  dlls/odbc32/proxyodbc.c | 42 ++++++++++++++++++++++++++++++++++++++---
  1 file changed, 39 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 31083792f8f..b490da9012f 100644
+index 8a5d91fb2a9..cc8a718a754 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
 @@ -4636,6 +4636,10 @@ static SQLRETURN col_attributes_unix_a( struct statement *stmt, SQLUSMALLINT col
@@ -22,7 +22,7 @@ index 31083792f8f..b490da9012f 100644
  static SQLRETURN col_attributes_win32_a( struct statement *stmt, SQLUSMALLINT col, SQLUSMALLINT field_id,
                                           SQLPOINTER char_attrs, SQLSMALLINT buflen, SQLSMALLINT *retlen,
                                           SQLLEN *num_attrs )
-@@ -5839,11 +5843,17 @@ static SQLRETURN col_attributes_win32_w( struct statement *stmt, SQLUSMALLINT co
+@@ -5844,11 +5848,17 @@ static SQLRETURN col_attributes_win32_w( struct statement *stmt, SQLUSMALLINT co
                                           SQLPOINTER char_attrs, SQLSMALLINT buflen, SQLSMALLINT *retlen,
                                           SQLLEN *num_attrs )
  {
@@ -41,7 +41,7 @@ index 31083792f8f..b490da9012f 100644
  }
  
  /*************************************************************************
-@@ -6295,8 +6305,34 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
+@@ -6300,8 +6310,34 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
  
      if (stmt->hdr.win32_funcs->SQLColAttribute)
      {

patches/odbc32-fixes/0017-odbc32-SQLColAttributeW-Add-ANSI-fallback.patch

@@ -1,17 +1,17 @@
-From 9b10e9df425671cbf0811f436ccfd83e048b5cc9 Mon Sep 17 00:00:00 2001
+From 644fc34023107225a278abc7a41249c98ab1126b Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 29 Apr 2025 13:08:38 +1000
-Subject: [PATCH] odbc32: SQLColAttributeW - Add ascii fallback
+Subject: [PATCH] odbc32: SQLColAttributeW - Add ANSI fallback
 
 ---
  dlls/odbc32/proxyodbc.c | 39 +++++++++++++++++++++++++++++++++++++--
  1 file changed, 37 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index b490da9012f..b17f8a46e0e 100644
+index cc8a718a754..be4908e258a 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -6335,7 +6335,7 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
+@@ -6340,7 +6340,7 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
          return ret;
      }
  
@@ -20,7 +20,7 @@ index b490da9012f..b17f8a46e0e 100644
      {
          if (buflen < 0) return SQL_ERROR;
          if (!col)
-@@ -6383,8 +6383,43 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
+@@ -6388,8 +6388,43 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
              FIXME( "field id %u not handled\n", field_id );
          }
  

patches/odbc32-fixes/0018-odbc32-SQLGetDiagRecW-add-ANSI-fallback.patch

@@ -1,17 +1,17 @@
-From 2b03235b360575563a2ffee961c9447699edce0d Mon Sep 17 00:00:00 2001
+From 1d2d97060b72cc99498fa440ae603f7db8ea74da Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 1 May 2025 07:32:58 +1000
-Subject: [PATCH] SQLGetDiagRecW: Add ascii fallback
+Subject: [PATCH] odbc32: SQLGetDiagRecW add ANSI fallback.
 
 ---
  dlls/odbc32/proxyodbc.c | 25 +++++++++++++++++++++++--
  1 file changed, 23 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index b607c361416..377124653c1 100644
+index be4908e258a..393eefc9791 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -6716,8 +6716,9 @@ static SQLRETURN get_diag_rec_win32_w( SQLSMALLINT type, struct object *obj, SQL
+@@ -6720,8 +6720,9 @@ static SQLRETURN get_diag_rec_win32_w( SQLSMALLINT type, struct object *obj, SQL
          return SQL_ERROR;
      }
  
@@ -22,7 +22,7 @@ index b607c361416..377124653c1 100644
          SQLHENV env = NULL;
          SQLHDBC con = NULL;
          SQLHSTMT stmt = NULL;
-@@ -6742,7 +6743,27 @@ static SQLRETURN get_diag_rec_win32_w( SQLSMALLINT type, struct object *obj, SQL
+@@ -6746,7 +6747,27 @@ static SQLRETURN get_diag_rec_win32_w( SQLSMALLINT type, struct object *obj, SQL
              return SQL_ERROR;
          }
  

patches/odbc32-fixes/0019-odbc32-SQLNativeSqlW-add-ANSI-fallback.patch

@@ -1,17 +1,17 @@
-From 7f895746aa93f74933dab0f2e115c4feb2d57556 Mon Sep 17 00:00:00 2001
+From 98f3cf627bba58f36113edb678c72afe86c2ea85 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 1 May 2025 08:05:31 +1000
-Subject: [PATCH] odbc32: SQLNativeSqlW add ascii fallback
+Subject: [PATCH] odbc32: SQLNativeSqlW add ANSI fallback
 
 ---
  dlls/odbc32/proxyodbc.c | 26 ++++++++++++++++++++++++--
  1 file changed, 24 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index ca2f94cb250..799ea5accf2 100644
+index 393eefc9791..9d4126112c3 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -7819,11 +7819,33 @@ static SQLRETURN native_sql_unix_w( struct connection *con, SQLWCHAR *in_stateme
+@@ -7824,11 +7824,33 @@ static SQLRETURN native_sql_unix_w( struct connection *con, SQLWCHAR *in_stateme
  static SQLRETURN native_sql_win32_w( struct connection *con, SQLWCHAR *in_statement, SQLINTEGER len,
                                       SQLWCHAR *out_statement, SQLINTEGER buflen, SQLINTEGER *retlen )
  {

patches/odbc32-fixes/0020-odbc32-SQLPrepareW-add-ANSI-fallback.patch

@@ -1,17 +1,17 @@
-From fbc17da7bbb48155d2fe1225f159a2b50b7aaf65 Mon Sep 17 00:00:00 2001
+From 55c6d603a469ec3d03b82f4b4237be769f8acae6 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 1 May 2025 08:10:04 +1000
-Subject: [PATCH] odbc32: SQLPrepareW add ascii fallback
+Subject: [PATCH] odbc32: SQLPrepareW add ANSI fallback
 
 ---
  dlls/odbc32/proxyodbc.c | 11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 799ea5accf2..0fed17640c1 100644
+index 9d4126112c3..76c104e3a4a 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -6199,10 +6199,17 @@ static SQLRETURN prepare_unix_w( struct statement *stmt, SQLWCHAR *statement, SQ
+@@ -6204,10 +6204,17 @@ static SQLRETURN prepare_unix_w( struct statement *stmt, SQLWCHAR *statement, SQ
  
  static SQLRETURN prepare_win32_w( struct statement *stmt, SQLWCHAR *statement, SQLINTEGER len )
  {