diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec
index 29129da5076..19a4aaac934 100644
--- a/dll/win32/setupapi/setupapi.spec
+++ b/dll/win32/setupapi/setupapi.spec
@@ -15,6 +15,7 @@
 @ stdcall CM_Add_Range(int64 int64 ptr long)
 @ stdcall CM_Add_Res_Des(ptr ptr long ptr long long)
 @ stdcall CM_Add_Res_Des_Ex(ptr ptr long ptr long long ptr)
+@ stub -version=0x600+ CM_Apply_PowerScheme
 @ stdcall CM_Connect_MachineA(str ptr)
 @ stdcall CM_Connect_MachineW(wstr ptr)
 @ stdcall CM_Create_DevNodeA(ptr str long long)
@@ -26,6 +27,11 @@
 @ stdcall CM_Delete_Class_Key_Ex(ptr long ptr)
 @ stdcall CM_Delete_DevNode_Key(long long long)
 @ stdcall CM_Delete_DevNode_Key_Ex(long long long ptr)
+@ stub -version=0x600+ CM_Delete_Device_Interface_KeyA
+@ stub -version=0x600+ CM_Delete_Device_Interface_KeyW
+@ stub -version=0x600+ CM_Delete_Device_Interface_Key_ExA
+@ stub -version=0x600+ CM_Delete_Device_Interface_Key_ExW
+@ stub -version=0x600+ CM_Delete_PowerScheme
 @ stdcall CM_Delete_Range(int64 int64 ptr long)
 @ stdcall CM_Detect_Resource_Conflict(long long ptr long ptr long)
 @ stdcall CM_Detect_Resource_Conflict_Ex(long long ptr long ptr long ptr)
@@ -33,6 +39,7 @@
 @ stdcall CM_Disable_DevNode_Ex(long long ptr)
 @ stdcall CM_Disconnect_Machine(ptr)
 @ stdcall CM_Dup_Range_List(ptr ptr long)
+@ stub -version=0x600+ CM_Duplicate_PowerScheme
 @ stdcall CM_Enable_DevNode(long long)
 @ stdcall CM_Enable_DevNode_Ex(long long ptr)
 @ stdcall CM_Enumerate_Classes(long ptr long)
@@ -132,6 +139,9 @@
 @ stdcall CM_Get_Sibling_Ex(ptr long long ptr)
 @ stdcall CM_Get_Version()
 @ stdcall CM_Get_Version_Ex(ptr)
+@ stub -version=0x600+ CM_Import_PowerScheme
+@ stub -version=0x600+ CM_Install_DevNodeW
+@ stub -version=0x600+ CM_Install_DevNode_ExW
 @ stdcall CM_Intersect_Range_List(ptr ptr ptr long)
 @ stdcall CM_Invert_Range_List(ptr ptr int64 long)
 @ stdcall CM_Is_Dock_Station_Present(ptr)
@@ -154,6 +164,10 @@
 @ stdcall CM_Open_Class_Key_ExW(ptr wstr long long ptr long ptr)
 @ stdcall CM_Open_DevNode_Key(ptr long long long ptr long)
 @ stdcall CM_Open_DevNode_Key_Ex(ptr long long long ptr long ptr)
+@ stub -version=0x600+ CM_Open_Device_Interface_KeyA
+@ stub -version=0x600+ CM_Open_Device_Interface_KeyW
+@ stub -version=0x600+ CM_Open_Device_Interface_Key_ExA
+@ stub -version=0x600+ CM_Open_Device_Interface_Key_ExW
 @ stdcall CM_Query_And_Remove_SubTreeA(long ptr str long long)
 @ stdcall CM_Query_And_Remove_SubTreeW(long ptr wstr long long)
 @ stdcall CM_Query_And_Remove_SubTree_ExA(long ptr str long long ptr)
@@ -181,8 +195,11 @@
 @ stdcall CM_Request_Device_Eject_ExW(long ptr wstr long long ptr)
 @ stdcall CM_Request_Eject_PC()
 @ stdcall CM_Request_Eject_PC_Ex(ptr)
+@ stub -version=0x600+ CM_RestoreAll_DefaultPowerSchemes
+@ stub -version=0x600+ CM_Restore_DefaultPowerScheme
 @ stdcall CM_Run_Detection(long)
 @ stdcall CM_Run_Detection_Ex(long ptr)
