Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 49811: [CMAKE] - Fix more modules.
by akhaldi＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: akhaldi Date: Sat Nov 27 09:00:22 2010 New Revision: 49811 URL: http://svn.reactos.org/svn/reactos?rev=49811&view=rev Log: [CMAKE] - Fix more modules. Modified: branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt branches/cmake-bringup/dll/cpl/ncpa/CMakeLists.txt branches/cmake-bringup/dll/cpl/odbccp32/CMakeLists.txt branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt branches/cmake-bringup/dll/directx/amstream/CMakeLists.txt branches/cmake-bringup/dll/directx/devenum/CMakeLists.txt branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt branches/cmake-bringup/dll/directx/dxdiagn/CMakeLists.txt branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt branches/cmake-bringup/dll/win32/sfc_os/CMakeLists.txt branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt branches/cmake-bringup/dll/win32/user32/CMakeLists.txt branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt Modified: branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -1,12 +1,13 @@ + add_definitions(-D_NOTIFYHOOK_IMPL) -add_library(notifyhook SHARED notifyhook.c ${CMAKE_CURRENT_SOURCE_DIR}/notifyhook.rc) +add_library(notifyhook SHARED + notifyhook.c + notifyhook.rc + notifyhook.def) set_module_type(notifyhook win32dll) -target_link_libraries(notifyhook - ${CMAKE_CURRENT_SOURCE_DIR}/notifyhook.def - -lkernel32 - -luser32) +add_importlibs(notifyhook user32 msvcrt kernel32) -add_cab_target(notifyhook 1) +add_cab_target(notifyhook 1) Modified: branches/cmake-bringup/dll/cpl/ncpa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/ncpa/CMak… ============================================================================== --- branches/cmake-bringup/dll/cpl/ncpa/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/ncpa/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -10,6 +10,7 @@ add_importlibs(ncpa msvcrt advapi32 - shell32) + shell32 + kernel32) add_cab_target(ncpa 1) Modified: branches/cmake-bringup/dll/cpl/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/odbccp32/… ============================================================================== --- branches/cmake-bringup/dll/cpl/odbccp32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/odbccp32/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -7,5 +7,5 @@ set_module_type(odbccp32i cpl) -add_importlibs(odbccp32i user32 comctl32 kernel32) +add_importlibs(odbccp32i user32 comctl32 msvcrt kernel32) add_cab_target(odbccp32i 1) Modified: branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/telephon/… ============================================================================== --- branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -15,6 +15,7 @@ comctl32 ole32 shell32 + msvcrt kernel32) add_cab_target(telephon 1) Modified: branches/cmake-bringup/dll/directx/amstream/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/amstr… ============================================================================== --- branches/cmake-bringup/dll/directx/amstream/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/amstream/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -26,6 +26,7 @@ add_importlibs(amstream ole32 advapi32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/directx/devenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/deven… ============================================================================== --- branches/cmake-bringup/dll/directx/devenum/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/devenum/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -30,6 +30,7 @@ winmm user32 avicap32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dinpu… ============================================================================== --- branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -32,6 +32,7 @@ advapi32 ole32 winmm + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/directx/dxdiagn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dxdia… ============================================================================== --- branches/cmake-bringup/dll/directx/dxdiagn/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/dxdiagn/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -23,6 +23,7 @@ advapi32 ole32 oleaut32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/ksuse… ============================================================================== --- branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -5,6 +5,6 @@ set_module_type(ksuser win32dll) -add_importlibs(ksuser advapi32 kernel32 ntdll) +add_importlibs(ksuser advapi32 msvcrt kernel32 ntdll) add_dependencies(ksuser psdk bugcodes) add_cab_target(ksuser 1) Modified: branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crtdll/… ============================================================================== --- branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -25,6 +25,8 @@ set_module_type(crtdll win32dll) +set_entrypoint(crtdll DllMain@12) + target_link_libraries(crtdll wine crt) Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -113,6 +113,7 @@ ${SOURCE}) set_module_type(kernel32 win32dll) +set_entrypoint(kernel32 DllMain@12) target_link_libraries(kernel32 ${PSEH_LIB}) Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -26,7 +26,10 @@ if (NOT MSVC) set_target_properties(msvcrt PROPERTIES LINK_FLAGS "-u __seh_longjmp_unwind@4") endif() + set_module_type(msvcrt win32dll) + +set_entrypoint(msvcrt DllMain@12) target_link_libraries(msvcrt crt Modified: branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvfw32… ============================================================================== --- branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -17,7 +17,7 @@ target_link_libraries(msvfw32 wine) -add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 kernel32 ntdll) +add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cab_target(msvfw32 1) add_importlib_target(msvfw32.spec) Modified: branches/cmake-bringup/dll/win32/sfc_os/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sfc_os/… ============================================================================== --- branches/cmake-bringup/dll/win32/sfc_os/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sfc_os/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -11,7 +11,7 @@ set_module_type(sfc_os win32dll) -add_importlibs(sfc_os kernel32 ntdll) +add_importlibs(sfc_os msvcrt kernel32 ntdll) add_pch(sfc_os ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(sfc_os 1) Modified: branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shimgvw… ============================================================================== --- branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -13,6 +13,7 @@ user32 gdi32 gdiplus + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/traffic… ============================================================================== --- branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -12,6 +12,6 @@ target_link_libraries(traffic wine) -add_importlibs(traffic kernel32 ntdll) +add_importlibs(traffic msvcrt kernel32 ntdll) add_dependencies(traffic psdk buildno_header) add_cab_target(traffic 1) Modified: branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufat/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -9,6 +9,6 @@ target_link_libraries(ufat vfatlib) -add_importlibs(ufat kernel32 ntdll) +add_importlibs(ufat msvcrt kernel32 ntdll) add_cab_target(ufat 1) Modified: branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/untfs/C… ============================================================================== --- branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -9,6 +9,6 @@ target_link_libraries(untfs ntfslib) -add_importlibs(untfs kernel32 ntdll) +add_importlibs(untfs msvcrt kernel32 ntdll) add_cab_target(untfs 1) Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -82,7 +82,7 @@ ${PSEH_LIB}) add_pch(user32 ${CMAKE_CURRENT_SOURCE_DIR}/include/user32.h ${SOURCE}) -add_importlibs(user32 gdi32 advapi32 imm32 kernel32 ntdll) +add_importlibs(user32 gdi32 advapi32 imm32 msvcrt kernel32 ntdll) add_cab_target(user32 1) add_importlib_target(user32.spec) Modified: branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/userenv… ============================================================================== --- branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -22,7 +22,7 @@ target_link_libraries(userenv uuid) -add_importlibs(userenv advapi32 user32 kernel32 ntdll) +add_importlibs(userenv advapi32 user32 msvcrt kernel32 ntdll) add_pch(userenv ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(userenv 1) Modified: branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/vdmdbg/… ============================================================================== --- branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -13,7 +13,7 @@ set_module_type(vdmdbg win32dll) -add_importlibs(vdmdbg kernel32 ntdll) +add_importlibs(vdmdbg msvcrt kernel32 ntdll) add_pch(vdmdbg ${CMAKE_CURRENT_SOURCE_DIR}/vdmdbg.h ${SOURCE}) add_cab_target(vdmdbg 1) Modified: branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wldap32… ============================================================================== --- branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -32,6 +32,6 @@ target_link_libraries(wldap32 wine) -add_importlibs(wldap32 user32 kernel32 ntdll) +add_importlibs(wldap32 user32 msvcrt kernel32 ntdll) add_cab_target(wldap32 1) Modified: branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32_… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -53,6 +53,6 @@ target_link_libraries(ws2_32_new wine) -add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help kernel32 ntdll) +add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_cab_target(ws2_32_new 1) Modified: branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2help… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -13,7 +13,7 @@ set_module_type(ws2help win32dll) -add_importlibs(ws2help advapi32 ws2_32 kernel32 ntdll) +add_importlibs(ws2help advapi32 ws2_32 msvcrt kernel32 ntdll) add_cab_target(ws2help 1) add_importlib_target(ws2help.spec) Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -26,6 +26,6 @@ wine uuid) -add_importlibs(wuapi ole32 advapi32 kernel32 ntdll) +add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll) add_cab_target(wuapi 1) Modified: branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -10,6 +10,6 @@ set_module_type(xinput1_1 win32dll) -add_importlibs(xinput1_1 kernel32) +add_importlibs(xinput1_1 msvcrt kernel32) add_cab_target(xinput1_1 1) Modified: branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -8,7 +8,7 @@ set_source_files_properties(xinput1_2.def PROPERTIES EXTERNAL_OBJECT TRUE) endif() -add_importlibs(xinput1_2 kernel32) +add_importlibs(xinput1_2 msvcrt kernel32) set_module_type(xinput1_2 win32dll) Modified: branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -8,7 +8,7 @@ set_source_files_properties(xinput9_1_0.def PROPERTIES EXTERNAL_OBJECT TRUE) endif() -add_importlibs(xinput9_1_0 kernel32) +add_importlibs(xinput9_1_0 msvcrt kernel32) set_module_type(xinput9_1_0 win32dll) Modified: branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xmllite… ============================================================================== --- branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -11,7 +11,7 @@ target_link_libraries(xmllite wine) -add_importlibs(xmllite kernel32 ntdll) +add_importlibs(xmllite msvcrt kernel32 ntdll) add_cab_target(xmllite 1) Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] Sat Nov 27 09:00:22 2010 @@ -36,7 +36,7 @@ set_module_type(win32csr win32dll) -add_importlibs(win32csr user32 gdi32 advapi32 psapi kernel32 ntdll) +add_importlibs(win32csr user32 gdi32 advapi32 psapi msvcrt kernel32 ntdll) add_pch(win32csr ${CMAKE_CURRENT_SOURCE_DIR}/w32csr.h ${SOURCE})

1 0

