quickwin 2.1.0 → 2.2.0

package/examples/execd_worker.js

@@ -0,0 +1,122 @@
+import * as os from 'os';
+import * as std from 'std';
+import { WCHAR } from '../lib/ffi/bind.js';
+import { NULL, PtrArrayBuffer } from '../lib/ffi/ctype.js';
+import { struct } from '../lib/ffi/struct.js';
+import { CloseHandle, CreatePipe, CreateProcess, GetExitCodeProcess, GetLastError, GetSystemDirectory, ReadFile, SetHandleInformation, WaitForSingleObject, } from '../lib/windows/kernel32.js';
+import { PROCESS_INFORMATION, STARTUPINFOW } from '../lib/windows/structs.js';
+// worker 没有可观测的输出通道：绑定失败会静默中断 worker 脚本，主线程永远等不到消息。
+// 失败原因落盘 diag.log 以便定位（典型：DLL 位数与进程不匹配 -> ERROR_BAD_EXE_FORMAT 193）。
+const diagFile = (stage) => {
+    try {
+        const f = std.open('diag.log', 'a');
+        if (f) {
+            f.puts(`${Date.now()} ${stage}\n`);
+            f.close();
+        }
+    }
+    catch (ex) { /* best effort */ }
+};
+const HANDLE_FLAG_INHERIT = 0x1;
+const STARTF_USESTDHANDLES = 0x100;
+const WAIT_INFINITE = 0xffffffff;
+// STARTUPINFOW / PROCESS_INFORMATION 的布局随进程位宽（x86 68B / x64 104B），由 struct 按 os.arch 推。
+// os.arch 是编译期的进程指针宽度（quickjs-libc.c OS_ARCH），WOW64 下的 32 位进程得 ia32 布局——
+// 本地 win7 VM 上的 execd 就是 32 位进程跑在 64 位系统上。
+const parent = os.Worker.parent;
+// GetSystemDirectoryW 拼 cmd.exe 全路径。
+// 探针实测（XP/Win7 均如此）：CreateProcessW 的 lpCommandLine 第一个 token 若是
+// 裸 "cmd.exe"，PATH 解析在本环境失败（err 267 ERROR_DIRECTORY / 123 ERROR_INVALID_NAME），
+// 用全路径即正常。cmd 内部再解析 ping/dir 等用自己的 PATH，无此问题。
+let sysDir = 'C:\\Windows\\System32';
+try {
+    const out = WCHAR.alloc(256);
+    const n = GetSystemDirectory(out, 256);
+    const s = n > 0 ? WCHAR.decode(out) : '';
+    if (s)
+        sysDir = s;
+}
+catch (ex) {
+    diagFile('SYS-DIR-FAIL: ' + String(ex));
+}
+// 用 CreateProcessW + CreatePipe 直接捕获子进程 stdout（替代 winpty）。
+// 纯捕获场景（/exec 从不交互），管道方案比 winpty 少一层 agent 中转：
+//   - 流式粒度更好：探针实测 XP 上逐行实时到达（winpty 攒批 ~4s）
+//   - 无 winpty.dll / winpty-agent.exe 依赖，纯 kernel32
+// 编码：无统一代码页转换——cmd 内置经 /u 恒为 UTF-16LE，外部程序各自原生
+// （qwin= UTF-8、中文系统工具= GBK），客户端按来源分别解码。
+// 同步阻塞读循环（worker 线程自转），主线程事件循环不受影响。
+// CreatePipe 的两个 HANDLE 出参槽：一个结构两个指针字段，读回走 decode
+// CreatePipe 成功后两端句柄必非零（失败已在下方 throw）——字段标 '!'，decode 直出 Ptr
+const PIPE_HANDLES = /* @__PURE__ */ struct('PIPE_HANDLES', { hRead: '<HFILE>ptr!', hWrite: '<HFILE>ptr!' });
+function runCmd(id, cmd) {
+    // —— 管道 + 继承设置（读端不可继承，否则 EOF 永不触发）——
+    const pipe = PIPE_HANDLES.alloc();
+    if (!CreatePipe(pipe.ptr, pipe.ptr + PIPE_HANDLES.offsetOf('hWrite'), NULL, 0)) {
+        throw new Error('CreatePipe err=' + GetLastError());
+    }
+    const { hRead, hWrite } = PIPE_HANDLES.decode(pipe);
+    SetHandleInformation(hWrite, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT);
+    SetHandleInformation(hRead, HANDLE_FLAG_INHERIT, 0);
+    // —— STARTUPINFO（写端作为子进程 stdout/stderr）——
+    const pi = PROCESS_INFORMATION.alloc();
+    // 恒加 /u：cmd 内置输出（echo/dir/type 与 cmd 自身报错）直接写 UTF-16LE，绕开「按代码页
+    // 编码成字节」这一步（Tiny11 缺 NLS 时中文变 ?；win7/XP 的 GBK 无损只是 ACP=936 的 locale 巧合）。
+    // /u 在所有 Win 版本行为一致，故不分版本——早期用 RtlGetVersion 判 NT>=10 只对 win11 加 /u，已删。
+    // 外部程序（qwin/ping 等）输出仍为各自原生编码，/u 不参与（实测 ping 仍透传 GBK）。见 .agents/CMD_ENCODING_ACP_NLS.md §8。
+    const cmdline = `${sysDir}\\cmd.exe /u /c ${cmd}`;
+    if (!CreateProcess(NULL, cmdline, NULL, NULL, 1, 0, NULL, NULL, { cb: STARTUPINFOW.size, dwFlags: STARTF_USESTDHANDLES, hStdOutput: hWrite, hStdError: hWrite }, pi.ptr)) {
+        CloseHandle(hRead);
+        CloseHandle(hWrite);
+        throw new Error('CreateProcessW err=' + GetLastError() + ' cmd=' + cmdline);
+    }
+    const { hProcess, hThread, dwProcessId } = PROCESS_INFORMATION.decode(pi);
+    CloseHandle(hThread);
+    CloseHandle(hWrite);
+    parent.postMessage({ type: 'info', id, pid: dwProcessId });
+    // —— 同步阻塞读循环（子进程树全退出、写端全关 -> EOF -> 收尾）——
+    const bufB = new PtrArrayBuffer(4096);
+    const buf = new Uint8Array(bufB);
+    const nReadB = new PtrArrayBuffer(4);
+    const nRead = new Uint32Array(nReadB);
+    for (;;) {
+        nRead[0] = 0;
+        if (!ReadFile(hRead, bufB, 4096, nReadB, NULL))
+            break;
+        const n = nRead[0];
+        if (n === 0)
+            break;
+        parent.postMessage({ type: 'data', id, chunk: buf.slice(0, n) });
+    }
+    WaitForSingleObject(hProcess, WAIT_INFINITE);
+    const ecB = new PtrArrayBuffer(4);
+    const ec = new Int32Array(ecB);
+    GetExitCodeProcess(hProcess, ecB);
+    const code = ec[0];
+    CloseHandle(hRead);
+    CloseHandle(hProcess);
+    return code;
+}
+parent.onmessage = (e) => {
+    // worker 只剩 /exec 一个租客：外部命令不可控，必须与主进程隔离（长阻塞无上界）。
+    // 内置端点（截屏/窗口列表/改分辨率）全部在主进程同步跑——bug 当场 throw → 500，
+    // 而不是在 worker 里静默挂掉等 timer 兜底成 504。
+    const msg = e.data;
+    if (msg.type === 'run' && typeof msg.cmd === 'string') {
+        let code = -1;
+        let error = null;
+        try {
+            code = runCmd(msg.id, msg.cmd);
+        }
+        catch (ex) {
+            error = String(ex);
+        }
+        parent.postMessage({ type: 'result', id: msg.id, code, error });
+    }
+    // 父侧每个请求起一个新 worker，一次只处理一个请求，处理完立刻释放自己的 port：
+    // port_list 清空后 js_os_poll 返回 -1（quickjs-libc.c:2506）→ 本线程退出，
+    // JSRuntime 随之释放。不设 null 的话线程常驻（实测 win7 30 次请求线程 4→35）。
+    // 注意父侧 `worker.onmessage = null` 只释放父侧 port，对本线程无效——必须在这里设。
+    // 消息已在 js_post_message_pipe 进队列，父侧读的是同一份 refcount 共享管道，线程退出不影响。
+    parent.onmessage = null;
+};