+@ stub -version=0x600+ CM_Set_ActiveScheme
 @ stdcall CM_Set_Class_Registry_PropertyA(ptr long ptr long long ptr)
 @ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr)
 @ stdcall CM_Set_DevNode_Problem(long long long)
@@ -206,7 +223,16 @@
 @ stdcall CM_Unregister_Device_InterfaceW(wstr long)
 @ stdcall CM_Unregister_Device_Interface_ExA(str long ptr)
 @ stdcall CM_Unregister_Device_Interface_ExW(wstr long ptr)
+@ stub -version=0x600+ CM_Write_UserPowerKey
 @ stdcall DoesUserHavePrivilege(wstr)
+@ stub -version=0x600+ DriverStoreAddDriverPackageA
+@ stub -version=0x600+ DriverStoreAddDriverPackageW
+@ stub -version=0x600+ DriverStoreDeleteDriverPackageA
+@ stub -version=0x600+ DriverStoreDeleteDriverPackageW
+@ stub -version=0x600+ DriverStoreEnumDriverPackageA
+@ stub -version=0x600+ DriverStoreEnumDriverPackageW
+@ stub -version=0x600+ DriverStoreFindDriverPackageA
+@ stub -version=0x600+ DriverStoreFindDriverPackageW
 @ stub ExtensionPropSheetPageProc
 @ stdcall InstallCatalog(str str ptr)
 @ stdcall InstallHinfSection(long long str long) InstallHinfSectionA
@@ -216,6 +242,11 @@
 @ stdcall MyFree(ptr)
 @ stdcall MyMalloc(long)
 @ stdcall MyRealloc(ptr long)
+@ stub -version=0x600+ PnpEnumDrpFile
+@ stub -version=0x600+ PnpIsFileAclIntact
+@ stub -version=0x600+ PnpIsFileContentIntact
+@ stub -version=0x600+ PnpIsFilePnpDriver
+@ stub -version=0x600+ PnpRepairWindowsProtectedDriver
 @ stdcall SetupAddInstallSectionToDiskSpaceListA(long long long str ptr long)
 @ stub SetupAddInstallSectionToDiskSpaceListW
 @ stdcall -stub SetupAddSectionToDiskSpaceListA(long long long str long ptr long)
@@ -251,6 +282,7 @@
 @ stdcall SetupDeleteErrorA(long str str long long)
 @ stdcall SetupDeleteErrorW(long wstr wstr long long)
 @ stdcall SetupDestroyDiskSpaceList(long)
+@ stub -version=0x600+ SetupDiApplyPowerScheme
 @ stub SetupDiAskForOEMDisk
 @ stdcall SetupDiBuildClassInfoList(long ptr long ptr)
 @ stdcall SetupDiBuildClassInfoListExA(long ptr long ptr str ptr)
@@ -313,6 +345,10 @@
 @ stdcall SetupDiGetClassImageListExW(ptr wstr ptr)
 @ stdcall SetupDiGetClassInstallParamsA(ptr ptr ptr long ptr)
 @ stdcall SetupDiGetClassInstallParamsW(ptr ptr ptr long ptr)
+@ stub -version=0x600+ SetupDiGetClassPropertyExW
+@ stub -version=0x600+ SetupDiGetClassPropertyKeys
+@ stub -version=0x600+ SetupDiGetClassPropertyKeysExW
+@ stub -version=0x600+ SetupDiGetClassPropertyW
 @ stdcall SetupDiGetClassRegistryPropertyA(ptr long ptr ptr long ptr str ptr)
 @ stdcall SetupDiGetClassRegistryPropertyW(ptr long ptr ptr long ptr wstr ptr)
 @ stdcall SetupDiGetCustomDevicePropertyA(ptr ptr str long ptr ptr long ptr)
@@ -327,6 +363,10 @@
 @ stdcall SetupDiGetDeviceInterfaceAlias(ptr ptr ptr ptr)
 @ stdcall SetupDiGetDeviceInterfaceDetailA(long ptr ptr long ptr ptr)
 @ stdcall SetupDiGetDeviceInterfaceDetailW(long ptr ptr long ptr ptr)
+@ stub -version=0x600+ SetupDiGetDeviceInterfacePropertyKeys
+@ stub -version=0x600+ SetupDiGetDeviceInterfacePropertyW
+@ stub -version=0x600+ SetupDiGetDevicePropertyKeys
+@ stdcall -stub -version=0x600+ SetupDiGetDevicePropertyW(ptr ptr ptr ptr ptr long ptr long)
 @ stdcall SetupDiGetDeviceRegistryPropertyA(long ptr long ptr ptr long ptr)
 @ stdcall SetupDiGetDeviceRegistryPropertyW(long ptr long ptr ptr long ptr)
 @ stdcall SetupDiGetDriverInfoDetailA(ptr ptr ptr ptr long ptr)
@@ -354,6 +394,7 @@
 @ stdcall SetupDiInstallDeviceInterfaces(ptr ptr)
 @ stdcall SetupDiInstallDriverFiles(ptr ptr)
 @ stdcall SetupDiLoadClassIcon(ptr ptr ptr)
+@ stub -version=0x600+ SetupDiLoadDeviceIcon
 @ stub SetupDiMoveDuplicateDevice
 @ stdcall SetupDiOpenClassRegKey(ptr long)
 @ stdcall SetupDiOpenClassRegKeyExA(ptr long long str ptr)
@@ -368,17 +409,26 @@
 @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr)
 @ stdcall SetupDiRemoveDevice(ptr ptr)
 @ stdcall SetupDiRemoveDeviceInterface(ptr ptr)
+@ stub -version=0x600+ SetupDiReportDeviceInstallError
+@ stub -version=0x600+ SetupDiReportDriverNotFoundError
+@ stub -version=0x600+ SetupDiReportDriverPackageImportationError
+@ stub -version=0x600+ SetupDiReportGenericDriverInstalled
+@ stub -version=0x600+ SetupDiReportPnPDeviceProblem
 @ stdcall -version=0x502+ SetupDiRestartDevices(ptr ptr)
 @ stdcall SetupDiSelectBestCompatDrv(ptr ptr)
 @ stdcall SetupDiSelectDevice(ptr ptr)
 @ stub SetupDiSelectOEMDrv
 @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long)
 @ stdcall SetupDiSetClassInstallParamsW(ptr ptr ptr long)
+@ stub -version=0x600+ SetupDiSetClassPropertyExW
+@ stub -version=0x600+ SetupDiSetClassPropertyW
 @ stdcall SetupDiSetClassRegistryPropertyA(ptr long ptr long str ptr)
 @ stdcall SetupDiSetClassRegistryPropertyW(ptr long ptr long wstr ptr)
 @ stdcall SetupDiSetDeviceInstallParamsA(ptr ptr ptr)
 @ stdcall SetupDiSetDeviceInstallParamsW(ptr ptr ptr)
 @ stub SetupDiSetDeviceInterfaceDefault
+@ stub -version=0x600+ SetupDiSetDeviceInterfacePropertyW
+@ stub -version=0x600+ SetupDiSetDevicePropertyW
 @ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr long)
 @ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr long)
 @ stdcall SetupDiSetDriverInstallParamsA(ptr ptr ptr ptr)
@@ -391,6 +441,8 @@
 @ stdcall SetupDuplicateDiskSpaceListW(ptr ptr long long)
 @ stdcall SetupEnumInfSectionsA(long long ptr long ptr)
 @ stdcall SetupEnumInfSectionsW(long long ptr long ptr)
+@ stub -version=0x600+ SetupEnumPublishedInfA
+@ stub -version=0x600+ SetupEnumPublishedInfW
 @ stdcall SetupFindFirstLineA(long str str ptr)
 @ stdcall SetupFindFirstLineW(long wstr wstr ptr)
 @ stdcall SetupFindNextLine(ptr ptr)
@@ -408,10 +460,14 @@
 @ stdcall SetupGetFileCompressionInfoW(wstr ptr ptr ptr ptr)
 @ stdcall SetupGetFileQueueCount(long long ptr)
 @ stdcall SetupGetFileQueueFlags(long ptr)
+@ stub -version=0x600+ SetupGetInfDriverStoreLocationA
+@ stub -version=0x600+ SetupGetInfDriverStoreLocationW
 @ stdcall SetupGetInfFileListA(str long str long ptr)
 @ stdcall SetupGetInfFileListW(wstr long wstr long ptr)
 @ stdcall SetupGetInfInformationA(ptr long ptr long ptr)
 @ stdcall SetupGetInfInformationW(ptr long ptr long ptr)