[akhaldi] 49810: - Fix more dlls.
by akhaldi＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: akhaldi Date: Sat Nov 27 01:16:42 2010 New Revision: 49810 URL: http://svn.reactos.org/svn/reactos?rev=49810&view=rev Log: - Fix more dlls. Modified: branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt branches/cmake-bringup/dll/win32/localspl/CMakeLists.txt branches/cmake-bringup/dll/win32/localui/CMakeLists.txt branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt branches/cmake-bringup/dll/win32/mscat32/CMakeLists.txt branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt branches/cmake-bringup/dll/win32/msctf/CMakeLists.txt branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt branches/cmake-bringup/dll/win32/netevent/CMakeLists.txt branches/cmake-bringup/dll/win32/netid/CMakeLists.txt branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt branches/cmake-bringup/dll/win32/query/CMakeLists.txt branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt branches/cmake-bringup/dll/win32/sfc/CMakeLists.txt branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt branches/cmake-bringup/dll/win32/url/CMakeLists.txt branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crtdll/… ============================================================================== --- branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -29,7 +29,7 @@ wine crt) -add_importlibs(crtdll msvcrt kernel32 ntdll) +add_importlibs(crtdll kernel32 ntdll) add_pch(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(crtdll 1) Modified: branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptdl… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -16,6 +16,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def wine) -add_importlibs(cryptdll kernel32 ntdll) +add_importlibs(cryptdll msvcrt kernel32 ntdll) add_cab_target(cryptdll 1) Modified: branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/itircl/… ============================================================================== --- branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -10,6 +10,6 @@ target_link_libraries(itircl wine) -add_importlibs(itircl kernel32 ntdll) +add_importlibs(itircl msvcrt kernel32 ntdll) add_dependencies(itircl psdk) add_cab_target(itircl 1) Modified: branches/cmake-bringup/dll/win32/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localsp… ============================================================================== --- branches/cmake-bringup/dll/win32/localspl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/localspl/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -22,6 +22,7 @@ spoolss user32 advapi32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui… ============================================================================== --- branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -17,6 +17,6 @@ uuid wine) -add_importlibs(localui winspool user32 kernel32 ntdll) +add_importlibs(localui winspool user32 msvcrt kernel32 ntdll) add_cab_target(localui 1) Modified: branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -16,6 +16,6 @@ set_module_type(lpk win32dll) -add_importlibs(lpk user32 usp10 kernel32 ntdll) +add_importlibs(lpk user32 usp10 msvcrt kernel32 ntdll) add_cab_target(lpk 1) Modified: branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mapi32/… ============================================================================== --- branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -19,6 +19,6 @@ wine uuid) -add_importlibs(mapi32 shlwapi shell32 user32 advapi32 kernel32 ntdll) +add_importlibs(mapi32 shlwapi shell32 user32 advapi32 msvcrt kernel32 ntdll) add_cab_target(mapi32 1) Modified: branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciavi3… ============================================================================== --- branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -18,6 +18,6 @@ target_link_libraries(mciavi32 wine) -add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 kernel32 ntdll) +add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 msvcrt kernel32 ntdll) add_cab_target(mciavi32 1) Modified: branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciqtz3… ============================================================================== --- branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -14,6 +14,6 @@ wine strmiids) -add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 kernel32 ntdll) +add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 msvcrt kernel32 ntdll) add_cab_target(mciqtz32 1) Modified: branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/modemui… ============================================================================== --- branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -7,6 +7,6 @@ set_module_type(modemui win32dll) -add_importlibs(modemui kernel32) +add_importlibs(modemui msvcrt kernel32) add_cab_target(modemui 1) Modified: branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -20,7 +20,7 @@ target_link_libraries(mpr wine) -add_importlibs(mpr advapi32 user32 kernel32 ntdll) +add_importlibs(mpr advapi32 user32 msvcrt kernel32 ntdll) add_cab_target(mpr 1) add_importlib_target(mpr.spec) Modified: branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mprapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -10,6 +10,6 @@ target_link_libraries(mprapi wine) -add_importlibs(mprapi kernel32 ntdll) +add_importlibs(mprapi msvcrt kernel32 ntdll) add_cab_target(mprapi 1) Modified: branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msafd/C… ============================================================================== --- branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -26,6 +26,6 @@ add_pch(msafd ${CMAKE_CURRENT_SOURCE_DIR}/msafd.h ${SOURCE}) -add_importlibs(msafd advapi32 kernel32 ntdll) +add_importlibs(msafd advapi32 msvcrt kernel32 ntdll) add_cab_target(msafd 1) Modified: branches/cmake-bringup/dll/win32/mscat32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscat32… ============================================================================== --- branches/cmake-bringup/dll/win32/mscat32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mscat32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -11,6 +11,6 @@ target_link_libraries(mscat32 wine) -add_importlibs(mscat32 wintrust kernel32 ntdll) +add_importlibs(mscat32 wintrust msvcrt kernel32 ntdll) add_cab_target(mscat32 1) Modified: branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscms/C… ============================================================================== --- branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -18,6 +18,6 @@ target_link_libraries(mscms wine) -add_importlibs(mscms kernel32 ntdll) +add_importlibs(mscms msvcrt kernel32 ntdll) add_cab_target(mscms 1) Modified: branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscoree… ============================================================================== --- branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mscoree/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -12,6 +12,6 @@ wine uuid) -add_importlibs(mscoree advapi32 shell32 kernel32 ntdll) +add_importlibs(mscoree advapi32 shell32 msvcrt kernel32 ntdll) add_cab_target(mscoree 1) Modified: branches/cmake-bringup/dll/win32/msctf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msctf/C… ============================================================================== --- branches/cmake-bringup/dll/win32/msctf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msctf/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -28,6 +28,6 @@ uuid wine) -add_importlibs(msctf ole32 oleaut32 user32 advapi32 kernel32 ntdll) +add_importlibs(msctf ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) add_cab_target(msctf 1) Modified: branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msftedi… ============================================================================== --- branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msftedit/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -15,6 +15,6 @@ uuid wine) -add_importlibs(msftedit riched20 kernel32 ntdll) +add_importlibs(msftedit riched20 msvcrt kernel32 ntdll) add_cab_target(msftedit 1) Modified: branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgina/… ============================================================================== --- branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msgina/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -16,6 +16,6 @@ target_link_libraries(msgina wine) -add_importlibs(msgina advapi32 user32 gdi32 userenv kernel32 ntdll) +add_importlibs(msgina advapi32 user32 gdi32 userenv msvcrt kernel32 ntdll) add_cab_target(msgina 1) Modified: branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml/… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -87,7 +87,6 @@ oldnames) add_importlibs(mshtml -# msvcrt urlmon shlwapi ole32 @@ -96,6 +95,7 @@ gdi32 advapi32 wininet + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msimg32… ============================================================================== --- branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -12,7 +12,7 @@ target_link_libraries(msimg32 wine) -add_importlibs(msimg32 gdi32 kernel32 ntdll) +add_importlibs(msimg32 gdi32 msvcrt kernel32 ntdll) add_cab_target(msimg32 1) add_importlib_target(msimg32.spec) Modified: branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisip/… ============================================================================== --- branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msisip/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -10,6 +10,6 @@ target_link_libraries(msisip wine) -add_importlibs(msisip crypt32 ole32 kernel32 ntdll) +add_importlibs(msisip crypt32 ole32 msvcrt kernel32 ntdll) add_cab_target(msisip 1) Modified: branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisys.… ============================================================================== --- branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -14,6 +14,6 @@ uuid wine) -add_importlibs(msisys kernel32 ntdll) +add_importlibs(msisys msvcrt kernel32 ntdll) add_cab_target(msisys 1) Modified: branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msnet32… ============================================================================== --- branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msnet32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -10,6 +10,6 @@ target_link_libraries(msnet32 wine) -add_importlibs(msnet32 kernel32 ntdll) +add_importlibs(msnet32 msvcrt kernel32 ntdll) add_cab_target(msnet32 1) Modified: branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mssign3… ============================================================================== --- branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -10,6 +10,6 @@ target_link_libraries(mssign32 wine) -add_importlibs(mssign32 kernel32 ntdll) +add_importlibs(mssign32 msvcrt kernel32 ntdll) add_cab_target(mssign32 1) Modified: branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mssip32… ============================================================================== --- branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -10,6 +10,6 @@ target_link_libraries(mssip32 wine) -add_importlibs(mssip32 kernel32 ntdll) +add_importlibs(mssip32 msvcrt kernel32 ntdll) add_cab_target(mssip32 1) Modified: branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvidc3… ============================================================================== --- branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -15,6 +15,6 @@ target_link_libraries(msvidc32 wine) -add_importlibs(msvidc32 user32 kernel32 ntdll) +add_importlibs(msvidc32 user32 msvcrt kernel32 ntdll) add_cab_target(msvidc32 1) Modified: branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mswsock… ============================================================================== --- branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -18,6 +18,6 @@ set_module_type(mswsock win32dll) -add_importlibs(mswsock ws2_32 kernel32) +add_importlibs(mswsock ws2_32 msvcrt kernel32) add_cab_target(mswsock 1) Modified: branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -23,7 +23,7 @@ target_link_libraries(netapi32 wine) -add_importlibs(netapi32 iphlpapi ws2_32 advapi32 kernel32 ntdll) +add_importlibs(netapi32 iphlpapi ws2_32 advapi32 msvcrt kernel32 ntdll) add_cab_target(netapi32 1) add_importlib_target(netapi32.spec) Modified: branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netcfgx… ============================================================================== --- branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -19,6 +19,6 @@ uuid wine) -add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 kernel32 ntdll) +add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 msvcrt kernel32 ntdll) add_cab_target(netcfgx 1) Modified: branches/cmake-bringup/dll/win32/netevent/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/neteven… ============================================================================== --- branches/cmake-bringup/dll/win32/netevent/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netevent/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -9,7 +9,7 @@ set_module_type(netevent win32dll) -add_importlibs(netevent kernel32) +add_importlibs(netevent msvcrt kernel32) add_dependencies(netevent neteventmsg) add_cab_target(netevent 1) Modified: branches/cmake-bringup/dll/win32/netid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/C… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -7,6 +7,6 @@ set_module_type(netid win32dll) -add_importlibs(netid user32 gdi32 comctl32 advapi32 netapi32 kernel32 ntdll) +add_importlibs(netid user32 gdi32 comctl32 advapi32 netapi32 msvcrt kernel32 ntdll) add_cab_target(netid 1) Modified: branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/newdev/… ============================================================================== --- branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -14,7 +14,7 @@ target_link_libraries(newdev wine) -add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 kernel32 ntdll) +add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 msvcrt kernel32 ntdll) add_cab_target(newdev 1) add_importlib_target(newdev.spec) Modified: branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntlanma… ============================================================================== --- branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -9,6 +9,6 @@ target_link_libraries(ntlanman wine) -add_importlibs(ntlanman netapi32 kernel32 ntdll) +add_importlibs(ntlanman netapi32 msvcrt kernel32 ntdll) add_cab_target(ntlanman 1) Modified: branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntmarta… ============================================================================== --- branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -17,6 +17,7 @@ add_importlibs(ntmarta user32 advapi32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntprint… ============================================================================== --- branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -10,6 +10,6 @@ target_link_libraries(ntprint wine) -add_importlibs(ntprint winspool kernel32 ntdll) +add_importlibs(ntprint winspool msvcrt kernel32 ntdll) add_dependencies(ntprint psdk) add_cab_target(ntprint 1) Modified: branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/objsel/… ============================================================================== --- branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -27,6 +27,7 @@ ole32 user32 advapi32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oledlg/… ============================================================================== --- branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -17,6 +17,6 @@ target_link_libraries(oledlg wine) -add_importlibs(oledlg ole32 comdlg32 user32 advapi32 kernel32 ntdll) +add_importlibs(oledlg ole32 comdlg32 user32 advapi32 msvcrt kernel32 ntdll) add_cab_target(oledlg 1) Modified: branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olethk3… ============================================================================== --- branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -10,6 +10,6 @@ target_link_libraries(olethk32 wine) -add_importlibs(olethk32 kernel32 ntdll) +add_importlibs(olethk32 msvcrt kernel32 ntdll) add_dependencies(olethk32 psdk) add_cab_target(olethk32 1) Modified: branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pidgen/… ============================================================================== --- branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -10,6 +10,6 @@ target_link_libraries(pidgen wine) -add_importlibs(pidgen kernel32 ntdll) +add_importlibs(pidgen msvcrt kernel32 ntdll) add_cab_target(pidgen 1) Modified: branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/powrpro… ============================================================================== --- branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -12,7 +12,7 @@ target_link_libraries(powrprof wine) -add_importlibs(powrprof advapi32 user32 comctl32 kernel32 ntdll) +add_importlibs(powrprof advapi32 user32 comctl32 msvcrt kernel32 ntdll) add_cab_target(powrprof 1) add_importlib_target(powrprof.spec) Modified: branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/psapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -19,7 +19,7 @@ epsapi ${PSEH_LIB}) -add_importlibs(psapi kernel32 ntdll) +add_importlibs(psapi msvcrt kernel32 ntdll) add_pch(psapi ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(psapi 1) Modified: branches/cmake-bringup/dll/win32/query/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/query/C… ============================================================================== --- branches/cmake-bringup/dll/win32/query/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/query/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -12,6 +12,6 @@ wine uuid) -add_importlibs(query kernel32 ntdll) +add_importlibs(query msvcrt kernel32 ntdll) add_cab_target(query 1) Modified: branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasadhl… ============================================================================== --- branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -11,6 +11,6 @@ set_module_type(rasadhlp win32dll) -add_importlibs(rasadhlp ws2_32 kernel32 ntdll) +add_importlibs(rasadhlp ws2_32 msvcrt kernel32 ntdll) add_cab_target(rasadhlp 1) Modified: branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasdlg/… ============================================================================== --- branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -9,6 +9,6 @@ wine uuid) -add_importlibs(rasdlg kernel32 ntdll) +add_importlibs(rasdlg msvcrt kernel32 ntdll) add_cab_target(rasdlg 1) Modified: branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasman/… ============================================================================== --- branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -9,6 +9,6 @@ wine uuid) -add_importlibs(rasman kernel32 ntdll) +add_importlibs(rasman msvcrt kernel32 ntdll) add_cab_target(rasman 1) Modified: branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/resutil… ============================================================================== --- branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -10,6 +10,6 @@ target_link_libraries(resutils wine) -add_importlibs(resutils kernel32 ntdll) +add_importlibs(resutils msvcrt kernel32 ntdll) add_cab_target(resutils 1) Modified: branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched3… ============================================================================== --- branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -12,6 +12,6 @@ target_link_libraries(riched32 wine) -add_importlibs(riched32 riched20 user32 kernel32 ntdll) +add_importlibs(riched32 riched20 user32 msvcrt kernel32 ntdll) add_cab_target(riched32 1) Modified: branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samlib/… ============================================================================== --- branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -8,7 +8,7 @@ set_module_type(samlib win32dll) -add_importlibs(samlib advapi32 kernel32 ntdll) +add_importlibs(samlib advapi32 msvcrt kernel32 ntdll) add_cab_target(samlib 1) add_importlib_target(samlib.spec) Modified: branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sccbase… ============================================================================== --- branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -10,6 +10,6 @@ target_link_libraries(sccbase wine) -add_importlibs(sccbase kernel32 ntdll) +add_importlibs(sccbase msvcrt kernel32 ntdll) add_cab_target(sccbase 1) Modified: branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/schanne… ============================================================================== --- branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -15,6 +15,6 @@ target_link_libraries(schannel wine) -add_importlibs(schannel secur32 kernel32 ntdll) +add_importlibs(schannel secur32 msvcrt kernel32 ntdll) add_cab_target(schannel 1) Modified: branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/secur32… ============================================================================== --- branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -20,7 +20,7 @@ target_link_libraries(secur32 lsalib) -add_importlibs(secur32 advapi32 kernel32 ntdll) +add_importlibs(secur32 advapi32 msvcrt kernel32 ntdll) add_pch(secur32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(secur32 1) Modified: branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sensapi… ============================================================================== --- branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -12,6 +12,6 @@ target_link_libraries(sensapi wine) -add_importlibs(sensapi kernel32 ntdll) +add_importlibs(sensapi msvcrt kernel32 ntdll) add_cab_target(sensapi 1) Modified: branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/serialu… ============================================================================== --- branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -9,6 +9,6 @@ set_module_type(serialui win32dll) -add_importlibs(serialui user32 shlwapi kernel32) +add_importlibs(serialui user32 shlwapi msvcrt kernel32) add_cab_target(serialui 1) Modified: branches/cmake-bringup/dll/win32/sfc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sfc/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sfc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sfc/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -11,9 +11,7 @@ set_module_type(sfc win32dll) - - -add_importlibs(sfc kernel32) +add_importlibs(sfc msvcrt kernel32) add_pch(sfc ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(sfc 1) Modified: branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdocvw… ============================================================================== --- branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -47,6 +47,7 @@ gdi32 version urlmon + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/slbcsp/… ============================================================================== --- branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -10,6 +10,6 @@ target_link_libraries(slbcsp wine) -add_importlibs(slbcsp kernel32 ntdll) +add_importlibs(slbcsp msvcrt kernel32 ntdll) add_cab_target(slbcsp 1) Modified: branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sndblst… ============================================================================== --- branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -16,6 +16,6 @@ mment4 mmebuddy) -add_importlibs(sndblst user32 winmm advapi32 kernel32 ntdll) +add_importlibs(sndblst user32 winmm advapi32 msvcrt kernel32 ntdll) add_cab_target(sndblst 1) Modified: branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/snmpapi… ============================================================================== --- branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -13,7 +13,7 @@ target_link_libraries(snmpapi wine) -add_importlibs(snmpapi kernel32 ntdll) +add_importlibs(snmpapi msvcrt kernel32 ntdll) add_cab_target(snmpapi 1) add_importlib_target(snmpapi.spec) Modified: branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/spoolss… ============================================================================== --- branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -10,6 +10,6 @@ target_link_libraries(spoolss wine) -add_importlibs(spoolss winspool kernel32 ntdll) +add_importlibs(spoolss winspool msvcrt kernel32 ntdll) add_cab_target(spoolss 1) Modified: branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/t2embed… ============================================================================== --- branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -11,7 +11,7 @@ target_link_libraries(t2embed wine) -add_importlibs(t2embed gdi32 user32 advapi32 version kernel32 ntdll) +add_importlibs(t2embed gdi32 user32 advapi32 version msvcrt kernel32 ntdll) add_cab_target(t2embed 1) Modified: branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uext2/C… ============================================================================== --- branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -9,6 +9,6 @@ target_link_libraries(uext2 ext2lib) -add_importlibs(uext2 kernel32 ntdll) +add_importlibs(uext2 msvcrt kernel32 ntdll) add_cab_target(uext2 1) Modified: branches/cmake-bringup/dll/win32/url/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/url/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/url/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/url/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -12,6 +12,6 @@ target_link_libraries(url wine) -add_importlibs(url shell32 shlwapi kernel32 ntdll) +add_importlibs(url shell32 shlwapi msvcrt kernel32 ntdll) add_cab_target(url 1) Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/… ============================================================================== --- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -51,14 +51,16 @@ wininet user32 advapi32 + msvcrt kernel32 ntdll) -add_definitions(-DENTRY_PREFIX=URLMON_) -add_definitions(-DPROXY_DELEGATION) -add_definitions(-DREGISTER_PROXY_DLL) -add_definitions(-D_URLMON_) +add_definitions( + -DENTRY_PREFIX=URLMON_ + -DPROXY_DELEGATION + -DREGISTER_PROXY_DLL + -D_URLMON_) # FIXME : this should be quotes enclosed add_definitions(-DPROXY_CLSID_IS={0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}) Modified: branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/usp10/C… ============================================================================== --- branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -16,6 +16,6 @@ target_link_libraries(usp10 wine) -add_importlibs(usp10 gdi32 kernel32 ntdll) +add_importlibs(usp10 gdi32 msvcrt kernel32 ntdll) add_cab_target(usp10 1) Modified: branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uxtheme… ============================================================================== --- branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -21,7 +21,7 @@ target_link_libraries(uxtheme wine) -add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 kernel32 ntdll) +add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 msvcrt kernel32 ntdll) add_cab_target(uxtheme 1) add_importlib_target(uxtheme.spec) Modified: branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -17,7 +17,7 @@ target_link_libraries(winspool wine) -add_importlibs(winspool advapi32 shlwapi kernel32 ntdll) +add_importlibs(winspool advapi32 shlwapi msvcrt kernel32 ntdll) add_cab_target(winspool 1) add_importlib_target(winspool.spec) Modified: branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winsta/… ============================================================================== --- branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -22,7 +22,7 @@ target_link_libraries(winsta wine) -add_importlibs(winsta kernel32 ntdll) +add_importlibs(winsta msvcrt kernel32 ntdll) add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE}) add_cab_target(winsta 1) Modified: branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32/… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -29,7 +29,7 @@ target_link_libraries(ws2_32 wine) -add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help kernel32 ntdll) +add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_pch(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/include/ws2_32.h ${SOURCE}) add_cab_target(ws2_32 1) Modified: branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshirda… ============================================================================== --- branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -9,6 +9,6 @@ set_module_type(wshirda win32dll) -add_importlibs(wshirda ws2_32 kernel32 ntdll) +add_importlibs(wshirda ws2_32 msvcrt kernel32 ntdll) add_cab_target(wshirda 1) Modified: branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32… ============================================================================== --- branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -9,5 +9,5 @@ set_module_type(wsock32 win32dll) -add_importlibs(wsock32 ws2_32 kernel32 ntdll) +add_importlibs(wsock32 ws2_32 msvcrt kernel32 ntdll) add_cab_target(wsock32 1) Modified: branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wtsapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] Sat Nov 27 01:16:42 2010 @@ -10,6 +10,6 @@ target_link_libraries(wtsapi32 wine) -add_importlibs(wtsapi32 advapi32 kernel32 ntdll) +add_importlibs(wtsapi32 advapi32 msvcrt kernel32 ntdll) add_cab_target(wtsapi32 1)

