Headers diff for odbccp32.dll between 6.1.7601.17632-Windows_7.0 and 6.3.9600.17415-Windows_8.1 versions
| odbcinst.h (6.1.7601.17632-Windows_7.0) | | odbcinst.h (6.3.9600.17415-Windows_8.1) |
|---|
|
| | /******************************************************** |
| | * * |
| | * Copyright (C) Microsoft. All rights reserved. * |
| | * * |
| | ********************************************************/ |
| | |
| //----------------------------------------------------------------------------- | | //----------------------------------------------------------------------------- |
| // File: odbcinst.h | | // File: odbcinst.h |
| // | | // |
|
| // Copyright: Copyright (c) Microsoft Corporation | | |
| // | | |
| // Contents: Prototypes for ODBCCP32.DLL | | // Contents: Prototypes for ODBCCP32.DLL |
| // | | // |
| // Comments: | | // Comments: |
| // | | // |
| //----------------------------------------------------------------------------- | | //----------------------------------------------------------------------------- |
| | |
| #ifndef __ODBCINST_H | | #ifndef __ODBCINST_H |
| #define __ODBCINST_H | | #define __ODBCINST_H |
|
| | #include <winapifamily.h> |
| | |
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| #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 |
| | |
| skipping to change at line 101 | | skipping to change at line 109 |
|---|
| | |
| #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, | | __declspec(deprecated("ODBC Installer API: SQLInstallODBC is no-op.")) |
| LPCSTR lpszInfFile, | | BOOL INSTAPI SQLInstallODBC (_Reserved_ HWND, |
| LPCSTR lpszSrcPath, | | _Reserved_ LPCSTR, |
| LPCSTR lpszDrivers); | | _Reserved_ LPCSTR, |
| | _Reserved_ LPCSTR); |
| | |
| 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) | | _Success_(return) |
| BOOL INSTAPI SQLGetTranslator | | BOOL INSTAPI SQLGetTranslator |
| ( | | ( |
| HWND hwnd, | | HWND hwnd, |
|
| __inout_ecount(cchNameMax) LPSTR lpszName, | | _Inout_updates_(cchNameMax) LPSTR lpszName, |
| WORD cchNameMax, | | WORD cchNameMax, |
| WORD* pcchNameOut, | | WORD* pcchNameOut, |
|
| __out_ecount(cchPathMax) LPSTR lpszPath, | | _Out_writes_(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) | | _Success_(return) |
| BOOL INSTAPI SQLInstallDriver | | BOOL INSTAPI SQLInstallDriver |
| ( | | ( |
| LPCSTR lpszInfFile, | | LPCSTR lpszInfFile, |
| LPCSTR lpszDriver, | | LPCSTR lpszDriver, |
|
| __out_ecount_opt(cchPathMax) LPSTR lpszPath, | | _Out_writes_opt_(cchPathMax) LPSTR lpszPath, |
| WORD cchPathMax, | | WORD cchPathMax, |
| WORD* pcchPathOut | | WORD* pcchPathOut |
| ); | | ); |
| | |
| BOOL INSTAPI SQLInstallDriverManager | | BOOL INSTAPI SQLInstallDriverManager |
| ( | | ( |
|
| __inout_ecount(cchPathMax) LPSTR lpszPath, | | _Inout_updates_(cchPathMax) LPSTR lpszPath, |
| WORD cchPathMax, | | WORD cchPathMax, |
| WORD* pcchPathOut | | WORD* pcchPathOut |
| ); | | ); |
| | |
|
| __success(return) | | _Success_(return) |
| BOOL INSTAPI SQLGetInstalledDrivers | | BOOL INSTAPI SQLGetInstalledDrivers |
| ( | | ( |
|
| __out_ecount(cchBufMax) LPSTR lpszBuf, | | _Out_writes_(cchBufMax) LPSTR lpszBuf, |
| WORD cchBufMax, | | WORD cchBufMax, |
| WORD* pcchBufOut | | WORD* pcchBufOut |
| ); | | ); |
| | |
|
| __success(return) | | __declspec(deprecated("ODBC API: SQLGetAvailableDrivers is a no-op.")) |
| BOOL INSTAPI SQLGetAvailableDrivers | | BOOL INSTAPI SQLGetAvailableDrivers |
| ( | | ( |
|
| LPCSTR lpszInfFile, | | _Reserved_ LPCSTR, |
| __out_ecount(cchBufMax) LPSTR lpszBuf, | | _Reserved_ LPSTR, |
| WORD cchBufMax, | | _Reserved_ WORD, |
| WORD* pcchBufOut | | _Reserved_ WORD* |
| ); | | ); |
| | |
| BOOL INSTAPI SQLConfigDataSource (HWND hwndParent, | | BOOL INSTAPI SQLConfigDataSource (HWND hwndParent, |
| WORD fRequest, | | WORD fRequest, |
| LPCSTR lpszDriver, | | LPCSTR lpszDriver, |
| LPCSTR lpszAttributes); | | LPCSTR lpszAttributes); |
| BOOL INSTAPI SQLRemoveDefaultDataSource(void); | | BOOL INSTAPI SQLRemoveDefaultDataSource(void); |
| 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) | | _Success_(return != 0) |
| int INSTAPI SQLGetPrivateProfileString | | int INSTAPI SQLGetPrivateProfileString |
| ( | | ( |
| LPCSTR lpszSection, | | LPCSTR lpszSection, |
| LPCSTR lpszEntry, | | LPCSTR lpszEntry, |
| LPCSTR lpszDefault, | | LPCSTR lpszDefault, |
|
| __out_ecount_opt(cchRetBuffer) LPSTR lpszRetBuffer, | | _Out_writes_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) | | _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_writes_(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) | | _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_writes_(cchMsgMax) LPSTR lpszMsg, |
| WORD cchMsgMax, | | WORD cchMsgMax, |
| WORD* pcchMsgOut | | WORD* pcchMsgOut |
| ); | | ); |
| | |
| #endif | | #endif |
| | |
| #if (ODBCVER >= 0x0300) | | #if (ODBCVER >= 0x0300) |
| | |
|
| __success(return==0 ||return==1) | | _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_writes_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) | | _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_writes_(cchString) LPSTR lpszString, |
| WORD cchString, | | WORD cchString, |
| WORD* pcchString | | WORD* pcchString |
| ); | | ); |
| | |
|
| __success(return) | | _Success_(return) |
| BOOL INSTAPI SQLInstallDriverEx | | BOOL INSTAPI SQLInstallDriverEx |
| ( | | ( |
| LPCSTR lpszDriver, | | LPCSTR lpszDriver, |
| LPCSTR lpszPathIn, | | LPCSTR lpszPathIn, |
|
| __out_ecount(cchPathOutMax) LPSTR lpszPathOut, | | _Out_writes_(cchPathOutMax) LPSTR lpszPathOut, |
| WORD cchPathOutMax, | | WORD cchPathOutMax, |
| WORD* pcchPathOut, | | WORD* pcchPathOut, |
| WORD fRequest, | | WORD fRequest, |
| LPDWORD lpdwUsageCount | | LPDWORD lpdwUsageCount |
| ); | | ); |
| | |
|
| __success(return) | | _Success_(return) |
| BOOL INSTAPI SQLInstallTranslatorEx | | BOOL INSTAPI SQLInstallTranslatorEx |
| ( | | ( |
| LPCSTR lpszTranslator, | | LPCSTR lpszTranslator, |
| LPCSTR lpszPathIn, | | LPCSTR lpszPathIn, |
|
| __out_ecount(cchPathOutMax) LPSTR lpszPathOut, | | _Out_writes_(cchPathOutMax) LPSTR lpszPathOut, |
| WORD cchPathOutMax, | | WORD cchPathOutMax, |
| WORD* pcchPathOut, | | WORD* pcchPathOut, |
| WORD fRequest, | | WORD fRequest, |
| LPDWORD lpdwUsageCount | | LPDWORD lpdwUsageCount |
| ); | | ); |
| | |
| BOOL INSTAPI SQLGetConfigMode(UWORD *pwConfigMode); | | BOOL INSTAPI SQLGetConfigMode(UWORD *pwConfigMode); |
| BOOL INSTAPI SQLSetConfigMode(UWORD wConfigMode); | | BOOL INSTAPI SQLSetConfigMode(UWORD wConfigMode); |
| #endif /* ODBCVER >= 0x0300 */ | | #endif /* ODBCVER >= 0x0300 */ |
| | |
| | |
| skipping to change at line 297 | | skipping to change at line 307 |
|---|
| DWORD *pvOption); | | DWORD *pvOption); |
| | |
| #if (ODBCVER >= 0x0250) | | #if (ODBCVER >= 0x0250) |
| | |
| BOOL INSTAPI ConfigDriver | | BOOL INSTAPI ConfigDriver |
| ( | | ( |
| HWND hwndParent, | | HWND hwndParent, |
| WORD fRequest, | | WORD fRequest, |
| LPCSTR lpszDriver, | | LPCSTR lpszDriver, |
| LPCSTR lpszArgs, | | LPCSTR lpszArgs, |
|
| __out_ecount(cchMsgMax) LPSTR lpszMsg, | | _Out_writes_(cchMsgMax) LPSTR lpszMsg, |
| WORD cchMsgMax, | | WORD cchMsgMax, |
| WORD* pcchMsgOut | | WORD* pcchMsgOut |
| ); | | ); |
| | |
| #endif | | #endif |
| | |
| // UNICODE APIs | | // UNICODE APIs |
| | |
| // High level APIs | | // High level APIs |
|
| BOOL INSTAPI SQLInstallODBCW (HWND hwndParent, | | __declspec(deprecated("ODBC API: SQLInstallODBCW is a no-op.")) |
| LPCWSTR lpszInfFile, | | BOOL INSTAPI SQLInstallODBCW (_Reserved_ HWND, |
| LPCWSTR lpszSrcPath, | | _Reserved_ LPCWSTR, |
| LPCWSTR lpszDrivers); | | _Reserved_ LPCWSTR, |
| | _Reserved_ LPCWSTR); |
| BOOL INSTAPI SQLCreateDataSourceW (HWND hwndParent, | | BOOL INSTAPI SQLCreateDataSourceW (HWND hwndParent, |
| LPCWSTR lpszDSN); | | LPCWSTR lpszDSN); |
|
| __success(return) | | _Success_(return) |
| BOOL INSTAPI SQLGetTranslatorW | | BOOL INSTAPI SQLGetTranslatorW |
| ( | | ( |
| HWND hwnd, | | HWND hwnd, |
|
| __out_ecount(cchNameMax) LPWSTR lpszName, | | _Out_writes_to_opt_(cchNameMax, *pcchNameOut) LPWSTR lpszName, |
| WORD cchNameMax, | | WORD cchNameMax, |
| WORD* pcchNameOut, | | WORD* pcchNameOut, |
|
| __out_ecount(cchPathMax) LPWSTR lpszPath, | | _Out_writes_to_opt_(cchPathMax, *pcchPathOut) 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) | | _Success_(return) |
| BOOL INSTAPI SQLInstallDriverW | | BOOL INSTAPI SQLInstallDriverW |
| ( | | ( |
| LPCWSTR lpszInfFile, | | LPCWSTR lpszInfFile, |
| LPCWSTR lpszDriver, | | LPCWSTR lpszDriver, |
|
| __out_ecount(cchPathMax) LPWSTR lpszPath, | | _Out_writes_(cchPathMax) LPWSTR lpszPath, |
| WORD cchPathMax, | | WORD cchPathMax, |
| WORD* pcchPathOut | | WORD* pcchPathOut |
| ); | | ); |
| | |
| BOOL INSTAPI SQLInstallDriverManagerW | | BOOL INSTAPI SQLInstallDriverManagerW |
| ( | | ( |
|
| __inout_ecount(cchPathMax) LPWSTR lpszPath, | | _Inout_updates_(cchPathMax) LPWSTR lpszPath, |
| WORD cchPathMax, | | WORD cchPathMax, |
| WORD* pcchPathOut | | WORD* pcchPathOut |
| ); | | ); |
| | |
|
| __success(return) | | _Success_(return) |
| BOOL INSTAPI SQLGetInstalledDriversW | | BOOL INSTAPI SQLGetInstalledDriversW |
| ( | | ( |
|
| __out_ecount(cchBufMax) LPWSTR lpszBuf, | | _Out_writes_(cchBufMax) LPWSTR lpszBuf, |
| WORD cchBufMax, | | WORD cchBufMax, |
| WORD* pcchBufOut | | WORD* pcchBufOut |
| ); | | ); |
| | |
|
| __success(return) | | __declspec(deprecated("ODBC API: SQLGetAvailableDriversW is a no-op.")) |
| BOOL INSTAPI SQLGetAvailableDriversW | | BOOL INSTAPI SQLGetAvailableDriversW |
| ( | | ( |
|
| LPCWSTR lpszInfFile, | | _Reserved_ LPCWSTR, |
| __out_ecount_opt(cchBufMax) LPWSTR lpszBuf, | | _Reserved_ LPWSTR, |
| WORD cchBufMax, | | _Reserved_ WORD, |
| WORD* pcchBufOut | | _Reserved_ WORD* |
| ); | | ); |
| | |
| BOOL INSTAPI SQLConfigDataSourceW (HWND hwndParent, | | BOOL INSTAPI SQLConfigDataSourceW (HWND hwndParent, |
| WORD fRequest, | | WORD fRequest, |
| LPCWSTR lpszDriver, | | LPCWSTR lpszDriver, |
| LPCWSTR lpszAttributes); | | LPCWSTR lpszAttributes); |
| 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) | | _Success_(return != 0) |
| int INSTAPI SQLGetPrivateProfileStringW | | int INSTAPI SQLGetPrivateProfileStringW |
| ( | | ( |
|
| LPCWSTR lpszSection, | | _In_opt_ LPCWSTR lpszSection, |
| LPCWSTR lpszEntry, | | _In_opt_ LPCWSTR lpszEntry, |
| LPCWSTR lpszDefault, | | _In_opt_ LPCWSTR lpszDefault, |
| __out_ecount_opt(cchRetBuffer) LPWSTR lpszRetBuffer, | | _Out_writes_opt_(cchRetBuffer) LPWSTR lpszRetBuffer, |
| int cchRetBuffer, | | int cchRetBuffer, |
| LPCWSTR lpszFilename | | _In_opt_ LPCWSTR lpszFilename |
| ); | | ); |
| | |
| #if (ODBCVER >= 0x0250) | | #if (ODBCVER >= 0x0250) |
| | |
|
| __success(return) | | _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_writes_(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) | | _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_writes_(cchMsgMax) LPWSTR lpszMsg, |
| WORD cchMsgMax, | | WORD cchMsgMax, |
| WORD* pcchMsgOut | | WORD* pcchMsgOut |
| ); | | ); |
| | |
| #endif | | #endif |
| | |
| #if (ODBCVER >= 0x0300) | | #if (ODBCVER >= 0x0300) |
| | |
|
| __success(return==0 ||return==1) | | _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_writes_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) | | _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_writes_(cchString) LPWSTR lpszString, |
| WORD cchString, | | WORD cchString, |
| WORD* pcchString | | WORD* pcchString |
| ); | | ); |
| | |
|
| __success(return) | | _Success_(return) |
| BOOL INSTAPI SQLInstallDriverExW | | BOOL INSTAPI SQLInstallDriverExW |
| ( | | ( |
| LPCWSTR lpszDriver, | | LPCWSTR lpszDriver, |
| LPCWSTR lpszPathIn, | | LPCWSTR lpszPathIn, |
|
| __out_ecount(cchPathOutMax) LPWSTR lpszPathOut, | | _Out_writes_(cchPathOutMax) LPWSTR lpszPathOut, |
| WORD cchPathOutMax, | | WORD cchPathOutMax, |
| WORD* pcchPathOut, | | WORD* pcchPathOut, |
| WORD fRequest, | | WORD fRequest, |
| LPDWORD lpdwUsageCount | | LPDWORD lpdwUsageCount |
| ); | | ); |
| | |
|
| __success(return) | | _Success_(return) |
| BOOL INSTAPI SQLInstallTranslatorExW | | BOOL INSTAPI SQLInstallTranslatorExW |
| ( | | ( |
| LPCWSTR lpszTranslator, | | LPCWSTR lpszTranslator, |
| LPCWSTR lpszPathIn, | | LPCWSTR lpszPathIn, |
|
| __out_ecount(cchPathOutMax) LPWSTR lpszPathOut, | | _Out_writes_(cchPathOutMax) LPWSTR lpszPathOut, |
| WORD cchPathOutMax, | | WORD cchPathOutMax, |
| WORD* pcchPathOut, | | WORD* pcchPathOut, |
| WORD fRequest, | | WORD fRequest, |
| LPDWORD lpdwUsageCount | | LPDWORD lpdwUsageCount |
| ); | | ); |
| | |
| #endif /* ODBCVER >= 0x0300 */ | | #endif /* ODBCVER >= 0x0300 */ |
| | |
| // Driver specific Setup APIs called by installer | | // Driver specific Setup APIs called by installer |
| | |
| | |
| skipping to change at line 496 | | skipping to change at line 507 |
|---|
| LPCWSTR lpszAttributes); | | LPCWSTR lpszAttributes); |
| | |
| #if (ODBCVER >= 0x0250) | | #if (ODBCVER >= 0x0250) |
| | |
| BOOL INSTAPI ConfigDriverW | | BOOL INSTAPI ConfigDriverW |
| ( | | ( |
| HWND hwndParent, | | HWND hwndParent, |
| WORD fRequest, | | WORD fRequest, |
| LPCWSTR lpszDriver, | | LPCWSTR lpszDriver, |
| LPCWSTR lpszArgs, | | LPCWSTR lpszArgs, |
|
| __out_ecount(cchMsgMax) LPWSTR lpszMsg, | | _Out_writes_(cchMsgMax) LPWSTR lpszMsg, |
| WORD cchMsgMax, | | WORD cchMsgMax, |
| WORD* pcchMsgOut | | WORD* pcchMsgOut |
| ); | | ); |
| | |
| #endif | | #endif |
| | |
| #ifndef SQL_NOUNICODEMAP // define this to disable the mapping | | #ifndef SQL_NOUNICODEMAP // define this to disable the mapping |
| #ifdef UNICODE | | #ifdef UNICODE |
| | |
| #define SQLInstallODBC SQLInstallODBCW | | #define SQLInstallODBC SQLInstallODBCW |
| | |
| skipping to change at line 539 | | skipping to change at line 550 |
|---|
| | |
| #endif // UNICODE | | #endif // UNICODE |
| #endif // SQL_NOUNICODEMAP | | #endif // SQL_NOUNICODEMAP |
| | |
| #endif // RC_INVOKED | | #endif // RC_INVOKED |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } // End of extern "C" { | | } // End of extern "C" { |
| #endif // __cplusplus | | #endif // __cplusplus |
| | |
|
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| | #pragma endregion |
| | |
| #endif // __ODBCINST_H | | #endif // __ODBCINST_H |
| | |
| End of changes. 56 change blocks. |
|---|
| 71 lines changed or deleted | | 85 lines changed or added |
|---|
|
This html diff was produced by rfcdiff 1.41. |