Skip to content

Commit

Permalink
vcrun2008: remove manifests when installing native dll
Browse files Browse the repository at this point in the history
Signed-off-by: Austin English <austinenglish@gmail.com>

 interactive rebase in progress; onto 5ff2a15
  • Loading branch information
austin987 committed Jun 14, 2017
1 parent 6226c41 commit d4056f5
Showing 1 changed file with 18 additions and 3 deletions.
21 changes: 18 additions & 3 deletions src/winetricks
Expand Up @@ -1798,6 +1798,17 @@ w_common_override_dll()
w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc80.mfcloc_1fc8b3b9a1e18e3b_8.0.50727.6195_none_deadbeef.manifest
w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc80.openmp_1fc8b3b9a1e18e3b_8.0.50727.6195_none_deadbeef.manifest
;;
vcrun2008)
w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/amd64_microsoft.vc90.atl_1fc8b3b9a1e18e3b_9.0.30729.6161_none_deadbeef.manifest
w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/amd64_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.6161_none_deadbeef.manifest
w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc90.atl_1fc8b3b9a1e18e3b_9.0.30729.6161_none_deadbeef.manifest
w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.6161_none_deadbeef.manifest

# These are 32-bit only?
w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc90.mfc_1fc8b3b9a1e18e3b_9.0.30729.6161_none_deadbeef.manifest
w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc90.mfcloc_1fc8b3b9a1e18e3b_9.0.30729.6161_none_deadbeef.manifest
w_try rm -rf "$W_WINDIR_UNIX"/winsxs/manifests/x86_microsoft.vc90.openmp_1fc8b3b9a1e18e3b_9.0.30729.6161_none_deadbeef.manifest
;;
esac

if [ "$_W_mode" = default ] ; then
Expand Down Expand Up @@ -9315,13 +9326,17 @@ load_vcrun2008()
w_download https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe 6b3e4c51c6c0e5f68c8a72b497445af3dbf976394cbb62aa23569065c28deeb6

# For native to be used, msvc* dlls must either be set to native only, OR
# set to native, builtin and remove wine's builtin manifest. Removing the manifest
# Makes it harder for user to revert later, so use native only method.
# set to native, builtin and remove wine's builtin manifest. Setting to native only breaks several apps,
# e.g., Dirac Codec and Ragnarok Online.
# For more info, see:
# https://bugs.winehq.org/show_bug.cgi?id=28225
# https://bugs.winehq.org/show_bug.cgi?id=33604
# https://bugs.winehq.org/show_bug.cgi?id=42859
w_override_dlls native atl90 msvcm90 msvcp90 msvcr90 vcomp90
# https://bugs.winehq.org/show_bug.cgi?id=28225
# https://bugs.winehq.org/show_bug.cgi?id=33604
# https://bugs.winehq.org/show_bug.cgi?id=42859
w_override_dlls native,builtin atl90 msvcm90 msvcp90 msvcr90 vcomp90

w_try_cd "$W_CACHE/$W_PACKAGE"
w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_Q

Expand Down

0 comments on commit d4056f5

Please sign in to comment.