[PATCH 1/3] wineusb: Quiet down unhandled minor function debug message

[Andrew Eikum]

Signed-off-by: Andrew Eikum 
---

These three patches quiet down Wine dumping these ERRs and FIXMEs on
every launch and exit when I have some USB device plugged in.

dlls/wineusb.sys/wineusb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c
index 55bd84ea30..d5ebe7693d 100644
--- a/dlls/wineusb.sys/wineusb.c
+++ b/dlls/wineusb.sys/wineusb.c
@@ -274,7 +274,7 @@ static NTSTATUS fdo_pnp(IRP *irp)
         }

default:
-            FIXME("Unhandled minor function %#x.\n", stack->MinorFunction);
+            TRACE("Unhandled minor function %#x.\n", stack->MinorFunction);
     }

IoSkipCurrentIrpStackLocation(irp);
@@ -382,7 +382,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp)
             break;

default:
-            FIXME("Unhandled minor function %#x.\n", stack->MinorFunction);
+            TRACE("Unhandled minor function %#x.\n", stack->MinorFunction);
     }

irp->IoStatus.Status = ret;

[Zebediah Figura]

On 4/24/20 11:05 AM, Andrew Eikum wrote:
> Signed-off-by: Andrew Eikum
>
> These three patches quiet down Wine dumping these ERRs and FIXMEs on
> every launch and exit when I have some USB device plugged in.
>
> dlls/wineusb.sys/wineusb.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c
> index 55bd84ea30..d5ebe7693d 100644
> --- a/dlls/wineusb.sys/wineusb.c
> +++ b/dlls/wineusb.sys/wineusb.c
> @@ -274,7 +274,7 @@ static NTSTATUS fdo_pnp(IRP *irp)
>           }
>       default:
> -
>        FIXME("Unhandled minor function %#x.\n", stack->MinorFunction);
> -
>        TRACE("Unhandled minor function %#x.\n", stack->MinorFunction);
> }
>
> IoSkipCurrentIrpStackLocation(irp);

Is this function actually producing any messages for you?
> @@ -382,7 +382,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp)
>               break;
>       default:
> -
>        FIXME("Unhandled minor function %#x.\n", stack->MinorFunction);
> -
>        TRACE("Unhandled minor function %#x.\n", stack->MinorFunction);
> }
>
> irp->IoStatus.Status = ret;

This seems less than ideal to me. I've sent a patch that implements 
IRP_MN_SURPRISE_REMOVAL and IRP_MN_REMOVE_DEVICE instead. Does this work 
for you?

[Andrew Eikum]

On Fri, Apr 24, 2020 at 11:44:47AM -0500, Zebediah Figura wrote:
> On 4/24/20 11:05 AM, Andrew Eikum wrote:
> > Signed-off-by: Andrew Eikum
> >
> > These three patches quiet down Wine dumping these ERRs and FIXMEs on
> > every launch and exit when I have some USB device plugged in.
> >
> > dlls/wineusb.sys/wineusb.c | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c
> > index 55bd84ea30..d5ebe7693d 100644
> > --- a/dlls/wineusb.sys/wineusb.c
> > +++ b/dlls/wineusb.sys/wineusb.c
> > @@ -274,7 +274,7 @@ static NTSTATUS fdo_pnp(IRP *irp)
> >           }
> >           default:
> > -
> >        FIXME("Unhandled minor function %#x.\n", stack->MinorFunction);
> > -
> >        TRACE("Unhandled minor function %#x.\n", stack->MinorFunction);
> > }
> > IoSkipCurrentIrpStackLocation(irp);
>
> Is this function actually producing any messages for you?

No, just turned up in the same grep.
> > @@ -382,7 +382,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp)
> >               break;
> >           default:
> > -
> >        FIXME("Unhandled minor function %#x.\n", stack->MinorFunction);
> > -
> >        TRACE("Unhandled minor function %#x.\n", stack->MinorFunction);
> > }
> > irp->IoStatus.Status = ret;
>
> This seems less than ideal to me. I've sent a patch that implements
> IRP_MN_SURPRISE_REMOVAL and IRP_MN_REMOVE_DEVICE instead. Does this work for
> you?

Yes, that gets rid of the messages on shutdown.

Andrew