Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 49069: [HEAP] - Implement setting/getting heap user values and flags (very easy provided heap design is now proper). Amount of winetest failures is down to 12 (but 3 crashes in child pro...
by fireball＠svn.reactos.org 09 Oct '10

09 Oct '10

Author: fireball Date: Sat Oct 9 12:49:30 2010 New Revision: 49069 URL: http://svn.reactos.org/svn/reactos?rev=49069&view=rev Log: [HEAP] - Implement setting/getting heap user values and flags (very easy provided heap design is now proper). Amount of winetest failures is down to 12 (but 3 crashes in child processes). Modified: trunk/reactos/lib/rtl/heap_rewrite.c Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Sat Oct 9 12:49:30 2010 @@ -12,6 +12,7 @@ http://binglongx.spaces.live.com/blog/cns!142CBF6D49079DE8!596.entry http://www.phreedom.org/research/exploits/asn1-bitstring/ http://illmatics.com/Understanding_the_LFH.pdf + http://www.alex-ionescu.com/?p=18 */ /* INCLUDES *****************************************************************/ @@ -243,7 +244,7 @@ { USHORT AllocatorBackTraceIndex; USHORT TagIndex; - ULONG Settable; + ULONG_PTR Settable; }; UINT64 ZeroInit; }; @@ -1153,7 +1154,7 @@ if (Segment->SegmentFlags & HEAP_USER_ALLOCATED) return; BaseAddress = Segment->BaseAddress; - DPRINT1("Destroying segment %p, BA %p\n", Segment, BaseAddress); + DPRINT("Destroying segment %p, BA %p\n", Segment, BaseAddress); /* Release virtual memory */ Status = ZwFreeVirtualMemory(NtCurrentProcess(), @@ -2983,7 +2984,15 @@ Flags |= HEAP_SETTABLE_USER_VALUE | ((InUseEntry->Flags & HEAP_ENTRY_SETTABLE_FLAGS) << 4); - UNIMPLEMENTED; + /* Get pointer to the old extra data */ + OldExtra = RtlpGetExtraStuffPointer(InUseEntry); + + /* Save tag index if it was set */ + if (OldExtra->TagIndex && + !(OldExtra->TagIndex & HEAP_PSEUDO_TAG_FLAG)) + { + Flags |= OldExtra->TagIndex << HEAP_TAG_SHIFT; + } } else if (InUseEntry->SmallTagIndex) { @@ -3131,7 +3140,7 @@ /* Check if it's really a heap */ if (Heap->Signature != HEAP_SIGNATURE) return FALSE; - /* Lock if it's lockable */ + /* Unlock if it's lockable */ if (!(Heap->Flags & HEAP_NO_SERIALIZE)) { RtlLeaveHeapLock(Heap->LockVariable); @@ -3307,8 +3316,49 @@ IN PVOID BaseAddress, IN PVOID UserValue) { - UNIMPLEMENTED; - return FALSE; + PHEAP Heap = (PHEAP)HeapHandle; + PHEAP_ENTRY HeapEntry; + PHEAP_ENTRY_EXTRA Extra; + BOOLEAN HeapLocked = FALSE; + + /* Force flags */ + Flags |= Heap->Flags; + + /* Lock if it's lockable */ + if (!(Heap->Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + } + + /* Get a pointer to the entry */ + HeapEntry = (PHEAP_ENTRY)BaseAddress - 1; + + /* If it's a free entry - return error */ + if (!(HeapEntry->Flags & HEAP_ENTRY_BUSY)) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); + + /* Release the heap lock if it was acquired */ + if (HeapLocked) + RtlLeaveHeapLock(Heap->LockVariable); + + return FALSE; + } + + /* Check if this entry has an extra stuff associated with it */ + if (HeapEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) + { + /* Use extra to store the value */ + Extra = RtlpGetExtraStuffPointer(HeapEntry); + Extra->Settable = (ULONG_PTR)UserValue; + } + + /* Release the heap lock if it was acquired */ + if (HeapLocked) + RtlLeaveHeapLock(Heap->LockVariable); + + return TRUE; } /* @@ -3319,9 +3369,47 @@ RtlSetUserFlagsHeap(IN PVOID HeapHandle, IN ULONG Flags, IN PVOID BaseAddress, - IN ULONG UserFlags) -{ - return FALSE; + IN ULONG UserFlagsReset, + IN ULONG UserFlagsSet) +{ + PHEAP Heap = (PHEAP)HeapHandle; + PHEAP_ENTRY HeapEntry; + BOOLEAN HeapLocked = FALSE; + + /* Force flags */ + Flags |= Heap->Flags; + + /* Lock if it's lockable */ + if (!(Heap->Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + } + + /* Get a pointer to the entry */ + HeapEntry = (PHEAP_ENTRY)BaseAddress - 1; + + /* If it's a free entry - return error */ + if (!(HeapEntry->Flags & HEAP_ENTRY_BUSY)) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); + + /* Release the heap lock if it was acquired */ + if (HeapLocked) + RtlLeaveHeapLock(Heap->LockVariable); + + return FALSE; + } + + /* Set / reset flags */ + HeapEntry->Flags &= ~(UserFlagsReset >> 4); + HeapEntry->Flags |= (UserFlagsSet >> 4); + + /* Release the heap lock if it was acquired */ + if (HeapLocked) + RtlLeaveHeapLock(Heap->LockVariable); + + return TRUE; } /* @@ -3335,8 +3423,56 @@ OUT PVOID *UserValue, OUT PULONG UserFlags) { - UNIMPLEMENTED; - return FALSE; + PHEAP Heap = (PHEAP)HeapHandle; + PHEAP_ENTRY HeapEntry; + PHEAP_ENTRY_EXTRA Extra; + BOOLEAN HeapLocked = FALSE; + + /* Force flags */ + Flags |= Heap->Flags; + + /* Lock if it's lockable */ + if (!(Heap->Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + } + + /* Get a pointer to the entry */ + HeapEntry = (PHEAP_ENTRY)BaseAddress - 1; + + /* If it's a free entry - return error */ + if (!(HeapEntry->Flags & HEAP_ENTRY_BUSY)) + { + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); + + /* Release the heap lock if it was acquired */ + if (HeapLocked) + RtlLeaveHeapLock(Heap->LockVariable); + + return FALSE; + } + + /* Check if this entry has an extra stuff associated with it */ + if (HeapEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) + { + /* Get pointer to extra data */ + Extra = RtlpGetExtraStuffPointer(HeapEntry); + + /* Pass user value */ + if (UserValue) + *UserValue = (PVOID)Extra->Settable; + + /* Decode and return user flags */ + if (UserFlags) + *UserFlags = (HeapEntry->Flags & HEAP_ENTRY_SETTABLE_FLAGS) << 4; + } + + /* Release the heap lock if it was acquired */ + if (HeapLocked) + RtlLeaveHeapLock(Heap->LockVariable); + + return TRUE; } /*

1 0

[akhaldi] 49068: [CMAKE] - Bring back explorer.
by akhaldi＠svn.reactos.org 09 Oct '10

09 Oct '10

Author: akhaldi Date: Sat Oct 9 12:48:57 2010 New Revision: 49068 URL: http://svn.reactos.org/svn/reactos?rev=49068&view=rev Log: [CMAKE] - Bring back explorer. Modified: branches/cmake-bringup/base/shell/CMakeLists.txt branches/cmake-bringup/base/shell/explorer/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt Modified: branches/cmake-bringup/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/CMakeL… ============================================================================== --- branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] Sat Oct 9 12:48:57 2010 @@ -1,4 +1,4 @@ add_subdirectory(cmd) -#add_subdirectory(explorer) +add_subdirectory(explorer) add_subdirectory(explorer-new) 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 9 12:48:57 2010 @@ -45,24 +45,33 @@ utility/window.cpp utility/shellbrowserimpl.cpp) # utility/shelltests.cpp - add_executable(explorer ${SOURCE}) #${CMAKE_CURRENT_BINARY_DIR}/explorer_precomp.h.gch ${SOURCE}) +set_subsystem(explorer windows) +set_entrypoint(explorer WinMainCRTStartup) + target_link_libraries(explorer + -lsupc++ + -lstdc++ + -lgcc + -lmingw32 + -lmingwex wine - uuid) + mingw_wmain + mingw_common + uuid + -ladvapi32 + -lgdi32 + -luser32 + -lws2_32 + -lmsimg32 + -lcomctl32 + -lole32 + -loleaut32 + -lshell32 + -lnotifyhook + -lmsvcrt + -lkernel32 + -lntdll) -set_module_type(explorer win32gui) - -add_importlibs(explorer - advapi32 - gdi32 - user32 - ws2_32 - msimg32 - comctl32 - ole32 - oleaut32 - shell32 - notifyhook - msvcrt) +add_dependencies(explorer psdk buildno_header) Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Sat Oct 9 12:48:57 2010 @@ -41,7 +41,7 @@ add_library(mingw_common ${MINGW_COMMON_SOURCE}) if(NOT MSVC) - add_dependencies(mingw_common oldnames) + target_link_libraries(mingw_common oldnames) endif(NOT MSVC) set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) Modified: branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/stlp… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Sat Oct 9 12:48:57 2010 @@ -44,6 +44,6 @@ if(NOT MSVC) #those are mandatory to get correctly ordered linked libraries. - target_link_libraries(stlport supc++ msvcrt.dll.a) - add_importlibs(stlport msvcrt) + #target_link_libraries(stlport supc++ msvcrt.dll.a) + #add_importlibs(stlport msvcrt) endif()

1 0

[akhaldi] 49067: [RAPPS] Igor Paliychuk: - Update some broken links. - Changed the cyrillic "P" to a latin "P" in the beginning of the VBox driver's russian and ukrainian descriptions (rapps doesn'...
by akhaldi＠svn.reactos.org 09 Oct '10

09 Oct '10

Author: akhaldi Date: Sat Oct 9 10:35:35 2010 New Revision: 49067 URL: http://svn.reactos.org/svn/reactos?rev=49067&view=rev Log: [RAPPS] Igor Paliychuk: - Update some broken links. - Changed the cyrillic "P" to a latin "P" in the beginning of the VBox driver's russian and ukrainian descriptions (rapps doesn't display it when it's cyrillic). Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/diablo2.txt trunk/reactos/base/applications/rapps/rapps/dosbox.txt trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt trunk/reactos/base/applications/rapps/rapps/lgeneral.txt trunk/reactos/base/applications/rapps/rapps/lmarbles.txt trunk/reactos/base/applications/rapps/rapps/mingw.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/remood.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/rosbearm.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 0.9M Category = 12 URLSite = http://www.7-zip.org/ -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z465.exe +URLDownload = http://ovh.dl.sourceforge.net/project/sevenzip/7-Zip/4.65/7z465.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -32,11 +32,11 @@ [Section.0419] Name = ÐÑÐ°Ð¹Ð²ÐµÑ AC97 Ð´Ð»Ñ VirtualBox Licence = ÐÐµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ -Description = Ð Ð°Ð·Ð°ÑÑÐ¸Ð²Ð¸ÑÑÐ¹ÑÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð² Ð¿Ð°Ð¿ÐºÑ "ReactOS", Ð·Ð°ÑÐµÐ¼ Ð´Ð²Ð°Ð¶Ð´Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. +Description = PÐ°Ð·Ð°ÑÑÐ¸Ð²Ð¸ÑÑÐ¹ÑÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð² Ð¿Ð°Ð¿ÐºÑ "ReactOS", Ð·Ð°ÑÐµÐ¼ Ð´Ð²Ð°Ð¶Ð´Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. URLSite = ÐÐµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ [Section.0422] Name = ÐÑÐ°Ð¹Ð²ÐµÑ AC97 Ð´Ð»Ñ VirtualBox Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° -Description = Ð Ð¾Ð·Ð°ÑÑÑÐ²ÑÐ¹ÑÐµ Ð²Ð¼ÑÑÑ Ð² ÑÐµÐºÑ "ReactOS" Ð¿ÑÑÐ»Ñ ÑÐ¾Ð³Ð¾ Ð´Ð²ÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. +Description = PÐ¾Ð·Ð°ÑÑÑÐ²ÑÐ¹ÑÐµ Ð²Ð¼ÑÑÑ Ð² ÑÐµÐºÑ "ReactOS" Ð¿ÑÑÐ»Ñ ÑÐ¾Ð³Ð¾ Ð´Ð²ÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. URLSite = ÐÐµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ Modified: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 132MB Category = 4 URLSite = http://www.blizzard.com/diablo2/ -URLDownload = http://ftp.freenet.de/pub/filepilot/windows/spiele/diabloiidemo.exe +URLDownload = http://pub.zoneofgames.ru/demos/diabloiidemo.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 1.4MB Category = 15 URLSite = http://www.dosbox.com/ -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.74-win32-installer… +URLDownload = http://ovh.dl.sourceforge.net/project/dosbox/dosbox/0.74/DOSBox0.74-win32-i… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 3.1MB Category = 4 URLSite = http://lgames.sourceforge.net/index.php?project=LBreakout2 -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.exe +URLDownload = http://ovh.dl.sourceforge.net/project/lgames/binaries/lbreakout2-2.4.1-win3… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lgeneral.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lgeneral.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 2.0MB Category = 4 URLSite = http://lgames.sourceforge.net/index.php?project=LGeneral -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe +URLDownload = http://ovh.dl.sourceforge.net/project/lgames/binaries/lgeneral-1.1-win32.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lmarbles.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lmarbles.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 1.4MB Category = 4 URLSite = http://lgames.sourceforge.net/index.php?project=LMarbles -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe +URLDownload = http://ovh.dl.sourceforge.net/project/lgames/binaries/lmarbles-1.0.6-win32.… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mingw.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mingw.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mingw.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -2,13 +2,13 @@ [Section] Name = MinGW -Version = 5.1.6 +Version = 20100909 Licence = Public domain/GPL Description = A Port of the GNU toolchain with GCC, GDB, GNU make, etc. -Size = 155kb +Size = 568kb Category = 7 URLSite = http://mingw.org/ -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.6.exe +URLDownload = http://ovh.dl.sourceforge.net/project/mingw/Automated%20MinGW%20Installer/m… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 3.4MB Category = 4 URLSite = http://www.openttd.org/ -URLDownload = http://binaries.openttd.org/releases/1.0.4/openttd-1.0.4-windows-win32.exe +URLDownload = http://cz.binaries.openttd.org/openttd/binaries/releases/1.0.4/openttd-1.0.… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 1.2M Category = 4 URLSite = http://remood.sourceforge.net/ -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/remood/remoodsetup-win32_08a.exe +URLDownload = http://ovh.dl.sourceforge.net/project/remood/ReMooD/0.8a/remoodsetup-win32_… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 13.8MB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.5.1.1.exe +URLDownload = http://ovh.dl.sourceforge.net/project/reactos/RosBE-Windows/i386/1.5.1/RosB… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/rosbearm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbearm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbearm.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 11.1MB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment/ -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-ARM-1.0.exe +URLDownload = http://ovh.dl.sourceforge.net/project/reactos/RosBE-Windows/arm/1.0/RosBE-A… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 14.2MB Category = 1 URLSite = http://smplayer.sourceforge.net/ -URLDownload = http://downloads.sourceforge.net/project/smplayer/SMPlayer/0.6.9/smplayer-0… +URLDownload = http://ovh.dl.sourceforge.net/project/smplayer/SMPlayer/0.6.9/smplayer-0.6.… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] Sat Oct 9 10:35:35 2010 @@ -8,7 +8,7 @@ Size = 10MB Category = 3 URLSite = http://tuxpaint.org/ -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.21-win32-in… +URLDownload = http://ovh.dl.sourceforge.net/project/tuxpaint/tuxpaint/0.9.21/tuxpaint-0.9… CDPath = none [Section.0407]

1 0

[akhaldi] 49066: [CMAKE] - Introduce lesser verbose makefiles.
by akhaldi＠svn.reactos.org 09 Oct '10

09 Oct '10

Author: akhaldi Date: Sat Oct 9 10:10:39 2010 New Revision: 49066 URL: http://svn.reactos.org/svn/reactos?rev=49066&view=rev Log: [CMAKE] - Introduce lesser verbose makefiles. Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Oct 9 10:10:39 2010 @@ -20,6 +20,8 @@ set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE) set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) + +set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) add_definitions(-D__REACTOS__)

1 0

[pschweitzer] 49065: [NTDLL] Fixed build
by pschweitzer＠svn.reactos.org 09 Oct '10

09 Oct '10

Author: pschweitzer Date: Sat Oct 9 10:01:37 2010 New Revision: 49065 URL: http://svn.reactos.org/svn/reactos?rev=49065&view=rev Log: [NTDLL] Fixed build Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.pspec?… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] Sat Oct 9 10:01:37 2010 @@ -897,7 +897,7 @@ //@ stdcall RtlSetTimer @ stdcall RtlSetUnhandledExceptionFilter(ptr) //@ stdcall RtlSetUnicodeCallouts -@ stdcall RtlSetUserFlagsHeap(ptr long ptr long) +@ stdcall RtlSetUserFlagsHeap(ptr long ptr long long) @ stdcall RtlSetUserValueHeap(ptr long ptr ptr) @ stdcall RtlSizeHeap(long long ptr) @ stdcall RtlSleepConditionVariableCS(ptr ptr ptr)

1 0

[fireball] 49064: [RTL] - Fix RtlSetUserFlagsHeap declaration and definition.
by fireball＠svn.reactos.org 09 Oct '10

09 Oct '10

Author: fireball Date: Sat Oct 9 09:19:33 2010 New Revision: 49064 URL: http://svn.reactos.org/svn/reactos?rev=49064&view=rev Log: [RTL] - Fix RtlSetUserFlagsHeap declaration and definition. Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat Oct 9 09:19:33 2010 @@ -766,7 +766,8 @@ IN PVOID HeapHandle, IN ULONG Flags, IN PVOID BaseAddress, - IN ULONG UserFlags + IN ULONG UserFlagsReset, + IN ULONG UserFlagsSet ); NTSYSAPI Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=49064&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sat Oct 9 09:19:33 2010 @@ -1812,7 +1812,8 @@ RtlSetUserFlagsHeap(IN PVOID HeapHandle, IN ULONG Flags, IN PVOID BaseAddress, - IN ULONG UserFlags) + IN ULONG UserFlagsReset, + IN ULONG UserFlagsSet) { HEAP *heapPtr; PHEAP_USER_DATA udata; @@ -1829,7 +1830,7 @@ udata = HEAP_AllocUserData(heapPtr, BaseAddress); if (!udata) return FALSE; } - udata->UserFlags = UserFlags & HEAP_SETTABLE_USER_FLAGS; + udata->UserFlags = UserFlagsSet & HEAP_SETTABLE_USER_FLAGS; return TRUE; }

1 0

[fireball] 49063: [KERNEL32] - Revert incorrect changes from 34404 and 40910: RtlSetUserFlagsHeap() doesn't set usual heap flags, it sets special user-settable heap entry flags. With the new heap m...
by fireball＠svn.reactos.org 09 Oct '10

09 Oct '10

Author: fireball Date: Sat Oct 9 09:15:50 2010 New Revision: 49063 URL: http://svn.reactos.org/svn/reactos?rev=49063&view=rev Log: [KERNEL32] - Revert incorrect changes from 34404 and 40910: RtlSetUserFlagsHeap() doesn't set usual heap flags, it sets special user-settable heap entry flags. With the new heap manager such usage corrupts heap integrity (not to say prototype of this function is incorrect). - RtlReAllocateHeap() is supposed to copy user values and flags so there is no need to set them afterwise again. - Fix a typo in comments. Modified: trunk/reactos/dll/win32/kernel32/mem/global.c trunk/reactos/dll/win32/kernel32/mem/local.c trunk/reactos/dll/win32/kernel32/process/procsup.c Modified: trunk/reactos/dll/win32/kernel32/mem/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/glo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/global.c [iso-8859-1] Sat Oct 9 09:15:50 2010 @@ -101,7 +101,6 @@ { /* All worked well, save our heap entry */ RtlSetUserValueHeap(hProcessHeap, HEAP_NO_SERIALIZE, Ptr, hMemory); - RtlSetUserFlagsHeap(hProcessHeap, HEAP_NO_SERIALIZE, Ptr, Flags); } } @@ -529,10 +528,6 @@ HEAP_NO_SERIALIZE, Ptr, hMem); - RtlSetUserFlagsHeap(hProcessHeap, - HEAP_NO_SERIALIZE, - Ptr, - Flags); } } else @@ -562,10 +557,6 @@ HEAP_NO_SERIALIZE, Ptr, hMem); - RtlSetUserFlagsHeap(hProcessHeap, - HEAP_NO_SERIALIZE, - Ptr, - Flags); } } @@ -668,10 +659,6 @@ HEAP_NO_SERIALIZE, HandleEntry->Object, hMem); - RtlSetUserFlagsHeap(hProcessHeap, - HEAP_NO_SERIALIZE, - HandleEntry->Object, - Flags); } } } Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] Sat Oct 9 09:15:50 2010 @@ -352,11 +352,6 @@ HEAP_NO_SERIALIZE, Ptr, hMem); - RtlSetUserFlagsHeap(hProcessHeap, - HEAP_NO_SERIALIZE, - Ptr, - Flags); - } } else @@ -378,19 +373,6 @@ /* And do the re-allocation */ Ptr = RtlReAllocateHeap(hProcessHeap, Flags, Ptr, dwBytes); - - if (Ptr) - { - /* Allocation succeeded, so save our entry */ - RtlSetUserValueHeap(hProcessHeap, - HEAP_NO_SERIALIZE, - Ptr, - hMem); - RtlSetUserFlagsHeap(hProcessHeap, - HEAP_NO_SERIALIZE, - Ptr, - Flags); - } } /* Make sure we have a pointer by now */ Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Sat Oct 9 09:15:50 2010 @@ -805,7 +805,7 @@ if (lpCommandLine) { - /* Serach for escape sequences */ + /* Search for escape sequences */ ScanString = lpCommandLine; while (NULL != (ScanString = wcschr(ScanString, L'^'))) {

1 0

[akhaldi] 49062: [CMAKE] - More work on the base modules.
by akhaldi＠svn.reactos.org 08 Oct '10

08 Oct '10

Author: akhaldi Date: Fri Oct 8 23:06:11 2010 New Revision: 49062 URL: http://svn.reactos.org/svn/reactos?rev=49062&view=rev Log: [CMAKE] - More work on the base modules. Modified: branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt branches/cmake-bringup/base/services/CMakeLists.txt branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt branches/cmake-bringup/base/services/eventlog/CMakeLists.txt branches/cmake-bringup/base/services/rpcss/CMakeLists.txt branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt branches/cmake-bringup/base/services/svchost/CMakeLists.txt branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt branches/cmake-bringup/base/services/telnetd/CMakeLists.txt branches/cmake-bringup/base/services/tftpd/CMakeLists.txt branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt branches/cmake-bringup/base/setup/reactos/CMakeLists.txt branches/cmake-bringup/base/setup/setup/CMakeLists.txt branches/cmake-bringup/base/setup/usetup/CMakeLists.txt branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt branches/cmake-bringup/base/setup/welcome/CMakeLists.txt branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt branches/cmake-bringup/base/system/autochk/CMakeLists.txt branches/cmake-bringup/base/system/bootok/CMakeLists.txt branches/cmake-bringup/base/system/expand/CMakeLists.txt branches/cmake-bringup/base/system/format/CMakeLists.txt branches/cmake-bringup/base/system/lsass/CMakeLists.txt branches/cmake-bringup/base/system/msiexec/CMakeLists.txt branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt branches/cmake-bringup/base/system/rundll32/CMakeLists.txt branches/cmake-bringup/base/system/runonce/CMakeLists.txt branches/cmake-bringup/base/system/services/CMakeLists.txt branches/cmake-bringup/base/system/smss/CMakeLists.txt branches/cmake-bringup/base/system/userinit/CMakeLists.txt branches/cmake-bringup/base/system/winlogon/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -13,4 +13,4 @@ set_module_type(sndvol32 win32gui) -add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32) +add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -1,9 +1,11 @@ + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__ROS_LONG64__) -add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) -add_definitions(-Dfileno=_fileno) -add_definitions(-Disatty=_isatty) +add_definitions( + -D__ROS_LONG64__ + -D_CRT_NONSTDC_NO_DEPRECATE + -Dfileno=_fileno + -Disatty=_isatty) add_executable(winhlp32 callback.c @@ -17,5 +19,4 @@ set_module_type(winhlp32 win32gui) target_link_libraries(winhlp32 wine) - -add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32) +add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/CMa… ============================================================================== --- branches/cmake-bringup/base/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -6,6 +6,6 @@ add_subdirectory(svchost) add_subdirectory(tcpsvcs) add_subdirectory(telnetd) -add_subdirectory(tftpd) +#add_subdirectory(tftpd) add_subdirectory(umpnpmgr) add_subdirectory(wlansvc) Modified: branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/aud… ============================================================================== --- branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -11,5 +11,5 @@ audiosrv.rc) set_module_type(audiosrv win32cui) -add_importlibs(audiosrv advapi32 user32 setupapi msvcrt) +add_importlibs(audiosrv advapi32 user32 setupapi msvcrt kernel32) Modified: branches/cmake-bringup/base/services/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/eve… ============================================================================== --- branches/cmake-bringup/base/services/eventlog/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/eventlog/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -18,4 +18,4 @@ set_module_type(eventlog win32cui) -add_importlibs(eventlog advapi32 rpcrt4 msvcrt) +add_importlibs(eventlog advapi32 rpcrt4 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc… ============================================================================== --- branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -16,4 +16,4 @@ set_module_type(rpcss win32cui) -add_importlibs(rpcss advapi32 rpcrt4 msvcrt) +add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/spo… ============================================================================== --- branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -6,4 +6,4 @@ target_link_libraries(spoolsv wine) set_module_type(spoolsv win32cui) -add_importlibs(spoolsv advapi32 msvcrt) +add_importlibs(spoolsv advapi32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/svchost/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/svc… ============================================================================== --- branches/cmake-bringup/base/services/svchost/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/svchost/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -2,4 +2,4 @@ add_executable(svchost svchost.c svchost.rc) set_module_type(svchost win32cui) -add_importlibs(svchost advapi32 msvcrt) +add_importlibs(svchost advapi32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tcp… ============================================================================== --- branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -16,5 +16,5 @@ add_pch(tcpsvcs ${CMAKE_CURRENT_SOURCE_DIR}/tcpsvcs.h ${SOURCE}) set_module_type(tcpsvcs win32cui) -add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt) +add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/telnetd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tel… ============================================================================== --- branches/cmake-bringup/base/services/telnetd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/telnetd/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -7,5 +7,5 @@ target_link_libraries(telnetd wine) set_module_type(telnetd win32cui) -add_importlibs(telnetd advapi32 ws2_32 msvcrt) +add_importlibs(telnetd advapi32 ws2_32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/tftpd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tft… ============================================================================== --- branches/cmake-bringup/base/services/tftpd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/tftpd/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -4,4 +4,4 @@ target_link_libraries(tftpd wine) set_module_type(tftpd win32cui) -add_importlibs(tftpd advapi32 ws2_32 msvcrt) +add_importlibs(tftpd advapi32 ws2_32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/ump… ============================================================================== --- branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -13,4 +13,6 @@ advapi32 rpcrt4 userenv - msvcrt) + msvcrt + kernel32 + ntdll) Modified: branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/wla… ============================================================================== --- branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -11,4 +11,6 @@ advapi32 rpcrt4 iphlpapi - msvcrt) + msvcrt + kernel32 + ntdll) Modified: branches/cmake-bringup/base/setup/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… ============================================================================== --- branches/cmake-bringup/base/setup/reactos/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/reactos/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -1,9 +1,7 @@ set_unicode() -add_executable(reactos - reactos.c - reactos.rc) +add_executable(reactos reactos.c reactos.rc) target_link_libraries(reactos uuid) @@ -13,4 +11,6 @@ user32 comctl32 setupapi - msvcrt) + msvcrt + kernel32 + ntdll) Modified: branches/cmake-bringup/base/setup/setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/setup/… ============================================================================== --- branches/cmake-bringup/base/setup/setup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/setup/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -1,9 +1,7 @@ set_unicode() -add_executable(setup - setup.c - setup.rc) +add_executable(setup setup.c setup.rc) set_module_type(setup win32gui) -add_importlibs(setup userenv msvcrt) +add_importlibs(setup userenv msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup… ============================================================================== --- branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) -add_executable(usetup WIN32 +add_executable(usetup interface/usetup.c interface/devinst.c interface/consup.c @@ -38,5 +38,4 @@ mingw_common) set_module_type(usetup nativecui) - -add_dependencies(usetup psdk buildno_header) +add_importlibs(usetup kernel32 ntdll) Modified: branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwins… ============================================================================== --- branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -1,9 +1,7 @@ set_unicode() -add_executable(vmwinst - vmwinst.c - vmwinst.rc) +add_executable(vmwinst vmwinst.c vmwinst.rc) target_link_libraries(vmwinst pseh) @@ -16,4 +14,6 @@ user32 setupapi shell32 - msvcrt) + msvcrt + kernel32 + ntdll) Modified: branches/cmake-bringup/base/setup/welcome/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/welcom… ============================================================================== --- branches/cmake-bringup/base/setup/welcome/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/welcome/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -1,9 +1,7 @@ set_unicode() -add_executable(welcome - welcome.c - welcome.rc) +add_executable(welcome welcome.c welcome.rc) set_module_type(welcome win32gui) -add_importlibs(welcome gdi32 user32 msvcrt) +add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -20,9 +20,9 @@ target_link_libraries(explorer_new uuid) -add_pch(explorer_new ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) +add_pch(explorer_new ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) set_module_type(explorer_new win32gui) -add_importlibs(explorer_new +add_importlibs(explorer_new advapi32 gdi32 user32 @@ -31,4 +31,6 @@ oleaut32 shell32 shlwapi - msvcrt) + msvcrt + kernel32 + ntdll) Modified: branches/cmake-bringup/base/system/autochk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/autoc… ============================================================================== --- branches/cmake-bringup/base/system/autochk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/autochk/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -4,3 +4,4 @@ set_module_type(autochk nativecui) target_link_libraries(autochk mingw_common nt) +add_importlibs(autochk kernel32 ntdll) Modified: branches/cmake-bringup/base/system/bootok/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/booto… ============================================================================== --- branches/cmake-bringup/base/system/bootok/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/bootok/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -5,4 +5,4 @@ set_module_type(bootok win32cui) -add_importlibs(bootok advapi32 msvcrt) +add_importlibs(bootok advapi32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/expand/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/expan… ============================================================================== --- branches/cmake-bringup/base/system/expand/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/expand/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -5,4 +5,4 @@ set_module_type(expand win32cui) -add_importlibs(expand lz32 setupapi user32 msvcrt) +add_importlibs(expand lz32 setupapi user32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/format/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/forma… ============================================================================== --- branches/cmake-bringup/base/system/format/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/format/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -6,4 +6,4 @@ set_module_type(format win32cui) -add_importlibs(format ntdll user32 fmifs msvcrt) +add_importlibs(format ntdll user32 fmifs msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/lsass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/lsass… ============================================================================== --- branches/cmake-bringup/base/system/lsass/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/lsass/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -7,4 +7,4 @@ set_module_type(lsass win32gui) -add_importlibs(lsass advapi32 lsasrv msvcrt) +add_importlibs(lsass advapi32 lsasrv msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/msiexec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/msiex… ============================================================================== --- branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -9,5 +9,7 @@ set_module_type(msiexec win32gui) -add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt) target_link_libraries(msiexec uuid wine) + +add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll) + Modified: branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/regsv… ============================================================================== --- branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -7,4 +7,4 @@ set_module_type(regsvr32 win32gui) -add_importlibs(regsvr32 user32 shell32 ole32 msvcrt) +add_importlibs(regsvr32 user32 shell32 ole32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/rundll32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/rundl… ============================================================================== --- branches/cmake-bringup/base/system/rundll32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/rundll32/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -7,4 +7,4 @@ set_module_type(rundll32 win32gui) -add_importlibs(rundll32 user32 msvcrt) +add_importlibs(rundll32 user32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/runonce/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/runon… ============================================================================== --- branches/cmake-bringup/base/system/runonce/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/runonce/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -5,4 +5,4 @@ set_module_type(runonce win32gui) -add_importlibs(runonce advapi32 user32 msvcrt) +add_importlibs(runonce advapi32 user32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi… ============================================================================== --- branches/cmake-bringup/base/system/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/services/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -22,5 +22,5 @@ set_module_type(services win32cui) -add_importlibs(services user32 advapi32 rpcrt4 msvcrt) +add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/smss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/smss/… ============================================================================== --- branches/cmake-bringup/base/system/smss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/smss/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -24,8 +24,9 @@ add_executable(smss WIN32 ${CMAKE_CURRENT_BINARY_DIR}/smss_smss.h.gch ${SOURCE}) +target_link_libraries(smss mingw_common nt smlib) + add_pch(smss ${CMAKE_CURRENT_SOURCE_DIR}/smss.h ${SOURCE}) set_module_type(smss nativecui) add_importlibs(smss ntdll) -target_link_libraries(smss mingw_common nt smlib) Modified: branches/cmake-bringup/base/system/userinit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/useri… ============================================================================== --- branches/cmake-bringup/base/system/userinit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/userinit/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -5,7 +5,8 @@ add_executable(userinit userinit.c userinit.rc) +target_link_libraries(userinit wine) + set_module_type(userinit win32gui) -add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt) -target_link_libraries(userinit wine) +add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/system/winlogon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/winlo… ============================================================================== --- branches/cmake-bringup/base/system/winlogon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/winlogon/CMakeLists.txt [iso-8859-1] Fri Oct 8 23:06:11 2010 @@ -10,9 +10,10 @@ add_executable(winlogon ${CMAKE_CURRENT_BINARY_DIR}/winlogon_winlogon.h.gch ${SOURCE}) +target_link_libraries(winlogon wine) + add_pch(winlogon ${CMAKE_CURRENT_SOURCE_DIR}/winlogon.h ${SOURCE}) set_module_type(winlogon win32gui) -add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt) -target_link_libraries(winlogon wine) +add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt kernel32 ntdll)

1 0

[akhaldi] 49061: [CMAKE] - More work on the base modules. - Fix a typo. - Fix shlwapi and audio_test builds.
by akhaldi＠svn.reactos.org 08 Oct '10

08 Oct '10

Author: akhaldi Date: Fri Oct 8 22:26:41 2010 New Revision: 49061 URL: http://svn.reactos.org/svn/reactos?rev=49061&view=rev Log: [CMAKE] - More work on the base modules. - Fix a typo. - Fix shlwapi and audio_test builds. Modified: branches/cmake-bringup/base/applications/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/dxdiag/CMakeLists.txt branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt branches/cmake-bringup/base/applications/fontview/CMakeLists.txt branches/cmake-bringup/base/applications/games/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/applications/kbswitch/CMakeLists.txt branches/cmake-bringup/base/applications/logoff/CMakeLists.txt branches/cmake-bringup/base/applications/magnify/CMakeLists.txt branches/cmake-bringup/base/applications/mmc/CMakeLists.txt branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt branches/cmake-bringup/base/applications/network/CMakeLists.txt branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt branches/cmake-bringup/base/applications/network/net/CMakeLists.txt branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt branches/cmake-bringup/base/applications/network/route/CMakeLists.txt branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt branches/cmake-bringup/base/applications/paint/CMakeLists.txt branches/cmake-bringup/base/applications/regedit/CMakeLists.txt branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt branches/cmake-bringup/base/applications/sc/CMakeLists.txt branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt branches/cmake-bringup/base/applications/winver/CMakeLists.txt branches/cmake-bringup/base/applications/write/CMakeLists.txt branches/cmake-bringup/base/shell/CMakeLists.txt branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -27,7 +27,7 @@ add_subdirectory(sc) #add_subdirectory(screensavers) add_subdirectory(shutdown) -add_subdirectory(sndrec32) +#add_subdirectory(sndrec32) add_subdirectory(sndvol32) add_subdirectory(taskmgr) add_subdirectory(winhlp32) 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] Fri Oct 8 22:26:41 2010 @@ -2,4 +2,4 @@ add_executable(dbgprint dbgprint.c) set_module_type(dbgprint win32cui) -add_importlibs(dbgprint msvcrt) +add_importlibs(dbgprint msvcrt kernel32) 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] Fri Oct 8 22:26:41 2010 @@ -4,4 +4,4 @@ add_executable(doskey doskey.c doskey.rc) set_module_type(doskey win32cui) -add_importlibs(doskey user32 msvcrt) +add_importlibs(doskey user32 msvcrt kernel32) 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] Fri Oct 8 22:26:41 2010 @@ -2,4 +2,4 @@ add_executable(find find.c find.rc) set_module_type(find win32cui) -add_importlibs(find user32 msvcrt) +add_importlibs(find user32 msvcrt kernel32) 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] Fri Oct 8 22:26:41 2010 @@ -2,4 +2,4 @@ add_executable(hostname hostname.c hostname.rc) set_module_type(hostname win32cui) -add_importlibs(hostname msvcrt) +add_importlibs(hostname msvcrt kernel32) 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] Fri Oct 8 22:26:41 2010 @@ -4,4 +4,4 @@ add_executable(lodctr lodctr_main.c) set_module_type(lodctr win32cui) -add_importlibs(lodctr loadperf msvcrt) +add_importlibs(lodctr loadperf msvcrt kernel32) 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] Fri Oct 8 22:26:41 2010 @@ -2,4 +2,4 @@ add_executable(more more.c more.rc) set_module_type(more win32cui) -add_importlibs(more user32 msvcrt) +add_importlibs(more user32 msvcrt kernel32) 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] Fri Oct 8 22:26:41 2010 @@ -7,4 +7,4 @@ add_executable(reg reg.c rsrc.rc) set_module_type(reg win32cui) -add_importlibs(reg advapi32 user32 msvcrt) +add_importlibs(reg advapi32 user32 msvcrt kernel32) 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] Fri Oct 8 22:26:41 2010 @@ -6,4 +6,4 @@ target_link_libraries(xcopy wine) set_module_type(xcopy win32cui) -add_importlibs(xcopy shell32 user32 msvcrt) +add_importlibs(xcopy shell32 user32 msvcrt kernel32 ntdll) 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] Fri Oct 8 22:26:41 2010 @@ -4,4 +4,4 @@ add_executable(control control.c control.rc) set_module_type(control win32gui) -add_importlibs(control advapi32 shell32 msvcrt) +add_importlibs(control advapi32 shell32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -27,4 +27,4 @@ target_link_libraries(dxdiag dxguid) -add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt) +add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32) 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] Fri Oct 8 22:26:41 2010 @@ -6,4 +6,4 @@ target_link_libraries(extrac32 wine) set_module_type(extrac32 win32gui) -add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt) +add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt kernel32 ntdll) 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] Fri Oct 8 22:26:41 2010 @@ -5,4 +5,4 @@ fontview.rc) set_module_type(fontview win32gui) -add_importlibs(fontview gdi32 shell32 user32 msvcrt) +add_importlibs(fontview gdi32 shell32 user32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/games/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -1,4 +1,4 @@ -add_subdirectory(solitaire) +#add_subdirectory(solitaire) #add_subdirectory(spider) add_subdirectory(winemine) 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] Fri Oct 8 22:26:41 2010 @@ -11,4 +11,4 @@ rsrc.rc) set_module_type(winemine win32gui) -add_importlibs(winemine user32 gdi32 advapi32 shell32 msvcrt) +add_importlibs(winemine user32 gdi32 advapi32 shell32 msvcrt kernel32) 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] Fri Oct 8 22:26:41 2010 @@ -2,4 +2,4 @@ add_executable(hh main.c hh.rc) set_module_type(hh win32gui) -add_importlibs(hh gdi32 user32 msvcrt) +add_importlibs(hh gdi32 user32 msvcrt kernel32) 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] Fri Oct 8 22:26:41 2010 @@ -2,4 +2,4 @@ add_executable(iexplore main.c iexplore.rc) set_module_type(iexplore win32gui) -add_importlibs(iexplore shdocvw msvcrt) +add_importlibs(iexplore shdocvw msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -4,6 +4,6 @@ add_executable(kbswitch kbswitch.c kbswitch.rc) set_module_type(kbswitch win32gui) -add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt) +add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt kernel32) add_subdirectory(kbsdll) Modified: branches/cmake-bringup/base/applications/logoff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/logoff/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/logoff/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -10,4 +10,4 @@ set_module_type(logoff win32cui) -add_importlibs(logoff advapi32 user32 msvcrt) +add_importlibs(logoff advapi32 user32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/magnify/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/magnify/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/magnify/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -6,4 +6,4 @@ set_module_type(magnify win32gui) -add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt) +add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/mmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mmc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mmc/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -13,4 +13,4 @@ set_module_type(mmcclient win32gui) -add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt) +add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -5,4 +5,4 @@ set_module_type(mplay32 win32gui) -add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt) +add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -17,4 +17,4 @@ set_module_type(msconfig win32gui) -add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt) +add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -15,4 +15,4 @@ set_module_type(devmgmt win32gui) -add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt) +add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -5,4 +5,4 @@ set_module_type(eventvwr win32gui) -add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt) +add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -29,4 +29,4 @@ set_module_type(servman win32gui) -add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt) +add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -29,4 +29,4 @@ set_module_type(mstsc win32gui) -add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt) +add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -9,6 +9,6 @@ add_subdirectory(nslookup) add_subdirectory(ping) #add_subdirectory(route) -add_subdirectory(telnet) +#add_subdirectory(telnet) add_subdirectory(tracert) #add_subdirectory(whois) Modified: branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -3,4 +3,4 @@ set_module_type(arp win32cui) -add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt) +add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -7,4 +7,4 @@ target_link_libraries(dwnl uuid) -add_importlibs(dwnl urlmon wininet uuid msvcrt) +add_importlibs(dwnl urlmon wininet msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -9,4 +9,4 @@ set_module_type(finger win32cui) -add_importlibs(finger ws2_32 msvcrt) +add_importlibs(finger ws2_32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -10,4 +10,4 @@ set_module_type(ftp win32cui) -add_importlibs(ftp ws2_32 iphlpapi msvcrt) +add_importlibs(ftp ws2_32 iphlpapi msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -3,4 +3,4 @@ set_module_type(ipconfig win32cui) -add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt) +add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/net/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/net/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -12,4 +12,4 @@ set_module_type(net win32cui) -add_importlibs(net ws2_32 msvcrt) +add_importlibs(net ws2_32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -3,4 +3,4 @@ set_module_type(netstat win32cui) -add_importlibs(netstat user32 ws2_32 snmpapi iphlpapi msvcrt) +add_importlibs(netstat user32 ws2_32 snmpapi iphlpapi msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -6,4 +6,4 @@ set_module_type(nslookup win32cui) -add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt) +add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -4,4 +4,4 @@ set_module_type(ping win32cui) -add_importlibs(ping ws2_32 msvcrt) +add_importlibs(ping ws2_32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/route/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/route/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/route/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -4,4 +4,4 @@ add_executable(route route.c route.rc) set_module_type(route win32cui) -add_importlibs(route ws2_32 iphlpapi msvcrt) +add_importlibs(route ws2_32 iphlpapi msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -26,4 +26,4 @@ set_module_type(telnet win32cui) -add_importlibs(telnet ws2_32 user32 msvcrt) +add_importlibs(telnet ws2_32 user32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -4,4 +4,4 @@ set_module_type(tracert win32cui) -add_importlibs(tracert ws2_32 msvcrt) +add_importlibs(tracert ws2_32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -3,4 +3,4 @@ set_module_type(whois win32cui) -add_importlibs(whois ws2_32 msvcrt) +add_importlibs(whois ws2_32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/paint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/paint/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/paint/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -18,4 +18,4 @@ set_module_type(paint win32gui) -add_importlibs(paint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt) +add_importlibs(paint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/regedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/regedit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/regedit/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -26,6 +26,6 @@ target_link_libraries(regedit uuid) -add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt) +add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt kernel32) #add_subdirectory(clb) Modified: branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -5,4 +5,4 @@ set_module_type(regedt32 win32gui) -add_importlibs(regedt32 shell32 shlwapi msvcrt) +add_importlibs(regedt32 shell32 shlwapi msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/sc/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -19,4 +19,4 @@ set_module_type(sc win32cui) -add_importlibs(sc advapi32 msvcrt) +add_importlibs(sc advapi32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -10,4 +10,4 @@ set_module_type(shutdown win32cui) -add_importlibs(shutdown advapi32 user32 msvcrt) +add_importlibs(shutdown advapi32 user32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -13,4 +13,4 @@ set_module_type(sndvol32 win32gui) -add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt) +add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -28,4 +28,4 @@ set_module_type(taskmgr win32gui) -add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt) +add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -18,4 +18,4 @@ target_link_libraries(winhlp32 wine) -add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt) +add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/winver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/winver/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/winver/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -5,4 +5,4 @@ set_module_type(winver win32gui) -add_importlibs(winver shell32 msvcrt) +add_importlibs(winver shell32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/write/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/write/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/write/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -5,4 +5,4 @@ set_module_type(write win32gui) -add_importlibs(write user32 gdi32 msvcrt) +add_importlibs(write user32 gdi32 msvcrt kernel32) Modified: branches/cmake-bringup/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/CMakeL… ============================================================================== --- branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -1,4 +1,4 @@ add_subdirectory(cmd) -add_subdirectory(explorer) +#add_subdirectory(explorer) add_subdirectory(explorer-new) Modified: branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olecli3… ============================================================================== --- branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -12,5 +12,5 @@ ${CMAKE_CURRENT_BINARY_DIR}/olecli32.def wine) -add_importlibs(oleacc ole32 gdi32 kernel32 ntdll) +add_importlibs(olecli32 ole32 gdi32 kernel32 ntdll) add_dependencies(olecli32 olecli32_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -43,6 +43,9 @@ mlang urlmon winmm - version) + version + shell32 + kernel32 + ntdll) add_dependencies(shlwapi shlwapi_def) Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt [iso-8859-1] Fri Oct 8 22:26:41 2010 @@ -1,18 +1,17 @@ add_definitions(-DPC_NO_IMPORTS) -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/3rdparty/libsamplerate) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound + ${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud + ${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) add_executable(audio_test audio_test.c) set_module_type(audio_test win32cui) target_link_libraries(audio_test - libsamplerate - mingw_main - mingw_common) + libsamplerate) -add_importlibs(audio_test setupapi ksuser msvcrt) -add_dependencies(audio_test psdk bugcodes) +add_importlibs(audio_test setupapi ksuser msvcrt kernel32) +add_dependencies(audio_test bugcodes)

1 0

[akhaldi] 49060: [CMAKE] - More work on the dlls.
by akhaldi＠svn.reactos.org 08 Oct '10

08 Oct '10

Author: akhaldi Date: Fri Oct 8 21:34:25 2010 New Revision: 49060 URL: http://svn.reactos.org/svn/reactos?rev=49060&view=rev Log: [CMAKE] - More work on the dlls. Modified: branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt branches/cmake-bringup/dll/win32/sti/CMakeLists.txt branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt branches/cmake-bringup/dll/win32/url/CMakeLists.txt branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt branches/cmake-bringup/dll/win32/user32/CMakeLists.txt branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt branches/cmake-bringup/dll/win32/wing32/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 Modified: branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/slbcsp/… ============================================================================== --- branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,19 +1,16 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__) spec2def(slbcsp ${CMAKE_CURRENT_SOURCE_DIR}/slbcsp.spec ${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def) add_library(slbcsp SHARED main.c) -set_target_properties(slbcsp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(slbcsp win32dll) target_link_libraries(slbcsp ${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def - wine - mingw_common) + wine) -add_dependencies(slbcsp slbcsp_def psdk) +add_importlibs(slbcsp kernel32 ntdll) +add_dependencies(slbcsp slbcsp_def) Modified: branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/C… ============================================================================== --- branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,5 +1,3 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) @@ -12,7 +10,7 @@ target_link_libraries(smdll ${CMAKE_CURRENT_BINARY_DIR}/smdll.def - smlib - -lntdll) + smlib) -add_dependencies(smdll smdll_def psdk) +add_importlibs(smdll ntdll) +add_dependencies(smdll smdll_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sndblst… ============================================================================== --- branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,25 +1,19 @@ +set_unicode() - +add_definitions(-DDEBUG_NT4) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) - -add_definitions(-DUNICODE -D_UNICODE) -add_definitions(-DDEBUG_NT4) spec2def(sndblst ${CMAKE_CURRENT_SOURCE_DIR}/sndblst.spec ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def) add_library(sndblst SHARED sndblst.c) -set_target_properties(sndblst PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(sndblst win32dll) target_link_libraries(sndblst ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def mment4 - mmebuddy - -luser32 - -lwinmm - -ladvapi32 - -lkernel32 - -lntdll) + mmebuddy) -add_dependencies(sndblst sndblst_def psdk) +add_importlibs(sndblst user32 winmm advapi32 kernel32 ntdll) +add_dependencies(sndblst sndblst_def) Modified: branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/snmpapi… ============================================================================== --- branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/snmpapi/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,9 +1,6 @@ - - - -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -12,11 +9,11 @@ add_library(snmpapi SHARED main.c snmpapi.rc) -set_target_properties(snmpapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(snmpapi win32dll) target_link_libraries(snmpapi ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def - wine - mingw_common) + wine) -add_dependencies(snmpapi snmpapi_def psdk) +add_importlibs(snmpapi kernel32 ntdll) +add_dependencies(snmpapi snmpapi_def) Modified: branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/spoolss… ============================================================================== --- branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,20 +1,16 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__) spec2def(spoolss ${CMAKE_CURRENT_SOURCE_DIR}/spoolss.spec ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def) add_library(spoolss SHARED spoolss_main.c router.c) -set_target_properties(spoolss PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(spoolss win32dll) target_link_libraries(spoolss ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def - wine - -lwinspool - mingw_common) + wine) -add_dependencies(spoolss spoolss_def psdk) +add_importlibs(spoolss winspool kernel32 ntdll) +add_dependencies(spoolss spoolss_def) Modified: branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/srclien… ============================================================================== --- branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,15 +1,11 @@ - - spec2def(srclient ${CMAKE_CURRENT_SOURCE_DIR}/srclient.spec ${CMAKE_CURRENT_BINARY_DIR}/srclient.def) add_library(srclient SHARED srclient_main.c) -set_target_properties(srclient PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(srclient 0) -target_link_libraries(srclient - ${CMAKE_CURRENT_BINARY_DIR}/srclient.def - -lkernel32 - -lntdll) +target_link_libraries(srclient ${CMAKE_CURRENT_BINARY_DIR}/srclient.def) +add_importlibs(srclient kernel32 ntdll) add_dependencies(srclient srclient_def psdk) Modified: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,10 +1,12 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-D__WINESRC__) -add_definitions(-DENTRY_PREFIX=STI_) -add_definitions(-DPROXY_DELEGATION) -add_definitions(-DREGISTER_PROXY_DLL) + +add_definitions( + -D__WINESRC__ + -DENTRY_PREFIX=STI_ + -DPROXY_DELEGATION + -DREGISTER_PROXY_DLL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -13,8 +15,7 @@ add_library(sti SHARED regsvr.c sti.c - sti_main.c - sti_wia.idl)# not sure + sti_main.c) set_entrypoint(sti 0) Modified: branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sxs/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,19 +1,16 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__) spec2def(sxs ${CMAKE_CURRENT_SOURCE_DIR}/sxs.spec ${CMAKE_CURRENT_BINARY_DIR}/sxs.def) add_library(sxs SHARED sxs.c) -set_target_properties(sxs PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(sxs 0) target_link_libraries(sxs ${CMAKE_CURRENT_BINARY_DIR}/sxs.def - wine - mingw_common) + wine) +add_importlibs(sxs kernel32 ntdll) add_dependencies(sxs sxs_def psdk) Modified: branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/t2embed… ============================================================================== --- branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/t2embed/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,23 +1,18 @@ - +set_unicode() include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -add_definitions(-DUNICODE -D_UNICODE) spec2def(t2embed ${CMAKE_CURRENT_SOURCE_DIR}/t2embed.spec ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def) add_library(t2embed SHARED t2embed.c t2embed.rc) -set_target_properties(t2embed PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(t2embed win32dll) target_link_libraries(t2embed ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def - wine - -lgdi32 - -luser32 - -ladvapi32 - -lversion - mingw_common) + wine) -add_dependencies(t2embed t2embed_def psdk) +add_importlibs(t2embed gdi32 user32 advapi32 version kernel32 ntdll) + +add_dependencies(t2embed t2embed_def) Modified: branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapi32/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,8 +1,5 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__) spec2def(tapi32 ${CMAKE_CURRENT_SOURCE_DIR}/tapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def) @@ -13,12 +10,11 @@ line.c phone.c) -set_target_properties(tapi32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(tapi32 0) target_link_libraries(tapi32 ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def - wine - -ladvapi32 - mingw_common) + wine) -add_dependencies(tapi32 tapi32_def psdk) +add_importlibs(tapi32 advapi32 kernel32 ntdll) +add_dependencies(tapi32 tapi32_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,8 +1,4 @@ - -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_library(tapiui SHARED tapiui.rc) - -set_target_properties(tapiui PROPERTIES LINK_FLAGS "-Wl,-entry,0") - -add_dependencies(tapiui psdk) +set_entrypoint(tapiui 0) +add_dependencies(tapiui psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/traffic… ============================================================================== --- branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/traffic/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,19 +1,16 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__) spec2def(traffic ${CMAKE_CURRENT_SOURCE_DIR}/traffic.spec ${CMAKE_CURRENT_BINARY_DIR}/traffic.def) add_library(traffic SHARED traffic_main.c) -set_target_properties(traffic PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(traffic win32dll) target_link_libraries(traffic ${CMAKE_CURRENT_BINARY_DIR}/traffic.def - wine - mingw_common) + wine) -add_dependencies(traffic traffic_def psdk) +add_importlibs(traffic kernel32 ntdll) +add_dependencies(traffic traffic_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/updspap… ============================================================================== --- branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,20 +1,16 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__) spec2def(updspapi ${CMAKE_CURRENT_SOURCE_DIR}/updspapi.spec ${CMAKE_CURRENT_BINARY_DIR}/updspapi.def) add_library(updspapi SHARED main.c) -set_target_properties(updspapi PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(updspapi 0) target_link_libraries(updspapi ${CMAKE_CURRENT_BINARY_DIR}/updspapi.def - wine - -lsetupapi - mingw_common) + wine) -add_dependencies(updspapi updspapi_def psdk) +add_importlibs(updspapi setupapi kernel32 ntdll) +add_dependencies(updspapi updspapi_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/url/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/url/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/url/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/url/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,21 +1,16 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__) spec2def(url ${CMAKE_CURRENT_SOURCE_DIR}/url.spec ${CMAKE_CURRENT_BINARY_DIR}/url.def) add_library(url SHARED url_main.c) -set_target_properties(url PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(url win32dll) target_link_libraries(url ${CMAKE_CURRENT_BINARY_DIR}/url.def - wine - -lshell32 - -lshlwapi - mingw_common) + wine) -add_dependencies(url url_def psdk) +add_importlibs(url shell32 shlwapi kernel32 ntdll) +add_dependencies(url url_def) Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/… ============================================================================== --- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,5 +1,6 @@ add_definitions(-D__WINESRC__) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,17 +1,16 @@ +set_unicode() - -add_definitions(-DUNICODE -D_UNICODE) add_definitions(-D_DLL -D__USE_CRTIMP) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) -include_directories(include) +include_directories( + BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + include) set_rc_compiler() list(APPEND SOURCE - user32_stubs.c controls/button.c controls/combo.c controls/edit.c @@ -62,25 +61,21 @@ windows/spy.c windows/text.c windows/window.c - windows/winpos.c) + windows/winpos.c + user32_stubs.c + user32.rc) add_library(user32 SHARED - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/user32.rc - ${CMAKE_CURRENT_BINARY_DIR}/user32_user32.h.gch) + ${CMAKE_CURRENT_BINARY_DIR}/user32_user32.h.gch + ${SOURCE}) -set_target_properties(user32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(user32 win32dll) target_link_libraries(user32 ${CMAKE_CURRENT_SOURCE_DIR}/user32.def wine - -lgdi32 - -ladvapi32 - -limm32 win32ksys - pseh - -lkernel32 - -lntdll) + pseh) add_pch(user32 ${CMAKE_CURRENT_SOURCE_DIR}/include/user32.h ${SOURCE}) -add_dependencies(user32 psdk) +add_importlibs(user32 gdi32 advapi32 imm32 kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/usp10/C… ============================================================================== --- branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,8 +1,5 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__) spec2def(usp10 ${CMAKE_CURRENT_SOURCE_DIR}/usp10.spec ${CMAKE_CURRENT_BINARY_DIR}/usp10.def) @@ -14,12 +11,11 @@ shape.c shaping.c) -set_target_properties(usp10 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(usp10 win32dll) target_link_libraries(usp10 ${CMAKE_CURRENT_BINARY_DIR}/usp10.def - wine - -lgdi32 - mingw_common) + wine) -add_dependencies(usp10 usp10_def psdk) +add_importlibs(usp10 gdi32 kernel32 ntdll) +add_dependencies(usp10 usp10_def) Modified: branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uxtheme… ============================================================================== --- branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,8 +1,5 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__WINESRC__) spec2def(uxtheme ${CMAKE_CURRENT_SOURCE_DIR}/uxtheme.spec ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def) @@ -19,15 +16,11 @@ uxini.c version.rc) -set_target_properties(uxtheme PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(uxtheme win32dll) target_link_libraries(uxtheme ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def - wine - -luser32 - -ladvapi32 - -lgdi32 - -lmsimg32 - mingw_common) + wine) -add_dependencies(uxtheme uxtheme_def psdk) +add_importlibs(uxtheme user32 advapi32 gdi32 msimg32 kernel32 ntdll) +add_dependencies(uxtheme uxtheme_def) 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] Fri Oct 8 21:34:25 2010 @@ -41,4 +41,4 @@ wine) add_importlibs(windowscodecs uuid ole32 shlwapi advapi32 msvcrt kernel32 ntdll) -add_dependencies(windowscodecs windowscodecs_def psdk) +add_dependencies(windowscodecs windowscodecs_def) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -14,7 +14,8 @@ add_library(winemp3.acm SHARED mpegl3.c) -set_target_properties(winemp3.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") +set_entrypoint(winemp3.acm 0) +set_target_properties(winemp3.acm PROPERTIES SUFFIX "") target_link_libraries(winemp3.acm ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -3,7 +3,7 @@ add_library(winfax SHARED winfax.c winfax.rc) -set_target_properties(winfax PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(winfax 0) target_link_libraries(winfax ${CMAKE_CURRENT_BINARY_DIR}/winfax.def) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] Fri Oct 8 21:34:25 2010 @@ -1,11 +1,11 @@ -add_definitions(-DUNICODE -D_UNICODE) +set_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") +set_entrypoint(wing32 0) target_link_libraries(wing32 ${CMAKE_CURRENT_BINARY_DIR}/wing32.def) 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] Fri Oct 8 21:34:25 2010 @@ -1,6 +1,5 @@ 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) @@ -21,4 +20,4 @@ wine) add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt kernel32 ntdll) -add_dependencies(winhttp winhttp_def psdk) +add_dependencies(winhttp winhttp_def) 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] Fri Oct 8 21:34:25 2010 @@ -33,4 +33,4 @@ pseh) add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll) -add_dependencies(wininet wininet_def psdk buildno_header) +add_dependencies(wininet wininet_def) 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] Fri Oct 8 21:34:25 2010 @@ -26,6 +26,6 @@ pseh) add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) -add_dependencies(winmm winmm_def psdk) +add_dependencies(winmm winmm_def) 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] Fri Oct 8 21:34:25 2010 @@ -1,5 +1,6 @@ -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(winspool ${CMAKE_CURRENT_SOURCE_DIR}/winspool.spec ${CMAKE_CURRENT_BINARY_DIR}/winspool.def) @@ -17,4 +18,4 @@ wine) add_importlibs(winspool advapi32 shlwapi kernel32 ntdll) -add_dependencies(winspool winspool_def psdk) +add_dependencies(winspool winspool_def) 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] Fri Oct 8 21:34:25 2010 @@ -23,4 +23,4 @@ add_importlibs(winsta kernel32 ntdll) add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE}) -add_dependencies(winsta winsta_def psdk) +add_dependencies(winsta winsta_def) 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] Fri Oct 8 21:34:25 2010 @@ -20,4 +20,4 @@ pseh) add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 ntdll) -add_dependencies(wintrust wintrust_def psdk buildno_header) +add_dependencies(wintrust wintrust_def) 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] Fri Oct 8 21:34:25 2010 @@ -5,7 +5,7 @@ add_library(wlanapi SHARED main.c) -set_target_properties(wlanapi PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(wlanapi 0) target_link_libraries(wlanapi ${CMAKE_CURRENT_BINARY_DIR}/wlanapi.def @@ -14,4 +14,4 @@ pseh) add_importlibs(wlanapi rpcrt4 kernel32 ntdll) -add_dependencies(wlanapi wlanapi_def psdk) +add_dependencies(wlanapi wlanapi_def psdk buildno_header) 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] Fri Oct 8 21:34:25 2010 @@ -34,4 +34,4 @@ wine) add_importlibs(wldap32 user32 kernel32 ntdll) -add_dependencies(wldap32 wldap32_def psdk) +add_dependencies(wldap32 wldap32_def) 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] Fri Oct 8 21:34:25 2010 @@ -1,5 +1,6 @@ -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() + add_definitions(-DLE) add_definitions(-DWINSOCK_API_LINKAGE=DECLSPEC_EXPORT) @@ -9,7 +10,6 @@ spec2def(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/ws2_32.spec ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def) list(APPEND SOURCE - ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_ws2_32.h.gch misc/bsd.c misc/catalog.c misc/dllmain.c @@ -32,4 +32,4 @@ 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) +add_dependencies(ws2_32 ws2_32_def) 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] Fri Oct 8 21:34:25 2010 @@ -52,4 +52,4 @@ wine) add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help kernel32 ntdll) -add_dependencies(ws2_32_new ws2_32_new_def psdk) +add_dependencies(ws2_32_new ws2_32_new_def) 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] Fri Oct 8 21:34:25 2010 @@ -14,4 +14,4 @@ target_link_libraries(ws2help ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def) add_importlibs(ws2help advapi32 ws2_32 kernel32 ntdll) -add_dependencies(ws2help ws2help_def psdk) +add_dependencies(ws2help ws2help_def) 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] Fri Oct 8 21:34:25 2010 @@ -9,4 +9,4 @@ target_link_libraries(wshirda ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def) add_importlibs(wshirda ws2_32 kernel32 ntdll) -add_dependencies(wshirda wshirda_def psdk) +add_dependencies(wshirda wshirda_def) 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] Fri Oct 8 21:34:25 2010 @@ -7,11 +7,11 @@ add_library(wshtcpip SHARED wshtcpip.c wshtcpip.rc) -set_target_properties(wshtcpip PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(wshtcpip 0) target_link_libraries(wshtcpip ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def tdilib) -add_importlibs(wshtcpip kernel32 ws2_32 kernel32 ntdll) -add_dependencies(wshtcpip wshtcpip_def psdk) +add_importlibs(wshtcpip ws2_32 kernel32 ntdll) +add_dependencies(wshtcpip wshtcpip_def psdk buildno_header) 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] Fri Oct 8 21:34:25 2010 @@ -7,4 +7,3 @@ target_link_libraries(wsock32 ${CMAKE_CURRENT_SOURCE_DIR}/wsock32.def) 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] Fri Oct 8 21:34:25 2010 @@ -13,4 +13,4 @@ wine) add_importlibs(wtsapi32 advapi32 kernel32 ntdll) -add_dependencies(wtsapi32 wtsapi32_def psdk) +add_dependencies(wtsapi32 wtsapi32_def) 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] Fri Oct 8 21:34:25 2010 @@ -21,7 +21,8 @@ target_link_libraries(wuapi ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def - wine) + wine + uuid) -add_importlibs(wuapi uuid ole32 advapi32 kernel32 ntdll) +add_importlibs(wuapi ole32 advapi32 kernel32 ntdll) add_dependencies(wuapi wuapi_def) 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] Fri Oct 8 21:34:25 2010 @@ -6,8 +6,8 @@ add_library(xinput1_1 SHARED xinput1_1_main.c version.rc) +set_module_type(xinput1_1 win32dll) + +target_link_libraries(xinput1_1 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def) 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 buildno_header) +add_dependencies(xinput1_1 xinput1_1_def) 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] Fri Oct 8 21:34:25 2010 @@ -10,4 +10,4 @@ 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 buildno_header) +add_dependencies(xinput1_2 xinput1_2_def) 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] Fri Oct 8 21:34:25 2010 @@ -14,4 +14,4 @@ add_importlibs(xinput1_3 msvcrt kernel32 ntdll) -add_dependencies(xinput1_3 xinput1_3_def psdk buildno_header) +add_dependencies(xinput1_3 xinput1_3_def) 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] Fri Oct 8 21:34:25 2010 @@ -10,4 +10,4 @@ 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 buildno_header) +add_dependencies(xinput9_1_0 xinput9_1_0_def) 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] Fri Oct 8 21:34:25 2010 @@ -14,4 +14,4 @@ add_importlibs(xmllite kernel32 ntdll) -add_dependencies(xmllite xmllite_def psdk buildno_header) +add_dependencies(xmllite xmllite_def)

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