quickwin 2.0.0 → 2.1.1

package/examples/exec_server.tsx

@@ -25,22 +25,21 @@ interface Cfg {
     token: string | null
 }
 
-// 只支持无值开关(--nogui)与等号形式(--gui=0/--token=x)。
-// 不支持空格分隔值形式 "--gui 0"/"--token x"：main.c 的 js_file 探测(main.c:214-250)
-// 会把裸值("0"/"x")当成脚本文件名,进程启动即 Failed to load 退出(见 .agents/TODO.md)。
+// 参数经 scriptArgs 透传：C 层只消费 -e/-o/-d，遇到未知选项即停止
+// 解析并把剩余全部交给脚本（见 main.c 参数解析段）。因此空格分隔
+// ("--gui 0") 与等号 ("--gui=0") 两种形式都由本函数自行解析。
 function parseArgs(): Cfg {
     let gui = true
     let token: string | null = null
     const args = typeof scriptArgs === 'undefined' ? [] : scriptArgs
+    const normToken = (v: string) => (v === '' ? null : v)  // 空串=未配置(放行)
     for (let i = 0; i < args.length; i++) {
         const a = args[i] ?? ''
         if (a === '--nogui') { gui = false }
+        else if (a === '--gui') { gui = (args[++i] ?? '') !== '0' }
         else if (a.startsWith('--gui=')) { gui = a.slice(6) !== '0' }
-        else if (a.startsWith('--token=')) {
-            // 空串归一为 null(未配置放行)：要求 Bearer 空串的"鉴权"无意义
-            const v = a.slice(8)
-            token = v === '' ? null : v
-        }
+        else if (a === '--token') { token = normToken(args[++i] ?? '') }
+        else if (a.startsWith('--token=')) { token = normToken(a.slice(8)) }
     }
     return { gui, token }
 }

package/examples/exec_server_worker.js

