[PATCH (try2)] setupapi: Fix spec entries for handle parameters

Andrew Eikum aeikum at codeweavers.com
Wed Mar 30 10:00:36 CDT 2016


Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
---

try2: Turns out there's a whole bunch more of these. I think I got
most/all of them.

 dlls/setupapi/setupapi.spec | 118 ++++++++++++++++++++++----------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index 4486994..7f57db7 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -242,23 +242,23 @@
 @ stub RetrieveServiceConfig
 @ stub SearchForInfFile
 @ stub SetArrayToMultiSzValue
-@ stdcall SetupAddInstallSectionToDiskSpaceListA(long long long str ptr long)
+@ stdcall SetupAddInstallSectionToDiskSpaceListA(ptr ptr ptr str ptr long)
 @ stub SetupAddInstallSectionToDiskSpaceListW
 @ stub SetupAddSectionToDiskSpaceListA
 @ stub SetupAddSectionToDiskSpaceListW
-@ stdcall SetupAddToDiskSpaceListA(long str int64 long ptr long)
-@ stdcall SetupAddToDiskSpaceListW(long wstr int64 long ptr long)
+@ stdcall SetupAddToDiskSpaceListA(ptr str int64 long ptr long)
+@ stdcall SetupAddToDiskSpaceListW(ptr wstr int64 long ptr long)
 @ stdcall SetupAddToSourceListA(long str)
 @ stdcall SetupAddToSourceListW(long wstr)
 @ stub SetupAdjustDiskSpaceListA
 @ stub SetupAdjustDiskSpaceListW
 @ stub SetupCancelTemporarySourceList
 @ stdcall SetupCloseFileQueue(ptr)
-@ stdcall SetupCloseInfFile(long)
+@ stdcall SetupCloseInfFile(ptr)
 @ stdcall SetupCloseLog()
-@ stdcall SetupCommitFileQueue(long long ptr ptr) SetupCommitFileQueueW
-@ stdcall SetupCommitFileQueueA(long long ptr ptr)
-@ stdcall SetupCommitFileQueueW(long long ptr ptr)
+@ stdcall SetupCommitFileQueue(long ptr ptr ptr) SetupCommitFileQueueW
+@ stdcall SetupCommitFileQueueA(long ptr ptr ptr)
+@ stdcall SetupCommitFileQueueW(long ptr ptr ptr)
 @ stdcall SetupCopyErrorA(long str str str str str long long str long ptr)
 @ stdcall SetupCopyErrorW(long wstr wstr wstr wstr wstr long long wstr long ptr)
 @ stdcall SetupCopyOEMInfA(str str long long ptr long ptr ptr)
@@ -291,11 +291,11 @@
 @ stdcall SetupDiClassNameFromGuidW(ptr wstr long ptr)
 @ stdcall SetupDiCreateDevRegKeyA(ptr ptr long long long ptr str)
 @ stdcall SetupDiCreateDevRegKeyW(ptr ptr long long long ptr wstr)
-@ stdcall SetupDiCreateDeviceInfoA(long str ptr str long long ptr)
+@ stdcall SetupDiCreateDeviceInfoA(ptr str ptr str long long ptr)
 @ stdcall SetupDiCreateDeviceInfoList(ptr ptr)
 @ stdcall SetupDiCreateDeviceInfoListExA(ptr long str ptr)
 @ stdcall SetupDiCreateDeviceInfoListExW(ptr long wstr ptr)
-@ stdcall SetupDiCreateDeviceInfoW(long wstr ptr wstr long long ptr)
+@ stdcall SetupDiCreateDeviceInfoW(ptr wstr ptr wstr long long ptr)
 @ stdcall SetupDiCreateDeviceInterfaceA(ptr ptr ptr str long ptr)
 @ stdcall SetupDiCreateDeviceInterfaceW(ptr ptr ptr wstr long ptr)
 @ stdcall SetupDiCreateDeviceInterfaceRegKeyA(ptr ptr long long ptr ptr)
@@ -306,15 +306,15 @@
 @ stdcall SetupDiDeleteDeviceInterfaceRegKey(ptr ptr long)
 @ stub SetupDiDeleteDeviceRegKey
 @ stdcall SetupDiDestroyClassImageList(ptr)