1 0

[akhaldi] 49809: - Remove some unneeded pdef files. - Fix some modules now that they use proper startup code.
by akhaldi＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: akhaldi Date: Sat Nov 27 00:36:28 2010 New Revision: 49809 URL: http://svn.reactos.org/svn/reactos?rev=49809&view=rev Log: - Remove some unneeded pdef files. - Fix some modules now that they use proper startup code. Removed: branches/cmake-bringup/dll/win32/acledit/acledit.pdef branches/cmake-bringup/dll/win32/aclui/aclui.pdef branches/cmake-bringup/dll/win32/avicap32/avicap32.pdef branches/cmake-bringup/dll/win32/batt/batt.pdef branches/cmake-bringup/dll/win32/cards/cards.pdef branches/cmake-bringup/dll/win32/compstui/compstui.pdef branches/cmake-bringup/dll/win32/getuname/getuname.pdef Modified: branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt branches/cmake-bringup/dll/win32/authz/CMakeLists.txt branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt branches/cmake-bringup/dll/win32/batt/CMakeLists.txt branches/cmake-bringup/dll/win32/bcrypt/CMakeLists.txt branches/cmake-bringup/dll/win32/cards/CMakeLists.txt branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt branches/cmake-bringup/dll/win32/credui/CMakeLists.txt branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptdlg/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt branches/cmake-bringup/dll/win32/hid/CMakeLists.txt branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt branches/cmake-bringup/dll/win32/hnetcfg/CMakeLists.txt branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt branches/cmake-bringup/dll/win32/inseng/CMakeLists.txt branches/cmake-bringup/dll/win32/itss/CMakeLists.txt branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt Modified: branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/joy/CMake… ============================================================================== --- branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -13,6 +13,9 @@ user32 comctl32 ole32 - shell32) + shell32 + msvcrt + kernel32 + ntdll) add_cab_target(joy 1) Modified: branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/desk… ============================================================================== --- branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -20,6 +20,7 @@ gdi32 comctl32 ole32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/desk… ============================================================================== --- branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -20,6 +20,7 @@ gdi32 comctl32 ole32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/devc… ============================================================================== --- branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -11,6 +11,7 @@ user32 powrprof comctl32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/font… ============================================================================== --- branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -21,6 +21,7 @@ lz32 advapi32 setupapi + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/slay… ============================================================================== --- branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -20,6 +20,7 @@ advapi32 ole32 shell32 + msvcrt kernel32 ntdll) Removed: branches/cmake-bringup/dll/win32/acledit/acledit.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/acledit.pdef [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/acledit/acledit.pdef (removed) @@ -1,24 +1,0 @@ -; File generated automatically, do not edit! - -LIBRARY acledit.dll - -EXPORTS -#define FOOL(x) x -#ifdef _MSC_VER -#define _NAME_STDCALL(name, stackbytes) name -#define _NAME_FASTCALL(name, stackbytes) name -#define _NAME_CDECL(name, stackbytes) name -#else -#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes -#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes -#define _NAME_CDECL(name, stackbytes) FOOL(name) -#endif -#define _NAME_EXTERN(name, stackbytes) name -#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) -_NAME(EditAuditInfo,STDCALL,4) -_NAME(EditOwnerInfo,STDCALL,4) -_NAME(EditPermissionInfo,STDCALL,4) -_NAME(FMExtensionProcW,STDCALL,12) -_NAME(SedDiscretionaryAclEditor,STDCALL,52) -_NAME(SedSystemAclEditor,STDCALL,48) -_NAME(SedTakeOwnership,STDCALL,56) Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/C… ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -22,7 +22,7 @@ add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/aclui.def) -add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme kernel32 ntdll) +add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll) add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) Removed: branches/cmake-bringup/dll/win32/aclui/aclui.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/a… ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/aclui.pdef [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/aclui/aclui.pdef (removed) @@ -1,20 +1,0 @@ -; File generated automatically, do not edit! - -LIBRARY aclui.dll - -EXPORTS -#define FOOL(x) x -#if defined(__GNUC__) && defined(_X86_) -#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes -#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes -#define _NAME_CDECL(name, stackbytes) FOOL(name) -#else -#define _NAME_STDCALL(name, stackbytes) name -#define _NAME_FASTCALL(name, stackbytes) name -#define _NAME_CDECL(name, stackbytes) name -#endif -#define _NAME_EXTERN(name, stackbytes) name -#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) -_NAME(CreateSecurityPage,STDCALL,4) -_NAME(EditSecurity,STDCALL,8) -_NAME(IID_ISecurityInformation,EXTERN,0) DATA Modified: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actived… ============================================================================== --- branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -11,7 +11,7 @@ target_link_libraries(activeds wine) -add_importlibs(activeds kernel32 ntdll) +add_importlibs(activeds msvcrt kernel32 ntdll) add_cab_target(activeds 1) Modified: branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advpack… ============================================================================== --- branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -20,6 +20,6 @@ target_link_libraries(advpack wine) -add_importlibs(advpack ole32 setupapi version advapi32 kernel32 ntdll) +add_importlibs(advpack ole32 setupapi version advapi32 msvcrt kernel32 ntdll) add_cab_target(advpack 1) Modified: branches/cmake-bringup/dll/win32/authz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/authz/C… ============================================================================== --- branches/cmake-bringup/dll/win32/authz/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/authz/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -16,9 +16,7 @@ set_module_type(authz win32dll) - - add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_importlibs(authz advapi32 kernel32 ntdll) +add_importlibs(authz advapi32 msvcrt kernel32 ntdll) add_cab_target(authz 1) Modified: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3… ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -12,7 +12,7 @@ target_link_libraries(avicap32 wine) -add_importlibs(avicap32 advapi32 user32 version kernel32 ntdll) +add_importlibs(avicap32 advapi32 user32 version msvcrt kernel32 ntdll) add_cab_target(avicap32 1) add_importlib_target(avicap32.spec) Removed: branches/cmake-bringup/dll/win32/avicap32/avicap32.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3… ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/avicap32.pdef [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avicap32/avicap32.pdef (removed) @@ -1,23 +1,0 @@ -; File generated automatically, do not edit! - -LIBRARY avicap32.dll - -EXPORTS -#define FOOL(x) x -#if defined(__GNUC__) && defined(_X86_) -#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes -#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes -#define _NAME_CDECL(name, stackbytes) FOOL(name) -#else -#define _NAME_STDCALL(name, stackbytes) name -#define _NAME_FASTCALL(name, stackbytes) name -#define _NAME_CDECL(name, stackbytes) name -#endif -#define _NAME_EXTERN(name, stackbytes) name -#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) -_NAME(AppCleanup,STDCALL,4) -_NAME(capCreateCaptureWindowA,STDCALL,32) -_NAME(capCreateCaptureWindowW,STDCALL,32) -_NAME(capGetDriverDescriptionA,STDCALL,20) -_NAME(capGetDriverDescriptionW,STDCALL,20) -_NAME(videoThunk32,STDCALL,20) Modified: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -12,6 +12,6 @@ add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/batt.def) -add_importlibs(batt kernel32) +add_importlibs(batt msvcrt kernel32) add_cab_target(batt 1) Removed: branches/cmake-bringup/dll/win32/batt/batt.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/ba… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/batt.pdef [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/batt/batt.pdef (removed) @@ -1,19 +1,0 @@ -; File generated automatically, do not edit! - -LIBRARY batt.dll - -EXPORTS -#define FOOL(x) x -#if defined(__GNUC__) && defined(_X86_) -#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes -#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes -#define _NAME_CDECL(name, stackbytes) FOOL(name) -#else -#define _NAME_STDCALL(name, stackbytes) name -#define _NAME_FASTCALL(name, stackbytes) name -#define _NAME_CDECL(name, stackbytes) name -#endif -#define _NAME_EXTERN(name, stackbytes) name -#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) -_NAME(BatteryClassCoInstaller,STDCALL,16) -_NAME(BatteryClassInstall,STDCALL,12) Modified: branches/cmake-bringup/dll/win32/bcrypt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/bcrypt/… ============================================================================== --- branches/cmake-bringup/dll/win32/bcrypt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/bcrypt/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -13,7 +13,7 @@ target_link_libraries(bcrypt wine) -add_importlibs(bcrypt kernel32 ntdll) +add_importlibs(bcrypt msvcrt kernel32 ntdll) add_cab_target(bcrypt 1) Modified: branches/cmake-bringup/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/C… ============================================================================== --- branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -15,6 +15,6 @@ set_module_type(cards win32dll) -add_importlibs(cards user32 gdi32) +add_importlibs(cards user32 gdi32 msvcrt kernel32) add_cab_target(cards 1) Removed: branches/cmake-bringup/dll/win32/cards/cards.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/c… ============================================================================== --- branches/cmake-bringup/dll/win32/cards/cards.pdef [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cards/cards.pdef (removed) @@ -1,23 +1,0 @@ -; File generated automatically, do not edit! - -LIBRARY cards.dll - -EXPORTS -#define FOOL(x) x -#if defined(__GNUC__) && defined(_X86_) -#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes -#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes -#define _NAME_CDECL(name, stackbytes) FOOL(name) -#else -#define _NAME_STDCALL(name, stackbytes) name -#define _NAME_FASTCALL(name, stackbytes) name -#define _NAME_CDECL(name, stackbytes) name -#endif -#define _NAME_EXTERN(name, stackbytes) name -#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) -_NAME(WEP,STDCALL,4) -_NAME(cdtAnimate,STDCALL,20) -_NAME(cdtDraw,STDCALL,24) -_NAME(cdtDrawExt,STDCALL,32) -_NAME(cdtInit,STDCALL,8) -_NAME(cdtTerm,STDCALL,0) Modified: branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/clusapi… ============================================================================== --- branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -11,6 +11,6 @@ target_link_libraries(clusapi wine) -add_importlibs(clusapi kernel32 ntdll) +add_importlibs(clusapi msvcrt kernel32 ntdll) add_cab_target(clusapi 1) Modified: branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/compstu… ============================================================================== --- branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -10,7 +10,7 @@ target_link_libraries(compstui wine) -add_importlibs(compstui kernel32 ntdll) +add_importlibs(compstui msvcrt kernel32 ntdll) add_cab_target(compstui 1) add_importlib_target(compstui.spec) Removed: branches/cmake-bringup/dll/win32/compstui/compstui.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/compstu… ============================================================================== --- branches/cmake-bringup/dll/win32/compstui/compstui.pdef [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/compstui/compstui.pdef (removed) @@ -1,21 +1,0 @@ -; File generated automatically, do not edit! - -LIBRARY compstui.dll - -EXPORTS -#define FOOL(x) x -#if defined(__GNUC__) && defined(_X86_) -#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes -#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes -#define _NAME_CDECL(name, stackbytes) FOOL(name) -#else -#define _NAME_STDCALL(name, stackbytes) name -#define _NAME_FASTCALL(name, stackbytes) name -#define _NAME_CDECL(name, stackbytes) name -#endif -#define _NAME_EXTERN(name, stackbytes) name -#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) -_NAME(CommonPropertySheetUIA,STDCALL,16) -_NAME(CommonPropertySheetUIW,STDCALL,16) -_NAME(GetCPSUIUserData,STDCALL,4) -_NAME(SetCPSUIUserData,STDCALL,8) Modified: branches/cmake-bringup/dll/win32/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/credui/… ============================================================================== --- branches/cmake-bringup/dll/win32/credui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/credui/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -11,6 +11,6 @@ target_link_libraries(credui wine) -add_importlibs(credui advapi32 user32 comctl32 kernel32 ntdll) +add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll) add_cab_target(credui 1) Modified: branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crtdll/… ============================================================================== --- branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -29,7 +29,7 @@ wine crt) -add_importlibs(crtdll kernel32 ntdll) +add_importlibs(crtdll msvcrt kernel32 ntdll) add_pch(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(crtdll 1) Modified: branches/cmake-bringup/dll/win32/cryptdlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptdl… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptdlg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptdlg/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -16,6 +16,7 @@ crypt32 cryptui wintrust + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptne… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -13,6 +13,7 @@ add_importlibs(cryptnet crypt32 wininet + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptui… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -23,6 +23,7 @@ wintrust comctl32 comdlg32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dciman3… ============================================================================== --- branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -11,6 +11,6 @@ target_link_libraries(dciman32 wine) -add_importlibs(dciman32 kernel32 ntdll) +add_importlibs(dciman32 msvcrt kernel32 ntdll) add_cab_target(dciman32 1) Modified: branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -25,6 +25,7 @@ advapi32 user32 version + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dwmapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -11,6 +11,6 @@ target_link_libraries(dwmapi wine) -add_importlibs(dwmapi kernel32 ntdll) +add_importlibs(dwmapi msvcrt kernel32 ntdll) add_cab_target(dwmapi 1) Modified: branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/faultre… ============================================================================== --- branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -11,6 +11,6 @@ target_link_libraries(faultrep wine) -add_importlibs(faultrep advapi32 kernel32 ntdll) +add_importlibs(faultrep advapi32 msvcrt kernel32 ntdll) add_cab_target(faultrep 1) Modified: branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/fusion/… ============================================================================== --- branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -18,6 +18,6 @@ target_link_libraries(fusion wine) -add_importlibs(fusion shlwapi advapi32 dbghelp user32 kernel32 ntdll) +add_importlibs(fusion shlwapi advapi32 dbghelp user32 msvcrt kernel32 ntdll) add_cab_target(fusion 1) Modified: branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -52,7 +52,7 @@ set_export_spec(gdi32 gdi32.spec) -add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) +add_importlibs(gdi32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) add_cab_target(gdi32 1) add_importlib_target(gdi32.spec) Modified: branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getunam… ============================================================================== --- branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -14,6 +14,6 @@ set_module_type(getuname win32dll) -add_importlibs(getuname kernel32 ntdll) +add_importlibs(getuname msvcrt kernel32 ntdll) add_cab_target(getuname 1) Removed: branches/cmake-bringup/dll/win32/getuname/getuname.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getunam… ============================================================================== --- branches/cmake-bringup/dll/win32/getuname/getuname.pdef [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/getuname/getuname.pdef (removed) @@ -1,18 +1,0 @@ -; File generated automatically, do not edit! - -LIBRARY getuname.dll - -EXPORTS -#define FOOL(x) x -#if defined(__GNUC__) && defined(_X86_) -#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes -#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes -#define _NAME_CDECL(name, stackbytes) FOOL(name) -#else -#define _NAME_STDCALL(name, stackbytes) name -#define _NAME_FASTCALL(name, stackbytes) name -#define _NAME_CDECL(name, stackbytes) name -#endif -#define _NAME_EXTERN(name, stackbytes) name -#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes) -_NAME(GetUName,STDCALL,8) Modified: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hhctrl.… ============================================================================== --- branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -34,6 +34,7 @@ oleaut32 user32 gdi32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/hid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hid/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/hid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hid/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -15,9 +15,7 @@ set_module_type(hid win32dll) - - -add_importlibs(hid kernel32 ntdll) +add_importlibs(hid msvcrt kernel32 ntdll) add_pch(hid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(hid 1) Modified: branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hlink/C… ============================================================================== --- branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -22,6 +22,7 @@ ole32 advapi32 urlmon + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/hnetcfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hnetcfg… ============================================================================== --- branches/cmake-bringup/dll/win32/hnetcfg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hnetcfg/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -28,6 +28,7 @@ add_importlibs(hnetcfg ole32 advapi32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/httpapi… ============================================================================== --- branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -11,6 +11,6 @@ target_link_libraries(httpapi wine) -add_importlibs(httpapi kernel32 ntdll) +add_importlibs(httpapi msvcrt kernel32 ntdll) add_cab_target(httpapi 1) Modified: branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iccvid/… ============================================================================== --- branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -12,6 +12,6 @@ target_link_libraries(iccvid wine) -add_importlibs(iccvid user32 kernel32 ntdll) +add_importlibs(iccvid user32 msvcrt kernel32 ntdll) add_cab_target(iccvid 1) Modified: branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/icmp/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -9,6 +9,6 @@ target_link_libraries(icmp wine) -add_importlibs(icmp ws2_32 kernel32 ntdll) +add_importlibs(icmp ws2_32 msvcrt kernel32 ntdll) add_dependencies(icmp psdk) add_cab_target(icmp 1) Modified: branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imagehl… ============================================================================== --- branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -22,7 +22,7 @@ target_link_libraries(imagehlp wine) -add_importlibs(imagehlp dbghelp kernel32 ntdll) +add_importlibs(imagehlp dbghelp msvcrt kernel32 ntdll) add_pch(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(imagehlp 1) Modified: branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imm32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -14,7 +14,7 @@ target_link_libraries(imm32 wine) -add_importlibs(imm32 advapi32 user32 kernel32 ntdll) +add_importlibs(imm32 advapi32 user32 msvcrt kernel32 ntdll) add_cab_target(imm32 1) add_importlib_target(imm32.spec) Modified: branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/inetcom… ============================================================================== --- branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -29,6 +29,7 @@ ws2_32 user32 advapi32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/initpki… ============================================================================== --- branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -10,6 +10,6 @@ target_link_libraries(initpki wine) -add_importlibs(initpki kernel32 ntdll) +add_importlibs(initpki msvcrt kernel32 ntdll) add_cab_target(initpki 1) Modified: branches/cmake-bringup/dll/win32/inseng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/inseng/… ============================================================================== --- branches/cmake-bringup/dll/win32/inseng/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/inseng/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -17,6 +17,7 @@ add_importlibs(inseng ole32 advapi32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/itss/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/itss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/itss/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -24,6 +24,7 @@ urlmon shlwapi ole32 + msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/loadper… ============================================================================== --- branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:36:28 2010 @@ -15,7 +15,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def wine) -add_importlibs(loadperf kernel32 ntdll) +add_importlibs(loadperf msvcrt kernel32 ntdll) add_cab_target(loadperf 1) add_importlib_target(loadperf.spec)

