Release v10.7

Convert of type needs to occur not matter if fallback is being used.

patches/krnl386.exe16-GDT_LDT_Emulation/0001-krnl386.exe16-Emulate-GDT-and-LDT-access.patch

@@ -1,27 +1,28 @@
-From 1de2ab4f1d48391f112897c2c89d4c1d77d4ac3f Mon Sep 17 00:00:00 2001
+From 05dfee93e261b38037c370611ab0f63a2785a08c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 27 Feb 2016 00:04:10 +0100
-Subject: krnl386.exe16: Emulate GDT and LDT access.
+Subject: [PATCH] krnl386.exe16: Emulate GDT and LDT access.
 
 ---
- dlls/krnl386.exe16/instr.c | 64 +++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 55 insertions(+), 9 deletions(-)
+ dlls/krnl386.exe16/instr.c | 65 ++++++++++++++++++++++++++++++++------
+ 1 file changed, 56 insertions(+), 9 deletions(-)
 
 diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c
-index b0de30f..865d944 100644
+index 666ef71363f..c6d05b7a0c9 100644
 --- a/dlls/krnl386.exe16/instr.c
 +++ b/dlls/krnl386.exe16/instr.c
-@@ -67,7 +67,7 @@ static inline void *get_stack( CONTEXT *context )
+@@ -60,7 +60,8 @@ static inline void *get_stack( CONTEXT *context )
  }
  
- #include "pshpack1.h"
+ #pragma pack(push,1)
 -struct idtr
++
 +struct dtr
  {
      WORD  limit;
      BYTE *base;
-@@ -75,19 +75,41 @@ struct idtr
- #include "poppack.h"
+@@ -68,19 +69,41 @@ struct idtr
+ #pragma pack(pop)
  
  static LDT_ENTRY idt[256];
 +static LDT_ENTRY gdt[8192];
@@ -35,6 +36,18 @@ index b0de30f..865d944 100644
 +    struct dtr ret;
      __asm__( "sidtl %0" : "=m" (ret) );
 +    *offset = data - ret.base;
++    return (*offset <= ret.limit + 1 - data_size);
++#else
++    return FALSE;
++#endif
++}
++
++static BOOL emulate_gdtr( BYTE *data, unsigned int data_size, unsigned int *offset )
++{
++#if defined(__i386__) && defined(__GNUC__)
++    struct dtr ret;
++    __asm__( "sgdtl %0" : "=m" (ret) );
++    *offset = data - ret.base;
 +    return (*offset <= ret.limit + 1 - data_size);
  #else
 -    ret.base = (BYTE *)idt;
@@ -44,18 +57,6 @@ index b0de30f..865d944 100644
 -    return ret;
  }
  
-+static BOOL emulate_gdtr( BYTE *data, unsigned int data_size, unsigned int *offset )
-+{
-+#if defined(__i386__) && defined(__GNUC__)
-+    struct dtr ret;
-+    __asm__( "sgdtl %0" : "=m" (ret) );
-+    *offset = data - ret.base;
-+    return (*offset <= ret.limit + 1 - data_size);
-+#else
-+    return FALSE;
-+#endif
-+}
-+
 +static inline WORD get_ldt(void)
 +{
 +    WORD seg = 1;
@@ -67,7 +68,7 @@ index b0de30f..865d944 100644
  
  /***********************************************************************
   *           INSTR_ReplaceSelector
-@@ -711,10 +733,9 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
+@@ -705,10 +728,9 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
                  BYTE *data = INSTR_GetOperandAddr(context, instr + 1, long_addr,
                                                    segprefix, &len);
                  unsigned int data_size = (*instr == 0x8b) ? (long_op ? 4 : 2) : 1;
@@ -80,7 +81,7 @@ index b0de30f..865d944 100644
                  {
                      idt[1].LimitLow = 0x100; /* FIXME */
                      idt[2].LimitLow = 0x11E; /* FIXME */
-@@ -728,6 +749,31 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
+@@ -722,6 +744,31 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
                      context->Eip += prefixlen + len + 1;
                      return ExceptionContinueExecution;
                  }
@@ -113,5 +114,5 @@ index b0de30f..865d944 100644
              break;  /* Unable to emulate it */
  
 -- 
-2.7.1
+2.47.2
 

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

@@ -1,21 +1,23 @@
-From 1b2068b8f8adc036d0c2b9cda00c37cd55330b41 Mon Sep 17 00:00:00 2001
+From 6159b0b10211094af4f0d5b8e6bff5c589664025 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
 
 ---
- dlls/odbc32/proxyodbc.c | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
+ dlls/odbc32/proxyodbc.c | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
 
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
-index 8f53fa71668..7099027c2b4 100644
+index d11b4122776..3eb53288c65 100644
 --- a/dlls/odbc32/proxyodbc.c
 +++ b/dlls/odbc32/proxyodbc.c
