[SCHANNEL] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 23 Mar 2018 11:20:45 +0000 (12:20 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 23 Mar 2018 11:20:45 +0000 (12:20 +0100)
dll/win32/schannel/lsamode.c
dll/win32/schannel/precomp.h
dll/win32/schannel/schannel_main.c
dll/win32/schannel/schannel_mbedtls.c
dll/win32/schannel/schannel_wine.c
dll/win32/schannel/secur32_wine.c
dll/win32/schannel/usermode.c
dll/win32/schannel/version.rc
media/doc/README.WINE

index f00cff1..96ca240 100644 (file)
  * 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
index 7c18e61..e2de158 100644 (file)
@@ -1,3 +1,4 @@
+
 #ifndef _SCHANNEL_PCH_
 #define _SCHANNEL_PCH_
 
 #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_ */
index 16a5fec..546ad14 100644 (file)
  * 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)
 {
index 64e8655..e23bf89 100644 (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>
index ed0754a..540b075 100644 (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
index 48ba2c9..c64616a 100644 (file)
@@ -21,6 +21,8 @@
 
 #include <assert.h>
 
+WINE_DEFAULT_DEBUG_CHANNEL(schannel);
+
 typedef struct _SecurePackageTable
 {
     DWORD numPackages;
index 2efa3f3..0713f82 100644 (file)
  * 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] =
 { {
index 95a12d7..0b41bd5 100644 (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"
index 884d6e0..5283c09 100644 (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)