1 0

[tkreuzer] 49808: [NDK] Fix syntax for MSVC
by tkreuzer＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: tkreuzer Date: Sat Nov 27 00:10:47 2010 New Revision: 49808 URL: http://svn.reactos.org/svn/reactos?rev=49808&view=rev Log: [NDK] Fix syntax for MSVC Modified: branches/cmake-bringup/include/ndk/umfuncs.h Modified: branches/cmake-bringup/include/ndk/umfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/umfun… ============================================================================== --- branches/cmake-bringup/include/ndk/umfuncs.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/ndk/umfuncs.h [iso-8859-1] Sat Nov 27 00:10:47 2010 @@ -296,7 +296,7 @@ IN PVOID BaseAddress ); -typedef VOID NTAPI (*PLDR_CALLBACK)(PVOID CallbackContext, PVOID Name); +typedef VOID (NTAPI *PLDR_CALLBACK)(PVOID CallbackContext, PVOID Name); NTSTATUS NTAPI LdrVerifyImageMatchesChecksum(

1 0

[tkreuzer] 49807: [CMAKE] add a bunch more importlib targets
by tkreuzer＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: tkreuzer Date: Sat Nov 27 00:02:36 2010 New Revision: 49807 URL: http://svn.reactos.org/svn/reactos?rev=49807&view=rev Log: [CMAKE] add a bunch more importlib targets Modified: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3… ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -1,3 +1,5 @@ + +spec2def(avicap32.dll avicap32.spec) set_unicode() @@ -8,12 +10,9 @@ set_module_type(avicap32 win32dll) -set_export_spec(avicap32 avicap32.spec) - -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/avicap32.def) - target_link_libraries(avicap32 wine) add_importlibs(avicap32 advapi32 user32 version kernel32 ntdll) add_cab_target(avicap32 1) +add_importlib_target(avicap32.spec) Modified: branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crypt32… ============================================================================== --- branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -51,3 +51,4 @@ add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll) add_cab_target(crypt32 1) +add_importlib_target(crypt32.spec) Modified: branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dnsapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -31,4 +31,5 @@ add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi/precomp.h ${SOURCE}) add_dependencies(dnsapi psdk buildno_header) -add_cab_target(dnsapi 1) +add_cab_target(dnsapi 1) +add_importlib_target(dnsapi.spec) Modified: branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/fmifs/C… ============================================================================== --- branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -21,3 +21,4 @@ add_importlibs(fmifs kernel32 ntdll) add_dependencies(fmifs psdk buildno_header) add_cab_target(fmifs 1) +add_importlib_target(fmifs.spec) Modified: branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imm32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -17,3 +17,4 @@ add_importlibs(imm32 advapi32 user32 kernel32 ntdll) add_cab_target(imm32 1) +add_importlib_target(imm32.spec) Modified: branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lsasrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -24,4 +24,5 @@ add_importlibs(lsasrv rpcrt4 kernel32 ntdll) add_dependencies(lsasrv psdk buildno_header) -add_cab_target(lsasrv 1) +add_cab_target(lsasrv 1) +add_importlib_target(lsasrv.spec) Modified: branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lz32/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -1,12 +1,12 @@ + +spec2def(lz32.dll lz32.spec) add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(lz32 SHARED version.rc lz32.def) - -if(NOT MSVC) - set_source_files_properties(lz32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(lz32 SHARED + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/lz32.def) set_entrypoint(lz32 0) @@ -14,4 +14,5 @@ add_importlibs(lz32 kernel32 ntdll) add_dependencies(lz32 psdk buildno_header) -add_cab_target(lz32 1) +add_cab_target(lz32 1) +add_importlib_target(lz32.spec) Modified: branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -23,3 +23,4 @@ add_importlibs(mpr advapi32 user32 kernel32 ntdll) add_cab_target(mpr 1) +add_importlib_target(mpr.spec) Modified: branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msacm32… ============================================================================== --- branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -25,3 +25,4 @@ add_subdirectory(msacm32.drv) add_cab_target(msacm32 1) +add_importlib_target(msacm32.spec) Modified: branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msimg32… ============================================================================== --- branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -1,12 +1,12 @@ + +spec2def(msimg32.dll msimg32.spec) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -add_library(msimg32 SHARED msimg32_main.c msimg32.def) - -if(NOT MSVC) - set_source_files_properties(msimg32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(msimg32 SHARED + msimg32_main.c + ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def) set_module_type(msimg32 win32dll) @@ -15,3 +15,4 @@ add_importlibs(msimg32 gdi32 kernel32 ntdll) add_cab_target(msimg32 1) +add_importlib_target(msimg32.spec) Modified: branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvfw32… ============================================================================== --- branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -20,3 +20,4 @@ add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 kernel32 ntdll) add_cab_target(msvfw32 1) +add_importlib_target(msvfw32.spec) Modified: branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -26,3 +26,4 @@ add_importlibs(netapi32 iphlpapi ws2_32 advapi32 kernel32 ntdll) add_cab_target(netapi32 1) +add_importlib_target(netapi32.spec) Modified: branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/newdev/… ============================================================================== --- branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -17,3 +17,4 @@ add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 kernel32 ntdll) add_cab_target(newdev 1) +add_importlib_target(newdev.spec) Modified: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleaut3… ============================================================================== --- branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -61,3 +61,4 @@ rpcproxy(oleaut32 oleaut32_oaidl.idl oleaut32_ocidl.idl) add_cab_target(oleaut32 1) +add_importlib_target(oleaut32.spec) Modified: branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/powrpro… ============================================================================== --- branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -1,11 +1,12 @@ + +spec2def(powrprof.dll powrprof.spec) set_unicode() -add_library(powrprof SHARED powrprof.c powrprof.rc powrprof.def) - -if(NOT MSVC) - set_source_files_properties(powrprof.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(powrprof SHARED + powrprof.c + powrprof.rc + ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def) set_module_type(powrprof win32dll) @@ -14,3 +15,4 @@ add_importlibs(powrprof advapi32 user32 comctl32 kernel32 ntdll) add_cab_target(powrprof 1) +add_importlib_target(powrprof.spec) Modified: branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samlib/… ============================================================================== --- branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -11,3 +11,4 @@ add_importlibs(samlib advapi32 kernel32 ntdll) add_cab_target(samlib 1) +add_importlib_target(samlib.spec) Modified: branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/secur32… ============================================================================== --- branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -24,3 +24,4 @@ add_pch(secur32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(secur32 1) +add_importlib_target(secur32.spec) Modified: branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/C… ============================================================================== --- branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -1,3 +1,5 @@ + +spec2def(smdll.dll smdll.spec) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) @@ -5,14 +7,11 @@ dllmain.c query.c smdll.rc - smdll.def) - -if(NOT MSVC) - set_source_files_properties(smdll.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/smdll.def) target_link_libraries(smdll smlib) add_importlibs(smdll ntdll) add_dependencies(smdll psdk buildno_header) -add_cab_target(smdll 1) +add_cab_target(smdll 1) +add_importlib_target(smdll.spec) Modified: branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/userenv… ============================================================================== --- branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -26,3 +26,4 @@ add_pch(userenv ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(userenv 1) +add_importlib_target(userenv.spec) Modified: branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uxtheme… ============================================================================== --- branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -24,3 +24,4 @@ add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 kernel32 ntdll) add_cab_target(uxtheme 1) +add_importlib_target(uxtheme.spec) Modified: branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -1,3 +1,5 @@ + +spec2def(winspool.drv winspool.spec) set_unicode() @@ -7,15 +9,15 @@ info.c stubs.c winspool_winspool.stubs.c - winspool.rc) + winspool.rc + ${CMAKE_CURRENT_BINARY_DIR}/winspool.def) set_target_properties(winspool PROPERTIES SUFFIX ".drv") set_module_type(winspool win32dll) -target_link_libraries(winspool - ${CMAKE_CURRENT_SOURCE_DIR}/winspool_winspool.auto.def - wine) +target_link_libraries(winspool wine) add_importlibs(winspool advapi32 shlwapi kernel32 ntdll) add_cab_target(winspool 1) +add_importlib_target(winspool.spec) Modified: branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2help… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] Sat Nov 27 00:02:36 2010 @@ -1,3 +1,5 @@ + +spec2def(ws2help.dll ws2help.spec) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) @@ -7,14 +9,11 @@ dllmain.c handle.c notify.c - ws2help.def) - -if(NOT MSVC) - set_source_files_properties(ws2help.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def) set_module_type(ws2help win32dll) add_importlibs(ws2help advapi32 ws2_32 kernel32 ntdll) add_cab_target(ws2help 1) +add_importlib_target(ws2help.spec)

