=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winebus.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: 1afcfc77d376916466035ab5c085dcb8201ecd03
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1afcfc77d376916466035ab5c085dcb8201ecd03

Author: André Hentschel <nerv at dawncrow.de>
Date:   Wed Jan 25 22:14:58 2017 +0100

winebus.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/winebus.sys/main.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c
index ed95435..978540b 100644
--- a/dlls/winebus.sys/main.c
+++ b/dlls/winebus.sys/main.c
@@ -21,6 +21,7 @@
 #include <stdarg.h>
 
 #define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
@@ -303,7 +304,7 @@ void bus_remove_hid_device(DEVICE_OBJECT *device)
     EnterCriticalSection(&ext->report_cs);
     while ((entry = RemoveHeadList(&ext->irp_queue)) != &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_CANCELLED;
         irp->IoStatus.Information = 0;
         IoCompleteRequest(irp, IO_NO_INCREMENT);
@@ -525,7 +526,7 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp)
             }
             else
             {
-                InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry);
+                InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.s.ListEntry);
                 status = STATUS_PENDING;
             }
             LeaveCriticalSection(&ext->report_cs);
@@ -613,7 +614,7 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length)
     {
         IO_STACK_LOCATION *irpsp;
         TRACE_(hid_report)("Processing Request\n");
-        irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry);
+        irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry);
         irpsp = IoGetCurrentIrpStackLocation(irp);
         irp->IoStatus.u.Status = deliver_last_report(ext,
             irpsp->Parameters.DeviceIoControl.OutputBufferLength,




More information about the wine-cvs mailing list