From a44f578a6c0ed114eb37f821434ca282765815b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 22 Mar 2014 20:04:28 +0000 Subject: [PATCH] [ADVAPI32][SECUR32] Remove useless msvcrt importing. [WINSRV] Fix imports. CORE-7985 svn path=/trunk/; revision=62545 --- reactos/dll/win32/advapi32/CMakeLists.txt | 6 +++--- reactos/dll/win32/advapi32/misc/dllmain.c | 2 +- reactos/dll/win32/secur32/CMakeLists.txt | 4 ++-- reactos/win32ss/user/winsrv/CMakeLists.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/reactos/dll/win32/advapi32/CMakeLists.txt b/reactos/dll/win32/advapi32/CMakeLists.txt index 3c1df063134..20cbef3e218 100644 --- a/reactos/dll/win32/advapi32/CMakeLists.txt +++ b/reactos/dll/win32/advapi32/CMakeLists.txt @@ -55,10 +55,10 @@ add_library(advapi32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.c ${CMAKE_CURRENT_BINARY_DIR}/svcctl_c.c) -set_module_type(advapi32 win32dll UNICODE) +set_module_type(advapi32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(advapi32 cryptlib wine ${PSEH_LIB}) -add_delay_importlibs(advapi32 rpcrt4) -add_importlibs(advapi32 secur32 msvcrt kernel32 ntdll) +add_delay_importlibs(advapi32 secur32) +add_importlibs(advapi32 rpcrt4 kernel32 ntdll) add_pch(advapi32 advapi32.h SOURCE) diff --git a/reactos/dll/win32/advapi32/misc/dllmain.c b/reactos/dll/win32/advapi32/misc/dllmain.c index ae7b29d7db4..d7e766a4105 100644 --- a/reactos/dll/win32/advapi32/misc/dllmain.c +++ b/reactos/dll/win32/advapi32/misc/dllmain.c @@ -36,7 +36,7 @@ DllMain( break; } - return TRUE; + return TRUE; } /* EOF */ diff --git a/reactos/dll/win32/secur32/CMakeLists.txt b/reactos/dll/win32/secur32/CMakeLists.txt index 95bece1bccd..c09dc40490d 100644 --- a/reactos/dll/win32/secur32/CMakeLists.txt +++ b/reactos/dll/win32/secur32/CMakeLists.txt @@ -17,11 +17,11 @@ add_library(secur32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/secur32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/secur32.def) -set_module_type(secur32 win32dll) +set_module_type(secur32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(secur32 lsalib) -add_importlibs(secur32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(secur32 advapi32 kernel32 ntdll) add_pch(secur32 precomp.h SOURCE) add_cd_file(TARGET secur32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/win32ss/user/winsrv/CMakeLists.txt b/reactos/win32ss/user/winsrv/CMakeLists.txt index e18461bab5d..1bbd16d4f30 100644 --- a/reactos/win32ss/user/winsrv/CMakeLists.txt +++ b/reactos/win32ss/user/winsrv/CMakeLists.txt @@ -26,8 +26,8 @@ target_link_libraries(winsrv consrv usersrv) # Add win32ksys because of NtUser...() target_link_libraries(winsrv win32ksys libcntpr ${PSEH_LIB} ${CONSRV_TARGET_LINK_LIBS}) -add_delay_importlibs(winsrv advapi32 gdi32 user32 ${CONSRV_DELAY_IMPORT_LIBS}) -add_importlibs(winsrv csrsrv kernel32 ntdll ${CONSRV_IMPORT_LIBS}) +add_delay_importlibs(winsrv advapi32 ${CONSRV_DELAY_IMPORT_LIBS}) +add_importlibs(winsrv csrsrv gdi32 user32 kernel32 ntdll ${CONSRV_IMPORT_LIBS}) add_dependencies(winsrv bugcodes) add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all)