-@@ -5242,6 +5242,29 @@ static SQLRETURN bind_parameter_win32( struct statement *stmt, SQLUSMALLINT para
-     if (stmt->hdr.win32_funcs->SQLBindParameter)
-         return stmt->hdr.win32_funcs->SQLBindParameter( stmt->hdr.win32_handle, param, io_type, value_type,
-                                                         param_type, size, digits, value, buflen, len );
-+    else if(stmt->hdr.win32_funcs->SQLBindParam)
+@@ -5522,9 +5522,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 )
+ {
++    struct environment *env = (struct environment *)find_object_type(SQL_HANDLE_ENV, stmt->hdr.parent);
++
++    if (env && env->attr_version == SQL_OV_ODBC3 && env->driver_ver == SQL_OV_ODBC2)
 +    {
 +        /* ODBC v2 */
 +        /* TODO: Make function */
@@ -32,8 +34,14 @@ index 8f53fa71668..7099027c2b4 100644
 +        else if (param_type == SQL_DATE)
 +            param_type = SQL_TYPE_DATE;
 +        else if (param_type == SQL_TIMESTAMP)
-+            param_type = SQL_TYPE_TIMESTAMP;;;
++            param_type = SQL_TYPE_TIMESTAMP;
++    }
 +
+     if (stmt->hdr.win32_funcs->SQLBindParameter)
+         return stmt->hdr.win32_funcs->SQLBindParameter( stmt->hdr.win32_handle, param, io_type, value_type,
+                                                         param_type, size, digits, value, buflen, len );
++    else if(stmt->hdr.win32_funcs->SQLBindParam)
++    {
 +        return stmt->hdr.win32_funcs->SQLBindParam( stmt->hdr.win32_handle, param, value_type, param_type,
 +                                                 size, digits, value, len);
 +    }
@@ -42,5 +50,5 @@ index 8f53fa71668..7099027c2b4 100644
  }
  
 -- 
-2.43.0
+2.47.2
 

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

