[ros-diffs] [tfaber] 71061: [CMAKE] - Delay imports belong before regular imports because delayimp may pull in functions from kernel32 CORE-10935

Author: tfaber
Date: Sun Mar 27 15:14:32 2016
New Revision: 71061

URL: http://svn.reactos.org/svn/reactos?rev=71061&view=rev
Log:
[CMAKE]
- Delay imports belong before regular imports because delayimp may pull in functions from
kernel32
CORE-10935

Modified:
    trunk/reactos/base/applications/iexplore/CMakeLists.txt
    trunk/reactos/dll/cpl/appwiz/CMakeLists.txt
    trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt
    trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt
    trunk/reactos/dll/win32/crypt32/CMakeLists.txt
    trunk/reactos/dll/win32/msgina/CMakeLists.txt
    trunk/reactos/dll/win32/netapi32/CMakeLists.txt
    trunk/reactos/dll/win32/ole32/CMakeLists.txt
    trunk/reactos/win32ss/user/winsrv/consrv_new.cmake
    trunk/rostests/apitests/winhttp/CMakeLists.txt
    trunk/rostests/apitests/wininet/CMakeLists.txt

Modified: trunk/reactos/base/applications/iexplore/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore…
==============================================================================
--- trunk/reactos/base/applications/iexplore/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/iexplore/CMakeLists.txt	[iso-8859-1] Sun Mar 27
15:14:32 2016
@@ -3,6 +3,6 @@
 add_executable(iexplore main.c iexplore.rc)
 target_link_libraries(iexplore wine)
 set_module_type(iexplore win32gui UNICODE)
+add_delay_importlibs(iexplore advpack version)
 add_importlibs(iexplore ieframe msvcrt kernel32 ntdll)
-add_delay_importlibs(iexplore advpack version)
 add_cd_file(TARGET iexplore DESTINATION reactos FOR all)

Modified: trunk/reactos/dll/cpl/appwiz/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/CMakeLists.…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/CMakeLists.txt	[iso-8859-1] Sun Mar 27 15:14:32 2016
@@ -23,7 +23,7 @@
 
 set_module_type(appwiz cpl UNICODE)
 target_link_libraries(appwiz uuid wine)
