hidclass.sys: Fix compilation on systems that don't support nameless structs.
Signed-off-by: André Hentschel <nerv@dawncrow.de> Signed-off-by: Aric Stewart <aric@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
e2a4974f39
commit
902b8a2b6d
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#define NONAMELESSUNION
|
#define NONAMELESSUNION
|
||||||
|
#define NONAMELESSSTRUCT
|
||||||
#include "hid.h"
|
#include "hid.h"
|
||||||
#include "wine/unicode.h"
|
#include "wine/unicode.h"
|
||||||
#include "winreg.h"
|
#include "winreg.h"
|
||||||
|
@ -184,7 +185,7 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device
|
||||||
entry = RemoveHeadList(&ext->irp_queue);
|
entry = RemoveHeadList(&ext->irp_queue);
|
||||||
while(entry != &ext->irp_queue)
|
while(entry != &ext->irp_queue)
|
||||||
{
|
{
|
||||||
irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry);
|
irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry);
|
||||||
irp->IoStatus.u.Status = STATUS_DEVICE_REMOVED;
|
irp->IoStatus.u.Status = STATUS_DEVICE_REMOVED;
|
||||||
IoCompleteRequest(irp, IO_NO_INCREMENT);
|
IoCompleteRequest(irp, IO_NO_INCREMENT);
|
||||||
entry = RemoveHeadList(&ext->irp_queue);
|
entry = RemoveHeadList(&ext->irp_queue);
|
||||||
|
@ -237,7 +238,7 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device)
|
||||||
while(entry != &ext->irp_queue)
|
while(entry != &ext->irp_queue)
|
||||||
{
|
{
|
||||||
int ptr;
|
int ptr;
|
||||||
irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry);
|
irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry);
|
||||||
ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext );
|
ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext );
|
||||||
|
|
||||||
RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size);
|
RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size);
|
||||||
|
@ -680,7 +681,7 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
TRACE_(hid_report)("Queue irp\n");
|
TRACE_(hid_report)("Queue irp\n");
|
||||||
InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry);
|
InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry);
|
||||||
rc = STATUS_PENDING;
|
rc = STATUS_PENDING;
|
||||||
}
|
}
|
||||||
HeapFree(GetProcessHeap(), 0, packet);
|
HeapFree(GetProcessHeap(), 0, packet);
|
||||||
|
|
Loading…
Reference in New Issue