* autoload.cc (UuidCreate): Remove.
(UuidCreateSequential): Remove. * passwd.cc (internal_getpwsid): Avoid a strict-aliasing compiler error with gcc 4.5.1. * fhandler_floppy.cc (fhandler_dev_floppy::get_drive_info): Ditto. * ntdll.h (NtAllocateUuids): Declare. * syscalls.cc (gethostid): Use NtAllocateUuids function rather than UuidCreateSequential/UuidCreate to get rid of rpcrt4 dependency.
This commit is contained in:
@ -41,6 +41,7 @@ fhandler_dev_floppy::get_drive_info (struct hd_geometry *geo)
|
||||
char dbuf[256];
|
||||
char pbuf[256];
|
||||
|
||||
DISK_GEOMETRY_EX *dix = NULL;
|
||||
DISK_GEOMETRY *di = NULL;
|
||||
PARTITION_INFORMATION_EX *pix = NULL;
|
||||
PARTITION_INFORMATION *pi = NULL;
|
||||
@ -57,7 +58,8 @@ fhandler_dev_floppy::get_drive_info (struct hd_geometry *geo)
|
||||
__seterrno ();
|
||||
else
|
||||
{
|
||||
di = &((DISK_GEOMETRY_EX *) dbuf)->Geometry;
|
||||
dix = (DISK_GEOMETRY_EX *) dbuf;
|
||||
di = &dix->Geometry;
|
||||
if (!DeviceIoControl (get_handle (),
|
||||
IOCTL_DISK_GET_PARTITION_INFO_EX, NULL, 0,
|
||||
pbuf, 256, &bytes_read, NULL))
|
||||
|
Reference in New Issue
Block a user