mirror of
https://github.com/reactos/reactos.git
synced 2024-10-15 05:37:44 +00:00
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:
parent
478a0d960b
commit
a10da52c02
|
@ -37,7 +37,7 @@ DriverEntry(IN PVOID Context1, IN PVOID Context2)
|
||||||
VIDEO_HW_INITIALIZATION_DATA InitData;
|
VIDEO_HW_INITIALIZATION_DATA InitData;
|
||||||
|
|
||||||
VideoPortZeroMemory(&InitData, sizeof(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.HwFindAdapter = VBEFindAdapter;
|
||||||
InitData.HwInitialize = VBEInitialize;
|
InitData.HwInitialize = VBEInitialize;
|
||||||
InitData.HwStartIO = VBEStartIO;
|
InitData.HwStartIO = VBEStartIO;
|
||||||
|
|
|
@ -31,7 +31,7 @@ DriverEntry(IN PVOID Context1,
|
||||||
|
|
||||||
VideoPortZeroMemory(&InitData, sizeof InitData);
|
VideoPortZeroMemory(&InitData, sizeof InitData);
|
||||||
|
|
||||||
InitData.HwInitDataSize = sizeof(InitData);
|
InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA;
|
||||||
/* FIXME: Fill in InitData members */
|
/* FIXME: Fill in InitData members */
|
||||||
InitData.StartingDeviceNumber = 0;
|
InitData.StartingDeviceNumber = 0;
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@ DriverEntry(IN PVOID Context1, IN PVOID Context2)
|
||||||
|
|
||||||
VideoPortZeroMemory(&InitData, sizeof(InitData));
|
VideoPortZeroMemory(&InitData, sizeof(InitData));
|
||||||
InitData.AdapterInterfaceType = PCIBus;
|
InitData.AdapterInterfaceType = PCIBus;
|
||||||
InitData.HwInitDataSize = sizeof(VIDEO_HW_INITIALIZATION_DATA);
|
InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA;
|
||||||
InitData.HwFindAdapter = XboxVmpFindAdapter;
|
InitData.HwFindAdapter = XboxVmpFindAdapter;
|
||||||
InitData.HwInitialize = XboxVmpInitialize;
|
InitData.HwInitialize = XboxVmpInitialize;
|
||||||
InitData.HwStartIO = XboxVmpStartIO;
|
InitData.HwStartIO = XboxVmpStartIO;
|
||||||
|
|
|
@ -81,14 +81,7 @@ IntVideoPortAddDevice(
|
||||||
DriverExtension,
|
DriverExtension,
|
||||||
PhysicalDeviceObject,
|
PhysicalDeviceObject,
|
||||||
&DeviceObject);
|
&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;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue