From 779ce9effed1ca7505e709b98c51c0f7522c6998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 27 Sep 2012 18:44:50 +0000 Subject: [PATCH] [CSRSS/CSRSRV] - Do not compile anymore the old CSRSS. - Update some headers and resource files. - Add header guards in srv.h svn path=/trunk/; revision=57402 --- reactos/subsystems/CMakeLists.txt | 1 - reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc | 2 +- reactos/subsystems/win32/csrss/csrsrv/server.c | 2 +- reactos/subsystems/win32/csrss/csrsrv/session.c | 2 +- reactos/subsystems/win32/csrss/csrsrv/srv.h | 5 +++++ reactos/subsystems/win32/csrss/csrsrv/wait.c | 2 +- reactos/subsystems/win32/csrss/csrss.rc | 6 +++--- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/reactos/subsystems/CMakeLists.txt b/reactos/subsystems/CMakeLists.txt index 2b46b6d9308..35210553785 100644 --- a/reactos/subsystems/CMakeLists.txt +++ b/reactos/subsystems/CMakeLists.txt @@ -1,5 +1,4 @@ if(ARCH STREQUAL "i386") add_subdirectory(ntvdm) endif() -add_subdirectory(csr) add_subdirectory(win32) diff --git a/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc b/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc index 658072d09b8..fbe30d31c97 100644 --- a/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc +++ b/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS CSR Core Server\0" +#define REACTOS_STR_FILE_DESCRIPTION "Client/Server Runtime SubSystem Process\0" #define REACTOS_STR_INTERNAL_NAME "csrsrv\0" #define REACTOS_STR_ORIGINAL_FILENAME "csrsrv.dll\0" #include diff --git a/reactos/subsystems/win32/csrss/csrsrv/server.c b/reactos/subsystems/win32/csrss/csrsrv/server.c index 5329e0c9481..cecfa9a7804 100644 --- a/reactos/subsystems/win32/csrss/csrsrv/server.c +++ b/reactos/subsystems/win32/csrss/csrsrv/server.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System - * FILE: subsys/csr/csrsrv/server.c + * FILE: subsystems/win32/csrss/csrsrv/server.c * PURPOSE: CSR Server DLL Server Functions * PROGRAMMERS: Alex Ionescu (alex@relsoft.net) */ diff --git a/reactos/subsystems/win32/csrss/csrsrv/session.c b/reactos/subsystems/win32/csrss/csrsrv/session.c index a9c0f97b0fd..9f068e013a8 100644 --- a/reactos/subsystems/win32/csrss/csrsrv/session.c +++ b/reactos/subsystems/win32/csrss/csrsrv/session.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System - * FILE: subsys/csr/csrsrv/session.c + * FILE: subsystems/win32/csrss/csrsrv/session.c * PURPOSE: CSR Server DLL Session Implementation * PROGRAMMERS: Alex Ionescu (alex@relsoft.net) */ diff --git a/reactos/subsystems/win32/csrss/csrsrv/srv.h b/reactos/subsystems/win32/csrss/csrsrv/srv.h index 67a3b73217a..94d6dfcb6af 100644 --- a/reactos/subsystems/win32/csrss/csrsrv/srv.h +++ b/reactos/subsystems/win32/csrss/csrsrv/srv.h @@ -1,3 +1,6 @@ +#ifndef _SRV_H +#define _SRV_H + /* PSDK/NDK Headers */ #define NTOS_MODE_USER #include @@ -35,3 +38,5 @@ extern HANDLE CsrHeap; /* Defines */ #define ROUND_UP(n, align) ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) #define ROUND_DOWN(n, align) (((ULONG)n) & ~((align) - 1l)) + +#endif diff --git a/reactos/subsystems/win32/csrss/csrsrv/wait.c b/reactos/subsystems/win32/csrss/csrsrv/wait.c index 00d0bdf3108..6fba748a3ee 100644 --- a/reactos/subsystems/win32/csrss/csrsrv/wait.c +++ b/reactos/subsystems/win32/csrss/csrsrv/wait.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS CSR Sub System - * FILE: subsys/csr/csrsrv/wait.c + * FILE: subsystems/win32/csrss/csrsrv/wait.c * PURPOSE: CSR Server DLL Wait Implementation * PROGRAMMERS: Emanuele Aliberti * Alex Ionescu (alex@relsoft.net) diff --git a/reactos/subsystems/win32/csrss/csrss.rc b/reactos/subsystems/win32/csrss/csrss.rc index b32ea153cc0..27380ede331 100644 --- a/reactos/subsystems/win32/csrss/csrss.rc +++ b/reactos/subsystems/win32/csrss/csrss.rc @@ -1,4 +1,4 @@ -#define REACTOS_STR_FILE_DESCRIPTION "Client/Server Runtime Process\0" -#define REACTOS_STR_INTERNAL_NAME "CSRSs and CSRSrv\0" -#define REACTOS_STR_ORIGINAL_FILENAME "CSRSs.exe and CSRSrv.dll\0" +#define REACTOS_STR_FILE_DESCRIPTION "Client/Server Runtime SubSystem Process\0" +#define REACTOS_STR_INTERNAL_NAME "csrss\0" +#define REACTOS_STR_ORIGINAL_FILENAME "csrss.exe\0" #include