Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 48969: Merge 48915 and 48923 to 0.3.12 branch.
by dreimer＠svn.reactos.org 03 Oct '10

03 Oct '10

Author: dreimer Date: Sun Oct 3 17:02:54 2010 New Revision: 48969 URL: http://svn.reactos.org/svn/reactos?rev=48969&view=rev Log: Merge 48915 and 48923 to 0.3.12 branch. Modified: branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/et-EE.h branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/uk-UA.h Modified: branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sun Oct 3 17:02:54 2010 @@ -985,13 +985,13 @@ { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "Paigalda alglaadur kävakettale (MBR ja VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "Paigalda alglaadur kävakettale (ainult VBR).", TEXT_STYLE_NORMAL }, { Modified: branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sun Oct 3 17:02:54 2010 @@ -985,31 +985,31 @@ { 6, 8, - "áâ ®¢«î¢ ç ¢áâ ®¢«îó boot loader", + "áâ ®¢«î¢ ç ¢áâ ®¢«îó § ¢ â ¦ã¢ ç", TEXT_STYLE_NORMAL }, { 8, 12, - "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¦®àáâª¨© ¤¨áª (MBR i VBR).", + "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¦®àáâª¨© ¤¨áª (MBR i VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¦®àáâª¨© ¤¨áª («¨è¥ VBR).", + "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¦®àáâª¨© ¤¨áª («¨è¥ VBR).", TEXT_STYLE_NORMAL }, { 8, 14, - "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¤¨áª¥âã.", + "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¤¨áª¥âã.", TEXT_STYLE_NORMAL }, { 8, 15, - "¥ ¢áâ ®¢«î¢ â¨ § ¢ â ¦ã¢ ç.", + "¥ ¢áâ ®¢«î¢ â¨ § ¢ â ¦ã¢ ç.", TEXT_STYLE_NORMAL }, {

1 0

[cgutman] 48968: [NDIS] - Disable timer queuing code (hackfix for various network driver failures) - Also needs to be merged into 0.3.12
by cgutman＠svn.reactos.org 03 Oct '10

03 Oct '10

Author: cgutman Date: Sun Oct 3 15:18:57 2010 New Revision: 48968 URL: http://svn.reactos.org/svn/reactos?rev=48968&view=rev Log: [NDIS] - Disable timer queuing code (hackfix for various network driver failures) - Also needs to be merged into 0.3.12 Modified: trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun Oct 3 15:18:57 2010 @@ -145,7 +145,7 @@ * - call at IRQL <= DISPATCH_LEVEL */ { - KIRQL OldIrql; + //KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(TimerCancelled); @@ -153,6 +153,7 @@ *TimerCancelled = KeCancelTimer (&Timer->Timer); +#if 0 if (*TimerCancelled) { KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); @@ -160,6 +161,7 @@ if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE); KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); } +#endif } VOID NTAPI @@ -170,6 +172,7 @@ { PNDIS_MINIPORT_TIMER Timer = DeferredContext; +#if 0 /* Only dequeue if the timer has a period of 0 */ if (!Timer->Timer.Period) { @@ -178,6 +181,7 @@ if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE); KeReleaseSpinLockFromDpcLevel(&Timer->Miniport->Lock); } +#endif Timer->MiniportTimerFunction(Dpc, Timer->MiniportTimerContext, @@ -240,14 +244,15 @@ */ { LARGE_INTEGER Timeout; - KIRQL OldIrql; + //KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(Timer); /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsPeriod, -10000); - + +#if 0 /* Lock the miniport block */ KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); @@ -260,6 +265,7 @@ /* Unlock the miniport block */ KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); +#endif KeSetTimerEx(&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc); } @@ -285,7 +291,7 @@ */ { LARGE_INTEGER Timeout; - KIRQL OldIrql; + //KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(Timer); @@ -293,6 +299,7 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsToDelay, -10000); +#if 0 /* Lock the miniport block */ KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); @@ -305,6 +312,7 @@ /* Unlock the miniport block */ KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); +#endif KeSetTimer(&Timer->Timer, Timeout, &Timer->Dpc); }

1 0

[akhaldi] 48967: [CMAKE] - Improve some dlls.
by akhaldi＠svn.reactos.org 02 Oct '10

02 Oct '10

