From 05d612869ca922984447dd00a4db3acbcf7b7d8e Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 15 Sep 2013 16:52:35 +0000 Subject: [PATCH] [CRYPTDLL] * Sync with Wine 1.7.1. svn path=/trunk/; revision=60139 --- reactos/dll/win32/cryptdll/CMakeLists.txt | 2 -- reactos/dll/win32/cryptdll/cryptdll.c | 6 ------ reactos/media/doc/README.WINE | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/reactos/dll/win32/cryptdll/CMakeLists.txt b/reactos/dll/win32/cryptdll/CMakeLists.txt index 8aa68a88bcc..1810479e81a 100644 --- a/reactos/dll/win32/cryptdll/CMakeLists.txt +++ b/reactos/dll/win32/cryptdll/CMakeLists.txt @@ -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 @@ list(APPEND SOURCE ${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) diff --git a/reactos/dll/win32/cryptdll/cryptdll.c b/reactos/dll/win32/cryptdll/cryptdll.c index 9ed5f9cc80f..11ee06f7d6c 100644 --- a/reactos/dll/win32/cryptdll/cryptdll.c +++ b/reactos/dll/win32/cryptdll/cryptdll.c @@ -35,14 +35,8 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - { DisableThreadLibraryCalls(hinstDLL); break; - } - case DLL_PROCESS_DETACH: - { - break; - } } return TRUE; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 30384ead408..a036b3a204f 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -65,7 +65,7 @@ reactos/dll/win32/compstui # Synced to Wine-1.5.19 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