+@ stub -version=0x600+ SetupGetInfPublishedNameA
+@ stub -version=0x600+ SetupGetInfPublishedNameW
 @ stub SetupGetInfSections
 @ stdcall SetupGetIntField(ptr long ptr)
 @ stdcall SetupGetLineByIndexA(long str long ptr)
@@ -433,6 +489,7 @@
 @ stdcall SetupGetStringFieldW(ptr long ptr long ptr)
 @ stdcall SetupGetTargetPathA(ptr ptr str ptr long ptr)
 @ stdcall SetupGetTargetPathW(ptr ptr wstr ptr long ptr)
+@ stub -version=0x600+ SetupGetThreadLogToken
 @ stdcall SetupInitDefaultQueueCallback(long)
 @ stdcall SetupInitDefaultQueueCallbackEx(long long long long ptr)
 @ stdcall SetupInitializeFileLogA(str long)
@@ -445,6 +502,8 @@
 @ stdcall SetupInstallFilesFromInfSectionW(long long long wstr wstr long)
 @ stdcall SetupInstallFromInfSectionA(long long str long long str long ptr ptr long ptr)
 @ stdcall SetupInstallFromInfSectionW(long long wstr long long wstr long ptr ptr long ptr)
+@ stub -version=0x600+ SetupInstallLogCloseEventGroup
+@ stub -version=0x600+ SetupInstallLogCreateEventGroup
 @ stdcall SetupInstallServicesFromInfSectionA(long str long)
 @ stdcall SetupInstallServicesFromInfSectionExA(long str long ptr ptr ptr ptr)
 @ stdcall SetupInstallServicesFromInfSectionExW(long wstr long ptr ptr ptr ptr)
@@ -524,6 +583,7 @@
 @ stub SetupSetPlatformPathOverrideW
 @ stdcall SetupSetSourceListA(long ptr long)
 @ stdcall SetupSetSourceListW(long ptr long)
+@ stub -version=0x600+ SetupSetThreadLogToken
 @ stdcall SetupTermDefaultQueueCallback(ptr)
 @ stdcall SetupTerminateFileLog(long)
 @ stub SetupUninstallNewlyCopiedInfs
@@ -531,41 +591,65 @@
 @ stdcall SetupUninstallOEMInfW(wstr long ptr)
 @ stdcall SetupVerifyInfFileA(str ptr ptr)
 @ stdcall SetupVerifyInfFileW(wstr ptr ptr)
+@ stub -version=0x600+ SetupWriteTextLog
+@ stub -version=0x600+ SetupWriteTextLogError
+@ stub -version=0x600+ SetupWriteTextLogInfLine
 @ stdcall UnicodeToMultiByte(wstr long) pSetupUnicodeToMultiByte
+@ stub -version=0x600+ UpdateAllDeviceIndirectStrings
 @ stub VerifyCatalogFile
+@ stub -version=0x600+ pGetDriverPackageHash
+@ stub -version=0x600+ pServerAddDriverPackage
+@ stub -version=0x600+ pServerDeleteDriverPackage
 @ stub pSetupAccessRunOnceNodeList
-@ stub pSetupAcquireSCMLock
+@ stub -version=0x501-0x502 pSetupAcquireSCMLock
 @ stub pSetupAddMiniIconToList
 @ stub pSetupAddTagToGroupOrderListEntry
-@ stub pSetupAppendStringToMultiSz
+@ stub -version=0x600+ pSetupAppendPath
+@ stub -version=0x501-0x502 pSetupAppendStringToMultiSz
 @ stdcall pSetupCaptureAndConvertAnsiArg(str ptr)
 @ stdcall pSetupCenterWindowRelativeToParent(long)
+@ stub -version=0x600+ pSetupCloseTextLogSection
 @ stdcall pSetupConcatenatePaths(wstr wstr long ptr)
+@ stub -version=0x600+ pSetupCreateTextLogSectionA
+@ stub -version=0x600+ pSetupCreateTextLogSectionW
 @ stub pSetupDestroyRunOnceNodeList