Author: akhaldi Date: Sat Oct 2 22:19:59 2010 New Revision: 48967 URL: http://svn.reactos.org/svn/reactos?rev=48967&view=rev Log: [CMAKE] - Improve some dlls. Modified: branches/cmake-bringup/dll/win32/cfgmgr32/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/crypt32/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt branches/cmake-bringup/dll/win32/fmifs/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/hid/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/imaadp32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cfgmgr3… ============================================================================== --- branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,12 +1,10 @@ - -set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") spec2def(cfgmgr32 ${CMAKE_CURRENT_SOURCE_DIR}/cfgmgr32.spec ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def) add_library(cfgmgr32 SHARED cfgmgr32.rc) -set_target_properties(cfgmgr32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(cfgmgr32 0) target_link_libraries(cfgmgr32 ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def) -add_dependencies(cfgmgr32 cfgmgr32_def psdk) +add_dependencies(cfgmgr32 cfgmgr32_def psdk buildno_header) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,11 +7,11 @@ add_library(clusapi SHARED clusapi.c) -set_target_properties(clusapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(clusapi win32dll) target_link_libraries(clusapi ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def - wine - mingw_common) + wine) -add_dependencies(clusapi clusapi_def psdk) +add_importlibs(clusapi kernel32 ntdll) +add_dependencies(clusapi clusapi_def) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,11 +7,11 @@ add_library(compstui SHARED compstui_main.c) -set_target_properties(compstui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(compstui win32dll) target_link_libraries(compstui ${CMAKE_CURRENT_BINARY_DIR}/compstui.def - wine - mingw_common) + wine) -add_dependencies(compstui compstui_def psdk) +add_importlibs(compstui kernel32 ntdll) +add_dependencies(compstui compstui_def) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,14 +7,11 @@ add_library(credui SHARED credui_main.c credui.rc) -set_target_properties(credui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(credui win32dll) target_link_libraries(credui ${CMAKE_CURRENT_BINARY_DIR}/credui.def - wine - mingw_common - -ladvapi32 - -luser32 - -lcomctl32) + wine) -add_dependencies(credui credui_def psdk) +add_importlibs(credui advapi32 user32 comctl32 kernel32 ntdll) +add_dependencies(credui credui_def) 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 Oct 2 22:19:59 2010 @@ -1,13 +1,12 @@ - - -add_definitions(-DUSE_MSVCRT_PREFIX) -add_definitions(-D_MSVCRT_LIB_) -add_definitions(-D_MSVCRT_) -add_definitions(-DCRTDLL) -add_definitions(-D_CTYPE_DISABLE_MACROS) -add_definitions(-D_NO_INLINING) -add_definitions(-D__MINGW_IMPORT="") +add_definitions( + -DUSE_MSVCRT_PREFIX + -D_MSVCRT_LIB_ + -D_MSVCRT_ + -DCRTDLL + -D_CTYPE_DISABLE_MACROS + -D_NO_INLINING + -D__MINGW_IMPORT="") include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) @@ -19,14 +18,13 @@ ${CMAKE_CURRENT_BINARY_DIR}/crtdll_precomp.h.gch ${SOURCE}) -set_target_properties(crtdll PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(crtdll win32dll) target_link_libraries(crtdll ${CMAKE_CURRENT_BINARY_DIR}/crtdll.def wine - crt - -lkernel32 - -lntdll) + crt) +add_importlibs(crtdll kernel32 ntdll) add_pch(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(crtdll crtdll_def psdk) +add_dependencies(crtdll crtdll_def) 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 Oct 2 22:19:59 2010 @@ -1,13 +1,12 @@ - - -add_definitions(-D__WINESRC__) -add_definitions(-D_DLL -D__USE_CRTIMP) -add_definitions(-D_WINE) +add_definitions( + -D__WINESRC__ + -D_DLL + -D__USE_CRTIMP + -D_WINE) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -41,15 +40,13 @@ crypt32.rc version.rc) -set_target_properties(crypt32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(crypt32 win32dll) target_link_libraries(crypt32 ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def wine pseh - mingw_common - -luser32 - -ladvapi32 - -lmsvcrt) + mingw_common) -add_dependencies(crypt32 crypt32_def psdk) +add_importlibs(crypt32 user32 advapi32 msvcrt) +add_dependencies(crypt32 crypt32_def) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,11 +7,11 @@ add_library(cryptdll SHARED cryptdll.c) -set_target_properties(cryptdll PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(cryptdll win32dll) target_link_libraries(cryptdll ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def - wine - mingw_common) + wine) -add_dependencies(cryptdll cryptdll_def psdk) +add_importlibs(cryptdll kernel32 ntdll) +add_dependencies(cryptdll cryptdll_def) Modified: branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dbghelp… ============================================================================== --- branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,12 +1,11 @@ - - -add_definitions(-D__WINESRC__) -add_definitions(-D_DLL -D__USE_CRTIMP) -add_definitions(-D_WINE) - -add_definitions(-DHAVE_REGEX_H) -add_definitions(-D_IMAGEHLP_SOURCE_) +add_definitions( + -D__WINESRC__ + -D_DLL + -D__USE_CRTIMP + -D_WINE + -DHAVE_REGEX_H + -D_IMAGEHLP_SOURCE_) if(ARCH MATCHES amd64) add_definitions(-DUNW_FLAG_NHANDLER=0 -DUNW_FLAG_EHANDLER=1 -DUNW_FLAG_UHANDLER=2 -DUNW_FLAG_CHAININFO=3) @@ -42,15 +41,13 @@ type.c version.rc) -set_target_properties(dbghelp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(dbghelp win32dll) target_link_libraries(dbghelp ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def wine mingw_common - -lpsapi - -lversion - pseh - -lmsvcrt) + pseh) -add_dependencies(dbghelp dbghelp_def psdk) +add_importlibs(dbghelp psapi version msvcrt) +add_dependencies(dbghelp dbghelp_def) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,11 +7,11 @@ add_library(dciman32 SHARED dciman_main.c) -set_target_properties(dciman32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(dciman32 win32dll) target_link_libraries(dciman32 ${CMAKE_CURRENT_BINARY_DIR}/dciman32.def - wine - mingw_common) + wine) -add_dependencies(dciman32 dciman32_def psdk) +add_importlibs(dciman32 kernel32 ntdll) +add_dependencies(dciman32 dciman32_def) Modified: branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dhcpcsv… ============================================================================== --- branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,5 @@ - +add_definitions(-Dtzset=_tzset) include_directories(include) @@ -25,17 +25,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc_rosdhcp.h.gch ${SOURCE}) -set_target_properties(dhcpcsvc PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(dhcpcsvc win32dll) -target_link_libraries(dhcpcsvc - ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def - -lmsvcrt - -lws2_32 - -liphlpapi - -ladvapi32 - oldnames - -lkernel32 - -lntdll) +target_link_libraries(dhcpcsvc ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def) +add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll) add_pch(dhcpcsvc ${CMAKE_CURRENT_SOURCE_DIR}/include/rosdhcp.h ${SOURCE}) -add_dependencies(dhcpcsvc dhcpcsvc_def psdk) +add_dependencies(dhcpcsvc dhcpcsvc_def) 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 Oct 2 22:19:59 2010 @@ -1,9 +1,8 @@ - - -include_directories(include) -include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/src) -include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/adns_win32) +include_directories( + include + ${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/src + ${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/adns_win32) add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-DADNS_JGAA_WIN32) @@ -24,17 +23,12 @@ ${CMAKE_CURRENT_BINARY_DIR}/dnsapi_precomp.h.gch ${SOURCE}) -set_target_properties(dnsapi PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(dnsapi 0) target_link_libraries(dnsapi ${CMAKE_CURRENT_BINARY_DIR}/dnsapi.def - adns - -luser32 - -lws2_32 - -lmsvcrt - -liphlpapi - -lkernel32 - -lntdll) + adns) +add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi/precomp.h ${SOURCE}) -add_dependencies(dnsapi dnsapi_def psdk) +add_dependencies(dnsapi dnsapi_def psdk buildno_header) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,11 +7,11 @@ add_library(dwmapi SHARED dwmapi_main.c version.rc) -set_target_properties(dwmapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(dwmapi win32dll) target_link_libraries(dwmapi ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def - wine - mingw_common) + wine) -add_dependencies(dwmapi dwmapi_def psdk) +add_importlibs(dwmapi kernel32 ntdll) +add_dependencies(dwmapi dwmapi_def) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,12 +7,11 @@ add_library(faultrep SHARED faultrep.c) -set_target_properties(faultrep PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(faultrep win32dll) target_link_libraries(faultrep ${CMAKE_CURRENT_BINARY_DIR}/faultrep.def - wine - mingw_common - -ladvapi32) + wine) -add_dependencies(faultrep faultrep_def psdk) +add_importlibs(faultrep advapi32 kernel32 ntdll) +add_dependencies(faultrep faultrep_def) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - spec2def(fmifs ${CMAKE_CURRENT_SOURCE_DIR}/fmifs.spec ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def) @@ -16,12 +14,10 @@ add_library(fmifs SHARED ${SOURCE}) -set_target_properties(fmifs PROPERTIES LINK_FLAGS "-Wl,-entry,_InitializeFmIfs@12") +set_entrypoint(fmifs InitializeFmIfs@12) -target_link_libraries(fmifs - ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def - -lkernel32 - -lntdll) +target_link_libraries(fmifs ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def) +add_importlibs(fmifs kernel32 ntdll) add_pch(fmifs ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(fmifs fmifs_def psdk) +add_dependencies(fmifs fmifs_def psdk buildno_header) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -15,15 +13,11 @@ fusion.c fusion_main.c) -set_target_properties(fusion PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(fusion win32dll) target_link_libraries(fusion ${CMAKE_CURRENT_BINARY_DIR}/fusion.def - wine - mingw_common - -lshlwapi - -ladvapi32 - -ldbghelp - -luser32) + wine) -add_dependencies(fusion fusion_def psdk) +add_importlibs(fusion shlwapi advapi32 dbghelp user32 kernel32 ntdll) +add_dependencies(fusion fusion_def) 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 Oct 2 22:19:59 2010 @@ -1,30 +1,54 @@ +set_unicode() - -add_definitions(-DUNICODE -D_UNICODE) add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-DLANGPACK) include_directories(include) -file(GLOB_RECURSE SOURCE *.c) +list(APPEND SOURCE + main/dllmain.c + misc/heap.c + misc/gdientry.c + misc/hacks.c + misc/historic.c + misc/misc.c + misc/stubs.c + misc/stubsa.c + misc/stubsw.c + misc/wingl.c + objects/arc.c + objects/bitmap.c + objects/brush.c + objects/coord.c + objects/dc.c + objects/eng.c + objects/enhmfile.c + objects/font.c + objects/icm.c + objects/linedda.c + objects/metafile.c + objects/painting.c + objects/printdrv.c + objects/palette.c + objects/pen.c + objects/region.c + objects/text.c + objects/utils.c + objects/path.c + gdi32.rc) add_library(gdi32 SHARED - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/gdi32.rc - ${CMAKE_CURRENT_BINARY_DIR}/gdi32_precomp.h.gch) + ${CMAKE_CURRENT_BINARY_DIR}/gdi32_precomp.h.gch + ${SOURCE}) -set_target_properties(gdi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(gdi32 win32dll) target_link_libraries(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/gdi32.def - -luser32 - -ladvapi32 win32ksys dxguid - pseh - -lkernel32 - -lntdll) - + pseh) + +add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) add_pch(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) -add_dependencies(gdi32 psdk) 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 Oct 2 22:19:59 2010 @@ -1,7 +1,5 @@ - - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -9,11 +7,9 @@ add_library(getuname SHARED getuname.c getuname.rc) -set_target_properties(getuname PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(getuname win32dll) -target_link_libraries(getuname - ${CMAKE_CURRENT_BINARY_DIR}/getuname.def - -lkernel32 - -lntdll) +target_link_libraries(getuname ${CMAKE_CURRENT_BINARY_DIR}/getuname.def) -add_dependencies(getuname getuname_def psdk) +add_importlibs(getuname kernel32 ntdll) +add_dependencies(getuname getuname_def) 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 Oct 2 22:19:59 2010 @@ -1,22 +1,18 @@ - - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() list(APPEND SOURCE hid.c stubs.c hid.rc) spec2def(hid ${CMAKE_CURRENT_SOURCE_DIR}/hid.spec ${CMAKE_CURRENT_BINARY_DIR}/hid.def) add_library(hid SHARED - ${SOURCE} - ${CMAKE_CURRENT_BINARY_DIR}/hid_precomp.h.gch) + ${CMAKE_CURRENT_BINARY_DIR}/hid_precomp.h.gch + ${SOURCE}) -set_target_properties(hid PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(hid win32dll) -target_link_libraries(hid - ${CMAKE_CURRENT_BINARY_DIR}/hid.def - -lkernel32 - -lntdll) +target_link_libraries(hid ${CMAKE_CURRENT_BINARY_DIR}/hid.def) +add_importlibs(hid kernel32 ntdll) add_pch(hid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(hid hid_def psdk) +add_dependencies(hid hid_def) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,11 +7,11 @@ add_library(httpapi SHARED httpapi_main.c) -set_target_properties(httpapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(httpapi win32dll) target_link_libraries(httpapi ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def - wine - mingw_common) + wine) -add_dependencies(httpapi httpapi_def psdk) +add_importlibs(httpapi kernel32 ntdll) +add_dependencies(httpapi httpapi_def) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,12 +7,11 @@ add_library(iccvid SHARED iccvid.c rsrc.rc) -set_target_properties(iccvid PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(iccvid win32dll) target_link_libraries(iccvid ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def - wine - -luser32 - mingw_common) + wine) -add_dependencies(iccvid iccvid_def psdk) +add_importlibs(iccvid user32 kernel32 ntdll) +add_dependencies(iccvid iccvid_def) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -7,12 +5,11 @@ add_library(icmp SHARED icmp_main.c icmp.rc) -set_target_properties(icmp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(icmp win32dll) target_link_libraries(icmp ${CMAKE_CURRENT_BINARY_DIR}/icmp.def - wine - -lws2_32 - mingw_common) + wine) +add_importlibs(icmp ws2_32 kernel32 ntdll) add_dependencies(icmp icmp_def psdk) Modified: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3… ============================================================================== --- branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,8 +1,5 @@ - - add_definitions(-D_DLL -D__USE_CRTIMP) - add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -16,14 +13,12 @@ add_library(imaadp32.acm SHARED imaadp32.c) -set_target_properties(imaadp32.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") +set_entrypoint(imaadp32.acm 0) +set_target_properties(imaadp32.acm PROPERTIES SUFFIX "") target_link_libraries(imaadp32.acm ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def - wine - -lwinmm - -luser32 - mingw_common - -lmsvcrt) + wine) -add_dependencies(imaadp32.acm imaadp32.acm_def psdk) +add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll) +add_dependencies(imaadp32.acm imaadp32.acm_def psdk buildno_header) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D_IMAGEHLP_SOURCE_) @@ -19,14 +17,12 @@ ${CMAKE_CURRENT_BINARY_DIR}/imagehlp_precomp.h.gch ${SOURCE}) -set_target_properties(imagehlp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(imagehlp win32dll) target_link_libraries(imagehlp ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def - wine - -ldbghelp - mingw_common - -lmsvcrt) + wine) +add_importlibs(imagehlp dbghelp kernel32 ntdll) add_pch(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(imagehlp imagehlp_def psdk) +add_dependencies(imagehlp imagehlp_def) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -12,13 +10,11 @@ add_library(imm32 SHARED imm.c version.rc) -set_target_properties(imm32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(imm32 win32dll) target_link_libraries(imm32 ${CMAKE_CURRENT_BINARY_DIR}/imm32.def - wine - -ladvapi32 - -luser32 - mingw_common) + wine) -add_dependencies(imm32 imm32_def psdk) +add_importlibs(imm32 advapi32 user32 kernel32 ntdll) +add_dependencies(imm32 imm32_def) 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 Oct 2 22:19:59 2010 @@ -1,19 +1,16 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(initpki ${CMAKE_CURRENT_SOURCE_DIR}/initpki.spec ${CMAKE_CURRENT_BINARY_DIR}/initpki.def) add_library(initpki SHARED main.c) -set_target_properties(initpki PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(initpki win32dll) target_link_libraries(initpki ${CMAKE_CURRENT_BINARY_DIR}/initpki.def - wine - mingw_common) + wine) -add_dependencies(initpki initpki_def psdk) +add_importlibs(initpki kernel32 ntdll) +add_dependencies(initpki initpki_def) Modified: branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpap… ============================================================================== --- branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,12 +1,12 @@ - +set_unicode() add_definitions(-D_DLL -D__USE_CRTIMP) -add_definitions(-DUNICODE -D_UNICODE) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -include_directories(${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/include) -include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/include + ${REACTOS_SOURCE_DIR}/lib/tdilib) spec2def(iphlpapi ${CMAKE_CURRENT_SOURCE_DIR}/iphlpapi.spec ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def) @@ -21,16 +21,12 @@ route_reactos.c iphlpapi.rc) -set_target_properties(iphlpapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(iphlpapi win32dll) target_link_libraries(iphlpapi ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def wine - tdilib - -ldhcpcsvc - -ladvapi32 - -lws2_32 - mingw_common - -lmsvcrt) + tdilib) -add_dependencies(iphlpapi iphlpapi_def psdk) +add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll) +add_dependencies(iphlpapi iphlpapi_def) 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 Oct 2 22:19:59 2010 @@ -1,19 +1,16 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(itircl ${CMAKE_CURRENT_SOURCE_DIR}/itircl.spec ${CMAKE_CURRENT_BINARY_DIR}/itircl.def) add_library(itircl SHARED itircl_main.c) -set_target_properties(itircl PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(itircl win32dll) target_link_libraries(itircl ${CMAKE_CURRENT_BINARY_DIR}/itircl.def - wine - mingw_common) + wine) +add_importlibs(itircl kernel32 ntdll) add_dependencies(itircl itircl_def psdk) 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 Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D_KERNEL32_) @@ -94,20 +92,28 @@ thread/fls.c thread/thread.c thread/tls.c - thread/${ARCH}/fiber.S - thread/${ARCH}/thread.S kernel32.rc kernel32_stubs.c) +if(ARCH MATCHES i386) +list(APPEND SOURCE + thread/i386/fiber.S + thread/i386/thread.S) +elseif(ARCH MATCHES amd64) +list(APPEND SOURCE + thread/amd64/fiber.S + thread/amd64/thread.S) +endif(ARCH MATCHES i386) + add_library(kernel32 SHARED - ${SOURCE} - ${CMAKE_CURRENT_BINARY_DIR}/kernel32_k32.h.gch) + ${CMAKE_CURRENT_BINARY_DIR}/kernel32_k32.h.gch + ${SOURCE}) -set_target_properties(kernel32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(kernel32 win32dll) target_link_libraries(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/kernel32.def - pseh - -lntdll) + pseh) +add_importlibs(kernel32 ntdll) add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) -add_dependencies(kernel32 errcodes version) +add_dependencies(kernel32 errcodes) 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 Oct 2 22:19:59 2010 @@ -1,19 +1,16 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(loadperf ${CMAKE_CURRENT_SOURCE_DIR}/loadperf.spec ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def) add_library(loadperf SHARED loadperf_main.c) -set_target_properties(loadperf PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(loadperf win32dll) target_link_libraries(loadperf ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def - wine - mingw_common) + wine) -add_dependencies(loadperf loadperf_def psdk) +add_importlibs(loadperf kernel32 ntdll) +add_dependencies(loadperf loadperf_def) 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 Oct 2 22:19:59 2010 @@ -1,22 +1,16 @@ - +set_unicode() add_definitions(-DLANGPACK) -add_definitions(-DUNICODE -D_UNICODE) - include_directories(include) spec2def(lpk ${CMAKE_CURRENT_SOURCE_DIR}/lpk.spec ${CMAKE_CURRENT_BINARY_DIR}/lpk.def) add_library(lpk SHARED dllmain.c stub.c lpk.rc) -set_target_properties(lpk PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(lpk win32dll) -target_link_libraries(lpk - ${CMAKE_CURRENT_BINARY_DIR}/lpk.def - -luser32 - -lusp10 - -lkernel32 - -lntdll) +target_link_libraries(lpk ${CMAKE_CURRENT_BINARY_DIR}/lpk.def) -add_dependencies(lpk lpk_def psdk) +add_importlibs(lpk user32 usp10 kernel32 ntdll) +add_dependencies(lpk lpk_def) 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 Oct 2 22:19:59 2010 @@ -1,19 +1,16 @@ - -set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(lz32 ${CMAKE_CURRENT_SOURCE_DIR}/lz32.spec ${CMAKE_CURRENT_BINARY_DIR}/lz32.def) add_library(lz32 SHARED version.rc) -set_target_properties(lz32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(lz32 0) target_link_libraries(lz32 ${CMAKE_CURRENT_BINARY_DIR}/lz32.def - wine - mingw_common) + wine) -add_dependencies(lz32 lz32_def psdk) +add_importlibs(lz32 kernel32 ntdll) +add_dependencies(lz32 lz32_def psdk buildno_header) 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 Oct 2 22:19:59 2010 @@ -1,8 +1,5 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mapi32 ${CMAKE_CURRENT_SOURCE_DIR}/mapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def) @@ -15,16 +12,12 @@ util.c version.rc) -set_target_properties(mapi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mapi32 win32dll) target_link_libraries(mapi32 ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def wine - -lshlwapi - -lshell32 - -luuid - mingw_common - -luser32 - -ladvapi32) + uuid) -add_dependencies(mapi32 mapi32_def psdk) +add_importlibs(mapi32 shlwapi shell32 user32 advapi32 kernel32 ntdll) +add_dependencies(mapi32 mapi32_def) 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 Oct 2 22:19:59 2010 @@ -1,8 +1,5 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mciavi32 ${CMAKE_CURRENT_SOURCE_DIR}/mciavi32.spec ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def) @@ -14,15 +11,11 @@ wnd.c mciavi_res.rc) -set_target_properties(mciavi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mciavi32 win32dll) target_link_libraries(mciavi32 ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def - wine - -lmsvfw32 - -lwinmm - mingw_common - -luser32 - -lgdi32) + wine) -add_dependencies(mciavi32 mciavi32_def psdk) +add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 kernel32 ntdll) +add_dependencies(mciavi32 mciavi32_def) Modified: branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mcicda/… ============================================================================== --- branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,21 +1,16 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mcicda ${CMAKE_CURRENT_SOURCE_DIR}/mcicda.spec ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def) add_library(mcicda SHARED mcicda.c) -set_target_properties(mcicda PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(mcicda 0) target_link_libraries(mcicda ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def - wine - -lwinmm - mingw_common - -luser32) + wine) -add_dependencies(mcicda mcicda_def psdk) +add_importlibs(mcicda winmm user32 kernel32 ntdll) +add_dependencies(mcicda mcicda_def psdk buildno_header) 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 Oct 2 22:19:59 2010 @@ -1,25 +1,17 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mciqtz32 ${CMAKE_CURRENT_SOURCE_DIR}/mciqtz32.spec ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def) add_library(mciqtz32 SHARED mciqtz.c version.rc) -set_target_properties(mciqtz32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mciqtz32 win32dll) target_link_libraries(mciqtz32 ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def wine - -lwinmm - -loleaut32 - -lole32 - strmiids - mingw_common - -luser32 - -lgdi32) + strmiids) -add_dependencies(mciqtz32 mciqtz32_def psdk) +add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 kernel32 ntdll) +add_dependencies(mciqtz32 mciqtz32_def) Modified: branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciseq/… ============================================================================== --- branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,21 +1,16 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mciseq ${CMAKE_CURRENT_SOURCE_DIR}/mciseq.spec ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def) add_library(mciseq SHARED mcimidi.c) -set_target_properties(mciseq PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(mciseq 0) target_link_libraries(mciseq ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def - wine - -lwinmm - mingw_common - -luser32) + wine) -add_dependencies(mciseq mciseq_def psdk) +add_importlibs(mciseq winmm user32 kernel32 ntdll) +add_dependencies(mciseq mciseq_def psdk buildno_header) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -18,6 +18,8 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") +set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + # Debugging (Note: DWARF-4 on 4.5.1 when we ship) add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types) @@ -30,15 +32,12 @@ # Optimizations add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) -# C++ Flags -#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti") - # Macros macro(set_entrypoint MODULE ENTRYPOINT) if(${ENTRYPOINT} STREQUAL "0") - set(NEW_LINKER_FLAGS "-Wl,-entry,0") + set(NEW_LINKER_FLAGS "-Wl,-entry,0") else() - set(NEW_LINKER_FLAGS "-Wl,-entry,_${ENTRYPOINT}") + set(NEW_LINKER_FLAGS "-Wl,-entry,_${ENTRYPOINT}") endif() get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) if(LINKER_FLAGS) Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -16,9 +16,9 @@ macro(set_entrypoint MODULE ENTRYPOINT) if(${ENTRYPOINT} STREQUAL "0") - set(NEW_LINKER_FLAGS "/ENTRY:0") + set(NEW_LINKER_FLAGS "/ENTRY:0") else() - set(NEW_LINKER_FLAGS "/ENTRY:${ENTRYPOINT}") + set(NEW_LINKER_FLAGS "/ENTRY:${ENTRYPOINT}") endif() get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) if(LINKER_FLAGS)

