Author: akhaldi
Date: Sun Sep 15 16:52:35 2013
New Revision: 60139
URL:
http://svn.reactos.org/svn/reactos?rev=60139&view=rev
Log:
[CRYPTDLL]
* Sync with Wine 1.7.1.
Modified:
trunk/reactos/dll/win32/cryptdll/CMakeLists.txt
trunk/reactos/dll/win32/cryptdll/cryptdll.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/cryptdll/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdll/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/cryptdll/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptdll/CMakeLists.txt [iso-8859-1] Sun Sep 15 16:52:35 2013
@@ -1,6 +1,5 @@
add_definitions(-D__WINESRC__)
-
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(cryptdll.dll cryptdll.spec)
@@ -11,7 +10,6 @@
${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def)
add_library(cryptdll SHARED ${SOURCE})
-
set_module_type(cryptdll win32dll)
target_link_libraries(cryptdll wine)
add_importlibs(cryptdll advapi32 msvcrt kernel32 ntdll)
Modified: trunk/reactos/dll/win32/cryptdll/cryptdll.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdll/cryptdl…
==============================================================================
--- trunk/reactos/dll/win32/cryptdll/cryptdll.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptdll/cryptdll.c [iso-8859-1] Sun Sep 15 16:52:35 2013
@@ -35,14 +35,8 @@
case DLL_WINE_PREATTACH:
return FALSE; /* prefer native version */
case DLL_PROCESS_ATTACH:
- {
DisableThreadLibraryCalls(hinstDLL);
break;
- }
- case DLL_PROCESS_DETACH:
- {
- break;
- }
}
return TRUE;
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 15 16:52:35 2013
@@ -65,7 +65,7 @@
reactos/dll/win32/credui # Synced to Wine-1.7.1
reactos/dll/win32/crypt32 # Synced to Wine-1.7.1
reactos/dll/win32/cryptdlg # Synced to Wine-1.7.1
-reactos/dll/win32/cryptdll # Synced to Wine-1.5.26
+reactos/dll/win32/cryptdll # Synced to Wine-1.7.1
reactos/dll/win32/cryptnet # Synced to Wine-1.5.26
reactos/dll/win32/cryptui # Synced to Wine-1.5.26
reactos/dll/win32/dbghelp # Synced to Wine-1.5.26