From bd03aec82ab52c8a784b98a826ec72b261be3b03 Mon Sep 17 00:00:00 2001 From: funman300 Date: Tue, 18 Aug 2026 20:20:38 +0000 Subject: [PATCH] Gate FIFA17 SBC dispatch acceptance --- fifa17-recon/tools/fifa17-hook-m1.sh | 31 +++++++++++++--------------- openfut-launcher | 2 +- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/fifa17-recon/tools/fifa17-hook-m1.sh b/fifa17-recon/tools/fifa17-hook-m1.sh index ab57506..70be938 100755 --- a/fifa17-recon/tools/fifa17-hook-m1.sh +++ b/fifa17-recon/tools/fifa17-hook-m1.sh @@ -158,7 +158,7 @@ launch() { local trace_enabled=0 local request_trace_enabled=0 local notifier_trace_enabled=0 - local commit_enabled=0 + local dispatch_enabled=0 case "$mode" in baseline) [[ "${OPENFUT_FIFA17_LAUNCH:-}" == "I_ACCEPT_M1_BASELINE_LAUNCH" ]] || @@ -177,14 +177,11 @@ launch() { request_trace_enabled=1 notifier_trace_enabled=1 ;; - commit) - [[ "${OPENFUT_FIFA17_COMMIT:-}" == "I_ACCEPT_POST_PARSE_READY_BYTE" ]] || - die "launch-commit requires OPENFUT_FIFA17_COMMIT=I_ACCEPT_POST_PARSE_READY_BYTE" - hook_enabled=1 - trace_enabled=1 + dispatch) + [[ "${OPENFUT_FIFA17_DISPATCH:-}" == "I_ACCEPT_GUARDED_NATIVE_DISPATCH" ]] || + die "launch-dispatch requires OPENFUT_FIFA17_DISPATCH=I_ACCEPT_GUARDED_NATIVE_DISPATCH" request_trace_enabled=1 - notifier_trace_enabled=1 - commit_enabled=1 + dispatch_enabled=1 ;; *) die "unknown launch mode: $mode" ;; esac @@ -207,7 +204,7 @@ launch() { done mkdir -p "${wine_prefix}/dosdevices" ln -sfn /mnt "${wine_prefix}/dosdevices/w:" - note "Launching $mode mode (SBC_HOOK=$hook_enabled; SBC_TRACE=$trace_enabled; SBC_REQUEST_TRACE=$request_trace_enabled; SBC_NOTIFIER_TRACE=$notifier_trace_enabled; SBC_COMMIT=$commit_enabled); log=/tmp/fifa17-hook-m1-launch.log" + note "Launching $mode mode (SBC_HOOK=$hook_enabled; SBC_TRACE=$trace_enabled; SBC_REQUEST_TRACE=$request_trace_enabled; SBC_NOTIFIER_TRACE=$notifier_trace_enabled; SBC_DISPATCH=$dispatch_enabled); log=/tmp/fifa17-hook-m1-launch.log" cd "$game_dir" env \ GAMEID=fifa17 \ @@ -218,8 +215,8 @@ launch() { OPENFUT_SBC_TRACE="$trace_enabled" \ OPENFUT_SBC_REQUEST_TRACE="$request_trace_enabled" \ OPENFUT_SBC_NOTIFIER_TRACE="$notifier_trace_enabled" \ - OPENFUT_SBC_DISPATCH=0 \ - OPENFUT_SBC_COMMIT="$commit_enabled" \ + OPENFUT_SBC_DISPATCH="$dispatch_enabled" \ + OPENFUT_SBC_DISPATCH_TRACE=0 \ OPENFUT_SBC_ARM_ONLY=0 \ OPENFUT_SBC_POPULATE=0 \ umu-run _fifa17.exe 2>&1 | tee /tmp/fifa17-hook-m1-launch.log @@ -227,7 +224,7 @@ launch() { usage() { cat <<'EOF' -Usage: fifa17-hook-m1.sh [inspect|build|stage|deploy|launch|launch-resolve|launch-trace|launch-commit] +Usage: fifa17-hook-m1.sh [inspect|build|stage|deploy|launch|launch-resolve|launch-trace|launch-dispatch] inspect Read-only PE/hash/export preflight (default). build Cross-build the inert FIFA17 hook, then run inspect. @@ -240,11 +237,11 @@ Usage: fifa17-hook-m1.sh [inspect|build|stage|deploy|launch|launch-resolve|launc Start M2 resolve-only mode (guarded reads/logging, no detours/writes); requires: OPENFUT_FIFA17_RESOLVE=I_ACCEPT_M2_RESOLVE_LAUNCH launch-trace - Start the single M3 passive factory/deserializer trace; requires: + Start the M3-M6 passive parser/request/notifier trace; requires: OPENFUT_FIFA17_TRACE=I_ACCEPT_M3_PASSIVE_TRACE - launch-commit - Trace and arm the SBC cache only after a validated native parse; requires: - OPENFUT_FIFA17_COMMIT=I_ACCEPT_POST_PARSE_READY_BYTE + launch-dispatch + Trace and repair only a fully validated native status-999 completion; requires: + OPENFUT_FIFA17_DISPATCH=I_ACCEPT_GUARDED_NATIVE_DISPATCH Optional path overrides: OPENFUT_FIFA17_HOOK_DLL, OPENFUT_FIFA17_GAME_DIR, @@ -260,7 +257,7 @@ case "${1:-inspect}" in launch) launch baseline ;; launch-resolve) launch resolve ;; launch-trace) launch trace ;; - launch-commit) launch commit ;; + launch-dispatch) launch dispatch ;; -h|--help|help) usage ;; *) usage >&2; die "unknown command: $1" ;; esac diff --git a/openfut-launcher b/openfut-launcher index 1cd4f18..1c7111d 160000 --- a/openfut-launcher +++ b/openfut-launcher @@ -1 +1 @@ -Subproject commit 1cd4f18e92fb553b99b24477f3538e7daff412d1 +Subproject commit 1c7111ddbf73db694784d7c7a40192c6f7386bb4