tapi.h: Move the unicode A/W macros after the function prototypes.
(lineAddProvider,lineBlindTransfer,lineConfigDialog,
lineConfigDialogEdit,lineDial,lineGatherDigits,lineGenerateDigits,
lineGetAddressID,lineGetAppPriority,lineGetDevConfig,lineGetIcon,
lineGetID,lineHandoff,lineMakeCall,linePark,linePickup,lineRedirect,
lineSetAppPriority,lineSetDevConfig,lineSetTollList,
lineTranslateAddress,lineTranslateDialog,lineUnpark,phoneConfigDialog,
phoneGetIcon,phoneGetID,tapiGetLocationInfo,tapiRequestMakeCall,
tapiRequestMediaCall): Define as *A variant only for TAPI2 or newer,
but always define as *W variant when UNICODE is defined.
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/stable/v1.x@5213 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/revstamp.h b/mingw-w64-crt/revstamp.h
index c702ec5..d65009d 100644
--- a/mingw-w64-crt/revstamp.h
+++ b/mingw-w64-crt/revstamp.h
@@ -1,4 +1,4 @@
/* Do not edit. Autogenerated. */
-#define __MINGW_W64_REV "5205"
+#define __MINGW_W64_REV "5213"
#define __MINGW_W64_REV_STAMP "2012-07-11"
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index 626d633..23af7a8 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,16 @@
+2012-07-11 Ozkan Sezer <sezeroz@gmail.com>
+
+ * tapi.h: Move the unicode A/W macros after the function prototypes.
+ (lineAddProvider,lineBlindTransfer,lineConfigDialog,
+ lineConfigDialogEdit,lineDial,lineGatherDigits,lineGenerateDigits,
+ lineGetAddressID,lineGetAppPriority,lineGetDevConfig,lineGetIcon,
+ lineGetID,lineHandoff,lineMakeCall,linePark,linePickup,lineRedirect,
+ lineSetAppPriority,lineSetDevConfig,lineSetTollList,
+ lineTranslateAddress,lineTranslateDialog,lineUnpark,phoneConfigDialog,
+ phoneGetIcon,phoneGetID,tapiGetLocationInfo,tapiRequestMakeCall,
+ tapiRequestMediaCall): Define as *A variant only for TAPI2 or newer,
+ but always define as *W variant when UNICODE is defined.
+
2012-06-27 Corinna Vinschen <vinschen@redhat.com>
* include/stralign.h: Fix and add #endif comments.
diff --git a/mingw-w64-headers/include/tapi.h b/mingw-w64-headers/include/tapi.h
index af9e68e..1ac135c 100644
--- a/mingw-w64-headers/include/tapi.h
+++ b/mingw-w64-headers/include/tapi.h
@@ -2005,124 +2005,6 @@
DWORD dwStringOffset;
} VARSTRING,*LPVARSTRING;
-#ifdef UNICODE
-#define lineAddProvider lineAddProviderW
-#define lineBlindTransfer lineBlindTransferW
-#define lineConfigDialog lineConfigDialogW
-#define lineConfigDialogEdit lineConfigDialogEditW
-#define lineCreateAgent lineCreateAgentW
-#define lineCreateAgent lineCreateAgentW
-#define lineDial lineDialW
-#define lineForward lineForwardW
-#define lineGatherDigits lineGatherDigitsW
-#define lineGenerateDigits lineGenerateDigitsW
-#define lineGetAddressCaps lineGetAddressCapsW
-#define lineGetAddressID lineGetAddressIDW
-#define lineGetAddressStatus lineGetAddressStatusW
-#define lineGetAgentActivityList lineGetAgentActivityListW
-#define lineGetAgentCaps lineGetAgentCapsW
-#define lineGetAgentGroupList lineGetAgentGroupListW
-#define lineGetAgentStatus lineGetAgentStatusW
-#define lineGetAppPriority lineGetAppPriorityW
-#define lineGetCallInfo lineGetCallInfoW
-#define lineGetCountry lineGetCountryW
-#define lineGetDevCaps lineGetDevCapsW
-#define lineGetDevConfig lineGetDevConfigW
-#define lineGetGroupList lineGetGroupListW
-#define lineGetIcon lineGetIconW
-#define lineGetID lineGetIDW
-#define lineGetDevStatus lineGetDevStatusW
-#define lineGetProviderList lineGetProviderListW
-#define lineGetQueueList lineGetQueueListW
-#define lineGetRequest lineGetRequestW
-#define lineGetTranslateCaps lineGetTranslateCapsW
-#define lineHandoff lineHandoffW
-#define lineInitializeEx lineInitializeExW
-#define lineMakeCall lineMakeCallW
-#define lineOpen lineOpenW
-#define linePark lineParkW
-#define linePickup linePickupW
-#define linePrepareAddToConference linePrepareAddToConferenceW
-#define lineRedirect lineRedirectW
-#define lineSetAppPriority lineSetAppPriorityW
-#define lineSetDevConfig lineSetDevConfigW
-#define lineSetTollList lineSetTollListW
-#define lineSetupConference lineSetupConferenceW
-#define lineSetupTransfer lineSetupTransferW
-#define lineTranslateAddress lineTranslateAddressW
-#define lineTranslateDialog lineTranslateDialogW
-#define lineUnpark lineUnparkW
-#define phoneConfigDialog phoneConfigDialogW
-#define phoneGetButtonInfo phoneGetButtonInfoW
-#define phoneGetDevCaps phoneGetDevCapsW
-#define phoneGetIcon phoneGetIconW
-#define phoneGetID phoneGetIDW
-#define phoneGetStatus phoneGetStatusW
-#define phoneInitializeEx phoneInitializeExW
-#define phoneSetButtonInfo phoneSetButtonInfoW
-#define tapiGetLocationInfo tapiGetLocationInfoW
-#define tapiRequestMakeCall tapiRequestMakeCallW
-#define tapiRequestMediaCall tapiRequestMediaCallW
-#else
-#define lineAddProvider lineAddProviderA
-#define lineBlindTransfer lineBlindTransferA
-#define lineConfigDialog lineConfigDialogA
-#define lineConfigDialogEdit lineConfigDialogEditA
-#define lineCreateAgent lineCreateAgentA
-#define lineCreateAgent lineCreateAgentA
-#define lineDial lineDialA
-#define lineForward lineForwardA
-#define lineGatherDigits lineGatherDigitsA
-#define lineGenerateDigits lineGenerateDigitsA
-#define lineGetAddressCaps lineGetAddressCapsA
-#define lineGetAddressID lineGetAddressIDA
-#define lineGetAddressStatus lineGetAddressStatusA
-#define lineGetAgentActivityList lineGetAgentActivityListA
-#define lineGetAgentCaps lineGetAgentCapsA
-#define lineGetAgentGroupList lineGetAgentGroupListA
-#define lineGetAgentStatus lineGetAgentStatusA
-#define lineGetAppPriority lineGetAppPriorityA
-#define lineGetCallInfo lineGetCallInfoA
-#define lineGetCountry lineGetCountryA
-#define lineGetDevCaps lineGetDevCapsA
-#define lineGetDevConfig lineGetDevConfigA
-#define lineGetGroupList lineGetGroupListA
-#define lineGetIcon lineGetIconA
-#define lineGetID lineGetIDA
-#define lineGetDevStatus lineGetDevStatusA
-#define lineGetProviderList lineGetProviderListA
-#define lineGetQueueList lineGetQueueListA
-#define lineGetRequest lineGetRequestA
-#define lineGetTranslateCaps lineGetTranslateCapsA
-#define lineHandoff lineHandoffA
-#define lineInitializeEx lineInitializeExA
-#define lineMakeCall lineMakeCallA
-#define lineOpen lineOpenA
-#define linePark lineParkA
-#define linePickup linePickupA
-#define linePrepareAddToConference linePrepareAddToConferenceA
-#define lineRedirect lineRedirectA
-#define lineSetAppPriority lineSetAppPriorityA
-#define lineSetDevConfig lineSetDevConfigA
-#define lineSetTollList lineSetTollListA
-#define lineSetupConference lineSetupConferenceA
-#define lineSetupTransfer lineSetupTransferA
-#define lineTranslateAddress lineTranslateAddressA
-#define lineTranslateDialog lineTranslateDialogA
-#define lineUnpark lineUnparkA
-#define phoneConfigDialog phoneConfigDialogA
-#define phoneGetButtonInfo phoneGetButtonInfoA
-#define phoneGetDevCaps phoneGetDevCapsA
-#define phoneGetIcon phoneGetIconA
-#define phoneGetID phoneGetIDA
-#define phoneGetStatus phoneGetStatusA
-#define phoneInitializeEx phoneInitializeExA
-#define phoneSetButtonInfo phoneSetButtonInfoA
-#define tapiGetLocationInfo tapiGetLocationInfoA
-#define tapiRequestMakeCall tapiRequestMakeCallA
-#define tapiRequestMediaCall tapiRequestMediaCallA
-#endif
-
LONG WINAPI lineAccept(HCALL hCall,LPCSTR lpsUserUserInfo,DWORD dwSize);
LONG WINAPI lineAddProvider(LPCSTR lpszProviderFilename,HWND hwndOwner,LPDWORD lpdwPermanentProviderID);
LONG WINAPI lineAddProviderA(LPCSTR lpszProviderFilename,HWND hwndOwner,LPDWORD lpdwPermanentProviderID);
@@ -2373,6 +2255,126 @@
LONG WINAPI tapiRequestMediaCallA(HWND hwnd,WPARAM wRequestID,LPCSTR lpszDeviceClass,LPCSTR lpDeviceID,DWORD dwSize,DWORD dwSecure,LPCSTR lpszDestAddress,LPCSTR lpszAppName,LPCSTR lpszCalledParty,LPCSTR lpszComment);
LONG WINAPI tapiRequestMediaCallW(HWND hwnd,WPARAM wRequestID,LPCWSTR lpszDeviceClass,LPCWSTR lpDeviceID,DWORD dwSize,DWORD dwSecure,LPCWSTR lpszDestAddress,LPCWSTR lpszAppName,LPCWSTR lpszCalledParty,LPCWSTR lpszComment);
+#ifdef UNICODE
+#define lineAddProvider lineAddProviderW
+#define lineBlindTransfer lineBlindTransferW
+#define lineConfigDialog lineConfigDialogW
+#define lineConfigDialogEdit lineConfigDialogEditW
+#define lineCreateAgent lineCreateAgentW
+#define lineCreateAgent lineCreateAgentW
+#define lineDial lineDialW
+#define lineForward lineForwardW
+#define lineGatherDigits lineGatherDigitsW
+#define lineGenerateDigits lineGenerateDigitsW
+#define lineGetAddressCaps lineGetAddressCapsW
+#define lineGetAddressID lineGetAddressIDW
+#define lineGetAddressStatus lineGetAddressStatusW
+#define lineGetAgentActivityList lineGetAgentActivityListW
+#define lineGetAgentCaps lineGetAgentCapsW
+#define lineGetAgentGroupList lineGetAgentGroupListW
+#define lineGetAgentStatus lineGetAgentStatusW
+#define lineGetAppPriority lineGetAppPriorityW
+#define lineGetCallInfo lineGetCallInfoW
+#define lineGetCountry lineGetCountryW
+#define lineGetDevCaps lineGetDevCapsW
+#define lineGetDevConfig lineGetDevConfigW
+#define lineGetGroupList lineGetGroupListW
+#define lineGetIcon lineGetIconW
+#define lineGetID lineGetIDW
+#define lineGetDevStatus lineGetDevStatusW
+#define lineGetProviderList lineGetProviderListW
+#define lineGetQueueList lineGetQueueListW
+#define lineGetRequest lineGetRequestW
+#define lineGetTranslateCaps lineGetTranslateCapsW
+#define lineHandoff lineHandoffW
+#define lineInitializeEx lineInitializeExW
+#define lineMakeCall lineMakeCallW
+#define lineOpen lineOpenW
+#define linePark lineParkW
+#define linePickup linePickupW
+#define linePrepareAddToConference linePrepareAddToConferenceW
+#define lineRedirect lineRedirectW
+#define lineSetAppPriority lineSetAppPriorityW
+#define lineSetDevConfig lineSetDevConfigW
+#define lineSetTollList lineSetTollListW
+#define lineSetupConference lineSetupConferenceW
+#define lineSetupTransfer lineSetupTransferW
+#define lineTranslateAddress lineTranslateAddressW
+#define lineTranslateDialog lineTranslateDialogW
+#define lineUnpark lineUnparkW
+#define phoneConfigDialog phoneConfigDialogW
+#define phoneGetButtonInfo phoneGetButtonInfoW
+#define phoneGetDevCaps phoneGetDevCapsW
+#define phoneGetIcon phoneGetIconW
+#define phoneGetID phoneGetIDW
+#define phoneGetStatus phoneGetStatusW
+#define phoneInitializeEx phoneInitializeExW
+#define phoneSetButtonInfo phoneSetButtonInfoW
+#define tapiGetLocationInfo tapiGetLocationInfoW
+#define tapiRequestMakeCall tapiRequestMakeCallW
+#define tapiRequestMediaCall tapiRequestMediaCallW
+#else
+#if (TAPI_CURRENT_VERSION >= 0x00020000)
+#define lineAddProvider lineAddProviderA
+#define lineBlindTransfer lineBlindTransferA
+#define lineConfigDialog lineConfigDialogA
+#define lineConfigDialogEdit lineConfigDialogEditA
+#define lineDial lineDialA
+#define lineGatherDigits lineGatherDigitsA
+#define lineGenerateDigits lineGenerateDigitsA
+#define lineGetAddressID lineGetAddressIDA
+#define lineGetAppPriority lineGetAppPriorityA
+#define lineGetDevConfig lineGetDevConfigA
+#define lineGetIcon lineGetIconA
+#define lineGetID lineGetIDA
+#define lineHandoff lineHandoffA
+#define lineMakeCall lineMakeCallA
+#define linePark lineParkA
+#define linePickup linePickupA
+#define lineRedirect lineRedirectA
+#define lineSetAppPriority lineSetAppPriorityA
+#define lineSetDevConfig lineSetDevConfigA
+#define lineSetTollList lineSetTollListA
+#define lineTranslateAddress lineTranslateAddressA
+#define lineTranslateDialog lineTranslateDialogA
+#define lineUnpark lineUnparkA
+#define phoneConfigDialog phoneConfigDialogA
+#define phoneGetIcon phoneGetIconA
+#define phoneGetID phoneGetIDA
+#define tapiGetLocationInfo tapiGetLocationInfoA
+#define tapiRequestMakeCall tapiRequestMakeCallA
+#define tapiRequestMediaCall tapiRequestMediaCallA
+#endif /* TAPI2 */
+#define lineCreateAgent lineCreateAgentA
+#define lineCreateAgent lineCreateAgentA
+#define lineForward lineForwardA
+#define lineGetAddressCaps lineGetAddressCapsA
+#define lineGetAddressStatus lineGetAddressStatusA
+#define lineGetAgentActivityList lineGetAgentActivityListA
+#define lineGetAgentCaps lineGetAgentCapsA
+#define lineGetAgentGroupList lineGetAgentGroupListA
+#define lineGetAgentStatus lineGetAgentStatusA
+#define lineGetCallInfo lineGetCallInfoA
+#define lineGetCountry lineGetCountryA
+#define lineGetDevCaps lineGetDevCapsA
+#define lineGetGroupList lineGetGroupListA
+#define lineGetDevStatus lineGetDevStatusA
+#define lineGetProviderList lineGetProviderListA
+#define lineGetQueueList lineGetQueueListA
+#define lineGetRequest lineGetRequestA
+#define lineGetTranslateCaps lineGetTranslateCapsA
+#define lineInitializeEx lineInitializeExA
+#define lineOpen lineOpenA
+#define linePrepareAddToConference linePrepareAddToConferenceA
+#define lineSetupConference lineSetupConferenceA
+#define lineSetupTransfer lineSetupTransferA
+#define phoneGetButtonInfo phoneGetButtonInfoA
+#define phoneGetDevCaps phoneGetDevCapsA
+#define phoneGetStatus phoneGetStatusA
+#define phoneInitializeEx phoneInitializeExA
+#define phoneSetButtonInfo phoneSetButtonInfoA
+#endif
+
#define TAPIERROR_FORMATMESSAGE(__ErrCode__) (((__ErrCode__) > 0xFFFF0000) ? ((__ErrCode__) & 0x0000FFFF) : (((__ErrCode__) & 0x10000000) ? ((__ErrCode__) - 0x90000000 + 0xF000) : ((__ErrCode__) - 0x80000000 + 0xE000)))
#ifdef __cplusplus
