ntoskrnl.exe: Return STATUS_INVALID_DEVICE_REQUEST when calling unhandled driver function.

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sebastian Lackner 2016-10-05 23:30:10 +02:00 committed by Alexandre Julliard
parent e27ff36fc6
commit 302d86f1a9
1 changed files with 24 additions and 9 deletions

View File

@ -884,6 +884,15 @@ static void build_driver_keypath( const WCHAR *name, UNICODE_STRING *keypath )
}
static NTSTATUS WINAPI unhandled_irp( DEVICE_OBJECT *device, IRP *irp )
{
TRACE( "(%p, %p)\n", device, irp );
irp->IoStatus.u.Status = STATUS_INVALID_DEVICE_REQUEST;
IoCompleteRequest( irp, IO_NO_INCREMENT );
return STATUS_INVALID_DEVICE_REQUEST;
}
/***********************************************************************
* IoCreateDriver (NTOSKRNL.EXE.@)
*/
@ -891,6 +900,7 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init )
{
struct wine_driver *driver;
NTSTATUS status;
unsigned int i;
TRACE("(%s, %p)\n", debugstr_us(name), init);
@ -909,24 +919,29 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init )
driver->driver_obj.DriverExtension = &driver->driver_extension;
driver->driver_extension.DriverObject = &driver->driver_obj;
build_driver_keypath( driver->driver_obj.DriverName.Buffer, &driver->driver_extension.ServiceKeyName );
for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++)
driver->driver_obj.MajorFunction[i] = unhandled_irp;
status = driver->driver_obj.DriverInit( &driver->driver_obj, &driver->driver_extension.ServiceKeyName );
if (status)
{
RtlFreeUnicodeString( &driver->driver_obj.DriverName );
RtlFreeUnicodeString( &driver->driver_extension.ServiceKeyName );
RtlFreeHeap( GetProcessHeap(), 0, driver );
}
else
{
EnterCriticalSection( &drivers_cs );
if (wine_rb_put( &wine_drivers, &driver->driver_obj.DriverName, &driver->entry ))
ERR( "failed to insert driver %s in tree\n", debugstr_us(name) );
LeaveCriticalSection( &drivers_cs );
return status;
}
return status;
for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++)
{
if (driver->driver_obj.MajorFunction[i]) continue;
driver->driver_obj.MajorFunction[i] = unhandled_irp;
}
EnterCriticalSection( &drivers_cs );
if (wine_rb_put( &wine_drivers, &driver->driver_obj.DriverName, &driver->entry ))
ERR( "failed to insert driver %s in tree\n", debugstr_us(name) );
LeaveCriticalSection( &drivers_cs );
return STATUS_SUCCESS;
}