From bb096c519724b5ac7238f1783620060494975943 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sat, 1 Nov 2025 22:46:22 +0300 Subject: [PATCH] gdiplus... im in danger... --- .gitignore | 3 ++- prepare.sh | 6 ++++++ src/config.py | 1 + src/installationthread.py | 14 ++++++++++++-- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a5240e3..239744d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ bin/* assets/wine assets/vcr.zip -assets/msxml3.zip \ No newline at end of file +assets/msxml3.zip +assets/gdiplus.dll \ No newline at end of file diff --git a/prepare.sh b/prepare.sh index 5e43ff9..d71f2d1 100755 --- a/prepare.sh +++ b/prepare.sh @@ -46,5 +46,11 @@ zip ./assets/msxml3.zip msxml3.dll msxml3r.dll rm msxml3.dll rm msxml3r.dll + +# Download gdiplus.dll +echo Downloading gdiplus.dll... +curl -LO https://github.com/relativemodder/aegnux/releases/download/vcrbin/gdiplus.dll +mv gdiplus.dll ./assets/ + echo -------------------------------------------- echo Done! \ No newline at end of file diff --git a/src/config.py b/src/config.py index 7217ba3..559e64a 100644 --- a/src/config.py +++ b/src/config.py @@ -11,6 +11,7 @@ STYLES_PATH = BASE_DIR + '/styles' WINE_RUNNER_DIR = BASE_DIR + '/assets/wine' WINETRICKS_BIN = BASE_DIR + '/bin/winetricks' CABEXTRACT_BIN = BASE_DIR + '/bin/cabextract' +GDIPLUS_DLL = BASE_DIR + '/assets/gdiplus.dll' VCR_ZIP = BASE_DIR + '/assets/vcr.zip' MSXML_ZIP = BASE_DIR + '/assets/msxml3.zip' diff --git a/src/installationthread.py b/src/installationthread.py index f96f317..278c37c 100644 --- a/src/installationthread.py +++ b/src/installationthread.py @@ -5,7 +5,7 @@ from src.config import ( AE_DOWNLOAD_URL, AE_FILENAME, WINE_RUNNER_DIR, WINETRICKS_BIN, CABEXTRACT_BIN, WINE_STYLE_REG, - VCR_ZIP, MSXML_ZIP + VCR_ZIP, MSXML_ZIP, GDIPLUS_DLL ) from src.processthread import ProcessThread from src.utils import ( @@ -107,7 +107,7 @@ class InstallationThread(ProcessThread): self.progress_signal.emit(60) - tweaks = ['dxvk', 'corefonts', 'gdiplus', 'fontsmooth=rgb'] + tweaks = ['dxvk', 'corefonts', 'fontsmooth=rgb'] for tweak in tweaks: self.log_signal.emit(f'[DEBUG] Installing {tweak} with winetricks') self.run_command(['winetricks', '-q', tweak], in_prefix=True) @@ -142,6 +142,16 @@ class InstallationThread(ProcessThread): in_prefix=True ) + self.log_signal.emit(f'[DEBUG] Overriding gdiplus DLL...') + shutil.copy(GDIPLUS_DLL, system32_dir.joinpath('gdiplus.dll')) + + self.run_command( + ['wine', 'reg', 'add', + 'HKCU\\Software\\Wine\\DllOverrides', '/v', + 'gdiplus', '/d', 'native,builtin', '/f'], + in_prefix=True + ) + if is_nvidia_present(): self.log_signal.emit("[INFO] Starting NVIDIA libs installation...") self.install_nvidia_libs()