+add_delay_importlibs(appwiz msi)
 add_importlibs(appwiz urlmon ole32 comctl32 advapi32 shell32 user32 msvcrt kernel32
ntdll)
-add_delay_importlibs(appwiz msi)
 add_pch(appwiz appwiz.h SOURCE)
 add_cd_file(TARGET appwiz DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/CMakeLists…
==============================================================================
--- trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt	[iso-8859-1] Sun Mar 27 15:14:32 2016
@@ -20,7 +20,7 @@
 
 set_module_type(inetcpl cpl UNICODE)
 target_link_libraries(inetcpl wine)
+add_delay_importlibs(inetcpl cryptui wininet ole32 urlmon shell32)
 add_importlibs(inetcpl advapi32 comctl32 user32 shlwapi msvcrt kernel32 ntdll)
-add_delay_importlibs(inetcpl cryptui wininet ole32 urlmon shell32)
 add_pch(inetcpl inetcpl.h SOURCE)
 add_cd_file(TARGET inetcpl DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/C…
==============================================================================
--- trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt	[iso-8859-1] Sun Mar 27 15:14:32
2016
@@ -22,7 +22,7 @@
 set_source_files_properties(devenum.rc PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/devenum_classes.rgs)
 set_module_type(devenum win32dll UNICODE)
 target_link_libraries(devenum strmiids uuid wine)
+add_delay_importlibs(devenum msvfw32)
 add_importlibs(devenum advapi32 advapi32_vista ole32 oleaut32 winmm user32 avicap32
msvcrt kernel32 ntdll)
-add_delay_importlibs(devenum msvfw32)
 add_pch(devenum devenum_private.h SOURCE)
 add_cd_file(TARGET devenum DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/CMakeLists.txt	[iso-8859-1] Sun Mar 27 15:14:32 2016
@@ -45,7 +45,7 @@
 
 set_module_type(crypt32 win32dll)
 target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames)
+add_delay_importlibs(crypt32 cryptnet)
 add_importlibs(crypt32 user32 advapi32 advapi32_vista msvcrt kernel32 ntdll)
-add_delay_importlibs(crypt32 cryptnet)
 add_pch(crypt32 crypt32_private.h SOURCE)
 add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/msgina/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/msgina/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msgina/CMakeLists.txt	[iso-8859-1] Sun Mar 27 15:14:32 2016
@@ -22,7 +22,7 @@
 
 set_module_type(msgina win32dll)
 target_link_libraries(msgina wine)
+add_delay_importlibs(msgina secur32)
 add_importlibs(msgina advapi32 user32 gdi32 powrprof userenv msvcrt kernel32 ntdll)
-add_delay_importlibs(msgina secur32)
 add_pch(msgina msgina.h SOURCE)
 add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/netapi32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt	[iso-8859-1] Sun Mar 27 15:14:32 2016
@@ -44,7 +44,7 @@
 
 set_module_type(netapi32 win32dll)
 target_link_libraries(netapi32 wine ${PSEH_LIB})
+add_delay_importlibs(netapi32 samlib secur32)
 add_importlibs(netapi32 iphlpapi ws2_32 advapi32 rpcrt4 msvcrt kernel32 ntdll)
-add_delay_importlibs(netapi32 samlib secur32)
 add_pch(netapi32 netapi32.h SOURCE)
 add_cd_file(TARGET netapi32 DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/ole32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/CMakeLists…
==============================================================================
--- trunk/reactos/dll/win32/ole32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/CMakeLists.txt	[iso-8859-1] Sun Mar 27 15:14:32 2016
@@ -80,8 +80,8 @@
 
 set_module_type(ole32 win32dll)
 target_link_libraries(ole32 wine uuid ${PSEH_LIB})
+add_delay_importlibs(ole32 oleaut32)
 add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 kernel32_vista ntdll)
-add_delay_importlibs(ole32 oleaut32)
 add_dependencies(ole32 ole32idl)
 add_pch(ole32 precomp.h SOURCE)
 add_cd_file(TARGET ole32 DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/win32ss/user/winsrv/consrv_new.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/consrv_new.cmake	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/consrv_new.cmake	[iso-8859-1] Sun Mar 27 15:14:32
2016
@@ -44,7 +44,7 @@
 
 add_library(consrv_new ${CONSRV_SOURCE})
 #add_object_library(consrv_new ${CONSRV_SOURCE})
+add_delay_importlibs(consrv_new ole32)   # And the default ones from winsrv
 add_importlibs(consrv_new psapi)         # And the default ones from winsrv
-add_delay_importlibs(consrv_new ole32)   # And the default ones from winsrv
 target_link_libraries(consrv_new uuid)   # And the default ones from winsrv
 set_module_type(consrv_new module UNICODE)

Modified: trunk/rostests/apitests/winhttp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winhttp/CMakeLis…
==============================================================================
--- trunk/rostests/apitests/winhttp/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/apitests/winhttp/CMakeLists.txt	[iso-8859-1] Sun Mar 27 15:14:32 2016
@@ -2,6 +2,6 @@
 add_executable(winhttp_apitest WinHttpOpen.c testlist.c)
 target_link_libraries(winhttp_apitest wine)
 set_module_type(winhttp_apitest win32cui)
+#add_delay_importlibs(winhttp_apitest winhttp)
 add_importlibs(winhttp_apitest msvcrt kernel32 ntdll)
-#add_delay_importlibs(winhttp_apitest winhttp)
 add_cd_file(TARGET winhttp_apitest DESTINATION reactos/bin FOR all)

Modified: trunk/rostests/apitests/wininet/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wininet/CMakeLis…
==============================================================================
--- trunk/rostests/apitests/wininet/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/apitests/wininet/CMakeLists.txt	[iso-8859-1] Sun Mar 27 15:14:32 2016
@@ -2,6 +2,6 @@
 add_executable(wininet_apitest InternetOpen.c testlist.c)
 target_link_libraries(wininet_apitest wine)
 set_module_type(wininet_apitest win32cui)
+#add_delay_importlibs(wininet_apitest wininet)
 add_importlibs(wininet_apitest msvcrt kernel32 ntdll)
-#add_delay_importlibs(wininet_apitest wininet)
 add_cd_file(TARGET wininet_apitest DESTINATION reactos/bin FOR all)