[ODBC32] Sync with Wine Staging 1.9.4. CORE-10912

svn path=/trunk/; revision=70887

diff --git a/reactos/dll/win32/odbc32/proxyodbc.c b/reactos/dll/win32/odbc32/proxyodbc.c
index f0e0921..12b4b43 100644 (file)
--- a/reactos/dll/win32/odbc32/proxyodbc.c
+++ b/reactos/dll/win32/odbc32/proxyodbc.c
@@ -61,7 +61,7 @@ static SQLRETURN (*pSQLAllocEnv)(SQLHENV*);
 static SQLRETURN (*pSQLAllocHandle)(SQLSMALLINT,SQLHANDLE,SQLHANDLE*);
 static SQLRETURN (*pSQLAllocHandleStd)(SQLSMALLINT,SQLHANDLE,SQLHANDLE*);
 static SQLRETURN (*pSQLAllocStmt)(SQLHDBC,SQLHSTMT*);
 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*);
 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*);

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 3697cba..e7517a4 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -140,7 +140,7 @@ reactos/dll/win32/npptools            # Synced to WineStaging-1.7.55
 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/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
 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