diff --git a/patches/odbc32-fixes/0010-odbc32-Store-handles-when-requesting-information-of-.patch b/patches/odbc32-fixes/0010-odbc32-Store-handles-when-requesting-information-of-.patch index 3589d789..494f6c49 100644 --- a/patches/odbc32-fixes/0010-odbc32-Store-handles-when-requesting-information-of-.patch +++ b/patches/odbc32-fixes/0010-odbc32-Store-handles-when-requesting-information-of-.patch @@ -1,8 +1,7 @@ -From e713bad9827c44a5a7db842845888b67667ae4e7 Mon Sep 17 00:00:00 2001 +From 2ea91088f723c630f2bc4ac2117adb175d535f1a Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 10 Jul 2024 15:17:00 +1000 -Subject: [PATCH 10/15] odbc32: Store handles when requesting information of - Columns. +Subject: [PATCH] odbc32: Store handles when requesting information of Columns. --- dlls/odbc32/proxyodbc.c | 34 +++++++++++++++++++++++++++++++++- @@ -10,14 +9,14 @@ Subject: [PATCH 10/15] odbc32: Store handles when requesting information of 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c -index e24557fbb11..3a9c2802d45 100644 +index 8233f77b418..53d0ba4f127 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c -@@ -4407,7 +4407,39 @@ SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute, +@@ -5298,7 +5298,39 @@ SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute, } else if (handle->win32_handle) { -- ret = handle->win32_funcs->SQLGetStmtAttrW( handle->win32_handle, Attribute, Value, BufferLength, StringLength ); +- ret = get_stmt_attr_win32_w( handle, Attribute, Value, BufferLength, StringLength ); + switch(Attribute) + { + case SQL_ATTR_APP_ROW_DESC: @@ -49,7 +48,7 @@ index e24557fbb11..3a9c2802d45 100644 + *((SQLHDESC*)Value) = &handle->imp_param_desc; + break; + default: -+ ret = handle->win32_funcs->SQLGetStmtAttrW( handle->win32_handle, Attribute, Value, BufferLength, StringLength ); ++ ret = get_stmt_attr_win32_w( handle, Attribute, Value, BufferLength, StringLength ); + } } diff --git a/staging/upstream-commit b/staging/upstream-commit index 2c50e776..a5595183 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -a891fcf66751921cf81db294b09a696c6b6999b8 +7df297968a932437c5ac50c67376f05265179cca