https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51fd824e2183aa5b8c704068d708b1ad72bfda7f
commit 51fd824e2183aa5b8c704068d708b1ad72bfda7f Author: Amine Khaldi <[email protected]> AuthorDate: Fri Mar 23 12:31:40 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Fri Mar 23 12:31:40 2018 +0100 [TAPI32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/tapi32/assisted.c | 16 +++++++++++++++- dll/win32/tapi32/internal.c | 2 ++ dll/win32/tapi32/line.c | 17 ++++++++++++++++- dll/win32/tapi32/phone.c | 9 ++++++++- dll/win32/tapi32/precomp.h | 5 ++--- dll/win32/tapi32/tapi32.spec | 6 +++--- media/doc/README.WINE | 2 +- 7 files changed, 47 insertions(+), 10 deletions(-) diff --git a/dll/win32/tapi32/assisted.c b/dll/win32/tapi32/assisted.c index aab6863822..57c24e8187 100644 --- a/dll/win32/tapi32/assisted.c +++ b/dll/win32/tapi32/assisted.c @@ -19,7 +19,21 @@ * 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.@) diff --git a/dll/win32/tapi32/internal.c b/dll/win32/tapi32/internal.c index c94d8befdc..53146d4000 100644 --- a/dll/win32/tapi32/internal.c +++ b/dll/win32/tapi32/internal.c @@ -20,6 +20,8 @@ #include "precomp.h" +WINE_DEFAULT_DEBUG_CHANNEL(tapi); + /*********************************************************************** * internalConfig (TAPI32.@) */ diff --git a/dll/win32/tapi32/line.c b/dll/win32/tapi32/line.c index f8e5aae776..c0e25ba4d8 100644 --- a/dll/win32/tapi32/line.c +++ b/dll/win32/tapi32/line.c @@ -18,7 +18,22 @@ * 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 */ static const char szCountrylistKey[] = diff --git a/dll/win32/tapi32/phone.c b/dll/win32/tapi32/phone.c index c03c3cc861..ed40a627ef 100644 --- a/dll/win32/tapi32/phone.c +++ b/dll/win32/tapi32/phone.c @@ -18,7 +18,13 @@ * 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: @@ -28,6 +34,7 @@ * - TSPI_ProviderEnumDevices * - TSPI_ProviderConfig */ +WINE_DEFAULT_DEBUG_CHANNEL(tapi); /*********************************************************************** * phoneClose (TAPI32.@) diff --git a/dll/win32/tapi32/precomp.h b/dll/win32/tapi32/precomp.h index 031a8ca582..e51c67ba01 100644 --- a/dll/win32/tapi32/precomp.h +++ b/dll/win32/tapi32/precomp.h @@ -1,3 +1,4 @@ + #ifndef _TAPI32_PCH_ #define _TAPI32_PCH_ @@ -18,6 +19,4 @@ #include <wine/unicode.h> #include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(tapi); - -#endif /* _TAPI32_PCH_ */ +#endif /* !_TAPI32_PCH_ */ diff --git a/dll/win32/tapi32/tapi32.spec b/dll/win32/tapi32/tapi32.spec index dafc6ff492..7148df759e 100644 --- a/dll/win32/tapi32/tapi32.spec +++ b/dll/win32/tapi32/tapi32.spec @@ -250,7 +250,7 @@ @ stdcall phoneGetVolume(long long ptr) @ stdcall phoneInitialize(ptr long ptr str 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 phoneNegotiateExtVersion(long long long long long ptr) @ stdcall phoneOpen(long long ptr long long long long) @@ -269,10 +269,10 @@ @ stdcall tapiGetLocationInfo(str str) tapiGetLocationInfoA @ stdcall tapiGetLocationInfoA(str str) @ stdcall tapiGetLocationInfoW(wstr wstr) -@ stub tapiRequestDrop +@ stub tapiRequestDrop @ stdcall tapiRequestMakeCall(str str str str) tapiRequestMakeCallA @ stdcall tapiRequestMakeCallA(str str str str) @ stub tapiRequestMakeCallW -@ stub tapiRequestMediaCall +@ stub tapiRequestMediaCall @ stub tapiRequestMediaCallA @ stub tapiRequestMediaCallW diff --git a/media/doc/README.WINE b/media/doc/README.WINE index fe8fd6722d..10480ed1c0 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -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/sxs # 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/twain_32 # Synced to Wine-3.0 reactos/dll/win32/updspapi # Synced to WineStaging-2.9
