From 9d5ecbef5d517913f2fe5e6ceeefcdd5c0de6202 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 29 May 2006 11:03:24 +0000 Subject: [PATCH] SP_DRVINFO_DETAIL_DATA_W.InfFileName must contain the full file name Add SetupDiSelectDevice stub svn path=/trunk/; revision=22103 --- reactos/dll/win32/setupapi/devinst.c | 24 +++++++++++++++++++----- reactos/dll/win32/setupapi/setupapi.spec | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/reactos/dll/win32/setupapi/devinst.c b/reactos/dll/win32/setupapi/devinst.c index a0c94b5babf..264144cab49 100644 --- a/reactos/dll/win32/setupapi/devinst.c +++ b/reactos/dll/win32/setupapi/devinst.c @@ -3805,7 +3805,7 @@ SetupDiSetClassInstallParamsW( } 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 @@ SetupDiCallClassInstaller( 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 @@ CheckDeviceInstallParameters( 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 @@ SetupDiBuildDriverInfoList( &ClassGuid, ContextDevice, currentInfFileDetails, - filename, + FullInfFileName, ProviderName, ManufacturerName, NULL, @@ -6203,7 +6204,7 @@ SetupDiBuildDriverInfoList( &ClassGuid, ContextDevice, currentInfFileDetails, - filename, + FullInfFileName, ProviderName, ManufacturerName, currentId, @@ -6224,7 +6225,7 @@ SetupDiBuildDriverInfoList( &ClassGuid, ContextDevice, currentInfFileDetails, - filename, + FullInfFileName, ProviderName, ManufacturerName, currentId, @@ -7552,6 +7553,19 @@ SetupDiSelectBestCompatDrv( return ret; } +/*********************************************************************** + * 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.@) */ diff --git a/reactos/dll/win32/setupapi/setupapi.spec b/reactos/dll/win32/setupapi/setupapi.spec index 2e66ad5565f..d546764c181 100644 --- a/reactos/dll/win32/setupapi/setupapi.spec +++ b/reactos/dll/win32/setupapi/setupapi.spec @@ -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) -- 2.17.1