Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/setupapi/setupapi.def

    r9403 r21916  
    55EXPORTS
    66
    7   CM_Connect_MachineW             = _CM_Connect_MachineW@8          @1
    8   CM_Disconnect_Machine           = _CM_Disconnect_Machine@4        @2
     7  CM_Connect_MachineW             = "_CM_Connect_MachineW@8"        @1
     8  CM_Disconnect_Machine           = "_CM_Disconnect_Machine@4"      @2
    99;@ stub CM_Free_Log_Conf_Handle
    1010;@ stub CM_Free_Res_Des_Handle
    … …  
    6868;@ stub SetupAdjustDiskSpaceListW
    6969;@ stub SetupCancelTemporarySourceList
    70   SetupCloseFileQueue              = _SetupCloseFileQueue@4         @56
    71   SetupCloseInfFile                = _SetupCloseInfFile@4           @57
     70  SetupCloseFileQueue              = "_SetupCloseFileQueue@4"       @56
     71  SetupCloseInfFile                = "_SetupCloseInfFile@4"         @57
    7272;@ stub SetupCommitFileQueue
    73   SetupCommitFileQueueA            = _SetupCommitFileQueueA@16      @59
    74   SetupCommitFileQueueW            = _SetupCommitFileQueueW@16      @60
     73  SetupCommitFileQueueA            = "_SetupCommitFileQueueA@16"    @59
     74  SetupCommitFileQueueW            = "_SetupCommitFileQueueW@16"    @60
    7575;@ stub SetupCopyErrorA
    7676;@ stub SetupCopyErrorW
    … …  
    8080;@ stub SetupDecompressOrCopyFileW
    8181;@ stub SetupDefaultQueueCallback
    82   SetupDefaultQueueCallbackA       = _SetupDefaultQueueCallbackA@16 @68
    83   SetupDefaultQueueCallbackW       = _SetupDefaultQueueCallbackW@16 @69
     82  SetupDefaultQueueCallbackA       = "_SetupDefaultQueueCallbackA@16" @68
     83  SetupDefaultQueueCallbackW       = "_SetupDefaultQueueCallbackW@16" @69
    8484;@ stub SetupDeleteErrorA
    8585;@ stub SetupDeleteErrorW
    … …  
    8787;@ stub SetupDiAskForOEMDisk
    8888;@ stub SetupDiBuildClassInfoList
    89   SetupDiBuildClassInfoListExW     = _SetupDiBuildClassInfoListExW@24  @75
     89  SetupDiBuildClassInfoListExW     = "_SetupDiBuildClassInfoListExW@24"  @75
    9090;@ stub SetupDiBuildDriverInfoList
    9191;@ stub SetupDiCallClassInstaller
    … …  
    9393;@ stub SetupDiChangeState
    9494;@ stub SetupDiClassGuidsFromNameA
    95   SetupDiClassGuidsFromNameExW     = _SetupDiClassGuidsFromNameExW@24  @81
     95  SetupDiClassGuidsFromNameExW     = "_SetupDiClassGuidsFromNameExW@24"  @81
    9696;@ stub SetupDiClassGuidsFromNameW
    9797;@ stub SetupDiClassNameFromGuidA
    98   SetupDiClassNameFromGuidExW      = _SetupDiClassNameFromGuidExW@24  @84
     98  SetupDiClassNameFromGuidExW      = "_SetupDiClassNameFromGuidExW@24" @84
    9999;@ stub SetupDiClassNameFromGuidW
    100100;@ stub SetupDiCreateDevRegKeyA
    … …  
    102102;@ stub SetupDiCreateDeviceInfoA
    103103;@ stub SetupDiCreateDeviceInfoList
    104   SetupDiCreateDeviceInfoListExW   = _SetupDiCreateDeviceInfoListExW@16 @90
     104  SetupDiCreateDeviceInfoListExW   = "_SetupDiCreateDeviceInfoListExW@16" @90
    105105;@ stub SetupDiCreateDeviceInfoW
    106106;@ stub SetupDiDeleteDevRegKey
    107107;@ stub SetupDiDeleteDeviceInfo
    108108;@ stub SetupDiDestroyClassImageList
    109   SetupDiDestroyDeviceInfoList = _SetupDiDestroyDeviceInfoList@4         @95
     109  SetupDiDestroyDeviceInfoList = "_SetupDiDestroyDeviceInfoList@4"       @95
    110110;@ stub SetupDiDestroyDriverInfoList
    111111;@ stub SetupDiDrawMiniIcon
    112   SetupDiEnumDeviceInfo        = _SetupDiEnumDeviceInfo@12               @96
    113   SetupDiEnumDeviceInterfaces  = _SetupDiEnumDeviceInterfaces@20         @97
     112  SetupDiEnumDeviceInfo        = "_SetupDiEnumDeviceInfo@12"             @96
     113  SetupDiEnumDeviceInterfaces  = "_SetupDiEnumDeviceInterfaces@20"       @97
    114114;@ stub SetupDiEnumDriverInfoA
    115115;@ stub SetupDiEnumDriverInfoW
    … …  
    118118;@ stub SetupDiGetClassBitmapIndex
    119119;@ stub SetupDiGetClassDescriptionA
    120   SetupDiGetClassDescriptionExW= _SetupDiGetClassDescriptionExW@24       @104
     120  SetupDiGetClassDescriptionExW= "_SetupDiGetClassDescriptionExW@24"     @104
    121121;@ stub SetupDiGetClassDescriptionW
    122122;@ stub SetupDiGetClassDevPropertySheetsA
    123123;@ stub SetupDiGetClassDevPropertySheetsW
    124   SetupDiGetClassDevsA         = _SetupDiGetClassDevsA@16                @108
    125   SetupDiGetClassDevsExW       = _SetupDiGetClassDevsExW@28              @109
    126   SetupDiGetClassDevsW         = _SetupDiGetClassDevsW@16                @110
     124  SetupDiGetClassDevsA         = "_SetupDiGetClassDevsA@16"              @108
     125  SetupDiGetClassDevsExW       = "_SetupDiGetClassDevsExW@28"            @109
     126  SetupDiGetClassDevsW         = "_SetupDiGetClassDevsW@16"              @110
    127127;@ stub SetupDiGetClassImageIndex
    128128;@ stub SetupDiGetClassImageList
    … …  
    130130;@ stub SetupDiGetClassInstallParamsW
    131131;@ stub SetupDiGetDeviceInfoListClass
    132   SetupDiGetDeviceInfoListDetailW = _SetupDiGetDeviceInfoListDetailW@8  @116
     132  SetupDiGetDeviceInfoListDetailW = "_SetupDiGetDeviceInfoListDetailW@8" @116
    133133;@ stub SetupDiGetDeviceInstallParamsA
    134134;@ stub SetupDiGetDeviceInstallParamsW
    135135;@ stub SetupDiGetDeviceInstanceIdA
    136136;@ stub SetupDiGetDeviceInstanceIdW
    137   SetupDiGetDeviceRegistryPropertyA = _SetupDiGetDeviceRegistryPropertyA@28 @121
     137  SetupDiGetDeviceRegistryPropertyA = "_SetupDiGetDeviceRegistryPropertyA@28" @121
    138138;@ stub SetupDiGetDeviceRegistryPropertyW
    139139;@ stub SetupDiGetDriverInfoDetailA
    … …  
    142142;@ stub SetupDiGetDriverInstallParamsW
    143143;@ stub SetupDiGetDeviceInterfaceAlias
    144   SetupDiGetDeviceInterfaceDetailA = _SetupDiGetDeviceInterfaceDetailA@24    @128
    145   SetupDiGetDeviceInterfaceDetailW = _SetupDiGetDeviceInterfaceDetailW@24    @129
     144  SetupDiGetDeviceInterfaceDetailA = "_SetupDiGetDeviceInterfaceDetailA@24"  @128
     145  SetupDiGetDeviceInterfaceDetailW = "_SetupDiGetDeviceInterfaceDetailW@24"  @129
    146146;@ stub SetupDiGetHwProfileFriendlyNameA
    147147;@ stub SetupDiGetHwProfileFriendlyNameW
    … …  
    160160;@ stub SetupDiMoveDuplicateDevice
    161161;@ stub SetupDiOpenClassRegKey
    162   SetupDiOpenClassRegKeyExW        = _SetupDiOpenClassRegKeyExW@20      @146
     162  SetupDiOpenClassRegKeyExW        = "_SetupDiOpenClassRegKeyExW@20"    @146
    163163;@ stub SetupDiOpenDevRegKey
    164164;@ stub SetupDiOpenDeviceInfoA
    … …  
    182182;@ stub SetupDuplicateDiskSpaceListW
    183183
    184   SetupFindFirstLineA                      = _SetupFindFirstLineA@16       @166
    185   SetupFindFirstLineW                      = _SetupFindFirstLineW@16       @167
    186   SetupFindNextLine                        = _SetupFindNextLine@8          @168
    187   SetupFindNextMatchLineA                  = _SetupFindNextMatchLineA@12  @169
    188   SetupFindNextMatchLineW                  = _SetupFindNextMatchLineW@12  @170
     184  SetupFindFirstLineA                      = "_SetupFindFirstLineA@16"     @166
     185  SetupFindFirstLineW                      = "_SetupFindFirstLineW@16"     @167
     186  SetupFindNextLine                        = "_SetupFindNextLine@8"        @168
     187  SetupFindNextMatchLineA                  = "_SetupFindNextMatchLineA@12" @169
     188  SetupFindNextMatchLineW                  = "_SetupFindNextMatchLineW@12" @170
    189189;@ stub SetupFreeSourceListA
    190190;@ stub SetupFreeSourceListW
    191   SetupGetBinaryField                      = _SetupGetBinaryField@20       @173
    192   SetupGetFieldCount                       = _SetupGetFieldCount@4         @174
     191  SetupGetBinaryField                      = "_SetupGetBinaryField@20"     @173
     192  SetupGetFieldCount                       = "_SetupGetFieldCount@4"       @174
    193193;@ stub SetupGetFileCompressionInfoA
    194194;@ stub SetupGetFileCompressionInfoW
    195   SetupGetFileQueueCount                   = _SetupGetFileQueueCount@12    @177
    196   SetupGetFileQueueFlags                   = _SetupGetFileQueueFlags@8     @178
     195  SetupGetFileQueueCount                   = "_SetupGetFileQueueCount@12"  @177
     196  SetupGetFileQueueFlags                   = "_SetupGetFileQueueFlags@8"   @178
    197197;@ stub SetupGetInfFileListA
    198198;@ stub SetupGetInfFileListW
    199199;@ stub SetupGetInfInformationA
    200200;@ stub SetupGetInfInformationW
    201   SetupGetIntField                         = _SetupGetIntField@12          @183
    202   SetupGetLineByIndexA                     = _SetupGetLineByIndexA@16      @184
    203   SetupGetLineByIndexW                     = _SetupGetLineByIndexW@16      @185
    204   SetupGetLineCountA                       = _SetupGetLineCountA@8         @186
    205   SetupGetLineCountW                       = _SetupGetLineCountW@8         @187
    206   SetupGetLineTextA                        = _SetupGetLineTextA@28         @188
    207   SetupGetLineTextW                        = _SetupGetLineTextW@28         @189
    208   SetupGetMultiSzFieldA                    = _SetupGetMultiSzFieldA@20     @190
    209   SetupGetMultiSzFieldW                    = _SetupGetMultiSzFieldW@20     @191
     201  SetupGetIntField                         = "_SetupGetIntField@12"        @183
     202  SetupGetLineByIndexA                     = "_SetupGetLineByIndexA@16"    @184
     203  SetupGetLineByIndexW                     = "_SetupGetLineByIndexW@16"    @185
     204  SetupGetLineCountA                       = "_SetupGetLineCountA@8"       @186
     205  SetupGetLineCountW                       = "_SetupGetLineCountW@8"       @187
     206  SetupGetLineTextA                        = "_SetupGetLineTextA@28"       @188
     207  SetupGetLineTextW                        = "_SetupGetLineTextW@28"       @189
     208  SetupGetMultiSzFieldA                    = "_SetupGetMultiSzFieldA@20"   @190
     209  SetupGetMultiSzFieldW                    = "_SetupGetMultiSzFieldW@20"   @191
    210210;@ stub SetupGetSourceFileLocationA
    211211;@ stub SetupGetSourceFileLocationW
    … …  
    214214;@ stub SetupGetSourceInfoA
    215215;@ stub SetupGetSourceInfoW
    216   SetupGetStringFieldA                     = _SetupGetStringFieldA@20      @198
    217   SetupGetStringFieldW                     = _SetupGetStringFieldW@20      @199
     216  SetupGetStringFieldA                     = "_SetupGetStringFieldA@20"    @198
     217  SetupGetStringFieldW                     = "_SetupGetStringFieldW@20"    @199
    218218;@ stub SetupGetTargetPathA
    219219;@ stub SetupGetTargetPathW
    220   SetupInitDefaultQueueCallback            = _SetupInitDefaultQueueCallback@4    @202
    221   SetupInitDefaultQueueCallbackEx          = _SetupInitDefaultQueueCallbackEx@20 @203
     220  SetupInitDefaultQueueCallback            = "_SetupInitDefaultQueueCallback@4"  @202
     221  SetupInitDefaultQueueCallbackEx          = "_SetupInitDefaultQueueCallbackEx@20" @203
    222222;@ stub SetupInitializeFileLogA
    223223;@ stub SetupInitializeFileLogW
    … …  
    226226;@ stub SetupInstallFileExW
    227227;@ stub SetupInstallFileW
    228   SetupInstallFilesFromInfSectionA          = _SetupInstallFilesFromInfSectionA@24  @210
    229   SetupInstallFilesFromInfSectionW          = _SetupInstallFilesFromInfSectionW@24  @211
    230   SetupInstallFromInfSectionA               = _SetupInstallFromInfSectionA@44       @212
    231   SetupInstallFromInfSectionW               = _SetupInstallFromInfSectionW@44       @213
     228  SetupInstallFilesFromInfSectionA          = "_SetupInstallFilesFromInfSectionA@24"  @210
     229  SetupInstallFilesFromInfSectionW          = "_SetupInstallFilesFromInfSectionW@24"  @211
     230  SetupInstallFromInfSectionA               = "_SetupInstallFromInfSectionA@44"     @212
     231  SetupInstallFromInfSectionW               = "_SetupInstallFromInfSectionW@44"     @213
    232232;@ stub SetupInstallServicesFromInfSectionA
    233233;@ stub SetupInstallServicesFromInfSectionW
    234   SetupIterateCabinetA                      = _SetupIterateCabinetA@16    @216
    235   SetupIterateCabinetW                      = _SetupIterateCabinetW@16    @217
     234  SetupIterateCabinetA                      = "_SetupIterateCabinetA@16"  @216
     235  SetupIterateCabinetW                      = "_SetupIterateCabinetW@16"  @217
    236236;@ stub SetupLogFileA
    237237;@ stub SetupLogFileW
    238   SetupOpenAppendInfFileA                   = _SetupOpenAppendInfFileA@12 @220
    239   SetupOpenAppendInfFileW                   = _SetupOpenAppendInfFileW@12 @221
    240   SetupOpenFileQueue                        = _SetupOpenFileQueue@0       @222
    241   SetupOpenInfFileA                         = _SetupOpenInfFileA@16       @223
    242   SetupOpenInfFileW                         = _SetupOpenInfFileW@16       @224
     238  SetupOpenAppendInfFileA                   = "_SetupOpenAppendInfFileA@12" @220
     239  SetupOpenAppendInfFileW                   = "_SetupOpenAppendInfFileW@12" @221
     240  SetupOpenFileQueue                        = "_SetupOpenFileQueue@0"     @222
     241  SetupOpenInfFileA                         = "_SetupOpenInfFileA@16"     @223
     242  SetupOpenInfFileW                         = "_SetupOpenInfFileW@16"     @224
    243243;@ stub SetupOpenMasterInf
    244244;@ stub SetupPromptForDiskA
    … …  
    257257;@ stub SetupQuerySpaceRequiredOnDriveA
    258258;@ stub SetupQuerySpaceRequiredOnDriveW
    259   SetupQueueCopyA                            = _SetupQueueCopyA@36          @241
    260   SetupQueueCopyIndirectA                    = _SetupQueueCopyIndirectA@4  @242
    261   SetupQueueCopyIndirectW                    = _SetupQueueCopyIndirectW@4  @243
    262   SetupQueueCopySectionA                     = _SetupQueueCopySectionA@24  @244
    263   SetupQueueCopySectionW                     = _SetupQueueCopySectionW@24  @245
    264   SetupQueueCopyW                            = _SetupQueueCopyW@36          @246
    265   SetupQueueDefaultCopyA                     = _SetupQueueDefaultCopyA@24  @247
    266   SetupQueueDefaultCopyW                     = _SetupQueueDefaultCopyW@24  @248
    267   SetupQueueDeleteA                          = _SetupQueueDeleteA@12        @249
    268   SetupQueueDeleteSectionA                   = _SetupQueueDeleteSectionA@16 @250
    269   SetupQueueDeleteSectionW                   = _SetupQueueDeleteSectionW@16 @251
    270   SetupQueueDeleteW                          = _SetupQueueDeleteW@12        @252
    271   SetupQueueRenameA                          = _SetupQueueRenameA@20        @253
    272   SetupQueueRenameSectionA                   = _SetupQueueRenameSectionA@16 @254
    273   SetupQueueRenameSectionW                   = _SetupQueueRenameSectionW@16 @255
    274   SetupQueueRenameW                          = _SetupQueueRenameW@20        @256
     259  SetupQueueCopyA                            = "_SetupQueueCopyA@36"        @241
     260  SetupQueueCopyIndirectA                    = "_SetupQueueCopyIndirectA@4" @242
     261  SetupQueueCopyIndirectW                    = "_SetupQueueCopyIndirectW@4" @243
     262  SetupQueueCopySectionA                     = "_SetupQueueCopySectionA@24" @244
     263  SetupQueueCopySectionW                     = "_SetupQueueCopySectionW@24" @245
     264  SetupQueueCopyW                            = "_SetupQueueCopyW@36"        @246
     265  SetupQueueDefaultCopyA                     = "_SetupQueueDefaultCopyA@24" @247
     266  SetupQueueDefaultCopyW                     = "_SetupQueueDefaultCopyW@24" @248
     267  SetupQueueDeleteA                          = "_SetupQueueDeleteA@12"      @249
     268  SetupQueueDeleteSectionA                   = "_SetupQueueDeleteSectionA@16" @250
     269  SetupQueueDeleteSectionW                   = "_SetupQueueDeleteSectionW@16" @251
     270  SetupQueueDeleteW                          = "_SetupQueueDeleteW@12"      @252
     271  SetupQueueRenameA                          = "_SetupQueueRenameA@20"      @253
     272  SetupQueueRenameSectionA                   = "_SetupQueueRenameSectionA@16" @254
     273  SetupQueueRenameSectionW                   = "_SetupQueueRenameSectionW@16" @255
     274  SetupQueueRenameW                          = "_SetupQueueRenameW@20"      @256
    275275;@ stub SetupRemoveFileLogEntryA
    276276;@ stub SetupRemoveFileLogEntryW
    … …  
    286286;@ stub SetupRenameErrorW
    287287;@ stub SetupScanFileQueue
    288   SetupScanFileQueueA                        = _SetupScanFileQueueA@24    @269
    289   SetupScanFileQueueW                        = _SetupScanFileQueueW@24    @270
    290   SetupSetDirectoryIdA                       = _SetupSetDirectoryIdA@12  @271
     288  SetupScanFileQueueA                        = "_SetupScanFileQueueA@24"  @269
     289  SetupScanFileQueueW                        = "_SetupScanFileQueueW@24"  @270
     290  SetupSetDirectoryIdA                       = "_SetupSetDirectoryIdA@12" @271
    291291;@ stub SetupSetDirectoryIdExA
    292292;@ stub SetupSetDirectoryIdExW
    293   SetupSetDirectoryIdW                       = _SetupSetDirectoryIdW@12  @274
    294   SetupSetFileQueueFlags                     = _SetupSetFileQueueFlags@12 @275
     293  SetupSetDirectoryIdW                       = "_SetupSetDirectoryIdW@12" @274
     294  SetupSetFileQueueFlags                     = "_SetupSetFileQueueFlags@12" @275
    295295;@ stub SetupSetPlatformPathOverrideA
    296296;@ stub SetupSetPlatformPathOverrideW
    297297;@ stub SetupSetSourceListA
    298298;@ stub SetupSetSourceListW
    299   SetupTermDefaultQueueCallback              = _SetupTermDefaultQueueCallback@4 @280
     299  SetupTermDefaultQueueCallback              = "_SetupTermDefaultQueueCallback@4" @280
    300300;@ stub SetupTerminateFileLog
    301301;@ stub ShouldDeviceBeExcluded
Note: See TracChangeset for help on using the changeset viewer.