July 2024 - Wine-commits - list.winehq.org

Hans Leidekker : odbc32: Stub SQLGetEnvAttr(SQL_ATTR_CONNECTION_POOLING).
by Alexandre Julliard 12 Jul '24

12 Jul '24

Module: wine Branch: master Commit: dc8f4729114eb2c548df5ca1083d673e3525bca7 URL: https://gitlab.winehq.org/wine/wine/-/commit/dc8f4729114eb2c548df5ca1083d67… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 10 11:47:16 2024 +0200 odbc32: Stub SQLGetEnvAttr(SQL_ATTR_CONNECTION_POOLING). --- dlls/odbc32/proxyodbc.c | 4 ++++ dlls/odbc32/tests/odbc32.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index c9db219c203..d1c1a7cfadd 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1738,6 +1738,10 @@ SQLRETURN WINAPI SQLGetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute, { switch (Attribute) { + case SQL_ATTR_CONNECTION_POOLING: + *(SQLINTEGER *)Value = SQL_CP_OFF; + break; + case SQL_ATTR_ODBC_VERSION: *(SQLINTEGER *)Value = handle->env_attr_version; break; diff --git a/dlls/odbc32/tests/odbc32.c b/dlls/odbc32/tests/odbc32.c index 0288260d3d3..01b8795e86e 100644 --- a/dlls/odbc32/tests/odbc32.c +++ b/dlls/odbc32/tests/odbc32.c @@ -82,7 +82,7 @@ static void test_SQLConnect( void ) SQLHENV env; SQLHDBC con; SQLRETURN ret; - SQLINTEGER size, version; + SQLINTEGER size, version, pooling; SQLUINTEGER timeout; SQLSMALLINT len; char str[32]; @@ -99,6 +99,11 @@ static void test_SQLConnect( void ) ok( size == -1, "size set\n" ); trace( "ODBC version %d\n", version ); + pooling = -1; + ret = SQLGetEnvAttr( env, SQL_ATTR_CONNECTION_POOLING, &pooling, sizeof(pooling), NULL ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + ok( !pooling, "got %d\n", pooling ); + ret = SQLAllocConnect( env, &con ); ok( ret == SQL_SUCCESS, "got %d\n", ret );

1 0

Hans Leidekker : odbc32: Handle options in SQLFreeStmt().
by Alexandre Julliard 12 Jul '24

12 Jul '24

Module: wine Branch: master Commit: 63718306e92e7415dcf483192ed35555ae059596 URL: https://gitlab.winehq.org/wine/wine/-/commit/63718306e92e7415dcf483192ed355… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 10 12:03:44 2024 +0200 odbc32: Handle options in SQLFreeStmt(). --- dlls/odbc32/proxyodbc.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index d1c1a7cfadd..5dc8e8649ce 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1377,17 +1377,23 @@ SQLRETURN WINAPI SQLFreeEnv(SQLHENV EnvironmentHandle) return ret; } -static void free_bindings( struct handle *handle ) +static void free_col_bindings( struct handle *handle ) { if (handle->bind_col.param) { free( handle->bind_col.param->len ); free( handle->bind_col.param ); + handle->bind_col.param = NULL; } +} + +static void free_param_bindings( struct handle *handle ) +{ if (handle->bind_parameter.param) { free( handle->bind_parameter.param->len ); free( handle->bind_parameter.param ); + handle->bind_parameter.param = NULL; } } @@ -1407,7 +1413,6 @@ SQLRETURN WINAPI SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle) { struct SQLFreeHandle_params params = { HandleType, handle->unix_handle }; ret = ODBC_CALL( SQLFreeHandle, &params ); - free_bindings( handle ); } else if (handle->win32_handle) { @@ -1416,6 +1421,8 @@ SQLRETURN WINAPI SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle) RegCloseKey( handle->drivers_key ); RegCloseKey( handle->sources_key ); + free_col_bindings( handle ); + free_param_bindings( handle ); free( handle ); TRACE("Returning %d\n", ret); @@ -1438,14 +1445,32 @@ SQLRETURN WINAPI SQLFreeStmt(SQLHSTMT StatementHandle, SQLUSMALLINT Option) { struct SQLFreeStmt_params params = { handle->unix_handle, Option }; ret = ODBC_CALL( SQLFreeStmt, &params ); - free_bindings( handle ); } else if (handle->win32_handle) { ret = handle->win32_funcs->SQLFreeStmt( handle->win32_handle, Option ); } - free( handle ); + switch (Option) + { + case SQL_CLOSE: + break; + + case SQL_UNBIND: + free_col_bindings( handle ); + break; + + case SQL_RESET_PARAMS: + free_param_bindings( handle ); + break; + + case SQL_DROP: + default: + free_col_bindings( handle ); + free_param_bindings( handle ); + free( handle ); + break; + } TRACE("Returning %d\n", ret); return ret;

