| tapi.h (6.1.7600.16385-Windows_7.0) | | tapi.h (6.3.9600.17415-Windows_8.1) |
|---|
| | |
| skipping to change at line 26 | | skipping to change at line 26 |
|---|
| Notes: | | Notes: |
| | |
| Additions to the Telephony Application Programming Interface (TAPI) since | | Additions to the Telephony Application Programming Interface (TAPI) since |
| version 1.0 are noted by version number (e.g. "TAPI v1.4"). | | version 1.0 are noted by version number (e.g. "TAPI v1.4"). |
| | |
| --*/ | | --*/ |
| | |
| #ifndef TAPI_H | | #ifndef TAPI_H |
| #define TAPI_H | | #define TAPI_H |
| | |
|
| | #include <winapifamily.h> |
| | |
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| // | | // |
| // -- TAPI VERSION INFO -- TAPI VERSION INFO -- TAPI VERSION INFO -- | | // -- TAPI VERSION INFO -- TAPI VERSION INFO -- TAPI VERSION INFO -- |
| // | | // |
| // To build a TAPI 1.4 application put a define as below in your source | | // To build a TAPI 1.4 application put a define as below in your source |
| // file before you include TAPI.H: | | // file before you include TAPI.H: |
| // | | // |
| // #define TAPI_CURRENT_VERSION 0x00010004 | | // #define TAPI_CURRENT_VERSION 0x00010004 |
| // | | // |
| // | | // |
| | |
| | |
| skipping to change at line 2650 | | skipping to change at line 2655 |
|---|
| lineConfigProvider( // TAPI v1.4 | | lineConfigProvider( // TAPI v1.4 |
| HWND hwndOwner, | | HWND hwndOwner, |
| DWORD dwPermanentProviderID | | DWORD dwPermanentProviderID |
| ); | | ); |
| | |
| #if (TAPI_CURRENT_VERSION >= 0x00020002) | | #if (TAPI_CURRENT_VERSION >= 0x00020002) |
| LONG | | LONG |
| WINAPI | | WINAPI |
| lineCreateAgentW( // TAPI v2.2 | | lineCreateAgentW( // TAPI v2.2 |
| HLINE hLine, | | HLINE hLine, |
|
| __in_opt LPCWSTR lpszAgentID, | | _In_opt_ LPCWSTR lpszAgentID, |
| __in_opt LPCWSTR lpszAgentPIN, | | _In_opt_ LPCWSTR lpszAgentPIN, |
| LPHAGENT lphAgent | | LPHAGENT lphAgent |
| ); | | ); |
| | |
| LONG | | LONG |
| WINAPI | | WINAPI |
| lineCreateAgentA( // TAPI v2.2 | | lineCreateAgentA( // TAPI v2.2 |
| HLINE hLine, | | HLINE hLine, |
|
| __in_opt LPCSTR lpszAgentID, | | _In_opt_ LPCSTR lpszAgentID, |
| __in_opt LPCSTR lpszAgentPIN, | | _In_opt_ LPCSTR lpszAgentPIN, |
| LPHAGENT lphAgent | | LPHAGENT lphAgent |
| ); | | ); |
| | |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define lineCreateAgent lineCreateAgentW | | #define lineCreateAgent lineCreateAgentW |
| #else | | #else |
| #define lineCreateAgent lineCreateAgentA | | #define lineCreateAgent lineCreateAgentA |
| #endif | | #endif |
| | |
| LONG | | LONG |
| WINAPI | | WINAPI |
| lineCreateAgentSessionW( // TAPI v2.2 | | lineCreateAgentSessionW( // TAPI v2.2 |
| HLINE hLine, | | HLINE hLine, |
| HAGENT hAgent, | | HAGENT hAgent, |
|
| __in_opt LPCWSTR lpszAgentPIN, | | _In_opt_ LPCWSTR lpszAgentPIN, |
| DWORD dwWorkingAddressID, | | DWORD dwWorkingAddressID, |
| LPGUID lpGroupID, | | LPGUID lpGroupID, |
| LPHAGENTSESSION lphAgentSession | | LPHAGENTSESSION lphAgentSession |
| ); | | ); |
| | |
| LONG | | LONG |
| WINAPI | | WINAPI |
| lineCreateAgentSessionA( // TAPI v2.2 | | lineCreateAgentSessionA( // TAPI v2.2 |
| HLINE hLine, | | HLINE hLine, |
| HAGENT hAgent, | | HAGENT hAgent, |
|
| __in_opt LPCSTR lpszAgentPIN, | | _In_opt_ LPCSTR lpszAgentPIN, |
| DWORD dwWorkingAddressID, | | DWORD dwWorkingAddressID, |
| LPGUID lpGroupID, | | LPGUID lpGroupID, |
| LPHAGENTSESSION lphAgentSession | | LPHAGENTSESSION lphAgentSession |
| ); | | ); |
| | |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define lineCreateAgentSession lineCreateAgentSessionW | | #define lineCreateAgentSession lineCreateAgentSessionW |
| #else | | #else |
| #define lineCreateAgentSession lineCreateAgentSessionA | | #define lineCreateAgentSession lineCreateAgentSessionA |
| #endif | | #endif |
| | |
| skipping to change at line 2817 | | skipping to change at line 2822 |
|---|
| #define lineForward lineForwardA | | #define lineForward lineForwardA |
| #endif | | #endif |
| #endif | | #endif |
| #endif | | #endif |
| | |
| LONG | | LONG |
| WINAPI | | WINAPI |
| lineGatherDigits( | | lineGatherDigits( |
| HCALL hCall, | | HCALL hCall, |
| DWORD dwDigitModes, | | DWORD dwDigitModes, |
|
| __out_ecount_opt(dwNumDigits) | | _Out_writes_opt_(dwNumDigits) |
| LPSTR lpsDigits, | | LPSTR lpsDigits, |
| DWORD dwNumDigits, | | DWORD dwNumDigits, |
| LPCSTR lpszTerminationDigits, | | LPCSTR lpszTerminationDigits, |
| DWORD dwFirstDigitTimeout, | | DWORD dwFirstDigitTimeout, |
| DWORD dwInterDigitTimeout | | DWORD dwInterDigitTimeout |
| ); | | ); |
| | |
| #if WIN32 | | #if WIN32 |
| LONG | | LONG |
| WINAPI | | WINAPI |
| lineGatherDigitsA( | | lineGatherDigitsA( |
| HCALL hCall, | | HCALL hCall, |
| DWORD dwDigitModes, | | DWORD dwDigitModes, |
|
| __out_ecount_opt(dwNumDigits) | | _Out_writes_opt_(dwNumDigits) |
| LPSTR lpsDigits, | | LPSTR lpsDigits, |
| DWORD dwNumDigits, | | DWORD dwNumDigits, |
| LPCSTR lpszTerminationDigits, | | LPCSTR lpszTerminationDigits, |
| DWORD dwFirstDigitTimeout, | | DWORD dwFirstDigitTimeout, |
| DWORD dwInterDigitTimeout | | DWORD dwInterDigitTimeout |
| ); | | ); |
| | |
| LONG | | LONG |
| WINAPI | | WINAPI |
| lineGatherDigitsW( | | lineGatherDigitsW( |
| HCALL hCall, | | HCALL hCall, |
| DWORD dwDigitModes, | | DWORD dwDigitModes, |
|
| __out_ecount_opt(dwNumDigits) | | _Out_writes_opt_(dwNumDigits) |
| LPWSTR lpsDigits, | | LPWSTR lpsDigits, |
| DWORD dwNumDigits, | | DWORD dwNumDigits, |
| LPCWSTR lpszTerminationDigits, | | LPCWSTR lpszTerminationDigits, |
| DWORD dwFirstDigitTimeout, | | DWORD dwFirstDigitTimeout, |
| DWORD dwInterDigitTimeout | | DWORD dwInterDigitTimeout |
| ); | | ); |
| | |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define lineGatherDigits lineGatherDigitsW | | #define lineGatherDigits lineGatherDigitsW |
| #else | | #else |
| | |
| skipping to change at line 5088 | | skipping to change at line 5093 |
|---|
| | |
| LONG | | LONG |
| WINAPI | | WINAPI |
| phoneShutdown( | | phoneShutdown( |
| HPHONEAPP hPhoneApp | | HPHONEAPP hPhoneApp |
| ); | | ); |
| | |
| LONG | | LONG |
| WINAPI | | WINAPI |
| tapiGetLocationInfo( | | tapiGetLocationInfo( |
|
| __out_ecount(8) LPSTR lpszCountryCode, | | _Out_writes_(8) LPSTR lpszCountryCode, |
| __out_ecount(8) LPSTR lpszCityCode | | _Out_writes_(8) LPSTR lpszCityCode |
| ); | | ); |
| | |
| #if WIN32 | | #if WIN32 |
| LONG | | LONG |
| WINAPI | | WINAPI |
| tapiGetLocationInfoA( | | tapiGetLocationInfoA( |
|
| __out_ecount(8) LPSTR lpszCountryCode, | | _Out_writes_(8) LPSTR lpszCountryCode, |
| __out_ecount(8) LPSTR lpszCityCode | | _Out_writes_(8) LPSTR lpszCityCode |
| ); | | ); |
| | |
| LONG | | LONG |
| WINAPI | | WINAPI |
| tapiGetLocationInfoW( | | tapiGetLocationInfoW( |
|
| __out_ecount(8) LPWSTR lpszCountryCodeW, | | _Out_writes_(8) LPWSTR lpszCountryCodeW, |
| __out_ecount(8) LPWSTR lpszCityCodeW | | _Out_writes_(8) LPWSTR lpszCityCodeW |
| ); | | ); |
| | |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define tapiGetLocationInfo tapiGetLocationInfoW | | #define tapiGetLocationInfo tapiGetLocationInfoW |
| #else | | #else |
| #if (TAPI_CURRENT_VERSION >= 0x00020000) | | #if (TAPI_CURRENT_VERSION >= 0x00020000) |
| #define tapiGetLocationInfo tapiGetLocationInfoA | | #define tapiGetLocationInfo tapiGetLocationInfoA |
| #endif | | #endif |
| #endif | | #endif |
| #endif | | #endif |
| | |
| skipping to change at line 5263 | | skipping to change at line 5268 |
|---|
| ( (__ErrCode__) - 0x90000000 + 0xF000 ) :
\ | | ( (__ErrCode__) - 0x90000000 + 0xF000 ) :
\ |
|
\ | |
\ |
| ( (__ErrCode__) - 0x80000000 + 0xE000 ) ) ) | | ( (__ErrCode__) - 0x80000000 + 0xE000 ) ) ) |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } /* End of extern "C" { */ | | } /* End of extern "C" { */ |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ |
| | |
| #pragma pack() | | #pragma pack() |
| | |
|
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| | #pragma endregion |
| | |
| #endif // TAPI_H | | #endif // TAPI_H |
| | |
| End of changes. 12 change blocks. |
|---|
| 15 lines changed or deleted | | 23 lines changed or added |
|---|
|