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 75f8de6bd41c945abe230e8fd1d8645f30b7667f.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2024-08-15 08:35:27 +10:00
parent 51d8ac0717
commit 7104b9b6ba
5 changed files with 18 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
patches/odbc32-fixes/0018-odbc32-Pass-statment-when-creating-a-descriptor.patch
View File

@@ -1,25 +0,0 @@
From daff4a3d283837c83f33bcc0141af4078e6251ac Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 14 Aug 2024 07:52:10 +1000
Subject: [PATCH] odbc32: Pass statment when creating a descriptor
---
dlls/odbc32/proxyodbc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index c12910161ab..2e55e1ee06e 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -547,7 +547,7 @@ static SQLRETURN alloc_descriptors( struct statement *stmt )
unsigned int i;
for (i = 0; i < ARRAY_SIZE(stmt->desc); i++)
{
- if (!(stmt->desc[i] = create_descriptor( NULL )))
+ if (!(stmt->desc[i] = create_descriptor( stmt )))
{
free_descriptors( stmt );
return SQL_ERROR;
--
2.43.0

29
patches/odbc32-fixes/0019-odbc32-Propgate-win32_funcs-to-all-children.patch
View File

@@ -1,29 +0,0 @@
From 9b5c4a85620c6f86a368d420221199da2f794c63 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 14 Aug 2024 07:51:18 +1000
Subject: [PATCH] odbc32: Propgate win32_funcs to all children
---
dlls/odbc32/proxyodbc.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 932560015b8..c12910161ab 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -397,7 +397,11 @@ static void init_object( struct object *obj, UINT32 type, struct object *parent
obj->parent = parent;
list_init( &obj->entry );
list_init( &obj->children );
- if (parent) list_add_tail( &parent->children, &obj->entry );
+ if (parent)
+ {
+ list_add_tail( &parent->children, &obj->entry );
+ obj->win32_funcs = parent->win32_funcs;
+ }
InitializeCriticalSectionEx( &obj->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO );
obj->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": object.cs");
}
--
2.43.0