Author: hbelusca
Date: Wed Oct 24 22:07:46 2012
New Revision: 57610
URL: http://svn.reactos.org/svn/reactos?rev=57610&view=rev
Log:
[CSRSRV/WINSRV]
- Move the last User CSR api which was in csrsrv instead of in winsrv.
- Remove unneeded file.
Removed:
branches/ros-csrss/subsystems/win32/csrsrv/user.c
Modified:
branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt
branches/ros-csrss/subsystems/win32/csrsrv/include/api.h
branches/ros-csrss/subsystems/win32/csrsrv/init.c
branches/ros-csrss/win32ss/user/winsrv/server.c
branches/ros-csrss/win32ss/user/winsrv/winsrv.h
Modified: branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt?rev=57610&r1=57609&r2=57610&view=diff
==============================================================================
--- branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/CMakeLists.txt [iso-8859-1] Wed
Oct 24 22:07:46 2012
@@ -11,7 +11,6 @@
server.c
session.c
thredsup.c
- user.c
wait.c
csrsrv.rc
${CMAKE_CURRENT_BINARY_DIR}/csrsrv.def)
Modified: branches/ros-csrss/subsystems/win32/csrsrv/include/api.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/include/api.h?rev=57610&r1=57609&r2=57610&view=diff
==============================================================================
--- 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] Wed
Oct 24 22:07:46 2012
@@ -104,7 +104,6 @@
CSR_API(CsrSrvUnusedFunction);
CSR_API(CsrSrvIdentifyAlertableThread);
CSR_API(CsrSrvSetPriorityClass);
-CSR_API(SrvRegisterServicesProcess);
/***
@@ -156,7 +155,10 @@
IN PCSR_PROCESS CsrProcess);
+#if 0
NTSTATUS FASTCALL CsrApiRegisterDefinitions(PCSRSS_API_DEFINITION
NewDefinitions);
+#endif
+
VOID FASTCALL CsrApiCallHandler(IN OUT PCSR_API_MESSAGE ApiMessage, OUT PULONG
Reply);
NTSTATUS
Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/init.c?rev=57610&r1=57609&r2=57610&view=diff
==============================================================================
--- branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] Wed Oct 24
22:07:46 2012
@@ -61,11 +61,6 @@
}
}
-CSRSS_API_DEFINITION NativeDefinitions[] =
-{
- CSRSS_DEFINE_API(REGISTER_SERVICES_PROCESS, SrvRegisterServicesProcess),
// winsrv.dll
-};
-
/* === INIT ROUTINES === */
/*++
@@ -994,14 +989,6 @@
return Status;
}
-#if 0
- Status = CsrApiRegisterDefinitions(NativeDefinitions);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("CSRSRV failed in %s with status %lx\n",
"CsrApiRegisterDefinitions", Status);
- }
-#endif
-
/* Now initialize our API Port */
Status = CsrApiPortInitialize();
if (!NT_SUCCESS(Status))
Removed: branches/ros-csrss/subsystems/win32/csrsrv/user.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrsrv/user.c?rev=57609&view=auto
==============================================================================
--- branches/ros-csrss/subsystems/win32/csrsrv/user.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/user.c (removed)
@@ -1,41 +1,0 @@
-/*
- * subsystems/win32/csrss/csrsrv/api/user.c
- *
- * User functions
- *
- * ReactOS Operating System
- *
- * PROGRAMMER: Eric Kohl
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <srv.h>
-
-#define NDEBUG
-#include <debug.h>
-
-/* GLOBALS *******************************************************************/
-
-static BOOLEAN ServicesProcessIdValid = FALSE;
-static ULONG_PTR ServicesProcessId;
-
-
-/* FUNCTIONS *****************************************************************/
-
-CSR_API(SrvRegisterServicesProcess)
-{
- if (ServicesProcessIdValid == TRUE)
- {
- /* Only accept a single call */
- return STATUS_INVALID_PARAMETER;
- }
- else
- {
- ServicesProcessId =
(ULONG_PTR)ApiMessage->Data.RegisterServicesProcessRequest.ProcessId;
- ServicesProcessIdValid = TRUE;
- return STATUS_SUCCESS;
- }
-}
-
-/* EOF */
Modified: branches/ros-csrss/win32ss/user/winsrv/server.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/server.c?rev=57610&r1=57609&r2=57610&view=diff
==============================================================================
--- branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/winsrv/server.c [iso-8859-1] Wed Oct 24
22:07:46 2012
@@ -1,5 +1,4 @@
-/* $Id: server.c 43790 2009-10-27 10:34:16Z dgorbachev $
- *
+/*
* server.c - ReactOS/Win32 Console+User Enviroment Subsystem Server -
Initialization
*
* ReactOS Operating System
@@ -21,11 +20,39 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* --------------------------------------------------------------------
+ *
+ * PROGRAMMER: Eric Kohl
*/
+
+/* INCLUDES ******************************************************************/
+
#include "winsrv.h"
//#define NDEBUG
#include <debug.h>
+/* GLOBALS *******************************************************************/
+
+static BOOLEAN ServicesProcessIdValid = FALSE;
+static ULONG_PTR ServicesProcessId;
+
+
+/* FUNCTIONS *****************************************************************/
+
+CSR_API(SrvRegisterServicesProcess)
+{
+ if (ServicesProcessIdValid == TRUE)
+ {
+ /* Only accept a single call */
+ return STATUS_INVALID_PARAMETER;
+ }
+ else
+ {
+ ServicesProcessId =
(ULONG_PTR)ApiMessage->Data.RegisterServicesProcessRequest.ProcessId;
+ ServicesProcessIdValid = TRUE;
+ return STATUS_SUCCESS;
+ }
+}
+
/* EOF */
Modified: branches/ros-csrss/win32ss/user/winsrv/winsrv.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/winsrv/winsrv.h?rev=57610&r1=57609&r2=57610&view=diff
==============================================================================
--- branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/winsrv/winsrv.h [iso-8859-1] Wed Oct 24
22:07:46 2012
@@ -10,3 +10,8 @@
#include <csr/server.h>
#include <win/base.h>
#include <win/windows.h>
+
+
+CSR_API(SrvRegisterServicesProcess);
+
+/* EOF */