1 0

[akhaldi] 48966: [CMAKE] - Introduce the case where entry point is 0. - Improve some dlls.
by akhaldi＠svn.reactos.org 02 Oct '10

02 Oct '10

Author: akhaldi Date: Sat Oct 2 19:08:06 2010 New Revision: 48966 URL: http://svn.reactos.org/svn/reactos?rev=48966&view=rev Log: [CMAKE] - Introduce the case where entry point is 0. - Improve some dlls. Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt branches/cmake-bringup/dll/win32/advapi32/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/beepmidi/CMakeLists.txt branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt branches/cmake-bringup/dll/win32/cards/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake 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 Oct 2 19:08:06 2010 @@ -3,28 +3,24 @@ add_definitions(-DSUPPORT_UXTHEME) -file(GLOB_RECURSE SOURCE *.c) +list(APPEND SOURCE + aclui.c + checklist.c + guid.c + misc.c + sidcache.c + aclui.rc) spec2def(aclui ${CMAKE_CURRENT_SOURCE_DIR}/aclui.spec ${CMAKE_CURRENT_BINARY_DIR}/aclui.def) add_library(aclui SHARED - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/aclui.rc - ${CMAKE_CURRENT_BINARY_DIR}/aclui_precomp.h.gch) + ${CMAKE_CURRENT_BINARY_DIR}/aclui_precomp.h.gch + ${SOURCE}) -set_target_properties(aclui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(aclui win32dll) -target_link_libraries(aclui - ${CMAKE_CURRENT_BINARY_DIR}/aclui.def - -luser32 - -lgdi32 - -lcomctl32 - -lole32 - -loleaut32 - -ladvapi32 - -luxtheme - -lkernel32 - -lntdll) +target_link_libraries(aclui ${CMAKE_CURRENT_BINARY_DIR}/aclui.def) +add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme kernel32 ntdll) add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(aclui aclui_def psdk buildno_header) +add_dependencies(aclui aclui_def) 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 Oct 2 19:08:06 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,11 +7,12 @@ add_library(activeds SHARED activeds_main.c) -set_target_properties(activeds PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(activeds win32dll) target_link_libraries(activeds ${CMAKE_CURRENT_BINARY_DIR}/activeds.def - wine - mingw_common) + wine) -add_dependencies(activeds activeds_def psdk buildno_header) +add_importlibs(activeds kernel32 ntdll) + +add_dependencies(activeds activeds_def) Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -1,7 +1,6 @@ +set_unicode() - -add_definitions(-DUNICODE -D_UNICODE) add_definitions(-D_ADVAPI32_) remove_definitions(-D_WIN32_WINNT=0x502) @@ -9,29 +8,53 @@ include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) -file(GLOB_RECURSE SOURCE *.c) - -set_source_files_properties(${REACTOS_BINARY_DIR}/include/reactos/idl/svcctl_c.c - ${REACTOS_BINARY_DIR}/include/reactos/idl/lsa_c.c - ${REACTOS_BINARY_DIR}/include/reactos/idl/eventlogrpc_c.c - PROPERTIES GENERATED TRUE) +list(APPEND SOURCE + crypt/crypt.c + crypt/crypt_arc4.c + crypt/crypt_des.c + crypt/crypt_lmhash.c + crypt/crypt_md4.c + crypt/crypt_md5.c + crypt/crypt_sha.c + misc/dllmain.c + misc/hwprofiles.c + misc/logon.c + misc/msi.c + misc/shutdown.c + misc/sysfunc.c + misc/trace.c + reg/reg.c + sec/ac.c + sec/audit.c + sec/cred.c + sec/lsa.c + sec/misc.c + sec/sec.c + sec/sid.c + sec/trustee.c + service/eventlog.c + service/rpc.c + service/scm.c + service/sctrl.c + token/privilege.c + token/token.c + advapi32_stubs.c + advapi32.rc) add_library(advapi32 SHARED - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.rc ${CMAKE_CURRENT_BINARY_DIR}/advapi32_advapi32.h.gch - ${REACTOS_BINARY_DIR}/include/reactos/idl/svcctl_c.c - ${REACTOS_BINARY_DIR}/include/reactos/idl/lsa_c.c - ${REACTOS_BINARY_DIR}/include/reactos/idl/eventlogrpc_c.c) + ${SOURCE}) -set_target_properties(advapi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(advapi32 win32dll) -target_link_libraries(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.def +target_link_libraries(advapi32 + ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.def + svcctl_client + lsa_client + eventlogrpc_client wine - pseh - rpcrt4 - -lkernel32 - -lntdll) + pseh) + +add_importlibs(advapi32 rpcrt4 kernel32 ntdll) add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE}) -add_dependencies(advapi32 svcctl_client lsa_client eventlogrpc_client version) 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 Oct 2 19:08:06 2010 @@ -1,25 +1,23 @@ - - add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -file(GLOB_RECURSE SOURCE *.c) +list(APPEND SOURCE + advpack.c + files.c + install.c + reg.c) spec2def(advpack ${CMAKE_CURRENT_SOURCE_DIR}/advpack.spec ${CMAKE_CURRENT_BINARY_DIR}/advpack.def) add_library(advpack SHARED ${SOURCE}) -set_target_properties(advpack PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(advpack win32dll) target_link_libraries(advpack ${CMAKE_CURRENT_BINARY_DIR}/advpack.def - wine - mingw_common - -lole32 - -lsetupapi - -lversion - -ladvapi32) + wine) -add_dependencies(advpack advpack_def psdk buildno_header) +add_importlibs(advpack ole32 setupapi version advapi32 kernel32 ntdll) +add_dependencies(advpack advpack_def) 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 Oct 2 19:08:06 2010 @@ -1,24 +1,22 @@ +set_unicode() - -add_definitions(-DUNICODE -D_UNICODE) - -file(GLOB_RECURSE SOURCE *.c) +list(APPEND SOURCE + authz.c + clictx.c + resman.c + authz.rc) spec2def(authz ${CMAKE_CURRENT_SOURCE_DIR}/authz.spec ${CMAKE_CURRENT_BINARY_DIR}/authz.def) add_library(authz SHARED - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/authz.rc - ${CMAKE_CURRENT_BINARY_DIR}/authz_precomp.h.gch) + ${CMAKE_CURRENT_BINARY_DIR}/authz_precomp.h.gch + ${SOURCE}) -set_target_properties(authz PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(authz win32dll) -target_link_libraries(authz - ${CMAKE_CURRENT_BINARY_DIR}/authz.def - -ladvapi32 - -lkernel32 - -lntdll) +target_link_libraries(authz ${CMAKE_CURRENT_BINARY_DIR}/authz.def) add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(authz authz_def psdk buildno_header) +add_importlibs(authz advapi32 kernel32 ntdll) +add_dependencies(authz authz_def) 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 Oct 2 19:08:06 2010 @@ -1,22 +1,15 @@ - - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() spec2def(avicap32 ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.spec ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def) -add_library(avicap32 SHARED - ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.c - ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.rc) +add_library(avicap32 SHARED avicap32.c avicap32.rc) -set_target_properties(avicap32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(avicap32 win32dll) target_link_libraries(avicap32 ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def - -ladvapi32 - -luser32 - wine - mingw_common - -lversion) + wine) -add_dependencies(avicap32 avicap32_def psdk) +add_importlibs(avicap32 advapi32 user32 version kernel32 ntdll) +add_dependencies(avicap32 avicap32_def) 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 Oct 2 19:08:06 2010 @@ -1,18 +1,13 @@ - - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() spec2def(batt ${CMAKE_CURRENT_SOURCE_DIR}/batt.spec ${CMAKE_CURRENT_BINARY_DIR}/batt.def) -add_library(batt SHARED - ${CMAKE_CURRENT_SOURCE_DIR}/batt.c - ${CMAKE_CURRENT_SOURCE_DIR}/batt.rc) +add_library(batt SHARED batt.c batt.rc) -set_target_properties(batt PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(batt win32dll) -target_link_libraries(batt - ${CMAKE_CURRENT_BINARY_DIR}/batt.def - -lkernel32) +target_link_libraries(batt ${CMAKE_CURRENT_BINARY_DIR}/batt.def) -add_dependencies(batt batt_def psdk) +add_importlibs(batt kernel32) +add_dependencies(batt batt_def) Modified: branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid… ============================================================================== --- branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -1,18 +1,13 @@ - - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() spec2def(beepmidi ${CMAKE_CURRENT_SOURCE_DIR}/beepmidi.spec ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def) add_library(beepmidi SHARED beepmidi.c) -set_target_properties(beepmidi PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(beepmidi 0) -target_link_libraries(beepmidi - ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def - -lwinmm - -lkernel32 - -lntdll) +target_link_libraries(beepmidi ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def) +add_importlibs(beepmidi winmm kernel32 ntdll) add_dependencies(beepmidi beepmidi_def psdk) Modified: branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cabinet… ============================================================================== --- branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -7,17 +5,19 @@ spec2def(cabinet ${CMAKE_CURRENT_SOURCE_DIR}/cabinet.spec ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def) -file(GLOB_RECURSE SOURCE *.c) +list(APPEND SOURCE + cabinet_main.c + fci.c + fdi.c + cabinet.rc) -add_library(cabinet SHARED - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/cabinet.rc) +add_library(cabinet SHARED ${SOURCE}) -set_target_properties(cabinet PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(cabinet 0) target_link_libraries(cabinet ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def - wine - mingw_common) + wine) -add_dependencies(cabinet cabinet_def psdk) +add_importlibs(cabinet kernel32 ntdll) +add_dependencies(cabinet cabinet_def psdk buildno_header) 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 Oct 2 19:08:06 2010 @@ -1,20 +1,16 @@ - - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() # Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN add_definitions(-DCARDSTYLE_DEFAULT) spec2def(cards ${CMAKE_CURRENT_SOURCE_DIR}/cards.spec ${CMAKE_CURRENT_BINARY_DIR}/cards.def) -add_library(cards SHARED ${CMAKE_CURRENT_SOURCE_DIR}/cards.c ${CMAKE_CURRENT_SOURCE_DIR}/cards.rc) +add_library(cards SHARED cards.c cards.rc) -set_target_properties(cards PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(cards win32dll) -target_link_libraries(cards - ${CMAKE_CURRENT_BINARY_DIR}/cards.def - -luser32 - -lgdi32) +target_link_libraries(cards ${CMAKE_CURRENT_BINARY_DIR}/cards.def) -add_dependencies(cards cards_def psdk) +add_importlibs(cards user32 gdi32) +add_dependencies(cards cards_def) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -35,7 +35,11 @@ # Macros macro(set_entrypoint MODULE ENTRYPOINT) + if(${ENTRYPOINT} STREQUAL "0") + set(NEW_LINKER_FLAGS "-Wl,-entry,0") + else() set(NEW_LINKER_FLAGS "-Wl,-entry,_${ENTRYPOINT}") + endif() get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) if(LINKER_FLAGS) set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}") Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -15,7 +15,11 @@ add_definitions(-Dinline=__inline -D__STDC__=1) macro(set_entrypoint MODULE ENTRYPOINT) + if(${ENTRYPOINT} STREQUAL "0") + set(NEW_LINKER_FLAGS "/ENTRY:0") + else() set(NEW_LINKER_FLAGS "/ENTRY:${ENTRYPOINT}") + endif() get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) if(LINKER_FLAGS) set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}")

