[ros-diffs] [akhaldi] 70887: [ODBC32] Sync with Wine Staging 1.9.4. CORE-10912

Author: akhaldi
Date: Thu Mar  3 14:08:04 2016
New Revision: 70887

URL: http://svn.reactos.org/svn/reactos?rev=70887&view=rev
Log:
[ODBC32] Sync with Wine Staging 1.9.4. CORE-10912

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] Thu Mar  3 14:08:04 2016
@@ -61,7 +61,7 @@
 static SQLRETURN (*pSQLAllocHandle)(SQLSMALLINT,SQLHANDLE,SQLHANDLE*);
 static SQLRETURN (*pSQLAllocHandleStd)(SQLSMALLINT,SQLHANDLE,SQLHANDLE*);
 static SQLRETURN (*pSQLAllocStmt)(SQLHDBC,SQLHSTMT*);
-static SQLRETURN
(*pSQLBindCol)(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
+static SQLRETURN
(*pSQLBindCol)(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLLEN*);
 static SQLRETURN
(*pSQLBindParam)(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLUINTEGER,SQLSMALLINT,SQLPOINTER,SQLINTEGER*);
 static SQLRETURN
(*pSQLBindParameter)(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLUINTEGER,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
 static SQLRETURN
(*pSQLBrowseConnect)(SQLHDBC,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Thu Mar  3 14:08:04 2016
@@ -140,7 +140,7 @@
 reactos/dll/win32/ntdsapi             # Synced to WineStaging-1.7.55
 reactos/dll/win32/ntprint             # Synced to WineStaging-1.7.55
 reactos/dll/win32/objsel              # Synced to WineStaging-1.7.55
-reactos/dll/win32/odbc32              # Synced to WineStaging-1.7.55. Depends on port of
Linux ODBC.
+reactos/dll/win32/odbc32              # Synced to WineStaging-1.9.4. Depends on port of
Linux ODBC.
 reactos/dll/win32/odbccp32            # Synced to WineStaging-1.7.55
 reactos/dll/win32/ole32               # Synced to WineStaging-1.7.55
 reactos/dll/win32/oleacc              # Synced to WineStaging-1.7.55