1 0

[akhaldi] 49806: - Correct the entry point for win32dll, win32ocx and cpl module types. - Fix acledit.
by akhaldi＠svn.reactos.org 26 Nov '10

26 Nov '10

Author: akhaldi Date: Fri Nov 26 23:57:03 2010 New Revision: 49806 URL: http://svn.reactos.org/svn/reactos?rev=49806&view=rev Log: - Correct the entry point for win32dll, win32ocx and cpl module types. - Fix acledit. Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Fri Nov 26 23:57:03 2010 @@ -13,7 +13,7 @@ set_export_spec(acledit acledit.spec) -add_importlibs(acledit ntdll) +add_importlibs(acledit msvcrt kernel32 ntdll) add_cab_target(acledit 1) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Nov 26 23:57:03 2010 @@ -135,7 +135,8 @@ target_link_libraries(${MODULE} mingw_common) endif() if(${TYPE} MATCHES win32dll) - set_entrypoint(${MODULE} DllMain@12) + set_entrypoint(${MODULE} DllMainCRTStartup@12) + target_link_libraries(${MODULE} mingw_dllmain mingw_common) if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}}) else() @@ -143,11 +144,13 @@ endif() endif() if(${TYPE} MATCHES win32ocx) - set_entrypoint(${MODULE} DllMain@12) + set_entrypoint(${MODULE} DllMainCRTStartup@12) + target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") endif() if(${TYPE} MATCHES cpl) - set_entrypoint(${MODULE} DllMain@12) + set_entrypoint(${MODULE} DllMainCRTStartup@12) + target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") endif() if(${TYPE} MATCHES kernelmodedriver)

