mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 13:33:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ODBC32] Sync with Wine Staging 1.7.37. CORE-9246

Browse Source 
svn path=/trunk/; revision=67200
This commit is contained in:
Amine Khaldi 2015-04-15 18:05:07 +00:00
parent 8046f009ba
commit a2f1af1a1d
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
reactos/dll/win32/odbc32/proxyodbc.c
View File

@ -54,6 +54,7 @@ static BOOL ODBC_LoadDriverManager(void);
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 @@ SQLRETURN WINAPI SQLDrivers(
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 @@ SQLRETURN WINAPI SQLDriversW(
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;
}
/*************************************************************************

2
reactos/media/doc/README.WINE
View File

@ -143,7 +143,7 @@ reactos/dll/win32/npptools # Synced to Wine-1.7.27
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