Author: akhaldi Date: Wed Oct 8 18:02:25 2014 New Revision: 64600
URL: http://svn.reactos.org/svn/reactos?rev=64600&view=rev Log: [SCHANNEL] * Sync with Wine 1.7.27. CORE-8540
Modified: trunk/reactos/dll/win32/schannel/schannel_main.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/schannel/schannel_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schannel... ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel_main.c [iso-8859-1] Wed Oct 8 18:02:25 2014 @@ -27,11 +27,14 @@ if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */
if (fdwReason == DLL_PROCESS_ATTACH) +#ifdef __REACTOS__ { +#endif DisableThreadLibraryCalls(hinstDLL); +#ifdef __REACTOS__ SECUR32_initSchannelSP(); } - +#endif return TRUE; }
@@ -46,6 +49,8 @@ FIXME("%s %x\n", debugstr_w(target), flags); return TRUE; } + +#ifdef __REACTOS__
PSecurityFunctionTableW WINAPI @@ -62,3 +67,5 @@ TRACE("InitSecurityInterfaceA() called\n"); return &schanTableA; } + +#endif /* __REACTOS__ */
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Oct 8 18:02:25 2014 @@ -175,7 +175,7 @@ reactos/dll/win32/rsabase # Synced to Wine-1.7.17 reactos/dll/win32/rsaenh # Synced to Wine-1.7.27 reactos/dll/win32/sccbase # Synced to Wine-1.7.17 -reactos/dll/win32/schannel # Synced to Wine-1.7.17 +reactos/dll/win32/schannel # Synced to Wine-1.7.27 reactos/dll/win32/scrrun # Synced to Wine-1.7.17 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec)