mirror of
https://github.com/reactos/reactos.git
synced 2025-02-24 09:25:10 +00:00
86ab907e82
This squashed commit ports back almost all improvements we did to explorer during 0.4.8-dev. Main motivation is: -fixing tons of bugs painting the systray icons, e.g. (but not exclusively) CORE-11378 -and to fix a regression about clock margins CORE-14272 -and the clocks vertical text placement -Win+E behavior CORE-14199 Here is a list of the commits I ported back: [PSDK] shellapi.h 0.4.8-dev-1053-g8b78b0ff980.4.8-dev-982-ga64c33e7870.4.8-dev-970-g9d2139b7d8[SHELL32]/[REACTOS]/[EXPLORER] 0.4.8-dev-984-g131678a0250.4.8-dev-971-g5ecabcce59[EXPLORER] 0.4.8-dev-1065-gf1535c2d6etiny part of CORE-14306 0.4.8-dev-1064-gabdde0b7640.4.8-dev-1054-g3003471e640.4.8-dev-974-g04498f3eb50.4.8-dev-944-gf5d679aeb9fixes CORE-14272 Clock Margins 0.4.8-dev-936-g556c485c8b0.4.8-dev-935-gd11e7af5f20.4.8-dev-934-gc109dc9f240.4.8-dev-928-g22d1e1017f0.4.8-dev-925-gc54c5ebb5f0.4.8-dev-924-g488477d10d0.4.8-dev-923-g85d7dd4f830.4.8-dev-922-g5a1984c9980.4.8-dev-921-g6c073e95390.4.8-dev-920-g455bce68b50.4.8-dev-908-g7f35908ad20.4.8-dev-860-g3d75cc08140.4.8-dev-853-g5ec441a8670.4.8-dev-852-gbc43733e480.4.8-dev-851-gbbca71c4a5[EXPLORER]&[ROSCTRLS] 0.4.8-dev-789-gcb8cc0d0980.4.8-dev-788-gbe2bf9b8c50.4.8-dev-787-g851e0ca5a80.4.8-dev-786-g2abd0683980.4.8-dev-785-g8c91a00fcf0.4.8-dev-784-g6c9629bb720.4.8-dev-783-gd66c6890f70.4.8-dev-691-g2c8ed376050.4.8-dev-690-g74e58d938e0.4.8-dev-669-g4b6d929be1fixes CORE-14199 0.4.8-dev-46-g2ed535da8a0.4.8-dev-21-g82b12ef4cf0.4.8-dev-20-g4238f22396For now I intentionally did leave out 0.4.8-dev-684-g71e66c69c1to not make explorer import oleaut32 SysAllocString()/SysFreeString(). I also did not update the translations rc files.
37 lines
973 B
CMake
37 lines
973 B
CMake
PROJECT(SHELL)
|
|
|
|
set_cpp(WITH_RUNTIME)
|
|
add_definitions(-D_ATL_NO_EXCEPTIONS)
|
|
include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)
|
|
|
|
list(APPEND SOURCE
|
|
desktop.cpp
|
|
explorer.cpp
|
|
notifyiconscust.cpp
|
|
rshell.cpp
|
|
settings.cpp
|
|
shellservice.cpp
|
|
startctxmnu.cpp
|
|
startmnu.cpp
|
|
startmnucust.cpp
|
|
startmnusite.cpp
|
|
startup.cpp
|
|
syspager.cpp
|
|
taskband.cpp
|
|
taskswnd.cpp
|
|
tbsite.cpp
|
|
trayclock.cpp
|
|
trayntfy.cpp
|
|
trayprop.cpp
|
|
traywnd.cpp
|
|
util.cpp
|
|
precomp.h)
|
|
|
|
file(GLOB explorer_rc_deps res/*.*)
|
|
add_rc_deps(explorer.rc ${explorer_rc_deps})
|
|
add_executable(explorer ${SOURCE} explorer.rc)
|
|
target_link_libraries(explorer uuid atlnew wine)
|
|
set_module_type(explorer win32gui UNICODE)
|
|
add_importlibs(explorer advapi32 gdi32 user32 comctl32 ole32 oleaut32 shell32 browseui shlwapi shdocvw version uxtheme msvcrt kernel32 ntdll)
|
|
add_pch(explorer precomp.h SOURCE)
|
|
add_cd_file(TARGET explorer DESTINATION reactos FOR all)
|