1 0

[akhaldi] 48965: [CMAKE] - Improve the IDL macro, along with some dependencies.
by akhaldi＠svn.reactos.org 02 Oct '10

02 Oct '10

Author: akhaldi Date: Sat Oct 2 17:09:48 2010 New Revision: 48965 URL: http://svn.reactos.org/svn/reactos?rev=48965&view=rev Log: [CMAKE] - Improve the IDL macro, along with some dependencies. Modified: branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt branches/cmake-bringup/include/reactos/idl/CMakeLists.txt 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 Oct 2 17:09:48 2010 @@ -12,6 +12,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def wine) -add_importlibs(xmllite msvcrt kernel32 ntdll) +add_importlibs(xmllite kernel32 ntdll) add_dependencies(xmllite xmllite_def psdk buildno_header) Modified: branches/cmake-bringup/include/reactos/idl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] Sat Oct 2 17:09:48 2010 @@ -8,44 +8,45 @@ get_directory_property(includes INCLUDE_DIRECTORIES) foreach(arg ${defines}) - set(result_defs ${result_defs} -D${arg}) + set(result_defs ${result_defs} -D${arg}) endforeach(arg ${defines}) foreach(arg ${includes}) - set(result_incs -I${arg} ${result_incs}) + set(result_incs -I${arg} ${result_incs}) endforeach(arg ${includes}) -MACRO (MACRO_IDL_FILES) +macro (MACRO_IDL_FILES) - FOREACH(_in_FILE ${ARGN}) + foreach(_in_FILE ${ARGN}) + get_filename_component(FILE ${_in_FILE} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c + COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h -s -S ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl + DEPENDS native-widl) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c + PROPERTIES GENERATED TRUE) + add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c) + add_dependencies(${FILE}_server psdk) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c + COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h -c -C ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl + DEPENDS native-widl) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c + PROPERTIES GENERATED TRUE) + add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) + add_dependencies(${FILE}_client psdk) + endforeach(_in_FILE ${ARGN}) - get_filename_component(FILE ${_in_FILE} NAME_WE) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c - COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h -s -S ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl - DEPENDS native-widl - ) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c - PROPERTIES GENERATED TRUE - ) - add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c - COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h -c -C ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl - DEPENDS native-widl - ) - set_source_files_properties( - ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c - PROPERTIES GENERATED TRUE - ) - add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) +endmacro (MACRO_IDL_FILES) - ENDFOREACH(_in_FILE ${ARGN}) +list(APPEND SOURCE + eventlogrpc.idl + lsa.idl + pnp.idl + svcctl.idl + wlansvc.idl) -ENDMACRO (MACRO_IDL_FILES) - -file(GLOB_RECURSE SOURCE "*.idl") -LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/ms-dtyp.idl) MACRO_IDL_FILES(${SOURCE})

1 0

[akhaldi] 48964: [CMAKE] - Improve the unicode situation. - Apply a consistent formatting. - Improve the unicode modules we have so far. - Get rid of some rbuildism. - Overall improvements.
by akhaldi＠svn.reactos.org 02 Oct '10

02 Oct '10

