Author: fireball
Date: Sat Sep 8 16:02:52 2007
New Revision: 28941
URL:
http://svn.reactos.org/svn/reactos?rev=28941&view=rev
Log:
- NTLPC always 1 now, remove deprecated code
- Unlock SMSS: authors are clearly known, history of smss goes to the beginnings of the
project. Code needs cleaning up (headers, formatting).
Modified:
trunk/reactos/base/system/smss/client.c (props changed)
trunk/reactos/base/system/smss/debug.c (props changed)
trunk/reactos/base/system/smss/init.c (props changed)
trunk/reactos/base/system/smss/initdosdev.c (props changed)
trunk/reactos/base/system/smss/initenv.c (props changed)
trunk/reactos/base/system/smss/initobdir.c (props changed)
trunk/reactos/base/system/smss/initpage.c (props changed)
trunk/reactos/base/system/smss/initrun.c (props changed)
trunk/reactos/base/system/smss/initss.c (props changed)
trunk/reactos/base/system/smss/smapi.c (contents, props changed)
trunk/reactos/base/system/smss/smapiquery.c (props changed)
Propchange: trunk/reactos/base/system/smss/client.c
------------------------------------------------------------------------------
--- svn:needs-lock (original)
+++ svn:needs-lock (removed)
@@ -1,1 +1,0 @@
-*
Propchange: trunk/reactos/base/system/smss/debug.c
------------------------------------------------------------------------------
--- svn:needs-lock (original)
+++ svn:needs-lock (removed)
@@ -1,1 +1,0 @@
-*
Propchange: trunk/reactos/base/system/smss/init.c
------------------------------------------------------------------------------
--- svn:needs-lock (original)
+++ svn:needs-lock (removed)
@@ -1,1 +1,0 @@
-*
Propchange: trunk/reactos/base/system/smss/initdosdev.c
------------------------------------------------------------------------------
--- svn:needs-lock (original)
+++ svn:needs-lock (removed)
@@ -1,1 +1,0 @@
-*
Propchange: trunk/reactos/base/system/smss/initenv.c
------------------------------------------------------------------------------
--- svn:needs-lock (original)
+++ svn:needs-lock (removed)
@@ -1,1 +1,0 @@
-*
Propchange: trunk/reactos/base/system/smss/initobdir.c
------------------------------------------------------------------------------
--- svn:needs-lock (original)
+++ svn:needs-lock (removed)
@@ -1,1 +1,0 @@
-*
Propchange: trunk/reactos/base/system/smss/initpage.c
------------------------------------------------------------------------------
--- svn:needs-lock (original)
+++ svn:needs-lock (removed)
@@ -1,1 +1,0 @@
-*
Propchange: trunk/reactos/base/system/smss/initrun.c
------------------------------------------------------------------------------
--- svn:needs-lock (original)
+++ svn:needs-lock (removed)
@@ -1,1 +1,0 @@
-*
Propchange: trunk/reactos/base/system/smss/initss.c
------------------------------------------------------------------------------
--- svn:needs-lock (original)
+++ svn:needs-lock (removed)
@@ -1,1 +1,0 @@
-*
Modified: trunk/reactos/base/system/smss/smapi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapi.c?r…
==============================================================================
--- trunk/reactos/base/system/smss/smapi.c (original)
+++ trunk/reactos/base/system/smss/smapi.c Sat Sep 8 16:02:52 2007
@@ -249,21 +249,14 @@
}
}
DPRINT("SM: %s: before NtAcceptConnectPort\n", __FUNCTION__);
-#if defined(NTLPC)
+
Status = NtAcceptConnectPort (ClientDataApiPort,
Context,
(PPORT_MESSAGE) Request,
Accept,
NULL,
NULL);
-#else /* ReactOS LPC */
- Status = NtAcceptConnectPort (ClientDataApiPort,
- SmApiPort, // ROS LPC requires the listen port here
- Context,
- Accept,
- NULL,
- NULL);
-#endif
+
if(Accept)
{
if(!NT_SUCCESS(Status))
@@ -280,25 +273,6 @@
__FUNCTION__, Status);
return Status;
}
-#if !defined(NTLPC) /* ReactOS LPC */
- DPRINT("SM: %s: server side comm port thread (ROS LPC)\n", __FUNCTION__);
- Status = RtlCreateUserThread(NtCurrentProcess(),
- NULL,
- FALSE,
- 0,
- 0,
- 0,
- (PTHREAD_START_ROUTINE) SmpApiConnectedThread,
- ClientDataApiPort,
- ClientDataApiPortThread,
- NULL);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("SM: %s: Unable to create server thread (Status=0x%08lx)\n",
- __FUNCTION__, Status);
- return Status;
- }
-#endif
}
Status = STATUS_SUCCESS;
}
@@ -390,17 +364,11 @@
0,
0,
0,
-#ifdef NTLPC
- (PTHREAD_START_ROUTINE)SmpApiConnectedThread,
- &SmApiPort,
-#else
- (PTHREAD_START_ROUTINE)SmpApiThread,
- (PVOID)SmApiPort,
-#endif
+ (PTHREAD_START_ROUTINE)SmpApiConnectedThread,
+ &SmApiPort,
NULL,
NULL);
-#ifdef NTLPC
//
// On NT LPC, we need a second thread to handle incoming connections
// generated by incoming requests, otherwise the thread handling
@@ -417,7 +385,6 @@
&SmApiPort,
NULL,
NULL);
-#endif
return(Status);
}
Propchange: trunk/reactos/base/system/smss/smapi.c
------------------------------------------------------------------------------
--- svn:needs-lock (original)
+++ svn:needs-lock (removed)
@@ -1,1 +1,0 @@
-*
Propchange: trunk/reactos/base/system/smss/smapiquery.c
------------------------------------------------------------------------------
--- svn:needs-lock (original)
+++ svn:needs-lock (removed)
@@ -1,1 +1,0 @@
-*