crt: move dismapi to lib-common
Use the shared one for lib64 and libarm64, and add a new def file for
lib32.
Signed-off-by: Biswapriyo Nath <nathbappai@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
diff --git a/mingw-w64-crt/lib-common/dismapi.def b/mingw-w64-crt/lib-common/dismapi.def
new file mode 100644
index 0000000..f4aba2f
--- /dev/null
+++ b/mingw-w64-crt/lib-common/dismapi.def
@@ -0,0 +1,102 @@
+;
+; Definition file of DismApi.DLL
+; Automatic generated by gendef
+; written by Kai Tietz 2008-2014
+;
+LIBRARY "DismApi.DLL"
+EXPORTS
+DismAddCapability
+DismAddDriver
+DismAddPackage
+DismApplyUnattend
+DismCheckImageHealth
+DismCleanupMountpoints
+DismCloseSession
+DismCommitImage
+DismDelete
+DismDisableFeature
+DismEnableFeature
+DismGetCapabilities
+DismGetCapabilityInfo
+DismGetDriverInfo
+DismGetDrivers
+DismGetFeatureInfo
+DismGetFeatureParent
+DismGetFeatures
+DismGetImageInfo
+DismGetLastErrorMessage
+DismGetMountedImageInfo
+DismGetPackageInfo
+DismGetPackageInfoEx
+DismGetPackages
+DismGetReservedStorageState
+DismInitialize
+DismMountImage
+DismOpenSession
+DismRemountImage
+DismRemoveCapability
+DismRemoveDriver
+DismRemovePackage
+DismRestoreImageHealth
+DismSetReservedStorageState
+DismShutdown
+DismUnmountImage
+_DismAddCapabilityEx
+_DismAddDriverEx
+_DismAddPackageEx
+_DismAddPackageFamilyToUninstallBlocklist
+_DismAddProvisionedAppxPackage
+_DismApplyCustomDataImage
+_DismApplyFfuImage
+_DismApplyProvisioningPackage
+_DismCleanImage
+_DismEnableDisableFeature
+_DismExportDriver
+_DismExportSource
+_DismExportSourceEx
+_DismGetCapabilitiesEx
+_DismGetCapabilityInfoEx
+_DismGetCurrentEdition
+_DismGetDriversEx
+_DismGetEffectiveSystemUILanguage
+_DismGetFeaturesEx
+_DismGetInstallLanguage
+_DismGetKCacheBinaryValue
+_DismGetKCacheDwordValue
+_DismGetKCacheStringValue
+_DismGetLastCBSSessionID
+_DismGetNonRemovableAppsPolicy
+_DismGetOSUninstallWindow
+_DismGetOsInfo
+_DismGetProductKeyInfo
+_DismGetProvisionedAppxPackages
+_DismGetProvisioningPackageInfo
+_DismGetRegistryMountPoint
+_DismGetStateFromCBSSessionID
+_DismGetTargetCompositionEditions
+_DismGetTargetEditions
+_DismGetTargetVirtualEditions
+_DismGetUsedSpace
+_DismInitiateOSUninstall
+_DismOptimizeImage
+_DismOptimizeProvisionedAppxPackages
+_DismRemoveOSUninstall
+_DismRemovePackageFamilyFromUninstallBlocklist
+_DismRemoveProvisionedAppxPackage
+_DismRemoveProvisionedAppxPackageAllUsers
+_DismRevertPendingActions
+_DismSetAllIntlSettings
+_DismSetAppXProvisionedDataFile
+_DismSetEdition
+_DismSetEdition2
+_DismSetFirstBootCommandLine
+_DismSetMachineName
+_DismSetOSUninstallWindow
+_DismSetProductKey
+_DismSetSkuIntlDefaults
+_DismSplitFfuImage
+_DismStage
+_DismSysprepCleanup
+_DismSysprepGeneralize
+_DismSysprepSpecialize
+_DismValidateProductKey
diff --git a/mingw-w64-crt/lib32/Makefile.am b/mingw-w64-crt/lib32/Makefile.am
index d3e5140..db5c5a6 100644
--- a/mingw-w64-crt/lib32/Makefile.am
+++ b/mingw-w64-crt/lib32/Makefile.am
@@ -106,6 +106,7 @@
lib32_DATA += %reldir%/libdhcpsapi.a
#lib32_DATA += %reldir%/libdinput.a # Handled by custom rule
#lib32_DATA += %reldir%/libdinput8.a # Handled by custom rule
+lib32_DATA += %reldir%/libdismapi.a
lib32_DATA += %reldir%/libdlcapi.a
lib32_DATA += %reldir%/libdnsapi.a
lib32_DATA += %reldir%/libdpapi.a
diff --git a/mingw-w64-crt/lib32/dismapi.def b/mingw-w64-crt/lib32/dismapi.def
new file mode 100644
index 0000000..a85146f
--- /dev/null
+++ b/mingw-w64-crt/lib32/dismapi.def
@@ -0,0 +1,102 @@
+;
+; Definition file of DismApi.DLL
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "DismApi.DLL"
+EXPORTS
+DismAddCapability@32
+DismAddDriver@12
+DismAddPackage@28
+DismApplyUnattend@12
+DismCheckImageHealth@24
+DismCleanupMountpoints@0
+DismCloseSession@4
+DismCommitImage@20
+DismDelete@4
+DismDisableFeature@28
+DismEnableFeature@44
+DismGetCapabilities@12
+DismGetCapabilityInfo@12
+DismGetDriverInfo@20
+DismGetDrivers@16
+DismGetFeatureInfo@20
+DismGetFeatureParent@24
+DismGetFeatures@20
+DismGetImageInfo@12
+DismGetLastErrorMessage@4
+DismGetMountedImageInfo@8
+DismGetPackageInfo@16
+DismGetPackageInfoEx@16
+DismGetPackages@12
+DismGetReservedStorageState@8
+DismInitialize@12
+DismMountImage@36
+DismOpenSession@16
+DismRemountImage@4
+DismRemoveCapability@20
+DismRemoveDriver@8
+DismRemovePackage@24
+DismRestoreImageHealth@28
+DismSetReservedStorageState@8
+DismShutdown@0
+DismUnmountImage@20
+_DismAddCapabilityEx@32
+_DismAddDriverEx@24
+_DismAddPackageEx@40
+_DismAddPackageFamilyToUninstallBlocklist@8
+_DismAddProvisionedAppxPackage@48
+_DismApplyCustomDataImage@24
+_DismApplyFfuImage@12
+_DismApplyProvisioningPackage@20
+_DismCleanImage@24
+_DismEnableDisableFeature@48
+_DismExportDriver@20
+_DismExportSource@28
+_DismExportSourceEx@28
+_DismGetCapabilitiesEx@24
+_DismGetCapabilityInfoEx@24
+_DismGetCurrentEdition@8
+_DismGetDriversEx@24
+_DismGetEffectiveSystemUILanguage@8
+_DismGetFeaturesEx@20
+_DismGetInstallLanguage@8
+_DismGetKCacheBinaryValue@16
+_DismGetKCacheDwordValue@12
+_DismGetKCacheStringValue@12
+_DismGetLastCBSSessionID@8
+_DismGetNonRemovableAppsPolicy@12
+_DismGetOSUninstallWindow@8
+_DismGetOsInfo@8
+_DismGetProductKeyInfo@16
+_DismGetProvisionedAppxPackages@12
+_DismGetProvisioningPackageInfo@12
+_DismGetRegistryMountPoint@12
+_DismGetStateFromCBSSessionID@16
+_DismGetTargetCompositionEditions@12
+_DismGetTargetEditions@12
+_DismGetTargetVirtualEditions@16
+_DismGetUsedSpace@12
+_DismInitiateOSUninstall@8
+_DismOptimizeImage@20
+_DismOptimizeProvisionedAppxPackages@4
+_DismRemoveOSUninstall@4
+_DismRemovePackageFamilyFromUninstallBlocklist@8
+_DismRemoveProvisionedAppxPackage@8
+_DismRemoveProvisionedAppxPackageAllUsers@12
+_DismRevertPendingActions@16
+_DismSetAllIntlSettings@8
+_DismSetAppXProvisionedDataFile@12
+_DismSetEdition2@24
+_DismSetEdition@24
+_DismSetFirstBootCommandLine@12
+_DismSetMachineName@8
+_DismSetOSUninstallWindow@8
+_DismSetProductKey@8
+_DismSetSkuIntlDefaults@8
+_DismSplitFfuImage@16
+_DismStage@4
+_DismSysprepCleanup@24
+_DismSysprepGeneralize@28
+_DismSysprepSpecialize@20
+_DismValidateProductKey@8
diff --git a/mingw-w64-crt/lib64/Makefile.am b/mingw-w64-crt/lib64/Makefile.am
index 7b52bc9..8cfa287 100644
--- a/mingw-w64-crt/lib64/Makefile.am
+++ b/mingw-w64-crt/lib64/Makefile.am
@@ -112,6 +112,7 @@
#lib64_DATA += %reldir%/libdinput.a # Handled by custom rule
#lib64_DATA += %reldir%/libdinput8.a # Handled by custom rule
lib64_DATA += %reldir%/libdiskcopy.a
+lib64_DATA += %reldir%/libdismapi.a
lib64_DATA += %reldir%/libdmconfig.a
lib64_DATA += %reldir%/libdmdskmgr.a
lib64_DATA += %reldir%/libdmivcitf.a
diff --git a/mingw-w64-crt/libarm32/dismapi.def b/mingw-w64-crt/libarm32/dismapi.def
deleted file mode 100644
index 2bfe1e7..0000000
--- a/mingw-w64-crt/libarm32/dismapi.def
+++ /dev/null
@@ -1,59 +0,0 @@
-;
-; Definition file of DismApi.DLL
-; Automatic generated by gendef
-; written by Kai Tietz 2008-2014
-;
-LIBRARY "DismApi.DLL"
-EXPORTS
-DismAddDriver
-DismAddPackage
-DismApplyUnattend
-DismCheckImageHealth
-DismCleanupMountpoints
-DismCloseSession
-DismCommitImage
-DismDelete
-DismDisableFeature
-DismEnableFeature
-DismGetDriverInfo
-DismGetDrivers
-DismGetFeatureInfo
-DismGetFeatureParent
-DismGetFeatures
-DismGetImageInfo
-DismGetLastErrorMessage
-DismGetMountedImageInfo
-DismGetPackageInfo
-DismGetPackages
-DismInitialize
-DismMountImage
-DismOpenSession
-DismRemountImage
-DismRemoveDriver
-DismRemovePackage
-DismRestoreImageHealth
-DismShutdown
-DismUnmountImage
-_DismAddProvisionedAppxPackage
-_DismEnableDisableFeature
-_DismExportDriver
-_DismGetCurrentEdition
-_DismGetFeaturesEx
-_DismGetKCacheBinaryValue
-_DismGetKCacheDwordValue
-_DismGetKCacheStringValue
-_DismGetLastCBSSessionID
-_DismGetOsInfo
-_DismGetProductKeyInfo
-_DismGetProvisionedAppxPackages
-_DismGetRegistryMountPoint
-_DismGetStateFromCBSSessionID
-_DismGetTargetEditions
-_DismOptimizeImage
-_DismRemoveProvisionedAppxPackage
-_DismSetAppXProvisionedDataFile
-_DismSetEdition
-_DismSetFirstBootCommandLine
-_DismSetMachineName
-_DismSetProductKey
-_DismValidateProductKey
diff --git a/mingw-w64-crt/libarm64/Makefile.am b/mingw-w64-crt/libarm64/Makefile.am
index 7a2ca4a..07e8145 100644
--- a/mingw-w64-crt/libarm64/Makefile.am
+++ b/mingw-w64-crt/libarm64/Makefile.am
@@ -69,6 +69,7 @@
#libarm64_DATA += %reldir%/libdinput.a # Handled by custom rule
#libarm64_DATA += %reldir%/libdinput8.a # Handled by custom rule
libarm64_DATA += %reldir%/libdiskcopy.a
+libarm64_DATA += %reldir%/libdismapi.a
libarm64_DATA += %reldir%/libdmutil.a
libarm64_DATA += %reldir%/libdnsapi.a
libarm64_DATA += %reldir%/libdnsrslvr.a