1 0

[tkreuzer] 49805: [CMAKE] - implicitly link to msvcsup - set proper entrypoints - add linkerflags /DLL and /DRIVER
by tkreuzer＠svn.reactos.org 26 Nov '10

26 Nov '10

Author: tkreuzer Date: Fri Nov 26 23:48:07 2010 New Revision: 49805 URL: http://svn.reactos.org/svn/reactos?rev=49805&view=rev Log: [CMAKE] - implicitly link to msvcsup - set proper entrypoints - add linkerflags /DLL and /DRIVER Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Fri Nov 26 23:48:07 2010 @@ -71,7 +71,7 @@ else() target_link_libraries(${MODULE} mingw_main) endif() - target_link_libraries(${MODULE} mingw_common) + target_link_libraries(${MODULE} mingw_common msvcsup) endif () if (${TYPE} MATCHES win32cui) set_subsystem(${MODULE} console) @@ -81,7 +81,7 @@ else() target_link_libraries(${MODULE} mingw_main) endif() - target_link_libraries(${MODULE} mingw_common) + target_link_libraries(${MODULE} mingw_common msvcsup) endif () if(${TYPE} MATCHES win32dll) # Need this only because mingw library is broken @@ -91,22 +91,27 @@ else() message(STATUS "${MODULE} has no base address") endif() - target_link_libraries(${MODULE} mingw_common mingw_dllmain) + target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) add_linkerflag(${MODULE} "/DLL") endif() if(${TYPE} MATCHES win32ocx) - set_entrypoint(${MODULE} DllMain@12) + set_entrypoint(${MODULE} DllMainCRTStartup@12) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") + target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) + add_linkerflag(${MODULE} "/DLL") endif() if(${TYPE} MATCHES cpl) - set_entrypoint(${MODULE} DllMain@12) + set_entrypoint(${MODULE} DllMainCRTStartup@12) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") + target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup) + add_linkerflag(${MODULE} "/DLL") endif() if(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") set_entrypoint(${MODULE} DriverEntry@8) set_subsystem(${MODULE} native) set_image_base(${MODULE} 0x00010000) + add_linkerflag(${MODULE} "/DRIVER") add_dependencies(${MODULE} bugcodes) endif()

