Skip to content

Commit 35b4a94

Browse files
committed
[CONSRV]
- Remove a useless declaration in conio.h and a useless import lib. - Move "condrv" part of the console server into "conlib" (console library): the functions that are there are quite general enough to implement a NT text+graphics console library (which is indeed used by the console server to implement the win32 consoles). See CORE-9496 for the details: the aim now would be to extract the pith and marrow out of this conlib to place it into a real "condrv" (console driver). svn path=/branches/condrv_restructure/; revision=67105
1 parent c2901b4 commit 35b4a94

File tree

8 files changed

+7
-11
lines changed

8 files changed

+7
-11
lines changed

win32ss/user/winsrv/consrv.cmake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ list(APPEND CONSRV_SOURCE
2020
consrv/settings.c
2121
consrv/shutdown.c
2222
consrv/subsysreg.c
23-
consrv/condrv/coninput.c
24-
consrv/condrv/conoutput.c
25-
consrv/condrv/console.c
26-
consrv/condrv/dummyterm.c
27-
consrv/condrv/graphics.c
28-
consrv/condrv/text.c
23+
consrv/conlib/coninput.c
24+
consrv/conlib/conoutput.c
25+
consrv/conlib/console.c
26+
consrv/conlib/dummyterm.c
27+
consrv/conlib/graphics.c
28+
consrv/conlib/text.c
2929
consrv/frontends/input.c
3030
consrv/frontends/terminal.c
3131
consrv/frontends/gui/conwnd.c
@@ -55,7 +55,7 @@ add_library(consrv ${CONSRV_SOURCE})
5555
add_dependencies(consrv psdk)
5656
add_pch(consrv consrv/consrv.h CONSRV_SOURCE)
5757
#add_object_library(consrv ${CONSRV_SOURCE})
58-
list(APPEND CONSRV_IMPORT_LIBS psapi)
58+
#list(APPEND CONSRV_IMPORT_LIBS )
5959
list(APPEND CONSRV_DELAY_IMPORT_LIBS ole32)
6060
list(APPEND CONSRV_TARGET_LINK_LIBS concfg uuid)
6161
set_module_type(consrv module UNICODE)

win32ss/user/winsrv/consrv/include/conio.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,10 +354,6 @@ ConDrvPause(PCONSOLE Console);
354354
VOID NTAPI
355355
ConDrvUnpause(PCONSOLE Console);
356356

357-
NTSTATUS
358-
ConSrvConsoleCtrlEvent(IN ULONG CtrlEvent,
359-
IN PCONSOLE_PROCESS_DATA ProcessData);
360-
361357

362358
#define GetConsoleInputBufferMode(Console) \
363359
(Console)->InputBuffer.Mode

0 commit comments

Comments
 (0)