[ros-diffs] [akhaldi] 67200: [ODBC32] Sync with Wine Staging 1.7.37. CORE-9246

Author: akhaldi
Date: Wed Apr 15 18:05:07 2015
New Revision: 67200

URL: http://svn.reactos.org/svn/reactos?rev=67200&view=rev
Log:
[ODBC32] Sync with Wine Staging 1.7.37. CORE-9246

Modified:
    trunk/reactos/dll/win32/odbc32/proxyodbc.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/odbc32/proxyodbc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/proxyodbc....
==============================================================================
--- trunk/reactos/dll/win32/odbc32/proxyodbc.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/odbc32/proxyodbc.c	[iso-8859-1] Wed Apr 15 18:05:07 2015
@@ -54,6 +54,7 @@
 static BOOL ODBC_LoadDMFunctions(void);

WINE_DEFAULT_DEBUG_CHANNEL(odbc);
+WINE_DECLARE_DEBUG_CHANNEL(winediag);

static SQLRETURN (*pSQLAllocConnect)(SQLHENV,SQLHDBC*);
 static SQLRETURN (*pSQLAllocEnv)(SQLHENV*);
@@ -1919,11 +1920,19 @@
     SQLSMALLINT        cbDriverAttrMax,
     SQLSMALLINT           *pcbDriverAttr)
 {
-        TRACE("\n");
+        SQLRETURN ret;
+
+        TRACE("direction=%d\n", fDirection);

if (!pSQLDrivers) return SQL_ERROR;
-        return pSQLDrivers(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc,
-                           szDriverAttributes, cbDriverAttrMax, pcbDriverAttr);
+        ret = pSQLDrivers(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc,
+                          szDriverAttributes, cbDriverAttrMax, pcbDriverAttr);
+
+        if (ret == SQL_NO_DATA && fDirection == SQL_FETCH_FIRST)
+            ERR_(winediag)("No ODBC drivers could be found. "
+                           "Check the settings for your libodbc provider.\n");
+
+        return ret;
 }

@@ -2652,11 +2661,19 @@
     SQLSMALLINT        cbDriverAttrMax,
     SQLSMALLINT           *pcbDriverAttr)
 {
-        TRACE("\n");
+        SQLRETURN ret;
+
+        TRACE("direction=%d\n", fDirection);

if (!pSQLDriversW) return SQL_ERROR;
-        return pSQLDriversW(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc,
-                            szDriverAttributes, cbDriverAttrMax, pcbDriverAttr);
+        ret = pSQLDriversW(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc,
+                           szDriverAttributes, cbDriverAttrMax, pcbDriverAttr);
+
+        if (ret == SQL_NO_DATA && fDirection == SQL_FETCH_FIRST)
+            ERR_(winediag)("No ODBC drivers could be found. "
+                           "Check the settings for your libodbc provider.\n");
+
+        return ret;
 }

/*************************************************************************

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Wed Apr 15 18:05:07 2015
@@ -143,7 +143,7 @@
 reactos/dll/win32/ntdsapi             # Synced to WineStaging-1.7.37
 reactos/dll/win32/ntprint             # Synced to Wine-1.7.27
 reactos/dll/win32/objsel              # Synced to Wine-1.7.27
-reactos/dll/win32/odbc32              # Synced to Wine-1.7.27. Depends on port of Linux ODBC.
+reactos/dll/win32/odbc32              # Synced to WineStaging-1.7.37. Depends on port of Linux ODBC.
 reactos/dll/win32/odbccp32            # Synced to Wine-1.7.27
 reactos/dll/win32/ole32               # Synced to WineStaging-1.7.37
 reactos/dll/win32/oleacc              # Synced to Wine-1.7.27