Author: hbelusca Date: Sat Oct 20 14:07:04 2012 New Revision: 57583
URL: http://svn.reactos.org/svn/reactos?rev=57583&view=rev Log: [CSRSRV] - Start renaming some APIs which should not be present there, but in basesrv instead. Names come from http://j00ru.vexillium.org/csrss_list/api_list.html#Windows_2k3
Modified: branches/ros-csrss/subsystems/win32/csrsrv/api/process.c branches/ros-csrss/subsystems/win32/csrsrv/api/user.c branches/ros-csrss/subsystems/win32/csrsrv/include/api.h branches/ros-csrss/subsystems/win32/csrsrv/init.c
Modified: branches/ros-csrss/subsystems/win32/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsr... ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api/process.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api/process.c [iso-8859-1] Sat Oct 20 14:07:04 2012 @@ -23,7 +23,14 @@ * CSRSS API *********************************************************************/
-CSR_API(CsrSrvCreateProcess) +/*** + *** Some APIs from here will go to basesrv.dll, some others to winsrv.dll. + *** Furthermore, this structure uses the old definition of APIs list. + *** The new one is in fact three arrays, one of APIs pointers, one other of + *** corresponding indexes, and the third one of names (not very efficient...). + ***/ + +CSR_API(BaseSrvCreateProcess) { NTSTATUS Status; HANDLE ProcessHandle, ThreadHandle; @@ -135,7 +142,7 @@ return Status; }
-CSR_API(CsrSrvCreateThread) +CSR_API(BaseSrvCreateThread) { PCSR_THREAD CurrentThread; HANDLE ThreadHandle; @@ -191,7 +198,7 @@ return Status; }
-CSR_API(CsrTerminateProcess) +CSR_API(BaseSrvExitProcess) { PCSR_THREAD CsrThread = CsrGetClientThread(); ASSERT(CsrThread != NULL); @@ -204,12 +211,7 @@ (NTSTATUS)ApiMessage->Data.TerminateProcessRequest.uExitCode); }
-CSR_API(CsrConnectProcess) -{ - return STATUS_SUCCESS; -} - -CSR_API(CsrGetShutdownParameters) +CSR_API(BaseSrvGetProcessShutdownParam) { PCSR_THREAD CsrThread = CsrGetClientThread(); ASSERT(CsrThread); @@ -220,7 +222,7 @@ return STATUS_SUCCESS; }
-CSR_API(CsrSetShutdownParameters) +CSR_API(BaseSrvSetProcessShutdownParam) { PCSR_THREAD CsrThread = CsrGetClientThread(); ASSERT(CsrThread);
Modified: branches/ros-csrss/subsystems/win32/csrsrv/api/user.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsr... ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api/user.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api/user.c [iso-8859-1] Sat Oct 20 14:07:04 2012 @@ -23,7 +23,7 @@
/* FUNCTIONS *****************************************************************/
-CSR_API(CsrRegisterServicesProcess) +CSR_API(SrvRegisterServicesProcess) { if (ServicesProcessIdValid == TRUE) {
Modified: branches/ros-csrss/subsystems/win32/csrsrv/include/api.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsr... ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/include/api.h [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/include/api.h [iso-8859-1] Sat Oct 20 14:07:04 2012 @@ -71,11 +71,11 @@
/* api/process.c */ CSR_API(CsrConnectProcess); -CSR_API(CsrSrvCreateProcess); -CSR_API(CsrTerminateProcess); -CSR_API(CsrSrvCreateThread); -CSR_API(CsrGetShutdownParameters); -CSR_API(CsrSetShutdownParameters); +CSR_API(BaseSrvCreateProcess); +CSR_API(BaseSrvExitProcess); +CSR_API(BaseSrvCreateThread); +CSR_API(BaseSrvGetProcessShutdownParam); +CSR_API(BaseSrvSetProcessShutdownParam);
VOID NTAPI @@ -263,6 +263,6 @@ IN ULONG ServerId);
/* api/user.c */ -CSR_API(CsrRegisterServicesProcess); +CSR_API(SrvRegisterServicesProcess);
/* EOF */
Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsr... ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] Sat Oct 20 14:07:04 2012 @@ -94,13 +94,12 @@ ***/ CSRSS_API_DEFINITION NativeDefinitions[] = { - CSRSS_DEFINE_API(CREATE_PROCESS, CsrSrvCreateProcess), - CSRSS_DEFINE_API(CREATE_THREAD, CsrSrvCreateThread), - CSRSS_DEFINE_API(TERMINATE_PROCESS, CsrTerminateProcess), - CSRSS_DEFINE_API(CONNECT_PROCESS, CsrConnectProcess), - CSRSS_DEFINE_API(REGISTER_SERVICES_PROCESS, CsrRegisterServicesProcess), - CSRSS_DEFINE_API(GET_SHUTDOWN_PARAMETERS, CsrGetShutdownParameters), - CSRSS_DEFINE_API(SET_SHUTDOWN_PARAMETERS, CsrSetShutdownParameters), + CSRSS_DEFINE_API(CREATE_PROCESS, BaseSrvCreateProcess), + CSRSS_DEFINE_API(CREATE_THREAD, BaseSrvCreateThread), + CSRSS_DEFINE_API(TERMINATE_PROCESS, BaseSrvExitProcess), + CSRSS_DEFINE_API(REGISTER_SERVICES_PROCESS, SrvRegisterServicesProcess), + CSRSS_DEFINE_API(GET_SHUTDOWN_PARAMETERS, BaseSrvGetProcessShutdownParam), + CSRSS_DEFINE_API(SET_SHUTDOWN_PARAMETERS, BaseSrvSetProcessShutdownParam), { 0, 0, NULL } };