Fix native build path quoting

Launcher/LocalBuild.ps1

@@ -429,7 +429,8 @@ try {
             }
             $redist = Join-Path $Toolkit 'Redist'
             if (Test-Path -LiteralPath $redist -PathType Container) {
-                Copy-Item -Path (Join-Path $redist '*.dll') -Destination $Destination -Force
+                Get-ChildItem -LiteralPath $redist -Filter '*.dll' -File |
+                    Copy-Item -Destination $Destination -Force
             }
             foreach ($name in @('config','wii_bootstrap')) {
                 $directory = Join-Path $build $name

Launcher/NativeBuildFlags.ps1

@@ -145,7 +145,8 @@ function Invoke-Checked([string]$FilePath, [string[]]$Arguments, [string]$Descri
     else { Write-Host "${LogPrefix}: $Description" }
     $quotedArguments = @($Arguments | ForEach-Object {
         if ($_.Contains('"')) { throw "A native build argument contains an unsupported quote: $_" }
-        '"' + $_ + '"'
+        # Backslashes directly before the closing quote would otherwise escape it.
+        '"' + ($_ -replace '(\\+)$', '$1$1') + '"'
     })
     if ($WaitForProcessTree) {
         $process = Start-Process -FilePath $FilePath -ArgumentList $quotedArguments `

Launcher/local-build.sh

@@ -437,7 +437,9 @@ if [[ "$cc_bin" == */* ]]; then
     configure_args+=(-DCMAKE_ASM_COMPILER="$cc_bin")
 fi
 if [[ -n "$fuse_ld_override" ]]; then
-    configure_args+=(-DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=$fuse_ld_override")
+    # CMAKE_EXE_LINKER_FLAGS is one string that CMake pastes into the shell link command.
+    printf -v fuse_ld_quoted '%q' "$fuse_ld_override"
+    configure_args+=(-DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=$fuse_ld_quoted")
 fi
 if [[ -n "$native_prebuilt_dir" ]]; then
     configure_args+=(-DMKW_NATIVE_PREBUILT_DIR="$native_prebuilt_dir")

Launcher/macos/setup.command

@@ -11,7 +11,13 @@ workspace="$support_root/BuildWorkspace"
 products="$support_root/Products"
 
 fail() { printf 'WiiCompiled Setup: %s\n' "$*" >&2; exit 1; }
-notice() { /usr/bin/osascript -e "display dialog \"${1//\"/\\\"}\" buttons {\"OK\"} default button \"OK\" with icon caution" >/dev/null; }
+notice() {
+    /usr/bin/osascript - "$1" >/dev/null <<'APPLESCRIPT'
+on run argv
+    display dialog (item 1 of argv) buttons {"OK"} default button "OK" with icon caution
+end run
+APPLESCRIPT
+}
 usage() {
     cat <<'EOF'
 Usage: setup.command --game IMAGE [--retro-dir DIR] [--install-location {user|applications}]
@@ -146,7 +152,7 @@ fi
 "$workspace/Launcher/local-build-macos.command" "${build_args[@]}" --profile "$profile" --cmake "$cmake_bin" --ninja "$ninja_bin" --translator-bin "$translator"
 
 config="$support_root/Config.toml"
-toml_string() { printf '%s' "$1" | sed -e 's/\\\\/\\\\\\\\/g' -e 's/"/\\\\"/g'; }
+toml_string() { printf '%s' "$1" | sed -e 's/\\/\\\\/g' -e 's/"/\\"/g'; }
 set_path() {
     local key=$1 value=$2 encoded line temporary
     encoded=$(toml_string "$value"); line="$key = \"$encoded\""; temporary="$config.tmp"
@@ -172,8 +178,13 @@ install_app() {
     local app=$1
     [[ -d "$products/$app" ]] || return 0
     if [[ "$destination" == /Applications ]]; then
-        command="mkdir -p /Applications && rm -rf '/Applications/$app' && ditto '$products/$app' '/Applications/$app'"
-        /usr/bin/osascript -e "do shell script \"$command\" with administrator privileges"
+        /usr/bin/osascript - "$products/$app" "/Applications/$app" <<'APPLESCRIPT'
+on run argv
+    set sourcePath to quoted form of (item 1 of argv)
+    set installedPath to quoted form of (item 2 of argv)
+    do shell script "mkdir -p /Applications && rm -rf " & installedPath & " && /usr/bin/ditto " & sourcePath & " " & installedPath with administrator privileges
+end run
+APPLESCRIPT
     else
         mkdir -p "$destination"; rm -rf "$destination/$app"; /usr/bin/ditto "$products/$app" "$destination/$app"
     fi

aurora-main/cmake/AuroraCopyRuntimeDLLs.cmake

@@ -15,6 +15,7 @@ function(aurora_copy_runtime_dlls target)
     add_custom_command(TARGET ${target} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_RUNTIME_DLLS:${_t}> $<TARGET_FILE_DIR:${target}>
         COMMAND_EXPAND_LISTS
+        VERBATIM
     )
   endforeach ()
 
@@ -30,6 +31,7 @@ function(aurora_copy_runtime_dlls target)
         if (EXISTS "${_dawn_bin_dir}/${_dll}")
           add_custom_command(TARGET ${target} POST_BUILD
               COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_dawn_bin_dir}/${_dll}" $<TARGET_FILE_DIR:${target}>
+              VERBATIM
           )
         endif ()
       endforeach ()

aurora-main/lib/input.cpp

@@ -14,7 +14,6 @@
 #include <array>
 #include <string>
 #include <utility>
-#include <vector>
 
 using namespace std::string_view_literals;
 
@@ -24,7 +23,7 @@ absl::flat_hash_map<Uint32, GameController> g_GameControllers;
 
 namespace {
 constexpr uint32_t kPortPreferencesMagic = SBIG('CPRT');
-constexpr uint32_t kPortPreferencesVersion = 3;
+constexpr uint32_t kPortPreferencesVersion = 2;
 constexpr uint32_t kMaxPersistedStringLength = 256;
 
 enum class PortPreferenceState : uint8_t {
@@ -36,8 +35,6 @@ enum class PortPreferenceState : uint8_t {
 struct ControllerIdentity {
   std::string guid;
   std::string serial;
-  std::string path;
-  int32_t slot = -1;
 };
 
 struct PortPreference {
@@ -47,9 +44,6 @@ struct PortPreference {
 
 std::array<PortPreference, PAD_MAX_CONTROLLERS> g_portPreferences;
 bool g_portPreferencesLoaded = false;
-// Startup controllers are added one by one via events; capture their SDL player index at init,
-// before earlier port reassignments can move it.
-absl::flat_hash_map<SDL_JoystickID, int32_t> g_connectSlots;
 
 std::string port_preferences_path() {
   if (g_config.userPath == nullptr) {
@@ -89,8 +83,6 @@ ControllerIdentity controller_identity(const GameController& controller) {
   SDL_GUIDToString(SDL_GetGamepadGUIDForID(SDL_GetGamepadID(controller.m_controller)), guid, sizeof(guid));
   identity.guid = guid;
   identity.serial = normalize_serial(SDL_GetGamepadSerial(controller.m_controller));
-  identity.path = controller.m_path;
-  identity.slot = controller.m_slot;
   return identity;
 }
 
@@ -145,16 +137,12 @@ bool write_string(SDL_IOStream* file, const std::string& value) {
   return write_value(file, size) && (size == 0 || write_exact(file, value.data(), size));
 }
 
-bool read_identity(SDL_IOStream* file, uint32_t version, ControllerIdentity& identity) {
-  if (!read_string(file, identity.guid) || !read_string(file, identity.serial)) {
-    return false;
-  }
-  return version < 3 || (read_string(file, identity.path) && read_value(file, identity.slot));
+bool read_identity(SDL_IOStream* file, ControllerIdentity& identity) {
+  return read_string(file, identity.guid) && read_string(file, identity.serial);
 }
 
 bool write_identity(SDL_IOStream* file, const ControllerIdentity& identity) {
-  return write_string(file, identity.guid) && write_string(file, identity.serial) &&
-         write_string(file, identity.path) && write_value(file, identity.slot);
+  return write_string(file, identity.guid) && write_string(file, identity.serial);
 }
 
 bool read_port_preferences_file(std::array<PortPreference, PAD_MAX_CONTROLLERS>& preferences) {
@@ -171,13 +159,13 @@ bool read_port_preferences_file(std::array<PortPreference, PAD_MAX_CONTROLLERS>&
   uint32_t magic = 0;
   uint32_t version = 0;
   bool ok = read_value(file, magic) && read_value(file, version) && magic == kPortPreferencesMagic &&
-            version >= 2 && version <= kPortPreferencesVersion;
+            version == kPortPreferencesVersion;
 
   for (auto& preference : preferences) {
     uint8_t state = 0;
     ControllerIdentity identity;
     ok = ok && read_value(file, state) && state <= static_cast<uint8_t>(PortPreferenceState::Controller) &&
-         read_identity(file, version, identity);
+         read_identity(file, identity);
     if (ok) {
       preference.state = static_cast<PortPreferenceState>(state);
       preference.identity = std::move(identity);
@@ -237,31 +225,22 @@ void save_port_preferences() {
   }
 }
 
-// Zero means no match. Higher scores claim ports first: path+slot > GUID > VID/PID.
-constexpr int kScoreVidPid = 1;
-constexpr int kScoreGuid = 2;
-constexpr int kScoreSlot = 1;
-constexpr int kScorePath = 2;
+enum class IdentityMatch {
+  None,
+  Fallback,
+  Exact,
+};
 
-int identity_score(const ControllerIdentity& saved, const ControllerIdentity& current) {
+IdentityMatch identity_match(const ControllerIdentity& saved, const ControllerIdentity& current) {
   if (saved.guid.empty()) {
-    return 0;
+    return IdentityMatch::None;
   }
   if (saved.guid == current.guid) {
-    if (!saved.serial.empty() && !serial_matches(saved.serial, current.serial)) {
-      return 0;
-    }
-    int score = kScoreGuid;
-    if (!saved.path.empty() && saved.path == current.path) {
-      score += kScorePath;
-    }
-    if (saved.slot >= 0 && saved.slot == current.slot) {
-      score += kScoreSlot;
-    }
-    return score;
+    return saved.serial.empty() || serial_matches(saved.serial, current.serial) ? IdentityMatch::Exact
+                                                                                : IdentityMatch::None;
   }
   if (!serial_matches(saved.serial, current.serial)) {
-    return 0;
+    return IdentityMatch::None;
   }
 
   // Attempt to match against VID/PID as a fallback if the GUID changes
@@ -271,9 +250,9 @@ int identity_score(const ControllerIdentity& saved, const ControllerIdentity& cu
   uint16_t currentProduct = 0;
   SDL_GetJoystickGUIDInfo(SDL_StringToGUID(saved.guid.c_str()), &savedVendor, &savedProduct, nullptr, nullptr);
   SDL_GetJoystickGUIDInfo(SDL_StringToGUID(current.guid.c_str()), &currentVendor, &currentProduct, nullptr, nullptr);
-  const bool sameDevice =
-      savedVendor != 0 && savedVendor == currentVendor && savedProduct != 0 && savedProduct == currentProduct;
-  return sameDevice ? kScoreVidPid : 0;
+  return savedVendor != 0 && savedVendor == currentVendor && savedProduct != 0 && savedProduct == currentProduct
+             ? IdentityMatch::Fallback
+             : IdentityMatch::None;
 }
 
 void assign_player_index(GameController& controller, int32_t port) {
@@ -288,6 +267,12 @@ int32_t effective_player_index(const GameController& controller) {
   return player >= 0 ? player : controller.m_playerIndex;
 }
 
+bool is_instance_claimed(const std::array<Uint32, PAD_MAX_CONTROLLERS>& claimedControllers, size_t claimedCount,
+                         Uint32 instance) {
+  return std::find(claimedControllers.begin(), claimedControllers.begin() + claimedCount, instance) !=
+         claimedControllers.begin() + claimedCount;
+}
+
 void apply_port_preferences() noexcept {
   ensure_port_preferences_loaded();
   if (!std::any_of(g_portPreferences.begin(), g_portPreferences.end(),
@@ -303,62 +288,44 @@ void apply_port_preferences() noexcept {
     }
   }
 
-  struct Candidate {
-    int score;
-    uint32_t port;
-    Uint32 instance;
-  };
-  std::vector<Candidate> candidates;
-  for (const auto& [instance, controller] : g_GameControllers) {
-    const auto identity = controller_identity(controller);
-    for (uint32_t port = 0; port < g_portPreferences.size(); ++port) {
-      if (g_portPreferences[port].state != PortPreferenceState::Controller) {
-        continue;
-      }
-      if (const int score = identity_score(g_portPreferences[port].identity, identity); score > 0) {
-        candidates.push_back({score, port, instance});
-      }
-    }
-  }
-  // Best matches claim first so identical controllers each end up on their own port
-  std::sort(candidates.begin(), candidates.end(), [](const Candidate& a, const Candidate& b) {
-    if (a.score != b.score) {
-      return a.score > b.score;
-    }
-    return a.port != b.port ? a.port < b.port : a.instance < b.instance;
-  });
-
-  std::array<bool, PAD_MAX_CONTROLLERS> portClaimed{};
-  std::array<Uint32, PAD_MAX_CONTROLLERS> claimedInstances{};
+  std::array<Uint32, PAD_MAX_CONTROLLERS> claimedControllers{};
   size_t claimedCount = 0;
-  bool upgraded = false;
-  for (const auto& candidate : candidates) {
-    if (portClaimed[candidate.port] ||
-        std::find(claimedInstances.begin(), claimedInstances.begin() + claimedCount, candidate.instance) !=
-            claimedInstances.begin() + claimedCount) {
+  for (uint32_t port = 0; port < g_portPreferences.size(); ++port) {
+    const auto& preference = g_portPreferences[port];
+    if (preference.state != PortPreferenceState::Controller) {
       continue;
     }
-    portClaimed[candidate.port] = true;
-    claimedInstances[claimedCount++] = candidate.instance;
-    auto& controller = g_GameControllers[candidate.instance];
-    assign_player_index(controller, static_cast<int32_t>(candidate.port));
 
-    // Preferences saved before path and slot existed gain them on their first GUID match
-    auto& saved = g_portPreferences[candidate.port].identity;
-    if (candidate.score >= kScoreGuid && (saved.path.empty() || saved.slot < 0)) {
-      const auto current = controller_identity(controller);
-      if (saved.path.empty() && !current.path.empty()) {
-        saved.path = current.path;
-        upgraded = true;
+    Uint32 fallbackInstance = 0;
+    GameController* fallbackController = nullptr;
+    for (auto& [instance, controller] : g_GameControllers) {
+      if (is_instance_claimed(claimedControllers, claimedCount, instance)) {
+        continue;
       }
-      if (saved.slot < 0 && current.slot >= 0) {
-        saved.slot = current.slot;
-        upgraded = true;
+
+      switch (identity_match(preference.identity, controller_identity(controller))) {
+      case IdentityMatch::Exact:
+        assign_player_index(controller, static_cast<int32_t>(port));
+        claimedControllers[claimedCount++] = instance;
+        fallbackController = nullptr;
+        break;
+      case IdentityMatch::Fallback:
+        // Prefer any later exact match before claiming a fallback candidate
+        if (fallbackController == nullptr) {
+          fallbackInstance = instance;
+          fallbackController = &controller;
+        }
+        continue;
+      case IdentityMatch::None:
+        continue;
       }
+      break;
+    }
+
+    if (fallbackController != nullptr) {
+      assign_player_index(*fallbackController, static_cast<int32_t>(port));
+      claimedControllers[claimedCount++] = fallbackInstance;
     }
-  }
-  if (upgraded) {
-    save_port_preferences();
   }
 }
 
@@ -434,15 +401,6 @@ SDL_JoystickID add_controller(SDL_JoystickID which) noexcept {
       return -1;
     }
     controller.m_isGameCube = controller.m_vid == 0x057E && controller.m_pid == 0x0337;
-    if (const char* path = SDL_GetGamepadPath(ctrl); path != nullptr) {
-      controller.m_path = path;
-    }
-    if (const auto slot = g_connectSlots.find(which); slot != g_connectSlots.end()) {
-      controller.m_slot = slot->second;
-      g_connectSlots.erase(slot);
-    } else {
-      controller.m_slot = SDL_GetGamepadPlayerIndex(ctrl);
-    }
     const char* serial = SDL_GetGamepadSerial(ctrl);
     controller.m_gameCubeUseOrdinaryStop = controller.m_isGameCube && serial && "GCP+"sv == serial;
     if (controller.m_isGameCube ||
@@ -462,7 +420,8 @@ SDL_JoystickID add_controller(SDL_JoystickID which) noexcept {
       bool hasOtherPortPreference = false;
       for (size_t port = 1; port < g_portPreferences.size(); ++port) {
         if (g_portPreferences[port].state == PortPreferenceState::Controller &&
-            identity_score(g_portPreferences[port].identity, controller_identity(g_GameControllers[instance])) > 0) {
+            identity_match(g_portPreferences[port].identity, controller_identity(g_GameControllers[instance])) !=
+                IdentityMatch::None) {
           hasOtherPortPreference = true;
           break;
         }
@@ -498,7 +457,6 @@ bool refresh_controller(SDL_JoystickID instance) noexcept {
 }
 
 void remove_controller(Uint32 instance) noexcept {
-  g_connectSlots.erase(instance);
   if (auto it = g_GameControllers.find(instance); it != g_GameControllers.end()) {
     SDL_CloseGamepad(it->second.m_controller);
     g_GameControllers.erase(it);
@@ -582,14 +540,6 @@ void initialize() noexcept {
    * as expected */
   ASSERT(SDL_Init(SDL_INIT_HAPTIC | SDL_INIT_JOYSTICK | SDL_INIT_GAMEPAD), "Failed to initialize SDL subsystems: {}",
          SDL_GetError());
-
-  int count = 0;
-  if (SDL_JoystickID* ids = SDL_GetGamepads(&count)) {
-    for (int i = 0; i < count; ++i) {
-      g_connectSlots[ids[i]] = SDL_GetGamepadPlayerIndexForID(ids[i]);
-    }
-    SDL_free(ids);
-  }
 }
 
 struct MouseScrollStatus {

aurora-main/lib/input.hpp

@@ -20,9 +20,6 @@ struct GameController {
   bool m_gameCubeUseOrdinaryStop = false;
   Sint32 m_index = -1;
   Sint32 m_playerIndex = -1;
-  // Device path and the SDL player index at connect (the adapter port for GameCube adapters).
-  std::string m_path;
-  Sint32 m_slot = -1;
   bool m_hasRumble = false;
   PADDeadZones m_deadZones{
       .emulateTriggers = true,

runtime/CMakeLists.txt

@@ -42,6 +42,12 @@ else()
         "WiiCompiled supports 64-bit LLVM-MinGW Clang on Windows, native Linux x86_64/aarch64, or Apple Clang on macOS x86_64/arm64")
 endif()
 
+if(MKW_PLATFORM_WINDOWS)
+    # CMake and Ninja write response files with Windows quoting, but clang tokenizes them with
+    # POSIX rules by default, where a bare apostrophe in a path opens a quoted span.
+    add_link_options(--rsp-quoting=windows)
+endif()
+
 if(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
     message(FATAL_ERROR "WiiCompiled only supports Release builds")
 endif()

runtime/cmake/PublicProducts.cmake

@@ -226,7 +226,7 @@ function(mkw_configure_product target)
        (MKW_SQLITE_TARGET_TYPE STREQUAL "SHARED_LIBRARY" OR
         MKW_SQLITE_TARGET_TYPE STREQUAL "MODULE_LIBRARY"))
         add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            $<TARGET_FILE:sqlite3> $<TARGET_FILE_DIR:${target}>)
+            $<TARGET_FILE:sqlite3> $<TARGET_FILE_DIR:${target}> VERBATIM)
     endif()
 
     if(MKW_PLATFORM_WINDOWS)
@@ -260,7 +260,7 @@ function(mkw_configure_product target)
             endif()
             add_custom_command(TARGET ${target} POST_BUILD
                 COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                    "${runtime_dll_path}" $<TARGET_FILE_DIR:${target}>)
+                    "${runtime_dll_path}" $<TARGET_FILE_DIR:${target}> VERBATIM)
         endforeach()
     endif()
 
@@ -269,7 +269,7 @@ function(mkw_configure_product target)
         message(FATAL_ERROR "Missing Wii first-run bootstrap payload: ${MKW_WII_BOOTSTRAP_SOURCE_DIR}")
     endif()
     add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory
-        "${MKW_WII_BOOTSTRAP_SOURCE_DIR}" "$<TARGET_FILE_DIR:${target}>/wii_bootstrap")
+        "${MKW_WII_BOOTSTRAP_SOURCE_DIR}" "$<TARGET_FILE_DIR:${target}>/wii_bootstrap" VERBATIM)
 
     set(MKW_DSP_COEFFICIENT_ROM "${MKW_RUNTIME_SOURCE_DIR}/assets/dsp/dsp_coef.bin")
     if(NOT EXISTS "${MKW_DSP_COEFFICIENT_ROM}")
@@ -281,7 +281,7 @@ function(mkw_configure_product target)
         message(FATAL_ERROR "Wii DSP coefficient ROM hash mismatch: ${MKW_DSP_COEFFICIENT_ROM_SHA256}")
     endif()
     add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        "${MKW_DSP_COEFFICIENT_ROM}" "$<TARGET_FILE_DIR:${target}>/dsp_coef.bin")
+        "${MKW_DSP_COEFFICIENT_ROM}" "$<TARGET_FILE_DIR:${target}>/dsp_coef.bin" VERBATIM)
 
     # Aurora imports this portable recipe database into each user's writable
     # pipeline cache. Keep the upstream filename so its default resourcesPath
@@ -293,7 +293,7 @@ function(mkw_configure_product target)
     endif()
     add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
         "${MKW_INITIAL_PIPELINE_CACHE}"
-        "$<TARGET_FILE_DIR:${target}>/initial_pipeline_cache.db")
+        "$<TARGET_FILE_DIR:${target}>/initial_pipeline_cache.db" VERBATIM)
 
     # Non-Windows TLS (runtime/src/hle/net/network_ssl.cpp's mbed TLS path) needs a trusted root
     # CA bundle to verify server certificates against - Windows gets this for free from the OS via
@@ -307,7 +307,7 @@ function(mkw_configure_product target)
             message(FATAL_ERROR "Missing TLS root CA bundle: ${MKW_CA_CERTIFICATE_BUNDLE}")
         endif()
         add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            "${MKW_CA_CERTIFICATE_BUNDLE}" "$<TARGET_FILE_DIR:${target}>/cacert.pem")
+            "${MKW_CA_CERTIFICATE_BUNDLE}" "$<TARGET_FILE_DIR:${target}>/cacert.pem" VERBATIM)
     endif()
 endfunction()
 

runtime/src/settings_overlay.cpp

@@ -779,15 +779,8 @@ void DrawControllerSettings() {
     if (ImGui::BeginMenu("Assign connected controller")) {
         for (uint32_t index = 0; index < controllerCount; ++index) {
             const char* name = PADGetNameForControllerIndex(index);
-            std::string label = name != nullptr ? name : "Unknown controller";
-            for (int port = 0; port < PAD_MAX_CONTROLLERS; ++port) {
-                if (PADGetIndexForPort(port) == static_cast<s32>(index)) {
-                    label += " (Port " + std::to_string(port + 1) + ")";
-                    break;
-                }
-            }
             ImGui::PushID(static_cast<int>(index));
-            if (ImGui::MenuItem(label.c_str())) {
+            if (ImGui::MenuItem(name != nullptr ? name : "Unknown controller")) {
                 PADSetPortForIndex(index, selectedGamePort);
                 g_configuredControllerIndices.fill(std::numeric_limits<int32_t>::min());
                 ApplyConfiguredMappings();