@@ -0,0 +1,64 @@
+From 518a165d51be822ae34c89146cd6a0d75e41852b 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
+ required.
+
+---
+ dlls/odbc32/proxyodbc.c | 37 +++++++++++++++++++++++++++++++++++--
+ 1 file changed, 35 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
+index cf9d72e8452..e26fdcb8620 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,
+                                          SQLSMALLINT len, SQLWCHAR *out_conn_str, SQLSMALLINT buflen, SQLSMALLINT *len2,
+                                          SQLUSMALLINT completion )
+ {
++    SQLRETURN ret = SQL_ERROR;
++
+     if (con->hdr.win32_funcs->SQLDriverConnectW)
+         return con->hdr.win32_funcs->SQLDriverConnectW( con->hdr.win32_handle, window, in_conn_str, len, out_conn_str,
+                                                         buflen, len2, completion );
+-    if (con->hdr.win32_funcs->SQLDriverConnect) FIXME( "Unicode to ANSI conversion not handled\n" );
+-    return SQL_ERROR;
++    if (con->hdr.win32_funcs->SQLDriverConnect)
++    {
++        SQLCHAR *in = NULL, *out = NULL;
++        SQLSMALLINT in_len = 0, out_len = 0;
++
++        in_len = WideCharToMultiByte(CP_ACP, 0, in_conn_str, len, NULL, 0, NULL, NULL);
++        if (!(in = malloc(in_len + 1))) return SQL_ERROR;
++
++        WideCharToMultiByte(CP_ACP, 0, in_conn_str, len, (char *)in, in_len, NULL, NULL);
++        in[in_len] = 0;
++
++        if (out_conn_str && buflen > 0)
++        {
++            if (!(out = malloc(buflen)))
++            {
++                free(in);
++                return SQL_ERROR;
++            }
++        }
++
++        ret = con->hdr.win32_funcs->SQLDriverConnect( con->hdr.win32_handle, window, in, in_len, out, buflen, &out_len, completion );
++
++        if (SQL_SUCCEEDED(ret) && out_conn_str && out)
++        {
++            MultiByteToWideChar(CP_ACP, 0, (char *)out, out_len, out_conn_str, buflen);
++            if (len2) *len2 = out_len;
++        }
++
++        free(in);
++        free(out);
++    }
++
++    return ret;
+ }
+ 
+ static SQLRETURN driver_connect_unix_w( struct connection *con, SQLHWND window, SQLWCHAR *in_conn_str, SQLSMALLINT len,
+-- 
+2.47.2
+

patches/odbc32-fixes/0020-odbc32-SQLGetInfoW-support-ascii-fallback.patch

@@ -0,0 +1,100 @@
+From 53904cea4cd192552ab26c247593c91ca0b81993 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.
+
+---
+ 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
+--- 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
+     return ODBC_CALL( SQLGetInfoW, &params );
+ }
+ 
++static BOOL typeinfo_is_string( SQLSMALLINT type )
++{
++    switch (type)
++    {
++    case SQL_ACCESSIBLE_PROCEDURES:
++    case SQL_ACCESSIBLE_TABLES:
++    case SQL_CATALOG_NAME:
++    case SQL_CATALOG_NAME_SEPARATOR:
++    case SQL_CATALOG_TERM:
++    case SQL_COLLATION_SEQ:
++    case SQL_COLUMN_ALIAS:
++    case SQL_DATA_SOURCE_NAME:
++    case SQL_DATA_SOURCE_READ_ONLY:
++    case SQL_DATABASE_NAME:
++    case SQL_DBMS_NAME:
++    case SQL_DBMS_VER:
++    case SQL_DESCRIBE_PARAMETER:
++    case SQL_DRIVER_NAME:
++    case SQL_DRIVER_ODBC_VER:
++    case SQL_DRIVER_VER:
++    case SQL_ODBC_VER:
++    case SQL_EXPRESSIONS_IN_ORDERBY:
++    case SQL_IDENTIFIER_QUOTE_CHAR:
++    case SQL_INTEGRITY:
++    case SQL_KEYWORDS:
++    case SQL_LIKE_ESCAPE_CLAUSE:
++    case SQL_MAX_ROW_SIZE_INCLUDES_LONG:
++    case SQL_MULT_RESULT_SETS:
++    case SQL_MULTIPLE_ACTIVE_TXN:
++    case SQL_NEED_LONG_DATA_LEN:
++    case SQL_ORDER_BY_COLUMNS_IN_SELECT:
++    case SQL_PROCEDURE_TERM:
++    case SQL_PROCEDURES:
++    case SQL_ROW_UPDATES:
++    case SQL_SCHEMA_TERM:
++    case SQL_SEARCH_PATTERN_ESCAPE:
++    case SQL_SERVER_NAME:
++    case SQL_SPECIAL_CHARACTERS:
++    case SQL_TABLE_TERM:
++    case SQL_USER_NAME:
++    case SQL_XOPEN_CLI_YEAR:
++    case SQL_OUTER_JOINS:
++        return TRUE;
++    default:
++        return FALSE;
++    }
++}
++
+ static SQLRETURN get_info_win32_w( struct connection *con, SQLUSMALLINT type, SQLPOINTER value, SQLSMALLINT buflen,
+                                    SQLSMALLINT *retlen )
+ {
++    SQLRETURN ret = SQL_ERROR;
++
+     if (con->hdr.win32_funcs->SQLGetInfoW)
+         return con->hdr.win32_funcs->SQLGetInfoW( con->hdr.win32_handle, type, value, buflen, retlen );
+-    if (con->hdr.win32_funcs->SQLGetInfo) FIXME( "Unicode to ANSI conversion not handled\n" );
+-    return SQL_ERROR;
++    if (con->hdr.win32_funcs->SQLGetInfo)
++    {
++        ret = con->hdr.win32_funcs->SQLGetInfo( con->hdr.win32_handle, type, value, buflen, retlen );
++        if (SQL_SUCCEEDED(ret) && typeinfo_is_string(type))
++        {
++            if (value)
++            {
++                WCHAR *p = strnAtoW(value, -1);
++                wcscpy(value, p);
++                free(p);
++
++                if (retlen)
++                    *retlen = wcslen(value) * sizeof(WCHAR);
++            }
++
++            if (retlen)
++                *retlen = *retlen * sizeof(WCHAR);
++        }
++    }
++    return ret;
+ }
+ 
+ /*************************************************************************
+-- 
+2.47.2
+

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

@@ -0,0 +1,57 @@
+From 6beecab75df0c60ccde26fe8571172166efd5d72 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
+
+---
+ 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 e8b05a7b9ec..b792fcbe603 100644
+--- a/dlls/odbc32/proxyodbc.c
++++ b/dlls/odbc32/proxyodbc.c
+@@ -1099,6 +1099,20 @@ static SQLWCHAR *strnAtoW( const SQLCHAR *str, int len )
+     return ret;
+ }
+ 
++static inline char *strdupWtoA(const WCHAR *str)
++{
++    char *ret = NULL;
++
++    if(str) {
++        DWORD size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL);
++        ret = malloc(size);
++        if(ret)
++            WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL);
++    }
++
++    return ret;
++}
++
+ 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
+ 
+ static SQLRETURN exec_direct_win32_w( struct statement *stmt, SQLWCHAR *text, SQLINTEGER len )
+ {
++    SQLRETURN ret = SQL_ERROR;
++
+     if (stmt->hdr.win32_funcs->SQLExecDirectW)
+         return stmt->hdr.win32_funcs->SQLExecDirectW( stmt->hdr.win32_handle, text, len );
+-    if (stmt->hdr.win32_funcs->SQLExecDirect) FIXME( "Unicode to ANSI conversion not handled\n" );
+-    return SQL_ERROR;
++    if (stmt->hdr.win32_funcs->SQLExecDirect)
++    {
++        SQLCHAR *textA = (SQLCHAR*)strdupWtoA( text );
++        ret = stmt->hdr.win32_funcs->SQLExecDirect( stmt->hdr.win32_handle, textA, len );
++        free(textA);
++    }
++    return ret;
+ }
+ 
+ /*************************************************************************
+-- 
+2.47.2
+

patches/odbc32-fixes/0022-odbc32-SQLDescribeColW-add-ascii-fallback.patch

@@ -0,0 +1,40 @@
+From ff127c9da0bcfe90fbf2c9d6bcbd63e11366b43c 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
+
+---
+ 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
+--- 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_
+                                        SQLSMALLINT buf_len, SQLSMALLINT *name_len, SQLSMALLINT *data_type,
+                                        SQLULEN *col_size, SQLSMALLINT *decimal_digits, SQLSMALLINT *nullable )
+ {
++    SQLRETURN ret = SQL_ERROR;
++
+     if (stmt->hdr.win32_funcs->SQLDescribeColW)
+         return stmt->hdr.win32_funcs->SQLDescribeColW( stmt->hdr.win32_handle, col_number, col_name, buf_len,
+                                                        name_len, data_type, col_size, decimal_digits, nullable );
+-    if (stmt->hdr.win32_funcs->SQLDescribeCol) FIXME( "Unicode to ANSI conversion not handled\n" );
+-    return SQL_ERROR;
++    if (stmt->hdr.win32_funcs->SQLDescribeCol)
++    {
++        SQLCHAR *name = (SQLCHAR*)strdupWtoA( (WCHAR*)col_name );
++
++        ret = stmt->hdr.win32_funcs->SQLDescribeCol( stmt->hdr.win32_handle, col_number, name, buf_len, name_len,
++                                                        data_type, col_size, decimal_digits, nullable);
++
++        free(name);
++    }
++    return ret;
+ }
+ 
+ /*************************************************************************
+-- 
+2.47.2
+

patches/odbc32-fixes/0023-odbc32-SQLGetStmtAttrW-add-ascii-fallback.patch

@@ -0,0 +1,26 @@
+From a559a392ee8ff765c9784e9fe5f05c899e38c76e 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
+
+---
+ 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
+--- 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,
+ {
+     if (stmt->hdr.win32_funcs->SQLGetStmtAttrW)
+         return stmt->hdr.win32_funcs->SQLGetStmtAttrW( stmt->hdr.win32_handle, attr, value, buflen, retlen );
+-    if (stmt->hdr.win32_funcs->SQLGetStmtAttr) FIXME( "Unicode to ANSI conversion not handled\n" );
++    if (stmt->hdr.win32_funcs->SQLGetStmtAttr)
++        return stmt->hdr.win32_funcs->SQLGetStmtAttr( stmt->hdr.win32_handle, attr, value, buflen, retlen );
+     return SQL_ERROR;
+ }
+ 
+-- 
+2.47.2
+

patches/odbc32-fixes/0024-odbc32-SQLSetStmtAttrW-add-ascii-fallback.patch

@@ -0,0 +1,31 @@
+From cbf28db0610f67e37193b8c7d773614a3f0674db 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
+
+---
+ 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
+--- 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,
+ {
+     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" );
++    if (stmt->hdr.win32_funcs->SQLSetStmtAttr)
++    {
++        SQLRETURN ret = stmt->hdr.win32_funcs->SQLSetStmtAttr( stmt->hdr.win32_handle, attr, value, len );
++        if (ret == SQL_ERROR)
++            FIXME( "Unicode to ANSI conversion not handled (%d)\n", attr );
++        return ret;
++    }
+     else if (stmt->hdr.win32_funcs->SQLSetStmtOption)
+     {
+         /* ODBC v2.0 */
+-- 
+2.47.2
+