-@ stub pSetupDiGetDeviceInfoContext
-@ stub pSetupDiSetDeviceInfoContext
+@ stub -version=0x600+ pSetupDiBuildInfoDataFromStrongName
+@ stub -version=0x600+ pSetupDiCrimsonLogDeviceInstall
+@ stub -version=0x501-0x502 pSetupDiGetDeviceInfoContext
+@ stub -version=0x501-0x502 pSetupDiSetDeviceInfoContext
+@ stub -version=0x600+ pSetupDiGetStrongNameForDriverNode
+@ stub -version=0x600+ pSetupDiInvalidateHelperModules
+@ stub -version=0x600+ pSetupDoLastKnownGoodBackup
 @ stdcall pSetupDoesUserHavePrivilege(wstr) DoesUserHavePrivilege
 @ stdcall pSetupDuplicateString(wstr)
 @ stdcall pSetupEnablePrivilege(wstr long)
 @ stdcall pSetupFree(ptr) MyFree
-@ stub pSetupFreeStringArray
+@ stub -version=0x501-0x502 pSetupFreeStringArray
 @ stub pSetupGetCurrentDriverSigningPolicy
+@ stub -version=0x600+ pSetupGetDriverDate
+@ stub -version=0x600+ pSetupGetDriverVersion
 @ stdcall pSetupGetField(ptr long)
 @ stdcall pSetupGetFileTitle(wstr)
 @ stdcall pSetupGetGlobalFlags()
+@ stub -version=0x600+ pSetupGetIndirectStringsFromDriverInfo
 @ stub pSetupGetInfSections
 @ stdcall pSetupGetQueueFlags(ptr)
 @ stub pSetupGetRealSystemTime
-@ stdcall pSetupGetVersionInfoFromImage(wstr ptr ptr)
+@ stdcall -version=0x501-0x502 pSetupGetVersionInfoFromImage(wstr ptr ptr)
 @ stdcall pSetupGuidFromString(wstr ptr)
 @ stub pSetupHandleFailedVerification
-@ stub pSetupInfCacheBuild
-@ stub pSetupInfIsFromOemLocation
+@ stub -version=0x501-0x502 pSetupInfCacheBuild
+@ stub -version=0x600+ pSetupInfGetDigitalSignatureInfo
+@ stub -version=0x501-0x502 pSetupInfIsFromOemLocation
+@ stub -version=0x600+ pSetupInfSetDigitalSignatureInfo
 @ stdcall pSetupInstallCatalog(wstr wstr ptr)
-@ stub pSetupInstallStopEx
+@ stub -version=0x501-0x502 pSetupInstallStopEx
+@ stub -version=0x600+ pSetupIsBiDiLocalizedSystemEx
 @ stdcall pSetupIsGuidNull(ptr)
 @ stub -version=0x502+ pSetupIsLocalSystem
 @ stdcall pSetupIsUserAdmin()
+@ stub -version=0x600+ pSetupIsUserTrustedInstaller
+@ stub -version=0x600+ pSetupLoadIndirectString
 @ stub pSetupMakeSurePathExists
 @ stdcall pSetupMalloc(long) MyMalloc
 @ stdcall pSetupModifyGlobalFlags(long long)
@@ -580,7 +664,7 @@
 @ stdcall pSetupSetGlobalFlags(long)
 @ stub pSetupSetNoDriverPrompts
 @ stdcall pSetupSetQueueFlags(ptr long)
-@ stub pSetupSetSystemSourcePath
+@ stub -version=0x501-0x502 pSetupSetSystemSourcePath
 @ stub pSetupShouldDeviceBeExcluded
 @ stdcall pSetupStringFromGuid(ptr wstr long)
 @ stdcall pSetupStringTableAddString(ptr wstr long)
@@ -599,7 +683,9 @@
 @ stdcall pSetupUnicodeToMultiByte(wstr long)
 @ stdcall pSetupUnmapAndCloseFile(long long ptr)
 @ stub pSetupVerifyCatalogFile
-@ stub pSetupVerifyFile
+@ stub -version=0x501-0x502 pSetupVerifyFile
 @ stub pSetupVerifyQueuedCatalogs
 @ stub pSetupWriteLogEntry
 @ stub pSetupWriteLogError
+@ stub -version=0x600 pSpAddInboxDriverPackage # Vista only
+@ stub -version=0x600 pSpDeleteInboxDriverPackage # Vista only