quickwin 2.3.1 → 3.0.0

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')) {

package/test/test_ffi_windows.js

@@ -1,8 +1,11 @@
-import { NULL } from '../lib/ffi/ctype.js';
+import { NULL, PTR_SIZE, PtrArrayBuffer } from '../lib/ffi/ctype.js';
 import { GetDesktopWindow, CreatePopupMenu, DestroyMenu, GetDC, ReleaseDC, LoadImage, LoadImageOrdinal, SetScrollInfo, GetScrollInfo, } from '../lib/windows/user32.js';
-import { GetDeviceCaps, CreateSolidBrush, DeleteObject, CreateFontIndirect, GetObject, SelectObject, CreateCompatibleDC, DeleteDC, } from '../lib/windows/gdi32.js';
-import { ImageListCreate, ImageListDestroy } from '../lib/windows/comctl32.js';
-import { LOGFONTW, SCROLLINFO } from '../lib/windows/structs.js';
+import { GetDeviceCaps, CreateSolidBrush, DeleteObject, CreateFontIndirect, GetObject, SelectObject, CreateCompatibleDC, CreateCompatibleBitmap, DeleteDC, GetDIBits, } from '../lib/windows/gdi32.js';
+import { ImageListCreate, ImageListAdd, ImageListDestroy } from '../lib/windows/comctl32.js';
+import { ShellNotifyIcon } from '../lib/windows/shell32.js';
+import { BITMAPINFOHEADER, LOGFONTW, NONCLIENTMETRICSW, NOTIFYICONDATAW, SCROLLINFO } from '../lib/windows/structs.js';
+import { createSystemDpiFont, getScaleFactor } from '../lib/dpi.js';
+import { createBitmapFromPixels } from '../lib/bitmap.js';
 export const suite = {
     run(t) {
         // 本文件 import 三个 dll 模块即在加载时执行全部 bind：proc 名错误 → GetProcAddress 失败 →
@@ -61,18 +64,28 @@ export const suite = {
         const hdc = GetDC(NULL);
         t.checkTrue('GetDC(NULL) 非 0', hdc !== 0);
         if (hdc !== 0)
-            t.checkTrue('GetDeviceCaps(hdc, LOGPIXELSX) > 0', GetDeviceCaps(hdc, 88) > 0);
+            t.checkTrue('GetDeviceCaps(hdc, LOGPIXELSX) > 0', GetDeviceCaps(hdc, 88 /* DeviceCap.LOGPIXELSX */) > 0);
         t.checkTrue('ReleaseDC(NULL, hdc) 成功', hdc !== 0 && ReleaseDC(NULL, hdc) !== 0);
         t.section('user32: 弹出菜单往返');
         const pm = CreatePopupMenu();
         t.checkTrue('CreatePopupMenu 非 0', pm !== 0);
         if (pm !== 0)
             t.checkTrue('DestroyMenu(pm) 成功', DestroyMenu(pm) !== 0);
-        t.section('comctl32: ImageList 创建-销毁往返');
-        const himl = ImageListCreate(16, 16, 4, 0, 0); // ILC_COLOR32=4；initial/grow=0 默认
-        t.checkTrue('ImageListCreate(16, 16, ILC_COLOR32) 非 0', himl !== 0);
-        if (himl !== 0)
+        t.section('comctl32: ImageList 创建-加位图-销毁往返（hbmMask 位传 NULL）');
+        const himl = ImageListCreate(16, 16, 24 /* ImageListFlag.COLOR24 */, 0, 0); // initial/grow=0 默认
+        t.checkTrue('ImageListCreate(16, 16, ILC_COLOR24) 非 0', himl !== 0);
+        if (himl !== 0) {
+            const hdcMem = CreateCompatibleDC(NULL);
+            const hbm = hdcMem !== 0 ? CreateCompatibleBitmap(hdcMem, 16, 16) : 0;
+            t.checkTrue('CreateCompatibleBitmap(16, 16) 非 0', hbm !== 0);
+            if (hbm !== 0)
+                t.check('ImageListAdd(himl, hbm, NULL) → 索引 0', 0, ImageListAdd(himl, hbm, NULL));
+            if (hbm !== 0)
+                DeleteObject(hbm);
+            if (hdcMem !== 0)
+                DeleteDC(hdcMem);
             t.checkTrue('ImageListDestroy(himl) 成功', ImageListDestroy(himl) !== 0);
+        }
         t.section('user32: LoadImage 双变体（string 自动编码 / ordinal MAKEINTRESOURCE）');
         // Win32 IMAGE_* 真值：BITMAP=0 CURSOR=1 ICON=2；LR_SHARED=0x8000（注意 ImageType d.ts 当前值与此不一致）
         t.checkTrue('LoadImageOrdinal(NULL, IDI_APPLICATION, IMAGE_ICON, LR_SHARED) 非 0', LoadImageOrdinal(NULL, 32512, 2, 0, 0, 0x8000) !== 0);
@@ -95,7 +108,65 @@ export const suite = {
         t.check('decode 回读 cbSize = encode 初值', SCROLLINFO.size, info.cbSize);
         t.check('decode 回读 fMask = encode 初值', 0x0001, info.fMask);
         t.checkTrue('读回字段为 number 形态', typeof info.nMin === 'number' && typeof info.nMax === 'number');
-        // CallWindowProc / ShowScrollBar / ImageListAdd 仅由 import 的模块加载覆盖 proc 名：
-        // CallWindowProc 跨线程窗口过程不安全、ShowScrollBar 有副作用、ImageListAdd 需位图源
+        // CallWindowProc / ShowScrollBar 仅由 import 的模块加载覆盖 proc 名：
+        // CallWindowProc 跨线程窗口过程不安全、ShowScrollBar 有副作用
+        // NONCLIENTMETRICS 的 cbSize/uiParam 随系统变（Vista+ 504 / XP·2003 500），
+        // 尺寸回退逻辑在 lib/dpi；此处只锁结构布局与端到端效果（见下 section）。
+        t.check('NONCLIENTMETRICSW.size == 504（4 LOGFONTW + 12 DWORD）', 504, NONCLIENTMETRICSW.size);
+        t.section('lib/dpi: 下沉到 JS 的 DPI / 系统字体复合逻辑');
+        t.checkTrue('getScaleFactor() ≥ 0.5', getScaleFactor() >= 0.5);
+        const dpiFont = createSystemDpiFont();
+        t.checkTrue('createSystemDpiFont() 非 NULL（SPI 尺寸回退后仍取到系统消息字体）', dpiFont !== 0);
+        if (dpiFont) {
+            const lf = LOGFONTW.alloc();
+            t.checkTrue('GetObject(dpiFont, LOGFONTW.size) 回读成功', GetObject(dpiFont, LOGFONTW.size, lf) === LOGFONTW.size);
+            const fo = LOGFONTW.decode(lf);
+            t.checkTrue('系统消息字体 lfFaceName 非空（结构确被 SPI 填过）', typeof fo.lfFaceName === 'string' && fo.lfFaceName.length > 0);
+            t.checkTrue('DeleteObject(系统字体) 成功', DeleteObject(dpiFont) !== 0);
+        }
+        t.section('shell32: Shell_NotifyIconW 托盘图标增删（NOTIFYICONDATAW 对象直传）');
+        // 尺寸基准来自 mingw 头文件实测（x86 956 / x64 976，随 hWnd/hIcon/hBalloonIcon 位宽）
+        t.check('NOTIFYICONDATAW.size == mingw sizeof（x86 956 / x64 976）', PTR_SIZE === 4 ? 956 : 976, NOTIFYICONDATAW.size);
+        const nid = NOTIFYICONDATAW.encode({ cbSize: NOTIFYICONDATAW.size, szTip: 'quickwin', szInfoTitle: 'qw' });
+        const nidBack = NOTIFYICONDATAW.decode(nid);
+        t.check('宽字符串糖 szTip 编解码往返', 'quickwin', nidBack.szTip);
+        t.check('宽字符串糖 szInfoTitle 编解码往返', 'qw', nidBack.szInfoTitle);
+        const trayIcon = LoadImageOrdinal(NULL, 32512 /* IDI.APPLICATION */, 1 /* ImageType.ICON */, 0, 0, 32768 /* LoadImageFlag.SHARED */);
+        t.checkTrue('LoadImageOrdinal(IDI.APPLICATION, SHARED) 非 0', trayIcon !== 0);
+        const trayHwnd = GetDesktopWindow();
+        t.checkTrue('ShellNotifyIcon(ADD) 成功（Vista+ 尺寸在 XP/Win7 均被接受）', ShellNotifyIcon(0 /* NotifyIconCmd.ADD */, {
+            cbSize: NOTIFYICONDATAW.size, hWnd: trayHwnd, uID: 77,
+            uFlags: 1 /* NotifyIconFlag.MESSAGE */ | 2 /* NotifyIconFlag.ICON */ | 4 /* NotifyIconFlag.TIP */,
+            uCallbackMessage: 0x8001, hIcon: trayIcon, szTip: 'quickwin test',
+        }) !== 0);
+        t.checkTrue('ShellNotifyIcon(DELETE) 成功（只需 hWnd+uID）', ShellNotifyIcon(2 /* NotifyIconCmd.DELETE */, { cbSize: NOTIFYICONDATAW.size, hWnd: trayHwnd, uID: 77 }) !== 0);
+        t.section('lib/bitmap: 按像素建 32bpp DIB 段（原 gui.CreateBitmapFromPixels）');
+        const nw = 4, nh = 2;
+        const px = new ArrayBuffer(nw * nh * 4);
+        const px8 = new Uint8Array(px);
+        for (let i = 0; i < px8.length; i++)
+            px8[i] = (i * 37 + 11) & 0xff;
+        const hbm = createBitmapFromPixels(nw, nh, px);
+        t.checkTrue('createBitmapFromPixels(4x2) 非 NULL', hbm !== 0);
+        if (hbm) {
+            const bmi = BITMAPINFOHEADER.encode({
+                biSize: BITMAPINFOHEADER.size, biWidth: nw, biHeight: -nh,
+                biPlanes: 1, biBitCount: 32, biSizeImage: nw * nh * 4,
+            });
+            const back = new PtrArrayBuffer(nw * nh * 4);
+            const dc = GetDC(NULL);
+            const rows = dc ? GetDIBits(dc, hbm, 0, nh, back, bmi.ptr, 0 /* ColorUse.RGB_COLORS */) : 0;
+            if (dc)
+                ReleaseDC(NULL, dc);
+            t.check('GetDIBits 取回全部扫描行', nh, rows);
+            const back8 = new Uint8Array(back);
+            let same = rows === nh;
+            for (let i = 0; i < back8.length; i++)
+                if (back8[i] !== px8[i])
+                    same = false;
+            t.checkTrue('像素逐字节一致（含 alpha，与旧 C 的 memcpy 等价）', same);
+            t.checkTrue('DeleteObject(位图) 成功', DeleteObject(hbm) !== 0);
+        }
+        t.checkTrue('非法入参 → NULL（宽/高 ≤ 0、像素缓冲不足，同旧 C 语义）', createBitmapFromPixels(0, nh, px) === NULL && createBitmapFromPixels(nw, nh, new ArrayBuffer(4)) === NULL);
     },
 };

package/test/test_ffi_windows.ts

@@ -1,14 +1,18 @@
 import { Tester } from './test_helper.js'
-import { NULL } from '../lib/ffi/ctype.js'
+import { NULL, PTR_SIZE, PtrArrayBuffer } from '../lib/ffi/ctype.js'
 import {
     GetDesktopWindow, CreatePopupMenu, DestroyMenu, GetDC, ReleaseDC,
     LoadImage, LoadImageOrdinal, SetScrollInfo, GetScrollInfo,
 } from '../lib/windows/user32.js'
 import {
-    GetDeviceCaps, CreateSolidBrush, DeleteObject, CreateFontIndirect, GetObject, SelectObject, CreateCompatibleDC, DeleteDC,
+    GetDeviceCaps, CreateSolidBrush, DeleteObject, CreateFontIndirect, GetObject, SelectObject, CreateCompatibleDC, CreateCompatibleBitmap, DeleteDC, GetDIBits,
 } from '../lib/windows/gdi32.js'
-import { ImageListCreate, ImageListDestroy } from '../lib/windows/comctl32.js'
-import { LOGFONTW, SCROLLINFO } from '../lib/windows/structs.js'
+import { ImageListCreate, ImageListAdd, ImageListDestroy } from '../lib/windows/comctl32.js'
+import { ShellNotifyIcon } from '../lib/windows/shell32.js'
+import { BITMAPINFOHEADER, LOGFONTW, NONCLIENTMETRICSW, NOTIFYICONDATAW, SCROLLINFO } from '../lib/windows/structs.js'
+import { ColorUse, DeviceCap, IDI, ImageListFlag, ImageType, LoadImageFlag, NotifyIconCmd, NotifyIconFlag } from '../constants'
+import { createSystemDpiFont, getScaleFactor } from '../lib/dpi.js'
+import { createBitmapFromPixels } from '../lib/bitmap.js'
 
 export const suite = {
     run(t: Tester) {
@@ -69,7 +73,7 @@ export const suite = {
         t.section('gdi32: GetDeviceCaps（<HDC>ptr 跨 user32 品牌互认）')
         const hdc = GetDC(NULL)
         t.checkTrue('GetDC(NULL) 非 0', hdc !== 0)
-        if (hdc !== 0) t.checkTrue('GetDeviceCaps(hdc, LOGPIXELSX) > 0', GetDeviceCaps(hdc, 88) > 0)
+        if (hdc !== 0) t.checkTrue('GetDeviceCaps(hdc, LOGPIXELSX) > 0', GetDeviceCaps(hdc, DeviceCap.LOGPIXELSX) > 0)
         t.checkTrue('ReleaseDC(NULL, hdc) 成功', hdc !== 0 && ReleaseDC(NULL, hdc) !== 0)
 
         t.section('user32: 弹出菜单往返')
@@ -77,10 +81,18 @@ export const suite = {
         t.checkTrue('CreatePopupMenu 非 0', pm !== 0)
         if (pm !== 0) t.checkTrue('DestroyMenu(pm) 成功', DestroyMenu(pm) !== 0)
 
-        t.section('comctl32: ImageList 创建-销毁往返')
-        const himl = ImageListCreate(16, 16, 4, 0, 0)   // ILC_COLOR32=4；initial/grow=0 默认
-        t.checkTrue('ImageListCreate(16, 16, ILC_COLOR32) 非 0', himl !== 0)
-        if (himl !== 0) t.checkTrue('ImageListDestroy(himl) 成功', ImageListDestroy(himl) !== 0)
+        t.section('comctl32: ImageList 创建-加位图-销毁往返（hbmMask 位传 NULL）')
+        const himl = ImageListCreate(16, 16, ImageListFlag.COLOR24, 0, 0)   // initial/grow=0 默认
+        t.checkTrue('ImageListCreate(16, 16, ILC_COLOR24) 非 0', himl !== 0)
+        if (himl !== 0) {
+            const hdcMem = CreateCompatibleDC(NULL)
+            const hbm = hdcMem !== 0 ? CreateCompatibleBitmap(hdcMem, 16, 16) : 0
+            t.checkTrue('CreateCompatibleBitmap(16, 16) 非 0', hbm !== 0)
+            if (hbm !== 0) t.check('ImageListAdd(himl, hbm, NULL) → 索引 0', 0, ImageListAdd(himl, hbm, NULL))
+            if (hbm !== 0) DeleteObject(hbm)
+            if (hdcMem !== 0) DeleteDC(hdcMem)
+            t.checkTrue('ImageListDestroy(himl) 成功', ImageListDestroy(himl) !== 0)
+        }
 
         t.section('user32: LoadImage 双变体（string 自动编码 / ordinal MAKEINTRESOURCE）')
         // Win32 IMAGE_* 真值：BITMAP=0 CURSOR=1 ICON=2；LR_SHARED=0x8000（注意 ImageType d.ts 当前值与此不一致）
@@ -107,7 +119,69 @@ export const suite = {
         t.check('decode 回读 cbSize = encode 初值', SCROLLINFO.size, info.cbSize)
         t.check('decode 回读 fMask = encode 初值', 0x0001, info.fMask)
         t.checkTrue('读回字段为 number 形态', typeof info.nMin === 'number' && typeof info.nMax === 'number')
-        // CallWindowProc / ShowScrollBar / ImageListAdd 仅由 import 的模块加载覆盖 proc 名：
-        // CallWindowProc 跨线程窗口过程不安全、ShowScrollBar 有副作用、ImageListAdd 需位图源
+        // CallWindowProc / ShowScrollBar 仅由 import 的模块加载覆盖 proc 名：
+        // CallWindowProc 跨线程窗口过程不安全、ShowScrollBar 有副作用
+
+        // NONCLIENTMETRICS 的 cbSize/uiParam 随系统变（Vista+ 504 / XP·2003 500），
+        // 尺寸回退逻辑在 lib/dpi；此处只锁结构布局与端到端效果（见下 section）。
+        t.check('NONCLIENTMETRICSW.size == 504（4 LOGFONTW + 12 DWORD）', 504, NONCLIENTMETRICSW.size)
+
+        t.section('lib/dpi: 下沉到 JS 的 DPI / 系统字体复合逻辑')
+        t.checkTrue('getScaleFactor() ≥ 0.5', getScaleFactor() >= 0.5)
+        const dpiFont = createSystemDpiFont()
+        t.checkTrue('createSystemDpiFont() 非 NULL（SPI 尺寸回退后仍取到系统消息字体）', dpiFont !== 0)
+        if (dpiFont) {
+            const lf = LOGFONTW.alloc()
+            t.checkTrue('GetObject(dpiFont, LOGFONTW.size) 回读成功', GetObject(dpiFont, LOGFONTW.size, lf) === LOGFONTW.size)
+            const fo = LOGFONTW.decode(lf)
+            t.checkTrue('系统消息字体 lfFaceName 非空（结构确被 SPI 填过）', typeof fo.lfFaceName === 'string' && fo.lfFaceName.length > 0)
+            t.checkTrue('DeleteObject(系统字体) 成功', DeleteObject(dpiFont) !== 0)
+        }
+
+        t.section('shell32: Shell_NotifyIconW 托盘图标增删（NOTIFYICONDATAW 对象直传）')
+        // 尺寸基准来自 mingw 头文件实测（x86 956 / x64 976，随 hWnd/hIcon/hBalloonIcon 位宽）
+        t.check('NOTIFYICONDATAW.size == mingw sizeof（x86 956 / x64 976）',
+            PTR_SIZE === 4 ? 956 : 976, NOTIFYICONDATAW.size)
+        const nid = NOTIFYICONDATAW.encode({ cbSize: NOTIFYICONDATAW.size, szTip: 'quickwin', szInfoTitle: 'qw' })
+        const nidBack = NOTIFYICONDATAW.decode(nid)
+        t.check('宽字符串糖 szTip 编解码往返', 'quickwin', nidBack.szTip)
+        t.check('宽字符串糖 szInfoTitle 编解码往返', 'qw', nidBack.szInfoTitle)
+
+        const trayIcon = LoadImageOrdinal(NULL, IDI.APPLICATION, ImageType.ICON, 0, 0, LoadImageFlag.SHARED)
+        t.checkTrue('LoadImageOrdinal(IDI.APPLICATION, SHARED) 非 0', trayIcon !== 0)
+        const trayHwnd = GetDesktopWindow()
+        t.checkTrue('ShellNotifyIcon(ADD) 成功（Vista+ 尺寸在 XP/Win7 均被接受）', ShellNotifyIcon(NotifyIconCmd.ADD, {
+            cbSize: NOTIFYICONDATAW.size, hWnd: trayHwnd, uID: 77,
+            uFlags: NotifyIconFlag.MESSAGE | NotifyIconFlag.ICON | NotifyIconFlag.TIP,
+            uCallbackMessage: 0x8001, hIcon: trayIcon, szTip: 'quickwin test',
+        }) !== 0)
+        t.checkTrue('ShellNotifyIcon(DELETE) 成功（只需 hWnd+uID）',
+            ShellNotifyIcon(NotifyIconCmd.DELETE, { cbSize: NOTIFYICONDATAW.size, hWnd: trayHwnd, uID: 77 }) !== 0)
+
+        t.section('lib/bitmap: 按像素建 32bpp DIB 段（原 gui.CreateBitmapFromPixels）')
+        const nw = 4, nh = 2
+        const px = new ArrayBuffer(nw * nh * 4)
+        const px8 = new Uint8Array(px)
+        for (let i = 0; i < px8.length; i++) px8[i] = (i * 37 + 11) & 0xff
+        const hbm = createBitmapFromPixels(nw, nh, px)
+        t.checkTrue('createBitmapFromPixels(4x2) 非 NULL', hbm !== 0)
+        if (hbm) {
+            const bmi = BITMAPINFOHEADER.encode({
+                biSize: BITMAPINFOHEADER.size, biWidth: nw, biHeight: -nh,
+                biPlanes: 1, biBitCount: 32, biSizeImage: nw * nh * 4,
+            })
+            const back = new PtrArrayBuffer<'BYTE'>(nw * nh * 4)
+            const dc = GetDC(NULL)
+            const rows = dc ? GetDIBits(dc, hbm, 0, nh, back, bmi.ptr, ColorUse.RGB_COLORS) : 0
+            if (dc) ReleaseDC(NULL, dc)
+            t.check('GetDIBits 取回全部扫描行', nh, rows)
+            const back8 = new Uint8Array(back)
+            let same = rows === nh
+            for (let i = 0; i < back8.length; i++) if (back8[i] !== px8[i]) same = false
+            t.checkTrue('像素逐字节一致（含 alpha，与旧 C 的 memcpy 等价）', same)
+            t.checkTrue('DeleteObject(位图) 成功', DeleteObject(hbm) !== 0)
+        }
+        t.checkTrue('非法入参 → NULL（宽/高 ≤ 0、像素缓冲不足，同旧 C 语义）',
+            createBitmapFromPixels(0, nh, px) === NULL && createBitmapFromPixels(nw, nh, new ArrayBuffer(4)) === NULL)
     },
 }

package/test/test_gdi_draw.js

@@ -38,7 +38,7 @@ export const suite = {
         // 失败置哨兵（px() 返回 -1）—— 像素断言 FAIL 出可诊断值，不炸整个 suite。
         let pxOk = true;
         const readPx = () => {
-            pxOk = GetDIBits(mem, bmp, 0, H, pxB, bmi.ptr, 0) === H;
+            pxOk = GetDIBits(mem, bmp, 0, H, pxB, bmi.ptr, 0 /* ColorUse.RGB_COLORS */) === H;
         };
         const px = (x, y) => {
             if (!pxOk)
@@ -435,13 +435,13 @@ export const suite = {
             biSize: BITMAPINFOHEADER.size, biWidth: 4, biHeight: -4,
             biPlanes: 1, biBitCount: 32, biSizeImage: 4 * 4 * 4,
         });
-        t.checkTrue('SetDIBitsToDevice ok', SetDIBitsToDevice(mem, 20, 20, 4, 4, 0, 0, 0, 4, dibBits, dibBmi, 0) === 4);
+        t.checkTrue('SetDIBitsToDevice ok', SetDIBitsToDevice(mem, 20, 20, 4, 4, 0, 0, 0, 4, dibBits, dibBmi, 0 /* ColorUse.RGB_COLORS */) === 4);
         readPx();
         t.check('dib top rows red (top-down)', RED, px(21, 21));
         t.check('dib bottom rows blue', BLUE, px(21, 23));
         t.check('dib outside untouched', WHITE, px(30, 21));
         clearWhite();
-        t.checkTrue('StretchDIBits ok', StretchDIBits(mem, 20, 20, 40, 40, 0, 0, 4, 4, dibBits, dibBmi, 0, 13369376 /* RasterOp.SRCCOPY */) === 4);
+        t.checkTrue('StretchDIBits ok', StretchDIBits(mem, 20, 20, 40, 40, 0, 0, 4, 4, dibBits, dibBmi, 0 /* ColorUse.RGB_COLORS */, 13369376 /* RasterOp.SRCCOPY */) === 4);
         readPx();
         t.check('stretched top half red', RED, px(40, 30));
         t.check('stretched bottom half blue', BLUE, px(40, 50));

package/test/test_gdi_draw.ts

@@ -13,7 +13,7 @@ import {
 } from '../lib/windows/gdi32.js'
 import { AlphaBlend, TransparentBlt } from '../lib/windows/msimg32.js'
 import { BITMAPINFOHEADER, POINT, SIZE, TEXTMETRICW } from '../lib/windows/structs.js'
-import { ArcDirection, BackgroundMode, HatchStyle, PenStyle, PolyFillMode, RasterMode, RasterOp, StockObject, StretchBltMode, TextAlign, TextOutOptions } from '../constants'
+import { ArcDirection, BackgroundMode, ColorUse, HatchStyle, PenStyle, PolyFillMode, RasterMode, RasterOp, StockObject, StretchBltMode, TextAlign, TextOutOptions } from '../constants'
 
 // 像素比较统一用 COLORREF 形（0x00BBGGRR）—— 与画图入参同形，读回直接对比。
 const RED = 0x000000ff
@@ -51,7 +51,7 @@ export const suite = {
         // 失败置哨兵（px() 返回 -1）—— 像素断言 FAIL 出可诊断值，不炸整个 suite。
         let pxOk = true
         const readPx = (): void => {
-            pxOk = GetDIBits(mem, bmp, 0, H, pxB, bmi.ptr, 0) === H
+            pxOk = GetDIBits(mem, bmp, 0, H, pxB, bmi.ptr, ColorUse.RGB_COLORS) === H
         }
         const px = (x: number, y: number): number => {
             if (!pxOk) return -1
@@ -469,14 +469,14 @@ export const suite = {
             biPlanes: 1, biBitCount: 32, biSizeImage: 4 * 4 * 4,
         })
         t.checkTrue('SetDIBitsToDevice ok',
-            SetDIBitsToDevice(mem, 20, 20, 4, 4, 0, 0, 0, 4, dibBits, dibBmi, 0) === 4)
+            SetDIBitsToDevice(mem, 20, 20, 4, 4, 0, 0, 0, 4, dibBits, dibBmi, ColorUse.RGB_COLORS) === 4)
         readPx()
         t.check('dib top rows red (top-down)', RED, px(21, 21))
         t.check('dib bottom rows blue', BLUE, px(21, 23))
         t.check('dib outside untouched', WHITE, px(30, 21))
         clearWhite()
         t.checkTrue('StretchDIBits ok',
-            StretchDIBits(mem, 20, 20, 40, 40, 0, 0, 4, 4, dibBits, dibBmi, 0,
+            StretchDIBits(mem, 20, 20, 40, 40, 0, 0, 4, 4, dibBits, dibBmi, ColorUse.RGB_COLORS,
                 RasterOp.SRCCOPY) === 4)
         readPx()
         t.check('stretched top half red', RED, px(40, 30))