diff --git a/sha256sum.list b/sha256sum.list index 9ecdfd1..db5100b 100644 --- a/sha256sum.list +++ b/sha256sum.list @@ -114,6 +114,7 @@ edf16d2b37bc77d121d5d81b06b60d3f694e0060c6606e729ceab30de3d27466 vkd3d-proton-s ##### CPCSP_PROXY ##### 3153088ff28d6af415c3504a421e5382554dbb305f38d5a87dd84df90d680421 wine-cpcsp_proxy-0.6.1-alt1.tar.xz fbe72bfe3c2c307363782ce2d37589e142b44111f269657b0e516a6b2d6ab8a9 wine-cpcsp_proxy-0.7.3-alt5-wow64.tar.xz +6f43427148c6f424cd49a406328669e4ec4f21df7bc86f1a6aad2b5c16b50e39 wine-cpcsp_proxy-0.7.7-alt1-wow64.tar.xz ##### FONTS ##### 405bfe3b7c7f80034837c05656535053305727ee4bf1d993521b67b71d08ebc6 extra_fonts_v01.tar.xz diff --git a/winehelper b/winehelper index 6ec8ea8..35084fb 100755 --- a/winehelper +++ b/winehelper @@ -143,7 +143,7 @@ check_variables WH_WINE_USE "wine_x_tkg_10-0_amd64" # or system check_variables WH_USE_CPCSP_PROXY "0" check_variables CPCSP_PROXY_X86_64_VER "0.6.1-alt1" -check_variables CPCSP_PROXY_WOW64_VER "0.7.3-alt5-wow64" +check_variables CPCSP_PROXY_WOW64_VER "0.7.7-alt1-wow64" check_variables WH_USE_EXTRA_FONTS "0" check_variables EXTRA_FONTS_VER "01" @@ -1326,11 +1326,15 @@ init_wineprefix () { try_copy_wine_dll_to_pfx_32 "cpcsp_proxy.dll" if [[ $WH_WINE_WOW64 == "1" ]] ; then + print_info "Запускаем регистрацию 64-битного cpcsp_proxy.dll..." env WINEDEBUG="fixme-all" "$WINE" "C:\\windows\\system32\\regsvr32.exe" \ /s /n /i cpcsp_proxy.dll 2>&1 | tee "$WINEPREFIX/cpcsp_setup.log" + wait_wineserver + print_info "Запускаем регистрацию 32-битного cpcsp_proxy.dll..." env WINEDEBUG="fixme-all" "$WINE" "C:\\windows\\syswow64\\regsvr32.exe" \ /s /n /i cpcsp_proxy.dll 2>&1 | tee -a "$WINEPREFIX/cpcsp_setup.log" + wait_wineserver else try_copy_wine_dll_to_pfx_64 "cpcsp_proxy_setup.exe" try_copy_wine_dll_to_pfx_32 "cpcsp_proxy_setup.exe" @@ -1356,7 +1360,6 @@ init_wineprefix () { fi try_remove_file "$WINEPREFIX/cpcsp_setup.log" - wait_wineserver if [[ $CPCSP_PROXY_OK == "1" ]] then print_info "Настройка cpcsp_proxy успешно завершена." else fatal "Ошибка во время настройки cpcsp_proxy."