quickwin 2.3.0 → 3.0.0

package/examples/test_tab.tsx

@@ -2,12 +2,13 @@ import '../lib/polyfill.js'
 import * as gui from 'gui'
 import { useState } from 'react'
 import { render, Button, Tab } from '../lib/react-qw/index.js'
-import { WindowStyle, WmMsg } from '../constants'
+import { ShowWindowCmd, WindowStyle, WmMsg } from '../constants'
+import { PostQuitMessage, ShowWindow } from '../lib/windows/user32.js'
 
 gui.RegisterClass('TabDemo', (hwnd, msg, wParam, lParam) => {
   if (!hwnd) return gui.DefWindowProc(hwnd, msg, wParam, lParam)
   if (msg === WmMsg.DESTROY) {
-    gui.PostQuitMessage(0)
+    PostQuitMessage(0)
     return 0
   }
   return gui.DefWindowProc(hwnd, msg, wParam, lParam)
@@ -71,6 +72,6 @@ const hwnd = gui.CreateWindow(
 )
 
 if (hwnd) {
-  gui.ShowWindow(hwnd)
+  ShowWindow(hwnd, ShowWindowCmd.SHOWNORMAL)
   render(<App />, hwnd)
 }

package/examples/tray_demo.js

@@ -1,73 +1,80 @@
 import * as gui from 'gui';
 import * as std from 'std';
+import { NULL } from '../lib/ffi/ctype.js';
+import { GetCursorPos, CreatePopupMenu, AppendMenu, TrackPopupMenu, DestroyMenu, GetSystemMetrics, LoadImageOrdinal, PostQuitMessage, SetForegroundWindow, ShowWindow } from '../lib/windows/user32.js';
+import { NOTIFYICONDATAW, POINT } from '../lib/windows/structs.js';
+import { ShellNotifyIcon } from '../lib/windows/shell32.js';
+import { createSystemDpiFont } from '../lib/dpi.js';
 const WM_TRAY = 0x8001;
 gui.RegisterClass('TrayApp', (hwnd, msg, wParam, lParam) => {
     if (msg === WM_TRAY) {
         const evt = lParam;
-        if (evt === 0x0201) { // WM_LBUTTONDOWN
-            gui.ShowWindow(hwnd, 5); // SW_SHOW
-            gui.SetForegroundWindow(hwnd);
+        if (evt === 513 /* WmMsg.LBUTTONDOWN */) {
+            ShowWindow(hwnd, 5 /* ShowWindowCmd.SHOW */);
+            SetForegroundWindow(hwnd);
         }
-        else if (evt === 0x0204 || evt === 0x007B) { // WM_RBUTTONDOWN or WM_CONTEXTMENU
-            gui.SetForegroundWindow(hwnd);
-            const pos = gui.GetCursorPos();
-            const x = pos ? pos[0] : 0;
-            const y = pos ? pos[1] : 0;
-            const hMenu = gui.CreatePopupMenu();
-            if (hMenu) {
-                gui.AppendMenu(hMenu, 0, 1, '显示窗口');
-                gui.AppendMenu(hMenu, 0x0800, 0, '');
-                gui.AppendMenu(hMenu, 0, 2, '退出');
-                const cmd = gui.TrackPopupMenu(hMenu, x, y, undefined, hwnd);
-                gui.DestroyMenu(hMenu);
+        else if (evt === 516 /* WmMsg.RBUTTONDOWN */ || evt === 123 /* WmMsg.CONTEXTMENU */) {
+            SetForegroundWindow(hwnd);
+            const pt = POINT.alloc();
+            const pos = GetCursorPos(pt.ptr) ? POINT.decode(pt) : null;
+            const x = pos ? pos.x : 0;
+            const y = pos ? pos.y : 0;
+            const hMenu = CreatePopupMenu();
+            if (hMenu !== NULL) {
+                AppendMenu(hMenu, 0, 1, '显示窗口');
+                AppendMenu(hMenu, 2048 /* MenuFlag.SEPARATOR */, 0, NULL);
+                AppendMenu(hMenu, 0, 2, '退出');
+                const cmd = TrackPopupMenu(hMenu, 256 /* TrackPopupMenuFlag.RETURNCMD */ | 2 /* TrackPopupMenuFlag.RIGHTBUTTON */, x, y, 0, hwnd, NULL);
+                DestroyMenu(hMenu);
                 if (cmd === 1) {
-                    gui.ShowWindow(hwnd, 5); // SW_SHOW
+                    ShowWindow(hwnd, 5 /* ShowWindowCmd.SHOW */);
                 }
                 else if (cmd === 2) {
-                    gui.ShellNotifyIcon(2 /* NotifyIconCmd.DELETE */, { hwnd, uID: 1 });
-                    gui.PostQuitMessage(0);
+                    ShellNotifyIcon(2 /* NotifyIconCmd.DELETE */, { cbSize: NOTIFYICONDATAW.size, hWnd: hwnd, uID: 1 });
+                    PostQuitMessage(0);
                 }
             }
         }
         return 0;
     }
     if (msg === 16 /* WmMsg.CLOSE */) {
-        gui.ShowWindow(hwnd, 0); // SW_HIDE
+        ShowWindow(hwnd, 0 /* ShowWindowCmd.HIDE */);
         return 0;
     }
     return gui.DefWindowProc(hwnd, msg, wParam, lParam);
 });
 // 创建窗口
 const W = 500, H = 400;
-const scr = gui.GetScreenSize();
+const scr = [GetSystemMetrics(0 /* SysMetrics.CXSCREEN */), GetSystemMetrics(1 /* SysMetrics.CYSCREEN */)];
 const x = (scr[0] - W) >> 1;
 const y = (scr[1] - H) >> 1;
 const hwnd = gui.CreateWindow('TrayApp', '系统托盘示例', 13565952 /* WindowStyle.OVERLAPPEDWINDOW */, x, y, W, H, null, null);
 if (!hwnd)
     std.exit(0);
-gui.ShowWindow(hwnd);
+ShowWindow(hwnd, 1 /* ShowWindowCmd.SHOWNORMAL */);
 // 添加说明文字
-const ES_MULTILINE = 0x0004;
-const ES_READONLY = 0x0800;
-const style = 1073741824 /* WindowStyle.CHILD */ | 268435456 /* WindowStyle.VISIBLE */ | ES_MULTILINE | ES_READONLY;
+const style = 1073741824 /* WindowStyle.CHILD */ | 268435456 /* WindowStyle.VISIBLE */ | 4 /* EditStyle.MULTILINE */ | 2048 /* EditStyle.READONLY */;
 const text = gui.CreateWindow('EDIT', 'QuickWin 系统托盘示例\r\n'
     + '\r\n'
     + '右键点击托盘图标打开上下文菜单。\r\n'
     + '关闭此窗口将隐藏到托盘。\r\n'
     + '从菜单中选择"显示窗口"恢复窗口，"退出"结束程序。', style, 15, 15, W - 30, H - 70, hwnd, null);
 if (text) {
-    const font = gui.CreateSystemDpiFont();
+    const font = createSystemDpiFont();
     if (font)
         gui.SendMessage(text, 48 /* WmMsg.SETFONT */, font, 1);
 }
+// LoadImageW 返回的句柄随 uType 变（HICON/HCURSOR/HBITMAP），绑定只能给裸地址档；
+// LoadAppIcon 的 HICON 是同一档的品牌子型，故变量按裸地址声明
 let hIcon = gui.LoadAppIcon();
 if (!hIcon)
-    hIcon = gui.LoadImage(null, 32512 /* IDI.APPLICATION */, 1 /* ImageType.ICON */, 0, 0, 32768 /* LoadImageFlag.SHARED */);
+    hIcon = LoadImageOrdinal(NULL, 32512 /* IDI.APPLICATION */, 1 /* ImageType.ICON */, 0, 0, 32768 /* LoadImageFlag.SHARED */);
 if (hIcon) {
-    const ok = gui.ShellNotifyIcon(0 /* NotifyIconCmd.ADD */, {
-        hwnd: hwnd, uID: 1,
-        flags: 1 /* NotifyIconFlag.MESSAGE */ | 2 /* NotifyIconFlag.ICON */,
-        callbackMessage: WM_TRAY,
+    const ok = ShellNotifyIcon(0 /* NotifyIconCmd.ADD */, {
+        cbSize: NOTIFYICONDATAW.size,
+        hWnd: hwnd, uID: 1,
+        uFlags: 1 /* NotifyIconFlag.MESSAGE */ | 2 /* NotifyIconFlag.ICON */,
+        uCallbackMessage: WM_TRAY,
         hIcon,
     });
     std.out.printf('tray icon %s\n', ok ? 'added' : 'FAILED');

package/examples/tray_demo.tsx

@@ -1,39 +1,45 @@
 import * as gui from 'gui'
 import * as std from 'std'
-import { IDI, ImageType, LoadImageFlag, NotifyIconCmd, NotifyIconFlag, WindowStyle, WmMsg } from '../constants'
+import { NULL, type MaybePtr } from '../lib/ffi/ctype.js'
+import { GetCursorPos, CreatePopupMenu, AppendMenu, TrackPopupMenu, DestroyMenu, GetSystemMetrics, LoadImageOrdinal, PostQuitMessage, SetForegroundWindow, ShowWindow } from '../lib/windows/user32.js'
+import { NOTIFYICONDATAW, POINT } from '../lib/windows/structs.js'
+import { ShellNotifyIcon } from '../lib/windows/shell32.js'
+import { createSystemDpiFont } from '../lib/dpi.js'
+import { EditStyle, IDI, ImageType, LoadImageFlag, MenuFlag, NotifyIconCmd, NotifyIconFlag, ShowWindowCmd, SysMetrics, TrackPopupMenuFlag, WindowStyle, WmMsg } from '../constants'
 
 const WM_TRAY = 0x8001
 
 gui.RegisterClass('TrayApp', (hwnd, msg, wParam, lParam) => {
     if (msg === WM_TRAY) {
         const evt = lParam
-        if (evt === 0x0201) { // WM_LBUTTONDOWN
-            gui.ShowWindow(hwnd, 5) // SW_SHOW
-            gui.SetForegroundWindow(hwnd)
-        } else if (evt === 0x0204 || evt === 0x007B) { // WM_RBUTTONDOWN or WM_CONTEXTMENU
-            gui.SetForegroundWindow(hwnd)
-            const pos = gui.GetCursorPos()
-            const x = pos ? pos[0] : 0
-            const y = pos ? pos[1] : 0
-            const hMenu = gui.CreatePopupMenu()
-            if (hMenu) {
-                gui.AppendMenu(hMenu, 0, 1, '显示窗口')
-                gui.AppendMenu(hMenu, 0x0800, 0, '')
-                gui.AppendMenu(hMenu, 0, 2, '退出')
-                const cmd = gui.TrackPopupMenu(hMenu, x, y, undefined, hwnd)
-                gui.DestroyMenu(hMenu)
+        if (evt === WmMsg.LBUTTONDOWN) {
+            ShowWindow(hwnd, ShowWindowCmd.SHOW)
+            SetForegroundWindow(hwnd)
+        } else if (evt === WmMsg.RBUTTONDOWN || evt === WmMsg.CONTEXTMENU) {
+            SetForegroundWindow(hwnd)
+            const pt = POINT.alloc()
+            const pos = GetCursorPos(pt.ptr) ? POINT.decode(pt) : null
+            const x = pos ? pos.x : 0
+            const y = pos ? pos.y : 0
+            const hMenu = CreatePopupMenu()
+            if (hMenu !== NULL) {
+                AppendMenu(hMenu, 0, 1, '显示窗口')
+                AppendMenu(hMenu, MenuFlag.SEPARATOR, 0, NULL)
+                AppendMenu(hMenu, 0, 2, '退出')
+                const cmd = TrackPopupMenu(hMenu, TrackPopupMenuFlag.RETURNCMD | TrackPopupMenuFlag.RIGHTBUTTON, x, y, 0, hwnd, NULL)
+                DestroyMenu(hMenu)
                 if (cmd === 1) {
-                    gui.ShowWindow(hwnd, 5) // SW_SHOW
+                    ShowWindow(hwnd, ShowWindowCmd.SHOW)
                 } else if (cmd === 2) {
-                    gui.ShellNotifyIcon(NotifyIconCmd.DELETE, { hwnd, uID: 1 })
-                    gui.PostQuitMessage(0)
+                    ShellNotifyIcon(NotifyIconCmd.DELETE, { cbSize: NOTIFYICONDATAW.size, hWnd: hwnd, uID: 1 })
+                    PostQuitMessage(0)
                 }
             }
         }
         return 0
     }
     if (msg === WmMsg.CLOSE) {
-        gui.ShowWindow(hwnd, 0) // SW_HIDE
+        ShowWindow(hwnd, ShowWindowCmd.HIDE)
         return 0
     }
     return gui.DefWindowProc(hwnd, msg, wParam, lParam)
@@ -41,17 +47,15 @@ gui.RegisterClass('TrayApp', (hwnd, msg, wParam, lParam) => {
 
 // 创建窗口
 const W = 500, H = 400
-const scr = gui.GetScreenSize()
+const scr: [number, number] = [GetSystemMetrics(SysMetrics.CXSCREEN), GetSystemMetrics(SysMetrics.CYSCREEN)]
 const x = (scr[0] - W) >> 1
 const y = (scr[1] - H) >> 1
 const hwnd = gui.CreateWindow('TrayApp', '系统托盘示例', WindowStyle.OVERLAPPEDWINDOW, x, y, W, H, null, null)
 if (!hwnd) std.exit(0)
-gui.ShowWindow(hwnd)
+ShowWindow(hwnd, ShowWindowCmd.SHOWNORMAL)
 
 // 添加说明文字
-const ES_MULTILINE = 0x0004
-const ES_READONLY = 0x0800
-const style = WindowStyle.CHILD | WindowStyle.VISIBLE | ES_MULTILINE | ES_READONLY
+const style = WindowStyle.CHILD | WindowStyle.VISIBLE | EditStyle.MULTILINE | EditStyle.READONLY
 const text = gui.CreateWindow('EDIT',
     'QuickWin 系统托盘示例\r\n'
     + '\r\n'
@@ -60,18 +64,21 @@ const text = gui.CreateWindow('EDIT',
     + '从菜单中选择"显示窗口"恢复窗口，"退出"结束程序。',
     style, 15, 15, W - 30, H - 70, hwnd, null)
 if (text) {
-    const font = gui.CreateSystemDpiFont()
+    const font = createSystemDpiFont()
     if (font)
         gui.SendMessage(text, WmMsg.SETFONT, font, 1)
 }
 
-let hIcon = gui.LoadAppIcon()
-if (!hIcon) hIcon = gui.LoadImage(null, IDI.APPLICATION, ImageType.ICON, 0, 0, LoadImageFlag.SHARED)
+// LoadImageW 返回的句柄随 uType 变（HICON/HCURSOR/HBITMAP），绑定只能给裸地址档；
+// LoadAppIcon 的 HICON 是同一档的品牌子型，故变量按裸地址声明
+let hIcon: MaybePtr<''> | null = gui.LoadAppIcon()
+if (!hIcon) hIcon = LoadImageOrdinal(NULL, IDI.APPLICATION, ImageType.ICON, 0, 0, LoadImageFlag.SHARED)
 if (hIcon) {
-    const ok = gui.ShellNotifyIcon(NotifyIconCmd.ADD, {
-        hwnd: hwnd, uID: 1,
-        flags: NotifyIconFlag.MESSAGE | NotifyIconFlag.ICON,
-        callbackMessage: WM_TRAY,
+    const ok = ShellNotifyIcon(NotifyIconCmd.ADD, {
+        cbSize: NOTIFYICONDATAW.size,
+        hWnd: hwnd, uID: 1,
+        uFlags: NotifyIconFlag.MESSAGE | NotifyIconFlag.ICON,
+        uCallbackMessage: WM_TRAY,
         hIcon,
     })
     std.out.printf('tray icon %s\n', ok ? 'added' : 'FAILED')

package/lib/bitmap.js

@@ -0,0 +1,40 @@
+// 按像素建位图 —— gui 模块下沉到 JS 层的复合逻辑（原 js_createBitmapFromPixels）。
+// 旧 C 体是 CreateDIBSection + memcpy 直写位数据；FFI 侧没有「JS 缓冲 → 原生地址」的
+// 批量写原语（ffi 只导出 readBytes / writeByte，逐字节循环不值当），改用 GDI 自带的
+// SetDIBits 把调用方缓冲装进 DIB 段：ColorUse.RGB_COLORS 下 hdc 被忽略（MSDN：
+// "used only if the DIB_PAL_COLORS constant is set ... otherwise it is ignored"），
+// 双机实测传 NULL 可用、GetDIBits 读回逐字节一致（含 alpha），与旧 C 的 memcpy 等价。
+import { NULL, PtrArrayBuffer } from './ffi/ctype.js';
+import { CreateDIBSection, DeleteObject, SetDIBits } from './windows/gdi32.js';
+import { BITMAPINFOHEADER } from './windows/structs.js';
+/** 建 32bpp 自顶向下 DIB 段位图（像素为 BGRA，[B,G,R,A] 字节序，alpha 保留 —— 可喂
+ *  ImageListAdd(ILC_COLOR32) 等）。width/height ≤ 0 或像素缓冲不足 width*height*4 →
+ *  NULL（同旧 gui.CreateBitmapFromPixels 语义：非法入参静默返空，由调用方按「无图」处理）；
+ *  GDI 失败同样返 NULL（已建的位图当场回收）。
+ *  位图归调用方所有：用完 DeleteObject。 */
+export function createBitmapFromPixels(width, height, pixels) {
+    if (width <= 0 || height <= 0)
+        return NULL;
+    const len = width * height * 4;
+    if (pixels.byteLength < len)
+        return NULL;
+    // 32bpp BI_RGB：头部即全部（无颜色表）；负 biHeight = 自顶向下，与 JS 缓冲行序一致
+    const bi = BITMAPINFOHEADER.encode({
+        biSize: BITMAPINFOHEADER.size,
+        biWidth: width,
+        biHeight: -height,
+        biPlanes: 1,
+        biBitCount: 32,
+    });
+    const hbm = CreateDIBSection(NULL, bi.ptr, 0 /* ColorUse.RGB_COLORS */, NULL, NULL, 0);
+    if (!hbm)
+        return NULL;
+    // 像素先落自有原生缓冲（BYTE.encode 需带 .ptr 的缓冲），再让 GDI 装进 DIB 段
+    const src = new PtrArrayBuffer(len);
+    new Uint8Array(src).set(new Uint8Array(pixels, 0, len));
+    if (SetDIBits(NULL, hbm, 0, height, src, bi.ptr, 0 /* ColorUse.RGB_COLORS */) !== height) {
+        DeleteObject(hbm);
+        return NULL;
+    }
+    return hbm;
+}

package/lib/bitmap.ts

@@ -0,0 +1,39 @@
+// 按像素建位图 —— gui 模块下沉到 JS 层的复合逻辑（原 js_createBitmapFromPixels）。
+// 旧 C 体是 CreateDIBSection + memcpy 直写位数据；FFI 侧没有「JS 缓冲 → 原生地址」的
+// 批量写原语（ffi 只导出 readBytes / writeByte，逐字节循环不值当），改用 GDI 自带的
+// SetDIBits 把调用方缓冲装进 DIB 段：ColorUse.RGB_COLORS 下 hdc 被忽略（MSDN：
+// "used only if the DIB_PAL_COLORS constant is set ... otherwise it is ignored"），
+// 双机实测传 NULL 可用、GetDIBits 读回逐字节一致（含 alpha），与旧 C 的 memcpy 等价。
+import { NULL, PtrArrayBuffer, type MaybePtr } from './ffi/ctype.js'
+import { CreateDIBSection, DeleteObject, SetDIBits } from './windows/gdi32.js'
+import { BITMAPINFOHEADER } from './windows/structs.js'
+import { ColorUse } from '../constants'
+
+/** 建 32bpp 自顶向下 DIB 段位图（像素为 BGRA，[B,G,R,A] 字节序，alpha 保留 —— 可喂
+ *  ImageListAdd(ILC_COLOR32) 等）。width/height ≤ 0 或像素缓冲不足 width*height*4 →
+ *  NULL（同旧 gui.CreateBitmapFromPixels 语义：非法入参静默返空，由调用方按「无图」处理）；
+ *  GDI 失败同样返 NULL（已建的位图当场回收）。
+ *  位图归调用方所有：用完 DeleteObject。 */
+export function createBitmapFromPixels(width: number, height: number, pixels: ArrayBuffer): MaybePtr<'HGDIOBJ'> {
+    if (width <= 0 || height <= 0) return NULL
+    const len = width * height * 4
+    if (pixels.byteLength < len) return NULL
+    // 32bpp BI_RGB：头部即全部（无颜色表）；负 biHeight = 自顶向下，与 JS 缓冲行序一致
+    const bi = BITMAPINFOHEADER.encode({
+        biSize: BITMAPINFOHEADER.size,
+        biWidth: width,
+        biHeight: -height,
+        biPlanes: 1,
+        biBitCount: 32,
+    })
+    const hbm = CreateDIBSection(NULL, bi.ptr, ColorUse.RGB_COLORS, NULL, NULL, 0)
+    if (!hbm) return NULL
+    // 像素先落自有原生缓冲（BYTE.encode 需带 .ptr 的缓冲），再让 GDI 装进 DIB 段
+    const src = new PtrArrayBuffer<'BYTE'>(len)
+    new Uint8Array(src).set(new Uint8Array(pixels, 0, len))
+    if (SetDIBits(NULL, hbm, 0, height, src, bi.ptr, ColorUse.RGB_COLORS) !== height) {
+        DeleteObject(hbm)
+        return NULL
+    }
+    return hbm
+}

package/lib/certs.js

@@ -6,8 +6,10 @@
 // bundle and are pushed into wolfSSL's process-wide trust store as soon
 // as this module is imported.
 //
-// The process-wide store has a fixed QW_CA_SLOTS (8) capacity; this
-// bundle uses 7, leaving headroom for run-time registrations.
+// The process-wide store has a fixed QW_CA_SLOTS (16) capacity; this
+// bundle uses 8, leaving headroom for future anchors. If the bundle
+// ever outgrows it, raise QW_CA_SLOTS in src/quickjs-wolfssl.c first —
+// a full store throws at import time.
 //
 // Each anchor covers a different root hierarchy, and none is
 // interchangeable: wolfSSL resolves a CA by AKID/SKID and does not walk
@@ -25,6 +27,10 @@
 //     G2 (bing.com), RSA 2048.
 //   * GLOBALSIGN_R46, ISRG_X1, ISRG_X2 — the newer GlobalSign R46 and
 //     Let's Encrypt hierarchies (taobao.com, qq.com).
+//   * GTS_R4 — cross-signed GTS Root R4 (issued by GlobalSign Root CA,
+//     notAfter 2028-01-28, EC P-256). unpkg.com and other properties
+//     whose chains terminate at Google Trust Services (WE1/E5/E6
+//     intermediates).
 //
 // Known limitation (wolfSSL, not the bundle): GLOBALSIGN_R46 and ISRG_X1
 // are RSA 4096, and this wolfSSL build compiles the SP bignum with
@@ -202,6 +208,27 @@ zj0EAwMDaAAwZQIwe3lORlCEwkSHRhtFcP9Ymd70/aTSVaYgLXTWNLxBo1BfASdW
 tL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5U6VR5CmD1/iQMVtCnwr1
 /q4AaOeMSQ+2b1tbFfLn
 -----END CERTIFICATE-----`;
+const GTS_R4 = `-----BEGIN CERTIFICATE-----
+MIIDejCCAmKgAwIBAgIQf+UwvzMTQ77dghYQST2KGzANBgkqhkiG9w0BAQsFADBX
+MQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEQMA4GA1UE
+CxMHUm9vdCBDQTEbMBkGA1UEAxMSR2xvYmFsU2lnbiBSb290IENBMB4XDTIzMTEx
+NTAzNDMyMVoXDTI4MDEyODAwMDA0MlowRzELMAkGA1UEBhMCVVMxIjAgBgNVBAoT
+GUdvb2dsZSBUcnVzdCBTZXJ2aWNlcyBMTEMxFDASBgNVBAMTC0dUUyBSb290IFI0
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE83Rzp2iLYK5DuDXFgTB7S0md+8Fhzube
+Rr1r1WEYNa5A3XP3iZEwWus87oV8okB2O6nGuEfYKueSkWpz6bFyOZ8pn6KY019e
+WIZlD6GEZQbR3IvJx3PIjGov5cSr0R2Ko4H/MIH8MA4GA1UdDwEB/wQEAwIBhjAd
+BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUgEzW63T/STaj1dj8tT7FavCUHYwwHwYDVR0jBBgwFoAUYHtmGkUN
+l8qJUC99BM00qP/8/UswNgYIKwYBBQUHAQEEKjAoMCYGCCsGAQUFBzAChhpodHRw
+Oi8vaS5wa2kuZ29vZy9nc3IxLmNydDAtBgNVHR8EJjAkMCKgIKAehhxodHRwOi8v
+Yy5wa2kuZ29vZy9yL2dzcjEuY3JsMBMGA1UdIAQMMAowCAYGZ4EMAQIBMA0GCSqG
+SIb3DQEBCwUAA4IBAQAYQrsPBtYDh5bjP2OBDwmkoWhIDDkic574y04tfzHpn+cJ
+odI2D4SseesQ6bDrarZ7C30ddLibZatoKiws3UL9xnELz4ct92vID24FfVbiI1hY
++SW6FoVHkNeWIP0GCbaM4C6uVdF5dTUsMVs/ZbzNnIdCp5Gxmx5ejvEau8otR/Cs
+kGN+hr/W5GvT1tMBjgWKZ1i4//emhA1JG1BbPzoLJQvyEotc03lXjTaCzv8mEbep
+8RqZ7a2CPsgRbuvTPBwcOMBBmuFeU88+FSBX6+7iP0il8b4Z0QFqIwwMHfs/L6K1
+vepuoxtGzi4CZ68zJpiq1UvSqTbFJjtbD4seiMHl
+-----END CERTIFICATE-----`;
 // Register at import time. Importers of this module get the anchors
 // without writing any code themselves. addTrustedCA only returns the
 // slot count (-1 when full/empty); the fatal-vs-not decision is ours.
@@ -216,4 +243,5 @@ trust(DIGICERT_GLOBAL_G2);
 trust(GLOBALSIGN_R46);
 trust(ISRG_X1);
 trust(ISRG_X2);
-export const TRUSTED_CA_COUNT = 7;
+trust(GTS_R4);
+export const TRUSTED_CA_COUNT = 8;

package/lib/certs.ts

@@ -6,8 +6,10 @@
 // bundle and are pushed into wolfSSL's process-wide trust store as soon
 // as this module is imported.
 //
-// The process-wide store has a fixed QW_CA_SLOTS (8) capacity; this
-// bundle uses 7, leaving headroom for run-time registrations.
+// The process-wide store has a fixed QW_CA_SLOTS (16) capacity; this
+// bundle uses 8, leaving headroom for future anchors. If the bundle
+// ever outgrows it, raise QW_CA_SLOTS in src/quickjs-wolfssl.c first —
+// a full store throws at import time.
 //
 // Each anchor covers a different root hierarchy, and none is
 // interchangeable: wolfSSL resolves a CA by AKID/SKID and does not walk
@@ -25,6 +27,10 @@
 //     G2 (bing.com), RSA 2048.
 //   * GLOBALSIGN_R46, ISRG_X1, ISRG_X2 — the newer GlobalSign R46 and
 //     Let's Encrypt hierarchies (taobao.com, qq.com).
+//   * GTS_R4 — cross-signed GTS Root R4 (issued by GlobalSign Root CA,
+//     notAfter 2028-01-28, EC P-256). unpkg.com and other properties
+//     whose chains terminate at Google Trust Services (WE1/E5/E6
+//     intermediates).
 //
 // Known limitation (wolfSSL, not the bundle): GLOBALSIGN_R46 and ISRG_X1
 // are RSA 4096, and this wolfSSL build compiles the SP bignum with
@@ -211,6 +217,28 @@ tL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5U6VR5CmD1/iQMVtCnwr1
 /q4AaOeMSQ+2b1tbFfLn
 -----END CERTIFICATE-----`
 
+const GTS_R4 = `-----BEGIN CERTIFICATE-----
+MIIDejCCAmKgAwIBAgIQf+UwvzMTQ77dghYQST2KGzANBgkqhkiG9w0BAQsFADBX
+MQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEQMA4GA1UE
+CxMHUm9vdCBDQTEbMBkGA1UEAxMSR2xvYmFsU2lnbiBSb290IENBMB4XDTIzMTEx
+NTAzNDMyMVoXDTI4MDEyODAwMDA0MlowRzELMAkGA1UEBhMCVVMxIjAgBgNVBAoT
+GUdvb2dsZSBUcnVzdCBTZXJ2aWNlcyBMTEMxFDASBgNVBAMTC0dUUyBSb290IFI0
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE83Rzp2iLYK5DuDXFgTB7S0md+8Fhzube
+Rr1r1WEYNa5A3XP3iZEwWus87oV8okB2O6nGuEfYKueSkWpz6bFyOZ8pn6KY019e
+WIZlD6GEZQbR3IvJx3PIjGov5cSr0R2Ko4H/MIH8MA4GA1UdDwEB/wQEAwIBhjAd
+BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUgEzW63T/STaj1dj8tT7FavCUHYwwHwYDVR0jBBgwFoAUYHtmGkUN
+l8qJUC99BM00qP/8/UswNgYIKwYBBQUHAQEEKjAoMCYGCCsGAQUFBzAChhpodHRw
+Oi8vaS5wa2kuZ29vZy9nc3IxLmNydDAtBgNVHR8EJjAkMCKgIKAehhxodHRwOi8v
+Yy5wa2kuZ29vZy9yL2dzcjEuY3JsMBMGA1UdIAQMMAowCAYGZ4EMAQIBMA0GCSqG
+SIb3DQEBCwUAA4IBAQAYQrsPBtYDh5bjP2OBDwmkoWhIDDkic574y04tfzHpn+cJ
+odI2D4SseesQ6bDrarZ7C30ddLibZatoKiws3UL9xnELz4ct92vID24FfVbiI1hY
++SW6FoVHkNeWIP0GCbaM4C6uVdF5dTUsMVs/ZbzNnIdCp5Gxmx5ejvEau8otR/Cs
+kGN+hr/W5GvT1tMBjgWKZ1i4//emhA1JG1BbPzoLJQvyEotc03lXjTaCzv8mEbep
+8RqZ7a2CPsgRbuvTPBwcOMBBmuFeU88+FSBX6+7iP0il8b4Z0QFqIwwMHfs/L6K1
+vepuoxtGzi4CZ68zJpiq1UvSqTbFJjtbD4seiMHl
+-----END CERTIFICATE-----`
+
 // Register at import time. Importers of this module get the anchors
 // without writing any code themselves. addTrustedCA only returns the
 // slot count (-1 when full/empty); the fatal-vs-not decision is ours.
@@ -225,5 +253,6 @@ trust(DIGICERT_GLOBAL_G2)
 trust(GLOBALSIGN_R46)
 trust(ISRG_X1)
 trust(ISRG_X2)
+trust(GTS_R4)
 
-export const TRUSTED_CA_COUNT = 7
+export const TRUSTED_CA_COUNT = 8

package/lib/dpi.js

@@ -0,0 +1,30 @@
+// DPI 与系统字体 —— gui 模块下沉到 JS 层的两处复合逻辑（原 js_getScaleFactor /
+// js_createSystemDpiFont）。两者都只按「一次操作一次」调用，FFI 的固定溢价无感；
+// 留在 C 只会与 lib/windows 的绑定重复一层，遂收在此处单点实现。
+import { NULL } from './ffi/ctype.js';
+import { GetDC, ReleaseDC, SystemParametersInfo } from './windows/user32.js';
+import { GetDeviceCaps, CreateFontIndirect } from './windows/gdi32.js';
+import { NONCLIENTMETRICSW } from './windows/structs.js';
+/** 屏幕缩放系数（96 DPI = 1）：GetDC(NULL) → GetDeviceCaps(LOGPIXELSX) → ReleaseDC 成对释放 */
+export function getScaleFactor() {
+    const hdc = GetDC(NULL);
+    const dpi = hdc ? GetDeviceCaps(hdc, 88 /* DeviceCap.LOGPIXELSX */) : 96;
+    if (hdc)
+        ReleaseDC(NULL, hdc);
+    return dpi / 96;
+}
+/** 系统消息字体（CreateFontIndirectW(NONCLIENTMETRICS.lfMessageFont)）——界面控件的默认字体；
+ *  出参位不注册 encoder：encode({cbSize}) 建缓冲带初值 → 传 .ptr → decode 读回。
+ *  cbSize/uiParam 必须与系统认知的结构尺寸一致：Vista+ 为 504（含尾部 iPaddedBorderWidth）、
+ *  XP/2003 为 500 —— 先按 504 试，失败退回 500（lfMessageFont 落在前 500 字节内，尾部留 0）；
+ *  两次都失败 → NULL，调用方按「无字体」处理（控件回落系统默认字体）。 */
+export function createSystemDpiFont() {
+    const ncm = NONCLIENTMETRICSW.encode({ cbSize: NONCLIENTMETRICSW.size });
+    if (!SystemParametersInfo(41 /* Spi.GETNONCLIENTMETRICS */, NONCLIENTMETRICSW.size, ncm, 0)) {
+        const legacySize = NONCLIENTMETRICSW.size - 4;
+        NONCLIENTMETRICSW.encode({ cbSize: legacySize }, ncm);
+        if (!SystemParametersInfo(41 /* Spi.GETNONCLIENTMETRICS */, legacySize, ncm, 0))
+            return NULL;
+    }
+    return CreateFontIndirect(NONCLIENTMETRICSW.decode(ncm).lfMessageFont);
+}

package/lib/dpi.ts

@@ -0,0 +1,31 @@
+// DPI 与系统字体 —— gui 模块下沉到 JS 层的两处复合逻辑（原 js_getScaleFactor /
+// js_createSystemDpiFont）。两者都只按「一次操作一次」调用，FFI 的固定溢价无感；
+// 留在 C 只会与 lib/windows 的绑定重复一层，遂收在此处单点实现。
+import { NULL, type Ptr } from './ffi/ctype.js'
+import { GetDC, ReleaseDC, SystemParametersInfo } from './windows/user32.js'
+import { GetDeviceCaps, CreateFontIndirect } from './windows/gdi32.js'
+import { NONCLIENTMETRICSW } from './windows/structs.js'
+import { DeviceCap, Spi } from '../constants'
+
+/** 屏幕缩放系数（96 DPI = 1）：GetDC(NULL) → GetDeviceCaps(LOGPIXELSX) → ReleaseDC 成对释放 */
+export function getScaleFactor(): number {
+    const hdc = GetDC(NULL)
+    const dpi = hdc ? GetDeviceCaps(hdc, DeviceCap.LOGPIXELSX) : 96
+    if (hdc) ReleaseDC(NULL, hdc)
+    return dpi / 96
+}
+
+/** 系统消息字体（CreateFontIndirectW(NONCLIENTMETRICS.lfMessageFont)）——界面控件的默认字体；
+ *  出参位不注册 encoder：encode({cbSize}) 建缓冲带初值 → 传 .ptr → decode 读回。
+ *  cbSize/uiParam 必须与系统认知的结构尺寸一致：Vista+ 为 504（含尾部 iPaddedBorderWidth）、
+ *  XP/2003 为 500 —— 先按 504 试，失败退回 500（lfMessageFont 落在前 500 字节内，尾部留 0）；
+ *  两次都失败 → NULL，调用方按「无字体」处理（控件回落系统默认字体）。 */
+export function createSystemDpiFont(): Ptr<'HGDIOBJ'> | NULL {
+    const ncm = NONCLIENTMETRICSW.encode({ cbSize: NONCLIENTMETRICSW.size })
+    if (!SystemParametersInfo(Spi.GETNONCLIENTMETRICS, NONCLIENTMETRICSW.size, ncm, 0)) {
+        const legacySize = NONCLIENTMETRICSW.size - 4
+        NONCLIENTMETRICSW.encode({ cbSize: legacySize }, ncm)
+        if (!SystemParametersInfo(Spi.GETNONCLIENTMETRICS, legacySize, ncm, 0)) return NULL
+    }
+    return CreateFontIndirect(NONCLIENTMETRICSW.decode(ncm).lfMessageFont)
+}

package/lib/dumpRects.js

@@ -1,17 +1,24 @@
 import * as os from 'os';
-import * as gui from 'gui';
+import { GetClientRect, GetWindow, GetWindowRect, GetWindowText, GetWindowTextLength } from '../lib/windows/user32.js';
+import { WCHAR } from '../lib/ffi/bind.js';
+import { RECT } from '../lib/windows/structs.js';
 export function startDumpRects(rootHwnd, intervalMs = 3000) {
     function dumpChild(parent, indent) {
-        var ch = gui.GetWindow(parent, 5 /* GetWindowCmd.CHILD */);
+        var ch = GetWindow(parent, 5 /* GetWindowCmd.CHILD */);
         var n = 0;
         while (ch) {
             n++;
-            var wr = gui.GetWindowRect(ch);
-            var cr = gui.GetClientRect(ch);
-            var txt = String(gui.GetWindowText(ch) || '').slice(0, 16);
-            console.log(indent + '[' + n + '] hwnd=' + String(ch) + ' txt="' + txt + '" wr=' + JSON.stringify(wr) + ' cr=' + JSON.stringify(cr));
+            const wr = RECT.alloc();
+            const cr = RECT.alloc();
+            GetWindowRect(ch, wr.ptr);
+            GetClientRect(ch, cr.ptr);
+            const cap = GetWindowTextLength(ch) + 1;
+            const textBuf = WCHAR.alloc(cap);
+            GetWindowText(ch, textBuf, cap);
+            var txt = WCHAR.decode(textBuf).slice(0, 16);
+            console.log(indent + '[' + n + '] hwnd=' + String(ch) + ' txt="' + txt + '" wr=' + JSON.stringify(RECT.decode(wr)) + ' cr=' + JSON.stringify(RECT.decode(cr)));
             dumpChild(ch, indent + '  ');
-            ch = gui.GetWindow(ch, 2 /* GetWindowCmd.NEXT */);
+            ch = GetWindow(ch, 2 /* GetWindowCmd.NEXT */);
         }
         if (n === 0)
             console.log(indent + '(no children)');

package/lib/dumpRects.ts

@@ -1,19 +1,27 @@
 import * as os from 'os'
 import * as gui from 'gui'
 import { GetWindowCmd } from '../constants'
+import { GetClientRect, GetWindow, GetWindowRect, GetWindowText, GetWindowTextLength } from '../lib/windows/user32.js'
+import { WCHAR } from '../lib/ffi/bind.js'
+import { RECT } from '../lib/windows/structs.js'
 
 export function startDumpRects(rootHwnd: gui.HWND, intervalMs: number = 3000): void {
   function dumpChild(parent: gui.HWND, indent: string): void {
-    var ch = gui.GetWindow(parent, GetWindowCmd.CHILD)
+    var ch = GetWindow(parent, GetWindowCmd.CHILD)
     var n = 0
     while (ch) {
       n++
-      var wr = gui.GetWindowRect(ch)
-      var cr = gui.GetClientRect(ch)
-      var txt = String(gui.GetWindowText(ch) || '').slice(0, 16)
-      console.log(indent + '[' + n + '] hwnd=' + String(ch) + ' txt="' + txt + '" wr=' + JSON.stringify(wr) + ' cr=' + JSON.stringify(cr))
+      const wr = RECT.alloc()
+      const cr = RECT.alloc()
+      GetWindowRect(ch, wr.ptr)
+      GetClientRect(ch, cr.ptr)
+      const cap = GetWindowTextLength(ch) + 1
+      const textBuf = WCHAR.alloc(cap)
+      GetWindowText(ch, textBuf, cap)
+      var txt = WCHAR.decode(textBuf).slice(0, 16)
+      console.log(indent + '[' + n + '] hwnd=' + String(ch) + ' txt="' + txt + '" wr=' + JSON.stringify(RECT.decode(wr)) + ' cr=' + JSON.stringify(RECT.decode(cr)))
       dumpChild(ch, indent + '  ')
-      ch = gui.GetWindow(ch, GetWindowCmd.NEXT)
+      ch = GetWindow(ch, GetWindowCmd.NEXT)
     }
     if (n === 0) console.log(indent + '(no children)')
   }

package/lib/ffi/bind.js

@@ -1,7 +1,6 @@
 import * as ffi from 'ffi';
 import * as os from 'os';
 import * as std from 'std';
-import * as win from 'win';
 import '../text-codec.js';
 import { cTokenToType, isCPtrToken, isCValToken, valName, normToken, PTR_SIZE, ptrName, readScalar, writeSlot, PtrArrayBuffer } from './ctype.js';
 // CodecMap 的值是结构形（size 只在 StructDef 上、不属 Codec 契约），统一走 unknown
@@ -14,7 +13,7 @@ function loadDll(dll) {
     const cached = _dllCache.get(dll);
     if (cached !== undefined)
         return cached;
-    const loaded = win.LoadLibrary(dll);
+    const loaded = ffi.LoadLibrary(dll);
     if (!loaded)
         throw new Error(`ffi-bind: LoadLibrary("${dll}") failed`);
     _dllCache.set(dll, loaded);
@@ -55,6 +54,8 @@ function parseSig(sig) {
         sig,
     };
 }
+/** proc 是 GetProcAddress 拿到的函数地址（<FARPROC>ptr）：调用方已校验非空，故收窄后的
+ *  Ptr 而非 MaybePtr；品牌只在绑定层内部走，落到 ffiCall 的 uintptr 槽（number）时脱落。 */
 function makeFn(proc, sig, encoders, decoders) {
     const ps = parseSig(sig);
     // 按值位的能力校验前移到绑定期（模块加载即炸，不留到首个调用）：布局缺位 / 非结构
@@ -296,7 +297,7 @@ const builtinCodecs = { WCHAR, BYTE };
  *  只需传一次（与运行时 `decoders ?? encoders` 同构：都只在实参缺省时生效，
  *  显式传空对象不 fallback）。内建 WCHAR/BYTE 无条件参与两张表。 */
 export function bind(dll, name, sig, encoders, decoders) {
-    const proc = win.GetProcAddress(loadDll(dll), name);
+    const proc = ffi.GetProcAddress(loadDll(dll), name);
     if (!proc)
         throw new Error(`ffi-bind: proc "${name}" not found in ${dll}`);
     const effDec = decoders ?? encoders;
@@ -310,7 +311,7 @@ export function bindLib(dll, map, encoders, decoders) {
     const encTable = { ...builtinCodecs, ...encoders };
     const decTable = { ...builtinCodecs, ...(effDec ?? {}) };
     for (const [name, sig] of Object.entries(map)) {
-        const proc = win.GetProcAddress(h, name);
+        const proc = ffi.GetProcAddress(h, name);
         if (!proc)
             throw new Error(`ffi-bind: proc "${name}" not found in ${dll}`);
         out[name] = makeFn(proc, sig, encTable, decTable);