-@ stdcall SetupDiDestroyDeviceInfoList(long)
+@ stdcall SetupDiDestroyDeviceInfoList(ptr)
 @ stdcall SetupDiDestroyDriverInfoList(ptr ptr long)
 @ stdcall SetupDiDrawMiniIcon(ptr int128 long long)
-@ stdcall SetupDiEnumDeviceInfo(long long ptr)
-@ stdcall SetupDiEnumDeviceInterfaces(long ptr ptr long ptr)
+@ stdcall SetupDiEnumDeviceInfo(ptr long ptr)
+@ stdcall SetupDiEnumDeviceInterfaces(ptr ptr ptr long ptr)
 @ stub SetupDiEnumDriverInfoA
 @ stub SetupDiEnumDriverInfoW
-@ stdcall SetupDiGetActualSectionToInstallA(long str str long ptr ptr)
-@ stdcall SetupDiGetActualSectionToInstallW(long wstr wstr long ptr ptr)
+@ stdcall SetupDiGetActualSectionToInstallA(ptr str str long ptr ptr)
+@ stdcall SetupDiGetActualSectionToInstallW(ptr wstr wstr long ptr ptr)
 @ stdcall SetupDiGetClassBitmapIndex(ptr ptr)
 @ stdcall SetupDiGetClassDescriptionA(ptr str long ptr)
 @ stdcall SetupDiGetClassDescriptionExA(ptr str long ptr str ptr)
@@ -340,10 +340,10 @@
 @ stdcall SetupDiGetDeviceInstanceIdA(ptr ptr ptr long ptr)
 @ stdcall SetupDiGetDeviceInstanceIdW(ptr ptr ptr long ptr)
 @ stub SetupDiGetDeviceInterfaceAlias
-@ stdcall SetupDiGetDeviceInterfaceDetailA(long ptr ptr long ptr ptr)
-@ stdcall SetupDiGetDeviceInterfaceDetailW(long ptr ptr long ptr ptr)
-@ stdcall SetupDiGetDeviceRegistryPropertyA(long ptr long ptr ptr long ptr)
-@ stdcall SetupDiGetDeviceRegistryPropertyW(long ptr long ptr ptr long ptr)
+@ stdcall SetupDiGetDeviceInterfaceDetailA(ptr ptr ptr long ptr ptr)
+@ stdcall SetupDiGetDeviceInterfaceDetailW(ptr ptr ptr long ptr ptr)
+@ stdcall SetupDiGetDeviceRegistryPropertyA(ptr ptr long ptr ptr long ptr)
+@ stdcall SetupDiGetDeviceRegistryPropertyW(ptr ptr long ptr ptr long ptr)
 @ stub SetupDiGetDriverInfoDetailA
 @ stub SetupDiGetDriverInfoDetailW
 @ stub SetupDiGetDriverInstallParamsA
@@ -398,10 +398,10 @@
 @ stub SetupDiUnremoveDevice
 @ stdcall SetupDuplicateDiskSpaceListA(ptr ptr long long)
 @ stdcall SetupDuplicateDiskSpaceListW(ptr ptr long long)
-@ stdcall SetupEnumInfSectionsA(long long ptr long ptr)
-@ stdcall SetupEnumInfSectionsW(long long ptr long ptr)
-@ stdcall SetupFindFirstLineA(long str str ptr)
-@ stdcall SetupFindFirstLineW(long wstr wstr ptr)
+@ stdcall SetupEnumInfSectionsA(ptr long ptr long ptr)
+@ stdcall SetupEnumInfSectionsW(ptr long ptr long ptr)
+@ stdcall SetupFindFirstLineA(ptr str str ptr)
+@ stdcall SetupFindFirstLineW(ptr wstr wstr ptr)
 @ stdcall SetupFindNextLine(ptr ptr)
 @ stdcall SetupFindNextMatchLineA(ptr str ptr)
 @ stdcall SetupFindNextMatchLineW(ptr wstr ptr)
@@ -415,20 +415,20 @@
 @ stdcall SetupGetFileCompressionInfoExA(str ptr long ptr ptr ptr ptr)
 @ stdcall SetupGetFileCompressionInfoExW(wstr ptr long ptr ptr ptr ptr)
 @ stdcall SetupGetFileCompressionInfoW(wstr ptr ptr ptr ptr)
-@ stdcall SetupGetFileQueueCount(long long ptr)
-@ stdcall SetupGetFileQueueFlags(long ptr)
+@ stdcall SetupGetFileQueueCount(ptr long ptr)
+@ stdcall SetupGetFileQueueFlags(ptr ptr)
 @ stdcall SetupGetInfFileListA(str long ptr long ptr)
 @ stdcall SetupGetInfFileListW(wstr long ptr long ptr)
 @ stdcall SetupGetInfInformationA(ptr long ptr long ptr)
 @ stdcall SetupGetInfInformationW(ptr long ptr long ptr)
 @ stub SetupGetInfSections
 @ stdcall SetupGetIntField(ptr long ptr)
-@ stdcall SetupGetLineByIndexA(long str long ptr)
-@ stdcall SetupGetLineByIndexW(long wstr long ptr)
-@ stdcall SetupGetLineCountA(long str)
-@ stdcall SetupGetLineCountW(long wstr)
-@ stdcall SetupGetLineTextA(ptr long str str ptr long ptr)
-@ stdcall SetupGetLineTextW(ptr long wstr wstr ptr long ptr)
+@ stdcall SetupGetLineByIndexA(ptr str long ptr)
+@ stdcall SetupGetLineByIndexW(ptr wstr long ptr)
+@ stdcall SetupGetLineCountA(ptr str)
+@ stdcall SetupGetLineCountW(ptr wstr)
+@ stdcall SetupGetLineTextA(ptr ptr str str ptr long ptr)
+@ stdcall SetupGetLineTextW(ptr ptr wstr wstr ptr long ptr)
 @ stdcall SetupGetMultiSzFieldA(ptr long ptr long ptr)
 @ stdcall SetupGetMultiSzFieldW(ptr long ptr long ptr)
 @ stdcall SetupGetNonInteractiveMode()
@@ -450,22 +450,22 @@
 @ stdcall SetupInstallFileExA(ptr ptr str str str long ptr ptr ptr)
 @ stdcall SetupInstallFileExW(ptr ptr wstr wstr wstr long ptr ptr ptr)
 @ stdcall SetupInstallFileW(ptr ptr wstr wstr wstr long ptr ptr)
-@ stdcall SetupInstallFilesFromInfSectionA(long long long str str long)
-@ 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)
-@ stdcall SetupInstallServicesFromInfSectionA(long str long)
+@ stdcall SetupInstallFilesFromInfSectionA(ptr ptr ptr str str long)
+@ stdcall SetupInstallFilesFromInfSectionW(ptr ptr ptr wstr wstr long)
+@ stdcall SetupInstallFromInfSectionA(long ptr str long long str long ptr ptr ptr ptr)
+@ stdcall SetupInstallFromInfSectionW(long ptr wstr long long wstr long ptr ptr ptr ptr)
+@ stdcall SetupInstallServicesFromInfSectionA(ptr str long)
 @ stub SetupInstallServicesFromInfSectionExA
 @ stub SetupInstallServicesFromInfSectionExW
-@ stdcall SetupInstallServicesFromInfSectionW(long wstr long)
+@ stdcall SetupInstallServicesFromInfSectionW(ptr wstr long)
 @ stdcall SetupIterateCabinetA(str long ptr ptr)
 @ stdcall SetupIterateCabinetW(wstr long ptr ptr)
 @ stdcall SetupLogErrorA(str long)
 @ stdcall SetupLogErrorW(wstr long)
 @ stdcall SetupLogFileA(ptr str str str long str str str long)
 @ stdcall SetupLogFileW(ptr wstr wstr wstr long wstr wstr wstr long)
-@ stdcall SetupOpenAppendInfFileA(str long ptr)
-@ stdcall SetupOpenAppendInfFileW(wstr long ptr)
+@ stdcall SetupOpenAppendInfFileA(str ptr ptr)
+@ stdcall SetupOpenAppendInfFileW(wstr ptr ptr)
 @ stdcall SetupOpenFileQueue()
 @ stdcall SetupOpenInfFileA(str str long ptr)
 @ stdcall SetupOpenInfFileW(wstr wstr long ptr)
@@ -486,24 +486,24 @@
 @ stub SetupQueryInfVersionInformationW
 @ stub SetupQuerySourceListA
 @ stub SetupQuerySourceListW
