Skip to content

emrg: fix .iss LoadStringFromFile 2-param signature (v0.2.30 Build Release windows gate)#732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
argszero wants to merge 1 commit into from
Closed

emrg: fix .iss LoadStringFromFile 2-param signature (v0.2.30 Build Release windows gate) #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,3 +56,25 @@ jobs:
- run: uv sync
- name: Python tests (Windows)
run: uv run pytest tests/ -v
# v0.2.30 教训（Build Release 31661378619）：Test 全绿 ≠ .iss 能编译。
# make-installer.sh 的 emrg.iss 只在 tag 触发 Build Release 时经 iscc 编译，
# #727 误用 LoadStringFromFile 单参数形式（Inno 真实签名是 2 参数 out-param）
# → iscc "Invalid number of parameters" 发版才暴露。此处用 runner 预装的
# iscc 编译渲染出的 emrg.iss（stub payload），PR CI 即拦截 .iss 语法/签名错误。
- name: Inno Setup script compile smoke test
shell: bash
run: |
set -euo pipefail
STAGE="$(mktemp -d)"
mkdir -p "$STAGE/payload/bin" "$STAGE/dist/artifacts"
touch "$STAGE/payload/bin/stop-emrg.cmd"
# 渲染 make-installer.sh 的 emrg.iss heredoc（变量展开与真实构建一致）
sed -n '/cat > "\$STAGE\/emrg.iss" <<EOF/,/^EOF$/p' packaging/make-installer.sh > "$STAGE/gen.sh"
VERSION="0.0.0-smoke" \
DIST_WIN="$(cygpath -m "$STAGE/dist")" \
STAGE_WIN="$(cygpath -m "$STAGE")" \
ROOT_WIN="$(cygpath -m "$PWD")" \
STAGE="$STAGE" \
bash "$STAGE/gen.sh"
command -v iscc >/dev/null 2>&1 || { echo "::error::iscc not on PATH (runner image regression)"; exit 1; }
iscc "$STAGE/emrg.iss"
8 changes: 7 additions & 1 deletion packaging/make-installer.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -400,8 +400,14 @@ begin
if ResultCode <> 0 then
begin
LogText := '';
// LoadStringFromFile 的 Inno Pascal Script 签名是
// `function LoadStringFromFile(const FileName: String; var S: AnsiString): Boolean;`
// （6.7.1 → 7.x 全版本一致，见 issrc Shared.ScriptFunc.pas）——不存在单参数
// 字符串返回形式！v0.2.30 Build Release 31661378619 因此编译失败
// （iscc "Invalid number of parameters"，Test CI 不编译 .iss 未拦住）。
// 正确用法：out-param 写入 LogText，返回 Boolean 表示成功。
if FileExists(LogFile) then
LogText := LoadStringFromFile(LogFile);
LoadStringFromFile(LogFile, LogText);
if Length(LogText) > 2000 then
LogText := Copy(LogText, 1, 2000);
if LogText <> '' then
Expand Down
8 changes: 7 additions & 1 deletion tests/test_installer_stop.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,7 +146,13 @@ def test_make_installer_iss_has_prepare_to_install():
# R125: rant 2026-08-13T09:24:37 — 输出重定向到 {tmp}\stop-emrg.log（2>&1），
# 失败时 LoadStringFromFile 读日志展示杀不掉的进程，不再让宿主手动跑诊断
assert '/c ""\' + StopScript + \'" > "\' + LogFile + \'" 2>&1"' in content
assert "LoadStringFromFile(LogFile)" in content
# ⚡ LoadStringFromFile 的 Inno Pascal Script 签名是 2 参数 out-param 形式
# `(const FileName: String; var S: AnsiString): Boolean`（6.7.1 → 7.x 一致，
# issrc Shared.ScriptFunc.pas）——单参数字符串返回形式不存在，iscc 编译报
# "Invalid number of parameters"（v0.2.30 Build Release 31661378619 实际失败，
# Test CI 不编译 .iss 未拦住）。正反两态钉死正确调用形态。
assert "LoadStringFromFile(LogFile, LogText)" in content # 正：out-param 形式
assert ":= LoadStringFromFile(LogFile)" not in content # 反：1 参数形式不存在
assert "Length(LogText) > 2000" in content
assert "Details from stop-emrg.cmd:" in content
assert "SW_HIDE" in content # 批处理执行不弹控制台窗口（#592 纪律）
Expand Down
Loading