tapi32 : add 'A' version of some functions

Rein Klazes rklazes at xs4all.nl
Wed Oct 13 08:00:03 CDT 2004


hi,

This patch makes Time&Chaos start up.

Tapi32 in win2k exports not only the A and W versions of some functions,
but also the function without any postfix. Those are identical to the
ansi version.

Changelog:
	dlls/tapi32 : tapi32.spec, line.c, phone.c, assisted.c
	include	    : tapi.h
	Provide an 'A' version of appropriate functions.

Rein.	
-- 
Rein Klazes
rklazes at xs4all.nl
-------------- next part --------------
--- wine/dlls/tapi32/tapi32.spec	2003-03-20 04:53:13.000000000 +0100
+++ mywine/dlls/tapi32/tapi32.spec	2004-10-13 14:13:56.000000000 +0200
@@ -1,104 +1,148 @@
 @ stdcall lineAccept(long str long)
-@ stdcall lineAddProvider(str long ptr)
+@ stdcall lineAddProvider(str long ptr) lineAddProviderA
+@ stdcall lineAddProviderA(str long ptr)
 @ stdcall lineAddToConference(long long)
 @ stdcall lineAnswer(long str long)
-@ stdcall lineBlindTransfer(long str long)
+@ stdcall lineBlindTransfer(long str long) lineBlindTransferA
+@ stdcall lineBlindTransferA(long str long)
 @ stdcall lineClose(long)
 @ stdcall lineCompleteCall(long ptr long long)
 @ stdcall lineCompleteTransfer(long long ptr long)
-@ stdcall lineConfigDialog(long long str)
-@ stdcall lineConfigDialogEdit(long long str ptr long ptr)
+@ stdcall lineConfigDialog(long long str) lineConfigDialogA
+@ stdcall lineConfigDialogA(long long str)
+@ stdcall lineConfigDialogEdit(long long str ptr long ptr) lineConfigDialogEditA
+@ stdcall lineConfigDialogEditA(long long str ptr long ptr)
 @ stdcall lineConfigProvider(long long)
 @ stdcall lineDeallocateCall(long)
 @ stdcall lineDevSpecific(long long long ptr long)
 @ stdcall lineDevSpecificFeature(long long ptr long)
-@ stdcall lineDial(long str long)
+@ stdcall lineDial(long str long) lineDialA
+@ stdcall lineDialA(long str long)
 @ stdcall lineDrop(long str long)
-@ stdcall lineForward(long long long ptr long ptr ptr)
-@ stdcall lineGatherDigits(long long str long str long long)
-@ stdcall lineGenerateDigits(long long str long)
+@ stdcall lineForward(long long long ptr long ptr ptr) lineForwardA
+@ stdcall lineForwardA(long long long ptr long ptr ptr)
+@ stdcall lineGatherDigits(long long str long str long long) lineGatherDigitsA
+@ stdcall lineGatherDigitsA(long long str long str long long)
+@ stdcall lineGenerateDigits(long long str long) lineGenerateDigitsA
+@ stdcall lineGenerateDigitsA(long long str long)
 @ stdcall lineGenerateTone(long long long long ptr)
-@ stdcall lineGetAddressCaps(long long long long long ptr)
-@ stdcall lineGetAddressID(long ptr long str long)
-@ stdcall lineGetAddressStatus(long long ptr)
-@ stdcall lineGetAppPriority(str long ptr long ptr ptr)
-@ stdcall lineGetCallInfo(long ptr)
+@ stdcall lineGetAddressCaps(long long long long long ptr) lineGetAddressCapsA
+@ stdcall lineGetAddressCapsA(long long long long long ptr)
+@ stdcall lineGetAddressID(long ptr long str long) lineGetAddressIDA
+@ stdcall lineGetAddressIDA(long ptr long str long)
+@ stdcall lineGetAddressStatus(long long ptr) lineGetAddressStatusA
+@ stdcall lineGetAddressStatusA(long long ptr)
+@ stdcall lineGetAppPriority(str long ptr long ptr ptr) lineGetAppPriorityA
+@ stdcall lineGetAppPriorityA(str long ptr long ptr ptr)
+@ stdcall lineGetCallInfo(long ptr) lineGetCallInfoA
+@ stdcall lineGetCallInfoA(long ptr)
 @ stdcall lineGetCallStatus(long ptr)
 @ stdcall lineGetConfRelatedCalls(long ptr)
-@ stdcall lineGetCountry(long long ptr)
-@ stdcall lineGetDevCaps(long long long long ptr)
-@ stdcall lineGetDevConfig(long ptr str)
-@ stdcall lineGetID(long long long long ptr str)
-@ stdcall lineGetIcon(long str ptr)
-@ stdcall lineGetLineDevStatus(long ptr)
+@ stdcall lineGetCountry(long long ptr) lineGetCountryA
+@ stdcall lineGetCountryA(long long ptr)
+@ stdcall lineGetDevCaps(long long long long ptr) lineGetDevCapsA
+@ stdcall lineGetDevCapsA(long long long long ptr)
+@ stdcall lineGetDevConfig(long ptr str) lineGetDevConfigA
+@ stdcall lineGetDevConfigA(long ptr str)
+@ stdcall lineGetIcon(long str ptr) lineGetIconA
+@ stdcall lineGetIconA(long str ptr)
+@ stdcall lineGetID(long long long long ptr str) lineGetIDA
+@ stdcall lineGetIDA(long long long long ptr str)
+@ stdcall lineGetLineDevStatus(long ptr) lineGetLineDevStatusA
+@ stdcall lineGetLineDevStatusA(long ptr)
 @ stdcall lineGetNewCalls(long long long ptr)
 @ stdcall lineGetNumRings(long long ptr)
-@ stdcall lineGetProviderList(long ptr)
-@ stdcall lineGetRequest(long long ptr)
+@ stdcall lineGetProviderList(long ptr) lineGetProviderListA
+@ stdcall lineGetProviderListA(long ptr)
+@ stdcall lineGetRequest(long long ptr) lineGetRequestA
+@ stdcall lineGetRequestA(long long ptr)
 @ stdcall lineGetStatusMessages(long ptr ptr)
