Compare commits

...
7 Commits
5 changed files with 16 additions and 7 deletions

No files matched your search

+1 -1
View File
@@ -18,7 +18,7 @@ get_and_set_reg_file --add 'Software\CTM\CTMSETUP' 'SkipKBCheck' 'REG_DWORD' "1"
AUTOINSTALL_EXE="${WH_TMP_DIR}/setup_cs.exe"
AUTOINSTALL_UNPACK="${WH_TMP_DIR}/setup_cs"
AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cs/setup.exe"
AUTOINSTALL_SETUP="${WH_TMP_DIR}/setup_cs/Setup.exe"
if try_download "https://files.ctm.ru/CSERVICE/SFX/setup_cs.exe" "${AUTOINSTALL_EXE}" ; then
unpack "${AUTOINSTALL_EXE}" "${AUTOINSTALL_UNPACK}"
+1
View File
@@ -10,6 +10,7 @@ export WINEARCH="win64"
export INSTALL_DLL="crypt32"
export WH_WINDOWS_VER="7"
export WH_USE_CPCSP_PROXY="1"
export CPCSP_PROXY_WOW64_VER="0.7.7-alt1.1-em-wow64"
export STAGING_SHARED_MEMORY="1"
export WINE_LARGE_ADDRESS_AWARE="1"
+1
View File
@@ -11,6 +11,7 @@ export WH_WINDOWS_VER="7"
export INSTALL_DLL="jet40 dotnet45 corefonts lucida opensymbol tahoma cjkfonts mdac28 msxml4 native_oleaut32 vcrun2005"
export WINEDLLOVERRIDES="d2d1=n"
export WH_MAIN_DECORATED="0"
export FREETYPE_PROPERTIES="truetype:interpreter-version=35"
if [[ -f "$2" ]] \
&& [[ $(basename "$2") =~ (Loader\.exe) ]]
+1
View File
@@ -118,6 +118,7 @@ edf16d2b37bc77d121d5d81b06b60d3f694e0060c6606e729ceab30de3d27466 vkd3d-proton-s
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
5a0c582f662ac501865f569124c153b43cded72eb98a001eaa7ebd5b2168f1a2 wine-cpcsp_proxy-0.7.7-alt1.1-em-wow64.tar.xz
##### FONTS #####
405bfe3b7c7f80034837c05656535053305727ee4bf1d993521b67b71d08ebc6 extra_fonts_v01.tar.xz
+12 -6
View File
@@ -737,7 +737,7 @@ EOF
-e "PROG_NAME=" -e "PROG_ICON=" -e "var_" -e "WH_MAIN_DECORATED" \
-e "WH_VIRTUAL_DESKTOP" -e "WINE_TOP_WINDOW" -e "WH_FONT_SMOOTHING "\
-e "WH_FONT_MSS_REPLACE" -e "FREETYPE_PROPERTIES" -e "WINE_D3D_CONFIG" \
-e "WH_USE_MESA_GL_OVERRIDE" \
-e "WH_USE_MESA_GL_OVERRIDE" -e "WINEDLLOVERRIDES" \
"$INSTALL_SCRIPT" | awk '{$1=$1;print}' >> "$exe_file".whdb
print_info "Создан файл настроек для $exe_file"
@@ -947,6 +947,7 @@ init_wine_ver () {
fi
if [[ $WH_USE_CPCSP_PROXY == "1" ]] ; then
unset UPDATE_CPCSP_PROXY
local cpcsp_proxy_ver
if [[ $WH_WINE_WOW64 == "1" ]]
then cpcsp_proxy_ver="$CPCSP_PROXY_WOW64_VER"
@@ -955,6 +956,7 @@ init_wine_ver () {
if [[ ! -f "$WINEDIR/cpcsp_proxy.ver" ]] \
|| ! grep -q "$cpcsp_proxy_ver" "$WINEDIR/cpcsp_proxy.ver"
then
export UPDATE_CPCSP_PROXY="1"
CPCSP_PROXY_NAME="wine-cpcsp_proxy-$cpcsp_proxy_ver"
CPCSP_PROXY_URL="$CLOUD_URL/$CPCSP_PROXY_NAME.tar.xz"
@@ -1353,16 +1355,18 @@ init_wineprefix () {
# настраиваем префикс для работы с cpcsp_proxy
if [[ $WH_USE_CPCSP_PROXY == "1" ]] ; then
if ! grep -q "cpcsp_proxy.dll" "$WINEPREFIX/system.reg" \
|| [[ $REBOOT_PFX == "1" ]]
if [[ $UPDATE_CPCSP_PROXY == "1" ]] \
|| [[ $REBOOT_PFX == "1" ]] \
|| ! grep -q "cpcsp_proxy.dll" "$WINEPREFIX/system.reg"
then
print_info "Запускаем настройку cpcsp_proxy..."
CPCSP_PROXY_OK="0"
try_copy_wine_dll_to_pfx_64 "cpcsp_proxy.dll"
try_copy_wine_dll_to_pfx_32 "cpcsp_proxy.dll"
if [[ $WH_WINE_WOW64 == "1" ]] ; then
print_info "Запускаем настройку cpcsp_proxy версии $CPCSP_PROXY_WOW64_VER"
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"
@@ -1373,6 +1377,8 @@ init_wineprefix () {
/s /n /i cpcsp_proxy.dll 2>&1 | tee -a "$WINEPREFIX/cpcsp_setup.log"
wait_wineserver
else
print_info "Запускаем настройку cpcsp_proxy версии $CPCSP_PROXY_X86_64_VER"
try_copy_wine_dll_to_pfx_64 "cpcsp_proxy_setup.exe"
try_copy_wine_dll_to_pfx_32 "cpcsp_proxy_setup.exe"
@@ -1425,8 +1431,8 @@ init_wineprefix () {
fi
for var in WH_WINE_USE BASE_PFX WINEARCH WH_WINDOWS_VER WINEESYNC WINEFSYNC \
STAGING_SHARED_MEMORY WINE_LARGE_ADDRESS_AWARE WH_USE_SHADER_CACHE WH_USE_WINE_DXGI \
WINE_CPU_TOPOLOGY DXVK_VER VKD3D_VER WH_XDG_OPEN WH_USE_CPCSP_PROXY WH_USE_EXTRA_FONTS \
WINEUSERNAME
WINE_CPU_TOPOLOGY DXVK_VER VKD3D_VER WH_XDG_OPEN WH_USE_EXTRA_FONTS \
WINEUSERNAME WH_USE_CPCSP_PROXY CPCSP_PROXY_X86_64_VER CPCSP_PROXY_WOW64_VER
do
update_last_conf_var "$var" "${!var}"
done