package/examples/execd_worker.ts

@@ -0,0 +1,127 @@
+import * as os from 'os'
+import * as std from 'std'
+import { WCHAR } from '../lib/ffi/bind.js'
+import { NULL, PtrArrayBuffer } from '../lib/ffi/ctype.js'
+import { struct } from '../lib/ffi/struct.js'
+import {
+    CloseHandle, CreatePipe, CreateProcess, GetExitCodeProcess, GetLastError, GetSystemDirectory,
+    ReadFile, SetHandleInformation, WaitForSingleObject,
+} from '../lib/windows/kernel32.js'
+import { PROCESS_INFORMATION, STARTUPINFOW } from '../lib/windows/structs.js'
+
+// worker 没有可观测的输出通道：绑定失败会静默中断 worker 脚本，主线程永远等不到消息。
+// 失败原因落盘 diag.log 以便定位（典型：DLL 位数与进程不匹配 -> ERROR_BAD_EXE_FORMAT 193）。
+const diagFile = (stage: string): void => {
+    try {
+        const f = std.open('diag.log', 'a')
+        if (f) { f.puts(`${Date.now()} ${stage}\n`); f.close() }
+    } catch (ex) { /* best effort */ }
+}
+
+const HANDLE_FLAG_INHERIT = 0x1
+const STARTF_USESTDHANDLES = 0x100
+const WAIT_INFINITE = 0xffffffff
+// STARTUPINFOW / PROCESS_INFORMATION 的布局随进程位宽（x86 68B / x64 104B），由 struct 按 os.arch 推。
+// os.arch 是编译期的进程指针宽度（quickjs-libc.c OS_ARCH），WOW64 下的 32 位进程得 ia32 布局——
+// 本地 win7 VM 上的 execd 就是 32 位进程跑在 64 位系统上。
+
+const parent = os.Worker.parent
+
+// GetSystemDirectoryW 拼 cmd.exe 全路径。
+// 探针实测（XP/Win7 均如此）：CreateProcessW 的 lpCommandLine 第一个 token 若是
+// 裸 "cmd.exe"，PATH 解析在本环境失败（err 267 ERROR_DIRECTORY / 123 ERROR_INVALID_NAME），
+// 用全路径即正常。cmd 内部再解析 ping/dir 等用自己的 PATH，无此问题。
+let sysDir = 'C:\\Windows\\System32'
+try {
+    const out = WCHAR.alloc(256)
+    const n = GetSystemDirectory(out, 256)
+    const s = n > 0 ? WCHAR.decode(out) : ''
+    if (s) sysDir = s
+} catch (ex) {
+    diagFile('SYS-DIR-FAIL: ' + String(ex))
+}
+
+// 用 CreateProcessW + CreatePipe 直接捕获子进程 stdout（替代 winpty）。
+// 纯捕获场景（/exec 从不交互），管道方案比 winpty 少一层 agent 中转：
+//   - 流式粒度更好：探针实测 XP 上逐行实时到达（winpty 攒批 ~4s）
+//   - 无 winpty.dll / winpty-agent.exe 依赖，纯 kernel32
+// 编码：无统一代码页转换——cmd 内置经 /u 恒为 UTF-16LE，外部程序各自原生
+// （qwin= UTF-8、中文系统工具= GBK），客户端按来源分别解码。
+// 同步阻塞读循环（worker 线程自转），主线程事件循环不受影响。
+// CreatePipe 的两个 HANDLE 出参槽：一个结构两个指针字段，读回走 decode
+// CreatePipe 成功后两端句柄必非零（失败已在下方 throw）——字段标 '!'，decode 直出 Ptr
+const PIPE_HANDLES = /* @__PURE__ */ struct('PIPE_HANDLES', { hRead: '<HFILE>ptr!', hWrite: '<HFILE>ptr!' })
+
+function runCmd(id: number, cmd: string): number {
+    // —— 管道 + 继承设置（读端不可继承，否则 EOF 永不触发）——
+    const pipe = PIPE_HANDLES.alloc()
+    if (!CreatePipe(pipe.ptr, pipe.ptr + PIPE_HANDLES.offsetOf('hWrite'), NULL, 0)) {
+        throw new Error('CreatePipe err=' + GetLastError())
+    }
+    const { hRead, hWrite } = PIPE_HANDLES.decode(pipe)
+    SetHandleInformation(hWrite, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT)
+    SetHandleInformation(hRead, HANDLE_FLAG_INHERIT, 0)
+
+    // —— STARTUPINFO（写端作为子进程 stdout/stderr）——
+    const pi = PROCESS_INFORMATION.alloc()
+    // 恒加 /u：cmd 内置输出（echo/dir/type 与 cmd 自身报错）直接写 UTF-16LE，绕开「按代码页
+    // 编码成字节」这一步（Tiny11 缺 NLS 时中文变 ?；win7/XP 的 GBK 无损只是 ACP=936 的 locale 巧合）。
+    // /u 在所有 Win 版本行为一致，故不分版本——早期用 RtlGetVersion 判 NT>=10 只对 win11 加 /u，已删。
+    // 外部程序（qwin/ping 等）输出仍为各自原生编码，/u 不参与（实测 ping 仍透传 GBK）。见 .agents/CMD_ENCODING_ACP_NLS.md §8。
+    const cmdline = `${sysDir}\\cmd.exe /u /c ${cmd}`
+    if (!CreateProcess(NULL, cmdline, NULL, NULL, 1, 0, NULL, NULL,
+        { cb: STARTUPINFOW.size, dwFlags: STARTF_USESTDHANDLES, hStdOutput: hWrite, hStdError: hWrite }, pi.ptr)) {
+        CloseHandle(hRead)
+        CloseHandle(hWrite)
+        throw new Error('CreateProcessW err=' + GetLastError() + ' cmd=' + cmdline)
+    }
+    const { hProcess, hThread, dwProcessId } = PROCESS_INFORMATION.decode(pi)
+    CloseHandle(hThread)
+    CloseHandle(hWrite)
+    parent.postMessage({ type: 'info', id, pid: dwProcessId })
+
+    // —— 同步阻塞读循环（子进程树全退出、写端全关 -> EOF -> 收尾）——
+    const bufB = new PtrArrayBuffer(4096)
+    const buf = new Uint8Array(bufB)
+    const nReadB = new PtrArrayBuffer(4)
+    const nRead = new Uint32Array(nReadB)
+    for (;;) {
+        nRead[0] = 0
+        if (!ReadFile(hRead, bufB, 4096, nReadB, NULL)) break
+        const n = nRead[0]!
+        if (n === 0) break
+        parent.postMessage({ type: 'data', id, chunk: buf.slice(0, n) })
+    }
+
+    WaitForSingleObject(hProcess, WAIT_INFINITE)
+    const ecB = new PtrArrayBuffer(4)
+    const ec = new Int32Array(ecB)
+    GetExitCodeProcess(hProcess, ecB)
+    const code = ec[0]!
+    CloseHandle(hRead)
+    CloseHandle(hProcess)
+    return code
+}
+
+parent.onmessage = (e) => {
+    // worker 只剩 /exec 一个租客：外部命令不可控，必须与主进程隔离（长阻塞无上界）。
+    // 内置端点（截屏/窗口列表/改分辨率）全部在主进程同步跑——bug 当场 throw → 500，
+    // 而不是在 worker 里静默挂掉等 timer 兜底成 504。
+    const msg = e.data as { type: string; id: number; cmd?: string }
+    if (msg.type === 'run' && typeof msg.cmd === 'string') {
+        let code = -1
+        let error: string | null = null
+        try {
+            code = runCmd(msg.id, msg.cmd)
+        } catch (ex) {
+            error = String(ex)
+        }
+        parent.postMessage({ type: 'result', id: msg.id, code, error })
+    }
+    // 父侧每个请求起一个新 worker，一次只处理一个请求，处理完立刻释放自己的 port：
+    // port_list 清空后 js_os_poll 返回 -1（quickjs-libc.c:2506）→ 本线程退出，
+    // JSRuntime 随之释放。不设 null 的话线程常驻（实测 win7 30 次请求线程 4→35）。
+    // 注意父侧 `worker.onmessage = null` 只释放父侧 port，对本线程无效——必须在这里设。
+    // 消息已在 js_post_message_pipe 进队列，父侧读的是同一份 refcount 共享管道，线程退出不影响。
+    parent.onmessage = null
+}

