Alistair Leslie-Hughes : msi: Don' t error when an ODBC Data Source fails to register.

Alexandre Julliard julliard at winehq.org
Wed Aug 28 18:23:20 CDT 2019


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

Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date:   Wed Aug 28 01:05:50 2019 +0000

msi: Don't error when an ODBC Data Source fails to register.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msi/action.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 55f978c..f6f7ffb 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -6783,10 +6783,7 @@ static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param )
     attrs[len + 1] = 0;
 
     if (!SQLConfigDataSourceW(NULL, request, driver, attrs))
-    {
-        ERR("Failed to install SQL data source!\n");
-        r = ERROR_FUNCTION_FAILED;
-    }
+        WARN("Failed to install SQL data source!\n");
 
     uirow = MSI_CreateRecord( 5 );
     MSI_RecordSetStringW( uirow, 1, desc );




More information about the wine-cvs mailing list