Author: akhaldi
Date: Sun Sep 15 16:35:08 2013
New Revision: 60137
URL:
http://svn.reactos.org/svn/reactos?rev=60137&view=rev
Log:
[CRYPTDLG]
* Sync with Wine 1.7.1.
Modified:
trunk/reactos/dll/win32/cryptdlg/CMakeLists.txt
trunk/reactos/dll/win32/cryptdlg/main.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/cryptdlg/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/cryptdlg/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptdlg/CMakeLists.txt [iso-8859-1] Sun Sep 15 16:35:08 2013
@@ -6,22 +6,11 @@
list(APPEND SOURCE
main.c
- cryptdlg.rc
${CMAKE_CURRENT_BINARY_DIR}/cryptdlg_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/cryptdlg.def)
-add_library(cryptdlg SHARED ${SOURCE})
+add_library(cryptdlg SHARED ${SOURCE} cryptdlg.rc)
set_module_type(cryptdlg win32dll)
target_link_libraries(cryptdlg wine)
-
-add_importlibs(cryptdlg
- advapi32
- user32
- crypt32
- cryptui
- wintrust
- msvcrt
- kernel32
- ntdll)
-
+add_importlibs(cryptdlg advapi32 user32 crypt32 cryptui wintrust msvcrt kernel32 ntdll)
add_cd_file(TARGET cryptdlg DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/cryptdlg/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/main.c?…
==============================================================================
--- trunk/reactos/dll/win32/cryptdlg/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptdlg/main.c [iso-8859-1] Sun Sep 15 16:35:08 2013
@@ -53,10 +53,6 @@
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hinstDLL);
hInstance = hinstDLL;
- break;
- case DLL_PROCESS_DETACH:
- break;
- default:
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:35:08 2013
@@ -64,7 +64,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.5.26
+reactos/dll/win32/cryptdlg # Synced to Wine-1.7.1
reactos/dll/win32/cryptdll # Synced to Wine-1.5.26
reactos/dll/win32/cryptnet # Synced to Wine-1.5.26
reactos/dll/win32/cryptui # Synced to Wine-1.5.26