|  tapi.h (5.2.3790.3959-Windows 5.0)  |   |  tapi.h (6.0.6000.16386-Windows 6.0)  | 
 
       |   |  | 
      | skipping to change at line 2648 |   | skipping to change at line 2648 | 
      | 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, | 
       | 
      |     LPWSTR              lpszAgentID, |   |     __in_opt LPCWSTR              lpszAgentID, | 
      |     LPWSTR              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, | 
       | 
      |     LPSTR               lpszAgentID, |   |     __in_opt LPCSTR     lpszAgentID, | 
      |     LPSTR               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, | 
       | 
      |     LPWSTR              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, | 
       | 
      |     LPSTR               lpszAgentPIN, |   |     __in_opt LPCSTR     lpszAgentPIN, | 
      |     DWORD               dwWorkingAddressID, |   |     DWORD               dwWorkingAddressID, | 
      |     LPGUID              lpGroupID, |   |     LPGUID              lpGroupID, | 
      |     LPHAGENTSESSION     lphAgentSession |   |     LPHAGENTSESSION     lphAgentSession | 
      |     ); |   |     ); | 
       |   |  | 
      | #ifdef UNICODE |   | #ifdef UNICODE | 
       | 
      | #define lineCreateAgent lineCreateAgentW |   | #define lineCreateAgentSession lineCreateAgentSessionW | 
      | #else |   | #else | 
       | 
      | #define lineCreateAgent lineCreateAgentA |   | #define lineCreateAgentSession lineCreateAgentSessionA | 
      | #endif |   | #endif | 
      | #endif |   | #endif | 
       |   |  | 
      | LONG |   | LONG | 
      | WINAPI |   | WINAPI | 
      | lineDeallocateCall( |   | lineDeallocateCall( | 
      |     HCALL               hCall |   |     HCALL               hCall | 
      |     ); |   |     ); | 
       |   |  | 
      | LONG |   | LONG | 
       |   |  | 
      | skipping to change at line 2815 |   | skipping to change at line 2815 | 
      | #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) | 
      |     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) | 
      |     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) | 
      |     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 5083 |   | skipping to change at line 5086 | 
       |   |  | 
      | LONG |   | LONG | 
      | WINAPI |   | WINAPI | 
      | phoneShutdown( |   | phoneShutdown( | 
      |     HPHONEAPP           hPhoneApp |   |     HPHONEAPP           hPhoneApp | 
      |     ); |   |     ); | 
       |   |  | 
      | LONG |   | LONG | 
      | WINAPI |   | WINAPI | 
      | tapiGetLocationInfo( |   | tapiGetLocationInfo( | 
       | 
      |     LPSTR               lpszCountryCode, |   |     __out_ecount(8) LPSTR               lpszCountryCode, | 
      |     LPSTR               lpszCityCode |   |     __out_ecount(8) LPSTR               lpszCityCode | 
      |     ); |   |     ); | 
       |   |  | 
      | #if WIN32 |   | #if WIN32 | 
      | LONG |   | LONG | 
      | WINAPI |   | WINAPI | 
      | tapiGetLocationInfoA( |   | tapiGetLocationInfoA( | 
       | 
      |     LPSTR               lpszCountryCode, |   |     __out_ecount(8) LPSTR               lpszCountryCode, | 
      |     LPSTR               lpszCityCode |   |     __out_ecount(8) LPSTR               lpszCityCode | 
      |     ); |   |     ); | 
       |   |  | 
      | LONG |   | LONG | 
      | WINAPI |   | WINAPI | 
      | tapiGetLocationInfoW( |   | tapiGetLocationInfoW( | 
       | 
      |     LPWSTR               lpszCountryCodeW, |   |     __out_ecount(8) LPWSTR               lpszCountryCodeW, | 
      |     LPWSTR               lpszCityCodeW |   |     __out_ecount(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 | 
      |   |  | 
     |  End of changes. 12 change blocks.  | 
     | 14 lines changed or deleted |   | 17 lines changed or added | 
      |