Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity
reactos/win32ss/user/winsrv/consrv.cmake

64 lines
1.8 KiB
CMake
Raw Normal View History

[CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. svn path=/trunk/; revision=59461
2013-07-13 04:54:49 +00:00
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
[CONSRV] - Introduce a "console configuration" library that is used by both CONSRV and the console properties applet so that they can share common code concerning getting/setting console registry properties. - Make use of the Windows-compatible (and undocumented) CONSOLE_STATE_INFO structure for that purpose (as well as the WM_SETCONSOLEINFO): see commits r63819 and r58415 and links within for more details. Note: this structure needs to be 4-byte packed (contrary to what it is said in almost all the links from above. The difference is only visible at the level of the last member that is the ConsoleTitle string array. This was tested on windows). - Simplify some parts of console settings initialization. - Some work is still needed concerning how to correctly retrieve the default console settings (without touching the ConsoleTitle member of CONSOLE_STATE_INFO, contrary to what we do currently). [CONSOLE.DLL] - Make the console properties applet windows-compatible, in the sense that you can now run it on win2k3 and use it instead of the windows one. This implies having the same strange hacks as windows' one, namely, that the window handle parameter of the CPlApplet entry point is either used as the caller (parent) window handle, OR, as a shared section handle to shared data with CONSRV. [KERNEL32] - Rework the console applet initialization accordingly. Also we reload each time the console.dll when opening the console applet, and then unload it: this "allows" to reset all the global variables that console.dll may (and does) have. svn path=/trunk/; revision=66867
2015-03-24 23:58:44 +00:00
include_directories(
concfg
consrv)
[CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. svn path=/trunk/; revision=59461
2013-07-13 04:54:49 +00:00
list(APPEND CONSRV_SOURCE
consrv/alias.c
consrv/coninput.c
consrv/conoutput.c
consrv/console.c
consrv/frontendctl.c
consrv/handle.c
[CONSRV] Commit my work that I've done during my trip from Albi back to Paris (part 1/2): - QuickEdit and InsertMode are input modes that are related to CONSRV terminal(s), therefore remove them from CONDRV that needs to be agnostic about terminal specificities. - Separate history helper functions from the line discipline functions to different files. svn path=/branches/condrv_restructure/; revision=63978
2014-08-29 19:45:45 +00:00
consrv/history.c
[CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. svn path=/trunk/; revision=59461
2013-07-13 04:54:49 +00:00
consrv/init.c
consrv/lineinput.c
[CONSRV]: Start implementing popup windows (it's what you see when you press e.g. the F7 key in your console, when you run cmd.exe). svn path=/branches/condrv_restructure/; revision=63992
2014-08-30 16:20:32 +00:00
consrv/popup.c
[CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. svn path=/trunk/; revision=59461
2013-07-13 04:54:49 +00:00
consrv/settings.c
[WINSRV]: Pave the way for proper ReactOS shutdown. Part 1/X CORE-8322 svn path=/trunk/; revision=65463
2014-11-23 15:50:49 +00:00
consrv/shutdown.c
[CONSRV]: Stubplement the remaining APIs needed for Windows kernel32. svn path=/trunk/; revision=59907
2013-08-30 17:53:45 +00:00
consrv/subsysreg.c
[CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. svn path=/trunk/; revision=59461
2013-07-13 04:54:49 +00:00
consrv/condrv/coninput.c
consrv/condrv/conoutput.c
consrv/condrv/console.c
[CONSRV] - Move some functions where they belong. - Start to differentiate frontends for consrv terminal, and terminals. svn path=/branches/condrv_restructure/; revision=63117
2014-05-02 18:44:26 +00:00
consrv/condrv/dummyterm.c
[CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. svn path=/trunk/; revision=59461
2013-07-13 04:54:49 +00:00
consrv/condrv/graphics.c
consrv/condrv/text.c
consrv/frontends/input.c
[CONSRV] - Move some functions where they belong. - Start to differentiate frontends for consrv terminal, and terminals. svn path=/branches/condrv_restructure/; revision=63117
2014-05-02 18:44:26 +00:00
consrv/frontends/terminal.c
[CONSRV] Preparation for Asian console support (#2171) Make preparation for console support of Chinese, Japanese and Korean (CJK) codepages. CORE-12451 - Add consrv/frontends/wcwidth.c. - Add GuiPaintTextModeBufferCJK function.
2019-12-25 14:35:01 +00:00
consrv/frontends/wcwidth.c
[CONSRV] Code reorganization: move console-window-class - related code into a file. svn path=/trunk/; revision=62740
2014-04-13 15:13:55 +00:00
consrv/frontends/gui/conwnd.c
Don't forget to add files to compilation, Arch! svn path=/trunk/; revision=60640
2013-10-13 14:15:36 +00:00
consrv/frontends/gui/fullscreen.c
[CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. svn path=/trunk/; revision=59461
2013-07-13 04:54:49 +00:00
consrv/frontends/gui/guiterm.c
consrv/frontends/gui/guisettings.c
consrv/frontends/gui/graphics.c
consrv/frontends/gui/text.c
consrv/frontends/tui/tuiterm.c
# consrv/consrv.rc
[CMAKE] * Make the minimum required version 2.8. * Remove redundant psdk dependencies. * Tidy up CMake files. svn path=/trunk/; revision=64795
2014-10-17 23:28:29 +00:00
consrv/consrv.h)
[CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. svn path=/trunk/; revision=59461
2013-07-13 04:54:49 +00:00
#
[CONSRV] Finally fix CONSOLE vs. CONSRV_CONSOLE/WINSRV_CONSOLE stuff. CORE-9496 What remains to be cleared up are the ugly casts.
2020-04-10 18:37:28 +00:00
# Explicitly enable MS extensions to be able to use unnamed (anonymous) nested structs.
[CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. svn path=/trunk/; revision=59461
2013-07-13 04:54:49 +00:00
#
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
if(MSVC)
## NOTE: No need to specify it as we use MSVC :)
[CMAKE] Replace custom functions to built-in ones add_target_compile_definitions -> target_compile_definitions add_target_compile_flags -> target_compile_options add_target_include_directories -> target_include_directories
2020-04-16 12:59:38 +00:00
##target_compile_options(consrv PRIVATE "/Ze")
[CMAKE] Use COMPILE_OPTIONS instead of superseded COMPILE_FLAGS for set_source_files_properties().
2024-06-03 15:52:29 +00:00
#set_source_files_properties(${CONSRV_SOURCE} PROPERTIES COMPILE_OPTIONS "/Ze")
[CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. svn path=/trunk/; revision=59461
2013-07-13 04:54:49 +00:00
else()
[CMAKE] Replace custom functions to built-in ones add_target_compile_definitions -> target_compile_definitions add_target_compile_flags -> target_compile_options add_target_include_directories -> target_include_directories
2020-04-16 12:59:38 +00:00
#target_compile_options(consrv PRIVATE "-fms-extensions")
[CMAKE] Use COMPILE_OPTIONS instead of superseded COMPILE_FLAGS for set_source_files_properties().
2024-06-03 15:52:29 +00:00
set_source_files_properties(${CONSRV_SOURCE} PROPERTIES COMPILE_OPTIONS "-fms-extensions")
[CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. svn path=/trunk/; revision=59461
2013-07-13 04:54:49 +00:00
endif()
add_library(consrv ${CONSRV_SOURCE})
[REACTOS] Explicitly link against pseh & include pseh headers in a few places
2021-04-22 15:28:52 +00:00
target_link_libraries(consrv pseh)
[CONSRV] * Add missing psdk dependency. CORE-8577 #resolve #comment Fixed in r64386. Thanks! svn path=/trunk/; revision=64386
2014-09-29 11:28:17 +00:00
add_dependencies(consrv psdk)
[WIN32SS] * Prepare the CMake scripts for PCH. CORE-7716 svn path=/trunk/; revision=62087
2014-02-09 22:52:01 +00:00
add_pch(consrv consrv/consrv.h CONSRV_SOURCE)
[CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. svn path=/trunk/; revision=59461
2013-07-13 04:54:49 +00:00
#add_object_library(consrv ${CONSRV_SOURCE})
[WINSRV] Delay-load psapi.dll Note that it is used only in debug builds in order to display the list of processes being terminated in the debug log.
2024-02-22 13:05:04 +00:00
#list(APPEND CONSRV_IMPORT_LIBS)
list(APPEND CONSRV_DELAY_IMPORT_LIBS shell32 ole32 psapi)
[CONSRV] - Introduce a "console configuration" library that is used by both CONSRV and the console properties applet so that they can share common code concerning getting/setting console registry properties. - Make use of the Windows-compatible (and undocumented) CONSOLE_STATE_INFO structure for that purpose (as well as the WM_SETCONSOLEINFO): see commits r63819 and r58415 and links within for more details. Note: this structure needs to be 4-byte packed (contrary to what it is said in almost all the links from above. The difference is only visible at the level of the last member that is the ConsoleTitle string array. This was tested on windows). - Simplify some parts of console settings initialization. - Some work is still needed concerning how to correctly retrieve the default console settings (without touching the ConsoleTitle member of CONSOLE_STATE_INFO, contrary to what we do currently). [CONSOLE.DLL] - Make the console properties applet windows-compatible, in the sense that you can now run it on win2k3 and use it instead of the windows one. This implies having the same strange hacks as windows' one, namely, that the window handle parameter of the CPlApplet entry point is either used as the caller (parent) window handle, OR, as a shared section handle to shared data with CONSRV. [KERNEL32] - Rework the console applet initialization accordingly. Also we reload each time the console.dll when opening the console applet, and then unload it: this "allows" to reset all the global variables that console.dll may (and does) have. svn path=/trunk/; revision=66867
2015-03-24 23:58:44 +00:00
list(APPEND CONSRV_TARGET_LINK_LIBS concfg uuid)
[CONSRV-WINSRV] Now that the console server works fine, move it into its real place (as in Windows), that is, inside winsrv.dll, instead of hosting it in consrv.dll. svn path=/trunk/; revision=59461
2013-07-13 04:54:49 +00:00
set_module_type(consrv module UNICODE)
Reference in a new issue Copy permalink