quickwin 2.2.0 → 2.3.0

package/lib/react-qw/index.js

@@ -10,7 +10,7 @@ function ensureDefaultClass() {
         return DEFAULT_CLASS;
     gui.RegisterClass(DEFAULT_CLASS, (hwnd, msg, wParam, lParam) => {
         const entry = rootMap.get(hwnd);
-        if (msg === 2 /* gui.WmMsg.DESTROY */ && entry) {
+        if (msg === 2 /* WmMsg.DESTROY */ && entry) {
             rootMap.delete(hwnd);
             reconciler.updateContainer(null, entry.root, null, () => {
                 instancesByHwnd.delete(hwnd);
@@ -19,7 +19,7 @@ function ensureDefaultClass() {
         const result = entry?.onEvent?.({ hwnd, msg, wParam, lParam });
         if (typeof result === 'number')
             return result;
-        if (msg === 5 /* gui.WmMsg.SIZE */)
+        if (msg === 5 /* WmMsg.SIZE */)
             forceFlexLayout(hwnd);
         return DefWindowProc(hwnd, msg, wParam, lParam);
     });
@@ -31,15 +31,15 @@ export function createRoot(container) {
     if (typeof container === 'object') {
         const cfg = container;
         const className = ensureDefaultClass();
-        const ws = (cfg.ws ?? 0) | 13565952 /* gui.WindowStyle.OVERLAPPEDWINDOW */;
+        const ws = (cfg.ws ?? 0) | 13565952 /* WindowStyle.OVERLAPPEDWINDOW */;
         const w = (cfg.width ?? 800) * scaleFactor;
         const h = (cfg.height ?? 600) * scaleFactor;
         // GetScreenSize 等价内联：SM_CXSCREEN=0 / SM_CYSCREEN=1
         const [sw, sh] = [GetSystemMetrics(0), GetSystemMetrics(1)];
         const x = cfg.x === undefined ? ((sw - w) / 2) | 0
-            : cfg.x === -2147483648 /* gui.CreatePos.USEDEFAULT */ ? -2147483648 /* gui.CreatePos.USEDEFAULT */ : cfg.x * scaleFactor;
+            : cfg.x === -2147483648 /* CreatePos.USEDEFAULT */ ? -2147483648 /* CreatePos.USEDEFAULT */ : cfg.x * scaleFactor;
         const y = cfg.y === undefined ? ((sh - h) / 2) | 0
-            : cfg.y === -2147483648 /* gui.CreatePos.USEDEFAULT */ ? -2147483648 /* gui.CreatePos.USEDEFAULT */ : cfg.y * scaleFactor;
+            : cfg.y === -2147483648 /* CreatePos.USEDEFAULT */ ? -2147483648 /* CreatePos.USEDEFAULT */ : cfg.y * scaleFactor;
         const hwin = gui.CreateWindow(className, cfg.text || '', ws, x, y, w, h, null, null);
         if (!hwin)
             throw new Error('CreateWindow failed');

package/lib/react-qw/index.ts

@@ -2,6 +2,7 @@ import * as gui from 'gui'
 import React from 'react'
 import { DefWindowProc, GetSystemMetrics } from '../windows/user32.js'
 import reconciler, { scaleFactor, instancesByHwnd, forceFlexLayout, type Instance } from './reconciler.js'
+import { CreatePos, WindowStyle, WmMsg } from '../../constants'
 
 const noop = () => { }
 
@@ -24,7 +25,7 @@ function ensureDefaultClass() {
   if (defaultClassRegistered) return DEFAULT_CLASS
   gui.RegisterClass(DEFAULT_CLASS, (hwnd, msg, wParam, lParam) => {
     const entry = rootMap.get(hwnd)
-    if (msg === gui.WmMsg.DESTROY && entry) {
+    if (msg === WmMsg.DESTROY && entry) {
       rootMap.delete(hwnd)
       reconciler.updateContainer(null, entry.root, null, () => {
         instancesByHwnd.delete(hwnd)
@@ -32,7 +33,7 @@ function ensureDefaultClass() {
     }
     const result = entry?.onEvent?.({ hwnd, msg, wParam, lParam })
     if (typeof result === 'number') return result
-    if (msg === gui.WmMsg.SIZE) forceFlexLayout(hwnd)
+    if (msg === WmMsg.SIZE) forceFlexLayout(hwnd)
     return DefWindowProc(hwnd, msg, wParam, lParam)
   })
   defaultClassRegistered = true
@@ -44,16 +45,16 @@ export function createRoot(container: gui.HWND | RootWindowConfig) {
   if (typeof container === 'object') {
     const cfg = container
     const className = ensureDefaultClass()
-    const ws = (cfg.ws ?? 0) | gui.WindowStyle.OVERLAPPEDWINDOW
+    const ws = (cfg.ws ?? 0) | WindowStyle.OVERLAPPEDWINDOW
     const w = (cfg.width ?? 800) * scaleFactor
     const h = (cfg.height ?? 600) * scaleFactor
     // GetScreenSize 等价内联：SM_CXSCREEN=0 / SM_CYSCREEN=1
     const [sw, sh] = [GetSystemMetrics(0), GetSystemMetrics(1)]
     const x = cfg.x === undefined ? ((sw - w) / 2) | 0
-      : cfg.x === gui.CreatePos.USEDEFAULT ? gui.CreatePos.USEDEFAULT
+      : cfg.x === CreatePos.USEDEFAULT ? CreatePos.USEDEFAULT
       : cfg.x * scaleFactor
     const y = cfg.y === undefined ? ((sh - h) / 2) | 0
-      : cfg.y === gui.CreatePos.USEDEFAULT ? gui.CreatePos.USEDEFAULT
+      : cfg.y === CreatePos.USEDEFAULT ? CreatePos.USEDEFAULT
       : cfg.y * scaleFactor
     const hwin = gui.CreateWindow(className, cfg.text || '', ws, x, y, w, h, null, null)
     if (!hwin) throw new Error('CreateWindow failed')

package/lib/react-qw/props.js

@@ -12,21 +12,21 @@ export function applyProps(instance, newProps, _oldProps) {
     if (textVal !== undefined) {
         let cursor = -1;
         if (instance.type === 'EDIT') {
-            const sel = gui.SendMessage(hwnd, 176 /* gui.EditMsg.GETSEL */, 0, 0);
+            const sel = gui.SendMessage(hwnd, 176 /* EditMsg.GETSEL */, 0, 0);
             cursor = sel >>> 16;
         }
         SetWindowText(hwnd, textVal);
         if (instance.type === 'EDIT' && cursor >= 0) {
-            gui.SendMessage(hwnd, 177 /* gui.EditMsg.SETSEL */, cursor, cursor);
+            gui.SendMessage(hwnd, 177 /* EditMsg.SETSEL */, cursor, cursor);
         }
     }
     if ('disabled' in newProps) {
         EnableWindow(hwnd, !newProps.disabled ? 1 : 0);
     }
     if ('hidden' in newProps) {
-        gui.ShowWindow(hwnd, newProps.hidden ? 0 /* gui.ShowWindowCmd.HIDE */ : 5 /* gui.ShowWindowCmd.SHOW */);
+        gui.ShowWindow(hwnd, newProps.hidden ? 0 /* ShowWindowCmd.HIDE */ : 5 /* ShowWindowCmd.SHOW */);
     }
     if ('visible' in newProps) {
-        gui.ShowWindow(hwnd, newProps.visible ? 5 /* gui.ShowWindowCmd.SHOW */ : 0 /* gui.ShowWindowCmd.HIDE */);
+        gui.ShowWindow(hwnd, newProps.visible ? 5 /* ShowWindowCmd.SHOW */ : 0 /* ShowWindowCmd.HIDE */);
     }
 }

package/lib/react-qw/props.ts

@@ -1,6 +1,7 @@
 import * as gui from 'gui'
 import { SetWindowText, EnableWindow } from '../windows/user32.js'
 import type { Instance, Props } from './reconciler.js'
+import { EditMsg, ShowWindowCmd } from '../../constants'
 
 export function applyProps(
   instance: Instance,
@@ -20,21 +21,21 @@ export function applyProps(
   if (textVal !== undefined) {
     let cursor = -1
     if (instance.type === 'EDIT') {
-      const sel = gui.SendMessage(hwnd, gui.EditMsg.GETSEL, 0, 0)
+      const sel = gui.SendMessage(hwnd, EditMsg.GETSEL, 0, 0)
       cursor = sel >>> 16
     }
     SetWindowText(hwnd, textVal)
     if (instance.type === 'EDIT' && cursor >= 0) {
-      gui.SendMessage(hwnd, gui.EditMsg.SETSEL, cursor, cursor)
+      gui.SendMessage(hwnd, EditMsg.SETSEL, cursor, cursor)
     }
   }
   if ('disabled' in newProps) {
     EnableWindow(hwnd, !newProps.disabled ? 1 : 0)
   }
   if ('hidden' in newProps) {
-    gui.ShowWindow(hwnd, newProps.hidden ? gui.ShowWindowCmd.HIDE : gui.ShowWindowCmd.SHOW)
+    gui.ShowWindow(hwnd, newProps.hidden ? ShowWindowCmd.HIDE : ShowWindowCmd.SHOW)
   }
   if ('visible' in newProps) {
-    gui.ShowWindow(hwnd, newProps.visible ? gui.ShowWindowCmd.SHOW : gui.ShowWindowCmd.HIDE)
+    gui.ShowWindow(hwnd, newProps.visible ? ShowWindowCmd.SHOW : ShowWindowCmd.HIDE)
   }
 }

package/lib/react-qw/reconciler.js

@@ -24,7 +24,7 @@ function isDelayedControl(winClass) {
 }
 function setupWindowProc(instance, hwnd) {
     instance.hwnd = hwnd;
-    const oldProc = GetWindowLongPtr(hwnd, -4 /* gui.Gwlp.WNDPROC */);
+    const oldProc = GetWindowLongPtr(hwnd, -4 /* Gwlp.WNDPROC */);
     instancesByHwnd.set(hwnd, instance);
     gui.SetWindowProc(hwnd, (hwnd, msg, wParam, lParam) => {
         const ev = instance.props.onEvent;
@@ -42,10 +42,10 @@ function ensureChildWindow(child, parentHwnd) {
     if (child.hwnd !== null)
         return child.hwnd;
     const sty = child.props.style || {};
-    const ws = ((child.props.ws ?? 0) | 1073741824 /* gui.WindowStyle.CHILD */) & ~268435456 /* gui.WindowStyle.VISIBLE */;
+    const ws = ((child.props.ws ?? 0) | 1073741824 /* WindowStyle.CHILD */) & ~268435456 /* WindowStyle.VISIBLE */;
     const hwnd = gui.CreateWindow(child.type, child.props.text || '', ws, 0, 0, (typeof sty.width === 'number' ? sty.width : 100) * scaleFactor, (typeof sty.height === 'number' ? sty.height : 30) * scaleFactor, parentHwnd, null);
     if (dpiFont)
-        gui.SendMessage(hwnd, 48 /* gui.WmMsg.SETFONT */, dpiFont, 1);
+        gui.SendMessage(hwnd, 48 /* WmMsg.SETFONT */, dpiFont, 1);
     setupWindowProc(child, hwnd);
     return hwnd;
 }
@@ -104,7 +104,7 @@ function runFlexLayout(inst) {
         if (lr && lr.x === r.x && lr.y === r.y && lr.w === r.width && lr.h === r.height)
             continue;
         console.log('flex: set', child.type, child.hwnd, 'to', r.x, r.y, r.width, r.height);
-        SetWindowPos(child.hwnd, 0 /* gui.SetWindowPosHwnd.TOP */, (r.x + pl) * scaleFactor, (r.y + pt) * scaleFactor, r.width * scaleFactor, r.height * scaleFactor, 64 /* gui.SetWindowPosFlag.SWP_SHOWWINDOW */);
+        SetWindowPos(child.hwnd, 0 /* SetWindowPosHwnd.TOP */, (r.x + pl) * scaleFactor, (r.y + pt) * scaleFactor, r.width * scaleFactor, r.height * scaleFactor, 64 /* SetWindowPosFlag.SWP_SHOWWINDOW */);
         InvalidateRect(child.hwnd, NULL, 1);
         child.lastRect = { x: r.x, y: r.y, w: r.width, h: r.height };
     }
@@ -133,12 +133,12 @@ const hostConfig = {
         }
         const sty = props.style || {};
         // reconciler 创建的都是子窗口，确保 WS_CHILD 避免定位异常；创建时不带 WS_VISIBLE 防止 (0,0) 闪烁
-        const ws = ((props.ws ?? 0) | 1073741824 /* gui.WindowStyle.CHILD */) & ~268435456 /* gui.WindowStyle.VISIBLE */;
+        const ws = ((props.ws ?? 0) | 1073741824 /* WindowStyle.CHILD */) & ~268435456 /* WindowStyle.VISIBLE */;
         if (DEBUG)
             console.log('[reconciler] CreateWindow args:', winClass, props.text ?? '', ws, 0, 0, sty.width ?? 100, sty.height ?? 30, rootContainer);
         const hwnd = gui.CreateWindow(winClass, props.text ?? '', ws, 0, 0, (typeof sty.width === 'number' ? sty.width : 100) * scaleFactor, (typeof sty.height === 'number' ? sty.height : 30) * scaleFactor, rootContainer, null);
         if (dpiFont)
-            gui.SendMessage(hwnd, 48 /* gui.WmMsg.SETFONT */, dpiFont, 1);
+            gui.SendMessage(hwnd, 48 /* WmMsg.SETFONT */, dpiFont, 1);
         if (DEBUG)
             console.log('[reconciler] createInstance hwnd result:', hwnd, 'null?', hwnd === null);
         const instance = { hwnd, type: winClass, props, children: [] };
@@ -260,19 +260,19 @@ const hostConfig = {
     },
     hideInstance(instance) {
         if (instance.hwnd !== null)
-            gui.ShowWindow(instance.hwnd, 0 /* gui.ShowWindowCmd.HIDE */);
+            gui.ShowWindow(instance.hwnd, 0 /* ShowWindowCmd.HIDE */);
     },
     hideTextInstance(instance) {
         if (instance.hwnd !== null)
-            gui.ShowWindow(instance.hwnd, 0 /* gui.ShowWindowCmd.HIDE */);
+            gui.ShowWindow(instance.hwnd, 0 /* ShowWindowCmd.HIDE */);
     },
     unhideInstance(instance, _props) {
         if (instance.hwnd !== null)
-            gui.ShowWindow(instance.hwnd, 5 /* gui.ShowWindowCmd.SHOW */);
+            gui.ShowWindow(instance.hwnd, 5 /* ShowWindowCmd.SHOW */);
     },
     unhideTextInstance(instance, _text) {
         if (instance.hwnd !== null)
-            gui.ShowWindow(instance.hwnd, 5 /* gui.ShowWindowCmd.SHOW */);
+            gui.ShowWindow(instance.hwnd, 5 /* ShowWindowCmd.SHOW */);
     },
     shouldSetTextContent(_type, props) {
         return typeof props.children === 'string' || typeof props.children === 'number';

package/lib/react-qw/reconciler.ts

@@ -10,6 +10,7 @@ import { applyProps } from './props.js'
 import { calculateFlexLayout, type FlexStyle } from './layout.js'
 import { getButtonIdealSize, measureTextForHwnd } from '../text-measure.js'
 import type { WIntrinsicProps } from './jsx.js'
+import { Gwlp, SetWindowPosFlag, SetWindowPosHwnd, ShowWindowCmd, WindowStyle, WmMsg } from '../../constants'
 
 // DEBUG 由 esbuild --define 在 bundle 时替换（见 build.ts），生产环境为 false
 declare const DEBUG: boolean
@@ -42,7 +43,7 @@ function isDelayedControl(winClass: string): boolean {
 
 function setupWindowProc(instance: Instance, hwnd: gui.HWND) {
   instance.hwnd = hwnd
-  const oldProc = GetWindowLongPtr(hwnd, gui.Gwlp.WNDPROC)
+  const oldProc = GetWindowLongPtr(hwnd, Gwlp.WNDPROC)
   instancesByHwnd.set(hwnd, instance)
   gui.SetWindowProc(hwnd, (hwnd: gui.HWND, msg: number, wParam: number, lParam: number) => {
     const ev = instance.props.onEvent
@@ -59,14 +60,14 @@ function setupWindowProc(instance: Instance, hwnd: gui.HWND) {
 function ensureChildWindow(child: Instance, parentHwnd: gui.HWND): gui.HWND {
   if (child.hwnd !== null) return child.hwnd
   const sty = child.props.style || {}
-  const ws = ((child.props.ws ?? 0) | gui.WindowStyle.CHILD) & ~gui.WindowStyle.VISIBLE
+  const ws = ((child.props.ws ?? 0) | WindowStyle.CHILD) & ~WindowStyle.VISIBLE
   const hwnd = gui.CreateWindow(
     child.type, child.props.text || '', ws,
     0, 0,
     (typeof sty.width === 'number' ? sty.width : 100) * scaleFactor, (typeof sty.height === 'number' ? sty.height : 30) * scaleFactor,
     parentHwnd, null
   )!
-  if (dpiFont) gui.SendMessage(hwnd, gui.WmMsg.SETFONT, dpiFont, 1)
+  if (dpiFont) gui.SendMessage(hwnd, WmMsg.SETFONT, dpiFont, 1)
   setupWindowProc(child, hwnd)
   return hwnd
 }
@@ -118,7 +119,7 @@ function runFlexLayout(inst: Instance) {
     const lr = child.lastRect
     if (lr && lr.x === r.x && lr.y === r.y && lr.w === r.width && lr.h === r.height) continue
     console.log('flex: set', child.type, child.hwnd, 'to', r.x, r.y, r.width, r.height)
-    SetWindowPos(child.hwnd!, gui.SetWindowPosHwnd.TOP, (r.x + pl) * scaleFactor, (r.y + pt) * scaleFactor, r.width * scaleFactor, r.height * scaleFactor, gui.SetWindowPosFlag.SWP_SHOWWINDOW)
+    SetWindowPos(child.hwnd!, SetWindowPosHwnd.TOP, (r.x + pl) * scaleFactor, (r.y + pt) * scaleFactor, r.width * scaleFactor, r.height * scaleFactor, SetWindowPosFlag.SWP_SHOWWINDOW)
     InvalidateRect(child.hwnd!, NULL, 1)
     child.lastRect = { x: r.x, y: r.y, w: r.width, h: r.height }
   }
@@ -164,7 +165,7 @@ const hostConfig: QuickWinHostConfig = {
     }
     const sty = props.style || {}
     // reconciler 创建的都是子窗口，确保 WS_CHILD 避免定位异常；创建时不带 WS_VISIBLE 防止 (0,0) 闪烁
-    const ws = ((props.ws ?? 0) | gui.WindowStyle.CHILD) & ~gui.WindowStyle.VISIBLE
+    const ws = ((props.ws ?? 0) | WindowStyle.CHILD) & ~WindowStyle.VISIBLE
     if (DEBUG) console.log('[reconciler] CreateWindow args:', winClass, props.text ?? '', ws, 0, 0, sty.width ?? 100, sty.height ?? 30, rootContainer)
     const hwnd = gui.CreateWindow(
       winClass, props.text ?? '', ws,
@@ -172,7 +173,7 @@ const hostConfig: QuickWinHostConfig = {
       (typeof sty.width === 'number' ? sty.width : 100) * scaleFactor, (typeof sty.height === 'number' ? sty.height : 30) * scaleFactor,
       rootContainer, null
     )!
-    if (dpiFont) gui.SendMessage(hwnd, gui.WmMsg.SETFONT, dpiFont, 1)
+    if (dpiFont) gui.SendMessage(hwnd, WmMsg.SETFONT, dpiFont, 1)
     if (DEBUG) console.log('[reconciler] createInstance hwnd result:', hwnd, 'null?', hwnd === null)
     const instance: Instance = { hwnd, type: winClass, props, children: [] }
     setupWindowProc(instance, hwnd)
@@ -283,19 +284,19 @@ const hostConfig: QuickWinHostConfig = {
   },
 
   hideInstance(instance: Instance) {
-    if (instance.hwnd !== null) gui.ShowWindow(instance.hwnd, gui.ShowWindowCmd.HIDE)
+    if (instance.hwnd !== null) gui.ShowWindow(instance.hwnd, ShowWindowCmd.HIDE)
   },
 
   hideTextInstance(instance: Instance) {
-    if (instance.hwnd !== null) gui.ShowWindow(instance.hwnd, gui.ShowWindowCmd.HIDE)
+    if (instance.hwnd !== null) gui.ShowWindow(instance.hwnd, ShowWindowCmd.HIDE)
   },
 
   unhideInstance(instance: Instance, _props: Props) {
-    if (instance.hwnd !== null) gui.ShowWindow(instance.hwnd, gui.ShowWindowCmd.SHOW)
+    if (instance.hwnd !== null) gui.ShowWindow(instance.hwnd, ShowWindowCmd.SHOW)
   },
 
   unhideTextInstance(instance: Instance, _text: string) {
-    if (instance.hwnd !== null) gui.ShowWindow(instance.hwnd, gui.ShowWindowCmd.SHOW)
+    if (instance.hwnd !== null) gui.ShowWindow(instance.hwnd, ShowWindowCmd.SHOW)
   },
 
   shouldSetTextContent(_type: string, props: Props) {

package/lib/text-measure.js

@@ -7,14 +7,14 @@ export function measureText(hdc, text, maxWidth) {
     // rect 双向位不注册 encoder（CALCRECT 就地写回）：encode(初值) 新建 + DeepPartial 初值一步到位
     //（left/top/bottom 缺省跳过保持 0）→ 传 .ptr → decode 读回
     const r = RECT.encode({ right: maxWidth });
-    DrawText(hdc, text, -1, r.ptr, 1024 /* gui.DrawTextFlag.CALCRECT */);
+    DrawText(hdc, text, -1, r.ptr, 1024 /* DrawTextFlag.CALCRECT */);
     const { right, bottom } = RECT.decode(r);
     return { width: right, height: bottom };
 }
 export function getButtonIdealSize(hwnd) {
     // SIZE 纯出参位（GETIDEALSIZE 就地写回）：alloc → 传 .ptr → decode 读回
     const size = SIZE.alloc();
-    gui.SendMessage(hwnd, 5633 /* gui.ButtonExtMsg.GETIDEALSIZE */, 0, size.ptr);
+    gui.SendMessage(hwnd, 5633 /* ButtonExtMsg.GETIDEALSIZE */, 0, size.ptr);
     const { cx, cy } = SIZE.decode(size);
     return { width: cx, height: cy };
 }
@@ -23,7 +23,7 @@ export function measureTextForHwnd(hwnd, text) {
     if (!hdc)
         return { width: 0, height: 0 };
     // SendMessage 返回 LRESULT 裸数；GETFONT 语义为 HFONT——断言进 GDI 对象品牌链
-    const hFont = gui.SendMessage(hwnd, 49 /* gui.WmMsg.GETFONT */, 0, 0);
+    const hFont = gui.SendMessage(hwnd, 49 /* WmMsg.GETFONT */, 0, 0);
     const oldFont = hFont ? SelectObject(hdc, hFont) : NULL;
     const result = measureText(hdc, text, 0);
     if (hFont)

package/lib/text-measure.ts

@@ -3,12 +3,13 @@ import * as gui from 'gui'
 import { DrawText, GetDC, ReleaseDC } from './windows/user32.js'
 import { SelectObject } from './windows/gdi32.js'
 import { RECT, SIZE } from './windows/structs.js'
+import { ButtonExtMsg, DrawTextFlag, WmMsg } from '../constants'
 
 export function measureText(hdc: Ptr<'HDC'>, text: string, maxWidth: number): { width: number; height: number } {
     // rect 双向位不注册 encoder（CALCRECT 就地写回）：encode(初值) 新建 + DeepPartial 初值一步到位
     //（left/top/bottom 缺省跳过保持 0）→ 传 .ptr → decode 读回
     const r = RECT.encode({ right: maxWidth })
-    DrawText(hdc, text, -1, r.ptr, gui.DrawTextFlag.CALCRECT)
+    DrawText(hdc, text, -1, r.ptr, DrawTextFlag.CALCRECT)
     const { right, bottom } = RECT.decode(r)
     return { width: right, height: bottom }
 }
@@ -16,7 +17,7 @@ export function measureText(hdc: Ptr<'HDC'>, text: string, maxWidth: number): {
 export function getButtonIdealSize(hwnd: gui.HWND): { width: number; height: number } {
     // SIZE 纯出参位（GETIDEALSIZE 就地写回）：alloc → 传 .ptr → decode 读回
     const size = SIZE.alloc()
-    gui.SendMessage(hwnd, gui.ButtonExtMsg.GETIDEALSIZE, 0, size.ptr)
+    gui.SendMessage(hwnd, ButtonExtMsg.GETIDEALSIZE, 0, size.ptr)
     const { cx, cy } = SIZE.decode(size)
     return { width: cx, height: cy }
 }
@@ -25,7 +26,7 @@ export function measureTextForHwnd(hwnd: gui.HWND, text: string): { width: numbe
     const hdc = GetDC(hwnd)
     if (!hdc) return { width: 0, height: 0 }
     // SendMessage 返回 LRESULT 裸数；GETFONT 语义为 HFONT——断言进 GDI 对象品牌链
-    const hFont = gui.SendMessage(hwnd, gui.WmMsg.GETFONT, 0, 0) as Ptr<'HGDIOBJ'>
+    const hFont = gui.SendMessage(hwnd, WmMsg.GETFONT, 0, 0) as Ptr<'HGDIOBJ'>
     const oldFont = hFont ? SelectObject(hdc, hFont) : NULL
     const result = measureText(hdc, text, 0)
     if (hFont) SelectObject(hdc, oldFont)

package/lib/websocket.js

@@ -273,16 +273,16 @@ class WebSocketImpl {
             if (this._processingHandshake)
                 return;
             if (resolved && state === 'open') {
-                if (event.lNetworkEvents & 1 /* sock.FdEvent.FD_READ */) {
+                if (event.lNetworkEvents & 1 /* FdEvent.FD_READ */) {
                     this._onData();
                 }
-                if (event.lNetworkEvents & 32 /* sock.FdEvent.FD_CLOSE */) {
+                if (event.lNetworkEvents & 32 /* FdEvent.FD_CLOSE */) {
                     this._cleanup();
                     this._setState(State.CLOSED);
                 }
                 return;
             }
-            if (event.lNetworkEvents & 16 /* sock.FdEvent.FD_CONNECT */) {
+            if (event.lNetworkEvents & 16 /* FdEvent.FD_CONNECT */) {
                 const errCode = event.iErrorCode[0];
                 if (errCode !== 0) {
                     doError(new Error('Connection failed: ' + errCode));
@@ -296,10 +296,10 @@ class WebSocketImpl {
                         return;
                     }
                     if (this._options.rejectUnauthorized === false) {
-                        wolfssl.wolfSSL_CTX_set_verify(this._ctx, 0 /* wolfssl.VerifyMode.SSL_VERIFY_NONE */);
+                        wolfssl.wolfSSL_CTX_set_verify(this._ctx, 0 /* VerifyMode.SSL_VERIFY_NONE */);
                     }
                     else {
-                        wolfssl.wolfSSL_CTX_set_verify(this._ctx, 1 /* wolfssl.VerifyMode.SSL_VERIFY_PEER */);
+                        wolfssl.wolfSSL_CTX_set_verify(this._ctx, 1 /* VerifyMode.SSL_VERIFY_PEER */);
                         wolfssl.loadTrustedCerts(this._ctx);
                     }
                     this._ssl = wolfssl.wolfSSL_new(this._ctx);
@@ -310,7 +310,7 @@ class WebSocketImpl {
                     wolfssl.wolfSSL_set_fd(this._ssl, sock.get_fd(fd));
                     const sniHost = host;
                     if (sniHost) {
-                        wolfssl.wolfSSL_UseSNI(this._ssl, 0 /* wolfssl.SniType.WOLFSSL_SNI_HOST_NAME */, sniHost);
+                        wolfssl.wolfSSL_UseSNI(this._ssl, 0 /* SniType.WOLFSSL_SNI_HOST_NAME */, sniHost);
                         if (this._options.rejectUnauthorized !== false) {
                             wolfssl.wolfSSL_check_domain_name(this._ssl, sniHost);
                         }
@@ -322,21 +322,21 @@ class WebSocketImpl {
                     state = 'request';
                 }
             }
-            if ((event.lNetworkEvents & 1 /* sock.FdEvent.FD_READ */) || (event.lNetworkEvents & 2 /* sock.FdEvent.FD_WRITE */)) {
+            if ((event.lNetworkEvents & 1 /* FdEvent.FD_READ */) || (event.lNetworkEvents & 2 /* FdEvent.FD_WRITE */)) {
                 if (state === 'handshake') {
                     if (!this._ssl) {
                         doError(new Error('TLS not initialized'));
                         return;
                     }
                     const ret = wolfssl.wolfSSL_connect(this._ssl);
-                    if (ret === 1 /* wolfssl.ReturnCode.SSL_SUCCESS */) {
+                    if (ret === 1 /* ReturnCode.SSL_SUCCESS */) {
                         this._sendRawStr(request);
                         state = 'request';
                     }
                     else {
                         const err = wolfssl.wolfSSL_get_error(this._ssl, ret);
-                        if (err !== 2 /* wolfssl.ErrorCode.WOLFSSL_ERROR_WANT_READ */ &&
-                            err !== 3 /* wolfssl.ErrorCode.WOLFSSL_ERROR_WANT_WRITE */) {
+                        if (err !== 2 /* WolfsslErrorCode.WOLFSSL_ERROR_WANT_READ */ &&
+                            err !== 3 /* WolfsslErrorCode.WOLFSSL_ERROR_WANT_WRITE */) {
                             doError(new Error('TLS handshake failed: ' + err));
                         }
                     }
@@ -352,10 +352,10 @@ class WebSocketImpl {
                             }
                             else {
                                 const err = wolfssl.wolfSSL_get_error(this._ssl, n);
-                                if (err === 2 /* wolfssl.ErrorCode.WOLFSSL_ERROR_WANT_READ */ ||
-                                    err === 3 /* wolfssl.ErrorCode.WOLFSSL_ERROR_WANT_WRITE */)
+                                if (err === 2 /* WolfsslErrorCode.WOLFSSL_ERROR_WANT_READ */ ||
+                                    err === 3 /* WolfsslErrorCode.WOLFSSL_ERROR_WANT_WRITE */)
                                     break;
-                                if (n === 0 || err === 6 /* wolfssl.ErrorCode.WOLFSSL_ERROR_ZERO_RETURN */)
+                                if (n === 0 || err === 6 /* WolfsslErrorCode.WOLFSSL_ERROR_ZERO_RETURN */)
                                     break;
                                 doError(new Error('TLS read failed: ' + err));
                                 return;
@@ -417,7 +417,7 @@ class WebSocketImpl {
                     }
                 }
             }
-            if (event.lNetworkEvents & 32 /* sock.FdEvent.FD_CLOSE */) {
+            if (event.lNetworkEvents & 32 /* FdEvent.FD_CLOSE */) {
                 if (state !== 'open') {
                     doError(new Error('Connection closed'));
                 }
@@ -464,10 +464,10 @@ class WebSocketImpl {
                 }
                 else {
                     const err = wolfssl.wolfSSL_get_error(this._ssl, n);
-                    if (err === 2 /* wolfssl.ErrorCode.WOLFSSL_ERROR_WANT_READ */ ||
-                        err === 3 /* wolfssl.ErrorCode.WOLFSSL_ERROR_WANT_WRITE */)
+                    if (err === 2 /* WolfsslErrorCode.WOLFSSL_ERROR_WANT_READ */ ||
+                        err === 3 /* WolfsslErrorCode.WOLFSSL_ERROR_WANT_WRITE */)
                         break;
-                    if (n === 0 || err === 6 /* wolfssl.ErrorCode.WOLFSSL_ERROR_ZERO_RETURN */)
+                    if (n === 0 || err === 6 /* WolfsslErrorCode.WOLFSSL_ERROR_ZERO_RETURN */)
                         break;
                     this._fireError(new Error('TLS read failed: ' + err));
                     if (this._state !== State.CLOSED)

package/lib/websocket.ts

@@ -2,6 +2,7 @@ import '../lib/polyfill.js'
 import * as sock from 'sock'
 import * as wolfssl from 'wolfssl'
 import * as os from 'os'
+import { FdEvent, ReturnCode, SniType, VerifyMode, WolfsslErrorCode } from '../constants'
 
 // ── Constants ──
 
@@ -301,17 +302,17 @@ class WebSocketImpl {
         sock.set_on_event(fd, async (event: { lNetworkEvents: number; iErrorCode: number[] }) => {
             if (this._processingHandshake) return
             if (resolved && state === 'open') {
-                if (event.lNetworkEvents & sock.FdEvent.FD_READ) {
+                if (event.lNetworkEvents & FdEvent.FD_READ) {
                     this._onData()
                 }
-                if (event.lNetworkEvents & sock.FdEvent.FD_CLOSE) {
+                if (event.lNetworkEvents & FdEvent.FD_CLOSE) {
                     this._cleanup()
                     this._setState(State.CLOSED)
                 }
                 return
             }
 
-            if (event.lNetworkEvents & sock.FdEvent.FD_CONNECT) {
+            if (event.lNetworkEvents & FdEvent.FD_CONNECT) {
                 const errCode = event.iErrorCode[0]
                 if (errCode !== 0) {
                     doError(new Error('Connection failed: ' + errCode))
@@ -322,9 +323,9 @@ class WebSocketImpl {
                     this._ctx = wolfssl.wolfSSL_CTX_new(method)
                     if (!this._ctx) { doError(new Error('SSL_CTX_new failed')); return }
                     if (this._options.rejectUnauthorized === false) {
-                        wolfssl.wolfSSL_CTX_set_verify(this._ctx, wolfssl.VerifyMode.SSL_VERIFY_NONE)
+                        wolfssl.wolfSSL_CTX_set_verify(this._ctx, VerifyMode.SSL_VERIFY_NONE)
                     } else {
-                        wolfssl.wolfSSL_CTX_set_verify(this._ctx, wolfssl.VerifyMode.SSL_VERIFY_PEER)
+                        wolfssl.wolfSSL_CTX_set_verify(this._ctx, VerifyMode.SSL_VERIFY_PEER)
                         wolfssl.loadTrustedCerts(this._ctx)
                     }
                     this._ssl = wolfssl.wolfSSL_new(this._ctx)
@@ -332,7 +333,7 @@ class WebSocketImpl {
                     wolfssl.wolfSSL_set_fd(this._ssl, sock.get_fd(fd))
                     const sniHost = host
                     if (sniHost) {
-                        wolfssl.wolfSSL_UseSNI(this._ssl, wolfssl.SniType.WOLFSSL_SNI_HOST_NAME, sniHost)
+                        wolfssl.wolfSSL_UseSNI(this._ssl, SniType.WOLFSSL_SNI_HOST_NAME, sniHost)
                         if (this._options.rejectUnauthorized !== false) {
                             wolfssl.wolfSSL_check_domain_name(this._ssl, sniHost)
                         }
@@ -344,17 +345,17 @@ class WebSocketImpl {
                 }
             }
 
-            if ((event.lNetworkEvents & sock.FdEvent.FD_READ) || (event.lNetworkEvents & sock.FdEvent.FD_WRITE)) {
+            if ((event.lNetworkEvents & FdEvent.FD_READ) || (event.lNetworkEvents & FdEvent.FD_WRITE)) {
                 if (state === 'handshake') {
                     if (!this._ssl) { doError(new Error('TLS not initialized')); return }
                     const ret = wolfssl.wolfSSL_connect(this._ssl)
-                    if (ret === wolfssl.ReturnCode.SSL_SUCCESS) {
+                    if (ret === ReturnCode.SSL_SUCCESS) {
                         this._sendRawStr(request)
                         state = 'request'
                     } else {
                         const err = wolfssl.wolfSSL_get_error(this._ssl, ret)
-                        if (err !== wolfssl.ErrorCode.WOLFSSL_ERROR_WANT_READ &&
-                            err !== wolfssl.ErrorCode.WOLFSSL_ERROR_WANT_WRITE) {
+                        if (err !== WolfsslErrorCode.WOLFSSL_ERROR_WANT_READ &&
+                            err !== WolfsslErrorCode.WOLFSSL_ERROR_WANT_WRITE) {
                             doError(new Error('TLS handshake failed: ' + err))
                         }
                     }
@@ -369,9 +370,9 @@ class WebSocketImpl {
                                 data = buf.slice(0, n)
                             } else {
                                 const err = wolfssl.wolfSSL_get_error(this._ssl, n)
-                                if (err === wolfssl.ErrorCode.WOLFSSL_ERROR_WANT_READ ||
-                                    err === wolfssl.ErrorCode.WOLFSSL_ERROR_WANT_WRITE) break
-                                if (n === 0 || err === wolfssl.ErrorCode.WOLFSSL_ERROR_ZERO_RETURN) break
+                                if (err === WolfsslErrorCode.WOLFSSL_ERROR_WANT_READ ||
+                                    err === WolfsslErrorCode.WOLFSSL_ERROR_WANT_WRITE) break
+                                if (n === 0 || err === WolfsslErrorCode.WOLFSSL_ERROR_ZERO_RETURN) break
                                 doError(new Error('TLS read failed: ' + err))
                                 return
                             }
@@ -431,7 +432,7 @@ class WebSocketImpl {
                 }
             }
 
-            if (event.lNetworkEvents & sock.FdEvent.FD_CLOSE) {
+            if (event.lNetworkEvents & FdEvent.FD_CLOSE) {
                 if (state !== 'open') {
                     doError(new Error('Connection closed'))
                 }
@@ -477,9 +478,9 @@ class WebSocketImpl {
                     data = buf.slice(0, n)
                 } else {
                     const err = wolfssl.wolfSSL_get_error(this._ssl, n)
-                    if (err === wolfssl.ErrorCode.WOLFSSL_ERROR_WANT_READ ||
-                        err === wolfssl.ErrorCode.WOLFSSL_ERROR_WANT_WRITE) break
-                    if (n === 0 || err === wolfssl.ErrorCode.WOLFSSL_ERROR_ZERO_RETURN) break
+                    if (err === WolfsslErrorCode.WOLFSSL_ERROR_WANT_READ ||
+                        err === WolfsslErrorCode.WOLFSSL_ERROR_WANT_WRITE) break
+                    if (n === 0 || err === WolfsslErrorCode.WOLFSSL_ERROR_ZERO_RETURN) break
                     this._fireError(new Error('TLS read failed: ' + err))
                     if (this._state !== State.CLOSED) this._setState(State.CLOSED)
                     return

package/lib/windows/advapi32.js

@@ -4,13 +4,13 @@ import { bind } from '../ffi/bind.js';
 const b = (name, sig) => bind('advapi32.dll', name, sig);
 /** 创建/打开子键（子键不存在则创建，含中间层级）
  *  @returns 0 = ERROR_SUCCESS
- *  @param args_0 hKey 父键：gui.HKey.CURRENT_USER / LOCAL_MACHINE 预定义键，或本族
+ *  @param args_0 hKey 父键：HKey.CURRENT_USER / LOCAL_MACHINE 预定义键，或本族
  *                Open/Create 返回的真实句柄（此位双来源，不标 @HKey——裸位收两种）
  *  @param args_1 lpSubKey 子键路径（'Software\\X\\Y'，可 NULL = 打开 hKey 自身副本）
  *  @param args_2 Reserved 保留，恒 0
  *  @param args_3 lpClass 键类名（一般 NULL）
  *  @param args_4 dwOptions 保留属性（恒 0）
- *  @param args_5 samDesired 访问掩码 gui.RegAccess.READ / SET_VALUE（标准组合常量按成员收录）
+ *  @param args_5 samDesired 访问掩码 RegAccess.READ / SET_VALUE（标准组合常量按成员收录）
  *  @param args_6 lpSecurityAttributes 安全描述符（一般 NULL）
  *  @param args_7 phkResult 出参：键句柄（PtrArrayBuffer(8)，readPtr 按架构读回）
  *  @param args_8 lpdwDisposition 出参：新建/已存在标记（可 NULL） */
@@ -20,7 +20,7 @@ export const RegCreateKeyEx = /*@__PURE__*/ b('RegCreateKeyExW', '<>ptr <WCHAR>p
  *  @param args_0 hKey 父键（同 RegCreateKeyEx 的双来源语义）
  *  @param args_1 lpSubKey 子键路径（NULL = 打开 hKey 自身副本）
  *  @param args_2 ulOptions 保留，恒 0
- *  @param args_3 samDesired 访问掩码 gui.RegAccess.READ / SET_VALUE
+ *  @param args_3 samDesired 访问掩码 RegAccess.READ / SET_VALUE
  *  @param args_4 phkResult 出参：键句柄 */
 export const RegOpenKeyEx = /*@__PURE__*/ b('RegOpenKeyExW', '<>ptr <WCHAR>ptr u32 u32@RegAccess <BYTE>ptr -> i32');
 /** 关闭键句柄；只关 Open/Create 返回的真实句柄——预定义键（HKEY_CURRENT_USER 等）
@@ -29,16 +29,16 @@ export const RegOpenKeyEx = /*@__PURE__*/ b('RegOpenKeyExW', '<>ptr <WCHAR>ptr u
 export const RegCloseKey = /*@__PURE__*/ b('RegCloseKey', '<>ptr -> i32');
 /** 写键值
  *  @returns 0 = ERROR_SUCCESS
- *  @param args_0 hKey 键句柄（须 KEY_SET_VALUE 权限，含于 gui.RegAccess.SET_VALUE）
+ *  @param args_0 hKey 键句柄（须 KEY_SET_VALUE 权限，含于 RegAccess.SET_VALUE）
  *  @param args_1 lpValueName 值名（NULL = 键的默认值）
  *  @param args_2 Reserved 保留，恒 0
- *  @param args_3 dwType 值类型 gui.RegType.SZ（UTF-16 字符串）
+ *  @param args_3 dwType 值类型 RegType.SZ（UTF-16 字符串）
  *  @param args_4 lpData 数据缓冲（REG_SZ：UTF-16LE 含结尾 NUL）
  *  @param args_5 cbData 数据字节数（REG_SZ = (字符数+1)*2） */
 export const RegSetValueEx = /*@__PURE__*/ b('RegSetValueExW', '<>ptr <WCHAR>ptr u32 u32@RegType <BYTE>ptr u32 -> i32');
 /** 读键值（两跳模式：第一跳 lpData=NULL 取尺寸/类型，第二跳按尺寸带缓冲读数据）
  *  @returns 0 = ERROR_SUCCESS；2 = ERROR_FILE_NOT_FOUND（值不存在）
- *  @param args_0 hKey 键句柄（须 KEY_QUERY_VALUE 权限，含于 gui.RegAccess.READ）
+ *  @param args_0 hKey 键句柄（须 KEY_QUERY_VALUE 权限，含于 RegAccess.READ）
  *  @param args_1 lpValueName 值名（NULL = 键的默认值）
  *  @param args_2 lpReserved 保留，恒 NULL
  *  @param args_3 lpType 出参：值类型（可 NULL）
@@ -46,7 +46,7 @@ export const RegSetValueEx = /*@__PURE__*/ b('RegSetValueExW', '<>ptr <WCHAR>ptr
  *  @param args_5 lpcbData 双向：入 = lpData 缓冲字节数（须预写）、出 = 实际字节数 */
 export const RegQueryValueEx = /*@__PURE__*/ b('RegQueryValueExW', '<>ptr <WCHAR>ptr <>ptr <BYTE>ptr <BYTE>ptr <BYTE>ptr -> i32');
 /** 删除子键（连值一起删）；须父键 KEY_CREATE_SUB_KEY 权限——自己的 HKCU 直接传
- *  gui.HKey.CURRENT_USER 即可
+ *  HKey.CURRENT_USER 即可
  *  @returns 0 = ERROR_SUCCESS；2 = 子键不存在
  *  @param args_0 hKey 父键
  *  @param args_1 lpSubKey 要删的子键路径（不可 NULL） */