wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Updated odbc32-fixes patchset

Browse Source 
Update patch to match latest MR patch

Enable the patchset.
This commit is contained in:
Alistair Leslie-Hughes 2024-07-16 08:29:44 +10:00
parent 3c0f797ca6
commit 6bab3a7617
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
patches/odbc32-fixes/0004-odbc32-SQLError-W-handle-NULL-handles.patch
View File

@ -1,17 +1,17 @@
From fda9d9bf29a6d1a3091dc648be8702b8b2b5cd99 Mon Sep 17 00:00:00 2001
From d6472baea228710d76bfb62f0d1c342374aebf96 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 12 Jul 2024 14:23:01 +1000
Subject: [PATCH] odbc32: SQLError/W handle NULL handles
---
dlls/odbc32/proxyodbc.c | 32 ++++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)
dlls/odbc32/proxyodbc.c | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 3ccb331a6be..31a789b26a4 100644
index 045738b45f7..9a8b9c952c3 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -1191,8 +1191,19 @@ SQLRETURN WINAPI SQLError(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, S
@@ -1217,8 +1217,16 @@ SQLRETURN WINAPI SQLError(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, S
}
else if ((env && env->win32_handle) || (con && con->win32_handle) || (stmt && stmt->win32_handle))
{
@ -21,19 +21,16 @@ index 3ccb331a6be..31a789b26a4 100644
+
+ if (env) win32_funcs = env->win32_funcs;
+ else if (con) win32_funcs = con->win32_funcs;
+ else if (stmt) win32_funcs = con->win32_funcs;
+ else if (stmt) win32_funcs = stmt->win32_funcs;
+
+ if(win32_funcs)
+ ret = win32_funcs->SQLError( env ? env->win32_handle : NULL,
+ ret = win32_funcs->SQLError( env ? env->win32_handle : NULL,
+ con ? con->win32_handle : NULL,
+ stmt ? stmt->win32_handle : NULL,
+ SqlState, NativeError, MessageText, BufferLength, TextLength );
+ else
+ ERR("No function map found\n");
}
if (SUCCESS( ret ))
@@ -3633,10 +3644,19 @@ SQLRETURN WINAPI SQLErrorW(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle,
@@ -3781,10 +3789,16 @@ SQLRETURN WINAPI SQLErrorW(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle,
}
else if ((env && env->win32_handle) || (con && con->win32_handle) || (stmt && stmt->win32_handle))
{
@ -45,15 +42,12 @@ index 3ccb331a6be..31a789b26a4 100644
+
+ if (env) win32_funcs = env->win32_funcs;
+ else if (con) win32_funcs = con->win32_funcs;
+ else if (stmt) win32_funcs = con->win32_funcs;
+ else if (stmt) win32_funcs = stmt->win32_funcs;
+
+ if(win32_funcs)
+ ret = win32_funcs->SQLErrorW( env ? env->win32_handle : NULL,
+ ret = win32_funcs->SQLErrorW( env ? env->win32_handle : NULL,
+ con ? con->win32_handle : NULL,
+ stmt ? stmt->win32_handle : NULL,
+ SqlState, NativeError, MessageText, BufferLength, TextLength );
+ else
+ ERR("No function map found\n");
}
if (SUCCESS(ret ))