[ros-diffs] [akhaldi] 60161: [CRYPTUI] * Sync with Wine 1.7.1.

Author: akhaldi
Date: Mon Sep 16 14:05:55 2013
New Revision: 60161

URL: http://svn.reactos.org/svn/reactos?rev=60161&view=rev
Log:
[CRYPTUI]
* Sync with Wine 1.7.1.

Modified:
    trunk/reactos/dll/win32/cryptui/CMakeLists.txt
    trunk/reactos/dll/win32/cryptui/main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/cryptui/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/cryptui/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptui/CMakeLists.txt	[iso-8859-1] Mon Sep 16 14:05:55 2013
@@ -9,25 +9,12 @@
 
 list(APPEND SOURCE
     main.c
-    cryptui.rc
     ${CMAKE_CURRENT_BINARY_DIR}/cryptui_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def)
 
-add_library(cryptui SHARED ${SOURCE})
+add_library(cryptui SHARED ${SOURCE} cryptui.rc)
 set_module_type(cryptui win32dll)
 target_link_libraries(cryptui uuid wine)
 add_delay_importlibs(cryptui urlmon wintrust)
-
-add_importlibs(cryptui
-    user32
-    ole32
-    crypt32
-    gdi32
-    advapi32
-    comctl32
-    comdlg32
-    msvcrt
-    kernel32
-    ntdll)
-
+add_importlibs(cryptui user32 ole32 crypt32 gdi32 advapi32 comctl32 comdlg32 msvcrt
kernel32 ntdll)
 add_cd_file(TARGET cryptui DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/cryptui/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r…
==============================================================================
--- trunk/reactos/dll/win32/cryptui/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/cryptui/main.c	[iso-8859-1] Mon Sep 16 14:05:55 2013
@@ -61,10 +61,6 @@
         case DLL_PROCESS_ATTACH:
             hInstance = hinstDLL;
             DisableThreadLibraryCalls(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] Mon Sep 16 14:05:55 2013
@@ -67,7 +67,7 @@
 reactos/dll/win32/cryptdlg        # Synced to Wine-1.7.1
 reactos/dll/win32/cryptdll        # Synced to Wine-1.7.1
 reactos/dll/win32/cryptnet        # Synced to Wine-1.7.1
-reactos/dll/win32/cryptui         # Synced to Wine-1.5.26
+reactos/dll/win32/cryptui         # Synced to Wine-1.7.1
 reactos/dll/win32/dbghelp         # Synced to Wine-1.5.26
 reactos/dll/win32/dciman32        # Synced to Wine-1.5.19
 reactos/dll/win32/dwmapi          # Synced to Wine-1.5.19