Unnamed objects do not have a base directory.

svn path=/trunk/; revision=15409
This commit is contained in:
Alex Ionescu 2005-05-19 05:26:35 +00:00
parent 1e16c56cc3
commit 2df4b9dc13
7 changed files with 12 additions and 10 deletions

View file

@ -77,7 +77,7 @@ CreateFileMappingA(HANDLE hFile,
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
(lpName ? &UnicodeName : NULL), (lpName ? &UnicodeName : NULL),
0, 0,
hBaseDir, (lpName ? hBaseDir : NULL),
SecurityDescriptor); SecurityDescriptor);
Status = NtCreateSection(&SectionHandle, Status = NtCreateSection(&SectionHandle,
@ -155,7 +155,7 @@ CreateFileMappingW(HANDLE hFile,
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
(lpName ? &UnicodeName : NULL), (lpName ? &UnicodeName : NULL),
0, 0,
hBaseDir, (lpName ? hBaseDir : NULL),
SecurityDescriptor); SecurityDescriptor);
Status = NtCreateSection(&SectionHandle, Status = NtCreateSection(&SectionHandle,

View file

@ -77,7 +77,7 @@ CreateEventW(LPSECURITY_ATTRIBUTES lpEventAttributes,
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
(lpName ? &UnicodeName : NULL), (lpName ? &UnicodeName : NULL),
0, 0,
hBaseDir, (lpName ? hBaseDir : NULL),
NULL); NULL);
if (lpEventAttributes != NULL) if (lpEventAttributes != NULL)

View file

@ -76,7 +76,7 @@ CreateMutexW(LPSECURITY_ATTRIBUTES lpMutexAttributes,
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
(lpName ? &UnicodeName : NULL), (lpName ? &UnicodeName : NULL),
0, 0,
hBaseDir, (lpName ? hBaseDir : NULL),
NULL); NULL);
if (lpMutexAttributes != NULL) if (lpMutexAttributes != NULL)

View file

@ -77,7 +77,7 @@ CreateSemaphoreW(LPSECURITY_ATTRIBUTES lpSemaphoreAttributes,
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
(lpName ? &UnicodeName : NULL), (lpName ? &UnicodeName : NULL),
0, 0,
hBaseDir, (lpName ? hBaseDir : NULL),
NULL); NULL);
if (lpSemaphoreAttributes != NULL) if (lpSemaphoreAttributes != NULL)

View file

@ -38,7 +38,7 @@ CreateWaitableTimerW(LPSECURITY_ATTRIBUTES lpTimerAttributes,
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
(lpTimerName ? &UnicodeName : NULL), (lpTimerName ? &UnicodeName : NULL),
0, 0,
hBaseDir, (lpTimerName ? hBaseDir : NULL),
NULL); NULL);
if (lpTimerAttributes != NULL) if (lpTimerAttributes != NULL)

View file

@ -278,7 +278,7 @@ IopSecurityFile(PVOID ObjectBody,
if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN)
{ {
/* Get the Device Object */ /* Get the Device Object */
DPRINT1("here\n"); DPRINT("here\n");
DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject);
/* Assign the Security Descriptor */ /* Assign the Security Descriptor */

View file

@ -74,7 +74,11 @@ ObpCaptureObjectName(IN OUT PUNICODE_STRING CapturedName,
} }
/* Fail if anything up to here died */ /* Fail if anything up to here died */
if (!NT_SUCCESS(Status)) return Status; if (!NT_SUCCESS(Status))
{
DPRINT1("Probing failed\n");
return Status;
}
} }
else else
{ {
@ -228,14 +232,12 @@ ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes,
} }
else else
{ {
#if 0 /*FIXME: FIX KERNEL32 and STUFF!!! */
/* He can't have specified a Root Directory */ /* He can't have specified a Root Directory */
if (ObjectCreateInfo->RootDirectory) if (ObjectCreateInfo->RootDirectory)
{ {
DPRINT1("Invalid name\n"); DPRINT1("Invalid name\n");
Status = STATUS_OBJECT_NAME_INVALID; Status = STATUS_OBJECT_NAME_INVALID;
} }
#endif
} }
fail: fail: