Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions src/updater.rs
Original file line number Diff line number Diff line change
Expand Up @@ -283,18 +283,38 @@ fn build_agent() -> Result<ureq::Agent, String> {
}

fn replace_target_binary(target: &Path, source: &Path) -> Result<(), String> {
replace_target_binary_with_retries(target, source, 60, Duration::from_millis(500))
}

fn replace_target_binary_with_retries(
target: &Path,
source: &Path,
attempts: u32,
delay: Duration,
) -> Result<(), String> {
let backup_path = backup_path_for(target);
let mut last_error = None;

for _ in 0..60 {
let _ = std::fs::remove_file(&backup_path);
for _ in 0..attempts {
// The backup may be the only copy of the installed exe (a failed
// restore, or an earlier interrupted update); drop it only while the
// target itself is still in place.
if target.exists() {
let _ = std::fs::remove_file(&backup_path);
} else if backup_path.exists() {
return Err(format!(
"Unable to replace {}. The previous version is kept at {}.",
target.display(),
backup_path.display()
));
}

let renamed_existing = match std::fs::rename(target, &backup_path) {
Ok(()) => true,
Err(error) if error.kind() == io::ErrorKind::NotFound => false,
Err(error) => {
last_error = Some(error);
std::thread::sleep(Duration::from_millis(500));
std::thread::sleep(delay);
continue;
}
};
Expand All @@ -305,15 +325,22 @@ fn replace_target_binary(target: &Path, source: &Path) -> Result<(), String> {
return Ok(());
}
Err(error) => {
last_error = Some(error);
let _ = std::fs::remove_file(target);
if renamed_existing {
let _ = std::fs::rename(&backup_path, target);
if let Err(restore_error) = std::fs::rename(&backup_path, target) {
return Err(format!(
"Unable to replace {}: {error}. Restoring the previous version \
failed ({restore_error}); it is kept at {}.",
target.display(),
backup_path.display()
));
}
}
last_error = Some(error);
}
}

std::thread::sleep(Duration::from_millis(500));
std::thread::sleep(delay);
}

Err(format!(
Expand Down
29 changes: 29 additions & 0 deletions src/updater/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,35 @@ fn verified_source_can_replace_the_installed_binary() {
assert!(!backup_path_for(&target).exists());
}

#[test]
fn failed_replacement_never_deletes_the_only_copy_in_the_backup() {
let dir = tempfile::tempdir().unwrap();
let source = dir.path().join("missing-download.exe");
let target = dir.path().join("app.exe");
let backup = backup_path_for(&target);
// A previous restore failed: the installed exe survives only as the backup.
std::fs::write(&backup, b"original").unwrap();

let error =
replace_target_binary_with_retries(&target, &source, 3, Duration::ZERO).unwrap_err();

assert!(error.contains(&backup.display().to_string()), "{error}");
assert_eq!(std::fs::read(&backup).unwrap(), b"original");
}

#[test]
fn failed_copy_restores_the_installed_binary() {
let dir = tempfile::tempdir().unwrap();
let source = dir.path().join("missing-download.exe");
let target = dir.path().join("app.exe");
std::fs::write(&target, b"original").unwrap();

replace_target_binary_with_retries(&target, &source, 2, Duration::ZERO).unwrap_err();

assert_eq!(std::fs::read(&target).unwrap(), b"original");
assert!(!backup_path_for(&target).exists());
}

#[test]
fn updater_agent_rejects_plain_http() {
let error = build_agent()
Expand Down
12 changes: 12 additions & 0 deletions src/window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3506,6 +3506,18 @@ fn taskbar_lock_applies(state: &AppState) -> bool {
}
}

/// A locked taskbar widget dragged off the taskbar turns the lock off, so the
/// drop lands as an ordinary floating widget. A widget whose placement the
/// lock does not cover (already floating) keeps the user's preference.
/// Returns whether the lock was released.
fn release_taskbar_lock_for_desktop_drop(state: &mut AppState) -> bool {
if !taskbar_lock_applies(state) {
return false;
}
state.lock_taskbar = false;
true
}

fn clear_locked_auto_ejection(state: &mut AppState) -> bool {
if !taskbar_lock_applies(state) || !state.auto_ejected {
return false;
Expand Down
39 changes: 8 additions & 31 deletions src/window/message_loop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -541,37 +541,14 @@ pub(super) unsafe extern "system" fn wnd_proc(
position_at_taskbar();
render_layered();
} else {
// Locked widgets cannot be dropped as floating: return them
// to the bar so they can only be moved along it.
let locked = lock_state().as_ref().is_some_and(taskbar_lock_applies);
if locked {
let taskbar = {
let mut state = lock_state();
state.as_mut().and_then(|s| {
s.embedded = true;
s.is_switching_window_style = true;
s.is_snapped = false;
s.auto_ejected = false;
s.auto_ejected_for_capacity = false;
s.auto_ejected_origin = None;
s.auto_ejected_host = None;
// The drag leaves the configured taskbar host
// and saved dock placement unchanged.
s.taskbar_hwnd.map(|h| h.to_hwnd())
})
};
// SetParent/style changes can synchronously re-enter
// wnd_proc. Release STATE before calling Win32.
if let Some(taskbar) = taskbar {
native_interop::embed_as_child(hwnd, taskbar);
}
if let Some(s) = lock_state().as_mut() {
s.is_switching_window_style = false;
}
save_state_settings();
position_at_taskbar();
render_layered();
return LRESULT(0);
// Dropping a locked widget onto the desktop releases the lock:
// re-embedding it from the drag popup left it at the bottom of
// the z-order, hidden behind other windows and the desktop.
let unlocked = lock_state()
.as_mut()
.is_some_and(release_taskbar_lock_for_desktop_drop);
if unlocked {
diagnose::log("taskbar lock released by drop on desktop");
}
let displays = native_interop::find_monitors();
let (monitor_idx, display) = positioning::monitor_for_point(&displays, pt);
Expand Down
20 changes: 20 additions & 0 deletions src/window/placement_regression_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1084,3 +1084,23 @@ fn collision_fixture(
reserved: tray.into_iter().collect(),
}
}

#[test]
fn desktop_drop_releases_taskbar_lock() {
let mut state = state_for(ThemeDocument::starter(), placement("taskbar"));
state.lock_taskbar = true;
assert!(taskbar_lock_applies(&state));
assert!(release_taskbar_lock_for_desktop_drop(&mut state));
assert!(!state.lock_taskbar);
assert!(!taskbar_lock_applies(&state));
// An unlocked drop leaves the setting alone.
assert!(!release_taskbar_lock_for_desktop_drop(&mut state));
assert!(!state.lock_taskbar);

// Moving an already-floating widget keeps the lock preference for a
// later dock.
let mut floating = state_for(ThemeDocument::starter(), placement("floating"));
floating.lock_taskbar = true;
assert!(!release_taskbar_lock_for_desktop_drop(&mut floating));
assert!(floating.lock_taskbar);
}
Loading