Author: akhaldi Date: Sat Oct 2 16:09:32 2010 New Revision: 48964 URL: http://svn.reactos.org/svn/reactos?rev=48964&view=rev Log: [CMAKE] - Improve the unicode situation. - Apply a consistent formatting. - Improve the unicode modules we have so far. - Get rid of some rbuildism. - Overall improvements. Added: branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libcrypt32.a (with props) Modified: branches/cmake-bringup/base/applications/cacls/CMakeLists.txt branches/cmake-bringup/base/applications/calc/CMakeLists.txt branches/cmake-bringup/base/applications/charmap/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt branches/cmake-bringup/base/applications/control/CMakeLists.txt branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt branches/cmake-bringup/base/applications/fontview/CMakeLists.txt branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt branches/cmake-bringup/base/applications/hh/CMakeLists.txt branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt branches/cmake-bringup/base/shell/cmd/CMakeLists.txt branches/cmake-bringup/base/shell/explorer/CMakeLists.txt branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt branches/cmake-bringup/dll/win32/acledit/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/wdmaud.drv/CMakeLists.txt branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2_32/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/wshirda/CMakeLists.txt branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt branches/cmake-bringup/dll/win32/wtsapi32/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/xinput1_3/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/base/applications/cacls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,7 +1,7 @@ -list(APPEND SOURCE - cacls.c - cacls.rc) +set_unicode() + +list(APPEND SOURCE cacls.c cacls.rc) add_executable(cacls ${CMAKE_CURRENT_BINARY_DIR}/cacls_precomp.h.gch @@ -9,8 +9,5 @@ add_pch(cacls ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -set_unicode(cacls yes) - set_module_type(cacls win32cui) - -add_importlibs(cacls advapi32 ntdll user32 shell32 msvcrt) +add_importlibs(cacls advapi32 user32 shell32 msvcrt) Modified: branches/cmake-bringup/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,5 +1,6 @@ -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() + add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1) add_executable(calc @@ -12,7 +13,4 @@ resource.rc) set_module_type(calc win32gui) -set_unicode(calc yes) add_importlibs(calc advapi32 user32 gdi32 msvcrt) - -add_dependencies(calc psdk) Modified: branches/cmake-bringup/base/applications/charmap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/charmap/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/charmap/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,3 +1,5 @@ + +set_unicode() list(APPEND SOURCE about.c @@ -12,8 +14,5 @@ add_pch(charmap ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -set_unicode(charmap yes) - set_module_type(charmap win32gui) - -add_importlibs(charmap user32 gdi32 comctl32 msvcrt) +add_importlibs(charmap user32 gdi32 comctl32 msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,7 +1,5 @@ + add_executable(dbgprint dbgprint.c) set_module_type(dbgprint win32cui) - -set_unicode(dbgprint no) - -add_importlibs(dbgprint msvcrt) +add_importlibs(dbgprint msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,9 +1,7 @@ -add_executable(doskey - doskey.c - doskey.rc) + +set_unicode() + +add_executable(doskey doskey.c doskey.rc) set_module_type(doskey win32cui) - -set_unicode(doskey yes) - -add_importlibs(doskey user32 msvcrt) +add_importlibs(doskey user32 msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,9 +1,5 @@ -add_executable(find - find.c - find.rc) + +add_executable(find find.c find.rc) set_module_type(find win32cui) - -set_unicode(find no) - -add_importlibs(find user32 msvcrt) +add_importlibs(find user32 msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,9 +1,5 @@ -add_executable(hostname - hostname.c - hostname.rc) + +add_executable(hostname hostname.c hostname.rc) set_module_type(hostname win32cui) - -set_unicode(hostname no) - -add_importlibs(hostname msvcrt) +add_importlibs(hostname msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,7 +1,7 @@ + +set_unicode() + add_executable(lodctr lodctr_main.c) set_module_type(lodctr win32cui) - -set_unicode(lodctr yes) - -add_importlibs(lodctr loadperf msvcrt) +add_importlibs(lodctr loadperf msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,9 +1,5 @@ -add_executable(more - more.c - more.rc) + +add_executable(more more.c more.rc) set_module_type(more win32cui) - -set_unicode(more no) - -add_importlibs(more ntdll user32 msvcrt) +add_importlibs(more user32 msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,12 +1,10 @@ + +set_unicode() + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_executable(reg - reg.c - rsrc.rc) +add_executable(reg reg.c rsrc.rc) set_module_type(reg win32cui) - -set_unicode(reg yes) - -add_importlibs(reg advapi32 user32 msvcrt) +add_importlibs(reg advapi32 user32 msvcrt) Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,11 +1,9 @@ -add_executable(xcopy - xcopy.c - rsrc.rc) + +set_unicode() + +add_executable(xcopy xcopy.c rsrc.rc) + +target_link_libraries(xcopy wine) set_module_type(xcopy win32cui) - -set_unicode(xcopy yes) - -add_importlibs(xcopy shell32 user32 msvcrt ntdll) - -target_link_libraries(xcopy wine) +add_importlibs(xcopy shell32 user32 msvcrt) Modified: branches/cmake-bringup/base/applications/control/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/control/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/control/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,10 +1,7 @@ -add_executable(control - control.c - control.rc) +set_unicode() -set_unicode(control yes) +add_executable(control control.c control.rc) set_module_type(control win32gui) - -add_importlibs(control advapi32 shell32 kernel32 msvcrt) +add_importlibs(control advapi32 shell32 msvcrt) Modified: branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,10 +1,9 @@ + +set_unicode() add_executable(extrac32 extrac32.c) -set_unicode(extrac32 yes) +target_link_libraries(extrac32 wine) set_module_type(extrac32 win32gui) - -target_link_libraries(extrac32 wine) - -add_importlibs(extrac32 ntdll shell32 setupapi shlwapi user32 msvcrt) +add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt) Modified: branches/cmake-bringup/base/applications/fontview/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/fontview/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/fontview/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -4,8 +4,5 @@ fontview.c fontview.rc) -set_unicode(fontview no) - set_module_type(fontview win32gui) - -add_importlibs(fontview gdi32 shell32 user32 msvcrt) +add_importlibs(fontview gdi32 shell32 user32 msvcrt) Modified: branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,3 +1,5 @@ + +set_unicode() include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib) @@ -7,10 +9,7 @@ solitaire.cpp rsrc.rc) -set_unicode(sol yes) +target_link_libraries(sol cardlib) set_module_type(sol win32gui) - -target_link_libraries(sol cardlib) - -add_importlibs(sol advapi32 comctl32 user32 gdi32 stdc++ gcc mingw32 msvcrt) +add_importlibs(sol advapi32 comctl32 user32 gdi32 stdc++ gcc mingw32 msvcrt) Modified: branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/winemine/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,14 +1,14 @@ +set_unicode() + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +set_rc_compiler() add_executable(winemine main.c dialog.c rsrc.rc) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -set_unicode(winemine yes) - set_module_type(winemine win32gui) -set_rc_compiler() - -add_importlibs(winemine user32 gdi32 advapi32 shell32 msvcrt) +add_importlibs(winemine user32 gdi32 advapi32 shell32 msvcrt) Modified: branches/cmake-bringup/base/applications/hh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/hh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/hh/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,10 +1,5 @@ -add_executable(hh - main.c - hh.rc) - -set_unicode(hh no) +add_executable(hh main.c hh.rc) set_module_type(hh win32gui) - -add_importlibs(hh gdi32 user32 msvcrt) +add_importlibs(hh gdi32 user32 msvcrt) Modified: branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,10 +1,5 @@ -add_executable(iexplore - main.c - iexplore.rc) - -set_unicode(iexplore no) +add_executable(iexplore main.c iexplore.rc) set_module_type(iexplore win32gui) - -add_importlibs(iexplore shdocvw msvcrt) +add_importlibs(iexplore shdocvw msvcrt) Modified: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/cmd/CM… ============================================================================== --- branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,13 +1,12 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +set_unicode() add_definitions(-DANONYMOUSUNIONS) add_definitions(-D_DEBUG_MEM) -list(APPEND SOURCE - cmd.rc - main.c) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) +list(APPEND SOURCE main.c cmd.rc) list(APPEND SOURCE alias.c @@ -71,7 +70,9 @@ window.c) add_executable(cmd ${CMAKE_CURRENT_BINARY_DIR}/cmd_precomp.h.gch ${SOURCE}) + +target_link_libraries(cmd wine) + +add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) set_module_type(cmd win32cui) -set_unicode(cmd yes) -target_link_libraries(cmd oldnames wine) add_importlibs(cmd advapi32 user32 msvcrt) Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,6 +1,8 @@ + add_subdirectory(notifyhook) -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() + add_definitions(-DWIN32) add_definitions(-D__WINDRES__) @@ -46,16 +48,12 @@ add_executable(explorer ${SOURCE}) #${CMAKE_CURRENT_BINARY_DIR}/explorer_precomp.h.gch ${SOURCE}) +target_link_libraries(explorer + wine + uuid) + set_module_type(explorer win32gui) -target_link_libraries(explorer - mingw_wmain - mingw_common - coldname - oldnames - wine - uuid) - add_importlibs(explorer advapi32 gdi32 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 Oct 2 16:09:32 2010 @@ -7,5 +7,5 @@ target_link_libraries(ksuser ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def) -add_importlibs(ksuser ntdll advapi32) +add_importlibs(ksuser advapi32 kernel32 ntdll) add_dependencies(ksuser ksuser_def psdk bugcodes) 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] Sat Oct 2 16:09:32 2010 @@ -1,20 +1,18 @@ +set_unicode() - -add_definitions(-DUNICODE -D_UNICODE) - -file(GLOB_RECURSE SOURCE *.c) +list(APPEND SOURCE + acledit.c + stubs.c + acledit.rc) spec2def(acledit ${CMAKE_CURRENT_SOURCE_DIR}/acledit.spec ${CMAKE_CURRENT_BINARY_DIR}/acledit.def) -add_library(acledit SHARED - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/acledit.rc) +add_library(acledit SHARED ${SOURCE}) -set_target_properties(acledit PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(acledit win32dll) -target_link_libraries(acledit - ${CMAKE_CURRENT_BINARY_DIR}/acledit.def - -lntdll) +target_link_libraries(acledit ${CMAKE_CURRENT_BINARY_DIR}/acledit.def) +add_importlibs(acledit ntdll) -add_dependencies(acledit acledit_def psdk buildno_header) +add_dependencies(acledit acledit_def) 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 Oct 2 16:09:32 2010 @@ -1,7 +1,6 @@ +set_unicode() - -add_definitions(-DUNICODE -D_UNICODE) add_definitions(-DSUPPORT_UXTHEME) file(GLOB_RECURSE SOURCE *.c) @@ -28,4 +27,4 @@ -lntdll) add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(aclui aclui_def psdk) +add_dependencies(aclui aclui_def psdk buildno_header) 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 Oct 2 16:09:32 2010 @@ -16,4 +16,4 @@ wine mingw_common) -add_dependencies(activeds activeds_def psdk) +add_dependencies(activeds activeds_def psdk buildno_header) 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 Oct 2 16:09:32 2010 @@ -22,4 +22,4 @@ -lversion -ladvapi32) -add_dependencies(advpack advpack_def psdk) +add_dependencies(advpack advpack_def psdk buildno_header) 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 Oct 2 16:09:32 2010 @@ -21,4 +21,4 @@ -lntdll) add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(authz authz_def psdk) +add_dependencies(authz authz_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,16 +1,18 @@ -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() + add_definitions(-DNDEBUG=1) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -include_directories(${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer) -include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound + ${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud + ${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer + ${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def - COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/wdmaud.spec --filename wdmaud.drv - DEPENDS native-winebuild) +add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/wdmaud.spec --filename wdmaud.drv + DEPENDS native-winebuild) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def PROPERTIES GENERATED TRUE) add_custom_target(wdmaud.drv_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def) @@ -30,5 +32,5 @@ libsamplerate mmixer) -add_importlibs(wdmaud.drv ntdll user32 winmm advapi32 msvcrt setupapi ksuser) +add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) add_dependencies(wdmaud.drv wdmaud.drv_def psdk) Modified: branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/windows… ============================================================================== --- branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,13 +1,15 @@ add_definitions(-D__WINESRC__) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg + ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff) spec2def(windowscodecs ${CMAKE_CURRENT_SOURCE_DIR}/windowscodecs.spec ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def) @@ -38,5 +40,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def wine) -add_importlibs(windowscodecs msvcrt uuid ole32 shlwapi advapi32) +add_importlibs(windowscodecs uuid ole32 shlwapi advapi32 msvcrt kernel32 ntdll) add_dependencies(windowscodecs windowscodecs_def psdk) Added: branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winemp3… ============================================================================== --- branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,0 +1,26 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D__WINESRC__ -DWIN32) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/winemp3.acm.spec --filename winemp3.acm + DEPENDS native-winebuild) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def PROPERTIES GENERATED TRUE) +add_custom_target(winemp3.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def) + +add_library(winemp3.acm SHARED mpegl3.c) + +set_target_properties(winemp3.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") + +target_link_libraries(winemp3.acm + ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def + mingw_common + wine + mpg123) + +add_importlibs(winemp3.acm msvcrt winmm user32) +add_dependencies(winemp3.acm winemp3.acm_def psdk) Propchange: branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp… ============================================================================== --- branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -20,5 +20,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def wine) -add_importlibs(winhttp msvcrt shlwapi wininet ws2_32 ntdll) +add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt kernel32 ntdll) add_dependencies(winhttp winhttp_def psdk) Modified: branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,8 +1,10 @@ add_definitions(-D__WINESRC__ -D_WINE) +add_definitions(-Dclose=_close) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) spec2def(wininet ${CMAKE_CURRENT_SOURCE_DIR}/wininet.spec ${CMAKE_CURRENT_BINARY_DIR}/wininet.def) @@ -30,5 +32,5 @@ zlib pseh) -add_importlibs(wininet msvcrt mpr shlwapi shell32 user32 advapi32 ntdll secur32 crypt32 ws2_32) +add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll) add_dependencies(wininet wininet_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/C… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -25,7 +25,7 @@ wine pseh) -add_importlibs(winmm msvcrt ntdll advapi32 user32) +add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) add_dependencies(winmm winmm_def psdk) add_subdirectory(midimap) 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 Oct 2 16:09:32 2010 @@ -16,5 +16,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/winspool.def wine) -add_importlibs(winspool ntdll advapi32 shlwapi) +add_importlibs(winspool advapi32 shlwapi kernel32 ntdll) add_dependencies(winspool winspool_def psdk) 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 Oct 2 16:09:32 2010 @@ -21,6 +21,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/winsta.def wine) -add_importlibs(winsta ntdll) +add_importlibs(winsta kernel32 ntdll) add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE}) add_dependencies(winsta winsta_def psdk) Modified: branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wintrus… ============================================================================== --- branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -19,5 +19,5 @@ wine pseh) -add_importlibs(wintrust msvcrt crypt32 cryptui user32 advapi32 imagehlp ntdll) -add_dependencies(wintrust wintrust_def psdk) +add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 ntdll) +add_dependencies(wintrust wintrust_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi… ============================================================================== --- branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -13,5 +13,5 @@ wine pseh) -add_importlibs(wlanapi kernel32 rpcrt4 ntdll) +add_importlibs(wlanapi rpcrt4 kernel32 ntdll) add_dependencies(wlanapi wlanapi_def psdk) 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 Oct 2 16:09:32 2010 @@ -33,5 +33,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/wldap32.def wine) -add_importlibs(wldap32 ntdll user32) +add_importlibs(wldap32 user32 kernel32 ntdll) add_dependencies(wldap32 wldap32_def psdk) 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 Oct 2 16:09:32 2010 @@ -30,6 +30,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def wine) -add_importlibs(ws2_32 ntdll user32 advapi32 dnsapi ws2help) +add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help kernel32 ntdll) add_pch(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/include/ws2_32.h ${SOURCE}) add_dependencies(ws2_32 ws2_32_def psdk) 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 Oct 2 16:09:32 2010 @@ -51,5 +51,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def wine) -add_importlibs(ws2_32_new ntdll user32 advapi32 dnsapi ws2help) +add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help kernel32 ntdll) add_dependencies(ws2_32_new ws2_32_new_def psdk) 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 Oct 2 16:09:32 2010 @@ -13,5 +13,5 @@ set_module_type(ws2help win32dll) target_link_libraries(ws2help ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def) -add_importlibs(ws2help advapi32 ntdll ws2_32) +add_importlibs(ws2help advapi32 ws2_32 kernel32 ntdll) add_dependencies(ws2help ws2help_def psdk) 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 Oct 2 16:09:32 2010 @@ -1,5 +1,5 @@ -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() spec2def(wshirda ${CMAKE_CURRENT_SOURCE_DIR}/wshirda.spec ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def) @@ -8,5 +8,5 @@ set_module_type(wshirda win32dll) target_link_libraries(wshirda ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def) -add_importlibs(wshirda ntdll ws2_32) +add_importlibs(wshirda ws2_32 kernel32 ntdll) add_dependencies(wshirda wshirda_def psdk) Modified: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpi… ============================================================================== --- branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,5 +1,6 @@ -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() + include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib) spec2def(wshtcpip ${CMAKE_CURRENT_SOURCE_DIR}/wshtcpip.spec ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def) @@ -12,5 +13,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def tdilib) -add_importlibs(wshtcpip kernel32 ntdll ws2_32) +add_importlibs(wshtcpip kernel32 ws2_32 kernel32 ntdll) add_dependencies(wshtcpip wshtcpip_def psdk) 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 Oct 2 16:09:32 2010 @@ -1,10 +1,10 @@ -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() add_library(wsock32 SHARED stubs.c wsock32.rc) set_module_type(wsock32 win32dll) target_link_libraries(wsock32 ${CMAKE_CURRENT_SOURCE_DIR}/wsock32.def) -add_importlibs(wsock32 ntdll ws2_32) +add_importlibs(wsock32 ws2_32 kernel32 ntdll) add_dependencies(wsock32 psdk) 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 Oct 2 16:09:32 2010 @@ -12,5 +12,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/wtsapi32.def wine) -add_importlibs(wtsapi32 advapi32 ntdll) +add_importlibs(wtsapi32 advapi32 kernel32 ntdll) add_dependencies(wtsapi32 wtsapi32_def psdk) 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 Oct 2 16:09:32 2010 @@ -23,5 +23,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def wine) -add_importlibs(wuapi uuid ole32 advapi32 ntdll) -add_dependencies(wuapi wuapi_def psdk) +add_importlibs(wuapi uuid ole32 advapi32 kernel32 ntdll) +add_dependencies(wuapi wuapi_def psdk buildno_header) 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 Oct 2 16:09:32 2010 @@ -6,6 +6,8 @@ add_library(xinput1_1 SHARED xinput1_1_main.c version.rc) +add_importlibs(xinput1_1 kernel32) + set_module_type(xinput1_1 win32dll) target_link_libraries(xinput1_1 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def) -add_dependencies(xinput1_1 xinput1_1_def psdk) +add_dependencies(xinput1_1 xinput1_1_def psdk buildno_header) 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 Oct 2 16:09:32 2010 @@ -6,6 +6,8 @@ add_library(xinput1_2 SHARED xinput1_2_main.c version.rc) +add_importlibs(xinput1_2 kernel32) + set_module_type(xinput1_2 win32dll) target_link_libraries(xinput1_2 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def) -add_dependencies(xinput1_2 xinput1_2_def psdk) +add_dependencies(xinput1_2 xinput1_2_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -12,4 +12,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def wine) -add_dependencies(xinput1_3 xinput1_3_def psdk) +add_importlibs(xinput1_3 msvcrt kernel32 ntdll) + +add_dependencies(xinput1_3 xinput1_3_def psdk buildno_header) 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 Oct 2 16:09:32 2010 @@ -6,6 +6,8 @@ add_library(xinput9_1_0 SHARED xinput9_1_0_main.c version.rc) +add_importlibs(xinput9_1_0 kernel32) + set_module_type(xinput9_1_0 win32dll) target_link_libraries(xinput9_1_0 ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def) -add_dependencies(xinput9_1_0 xinput9_1_0_def psdk) +add_dependencies(xinput9_1_0 xinput9_1_0_def psdk buildno_header) 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 Oct 2 16:09:32 2010 @@ -12,4 +12,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def wine) -add_dependencies(xmllite xmllite_def psdk) +add_importlibs(xmllite msvcrt kernel32 ntdll) + +add_dependencies(xmllite xmllite_def psdk buildno_header) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -53,44 +53,49 @@ endmacro() macro(add_importlibs MODULE) - FOREACH(LIB ${ARGN}) + foreach(LIB ${ARGN}) target_link_libraries(${MODULE} ${LIB}.a) - ENDFOREACH() + endforeach() endmacro() macro(set_module_type MODULE TYPE) - add_dependencies(${MODULE} builno_header psdk) + add_dependencies(${MODULE} psdk buildno_header) - if(${TYPE} MATCHES nativecui) - set_subsystem(${MODULE} native) - set_entrypoint(${MODULE} NtProcessStartup@4) - endif() - if(${TYPE} MATCHES win32gui) - set_subsystem(${MODULE} windows) - set_entrypoint(${MODULE} WinMainCRTStartup) - endif() - if(${TYPE} MATCHES win32cui) - set_subsystem(${MODULE} console) - set_entrypoint(${MODULE} mainCRTStartup) - endif() - if(${TYPE} MATCHES win32dll) - target_link_libraries(${MODULE} mingw_dllmain mingw_common) - set_entrypoint(${MODULE} DllMain@12) - endif() + if(${TYPE} MATCHES nativecui) + set_subsystem(${MODULE} native) + set_entrypoint(${MODULE} NtProcessStartup@4) + endif() + if(${TYPE} MATCHES win32gui) + set_subsystem(${MODULE} windows) + set_entrypoint(${MODULE} WinMainCRTStartup) + if(NOT IS_UNICODE) + target_link_libraries(${MODULE} mingw_main) + else() + target_link_libraries(${MODULE} mingw_wmain) + endif(NOT IS_UNICODE) + target_link_libraries(${MODULE} mingw_common) + endif() + if(${TYPE} MATCHES win32cui) + set_subsystem(${MODULE} console) + set_entrypoint(${MODULE} mainCRTStartup) + if(NOT IS_UNICODE) + target_link_libraries(${MODULE} mingw_main) + else() + target_link_libraries(${MODULE} mingw_wmain) + endif(NOT IS_UNICODE) + target_link_libraries(${MODULE} mingw_common) + endif() + if(${TYPE} MATCHES win32dll) + set_entrypoint(${MODULE} DllMain@12) + endif() endmacro() endif() -macro(set_unicode MODULE STATE) - if(${STATE} MATCHES yes) - add_definitions(-DUNICODE -D_UNICODE) - target_link_libraries(${MODULE} mingw_wmain) - else() - target_link_libraries(${MODULE} mingw_main) - endif() - - target_link_libraries(${MODULE} mingw_common) +macro(set_unicode) + add_definitions(-DUNICODE -D_UNICODE) + set(IS_UNICODE 1) endmacro() # Workaround lack of mingw RC support in cmake @@ -106,20 +111,18 @@ set(result_incs "-I${arg} ${result_incs}") endforeach(arg ${includes}) - SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${result_defs} ${result_incs} -i <SOURCE> -O coff -o <OBJECT>") + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${result_defs} ${result_incs} -i <SOURCE> -O coff -o <OBJECT>") endmacro() #typelib support macro(ADD_TYPELIB TARGET) - FOREACH(SOURCE ${ARGN}) - GET_FILENAME_COMPONENT(FILE ${SOURCE} NAME_WE) - SET(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) - ADD_CUSTOM_COMMAND( - OUTPUT ${OBJECT} - COMMAND native-widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -t -T ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} - DEPENDS native-widl - ) - LIST(APPEND OBJECTS ${OBJECT}) - ENDFOREACH() - ADD_CUSTOM_TARGET(${TARGET} ALL DEPENDS ${OBJECTS}) -ENDMACRO() + foreach(SOURCE ${ARGN}) + get_filename_component(FILE ${SOURCE} NAME_WE) + set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) + add_custom_command(OUTPUT ${OBJECT} + COMMAND native-widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -t -T ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} + DEPENDS native-widl) + list(APPEND OBJECTS ${OBJECT}) + endforeach() + add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) +endmacro() Added: branches/cmake-bringup/importlibs/libcrypt32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcry… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libcrypt32.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sat Oct 2 16:09:32 2010 @@ -1,6 +1,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86") - add_definitions(-D__i386__) + add_definitions(-D__i386__) endif() add_definitions(-Dinline=__inline) @@ -33,34 +33,32 @@ endmacro() macro(add_importlibs MODULE) - FOREACH(LIB ${ARGN}) - target_link_libraries(${MODULE} ${LIB}.LIB) - ENDFOREACH() + foreach(LIB ${ARGN}) + target_link_libraries(${MODULE} ${LIB}.LIB) + endforeach() endmacro() macro(set_module_type MODULE TYPE) - if(${TYPE} MATCHES nativecui) - set_subsystem(${MODULE} native) - add_importlibs(${MODULE} ntdll) - endif() - if (${TYPE} MATCHES win32gui) - set_subsystem(${MODULE} windows) - endif () - if (${TYPE} MATCHES win32cui) - set_subsystem(${MODULE} console) - endif () + if(${TYPE} MATCHES nativecui) + set_subsystem(${MODULE} native) + add_importlibs(${MODULE} ntdll) + endif() + if (${TYPE} MATCHES win32gui) + set_subsystem(${MODULE} windows) + endif () + if (${TYPE} MATCHES win32cui) + set_subsystem(${MODULE} console) + endif () endmacro() -macro(set_unicode MODULE STATE) - if(${STATE} MATCHES yes) - add_definitions(-DUNICODE -D_UNICODE) - endif() +macro(set_unicode) + add_definitions(-DUNICODE -D_UNICODE) endmacro() endif() set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") -SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") +set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") macro(set_rc_compiler) # dummy, this workaround is only needed in mingw due to lack of RC support in cmake @@ -68,14 +66,12 @@ #typelib support macro(ADD_TYPELIB TARGET) - FOREACH(SOURCE ${ARGN}) - GET_FILENAME_COMPONENT(FILE ${SOURCE} NAME_WE) - SET(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) - ADD_CUSTOM_COMMAND( - OUTPUT ${OBJECT} - COMMAND midl /I ${REACTOS_SOURCE_DIR}/include/dxsdk /I . /I ${REACTOS_SOURCE_DIR}/include /I ${REACTOS_SOURCE_DIR}/include/psdk /win32 /tlb ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} - ) - LIST(APPEND OBJECTS ${OBJECT}) - ENDFOREACH() - ADD_CUSTOM_TARGET(${TARGET} ALL DEPENDS ${OBJECTS}) -ENDMACRO() + foreach(SOURCE ${ARGN}) + get_filename_component(FILE ${SOURCE} NAME_WE) + set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) + add_custom_command(OUTPUT ${OBJECT} + COMMAND midl /I ${REACTOS_SOURCE_DIR}/include/dxsdk /I . /I ${REACTOS_SOURCE_DIR}/include /I ${REACTOS_SOURCE_DIR}/include/psdk /win32 /tlb ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}) + list(APPEND OBJECTS ${OBJECT}) + endforeach() + add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) +endmacro()

