* advapi32.cc (AllocateLocallyUniqueId): Remove.

* fhandler_disk_file.cc (fhandler_base::open_fs): Replace call to
	AllocateLocallyUniqueId with call to NtAllocateLocallyUniqueId;
	* posix_ipc.cc (mq_open): Ditto.  Drop error handling for that call.
	(sem_open): Ditto.
This commit is contained in:
Corinna Vinschen 2011-04-28 08:15:56 +00:00
parent f97612978a
commit 41e9c14558
4 changed files with 11 additions and 18 deletions

View File

@ -1,3 +1,11 @@
2011-04-28 Corinna Vinschen <corinna@vinschen.de>
* advapi32.cc (AllocateLocallyUniqueId): Remove.
* fhandler_disk_file.cc (fhandler_base::open_fs): Replace call to
AllocateLocallyUniqueId with call to NtAllocateLocallyUniqueId;
* posix_ipc.cc (mq_open): Ditto. Drop error handling for that call.
(sem_open): Ditto.
2011-04-28 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc (GetSecurityInfo): Remove.

View File

@ -19,13 +19,6 @@ details. */
SetLastError (RtlNtStatusToDosError (status)); \
return NT_SUCCESS (status);
BOOL WINAPI
AllocateLocallyUniqueId (PLUID luid)
{
NTSTATUS status = NtAllocateLocallyUniqueId (luid);
DEFAULT_NTSTATUS_TO_BOOL_RETURN
}
BOOL WINAPI
AccessCheck (PSECURITY_DESCRIPTOR sd, HANDLE tok, DWORD access,
PGENERIC_MAPPING mapping, PPRIVILEGE_SET pset, LPDWORD psetlen,

View File

@ -1403,7 +1403,7 @@ fhandler_base::open_fs (int flags, mode_t mode)
ino = pc.get_ino_by_handle (get_handle ());
/* A unique ID is necessary to recognize fhandler entries which are
duplicated by dup(2) or fork(2). */
AllocateLocallyUniqueId ((PLUID) &unique_id);
NtAllocateLocallyUniqueId ((PLUID) &unique_id);
out:
syscall_printf ("%d = fhandler_disk_file::open (%S, %p)", res,

View File

@ -419,11 +419,7 @@ again:
mqhdr->mqh_attr.mq_curmsgs = 0;
mqhdr->mqh_nwait = 0;
mqhdr->mqh_pid = 0;
if (!AllocateLocallyUniqueId (&luid))
{
__seterrno ();
goto err;
}
NtAllocateLocallyUniqueId (&luid);
__small_sprintf (mqhdr->mqh_uname, "%016X%08x%08x",
hash_path_name (0,mqname),
luid.HighPart, luid.LowPart);
@ -1008,11 +1004,7 @@ again:
}
created = 1;
/* First one to create the file initializes it. */
if (!AllocateLocallyUniqueId (&sf.luid))
{
__seterrno ();
goto err;
}
NtAllocateLocallyUniqueId (&sf.luid);
sf.value = value;
sf.hash = hash_path_name (0, semname);
if (write (fd, &sf, sizeof sf) != sizeof sf)