[SCHANNEL]
authorAmine Khaldi <amine.khaldi@reactos.org>
Wed, 8 Oct 2014 18:02:25 +0000 (18:02 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Wed, 8 Oct 2014 18:02:25 +0000 (18:02 +0000)
* Sync with Wine 1.7.27.
CORE-8540

svn path=/trunk/; revision=64600

reactos/dll/win32/schannel/schannel_main.c
reactos/media/doc/README.WINE

index 27c35a3..16a5fec 100644 (file)
@@ -27,11 +27,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
        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;
 }
 
@@ -47,6 +50,8 @@ BOOL WINAPI SslEmptyCacheW(LPWSTR target, DWORD flags)
     return TRUE;
 }
 
+#ifdef __REACTOS__
+
 PSecurityFunctionTableW
 WINAPI
 schan_InitSecurityInterfaceW(VOID)
@@ -62,3 +67,5 @@ schan_InitSecurityInterfaceA(VOID)
     TRACE("InitSecurityInterfaceA() called\n");
     return &schanTableA;
 }
+
+#endif /* __REACTOS__ */
index de8f835..8761993 100644 (file)
@@ -175,7 +175,7 @@ reactos/dll/win32/rpcrt4              # Synced to Wine-1.7.17
 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)