-@ stdcall SetupQuerySpaceRequiredOnDriveA(long str ptr ptr long)
-@ stdcall SetupQuerySpaceRequiredOnDriveW(long wstr ptr ptr long)
-@ stdcall SetupQueueCopyA(long str str str str str str str long)
+@ stdcall SetupQuerySpaceRequiredOnDriveA(ptr str ptr ptr long)
+@ stdcall SetupQuerySpaceRequiredOnDriveW(ptr wstr ptr ptr long)
+@ stdcall SetupQueueCopyA(ptr str str str str str str str long)
 @ stdcall SetupQueueCopyIndirectA(ptr)
 @ stdcall SetupQueueCopyIndirectW(ptr)
-@ stdcall SetupQueueCopySectionA(long str long long str long)
-@ stdcall SetupQueueCopySectionW(long wstr long long wstr long)
-@ stdcall SetupQueueCopyW(long wstr wstr wstr wstr wstr wstr wstr long)
-@ stdcall SetupQueueDefaultCopyA(long long str str str long)
-@ stdcall SetupQueueDefaultCopyW(long long wstr wstr wstr long)
-@ stdcall SetupQueueDeleteA(long str str)
-@ stdcall SetupQueueDeleteSectionA(long long long str)
-@ stdcall SetupQueueDeleteSectionW(long long long wstr)
-@ stdcall SetupQueueDeleteW(long wstr wstr)
-@ stdcall SetupQueueRenameA(long str str str str)
-@ stdcall SetupQueueRenameSectionA(long long long str)
-@ stdcall SetupQueueRenameSectionW(long long long wstr)
-@ stdcall SetupQueueRenameW(long wstr wstr wstr wstr)
+@ stdcall SetupQueueCopySectionA(ptr str ptr ptr str long)
+@ stdcall SetupQueueCopySectionW(ptr wstr ptr ptr wstr long)
+@ stdcall SetupQueueCopyW(ptr wstr wstr wstr wstr wstr wstr wstr long)
+@ stdcall SetupQueueDefaultCopyA(ptr ptr str str str long)
+@ stdcall SetupQueueDefaultCopyW(ptr ptr wstr wstr wstr long)
+@ stdcall SetupQueueDeleteA(ptr str str)
+@ stdcall SetupQueueDeleteSectionA(ptr ptr ptr str)
+@ stdcall SetupQueueDeleteSectionW(ptr ptr ptr wstr)
+@ stdcall SetupQueueDeleteW(ptr wstr wstr)
+@ stdcall SetupQueueRenameA(ptr str str str str)
+@ stdcall SetupQueueRenameSectionA(ptr ptr ptr str)
+@ stdcall SetupQueueRenameSectionW(ptr ptr ptr wstr)
+@ stdcall SetupQueueRenameW(ptr wstr wstr wstr wstr)
 @ stub SetupRemoveFileLogEntryA
 @ stub SetupRemoveFileLogEntryW
 @ stub SetupRemoveFromDiskSpaceListA
@@ -517,15 +517,15 @@
 @ stdcall SetupRenameErrorA(long str str str long long)
 @ stdcall SetupRenameErrorW(long wstr wstr wstr long long)
 @ stub SetupScanFileQueue
-@ stdcall SetupScanFileQueueA(long long long ptr ptr ptr)
-@ stdcall SetupScanFileQueueW(long long long ptr ptr ptr)
-@ stdcall SetupSetDirectoryIdA(long long str)
+@ stdcall SetupScanFileQueueA(ptr long long ptr ptr ptr)
+@ stdcall SetupScanFileQueueW(ptr long long ptr ptr ptr)
+@ stdcall SetupSetDirectoryIdA(ptr long str)
 @ stub SetupSetDirectoryIdExA
 @ stub SetupSetDirectoryIdExW
-@ stdcall SetupSetDirectoryIdW(long long wstr)
+@ stdcall SetupSetDirectoryIdW(ptr long wstr)
 @ stdcall SetupSetFileQueueAlternatePlatformA(ptr ptr str)
 @ stdcall SetupSetFileQueueAlternatePlatformW(ptr ptr wstr)
-@ stdcall SetupSetFileQueueFlags(long long long)
+@ stdcall SetupSetFileQueueFlags(ptr long long)
 @ stdcall SetupSetNonInteractiveMode(long)
 @ stub SetupSetPlatformPathOverrideA
 @ stub SetupSetPlatformPathOverrideW
-- 
2.7.4




More information about the wine-patches mailing list