[ros-diffs] [hbelusca] 62545: [ADVAPI32][SECUR32] Remove useless msvcrt importing. [WINSRV] Fix imports. CORE-7985

Author: hbelusca
Date: Sat Mar 22 20:04:28 2014
New Revision: 62545

URL: http://svn.reactos.org/svn/reactos?rev=62545&view=rev
Log:
[ADVAPI32][SECUR32]
Remove useless msvcrt importing.

[WINSRV]
Fix imports.

CORE-7985

Modified:
    trunk/reactos/dll/win32/advapi32/CMakeLists.txt
    trunk/reactos/dll/win32/advapi32/misc/dllmain.c
    trunk/reactos/dll/win32/secur32/CMakeLists.txt
    trunk/reactos/win32ss/user/winsrv/CMakeLists.txt

Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt	[iso-8859-1] Sat Mar 22 20:04:28 2014
@@ -55,10 +55,10 @@
     ${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)
 

Modified: trunk/reactos/dll/win32/advapi32/misc/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/dl…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/misc/dllmain.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/misc/dllmain.c	[iso-8859-1] Sat Mar 22 20:04:28 2014
@@ -36,7 +36,7 @@
             break;
     }
 
-   return TRUE;
+    return TRUE;
 }
 
 /* EOF */

Modified: trunk/reactos/dll/win32/secur32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/secur32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/secur32/CMakeLists.txt	[iso-8859-1] Sat Mar 22 20:04:28 2014
@@ -17,11 +17,11 @@
     ${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)

Modified: trunk/reactos/win32ss/user/winsrv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/CMakeL…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/CMakeLists.txt	[iso-8859-1] Sat Mar 22 20:04:28
2014
@@ -26,8 +26,8 @@
 # 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)