Author: hbelusca
Date: Thu Sep 27 18:44:50 2012
New Revision: 57402
URL: http://svn.reactos.org/svn/reactos?rev=57402&view=rev
Log:
[CSRSS/CSRSRV]
- Do not compile anymore the old CSRSS.
- Update some headers and resource files.
- Add header guards in srv.h
Modified:
trunk/reactos/subsystems/CMakeLists.txt
trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc
trunk/reactos/subsystems/win32/csrss/csrsrv/server.c
trunk/reactos/subsystems/win32/csrss/csrsrv/session.c
trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h
trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c
trunk/reactos/subsystems/win32/csrss/csrss.rc
Modified: trunk/reactos/subsystems/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/CMakeLists.txt?rev=57402&r1=57401&r2=57402&view=diff
==============================================================================
--- trunk/reactos/subsystems/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/subsystems/CMakeLists.txt [iso-8859-1] Thu Sep 27 18:44:50
2012
@@ -1,5 +1,4 @@
if(ARCH STREQUAL "i386")
add_subdirectory(ntvdm)
endif()
-add_subdirectory(csr)
add_subdirectory(win32)
Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc?rev=57402&r1=57401&r2=57402&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rc [iso-8859-1] Thu Sep
27 18:44:50 2012
@@ -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 <reactos/version.rc>
Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/server.c?rev=57402&r1=57401&r2=57402&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] Thu Sep
27 18:44:50 2012
@@ -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 (a...@relsoft.net)
*/
Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/session.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/session.c?rev=57402&r1=57401&r2=57402&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/session.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/session.c [iso-8859-1] Thu Sep
27 18:44:50 2012
@@ -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 (a...@relsoft.net)
*/
Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h?rev=57402&r1=57401&r2=57402&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h [iso-8859-1] Thu Sep 27
18:44:50 2012
@@ -1,3 +1,6 @@
+#ifndef _SRV_H
+#define _SRV_H
+
/* PSDK/NDK Headers */
#define NTOS_MODE_USER
#include <stdio.h>
@@ -35,3 +38,5 @@
/* Defines */
#define ROUND_UP(n, align) ROUND_DOWN(((ULONG)n) + (align) - 1, (align))
#define ROUND_DOWN(n, align) (((ULONG)n) & ~((align) - 1l))
+
+#endif
Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c?rev=57402&r1=57401&r2=57402&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/wait.c [iso-8859-1] Thu Sep 27
18:44:50 2012
@@ -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 (a...@relsoft.net)
Modified: trunk/reactos/subsystems/win32/csrss/csrss.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrss.rc?rev=57402&r1=57401&r2=57402&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrss.rc [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrss.rc [iso-8859-1] Thu Sep 27
18:44:50 2012
@@ -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 <reactos/version.rc>
