Do not rely on a call to AddDevice with a NULL PDO to start to use a legacy video miniport

svn path=/trunk/; revision=27411
This commit is contained in:
Hervé Poussineau 2007-07-05 20:03:22 +00:00
parent 478a0d960b
commit a10da52c02
4 changed files with 3 additions and 10 deletions

View file

@ -37,7 +37,7 @@ DriverEntry(IN PVOID Context1, IN PVOID Context2)
VIDEO_HW_INITIALIZATION_DATA InitData;
VideoPortZeroMemory(&InitData, sizeof(InitData));
InitData.HwInitDataSize = sizeof(VIDEO_HW_INITIALIZATION_DATA);
InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA;
InitData.HwFindAdapter = VBEFindAdapter;
InitData.HwInitialize = VBEInitialize;
InitData.HwStartIO = VBEStartIO;

View file

@ -31,7 +31,7 @@ DriverEntry(IN PVOID Context1,
VideoPortZeroMemory(&InitData, sizeof InitData);
InitData.HwInitDataSize = sizeof(InitData);
InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA;
/* FIXME: Fill in InitData members */
InitData.StartingDeviceNumber = 0;

View file

@ -42,7 +42,7 @@ DriverEntry(IN PVOID Context1, IN PVOID Context2)
VideoPortZeroMemory(&InitData, sizeof(InitData));
InitData.AdapterInterfaceType = PCIBus;
InitData.HwInitDataSize = sizeof(VIDEO_HW_INITIALIZATION_DATA);
InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA;
InitData.HwFindAdapter = XboxVmpFindAdapter;
InitData.HwInitialize = XboxVmpInitialize;
InitData.HwStartIO = XboxVmpStartIO;

View file

@ -81,14 +81,7 @@ IntVideoPortAddDevice(
DriverExtension,
PhysicalDeviceObject,
&DeviceObject);
if (!NT_SUCCESS(Status))
return Status;
if (PhysicalDeviceObject == NULL)
{
/* We will never have a IRP_MJ_PNP/IRP_MN_START_DEVICE Irp */
Status = IntVideoPortFindAdapter(DriverObject, DriverExtension, DeviceObject);
}
return Status;
}