mirror of
https://github.com/reactos/reactos.git
synced 2024-09-28 05:26:58 +00:00
[TAPI32] Sync with Wine Staging 3.3. CORE-14434
This commit is contained in:
parent
567f50fb3f
commit
51fd824e21
|
@ -19,7 +19,21 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "precomp.h"
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
|
#include <stdarg.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include "windef.h"
|
||||||
|
#include "winbase.h"
|
||||||
|
#include "wingdi.h"
|
||||||
|
#include "winreg.h"
|
||||||
|
#include "objbase.h"
|
||||||
|
#include "tapi.h"
|
||||||
|
#include "wine/unicode.h"
|
||||||
|
#include "wine/debug.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(tapi);
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* tapiGetLocationInfoW (TAPI32.@)
|
* tapiGetLocationInfoW (TAPI32.@)
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
|
|
||||||
#include "precomp.h"
|
#include "precomp.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(tapi);
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* internalConfig (TAPI32.@)
|
* internalConfig (TAPI32.@)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -18,7 +18,22 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "precomp.h"
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdarg.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include "windef.h"
|
||||||
|
#include "winbase.h"
|
||||||
|
#include "wingdi.h"
|
||||||
|
#include "winreg.h"
|
||||||
|
#include "winnls.h"
|
||||||
|
#include "winerror.h"
|
||||||
|
#include "objbase.h"
|
||||||
|
#include "tapi.h"
|
||||||
|
#include "wine/debug.h"
|
||||||
|
#include "wine/unicode.h"
|
||||||
|
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(tapi);
|
||||||
|
|
||||||
/* registry keys */
|
/* registry keys */
|
||||||
static const char szCountrylistKey[] =
|
static const char szCountrylistKey[] =
|
||||||
|
|
|
@ -18,7 +18,13 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "precomp.h"
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
#include "windef.h"
|
||||||
|
#include "winbase.h"
|
||||||
|
#include "objbase.h"
|
||||||
|
#include "tapi.h"
|
||||||
|
#include "wine/debug.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Additional TSPI functions:
|
* Additional TSPI functions:
|
||||||
|
@ -28,6 +34,7 @@
|
||||||
* - TSPI_ProviderEnumDevices
|
* - TSPI_ProviderEnumDevices
|
||||||
* - TSPI_ProviderConfig
|
* - TSPI_ProviderConfig
|
||||||
*/
|
*/
|
||||||
|
WINE_DEFAULT_DEBUG_CHANNEL(tapi);
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* phoneClose (TAPI32.@)
|
* phoneClose (TAPI32.@)
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
|
||||||
#ifndef _TAPI32_PCH_
|
#ifndef _TAPI32_PCH_
|
||||||
#define _TAPI32_PCH_
|
#define _TAPI32_PCH_
|
||||||
|
|
||||||
|
@ -18,6 +19,4 @@
|
||||||
#include <wine/unicode.h>
|
#include <wine/unicode.h>
|
||||||
#include <wine/debug.h>
|
#include <wine/debug.h>
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(tapi);
|
#endif /* !_TAPI32_PCH_ */
|
||||||
|
|
||||||
#endif /* _TAPI32_PCH_ */
|
|
||||||
|
|
|
@ -250,7 +250,7 @@
|
||||||
@ stdcall phoneGetVolume(long long ptr)
|
@ stdcall phoneGetVolume(long long ptr)
|
||||||
@ stdcall phoneInitialize(ptr long ptr str ptr)
|
@ stdcall phoneInitialize(ptr long ptr str ptr)
|
||||||
@ stdcall phoneInitializeExA(ptr long ptr str ptr ptr ptr)
|
@ stdcall phoneInitializeExA(ptr long ptr str ptr ptr ptr)
|
||||||
@ stdcall phoneInitializeExW(ptr long ptr str ptr ptr ptr)
|
@ stdcall phoneInitializeExW(ptr long ptr wstr ptr ptr ptr)
|
||||||
@ stdcall phoneNegotiateAPIVersion(long long long long ptr ptr)
|
@ stdcall phoneNegotiateAPIVersion(long long long long ptr ptr)
|
||||||
@ stdcall phoneNegotiateExtVersion(long long long long long ptr)
|
@ stdcall phoneNegotiateExtVersion(long long long long long ptr)
|
||||||
@ stdcall phoneOpen(long long ptr long long long long)
|
@ stdcall phoneOpen(long long ptr long long long long)
|
||||||
|
@ -269,10 +269,10 @@
|
||||||
@ stdcall tapiGetLocationInfo(str str) tapiGetLocationInfoA
|
@ stdcall tapiGetLocationInfo(str str) tapiGetLocationInfoA
|
||||||
@ stdcall tapiGetLocationInfoA(str str)
|
@ stdcall tapiGetLocationInfoA(str str)
|
||||||
@ stdcall tapiGetLocationInfoW(wstr wstr)
|
@ stdcall tapiGetLocationInfoW(wstr wstr)
|
||||||
@ stub tapiRequestDrop
|
@ stub tapiRequestDrop
|
||||||
@ stdcall tapiRequestMakeCall(str str str str) tapiRequestMakeCallA
|
@ stdcall tapiRequestMakeCall(str str str str) tapiRequestMakeCallA
|
||||||
@ stdcall tapiRequestMakeCallA(str str str str)
|
@ stdcall tapiRequestMakeCallA(str str str str)
|
||||||
@ stub tapiRequestMakeCallW
|
@ stub tapiRequestMakeCallW
|
||||||
@ stub tapiRequestMediaCall
|
@ stub tapiRequestMediaCall
|
||||||
@ stub tapiRequestMediaCallA
|
@ stub tapiRequestMediaCallA
|
||||||
@ stub tapiRequestMediaCallW
|
@ stub tapiRequestMediaCallW
|
||||||
|
|
|
@ -183,7 +183,7 @@ reactos/dll/win32/stdole32.tlb # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/sti # Synced to WineStaging-3.3
|
reactos/dll/win32/sti # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/sxs # Synced to WineStaging-3.3
|
reactos/dll/win32/sxs # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/t2embed # Synced to WineStaging-3.3
|
reactos/dll/win32/t2embed # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/tapi32 # Synced to WineStaging-2.9
|
reactos/dll/win32/tapi32 # Synced to WineStaging-3.3
|
||||||
reactos/dll/win32/traffic # Synced to WineStaging-2.9
|
reactos/dll/win32/traffic # Synced to WineStaging-2.9
|
||||||
reactos/dll/win32/twain_32 # Synced to Wine-3.0
|
reactos/dll/win32/twain_32 # Synced to Wine-3.0
|
||||||
reactos/dll/win32/updspapi # Synced to WineStaging-2.9
|
reactos/dll/win32/updspapi # Synced to WineStaging-2.9
|
||||||
|
|
Loading…
Reference in a new issue