1 0

[spetreolle] 48963: [CMAKE] Add missing libcryptui.a for wintrust.dll.
by spetreolle＠svn.reactos.org 02 Oct '10

02 Oct '10

Author: spetreolle Date: Sat Oct 2 14:02:32 2010 New Revision: 48963 URL: http://svn.reactos.org/svn/reactos?rev=48963&view=rev Log: [CMAKE] Add missing libcryptui.a for wintrust.dll. Added: branches/cmake-bringup/importlibs/libcryptui.a (with props) Added: branches/cmake-bringup/importlibs/libcryptui.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcry… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libcryptui.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[akhaldi] 48962: [CMAKE] - Add wdmaud.drv, windowscodecs, winfax, wing32, winhttp, winmm, winspool, winsta and winsta to build. By Alexey Komarov.
by akhaldi＠svn.reactos.org 02 Oct '10

02 Oct '10

Author: akhaldi Date: Sat Oct 2 11:18:13 2010 New Revision: 48962 URL: http://svn.reactos.org/svn/reactos?rev=48962&view=rev Log: [CMAKE] - Add wdmaud.drv, windowscodecs, winfax, wing32, winhttp, winmm, winspool, winsta and winsta to build. By Alexey Komarov. Added: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -197,18 +197,18 @@ add_subdirectory(uxtheme) #add_subdirectory(vdmdbg) #add_subdirectory(version) -#add_subdirectory(wdmaud.drv) -#add_subdirectory(windowscodecs) +add_subdirectory(wdmaud.drv) +add_subdirectory(windowscodecs) #add_subdirectory(winemp3.acm) -#add_subdirectory(winfax) -#add_subdirectory(wing32) -#add_subdirectory(winhttp) -#add_subdirectory(wininet) -#add_subdirectory(winmm) +add_subdirectory(winfax) +add_subdirectory(wing32) +add_subdirectory(winhttp) +add_subdirectory(wininet) +add_subdirectory(winmm) #add_subdirectory(winscard) -#add_subdirectory(winspool) -#add_subdirectory(winsta) -#add_subdirectory(wintrust) +add_subdirectory(winspool) +add_subdirectory(winsta) +add_subdirectory(wintrust) add_subdirectory(wlanapi) add_subdirectory(wldap32) #add_subdirectory(wmi) Added: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,34 @@ + +add_definitions(-DUNICODE -D_UNICODE) +add_definitions(-DNDEBUG=1) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories(${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud) +include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer) +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/wdmaud.spec --filename wdmaud.drv + DEPENDS native-winebuild) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def PROPERTIES GENERATED TRUE) +add_custom_target(wdmaud.drv_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def) + +add_library(wdmaud.drv SHARED + wdmaud.c + mixer.c + mmixer.c + legacy.c + wdmaud.rc) + +set_module_type(wdmaud.drv win32dll) +set_target_properties(wdmaud.drv PROPERTIES SUFFIX "") + +target_link_libraries(wdmaud.drv + ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def + mmebuddy + libsamplerate + mmixer) + +add_importlibs(wdmaud.drv ntdll user32 winmm advapi32 msvcrt setupapi ksuser) +add_dependencies(wdmaud.drv wdmaud.drv_def psdk) Propchange: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/windows… ============================================================================== --- branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,42 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff) + +spec2def(windowscodecs ${CMAKE_CURRENT_SOURCE_DIR}/windowscodecs.spec ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def) + +add_library(windowscodecs SHARED + bmpdecode.c + bmpencode.c + clsfactory.c + converter.c + fliprotate.c + gifformat.c + icoformat.c + imgfactory.c + info.c + jpegformat.c + main.c + palette.c + pngformat.c + propertybag.c + regsvr.c + stream.c + tiffformat.c + ungif.c + version.rc) + +set_module_type(windowscodecs win32dll) + +target_link_libraries(windowscodecs + ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def + wine) + +add_importlibs(windowscodecs msvcrt uuid ole32 shlwapi advapi32) +add_dependencies(windowscodecs windowscodecs_def psdk) Propchange: branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winfax/… ============================================================================== --- branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,11 @@ + +spec2def(winfax ${CMAKE_CURRENT_SOURCE_DIR}/winfax.spec ${CMAKE_CURRENT_BINARY_DIR}/winfax.def) + +add_library(winfax SHARED winfax.c winfax.rc) + +set_target_properties(winfax PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(winfax ${CMAKE_CURRENT_BINARY_DIR}/winfax.def) + +add_importlibs(winfax kernel32 ntdll) +add_dependencies(winfax winfax_def psdk) Propchange: branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wing32/… ============================================================================== --- branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,13 @@ + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(wing32 ${CMAKE_CURRENT_SOURCE_DIR}/wing32.spec ${CMAKE_CURRENT_BINARY_DIR}/wing32.def) + +add_library(wing32 SHARED wing32.c) + +set_target_properties(wing32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(wing32 ${CMAKE_CURRENT_BINARY_DIR}/wing32.def) + +add_importlibs(wing32 user32 gdi32) +add_dependencies(wing32 wing32_def psdk) Propchange: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp… ============================================================================== --- branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,24 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(winhttp ${CMAKE_CURRENT_SOURCE_DIR}/winhttp.spec ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def) + +add_library(winhttp SHARED + cookie.c + handle.c + main.c + net.c + request.c + session.c + url.c) + +set_module_type(winhttp win32dll) + +target_link_libraries(winhttp + ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def + wine) + +add_importlibs(winhttp msvcrt shlwapi wininet ws2_32 ntdll) +add_dependencies(winhttp winhttp_def psdk) Propchange: branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/C… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,31 @@ + +add_definitions(-D_WINE) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(winmm ${CMAKE_CURRENT_SOURCE_DIR}/winmm.spec ${CMAKE_CURRENT_BINARY_DIR}/winmm.def) + +set_rc_compiler() + +add_library(winmm SHARED + driver.c + joystick.c + lolvldrv.c + mci.c + mmio.c + playsound.c + registry.c + time.c + winmm.c + winmm_res.rc) + +set_module_type(winmm win32dll) + +target_link_libraries(winmm + ${CMAKE_CURRENT_BINARY_DIR}/winmm.def + wine + pseh) + +add_importlibs(winmm msvcrt ntdll advapi32 user32) +add_dependencies(winmm winmm_def psdk) + +add_subdirectory(midimap) Propchange: branches/cmake-bringup/dll/win32/winmm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/m… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,15 @@ + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(midimap ${CMAKE_CURRENT_SOURCE_DIR}/midimap.spec ${CMAKE_CURRENT_BINARY_DIR}/midimap.def) + +add_library(midimap SHARED midimap.c midimap.rc) + +set_target_properties(midimap PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(midimap + ${CMAKE_CURRENT_BINARY_DIR}/midimap.def + wine) + +add_importlibs(midimap kernel32 uuid ntdll advapi32 user32 winmm) +add_dependencies(midimap midimap_def psdk) Propchange: branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,20 @@ + +add_definitions(-DUNICODE -D_UNICODE) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(winspool ${CMAKE_CURRENT_SOURCE_DIR}/winspool.spec ${CMAKE_CURRENT_BINARY_DIR}/winspool.def) + +add_library(winspool SHARED + info.c + stubs.c + winspool.rc) + +set_module_type(winspool win32dll) +set_target_properties(winspool PROPERTIES SUFFIX ".drv") + +target_link_libraries(winspool + ${CMAKE_CURRENT_BINARY_DIR}/winspool.def + wine) + +add_importlibs(winspool ntdll advapi32 shlwapi) +add_dependencies(winspool winspool_def psdk) Propchange: branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,26 @@ + +spec2def(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.spec ${CMAKE_CURRENT_BINARY_DIR}/winsta.def) + +list(APPEND SOURCE + logon.c + main.c + misc.c + query.c + security.c + server.c + ws.c + winsta.rc) + +add_library(winsta SHARED + ${CMAKE_CURRENT_BINARY_DIR}/winsta_winsta.h.gch + ${SOURCE}) + +set_module_type(winsta win32dll) + +target_link_libraries(winsta + ${CMAKE_CURRENT_BINARY_DIR}/winsta.def + wine) + +add_importlibs(winsta ntdll) +add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE}) +add_dependencies(winsta winsta_def psdk) Propchange: branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wintrus… ============================================================================== --- branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Sat Oct 2 11:18:13 2010 @@ -1,0 +1,23 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(wintrust ${CMAKE_CURRENT_SOURCE_DIR}/wintrust.spec ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def) + +add_library(wintrust SHARED + crypt.c + register.c + wintrust_main.c + asn.c + softpub.c + version.rc) + +set_module_type(wintrust win32dll) + +target_link_libraries(wintrust + ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def + wine + pseh) + +add_importlibs(wintrust msvcrt crypt32 cryptui user32 advapi32 imagehlp ntdll) +add_dependencies(wintrust wintrust_def psdk) Propchange: branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48961: [CMAKE] - Add wininet to build. By Alexey Komarov.
by akhaldi＠svn.reactos.org 02 Oct '10