1 0

[tkreuzer] 49804: [CMAKE] Add msvcsup static library for MSVC. This might be superseded by something else later.
by tkreuzer＠svn.reactos.org 26 Nov '10

26 Nov '10

Author: tkreuzer Date: Fri Nov 26 23:45:30 2010 New Revision: 49804 URL: http://svn.reactos.org/svn/reactos?rev=49804&view=rev Log: [CMAKE] Add msvcsup static library for MSVC. This might be superseded by something else later. Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Fri Nov 26 23:45:30 2010 @@ -570,3 +570,13 @@ add_library(libcntpr ${LIBCNTPR_SOURCE}) set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) add_dependencies(libcntpr psdk buildno_header asm) + +# This is a temporary solution until we have proper crt libs +list(APPEND MSVCSUP_SOURCE + misc/fltused.c + except/i386/chkstk_asm.s + math/i386/ftol2_asm.S +) + +add_library(msvcsup ${MSVCSUP_SOURCE}) +add_dependencies(msvcsup psdk buildno_header asm)

1 0

[spetreolle] 49803: [CMAKE] Sync with trunk. (r49792)
by spetreolle＠svn.reactos.org 26 Nov '10

26 Nov '10

Author: spetreolle Date: Fri Nov 26 23:33:34 2010 New Revision: 49803 URL: http://svn.reactos.org/svn/reactos?rev=49803&view=rev Log: [CMAKE] Sync with trunk. (r49792) Added: branches/cmake-bringup/boot/armllb/hw/matrix.c - copied unchanged from r49792, trunk/reactos/boot/armllb/hw/matrix.c branches/cmake-bringup/boot/armllb/hw/omap3-beagle/ - copied from r49792, trunk/reactos/boot/armllb/hw/omap3-beagle/ branches/cmake-bringup/boot/armllb/hw/omap3-zoom2/ - copied from r49792, trunk/reactos/boot/armllb/hw/omap3-zoom2/ branches/cmake-bringup/boot/armllb/inc/omap3.h - copied unchanged from r49792, trunk/reactos/boot/armllb/inc/omap3.h branches/cmake-bringup/boot/freeldr/freeldr/freeldr_arm.lnk - copied unchanged from r49792, trunk/reactos/boot/freeldr/freeldr/freeldr_arm.lnk branches/cmake-bringup/hal/halarm/omap3/ - copied from r49792, trunk/reactos/hal/halarm/omap3/ branches/cmake-bringup/include/psdk/specstrings.h - copied unchanged from r49792, trunk/reactos/include/psdk/specstrings.h Removed: branches/cmake-bringup/boot/armllb/hw/omap3/ Modified: branches/cmake-bringup/ (props changed) branches/cmake-bringup/base/applications/rapps/rapps/7zip.txt branches/cmake-bringup/base/applications/rapps/rapps/libreoffice.txt branches/cmake-bringup/base/applications/rapps/rapps/mirandaim.txt branches/cmake-bringup/base/applications/rapps/rapps/mono2.txt branches/cmake-bringup/base/applications/rapps/rapps/openttd.txt branches/cmake-bringup/base/system/services/rpcserver.c branches/cmake-bringup/boot/CMakeLists.txt branches/cmake-bringup/boot/armllb/boot.s branches/cmake-bringup/boot/armllb/crtsupp.c branches/cmake-bringup/boot/armllb/envir.c branches/cmake-bringup/boot/armllb/fw.c branches/cmake-bringup/boot/armllb/hw/time.c branches/cmake-bringup/boot/armllb/hw/video.c branches/cmake-bringup/boot/armllb/inc/envir.h branches/cmake-bringup/boot/armllb/inc/keyboard.h branches/cmake-bringup/boot/armllb/inc/machtype.h branches/cmake-bringup/boot/armllb/inc/precomp.h branches/cmake-bringup/boot/armllb/main.c branches/cmake-bringup/boot/armllb/os/loader.c branches/cmake-bringup/boot/freeldr/freeldr/arch/arm/boot.s branches/cmake-bringup/boot/freeldr/freeldr/arch/arm/macharm.c branches/cmake-bringup/boot/freeldr/freeldr/include/keycodes.h branches/cmake-bringup/boot/freeldr/freeldr/mm/mm.c branches/cmake-bringup/boot/freeldr/freeldr/rtl/bget.c branches/cmake-bringup/boot/freeldr/freeldr/windows/arm/wlmemory.c branches/cmake-bringup/boot/freeldr/freeldr/windows/conversion.c branches/cmake-bringup/boot/freeldr/freeldr/windows/winldr.c branches/cmake-bringup/boot/freeldr/freeldr/windows/wlregistry.c branches/cmake-bringup/dll/ntdll/ldr/utils.c branches/cmake-bringup/dll/win32/gdi32/objects/coord.c branches/cmake-bringup/dll/win32/gdi32/objects/dc.c branches/cmake-bringup/dll/win32/kernel32/file/npipe.c branches/cmake-bringup/drivers/filesystems/npfs/create.c branches/cmake-bringup/drivers/filesystems/npfs/fsctrl.c branches/cmake-bringup/drivers/filesystems/npfs/npfs.c branches/cmake-bringup/drivers/filesystems/npfs/npfs.h branches/cmake-bringup/include/crt/mingw32/intrin_arm.h branches/cmake-bringup/include/crt/setjmp.h branches/cmake-bringup/include/crt/stddef.h branches/cmake-bringup/include/ddk/wdm.h branches/cmake-bringup/include/ndk/arm/ketypes.h branches/cmake-bringup/include/ndk/arm/mmtypes.h branches/cmake-bringup/include/ndk/umfuncs.h branches/cmake-bringup/include/psdk/windef.h branches/cmake-bringup/include/psdk/winnt.h branches/cmake-bringup/include/reactos/arm/armddk.h branches/cmake-bringup/include/reactos/wine/exception.h branches/cmake-bringup/lib/sdk/crt/misc/assert.c branches/cmake-bringup/ntoskrnl/fsrtl/dbcsname.c branches/cmake-bringup/ntoskrnl/fsrtl/filtrctx.c branches/cmake-bringup/ntoskrnl/fsrtl/name.c branches/cmake-bringup/ntoskrnl/include/internal/arm/kxarm.h branches/cmake-bringup/ntoskrnl/include/internal/arm/mm.h branches/cmake-bringup/ntoskrnl/include/internal/fsrtl.h branches/cmake-bringup/ntoskrnl/include/internal/i386/mm.h branches/cmake-bringup/ntoskrnl/include/internal/io.h branches/cmake-bringup/ntoskrnl/include/internal/mm.h branches/cmake-bringup/ntoskrnl/include/internal/ntoskrnl.h branches/cmake-bringup/ntoskrnl/io/iomgr/controller.c branches/cmake-bringup/ntoskrnl/io/iomgr/file.c branches/cmake-bringup/ntoskrnl/ke/arm/boot.s branches/cmake-bringup/ntoskrnl/ke/arm/cpu.c branches/cmake-bringup/ntoskrnl/ke/arm/ctxswtch.s branches/cmake-bringup/ntoskrnl/ke/arm/thrdini.c branches/cmake-bringup/ntoskrnl/ke/arm/trapc.c branches/cmake-bringup/ntoskrnl/mm/ARM3/arm/init.c branches/cmake-bringup/ntoskrnl/mm/ARM3/mdlsup.c branches/cmake-bringup/ntoskrnl/mm/ARM3/miarm.h branches/cmake-bringup/ntoskrnl/mm/ARM3/mminit.c branches/cmake-bringup/ntoskrnl/mm/ARM3/pagfault.c branches/cmake-bringup/ntoskrnl/mm/ARM3/pool.c branches/cmake-bringup/ntoskrnl/mm/ARM3/procsup.c branches/cmake-bringup/ntoskrnl/mm/ARM3/section.c branches/cmake-bringup/ntoskrnl/mm/ARM3/virtual.c branches/cmake-bringup/ntoskrnl/mm/amd64/init.c branches/cmake-bringup/ntoskrnl/mm/arm/page.c branches/cmake-bringup/ntoskrnl/mm/arm/stubs.c branches/cmake-bringup/ntoskrnl/mm/pagefile.c branches/cmake-bringup/ntoskrnl/ntoskrnl.spec branches/cmake-bringup/ntoskrnl/po/power.c branches/cmake-bringup/subsystems/win32/win32k/include/msgqueue.h branches/cmake-bringup/subsystems/win32/win32k/include/winpos.h branches/cmake-bringup/subsystems/win32/win32k/ntuser/clipboard.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/cursoricon.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/desktop.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/input.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/menu.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/msgqueue.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/ntstubs.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/window.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/winpos.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/winsta.c branches/cmake-bringup/subsystems/win32/win32k/pch.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi… Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… Modified: branches/cmake-bringup/boot/armllb/boot.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/boot.… Modified: branches/cmake-bringup/boot/armllb/crtsupp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/crtsu… Modified: branches/cmake-bringup/boot/armllb/envir.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/envir… Modified: branches/cmake-bringup/boot/armllb/fw.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/fw.c?… Modified: branches/cmake-bringup/boot/armllb/hw/time.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/hw/ti… Modified: branches/cmake-bringup/boot/armllb/hw/video.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/hw/vi… Modified: branches/cmake-bringup/boot/armllb/inc/envir.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/inc/e… Modified: branches/cmake-bringup/boot/armllb/inc/keyboard.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/inc/k… Modified: branches/cmake-bringup/boot/armllb/inc/machtype.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/inc/m… Modified: branches/cmake-bringup/boot/armllb/inc/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/inc/p… Modified: branches/cmake-bringup/boot/armllb/main.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/main.… Modified: branches/cmake-bringup/boot/armllb/os/loader.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/armllb/os/lo… Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/arm/boot.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/include/keycodes.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/rtl/bget.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/windows/arm/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/windows/conversion.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… Modified: branches/cmake-bringup/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/ldr/uti… Modified: branches/cmake-bringup/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/o… Modified: branches/cmake-bringup/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/o… Modified: branches/cmake-bringup/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… Modified: branches/cmake-bringup/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… Modified: branches/cmake-bringup/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… Modified: branches/cmake-bringup/drivers/filesystems/npfs/npfs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… Modified: branches/cmake-bringup/drivers/filesystems/npfs/npfs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… Modified: branches/cmake-bringup/include/crt/mingw32/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/mingw… Modified: branches/cmake-bringup/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/setjm… Modified: branches/cmake-bringup/include/crt/stddef.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/stdde… Modified: branches/cmake-bringup/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ddk/wdm.h… Modified: branches/cmake-bringup/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/arm/k… Modified: branches/cmake-bringup/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/arm/m… Modified: branches/cmake-bringup/include/ndk/umfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/umfun… Modified: branches/cmake-bringup/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/wind… Modified: branches/cmake-bringup/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/winn… Modified: branches/cmake-bringup/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/a… Modified: branches/cmake-bringup/include/reactos/wine/exception.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… Modified: branches/cmake-bringup/lib/sdk/crt/misc/assert.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/misc/… Modified: branches/cmake-bringup/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/fsrtl/db… Modified: branches/cmake-bringup/ntoskrnl/fsrtl/filtrctx.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/fsrtl/fi… Modified: branches/cmake-bringup/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/fsrtl/na… Modified: branches/cmake-bringup/ntoskrnl/include/internal/arm/kxarm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/include/internal/fsrtl.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/io/iomgr/controller.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/io/iomgr… Modified: branches/cmake-bringup/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/io/iomgr… Modified: branches/cmake-bringup/ntoskrnl/ke/arm/boot.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/arm/b… Modified: branches/cmake-bringup/ntoskrnl/ke/arm/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/arm/c… Modified: branches/cmake-bringup/ntoskrnl/ke/arm/ctxswtch.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/arm/c… Modified: branches/cmake-bringup/ntoskrnl/ke/arm/thrdini.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/arm/t… Modified: branches/cmake-bringup/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/arm/t… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/amd64… Modified: branches/cmake-bringup/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/arm/p… Modified: branches/cmake-bringup/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/arm/s… Modified: branches/cmake-bringup/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/pagef… Modified: branches/cmake-bringup/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ntoskrnl… Modified: branches/cmake-bringup/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/po/power… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