1 0

Hans Leidekker : odbc32: Default to ODBC version 2.
by Alexandre Julliard 12 Jul '24

12 Jul '24

Module: wine Branch: master Commit: 54aea36777b952fed8f43f2ad1426aa235ada14f URL: https://gitlab.winehq.org/wine/wine/-/commit/54aea36777b952fed8f43f2ad1426a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 10 12:50:02 2024 +0200 odbc32: Default to ODBC version 2. --- dlls/odbc32/proxyodbc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 5dc8e8649ce..925abcfc063 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -385,6 +385,7 @@ static struct handle *create_handle( struct handle *parent ) struct handle *ret; if (!(ret = calloc( 1, sizeof(*ret) ))) return NULL; ret->parent = parent; + ret->env_attr_version = SQL_OV_ODBC2; ret->row_count = 1; return ret; }

1 0

Hans Leidekker : odbc32: Implement SQLGetInfo(SQL_ODBC_VER).
by Alexandre Julliard 12 Jul '24

12 Jul '24

Module: wine Branch: master Commit: ea2dfd1c14942ada174b3e425f90fd13721183d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ea2dfd1c14942ada174b3e425f90fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 10 14:02:23 2024 +0200 odbc32: Implement SQLGetInfo(SQL_ODBC_VER). --- dlls/odbc32/proxyodbc.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/odbc32/tests/odbc32.c | 22 ++++++++++++---------- 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 925abcfc063..c48e9c60917 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1823,6 +1823,25 @@ SQLRETURN WINAPI SQLGetInfo(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQL if (!handle) return SQL_INVALID_HANDLE; + switch (InfoType) + { + case SQL_ODBC_VER: + { + const char version[] = "03.80.0000"; + int len = sizeof(version); + char *value = InfoValue; + + if (StringLength) *StringLength = len; + if (value && BufferLength >= len) + { + strcpy( value, version ); + if (StringLength) *StringLength = len - 1; + } + return SQL_SUCCESS; + } + default: break; + } + if (handle->unix_handle) { struct SQLGetInfo_params params = { handle->unix_handle, InfoType, InfoValue, BufferLength, StringLength }; @@ -4122,6 +4141,25 @@ SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQ if (!handle) return SQL_INVALID_HANDLE; + switch (InfoType) + { + case SQL_ODBC_VER: + { + const WCHAR version[] = L"03.80.0000"; + int len = ARRAY_SIZE(version); + WCHAR *value = InfoValue; + + if (StringLength) *StringLength = len; + if (value && BufferLength >= len) + { + wcscpy( value, version ); + if (StringLength) *StringLength = len - 1; + } + return SQL_SUCCESS; + } + default: break; + } + if (handle->unix_handle) { struct SQLGetInfoW_params params = { handle->unix_handle, InfoType, InfoValue, BufferLength, StringLength }; diff --git a/dlls/odbc32/tests/odbc32.c b/dlls/odbc32/tests/odbc32.c index 01b8795e86e..8282e5a47ea 100644 --- a/dlls/odbc32/tests/odbc32.c +++ b/dlls/odbc32/tests/odbc32.c @@ -107,6 +107,18 @@ static void test_SQLConnect( void ) ret = SQLAllocConnect( env, &con ); ok( ret == SQL_SUCCESS, "got %d\n", ret ); + len = -1; + ret = SQLGetInfo( con, SQL_ODBC_VER, NULL, 0, &len ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + ok( len != -1, "len not set\n" ); + + memset( str, 0, sizeof(str) ); + ret = SQLGetInfo( con, SQL_ODBC_VER, str, sizeof(str), &len ); + ok( ret == SQL_SUCCESS, "got %d\n", ret ); + ok( str[0], "empty string\n" ); + ok( len == strlen(str), "got %d\n", len ); + trace( "version %s\n", str ); + ret = SQLConnect( con, (SQLCHAR *)"winetest", 8, (SQLCHAR *)"winetest", 8, (SQLCHAR *)"winetest", 8 ); if (ret == SQL_ERROR) diag( con, SQL_HANDLE_DBC ); if (ret != SQL_SUCCESS) @@ -124,16 +136,6 @@ static void test_SQLConnect( void ) ok( timeout != 0xdeadbeef, "timeout not set\n" ); ok( size == -1, "size set\n" ); - len = -1; - memset( str, 0, sizeof(str) ); - ret = SQLGetInfo( con, SQL_ODBC_VER, str, sizeof(str), &len ); - if (ret == SQL_SUCCESS) - { - ok( str[0], "empty string\n" ); - ok( len != -1, "len not set\n" ); - trace( "version %s\n", str ); - } - ret = SQLDisconnect( con ); ok( ret == SQL_SUCCESS, "got %d\n", ret );

1 0

Hans Leidekker : odbc32: Factor out helpers to create driver environment and connection handles.
by Alexandre Julliard 12 Jul '24

12 Jul '24

Module: wine Branch: master Commit: caa124252f23022b9273e7a0b30f342a513bb1f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/caa124252f23022b9273e7a0b30f34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 11 08:22:43 2024 +0200 odbc32: Factor out helpers to create driver environment and connection handles. --- dlls/odbc32/proxyodbc.c | 166 ++++++++++++++++++++---------------------------- 1 file changed, 68 insertions(+), 98 deletions(-)

1 0

Hans Leidekker : odbc32: Accept SQL_FETCH_NEXT in SQLDataSources/Drivers() if the key has not been opened.
by Alexandre Julliard 12 Jul '24

12 Jul '24

Module: wine Branch: master Commit: 2bd4c765eab7d9840815642d63ae94380b1d9dfb URL: https://gitlab.winehq.org/wine/wine/-/commit/2bd4c765eab7d9840815642d63ae94… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 11 15:57:17 2024 +0200 odbc32: Accept SQL_FETCH_NEXT in SQLDataSources/Drivers() if the key has not been opened. --- dlls/odbc32/proxyodbc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 094d690c714..d1e1beef723 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1000,7 +1000,7 @@ SQLRETURN WINAPI SQLDataSources(SQLHENV EnvironmentHandle, SQLUSMALLINT Directio if (!handle) return SQL_INVALID_HANDLE; - if (Direction == SQL_FETCH_FIRST) + if (Direction == SQL_FETCH_FIRST || (Direction == SQL_FETCH_NEXT && !handle->sources_key)) { handle->sources_idx = 0; handle->sources_system = FALSE; @@ -3185,7 +3185,7 @@ SQLRETURN WINAPI SQLDrivers(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, S if (!handle) return SQL_INVALID_HANDLE; - if (Direction == SQL_FETCH_FIRST) + if (Direction == SQL_FETCH_FIRST || (Direction == SQL_FETCH_NEXT && !handle->drivers_key)) { handle->drivers_idx = 0; RegCloseKey( handle->drivers_key ); @@ -4425,7 +4425,7 @@ SQLRETURN WINAPI SQLDataSourcesW(SQLHENV EnvironmentHandle, SQLUSMALLINT Directi if (!handle) return SQL_INVALID_HANDLE; - if (Direction == SQL_FETCH_FIRST) + if (Direction == SQL_FETCH_FIRST || (Direction == SQL_FETCH_NEXT && !handle->sources_key)) { handle->sources_idx = 0; handle->sources_system = FALSE; @@ -4699,7 +4699,7 @@ SQLRETURN WINAPI SQLDriversW(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, if (!handle) return SQL_INVALID_HANDLE; - if (Direction == SQL_FETCH_FIRST) + if (Direction == SQL_FETCH_FIRST || (Direction == SQL_FETCH_NEXT && !handle->drivers_key)) { handle->drivers_idx = 0; RegCloseKey( handle->drivers_key );

1 0

Hans Leidekker : odbc32: Set parent functions before creating the environment handle.
by Alexandre Julliard 12 Jul '24

12 Jul '24

Module: wine Branch: master Commit: 8c7e82d01f0003e84a86d21e4ac12c960a4dfb09 URL: https://gitlab.winehq.org/wine/wine/-/commit/8c7e82d01f0003e84a86d21e4ac12c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 11 22:00:35 2024 +0200 odbc32: Set parent functions before creating the environment handle. --- dlls/odbc32/proxyodbc.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index d1e1beef723..54b680feb71 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -914,7 +914,7 @@ SQLRETURN WINAPI SQLConnect(SQLHDBC ConnectionHandle, SQLCHAR *ServerName, SQLSM if (has_suffix( filename, L".dll" )) { - if (!(handle->win32_funcs = load_driver( filename ))) + if (!(handle->win32_funcs = handle->parent->win32_funcs = load_driver( filename ))) { WARN( "failed to load driver %s\n", debugstr_w(filename) ); goto done; @@ -922,7 +922,6 @@ SQLRETURN WINAPI SQLConnect(SQLHDBC ConnectionHandle, SQLCHAR *ServerName, SQLSM TRACE( "using Windows driver %s\n", debugstr_w(filename) ); if (!SUCCESS((ret = create_env( handle->parent, FALSE )))) goto done; - handle->parent->win32_funcs = handle->win32_funcs; if (!SUCCESS((ret = create_con( handle )))) goto done; ret = handle->win32_funcs->SQLConnect( handle->win32_handle, ServerName, NameLength1, UserName, NameLength2, @@ -2647,7 +2646,7 @@ SQLRETURN WINAPI SQLBrowseConnect(SQLHDBC ConnectionHandle, SQLCHAR *InConnectio if (has_suffix( filename, L".dll" )) { - if (!(handle->win32_funcs = load_driver( filename ))) + if (!(handle->win32_funcs = handle->parent->win32_funcs = load_driver( filename ))) { WARN( "failed to load driver %s\n", debugstr_w(filename) ); goto done; @@ -2655,7 +2654,6 @@ SQLRETURN WINAPI SQLBrowseConnect(SQLHDBC ConnectionHandle, SQLCHAR *InConnectio TRACE( "using Windows driver %s\n", debugstr_w(filename) ); if (!SUCCESS((ret = create_env( handle->parent, FALSE )))) goto done; - handle->parent->win32_funcs = handle->win32_funcs; if (!SUCCESS((ret = create_con( handle )))) goto done; ret = handle->win32_funcs->SQLBrowseConnect( handle->win32_handle, InConnectionString, StringLength1, @@ -3309,7 +3307,7 @@ SQLRETURN WINAPI SQLDriverConnect(SQLHDBC ConnectionHandle, SQLHWND WindowHandle if (has_suffix( filename, L".dll" )) { - if (!(handle->win32_funcs = load_driver( filename ))) + if (!(handle->win32_funcs = handle->parent->win32_funcs = load_driver( filename ))) { WARN( "failed to load driver %s\n", debugstr_w(filename) ); goto done; @@ -3317,7 +3315,6 @@ SQLRETURN WINAPI SQLDriverConnect(SQLHDBC ConnectionHandle, SQLHWND WindowHandle TRACE( "using Windows driver %s\n", debugstr_w(filename) ); if (!SUCCESS((ret = create_env( handle->parent, FALSE )))) goto done; - handle->parent->win32_funcs = handle->win32_funcs; if (!SUCCESS((ret = create_con( handle )))) goto done; ret = handle->win32_funcs->SQLDriverConnect( handle->win32_handle, WindowHandle, InConnectionString, Length, @@ -3467,7 +3464,7 @@ SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle, WCHAR *ServerName, SQLSMA if (has_suffix( filename, L".dll" )) { - if (!(handle->win32_funcs = load_driver( filename ))) + if (!(handle->win32_funcs = handle->parent->win32_funcs = load_driver( filename ))) { WARN( "failed to load driver %s\n", debugstr_w(filename) ); goto done; @@ -3475,7 +3472,6 @@ SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle, WCHAR *ServerName, SQLSMA TRACE( "using Windows driver %s\n", debugstr_w(filename) ); if (!SUCCESS((ret = create_env( handle->parent, FALSE )))) goto done; - handle->parent->win32_funcs = handle->win32_funcs; if (!SUCCESS((ret = create_con( handle )))) goto done; ret = handle->win32_funcs->SQLConnectW( handle->win32_handle, ServerName, NameLength1, UserName, NameLength2, @@ -4048,7 +4044,7 @@ SQLRETURN WINAPI SQLDriverConnectW(SQLHDBC ConnectionHandle, SQLHWND WindowHandl if (has_suffix( filename, L".dll" )) { - if (!(handle->win32_funcs = load_driver( filename ))) + if (!(handle->win32_funcs = handle->parent->win32_funcs = load_driver( filename ))) { WARN( "failed to load driver %s\n", debugstr_w(filename) ); goto done; @@ -4056,7 +4052,6 @@ SQLRETURN WINAPI SQLDriverConnectW(SQLHDBC ConnectionHandle, SQLHWND WindowHandl TRACE( "using Windows driver %s\n", debugstr_w(filename) ); if (!SUCCESS((ret = create_env( handle->parent, FALSE )))) goto done; - handle->parent->win32_funcs = handle->win32_funcs; if (!SUCCESS((ret = create_con( handle )))) goto done; ret = handle->win32_funcs->SQLDriverConnectW( handle->win32_handle, WindowHandle, InConnectionString, Length, @@ -4338,7 +4333,7 @@ SQLRETURN WINAPI SQLBrowseConnectW(SQLHDBC ConnectionHandle, SQLWCHAR *InConnect if (has_suffix( filename, L".dll" )) { - if (!(handle->win32_funcs = load_driver( filename ))) + if (!(handle->win32_funcs = handle->parent->win32_funcs = load_driver( filename ))) { WARN( "failed to load driver %s\n", debugstr_w(filename) ); goto done; @@ -4346,7 +4341,6 @@ SQLRETURN WINAPI SQLBrowseConnectW(SQLHDBC ConnectionHandle, SQLWCHAR *InConnect TRACE( "using Windows driver %s\n", debugstr_w(filename) ); if (!SUCCESS((ret = create_env( handle->parent, FALSE )))) goto done; - handle->parent->win32_funcs = handle->win32_funcs; if (!SUCCESS((ret = create_con( handle )))) goto done; ret = handle->win32_funcs->SQLBrowseConnectW( handle->win32_handle, InConnectionString, StringLength1,

1 0

Hans Leidekker : odbc32: Use SQLFreeHandle() instead of SQLFreeEnv/Connect().
by Alexandre Julliard 12 Jul '24

12 Jul '24

Module: wine Branch: master Commit: dbe651d330f260183c6d3e59e06b82910ba34c9f URL: https://gitlab.winehq.org/wine/wine/-/commit/dbe651d330f260183c6d3e59e06b82… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 12 08:20:11 2024 +0200 odbc32: Use SQLFreeHandle() instead of SQLFreeEnv/Connect(). The latter are not exported by some drivers. --- dlls/odbc32/proxyodbc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 54b680feb71..033d009be50 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1359,12 +1359,12 @@ SQLRETURN WINAPI SQLFreeConnect(SQLHDBC ConnectionHandle) if (handle->unix_handle) { - struct SQLFreeConnect_params params = { handle->unix_handle }; - ret = ODBC_CALL( SQLFreeConnect, &params ); + struct SQLFreeHandle_params params = { SQL_HANDLE_DBC, handle->unix_handle }; + ret = ODBC_CALL( SQLFreeHandle, &params ); } else if (handle->win32_handle) { - ret = handle->win32_funcs->SQLFreeConnect( handle->win32_handle ); + ret = handle->win32_funcs->SQLFreeHandle( SQL_HANDLE_DBC, handle->win32_handle ); } free( handle ); @@ -1386,12 +1386,12 @@ SQLRETURN WINAPI SQLFreeEnv(SQLHENV EnvironmentHandle) if (handle->unix_handle) { - struct SQLFreeEnv_params params = { handle->unix_handle }; - ret = ODBC_CALL( SQLFreeEnv, &params ); + struct SQLFreeHandle_params params = { SQL_HANDLE_ENV, handle->unix_handle }; + ret = ODBC_CALL( SQLFreeHandle, &params ); } else if (handle->win32_handle) { - ret = handle->win32_funcs->SQLFreeEnv( handle->win32_handle ); + ret = handle->win32_funcs->SQLFreeHandle( SQL_HANDLE_ENV, handle->win32_handle ); } RegCloseKey( handle->drivers_key );

1 0

Hans Leidekker : odbc32: Use SQLSetConnectAttrW() instead of SQLSetConnectAttr() if possible.
by Alexandre Julliard 12 Jul '24

12 Jul '24

Module: wine Branch: master Commit: 551a3e6887c4f79daa823ddc366996243a977fa9 URL: https://gitlab.winehq.org/wine/wine/-/commit/551a3e6887c4f79daa823ddc366996… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 12 08:24:58 2024 +0200 odbc32: Use SQLSetConnectAttrW() instead of SQLSetConnectAttr() if possible. --- dlls/odbc32/proxyodbc.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 033d009be50..957584af008 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -854,7 +854,20 @@ static SQLRETURN set_con_attr( struct handle *handle, SQLINTEGER attr, SQLPOINTE } else if (handle->win32_handle) { - ret = handle->win32_funcs->SQLSetConnectAttr( handle->win32_handle, attr, value, len ); + switch (attr) + { + case SQL_ATTR_CURRENT_CATALOG: + case SQL_ATTR_TRACEFILE: + case SQL_ATTR_TRANSLATE_LIB: + ERR( "string attribute %u not handled\n", attr ); + return SQL_ERROR; + default: + break; + } + if (handle->win32_funcs->SQLSetConnectAttrW) + ret = handle->win32_funcs->SQLSetConnectAttrW( handle->win32_handle, attr, value, len ); + else if (handle->win32_funcs->SQLSetConnectAttr) + ret = handle->win32_funcs->SQLSetConnectAttr( handle->win32_handle, attr, value, len ); } return ret; }

1 0

Elizabeth Figura : wined3d: Destroy the push constant buffers on device reset.
by Alexandre Julliard 12 Jul '24

12 Jul '24

Module: wine Branch: master Commit: a5535aea042674417935a2239f1242a9a3306cdd URL: https://gitlab.winehq.org/wine/wine/-/commit/a5535aea042674417935a2239f1242… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sun Jun 9 12:50:30 2024 -0500 wined3d: Destroy the push constant buffers on device reset. --- dlls/wined3d/device.c | 6 ++++++ dlls/wined3d/stateblock.c | 13 ++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index acc70256462..e445679ec2f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5020,6 +5020,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_texture_decref(device->cursor_texture); device->cursor_texture = NULL; } + for (unsigned int i = 0; i < ARRAY_SIZE(device->push_constants); ++i) + { + if (device->push_constants[i]) + wined3d_buffer_decref(device->push_constants[i]); + device->push_constants[i] = NULL; + } state_unbind_resources(state); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 28aa2a46f08..104affe6e56 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -2193,6 +2193,14 @@ static void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state } +/* FFP push constant buffers do not have a "default" state on the CS side. + * We need to explicitly invalidate them when initializing the context or + * resetting. */ +static void wined3d_stateblock_invalidate_push_constants(struct wined3d_stateblock *stateblock) +{ + stateblock->changed.ffp_ps_constants = 1; +} + static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, const struct wined3d_stateblock *device_state, struct wined3d_device *device, enum wined3d_stateblock_type type) { @@ -2207,9 +2215,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, const stru stateblock->changed.store_stream_offset = 1; list_init(&stateblock->changed.changed_lights); - /* FFP push constant buffers need to be set if used; the backend does not - * have a default state for them. */ - stateblock->changed.ffp_ps_constants = 1; + wined3d_stateblock_invalidate_push_constants(stateblock); if (type == WINED3D_SBT_RECORDED || type == WINED3D_SBT_PRIMARY) return WINED3D_OK; @@ -2286,6 +2292,7 @@ void CDECL wined3d_stateblock_reset(struct wined3d_stateblock *stateblock) memset(&stateblock->stateblock_state, 0, sizeof(stateblock->stateblock_state)); stateblock->stateblock_state.light_state = &stateblock->light_state; wined3d_stateblock_state_init(&stateblock->stateblock_state, stateblock->device, WINED3D_STATE_INIT_DEFAULT); + wined3d_stateblock_invalidate_push_constants(stateblock); } static void wined3d_device_set_base_vertex_index(struct wined3d_device *device, int base_index)

1 0