Make NTDLL not bind automatically to the Win32 server.
This will allow other personality subsystem not to depend on Win32.
Modified: trunk/reactos/lib/kernel32/misc/dllmain.c
Modified: trunk/reactos/lib/ntdll/csr/lpc.c
Modified: trunk/reactos/subsys/csrss/init.c
_____
Modified: trunk/reactos/lib/kernel32/misc/dllmain.c
--- trunk/reactos/lib/kernel32/misc/dllmain.c 2005-08-16 05:17:06 UTC
(rev 17410)
+++ trunk/reactos/lib/kernel32/misc/dllmain.c 2005-08-16 14:24:00 UTC
(rev 17411)
@@ -218,7 +218,7 @@
/*
* Connect to the csrss server
*/
- Status = CsrClientConnectToServer(NULL,
+ Status = CsrClientConnectToServer(L"\\Windows\\ApiPort",
0,
NULL,
NULL,
_____
Modified: trunk/reactos/lib/ntdll/csr/lpc.c
--- trunk/reactos/lib/ntdll/csr/lpc.c 2005-08-16 05:17:06 UTC (rev
17410)
+++ trunk/reactos/lib/ntdll/csr/lpc.c 2005-08-16 14:24:00 UTC (rev
17411)
@@ -109,8 +109,8 @@
ULONG ContextLength,
PBOOLEAN ServerToServerCall)
{
- NTSTATUS Status;
- UNICODE_STRING PortName =
RTL_CONSTANT_STRING(L"\\Windows\\ApiPort");
+ NTSTATUS Status = STATUS_SUCCESS;
+ UNICODE_STRING PortName;
ULONG ConnectInfoLength;
CSR_API_MESSAGE Request;
PORT_VIEW LpcWrite;
@@ -122,6 +122,13 @@
return STATUS_SUCCESS;
}
+ if (NULL == ObjectDirectory)
+ {
+ return STATUS_INVALID_PARAMETER;
+ }
+
+ RtlInitUnicodeString (& PortName, ObjectDirectory);
+
CsrSectionViewSize.QuadPart = CSR_CSRSS_SECTION_SIZE;
Status = NtCreateSection(&CsrSectionHandle,
SECTION_ALL_ACCESS,
_____
Modified: trunk/reactos/subsys/csrss/init.c
--- trunk/reactos/subsys/csrss/init.c 2005-08-16 05:17:06 UTC (rev
17410)
+++ trunk/reactos/subsys/csrss/init.c 2005-08-16 14:24:00 UTC (rev
17411)
@@ -458,7 +458,8 @@
static NTSTATUS
CsrpCCTS (ULONG argc, PWSTR* argv)
{
- return CsrClientConnectToServer(NULL, 0, NULL, NULL, 0, NULL);
+ return CsrClientConnectToServer(L"\\Windows\\ApiPort",
+ 0, NULL, NULL, 0, NULL);
}
/**********************************************************************
Show replies by date