[SCHANNEL] Sync with Wine Staging 3.3. CORE-14434

This commit is contained in:
Amine Khaldi 2018-03-23 12:20:45 +01:00
parent 97ac90d7ca
commit b5f897f219
9 changed files with 53 additions and 12 deletions

View file

@ -18,9 +18,20 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "precomp.h"
#include <stdarg.h>
#include <schannel.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
#include "windef.h"
#include "winbase.h"
#include "sspi.h"
#include "ntsecapi.h"
#include "ntsecpkg.h"
#include "schannel.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(schannel);
/***********************************************************************
* SpGetInfoUnified

View file

@ -1,3 +1,4 @@
#ifndef _SCHANNEL_PCH_
#define _SCHANNEL_PCH_
@ -15,15 +16,12 @@
#include <sspi.h>
#include <ntsecapi.h>
#include <ntsecpkg.h>
#include <schannel.h>
#include <wine/list.h>
#include "schannel_priv.h"
#include <wine/debug.h>
#include <wine/list.h>
#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(schannel);
#include "schannel_priv.h"
#endif /* _SCHANNEL_PCH_ */
#endif /* !_SCHANNEL_PCH_ */

View file

@ -18,7 +18,21 @@
* 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 "wine/debug.h"
#ifdef __REACTOS__
#include <sspi.h>
#include <schannel.h>
#include <wine/list.h>
#include "schannel_priv.h"
#endif
WINE_DEFAULT_DEBUG_CHANNEL(schannel);
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{

View file

@ -36,6 +36,8 @@
#include "wine/library.h"
#endif
WINE_DEFAULT_DEBUG_CHANNEL(schannel);
#if defined(SONAME_LIBMBEDTLS) && !defined(HAVE_SECURITY_SECURITY_H) && !defined(SONAME_LIBGNUTLS)
#include <mbedtls/ssl.h>

View file

@ -22,6 +22,8 @@
#include <wine/config.h>
WINE_DEFAULT_DEBUG_CHANNEL(schannel);
#if defined(SONAME_LIBGNUTLS) || defined (HAVE_SECURITY_SECURITY_H) || defined (SONAME_LIBMBEDTLS)
#define SCHAN_INVALID_HANDLE ~0UL

View file

@ -21,6 +21,8 @@
#include <assert.h>
WINE_DEFAULT_DEBUG_CHANNEL(schannel);
typedef struct _SecurePackageTable
{
DWORD numPackages;

View file

@ -18,7 +18,19 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "precomp.h"
#include <stdarg.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
#include "windef.h"
#include "winbase.h"
#include "sspi.h"
#include "ntsecapi.h"
#include "ntsecpkg.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(schannel);
static SECPKG_USER_FUNCTION_TABLE secPkgUserTables[2] =
{ {

View file

@ -23,4 +23,4 @@
#define WINE_PRODUCTVERSION 5,1,2600,2180
#define WINE_PRODUCTVERSION_STR "5.1.2600.2180"
#include <wine/wine_common_ver.rc>
#include "wine/wine_common_ver.rc"

View file

@ -164,7 +164,7 @@ reactos/dll/win32/rpcrt4 # Synced to WineStaging-3.3
reactos/dll/win32/rsabase # Synced to WineStaging-3.3
reactos/dll/win32/rsaenh # Synced to WineStaging-2.9
reactos/dll/win32/sccbase # Synced to WineStaging-3.3
reactos/dll/win32/schannel # Synced to WineStaging-2.9
reactos/dll/win32/schannel # Synced to WineStaging-3.3
reactos/dll/win32/scrrun # Synced to WineStaging-2.9
reactos/dll/win32/secur32 # Forked
reactos/dll/win32/security # Forked (different .spec)