=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: hidclass.sys: Fix compilation on systems that don't support nameless structs.
Alexandre Julliard
julliard at winehq.org
Thu Jan 26 14:53:13 CST 2017
Module: wine
Branch: master
Commit: 902b8a2b6d3393c5af52af5b84166634153436a1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=902b8a2b6d3393c5af52af5b84166634153436a1
Author: André Hentschel <nerv at dawncrow.de>
Date: Wed Jan 25 22:14:54 2017 +0100
hidclass.sys: Fix compilation on systems that don't support nameless structs.
Signed-off-by: André Hentschel <nerv at dawncrow.de>
Signed-off-by: Aric Stewart <aric at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/hidclass.sys/device.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c
index b241016..fe79212 100644
--- a/dlls/hidclass.sys/device.c
+++ b/dlls/hidclass.sys/device.c
@@ -22,6 +22,7 @@
#include <stdarg.h>
#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "hid.h"
#include "wine/unicode.h"
#include "winreg.h"
@@ -184,7 +185,7 @@ void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device
entry = RemoveHeadList(&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;
IoCompleteRequest(irp, IO_NO_INCREMENT);
entry = RemoveHeadList(&ext->irp_queue);
@@ -237,7 +238,7 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device)
while(entry != &ext->irp_queue)
{
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 );
RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size);
@@ -680,7 +681,7 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp)
else
{
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;
}
HeapFree(GetProcessHeap(), 0, packet);
More information about the wine-cvs
mailing list