-@ stdcall lineGetTranslateCaps(long long ptr)
-@ stdcall lineHandoff(long str long)
+@ stdcall lineGetTranslateCaps(long long ptr) lineGetTranslateCapsA
+@ stdcall lineGetTranslateCapsA(long long ptr)
+@ stdcall lineHandoff(long str long) lineHandoffA
+@ stdcall lineHandoffA(long str long)
 @ stdcall lineHold(long)
 @ stdcall lineInitialize(ptr long ptr str ptr)
-@ stdcall lineMakeCall(long ptr str long ptr)
+@ stdcall lineMakeCall(long ptr str long ptr) lineMakeCallA
+@ stdcall lineMakeCallA(long ptr str long ptr)
 @ stdcall lineMonitorDigits(long long)
 @ stdcall lineMonitorMedia(long long)
 @ stdcall lineMonitorTones(long ptr long)
 @ stdcall lineNegotiateAPIVersion(long long long long ptr ptr)
 @ stdcall lineNegotiateExtVersion(long long long long long ptr)
-@ stdcall lineOpen(long long ptr long long long long long ptr)
-@ stdcall linePark(long long str ptr)
-@ stdcall linePickup(long long ptr str str)
-@ stdcall linePrepareAddToConference(long ptr ptr)
-@ stdcall lineRedirect(long str long)
+@ stdcall lineOpen(long long ptr long long long long long ptr) lineOpenA
+@ stdcall lineOpenA(long long ptr long long long long long ptr)
+@ stdcall linePark(long long str ptr) lineParkA
+@ stdcall lineParkA(long long str ptr)
+@ stdcall linePickup(long long ptr str str) linePickupA
+@ stdcall linePickupA(long long ptr str str)
+@ stdcall linePrepareAddToConference(long ptr ptr) linePrepareAddToConferenceA
+@ stdcall linePrepareAddToConferenceA(long ptr ptr)
+@ stdcall lineRedirect(long str long) lineRedirectA
+@ stdcall lineRedirectA(long str long)
 @ stdcall lineRegisterRequestRecipient(long long long long)
 @ stdcall lineReleaseUserUserInfo(long)
 @ stdcall lineRemoveFromConference(long)
 @ stdcall lineRemoveProvider(long long)
 @ stdcall lineSecureCall(long)
 @ stdcall lineSendUserUserInfo(long str long)
-@ stdcall lineSetAppPriority(str long ptr long str long)
+@ stdcall lineSetAppPriority(str long ptr long str long) lineSetAppPriorityA
+@ stdcall lineSetAppPriorityA(str long ptr long str long)
 @ stdcall lineSetAppSpecific(long long)
 @ stdcall lineSetCallParams(long long long long ptr)
 @ stdcall lineSetCallPrivilege(long long)
 @ stdcall lineSetCurrentLocation(long long)
-@ stdcall lineSetDevConfig(long ptr long str)
+@ stdcall lineSetDevConfig(long ptr long str) lineSetDevConfigA
+@ stdcall lineSetDevConfigA(long ptr long str)
 @ stdcall lineSetMediaControl(long long long long ptr long ptr long ptr long ptr long)
 @ stdcall lineSetMediaMode(long long)
 @ stdcall lineSetNumRings(long long long)
 @ stdcall lineSetStatusMessages(long long long)
 @ stdcall lineSetTerminal(long long long long long long long)
-@ stdcall lineSetTollList(long long str long)
-@ stdcall lineSetupConference(long long ptr ptr long ptr)
-@ stdcall lineSetupTransfer(long ptr ptr)
+@ stdcall lineSetTollList(long long str long) lineSetTollListA
+@ stdcall lineSetTollListA(long long str long)
+@ stdcall lineSetupConference(long long ptr ptr long ptr) lineSetupConferenceA
+@ stdcall lineSetupConferenceA(long long ptr ptr long ptr)
+@ stdcall lineSetupTransfer(long ptr ptr) lineSetupTransferA
+@ stdcall lineSetupTransferA(long ptr ptr)
 @ stdcall lineShutdown(long)
 @ stdcall lineSwapHold(long long)
-@ stdcall lineTranslateAddress(long long long str long long ptr)
-@ stdcall lineTranslateDialog(long long long long str)
+@ stdcall lineTranslateAddress(long long long str long long ptr) lineTranslateAddressA
+@ stdcall lineTranslateAddressA(long long long str long long ptr)
+@ stdcall lineTranslateDialog(long long long long str) lineTranslateDialogA
+@ stdcall lineTranslateDialogA(long long long long str)
 @ stdcall lineUncompleteCall(long long)
 @ stdcall lineUnhold(long)
-@ stdcall lineUnpark(long long ptr str)
+@ stdcall lineUnpark(long long ptr str) lineUnparkA
+@ stdcall lineUnparkA(long long ptr str)
 @ stdcall phoneClose(long)
-@ stdcall phoneConfigDialog(long long str)
+@ stdcall phoneConfigDialog(long long str) phoneConfigDialogA
+@ stdcall phoneConfigDialogA(long long str)
 @ stdcall phoneDevSpecific(long ptr long)
-@ stdcall phoneGetButtonInfo(long long ptr)
+@ stdcall phoneGetButtonInfo(long long ptr) phoneGetButtonInfoA
+@ stdcall phoneGetButtonInfoA(long long ptr)
 @ stdcall phoneGetData(long long ptr long)
-@ stdcall phoneGetDevCaps(long long long long ptr)
+@ stdcall phoneGetDevCaps(long long long long ptr) phoneGetDevCapsA
+@ stdcall phoneGetDevCapsA(long long long long ptr)
 @ stdcall phoneGetDisplay(long ptr)
 @ stdcall phoneGetGain(long long ptr)
 @ stdcall phoneGetHookSwitch(long ptr)
-@ stdcall phoneGetID(long ptr str)
-@ stdcall phoneGetIcon(long str ptr)
+@ stdcall phoneGetIcon(long str ptr) phoneGetIconA
+@ stdcall phoneGetIconA(long str ptr)
+@ stdcall phoneGetID(long ptr str) phoneGetIDA
+@ stdcall phoneGetIDA(long ptr str)
 @ stdcall phoneGetLamp(long long ptr)
 @ stdcall phoneGetRing(long ptr ptr)
