diff --git a/ChangeLog.md b/ChangeLog.md index 351ab33d..f15c3608 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -33,6 +33,27 @@ produce the Windows executables and installer. currently used version in a given branch. --- +Release 5.9.4 +=== +This release fixes a widely-reported bug that resulted in the cAPI Authentication +flow being disrupted for a subset of users. Thank you to all the CMDRs who reported this to +us and provided logs to us so that we could get the issue isolated. + +- Fixes a missing registry issue that could cause the EDMC:// protocol to fail. +(#2061, #2059, #2058, #2057) +- Renames the default start menu shortcut to be more clear. (#2062) + +Known Issues +-- +- The popup on the EDMC Authentication Box is not translated yet. Ich spreche kein Deutsch. +- The cAPI is giving an Error: 500 on the /shipyard endpoint on carriers. We think this is an FDEV issue. + +Release 5.9.3 +=== +This release is identical to 5.9.3, except reverts a bad change. + +- REVERTS Deprecated load_module() is now retired (#1462) + Release 5.9.2 === This release fixes a critical issue on clean installs which would not update the diff --git a/companion.py b/companion.py index 510510d5..60322231 100644 --- a/companion.py +++ b/companion.py @@ -15,6 +15,7 @@ import json import numbers import os import random +import sys import threading import time import tkinter as tk @@ -743,6 +744,10 @@ class Session(object): self.state = Session.STATE_INIT # Will try to authorize again on next login or query self.auth = None raise # Bad thing happened + if getattr(sys, 'frozen', False): + tk.messagebox.showinfo(title="Authentication Successful", + message="Authentication with cAPI Successful.\n" + "You may now close the Frontier login tab if it is still open.") def close(self) -> None: """Close the `request.Session().""" diff --git a/config/__init__.py b/config/__init__.py index e9079c28..e7232e1f 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,8 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.9.2' +_static_appversion = '5.9.4' + _cached_version: Optional[semantic_version.Version] = None copyright = '© 2015-2019 Jonathan Harris, 2020-2023 EDCD' diff --git a/resources/EDMC_Installer_Config_template.txt b/resources/EDMC_Installer_Config_template.txt index 7810270b..4b8f053d 100644 --- a/resources/EDMC_Installer_Config_template.txt +++ b/resources/EDMC_Installer_Config_template.txt @@ -1,4 +1,5 @@ #define MyAppName "EDMarketConnector" +#define MyAppLongName "Elite Dangerous Market Connector" #define MyAppVersion "$appver" #define MyAppPublisher "EDCD" #define MyAppURL "https://edcd.github.io/" @@ -32,7 +33,7 @@ LicenseFile=LICENSE AlwaysShowDirOnReadyPage=yes UninstallDisplayIcon={app}\{#MyAppExeName} MinVersion=6.2 - +ChangesAssociations = yes [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" @@ -45,36 +46,49 @@ Source: "dist.win32\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion Source: "dist.win32\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs [Icons] -Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" -Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon +Name: "{autoprograms}\{#MyAppLongName}"; Filename: "{app}\{#MyAppExeName}"; Comment: "EDMC"; +Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon; [Run] Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent ;Check if a WiX-based installation exists. If so, kill it with fire. [Code] +function IsWixInstalled: Boolean; +var + Uninstall: String; +begin + Result := RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5E9AD4D3-0365-41D5-9586-9368745DD109}', 'UninstallString', Uninstall); +end; + procedure CurStepChanged(CurStep: TSetupStep); var ResultCode: Integer; Uninstall: String; begin - if (CurStep = ssInstall) then begin - if RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5E9AD4D3-0365-41D5-9586-9368745DD109}', 'UninstallString', Uninstall) then begin - MsgBox('Warning: an old version of EDMC is installed! Please close EDMC while we remove the old version!', mbInformation, MB_OK); - Uninstall := '/x {5E9AD4D3-0365-41D5-9586-9368745DD109}'; - Exec('MsiExec.exe', Uninstall, '', SW_SHOW, ewWaitUntilTerminated, ResultCode); - end; + if (CurStep = ssInstall) and IsWixInstalled then + begin + MsgBox('Warning: an old version of EDMC is installed! Please close EDMC while we remove the old version!', mbInformation, MB_OK); + Uninstall := '/x {5E9AD4D3-0365-41D5-9586-9368745DD109}'; + Exec('MsiExec.exe', Uninstall, '', SW_SHOW, ewWaitUntilTerminated, ResultCode); end; end; [Registry] -; Create the registry key for the custom file type +; Create the main registry key under HKCR Root: HKCR; Subkey: "edmc"; Flags: uninsdeletekey -; Create the registry values for the custom file type -Root: HKCR; Subkey: "edmc"; ValueType: string; ValueName: ""; ValueData: "{#MyAppName}"; Flags: uninsdeletevalue -Root: HKCR; Subkey: "edmc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0"; Flags: uninsdeletevalue -Root: HKCR; Subkey: "edmc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""; Flags: uninsdeletevalue - -; Register the URL protocol handler -Root: HKCR; Subkey: "edmc"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Flags: uninsdeletevalue +; Create a default value under the "edmc" key +Root: HKCR; Subkey: "edmc"; ValueType: string; ValueName: ""; ValueData: "{#MyAppName}"; Flags: uninsdeletekey +; Create the "URL Protocol" value under the "edmc" key +Root: HKCR; Subkey: "edmc"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Flags: uninsdeletekey +; Create the "DefaultIcon" subkey under the "edmc" key +Root: HKCR; Subkey: "edmc\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\EDMarketConnector.exe,0"; Flags: uninsdeletekey +; Create the "shell" subkey under the "edmc" key +Root: HKCR; Subkey: "edmc\shell"; Flags: uninsdeletekey +; Create the "open" subkey under the "shell" subkey +Root: HKCR; Subkey: "edmc\shell\open"; Flags: uninsdeletekey +; Create the "command" subkey under the "open" subkey +Root: HKCR; Subkey: "edmc\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\EDMarketConnector.exe"" ""%1"""; Flags: uninsdeletekey +; Create the "ddeexec" subkey under the "open" subkey +Root: HKCR; Subkey: "edmc\shell\open\ddeexec"; ValueType: string; ValueName: ""; ValueData: "Open(""%1"")"; Flags: uninsdeletekey