Fixed a bug w/wintweaks

 Please enter the commit message for your changes. Lines starting
 with '' will be ignored, and an empty message aborts the commit.

 On branch dev
 Your branch is ahead of 'origin/dev' by 1 commit.
   (use "git push" to publish your local commits)

 Changes to be committed:
	modified:   scripts/build-appimage.sh
	deleted:    scripts/build-standalone.sh
	modified:   src/lufus/block_ops.py
	modified:   src/lufus/gui/dialogs.py
	modified:   src/lufus/gui/gui.py
	modified:   src/lufus/gui/i18n.py
	modified:   src/lufus/writing/windows/flash.py
	modified:   src/lufus/writing/windows/tweaks.py
	modified:   tests/test_flash_windows_and_install_ventoy_fixes.py

Author: R-Larocque

scripts/build-appimage.sh

@@ -52,6 +52,7 @@ rm -rf build dist AppDir
 $PYTHON -m PyInstaller src/lufus/__main__.py \
     --name lufus \
     --windowed \
+    --clean \
     --paths src \
     --hidden-import PyQt6.QtCore \
     --hidden-import PyQt6.QtGui \
@@ -69,6 +70,18 @@ $PYTHON -m PyInstaller src/lufus/__main__.py \
 mkdir -p AppDir/usr/bin
 cp -r dist/lufus/* AppDir/usr/bin/
 
+# Bundle system binaries needed at runtime (same list as build-standalone.sh)
+for bin in \
+    mkfs.vfat mkfs.ntfs mkfs.exfat mkfs.ext4 mkudffs \
+    ntfslabel fatlabel e2label udflabel \
+    badblocks wimlib-imagex chntpw \
+    udevadm xdg-open; do
+    path=$(command -v "$bin" 2>/dev/null || true)
+    if [ -n "$path" ]; then
+        cp "$path" AppDir/usr/bin/
+    fi
+done
+
 # Create desktop file
 cat > AppDir/lufus.desktop <<'DESKTOP'
 [Desktop Entry]

scripts/build-standalone.sh

@@ -29,6 +29,7 @@ def _get_libc():
     return _LIBC
 
 
+_MS_RDONLY = 1
 _MS_BIND = 4096
 _MS_MOVE = 8192
 _MS_REC = 16384
@@ -216,6 +217,103 @@ def reread_partitions(device: str) -> bool:
         os.close(fd)
 
 
+# -------- Loop device helpers (pure Python replacement for losetup) --------
+
+_LOOP_CTL_GET_FREE = 0x4C82
+_LOOP_SET_FD = 0x4C00
+_LOOP_CLR_FD = 0x4C01
+
+_loop_devices: dict[str, str] = {}  # mount_point -> loop_device
+
+
+def _setup_loop(file_path: str) -> str | None:
+    """Associate a regular file with a free loop device.
+
+    Returns the loop device path (e.g. /dev/loop0) or None on failure.
+    """
+    import fcntl
+
+    try:
+        ctl_fd = os.open("/dev/loop-control", os.O_RDWR | os.O_CLOEXEC)
+        try:
+            idx = fcntl.ioctl(ctl_fd, _LOOP_CTL_GET_FREE)
+        finally:
+            os.close(ctl_fd)
+    except OSError as e:
+        log.error("Cannot get free loop device: %s", e)
+        return None
+
+    loop_dev = f"/dev/loop{idx}"
+    try:
+        file_fd = os.open(file_path, os.O_RDONLY | os.O_CLOEXEC)
+        loop_fd = os.open(loop_dev, os.O_RDWR | os.O_CLOEXEC)
+        try:
+            fcntl.ioctl(loop_fd, _LOOP_SET_FD, file_fd)
+        except OSError as e:
+            log.error("LOOP_SET_FD on %s failed: %s", loop_dev, e)
+            os.close(loop_fd)
+            os.close(file_fd)
+            return None
+        os.close(loop_fd)
+        os.close(file_fd)
+    except OSError as e:
+        log.error("Cannot set up loop for %s: %s", file_path, e)
+        return None
+
+    log.info("Loop device %s <- %s", loop_dev, file_path)
+    return loop_dev
+
+
+def _detach_loop(loop_dev: str) -> None:
+    """Detach a loop device."""
+    import fcntl
+
+    try:
+        fd = os.open(loop_dev, os.O_RDWR | os.O_CLOEXEC)
+        try:
+            fcntl.ioctl(fd, _LOOP_CLR_FD)
+            log.info("Loop device %s detached", loop_dev)
+        except OSError as e:
+            log.warning("Cannot detach loop device %s: %s", loop_dev, e)
+        finally:
+            os.close(fd)
+    except OSError:
+        pass
+
+
+def mount_iso(iso_path: str, mount_point: str) -> bool:
+    """Mount an ISO file on *mount_point* using a loop device.
+
+    Creates the mount point directory if needed.
+    Returns True on success.
+    """
+    os.makedirs(mount_point, exist_ok=True)
+    loop_dev = _setup_loop(iso_path)
+    if loop_dev is None:
+        return False
+
+    # Windows installer ISOs normally store the real payload in UDF. Their
+    # ISO9660 compatibility view may contain only a small readme.txt.
+    for fstype in ("udf", "iso9660"):
+        if mount(loop_dev, mount_point, fstype=fstype, flags=_MS_RDONLY):
+            _loop_devices[mount_point] = loop_dev
+            log.info("ISO %s mounted as %s on %s", iso_path, fstype, mount_point)
+            return True
+
+    log.error("mount(2) failed for loop device %s on %s as UDF or ISO9660", loop_dev, mount_point)
+    _detach_loop(loop_dev)
+    return False
+
+
+def umount_iso(mount_point: str) -> bool:
+    """Unmount an ISO mounted via mount_iso and detach its loop device."""
+    ok = umount(mount_point)
+    loop_dev = _loop_devices.pop(mount_point, None)
+    if loop_dev:
+        _detach_loop(loop_dev)
+    return ok
+
+
 # -------- GPT partition table writer --------
 
 _GPT_SIGNATURE = b"EFI PART"
@@ -238,6 +336,13 @@ def _crc32(data: bytes) -> int:
     return binascii.crc32(data) & 0xFFFFFFFF
 
 
+def _gpt_header_crc(header: bytes, header_size: int = 92) -> int:
+    """Return a GPT header CRC over HeaderSize bytes with the CRC field zeroed."""
+    crc_data = bytearray(header[:header_size])
+    crc_data[16:20] = b"\x00\x00\x00\x00"
+    return _crc32(bytes(crc_data))
+
+
 def _write_gpt(device: str, disk_guid: bytes, partitions: list[dict]) -> bool:
     """Write a GPT partition table to device.
 
@@ -318,8 +423,9 @@ def _write_gpt(device: str, disk_guid: bytes, partitions: list[dict]) -> bool:
     )
     assert len(header) == 512
 
-    # Compute and set header CRC
-    header_crc = _crc32(header[:16] + b"\x00\x00\x00\x00" + header[20:])
+    # Compute and set header CRC. GPT requires the CRC to cover only
+    # HeaderSize bytes, not the full 512-byte sector.
+    header_crc = _gpt_header_crc(header, 92)
     header = header[:16] + struct.pack("<I", header_crc) + header[20:]
 
     # Protective MBR
@@ -355,7 +461,7 @@ def _write_gpt(device: str, disk_guid: bytes, partitions: list[dict]) -> bool:
         + struct.pack("<I", partition_entries_crc)
         + b"\x00" * (512 - 92)
     )
-    backup_crc = _crc32(backup_header[:16] + b"\x00\x00\x00\x00" + backup_header[20:])
+    backup_crc = _gpt_header_crc(backup_header, 92)
     backup_header = backup_header[:16] + struct.pack("<I", backup_crc) + backup_header[20:]
 
     try:
@@ -375,6 +481,7 @@ def _write_gpt(device: str, disk_guid: bytes, partitions: list[dict]) -> bool:
             # Write backup GPT header (last sector)
             os.lseek(fd, backup_header_lba * 512, os.SEEK_SET)
             os.write(fd, backup_header)
+            os.fsync(fd)
         finally:
             os.close(fd)
         log.info("GPT written to %s (%d partitions)", device, len(partitions))

src/lufus/block_ops.py

@@ -301,6 +301,7 @@ def _on_language_changed(self):
 class WinTweaks(QDialog):
     def __init__(self, parent=None):
         super().__init__(parent)
+        self._T = parent._T if parent else {}
         re = QRegularExpression("^[a-zA-Z0-9_]*$")
         validator = QRegularExpressionValidator(re)
         self.setWindowTitle("Windows Tweaks (MAY BREAK! USE CAUTION)")

src/lufus/gui/dialogs.py

@@ -16,6 +16,7 @@
 from pathlib import Path
 from PySide6.QtWidgets import (
     QApplication,
+    QDialog,
     QMainWindow,
     QWidget,
     QVBoxLayout,
@@ -53,7 +54,6 @@
 from lufus.gui.redirector import StdoutRedirector
 from lufus.gui.dialogs import LogWindow, AboutWindow, SettingsDialog, WinTweaks
 from lufus.gui.workers import FlashWorker, VerifyWorker
-from lufus.writing.windows.tweaks import *
 
 # log level mapping for colors and methods
 _LOG_LEVELS = {
@@ -1537,10 +1537,14 @@ def start_process(self):
             self.verify_worker.start()
         else:
             # skip verification and start flash :3
-            if states.image_option == 0 and states.currentflash == 0:
+            if state.image_option == 0 and state.flash_mode == 0:
                 dlg = WinTweaks(self)
-                if dlg.exec() == QDialog.DialogCode.Rejected:
+                result = dlg.exec()
+                self.log_message(f"WinTweaks dialog closed with result: {result}")
+                if result == QDialog.DialogCode.Rejected:
+                    self.log_message("Flash cancelled in WinTweaks dialog", level="WARN")
                     return
+            self.log_message("Proceeding to perform_flash")
             self.perform_flash()
 
     def on_verify_finished(self, success: bool):
@@ -1549,7 +1553,7 @@ def on_verify_finished(self, success: bool):
             self.log_message("SHA256 verification successful, proceeding to flash")
             self.progress_bar.setFormat("")
             self._clear_speed_eta()
-            if states.image_option == 0 and states.currentflash == 0:
+            if state.image_option == 0 and state.flash_mode == 0:
                 dlg = WinTweaks(self)
                 if dlg.exec() == QDialog.DialogCode.Rejected:
                     self.btn_start.setEnabled(True)
@@ -1574,6 +1578,7 @@ def on_verify_finished(self, success: bool):
 
     def perform_flash(self):
         # Rufus-style warning before flashing :3
+        self.log_message("perform_flash: showing confirmation dialog")
         device_name = self.combo_device.currentText()
         warning_title = self._T.get("msgbox_flash_warning_title", "WARNING: ALL DATA ON DEVICE WILL BE DESTROYED!")
         warning_body = self._T.get(
@@ -1699,18 +1704,7 @@ def on_flash_finished(self, success: bool):
             # flash succeeded :D
             self.progress_bar.setValue(100)
             self.progress_bar.setFormat(self._T.get("progress_complete", "Complete"))
-            # change from fo to tweaks
             self.log_message("Flash operation finished with result: SUCCESS")
-            if states.image_option == 0 and states.currentflash == 0:
-                if getattr(states, "win_hardware_bypass", 0) == 1:
-                    win_hardware_bypass()
-                if getattr(states, "win_microsoft_acc", 0) == 1:
-                    if getattr(states, "win_local_acc_chk", 0) == 1:
-                        win_local_acc_name()
-                    else:
-                        win_local_acc()
-                if getattr(states, "win_privacy", 0) == 1:
-                    win_skip_privacy_questions()
             QMessageBox.information(
                 self,
                 self._T.get("msgbox_success_title", "Success"),

src/lufus/gui/gui.py

@@ -31,20 +31,23 @@ def detect_system_language() -> str:
 
     Falls back to English if detection fails or no match is found.
     """
-    try:
-        # Read the system locale without mutating global locale state.
-        loc = locale.getdefaultlocale()
-    except Exception:
-        loc = (None, None)
+    # Read locale from environment directly (replaces deprecated
+    # locale.getdefaultlocale() which is removed in Python 3.15).
+    lang_code = ""
+    for var in ("LC_ALL", "LC_MESSAGES", "LC_CTYPE", "LANG", "LANGUAGE"):
+        val = os.environ.get(var)
+        if val:
+            lang_code = val
+            break
 
-    # Fallback to the process locale if the default locale could not be determined.
-    if not loc or not loc[0]:
+    # Fallback to the process locale if env vars are empty.
+    if not lang_code:
         try:
             loc = locale.getlocale()
+            if loc and loc[0]:
+                lang_code = loc[0]
         except Exception:
-            loc = (None, None)
-
-    lang_code = (loc[0] or "") or os.environ.get("LANG", "")
+            pass
 
     if not lang_code:
         return "English"