@@ -50,7 +50,7 @@ catch (ex) {
 let IS_WIN11 = false;
 try {
     const vi = OSVERSIONINFO_148.encode({ dwOSVersionInfoSize: OSVERSIONINFO_148.size });
-    if (RtlGetVersion(vi) === 0) {
+    if (RtlGetVersion(vi.ptr) === 0) {
         IS_WIN11 = OSVERSIONINFO_148.decode(vi).dwMajorVersion >= 10;
     }
 }

package/examples/exec_server_worker.ts

@@ -60,7 +60,7 @@ try {
 let IS_WIN11 = false
 try {
     const vi = OSVERSIONINFO_148.encode({ dwOSVersionInfoSize: OSVERSIONINFO_148.size })
-    if (RtlGetVersion(vi) === 0) {
+    if (RtlGetVersion(vi.ptr) === 0) {
         IS_WIN11 = OSVERSIONINFO_148.decode(vi).dwMajorVersion >= 10
     }
 } catch (ex) {
@@ -165,7 +165,7 @@ function bmpHeader(size: number, w: number, h: number): Uint8Array {
 }
 
 // 取 hdc 当前选中位图的全部像素，按 BMP 分块发出。返回 GetDIBits 是否全量成功。
-function emitDib(id: number, hdc: Ptr<'HDC'>, hbm: number, w: number, h: number): boolean {
+function emitDib(id: number, hdc: Ptr<'HDC'>, hbm: Ptr<'HGDIOBJ'>, w: number, h: number): boolean {
     const pxB = new PtrArrayBuffer(w * h * 4)
     const px = new Uint8Array(pxB)
     const bmi = BITMAPINFOHEADER.encode({

package/examples/pdf_preview2.js

@@ -144,7 +144,7 @@ function openPdfFileDialog() {
         Flags: 0x1000 | 0x0800 | 0x0004,
     });
     ofn.__keep = [fileBuf, filterWide];
-    const ret = GetOpenFileName(ofn);
+    const ret = GetOpenFileName(ofn.ptr);
     return ret ? WCHAR.decode(fileBuf) : null;
 }
 function updateScrollRange() {

package/examples/pdf_preview2.ts

@@ -105,7 +105,7 @@ function openPdfFileDialog(): string | null {
         Flags: 0x1000 | 0x0800 | 0x0004,
     })
     ofn.__keep = [fileBuf, filterWide]
-    const ret = GetOpenFileName(ofn)
+    const ret = GetOpenFileName(ofn.ptr)
     return ret ? WCHAR.decode(fileBuf) : null
 }
 

package/examples/pdf_viewer.js

@@ -15373,10 +15373,18 @@ var C_BASIC_TYPE = [
   "f64",
   "ptr"
 ];
-var PTR_TOKEN_RE = /^<([^<>\s]*)>ptr(!|@[A-Za-z_]\w*)?$/;
+var PTR_TOKEN_RE = /^<([A-Za-z_]\w*|)>ptr(!|@[A-Za-z_]\w*)?$/;
 function isCPtrToken(t) {
   return PTR_TOKEN_RE.test(t);
 }
+var VAL_TOKEN_RE = /^<([A-Za-z_]\w*)>$/;
+function isCValToken(t) {
+  return VAL_TOKEN_RE.test(t);
+}
+function valName(t) {
+  const m = VAL_TOKEN_RE.exec(t);
+  return m?.[1] || "";
+}
 function ptrName(t) {
   const m = PTR_TOKEN_RE.exec(t);
   return m?.[1] || "";
@@ -15384,8 +15392,9 @@ function ptrName(t) {
 var cTokenToType = (t) => {
   if (isCPtrToken(t))
     return "ptr";
-  else
-    return t;
+  if (isCValToken(t))
+    throw new Error(`ffi: cTokenToType: by-value token "${t}" has no scalar slot type`);
+  return t;
 };
 var PTR_SIZE = os.arch === "x64" ? 8 : 4;
 var SizeAlign = {
@@ -15404,8 +15413,12 @@ var NULL = 0;
 function normToken(t) {
   if (isCPtrToken(t)) {
     const m = PTR_TOKEN_RE.exec(t);
-    return m?.[2]?.startsWith("@") ? `<${m[1]}>ptr` : t;
+    const name = m?.[1] || "";
+    const mod = m?.[2];
+    return mod?.startsWith("@") ? `<${name}>ptr` : t;
   }
+  if (isCValToken(t))
+    return t;
   const at = t.indexOf("@");
   const base = at >= 0 ? t.slice(0, at) : t;
   const suffixOk = at < 0 || /^[A-Za-z_]\w*$/.test(t.slice(at + 1));
@@ -15732,6 +15745,9 @@ if (typeof globalThis.TextEncoder === "undefined") {
 }
 
 // _build/lib/ffi/bind.js
+function valCodec(name, encoders) {
+  return encoders[name];
+}
 var _dllCache = /* @__PURE__ */ new Map();
 function loadDll(dll) {
   const cached = _dllCache.get(dll);
@@ -15757,14 +15773,27 @@ function parseSig(sig) {
     }
     argTokens.push(tok);
   }
+  const retToken = normToken(parts[1]);
+  if (isCValToken(retToken))
+    throw new Error(`ffi-bind: "${sig}": by-value struct at the return position (<${valName(retToken)}>) is not supported \u2014 argument positions only; pass a struct out through an out-param slot instead (<N>ptr + caller buffer)`);
   return {
     argTokens,
-    retToken: normToken(parts[1]),
+    retToken,
     sig
   };
 }
 function makeFn(proc, sig, encoders, decoders) {
   const ps = parseSig(sig);
+  for (const t of ps.argTokens) {
+    if (!isCValToken(t))
+      continue;
+    const name = valName(t);
+    const codec = valCodec(name, encoders);
+    if (!codec || typeof codec.encode !== "function")
+      throw new Error(`ffi-bind: ${sig}: by-value position <${name}> has no registered layout (available: ${Object.keys(encoders).join(", ") || "none"})`);
+    if (typeof codec.size !== "number" || codec.size < 1)
+      throw new Error(`ffi-bind: ${sig}: by-value position <${name}> requires a struct layout with size >= 1 (got ${codec.size}; non-struct codecs expose no size)`);
+  }
   return (...a) => callPacked(proc, ps, a, encoders, decoders);
 }
 var IA32_ARG_SIZE = {
@@ -15784,15 +15813,29 @@ var X64_MIN_SLOTS = 4;
 function callPacked(proc, { argTokens, retToken, sig }, args, encoders, decoders) {
   const is64 = os2.arch === "x64";
   const getWidth = (t, is642) => {
+    if (isCValToken(t))
+      throw new Error(`ffi-bind: getWidth: by-value token "${t}" (dispatched by widthOf)`);
     if (is642)
       return 8;
     if (isCPtrToken(t))
       return PTR_SIZE;
     return IA32_ARG_SIZE[t];
   };
+  const widthOf = (t) => {
+    if (isCValToken(t)) {
+      if (is64)
+        return 8;
+      const layout = valCodec(valName(t), encoders);
+      if (!layout)
+        throw new Error(`ffi-bind: <${valName(t)}> by-value position has no registered layout`);
+      const size = layout.size;
+      return size % 4 === 0 ? size : size + 4 - size % 4;
+    }
+    return getWidth(t, is64);
+  };
   let total = 0;
   for (const t of argTokens)
-    total += getWidth(t, is64);
+    total += widthOf(t);
   if (is64 && argTokens.length < X64_MIN_SLOTS)
     total = X64_MIN_SLOTS * 8;
   const argFrame = new ArrayBuffer(total);
@@ -15829,10 +15872,28 @@ function callPacked(proc, { argTokens, retToken, sig }, args, encoders, decoders
           throw new Error(`ffi-bind: ${sig}: arg#${i + 1} <${name}>ptr! encode produced 0 (null pointer forbidden here)`);
         writeSlot(dv, off, { k: "ptr", v: p });
       }
+    } else if (isCValToken(argToken)) {
+      const name = valName(argToken);
+      const codec = valCodec(name, encoders);
+      if (!codec)
+        throw new Error(`ffi-bind: ${sig}: arg#${i + 1} <${name}> by-value position has no registered layout`);
+      if (arg === null || arg === void 0)
+        throw new Error(`ffi-bind: <${name}> value position got ${String(arg)}; pass a struct object (use <${name}>ptr to pass a pointer)`);
+      const size = codec.size;
+      if (!is64 || size <= 8 && (size & size - 1) === 0) {
+        codec.encode(arg, argFrame, off);
+      } else {
+        const buf = new ArrayBuffer(size + 15);
+        const base = ffi.bufferPtr(buf);
+        const pad = (16 - base % 16) % 16;
+        codec.encode(arg, buf, pad);
+        held.push(buf);
+        writeSlot(dv, off, { k: "ptr", v: base + pad });
+      }
     } else {
       writeSlot(dv, off, { k: argToken, v: arg });
     }
-    off += getWidth(argToken, is64);
+    off += widthOf(argToken);
   }
   const retBuf = new ArrayBuffer(8);
   const retIsFp = retToken === "f32" || retToken === "f64";
@@ -16223,21 +16284,20 @@ function createStruct(t) {
     size,
     structAlign: maxEffectiveAlign,
     decode: (p) => {
-      if (typeof p === "number") {
-        const buf = new ArrayBuffer(size);
-        const u8 = new Uint8Array(buf);
-        for (let i = 0; i < size; i++)
-          u8[i] = ffi2.readByte(p + i);
-        return doDecode(new DataView(buf), 0, fields);
-      }
+      if (typeof p === "number")
+        return doDecode(new DataView(ffi2.readBytes(p, size)), 0, fields);
       return doDecode(new DataView(p), 0, fields);
     },
-    alloc: (() => new PtrArrayBuffer(size)),
-    encode: ((v, buf) => {
+    alloc: ((n) => {
+      if (n !== void 0 && (!Number.isInteger(n) || n < 1))
+        throw new Error(`ffi-struct: alloc(n) requires an integer n >= 1 (PAB(0) never escapes \u2014 pass NULL for an empty pointer position)`);
+      return new PtrArrayBuffer(size * (n ?? 1));
+    }),
+    encode: ((v, buf, offset) => {
       if (v === void 0 || v === null)
         throw new Error(`ffi-struct: encode(v) requires an argument; use alloc() for a zeroed out-param slot`);
       const out = buf ?? new PtrArrayBuffer(size);
-      doEncode(new DataView(out), 0, fields, v);
+      doEncode(new DataView(out), offset ?? 0, fields, v);
       return out;
     }),
     offsetOf: (name) => {
@@ -16257,6 +16317,49 @@ function buildDecl(kind, member, pack) {
       decl[k] = v;
   return decl;
 }
+function structArray(def) {
+  const { fields, size } = computeStructLayout(def.__struct);
+  const readN = (dv, n) => {
+    const out = [];
+    for (let i = 0; i < n; i++)
+      out.push(doDecode(dv, i * size, fields));
+    return out;
+  };
+  return {
+    encode: (els) => {
+      if (!Array.isArray(els) || els.length === 0)
+        throw new Error(`ffi-struct: structArray(def).encode(els) requires a non-empty element array (pass NULL for an empty pointer position)`);
+      const out = def.alloc(els.length);
+      for (let i = 0; i < els.length; i++)
+        def.encode(els[i], out, i * def.size);
+      return out;
+    },
+    decode: ((p, count) => {
+      if (count !== void 0 && (!Number.isInteger(count) || count < 0))
+        throw new Error(`ffi-struct: structArray.decode(p, count) requires a non-negative integer count, got ${count}`);
+      if (typeof p === "number") {
+        if (count === void 0)
+          throw new Error(`ffi-struct: structArray.decode(address, count) requires an explicit count (a bare address carries no length)`);
+        if (count === 0)
+          return [];
+        return readN(new DataView(ffi2.readBytes(p, count * size)), count);
+      }
+      let n;
+      if (count !== void 0) {
+        n = count;
+        if (n * size > p.byteLength)
+          throw new Error(`ffi-struct: structArray.decode: count ${n} \xD7 size ${size} = ${n * size} exceeds buffer byteLength ${p.byteLength}`);
+      } else {
+        if (p.byteLength % size !== 0)
+          throw new Error(`ffi-struct: structArray.decode: byteLength ${p.byteLength} is not a multiple of size ${size} (mixed buffer? pass count explicitly)`);
+        n = p.byteLength / size;
+      }
+      if (n === 0)
+        return [];
+      return readN(new DataView(p), n);
+    })
+  };
+}
 function struct(a, b6, c) {
   const isNamed = typeof a === "string";
   const raw = isNamed ? b6 : a;
@@ -16519,11 +16622,12 @@ import * as os4 from "os";
 
 // _build/lib/windows/gdi32.js
 var b2 = (name, sig, encoders) => bind("gdi32.dll", name, sig, encoders);
-var DeleteObject = /* @__PURE__ */ b2("DeleteObject", "<>ptr -> i32");
+var POINTArr = structArray(POINT);
+var DeleteObject = /* @__PURE__ */ b2("DeleteObject", "<HGDIOBJ>ptr -> i32");
 var GetDeviceCaps = /* @__PURE__ */ b2("GetDeviceCaps", "<HDC>ptr! i32@DeviceCap -> i32");
-var CreateFontIndirect = /* @__PURE__ */ b2("CreateFontIndirectW", "<LOGFONTW>ptr -> <>ptr", { LOGFONTW });
-var SelectObject = /* @__PURE__ */ b2("SelectObject", "<HDC>ptr! <>ptr -> <>ptr");
-var GetObject = /* @__PURE__ */ b2("GetObjectW", "<>ptr i32 <BYTE>ptr -> i32");
+var CreateFontIndirect = /* @__PURE__ */ b2("CreateFontIndirectW", "<LOGFONTW>ptr -> <HGDIOBJ>ptr", { LOGFONTW });
+var SelectObject = /* @__PURE__ */ b2("SelectObject", "<HDC>ptr! <HGDIOBJ>ptr -> <HGDIOBJ>ptr");
+var GetObject = /* @__PURE__ */ b2("GetObjectW", "<HGDIOBJ>ptr i32 <BYTE>ptr -> i32");
 var SetDIBitsToDevice = /* @__PURE__ */ b2("SetDIBitsToDevice", "<HDC>ptr! i32 i32 u32 u32 i32 i32 u32 u32 <BYTE>ptr <BYTE>ptr u32 -> i32");
 
 // _build/lib/react-qw/props.js
@@ -16671,7 +16775,7 @@ function measureTextForHwnd(hwnd, text) {
   if (!hdc)
     return { width: 0, height: 0 };
   const hFont = gui2.SendMessage(hwnd, 49, 0, 0);
-  const oldFont = hFont ? SelectObject(hdc, hFont) : 0;
+  const oldFont = hFont ? SelectObject(hdc, hFont) : NULL;
   const result = measureText(hdc, text, 0);
   if (hFont)
     SelectObject(hdc, oldFont);
@@ -18056,11 +18160,11 @@ var import_react17 = __toESM(require_react(), 1);
 
 // _build/lib/windows/comdlg32.js
 var b3 = (name, sig) => bind("comdlg32.dll", name, sig);
-var GetOpenFileName = /* @__PURE__ */ b3("GetOpenFileNameW", "<BYTE>ptr -> u32");
+var GetOpenFileName = /* @__PURE__ */ b3("GetOpenFileNameW", "<OPENFILENAMEW>ptr -> u32");
 
 // _build/lib/windows/shell32.js
 var b4 = (name, sig) => bind("shell32.dll", name, sig);
-var SHBrowseForFolder = /* @__PURE__ */ b4("SHBrowseForFolderW", "<BYTE>ptr -> <>ptr");
+var SHBrowseForFolder = /* @__PURE__ */ b4("SHBrowseForFolderW", "<BROWSEINFOW>ptr -> <>ptr");
 var SHGetPathFromIDList = /* @__PURE__ */ b4("SHGetPathFromIDListW", "<>ptr <BYTE>ptr -> u32");
 
 // _build/lib/windows/ole32.js
@@ -18085,7 +18189,7 @@ function openFileDialog(owner, filter, title, multiple) {
     lpstrTitle: titleWide?.ptr ?? 0,
     Flags: flags
   });
-  const ret = GetOpenFileName(ofn);
+  const ret = GetOpenFileName(ofn.ptr);
   if (!ret)
     return null;
   if (!multiple) {
@@ -18103,7 +18207,7 @@ function openFolderDialog(owner, title) {
     lpszTitle: titleWide?.ptr ?? 0,
     ulFlags: 65
   });
-  const pidl = SHBrowseForFolder(bi);
+  const pidl = SHBrowseForFolder(bi.ptr);
   if (!pidl)
     return null;
   const pathBuf = WCHAR.alloc(260);
@@ -18198,7 +18302,7 @@ function createRoot(container) {
   } else {
     hwnd = container;
   }
-  const root = reconciler_default.createContainer(hwnd, 0, null, false, null, "", noop, noop, noop, noop);
+  const root = reconciler_default.createContainer(hwnd, 0, null, false, null, "", (error, info) => console.log("[React uncaught]", error, error.stack, info.componentStack), (error, info) => console.log("[React caught]", error, error.stack, info.componentStack), (error, info) => console.log("[React recoverable]", error, error.stack, info.componentStack), noop);
   const rootInst = { hwnd, type: "_root", props: { type: "_root", style: { flexDirection: "column", alignItems: "stretch" } }, children: [] };
   instancesByHwnd.set(hwnd, rootInst);
   if (typeof container === "object")
@@ -18270,7 +18374,7 @@ function openPdfFileDialog(owner) {
     Flags: 4096 | 2048 | 4
   });
   ofn.__keep = [fileBuf, filterWide];
-  const ret = GetOpenFileName(ofn);
+  const ret = GetOpenFileName(ofn.ptr);
   if (!ret)
     return null;
   const path = WCHAR.decode(fileBuf);

package/examples/pdf_viewer.tsx

@@ -26,7 +26,7 @@ function openPdfFileDialog(owner: MaybePtr<'HWND'>): string | null {
   })
   ofn.__keep = [fileBuf, filterWide]
 
-  const ret = GetOpenFileName(ofn)
+  const ret = GetOpenFileName(ofn.ptr)
   if (!ret) return null
 
   const path = WCHAR.decode(fileBuf)