Hans Leidekker : odbc32: Accept SQL_FETCH_NEXT in SQLDataSources/Drivers() if the key has not been opened.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2bd4c765eab7d9840815642d63ae94380b1d9dfb
URL:    https://gitlab.winehq.org/wine/wine/-/commit/2bd4c765eab7d9840815642d63ae943...

Author: Hans Leidekker 
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 );