From 294e058f4b058d7a2355e57e9b48bead084f6f8e Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 27 Aug 2024 07:55:07 +1000 Subject: [PATCH] Updated odbc32-fixes patchset There is only a small subset of columns fields that need converting from 3 to 2. Let all the other pass and we can deal with fallout later. --- ...ss-through-the-field-id-to-SQLColAtt.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 patches/odbc32-fixes/0016-odbc32-Always-pass-through-the-field-id-to-SQLColAtt.patch diff --git a/patches/odbc32-fixes/0016-odbc32-Always-pass-through-the-field-id-to-SQLColAtt.patch b/patches/odbc32-fixes/0016-odbc32-Always-pass-through-the-field-id-to-SQLColAtt.patch new file mode 100644 index 00000000..43b3c9e1 --- /dev/null +++ b/patches/odbc32-fixes/0016-odbc32-Always-pass-through-the-field-id-to-SQLColAtt.patch @@ -0,0 +1,47 @@ +From c32d12a345ce533dd7e785c439cede340cfef17e Mon Sep 17 00:00:00 2001 +From: Alistair Leslie-Hughes +Date: Tue, 27 Aug 2024 07:25:34 +1000 +Subject: [PATCH] odbc32: Always pass through the field id to + SQLColAttributes/W + +--- + dlls/odbc32/proxyodbc.c | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c +index f6a5ea01e22..82859650993 100644 +--- a/dlls/odbc32/proxyodbc.c ++++ b/dlls/odbc32/proxyodbc.c +@@ -1004,13 +1004,8 @@ static SQLRETURN col_attribute_win32_a( struct statement *stmt, SQLUSMALLINT col + field_id = SQL_DESC_NULLABLE; + break; + +- case SQL_COLUMN_TYPE: +- case SQL_COLUMN_DISPLAY_SIZE: +- break; +- + default: +- FIXME( "field id %u not handled\n", field_id ); +- return SQL_ERROR; ++ /* Pass through field id. */ + } + + return stmt->hdr.win32_funcs->SQLColAttributes( stmt->hdr.win32_handle, col, field_id, char_attr, buflen, +@@ -6230,13 +6225,8 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col + field_id = SQL_DESC_NULLABLE; + break; + +- case SQL_COLUMN_TYPE: +- case SQL_COLUMN_DISPLAY_SIZE: +- break; +- + default: +- FIXME( "field id %u not handled\n", field_id ); +- return SQL_ERROR; ++ /* Pass through field id. */ + } + + ret = stmt->hdr.win32_funcs->SQLColAttributesW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen, +-- +2.45.2 +