[CSRSRV]: CSRSS tries to connect with itself and already has the region mapped, so allow this as a hack.

svn path=/trunk/; revision=53051
This commit is contained in:
Alex Ionescu 2011-08-03 15:45:16 +00:00
parent b3526a42af
commit a768ce8ab6
2 changed files with 8 additions and 1 deletions

View file

@ -293,6 +293,12 @@ CsrSrvAttachSharedSection(IN PCSRSS_PROCESS_DATA CsrProcess OPTIONAL,
ViewUnmap,
SEC_NO_CHANGE,
PAGE_EXECUTE_READ);
if (Status == STATUS_CONFLICTING_ADDRESSES)
{
/* I Think our csrss tries to connect to itself... */
DPRINT1("Multiple mapping hack\n");
Status = STATUS_SUCCESS;
}
if (!NT_SUCCESS(Status)) return Status;
}

View file

@ -497,6 +497,7 @@ CsrSrvCreateSharedSection(IN PCHAR ParameterValue);
static NTSTATUS
CsrpCreateHeap (int argc, char ** argv, char ** envp)
{
CHAR Value[] = "1024,3072,512";
NTSTATUS Status;
DPRINT("CSR: %s called\n", __FUNCTION__);
@ -512,7 +513,7 @@ CsrpCreateHeap (int argc, char ** argv, char ** envp)
}
Status = CsrSrvCreateSharedSection("1024,3072,512");
Status = CsrSrvCreateSharedSection(Value);
DPRINT1("Status: %lx\n", Status);
ASSERT(Status == STATUS_SUCCESS);