02 Oct '10

Author: akhaldi Date: Sat Oct 2 10:15:25 2010 New Revision: 48961 URL: http://svn.reactos.org/svn/reactos?rev=48961&view=rev Log: [CMAKE] - Add wininet to build. By Alexey Komarov. Added: branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt (with props) Added: branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Sat Oct 2 10:15:25 2010 @@ -1,0 +1,34 @@ + +add_definitions(-D__WINESRC__ -D_WINE) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) + +spec2def(wininet ${CMAKE_CURRENT_SOURCE_DIR}/wininet.spec ${CMAKE_CURRENT_BINARY_DIR}/wininet.def) + +set_rc_compiler() + +add_library(wininet SHARED + cookie.c + dialogs.c + ftp.c + gopher.c + http.c + internet.c + netconnection.c + urlcache.c + utility.c + wininet_main.c + rsrc.rc + version.rc) + +set_module_type(wininet win32dll) + +target_link_libraries(wininet + ${CMAKE_CURRENT_BINARY_DIR}/wininet.def + wine + zlib + pseh) + +add_importlibs(wininet msvcrt mpr shlwapi shell32 user32 advapi32 ntdll secur32 crypt32 ws2_32) +add_dependencies(wininet wininet_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48960: [CMAKE] - Fix wininet translations so that wininet can compile. I'll provide a patch upstream.
by akhaldi＠svn.reactos.org 02 Oct '10

02 Oct '10