package/examples/pdf_viewer.js

@@ -16280,7 +16280,7 @@ function doEncode(dv, base, fields, v) {
 function createStruct(t) {
   const { fields, size, maxEffectiveAlign } = computeStructLayout(t);
   return {
-    __struct: t,
+    fields,
     size,
     structAlign: maxEffectiveAlign,
     decode: (p) => {
@@ -16309,6 +16309,14 @@ function createStruct(t) {
   };
 }
 function buildDecl(kind, member, pack) {
+  const declKind = member["#"];
+  if (declKind !== void 0 && declKind !== kind)
+    throw new Error(`ffi-struct: ${kind}() received a '${String(declKind)}' declaration (kind mismatch \u2014 use ${declKind}() for it)`);
+  const declPack = member["#pack"];
+  if (pack === void 0 && declPack !== void 0)
+    pack = declPack;
+  else if (pack !== void 0 && declPack !== void 0 && pack !== declPack)
+    throw new Error(`ffi-struct: #pack conflict: opts.pack=${pack} vs declaration ${String(declPack)}`);
   const decl = { "#": kind };
   if (pack !== void 0)
     decl["#pack"] = pack;
@@ -16317,49 +16325,6 @@ 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;
@@ -16368,21 +16333,28 @@ function struct(a, b6, c) {
 }
 
 // _build/lib/windows/structs.js
-var RECT = /* @__PURE__ */ struct("RECT", {
+var RECT_DECL = {
+  "#": "struct",
   left: "i32",
   top: "i32",
   right: "i32",
   bottom: "i32"
-});
-var POINT = /* @__PURE__ */ struct("POINT", {
+};
+var RECT = /* @__PURE__ */ struct("RECT", RECT_DECL);
+var POINT_DECL = {
+  "#": "struct",
   x: "i32",
   y: "i32"
-});
-var SIZE = /* @__PURE__ */ struct("SIZE", {
+};
+var POINT = /* @__PURE__ */ struct("POINT", POINT_DECL);
+var SIZE_DECL = {
+  "#": "struct",
   cx: "i32",
   cy: "i32"
-});
-var LOGFONTW = /* @__PURE__ */ struct("LOGFONTW", {
+};
+var SIZE = /* @__PURE__ */ struct("SIZE", SIZE_DECL);
+var LOGFONTW_DECL = {
+  "#": "struct",
   lfHeight: "i32",
   lfWidth: "i32",
   lfEscapement: "i32",
@@ -16397,8 +16369,10 @@ var LOGFONTW = /* @__PURE__ */ struct("LOGFONTW", {
   lfQuality: "u8",
   lfPitchAndFamily: "u8",
   lfFaceName: "u16[32]@utf-16le"
-});
-var BITMAPINFOHEADER = /* @__PURE__ */ struct("BITMAPINFOHEADER", {
+};
+var LOGFONTW = /* @__PURE__ */ struct("LOGFONTW", LOGFONTW_DECL);
+var BITMAPINFOHEADER_DECL = {
+  "#": "struct",
   biSize: "u32",
   biWidth: "i32",
   biHeight: "i32",
@@ -16410,8 +16384,10 @@ var BITMAPINFOHEADER = /* @__PURE__ */ struct("BITMAPINFOHEADER", {
   biYPelsPerMeter: "i32",
   biClrUsed: "u32",
   biClrImportant: "u32"
-});
-var OPENFILENAMEW = /* @__PURE__ */ struct("OPENFILENAMEW", {
+};
+var BITMAPINFOHEADER = /* @__PURE__ */ struct("BITMAPINFOHEADER", BITMAPINFOHEADER_DECL);
+var OPENFILENAMEW_DECL = {
+  "#": "struct",
   lStructSize: "u32",
   hwndOwner: "<HWND>ptr",
   hInstance: "<HMODULE>ptr",
@@ -16435,8 +16411,10 @@ var OPENFILENAMEW = /* @__PURE__ */ struct("OPENFILENAMEW", {
   pvReserved: "<>ptr",
   dwReserved: "u32",
   FlagsEx: "u32"
-});
-var BROWSEINFOW = /* @__PURE__ */ struct("BROWSEINFOW", {
+};
+var OPENFILENAMEW = /* @__PURE__ */ struct("OPENFILENAMEW", OPENFILENAMEW_DECL);
+var BROWSEINFOW_DECL = {
+  "#": "struct",
   hwndOwner: "<HWND>ptr",
   pidlRoot: "<>ptr",
   pszDisplayName: "<>ptr",
@@ -16445,13 +16423,17 @@ var BROWSEINFOW = /* @__PURE__ */ struct("BROWSEINFOW", {
   lpfn: "<>ptr",
   lParam: "<>ptr",
   iImage: "i32"
-});
-var NMHDR = /* @__PURE__ */ struct("NMHDR", {
+};
+var BROWSEINFOW = /* @__PURE__ */ struct("BROWSEINFOW", BROWSEINFOW_DECL);
+var NMHDR_DECL = {
+  "#": "struct",
   hwndFrom: "<HWND>ptr",
   idFrom: "<>ptr",
   code: "i32"
-});
-var SYSTEMTIME = /* @__PURE__ */ struct("SYSTEMTIME", {
+};
+var NMHDR = /* @__PURE__ */ struct("NMHDR", NMHDR_DECL);
+var SYSTEMTIME_DECL = {
+  "#": "struct",
   wYear: "u16",
   wMonth: "u16",
   wDayOfWeek: "u16",
@@ -16460,35 +16442,44 @@ var SYSTEMTIME = /* @__PURE__ */ struct("SYSTEMTIME", {
   wMinute: "u16",
   wSecond: "u16",
   wMilliseconds: "u16"
-});
-var NMDATETIMECHANGE = /* @__PURE__ */ struct("NMDATETIMECHANGE", {
-  hdr: NMHDR.__struct,
+};
+var SYSTEMTIME = /* @__PURE__ */ struct("SYSTEMTIME", SYSTEMTIME_DECL);
+var NMDATETIMECHANGE_DECL = {
+  "#": "struct",
+  hdr: NMHDR_DECL,
   dwFlags: "u32",
-  st: SYSTEMTIME.__struct
-});
-var LITEM = /* @__PURE__ */ struct("LITEM", {
+  st: SYSTEMTIME_DECL
+};
+var NMDATETIMECHANGE = /* @__PURE__ */ struct("NMDATETIMECHANGE", NMDATETIMECHANGE_DECL);
+var LITEM_DECL = {
+  "#": "struct",
   mask: "u32",
   iLink: "i32",
   state: "u32",
   stateMask: "u32",
   szID: "u16[48]@utf-16le",
   szUrl: "u16[2084]@utf-16le"
-});
-var NMLINK = /* @__PURE__ */ struct("NMLINK", {
-  hdr: NMHDR.__struct,
-  item: LITEM.__struct
-});
-var NMCUSTOMDRAW = /* @__PURE__ */ struct("NMCUSTOMDRAW", {
-  hdr: NMHDR.__struct,
+};
+var NMLINK_DECL = {
+  "#": "struct",
+  hdr: NMHDR_DECL,
+  item: LITEM_DECL
+};
+var NMLINK = /* @__PURE__ */ struct("NMLINK", NMLINK_DECL);
+var NMCUSTOMDRAW_DECL = {
+  "#": "struct",
+  hdr: NMHDR_DECL,
   dwDrawStage: "u32",
   hdc: "<HDC>ptr",
   rc: "i32[4]",
   dwItemSpec: "<>ptr",
   uItemState: "u32",
   lItemlParam: "<>ptr"
-});
-var NMLVCUSTOMDRAW = /* @__PURE__ */ struct("NMLVCUSTOMDRAW", {
-  hdr: NMHDR.__struct,
+};
+var NMCUSTOMDRAW = /* @__PURE__ */ struct("NMCUSTOMDRAW", NMCUSTOMDRAW_DECL);
+var NMLVCUSTOMDRAW_DECL = {
+  "#": "struct",
+  hdr: NMHDR_DECL,
   dwDrawStage: "u32",
   hdc: "<HDC>ptr",
   rc: "i32[4]",
@@ -16499,9 +16490,11 @@ var NMLVCUSTOMDRAW = /* @__PURE__ */ struct("NMLVCUSTOMDRAW", {
   clrTextBk: "u32",
   iSubItem: "i32",
   dwItemType: "u32"
-});
-var NMLISTVIEW = /* @__PURE__ */ struct("NMLISTVIEW", {
-  hdr: NMHDR.__struct,
+};
+var NMLVCUSTOMDRAW = /* @__PURE__ */ struct("NMLVCUSTOMDRAW", NMLVCUSTOMDRAW_DECL);
+var NMLISTVIEW_DECL = {
+  "#": "struct",
+  hdr: NMHDR_DECL,
   iItem: "i32",
   iSubItem: "i32",
   uNewState: "u32",
@@ -16509,8 +16502,10 @@ var NMLISTVIEW = /* @__PURE__ */ struct("NMLISTVIEW", {
   uChanged: "u32",
   ptAction: "i32[2]",
   lParam: "<>ptr"
-});
-var TCITEMW = /* @__PURE__ */ struct("TCITEMW", {
+};
+var NMLISTVIEW = /* @__PURE__ */ struct("NMLISTVIEW", NMLISTVIEW_DECL);
+var TCITEMW_DECL = {
+  "#": "struct",
   mask: "u32",
   dwState: "u32",
   dwStateMask: "u32",
@@ -16518,8 +16513,10 @@ var TCITEMW = /* @__PURE__ */ struct("TCITEMW", {
   cchTextMax: "i32",
   iImage: "i32",
   lParam: "<>ptr"
-});
-var TVITEM = /* @__PURE__ */ struct("TVITEM", {
+};
+var TCITEMW = /* @__PURE__ */ struct("TCITEMW", TCITEMW_DECL);
+var TVITEM_DECL = {
+  "#": "struct",
   mask: "u32",
   hItem: "<>ptr",
   state: "u32",
@@ -16530,20 +16527,26 @@ var TVITEM = /* @__PURE__ */ struct("TVITEM", {
   iSelectedImage: "i32",
   cChildren: "i32",
   lParam: "<>ptr"
-});
-var TVINSERTSTRUCT = /* @__PURE__ */ struct("TVINSERTSTRUCT", {
+};
+var TVITEM = /* @__PURE__ */ struct("TVITEM", TVITEM_DECL);
+var TVINSERTSTRUCT_DECL = {
+  "#": "struct",
   hParent: "<>ptr",
   hInsertAfter: "<>ptr",
-  item: TVITEM.__struct
-});
-var LVHITTESTINFO = /* @__PURE__ */ struct("LVHITTESTINFO", {
+  item: TVITEM_DECL
+};
+var TVINSERTSTRUCT = /* @__PURE__ */ struct("TVINSERTSTRUCT", TVINSERTSTRUCT_DECL);
+var LVHITTESTINFO_DECL = {
+  "#": "struct",
   pt: "i32[2]",
   flags: "u32",
   iItem: "i32",
   iSubItem: "i32",
   iGroup: "i32"
-});
-var LVITEMW = /* @__PURE__ */ struct("LVITEMW", {
+};
+var LVHITTESTINFO = /* @__PURE__ */ struct("LVHITTESTINFO", LVHITTESTINFO_DECL);
+var LVITEMW_DECL = {
+  "#": "struct",
   mask: "u32",
   iItem: "i32",
   iSubItem: "i32",
@@ -16559,8 +16562,10 @@ var LVITEMW = /* @__PURE__ */ struct("LVITEMW", {
   puColumns: "<>ptr",
   piColFmt: "<>ptr",
   iGroup: "i32"
-});
-var LVCOLUMNW = /* @__PURE__ */ struct("LVCOLUMNW", {
+};
+var LVITEMW = /* @__PURE__ */ struct("LVITEMW", LVITEMW_DECL);
+var LVCOLUMNW_DECL = {
+  "#": "struct",
   mask: "u32",
   fmt: "i32",
   cx: "i32",
@@ -16572,23 +16577,8 @@ var LVCOLUMNW = /* @__PURE__ */ struct("LVCOLUMNW", {
   cxMin: "i32",
   cxDefault: "i32",
   cxIdeal: "i32"
-});
-var MSG = /* @__PURE__ */ struct("MSG", {
-  hwnd: "<HWND>ptr",
-  message: "u32",
-  wParam: "<>ptr",
-  lParam: "<>ptr",
-  time: "u32",
-  pt: POINT.__struct
-});
-var PAINTSTRUCT = /* @__PURE__ */ struct("PAINTSTRUCT", {
-  hdc: "<HDC>ptr",
-  fErase: "i32",
-  rcPaint: RECT.__struct,
-  fRestore: "i32",
-  fIncUpdate: "i32",
-  rgbReserved: "u8[32]"
-});
+};
+var LVCOLUMNW = /* @__PURE__ */ struct("LVCOLUMNW", LVCOLUMNW_DECL);
 
 // _build/lib/windows/user32.js
 var b = (name, sig, encoders) => bind("user32.dll", name, sig, encoders);
@@ -16622,7 +16612,6 @@ import * as os4 from "os";
 
 // _build/lib/windows/gdi32.js
 var b2 = (name, sig, encoders) => bind("gdi32.dll", name, sig, encoders);
-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 -> <HGDIOBJ>ptr", { LOGFONTW });