* 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:
parent
f97612978a
commit
41e9c14558
@ -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>
|
2011-04-28 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
* autoload.cc (GetSecurityInfo): Remove.
|
* autoload.cc (GetSecurityInfo): Remove.
|
||||||
|
@ -19,13 +19,6 @@ details. */
|
|||||||
SetLastError (RtlNtStatusToDosError (status)); \
|
SetLastError (RtlNtStatusToDosError (status)); \
|
||||||
return NT_SUCCESS (status);
|
return NT_SUCCESS (status);
|
||||||
|
|
||||||
BOOL WINAPI
|
|
||||||
AllocateLocallyUniqueId (PLUID luid)
|
|
||||||
{
|
|
||||||
NTSTATUS status = NtAllocateLocallyUniqueId (luid);
|
|
||||||
DEFAULT_NTSTATUS_TO_BOOL_RETURN
|
|
||||||
}
|
|
||||||
|
|
||||||
BOOL WINAPI
|
BOOL WINAPI
|
||||||
AccessCheck (PSECURITY_DESCRIPTOR sd, HANDLE tok, DWORD access,
|
AccessCheck (PSECURITY_DESCRIPTOR sd, HANDLE tok, DWORD access,
|
||||||
PGENERIC_MAPPING mapping, PPRIVILEGE_SET pset, LPDWORD psetlen,
|
PGENERIC_MAPPING mapping, PPRIVILEGE_SET pset, LPDWORD psetlen,
|
||||||
|
@ -1403,7 +1403,7 @@ fhandler_base::open_fs (int flags, mode_t mode)
|
|||||||
ino = pc.get_ino_by_handle (get_handle ());
|
ino = pc.get_ino_by_handle (get_handle ());
|
||||||
/* A unique ID is necessary to recognize fhandler entries which are
|
/* A unique ID is necessary to recognize fhandler entries which are
|
||||||
duplicated by dup(2) or fork(2). */
|
duplicated by dup(2) or fork(2). */
|
||||||
AllocateLocallyUniqueId ((PLUID) &unique_id);
|
NtAllocateLocallyUniqueId ((PLUID) &unique_id);
|
||||||
|
|
||||||
out:
|
out:
|
||||||
syscall_printf ("%d = fhandler_disk_file::open (%S, %p)", res,
|
syscall_printf ("%d = fhandler_disk_file::open (%S, %p)", res,
|
||||||
|
@ -419,11 +419,7 @@ again:
|
|||||||
mqhdr->mqh_attr.mq_curmsgs = 0;
|
mqhdr->mqh_attr.mq_curmsgs = 0;
|
||||||
mqhdr->mqh_nwait = 0;
|
mqhdr->mqh_nwait = 0;
|
||||||
mqhdr->mqh_pid = 0;
|
mqhdr->mqh_pid = 0;
|
||||||
if (!AllocateLocallyUniqueId (&luid))
|
NtAllocateLocallyUniqueId (&luid);
|
||||||
{
|
|
||||||
__seterrno ();
|
|
||||||
goto err;
|
|
||||||
}
|
|
||||||
__small_sprintf (mqhdr->mqh_uname, "%016X%08x%08x",
|
__small_sprintf (mqhdr->mqh_uname, "%016X%08x%08x",
|
||||||
hash_path_name (0,mqname),
|
hash_path_name (0,mqname),
|
||||||
luid.HighPart, luid.LowPart);
|
luid.HighPart, luid.LowPart);
|
||||||
@ -1008,11 +1004,7 @@ again:
|
|||||||
}
|
}
|
||||||
created = 1;
|
created = 1;
|
||||||
/* First one to create the file initializes it. */
|
/* First one to create the file initializes it. */
|
||||||
if (!AllocateLocallyUniqueId (&sf.luid))
|
NtAllocateLocallyUniqueId (&sf.luid);
|
||||||
{
|
|
||||||
__seterrno ();
|
|
||||||
goto err;
|
|
||||||
}
|
|
||||||
sf.value = value;
|
sf.value = value;
|
||||||
sf.hash = hash_path_name (0, semname);
|
sf.hash = hash_path_name (0, semname);
|
||||||
if (write (fd, &sf, sizeof sf) != sizeof sf)
|
if (write (fd, &sf, sizeof sf) != sizeof sf)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user