Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-13 14:20:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINTRUST]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60430
This commit is contained in:
Amine Khaldi 2013-09-28 15:28:15 +00:00
parent fd6560a684
commit d42bd1c809
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/dll/win32/wintrust/CMakeLists.txt
View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(wintrust.dll wintrust.spec ADD_IMPORTLIB) spec2def(wintrust.dll wintrust.spec ADD_IMPORTLIB)
list(APPEND SOURCE list(APPEND SOURCE
@ -10,16 +9,14 @@ list(APPEND SOURCE
register.c register.c
softpub.c softpub.c
wintrust_main.c wintrust_main.c
version.rc
${CMAKE_CURRENT_BINARY_DIR}/wintrust_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/wintrust_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/wintrust.def) ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def)
add_library(wintrust SHARED ${SOURCE}) add_library(wintrust SHARED ${SOURCE} version.rc)
set_module_type(wintrust win32dll) set_module_type(wintrust win32dll)
target_link_libraries(wintrust wine ${PSEH_LIB}) 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 imagehlp)
add_delay_importlibs(wintrust cryptui) add_delay_importlibs(wintrust cryptui)
add_importlibs(wintrust imagehlp crypt32 user32 advapi32 msvcrt kernel32 ntdll) add_importlibs(wintrust imagehlp crypt32 user32 advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET wintrust DESTINATION reactos/system32 FOR all) add_cd_file(TARGET wintrust DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/wintrust/asn.c
View file

@ -2342,7 +2342,7 @@ static BOOL WINAPI CRYPT_AsnDecodeBool(DWORD dwCertEncodingType,
else else
{ {
*pcbStructInfo = sizeof(BOOL); *pcbStructInfo = sizeof(BOOL);
*(BOOL *)pvStructInfo = pbEncoded[2] ? TRUE : FALSE; *(BOOL *)pvStructInfo = pbEncoded[2] != 0;
ret = TRUE; ret = TRUE;
} }
TRACE("returning %d (%08x)\n", ret, GetLastError()); TRACE("returning %d (%08x)\n", ret, GetLastError());

2
reactos/media/doc/README.WINE
View file

@ -207,7 +207,7 @@ reactos/dll/win32/wininet # Synced to Wine-1.7.1
reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm # Forked at Wine-20050628
reactos/dll/win32/winmm/midimap # 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/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/wldap32 # Autosync
reactos/dll/win32/wmi # Synced to Wine-1.5.19 reactos/dll/win32/wmi # Synced to Wine-1.5.19
reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4 reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4