[ros-diffs] [akhaldi] 60430: [WINTRUST] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Sat Sep 28 15:28:15 2013
New Revision: 60430

URL: http://svn.reactos.org/svn/reactos?rev=60430&view=rev
Log:
[WINTRUST]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/dll/win32/wintrust/CMakeLists.txt
    trunk/reactos/dll/win32/wintrust/asn.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/wintrust/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wintrust/CMakeLists.txt	[iso-8859-1] Sat Sep 28 15:28:15 2013
@@ -1,7 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(wintrust.dll wintrust.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
@@ -10,16 +9,14 @@
     register.c
     softpub.c
     wintrust_main.c
-    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wintrust_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def)
 
-add_library(wintrust SHARED ${SOURCE})
+add_library(wintrust SHARED ${SOURCE} version.rc)
 set_module_type(wintrust win32dll)
 target_link_libraries(wintrust wine ${PSEH_LIB})
-# FIXME: imagehlp should be delay-imported. See bug 7171
+# FIXME: imagehlp should be delay-imported. See CORE-6504
 #add_delay_importlibs(wintrust cryptui imagehlp)
 add_delay_importlibs(wintrust cryptui)
 add_importlibs(wintrust imagehlp crypt32 user32 advapi32 msvcrt kernel32 ntdll)
-
 add_cd_file(TARGET wintrust DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/wintrust/asn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/asn.c?r…
==============================================================================
--- trunk/reactos/dll/win32/wintrust/asn.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wintrust/asn.c	[iso-8859-1] Sat Sep 28 15:28:15 2013
@@ -2342,7 +2342,7 @@
     else
     {
         *pcbStructInfo = sizeof(BOOL);
-        *(BOOL *)pvStructInfo = pbEncoded[2] ? TRUE : FALSE;
+        *(BOOL *)pvStructInfo = pbEncoded[2] != 0;
         ret = TRUE;
     }
     TRACE("returning %d (%08x)\n", ret, GetLastError());

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] Sat Sep 28 15:28:15 2013
@@ -207,7 +207,7 @@
 reactos/dll/win32/winmm           # Forked at Wine-20050628
 reactos/dll/win32/winmm/midimap   # Forked at Wine-20050628
 reactos/dll/win32/winmm/wavemap   # Forked at Wine-20050628
-reactos/dll/win32/wintrust        # Synced to Wine-1.5.4
+reactos/dll/win32/wintrust        # Synced to Wine-1.7.1
 reactos/dll/win32/wldap32         # Autosync
 reactos/dll/win32/wmi             # Synced to Wine-1.5.19
 reactos/dll/win32/wtsapi32        # Synced to Wine-1.5.4