[akhaldi] 67201: [ODBCCP32] Sync with Wine Staging 1.7.37. CORE-9246 - Ros-diffs

15 Apr 2015

Author: akhaldi
Date: Wed Apr 15 18:06:22 2015
New Revision: 67201

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

Modified:
    trunk/reactos/dll/win32/odbccp32/odbccp32.spec
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3…
==============================================================================

--- trunk/reactos/dll/win32/odbccp32/odbccp32.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/odbccp32/odbccp32.spec	[iso-8859-1] Wed Apr 15 18:06:22 2015
@@ -1,57 +1,57 @@
-@ stdcall ODBCCPlApplet( long long ptr ptr)
-@ stdcall SQLConfigDataSource(ptr long str str)
-@ stdcall SQLConfigDataSourceW(ptr long wstr wstr)
-@ stdcall SQLConfigDriver(ptr long str str ptr long ptr)
-@ stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr)
-@ stdcall SQLCreateDataSource(ptr str)
-@ stub SQLCreateDataSourceEx
-@ stub SQLCreateDataSourceExW
-@ stdcall SQLCreateDataSourceW(ptr wstr)
-@ stdcall SQLGetAvailableDrivers(str ptr long ptr)
-@ stdcall SQLGetAvailableDriversW(wstr ptr long ptr)
-@ stdcall SQLGetConfigMode(ptr)
-@ stdcall SQLGetInstalledDrivers(str long ptr)
-@ stdcall SQLGetInstalledDriversW(wstr long ptr)
-@ stdcall SQLGetPrivateProfileString(str str str str long str)
-@ stdcall SQLGetPrivateProfileStringW(wstr wstr wstr wstr long wstr)
-@ stdcall SQLGetTranslator(ptr str long ptr ptr long ptr ptr)
-@ stdcall SQLGetTranslatorW(ptr wstr long ptr ptr long ptr ptr)
-@ stdcall SQLInstallDriver(str str str long ptr)
-@ stdcall SQLInstallDriverEx(str str str long ptr long ptr)
-@ stdcall SQLInstallDriverExW(wstr wstr wstr long ptr long ptr)
-@ stdcall SQLInstallDriverManager(ptr long ptr)
-@ stdcall SQLInstallDriverManagerW(ptr long ptr)
-@ stdcall SQLInstallDriverW(wstr wstr wstr long ptr)
-@ stdcall SQLInstallODBC(ptr str str str)
-@ stdcall SQLInstallODBCW(ptr wstr wstr wstr)
-@ stdcall SQLInstallTranslator(str str str ptr long ptr long ptr)
-@ stdcall SQLInstallTranslatorEx(str str ptr long ptr long ptr)
-@ stdcall SQLInstallTranslatorExW(wstr wstr ptr long ptr long ptr)
-@ stdcall SQLInstallTranslatorW(wstr wstr wstr ptr long ptr long ptr)
-@ stdcall SQLInstallerError(long ptr ptr long ptr)
-@ stdcall SQLInstallerErrorW(long ptr ptr long ptr)
-@ stub SQLLoadDataSourcesListBox
-@ stub SQLLoadDriverListBox
-@ stdcall SQLManageDataSources(ptr)
-@ stdcall SQLPostInstallerError(long ptr)
-@ stdcall SQLPostInstallerErrorW(long ptr)
-@ stdcall SQLReadFileDSN(str str str ptr long ptr)
-@ stdcall SQLReadFileDSNW(wstr wstr wstr ptr long ptr)
-@ stdcall SQLRemoveDSNFromIni(str)
-@ stdcall SQLRemoveDSNFromIniW(wstr)
-@ stdcall SQLRemoveDefaultDataSource()
-@ stdcall SQLRemoveDriver(str long ptr)
-@ stdcall SQLRemoveDriverManager(ptr)
-@ stdcall SQLRemoveDriverW(wstr long ptr)
-@ stdcall SQLRemoveTranslator(str ptr)
-@ stdcall SQLRemoveTranslatorW(wstr ptr)
-@ stdcall SQLSetConfigMode(long)
-@ stdcall SQLValidDSN(str)
-@ stdcall SQLValidDSNW(wstr)
-@ stdcall SQLWriteDSNToIni(str str)
-@ stdcall SQLWriteDSNToIniW(wstr wstr)
-@ stdcall SQLWriteFileDSN(str str str str)
-@ stdcall SQLWriteFileDSNW(wstr wstr wstr wstr)
-@ stdcall SQLWritePrivateProfileString(str str str str)
-@ stdcall SQLWritePrivateProfileStringW(wstr wstr wstr wstr)
-@ stub SelectTransDlg
+2 stdcall SQLInstallDriver(str str str long ptr)
+3 stdcall SQLInstallDriverManager(ptr long ptr)
+4 stdcall SQLGetInstalledDrivers(str long ptr)
+5 stdcall SQLGetAvailableDrivers(str ptr long ptr)
+6 stdcall SQLConfigDataSource(ptr long str str)
+7 stdcall SQLRemoveDefaultDataSource()
+8 stdcall SQLWriteDSNToIni(str str)
+9 stdcall SQLRemoveDSNFromIni(str)
+10 stdcall SQLInstallODBC(ptr str str str)
+11 stdcall SQLManageDataSources(ptr)
+12 stdcall SQLCreateDataSource(ptr str)
+13 stdcall SQLGetTranslator(ptr str long ptr ptr long ptr ptr)
+14 stdcall SQLWritePrivateProfileString(str str str str)
+15 stdcall SQLGetPrivateProfileString(str str str str long str)
+16 stdcall SQLValidDSN(str)
+17 stdcall SQLRemoveDriverManager(ptr)
+18 stdcall SQLInstallTranslator(str str str ptr long ptr long ptr)
+19 stdcall SQLRemoveTranslator(str ptr)
+20 stdcall SQLRemoveDriver(str long ptr)
+21 stdcall SQLConfigDriver(ptr long str str ptr long ptr)
+22 stdcall SQLInstallerError(long ptr ptr long ptr)
+23 stdcall SQLPostInstallerError(long ptr)
+24 stdcall SQLReadFileDSN(str str str ptr long ptr)
+25 stdcall SQLWriteFileDSN(str str str str)
+26 stdcall SQLInstallDriverEx(str str str long ptr long ptr)
+27 stdcall SQLGetConfigMode(ptr)
+28 stdcall SQLSetConfigMode(long)
+29 stdcall SQLInstallTranslatorEx(str str ptr long ptr long ptr)
+30 stub SQLCreateDataSourceEx
+101 stdcall ODBCCPlApplet( long long ptr ptr)
+112 stub SelectTransDlg
+202 stdcall SQLInstallDriverW(wstr wstr wstr long ptr)
+203 stdcall SQLInstallDriverManagerW(ptr long ptr)
+204 stdcall SQLGetInstalledDriversW(wstr long ptr)
+205 stdcall SQLGetAvailableDriversW(wstr ptr long ptr)
+206 stdcall SQLConfigDataSourceW(ptr long wstr wstr)
+208 stdcall SQLWriteDSNToIniW(wstr wstr)
+209 stdcall SQLRemoveDSNFromIniW(wstr)
+210 stdcall SQLInstallODBCW(ptr wstr wstr wstr)
+212 stdcall SQLCreateDataSourceW(ptr wstr)
+213 stdcall SQLGetTranslatorW(ptr wstr long ptr ptr long ptr ptr)
+214 stdcall SQLWritePrivateProfileStringW(wstr wstr wstr wstr)
+215 stdcall SQLGetPrivateProfileStringW(wstr wstr wstr wstr long wstr)
+216 stdcall SQLValidDSNW(wstr)
+218 stdcall SQLInstallTranslatorW(wstr wstr wstr ptr long ptr long ptr)
+219 stdcall SQLRemoveTranslatorW(wstr ptr)
+220 stdcall SQLRemoveDriverW(wstr long ptr)
+221 stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr)
+222 stdcall SQLInstallerErrorW(long ptr ptr long ptr)
+223 stdcall SQLPostInstallerErrorW(long ptr)
+224 stdcall SQLReadFileDSNW(wstr wstr wstr ptr long ptr)
+225 stdcall SQLWriteFileDSNW(wstr wstr wstr wstr)
+226 stdcall SQLInstallDriverExW(wstr wstr wstr long ptr long ptr)
+229 stdcall SQLInstallTranslatorExW(wstr wstr ptr long ptr long ptr)
+230 stub SQLCreateDataSourceExW
+231 stub SQLLoadDriverListBox
+232 stub SQLLoadDataSourcesListBox

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] Wed Apr 15 18:06:22 2015
@@ -144,7 +144,7 @@
 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 WineStaging-1.7.37. Depends on port of
Linux ODBC.
-reactos/dll/win32/odbccp32            # Synced to Wine-1.7.27
+reactos/dll/win32/odbccp32            # Synced to WineStaging-1.7.37
 reactos/dll/win32/ole32               # Synced to WineStaging-1.7.37
 reactos/dll/win32/oleacc              # Synced to Wine-1.7.27
 reactos/dll/win32/oleaut32            # Synced to Wine-1.7.27



    