quickwin 2.2.0 → 2.3.1

package/quickwin.d.ts

@@ -1,5 +1,4 @@
-/// <reference path="quickwin_const.d.ts" />
-/// <reference path="quickwin_enum_map.d.ts" />
+/// <reference path="enum_map.d.ts" />
 interface ImportMeta {
     url: string
 }
@@ -348,6 +347,12 @@ declare module "os" {
 declare module "sock" {
     type SockHandle = number & { readonly __brand: unique symbol };
     type SockFd = number & { readonly __brand: unique symbol };
+    // 枚举唯一定义在 constants.ts（真实 .ts，tsc/esbuild 均内联）；此处别名仅供签名引用，
+    // 使用方请直接 import { AddrFamily } from 'quickwin/constants'。
+    type AddrFamily = import('./constants').AddrFamily;
+    type SockType = import('./constants').SockType;
+    type Protocol = import('./constants').Protocol;
+    type Shutdown = import('./constants').Shutdown;
 
     function socket(domain?: AddrFamily, type?: SockType, protocol?: Protocol): SockHandle;
     function connect(sock: SockHandle, addr: string, port: number): number;
@@ -374,6 +379,10 @@ declare module "wolfssl" {
     type WOLFSSL = number & { readonly __brand: unique symbol };
     type WOLFSSL_CTX = number & { readonly __brand: unique symbol };
     type WOLFSSL_METHOD = number & { readonly __brand: unique symbol };
+    // 枚举唯一定义在 constants.ts（见 sock 块注释）。
+    type VerifyMode = import('./constants').VerifyMode;
+    type SniType = import('./constants').SniType;
+    type FileType = import('./constants').FileType;
 
     function wolfSSL_library_init(): number;
     function wolfSSL_CTX_new(method: WOLFSSL_METHOD): WOLFSSL_CTX | null;
@@ -433,6 +442,18 @@ declare module "gui" {
     type HFONT = number & { readonly ptrBrand: "HFONT" };
     type HICON = number & { readonly ptrBrand: "HICON" };
     type WNDPROC = number & { readonly ptrBrand: "WNDPROC" };
+    // 枚举唯一定义在 constants.ts（真实 .ts，tsc/esbuild 均内联）；此处别名仅供签名引用，
+    // 使用方请直接 import { WindowStyle } from 'quickwin/constants'。
+    // Gwlp/ImageType 的成员访问（如 Gwlp.WNDPROC）需写 import('./constants').Gwlp.WNDPROC
+    // ——类型别名不建命名空间，无法穿透取成员。
+    type GetWindowCmd = import('./constants').GetWindowCmd;
+    type ShowWindowCmd = import('./constants').ShowWindowCmd;
+    type SetWindowPosHwnd = import('./constants').SetWindowPosHwnd;
+    type Gwlp = import('./constants').Gwlp;
+    type NotifyIconCmd = import('./constants').NotifyIconCmd;
+    type ImageType = import('./constants').ImageType;
+    type IDI = import('./constants').IDI;
+    type ScrollBar = import('./constants').ScrollBar;
 
     function RegisterClass(className: string, wndProc?: (hwnd: HWND, msg: number, wParam: number, lParam: number) => number): number;
     function CreateWindow(className: string, title: string, style: number, x: number, y: number, width: number, height: number, parent: HWND | null, menu: HMENU | null): HWND | null;
@@ -450,7 +471,7 @@ declare module "gui" {
     function GetWindowText(hwnd: HWND): string;
     function GetScaleFactor(): number;
     function CreateSystemDpiFont(): HFONT | null;
-    type GwlpReturnType<T extends Gwlp> = T extends Gwlp.WNDPROC ? WNDPROC : number;
+    type GwlpReturnType<T extends Gwlp> = T extends import('./constants').Gwlp.WNDPROC ? WNDPROC : number;
     function GetWindowLongPtr<T extends Gwlp>(hwnd: HWND, nIndex: T): GwlpReturnType<T>;
     function SetWindowLongPtr(hwnd: HWND, nIndex: Gwlp, newLong: number): number;
     function UnsetWindowProc(hwnd: HWND): boolean;
@@ -475,20 +496,21 @@ declare module "gui" {
      * Thin wrapper around LoadImageW. Parameter order matches Win32 LoadImageW: (hinst, name, uType?, cx?, cy?, fuLoad?).
      * hinst: null for system resources/file path, number for module handle;
      * name: when hinst=null, a system icon IDI or .ico file path; when hinst=module handle, a resource ID (number) or resource name (string);
-     * uType: gui.ImageType constant, default IMAGE_ICON (returns HICON), pass BITMAP/CURSOR for number return;
-     * cx/cy: target size (0 for default, use gui.LoadImageFlag.DEFAULTSIZE for system default size);
-     * fuLoad: gui.LoadImageFlag constants. Note: loading system icons (IDI_*, hinst=null) requires gui.LoadImageFlag.SHARED.
-     * Example: gui.LoadImage(null, "app.ico", gui.ImageType.ICON, 32, 32, gui.LoadImageFlag.LOADFROMFILE)
-     *          gui.LoadImage(null, gui.IDI.APPLICATION, gui.ImageType.ICON, 0, 0, gui.LoadImageFlag.SHARED)
+     * uType: ImageType constant, default IMAGE_ICON (returns HICON), pass BITMAP/CURSOR for number return;
+     * cx/cy: target size (0 for default, use LoadImageFlag.DEFAULTSIZE for system default size);
+     * fuLoad: LoadImageFlag constants. Note: loading system icons (IDI_*, hinst=null) requires LoadImageFlag.SHARED.
+     * Example: import { IDI, ImageType, LoadImageFlag } from 'quickwin/constants'
+     *          gui.LoadImage(null, "app.ico", ImageType.ICON, 32, 32, LoadImageFlag.LOADFROMFILE)
+     *          gui.LoadImage(null, IDI.APPLICATION, ImageType.ICON, 0, 0, LoadImageFlag.SHARED)
      */
-    function LoadImage<H extends (import("win").HMODULE) | null, T extends ImageType = ImageType.ICON>(
+    function LoadImage<H extends (import("win").HMODULE) | null, T extends ImageType = import('./constants').ImageType.ICON>(
         hinst: H,
         name: H extends null ? string | IDI : string | number,
         uType?: T,
         cx?: number,
         cy?: number,
         fuLoad?: number
-    ): T extends ImageType.ICON ? HICON | null : number | null;
+    ): T extends import('./constants').ImageType.ICON ? HICON | null : number | null;
     /**
      * Loads the first icon group (RT_GROUP_ICON) from this exe, i.e. the custom icon
      * embedded by rcedit. Works with any resource ID including 0. Returns null if the

package/test/test_ffi_bind.js

@@ -88,7 +88,7 @@ export const suite = {
         const rect = new PtrArrayBuffer(16);
         const dv = new DataView(rect);
         dv.setInt32(8, 500, true);
-        const lines = user32.DrawTextW(dc, 'hello ffi-bind', -1, rect, 1024 /* gui.DrawTextFlag.CALCRECT */);
+        const lines = user32.DrawTextW(dc, 'hello ffi-bind', -1, rect, 1024 /* DrawTextFlag.CALCRECT */);
         t.checkTrue('DrawTextW returns line count > 0', lines > 0);
         t.checkTrue('measured width > 0', dv.getInt32(8, true) > 0);
         t.checkTrue('measured height > 0', dv.getInt32(12, true) > 0);
@@ -529,7 +529,7 @@ export const suite = {
             t.check('closure 返回 ! 非零：正常写槽', 0x3000, readScalar(new DataView(rr3), 0, 'ptr'));
             nnRet.dispose();
             // 返回位负例：fn 返回 0 → printf 诊断 + 不写槽；C 侧 retbuf 初值恒零
-            // （quickjs-ffi-closure.c zero8 拷贝），终值 0 与「写了 0」不可分——
+            // （src/quickjs-ffi-closure.c zero8 拷贝），终值 0 与「写了 0」不可分——
             // 值层面只验分发不炸、槽保持 0（诊断走 stdout，见上方 printf）。
             const nnRet0 = closure('i32 -> <>ptr!', (_n) => 0);
             const rr4 = new ArrayBuffer(8);
@@ -587,9 +587,9 @@ export const suite = {
         const drawText = bind('user32.dll', 'DrawTextW', '<>ptr! <WCHAR>ptr i32 <BYTE>ptr i32 -> i32');
         const dtRect = new PtrArrayBuffer(16);
         if (dcScreen) {
-            t.checkTrue('DrawTextW 非空 DC 通过 ! 参数位', drawText(dcScreen, 'hi !', -1, dtRect, 1024 /* gui.DrawTextFlag.CALCRECT */) > 0);
+            t.checkTrue('DrawTextW 非空 DC 通过 ! 参数位', drawText(dcScreen, 'hi !', -1, dtRect, 1024 /* DrawTextFlag.CALCRECT */) > 0);
             try {
-                drawText(0, 'hi !', -1, dtRect, 1024 /* gui.DrawTextFlag.CALCRECT */);
+                drawText(0, 'hi !', -1, dtRect, 1024 /* DrawTextFlag.CALCRECT */);
                 t.checkTrue('DrawTextW NULL DC 标 ! 后应 throw', false);
             }
             catch (e) {
@@ -644,13 +644,13 @@ export const suite = {
         if (false) {
             const sw = bind('user32.dll', 'ShowWindow', '<X>ptr i32@ShowWindowCmd -> i32');
             const sp = bind('user32.dll', 'SetWindowPos', '<X>ptr <>ptr@SetWindowPosHwnd i32 i32 i32 i32 u32 -> i32');
-            sw(NULL, 5 /* gui.ShowWindowCmd.SHOW */); // 枚举成员
+            sw(NULL, 5 /* ShowWindowCmd.SHOW */); // 枚举成员
             sw(NULL, 5); // 域内字面量（5 = SW_SHOW）
-            sp(NULL, 0 /* gui.SetWindowPosHwnd.TOP */, 0, 0, 0, 0, 1 /* gui.SetWindowPosFlag.SWP_NOSIZE */);
+            sp(NULL, 0 /* SetWindowPosHwnd.TOP */, 0, 0, 0, 0, 1 /* SetWindowPosFlag.SWP_NOSIZE */);
             // @ts-expect-error 域外字面量被拦（11152 不是任何 ShowWindow 命令）
             sw(NULL, 0x2B90);
             // @ts-expect-error 跨枚举误用：HWND_TOP/TOPMOST 不是 ShowWindow 命令
-            sw(NULL, 0 /* gui.SetWindowPosHwnd.TOP */);
+            sw(NULL, 0 /* SetWindowPosHwnd.TOP */);
         }
     },
 };

package/test/test_ffi_bind.ts

@@ -1,11 +1,11 @@
 import * as std from 'std'
-import * as gui from 'gui'
 import * as ffi from 'ffi'
 import * as os from 'os'
 import { Tester } from './test_helper.js'
 import { bind, bindLib, closure, WCHAR, BYTE, type CodecMap } from '../lib/ffi/bind.js'
 import { struct } from '../lib/ffi/struct.js'
 import { NULL, type C_Struct, type MaybePtr, Ptr, PtrArrayBuffer, readScalar, writeScalar, PTR_SIZE, normToken } from '../lib/ffi/ctype.js'
+import { DrawTextFlag, SetWindowPosFlag, SetWindowPosHwnd, ShowWindowCmd } from '../constants'
 
 // 编译期断言工具（仅类型层，运行时无开销）
 type Equal<A, B> = (<G>() => G extends A ? 1 : 2) extends (<G>() => G extends B ? 1 : 2) ? true : false
@@ -86,7 +86,7 @@ export const suite = {
         const rect = new PtrArrayBuffer(16)
         const dv = new DataView(rect)
         dv.setInt32(8, 500, true)
-        const lines = user32.DrawTextW(dc, 'hello ffi-bind', -1, rect, gui.DrawTextFlag.CALCRECT)
+        const lines = user32.DrawTextW(dc, 'hello ffi-bind', -1, rect, DrawTextFlag.CALCRECT)
         t.checkTrue('DrawTextW returns line count > 0', lines > 0)
         t.checkTrue('measured width > 0', dv.getInt32(8, true) > 0)
         t.checkTrue('measured height > 0', dv.getInt32(12, true) > 0)
@@ -541,7 +541,7 @@ export const suite = {
             t.check('closure 返回 ! 非零：正常写槽', 0x3000, readScalar(new DataView(rr3), 0, 'ptr'))
             nnRet.dispose()
             // 返回位负例：fn 返回 0 → printf 诊断 + 不写槽；C 侧 retbuf 初值恒零
-            // （quickjs-ffi-closure.c zero8 拷贝），终值 0 与「写了 0」不可分——
+            // （src/quickjs-ffi-closure.c zero8 拷贝），终值 0 与「写了 0」不可分——
             // 值层面只验分发不炸、槽保持 0（诊断走 stdout，见上方 printf）。
             const nnRet0 = closure('i32 -> <>ptr!', (_n) => 0)
             const rr4 = new ArrayBuffer(8)
@@ -602,9 +602,9 @@ export const suite = {
         const dtRect = new PtrArrayBuffer(16)
         if (dcScreen) {
             t.checkTrue('DrawTextW 非空 DC 通过 ! 参数位',
-                drawText(dcScreen, 'hi !', -1, dtRect, gui.DrawTextFlag.CALCRECT) > 0)
+                drawText(dcScreen, 'hi !', -1, dtRect, DrawTextFlag.CALCRECT) > 0)
             try {
-                drawText(0, 'hi !', -1, dtRect, gui.DrawTextFlag.CALCRECT)
+                drawText(0, 'hi !', -1, dtRect, DrawTextFlag.CALCRECT)
                 t.checkTrue('DrawTextW NULL DC 标 ! 后应 throw', false)
             } catch (e) { t.checkTrue('! 参数位（第 1 位）throw 指明 arg#1', String(e).includes('arg#1')) }
         }
@@ -658,13 +658,13 @@ export const suite = {
         if (false) {
             const sw = bind('user32.dll', 'ShowWindow', '<X>ptr i32@ShowWindowCmd -> i32')
             const sp = bind('user32.dll', 'SetWindowPos', '<X>ptr <>ptr@SetWindowPosHwnd i32 i32 i32 i32 u32 -> i32')
-            sw(NULL, gui.ShowWindowCmd.SHOW)  // 枚举成员
+            sw(NULL, ShowWindowCmd.SHOW)  // 枚举成员
             sw(NULL, 5)                       // 域内字面量（5 = SW_SHOW）
-            sp(NULL, gui.SetWindowPosHwnd.TOP, 0, 0, 0, 0, gui.SetWindowPosFlag.SWP_NOSIZE)
+            sp(NULL, SetWindowPosHwnd.TOP, 0, 0, 0, 0, SetWindowPosFlag.SWP_NOSIZE)
             // @ts-expect-error 域外字面量被拦（11152 不是任何 ShowWindow 命令）
             sw(NULL, 0x2B90)
             // @ts-expect-error 跨枚举误用：HWND_TOP/TOPMOST 不是 ShowWindow 命令
-            sw(NULL, gui.SetWindowPosHwnd.TOP)
+            sw(NULL, SetWindowPosHwnd.TOP)
         }
     },
 }

package/test/test_ffi_struct.js

@@ -724,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]' });

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_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
@@ -769,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 剥 @）+ 元素值域

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)