Author: akhaldi Date: Sat Oct 2 10:14:50 2010 New Revision: 48960 URL: http://svn.reactos.org/svn/reactos?rev=48960&view=rev Log: [CMAKE] - Fix wininet translations so that wininet can compile. I'll provide a patch upstream. Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Bg.rc branches/cmake-bringup/dll/win32/wininet/wininet_Cs.rc branches/cmake-bringup/dll/win32/wininet/wininet_Da.rc branches/cmake-bringup/dll/win32/wininet/wininet_De.rc branches/cmake-bringup/dll/win32/wininet/wininet_En.rc branches/cmake-bringup/dll/win32/wininet/wininet_Es.rc branches/cmake-bringup/dll/win32/wininet/wininet_Fi.rc branches/cmake-bringup/dll/win32/wininet/wininet_Fr.rc branches/cmake-bringup/dll/win32/wininet/wininet_Hu.rc branches/cmake-bringup/dll/win32/wininet/wininet_It.rc branches/cmake-bringup/dll/win32/wininet/wininet_Ja.rc branches/cmake-bringup/dll/win32/wininet/wininet_Ko.rc branches/cmake-bringup/dll/win32/wininet/wininet_Lt.rc branches/cmake-bringup/dll/win32/wininet/wininet_Nl.rc branches/cmake-bringup/dll/win32/wininet/wininet_No.rc branches/cmake-bringup/dll/win32/wininet/wininet_Pl.rc branches/cmake-bringup/dll/win32/wininet/wininet_Pt.rc branches/cmake-bringup/dll/win32/wininet/wininet_Ro.rc branches/cmake-bringup/dll/win32/wininet/wininet_Ru.rc branches/cmake-bringup/dll/win32/wininet/wininet_Si.rc branches/cmake-bringup/dll/win32/wininet/wininet_Sv.rc branches/cmake-bringup/dll/win32/wininet/wininet_Tr.rc branches/cmake-bringup/dll/win32/wininet/wininet_Uk.rc branches/cmake-bringup/dll/win32/wininet/wininet_Zh.rc Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Bg.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Bg.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Bg.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Îáëàñò", -1, 40, 46, 50, 10 LTEXT "Ïîòðåáèòåë", -1, 40, 66, 50, 10 LTEXT "Ïàðîëà", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Çàïîìíè ïàðîëàòà (íåáåçîïàñíî)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Cs.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Cs.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Cs.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -35,8 +35,8 @@ LTEXT "Plné jméno", -1, 40, 46, 50, 10 LTEXT "Uivatel", -1, 40, 66, 50, 10 LTEXT "Heslo", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Uloit toto heslo (nebezpeèné) ?", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Da.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Da.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "Brugernavn", -1, 40, 66, 50, 10 LTEXT "Kodeord", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Gem dette kodeord (usikkert)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_De.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_De.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_De.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -33,8 +33,8 @@ LTEXT "Bereich", -1, 40, 46, 50, 10 LTEXT "Ben&utzer", -1, 40, 66, 50, 10 LTEXT "Kenn&wort", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Dieses &Kennwort speichern (unsicher)", IDC_SAVEPASSWORD, @@ -53,8 +53,8 @@ LTEXT "Bereich", -1, 40, 46, 50, 10 LTEXT "Benutzer", -1, 40, 66, 50, 10 LTEXT "Kennwort", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Dieses &Kennwort speichern (unsicher)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_En.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_En.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_En.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "User", -1, 40, 66, 50, 10 LTEXT "Password", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Save this password (insecure)", IDC_SAVEPASSWORD, @@ -50,8 +50,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "User", -1, 40, 66, 50, 10 LTEXT "Password", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Save this password (insecure)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Es.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Es.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Dominio", -1, 40, 46, 50, 10 LTEXT "Usuario", -1, 40, 66, 50, 10 LTEXT "Contraseña", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Guardar esta contraseña (inseguro)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Fi.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Fi.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Fi.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Alue", -1, 40, 46, 50, 10 LTEXT "Käyttäjä", -1, 40, 66, 50, 10 LTEXT "Salasana", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Tallenna tämä salasana (epäturvallinen)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Fr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Fr.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -39,8 +39,8 @@ LTEXT "Domaine", -1, 10, 50, 50, 10 LTEXT "Utilisateur", -1, 10, 71, 50, 10 LTEXT "Mot de passe", -1, 10, 90, 50, 10 - LTEXT "" IDC_PROXY, 58, 28, 150, 14, 0 - LTEXT "" IDC_REALM, 58, 48, 150, 14, 0 + LTEXT "", IDC_PROXY, 58, 28, 150, 14, 0 + LTEXT "", IDC_REALM, 58, 48, 150, 14, 0 EDITTEXT IDC_USERNAME, 58, 68, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 58, 88, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Enregistrer ce mot de passe (risquÃ©)", IDC_SAVEPASSWORD, @@ -59,8 +59,8 @@ LTEXT "Domaine", -1, 10, 50, 50, 10 LTEXT "Utilisateur", -1, 10, 71, 50, 10 LTEXT "Mot de passe", -1, 10, 90, 50, 10 - LTEXT "" IDC_SERVER, 58, 28, 150, 14, 0 - LTEXT "" IDC_REALM, 58, 48, 150, 14, 0 + LTEXT "", IDC_SERVER, 58, 28, 150, 14, 0 + LTEXT "", IDC_REALM, 58, 48, 150, 14, 0 EDITTEXT IDC_USERNAME, 58, 68, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 58, 88, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Enregistrer ce mot de passe (risquÃ©)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Hu.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Hu.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Csoport", -1, 40, 46, 50, 10 LTEXT "Felhasználó", -1, 40, 66, 50, 10 LTEXT "Jelszó", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Jelszó mentése (nem biztonságos)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_It.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_It.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_It.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -32,8 +32,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "Utente", -1, 40, 66, 50, 10 LTEXT "Password", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Memorizza la password ( RISCHIOSO )", IDC_SAVEPASSWORD, @@ -52,8 +52,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "Utente", -1, 40, 66, 50, 10 LTEXT "Password", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Memorizza la password (RISCHIOSO)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Ja.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Ja.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -33,8 +33,8 @@ LTEXT "å°å", -1, 40, 46, 50, 10 LTEXT "ã¦ã¼ã¶å", -1, 40, 66, 50, 10 LTEXT "ãã¹ã¯ã¼ã", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "ãã¹ã¯ã¼ããä¿åãã(&S)(ã»ãã¥ã¢ã§ã¯ããã¾ãã)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Ko.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Ko.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "»ç¿ëÀÚ", -1, 40, 66, 50, 10 LTEXT "¾ÏÈ£", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "¾ÏÈ£ ÀÔ·Â(&S)(ÁÖÀÇÇÏ½Ã¿À)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Lt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Lt.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -33,8 +33,8 @@ LTEXT "Sritis", -1, 40, 46, 50, 10 LTEXT "Naudotojas", -1, 40, 66, 50, 10 LTEXT "SlaptaÅ¾odis", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Ä®&raÅ¡yti Å¡Ä¯ slaptaÅ¾odÄ¯ (nesaugu)", IDC_SAVEPASSWORD, @@ -53,8 +53,8 @@ LTEXT "Sritis", -1, 40, 46, 50, 10 LTEXT "Naudotojas", -1, 40, 66, 50, 10 LTEXT "SlaptaÅ¾odis", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Ä®&raÅ¡yti Å¡Ä¯ slaptaÅ¾odÄ¯ (nesaugu)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Nl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Nl.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -32,8 +32,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "Gebruikersnaam", -1, 40, 66, 50, 10 LTEXT "Wachtwoord", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Wachtwoord opslaan (onveilig)", IDC_SAVEPASSWORD, @@ -52,8 +52,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "Gebruikersnaam", -1, 40, 66, 50, 10 LTEXT "Wachtwoord", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Wachtwoord opslaan (onveilig)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_No.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_No.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_No.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -32,8 +32,8 @@ LTEXT "OmrÃ¥de", -1, 40, 46, 50, 10 LTEXT "Bruker", -1, 40, 66, 50, 10 LTEXT "Passord", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Lagre dette pa&ssordet (usikkert)", IDC_SAVEPASSWORD, @@ -52,8 +52,8 @@ LTEXT "OmrÃ¥de", -1, 40, 46, 50, 10 LTEXT "Bruker", -1, 40, 66, 50, 10 LTEXT "Passord", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Lagre pa&ssordet (sikkerhetsrisiko)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Pl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Pl.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -31,8 +31,8 @@ LTEXT "Obszar", -1, 40, 46, 50, 10 LTEXT "U¿ytkonik", -1, 40, 66, 50, 10 LTEXT "Has³o", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Zapamiêtaj to has³o (nie bezpieczne)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Pt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Pt.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -34,8 +34,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "UsuÃ¡rio", -1, 40, 66, 50, 10 LTEXT "Senha", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Salvar esta senha (inseguro)", IDC_SAVEPASSWORD, @@ -56,8 +56,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "Utilizador", -1, 40, 66, 50, 10 LTEXT "Senha", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Gravar esta senha (inseguro)", IDC_SAVEPASSWORD, @@ -76,8 +76,8 @@ LTEXT "Reino", -1, 40, 46, 50, 10 LTEXT "Utilizador", -1, 40, 66, 50, 10 LTEXT "Palavra-passe", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Guardar esta palavra-passe (inseguro)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Ro.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Ro.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -33,8 +33,8 @@ LTEXT "Domeniu", -1, 40, 46, 50, 10 LTEXT "Utilizator", -1, 40, 66, 50, 10 LTEXT "ParolÄ", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&SalveazÄ aceastÄ parolÄ (nesigur)", IDC_SAVEPASSWORD, @@ -53,8 +53,8 @@ LTEXT "Domeniu", -1, 40, 46, 50, 10 LTEXT "Utilizator", -1, 40, 66, 50, 10 LTEXT "ParolÄ", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&SalveazÄ aceastÄ parolÄ (nesigur)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Ru.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Ru.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -35,8 +35,8 @@ LTEXT "ÐÐ¾Ð¼ÐµÐ½", -1, 40, 46, 50, 10 LTEXT "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ", -1, 40, 66, 50, 10 LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÑÐ¾Ñ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð½ÐµÐ±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾)", IDC_SAVEPASSWORD, @@ -55,8 +55,8 @@ LTEXT "ÐÐ¾Ð¼ÐµÐ½", -1, 40, 46, 50, 10 LTEXT "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ", -1, 40, 66, 50, 10 LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 40, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÑÐ¾Ñ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð½ÐµÐ±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Si.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Si.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -32,8 +32,8 @@ LTEXT "PodroÄje", -1, 20, 46, 50, 10 LTEXT "UporabniÅ¡ko ime", -1, 20, 66, 55, 10 LTEXT "Geslo", -1, 20, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Shrani geslo (nezaÅ¡Äiteno)", IDC_SAVEPASSWORD, @@ -52,8 +52,8 @@ LTEXT "PodroÄje", -1, 20, 46, 50, 10 LTEXT "UporabniÅ¡ko ime", -1, 20, 66, 55, 10 LTEXT "Geslo", -1, 20, 86, 50, 10 - LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Shrani geslo (nezaÅ¡Äiteno)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Sv.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Sv.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -30,8 +30,8 @@ LTEXT "Domän", -1, 40, 46, 50, 10 LTEXT "Användarnamn", -1, 40, 66, 50, 10 LTEXT "Lösenord", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Spara detta lösenord (osäkert)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Tr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Tr.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -32,8 +32,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "Kullanýcý", -1, 40, 66, 50, 10 LTEXT "Parola", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Bu parolayý &sakla (güvensiz)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Uk.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Uk.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -32,8 +32,8 @@ LTEXT "Îáëàñòü", -1, 40, 46, 50, 10 LTEXT "Êîðèñòóâà÷", -1, 40, 66, 50, 10 LTEXT "Ïàðîëü", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Çáåðåãòè öåé ïàðîëü (íåáåçïå÷íî)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/wininet/wininet_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/wininet_Zh.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/wininet_Zh.rc [iso-8859-1] Sat Oct 2 10:14:50 2010 @@ -35,8 +35,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "ç¨æ·", -1, 40, 66, 50, 10 LTEXT "å¯ç ", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "ä¿åå¯ç (ä¸å®å¨)(&S)", IDC_SAVEPASSWORD, @@ -62,8 +62,8 @@ LTEXT "Realm", -1, 40, 46, 50, 10 LTEXT "ç¨æ¶", -1, 40, 66, 50, 10 LTEXT "å¯ç¢¼", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "å²åå¯ç¢¼(ä¸å®å¨)(&S)", IDC_SAVEPASSWORD,

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