quickwin 2.3.1 → 3.0.1

package/lib/windows/user32.js

@@ -495,10 +495,10 @@ export const GetSubMenu = /*@__PURE__*/ b('GetSubMenu', '<HMENU>ptr i32 -> <HMEN
  *  @param args_1 uFlags TPM_* 标志
  *  @param args_2 x 屏幕 x
  *  @param args_3 y 屏幕 y
- *  @param args_4 nReserved 保留，传 0
- *  @param args_5 prcRect 点击区矩形（DeepPartial RECT / .ptr / NULL）
- *  @param args_6 hdc 参考 DC，可 NULL */
-export const TrackPopupMenu = /*@__PURE__*/ b('TrackPopupMenu', '<HMENU>ptr u32 i32 i32 i32 <RECT>ptr <HDC>ptr -> i32', { RECT });
+ *  @param args_4 nReserved 保留，传 0（TrackPopupMenuEx 才用）
+ *  @param args_5 hWnd 拥有者窗口（TPM_RETURNCMD 时命令 ID 回到该窗口所属线程队列）
+ *  @param args_6 prcRect 保留位，传 NULL（Win32 文档标注本 API 忽略此参数） */
+export const TrackPopupMenu = /*@__PURE__*/ b('TrackPopupMenu', '<HMENU>ptr u32 i32 i32 i32 <HWND>ptr <RECT>ptr -> i32', { RECT });
 /** 创建弹出菜单；配对 DestroyMenu
  *  @returns 菜单句柄；失败 → NULL */
 export const CreatePopupMenu = /*@__PURE__*/ b('CreatePopupMenu', ' -> <HMENU>ptr');
@@ -534,7 +534,8 @@ export const MessageBox = /*@__PURE__*/ b('MessageBoxW', '<HWND>ptr <WCHAR>ptr <
 // ============ 图像 ============
 /** 按名加载图像（string 自动编码；uType/fuLoad 用 Win32 真值——与 ImageType 枚举当前值
  *  不同）
- *  @returns 图像句柄；失败 → 0
+ *  @returns 图像句柄——类型随 uType（IMAGE_ICON→HICON / CURSOR→HCURSOR / BITMAP→HBITMAP），
+ *    绑定侧给不出品牌故为裸地址档；失败 → 0
  *  @param args_0 hinst 模块句柄，NULL = 系统资源或 .ico 文件
  *  @param args_1 name 图像名 string（资源名或文件路径）
  *  @param args_2 uType IMAGE_* 真值（BITMAP=0/CURSOR=1/ICON=2）

package/lib/windows/version.d.ts

@@ -0,0 +1,27 @@
+/** 取文件版本资源大小
+ *  @returns 字节数（0 = 文件无版本资源）
+ *  @param args_0 lptstrFilename 文件路径（禁空）
+ *  @param args_1 lpdwHandle 出参槽（Info 步的入参句柄，MSDN 恒 0 但仍须传），
+ *                PtrArrayBuffer(4) + Uint32Array 读回 */
+export declare const GetFileVersionInfoSize: (args_0: string | (number & {
+    readonly ptrBrand: "WCHAR";
+}), args_1: import("../ffi/ctype.js").PtrArrayBuffer<any> | import("../ffi/ctype.js").MaybePtr<"BYTE">) => number;
+/** 读版本资源进缓冲
+ *  @returns 成功 → 非 0
+ *  @param args_0 lptstrFilename 文件路径（禁空）
+ *  @param args_1 dwHandle Size 步读回的句柄（恒 0）
+ *  @param args_2 dwLen 缓冲字节数（= Size 返回值）
+ *  @param args_3 lpData 接收缓冲（PtrArrayBuffer(dwLen)） */
+export declare const GetFileVersionInfo: (args_0: string | (number & {
+    readonly ptrBrand: "WCHAR";
+}), args_1: number, args_2: number, args_3: import("../ffi/ctype.js").PtrArrayBuffer<any> | import("../ffi/ctype.js").MaybePtr<"BYTE">) => number;
+/** 在版本资源缓冲内查询子块
+ *  @returns 成功 → 非 0
+ *  @param args_0 pBlock Info 步的资源缓冲（PtrArrayBuffer 直传）
+ *  @param args_1 lpszSubBlock 子块路径（禁空）：'\\' = 根块 VS_FIXEDFILEINFO、
+ *                '\\StringFileInfo\\040904B0\\FileVersion' 等字符串表项
+ *  @param args_2 lplpBuffer 出参槽（块内偏移指针写回），PtrArrayBuffer(8)
+ *  @param args_3 puLen 出参槽（块字节数，VS_FIXEDFILEINFO = 52），PtrArrayBuffer(4) */
+export declare const VerQueryValue: (args_0: import("../ffi/ctype.js").PtrArrayBuffer<any> | import("../ffi/ctype.js").MaybePtr<"BYTE">, args_1: string | (number & {
+    readonly ptrBrand: "WCHAR";
+}), args_2: import("../ffi/ctype.js").PtrArrayBuffer<any> | import("../ffi/ctype.js").MaybePtr<"BYTE">, args_3: import("../ffi/ctype.js").PtrArrayBuffer<any> | import("../ffi/ctype.js").MaybePtr<"BYTE">) => number;

package/lib/windows/{winspool.ts → winspool.d.ts}

@@ -1,19 +1,3 @@
-// winspool.drv 绑定（打印后台处理：枚举 / 能力查询 / 原始作业链；品牌约定见
-// lib/windows/user32.ts 头注释）：
-//   - 打印机句柄（OpenPrinter 的 HPRINTER* 出参槽写回）位宽无关：出参槽 = <BYTE>ptr
-//     收 PtrArrayBuffer(8) + readPtr 读回 number，作业链句柄位 <>ptr 收宽（批 5 HKey 同型）
-//   - 结构位按方向分流（结构定义见 ./structs.ts）：DOC_INFO_1W 纯入参位注册 encoder →
-//     对象直传；PRINTER_INFO_2W 出参数组不注册 → structArray(PRINTER_INFO_2W).decode
-//     (buf, count) 读回（缓冲尾部含字符串，须显式 count），指针字段跟进读字符串
-//   - 枚举标注：DeviceCap 是单选查询位标枚举；PrinterEnum 是 LOCAL|CONNECTIONS 可组合
-//     flags → 裸 u32 + JSDoc（组合 OR 结果不是枚举成员，位标枚举反而传不进）
-import { bind, type CodecMap } from '../ffi/bind.js'
-import { DOC_INFO_1W } from './structs.js'
-
-// dll 名部分应用（工厂转调保泛型 infer，见 lib/windows/user32.ts 头注释）
-const b = <const S extends string, const LE extends CodecMap = {}>(name: string, sig: S, encoders?: LE) =>
-    bind('winspool.drv', name, sig, encoders)
-
 /** 枚举打印队列（Level=2 → PRINTER_INFO_2W 数组）；两段式：先
  *  NULL+cbBuf 0 拿 pcbNeeded，再按需分配缓冲重调
  *  @returns 成功 → 非 0
@@ -25,15 +9,12 @@ const b = <const S extends string, const LE extends CodecMap = {}>(name: string,
  *  @param args_4 cbBuf 缓冲字节数
  *  @param args_5 pcbNeeded 出参槽（需求字节数）PtrArrayBuffer(4)
  *  @param args_6 pcReturned 出参槽（返回条数）PtrArrayBuffer(4) */
-export const EnumPrinters = /*@__PURE__*/ b('EnumPrintersW',
-    'u32 <WCHAR>ptr u32 <BYTE>ptr u32 <BYTE>ptr <BYTE>ptr -> i32')
-
+export declare const EnumPrinters: (args_0: number, args_1: string | import("../ffi/ctype.js").MaybePtr<"WCHAR">, args_2: number, args_3: import("../ffi/ctype.js").PtrArrayBuffer<any> | import("../ffi/ctype.js").MaybePtr<"BYTE">, args_4: number, args_5: import("../ffi/ctype.js").PtrArrayBuffer<any> | import("../ffi/ctype.js").MaybePtr<"BYTE">, args_6: import("../ffi/ctype.js").PtrArrayBuffer<any> | import("../ffi/ctype.js").MaybePtr<"BYTE">) => number;
 /** 取默认打印机名
  *  @returns 成功 → 非 0，0 = 失败（缓冲不足时 pcchBuffer 带回所需长度）
  *  @param args_0 pszBuffer 出参缓冲，WCHAR.alloc(n)、WCHAR.decode 读回
  *  @param args_1 pcchBuffer 出入长度槽（入 = 缓冲 WCHAR 容量，出 = 实际长度），PtrArrayBuffer(4) */
-export const GetDefaultPrinter = /*@__PURE__*/ b('GetDefaultPrinterW', '<BYTE>ptr <BYTE>ptr -> i32')
-
+export declare const GetDefaultPrinter: (args_0: import("../ffi/ctype.js").PtrArrayBuffer<any> | import("../ffi/ctype.js").MaybePtr<"BYTE">, args_1: import("../ffi/ctype.js").PtrArrayBuffer<any> | import("../ffi/ctype.js").MaybePtr<"BYTE">) => number;
 /** 查设备能力；nCapability 单选 DeviceCap.*
  *  @returns 返回值随能力（数值能力 = 数值，
  *  -1 = 失败）
@@ -42,39 +23,44 @@ export const GetDefaultPrinter = /*@__PURE__*/ b('GetDefaultPrinterW', '<BYTE>pt
  *  @param args_2 nCapability 能力码（DeviceCap.HORZRES 等单选）
  *  @param args_3 pOutput 字符串列表型能力的缓冲；数值型查询传 NULL
  *  @param args_4 pDevmode DEVMODE，传 NULL */
-export const DeviceCapabilities = /*@__PURE__*/ b('DeviceCapabilitiesW',
-    '<WCHAR>ptr! <WCHAR>ptr u32@DeviceCap <BYTE>ptr <>ptr -> i32')
-
+export declare const DeviceCapabilities: (args_0: string | (number & {
+    readonly ptrBrand: "WCHAR";
+}), args_1: string | import("../ffi/ctype.js").MaybePtr<"WCHAR">, args_2: import("../../constants.js").DeviceCap, args_3: import("../ffi/ctype.js").PtrArrayBuffer<any> | import("../ffi/ctype.js").MaybePtr<"BYTE">, args_4: import("../ffi/ctype.js").MaybePtr<"">) => number;
 /** 打开打印机对象（不产生打印作业）
  *  @returns 成功 → 非 0，hPrinter 写回
  *  @param args_0 pPrinterName 打印机名（禁空）
  *  @param args_1 phPrinter 出参槽（句柄写回），PtrArrayBuffer(8) + readPtr 读回
  *  @param args_2 pDefault 默认值（Datatype/DevMode/DesiredAccess），传 NULL 全默认 */
-export const OpenPrinter = /*@__PURE__*/ b('OpenPrinterW', '<WCHAR>ptr! <BYTE>ptr <>ptr -> i32')
+export declare const OpenPrinter: (args_0: string | (number & {
+    readonly ptrBrand: "WCHAR";
+}), args_1: import("../ffi/ctype.js").PtrArrayBuffer<any> | import("../ffi/ctype.js").MaybePtr<"BYTE">, args_2: import("../ffi/ctype.js").MaybePtr<"">) => number;
 /** 关闭打印机句柄
  *  @returns 成功 → 非 0 */
-export const ClosePrinter = /*@__PURE__*/ b('ClosePrinter', '<>ptr -> i32')
+export declare const ClosePrinter: (args_0: import("../ffi/ctype.js").MaybePtr<"">) => number;
 /** 起打印作业
  *  @returns 作业 id（0 = 失败）
  *  @param args_0 hPrinter 打印机句柄
  *  @param args_1 dwLevel 固定 1（DOC_INFO_1W）
  *  @param args_2 pDocInfo DOC_INFO_1W 对象（指针字段收裸地址 number：WCHAR.encode(s).ptr，
  *                PAB 须在调用返回前保持引用） */
-export const StartDocPrinter = /*@__PURE__*/ b('StartDocPrinterW', '<>ptr u32 <DOC_INFO_1W>ptr -> u32',
-    { DOC_INFO_1W })
+export declare const StartDocPrinter: (args_0: import("../ffi/ctype.js").MaybePtr<"">, args_1: number, args_2: {
+    pDatatype?: import("../ffi/ctype.js").MaybePtr<""> | undefined;
+    pDocName?: import("../ffi/ctype.js").MaybePtr<""> | undefined;
+    pOutputFile?: import("../ffi/ctype.js").MaybePtr<""> | undefined;
+} | import("../ffi/ctype.js").MaybePtr<"DOC_INFO_1W">) => number;
 /** 结束打印作业（提交）
  *  @returns 成功 → 非 0 */
-export const EndDocPrinter = /*@__PURE__*/ b('EndDocPrinter', '<>ptr -> i32')
+export declare const EndDocPrinter: (args_0: import("../ffi/ctype.js").MaybePtr<"">) => number;
 /** 起页
  *  @returns 成功 → 非 0 */
-export const StartPagePrinter = /*@__PURE__*/ b('StartPagePrinter', '<>ptr -> i32')
+export declare const StartPagePrinter: (args_0: import("../ffi/ctype.js").MaybePtr<"">) => number;
 /** 结束页
  *  @returns 成功 → 非 0 */
-export const EndPagePrinter = /*@__PURE__*/ b('EndPagePrinter', '<>ptr -> i32')
+export declare const EndPagePrinter: (args_0: import("../ffi/ctype.js").MaybePtr<"">) => number;
 /** 写作业数据（RAW 直写 spooler）
  *  @returns 成功 → 非 0
  *  @param args_0 hPrinter 打印机句柄
  *  @param args_1 lpBuffer 数据缓冲（<BYTE>ptr，PtrArrayBuffer）
  *  @param args_2 nNumberOfBytesToWrite 写入字节数
  *  @param args_3 lpNumberOfBytesWritten 出参槽，PtrArrayBuffer(4) 读实际写入字节数 */
-export const WritePrinter = /*@__PURE__*/ b('WritePrinter', '<>ptr <BYTE>ptr u32 <BYTE>ptr -> i32')
+export declare const WritePrinter: (args_0: import("../ffi/ctype.js").MaybePtr<"">, args_1: import("../ffi/ctype.js").PtrArrayBuffer<any> | import("../ffi/ctype.js").MaybePtr<"BYTE">, args_2: number, args_3: import("../ffi/ctype.js").PtrArrayBuffer<any> | import("../ffi/ctype.js").MaybePtr<"BYTE">) => number;

package/main.js

@@ -1,6 +1,11 @@
-import { CallWindowProc, CreateSystemDpiFont, CreateWindow as CreateWindowWithoutScale, DefWindowProc, GetScaleFactor, GetWindowLongPtr, GetWindowText, RegisterClass, SendMessage, SetWindowProc, ShowWindow, } from "gui";
-const scaleFactor = GetScaleFactor();
-const dpiFont = CreateSystemDpiFont();
+import { CreateWindow as CreateWindowWithoutScale, DefWindowProc, RegisterClass, SendMessage, SetWindowProc, } from "gui";
+// Win32 直通：CallWindowProc / GetWindowLongPtr / GetWindowText 无引擎状态，
+// 已从 gui 模块摘除，走 lib/windows 的 FFI 绑定
+import { CallWindowProc, GetWindowLongPtr, GetWindowText, GetWindowTextLength, ShowWindow } from "./lib/windows/user32.js";
+import { WCHAR } from "./lib/ffi/bind.js";
+import { createSystemDpiFont, getScaleFactor } from "./lib/dpi.js";
+const scaleFactor = getScaleFactor();
+const dpiFont = createSystemDpiFont();
 if (!dpiFont)
     throw new Error('Failed to create DPI font');
 const CreateWindow = (className, title, style, x, y, cx, cy, parent, id) => {
@@ -26,7 +31,10 @@ function wndProc(hwnd, msg, wParam, lParam) {
                     return 0;
                 if (!list)
                     return 0;
-                const text = GetWindowText(edit);
+                const cap = GetWindowTextLength(edit) + 1;
+                const buf = WCHAR.alloc(cap);
+                GetWindowText(edit, buf, cap);
+                const text = WCHAR.decode(buf);
                 if (text.trim())
                     SendMessage(list, 384 /* LbMsg.ADDSTRING */, 0, text);
                 return 0;
@@ -43,4 +51,4 @@ function wndProc(hwnd, msg, wParam, lParam) {
 RegisterClass("MainWindow", wndProc);
 var hwnd = CreateWindow("MainWindow", "Todo List", 13565952 /* WindowStyle.OVERLAPPEDWINDOW */, 0, 0, 600, 400, null, null);
 if (hwnd)
-    ShowWindow(hwnd);
+    ShowWindow(hwnd, 1 /* ShowWindowCmd.SHOWNORMAL */);

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "quickwin",
-  "version": "2.3.1",
+  "version": "3.0.1",
   "description": "QuickJS Win32 runtime — GUI, networking, WASM, FFI, and more",
   "bin": {
     "quickwin": "qwin.exe",
@@ -22,7 +22,6 @@
     "lib/",
     "test/",
     "examples/",
-    "vendor/",
     "quickwin.d.ts",
     "constants.ts",
     "enum_map.d.ts",
@@ -35,17 +34,27 @@
     "type": "git",
     "url": "git+https://github.com/quickwinlabs/quickwin.git"
   },
+  "dependencies": {
+    "@types/react-reconciler": "^0.33.0",
+    "react-reconciler": "^0.33.0"
+  },
+  "peerDependencies": {
+    "@types/react": "^19.2.17",
+    "react": "^19.2.7"
+  },
+  "peerDependenciesMeta": {
+    "@types/react": {
+      "optional": true
+    }
+  },
   "devDependencies": {
+    "@quickwinlabs/mupdf-wasm": "^1.28.0",
     "@types/node": "^24.13.2",
     "@types/react": "^19.2.17",
-    "@types/react-reconciler": "^0.33.0",
     "@types/ws": "^8.18.1",
     "esbuild": "^0.28.0",
-    "typescript": "^7.0.2"
-  },
-  "dependencies": {
     "react": "^19.2.7",
-    "react-reconciler": "^0.33.0",
+    "typescript": "^7.0.2",
     "web-streams-polyfill": "^4.3.0",
     "ws": "^8.21.0"
   }

package/quickwin.d.ts

@@ -421,96 +421,23 @@ declare module "wolfssl" {
 
 }
 
-declare module "win" {
-    /** 与 ffi 的 Ptr<"HMODULE"> 同型（ptrBrand string 键）——FFI 侧 <HMODULE>ptr 位（HINSTANCE 语义）直收 */
-    type HMODULE = number & { readonly ptrBrand: "HMODULE" };
-
-    function LoadLibrary(libName: string): HMODULE | null;
-    function GetProcAddress(hModule: HMODULE, procName: string): number | null;
-    function FreeLibrary(hModule: HMODULE): boolean;
-    /** GetModuleFileName(hModule?) — 传 HMODULE 或不传（当前进程），返回模块完整路径；失败返回 undefined */
-    function GetModuleFileName(hModule?: HMODULE): string | undefined;
-    /** GetModuleHandle(moduleName?) — 不传返回当前 exe 的模块句柄；失败返回 null */
-    function GetModuleHandle(moduleName?: string): HMODULE | null;
-}
-
 declare module "gui" {
     /** 与 ffi 的 Ptr<"N"> 结构同型（ptrBrand string 键，见 lib/ffi/ctype.ts）——各句柄可在
      *  gui 模块与 FFI 绑定两体系间互认直传（原 unique symbol 键只有 HWND 打通） */
     type HWND = number & { readonly ptrBrand: "HWND" };
     type HMENU = number & { readonly ptrBrand: "HMENU" };
-    type HFONT = number & { readonly ptrBrand: "HFONT" };
     type HICON = number & { readonly ptrBrand: "HICON" };
-    type WNDPROC = number & { readonly ptrBrand: "WNDPROC" };
-    // 枚举唯一定义在 constants.ts（真实 .ts，tsc/esbuild 均内联）；此处别名仅供签名引用，
-    // 使用方请直接 import { WindowStyle } from 'quickwin/constants'。
-    // Gwlp/ImageType 的成员访问（如 Gwlp.WNDPROC）需写 import('./constants').Gwlp.WNDPROC
-    // ——类型别名不建命名空间，无法穿透取成员。
-    type GetWindowCmd = import('./constants').GetWindowCmd;
-    type ShowWindowCmd = import('./constants').ShowWindowCmd;
-    type SetWindowPosHwnd = import('./constants').SetWindowPosHwnd;
-    type Gwlp = import('./constants').Gwlp;
-    type NotifyIconCmd = import('./constants').NotifyIconCmd;
-    type ImageType = import('./constants').ImageType;
-    type IDI = import('./constants').IDI;
-    type ScrollBar = import('./constants').ScrollBar;
+    // 枚举唯一定义在 constants.ts（真实 .ts，tsc/esbuild 均内联）；本模块不再转出枚举
+    // 别名与 RECT 等结构类型——Win32 直通请走 lib/windows（含常量与结构定义）
 
     function RegisterClass(className: string, wndProc?: (hwnd: HWND, msg: number, wParam: number, lParam: number) => number): number;
     function CreateWindow(className: string, title: string, style: number, x: number, y: number, width: number, height: number, parent: HWND | null, menu: HMENU | null): HWND | null;
     // 销毁窗口及其所有子窗口，自动清理 WNDPROC 和 JS 引用
     function DestroyWindow(hwnd: HWND): boolean;
-    function GetWindow(hwnd: HWND, cmd: GetWindowCmd): HWND;
-
-    function ShowWindow(hwnd: HWND, nCmdShow?: ShowWindowCmd): void;
     function SetWindowProc(hwnd: HWND, wndProc: (hwnd: HWND, msg: number, wParam: number, lParam: number) => number): void;
     function DefWindowProc(hwnd: HWND, msg: number, wParam: number, lParam: number): number;
-    function PostQuitMessage(exitCode: number): void;
     function SendMessage(hwnd: HWND, msg: number, wParam: number, lParam: number | string): number;
-    function MessageBox(message: string): void;
-    function SetWindowText(hwnd: HWND, text: string): void;
-    function GetWindowText(hwnd: HWND): string;
-    function GetScaleFactor(): number;
-    function CreateSystemDpiFont(): HFONT | null;
-    type GwlpReturnType<T extends Gwlp> = T extends import('./constants').Gwlp.WNDPROC ? WNDPROC : number;
-    function GetWindowLongPtr<T extends Gwlp>(hwnd: HWND, nIndex: T): GwlpReturnType<T>;
-    function SetWindowLongPtr(hwnd: HWND, nIndex: Gwlp, newLong: number): number;
     function UnsetWindowProc(hwnd: HWND): boolean;
-    function CallWindowProc(wndProc: WNDPROC, hwnd: HWND, msg: number, wParam: number, lParam: number): number;
-    function SetParent(hwnd: HWND, parent: HWND | null): void;
-    function EnableWindow(hwnd: HWND, enable: boolean): void;
-    function SetWindowPos(hwnd: HWND, insertAfter: SetWindowPosHwnd, x: number, y: number, width: number, height: number, flags: number): void;
-
-
-
-    interface NotifyIconData {
-        hwnd: HWND
-        uID?: number
-        flags?: number
-        callbackMessage?: number
-        hIcon?: HICON
-        tip?: string
-    }
-
-    function ShellNotifyIcon(cmd: NotifyIconCmd, nid: NotifyIconData): boolean;
-    /**
-     * Thin wrapper around LoadImageW. Parameter order matches Win32 LoadImageW: (hinst, name, uType?, cx?, cy?, fuLoad?).
-     * hinst: null for system resources/file path, number for module handle;
-     * name: when hinst=null, a system icon IDI or .ico file path; when hinst=module handle, a resource ID (number) or resource name (string);
-     * uType: ImageType constant, default IMAGE_ICON (returns HICON), pass BITMAP/CURSOR for number return;
-     * cx/cy: target size (0 for default, use LoadImageFlag.DEFAULTSIZE for system default size);
-     * fuLoad: LoadImageFlag constants. Note: loading system icons (IDI_*, hinst=null) requires LoadImageFlag.SHARED.
-     * Example: import { IDI, ImageType, LoadImageFlag } from 'quickwin/constants'
-     *          gui.LoadImage(null, "app.ico", ImageType.ICON, 32, 32, LoadImageFlag.LOADFROMFILE)
-     *          gui.LoadImage(null, IDI.APPLICATION, ImageType.ICON, 0, 0, LoadImageFlag.SHARED)
-     */
-    function LoadImage<H extends (import("win").HMODULE) | null, T extends ImageType = import('./constants').ImageType.ICON>(
-        hinst: H,
-        name: H extends null ? string | IDI : string | number,
-        uType?: T,
-        cx?: number,
-        cy?: number,
-        fuLoad?: number
-    ): T extends import('./constants').ImageType.ICON ? HICON | null : number | null;
     /**
      * Loads the first icon group (RT_GROUP_ICON) from this exe, i.e. the custom icon
      * embedded by rcedit. Works with any resource ID including 0. Returns null if the
@@ -519,46 +446,6 @@ declare module "gui" {
      * Example: gui.LoadAppIcon() → HICON of the exe's icon.
      */
     function LoadAppIcon(cx?: number, cy?: number): HICON | null;
-    /** 从 BGRA 像素数据创建 32bpp top-down DIB，data 为 length >= width*height*4 的 ArrayBuffer，返回 HBITMAP */
-    function CreateBitmapFromPixels(width: number, height: number, data: ArrayBuffer): number | null;
-    function DeleteObject(hObject: number): boolean;
-    function ImageListCreate(cx: number, cy: number, flags?: number, initial?: number, grow?: number): number | null;
-    function ImageListAdd(himl: number, hBitmap: number): number;
-    function ImageListDestroy(himl: number): boolean;
-
-
-    function CreatePopupMenu(): HMENU | null;
-    function AppendMenu(menu: HMENU, flags: number, id: number, text: string): boolean;
-    function TrackPopupMenu(menu: HMENU, x: number, y: number, flags?: number, hwnd?: HWND): number;
-    function DestroyMenu(menu: HMENU): boolean;
-    function SetForegroundWindow(hwnd: HWND): boolean;
-    /** Returns [x, y] or null */
-    function GetCursorPos(): [number, number] | null;
-    /** Returns [width, height] of the primary monitor */
-    function GetScreenSize(): [number, number];
-    /** Client-area/mouse rect: { left, top, right, bottom } */
-    type RECT = { left: number; top: number; right: number; bottom: number };
-    /** Returns { left, top, right, bottom } of client area, or null if invalid */
-    function GetClientRect(hwnd: HWND): RECT | null;
-    
-    function GetWindowRect(hwnd: HWND): RECT | null;
-    /** Invalidates client area (rect can be null/undefined for full window) */
-    function InvalidateRect(hwnd: HWND, rect?: RECT | null, erase?: boolean): void;
-    /** Forces immediate repaint of invalidated area */
-    function UpdateWindow(hwnd: HWND): void;
-    /** Checks if the window handle is valid */
-    function IsWindow(hwnd: HWND): boolean;
-    /** Sets scroll info; returns current scroll box position. Signature matches Win32 SetScrollInfo. */
-    function SetScrollInfo(hwnd: HWND, bar: ScrollBar, info: { pos?: number; page?: number; min?: number; max?: number }, redraw?: boolean): number;
-
-    /** Gets scroll info. Signature matches Win32 GetScrollInfo. */
-    function GetScrollInfo(hwnd: HWND, bar: ScrollBar): { pos: number; page: number; min: number; max: number; trackPos: number };
-
-    /** Shows or hides a scroll bar. Signature matches Win32 ShowScrollBar. */
-    function ShowScrollBar(hwnd: HWND, bar: ScrollBar, show: boolean): boolean;
-
-
-
 
 
 
@@ -585,6 +472,12 @@ declare module "gui" {
 }
 
 declare module "ffi" {
+    /** 指针品牌唯一定义在 lib/ffi/ctype.ts（此处只转发，不手抄结构）——本模块返回的
+     *  句柄 / 地址即对应 C 侧指针位，空值形态同 FFI 层：NULL（0），不是 JS null。 */
+    type Ptr<N extends string> = import('./lib/ffi/ctype').Ptr<N>;
+    type MaybePtr<N extends string> = import('./lib/ffi/ctype').MaybePtr<N>;
+    type HMODULE = Ptr<"HMODULE">;
+
     function ffiCall(func: number, argFrame: ArrayBuffer, retBuf: ArrayBuffer, retIsFp: 0 | 1): void;
     function bufferPtr(buf: ArrayBuffer): number;
     function readByte(ptr: number): number;
@@ -592,6 +485,11 @@ declare module "ffi" {
     function writeByte(ptr: number, value: number): void;
     function closureNew(argBytes: number, retKind: number, wrapper: (frame: ArrayBuffer, retBuf: ArrayBuffer) => void): number;
     function closureFree(ptr: number): void;
+    /** LoadLibraryW 直映：FFI 自举入口（ffi 自身没有 dlopen，取符号必先装载），
+     *  成功为模块句柄 <HMODULE>ptr（HINSTANCE 语义），失败为空指针（0）；按真值收窄。 */
+    function LoadLibrary(libName: string): MaybePtr<"HMODULE">;
+    /** GetProcAddress 直映：成功为函数地址 <FARPROC>ptr，失败为空指针（0）。 */
+    function GetProcAddress(hModule: HMODULE, procName: string): MaybePtr<"FARPROC">;
 }
 
 

package/test/bench_ffi_callraw.js

@@ -13,7 +13,6 @@
 // 结束必须 DestroyWindow + std.exit。
 import * as std from 'std';
 import * as gui from 'gui';
-import * as win from 'win';
 import * as ffi from 'ffi';
 import { bind } from '../lib/ffi/bind.js';
 const WM_NULL = 0x0000;
@@ -37,11 +36,11 @@ function step(msg) {
 step('stage: imports ok');
 // ---- proc 地址（B/C 臂绕过 bind 直驱 ffiCall）----
 function procOf(dll, name) {
-    const h = win.LoadLibrary(dll);
+    const h = ffi.LoadLibrary(dll);
     if (!h)
         throw new Error('LoadLibrary(' + dll + ') failed');
-    const p = win.GetProcAddress(h, name);
-    if (p === null)
+    const p = ffi.GetProcAddress(h, name);
+    if (!p)
         throw new Error('GetProcAddress(' + dll + '!' + name + ') failed');
     return p;
 }

package/test/bench_ffi_callraw.ts

@@ -13,7 +13,6 @@
 // 结束必须 DestroyWindow + std.exit。
 import * as std from 'std'
 import * as gui from 'gui'
-import * as win from 'win'
 import * as ffi from 'ffi'
 import { bind } from '../lib/ffi/bind.js'
 
@@ -39,10 +38,10 @@ step('stage: imports ok')
 
 // ---- proc 地址（B/C 臂绕过 bind 直驱 ffiCall）----
 function procOf(dll: string, name: string): number {
-    const h = win.LoadLibrary(dll)
+    const h = ffi.LoadLibrary(dll)
     if (!h) throw new Error('LoadLibrary(' + dll + ') failed')
-    const p = win.GetProcAddress(h, name)
-    if (p === null) throw new Error('GetProcAddress(' + dll + '!' + name + ') failed')
+    const p = ffi.GetProcAddress(h, name)
+    if (!p) throw new Error('GetProcAddress(' + dll + '!' + name + ') failed')
     return p
 }
 const pNop0 = procOf('test/nop.dll', 'nop0')

package/test/debug/mupdf_debug.js

@@ -1,25 +1,7 @@
 import * as std from 'std';
-function loadWasmBytes(path) {
-    const fp = std.open(path, 'rb');
-    if (!fp)
-        throw new Error('Cannot open: ' + path);
-    fp.seek(0, 2);
-    const size = fp.tell();
-    fp.seek(0, 0);
-    const buffer = new ArrayBuffer(size);
-    fp.read(buffer, 0, size);
-    fp.close();
-    return buffer;
-}
-function setupMupdfModule(wasmPath) {
-    const wasmBinary = loadWasmBytes(wasmPath);
-    globalThis["$libmupdf_wasm_Module"] = {
-        wasmBinary,
-        locateFile: (p) => p
-    };
-}
-setupMupdfModule('./vendor/mupdf-wasm/mupdf-wasm.wasm');
-await import('../../vendor/mupdf-wasm/mupdf.js');
+import { MUPDF_JS_URL, preloadMupdfWasm } from '../mupdf-cdn.js';
+await preloadMupdfWasm();
+await import(MUPDF_JS_URL);
 // Debug the instance exports
 const inst = globalThis["$wasm_inst"];
 const mod = globalThis["$wasm_mod"];
@@ -39,7 +21,7 @@ console.log('Sf index:', sf_idx, 'Tf index:', tf_idx);
 console.log('instance exports Sf:', typeof inst.exports['Sf']);
 console.log('instance exports Tf:', typeof inst.exports['Tf']);
 // Load a simple WASM to verify bridge works
-const fp = std.open('./example.pdf', 'rb');
+const fp = std.open('./test/example.pdf', 'rb');
 if (!fp) {
     console.log('cannot open example.pdf');
     std.exit(1);

package/test/debug/wasm_export_debug.js

@@ -1,15 +1,5 @@
-import * as std from 'std';
-const fp = std.open('./vendor/mupdf-wasm/mupdf-wasm.wasm', 'rb');
-if (!fp) {
-    console.log('cannot open vendor/mupdf-wasm/mupdf-wasm.wasm');
-    std.exit(1);
-}
-fp.seek(0, 2);
-const size = fp.tell();
-fp.seek(0, 0);
-const buf = new ArrayBuffer(size);
-fp.read(buf, 0, size);
-fp.close();
+import { fetchMupdfWasm } from '../mupdf-cdn.js';
+const buf = await fetchMupdfWasm();
 const module = new WebAssembly.Module(buf);
 const exports = WebAssembly.Module.exports(module);
 const imports = WebAssembly.Module.imports(module);

package/test/debug/wasm_names.js

@@ -1,16 +1,6 @@
-import * as std from 'std';
-// Load the vendor/mupdf-wasm binary using our pre-load mechanism
-const fp = std.open('./vendor/mupdf-wasm/mupdf-wasm.wasm', 'rb');
-if (!fp) {
-    console.log('cannot open vendor/mupdf-wasm/mupdf-wasm.wasm');
-    std.exit(1);
-}
-fp.seek(0, 2);
-const size = fp.tell();
-fp.seek(0, 0);
-const buf = new ArrayBuffer(size);
-fp.read(buf, 0, size);
-fp.close();
+import { fetchMupdfWasm } from '../mupdf-cdn.js';
+// Fetch the mupdf-wasm binary over HTTPS (process-wide HTTP cache applies)
+const buf = await fetchMupdfWasm();
 // Check exports for Tf
 const module = new WebAssembly.Module(buf);
 const exports = WebAssembly.Module.exports(module);

package/test/mupdf-cdn.js

@@ -0,0 +1,40 @@
+// ── mupdf-wasm CDN loading ──
+//
+// The runtime loads mupdf from unpkg; the npm package itself only ships
+// types (devDependency @quickwinlabs/mupdf-wasm resolved through the
+// package's exports types mapping — no local vendor copy involved).
+// MUPDF_VERSION must stay in sync with the devDependency in package.json
+// when bumping.
+//
+// Importing this module wires up the HTTPS stack (certs + fetch): the
+// wasm bytes travel through the process-wide HTTP cache next to the
+// executable, so the first fetch is the only network hit.
+import '../lib/certs.js';
+import '../lib/fetch.js';
+export const MUPDF_VERSION = '1.28.0';
+const BASE = `https://unpkg.com/@quickwinlabs/mupdf-wasm@${MUPDF_VERSION}`;
+export const MUPDF_JS_URL = `${BASE}/mupdf.js`;
+export const MUPDF_WASM_URL = `${BASE}/mupdf-wasm.wasm`;
+/** Fetch the wasm binary over HTTPS (HTTP-cached, no filesystem involved). */
+export async function fetchMupdfWasm() {
+    const resp = await fetch(MUPDF_WASM_URL);
+    if (resp.status !== 200)
+        throw new Error(`mupdf wasm fetch failed: HTTP ${resp.status}`);
+    const wasmBinary = await resp.arrayBuffer();
+    if (wasmBinary.byteLength < 1_000_000)
+        throw new Error(`mupdf wasm truncated: ${wasmBinary.byteLength} bytes`);
+    return wasmBinary;
+}
+/**
+ * Fetch the wasm binary and pre-wire it as $libmupdf_wasm_Module so the
+ * mupdf.js module factory instantiates from memory (same injection the
+ * local-vendor loading used).
+ */
+export async function preloadMupdfWasm() {
+    const wasmBinary = await fetchMupdfWasm();
+    globalThis.$libmupdf_wasm_Module = {
+        wasmBinary,
+        locateFile: (p) => p,
+    };
+    return wasmBinary;
+}

package/test/mupdf-cdn.ts

@@ -0,0 +1,43 @@
+// ── mupdf-wasm CDN loading ──
+//
+// The runtime loads mupdf from unpkg; the npm package itself only ships
+// types (devDependency @quickwinlabs/mupdf-wasm resolved through the
+// package's exports types mapping — no local vendor copy involved).
+// MUPDF_VERSION must stay in sync with the devDependency in package.json
+// when bumping.
+//
+// Importing this module wires up the HTTPS stack (certs + fetch): the
+// wasm bytes travel through the process-wide HTTP cache next to the
+// executable, so the first fetch is the only network hit.
+
+import '../lib/certs.js'
+import '../lib/fetch.js'
+
+export const MUPDF_VERSION = '1.28.0'
+const BASE = `https://unpkg.com/@quickwinlabs/mupdf-wasm@${MUPDF_VERSION}`
+
+export const MUPDF_JS_URL = `${BASE}/mupdf.js`
+export const MUPDF_WASM_URL = `${BASE}/mupdf-wasm.wasm`
+
+/** Fetch the wasm binary over HTTPS (HTTP-cached, no filesystem involved). */
+export async function fetchMupdfWasm(): Promise<ArrayBuffer> {
+    const resp = await fetch(MUPDF_WASM_URL)
+    if (resp.status !== 200) throw new Error(`mupdf wasm fetch failed: HTTP ${resp.status}`)
+    const wasmBinary = await resp.arrayBuffer()
+    if (wasmBinary.byteLength < 1_000_000) throw new Error(`mupdf wasm truncated: ${wasmBinary.byteLength} bytes`)
+    return wasmBinary
+}
+
+/**
+ * Fetch the wasm binary and pre-wire it as $libmupdf_wasm_Module so the
+ * mupdf.js module factory instantiates from memory (same injection the
+ * local-vendor loading used).
+ */
+export async function preloadMupdfWasm(): Promise<ArrayBuffer> {
+    const wasmBinary = await fetchMupdfWasm()
+    ;(globalThis as any).$libmupdf_wasm_Module = {
+        wasmBinary,
+        locateFile: (p: string) => p,
+    }
+    return wasmBinary
+}