quickwin 2.2.0 → 2.3.0

package/lib/fetch.js

@@ -180,7 +180,7 @@ async function fetchRequest(req) {
         sock.set_on_event(fd, (event) => {
             if (state === ST_DONE)
                 return;
-            if (event.lNetworkEvents & 16 /* sock.FdEvent.FD_CONNECT */) {
+            if (event.lNetworkEvents & 16 /* FdEvent.FD_CONNECT */) {
                 const err = event.iErrorCode[0];
                 if (err !== 0) {
                     doReject(new Error('Connection failed: ' + err));
@@ -194,10 +194,10 @@ async function fetchRequest(req) {
                         return;
                     }
                     if (req.rejectUnauthorized === false) {
-                        wolfssl.wolfSSL_CTX_set_verify(ctx, 0 /* wolfssl.VerifyMode.SSL_VERIFY_NONE */);
+                        wolfssl.wolfSSL_CTX_set_verify(ctx, 0 /* VerifyMode.SSL_VERIFY_NONE */);
                     }
                     else {
-                        wolfssl.wolfSSL_CTX_set_verify(ctx, 1 /* wolfssl.VerifyMode.SSL_VERIFY_PEER */);
+                        wolfssl.wolfSSL_CTX_set_verify(ctx, 1 /* VerifyMode.SSL_VERIFY_PEER */);
                         wolfssl.loadTrustedCerts(ctx);
                     }
                     ssl = wolfssl.wolfSSL_new(ctx);
@@ -207,7 +207,7 @@ async function fetchRequest(req) {
                     }
                     wolfssl.wolfSSL_set_fd(ssl, sock.get_fd(fd));
                     if (parsedUrl.hostname) {
-                        wolfssl.wolfSSL_UseSNI(ssl, 0 /* wolfssl.SniType.WOLFSSL_SNI_HOST_NAME */, parsedUrl.hostname);
+                        wolfssl.wolfSSL_UseSNI(ssl, 0 /* SniType.WOLFSSL_SNI_HOST_NAME */, parsedUrl.hostname);
                         if (req.rejectUnauthorized !== false) {
                             wolfssl.wolfSSL_check_domain_name(ssl, parsedUrl.hostname);
                         }
@@ -219,21 +219,21 @@ async function fetchRequest(req) {
                     state = ST_RECV_HEADERS;
                 }
             }
-            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 === ST_HANDSHAKE) {
                     if (!ssl) {
                         doReject(new Error('TLS not initialized'));
                         return;
                     }
                     const ret = wolfssl.wolfSSL_connect(ssl);
-                    if (ret === 1 /* wolfssl.ReturnCode.SSL_SUCCESS */) {
+                    if (ret === 1 /* ReturnCode.SSL_SUCCESS */) {
                         wolfssl.wolfSSL_write(ssl, httpRequest);
                         state = ST_RECV_HEADERS;
                     }
                     else {
                         const err = wolfssl.wolfSSL_get_error(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 */) {
                             doReject(new Error('TLS handshake failed: ' + err));
                         }
                     }
@@ -251,10 +251,10 @@ async function fetchRequest(req) {
                             }
                             else {
                                 const err = wolfssl.wolfSSL_get_error(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;
                                 doReject(new Error('TLS read failed: ' + err));
                                 return;
@@ -338,10 +338,10 @@ async function fetchRequest(req) {
                             }
                             else {
                                 const err = wolfssl.wolfSSL_get_error(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;
                                 // Fatal TLS error mid-body: the response already
                                 // resolved, so fail the body stream instead of
@@ -390,7 +390,7 @@ async function fetchRequest(req) {
                     }
                 }
             }
-            if (event.lNetworkEvents & 32 /* sock.FdEvent.FD_CLOSE */) {
+            if (event.lNetworkEvents & 32 /* FdEvent.FD_CLOSE */) {
                 if (state === ST_DONE)
                     return;
                 if (state === ST_RECV_HEADERS) {

package/lib/fetch.ts

@@ -12,6 +12,7 @@ import {
     RequestImpl,
     ResponseImpl,
 } from './http-common.js'
+import { FdEvent, ReturnCode, SniType, VerifyMode, WolfsslErrorCode } from '../constants'
 
 // ── HTTP Response Parser ──
 
@@ -178,7 +179,7 @@ async function fetchRequest(req: RequestImpl): Promise<ResponseImpl> {
         sock.set_on_event(fd, (event: { lNetworkEvents: number; iErrorCode: number[] }) => {
             if (state === ST_DONE) return
 
-            if (event.lNetworkEvents & sock.FdEvent.FD_CONNECT) {
+            if (event.lNetworkEvents & FdEvent.FD_CONNECT) {
                 const err = event.iErrorCode[0]
                 if (err !== 0) { doReject(new Error('Connection failed: ' + err)); return }
 
@@ -187,16 +188,16 @@ async function fetchRequest(req: RequestImpl): Promise<ResponseImpl> {
                     ctx = wolfssl.wolfSSL_CTX_new(tlsMethod)
                     if (!ctx) { doReject(new Error('SSL_CTX_new failed')); return }
                     if (req.rejectUnauthorized === false) {
-                        wolfssl.wolfSSL_CTX_set_verify(ctx, wolfssl.VerifyMode.SSL_VERIFY_NONE)
+                        wolfssl.wolfSSL_CTX_set_verify(ctx, VerifyMode.SSL_VERIFY_NONE)
                     } else {
-                        wolfssl.wolfSSL_CTX_set_verify(ctx, wolfssl.VerifyMode.SSL_VERIFY_PEER)
+                        wolfssl.wolfSSL_CTX_set_verify(ctx, VerifyMode.SSL_VERIFY_PEER)
                         wolfssl.loadTrustedCerts(ctx)
                     }
                     ssl = wolfssl.wolfSSL_new(ctx)
                     if (!ssl) { doReject(new Error('SSL_new failed')); return }
                     wolfssl.wolfSSL_set_fd(ssl, sock.get_fd(fd))
                     if (parsedUrl.hostname) {
-                        wolfssl.wolfSSL_UseSNI(ssl, wolfssl.SniType.WOLFSSL_SNI_HOST_NAME, parsedUrl.hostname)
+                        wolfssl.wolfSSL_UseSNI(ssl, SniType.WOLFSSL_SNI_HOST_NAME, parsedUrl.hostname)
                         if (req.rejectUnauthorized !== false) {
                             wolfssl.wolfSSL_check_domain_name(ssl, parsedUrl.hostname)
                         }
@@ -208,17 +209,17 @@ async function fetchRequest(req: RequestImpl): Promise<ResponseImpl> {
                 }
             }
 
-            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 === ST_HANDSHAKE) {
                     if (!ssl) { doReject(new Error('TLS not initialized')); return }
                     const ret = wolfssl.wolfSSL_connect(ssl)
-                    if (ret === wolfssl.ReturnCode.SSL_SUCCESS) {
+                    if (ret === ReturnCode.SSL_SUCCESS) {
                         wolfssl.wolfSSL_write(ssl, httpRequest)
                         state = ST_RECV_HEADERS
                     } else {
                         const err = wolfssl.wolfSSL_get_error(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) {
                             doReject(new Error('TLS handshake failed: ' + err))
                         }
                     }
@@ -234,9 +235,9 @@ async function fetchRequest(req: RequestImpl): Promise<ResponseImpl> {
                                 data = buf.slice(0, n)
                             } else {
                                 const err = wolfssl.wolfSSL_get_error(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
                                 doReject(new Error('TLS read failed: ' + err))
                                 return
                             }
@@ -315,9 +316,9 @@ async function fetchRequest(req: RequestImpl): Promise<ResponseImpl> {
                                 data = buf.slice(0, n)
                             } else {
                                 const err = wolfssl.wolfSSL_get_error(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
                                 // Fatal TLS error mid-body: the response already
                                 // resolved, so fail the body stream instead of
                                 // silently waiting for an FD event that never comes.
@@ -355,7 +356,7 @@ async function fetchRequest(req: RequestImpl): Promise<ResponseImpl> {
                 }
             }
 
-            if (event.lNetworkEvents & sock.FdEvent.FD_CLOSE) {
+            if (event.lNetworkEvents & FdEvent.FD_CLOSE) {
                 if (state === ST_DONE) return
                 if (state === ST_RECV_HEADERS) {
                     doReject(new Error('Connection closed before response'))

package/lib/ffi/bind.js

@@ -73,7 +73,7 @@ function makeFn(proc, sig, encoders, decoders) {
     }
     return (...a) => callPacked(proc, ps, a, encoders, decoders);
 }
-// 每个参数在 argFrame 里占的字节数。与 quickjs-ffi-type.h 的 qwin_ffi_arg_size[]
+// 每个参数在 argFrame 里占的字节数。与 src/quickjs-ffi-type.h 的 qwin_ffi_arg_size[]
 // 保持一致（ia32：≤4B 类型进 4 字节、更大的进 8 字节；x64：恒 8 字节槽）。
 // 注意这是「槽宽」，不是类型的 sizeof——同一定义也用于返回槽。指针布局恒指针宽。
 const IA32_ARG_SIZE = {
@@ -334,7 +334,7 @@ const leakRegistry = new FinalizationRegistry((held) => {
 // args/ret 为「底档 + '!' 绑定」的记录（与 ParsedSig 同形态——修饰随 token 走，
 // 消费者要么整体拿到、要么整体拿不到）。'!' 违约（C 传入 0 / fn 返回 0）打印诊断并
 // 中止本次分发（fn 不被调用 / 结果槽保持 0），与 fn-throw 同风格：此处不 throw，
-// 异常通道只留给用户回调（C 桩捕获 wrapper 异常并清零，quickjs-ffi-closure.c）。
+// 异常通道只留给用户回调（C 桩捕获 wrapper 异常并清零，src/quickjs-ffi-closure.c）。
 function dispatchClosure(args, ret, fn, frameBuf, retBuf, sig) {
     const dv = new DataView(retBuf);
     const is64 = os.arch === 'x64';
@@ -409,7 +409,7 @@ export function closure(sig, fn, opts) {
     const retSpec = { tok: cTokenToType(retToken), nonnull: retToken.endsWith('!') };
     const is64 = os.arch === 'x64';
     const stackCapture = argSpecs.reduce((s, x) => s + IA32_ARG_SIZE[x.tok], 0);
-    // C 桩捕获窗定长（quickjs-ffi-closure.c：x64 栈区 96B=12 槽，第 5 参起在栈上，
+    // C 桩捕获窗定长（src/quickjs-ffi-closure.c：x64 栈区 96B=12 槽，第 5 参起在栈上，
     // 即至多 16 参；ia32 16×4B）——超限 dispatch 会读到捕获缓冲之外的垃圾，或
     // RangeError 被吞成返回 0，故创建期 fail-fast。扩容改 C 侧 buf 尺寸并同步放宽。
     if (is64 ? argSpecs.length > 16 : stackCapture > 64) {

package/lib/ffi/bind.ts

@@ -123,7 +123,7 @@ function makeFn(proc: number, sig: string, encoders: CodecMap, decoders: CodecMa
     return (...a: unknown[]) => callPacked(proc, ps, a, encoders, decoders)
 }
 
-// 每个参数在 argFrame 里占的字节数。与 quickjs-ffi-type.h 的 qwin_ffi_arg_size[]
+// 每个参数在 argFrame 里占的字节数。与 src/quickjs-ffi-type.h 的 qwin_ffi_arg_size[]
 // 保持一致（ia32：≤4B 类型进 4 字节、更大的进 8 字节；x64：恒 8 字节槽）。
 // 注意这是「槽宽」，不是类型的 sizeof——同一定义也用于返回槽。指针布局恒指针宽。
 const IA32_ARG_SIZE: Record<C_BasicType_No_Void, number> = {
@@ -429,7 +429,7 @@ const leakRegistry: FinalizationRegistry<{ sig: string, ptr: number }> =
 // args/ret 为「底档 + '!' 绑定」的记录（与 ParsedSig 同形态——修饰随 token 走，
 // 消费者要么整体拿到、要么整体拿不到）。'!' 违约（C 传入 0 / fn 返回 0）打印诊断并
 // 中止本次分发（fn 不被调用 / 结果槽保持 0），与 fn-throw 同风格：此处不 throw，
-// 异常通道只留给用户回调（C 桩捕获 wrapper 异常并清零，quickjs-ffi-closure.c）。
+// 异常通道只留给用户回调（C 桩捕获 wrapper 异常并清零，src/quickjs-ffi-closure.c）。
 function dispatchClosure(
     args: { tok: C_BasicType_No_Void, nonnull: boolean }[],
     ret: { tok: C_BasicType, nonnull: boolean },
@@ -508,7 +508,7 @@ export function closure<S extends string>(sig: S, fn: BindFn<S, {}, {}>,
     const retSpec = { tok: cTokenToType(retToken), nonnull: retToken.endsWith('!') }
     const is64 = os.arch === 'x64'
     const stackCapture = argSpecs.reduce((s, x) => s + IA32_ARG_SIZE[x.tok], 0)
-    // C 桩捕获窗定长（quickjs-ffi-closure.c：x64 栈区 96B=12 槽，第 5 参起在栈上，
+    // C 桩捕获窗定长（src/quickjs-ffi-closure.c：x64 栈区 96B=12 槽，第 5 参起在栈上，
     // 即至多 16 参；ia32 16×4B）——超限 dispatch 会读到捕获缓冲之外的垃圾，或
     // RangeError 被吞成返回 0，故创建期 fail-fast。扩容改 C 侧 buf 尺寸并同步放宽。
     if (is64 ? argSpecs.length > 16 : stackCapture > 64) {

package/lib/http-server.js

@@ -163,7 +163,7 @@ export class HttpServer {
         }
         this.serverSock = s;
         sock.set_on_event(s, (event) => {
-            if (event.lNetworkEvents & 8 /* sock.FdEvent.FD_ACCEPT */)
+            if (event.lNetworkEvents & 8 /* FdEvent.FD_ACCEPT */)
                 this.acceptLoop();
         });
         return 0;
@@ -207,11 +207,11 @@ export class HttpServer {
     onConnEvent(c, event) {
         if (c.closed)
             return;
-        if (event.lNetworkEvents & 1 /* sock.FdEvent.FD_READ */)
+        if (event.lNetworkEvents & 1 /* FdEvent.FD_READ */)
             onRead(c);
-        if (event.lNetworkEvents & 2 /* sock.FdEvent.FD_WRITE */)
+        if (event.lNetworkEvents & 2 /* FdEvent.FD_WRITE */)
             flushQueue(c);
-        if (event.lNetworkEvents & 32 /* sock.FdEvent.FD_CLOSE */) {
+        if (event.lNetworkEvents & 32 /* FdEvent.FD_CLOSE */) {
             onRead(c);
             abortConn(c);
             closeConn(c);

package/lib/http-server.ts

@@ -2,6 +2,7 @@ import './polyfill.js'
 import * as sock from 'sock'
 import { HeadersImpl, RequestImpl, ResponseImpl, _readStream } from './http-common.js'
 import { AbortController } from './abort.js'
+import { FdEvent } from '../constants'
 
 type SockHandle = import('sock').SockHandle
 
@@ -191,7 +192,7 @@ export class HttpServer {
         if (sock.listen(s, backlog ?? 64) !== 0) { sock.closesocket(s); return -1 }
         this.serverSock = s
         sock.set_on_event(s, (event: NetEvent) => {
-            if (event.lNetworkEvents & sock.FdEvent.FD_ACCEPT) this.acceptLoop()
+            if (event.lNetworkEvents & FdEvent.FD_ACCEPT) this.acceptLoop()
         })
         return 0
     }
@@ -229,9 +230,9 @@ export class HttpServer {
 
     private onConnEvent(c: Conn, event: NetEvent): void {
         if (c.closed) return
-        if (event.lNetworkEvents & sock.FdEvent.FD_READ) onRead(c)
-        if (event.lNetworkEvents & sock.FdEvent.FD_WRITE) flushQueue(c)
-        if (event.lNetworkEvents & sock.FdEvent.FD_CLOSE) {
+        if (event.lNetworkEvents & FdEvent.FD_READ) onRead(c)
+        if (event.lNetworkEvents & FdEvent.FD_WRITE) flushQueue(c)
+        if (event.lNetworkEvents & FdEvent.FD_CLOSE) {
             onRead(c)
             abortConn(c)
             closeConn(c)

package/lib/react-qw/components/Button.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { forwardRef } from 'react';
 export const Button = forwardRef(({ children, onClick, style, disabled }, ref) => {
-    return (_jsx("w", { type: "BUTTON", text: children != null ? (Array.isArray(children) ? children.join('') : String(children)) : '', ws: 268435456 /* gui.WindowStyle.VISIBLE */, style: style, disabled: disabled, ref: ref, onEvent: (e) => {
-            if (e.msg === 514 /* gui.WmMsg.LBUTTONUP */)
+    return (_jsx("w", { type: "BUTTON", text: children != null ? (Array.isArray(children) ? children.join('') : String(children)) : '', ws: 268435456 /* WindowStyle.VISIBLE */, style: style, disabled: disabled, ref: ref, onEvent: (e) => {
+            if (e.msg === 514 /* WmMsg.LBUTTONUP */)
                 onClick?.();
         } }));
 });

package/lib/react-qw/components/CheckBox.js

@@ -10,17 +10,17 @@ export const CheckBox = forwardRef(({ checked: controlledChecked, defaultChecked
         const h = cbRef.current;
         if (!h)
             return;
-        gui.SendMessage(h, 241 /* gui.ButtonMsg.SETCHECK */, displayChecked ? 1 /* gui.ButtonCheckState.CHECKED */ : 0 /* gui.ButtonCheckState.UNCHECKED */, 0);
+        gui.SendMessage(h, 241 /* ButtonMsg.SETCHECK */, displayChecked ? 1 /* ButtonCheckState.CHECKED */ : 0 /* ButtonCheckState.UNCHECKED */, 0);
     }, [displayChecked]);
-    return (_jsx("w", { type: "BUTTON", text: label ?? '', ws: 268435456 /* gui.WindowStyle.VISIBLE */ | 3 /* gui.ButtonStyle.AUTOCHECKBOX */, style: style, disabled: disabled, ref: (h) => {
+    return (_jsx("w", { type: "BUTTON", text: label ?? '', ws: 268435456 /* WindowStyle.VISIBLE */ | 3 /* ButtonStyle.AUTOCHECKBOX */, style: style, disabled: disabled, ref: (h) => {
             cbRef.current = h;
             if (typeof ref === 'function')
                 ref(h);
             else if (ref)
                 ref.current = h;
         }, onEvent: (e) => {
-            if (e.msg === 514 /* gui.WmMsg.LBUTTONUP */) {
-                const newChecked = gui.SendMessage(e.hwnd, 240 /* gui.ButtonMsg.GETCHECK */, 0, 0) !== 0;
+            if (e.msg === 514 /* WmMsg.LBUTTONUP */) {
+                const newChecked = gui.SendMessage(e.hwnd, 240 /* ButtonMsg.GETCHECK */, 0, 0) !== 0;
                 if (newChecked !== displayChecked) {
                     if (!isControlled)
                         setInternalChecked(newChecked);

package/lib/react-qw/components/ComboBox.js

@@ -6,32 +6,32 @@ export const ComboBox = forwardRef(({ items, selectedIndex: controlledIndex, def
     const isControlled = controlledIndex !== undefined;
     const sel = isControlled ? controlledIndex : internalIndex;
     const cbRef = useRef(null);
-    const cbWs = 268435456 /* gui.WindowStyle.VISIBLE */ | 8388608 /* gui.WindowStyle.BORDER */
-        | 3 /* gui.ComboBoxStyle.DROPDOWNLIST */ | 512 /* gui.ComboBoxStyle.HASSTRINGS */;
+    const cbWs = 268435456 /* WindowStyle.VISIBLE */ | 8388608 /* WindowStyle.BORDER */
+        | 3 /* ComboBoxStyle.DROPDOWNLIST */ | 512 /* ComboBoxStyle.HASSTRINGS */;
     useEffect(() => {
         const h = cbRef.current;
         if (!h)
             return;
-        gui.SendMessage(h, 331 /* gui.ComboBoxMsg.RESETCONTENT */, 0, 0);
+        gui.SendMessage(h, 331 /* ComboBoxMsg.RESETCONTENT */, 0, 0);
         for (const item of items)
-            gui.SendMessage(h, 323 /* gui.ComboBoxMsg.ADDSTRING */, 0, item);
+            gui.SendMessage(h, 323 /* ComboBoxMsg.ADDSTRING */, 0, item);
         if (sel >= 0 && sel < items.length)
-            gui.SendMessage(h, 334 /* gui.ComboBoxMsg.SETCURSEL */, sel, 0);
+            gui.SendMessage(h, 334 /* ComboBoxMsg.SETCURSEL */, sel, 0);
     }, [items]);
     useEffect(() => {
         const h = cbRef.current;
         if (h)
-            gui.SendMessage(h, 334 /* gui.ComboBoxMsg.SETCURSEL */, sel, 0);
+            gui.SendMessage(h, 334 /* ComboBoxMsg.SETCURSEL */, sel, 0);
     }, [sel]);
-    return (_jsx("w", { type: "STATIC", ws: 268435456 /* gui.WindowStyle.VISIBLE */ | 33554432 /* gui.WindowStyle.CLIPCHILDREN */, style: { ...style, flexDirection: 'column', alignItems: 'stretch' }, ref: ref, onEvent: (e) => {
-            if (e.msg !== 273 /* gui.WmMsg.COMMAND */)
+    return (_jsx("w", { type: "STATIC", ws: 268435456 /* WindowStyle.VISIBLE */ | 33554432 /* WindowStyle.CLIPCHILDREN */, style: { ...style, flexDirection: 'column', alignItems: 'stretch' }, ref: ref, onEvent: (e) => {
+            if (e.msg !== 273 /* WmMsg.COMMAND */)
                 return;
             const code = (e.wParam >> 16) & 0xFFFF;
-            if (code === 1 /* gui.CbnCode.SELCHANGE */) {
+            if (code === 1 /* CbnCode.SELCHANGE */) {
                 const h = cbRef.current;
                 if (!h)
                     return;
-                const newSel = gui.SendMessage(h, 327 /* gui.ComboBoxMsg.GETCURSEL */, 0, 0);
+                const newSel = gui.SendMessage(h, 327 /* ComboBoxMsg.GETCURSEL */, 0, 0);
                 if (newSel !== sel && newSel >= 0) {
                     if (!isControlled)
                         setInternalIndex(newSel);

package/lib/react-qw/components/DateTimePicker.js

@@ -24,15 +24,15 @@ const DateTimePicker = forwardRef(function DateTimePicker({ value, onChange, def
     const dpRef = useRef(null);
     const onChangeRef = useRef(onChange);
     onChangeRef.current = onChange;
-    let dpStyle = 268435456 /* gui.WindowStyle.VISIBLE */ | 8388608 /* gui.WindowStyle.BORDER */;
+    let dpStyle = 268435456 /* WindowStyle.VISIBLE */ | 8388608 /* WindowStyle.BORDER */;
     if (format === 'long')
-        dpStyle |= 4 /* gui.DtStyle.LONGDATEFORMAT */;
+        dpStyle |= 4 /* DtStyle.LONGDATEFORMAT */;
     else if (format === 'time')
-        dpStyle |= 9 /* gui.DtStyle.TIMEFORMAT */;
+        dpStyle |= 9 /* DtStyle.TIMEFORMAT */;
     if (updown)
-        dpStyle |= 1 /* gui.DtStyle.UPDOWN */;
+        dpStyle |= 1 /* DtStyle.UPDOWN */;
     if (allowNone)
-        dpStyle |= 2 /* gui.DtStyle.SHOWNONE */;
+        dpStyle |= 2 /* DtStyle.SHOWNONE */;
     useEffect(() => {
         const h = dpRef.current;
         if (!h)
@@ -40,10 +40,10 @@ const DateTimePicker = forwardRef(function DateTimePicker({ value, onChange, def
         const d = effectiveDate;
         if (d) {
             const buf = dateToSysTimeBuf(d);
-            gui.SendMessage(h, 4098 /* gui.DtMsg.SETSYSTEMTIME */, 0 /* gui.DtFlag.GDT_VALID */, buf.ptr);
+            gui.SendMessage(h, 4098 /* DtMsg.SETSYSTEMTIME */, 0 /* DtFlag.GDT_VALID */, buf.ptr);
         }
         else {
-            gui.SendMessage(h, 4098 /* gui.DtMsg.SETSYSTEMTIME */, 1 /* gui.DtFlag.GDT_NONE */, 0);
+            gui.SendMessage(h, 4098 /* DtMsg.SETSYSTEMTIME */, 1 /* DtFlag.GDT_NONE */, 0);
         }
     }, [effectiveDate]);
     useEffect(() => {
@@ -56,16 +56,16 @@ const DateTimePicker = forwardRef(function DateTimePicker({ value, onChange, def
         if (cr) {
             const w = cr.right - cr.left;
             const hh = cr.bottom - cr.top;
-            gui.SendMessage(h, 5 /* gui.WmMsg.SIZE */, 0, (hh << 16) | w);
+            gui.SendMessage(h, 5 /* WmMsg.SIZE */, 0, (hh << 16) | w);
         }
     }, []);
-    return (_jsx("w", { type: "STATIC", ws: 268435456 /* gui.WindowStyle.VISIBLE */ | 33554432 /* gui.WindowStyle.CLIPCHILDREN */, style: { ...style, flexDirection: 'column', alignItems: 'stretch' }, ref: ref, onEvent: (e) => {
-            if (e.msg === 78 /* gui.WmMsg.NOTIFY */) {
+    return (_jsx("w", { type: "STATIC", ws: 268435456 /* WindowStyle.VISIBLE */ | 33554432 /* WindowStyle.CLIPCHILDREN */, style: { ...style, flexDirection: 'column', alignItems: 'stretch' }, ref: ref, onEvent: (e) => {
+            if (e.msg === 78 /* WmMsg.NOTIFY */) {
                 const code = nmCode(e.lParam);
-                if (code === -759 /* gui.DtNotifyCode.DATETIMECHANGE */) {
+                if (code === -759 /* DtNotifyCode.DATETIMECHANGE */) {
                     // NMDATETIMECHANGE: NMHDR + DWORD dwFlags + SYSTEMTIME st
                     const { dwFlags, st } = NMDATETIMECHANGE.decode(e.lParam);
-                    if (dwFlags === 1 /* gui.DtFlag.GDT_NONE */) {
+                    if (dwFlags === 1 /* DtFlag.GDT_NONE */) {
                         if (!isControlled)
                             setInternalDate(null);
                         onChangeRef.current?.(null);

package/lib/react-qw/components/Input.js

@@ -7,21 +7,21 @@ export const Input = forwardRef(({ value: controlledValue, defaultValue = '', on
     const isControlled = controlledValue !== undefined;
     const displayValue = isControlled ? controlledValue : internalValue;
     const inputRef = useRef(null);
-    let ws = 268435456 /* gui.WindowStyle.VISIBLE */ | 8388608 /* gui.WindowStyle.BORDER */;
+    let ws = 268435456 /* WindowStyle.VISIBLE */ | 8388608 /* WindowStyle.BORDER */;
     if (multiline)
-        ws |= 4 /* gui.EditStyle.MULTILINE */ | 64 /* gui.EditStyle.AUTOVSCROLL */ | 2097152 /* gui.WindowStyle.VSCROLL */;
+        ws |= 4 /* EditStyle.MULTILINE */ | 64 /* EditStyle.AUTOVSCROLL */ | 2097152 /* WindowStyle.VSCROLL */;
     if (readonly)
-        ws |= 2048 /* gui.EditStyle.READONLY */;
+        ws |= 2048 /* EditStyle.READONLY */;
     if (number)
-        ws |= 8192 /* gui.EditStyle.NUMBER */;
+        ws |= 8192 /* EditStyle.NUMBER */;
     if (password)
-        ws |= 32 /* gui.EditStyle.PASSWORD */ | 128 /* gui.EditStyle.AUTOHSCROLL */;
+        ws |= 32 /* EditStyle.PASSWORD */ | 128 /* EditStyle.AUTOHSCROLL */;
     useEffect(() => {
         const h = inputRef.current;
         if (!h || !placeholder)
             return;
         const buf = WCHAR.encode(placeholder);
-        gui.SendMessage(h, 5377 /* gui.EditMsg.SETCUEBANNER */, 1, buf.ptr);
+        gui.SendMessage(h, 5377 /* EditMsg.SETCUEBANNER */, 1, buf.ptr);
     }, [placeholder]);
     return (_jsx("w", { type: "EDIT", text: displayValue, ws: ws, style: style, disabled: disabled, ref: (h) => {
             inputRef.current = h;
@@ -30,7 +30,7 @@ export const Input = forwardRef(({ value: controlledValue, defaultValue = '', on
             else if (ref)
                 ref.current = h;
         }, onEvent: (e) => {
-            if (e.msg === 258 /* gui.WmMsg.CHAR */) {
+            if (e.msg === 258 /* WmMsg.CHAR */) {
                 const h = inputRef.current;
                 if (!h)
                     return;

package/lib/react-qw/components/Link.js

@@ -16,13 +16,13 @@ const Link = forwardRef(function Link({ href, children, onClick, style }, ref) {
             return;
         InvalidateRect(h, NULL, 1);
     }, [linkText]);
-    return (_jsx("w", { type: "STATIC", ws: 268435456 /* gui.WindowStyle.VISIBLE */ | 33554432 /* gui.WindowStyle.CLIPCHILDREN */, style: { ...style, flexDirection: 'column', alignItems: 'stretch' }, ref: ref, onEvent: (e) => {
-            if (e.msg === 78 /* gui.WmMsg.NOTIFY */) {
+    return (_jsx("w", { type: "STATIC", ws: 268435456 /* WindowStyle.VISIBLE */ | 33554432 /* WindowStyle.CLIPCHILDREN */, style: { ...style, flexDirection: 'column', alignItems: 'stretch' }, ref: ref, onEvent: (e) => {
+            if (e.msg === 78 /* WmMsg.NOTIFY */) {
                 const code = nmCode(e.lParam);
-                if (code === -2 /* gui.SysLinkNotifyCode.CLICK */ || code === -4 /* gui.SysLinkNotifyCode.RETURN */) {
+                if (code === -2 /* SysLinkNotifyCode.CLICK */ || code === -4 /* SysLinkNotifyCode.RETURN */) {
                     onClickRef.current?.(NMLINK.decode(e.lParam).item.szUrl);
                 }
             }
-        }, children: _jsx("w", { type: "SysLink", ws: 268435456 /* gui.WindowStyle.VISIBLE */ | 65536 /* gui.WindowStyle.TABSTOP */, text: linkText, style: { flexGrow: 1 }, ref: (h) => { linkRef.current = h; } }) }));
+        }, children: _jsx("w", { type: "SysLink", ws: 268435456 /* WindowStyle.VISIBLE */ | 65536 /* WindowStyle.TABSTOP */, text: linkText, style: { flexGrow: 1 }, ref: (h) => { linkRef.current = h; } }) }));
 });
 export { Link };

package/lib/react-qw/components/ListBox.js

@@ -7,35 +7,35 @@ export const ListBox = forwardRef(({ items, selectedIndex: controlledIndex, defa
     const sel = isControlled ? controlledIndex : internalIndex;
     const lbRef = useRef(null);
     useImperativeHandle(ref, () => lbRef.current);
-    const lbWs = 268435456 /* gui.WindowStyle.VISIBLE */ | 8388608 /* gui.WindowStyle.BORDER */ | 2097152 /* gui.WindowStyle.VSCROLL */
-        | 64 /* gui.ListBoxStyle.HASSTRINGS */ | 1 /* gui.ListBoxStyle.NOTIFY */ | 256 /* gui.ListBoxStyle.NOINTEGRALHEIGHT */
-        | (sort ? 2 /* gui.ListBoxStyle.SORT */ : 0);
+    const lbWs = 268435456 /* WindowStyle.VISIBLE */ | 8388608 /* WindowStyle.BORDER */ | 2097152 /* WindowStyle.VSCROLL */
+        | 64 /* ListBoxStyle.HASSTRINGS */ | 1 /* ListBoxStyle.NOTIFY */ | 256 /* ListBoxStyle.NOINTEGRALHEIGHT */
+        | (sort ? 2 /* ListBoxStyle.SORT */ : 0);
     useEffect(() => {
         const h = lbRef.current;
         if (!h)
             return;
-        gui.SendMessage(h, 388 /* gui.LbMsg.RESETCONTENT */, 0, 0);
+        gui.SendMessage(h, 388 /* LbMsg.RESETCONTENT */, 0, 0);
         for (const item of items)
-            gui.SendMessage(h, 384 /* gui.LbMsg.ADDSTRING */, 0, item);
+            gui.SendMessage(h, 384 /* LbMsg.ADDSTRING */, 0, item);
         if (sel >= 0 && sel < items.length)
-            gui.SendMessage(h, 390 /* gui.LbMsg.SETCURSEL */, sel, 0);
+            gui.SendMessage(h, 390 /* LbMsg.SETCURSEL */, sel, 0);
         if (scrollToBottom && items.length > 0)
-            gui.SendMessage(h, 407 /* gui.LbMsg.SETTOPINDEX */, items.length - 1, 0);
+            gui.SendMessage(h, 407 /* LbMsg.SETTOPINDEX */, items.length - 1, 0);
     }, [items]);
     useEffect(() => {
         const h = lbRef.current;
         if (h)
-            gui.SendMessage(h, 390 /* gui.LbMsg.SETCURSEL */, sel, 0);
+            gui.SendMessage(h, 390 /* LbMsg.SETCURSEL */, sel, 0);
     }, [sel]);
-    return (_jsx("w", { type: "STATIC", ws: 268435456 /* gui.WindowStyle.VISIBLE */ | 33554432 /* gui.WindowStyle.CLIPCHILDREN */, style: { ...style, flexDirection: 'column', alignItems: 'stretch' }, onEvent: (e) => {
-            if (e.msg !== 273 /* gui.WmMsg.COMMAND */)
+    return (_jsx("w", { type: "STATIC", ws: 268435456 /* WindowStyle.VISIBLE */ | 33554432 /* WindowStyle.CLIPCHILDREN */, style: { ...style, flexDirection: 'column', alignItems: 'stretch' }, onEvent: (e) => {
+            if (e.msg !== 273 /* WmMsg.COMMAND */)
                 return;
             const code = (e.wParam >> 16) & 0xFFFF;
-            if (code === 1 /* gui.LbnCode.SELCHANGE */) {
+            if (code === 1 /* LbnCode.SELCHANGE */) {
                 const h = lbRef.current;
                 if (!h)
                     return;
-                const newSel = gui.SendMessage(h, 392 /* gui.LbMsg.GETCURSEL */, 0, 0);
+                const newSel = gui.SendMessage(h, 392 /* LbMsg.GETCURSEL */, 0, 0);
                 if (newSel !== sel && newSel >= 0) {
                     if (!isControlled)
                         setInternalIndex(newSel);