Headers diff for odbccp32.dll between 6.0.6002.18005-Windows 6.0 and 6.1.7601.17632-Windows 7.0 versions
| odbcinst.h (6.0.6002.18005-Windows 6.0) | | odbcinst.h (6.1.7601.17632-Windows 7.0) |
|---|
| | |
| skipping to change at line 24 | | skipping to change at line 24 |
|---|
| | |
| #ifndef __SQL | | #ifndef __SQL |
| #include "sql.h" | | #include "sql.h" |
| #endif | | #endif |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| extern "C" { // Assume C declarations for C++ | | extern "C" { // Assume C declarations for C++ |
| #endif // __cplusplus | | #endif // __cplusplus |
| | |
| #ifndef ODBCVER | | #ifndef ODBCVER |
|
| #define ODBCVER 0x0351 // Assume ODBC 3.51 | | #define ODBCVER 0x0380 // Default to ODBC 3.80 |
| #endif | | #endif |
| | |
| #ifndef WINVER | | #ifndef WINVER |
| #define WINVER 0x0400 // Assume Windows 4.0 | | #define WINVER 0x0400 // Assume Windows 4.0 |
| #endif | | #endif |
| | |
| // Constants --------------------------------------------------------------- | | // Constants --------------------------------------------------------------- |
| // SQLConfigDataSource request flags | | // SQLConfigDataSource request flags |
| #define ODBC_ADD_DSN 1 // Add data source | | #define ODBC_ADD_DSN 1 // Add data source |
| #define ODBC_CONFIG_DSN 2 // Configure (edit) data source | | #define ODBC_CONFIG_DSN 2 // Configure (edit) data source |
| | |
| skipping to change at line 87 | | skipping to change at line 87 |
|---|
| #define ODBC_ERROR_LOAD_LIB_FAILED 13 | | #define ODBC_ERROR_LOAD_LIB_FAILED 13 |
| #define ODBC_ERROR_INVALID_PARAM_SEQUENCE 14 | | #define ODBC_ERROR_INVALID_PARAM_SEQUENCE 14 |
| #define ODBC_ERROR_INVALID_LOG_FILE 15 | | #define ODBC_ERROR_INVALID_LOG_FILE 15 |
| #define ODBC_ERROR_USER_CANCELED 16 | | #define ODBC_ERROR_USER_CANCELED 16 |
| #define ODBC_ERROR_USAGE_UPDATE_FAILED 17 | | #define ODBC_ERROR_USAGE_UPDATE_FAILED 17 |
| #define ODBC_ERROR_CREATE_DSN_FAILED 18 | | #define ODBC_ERROR_CREATE_DSN_FAILED 18 |
| #define ODBC_ERROR_WRITING_SYSINFO_FAILED 19 | | #define ODBC_ERROR_WRITING_SYSINFO_FAILED 19 |
| #define ODBC_ERROR_REMOVE_DSN_FAILED 20 | | #define ODBC_ERROR_REMOVE_DSN_FAILED 20 |
| #define ODBC_ERROR_OUT_OF_MEM 21 | | #define ODBC_ERROR_OUT_OF_MEM 21 |
| #define ODBC_ERROR_OUTPUT_STRING_TRUNCATED 22 | | #define ODBC_ERROR_OUTPUT_STRING_TRUNCATED 22 |
|
| | #define ODBC_ERROR_NOTRANINFO 23 |
| | |
| | #define ODBC_ERROR_MAX ODBC_ERROR_NOTRANINFO // updat |
| | e this when we add new error message |
| #endif /* ODBCVER >= 0x0300 */ | | #endif /* ODBCVER >= 0x0300 */ |
| | |
| #ifndef EXPORT | | #ifndef EXPORT |
| #define EXPORT | | #define EXPORT |
| #endif | | #endif |
| | |
| #ifndef RC_INVOKED | | #ifndef RC_INVOKED |
| // Prototypes -------------------------------------------------------------- | | // Prototypes -------------------------------------------------------------- |
| #define INSTAPI __stdcall | | #define INSTAPI __stdcall |
| | |
| // High level APIs | | // High level APIs |
| BOOL INSTAPI SQLInstallODBC (HWND hwndParent, | | BOOL INSTAPI SQLInstallODBC (HWND hwndParent, |
| LPCSTR lpszInfFile, | | LPCSTR lpszInfFile, |
| LPCSTR lpszSrcPath, | | LPCSTR lpszSrcPath, |
| LPCSTR lpszDrivers); | | LPCSTR lpszDrivers); |
| BOOL INSTAPI SQLManageDataSources (HWND hwndParent); | | BOOL INSTAPI SQLManageDataSources (HWND hwndParent); |
| BOOL INSTAPI SQLCreateDataSource (HWND hwndParent, | | BOOL INSTAPI SQLCreateDataSource (HWND hwndParent, |
| LPCSTR lpszDSN); | | LPCSTR lpszDSN); |
|
| | |
| | __success(return) |
| BOOL INSTAPI SQLGetTranslator | | BOOL INSTAPI SQLGetTranslator |
| ( | | ( |
| HWND hwnd, | | HWND hwnd, |
|
| __out_ecount(cchNameMax) LPSTR lpszName, | | __inout_ecount(cchNameMax) LPSTR lpszName, |
| WORD cchNameMax, | | WORD cchNameMax, |
| WORD* pcchNameOut, | | WORD* pcchNameOut, |
| __out_ecount(cchPathMax) LPSTR lpszPath, | | __out_ecount(cchPathMax) LPSTR lpszPath, |
| WORD cchPathMax, | | WORD cchPathMax, |
| WORD* pcchPathOut, | | WORD* pcchPathOut, |
| DWORD* pvOption | | DWORD* pvOption |
| ); | | ); |
| | |
| // Low level APIs | | // Low level APIs |
| // NOTE: The high-level APIs should always be used. These APIs | | // NOTE: The high-level APIs should always be used. These APIs |
| // have been left for compatibility. | | // have been left for compatibility. |
|
| | __success(return) |
| BOOL INSTAPI SQLInstallDriver | | BOOL INSTAPI SQLInstallDriver |
| ( | | ( |
| LPCSTR lpszInfFile, | | LPCSTR lpszInfFile, |
| LPCSTR lpszDriver, | | LPCSTR lpszDriver, |
| __out_ecount_opt(cchPathMax) LPSTR lpszPath, | | __out_ecount_opt(cchPathMax) LPSTR lpszPath, |
| WORD cchPathMax, | | WORD cchPathMax, |
| WORD* pcchPathOut | | WORD* pcchPathOut |
| ); | | ); |
| | |
| BOOL INSTAPI SQLInstallDriverManager | | BOOL INSTAPI SQLInstallDriverManager |
| ( | | ( |
|
| __inout_ecount(cchPathMax) LPSTR lpszPath, | | __inout_ecount(cchPathMax) LPSTR lpszPath, |
| WORD cchPathMax, | | WORD cchPathMax, |
| WORD* pcchPathOut | | WORD* pcchPathOut |
| ); | | ); |
| | |
|
| | __success(return) |
| BOOL INSTAPI SQLGetInstalledDrivers | | BOOL INSTAPI SQLGetInstalledDrivers |
| ( | | ( |
| __out_ecount(cchBufMax) LPSTR lpszBuf, | | __out_ecount(cchBufMax) LPSTR lpszBuf, |
| WORD cchBufMax, | | WORD cchBufMax, |
| WORD* pcchBufOut | | WORD* pcchBufOut |
| ); | | ); |
| | |
|
| | __success(return) |
| BOOL INSTAPI SQLGetAvailableDrivers | | BOOL INSTAPI SQLGetAvailableDrivers |
| ( | | ( |
| LPCSTR lpszInfFile, | | LPCSTR lpszInfFile, |
| __out_ecount(cchBufMax) LPSTR lpszBuf, | | __out_ecount(cchBufMax) LPSTR lpszBuf, |
| WORD cchBufMax, | | WORD cchBufMax, |
| WORD* pcchBufOut | | WORD* pcchBufOut |
| ); | | ); |
| | |
| BOOL INSTAPI SQLConfigDataSource (HWND hwndParent, | | BOOL INSTAPI SQLConfigDataSource (HWND hwndParent, |
| WORD fRequest, | | WORD fRequest, |
| | |
| skipping to change at line 166 | | skipping to change at line 174 |
|---|
| BOOL INSTAPI SQLWriteDSNToIni (LPCSTR lpszDSN, | | BOOL INSTAPI SQLWriteDSNToIni (LPCSTR lpszDSN, |
| LPCSTR lpszDriver); | | LPCSTR lpszDriver); |
| BOOL INSTAPI SQLRemoveDSNFromIni (LPCSTR lpszDSN); | | BOOL INSTAPI SQLRemoveDSNFromIni (LPCSTR lpszDSN); |
| BOOL INSTAPI SQLValidDSN (LPCSTR lpszDSN); | | BOOL INSTAPI SQLValidDSN (LPCSTR lpszDSN); |
| | |
| BOOL INSTAPI SQLWritePrivateProfileString(LPCSTR lpszSection, | | BOOL INSTAPI SQLWritePrivateProfileString(LPCSTR lpszSection, |
| LPCSTR lpszEntry, | | LPCSTR lpszEntry, |
| LPCSTR lpszString, | | LPCSTR lpszString, |
| LPCSTR lpszFilename); | | LPCSTR lpszFilename); |
| | |
|
| | __success(return != 0) |
| int INSTAPI SQLGetPrivateProfileString | | int INSTAPI SQLGetPrivateProfileString |
| ( | | ( |
| LPCSTR lpszSection, | | LPCSTR lpszSection, |
| LPCSTR lpszEntry, | | LPCSTR lpszEntry, |
| LPCSTR lpszDefault, | | LPCSTR lpszDefault, |
|
| __out_ecount(cchRetBuffer) LPSTR lpszRetBuffer, | | __out_ecount_opt(cchRetBuffer) LPSTR lpszRetBuffer, |
| int cchRetBuffer, | | int cchRetBuffer, |
| LPCSTR lpszFilename | | LPCSTR lpszFilename |
| ); | | ); |
| | |
| #if (ODBCVER >= 0x0250) | | #if (ODBCVER >= 0x0250) |
| BOOL INSTAPI SQLRemoveDriverManager(LPDWORD lpdwUsageCount); | | BOOL INSTAPI SQLRemoveDriverManager(LPDWORD lpdwUsageCount); |
| | |
|
| | __success(return) |
| BOOL INSTAPI SQLInstallTranslator | | BOOL INSTAPI SQLInstallTranslator |
| ( | | ( |
| LPCSTR lpszInfFile, | | LPCSTR lpszInfFile, |
| LPCSTR lpszTranslator, | | LPCSTR lpszTranslator, |
| LPCSTR lpszPathIn, | | LPCSTR lpszPathIn, |
| __out_ecount(cchPathOutMax) LPSTR lpszPathOut, | | __out_ecount(cchPathOutMax) LPSTR lpszPathOut, |
| WORD cchPathOutMax, | | WORD cchPathOutMax, |
| WORD* pcchPathOut, | | WORD* pcchPathOut, |
| WORD fRequest, | | WORD fRequest, |
| LPDWORD lpdwUsageCount | | LPDWORD lpdwUsageCount |
| ); | | ); |
| | |
| BOOL INSTAPI SQLRemoveTranslator(LPCSTR lpszTranslator, | | BOOL INSTAPI SQLRemoveTranslator(LPCSTR lpszTranslator, |
| LPDWORD lpdwUsageCount); | | LPDWORD lpdwUsageCount); |
| BOOL INSTAPI SQLRemoveDriver(LPCSTR lpszDriver, | | BOOL INSTAPI SQLRemoveDriver(LPCSTR lpszDriver, |
| BOOL fRemoveDSN, | | BOOL fRemoveDSN, |
| LPDWORD lpdwUsageCount); | | LPDWORD lpdwUsageCount); |
|
| | |
| | __success(return) |
| BOOL INSTAPI SQLConfigDriver | | BOOL INSTAPI SQLConfigDriver |
| ( | | ( |
| HWND hwndParent, | | HWND hwndParent, |
| WORD fRequest, | | WORD fRequest, |
| LPCSTR lpszDriver, | | LPCSTR lpszDriver, |
| LPCSTR lpszArgs, | | LPCSTR lpszArgs, |
| __out_ecount(cchMsgMax) LPSTR lpszMsg, | | __out_ecount(cchMsgMax) LPSTR lpszMsg, |
| WORD cchMsgMax, | | WORD cchMsgMax, |
| WORD* pcchMsgOut | | WORD* pcchMsgOut |
| ); | | ); |
| | |
| #endif | | #endif |
| | |
| #if (ODBCVER >= 0x0300) | | #if (ODBCVER >= 0x0300) |
| | |
|
| | __success(return==0 ||return==1) |
| SQLRETURN INSTAPI SQLInstallerError | | SQLRETURN INSTAPI SQLInstallerError |
| ( | | ( |
| WORD iError, | | WORD iError, |
| DWORD* pfErrorCode, | | DWORD* pfErrorCode, |
| __out_ecount_opt(cchErrorMsgMax) LPSTR lpszErrorMsg, | | __out_ecount_opt(cchErrorMsgMax) LPSTR lpszErrorMsg, |
| WORD cchErrorMsgMax, | | WORD cchErrorMsgMax, |
| WORD* pcchErrorMsg | | WORD* pcchErrorMsg |
| ); | | ); |
| | |
| SQLRETURN INSTAPI SQLPostInstallerError(DWORD dwErrorCode, LPCSTR lpszErrMsg); | | SQLRETURN INSTAPI SQLPostInstallerError(DWORD dwErrorCode, LPCSTR lpszErrMsg); |
| | |
| BOOL INSTAPI SQLWriteFileDSN(LPCSTR lpszFileName, | | BOOL INSTAPI SQLWriteFileDSN(LPCSTR lpszFileName, |
| LPCSTR lpszAppName, | | LPCSTR lpszAppName, |
| LPCSTR lpszKeyName, | | LPCSTR lpszKeyName, |
| LPCSTR lpszString); | | LPCSTR lpszString); |
| | |
|
| | __success(return) |
| BOOL INSTAPI SQLReadFileDSN | | BOOL INSTAPI SQLReadFileDSN |
| ( | | ( |
| LPCSTR lpszFileName, | | LPCSTR lpszFileName, |
| LPCSTR lpszAppName, | | LPCSTR lpszAppName, |
| LPCSTR lpszKeyName, | | LPCSTR lpszKeyName, |
| __out_ecount(cchString) LPSTR lpszString, | | __out_ecount(cchString) LPSTR lpszString, |
| WORD cchString, | | WORD cchString, |
| WORD* pcchString | | WORD* pcchString |
| ); | | ); |
| | |
|
| | __success(return) |
| BOOL INSTAPI SQLInstallDriverEx | | BOOL INSTAPI SQLInstallDriverEx |
| ( | | ( |
| LPCSTR lpszDriver, | | LPCSTR lpszDriver, |
| LPCSTR lpszPathIn, | | LPCSTR lpszPathIn, |
| __out_ecount(cchPathOutMax) LPSTR lpszPathOut, | | __out_ecount(cchPathOutMax) LPSTR lpszPathOut, |
| WORD cchPathOutMax, | | WORD cchPathOutMax, |
| WORD* pcchPathOut, | | WORD* pcchPathOut, |
| WORD fRequest, | | WORD fRequest, |
| LPDWORD lpdwUsageCount | | LPDWORD lpdwUsageCount |
| ); | | ); |
| | |
|
| | __success(return) |
| BOOL INSTAPI SQLInstallTranslatorEx | | BOOL INSTAPI SQLInstallTranslatorEx |
| ( | | ( |
| LPCSTR lpszTranslator, | | LPCSTR lpszTranslator, |
| LPCSTR lpszPathIn, | | LPCSTR lpszPathIn, |
| __out_ecount(cchPathOutMax) LPSTR lpszPathOut, | | __out_ecount(cchPathOutMax) LPSTR lpszPathOut, |
| WORD cchPathOutMax, | | WORD cchPathOutMax, |
| WORD* pcchPathOut, | | WORD* pcchPathOut, |
| WORD fRequest, | | WORD fRequest, |
| LPDWORD lpdwUsageCount | | LPDWORD lpdwUsageCount |
| ); | | ); |
| | |
| skipping to change at line 297 | | skipping to change at line 313 |
|---|
| | |
| // UNICODE APIs | | // UNICODE APIs |
| | |
| // High level APIs | | // High level APIs |
| BOOL INSTAPI SQLInstallODBCW (HWND hwndParent, | | BOOL INSTAPI SQLInstallODBCW (HWND hwndParent, |
| LPCWSTR lpszInfFile, | | LPCWSTR lpszInfFile, |
| LPCWSTR lpszSrcPath, | | LPCWSTR lpszSrcPath, |
| LPCWSTR lpszDrivers); | | LPCWSTR lpszDrivers); |
| BOOL INSTAPI SQLCreateDataSourceW (HWND hwndParent, | | BOOL INSTAPI SQLCreateDataSourceW (HWND hwndParent, |
| LPCWSTR lpszDSN); | | LPCWSTR lpszDSN); |
|
| | __success(return) |
| BOOL INSTAPI SQLGetTranslatorW | | BOOL INSTAPI SQLGetTranslatorW |
| ( | | ( |
| HWND hwnd, | | HWND hwnd, |
| __out_ecount(cchNameMax) LPWSTR lpszName, | | __out_ecount(cchNameMax) LPWSTR lpszName, |
| WORD cchNameMax, | | WORD cchNameMax, |
| WORD* pcchNameOut, | | WORD* pcchNameOut, |
| __out_ecount(cchPathMax) LPWSTR lpszPath, | | __out_ecount(cchPathMax) LPWSTR lpszPath, |
| WORD cchPathMax, | | WORD cchPathMax, |
| WORD* pcchPathOut, | | WORD* pcchPathOut, |
| DWORD* pvOption | | DWORD* pvOption |
| ); | | ); |
| | |
| // Low level APIs | | // Low level APIs |
| // NOTE: The high-level APIs should always be used. These APIs | | // NOTE: The high-level APIs should always be used. These APIs |
| // have been left for compatibility. | | // have been left for compatibility. |
| | |
|
| | __success(return) |
| BOOL INSTAPI SQLInstallDriverW | | BOOL INSTAPI SQLInstallDriverW |
| ( | | ( |
| LPCWSTR lpszInfFile, | | LPCWSTR lpszInfFile, |
| LPCWSTR lpszDriver, | | LPCWSTR lpszDriver, |
|
| __inout_ecount(cchPathMax) LPWSTR lpszPath, | | __out_ecount(cchPathMax) LPWSTR lpszPath, |
| WORD cchPathMax, | | WORD cchPathMax, |
| WORD* pcchPathOut | | WORD* pcchPathOut |
| ); | | ); |
| | |
| BOOL INSTAPI SQLInstallDriverManagerW | | BOOL INSTAPI SQLInstallDriverManagerW |
| ( | | ( |
| __inout_ecount(cchPathMax) LPWSTR lpszPath, | | __inout_ecount(cchPathMax) LPWSTR lpszPath, |
| WORD cchPathMax, | | WORD cchPathMax, |
| WORD* pcchPathOut | | WORD* pcchPathOut |
| ); | | ); |
| | |
|
| | __success(return) |
| BOOL INSTAPI SQLGetInstalledDriversW | | BOOL INSTAPI SQLGetInstalledDriversW |
| ( | | ( |
| __out_ecount(cchBufMax) LPWSTR lpszBuf, | | __out_ecount(cchBufMax) LPWSTR lpszBuf, |
| WORD cchBufMax, | | WORD cchBufMax, |
| WORD* pcchBufOut | | WORD* pcchBufOut |
| ); | | ); |
| | |
|
| | __success(return) |
| BOOL INSTAPI SQLGetAvailableDriversW | | BOOL INSTAPI SQLGetAvailableDriversW |
| ( | | ( |
| LPCWSTR lpszInfFile, | | LPCWSTR lpszInfFile, |
| __out_ecount_opt(cchBufMax) LPWSTR lpszBuf, | | __out_ecount_opt(cchBufMax) LPWSTR lpszBuf, |
| WORD cchBufMax, | | WORD cchBufMax, |
| WORD* pcchBufOut | | WORD* pcchBufOut |
| ); | | ); |
| | |
| BOOL INSTAPI SQLConfigDataSourceW (HWND hwndParent, | | BOOL INSTAPI SQLConfigDataSourceW (HWND hwndParent, |
| WORD fRequest, | | WORD fRequest, |
| | |
| skipping to change at line 358 | | skipping to change at line 378 |
|---|
| BOOL INSTAPI SQLWriteDSNToIniW (LPCWSTR lpszDSN, | | BOOL INSTAPI SQLWriteDSNToIniW (LPCWSTR lpszDSN, |
| LPCWSTR lpszDriver); | | LPCWSTR lpszDriver); |
| BOOL INSTAPI SQLRemoveDSNFromIniW (LPCWSTR lpszDSN); | | BOOL INSTAPI SQLRemoveDSNFromIniW (LPCWSTR lpszDSN); |
| BOOL INSTAPI SQLValidDSNW (LPCWSTR lpszDSN); | | BOOL INSTAPI SQLValidDSNW (LPCWSTR lpszDSN); |
| | |
| BOOL INSTAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, | | BOOL INSTAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, |
| LPCWSTR lpszEntry, | | LPCWSTR lpszEntry, |
| LPCWSTR lpszString, | | LPCWSTR lpszString, |
| LPCWSTR lpszFilename); | | LPCWSTR lpszFilename); |
| | |
|
| | __success(return != 0) |
| int INSTAPI SQLGetPrivateProfileStringW | | int INSTAPI SQLGetPrivateProfileStringW |
| ( | | ( |
| LPCWSTR lpszSection, | | LPCWSTR lpszSection, |
| LPCWSTR lpszEntry, | | LPCWSTR lpszEntry, |
| LPCWSTR lpszDefault, | | LPCWSTR lpszDefault, |
|
| __out_ecount(cchRetBuffer) LPWSTR lpszRetBuffer, | | __out_ecount_opt(cchRetBuffer) LPWSTR lpszRetBuffer, |
| int cchRetBuffer, | | int cchRetBuffer, |
| LPCWSTR lpszFilename | | LPCWSTR lpszFilename |
| ); | | ); |
| | |
| #if (ODBCVER >= 0x0250) | | #if (ODBCVER >= 0x0250) |
| | |
|
| | __success(return) |
| BOOL INSTAPI SQLInstallTranslatorW | | BOOL INSTAPI SQLInstallTranslatorW |
| ( | | ( |
| LPCWSTR lpszInfFile, | | LPCWSTR lpszInfFile, |
| LPCWSTR lpszTranslator, | | LPCWSTR lpszTranslator, |
| LPCWSTR lpszPathIn, | | LPCWSTR lpszPathIn, |
| __out_ecount(cchPathOutMax) LPWSTR lpszPathOut, | | __out_ecount(cchPathOutMax) LPWSTR lpszPathOut, |
| WORD cchPathOutMax, | | WORD cchPathOutMax, |
| WORD* pcchPathOut, | | WORD* pcchPathOut, |
| WORD fRequest, | | WORD fRequest, |
| LPDWORD lpdwUsageCount | | LPDWORD lpdwUsageCount |
| ); | | ); |
| | |
| BOOL INSTAPI SQLRemoveTranslatorW(LPCWSTR lpszTranslator, | | BOOL INSTAPI SQLRemoveTranslatorW(LPCWSTR lpszTranslator, |
| LPDWORD lpdwUsageCount); | | LPDWORD lpdwUsageCount); |
| BOOL INSTAPI SQLRemoveDriverW(LPCWSTR lpszDriver, | | BOOL INSTAPI SQLRemoveDriverW(LPCWSTR lpszDriver, |
| BOOL fRemoveDSN, | | BOOL fRemoveDSN, |
| LPDWORD lpdwUsageCount); | | LPDWORD lpdwUsageCount); |
| | |
|
| | __success(return) |
| BOOL INSTAPI SQLConfigDriverW | | BOOL INSTAPI SQLConfigDriverW |
| ( | | ( |
| HWND hwndParent, | | HWND hwndParent, |
| WORD fRequest, | | WORD fRequest, |
| LPCWSTR lpszDriver, | | LPCWSTR lpszDriver, |
| LPCWSTR lpszArgs, | | LPCWSTR lpszArgs, |
| __out_ecount(cchMsgMax) LPWSTR lpszMsg, | | __out_ecount(cchMsgMax) LPWSTR lpszMsg, |
| WORD cchMsgMax, | | WORD cchMsgMax, |
| WORD* pcchMsgOut | | WORD* pcchMsgOut |
| ); | | ); |
| | |
| #endif | | #endif |
| | |
| #if (ODBCVER >= 0x0300) | | #if (ODBCVER >= 0x0300) |
| | |
|
| | __success(return==0 ||return==1) |
| SQLRETURN INSTAPI SQLInstallerErrorW | | SQLRETURN INSTAPI SQLInstallerErrorW |
| ( | | ( |
| WORD iError, | | WORD iError, |
| DWORD* pfErrorCode, | | DWORD* pfErrorCode, |
| __out_ecount_opt(cchErrorMsgMax) LPWSTR lpszErrorMsg, | | __out_ecount_opt(cchErrorMsgMax) LPWSTR lpszErrorMsg, |
| WORD cchErrorMsgMax, | | WORD cchErrorMsgMax, |
| WORD* pcchErrorMsg | | WORD* pcchErrorMsg |
| ); | | ); |
| | |
| SQLRETURN INSTAPI SQLPostInstallerErrorW(DWORD dwErrorCode, | | SQLRETURN INSTAPI SQLPostInstallerErrorW(DWORD dwErrorCode, |
| LPCWSTR lpszErrorMsg); | | LPCWSTR lpszErrorMsg); |
| | |
| BOOL INSTAPI SQLWriteFileDSNW(LPCWSTR lpszFileName, | | BOOL INSTAPI SQLWriteFileDSNW(LPCWSTR lpszFileName, |
| LPCWSTR lpszAppName, | | LPCWSTR lpszAppName, |
| LPCWSTR lpszKeyName, | | LPCWSTR lpszKeyName, |
| LPCWSTR lpszString); | | LPCWSTR lpszString); |
| | |
|
| | __success(return) |
| BOOL INSTAPI SQLReadFileDSNW | | BOOL INSTAPI SQLReadFileDSNW |
| ( | | ( |
| LPCWSTR lpszFileName, | | LPCWSTR lpszFileName, |
| LPCWSTR lpszAppName, | | LPCWSTR lpszAppName, |
| LPCWSTR lpszKeyName, | | LPCWSTR lpszKeyName, |
| __out_ecount(cchString) LPWSTR lpszString, | | __out_ecount(cchString) LPWSTR lpszString, |
| WORD cchString, | | WORD cchString, |
| WORD* pcchString | | WORD* pcchString |
| ); | | ); |
| | |
|
| | __success(return) |
| BOOL INSTAPI SQLInstallDriverExW | | BOOL INSTAPI SQLInstallDriverExW |
| ( | | ( |
| LPCWSTR lpszDriver, | | LPCWSTR lpszDriver, |
| LPCWSTR lpszPathIn, | | LPCWSTR lpszPathIn, |
| __out_ecount(cchPathOutMax) LPWSTR lpszPathOut, | | __out_ecount(cchPathOutMax) LPWSTR lpszPathOut, |
| WORD cchPathOutMax, | | WORD cchPathOutMax, |
| WORD* pcchPathOut, | | WORD* pcchPathOut, |
| WORD fRequest, | | WORD fRequest, |
| LPDWORD lpdwUsageCount | | LPDWORD lpdwUsageCount |
| ); | | ); |
| | |
|
| | __success(return) |
| BOOL INSTAPI SQLInstallTranslatorExW | | BOOL INSTAPI SQLInstallTranslatorExW |
| ( | | ( |
| LPCWSTR lpszTranslator, | | LPCWSTR lpszTranslator, |
| LPCWSTR lpszPathIn, | | LPCWSTR lpszPathIn, |
| __out_ecount(cchPathOutMax) LPWSTR lpszPathOut, | | __out_ecount(cchPathOutMax) LPWSTR lpszPathOut, |
| WORD cchPathOutMax, | | WORD cchPathOutMax, |
| WORD* pcchPathOut, | | WORD* pcchPathOut, |
| WORD fRequest, | | WORD fRequest, |
| LPDWORD lpdwUsageCount | | LPDWORD lpdwUsageCount |
| ); | | ); |
| | |
| End of changes. 29 change blocks. |
|---|
| 6 lines changed or deleted | | 34 lines changed or added |
|---|
|
This html diff was produced by rfcdiff 1.41. |