From b507bd061267795df23eb8da0d8ce305879189ed Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 25 Oct 2012 20:40:41 +0000 Subject: [PATCH] [CSR/BASESRV/CONSRV/WINSRV] - Fix code headers. No code changes. - Rename csrcl.h to csr.h for readability purposes. - exitros.c --> shutdown.c svn path=/branches/ros-csrss/; revision=57618 --- dll/ntdll/include/ntdll.h | 2 +- dll/win32/kernel32/k32.h | 4 +-- include/reactos/subsys/csr/{csrcl.h => csr.h} | 13 +++++---- include/reactos/subsys/csr/csrmsg.h | 9 +++--- include/reactos/subsys/csr/csrsrv.h | 9 +++--- include/reactos/subsys/win/base.h | 15 ++++++---- include/reactos/subsys/win/basemsg.h | 18 ++++++++---- include/reactos/subsys/win/conmsg.h | 16 +++++++--- include/reactos/subsys/win/winmsg.h | 14 +++++++-- subsystems/win/basesrv/basesrv.h | 7 +++++ subsystems/win/basesrv/init.c | 2 +- subsystems/win/basesrv/server.c | 4 +-- subsystems/win32/csrsrv/api.c | 2 +- subsystems/win32/csrsrv/include/csrplugin.h | 2 +- subsystems/win32/csrsrv/init.c | 4 +-- subsystems/win32/csrsrv/procsup.c | 6 ++-- subsystems/win32/csrsrv/server.c | 4 +-- subsystems/win32/csrsrv/session.c | 4 +-- subsystems/win32/csrsrv/srv.h | 13 ++++++++- subsystems/win32/csrsrv/thredsup.c | 4 +-- subsystems/win32/csrsrv/wait.c | 4 +-- subsystems/win32/csrss/csrss.c | 4 +-- win32ss/user/consrv/alias.c | 12 ++++---- win32ss/user/consrv/coninput.c | 10 +++---- win32ss/user/consrv/conio.h | 9 +++--- win32ss/user/consrv/conoutput.c | 10 +++---- win32ss/user/consrv/console.c | 10 +++---- win32ss/user/consrv/consrv.h | 7 +++++ win32ss/user/consrv/guiconsole.c | 3 +- win32ss/user/consrv/guiconsole.h | 6 ++-- win32ss/user/consrv/handle.c | 10 +++---- win32ss/user/consrv/lineinput.c | 4 +-- win32ss/user/consrv/resource.h | 7 ++--- win32ss/user/consrv/server.c | 2 +- win32ss/user/consrv/tuiconsole.c | 5 ++-- win32ss/user/consrv/tuiconsole.h | 4 +-- win32ss/user/winsrv/CMakeLists.txt | 2 ++ win32ss/user/winsrv/harderror.c | 6 ++-- win32ss/user/winsrv/init.c | 27 ++++------------- win32ss/user/winsrv/resource.h | 7 ++--- win32ss/user/winsrv/server.c | 29 ++++--------------- win32ss/user/winsrv/{exitros.c => shutdown.c} | 9 +++--- win32ss/user/winsrv/winsrv.h | 8 +++++ 43 files changed, 191 insertions(+), 156 deletions(-) rename include/reactos/subsys/csr/{csrcl.h => csr.h} (87%) rename win32ss/user/winsrv/{exitros.c => shutdown.c} (99%) diff --git a/dll/ntdll/include/ntdll.h b/dll/ntdll/include/ntdll.h index b972e5beb96..d76e6f68da3 100644 --- a/dll/ntdll/include/ntdll.h +++ b/dll/ntdll/include/ntdll.h @@ -42,7 +42,7 @@ #include "ntdllp.h" /* CSRSS Header */ -#include +#include /* PSEH */ #include diff --git a/dll/win32/kernel32/k32.h b/dll/win32/kernel32/k32.h index 997e0237d52..0a958af2d01 100644 --- a/dll/win32/kernel32/k32.h +++ b/dll/win32/kernel32/k32.h @@ -36,8 +36,8 @@ #include /* CSRSS Header */ -#include -#include // FIXME: data header. +#include +//#include // FIXME: data header. /* C Headers */ #include diff --git a/include/reactos/subsys/csr/csrcl.h b/include/reactos/subsys/csr/csr.h similarity index 87% rename from include/reactos/subsys/csr/csrcl.h rename to include/reactos/subsys/csr/csr.h index ef6a89d347c..fcc415f2ee3 100644 --- a/include/reactos/subsys/csr/csrcl.h +++ b/include/reactos/subsys/csr/csr.h @@ -1,13 +1,14 @@ /* - * PROJECT: ReactOS Native Headers - * FILE: include/subsys/csrss/client.h - * PURPOSE: Public Definitions for CSR Clients + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/csr/csr.h + * PURPOSE: Public definitions for CSR Clients * PROGRAMMERS: Alex Ionescu (alex@relsoft.net) * Hermes Belusca-Maito (hermes.belusca@sfr.fr) */ -#ifndef _CSRCL_H -#define _CSRCL_H +#ifndef _CSR_H +#define _CSR_H #include "csrmsg.h" @@ -88,6 +89,6 @@ NTAPI CsrSetPriorityClass(IN HANDLE Process, IN OUT PULONG PriorityClass); -#endif // _CSRCLIENT_H +#endif // _CSR_H /* EOF */ diff --git a/include/reactos/subsys/csr/csrmsg.h b/include/reactos/subsys/csr/csrmsg.h index eae1060d94e..06c1e79a6f4 100644 --- a/include/reactos/subsys/csr/csrmsg.h +++ b/include/reactos/subsys/csr/csrmsg.h @@ -1,8 +1,9 @@ /* - * PROJECT: ReactOS Native Headers - * FILE: include/subsys/csrss/msg.h - * PURPOSE: Public Definitions for communication - * between CSR Clients and Servers. + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/csr/csrmsg.h + * PURPOSE: Public definitions for communication + * between CSR Clients and Servers * PROGRAMMERS: Alex Ionescu (alex@relsoft.net) * Hermes Belusca-Maito (hermes.belusca@sfr.fr) */ diff --git a/include/reactos/subsys/csr/csrsrv.h b/include/reactos/subsys/csr/csrsrv.h index 55d4e6817a8..47098864628 100644 --- a/include/reactos/subsys/csr/csrsrv.h +++ b/include/reactos/subsys/csr/csrsrv.h @@ -1,7 +1,8 @@ /* - * PROJECT: ReactOS Native Headers - * FILE: include/subsys/csrss/csrsrv.h - * PURPOSE: Public Definitions for CSR Servers + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/csr/csrsrv.h + * PURPOSE: Public definitions for CSR Servers * PROGRAMMERS: Alex Ionescu (alex@relsoft.net) * Hermes Belusca-Maito (hermes.belusca@sfr.fr) */ @@ -440,6 +441,6 @@ CsrValidateMessageString(IN PCSR_API_MESSAGE ApiMessage, #endif */ -#endif // _CSRSERVER_H +#endif // _CSRSRV_H /* EOF */ diff --git a/include/reactos/subsys/win/base.h b/include/reactos/subsys/win/base.h index 143bbf2d453..1acf5140495 100644 --- a/include/reactos/subsys/win/base.h +++ b/include/reactos/subsys/win/base.h @@ -1,6 +1,13 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/win/base.h + * PURPOSE: Public definitions for Base API Clients + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca@sfr.fr) + */ -#ifndef __BASE_H__ -#define __BASE_H__ +#ifndef _BASE_H +#define _BASE_H #pragma once @@ -9,8 +16,6 @@ typedef VOID (CALLBACK * BASE_PROCESS_CREATE_NOTIFY_ROUTINE)(PVOID); NTSTATUS WINAPI BaseSetProcessCreateNotify (BASE_PROCESS_CREATE_NOTIFY_ROUTINE); CSR_SERVER_DLL_INIT(ServerDllInitialization); - - typedef struct _NLS_USER_INFO { WCHAR iCountry[80]; @@ -79,6 +84,6 @@ typedef struct _BASE_STATIC_SERVER_DATA ULONG TermsrvClientTimeZoneChangeNum; } BASE_STATIC_SERVER_DATA, *PBASE_STATIC_SERVER_DATA; -#endif // __BASE_H__ +#endif // _BASE_H /* EOF */ diff --git a/include/reactos/subsys/win/basemsg.h b/include/reactos/subsys/win/basemsg.h index 0036e156db4..2929fafbb40 100644 --- a/include/reactos/subsys/win/basemsg.h +++ b/include/reactos/subsys/win/basemsg.h @@ -1,6 +1,14 @@ - -#ifndef __BASEMSG_H__ -#define __BASEMSG_H__ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/win/basemsg.h + * PURPOSE: Public definitions for communication + * between Base API Clients and Servers + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca@sfr.fr) + */ + +#ifndef _BASEMSG_H +#define _BASEMSG_H #pragma once @@ -177,7 +185,7 @@ typedef struct _BASE_API_MESSAGE PCSR_CAPTURE_BUFFER CsrCaptureData; CSR_API_NUMBER ApiNumber; - ULONG Status; + ULONG Status; // ReturnValue; // NTSTATUS Status ULONG Reserved; union { @@ -195,6 +203,6 @@ typedef struct _BASE_API_MESSAGE } Data; } BASE_API_MESSAGE, *PBASE_API_MESSAGE; -#endif // __BASEMSG_H__ +#endif // _BASEMSG_H /* EOF */ diff --git a/include/reactos/subsys/win/conmsg.h b/include/reactos/subsys/win/conmsg.h index b0a16e1f368..5f1f10c207b 100644 --- a/include/reactos/subsys/win/conmsg.h +++ b/include/reactos/subsys/win/conmsg.h @@ -1,6 +1,14 @@ - -#ifndef __CONMSG_H__ -#define __CONMSG_H__ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/win/conmsg.h + * PURPOSE: Public definitions for communication + * between Console API Clients and Servers + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca@sfr.fr) + */ + +#ifndef _CONMSG_H +#define _CONMSG_H #pragma once @@ -559,6 +567,6 @@ typedef struct _CONSOLE_API_MESSAGE } Data; } CONSOLE_API_MESSAGE, *PCONSOLE_API_MESSAGE; -#endif // __CONMSG_H__ +#endif // _CONMSG_H /* EOF */ diff --git a/include/reactos/subsys/win/winmsg.h b/include/reactos/subsys/win/winmsg.h index 4c380fa931b..25ebc65e202 100644 --- a/include/reactos/subsys/win/winmsg.h +++ b/include/reactos/subsys/win/winmsg.h @@ -1,6 +1,14 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: include/reactos/subsys/win/winmsg.h + * PURPOSE: Public definitions for communication + * between User-Mode API Clients and Servers + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca@sfr.fr) + */ -#ifndef __WINMSG_H__ -#define __WINMSG_H__ +#ifndef _WINMSG_H +#define _WINMSG_H #pragma once @@ -9,6 +17,6 @@ // CSR_SERVER_DLL_INIT(UserServerDllInitialization); -#endif // __WINMSG_H__ +#endif // _WINMSG_H /* EOF */ diff --git a/subsystems/win/basesrv/basesrv.h b/subsystems/win/basesrv/basesrv.h index 063103a8825..4835cd9155a 100644 --- a/subsystems/win/basesrv/basesrv.h +++ b/subsystems/win/basesrv/basesrv.h @@ -1,3 +1,10 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS/Win32 Base enviroment Subsystem Server + * FILE: subsystems/win/basesrv/basesrv.h + * PURPOSE: Main header - Definitions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca@sfr.fr) + */ #ifndef __BASESRV_H__ #define __BASESRV_H__ diff --git a/subsystems/win/basesrv/init.c b/subsystems/win/basesrv/init.c index 78e86cb19e6..3f972bddcd9 100644 --- a/subsystems/win/basesrv/init.c +++ b/subsystems/win/basesrv/init.c @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS/Win32 base enviroment subsystem server + * PROJECT: ReactOS/Win32 Base enviroment Subsystem Server * FILE: subsystems/win/basesrv/init.c * PURPOSE: Initialization * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca@sfr.fr) diff --git a/subsystems/win/basesrv/server.c b/subsystems/win/basesrv/server.c index 9b6ac02a257..7fcfc47b535 100644 --- a/subsystems/win/basesrv/server.c +++ b/subsystems/win/basesrv/server.c @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS/Win32 base enviroment subsystem server + * PROJECT: ReactOS/Win32 Base enviroment Subsystem Server * FILE: subsystems/win/basesrv/server.c - * PURPOSE: Initialization + * PURPOSE: Server APIs * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca@sfr.fr) */ diff --git a/subsystems/win32/csrsrv/api.c b/subsystems/win32/csrsrv/api.c index 47dfeae5e7b..b9a8ca73d65 100644 --- a/subsystems/win32/csrsrv/api.c +++ b/subsystems/win32/csrsrv/api.c @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSR Sub System + * PROJECT: ReactOS Client/Server Runtime SubSystem * FILE: subsystems/win32/csrsrv/api.c * PURPOSE: CSR Server DLL API LPC Implementation * "\windows\ApiPort" port process management functions diff --git a/subsystems/win32/csrsrv/include/csrplugin.h b/subsystems/win32/csrsrv/include/csrplugin.h index 053410d7ca2..6b0ed95524f 100644 --- a/subsystems/win32/csrsrv/include/csrplugin.h +++ b/subsystems/win32/csrsrv/include/csrplugin.h @@ -19,7 +19,7 @@ #include -#include +#include //#include "api.h" /* diff --git a/subsystems/win32/csrsrv/init.c b/subsystems/win32/csrsrv/init.c index d7e08961e18..7ab776553ef 100644 --- a/subsystems/win32/csrsrv/init.c +++ b/subsystems/win32/csrsrv/init.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSR SubSystem - * FILE: subsystems/win32/csrss/csrsrv/init.c + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: subsystems/win32/csrsrv/init.c * PURPOSE: CSR Server DLL Initialization * PROGRAMMERS: Alex Ionescu (alex@relsoft.net) * ReactOS Portable Systems Group diff --git a/subsystems/win32/csrsrv/procsup.c b/subsystems/win32/csrsrv/procsup.c index 37961450c25..4d80f1ad0b4 100644 --- a/subsystems/win32/csrsrv/procsup.c +++ b/subsystems/win32/csrsrv/procsup.c @@ -1,12 +1,12 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSR SubSystem - * FILE: subsystems/win32/csrss/csrsrv/procsup.c + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: subsystems/win32/csrsrv/procsup.c * PURPOSE: CSR Server DLL Process Management * PROGRAMMERS: ReactOS Portable Systems Group * Alex Ionescu (alex@relsoft.net) */ - + /* INCLUDES *******************************************************************/ #include diff --git a/subsystems/win32/csrsrv/server.c b/subsystems/win32/csrsrv/server.c index 8954c4dfcb4..4d1058ae447 100644 --- a/subsystems/win32/csrsrv/server.c +++ b/subsystems/win32/csrsrv/server.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSR SubSystem - * FILE: subsystems/win32/csrss/csrsrv/server.c + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: subsystems/win32/csrsrv/server.c * PURPOSE: CSR Server DLL Server Functions * PROGRAMMERS: Alex Ionescu (alex@relsoft.net) */ diff --git a/subsystems/win32/csrsrv/session.c b/subsystems/win32/csrsrv/session.c index 9c932496a2d..793efe91e91 100644 --- a/subsystems/win32/csrsrv/session.c +++ b/subsystems/win32/csrsrv/session.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSR SubSystem - * FILE: subsystems/win32/csrss/csrsrv/session.c + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: subsystems/win32/csrsrv/session.c * PURPOSE: CSR Server DLL Session Implementation * PROGRAMMERS: Alex Ionescu (alex@relsoft.net) */ diff --git a/subsystems/win32/csrsrv/srv.h b/subsystems/win32/csrsrv/srv.h index e6ed8107b70..7ebc21909d2 100644 --- a/subsystems/win32/csrsrv/srv.h +++ b/subsystems/win32/csrsrv/srv.h @@ -1,3 +1,12 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: subsystems/win32/csrsrv/srv.h + * PURPOSE: Main header - Definitions + * PROGRAMMERS: Alex Ionescu (alex@relsoft.net) + * ReactOS Portable Systems Group + */ + #ifndef _SRV_H #define _SRV_H @@ -36,4 +45,6 @@ #define ROUND_UP(n, align) ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) #define ROUND_DOWN(n, align) (((ULONG)n) & ~((align) - 1l)) -#endif +#endif // _SRV_H + +/* EOF */ diff --git a/subsystems/win32/csrsrv/thredsup.c b/subsystems/win32/csrsrv/thredsup.c index 63246516657..91e10835989 100644 --- a/subsystems/win32/csrsrv/thredsup.c +++ b/subsystems/win32/csrsrv/thredsup.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSR SubSystem - * FILE: subsystems/win32/csrss/csrsrv/thredsup.c + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: subsystems/win32/csrsrv/thredsup.c * PURPOSE: CSR Server DLL Thread Management * PROGRAMMERS: ReactOS Portable Systems Group * Alex Ionescu (alex@relsoft.net) diff --git a/subsystems/win32/csrsrv/wait.c b/subsystems/win32/csrsrv/wait.c index 1852c9dfb7e..91e0d0dee31 100644 --- a/subsystems/win32/csrsrv/wait.c +++ b/subsystems/win32/csrsrv/wait.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSR Sub System - * FILE: subsystems/win32/csrss/csrsrv/wait.c + * PROJECT: ReactOS Client/Server Runtime SubSystem + * FILE: subsystems/win32/csrsrv/wait.c * PURPOSE: CSR Server DLL Wait Implementation * PROGRAMMERS: Emanuele Aliberti * Alex Ionescu (alex@relsoft.net) diff --git a/subsystems/win32/csrss/csrss.c b/subsystems/win32/csrss/csrss.c index 82143d6e5c6..b78534687a6 100644 --- a/subsystems/win32/csrss/csrss.c +++ b/subsystems/win32/csrss/csrss.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Client Server Runtime SubSystem (CSRSS) * LICENSE: BSD - See COPYING.ARM in root directory + * PROJECT: ReactOS Client/Server Runtime SubSystem * FILE: subsystems/win32/csrss/csrss.c - * PURPOSE: CSRSS Main Executable Code + * PURPOSE: CSRSS Process Main Executable Code * PROGRAMMERS: Alex Ionescu (alex@relsoft.net) * ReactOS Portable Systems Group */ diff --git a/win32ss/user/consrv/alias.c b/win32ss/user/consrv/alias.c index ec4e3edf09a..d9a40d5b246 100644 --- a/win32ss/user/consrv/alias.c +++ b/win32ss/user/consrv/alias.c @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS CSRSS - * LICENSE: GPL - See COPYING in the top level directory - * FILE: subsystems/win32/csrss/api/alias.c - * PURPOSE: CSRSS alias support functions - * COPYRIGHT: Christoph Wittich - * Johannes Anderwald + * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/alias.c + * PURPOSE: Alias support functions + * PROGRAMMERS: Christoph Wittich + * Johannes Anderwald */ /* INCLUDES ******************************************************************/ diff --git a/win32ss/user/consrv/coninput.c b/win32ss/user/consrv/coninput.c index cbdc36d2751..cf55ff02b21 100644 --- a/win32ss/user/consrv/coninput.c +++ b/win32ss/user/consrv/coninput.c @@ -1,9 +1,9 @@ /* - * reactos/win32ss/user/consrv/conio.c - * - * Console I/O functions - * - * ReactOS Operating System + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/coninput.c + * PURPOSE: Console I/O functions + * PROGRAMMERS: */ /* INCLUDES ******************************************************************/ diff --git a/win32ss/user/consrv/conio.h b/win32ss/user/consrv/conio.h index 424277822db..8d993bcb60b 100644 --- a/win32ss/user/consrv/conio.h +++ b/win32ss/user/consrv/conio.h @@ -1,14 +1,13 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: subsys/csrss/include/conio.h - * PURPOSE: CSRSS internal console I/O interface + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/conio.h + * PURPOSE: Internal console I/O interface + * PROGRAMMERS: */ #pragma once -// #include "api.h" - #define CSR_DEFAULT_CURSOR_SIZE 25 /* Object type magic numbers */ diff --git a/win32ss/user/consrv/conoutput.c b/win32ss/user/consrv/conoutput.c index a81e7e3a744..9f860e45907 100644 --- a/win32ss/user/consrv/conoutput.c +++ b/win32ss/user/consrv/conoutput.c @@ -1,9 +1,9 @@ /* - * reactos/win32ss/user/consrv/conio.c - * - * Console I/O functions - * - * ReactOS Operating System + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/conoutput.c + * PURPOSE: Console I/O functions + * PROGRAMMERS: */ /* INCLUDES ******************************************************************/ diff --git a/win32ss/user/consrv/console.c b/win32ss/user/consrv/console.c index 15d9c4fe475..5cda3fd3293 100644 --- a/win32ss/user/consrv/console.c +++ b/win32ss/user/consrv/console.c @@ -1,9 +1,9 @@ /* - * reactos/win32ss/user/consrv/conio.c - * - * Console I/O functions - * - * ReactOS Operating System + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/console.c + * PURPOSE: Console I/O functions + * PROGRAMMERS: */ /* INCLUDES ******************************************************************/ diff --git a/win32ss/user/consrv/consrv.h b/win32ss/user/consrv/consrv.h index b53d8f0341c..3bf081c73b2 100644 --- a/win32ss/user/consrv/consrv.h +++ b/win32ss/user/consrv/consrv.h @@ -1,3 +1,10 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/consrv.h + * PURPOSE: Main header - Definitions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca@sfr.fr) + */ #ifndef __CONSRV_H__ #define __CONSRV_H__ diff --git a/win32ss/user/consrv/guiconsole.c b/win32ss/user/consrv/guiconsole.c index 72d1cb3cb59..978df61673d 100644 --- a/win32ss/user/consrv/guiconsole.c +++ b/win32ss/user/consrv/guiconsole.c @@ -1,8 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/guiconsole.c * PURPOSE: Implementation of gui-mode consoles + * PROGRAMMERS: */ /* INCLUDES ******************************************************************/ diff --git a/win32ss/user/consrv/guiconsole.h b/win32ss/user/consrv/guiconsole.h index 285813cb446..ecd94579612 100644 --- a/win32ss/user/consrv/guiconsole.h +++ b/win32ss/user/consrv/guiconsole.h @@ -1,11 +1,11 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/guiconsole.h - * PURPOSE: Interface to GUI consoles + * PURPOSE: Interface to gui-mode consoles + * PROGRAMMERS: */ -// #include "api.h" #include "conio.h" #define CONGUI_MIN_WIDTH 10 diff --git a/win32ss/user/consrv/handle.c b/win32ss/user/consrv/handle.c index a8ad28f30ef..be55af8ea7d 100644 --- a/win32ss/user/consrv/handle.c +++ b/win32ss/user/consrv/handle.c @@ -1,9 +1,9 @@ /* - * reactos/subsys/csrss/api/handle.c - * - * CSRSS handle functions - * - * ReactOS Operating System + * LICENSE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/handle.c + * PURPOSE: Handle functions + * PROGRAMMERS: */ /* INCLUDES ******************************************************************/ diff --git a/win32ss/user/consrv/lineinput.c b/win32ss/user/consrv/lineinput.c index d3180d65f88..2c89a078d30 100644 --- a/win32ss/user/consrv/lineinput.c +++ b/win32ss/user/consrv/lineinput.c @@ -1,7 +1,7 @@ /* - * PROJECT: ReactOS CSRSS * LICENSE: GPL - See COPYING in the top level directory - * FILE: win32ss/user/consrv/lineinput.c + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/tuiconsole.c * PURPOSE: Console line input functions * PROGRAMMERS: Jeffrey Morlan */ diff --git a/win32ss/user/consrv/resource.h b/win32ss/user/consrv/resource.h index 030f61e3ad0..7b451160061 100644 --- a/win32ss/user/consrv/resource.h +++ b/win32ss/user/consrv/resource.h @@ -1,8 +1,7 @@ -/* $Id: resource.h 51293 2011-04-09 12:01:36Z mkupfer $ - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Win32 subsystem - * FILE: subsys/csrss/win32csr/resource.h + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/resource.h * PURPOSE: Resource #defines */ diff --git a/win32ss/user/consrv/server.c b/win32ss/user/consrv/server.c index 21f5a202ee5..54ebc1070b7 100644 --- a/win32ss/user/consrv/server.c +++ b/win32ss/user/consrv/server.c @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/init.c - * PURPOSE: Initialization + * PURPOSE: Server APIs * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca@sfr.fr) */ diff --git a/win32ss/user/consrv/tuiconsole.c b/win32ss/user/consrv/tuiconsole.c index 4c3f2f3ba9b..d8826b4a544 100644 --- a/win32ss/user/consrv/tuiconsole.c +++ b/win32ss/user/consrv/tuiconsole.c @@ -1,8 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/tuiconsole.c - * PURPOSE: Implementation of text-mode consoles + * PURPOSE: Interface to text-mode consoles + * PROGRAMMERS: */ #include "consrv.h" diff --git a/win32ss/user/consrv/tuiconsole.h b/win32ss/user/consrv/tuiconsole.h index a519c6d3c78..b333779213e 100644 --- a/win32ss/user/consrv/tuiconsole.h +++ b/win32ss/user/consrv/tuiconsole.h @@ -1,11 +1,11 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * PROJECT: ReactOS Console Server DLL * FILE: win32ss/user/consrv/tuiconsole.h * PURPOSE: Interface to text-mode consoles + * PROGRAMMERS: */ -// #include "api.h" #include "conio.h" extern NTSTATUS FASTCALL TuiInitConsole(PCSRSS_CONSOLE Console); diff --git a/win32ss/user/winsrv/CMakeLists.txt b/win32ss/user/winsrv/CMakeLists.txt index da820545780..5faf8dcf3e7 100644 --- a/win32ss/user/winsrv/CMakeLists.txt +++ b/win32ss/user/winsrv/CMakeLists.txt @@ -6,8 +6,10 @@ include_directories( spec2def(winsrv.dll winsrv.spec) list(APPEND SOURCE + harderror.c init.c server.c + shutdown.c winsrv.rc ${CMAKE_CURRENT_BINARY_DIR}/winsrv.def) diff --git a/win32ss/user/winsrv/harderror.c b/win32ss/user/winsrv/harderror.c index 8bb9d4eafa7..6723cfba9b5 100644 --- a/win32ss/user/winsrv/harderror.c +++ b/win32ss/user/winsrv/harderror.c @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: win32ss/user/winsrv/dllmain.c - * PURPOSE: Initialization + * PROJECT: ReactOS User API Server DLL + * FILE: win32ss/user/winsrv/harderror.c + * PURPOSE: Hard errors * PROGRAMMERS: Dmitry Philippov (shedon@mail.ru) * Timo Kreuzer (timo.kreuzer@reactos.org) */ diff --git a/win32ss/user/winsrv/init.c b/win32ss/user/winsrv/init.c index 372e9f9e430..9651b550b12 100644 --- a/win32ss/user/winsrv/init.c +++ b/win32ss/user/winsrv/init.c @@ -1,25 +1,10 @@ /* - * init.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - Initialization - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * -------------------------------------------------------------------- + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User API Server DLL + * FILE: win32ss/user/winsrv/init.c + * PURPOSE: Initialization + * PROGRAMMERS: Dmitry Philippov (shedon@mail.ru) + * Hermes Belusca-Maito (hermes.belusca@sfr.fr) */ #include "winsrv.h" diff --git a/win32ss/user/winsrv/resource.h b/win32ss/user/winsrv/resource.h index 1c54971aff9..2bfeae7a18c 100644 --- a/win32ss/user/winsrv/resource.h +++ b/win32ss/user/winsrv/resource.h @@ -1,8 +1,7 @@ -/* $Id: resource.h 51293 2011-04-09 12:01:36Z mkupfer $ - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Win32 subsystem - * FILE: subsys/csrss/win32csr/resource.h + * PROJECT: ReactOS User API Server DLL + * FILE: win32ss/user/winsrv/resource.h * PURPOSE: Resource #defines */ diff --git a/win32ss/user/winsrv/server.c b/win32ss/user/winsrv/server.c index c4a657f9886..37057cd871e 100644 --- a/win32ss/user/winsrv/server.c +++ b/win32ss/user/winsrv/server.c @@ -1,27 +1,10 @@ /* - * server.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - Initialization - * - * ReactOS Operating System - * - * -------------------------------------------------------------------- - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * -------------------------------------------------------------------- - * - * PROGRAMMER: Eric Kohl + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User API Server DLL + * FILE: win32ss/user/winsrv/server.c + * PURPOSE: Server APIs + * PROGRAMMERS: Eric Kohl + * Hermes Belusca-Maito (hermes.belusca@sfr.fr) */ /* INCLUDES ******************************************************************/ diff --git a/win32ss/user/winsrv/exitros.c b/win32ss/user/winsrv/shutdown.c similarity index 99% rename from win32ss/user/winsrv/exitros.c rename to win32ss/user/winsrv/shutdown.c index 8f78bccd379..7f0f586f484 100644 --- a/win32ss/user/winsrv/exitros.c +++ b/win32ss/user/winsrv/shutdown.c @@ -1,8 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CSRSS subsystem - * FILE: win32ss/user/winsrv/exitros.c + * PROJECT: ReactOS User API Server DLL + * FILE: win32ss/user/winsrv/shutdown.c * PURPOSE: Logout/shutdown + * PROGRAMMERS: */ /* INCLUDES ******************************************************************/ @@ -28,7 +29,7 @@ Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, return CsrEnumProcesses(EnumProc, Context); } -CSR_API(CsrRegisterLogonProcess) +CSR_API(SrvRegisterLogonProcess) { if (ApiMessage->Data.RegisterLogonProcessRequest.Register) { @@ -925,7 +926,7 @@ UserExitReactos(DWORD UserProcessId, UINT Flags) return Status; } -CSR_API(CsrExitReactos) +CSR_API(SrvExitWindowsEx) { if (0 == (ApiMessage->Data.ExitReactosRequest.Flags & EWX_INTERNAL_FLAG)) { diff --git a/win32ss/user/winsrv/winsrv.h b/win32ss/user/winsrv/winsrv.h index 53bd4630261..0ce515cb65b 100644 --- a/win32ss/user/winsrv/winsrv.h +++ b/win32ss/user/winsrv/winsrv.h @@ -1,3 +1,11 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User API Server DLL + * FILE: win32ss/user/winsrv/winsrv.h + * PURPOSE: Main header - Definitions + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca@sfr.fr) + */ + #pragma once /* PSDK/NDK Headers */ -- 2.17.1