[USB-BRINGUP-TRUNK]

[reactos.git] / base / setup / usetup / interface / devinst.c

diff --git a/base/setup/usetup/interface/devinst.c b/base/setup/usetup/interface/devinst.c
index 8ea6444..3c1e43d 100644 (file)
--- a/base/setup/usetup/interface/devinst.c
+++ b/base/setup/usetup/interface/devinst.c
@@ -11,10 +11,6 @@
 #define NDEBUG
 #include <debug.h>
 
-#define INITGUID
-#include <guiddef.h>
-#include <libs/umpnpmgr/sysguid.h>
-
 BOOLEAN
 ResetDevice(
     IN LPCWSTR DeviceId)
@@ -65,6 +61,9 @@ InstallDriver(
     /* Find associated driver name */
     /* FIXME: check in other sections too! */
     if (!SetupFindFirstLineW(hInf, L"BootBusExtenders.Load", Driver, &Context)
+     && !SetupFindFirstLineW(hInf, L"BusExtenders.Load", Driver, &Context)
+     && !SetupFindFirstLineW(hInf, L"SCSI.Load", Driver, &Context)
+        && !SetupFindFirstLineW(hInf, L"InputDevicesSupport.Load", Driver, &Context)
      && !SetupFindFirstLineW(hInf, L"Keyboard.Load", Driver, &Context))
         return FALSE;
     if (!INF_GetDataField(&Context, 1, &ImagePath))
@@ -81,7 +80,7 @@ InstallDriver(
     RtlCopyMemory(FullImagePath, PathPrefix.Buffer, PathPrefix.MaximumLength);
     wcscat(FullImagePath, ImagePath);
 
-    DPRINT("Using driver '%S' for device '%S'\n", ImagePath, DeviceId);
+    DPRINT1("Using driver '%S' for device '%S'\n", ImagePath, DeviceId);
 
     /* Create service key */
     RtlInitUnicodeString(&StringU, Driver);