1 0

[fireball] 49802: - Sync up to Wine-1.3.8.
by fireball＠svn.reactos.org 26 Nov '10

26 Nov '10

Author: fireball Date: Fri Nov 26 23:13:42 2010 New Revision: 49802 URL: http://svn.reactos.org/svn/reactos?rev=49802&view=rev Log: - Sync up to Wine-1.3.8. Modified: branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/user32/focus.c branches/arwinss/reactos/dll/win32/user32/message.c branches/arwinss/reactos/dll/win32/user32/painting.c branches/arwinss/reactos/dll/win32/user32/user32.spec branches/arwinss/reactos/dll/win32/user32/win.c branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/event.c branches/arwinss/reactos/dll/win32/winex11.drv/window.c branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c Propchange: branches/arwinss/reactos/dll/win32/user32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 26 23:13:42 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/user32:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605,48678 -/vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321,47585,47798,47861,48147,48418,48677,49173,49721 +/vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46696,46915,47274,47321,47585,47798,47861,48147,48418,48677,49173,49721,49800 Modified: branches/arwinss/reactos/dll/win32/user32/focus.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/focus.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/focus.c [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -163,6 +163,7 @@ { GUITHREADINFO info; + info.cbSize = sizeof(info); GetGUIThreadInfo( GetCurrentThreadId(), &info ); /* Do not change focus if the window is no more active */ if (hwnd == info.hwndActive) Modified: branches/arwinss/reactos/dll/win32/user32/message.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/message.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/message.c [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -2360,6 +2360,7 @@ /* find the window to dispatch this mouse message to */ + info.cbSize = sizeof(info); GetGUIThreadInfo( GetCurrentThreadId(), &info ); if (info.hwndCapture) { @@ -4231,11 +4232,27 @@ /********************************************************************** + * IsGUIThread (USER32.@) + */ +BOOL WINAPI IsGUIThread( BOOL convert ) +{ + FIXME( "%u: stub\n", convert ); + return TRUE; +} + + +/********************************************************************** * GetGUIThreadInfo (USER32.@) */ BOOL WINAPI GetGUIThreadInfo( DWORD id, GUITHREADINFO *info ) { BOOL ret; + + if (info->cbSize != sizeof(*info)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } SERVER_START_REQ( get_thread_input ) { Modified: branches/arwinss/reactos/dll/win32/user32/painting.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/painting.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/painting.c [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -802,6 +802,7 @@ RECT rect, mapped_rcCaret; BOOL hide_caret = FALSE; + info.cbSize = sizeof(info); if (!GetGUIThreadInfo( GetCurrentThreadId(), &info )) return 0; if (!info.hwndCaret) return 0; Modified: branches/arwinss/reactos/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user32.spec [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -436,7 +436,7 @@ @ stdcall IsDialogMessageA(long ptr) @ stdcall IsDialogMessageW(long ptr) @ stdcall IsDlgButtonChecked(long long) -@ stub IsGUIThread +@ stdcall IsGUIThread(long) @ stdcall IsHungAppWindow(long) # @ stub IsHungThread @ stdcall IsIconic(long) Modified: branches/arwinss/reactos/dll/win32/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -1588,6 +1588,7 @@ { GUITHREADINFO info; + info.cbSize = sizeof(info); if (GetGUIThreadInfo( GetCurrentThreadId(), &info )) { if (hwnd == info.hwndCaret) DestroyCaret(); Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 26 23:13:42 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/winex11.drv:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/winex11.drv:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605,48678 -/vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46915,47274,47321,47798,47861,48147,48418,48677,49173,49721 +/vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044,45206,45455,45646,45910,46314,46915,47274,47321,47798,47861,48147,48418,48677,49173,49721,49800 Modified: branches/arwinss/reactos/dll/win32/winex11.drv/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/event.c [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -498,6 +498,7 @@ TRACE( "setting foreground window to %p\n", hwnd ); SetForegroundWindow( hwnd ); + threadinfo.cbSize = sizeof(threadinfo); GetGUIThreadInfo(0, &threadinfo); focus = threadinfo.hwndFocus; if (!focus) focus = threadinfo.hwndActive; Modified: branches/arwinss/reactos/dll/win32/winex11.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -79,6 +79,7 @@ static Time last_user_time; static Window user_time_window; +static const char foreign_window_prop[] = "__wine_x11_foreign_window"; static const char whole_window_prop[] = "__wine_x11_whole_window"; static const char client_window_prop[]= "__wine_x11_client_window"; static const char icon_window_prop[] = "__wine_x11_icon_window"; @@ -1754,7 +1755,23 @@ */ static void destroy_whole_window( Display *display, struct x11drv_win_data *data, BOOL already_destroyed ) { - if (!data->whole_window) return; + if (!data->whole_window) + { + if (data->embedded) + { + Window xwin = (Window)GetPropA( data->hwnd, foreign_window_prop ); + if (xwin) + { + wine_tsx11_lock(); + if (!already_destroyed) XSelectInput( display, xwin, 0 ); + XDeleteContext( display, xwin, winContext ); + wine_tsx11_unlock(); + RemovePropA( data->hwnd, foreign_window_prop ); + } + } + return; + } + TRACE( "win %p xwin %lx/%lx\n", data->hwnd, data->whole_window, data->client_window ); wine_tsx11_lock(); @@ -1895,14 +1912,7 @@ if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->embedded) FIXME( "window %p/%lx destroyed from the outside\n", hwnd, data->whole_window ); - if (!data->whole_window) - { - wine_tsx11_lock(); - XDeleteContext( display, event->xdestroywindow.window, winContext ); - wine_tsx11_unlock(); - } - else destroy_whole_window( display, data, TRUE ); - + destroy_whole_window( display, data, TRUE ); if (data->embedded) SendMessageW( hwnd, WM_CLOSE, 0, 0 ); } @@ -2154,6 +2164,7 @@ data->embedded = TRUE; data->mapped = TRUE; + SetPropA( hwnd, foreign_window_prop, (HANDLE)xwin ); wine_tsx11_lock(); XSaveContext( display, xwin, winContext, (char *)data->hwnd ); wine_tsx11_unlock(); Modified: branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/x11drv_main.c [iso-8859-1] Fri Nov 26 23:13:42 2010 @@ -198,7 +198,7 @@ */ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) { - if (event->request_code == X_SetInputFocus && + if ((event->request_code == X_SetInputFocus || event->request_code == X_ChangeWindowAttributes) && (event->error_code == BadMatch || event->error_code == BadWindow)) return TRUE; /* ignore a number of errors on gdi display caused by creating/destroying windows */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs