wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against e3d2620bdf6f8e91a5ccf5904f256a55a5af137e.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2024-08-29 07:37:28 +10:00
parent f43640039b
commit 041773cac4
5 changed files with 1 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
patches/odbc32-fixes/0016-odbc32-SQLColAttribute-W-pass-through-field-id-SQL_M.patch
View File

@@ -1,33 +0,0 @@
From b2a461e789d8602012328811451a39ebd4bb849d Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 28 Aug 2024 05:10:00 +1000
Subject: [PATCH] odbc32: SQLColAttribute/W pass through field id
SQL_MAX_COLUMNS_IN_TABLE
---
dlls/odbc32/proxyodbc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 49e16b1df08..26f38d63b63 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -1003,6 +1003,7 @@ static SQLRETURN col_attribute_win32_a( struct statement *stmt, SQLUSMALLINT col
case SQL_COLUMN_TYPE:
case SQL_COLUMN_DISPLAY_SIZE:
+ case SQL_MAX_COLUMNS_IN_TABLE:
break;
default:
@@ -6188,6 +6189,7 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
case SQL_COLUMN_TYPE:
case SQL_COLUMN_DISPLAY_SIZE:
+ case SQL_MAX_COLUMNS_IN_TABLE:
break;
default:
--
2.45.2

96
patches/odbc32-fixes/0017-odbc32-SQLColAttribute-W-Correcly-convert-columns-ID.patch
View File

@@ -1,96 +0,0 @@
From a3e36e081e53a3e6b7275c27bc1e92ad555ad1b9 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 28 Aug 2024 05:25:23 +1000
Subject: [PATCH] odbc32: SQLColAttribute/W Correcly convert columns ID for
ODBC v2.0
The current conversion is converting ODBC 2 to 3 which is backwards.
---
dlls/odbc32/proxyodbc.c | 56 ++++++++++++++++++++++++++++++++---------
1 file changed, 44 insertions(+), 12 deletions(-)
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 26f38d63b63..b0a7bf498e6 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -989,16 +989,32 @@ static SQLRETURN col_attribute_win32_a( struct statement *stmt, SQLUSMALLINT col
switch (field_id)
{
- case SQL_COLUMN_COUNT:
- field_id = SQL_DESC_COUNT;
+ case SQL_DESC_COUNT:
+ field_id = SQL_COLUMN_COUNT;
break;
- case SQL_COLUMN_NAME:
- field_id = SQL_DESC_NAME;
+ case SQL_DESC_TYPE:
+ field_id = SQL_COLUMN_TYPE;
break;
- case SQL_COLUMN_NULLABLE:
- field_id = SQL_DESC_NULLABLE;
+ case SQL_DESC_LENGTH:
+ field_id = SQL_COLUMN_LENGTH;
+ break;
+
+ case SQL_DESC_PRECISION:
+ field_id = SQL_COLUMN_PRECISION;
+ break;
+
+ case SQL_DESC_SCALE:
+ field_id = SQL_COLUMN_SCALE;
+ break;
+
+ case SQL_DESC_NULLABLE:
+ field_id = SQL_COLUMN_NULLABLE;
+ break;
+
+ case SQL_DESC_NAME:
+ field_id = SQL_COLUMN_NAME;
break;
case SQL_COLUMN_TYPE:
@@ -6175,16 +6191,32 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
switch (field_id)
{
- case SQL_COLUMN_COUNT:
- field_id = SQL_DESC_COUNT;
+ case SQL_DESC_COUNT:
+ field_id = SQL_COLUMN_COUNT;
break;
- case SQL_COLUMN_NAME:
- field_id = SQL_DESC_NAME;
+ case SQL_DESC_TYPE:
+ field_id = SQL_COLUMN_TYPE;
break;
- case SQL_COLUMN_NULLABLE:
- field_id = SQL_DESC_NULLABLE;
+ case SQL_DESC_LENGTH:
+ field_id = SQL_COLUMN_LENGTH;
+ break;
+
+ case SQL_DESC_PRECISION:
+ field_id = SQL_COLUMN_PRECISION;
+ break;
+
+ case SQL_DESC_SCALE:
+ field_id = SQL_COLUMN_SCALE;
+ break;
+
+ case SQL_DESC_NULLABLE:
+ field_id = SQL_COLUMN_NULLABLE;
+ break;
+
+ case SQL_DESC_NAME:
+ field_id = SQL_COLUMN_NAME;
break;
case SQL_COLUMN_TYPE:
--
2.45.2