mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 05:10:36 +00:00
include: Don't accidentally redefine a member in struct _IRP (LLVM/Clang).
This commit is contained in:
parent
69ee0ad151
commit
5415b62fc2
|
@ -858,7 +858,7 @@ NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, ch
|
|||
/* handler for ioctls on the harddisk device */
|
||||
static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp )
|
||||
{
|
||||
IO_STACK_LOCATION *irpsp = irp->Tail.Overlay.s.u.CurrentStackLocation;
|
||||
IO_STACK_LOCATION *irpsp = irp->Tail.Overlay.s.u2.CurrentStackLocation;
|
||||
struct disk_device *dev = device->DeviceExtension;
|
||||
|
||||
TRACE( "ioctl %x insize %u outsize %u\n",
|
||||
|
|
|
@ -351,7 +351,7 @@ done:
|
|||
/* handler for ioctls on the mount manager device */
|
||||
static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp )
|
||||
{
|
||||
IO_STACK_LOCATION *irpsp = irp->Tail.Overlay.s.u.CurrentStackLocation;
|
||||
IO_STACK_LOCATION *irpsp = irp->Tail.Overlay.s.u2.CurrentStackLocation;
|
||||
|
||||
TRACE( "ioctl %x insize %u outsize %u\n",
|
||||
irpsp->Parameters.DeviceIoControl.IoControlCode,
|
||||
|
|
|
@ -144,7 +144,7 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff,
|
|||
irp.AssociatedIrp.SystemBuffer = in_buff;
|
||||
irp.UserBuffer = out_buff;
|
||||
irp.MdlAddress = &mdl;
|
||||
irp.Tail.Overlay.s.u.CurrentStackLocation = &irpsp;
|
||||
irp.Tail.Overlay.s.u2.CurrentStackLocation = &irpsp;
|
||||
irp.UserIosb = NULL;
|
||||
|
||||
irpsp.MajorFunction = IRP_MJ_DEVICE_CONTROL;
|
||||
|
@ -294,7 +294,7 @@ void WINAPI IoInitializeIrp( IRP *irp, USHORT size, CCHAR stack_size )
|
|||
InitializeListHead( &irp->ThreadListEntry );
|
||||
irp->StackCount = stack_size;
|
||||
irp->CurrentLocation = stack_size + 1;
|
||||
irp->Tail.Overlay.s.u.CurrentStackLocation =
|
||||
irp->Tail.Overlay.s.u2.CurrentStackLocation =
|
||||
(PIO_STACK_LOCATION)(irp + 1) + stack_size;
|
||||
}
|
||||
|
||||
|
@ -434,7 +434,7 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG IoControlCode,
|
|||
instance->irp = irp;
|
||||
list_add_tail( &Irps, &instance->entry );
|
||||
|
||||
irpsp = irp->Tail.Overlay.s.u.CurrentStackLocation - 1;
|
||||
irpsp = irp->Tail.Overlay.s.u2.CurrentStackLocation - 1;
|
||||
irpsp->MajorFunction = InternalDeviceIoControl ?
|
||||
IRP_MJ_INTERNAL_DEVICE_CONTROL : IRP_MJ_DEVICE_CONTROL;
|
||||
irpsp->Parameters.DeviceIoControl.IoControlCode = IoControlCode;
|
||||
|
@ -647,7 +647,7 @@ NTSTATUS WINAPI IofCallDriver( DEVICE_OBJECT *device, IRP *irp )
|
|||
TRACE( "%p %p\n", device, irp );
|
||||
|
||||
--irp->CurrentLocation;
|
||||
irpsp = --irp->Tail.Overlay.s.u.CurrentStackLocation;
|
||||
irpsp = --irp->Tail.Overlay.s.u2.CurrentStackLocation;
|
||||
dispatch = device->DriverObject->MajorFunction[irpsp->MajorFunction];
|
||||
status = dispatch( device, irp );
|
||||
|
||||
|
@ -744,7 +744,7 @@ void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost )
|
|||
status = irp->IoStatus.u.Status;
|
||||
while (irp->CurrentLocation <= irp->StackCount)
|
||||
{
|
||||
irpsp = irp->Tail.Overlay.s.u.CurrentStackLocation;
|
||||
irpsp = irp->Tail.Overlay.s.u2.CurrentStackLocation;
|
||||
routine = irpsp->CompletionRoutine;
|
||||
call_flag = 0;
|
||||
/* FIXME: add SL_INVOKE_ON_CANCEL support */
|
||||
|
@ -756,7 +756,7 @@ void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost )
|
|||
call_flag = 1;
|
||||
}
|
||||
++irp->CurrentLocation;
|
||||
++irp->Tail.Overlay.s.u.CurrentStackLocation;
|
||||
++irp->Tail.Overlay.s.u2.CurrentStackLocation;
|
||||
if (call_flag)
|
||||
{
|
||||
TRACE( "calling %p( %p, %p, %p )\n", routine,
|
||||
|
|
|
@ -423,7 +423,7 @@ typedef struct _IRP {
|
|||
struct {
|
||||
PVOID DriverContext[4];
|
||||
} DUMMYSTRUCTNAME;
|
||||
} DUMMYUNIONNAME;
|
||||
} DUMMYUNIONNAME1;
|
||||
PETHREAD Thread;
|
||||
PCHAR AuxiliaryBuffer;
|
||||
struct {
|
||||
|
@ -431,7 +431,7 @@ typedef struct _IRP {
|
|||
union {
|
||||
struct _IO_STACK_LOCATION *CurrentStackLocation;
|
||||
ULONG PacketType;
|
||||
} DUMMYUNIONNAME;
|
||||
} DUMMYUNIONNAME2;
|
||||
} DUMMYSTRUCTNAME;
|
||||
struct _FILE_OBJECT *OriginalFileObject;
|
||||
} Overlay;
|
||||
|
|
Loading…
Reference in a new issue