[ros-diffs] [hpoussin] 27411: Do not rely on a call to AddDevice with a NULL PDO to start to use a legacy video miniport

[hpoussin at svn.reactos.org]

Author: hpoussin
Date: Fri Jul  6 00:03:22 2007
New Revision: 27411

URL: http://svn.reactos.org/svn/reactos?rev=27411&view=rev
Log:
Do not rely on a call to AddDevice with a NULL PDO to start to use a legacy video miniport

Modified:
    trunk/reactos/drivers/video/miniport/vbe/vbemp.c
    trunk/reactos/drivers/video/miniport/vga/vgamp.c
    trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
    trunk/reactos/drivers/video/videoprt/dispatch.c

Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe/vbemp.c?rev=27411&r1=27410&r2=27411&view=diff
==============================================================================
--- trunk/reactos/drivers/video/miniport/vbe/vbemp.c (original)
+++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c Fri Jul  6 00:03:22 2007
@@ -37,7 +37,7 @@
    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;

Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga/vgamp.c?rev=27411&r1=27410&r2=27411&view=diff
==============================================================================
--- trunk/reactos/drivers/video/miniport/vga/vgamp.c (original)
+++ trunk/reactos/drivers/video/miniport/vga/vgamp.c Fri Jul  6 00:03:22 2007
@@ -31,7 +31,7 @@
 
   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;
 

Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c?rev=27411&r1=27410&r2=27411&view=diff
==============================================================================
--- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c (original)
+++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c Fri Jul  6 00:03:22 2007
@@ -42,7 +42,7 @@
 
   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;

Modified: trunk/reactos/drivers/video/videoprt/dispatch.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dispatch.c?rev=27411&r1=27410&r2=27411&view=diff
==============================================================================
--- trunk/reactos/drivers/video/videoprt/dispatch.c (original)
+++ trunk/reactos/drivers/video/videoprt/dispatch.c Fri Jul  6 00:03:22 2007
@@ -81,14 +81,7 @@
       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;
 }