patches/odbc32-fixes/0025-odbc32-Various-ascii-fallback.patch

@@ -0,0 +1,76 @@
+From 74f21e527480e68e05913e5fa09fb5fa9d042e04 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
+
+Needs spliting.
+---
+ dlls/odbc32/proxyodbc.c | 40 +++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 35 insertions(+), 5 deletions(-)
+
+diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
+index 81f5cb9a799..e965a86bf15 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
+ {
+     if (con->hdr.win32_funcs->SQLGetConnectAttrW)
+         return con->hdr.win32_funcs->SQLGetConnectAttrW( con->hdr.win32_handle, attr, value, buflen, retlen );
+-    if (con->hdr.win32_funcs->SQLGetConnectAttr) FIXME( "Unicode to ANSI conversion not handled\n" );
++    if (con->hdr.win32_funcs->SQLGetConnectAttr)
++    {
++        SQLRETURN ret = con->hdr.win32_funcs->SQLGetConnectAttr( con->hdr.win32_handle, attr, value, buflen, retlen );
++        if (ret == SQL_ERROR)
++            FIXME( "Unicode to ANSI conversion not handled\n" );
++        return ret;
++    }
+     return SQL_ERROR;
+ }
+ 
+@@ -6577,7 +6583,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 );
+-    if (obj->win32_funcs->SQLGetDiagField) FIXME( "Unicode to ANSI conversion not handled\n" );
++    if (obj->win32_funcs->SQLGetDiagField)
++    {
++        FIXME( "Unicode to ANSI conversion not handled\n" );
++        return obj->win32_funcs->SQLGetDiagField( type, obj->win32_handle, rec_num, diag_id, diag_info, buflen,
++                                                           retlen );
++    }
+     return SQL_ERROR;
+ }
+ 
+@@ -6780,7 +6791,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 );
+-    if (con->hdr.win32_funcs->SQLSetConnectAttr) FIXME( "Unicode to ANSI conversion not handled\n" );
++    if (con->hdr.win32_funcs->SQLSetConnectAttr)
++    {
++        SQLRETURN ret = con->hdr.win32_funcs->SQLSetConnectAttr( con->hdr.win32_handle, attr, value, len );
++        if (ret == SQL_ERROR)
++            FIXME( "Unicode to ANSI conversion not handled\n" );
++        return ret;
++    }
+     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
+ {
+     if (desc->hdr.win32_funcs->SQLSetDescFieldW)
+         return desc->hdr.win32_funcs->SQLSetDescFieldW( desc->hdr.win32_handle, record, id, value, len );
+-    if (desc->hdr.win32_funcs->SQLSetDescField) FIXME( "Unicode to ANSI conversion not handled\n" );
++    if (desc->hdr.win32_funcs->SQLSetDescField)
++    {
++        SQLRETURN ret = desc->hdr.win32_funcs->SQLSetDescField( desc->hdr.win32_handle, record, id, value, len );
++        if (ret == SQL_ERROR)
++            FIXME( "Unicode to ANSI conversion not handled (%d)\n", id );
++        return ret;
++    }
+     return SQL_ERROR;
+ }
+ 
+-- 
+2.47.2
+

patches/odbc32-fixes/0026-odbc32-SQLColAttributesW-support-ascii-fallback.patch

@@ -0,0 +1,83 @@
+From 085539732d3dcd3aadfda4fc022de8f33be1e509 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
+
+---
+ 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
+--- 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
+     return ret;
+ }
+ 
++static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col, SQLUSMALLINT field_id,
++                                        SQLPOINTER char_attr, SQLSMALLINT buflen, SQLSMALLINT *retlen,
++                                        SQLLEN *num_attr );
++
+ 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
+                                          SQLPOINTER char_attrs, SQLSMALLINT buflen, SQLSMALLINT *retlen,
+                                          SQLLEN *num_attrs )
+ {
++    SQLRETURN ret = SQL_ERROR;
++
+     if (stmt->hdr.win32_funcs->SQLColAttributesW)
+         return stmt->hdr.win32_funcs->SQLColAttributesW( stmt->hdr.win32_handle, col, field_id, char_attrs, buflen,
+                                                          retlen, num_attrs );
+     if (stmt->hdr.win32_funcs->SQLColAttributes) FIXME( "Unicode to ANSI conversion not handled\n" );
+-    return SQL_ERROR;
++    else
++    {
++       ret = col_attribute_win32_w( stmt, col, field_id, char_attrs, buflen, retlen, num_attrs );
++    }
++    return ret;
+ }
+ 
+ /*************************************************************************
+@@ -6295,8 +6305,34 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
+ 
+     if (stmt->hdr.win32_funcs->SQLColAttribute)
+     {
+-        FIXME( "Unicode to ANSI conversion not handled\n" );
+-        return SQL_ERROR;
++        SQLCHAR *strA = char_attr;
++
++        if (char_attr && buflen && SQLColAttributes_KnownStringAttribute(field_id))
++        {
++            strA = malloc( buflen );
++        }
++
++        ret = stmt->hdr.win32_funcs->SQLColAttribute( stmt->hdr.win32_handle, col, field_id, strA, buflen,
++                                                         retlen, num_attr );
++        if (ret == SQL_SUCCESS && SQLColAttributes_KnownStringAttribute(field_id))
++        {
++            if (strA)
++            {
++                WCHAR *p = strnAtoW(strA, -1);
++                wcscpy(char_attr, p);
++                free(p);
++
++                if (retlen)
++                    *retlen = wcslen( char_attr ) * sizeof(WCHAR);
++            }
++            else if (retlen)
++                *retlen = *retlen * sizeof(WCHAR);
++        }
++
++        if (strA != char_attr)
++            free(strA);
++
++        return ret;
+     }
+ 
+     if (stmt->hdr.win32_funcs->SQLColAttributesW)
+-- 
+2.47.2
+

patches/odbc32-fixes/0027-odbc32-SQLColAttributeW-Add-ascii-fallback.patch

@@ -0,0 +1,70 @@
+From 9b10e9df425671cbf0811f436ccfd83e048b5cc9 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
+
+---
+ 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
+--- 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
+         return ret;
+     }
+ 
+-    if (stmt->hdr.win32_funcs->SQLColAttributesW)
++    if (stmt->hdr.win32_funcs->SQLColAttributesW || stmt->hdr.win32_funcs->SQLColAttributes)
+     {
+         if (buflen < 0) return SQL_ERROR;
+         if (!col)
+@@ -6383,8 +6383,43 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
+             FIXME( "field id %u not handled\n", field_id );
+         }
+ 
+-        ret = stmt->hdr.win32_funcs->SQLColAttributesW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen,
++        if (stmt->hdr.win32_funcs->SQLColAttributes)
++        {
++            SQLCHAR *strA = char_attr;
++
++            if (char_attr && buflen && SQLColAttributes_KnownStringAttribute(field_id))
++            {
++                strA = malloc( buflen );
++            }
++
++            ret = stmt->hdr.win32_funcs->SQLColAttributes( stmt->hdr.win32_handle, col, field_id, strA, buflen,
++                    retlen, num_attr );
++
++            if (ret == SQL_SUCCESS && SQLColAttributes_KnownStringAttribute(field_id) )
++            {
++                if (strA)
++                {
++                    WCHAR *p = strnAtoW(strA, -1);
++                    wcscpy(char_attr, p);
++                    free(p);
++
++                    if (retlen)
++                        *retlen = wcslen( char_attr ) * sizeof(WCHAR);
++                }
++                else if (retlen)
++                    *retlen = *retlen * sizeof(WCHAR);
++            }
++
++            if (strA != char_attr)
++                free(strA);
++
++        }
++        else
++        {
++            ret = stmt->hdr.win32_funcs->SQLColAttributesW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen,
+                                                          retlen, num_attr );
++        }
++
+         /* Convert back for ODBC2 drivers */
+         env = (struct environment *)find_object_type(SQL_HANDLE_ENV, stmt->hdr.parent);
+         if (SQL_SUCCEEDED(ret) && num_attr && field_id == SQL_COLUMN_TYPE &&
+-- 
+2.47.2
+

patches/odbc32-fixes/0028-SQLGetDiagRecW-Add-ascii-fallback.patch

@@ -0,0 +1,56 @@
+From 2b03235b360575563a2ffee961c9447699edce0d 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
+
+---
+ 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
+--- 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
+         return SQL_ERROR;
+     }
+ 
+-    if (obj->win32_funcs->SQLErrorW)
++    if (obj->win32_funcs->SQLErrorW || obj->win32_funcs->SQLError)
+     {
++        SQLRETURN ret = SQL_ERROR;
+         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
+             return SQL_ERROR;
+         }
+ 
+-        return obj->win32_funcs->SQLErrorW( env, con, stmt, state, native_err, msg, buflen, retlen );
++        if (obj->win32_funcs->SQLErrorW)
++            ret = obj->win32_funcs->SQLErrorW( env, con, stmt, state, native_err, msg, buflen, retlen );
++        else if (obj->win32_funcs->SQLError)
++        {
++            SQLCHAR stateA[6], *msgA = NULL;
++            SQLSMALLINT lenA;
++
++            if (!(msgA = malloc( buflen ))) return SQL_ERROR;
++            ret = obj->win32_funcs->SQLError( env, con, stmt, stateA, native_err, msgA, buflen, &lenA );
++            if (SUCCESS( ret ))
++            {
++                WCHAR *p = strnAtoW(msgA, lenA);
++                wcscpy(msg, p);
++                free(p);
++
++                MultiByteToWideChar( CP_ACP, 0, (const char *)stateA, 6, state, 12 );
++            }
++            free( msgA );
++
++        }
++        return ret;
+     }
+ 
+     return SQL_ERROR;
+-- 
+2.47.2
+

