[ros-diffs] 01/01: [SCHANNEL] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5f897f2199384078cc7d…

commit b5f897f2199384078cc7d7c3240c49e815c2c328
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Fri Mar 23 12:20:45 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Fri Mar 23 12:20:45 2018 +0100

    [SCHANNEL] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/schannel/lsamode.c          | 15 +++++++++++++--
 dll/win32/schannel/precomp.h          | 10 ++++------
 dll/win32/schannel/schannel_main.c    | 16 +++++++++++++++-
 dll/win32/schannel/schannel_mbedtls.c |  2 ++
 dll/win32/schannel/schannel_wine.c    |  2 ++
 dll/win32/schannel/secur32_wine.c     |  2 ++
 dll/win32/schannel/usermode.c         | 14 +++++++++++++-
 dll/win32/schannel/version.rc         |  2 +-
 media/doc/README.WINE                 |  2 +-
 9 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/dll/win32/schannel/lsamode.c b/dll/win32/schannel/lsamode.c
index f00cff11ec..96ca240c08 100644
--- a/dll/win32/schannel/lsamode.c
+++ b/dll/win32/schannel/lsamode.c
@@ -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
diff --git a/dll/win32/schannel/precomp.h b/dll/win32/schannel/precomp.h
index 7c18e61d89..e2de158fcd 100644
--- a/dll/win32/schannel/precomp.h
+++ b/dll/win32/schannel/precomp.h
@@ -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_ */
diff --git a/dll/win32/schannel/schannel_main.c b/dll/win32/schannel/schannel_main.c
index 16a5fec3da..546ad14756 100644
--- a/dll/win32/schannel/schannel_main.c
+++ b/dll/win32/schannel/schannel_main.c
@@ -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)
 {
diff --git a/dll/win32/schannel/schannel_mbedtls.c
b/dll/win32/schannel/schannel_mbedtls.c
index 64e8655a07..e23bf89fa0 100644
--- a/dll/win32/schannel/schannel_mbedtls.c
+++ b/dll/win32/schannel/schannel_mbedtls.c
@@ -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>
diff --git a/dll/win32/schannel/schannel_wine.c b/dll/win32/schannel/schannel_wine.c
index ed0754a3ff..540b075807 100644
--- a/dll/win32/schannel/schannel_wine.c
+++ b/dll/win32/schannel/schannel_wine.c
@@ -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
diff --git a/dll/win32/schannel/secur32_wine.c b/dll/win32/schannel/secur32_wine.c
index 48ba2c9174..c64616a502 100644
--- a/dll/win32/schannel/secur32_wine.c
+++ b/dll/win32/schannel/secur32_wine.c
@@ -21,6 +21,8 @@
 
 #include <assert.h>
 
+WINE_DEFAULT_DEBUG_CHANNEL(schannel);
+
 typedef struct _SecurePackageTable
 {
     DWORD numPackages;
diff --git a/dll/win32/schannel/usermode.c b/dll/win32/schannel/usermode.c
index 2efa3f39d4..0713f822f9 100644
--- a/dll/win32/schannel/usermode.c
+++ b/dll/win32/schannel/usermode.c
@@ -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] =
 { {
diff --git a/dll/win32/schannel/version.rc b/dll/win32/schannel/version.rc
index 95a12d7f72..0b41bd5d7d 100644
--- a/dll/win32/schannel/version.rc
+++ b/dll/win32/schannel/version.rc
@@ -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"
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 884d6e047d..5283c09505 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -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)