Hans Leidekker : msi/tests: SQLGetInstalledDrivers fails if there are no ODBC drivers installed.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1be65cbb46bf792773a5aabc550851ed51f727cd
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1be65cbb46bf792773a5aabc5...

Author: Hans Leidekker 
Date:   Thu Sep 27 15:00:30 2018 +0200

msi/tests: SQLGetInstalledDrivers fails if there are no ODBC drivers installed.

Signed-off-by: Hans Leidekker 
Signed-off-by: Alexandre Julliard

---

dlls/msi/tests/custom.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
index cd6cb0c..c7ce4d2 100644
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/custom.c
@@ -1424,9 +1424,10 @@ UINT WINAPI odbc_present(MSIHANDLE hinst)
     WORD len;
     BOOL r;

+    buffer[0] = 0;
+    len = sizeof(buffer);
     r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len);
-    ok(hinst, len < sizeof(buffer), "buffer too small\n");
-    ok(hinst, r, "SQLGetInstalledDrivers failed\n");
+    if (r) ok(hinst, len < sizeof(buffer), "buffer too small\n");
     for (p = buffer; *p; p += strlen(p) + 1)
     {
         if (!strcmp(p, "ODBC test driver"))
@@ -1446,9 +1447,10 @@ UINT WINAPI odbc_absent(MSIHANDLE hinst)
     WORD len;
     BOOL r;

+    buffer[0] = 0;
+    len = sizeof(buffer);
     r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len);
-    ok(hinst, len < sizeof(buffer), "buffer too small\n");
-    ok(hinst, r, "SQLGetInstalledDrivers failed\n");
+    if (r) ok(hinst, len < sizeof(buffer), "buffer too small\n");
     for (p = buffer; *p; p += strlen(p) + 1)
     {
         if (!strcmp(p, "ODBC test driver"))