patches/odbc32-fixes/0029-odbc32-SQLNativeSqlW-add-ascii-fallback.patch

@@ -0,0 +1,52 @@
+From 7f895746aa93f74933dab0f2e115c4feb2d57556 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
+
+---
+ 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
+--- 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
+ static SQLRETURN native_sql_win32_w( struct connection *con, SQLWCHAR *in_statement, SQLINTEGER len,
+                                      SQLWCHAR *out_statement, SQLINTEGER buflen, SQLINTEGER *retlen )
+ {
++    SQLRETURN ret = SQL_ERROR;
++
+     if (con->hdr.win32_funcs->SQLNativeSqlW)
+         return con->hdr.win32_funcs->SQLNativeSqlW( con->hdr.win32_handle, in_statement, len, out_statement, buflen,
+                                                     retlen );
+-    if (con->hdr.win32_funcs->SQLNativeSql) FIXME( "Unicode to ANSI conversion not handled\n" );
+-    return SQL_ERROR;
++    if (con->hdr.win32_funcs->SQLNativeSql)
++    {
++        SQLCHAR *statement = (SQLCHAR*)strdupWtoA( (WCHAR*)in_statement );
++        SQLCHAR *out = NULL;
++        if (buflen)
++            out = malloc( buflen );
++
++        ret = con->hdr.win32_funcs->SQLNativeSql( con->hdr.win32_handle, statement, len, out, buflen, retlen );
++        if(ret == SQL_SUCCESS)
++        {
++            if (out_statement)
++            {
++                MultiByteToWideChar( CP_ACP, 0, (const char *)out, len, out_statement, buflen );
++                out_statement[buflen] = 0;
++            }
++        }
++        if (retlen) *retlen *= sizeof(WCHAR);
++
++        free( statement );
++        free( out );
++    }
++    return ret;
+ }
+ 
+ /*************************************************************************
+-- 
+2.47.2
+

patches/odbc32-fixes/0030-odbc32-SQLPrepareW-add-ascii-fallback.patch

@@ -0,0 +1,36 @@
+From fbc17da7bbb48155d2fe1225f159a2b50b7aaf65 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
+
+---
+ 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
+--- 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
+ 
+ static SQLRETURN prepare_win32_w( struct statement *stmt, SQLWCHAR *statement, SQLINTEGER len )
+ {
++    SQLRETURN ret = SQL_ERROR;
++
+     if (stmt->hdr.win32_funcs->SQLPrepareW)
+         return stmt->hdr.win32_funcs->SQLPrepareW( stmt->hdr.win32_handle, statement, len );
+-    if (stmt->hdr.win32_funcs->SQLPrepare) FIXME( "Unicode to ANSI conversion not handled\n" );
+-    return SQL_ERROR;
++    if (stmt->hdr.win32_funcs->SQLPrepare)
++    {
++        SQLCHAR *statementA = (SQLCHAR*)strdupWtoA( statement );
++        ret = stmt->hdr.win32_funcs->SQLPrepare( stmt->hdr.win32_handle, statementA, len );
++        free(statementA);
++    }
++    return ret;
+ }
+ 
+ /*************************************************************************
+-- 
+2.47.2
+

patches/user32-ScrollWindowEx/0001-user32-Fix-return-value-of-ScrollWindowEx-for-invisi.patch

@@ -1,33 +0,0 @@
-From 76d256b461af14a89c54da1cf6c2002118372d1f Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Fri, 12 Dec 2014 05:06:31 +0100
-Subject: [PATCH] win32u: Fix return value of ScrollWindowEx for invisible
- windows.
-
----
- dlls/win32u/dce.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c
-index cfa3510c60b..2315a16d1b4 100644
---- a/dlls/win32u/dce.c
-+++ b/dlls/win32u/dce.c
-@@ -1631,10 +1631,13 @@ INT WINAPI NtUserScrollWindowEx( HWND hwnd, INT dx, INT dy, const RECT *rect,
-     rdw_flags = (flags & SW_ERASE) && (flags & SW_INVALIDATE) ?
-         RDW_INVALIDATE | RDW_ERASE  : RDW_INVALIDATE;
- 
--    if (!is_window_drawable( hwnd, TRUE )) return ERROR;
-     hwnd = get_full_window_handle( hwnd );
- 
--    get_client_rect( hwnd, &rc, get_thread_dpi() );
-+    if (!is_window_drawable( hwnd, TRUE ))
-+        SetRectEmpty( &rc );
-+    else
-+        get_client_rect( hwnd, &rc, get_thread_dpi() );
-+    
-     if (clip_rect) intersect_rect( &cliprc, &rc, clip_rect );
-     else cliprc = rc;
- 
--- 
-2.43.0
-

patches/user32-ScrollWindowEx/definition

@@ -1 +0,0 @@
-Fixes: [37706] Fix return value of ScrollWindowEx for invisible windows

patches/user32-rawinput-mouse/0002-winex11-Clear-the-MOUSEEVENTF_MOVE-flag-when-accumul.patch

@@ -1,18 +1,18 @@
-From 7a0030874b52ffdb0324b8f114190e909ee572cd Mon Sep 17 00:00:00 2001
+From 9ff19d91c8b7d679795f154ceb6b6cbcacaa71a4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Fri, 8 Mar 2024 11:08:53 +0100
-Subject: [PATCH 2/7] winex11: Clear the MOUSEEVENTF_MOVE flag when
- accumulating motion.
+Subject: [PATCH] winex11: Clear the MOUSEEVENTF_MOVE flag when accumulating
+ motion.
 
 ---
  dlls/winex11.drv/mouse.c | 23 +++++++++++------------
  1 file changed, 11 insertions(+), 12 deletions(-)
 
 diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
-index 7293480b635..45619d4970d 100644
+index 6107b1679be..21fb38b3186 100644
 --- a/dlls/winex11.drv/mouse.c
 +++ b/dlls/winex11.drv/mouse.c
-@@ -1703,19 +1703,17 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input )
+@@ -1699,19 +1699,17 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input )
          values++;
      }
  
@@ -20,7 +20,7 @@ index 7293480b635..45619d4970d 100644
 -    input->mi.dy = round( y->value );
 -
 -    TRACE( "event %f,%f value %f,%f input %d,%d\n", x_value, y_value, x->value, y->value,
--           (int)input->mi.dx, (int)input->mi.dy );
+-           input->mi.dx, input->mi.dy );
 -
 -    x->value -= input->mi.dx;
 -    y->value -= input->mi.dy;
@@ -36,13 +36,13 @@ index 7293480b635..45619d4970d 100644
 +    else
 +    {
 +        TRACE( "event %f,%f value %f,%f, input %d,%d\n", x_value, y_value, x->value, y->value,
-+               (int)input->mi.dx, (int)input->mi.dy );
++               input->mi.dx, input->mi.dy );
 +        x->value -= input->mi.dx;
 +        y->value -= input->mi.dy;
      }
  
      return TRUE;
-@@ -1743,6 +1741,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
+@@ -1739,6 +1737,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
      input.mi.dx          = 0;
      input.mi.dy          = 0;
      if (!map_raw_event_coords( event, &input )) return FALSE;
@@ -51,5 +51,5 @@ index 7293480b635..45619d4970d 100644
      NtUserSendHardwareInput( 0, 0, &input, 0 );
      return TRUE;
 -- 
-2.43.0
+2.47.2
 

patches/vkd3d-latest/0001-Updated-vkd3d-to-f576ecc9929dd98c900bb8bc0335b91a1a0.patch

@@ -1,4 +1,4 @@
-From 7e86c25d99b4ebaa196bb0cfe1053d9d9a4cc9f8 Mon Sep 17 00:00:00 2001
+From 11b1f07cfad213e1e17bc2ae609fa0d9c1628ddb Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 21 Feb 2025 09:15:01 +1100
 Subject: [PATCH] Updated vkd3d to f576ecc9929dd98c900bb8bc0335b91a1a0d3bff.

patches/vkd3d-latest/0002-Updated-vkd3d-to-cbce3a8631116ec10895e6c9c4a00b89b05.patch

@@ -1,4 +1,4 @@
-From 32c6084506f963100eb55be8df149437b5e8d4f0 Mon Sep 17 00:00:00 2001
+From 77a6a8c574a94f8fb1a0bfbda96313e660b607c8 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 10 Apr 2025 07:44:42 +1000
 Subject: [PATCH] Updated vkd3d to cbce3a8631116ec10895e6c9c4a00b89b051f6b0.

patches/vkd3d-latest/0003-Updated-vkd3d-to-f02ea94c428f6b2f662f78fc78eae7f3342.patch

@@ -1,4 +1,4 @@
-From 8684d82a0d27ada846a357d0fec558fbb23334c2 Mon Sep 17 00:00:00 2001
+From b751f52ca93f8fd64aff26d17227e6fcbe4b3d40 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 15 Apr 2025 08:45:19 +1000
 Subject: [PATCH] Updated vkd3d to f02ea94c428f6b2f662f78fc78eae7f33428e9de.