[ros-diffs] [hpoussin] 22103: SP_DRVINFO_DETAIL_DATA_W.InfFileName must contain the full file name Add SetupDiSelectDevice stub

Author: hpoussin
Date: Mon May 29 15:03:24 2006
New Revision: 22103

URL: http://svn.reactos.ru/svn/reactos?rev=22103&view=rev
Log:
SP_DRVINFO_DETAIL_DATA_W.InfFileName must contain the full file name
Add SetupDiSelectDevice stub

Modified:
    trunk/reactos/dll/win32/setupapi/devinst.c
    trunk/reactos/dll/win32/setupapi/setupapi.spec

Modified: trunk/reactos/dll/win32/setupapi/devinst.c
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.…
==============================================================================
--- trunk/reactos/dll/win32/setupapi/devinst.c (original)
+++ trunk/reactos/dll/win32/setupapi/devinst.c Mon May 29 15:03:24 2006
@@ -3805,7 +3805,7 @@
             }
             else if
(UpdateClassInstallParamHandlers[ClassInstallParams->InstallFunction -
DIF_SELECTDEVICE] == NULL)
             {
-                FIXME("InstallFunction %u is valid, but has no associated update
handler\n", ClassInstallParams->InstallFunction);
+                ERR("InstallFunction %u is valid, but has no associated update
handler\n", ClassInstallParams->InstallFunction);
                 SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
                 goto done;
             }
@@ -4070,7 +4070,7 @@
                 break;
             case DIF_SELECTDEVICE:
                 CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER;
-                DefaultHandler = SetupDiSelectBestCompatDrv;
+                DefaultHandler = SetupDiSelectDevice;
                 break;
             case DIF_TROUBLESHOOTER:
                 CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER;
@@ -4491,6 +4491,7 @@
         DI_RESOURCEPAGE_ADDED |               /* 0x00002000 */
         DI_PROPERTIES_CHANGE |                /* 0x00004000 */
         DI_ENUMSINGLEINF |                    /* 0x00010000 */
+        DI_DONOTCALLCONFIGMG |                /* 0x00020000 */
         DI_CLASSINSTALLPARAMS |               /* 0x00100000 */
         DI_NODI_DEFAULTACTION |               /* 0x00200000 */
         DI_QUIETINSTALL |                     /* 0x00800000 */
@@ -6146,7 +6147,7 @@
                                 &ClassGuid,
                                 ContextDevice,
                                 currentInfFileDetails,
-                                filename,
+                                FullInfFileName,
                                 ProviderName,
                                 ManufacturerName,
                                 NULL,
@@ -6203,7 +6204,7 @@
                                             &ClassGuid,
                                             ContextDevice,
                                             currentInfFileDetails,
-                                            filename,
+                                            FullInfFileName,
                                             ProviderName,
                                             ManufacturerName,
                                             currentId,
@@ -6224,7 +6225,7 @@
                                                 &ClassGuid,
                                                 ContextDevice,
                                                 currentInfFileDetails,
-                                                filename,
+                                                FullInfFileName,
                                                 ProviderName,
                                                 ManufacturerName,
                                                 currentId,
@@ -7553,6 +7554,19 @@
 }
 
 /***********************************************************************
+ *		SetupDiSelectDevice (SETUPAPI.@)
+ */
+BOOL WINAPI
+SetupDiSelectDevice(
+    IN HDEVINFO DeviceInfoSet,
+    IN OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL)
+{
+	FIXME("%p %p\n", DeviceInfoSet, DeviceInfoData);
+	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+	return FALSE;
+}
+
+/***********************************************************************
  *		SetupDiInstallDriverFiles (SETUPAPI.@)
  */
 BOOL WINAPI

Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/setupapi…
==============================================================================
--- trunk/reactos/dll/win32/setupapi/setupapi.spec (original)
+++ trunk/reactos/dll/win32/setupapi/setupapi.spec Mon May 29 15:03:24 2006
@@ -372,7 +372,7 @@
 @ stdcall SetupDiRemoveDevice(ptr ptr)
 @ stub SetupDiRemoveDeviceInterface
 @ stdcall SetupDiSelectBestCompatDrv(ptr ptr)
-@ stub SetupDiSelectDevice
+@ stdcall SetupDiSelectDevice(ptr ptr)
 @ stub SetupDiSelectOEMDrv
 @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long)
 @ stdcall SetupDiSetClassInstallParamsW(ptr ptr ptr long)