odbccp32: Avoid using RegQueryInfoKey() in SQLGetInstalledDrivers().

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

odbccp32: Avoid using RegQueryInfoKey() in SQLGetInstalledDrivers().
5eb8894e · Zebediah Figura · Alexandre Julliard · 737bbbec · 5eb8894e
Commit 5eb8894e authored May 22, 2018 by Zebediah Figura Committed by Alexandre Julliard May 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

odbccp32.c dlls/odbccp32/odbccp32.c +9 -3

No files found.
--- a/dlls/odbccp32/odbccp32.c
+++ b/dlls/odbccp32/odbccp32.c
@@ -510,15 +510,20 @@ BOOL WINAPI SQLGetInstalledDriversW(WCHAR *buf, WORD size, WORD *sizeout)
        return FALSE;
    }

-    RegQueryInfoKeyW(drivers, 0, 0, 0, 0, 0, 0, 0, &valuelen, 0, 0, 0);
-    value = heap_alloc(++valuelen * sizeof(WCHAR));
+    valuelen = 256;
+    value = heap_alloc(valuelen * sizeof(WCHAR));

    size--;

    while (1)
    {
        len = valuelen;
-        res = RegEnumValueW(drivers, index++, value, &len, NULL, NULL, NULL, NULL);
+        res = RegEnumValueW(drivers, index, value, &len, NULL, NULL, NULL, NULL);
+        while (res == ERROR_MORE_DATA)
+        {
+            value = heap_realloc(value, ++len * sizeof(WCHAR));
+            res = RegEnumValueW(drivers, index, value, &len, NULL, NULL, NULL, NULL);
+        }
        if (res == ERROR_SUCCESS)
        {
            lstrcpynW(buf + written, value, size - written);
@@ -532,6 +537,7 @@ BOOL WINAPI SQLGetInstalledDriversW(WCHAR *buf, WORD size, WORD *sizeout)
            ret = FALSE;
            break;
        }
+        index++;
    }

    buf[written++] = 0;