Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bundled Universal CRT not working on computers where the Universal CRT was not already installed

Browse Source
This commit is contained in:
Kovid Goyal 2015-12-11 11:16:09 +05:30
parent 107c454cb2
commit ed1caccac7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
setup/installer/windows/freeze.py
View File

@ -730,14 +730,17 @@ class Win32Freeze(Command, WixMixIn):
vc_path = os.path.join(r'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist', plat, 'Microsoft.VC140.CRT') vc_path = os.path.join(r'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist', plat, 'Microsoft.VC140.CRT')
if not os.path.exists(vc_path): if not os.path.exists(vc_path):
raise SystemExit('Visual Studio redistributable CRT not found') raise SystemExit('Visual Studio redistributable CRT not found')
# I cannot get app local deployment of the UCRT to work. Things left to # We cannot use the Universal CRT DLLs that come with Visual Studio, as
# try: try dlls from the windows sdk standalone, try manually loading # they are broken. Have to use the ones from the Standalone SDK for Windows 10.
# ucrtbase.dll and some api dlls before loading the launcher. # However, I dont want to install this SDK, incase it messes things up,
# sdk_path = os.path.join(r'C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs', plat) # so the below path points to dlls I got from installing the SDK in a
# if not os.path.exists(sdk_path): # different VM. To re-create just copy the api-ms*.dll and ucrtbase.dll
# raise SystemExit('Windows 10 redistributable CRT not found') # files from a previous calibre install.
# for dll in glob.glob(os.path.join(sdk_path, '*.dll')): sdk_path = os.path.join(SW, '..', 'ucrt', 'DLLs', plat)
# shutil.copy2(dll, self.dll_dir) if not os.path.exists(sdk_path):
raise SystemExit('Windows 10 Universal CRT redistributable not found')
for dll in glob.glob(os.path.join(sdk_path, '*.dll')):
shutil.copy2(dll, self.dll_dir)
for dll in glob.glob(os.path.join(vc_path, '*.dll')): for dll in glob.glob(os.path.join(vc_path, '*.dll')):
bname = os.path.basename(dll) bname = os.path.basename(dll)
if not bname.startswith('vccorlib') and not bname.startswith('concrt'): if not bname.startswith('vccorlib') and not bname.startswith('concrt'):

2
setup/installer/windows/main.c
View File

@ -78,6 +78,8 @@ static ENTRYPROC load_launcher_dll() {
show_last_error(L"Failed to set DLL directory"); show_last_error(L"Failed to set DLL directory");
return NULL; return NULL;
} }
// Have to load ucrtbase manually first, otherwise loading fails on systems where the
// Universal CRT is not installed.
if (!LoadLibraryW(L"ucrtbase.dll")) { if (!LoadLibraryW(L"ucrtbase.dll")) {
show_last_error(L"Unable to find ucrtbase.dll. You should install all Windows updates on your computer to get this file."); show_last_error(L"Unable to find ucrtbase.dll. You should install all Windows updates on your computer to get this file.");
return NULL; return NULL;