-@ stdcall phoneGetStatus(long ptr)
+@ stdcall phoneGetStatus(long ptr) phoneGetStatusA
+@ stdcall phoneGetStatusA(long ptr)
 @ stdcall phoneGetStatusMessages(long ptr ptr ptr)
 @ stdcall phoneGetVolume(long long ptr)
 @ stdcall phoneInitialize(ptr long ptr str ptr)
 @ stdcall phoneNegotiateAPIVersion(long long long long ptr ptr)
 @ stdcall phoneNegotiateExtVersion(long long long long long ptr)
 @ stdcall phoneOpen(long long ptr long long long long)
-@ stdcall phoneSetButtonInfo(long long ptr)
+@ stdcall phoneSetButtonInfo(long long ptr) phoneSetButtonInfoA
+@ stdcall phoneSetButtonInfoA(long long ptr)
 @ stdcall phoneSetData(long long ptr long)
 @ stdcall phoneSetDisplay(long long long str long)
 @ stdcall phoneSetGain(long long long)
@@ -108,7 +152,9 @@
 @ stdcall phoneSetStatusMessages(long long long long)
 @ stdcall phoneSetVolume(long long long)
 @ stdcall phoneShutdown(long)
-@ stdcall tapiGetLocationInfo(str str)
+@ stdcall tapiGetLocationInfo(str str) tapiGetLocationInfoA
+@ stdcall tapiGetLocationInfoA(str str)
 @ stub    tapiRequestDrop
-@ stdcall tapiRequestMakeCall(str str str str)
+@ stdcall tapiRequestMakeCall(str str str str) tapiRequestMakeCallA
+@ stdcall tapiRequestMakeCallA(str str str str)
 @ stub    tapiRequestMediaCall
--- wine/dlls/tapi32/line.c	2004-05-11 08:16:47.000000000 +0200
+++ mywine/dlls/tapi32/line.c	2004-10-13 14:02:59.000000000 +0200
@@ -53,7 +53,7 @@
 /***********************************************************************
  *		lineAddProvider (TAPI32.@)
  */
