quickwin 2.3.0 → 3.0.0

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.0",
+  "version": "3.0.0",
   "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",
@@ -36,6 +35,7 @@
     "url": "git+https://github.com/quickwinlabs/quickwin.git"
   },
   "devDependencies": {
+    "@quickwinlabs/mupdf-wasm": "^1.28.0",
     "@types/node": "^24.13.2",
     "@types/react": "^19.2.17",
     "@types/react-reconciler": "^0.33.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
+}

package/test/test_ffi.js

@@ -1,5 +1,4 @@
 import * as std from 'std';
-import * as win from 'win';
 import * as ffi from 'ffi';
 import * as os from 'os';
 import { bind, bindLib } from '../lib/ffi/bind.js';
@@ -72,12 +71,12 @@ export const suite = {
     name: 'ffi',
     run: (t) => {
         t.section('EnumPrinters');
-        const hWinspool = win.LoadLibrary('winspool.drv');
-        t.checkTrue('LoadLibrary("winspool.drv") succeeds', hWinspool !== null);
+        const hWinspool = ffi.LoadLibrary('winspool.drv');
+        t.checkTrue('LoadLibrary("winspool.drv") succeeds', !!hWinspool);
         if (!hWinspool)
             return;
-        const enumPrinters = win.GetProcAddress(hWinspool, 'EnumPrintersW');
-        t.checkTrue('GetProcAddress("EnumPrintersW") succeeds', enumPrinters !== null);
+        const enumPrinters = ffi.GetProcAddress(hWinspool, 'EnumPrintersW');
+        t.checkTrue('GetProcAddress("EnumPrintersW") succeeds', !!enumPrinters);
         if (!enumPrinters)
             return;
         const { EnumPrintersW: EnumPrinters } = bindLib('winspool.drv', {
@@ -141,11 +140,11 @@ export const suite = {
             std.printf('  no printers installed (skip)\n');
         }
         t.section('PTR accepts raw number handles (XP 32-bit fix)');
-        const hUser32 = win.LoadLibrary('user32.dll');
-        t.checkTrue('LoadLibrary("user32.dll") succeeds', hUser32 !== null);
+        const hUser32 = ffi.LoadLibrary('user32.dll');
+        t.checkTrue('LoadLibrary("user32.dll") succeeds', !!hUser32);
         if (hUser32) {
-            const getDC = win.GetProcAddress(hUser32, 'GetDC');
-            t.checkTrue('GetProcAddress("GetDC") succeeds', getDC !== null);
+            const getDC = ffi.GetProcAddress(hUser32, 'GetDC');
+            t.checkTrue('GetProcAddress("GetDC") succeeds', !!getDC);
             if (getDC) {
                 const GetDC = bind('user32.dll', 'GetDC', '<>ptr -> <>ptr');
                 const screenDc = GetDC(0);

package/test/test_ffi.ts

@@ -1,5 +1,4 @@
 import * as std from 'std'
-import * as win from 'win'
 import * as ffi from 'ffi'
 import * as os from 'os'
 import { bind, bindLib } from '../lib/ffi/bind.js'
@@ -75,12 +74,12 @@ export const suite = {
     name: 'ffi',
     run: (t: Tester) => {
         t.section('EnumPrinters')
-        const hWinspool = win.LoadLibrary('winspool.drv')
-        t.checkTrue('LoadLibrary("winspool.drv") succeeds', hWinspool !== null)
+        const hWinspool = ffi.LoadLibrary('winspool.drv')
+        t.checkTrue('LoadLibrary("winspool.drv") succeeds', !!hWinspool)
         if (!hWinspool) return
 
-        const enumPrinters = win.GetProcAddress(hWinspool, 'EnumPrintersW')
-        t.checkTrue('GetProcAddress("EnumPrintersW") succeeds', enumPrinters !== null)
+        const enumPrinters = ffi.GetProcAddress(hWinspool, 'EnumPrintersW')
+        t.checkTrue('GetProcAddress("EnumPrintersW") succeeds', !!enumPrinters)
         if (!enumPrinters) return
 
         const { EnumPrintersW: EnumPrinters } = bindLib('winspool.drv', {
@@ -154,11 +153,11 @@ export const suite = {
         }
 
         t.section('PTR accepts raw number handles (XP 32-bit fix)')
-        const hUser32 = win.LoadLibrary('user32.dll')
-        t.checkTrue('LoadLibrary("user32.dll") succeeds', hUser32 !== null)
+        const hUser32 = ffi.LoadLibrary('user32.dll')
+        t.checkTrue('LoadLibrary("user32.dll") succeeds', !!hUser32)
         if (hUser32) {
-            const getDC = win.GetProcAddress(hUser32, 'GetDC')
-            t.checkTrue('GetProcAddress("GetDC") succeeds', getDC !== null)
+            const getDC = ffi.GetProcAddress(hUser32, 'GetDC')
+            t.checkTrue('GetProcAddress("GetDC") succeeds', !!getDC)
             if (getDC) {
                 const GetDC = bind('user32.dll', 'GetDC', '<>ptr -> <>ptr')
                 const screenDc = GetDC(0)

package/test/test_ffi_abi.js

@@ -1,5 +1,5 @@
 import * as std from 'std';
-import * as win from 'win';
+import * as ffi from 'ffi';
 import * as os from 'os';
 import { bind } from '../lib/ffi/bind.js';
 import { struct } from '../lib/ffi/struct.js';
@@ -29,15 +29,15 @@ function readAscii(buf, len) {
     return s;
 }
 function has(dll, name) {
-    return !!dll && !!win.GetProcAddress(dll, name);
+    return !!dll && !!ffi.GetProcAddress(dll, name);
 }
 export const suite = {
     name: 'ffi-abi',
     run: (t) => {
-        const k32 = win.LoadLibrary('kernel32.dll');
-        const usr = win.LoadLibrary('user32.dll');
-        const gdi = win.LoadLibrary('gdi32.dll');
-        const crt = win.LoadLibrary('msvcrt.dll');
+        const k32 = ffi.LoadLibrary('kernel32.dll');
+        const usr = ffi.LoadLibrary('user32.dll');
+        const gdi = ffi.LoadLibrary('gdi32.dll');
+        const crt = ffi.LoadLibrary('msvcrt.dll');
         t.section('param count 0 ( -> u32)');
         if (has(k32, 'GetTickCount')) {
             const getTickCount = bind('kernel32.dll', 'GetTickCount', ' -> u32');

package/test/test_ffi_abi.ts

@@ -1,9 +1,9 @@
 import * as std from 'std'
-import * as win from 'win'
+import * as ffi from 'ffi'
 import * as os from 'os'
 import { bind } from '../lib/ffi/bind.js'
 import { struct } from '../lib/ffi/struct.js'
-import { NULL, PtrArrayBuffer } from '../lib/ffi/ctype.js'
+import { NULL, PtrArrayBuffer, type MaybePtr } from '../lib/ffi/ctype.js'
 import { POINT, RECT } from '../lib/windows/structs.js'
 import { Tester } from './test_helper.js'
 
@@ -31,17 +31,17 @@ function readAscii(buf: ArrayBuffer, len: number): string {
     return s
 }
 
-function has(dll: win.HMODULE | null, name: string): boolean {
-    return !!dll && !!win.GetProcAddress(dll, name)
+function has(dll: MaybePtr<'HMODULE'>, name: string): boolean {
+    return !!dll && !!ffi.GetProcAddress(dll, name)
 }
 
 export const suite = {
     name: 'ffi-abi',
     run: (t: Tester) => {
-        const k32 = win.LoadLibrary('kernel32.dll')
-        const usr = win.LoadLibrary('user32.dll')
-        const gdi = win.LoadLibrary('gdi32.dll')
-        const crt = win.LoadLibrary('msvcrt.dll')
+        const k32 = ffi.LoadLibrary('kernel32.dll')
+        const usr = ffi.LoadLibrary('user32.dll')
+        const gdi = ffi.LoadLibrary('gdi32.dll')
+        const crt = ffi.LoadLibrary('msvcrt.dll')
 
         t.section('param count 0 ( -> u32)')
         if (has(k32, 'GetTickCount')) {