From 59f8611321c676050a41315c660f93f7d6b9143c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 22 Feb 2024 14:05:04 +0100 Subject: [PATCH] [WINSRV] Delay-load psapi.dll Note that it is used only in debug builds in order to display the list of processes being terminated in the debug log. --- win32ss/user/winsrv/CMakeLists.txt | 2 +- win32ss/user/winsrv/consrv.cmake | 4 ++-- win32ss/user/winsrv/usersrv.cmake | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/win32ss/user/winsrv/CMakeLists.txt b/win32ss/user/winsrv/CMakeLists.txt index a04ad47fabd..c0cc6d68164 100644 --- a/win32ss/user/winsrv/CMakeLists.txt +++ b/win32ss/user/winsrv/CMakeLists.txt @@ -29,7 +29,7 @@ target_link_libraries(winsrv consrv usersrv) # Add win32ksys because of NtUser...() target_link_libraries(winsrv ${CONSRV_TARGET_LINK_LIBS} win32ksys libcntpr ${PSEH_LIB}) -add_delay_importlibs(winsrv ${CONSRV_DELAY_IMPORT_LIBS} advapi32) +add_delay_importlibs(winsrv ${CONSRV_DELAY_IMPORT_LIBS} ${USERSRV_DELAY_IMPORT_LIBS} advapi32) add_importlibs(winsrv ${CONSRV_IMPORT_LIBS} ${USERSRV_IMPORT_LIBS} csrsrv gdi32 user32 kernel32 ntdll) add_dependencies(winsrv bugcodes xdk) add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all) diff --git a/win32ss/user/winsrv/consrv.cmake b/win32ss/user/winsrv/consrv.cmake index d2ef3a2b5ec..dd4b6da03c2 100644 --- a/win32ss/user/winsrv/consrv.cmake +++ b/win32ss/user/winsrv/consrv.cmake @@ -57,7 +57,7 @@ target_link_libraries(consrv pseh) add_dependencies(consrv psdk) add_pch(consrv consrv/consrv.h CONSRV_SOURCE) #add_object_library(consrv ${CONSRV_SOURCE}) -list(APPEND CONSRV_IMPORT_LIBS psapi) -list(APPEND CONSRV_DELAY_IMPORT_LIBS shell32 ole32) +#list(APPEND CONSRV_IMPORT_LIBS) +list(APPEND CONSRV_DELAY_IMPORT_LIBS shell32 ole32 psapi) list(APPEND CONSRV_TARGET_LINK_LIBS concfg uuid) set_module_type(consrv module UNICODE) diff --git a/win32ss/user/winsrv/usersrv.cmake b/win32ss/user/winsrv/usersrv.cmake index 8db138e5a27..ebdd72ca597 100644 --- a/win32ss/user/winsrv/usersrv.cmake +++ b/win32ss/user/winsrv/usersrv.cmake @@ -14,5 +14,6 @@ target_link_libraries(usersrv pseh) add_dependencies(usersrv xdk) add_pch(usersrv usersrv/usersrv.h USERSRV_SOURCE) #add_object_library(usersrv ${USERSRV_SOURCE}) -list(APPEND USERSRV_IMPORT_LIBS basesrv psapi) +list(APPEND USERSRV_IMPORT_LIBS basesrv) +list(APPEND USERSRV_DELAY_IMPORT_LIBS psapi) set_module_type(usersrv module UNICODE)