-DWORD WINAPI lineAddProvider(LPCSTR lpszProviderName, HWND hwndOwner, LPDWORD lpdwPermanentProviderID)
+DWORD WINAPI lineAddProviderA(LPCSTR lpszProviderName, HWND hwndOwner, LPDWORD lpdwPermanentProviderID)
 {
     FIXME("(%s, %p, %p): stub.\n", lpszProviderName, hwndOwner, lpdwPermanentProviderID);
     return 1;
@@ -80,7 +80,7 @@
 /***********************************************************************
  *		lineBlindTransfer (TAPI32.@)
  */
-DWORD WINAPI lineBlindTransfer(HCALL hCall, LPCSTR lpszDestAddress, DWORD dwCountryCode)
+DWORD WINAPI lineBlindTransferA(HCALL hCall, LPCSTR lpszDestAddress, DWORD dwCountryCode)
 {
     FIXME("(%p, %s, %08lx): stub.\n", hCall, lpszDestAddress, dwCountryCode);
     return 1;
@@ -116,7 +116,7 @@
 /***********************************************************************
  *		lineConfigDialog (TAPI32.@)
  */
-DWORD WINAPI lineConfigDialog(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDeviceClass)
+DWORD WINAPI lineConfigDialogA(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDeviceClass)
 {
     FIXME("(%08lx, %p, %s): stub.\n", dwDeviceID, hwndOwner, lpszDeviceClass);
     return 0;
@@ -125,7 +125,7 @@
 /***********************************************************************
  *		lineConfigDialogEdit (TAPI32.@)
  */
-DWORD WINAPI lineConfigDialogEdit(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDeviceClass, LPVOID const lpDeviceConfigIn, DWORD dwSize, LPVARSTRING lpDeviceConfigOut)
+DWORD WINAPI lineConfigDialogEditA(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDeviceClass, LPVOID const lpDeviceConfigIn, DWORD dwSize, LPVARSTRING lpDeviceConfigOut)
 {
     FIXME("stub.\n");
     return 0;
@@ -170,7 +170,7 @@
 /***********************************************************************
  *		lineDial (TAPI32.@)
  */
-DWORD WINAPI lineDial(HCALL hCall, LPCSTR lpszDestAddress, DWORD dwCountryCode)
+DWORD WINAPI lineDialA(HCALL hCall, LPCSTR lpszDestAddress, DWORD dwCountryCode)
 {
     FIXME("(%p, %s, %08lx): stub.\n", hCall, lpszDestAddress, dwCountryCode);
     return 1;
@@ -188,7 +188,7 @@
 /***********************************************************************
  *		lineForward (TAPI32.@)
  */
-DWORD WINAPI lineForward(HLINE hLine, DWORD bAllAddress, DWORD dwAdressID, LPLINEFORWARDLIST lpForwardList, DWORD dwNumRingsNoAnswer, LPHCALL lphConsultCall, LPLINECALLPARAMS lpCallParams)
+DWORD WINAPI lineForwardA(HLINE hLine, DWORD bAllAddress, DWORD dwAdressID, LPLINEFORWARDLIST lpForwardList, DWORD dwNumRingsNoAnswer, LPHCALL lphConsultCall, LPLINECALLPARAMS lpCallParams)
 {
     FIXME("stub.\n");
     return 1;
@@ -197,7 +197,7 @@
 /***********************************************************************
  *		lineGatherDigits (TAPI32.@)
  */
-DWORD WINAPI lineGatherDigits(HCALL hCall, DWORD dwDigitModes, LPSTR lpsDigits, DWORD dwNumDigits, LPCSTR lpszTerminationDigits, DWORD dwFirstDigitTimeout, DWORD dwInterDigitTimeout)
+DWORD WINAPI lineGatherDigitsA(HCALL hCall, DWORD dwDigitModes, LPSTR lpsDigits, DWORD dwNumDigits, LPCSTR lpszTerminationDigits, DWORD dwFirstDigitTimeout, DWORD dwInterDigitTimeout)
 {
     FIXME("stub.\n");
     return 0;
@@ -206,7 +206,7 @@
 /***********************************************************************
  *		lineGenerateDigits (TAPI32.@)
  */
-DWORD WINAPI lineGenerateDigits(HCALL hCall, DWORD dwDigitModes, LPCSTR lpszDigits, DWORD dwDuration)
+DWORD WINAPI lineGenerateDigitsA(HCALL hCall, DWORD dwDigitModes, LPCSTR lpszDigits, DWORD dwDuration)
 {
     FIXME("(%p, %08lx, %s, %ld): stub.\n", hCall, dwDigitModes, lpszDigits, dwDuration);
     return 0;
@@ -224,7 +224,7 @@
 /***********************************************************************
  *		lineGetAddressCaps (TAPI32.@)
  */
-DWORD WINAPI lineGetAddressCaps(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAddressID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEADDRESSCAPS lpAddressCaps)
+DWORD WINAPI lineGetAddressCapsA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAddressID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEADDRESSCAPS lpAddressCaps)
 {
     FIXME("(%p, %08lx, %08lx, %08lx, %08lx, %p): stub.\n", hLineApp, dwDeviceID, dwAddressID, dwAPIVersion, dwExtVersion, lpAddressCaps);
     return 0;
@@ -233,7 +233,7 @@
 /***********************************************************************
  *		lineGetAddressID (TAPI32.@)
  */
-DWORD WINAPI lineGetAddressID(HLINE hLine, LPDWORD lpdwAddressID, DWORD dwAddressMode, LPCSTR lpsAddress, DWORD dwSize)
+DWORD WINAPI lineGetAddressIDA(HLINE hLine, LPDWORD lpdwAddressID, DWORD dwAddressMode, LPCSTR lpsAddress, DWORD dwSize)
 {
     FIXME("%p, %p, %08lx, %s, %ld): stub.\n", hLine, lpdwAddressID, dwAddressMode, lpsAddress, dwSize);
     return 0;
@@ -242,7 +242,7 @@
 /***********************************************************************
  *		lineGetAddressStatus (TAPI32.@)
  */
-DWORD WINAPI lineGetAddressStatus(HLINE hLine, DWORD dwAddressID, LPLINEADDRESSSTATUS lpAddressStatus)
+DWORD WINAPI lineGetAddressStatusA(HLINE hLine, DWORD dwAddressID, LPLINEADDRESSSTATUS lpAddressStatus)
 {
     FIXME("(%p, %08lx, %p): stub.\n", hLine, dwAddressID, lpAddressStatus);
     return 0;
@@ -251,7 +251,7 @@
 /***********************************************************************
  *		lineGetAppPriority (TAPI32.@)
  */
-DWORD WINAPI lineGetAppPriority(LPCSTR lpszAppFilename, DWORD dwMediaMode, LPLINEEXTENSIONID const lpExtensionID, DWORD dwRequestMode, LPVARSTRING lpExtensionName, LPDWORD lpdwPriority)
+DWORD WINAPI lineGetAppPriorityA(LPCSTR lpszAppFilename, DWORD dwMediaMode, LPLINEEXTENSIONID const lpExtensionID, DWORD dwRequestMode, LPVARSTRING lpExtensionName, LPDWORD lpdwPriority)
 {
     FIXME("(%s, %08lx, %p, %08lx, %p, %p): stub.\n", lpszAppFilename, dwMediaMode, lpExtensionID, dwRequestMode, lpExtensionName, lpdwPriority);
     return 0;
@@ -260,7 +260,7 @@
 /***********************************************************************
  *		lineGetCallInfo (TAPI32.@)
  */
-DWORD WINAPI lineGetCallInfo(HCALL hCall, LPLINECALLINFO lpCallInfo)
+DWORD WINAPI lineGetCallInfoA(HCALL hCall, LPLINECALLINFO lpCallInfo)
 {
     FIXME("(%p, %p): stub.\n", hCall, lpCallInfo);
     return 0;
@@ -297,7 +297,7 @@
 /***********************************************************************
  *		lineGetCountry (TAPI32.@)
  */
-DWORD WINAPI lineGetCountry(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTRYLIST lpLineCountryList)
+DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTRYLIST lpLineCountryList)
 {
     DWORD dwAvailSize, dwOffset, i, num_countries, max_subkey_len;
     LPLINECOUNTRYENTRY lpLCE;
@@ -457,7 +457,7 @@
 /***********************************************************************
  *		lineGetDevCaps (TAPI32.@)
  */
-DWORD WINAPI lineGetDevCaps(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps)
+DWORD WINAPI lineGetDevCapsA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps)
 {
     FIXME("(%p, %08lx, %08lx, %08lx, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpLineDevCaps);
     return 0;
@@ -466,7 +466,7 @@
 /***********************************************************************
  *		lineGetDevConfig (TAPI32.@)
  */
-DWORD WINAPI lineGetDevConfig(DWORD dwDeviceID, LPVARSTRING lpDeviceConfig, LPCSTR lpszDeviceClass)
+DWORD WINAPI lineGetDevConfigA(DWORD dwDeviceID, LPVARSTRING lpDeviceConfig, LPCSTR lpszDeviceClass)
 {
     FIXME("(%08lx, %p, %s): stub.\n", dwDeviceID, lpDeviceConfig, lpszDeviceClass);
     return 0;
@@ -475,7 +475,7 @@
 /***********************************************************************
  *		lineGetID (TAPI32.@)
  */
-DWORD WINAPI lineGetID(HLINE hLine, DWORD dwAddressID, HCALL hCall, DWORD dwSelect, LPVARSTRING lpDeviceID, LPCSTR lpszDeviceClass)
+DWORD WINAPI lineGetIDA(HLINE hLine, DWORD dwAddressID, HCALL hCall, DWORD dwSelect, LPVARSTRING lpDeviceID, LPCSTR lpszDeviceClass)
 {
     FIXME("(%p, %08lx, %p, %08lx, %p, %s): stub.\n", hLine, dwAddressID, hCall, dwSelect, lpDeviceID, lpszDeviceClass);
     return 0;
@@ -484,7 +484,7 @@
 /***********************************************************************
  *		lineGetIcon (TAPI32.@)
  */
-DWORD WINAPI lineGetIcon(DWORD dwDeviceID, LPCSTR lpszDeviceClass, HICON *lphIcon)
+DWORD WINAPI lineGetIconA(DWORD dwDeviceID, LPCSTR lpszDeviceClass, HICON *lphIcon)
 {
     FIXME("(%08lx, %s, %p): stub.\n", dwDeviceID, lpszDeviceClass, lphIcon);
     return 0;
@@ -493,7 +493,7 @@
 /***********************************************************************
  *		lineGetLineDevStatus (TAPI32.@)
  */
-DWORD WINAPI lineGetLineDevStatus(HLINE hLine, LPLINEDEVSTATUS lpLineDevStatus)
+DWORD WINAPI lineGetLineDevStatusA(HLINE hLine, LPLINEDEVSTATUS lpLineDevStatus)
 {
     FIXME("(%p, %p): stub.\n", hLine, lpLineDevStatus);
     return 0;
@@ -520,7 +520,7 @@
 /***********************************************************************
  *		lineGetProviderList (TAPI32.@)
  */
-DWORD WINAPI lineGetProviderList(DWORD dwAPIVersion, LPLINEPROVIDERLIST lpProviderList)
+DWORD WINAPI lineGetProviderListA(DWORD dwAPIVersion, LPLINEPROVIDERLIST lpProviderList)
 {
     FIXME("(%08lx, %p): stub.\n", dwAPIVersion, lpProviderList);
     return 0;
@@ -529,7 +529,7 @@
 /***********************************************************************
  *		lineGetRequest (TAPI32.@)
  */
-DWORD WINAPI lineGetRequest(HLINEAPP hLineApp, DWORD dwRequestMode, LPVOID lpRequestBuffer)
+DWORD WINAPI lineGetRequestA(HLINEAPP hLineApp, DWORD dwRequestMode, LPVOID lpRequestBuffer)
 {
     FIXME("%p, %08lx, %p): stub.\n", hLineApp, dwRequestMode, lpRequestBuffer);
     return 0;
@@ -590,7 +590,7 @@
  *      | above.                |
  *      +-----------------------+
  */
-DWORD WINAPI lineGetTranslateCaps(HLINEAPP hLineApp, DWORD dwAPIVersion,
+DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion,
         LPLINETRANSLATECAPS lpTranslateCaps)
 {
     HKEY hkLocations, hkCards, hkCardLocations, hsubkey;
@@ -931,7 +931,7 @@
 /***********************************************************************
  *		lineHandoff (TAPI32.@)
  */
-DWORD WINAPI lineHandoff(HCALL hCall, LPCSTR lpszFileName, DWORD dwMediaMode)
+DWORD WINAPI lineHandoffA(HCALL hCall, LPCSTR lpszFileName, DWORD dwMediaMode)
 {
     FIXME("(%p, %s, %08lx): stub.\n", hCall, lpszFileName, dwMediaMode);
     return 0;
@@ -964,7 +964,7 @@
 /***********************************************************************
  *		lineMakeCall (TAPI32.@)
  */
-DWORD WINAPI lineMakeCall(HLINE hLine, LPHCALL lphCall, LPCSTR lpszDestAddress, DWORD dwCountryCode, LPLINECALLPARAMS lpCallParams)
+DWORD WINAPI lineMakeCallA(HLINE hLine, LPHCALL lphCall, LPCSTR lpszDestAddress, DWORD dwCountryCode, LPLINECALLPARAMS lpCallParams)
 {
     FIXME("(%p, %p, %s, %08lx, %p): stub.\n", hLine, lphCall, lpszDestAddress, dwCountryCode, lpCallParams);
     return 1;
@@ -1027,7 +1027,7 @@
 /***********************************************************************
  *		lineOpen (TAPI32.@)
  */
-DWORD WINAPI lineOpen(HLINEAPP hLineApp, DWORD dwDeviceID, LPHLINE lphLine, DWORD dwAPIVersion, DWORD dwExtVersion, DWORD dwCallbackInstance, DWORD dwPrivileges, DWORD dwMediaModes, LPLINECALLPARAMS lpCallParams)
+DWORD WINAPI lineOpenA(HLINEAPP hLineApp, DWORD dwDeviceID, LPHLINE lphLine, DWORD dwAPIVersion, DWORD dwExtVersion, DWORD dwCallbackInstance, DWORD dwPrivileges, DWORD dwMediaModes, LPLINECALLPARAMS lpCallParams)
 {
     FIXME("stub.\n");
     return 0;
@@ -1036,7 +1036,7 @@
 /***********************************************************************
  *		linePark (TAPI32.@)
  */
-DWORD WINAPI linePark(HCALL hCall, DWORD dwParkMode, LPCSTR lpszDirAddress, LPVARSTRING lpNonDirAddress)
+DWORD WINAPI lineParkA(HCALL hCall, DWORD dwParkMode, LPCSTR lpszDirAddress, LPVARSTRING lpNonDirAddress)
 {
     FIXME("(%p, %08lx, %s, %p): stub.\n", hCall, dwParkMode, lpszDirAddress, lpNonDirAddress);
     return 1;
@@ -1045,7 +1045,7 @@
 /***********************************************************************
  *		linePickup (TAPI32.@)
  */
-DWORD WINAPI linePickup(HLINE hLine, DWORD dwAddressID, LPHCALL lphCall, LPCSTR lpszDestAddress, LPCSTR lpszGroupID)
+DWORD WINAPI linePickupA(HLINE hLine, DWORD dwAddressID, LPHCALL lphCall, LPCSTR lpszDestAddress, LPCSTR lpszGroupID)
 {
     FIXME("(%p, %08lx, %p, %s, %s): stub.\n", hLine, dwAddressID, lphCall, lpszDestAddress, lpszGroupID);
     return 1;
@@ -1054,7 +1054,7 @@
 /***********************************************************************
  *		linePrepareAddToConference (TAPI32.@)
  */
-DWORD WINAPI linePrepareAddToConference(HCALL hConfCall, LPHCALL lphConsultCall, LPLINECALLPARAMS lpCallParams)
+DWORD WINAPI linePrepareAddToConferenceA(HCALL hConfCall, LPHCALL lphConsultCall, LPLINECALLPARAMS lpCallParams)
 {
     FIXME("(%p, %p, %p): stub.\n", hConfCall, lphConsultCall, lpCallParams);
     return 1;
@@ -1063,7 +1063,7 @@
 /***********************************************************************
  *		lineRedirect (TAPI32.@)
  */
-DWORD WINAPI lineRedirect(
+DWORD WINAPI lineRedirectA(
   HCALL hCall,
   LPCSTR lpszDestAddress,
   DWORD  dwCountryCode) {
@@ -1129,7 +1129,7 @@
 /***********************************************************************
  *		lineSetAppPriority (TAPI32.@)
  */
-DWORD WINAPI lineSetAppPriority(LPCSTR lpszAppFilename, DWORD dwMediaMode, LPLINEEXTENSIONID const lpExtensionID, DWORD dwRequestMode, LPCSTR lpszExtensionName, DWORD dwPriority)
+DWORD WINAPI lineSetAppPriorityA(LPCSTR lpszAppFilename, DWORD dwMediaMode, LPLINEEXTENSIONID const lpExtensionID, DWORD dwRequestMode, LPCSTR lpszExtensionName, DWORD dwPriority)
 {
     FIXME("(%s, %08lx, %p, %08lx, %s, %08lx): stub.\n", lpszAppFilename, dwMediaMode, lpExtensionID, dwRequestMode, lpszExtensionName, dwPriority);
     return 0;
@@ -1174,7 +1174,7 @@
 /***********************************************************************
  *		lineSetDevConfig (TAPI32.@)
  */
-DWORD WINAPI lineSetDevConfig(DWORD dwDeviceID, LPVOID lpDeviceConfig, DWORD dwSize, LPCSTR lpszDeviceClass)
+DWORD WINAPI lineSetDevConfigA(DWORD dwDeviceID, LPVOID lpDeviceConfig, DWORD dwSize, LPCSTR lpszDeviceClass)
 {
     FIXME("(%08lx, %p, %08lx, %s): stub.\n", dwDeviceID, lpDeviceConfig, dwSize, lpszDeviceClass);
     return 0;
@@ -1240,7 +1240,7 @@
 /***********************************************************************
  *		lineSetTollList (TAPI32.@)
  */
-DWORD WINAPI lineSetTollList(HLINEAPP hLineApp, DWORD dwDeviceID, LPCSTR lpszAddressIn, DWORD dwTollListOption)
+DWORD WINAPI lineSetTollListA(HLINEAPP hLineApp, DWORD dwDeviceID, LPCSTR lpszAddressIn, DWORD dwTollListOption)
 {
     FIXME("(%p, %08lx, %s, %08lx): stub.\n", hLineApp, dwDeviceID, lpszAddressIn, dwTollListOption);
     return 0;
@@ -1249,7 +1249,7 @@
 /***********************************************************************
  *		lineSetupConference (TAPI32.@)
  */
-DWORD WINAPI lineSetupConference(HCALL hCall, HLINE hLine, LPHCALL lphConfCall, LPHCALL lphConsultCall, DWORD dwNumParties, LPLINECALLPARAMS lpCallParams)
+DWORD WINAPI lineSetupConferenceA(HCALL hCall, HLINE hLine, LPHCALL lphConfCall, LPHCALL lphConsultCall, DWORD dwNumParties, LPLINECALLPARAMS lpCallParams)
 {
     FIXME("(%p, %p, %p, %p, %08lx, %p): stub.\n", hCall, hLine, lphConfCall, lphConsultCall, dwNumParties, lpCallParams);
     return 1;
@@ -1258,7 +1258,7 @@
 /***********************************************************************
  *		lineSetupTransfer (TAPI32.@)
  */
-DWORD WINAPI lineSetupTransfer(HCALL hCall, LPHCALL lphConsultCall, LPLINECALLPARAMS lpCallParams)
+DWORD WINAPI lineSetupTransferA(HCALL hCall, LPHCALL lphConsultCall, LPLINECALLPARAMS lpCallParams)
 {
     FIXME("(%p, %p, %p): stub.\n", hCall, lphConsultCall, lpCallParams);
     return 1;
@@ -1285,7 +1285,7 @@
 /***********************************************************************
  *		lineTranslateAddress (TAPI32.@)
  */
-DWORD WINAPI lineTranslateAddress(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, LPCSTR lpszAddressIn, DWORD dwCard, DWORD dwTranslateOptions, LPLINETRANSLATEOUTPUT lpTranslateOutput)
+DWORD WINAPI lineTranslateAddressA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, LPCSTR lpszAddressIn, DWORD dwCard, DWORD dwTranslateOptions, LPLINETRANSLATEOUTPUT lpTranslateOutput)
 {
     FIXME("(%p, %08lx, %08lx, %s, %08lx, %08lx, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, lpszAddressIn, dwCard, dwTranslateOptions, lpTranslateOutput);
     return 0;
@@ -1294,7 +1294,7 @@
 /***********************************************************************
  *		lineTranslateDialog (TAPI32.@)
  */
-DWORD WINAPI lineTranslateDialog(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, HWND hwndOwner, LPCSTR lpszAddressIn)
+DWORD WINAPI lineTranslateDialogA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, HWND hwndOwner, LPCSTR lpszAddressIn)
 {
     FIXME("(%p, %08lx, %08lx, %p, %s): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, hwndOwner, lpszAddressIn);
     return 0;
@@ -1321,7 +1321,7 @@
 /***********************************************************************
  *		lineUnpark (TAPI32.@)
  */
-DWORD WINAPI lineUnpark(HLINE hLine, DWORD dwAddressID, LPHCALL lphCall, LPCSTR lpszDestAddress)
+DWORD WINAPI lineUnparkA(HLINE hLine, DWORD dwAddressID, LPHCALL lphCall, LPCSTR lpszDestAddress)
 {
     FIXME("(%p, %08lx, %p, %s): stub.\n", hLine, dwAddressID, lphCall, lpszDestAddress);
     return 1;
--- wine/dlls/tapi32/phone.c	2003-09-06 01:08:30.000000000 +0200
+++ mywine/dlls/tapi32/phone.c	2004-10-13 14:08:25.000000000 +0200
@@ -48,7 +48,7 @@
 /***********************************************************************
  *		phoneConfigDialog (TAPI32.@)
  */
-DWORD WINAPI phoneConfigDialog(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDeviceClass)
+DWORD WINAPI phoneConfigDialogA(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDeviceClass)
 {
     FIXME("(%08lx, %p, %s): stub.\n", dwDeviceID, hwndOwner, lpszDeviceClass);
     return 0;
@@ -66,7 +66,7 @@
 /***********************************************************************
  *		phoneGetButtonInfo (TAPI32.@)
  */
-DWORD WINAPI phoneGetButtonInfo(HPHONE hPhone, DWORD dwButtonLampID,
+DWORD WINAPI phoneGetButtonInfoA(HPHONE hPhone, DWORD dwButtonLampID,
                                 LPPHONEBUTTONINFO lpButtonInfo)
 {
     FIXME("(%p, %08lx, %p): stub.\n", hPhone, dwButtonLampID, lpButtonInfo);
@@ -85,7 +85,7 @@
 /***********************************************************************
  *		phoneGetDevCaps (TAPI32.@)
  */
-DWORD WINAPI phoneGetDevCaps(HPHONEAPP hPhoneApp, DWORD dwDeviceID,
+DWORD WINAPI phoneGetDevCapsA(HPHONEAPP hPhoneApp, DWORD dwDeviceID,
                DWORD dwAPIVersion, DWORD dwExtVersion, LPPHONECAPS lpPhoneCaps)
 {
     FIXME("(%p, %08ld, %08lx, %08lx, %p): stub.\n", hPhoneApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpPhoneCaps);
@@ -125,7 +125,7 @@
 /***********************************************************************
  *		phoneGetID (TAPI32.@)
  */
-DWORD WINAPI phoneGetID(HPHONE hPhone, LPVARSTRING lpDeviceID,
+DWORD WINAPI phoneGetIDA(HPHONE hPhone, LPVARSTRING lpDeviceID,
                         LPCSTR lpszDeviceClass)
 {
     FIXME("(%p, %p, %s): stub.\n", hPhone, lpDeviceID, lpszDeviceClass);
@@ -136,7 +136,7 @@
 /***********************************************************************
  *		phoneGetIcon (TAPI32.@)
  */
-DWORD WINAPI phoneGetIcon(DWORD dwDeviceID, LPCSTR lpszDeviceClass,
+DWORD WINAPI phoneGetIconA(DWORD dwDeviceID, LPCSTR lpszDeviceClass,
 		          HICON *lphIcon)
 {
     FIXME("(%08lx, %s, %p): stub.\n", dwDeviceID, lpszDeviceClass, lphIcon);
@@ -166,7 +166,7 @@
 /***********************************************************************
  *		phoneGetStatus (TAPI32.@)
  */
-DWORD WINAPI phoneGetStatus(HPHONE hPhone, LPPHONESTATUS lpPhoneStatus)
+DWORD WINAPI phoneGetStatusA(HPHONE hPhone, LPPHONESTATUS lpPhoneStatus)
 {
     FIXME("(%p, %p): stub.\n", hPhone, lpPhoneStatus);
     /* call TSPI function here ! */
@@ -237,7 +237,7 @@
 /***********************************************************************
  *		phoneSetButtonInfo (TAPI32.@)
  */
-DWORD WINAPI phoneSetButtonInfo(HPHONE hPhone, DWORD dwButtonLampID, LPPHONEBUTTONINFO lpButtonInfo)
+DWORD WINAPI phoneSetButtonInfoA(HPHONE hPhone, DWORD dwButtonLampID, LPPHONEBUTTONINFO lpButtonInfo)
 {
     FIXME("(%p, %08lx, %p): stub.\n", hPhone, dwButtonLampID, lpButtonInfo);
     return 0;
--- wine/dlls/tapi32/assisted.c	2004-04-13 06:03:35.000000000 +0200
+++ mywine/dlls/tapi32/assisted.c	2004-10-13 14:10:33.000000000 +0200
@@ -31,7 +31,7 @@
 /***********************************************************************
  *		tapiGetLocationInfo (TAPI32.@)
  */
-DWORD WINAPI tapiGetLocationInfo(LPSTR lpszCountryCode, LPSTR lpszCityCode)
+DWORD WINAPI tapiGetLocationInfoA(LPSTR lpszCountryCode, LPSTR lpszCityCode)
 {
     HKEY hkey, hsubkey;
     DWORD currid;
@@ -84,7 +84,7 @@
 /***********************************************************************
  *		tapiRequestMakeCall (TAPI32.@)
  */
-DWORD WINAPI tapiRequestMakeCall(LPCSTR lpszDestAddress, LPCSTR lpszAppName,
+DWORD WINAPI tapiRequestMakeCallA(LPCSTR lpszDestAddress, LPCSTR lpszAppName,
                                  LPCSTR lpszCalledParty, LPCSTR lpszComment)
 {
     FIXME("(%s, %s, %s, %s): stub.\n", lpszDestAddress, lpszAppName, lpszCalledParty, lpszComment);
--- wine/include/tapi.h	2004-04-09 06:27:42.000000000 +0200
+++ mywine/include/tapi.h	2004-10-13 14:40:35.000000000 +0200
@@ -921,6 +921,44 @@
 DWORD WINAPI lineUnHold(HCALL);
 DWORD WINAPI lineUnpark(HLINE,DWORD,LPHCALL,LPCSTR);
 
+DWORD WINAPI lineAddProviderA(LPCSTR,HWND,LPDWORD);
+DWORD WINAPI lineBlindTransferA(HCALL,LPCSTR,DWORD);
+DWORD WINAPI lineConfigDialogA(DWORD,HWND,LPCSTR);
+DWORD WINAPI lineConfigDialogEditA(DWORD,HWND,LPCSTR,LPVOID const,DWORD,LPVARSTRING);
+DWORD WINAPI lineDialA(HCALL,LPCSTR,DWORD);
+DWORD WINAPI lineForwardA(HLINE,DWORD,DWORD,LPLINEFORWARDLIST,DWORD,LPHCALL,LPLINECALLPARAMS);
+DWORD WINAPI lineGatherDigitsA(HCALL,DWORD,LPSTR,DWORD,LPCSTR,DWORD,DWORD);
+DWORD WINAPI lineGenerateDigitsA(HCALL,DWORD,LPCSTR,DWORD);
+DWORD WINAPI lineGetAddressCapsA(HLINEAPP,DWORD,DWORD,DWORD,DWORD,LPLINEADDRESSCAPS);
+DWORD WINAPI lineGetAddressIDA(HLINE,LPDWORD,DWORD,LPCSTR,DWORD);
+DWORD WINAPI lineGetAddressStatusA(HLINE,DWORD,LPLINEADDRESSSTATUS);
+DWORD WINAPI lineGetAppPriorityA(LPCSTR,DWORD,LPLINEEXTENSIONID const,DWORD,LPVARSTRING,LPDWORD);
+DWORD WINAPI lineGetCallInfoA(HCALL,LPLINECALLINFO);
+DWORD WINAPI lineGetCountryA(DWORD,DWORD,LPLINECOUNTRYLIST);
+DWORD WINAPI lineGetDevCapsA(HLINEAPP,DWORD,DWORD,DWORD,LPLINEDEVCAPS);
+DWORD WINAPI lineGetDevConfigA(DWORD,LPVARSTRING,LPCSTR);
+DWORD WINAPI lineGetIDA(HLINE,DWORD,HCALL,DWORD,LPVARSTRING,LPCSTR);
+DWORD WINAPI lineGetIconA(DWORD,LPCSTR,HICON *);
+DWORD WINAPI lineGetLineDevStatusA(HLINE,LPLINEDEVSTATUS);
+DWORD WINAPI lineGetProviderListA(DWORD dwAPIVersion,LPLINEPROVIDERLIST);
+DWORD WINAPI lineGetRequestA(HLINEAPP,DWORD,LPVOID);
+DWORD WINAPI lineGetTranslateCapsA(HLINEAPP,DWORD,LPLINETRANSLATECAPS);
+DWORD WINAPI lineHandoffA(HCALL,LPCSTR,DWORD);
+DWORD WINAPI lineMakeCallA(HLINE,LPHCALL,LPCSTR,DWORD,LPLINECALLPARAMS);
+DWORD WINAPI lineOpenA(HLINEAPP,DWORD,LPHLINE,DWORD,DWORD,DWORD,DWORD,DWORD,LPLINECALLPARAMS);
+DWORD WINAPI lineParkA(HCALL,DWORD,LPCSTR,LPVARSTRING);
+DWORD WINAPI linePickupA(HLINE,DWORD,LPHCALL,LPCSTR,LPCSTR);
+DWORD WINAPI linePrepareAddToConferenceA(HCALL,LPHCALL,LPLINECALLPARAMS);
+DWORD WINAPI lineRedirectA(HCALL,LPCSTR,DWORD);
+DWORD WINAPI lineSetAppPriorityA(LPCSTR,DWORD,LPLINEEXTENSIONID const,DWORD,LPCSTR,DWORD);
+DWORD WINAPI lineSetDevConfigA(DWORD,LPVOID,DWORD,LPCSTR);
+DWORD WINAPI lineSetTollListA(HLINEAPP,DWORD,LPCSTR,DWORD);
+DWORD WINAPI lineSetupConferenceA(HCALL,HLINE,LPHCALL,LPHCALL,DWORD,LPLINECALLPARAMS);
+DWORD WINAPI lineSetupTransferA(HCALL,LPHCALL,LPLINECALLPARAMS);
+DWORD WINAPI lineTranslateAddressA(HLINEAPP,DWORD,DWORD,LPCSTR,DWORD,DWORD,LPLINETRANSLATEOUTPUT);
+DWORD WINAPI lineTranslateDialogA(HLINEAPP,DWORD,DWORD,HWND,LPCSTR);
+DWORD WINAPI lineUnparkA(HLINE,DWORD,LPHCALL,LPCSTR);
+
 /* phone functions */
 DWORD WINAPI phoneClose(HPHONE);
 DWORD WINAPI phoneConfigDialog(DWORD,HWND,LPCSTR);
@@ -953,10 +991,21 @@
 DWORD WINAPI phoneSetVolume(HPHONE,DWORD,DWORD);
 DWORD WINAPI phoneShutdown(HPHONEAPP);
 
+DWORD WINAPI phoneConfigDialogA(DWORD,HWND,LPCSTR);
+DWORD WINAPI phoneGetButtonInfoA(HPHONE,DWORD,LPPHONEBUTTONINFO);
+DWORD WINAPI phoneGetDevCapsA(HPHONEAPP,DWORD,DWORD,DWORD,LPPHONECAPS);
+DWORD WINAPI phoneGetIDA(HPHONE,LPVARSTRING,LPCSTR);
+DWORD WINAPI phoneGetIconA(DWORD,LPCSTR,HICON *);
+DWORD WINAPI phoneGetStatusA(HPHONE,LPPHONESTATUS);
+DWORD WINAPI phoneSetButtonInfoA(HPHONE,DWORD,LPPHONEBUTTONINFO);
+
 /* "assisted" functions */
 DWORD WINAPI tapiGetLocationInfo(LPSTR,LPSTR);
 DWORD WINAPI tapiRequestMakeCall(LPCSTR,LPCSTR,LPCSTR,LPCSTR);
 
+DWORD WINAPI tapiGetLocationInfoA(LPSTR,LPSTR);
+DWORD WINAPI tapiRequestMakeCallA(LPCSTR,LPCSTR,LPCSTR,LPCSTR);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif /* defined(__cplusplus) */


More information about the wine-patches mailing list