quickwin 2.1.1 → 2.3.0

package/test/test_ffi_struct.js

@@ -13,7 +13,8 @@ const RECT = /* @__PURE__ */ struct('RECT', {
     right: 'i32',
     bottom: 'i32',
 });
-const TVITEM = /* @__PURE__ */ struct('TVITEM', {
+const TVITEM_DECL = {
+    '#': 'struct',
     mask: 'u32',
     hItem: '<>ptr',
     state: 'u32',
@@ -24,11 +25,12 @@ const TVITEM = /* @__PURE__ */ struct('TVITEM', {
     iSelectedImage: 'i32',
     cChildren: 'i32',
     lParam: '<>ptr',
-});
+};
+const TVITEM = /* @__PURE__ */ struct('TVITEM', TVITEM_DECL);
 const TVINSERTSTRUCT = /* @__PURE__ */ struct('TVINSERTSTRUCT', {
     hParent: '<>ptr',
     hInsertAfter: '<>ptr',
-    item: TVITEM.__struct,
+    item: TVITEM_DECL,
 });
 export const suite = {
     name: 'ffi-struct',
@@ -228,13 +230,15 @@ export const suite = {
         t.check('length 1', 1, one.v.length);
         t.check('[0]', 42, one.v[0]);
         t.section('array of struct roundtrip (stride = child size)');
-        const PT = struct('PT', {
+        const PT_DECL = {
+            '#': 'struct',
             x: 'i32',
             y: 'i32',
-        });
+        };
+        const PT = /* @__PURE__ */ struct('PT', PT_DECL);
         const POLY = struct('POLY', {
             count: 'u32',
-            pts: { '#': 'array', element: PT.__struct, length: 3 },
+            pts: { '#': 'array', element: PT_DECL, length: 3 },
         });
         t.check('POLY.size == 28', 28, POLY.size);
         t.check('POLY.offsetOf pts', 4, POLY.offsetOf('pts'));
@@ -274,9 +278,28 @@ export const suite = {
             rejectedMap = true;
         }
         t.check('bare nested map rejected（漏写 #）', true, rejectedMap);
-        // 顶层 '#' 由构造器写入：字段表混入的 '#' 指令键被剔除（运行时兜底，类型层已禁）
-        const H = struct({ '#': 'union', a: 'u8', b: 'u32' });
-        t.check('top-level # stripped（仍按函数名 struct 布局）', 8, H.size);
+        // 顶层 '#' 与函数名 kind 不符 → throw（union DECL 误传 struct() 防线）；
+        // 一致（'#': 'struct' 的 DECL 直传形态）→ 按 kind 正常布局
+        let rejectedKind = false;
+        try {
+            struct({ '#': 'union', a: 'u8', b: 'u32' });
+        }
+        catch {
+            rejectedKind = true;
+        }
+        t.check('top-level # kind mismatch rejected', true, rejectedKind);
+        const H = struct('H', { '#': 'struct', a: 'u8', b: 'u32' });
+        t.check('top-level # matching kind accepted（DECL 直传）', 8, H.size);
+        // 类型层 kind 锁（参数交叉 `{ '#'?: 'struct' }` / `{ '#'?: 'union' }`）：DECL 的
+        // '#' 字面与函数名 kind 不符 → 交叉 never，编译期报错。@ts-expect-error 断言该
+        // 报错存在（锁失效则指令未使用、tsc 报错）；仅类型期检查，函数不调用
+        const _kindLock = () => {
+            // @ts-expect-error —— union DECL 传 struct()
+            struct('BAD_U', { '#': 'union', a: 'u8', b: 'u32' });
+            // @ts-expect-error —— struct DECL 传 union()
+            union('BAD_S', { '#': 'struct', a: 'u8', b: 'u32' });
+        };
+        void _kindLock;
         t.section("pointer member '<>ptr' raw vs '<T>ptr' branded");
         const PTR = struct('PTR', {
             raw: '<>ptr',
@@ -376,16 +399,18 @@ export const suite = {
         t.check('BROWSEINFOW.offsetOf lpszTitle', is64 ? 24 : 12, BROWSEINFOW.offsetOf('lpszTitle'));
         t.check('BROWSEINFOW.offsetOf ulFlags', is64 ? 32 : 16, BROWSEINFOW.offsetOf('ulFlags'));
         t.section('NMHDR（嵌套时 MSVC 尾 padding 传染）');
-        const NMHDR = struct('NMHDR', {
+        const NMHDR_DECL = {
+            '#': 'struct',
             hwndFrom: '<>ptr',
             idFrom: '<>ptr',
             code: 'i32',
-        });
+        };
+        const NMHDR = /* @__PURE__ */ struct('NMHDR', NMHDR_DECL);
         t.check('NMHDR.size', is64 ? 24 : 12, NMHDR.size);
         t.check('NMHDR.offsetOf code', is64 ? 16 : 8, NMHDR.offsetOf('code'));
         t.section('NMCUSTOMDRAW / NMLVCUSTOMDRAW (ListView custom draw)');
         const NMCUSTOMDRAW = struct('NMCUSTOMDRAW', {
-            hdr: NMHDR.__struct,
+            hdr: NMHDR_DECL,
             dwDrawStage: 'u32',
             hdc: '<>ptr',
             rc: 'i32[4]',
@@ -398,7 +423,7 @@ export const suite = {
         t.check('NMCUSTOMDRAW.offsetOf hdc', is64 ? 32 : 16, NMCUSTOMDRAW.offsetOf('hdc'));
         t.check('NMCUSTOMDRAW.offsetOf dwItemSpec', is64 ? 56 : 36, NMCUSTOMDRAW.offsetOf('dwItemSpec'));
         const NMLVCUSTOMDRAW = struct('NMLVCUSTOMDRAW', {
-            hdr: NMHDR.__struct,
+            hdr: NMHDR_DECL,
             dwDrawStage: 'u32',
             hdc: '<>ptr',
             rc: 'i32[4]',
@@ -416,7 +441,7 @@ export const suite = {
         t.check('NMLVCUSTOMDRAW.offsetOf iSubItem', is64 ? 88 : 56, NMLVCUSTOMDRAW.offsetOf('iSubItem'));
         t.section('NMLISTVIEW / NMITEMACTIVATE');
         const NMLISTVIEW = struct('NMLISTVIEW', {
-            hdr: NMHDR.__struct,
+            hdr: NMHDR_DECL,
             iItem: 'i32',
             iSubItem: 'i32',
             uNewState: 'u32',
@@ -471,7 +496,8 @@ export const suite = {
         t.check('LVCOLUMNW.offsetOf iSubItem', is64 ? 28 : 20, LVCOLUMNW.offsetOf('iSubItem'));
         t.check('LVCOLUMNW.offsetOf iOrder', is64 ? 36 : 28, LVCOLUMNW.offsetOf('iOrder'));
         t.section('NMDATETIMECHANGE');
-        const SYSTEMTIME = struct('SYSTEMTIME', {
+        const SYSTEMTIME_DECL = {
+            '#': 'struct',
             wYear: 'u16',
             wMonth: 'u16',
             wDayOfWeek: 'u16',
@@ -480,26 +506,28 @@ export const suite = {
             wMinute: 'u16',
             wSecond: 'u16',
             wMilliseconds: 'u16',
-        });
+        };
         const NMDATETIMECHANGE = struct('NMDATETIMECHANGE', {
-            hdr: NMHDR.__struct,
+            hdr: NMHDR_DECL,
             dwFlags: 'u32',
-            st: SYSTEMTIME.__struct,
+            st: SYSTEMTIME_DECL,
         });
         t.check('NMDATETIMECHANGE.size', is64 ? 48 : 32, NMDATETIMECHANGE.size);
         t.check('NMDATETIMECHANGE.offsetOf dwFlags', is64 ? 24 : 12, NMDATETIMECHANGE.offsetOf('dwFlags'));
         t.check('NMDATETIMECHANGE.offsetOf st', is64 ? 28 : 16, NMDATETIMECHANGE.offsetOf('st'));
         t.section('NMLINK szUrl offset');
-        const LITEM = struct('LITEM', {
+        const LITEM_DECL = {
+            '#': 'struct',
             mask: 'u32',
             iLink: 'i32',
             state: 'u32',
             stateMask: 'u32',
             szID: 'u16[48]@utf-16le',
-        });
+        };
+        const LITEM = /* @__PURE__ */ struct('LITEM', LITEM_DECL);
         const NMLINK = struct('NMLINK', {
-            hdr: NMHDR.__struct,
-            item: LITEM.__struct,
+            hdr: NMHDR_DECL,
+            item: LITEM_DECL,
             szUrl: 'u16[2084]@utf-16le',
         });
         t.check('LITEM.offsetOf szID', 16, LITEM.offsetOf('szID'));
@@ -696,14 +724,14 @@ export const suite = {
             t.check('数字位 @ 字段归一往返', 4, dev.key);
             // encode 必填判定：0 ∉ 值域的 @ 字段必填（省略 = 新槽写 0 = 静默违约）；
             // 0 ∈ 值域可省。下面 { key } 行能编译即 msg/hp 可省的断言。
-            EV.encode({ key: 4 /* gui.MouseKeyFlag.MK_SHIFT */ });
+            EV.encode({ key: 4 /* MouseKeyFlag.MK_SHIFT */ });
             // @ts-expect-error key 必填：省略即编译错（0 ∉ MouseKeyFlag）
             EV.encode({ msg: 0 });
             if (false) {
                 // @ts-expect-error 域外字面量（3 不是任何 MK_ 标志）
                 EV.encode({ key: 3 });
                 // @ts-expect-error 跨枚举误用（WmMsg 成员不是 MouseKeyFlag）
-                EV.encode({ key: 1 /* gui.WmMsg.CREATE */ });
+                EV.encode({ key: 1 /* WmMsg.CREATE */ });
             }
             // 数组糖元素带 @：lower 递归归一（normToken 剥 @）+ 元素值域
             const EA = struct('EA', { msgs: 'u32@WmMsg[4]' });
@@ -715,8 +743,14 @@ export const suite = {
         t.section('EncodeIn DFS 后序：子树含必填 ⇒ 键必填；值后序合成（非必填兄弟可省）');
         {
             // 嵌套子结构含 '!'（内层强制）+ 标量/字符串糖（内层可省：''/0 是合法零值）
-            const NSUB = struct('NSUB', { hp: '<X>ptr!', rest: 'u32', s: 'u16[4]@utf-8' });
-            const NOUT = struct('NOUT', { top: 'u32', sub: NSUB.__struct });
+            const NSUB_DECL = {
+                '#': 'struct',
+                hp: '<X>ptr!',
+                rest: 'u32',
+                s: 'u16[4]@utf-8',
+            };
+            const NSUB = /* @__PURE__ */ struct('NSUB', NSUB_DECL);
+            const NOUT = struct('NOUT', { top: 'u32', sub: NSUB_DECL });
             // decode 造全量对象（hp 槽预填非零，绕 '!' 的 decode 0 断言）
             const nbuf = new PtrArrayBuffer(NOUT.size);
             new DataView(nbuf).setUint32(NOUT.offsetOf('sub') + NSUB.offsetOf('hp'), 0x1234, true);

package/test/test_ffi_struct.ts

@@ -1,10 +1,10 @@
 import * as os from 'os'
-import * as gui from 'gui'
 import { Tester } from './test_helper.js'
 import { struct, union } from '../lib/ffi/struct.js'
 import { bind, } from '../lib/ffi/bind.js'
 import { type MaybePtr, Ptr, PtrArrayBuffer } from '../lib/ffi/ctype.js'
-import type { C_Union } from '../lib/ffi/ctype.js'
+import type { C_Struct, C_Union } from '../lib/ffi/ctype.js'
+import { MouseKeyFlag, WmMsg } from '../constants'
 
 // 编译期断言工具（仅类型层，运行时无开销）
 type Equal<A, B> = (<G>() => G extends A ? 1 : 2) extends (<G>() => G extends B ? 1 : 2) ? true : false
@@ -22,7 +22,8 @@ const RECT = /* @__PURE__ */ struct('RECT', {
     bottom: 'i32',
 })
 
-const TVITEM = /* @__PURE__ */ struct('TVITEM', {
+const TVITEM_DECL = {
+    '#': 'struct',
     mask: 'u32',
     hItem: '<>ptr',
     state: 'u32',
@@ -33,11 +34,12 @@ const TVITEM = /* @__PURE__ */ struct('TVITEM', {
     iSelectedImage: 'i32',
     cChildren: 'i32',
     lParam: '<>ptr',
-})
+} satisfies C_Struct
+const TVITEM = /* @__PURE__ */ struct('TVITEM', TVITEM_DECL)
 const TVINSERTSTRUCT = /* @__PURE__ */ struct('TVINSERTSTRUCT', {
     hParent: '<>ptr',
     hInsertAfter: '<>ptr',
-    item: TVITEM.__struct,
+    item: TVITEM_DECL,
 })
 
 export const suite = {
@@ -260,13 +262,15 @@ export const suite = {
         t.check('[0]', 42, one.v[0])
 
         t.section('array of struct roundtrip (stride = child size)')
-        const PT = struct('PT', {
+        const PT_DECL = {
+            '#': 'struct',
             x: 'i32',
             y: 'i32',
-        })
+        } satisfies C_Struct
+        const PT = /* @__PURE__ */ struct('PT', PT_DECL)
         const POLY = struct('POLY', {
             count: 'u32',
-            pts: { '#': 'array', element: PT.__struct, length: 3 },
+            pts: { '#': 'array', element: PT_DECL, length: 3 },
         })
         t.check('POLY.size == 28', 28, POLY.size)
         t.check('POLY.offsetOf pts', 4, POLY.offsetOf('pts'))
@@ -296,9 +300,24 @@ export const suite = {
         try { (struct as any)({ outer: { inner: 'u32' } }) } catch { rejectedMap = true }
         t.check('bare nested map rejected（漏写 #）', true, rejectedMap)
 
-        // 顶层 '#' 由构造器写入：字段表混入的 '#' 指令键被剔除（运行时兜底，类型层已禁）
-        const H = (struct as any)({ '#': 'union', a: 'u8', b: 'u32' })
-        t.check('top-level # stripped（仍按函数名 struct 布局）', 8, H.size)
+        // 顶层 '#' 与函数名 kind 不符 → throw（union DECL 误传 struct() 防线）；
+        // 一致（'#': 'struct' 的 DECL 直传形态）→ 按 kind 正常布局
+        let rejectedKind = false
+        try { (struct as any)({ '#': 'union', a: 'u8', b: 'u32' }) } catch { rejectedKind = true }
+        t.check('top-level # kind mismatch rejected', true, rejectedKind)
+        const H = (struct as any)('H', { '#': 'struct', a: 'u8', b: 'u32' })
+        t.check('top-level # matching kind accepted（DECL 直传）', 8, H.size)
+
+        // 类型层 kind 锁（参数交叉 `{ '#'?: 'struct' }` / `{ '#'?: 'union' }`）：DECL 的
+        // '#' 字面与函数名 kind 不符 → 交叉 never，编译期报错。@ts-expect-error 断言该
+        // 报错存在（锁失效则指令未使用、tsc 报错）；仅类型期检查，函数不调用
+        const _kindLock = () => {
+            // @ts-expect-error —— union DECL 传 struct()
+            struct('BAD_U', { '#': 'union', a: 'u8', b: 'u32' })
+            // @ts-expect-error —— struct DECL 传 union()
+            union('BAD_S', { '#': 'struct', a: 'u8', b: 'u32' })
+        }
+        void _kindLock
 
         t.section("pointer member '<>ptr' raw vs '<T>ptr' branded")
         const PTR = struct('PTR', {
@@ -405,17 +424,19 @@ export const suite = {
         t.check('BROWSEINFOW.offsetOf ulFlags', is64 ? 32 : 16, BROWSEINFOW.offsetOf('ulFlags'))
 
         t.section('NMHDR（嵌套时 MSVC 尾 padding 传染）')
-        const NMHDR = struct('NMHDR', {
+        const NMHDR_DECL = {
+            '#': 'struct',
             hwndFrom: '<>ptr',
             idFrom: '<>ptr',
             code: 'i32',
-        })
+        } satisfies C_Struct
+        const NMHDR = /* @__PURE__ */ struct('NMHDR', NMHDR_DECL)
         t.check('NMHDR.size', is64 ? 24 : 12, NMHDR.size)
         t.check('NMHDR.offsetOf code', is64 ? 16 : 8, NMHDR.offsetOf('code'))
 
         t.section('NMCUSTOMDRAW / NMLVCUSTOMDRAW (ListView custom draw)')
         const NMCUSTOMDRAW = struct('NMCUSTOMDRAW', {
-            hdr: NMHDR.__struct,
+            hdr: NMHDR_DECL,
             dwDrawStage: 'u32',
             hdc: '<>ptr',
             rc: 'i32[4]',
@@ -428,7 +449,7 @@ export const suite = {
         t.check('NMCUSTOMDRAW.offsetOf hdc', is64 ? 32 : 16, NMCUSTOMDRAW.offsetOf('hdc'))
         t.check('NMCUSTOMDRAW.offsetOf dwItemSpec', is64 ? 56 : 36, NMCUSTOMDRAW.offsetOf('dwItemSpec'))
         const NMLVCUSTOMDRAW = struct('NMLVCUSTOMDRAW', {
-            hdr: NMHDR.__struct,
+            hdr: NMHDR_DECL,
             dwDrawStage: 'u32',
             hdc: '<>ptr',
             rc: 'i32[4]',
@@ -447,7 +468,7 @@ export const suite = {
 
         t.section('NMLISTVIEW / NMITEMACTIVATE')
         const NMLISTVIEW = struct('NMLISTVIEW', {
-            hdr: NMHDR.__struct,
+            hdr: NMHDR_DECL,
             iItem: 'i32',
             iSubItem: 'i32',
             uNewState: 'u32',
@@ -504,7 +525,8 @@ export const suite = {
         t.check('LVCOLUMNW.offsetOf iOrder', is64 ? 36 : 28, LVCOLUMNW.offsetOf('iOrder'))
 
         t.section('NMDATETIMECHANGE')
-        const SYSTEMTIME = struct('SYSTEMTIME', {
+        const SYSTEMTIME_DECL = {
+            '#': 'struct',
             wYear: 'u16',
             wMonth: 'u16',
             wDayOfWeek: 'u16',
@@ -513,27 +535,29 @@ export const suite = {
             wMinute: 'u16',
             wSecond: 'u16',
             wMilliseconds: 'u16',
-        })
+        } satisfies C_Struct
         const NMDATETIMECHANGE = struct('NMDATETIMECHANGE', {
-            hdr: NMHDR.__struct,
+            hdr: NMHDR_DECL,
             dwFlags: 'u32',
-            st: SYSTEMTIME.__struct,
+            st: SYSTEMTIME_DECL,
         })
         t.check('NMDATETIMECHANGE.size', is64 ? 48 : 32, NMDATETIMECHANGE.size)
         t.check('NMDATETIMECHANGE.offsetOf dwFlags', is64 ? 24 : 12, NMDATETIMECHANGE.offsetOf('dwFlags'))
         t.check('NMDATETIMECHANGE.offsetOf st', is64 ? 28 : 16, NMDATETIMECHANGE.offsetOf('st'))
 
         t.section('NMLINK szUrl offset')
-        const LITEM = struct('LITEM', {
+        const LITEM_DECL = {
+            '#': 'struct',
             mask: 'u32',
             iLink: 'i32',
             state: 'u32',
             stateMask: 'u32',
             szID: 'u16[48]@utf-16le',
-        })
+        } satisfies C_Struct
+        const LITEM = /* @__PURE__ */ struct('LITEM', LITEM_DECL)
         const NMLINK = struct('NMLINK', {
-            hdr: NMHDR.__struct,
-            item: LITEM.__struct,
+            hdr: NMHDR_DECL,
+            item: LITEM_DECL,
             szUrl: 'u16[2084]@utf-16le',
         })
         t.check('LITEM.offsetOf szID', 16, LITEM.offsetOf('szID'))
@@ -745,14 +769,14 @@ export const suite = {
 
             // encode 必填判定：0 ∉ 值域的 @ 字段必填（省略 = 新槽写 0 = 静默违约）；
             // 0 ∈ 值域可省。下面 { key } 行能编译即 msg/hp 可省的断言。
-            EV.encode({ key: gui.MouseKeyFlag.MK_SHIFT })
+            EV.encode({ key: MouseKeyFlag.MK_SHIFT })
             // @ts-expect-error key 必填：省略即编译错（0 ∉ MouseKeyFlag）
             EV.encode({ msg: 0 })
             if (false) {
                 // @ts-expect-error 域外字面量（3 不是任何 MK_ 标志）
                 EV.encode({ key: 3 })
                 // @ts-expect-error 跨枚举误用（WmMsg 成员不是 MouseKeyFlag）
-                EV.encode({ key: gui.WmMsg.CREATE })
+                EV.encode({ key: WmMsg.CREATE })
             }
 
             // 数组糖元素带 @：lower 递归归一（normToken 剥 @）+ 元素值域
@@ -766,8 +790,14 @@ export const suite = {
         t.section('EncodeIn DFS 后序：子树含必填 ⇒ 键必填；值后序合成（非必填兄弟可省）')
         {
             // 嵌套子结构含 '!'（内层强制）+ 标量/字符串糖（内层可省：''/0 是合法零值）
-            const NSUB = struct('NSUB', { hp: '<X>ptr!', rest: 'u32', s: 'u16[4]@utf-8' })
-            const NOUT = struct('NOUT', { top: 'u32', sub: NSUB.__struct })
+            const NSUB_DECL = {
+                '#': 'struct',
+                hp: '<X>ptr!',
+                rest: 'u32',
+                s: 'u16[4]@utf-8',
+            } satisfies C_Struct
+            const NSUB = /* @__PURE__ */ struct('NSUB', NSUB_DECL)
+            const NOUT = struct('NOUT', { top: 'u32', sub: NSUB_DECL })
             // decode 造全量对象（hp 槽预填非零，绕 '!' 的 decode 0 断言）
             const nbuf = new PtrArrayBuffer(NOUT.size)
             new DataView(nbuf).setUint32(NOUT.offsetOf('sub') + NSUB.offsetOf('hp'), 0x1234, true)

package/test/test_ffi_windows.js

@@ -74,7 +74,7 @@ export const suite = {
         if (himl !== 0)
             t.checkTrue('ImageListDestroy(himl) 成功', ImageListDestroy(himl) !== 0);
         t.section('user32: LoadImage 双变体（string 自动编码 / ordinal MAKEINTRESOURCE）');
-        // Win32 IMAGE_* 真值：BITMAP=0 CURSOR=1 ICON=2；LR_SHARED=0x8000（注意 gui.ImageType d.ts 当前值与此不一致）
+        // Win32 IMAGE_* 真值：BITMAP=0 CURSOR=1 ICON=2；LR_SHARED=0x8000（注意 ImageType d.ts 当前值与此不一致）
         t.checkTrue('LoadImageOrdinal(NULL, IDI_APPLICATION, IMAGE_ICON, LR_SHARED) 非 0', LoadImageOrdinal(NULL, 32512, 2, 0, 0, 0x8000) !== 0);
         t.check('LoadImage(LOADFROMFILE, 不存在文件) → 0', 0, LoadImage(NULL, 'qw_no_such_icon_xyz.ico', 2, 0, 0, 0x10));
         t.section('user32: 滚动条（入参对象直传 / 出参 encode → call → decode）');

package/test/test_ffi_windows.ts

@@ -83,7 +83,7 @@ export const suite = {
         if (himl !== 0) t.checkTrue('ImageListDestroy(himl) 成功', ImageListDestroy(himl) !== 0)
 
         t.section('user32: LoadImage 双变体（string 自动编码 / ordinal MAKEINTRESOURCE）')
-        // Win32 IMAGE_* 真值：BITMAP=0 CURSOR=1 ICON=2；LR_SHARED=0x8000（注意 gui.ImageType d.ts 当前值与此不一致）
+        // Win32 IMAGE_* 真值：BITMAP=0 CURSOR=1 ICON=2；LR_SHARED=0x8000（注意 ImageType d.ts 当前值与此不一致）
         t.checkTrue('LoadImageOrdinal(NULL, IDI_APPLICATION, IMAGE_ICON, LR_SHARED) 非 0',
             LoadImageOrdinal(NULL, 32512, 2, 0, 0, 0x8000) !== 0)
         t.check('LoadImage(LOADFROMFILE, 不存在文件) → 0', 0,

package/test/test_files.js

@@ -40,7 +40,7 @@ export const suite = {
         const pathC = `${dir}\\c.txt`;
         const pathCn = `${dir}\\中文文件.txt`;
         t.section('CreateFile + WriteFile: write payload');
-        const hW = CreateFile(pathA, GENERIC_WRITE, 0, NULL, 2 /* gui.FileCreation.CREATE_ALWAYS */, 0x80 /* FILE_ATTRIBUTE_NORMAL */, NULL);
+        const hW = CreateFile(pathA, GENERIC_WRITE, 0, NULL, 2 /* FileCreation.CREATE_ALWAYS */, 0x80 /* FILE_ATTRIBUTE_NORMAL */, NULL);
         t.checkTrue(`write handle valid (${hW})`, hW !== -1); // 失败 = INVALID_HANDLE_VALUE(-1)
         const payload = 'hello files';
         const wData = toWide(payload);
@@ -49,34 +49,34 @@ export const suite = {
         t.check('bytes written', payload.length * 2, new DataView(pWr).getUint32(0, true));
         t.checkTrue('CloseHandle (writer)', CloseHandle(hW) !== 0);
         t.section('CreateFile(READ) + GetFileSize + SetFilePointer + ReadFile');
-        const hR = CreateFile(pathA, GENERIC_READ, 0, NULL, 3 /* gui.FileCreation.OPEN_EXISTING */, 0x80, NULL);
+        const hR = CreateFile(pathA, GENERIC_READ, 0, NULL, 3 /* FileCreation.OPEN_EXISTING */, 0x80, NULL);
         t.checkTrue(`read handle valid (${hR})`, hR !== -1);
         t.check('GetFileSize', payload.length * 2, GetFileSize(hR, NULL));
-        t.check('SetFilePointer BEGIN → 0', 0, SetFilePointer(hR, 0, NULL, 0 /* gui.FileSeekFrom.BEGIN */));
+        t.check('SetFilePointer BEGIN → 0', 0, SetFilePointer(hR, 0, NULL, 0 /* FileSeekFrom.BEGIN */));
         const rData = new PtrArrayBuffer(payload.length * 2);
         const pRd = new PtrArrayBuffer(4);
         t.checkTrue('ReadFile ok', ReadFile(hR, rData, payload.length * 2, pRd, NULL) !== 0);
         t.check('read roundtrip', payload, fromWide(rData, payload.length));
         // seek 到 END-4 验证负偏移 + 读尾 4 字节
-        t.check('SetFilePointer END-4', payload.length * 2 - 4, SetFilePointer(hR, -4, NULL, 2 /* gui.FileSeekFrom.END */));
+        t.check('SetFilePointer END-4', payload.length * 2 - 4, SetFilePointer(hR, -4, NULL, 2 /* FileSeekFrom.END */));
         const rTail = new PtrArrayBuffer(8);
         ReadFile(hR, rTail, 4, pRd, NULL);
         t.check('seeked tail', payload.slice(-2), fromWide(rTail, 2));
         CloseHandle(hR);
         t.section('CopyFile + MoveFileEx + GetFileAttributes');
-        const hB = CreateFile(pathB, GENERIC_WRITE, 0, NULL, 2 /* gui.FileCreation.CREATE_ALWAYS */, 0x80, NULL);
+        const hB = CreateFile(pathB, GENERIC_WRITE, 0, NULL, 2 /* FileCreation.CREATE_ALWAYS */, 0x80, NULL);
         const bData = toWide('bb');
         WriteFile(hB, bData, 4, pWr, NULL);
         CloseHandle(hB);
         t.checkTrue('CopyFile ok', CopyFile(pathB, pathC, 0) !== 0);
-        const hC = CreateFile(pathC, GENERIC_READ, 0, NULL, 3 /* gui.FileCreation.OPEN_EXISTING */, 0x80, NULL);
+        const hC = CreateFile(pathC, GENERIC_READ, 0, NULL, 3 /* FileCreation.OPEN_EXISTING */, 0x80, NULL);
         t.check('copied size', 4, GetFileSize(hC, NULL));
         t.checkTrue('CloseHandle (copy reader)', CloseHandle(hC) !== 0);
         t.checkTrue('MoveFileEx replace ok', MoveFileEx(pathB, pathC, 0x1 /* MOVEFILE_REPLACE_EXISTING */) !== 0);
         t.check('moved: source gone', INVALID32, GetFileAttributes(pathB));
         t.checkTrue('dest is file (not dir)', (GetFileAttributes(pathC) & FILE_ATTRIBUTE_DIRECTORY) === 0);
         t.section('FindFirstFile/FindNextFile: enumerate *.txt incl. CJK name');
-        const hCn = CreateFile(pathCn, GENERIC_WRITE, 0, NULL, 2 /* gui.FileCreation.CREATE_ALWAYS */, 0x80, NULL);
+        const hCn = CreateFile(pathCn, GENERIC_WRITE, 0, NULL, 2 /* FileCreation.CREATE_ALWAYS */, 0x80, NULL);
         CloseHandle(hCn); // 0 字节中文名文件
         const fd = WIN32_FIND_DATAW.alloc();
         const hFind = FindFirstFile(`${dir}\\a.txt`, fd.ptr);

package/test/test_files.ts

@@ -1,4 +1,3 @@
-import * as gui from 'gui'
 import { WCHAR } from '../lib/ffi/bind.js'
 import { NULL, PtrArrayBuffer } from '../lib/ffi/ctype.js'
 import {
@@ -8,6 +7,7 @@ import {
 } from '../lib/windows/kernel32.js'
 import { WIN32_FIND_DATAW } from '../lib/windows/structs.js'
 import { Tester } from './test_helper.js'
+import { FileCreation, FileSeekFrom } from '../constants'
 
 const GENERIC_READ = 0x80000000
 const GENERIC_WRITE = 0x40000000
@@ -49,7 +49,7 @@ export const suite = {
 
         t.section('CreateFile + WriteFile: write payload')
         const hW = CreateFile(pathA, GENERIC_WRITE, 0, NULL,
-            gui.FileCreation.CREATE_ALWAYS, 0x80 /* FILE_ATTRIBUTE_NORMAL */, NULL)
+            FileCreation.CREATE_ALWAYS, 0x80 /* FILE_ATTRIBUTE_NORMAL */, NULL)
         t.checkTrue(`write handle valid (${hW})`, hW !== -1) // 失败 = INVALID_HANDLE_VALUE(-1)
         const payload = 'hello files'
         const wData = toWide(payload)
@@ -60,17 +60,17 @@ export const suite = {
 
         t.section('CreateFile(READ) + GetFileSize + SetFilePointer + ReadFile')
         const hR = CreateFile(pathA, GENERIC_READ, 0, NULL,
-            gui.FileCreation.OPEN_EXISTING, 0x80, NULL)
+            FileCreation.OPEN_EXISTING, 0x80, NULL)
         t.checkTrue(`read handle valid (${hR})`, hR !== -1)
         t.check('GetFileSize', payload.length * 2, GetFileSize(hR, NULL))
-        t.check('SetFilePointer BEGIN → 0', 0, SetFilePointer(hR, 0, NULL, gui.FileSeekFrom.BEGIN))
+        t.check('SetFilePointer BEGIN → 0', 0, SetFilePointer(hR, 0, NULL, FileSeekFrom.BEGIN))
         const rData = new PtrArrayBuffer(payload.length * 2)
         const pRd = new PtrArrayBuffer(4)
         t.checkTrue('ReadFile ok', ReadFile(hR, rData, payload.length * 2, pRd, NULL) !== 0)
         t.check('read roundtrip', payload, fromWide(rData, payload.length))
         // seek 到 END-4 验证负偏移 + 读尾 4 字节
         t.check('SetFilePointer END-4', payload.length * 2 - 4,
-            SetFilePointer(hR, -4, NULL, gui.FileSeekFrom.END))
+            SetFilePointer(hR, -4, NULL, FileSeekFrom.END))
         const rTail = new PtrArrayBuffer(8)
         ReadFile(hR, rTail, 4, pRd, NULL)
         t.check('seeked tail', payload.slice(-2), fromWide(rTail, 2))
@@ -78,13 +78,13 @@ export const suite = {
 
         t.section('CopyFile + MoveFileEx + GetFileAttributes')
         const hB = CreateFile(pathB, GENERIC_WRITE, 0, NULL,
-            gui.FileCreation.CREATE_ALWAYS, 0x80, NULL)
+            FileCreation.CREATE_ALWAYS, 0x80, NULL)
         const bData = toWide('bb')
         WriteFile(hB, bData, 4, pWr, NULL)
         CloseHandle(hB)
         t.checkTrue('CopyFile ok', CopyFile(pathB, pathC, 0) !== 0)
         const hC = CreateFile(pathC, GENERIC_READ, 0, NULL,
-            gui.FileCreation.OPEN_EXISTING, 0x80, NULL)
+            FileCreation.OPEN_EXISTING, 0x80, NULL)
         t.check('copied size', 4, GetFileSize(hC, NULL))
         t.checkTrue('CloseHandle (copy reader)', CloseHandle(hC) !== 0)
         t.checkTrue('MoveFileEx replace ok',
@@ -95,7 +95,7 @@ export const suite = {
 
         t.section('FindFirstFile/FindNextFile: enumerate *.txt incl. CJK name')
         const hCn = CreateFile(pathCn, GENERIC_WRITE, 0, NULL,
-            gui.FileCreation.CREATE_ALWAYS, 0x80, NULL)
+            FileCreation.CREATE_ALWAYS, 0x80, NULL)
         CloseHandle(hCn)                                      // 0 字节中文名文件
         const fd = WIN32_FIND_DATAW.alloc()
         const hFind = FindFirstFile(`${dir}\\a.txt`, fd.ptr)