quickwin 1.2.1 → 1.3.0

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

@@ -2,6 +2,17 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef, useRef, useEffect, useState } from 'react';
 import * as gui from 'gui';
 import * as ffi from 'ffi';
+import { struct } from '../../ffi-struct.js';
+import { nmCode } from '../nmhdr.js';
+const TCITEMW = struct({
+    mask: 'u32',
+    dwState: 'u32',
+    dwStateMask: 'u32',
+    pszText: 'ptr',
+    cchTextMax: 'i32',
+    iImage: 'i32',
+    lParam: 'ptr',
+});
 function textToUtf16(s) {
     const buf = new ArrayBuffer((s.length + 1) * 2);
     const dv = new DataView(buf);
@@ -9,10 +20,6 @@ function textToUtf16(s) {
         dv.setUint16(i * 2, s.charCodeAt(i), true);
     return buf;
 }
-function readI32(ptr, offset) {
-    return ffi.readByte(ptr + offset) | (ffi.readByte(ptr + offset + 1) << 8) |
-        (ffi.readByte(ptr + offset + 2) << 16) | (ffi.readByte(ptr + offset + 3) << 24);
-}
 export const Tab = forwardRef(({ tabs, selectedIndex: controlledIndex, defaultSelectedIndex = 0, onChange, style }, ref) => {
     const [internalIndex, setInternalIndex] = useState(defaultSelectedIndex);
     const isControlled = controlledIndex !== undefined;
@@ -25,11 +32,15 @@ export const Tab = forwardRef(({ tabs, selectedIndex: controlledIndex, defaultSe
         gui.SendMessage(h, 4873 /* gui.TcMsg.DELETEALLITEMS */, 0, 0);
         for (let i = 0; i < tabs.length; i++) {
             const titleBuf = textToUtf16(tabs[i].title);
-            const tci = new ArrayBuffer(40);
-            const dv = new DataView(tci);
-            dv.setUint32(0, 1 /* gui.TcItemFlag.TEXT */, true);
-            dv.setBigUint64(16, BigInt(ffi.bufferPtr(titleBuf)), true);
-            dv.setInt32(24, tabs[i].title.length + 1, true);
+            const tci = TCITEMW.write({
+                mask: 1 /* gui.TcItemFlag.TEXT */,
+                dwState: 0,
+                dwStateMask: 0,
+                pszText: ffi.bufferPtr(titleBuf),
+                cchTextMax: tabs[i].title.length + 1,
+                iImage: 0,
+                lParam: 0,
+            });
             const tciPtr = ffi.bufferPtr(tci);
             gui.SendMessage(h, 4926 /* gui.TcMsg.INSERTITEMW */, i, tciPtr);
         }
@@ -45,7 +56,7 @@ export const Tab = forwardRef(({ tabs, selectedIndex: controlledIndex, defaultSe
                 const h = tabHwnd.current;
                 if (!h)
                     return;
-                const code = readI32(e.lParam, 16);
+                const code = nmCode(e.lParam);
                 // SysTabControl32 在 comctl32 v6 下不发标准的 TCN_SELCHANGE (-550),
                 // 收到 NM_CLICK (-2) 或 TCN_SELCHANGING (-551) 时读实际选中项
                 if (code === -552 /* gui.TcNotifyCode.SELCHANGING */ || code === -2 /* gui.SysLinkNotifyCode.CLICK */) {

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

@@ -1,25 +1,37 @@
 import { useRef, useEffect, Children, cloneElement } from 'react';
 import * as gui from 'gui';
 import * as ffi from 'ffi';
-const TTTOOLINFO_CBSIZE = 64;
-function setQword(dv, offset, val) {
-    dv.setUint32(offset, val & 0xFFFFFFFF, true);
-    dv.setUint32(offset + 4, Math.floor(val / 0x100000000), true);
-}
+import { struct } from '../../ffi-struct.js';
+const TTTOOLINFOW = struct({
+    cbSize: 'u32',
+    uFlags: 'u32',
+    hwnd: 'ptr',
+    uId: 'ptr',
+    rect: 'i32[4]',
+    hinst: 'ptr',
+    lpszText: 'ptr',
+    lParam: 'ptr',
+    lpReserved: 'ptr', // WinXP+ 追加字段（系统 sizeof 含之）
+});
 function buildToolInfo(hTarget, text) {
-    const textOff = TTTOOLINFO_CBSIZE;
+    const size = TTTOOLINFOW.size;
     const textLen = (text.length + 1) * 2;
-    const buf = new ArrayBuffer(TTTOOLINFO_CBSIZE + textLen);
+    const buf = new ArrayBuffer(size + textLen);
+    TTTOOLINFOW.write({
+        cbSize: size,
+        uFlags: 16 /* gui.TtToolFlag.SUBCLASS */ | 1 /* gui.TtToolFlag.IDISHWND */,
+        hwnd: hTarget,
+        uId: hTarget,
+        rect: [0, 0, 0, 0],
+        hinst: 0,
+        lpszText: ffi.bufferPtr(buf) + size,
+        lParam: 0,
+        lpReserved: 0,
+    }, buf);
     const dv = new DataView(buf);
-    dv.setUint32(0, TTTOOLINFO_CBSIZE, true);
-    dv.setUint32(4, 16 /* gui.TtToolFlag.SUBCLASS */ | 1 /* gui.TtToolFlag.IDISHWND */, true);
-    setQword(dv, 8, hTarget);
-    setQword(dv, 16, hTarget);
     for (let i = 0; i < text.length; i++)
-        dv.setUint16(textOff + i * 2, text.charCodeAt(i), true);
-    dv.setUint16(textOff + text.length * 2, 0, true);
-    const bufPtr = ffi.bufferPtr(buf);
-    setQword(dv, 48, bufPtr + textOff);
+        dv.setUint16(size + i * 2, text.charCodeAt(i), true);
+    dv.setUint16(size + text.length * 2, 0, true);
     return buf;
 }
 function Tooltip({ text, children, balloon }) {

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

@@ -2,6 +2,21 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { forwardRef, useRef, useEffect, useState } from 'react';
 import * as gui from 'gui';
 import * as ffi from 'ffi';
+import { struct } from '../../ffi-struct.js';
+import { nmCode } from '../nmhdr.js';
+const TVITEM = struct({
+    mask: 'u32',
+    hItem: 'ptr',
+    state: 'u32',
+    stateMask: 'u32',
+    pszText: 'ptr',
+    cchTextMax: 'i32',
+    iImage: 'i32',
+    iSelectedImage: 'i32',
+    cChildren: 'i32',
+    lParam: 'ptr',
+});
+const TVINSERTSTRUCT = struct({ hParent: 'ptr', hInsertAfter: 'ptr', item: TVITEM });
 function textToUtf16(s) {
     const buf = new ArrayBuffer((s.length + 1) * 2);
     const dv = new DataView(buf);
@@ -9,51 +24,26 @@ function textToUtf16(s) {
         dv.setUint16(i * 2, s.charCodeAt(i), true);
     return buf;
 }
-function readI32(ptr, offset) {
-    return ffi.readByte(ptr + offset) | (ffi.readByte(ptr + offset + 1) << 8) |
-        (ffi.readByte(ptr + offset + 2) << 16) | (ffi.readByte(ptr + offset + 3) << 24);
-}
 function bufPtr(buf) {
     return ffi.bufferPtr(buf);
 }
-function setPtr(dv, offset, ptr) {
-    dv.setUint32(offset, ptr & 0xFFFFFFFF, true);
-    dv.setUint32(offset + 4, Math.floor(ptr / 0x100000000), true);
-}
 function buildTvItem(textPtr, cChildren) {
     let mask = 1 /* gui.TvIfFlag.TEXT */;
     if (cChildren > 0)
         mask |= 64 /* gui.TvIfFlag.CHILDREN */;
-    const buf = new ArrayBuffer(56);
-    const dv = new DataView(buf);
-    dv.setUint32(0, mask, true); // mask (offset 0)
-    setPtr(dv, 8, 0); // hItem
-    dv.setUint32(16, 0, true); // state
-    dv.setUint32(20, 0, true); // stateMask
-    setPtr(dv, 24, textPtr); // pszText
-    dv.setInt32(32, 260, true); // cchTextMax
-    dv.setInt32(36, 0, true); // iImage
-    dv.setInt32(40, 0, true); // iSelectedImage
-    dv.setInt32(44, cChildren, true); // cChildren
-    setPtr(dv, 48, 0); // lParam
-    return buf;
-}
-function buildTvInsertStruct(hParent, hInsertAfter, itemBuf) {
-    const buf = new ArrayBuffer(72);
-    const dv = new DataView(buf);
-    setPtr(dv, 0, hParent); // hParent (offset 0)
-    setPtr(dv, 8, hInsertAfter); // hInsertAfter (offset 8)
-    const src = new DataView(itemBuf);
-    for (let i = 0; i < 56; i += 4)
-        dv.setUint32(16 + i, src.getUint32(i, true), true);
-    return buf;
+    return TVITEM.write({
+        mask, hItem: 0, state: 0, stateMask: 0,
+        pszText: textPtr, cchTextMax: 260,
+        iImage: 0, iSelectedImage: 0, cChildren, lParam: 0,
+    });
 }
 function insertItems(hTree, nodes, parentHandle, hItemMap, keyMap) {
     for (const node of nodes) {
         const cChildren = node.children && node.children.length > 0 ? 1 : 0;
         const textBuf = textToUtf16(node.label);
         const itemBuf = buildTvItem(bufPtr(textBuf), cChildren);
-        const tvins = buildTvInsertStruct(parentHandle, -65536 /* gui.TvInsertAfter.ROOT */, itemBuf);
+        const item = TVITEM.read(itemBuf);
+        const tvins = TVINSERTSTRUCT.write({ hParent: parentHandle, hInsertAfter: -65536 /* gui.TvInsertAfter.ROOT */, item });
         const hItem = gui.SendMessage(hTree, 4402 /* gui.TvMsg.INSERTITEMW */, 0, bufPtr(tvins));
         hItemMap.set(hItem, node);
         if (node.key)
@@ -112,7 +102,7 @@ const TreeView = forwardRef(function TreeViewInner({ data, onSelect, defaultSele
     }, [selKey]);
     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 */) {
-                const code = readI32(e.lParam, 16);
+                const code = nmCode(e.lParam);
                 if (code === -451 /* gui.TvNotifyCode.SELCHANGEDW */) {
                     const h = tvRef.current;
                     if (!h)

package/lib/react-qw/nmhdr.js

@@ -0,0 +1,26 @@
+import * as os from 'os';
+import * as ffi from 'ffi';
+import { struct } from '../ffi-struct.js';
+// 架构相关常量：32 位(ia32)/64 位(x64) Windows ABI
+export const IS64 = os.arch === 'x64';
+export const PTR_SIZE = IS64 ? 8 : 4;
+// NMHDR = hwndFrom(ptr) + idFrom(ptr) + code(i32)。
+// 用 ffi-struct 定义以复现 MSVC/嵌套结构的“尾 padding 传染”（内嵌 NMHDR 占满 24/12 字节）。
+export const NMHDR = struct({ hwndFrom: 'ptr', idFrom: 'ptr', code: 'i32' });
+export const NMHDR_SIZE = NMHDR.size; // 24 (x64) / 12 (ia32)
+export const NMHDR_CODE = NMHDR.offsetOf('code'); // 16 / 8
+export function readI32At(ptr, offset) {
+    return ffi.readByte(ptr + offset) | (ffi.readByte(ptr + offset + 1) << 8) |
+        (ffi.readByte(ptr + offset + 2) << 16) | (ffi.readByte(ptr + offset + 3) << 24);
+}
+export function readU32At(ptr, offset) {
+    return ffi.readByte(ptr + offset) | (ffi.readByte(ptr + offset + 1) << 8) |
+        (ffi.readByte(ptr + offset + 2) << 16) | (ffi.readByte(ptr + offset + 3) << 24) >>> 0;
+}
+export function readU16At(ptr, offset) {
+    return ffi.readByte(ptr + offset) | (ffi.readByte(ptr + offset + 1) << 8);
+}
+// 读 NMHDR.code（WM_NOTIFY 通知码）
+export function nmCode(lParam) {
+    return readI32At(lParam, NMHDR_CODE);
+}

package/lib/react-qw/nmhdr.ts

@@ -0,0 +1,32 @@
+import * as os from 'os'
+import * as ffi from 'ffi'
+import { struct } from '../ffi-struct.js'
+
+// 架构相关常量：32 位(ia32)/64 位(x64) Windows ABI
+export const IS64 = os.arch === 'x64'
+export const PTR_SIZE = IS64 ? 8 : 4
+
+// NMHDR = hwndFrom(ptr) + idFrom(ptr) + code(i32)。
+// 用 ffi-struct 定义以复现 MSVC/嵌套结构的“尾 padding 传染”（内嵌 NMHDR 占满 24/12 字节）。
+export const NMHDR = struct({ hwndFrom: 'ptr', idFrom: 'ptr', code: 'i32' })
+export const NMHDR_SIZE = NMHDR.size // 24 (x64) / 12 (ia32)
+export const NMHDR_CODE = NMHDR.offsetOf('code') // 16 / 8
+
+export function readI32At(ptr: number, offset: number): number {
+  return ffi.readByte(ptr + offset) | (ffi.readByte(ptr + offset + 1) << 8) |
+    (ffi.readByte(ptr + offset + 2) << 16) | (ffi.readByte(ptr + offset + 3) << 24)
+}
+
+export function readU32At(ptr: number, offset: number): number {
+  return ffi.readByte(ptr + offset) | (ffi.readByte(ptr + offset + 1) << 8) |
+    (ffi.readByte(ptr + offset + 2) << 16) | (ffi.readByte(ptr + offset + 3) << 24) >>> 0
+}
+
+export function readU16At(ptr: number, offset: number): number {
+  return ffi.readByte(ptr + offset) | (ffi.readByte(ptr + offset + 1) << 8)
+}
+
+// 读 NMHDR.code（WM_NOTIFY 通知码）
+export function nmCode(lParam: number): number {
+  return readI32At(lParam, NMHDR_CODE)
+}

package/lib/text-measure.js

@@ -1,31 +1,19 @@
 import * as ffi from 'ffi';
-import * as os from 'os';
-import * as win from 'win';
 import * as gui from 'gui';
-function loadProc(lib, name) {
-    const ptr = win.GetProcAddress(lib, name);
-    if (!ptr)
-        throw new Error(`Cannot load ${name}`);
-    return ptr;
-}
-const user32 = win.LoadLibrary('user32.dll');
-const gdi32 = win.LoadLibrary('gdi32.dll');
-if (!user32 || !gdi32)
-    throw new Error('Failed to load system DLLs');
-const DrawTextW = loadProc(user32, 'DrawTextW');
-const GetDC = loadProc(user32, 'GetDC');
-const ReleaseDC = loadProc(user32, 'ReleaseDC');
-const SelectObject = loadProc(gdi32, 'SelectObject');
-// 句柄宽度随架构：ia32 上 HDC/HWND 是 32-bit，错用 UINT64 会导致 DrawTextW 参数错位、测宽为 0
-const FFI_HND = os.arch === 'ia32' ? ffi.FFI_TYPE_UINT32 : ffi.FFI_TYPE_UINT64;
-const FFI_S32 = ffi.FFI_TYPE_SINT32;
-const FFI_PTR = ffi.FFI_TYPE_POINTER;
+import { bindLib } from './ffi-bind.js';
+const user32 = bindLib('user32.dll', {
+    DrawTextW: 'ptr wstr i32 ptr i32 -> i32',
+    GetDC: 'ptr -> ptr',
+    ReleaseDC: 'ptr ptr -> i32',
+});
+const gdi32 = bindLib('gdi32.dll', {
+    SelectObject: 'ptr ptr -> ptr',
+});
 export function measureText(hdc, text, maxWidth) {
-    const textBuf = new TextEncoder('utf-16le').encode(text + '\0').buffer;
     const rect = new ArrayBuffer(16);
     const dv = new DataView(rect);
     dv.setInt32(8, maxWidth, true);
-    ffi.ffiCall(DrawTextW, [FFI_HND, FFI_PTR, FFI_S32, FFI_PTR, FFI_S32], [hdc, textBuf, -1, rect, 1024 /* gui.DrawTextFlag.CALCRECT */], FFI_S32);
+    user32.DrawTextW(hdc, text, -1, rect, 1024 /* gui.DrawTextFlag.CALCRECT */);
     return { width: dv.getInt32(8, true), height: dv.getInt32(12, true) };
 }
 export function getButtonIdealSize(hwnd) {
@@ -35,15 +23,15 @@ export function getButtonIdealSize(hwnd) {
     return { width: dv.getInt32(0, true), height: dv.getInt32(4, true) };
 }
 export function measureTextForHwnd(hwnd, text) {
-    const hdc = ffi.ffiCall(GetDC, [FFI_HND], [hwnd], FFI_HND);
+    const hdc = user32.GetDC(hwnd);
     if (!hdc)
         return { width: 0, height: 0 };
     const hFont = gui.SendMessage(hwnd, 49 /* gui.WmMsg.GETFONT */, 0, 0);
-    const oldFont = hFont ? ffi.ffiCall(SelectObject, [FFI_HND, FFI_HND], [hdc, hFont], FFI_HND) : 0;
+    const oldFont = hFont ? gdi32.SelectObject(hdc, hFont) : 0;
     const result = measureText(hdc, text, 0);
     if (hFont)
-        ffi.ffiCall(SelectObject, [FFI_HND, FFI_HND], [hdc, oldFont], FFI_HND);
-    ffi.ffiCall(ReleaseDC, [FFI_HND, FFI_HND], [hwnd, hdc], FFI_S32);
+        gdi32.SelectObject(hdc, oldFont);
+    user32.ReleaseDC(hwnd, hdc);
     const wr = gui.GetWindowRect(hwnd);
     const cr = gui.GetClientRect(hwnd);
     if (wr && cr) {

package/lib/text-measure.ts

@@ -1,33 +1,21 @@
 import * as ffi from 'ffi'
-import * as os from 'os'
-import * as win from 'win'
 import * as gui from 'gui'
+import { bindLib } from './ffi-bind.js'
 
-function loadProc(lib: win.HMODULE, name: string): number {
-    const ptr = win.GetProcAddress(lib, name)
-    if (!ptr) throw new Error(`Cannot load ${name}`)
-    return ptr
-}
-
-const user32 = win.LoadLibrary('user32.dll')
-const gdi32 = win.LoadLibrary('gdi32.dll')
-if (!user32 || !gdi32) throw new Error('Failed to load system DLLs')
-const DrawTextW = loadProc(user32, 'DrawTextW')
-const GetDC = loadProc(user32, 'GetDC')
-const ReleaseDC = loadProc(user32, 'ReleaseDC')
-const SelectObject = loadProc(gdi32, 'SelectObject')
-
-// 句柄宽度随架构：ia32 上 HDC/HWND 是 32-bit，错用 UINT64 会导致 DrawTextW 参数错位、测宽为 0
-const FFI_HND = os.arch === 'ia32' ? ffi.FFI_TYPE_UINT32 : ffi.FFI_TYPE_UINT64
-const FFI_S32 = ffi.FFI_TYPE_SINT32
-const FFI_PTR = ffi.FFI_TYPE_POINTER
+const user32 = bindLib('user32.dll', {
+    DrawTextW: 'ptr wstr i32 ptr i32 -> i32',
+    GetDC: 'ptr -> ptr',
+    ReleaseDC: 'ptr ptr -> i32',
+})
+const gdi32 = bindLib('gdi32.dll', {
+    SelectObject: 'ptr ptr -> ptr',
+})
 
 export function measureText(hdc: number, text: string, maxWidth: number): { width: number; height: number } {
-    const textBuf = new TextEncoder('utf-16le').encode(text + '\0').buffer
     const rect = new ArrayBuffer(16)
     const dv = new DataView(rect)
     dv.setInt32(8, maxWidth, true)
-    ffi.ffiCall(DrawTextW, [FFI_HND, FFI_PTR, FFI_S32, FFI_PTR, FFI_S32], [hdc, textBuf, -1, rect, gui.DrawTextFlag.CALCRECT], FFI_S32)
+    user32.DrawTextW(hdc, text, -1, rect, gui.DrawTextFlag.CALCRECT)
     return { width: dv.getInt32(8, true), height: dv.getInt32(12, true) }
 }
 
@@ -39,13 +27,13 @@ export function getButtonIdealSize(hwnd: gui.HWND): { width: number; height: num
 }
 
 export function measureTextForHwnd(hwnd: gui.HWND, text: string): { width: number; height: number } {
-    const hdc = ffi.ffiCall(GetDC, [FFI_HND], [hwnd], FFI_HND)
+    const hdc = user32.GetDC(hwnd)
     if (!hdc) return { width: 0, height: 0 }
     const hFont = gui.SendMessage(hwnd, gui.WmMsg.GETFONT, 0, 0)
-    const oldFont = hFont ? ffi.ffiCall(SelectObject, [FFI_HND, FFI_HND], [hdc, hFont], FFI_HND) : 0
+    const oldFont = hFont ? gdi32.SelectObject(hdc, hFont) : 0
     const result = measureText(hdc, text, 0)
-    if (hFont) ffi.ffiCall(SelectObject, [FFI_HND, FFI_HND], [hdc, oldFont], FFI_HND)
-    ffi.ffiCall(ReleaseDC, [FFI_HND, FFI_HND], [hwnd, hdc], FFI_S32)
+    if (hFont) gdi32.SelectObject(hdc, oldFont)
+    user32.ReleaseDC(hwnd, hdc)
     const wr = gui.GetWindowRect(hwnd)
     const cr = gui.GetClientRect(hwnd)
     if (wr && cr) {

package/lib/win-common-structs.js

@@ -0,0 +1,39 @@
+import { struct } from './ffi-struct.js';
+// 跨组件/示例共享的 Windows 结构体（ffi-struct 按本机架构 MSVC 对齐布局）。
+// OPENFILENAMEW（GetOpenFileNameW）。Win2000+ 定义含尾部 pvReserved/dwReserved/FlagsEx（即 XP 系统上的真实 sizeof=152/88）：
+export const OPENFILENAMEW = struct({
+    lStructSize: 'u32',
+    hwndOwner: 'ptr',
+    hInstance: 'ptr',
+    lpstrFilter: 'ptr',
+    lpstrCustomFilter: 'ptr',
+    nMaxCustFilter: 'u32',
+    nFilterIndex: 'u32',
+    lpstrFile: 'ptr',
+    nMaxFile: 'u32',
+    lpstrFileTitle: 'ptr',
+    nMaxFileTitle: 'u32',
+    lpstrInitialDir: 'ptr',
+    lpstrTitle: 'ptr',
+    Flags: 'u32',
+    nFileOffset: 'u16',
+    nFileExtension: 'u16',
+    lpstrDefExt: 'ptr',
+    lCustData: 'ptr',
+    lpfnHook: 'ptr',
+    lpTemplateName: 'ptr',
+    pvReserved: 'ptr',
+    dwReserved: 'u32',
+    FlagsEx: 'u32',
+});
+// BROWSEINFOW（SHBrowseForFolderW）：
+export const BROWSEINFOW = struct({
+    hwndOwner: 'ptr',
+    pidlRoot: 'ptr',
+    pszDisplayName: 'ptr',
+    lpszTitle: 'ptr',
+    ulFlags: 'u32',
+    lpfn: 'ptr',
+    lParam: 'ptr',
+    iImage: 'i32',
+});

package/lib/win-common-structs.ts

@@ -0,0 +1,41 @@
+import { struct } from './ffi-struct.js'
+
+// 跨组件/示例共享的 Windows 结构体（ffi-struct 按本机架构 MSVC 对齐布局）。
+// OPENFILENAMEW（GetOpenFileNameW）。Win2000+ 定义含尾部 pvReserved/dwReserved/FlagsEx（即 XP 系统上的真实 sizeof=152/88）：
+export const OPENFILENAMEW = struct({
+  lStructSize: 'u32',
+  hwndOwner: 'ptr',
+  hInstance: 'ptr',
+  lpstrFilter: 'ptr',
+  lpstrCustomFilter: 'ptr',
+  nMaxCustFilter: 'u32',
+  nFilterIndex: 'u32',
+  lpstrFile: 'ptr',
+  nMaxFile: 'u32',
+  lpstrFileTitle: 'ptr',
+  nMaxFileTitle: 'u32',
+  lpstrInitialDir: 'ptr',
+  lpstrTitle: 'ptr',
+  Flags: 'u32',
+  nFileOffset: 'u16',
+  nFileExtension: 'u16',
+  lpstrDefExt: 'ptr',
+  lCustData: 'ptr',
+  lpfnHook: 'ptr',
+  lpTemplateName: 'ptr',
+  pvReserved: 'ptr',
+  dwReserved: 'u32',
+  FlagsEx: 'u32',
+})
+
+// BROWSEINFOW（SHBrowseForFolderW）：
+export const BROWSEINFOW = struct({
+  hwndOwner: 'ptr',
+  pidlRoot: 'ptr',
+  pszDisplayName: 'ptr',
+  lpszTitle: 'ptr',
+  ulFlags: 'u32',
+  lpfn: 'ptr',
+  lParam: 'ptr',
+  iImage: 'i32',
+})

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "quickwin",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "QuickJS Win32 runtime — GUI, networking, WASM, FFI, and more",
   "bin": {
     "quickwin": "qwin.exe",

package/quickwin.d.ts

@@ -554,6 +554,8 @@ declare module "ffi" {
     type TYPE_OF_FFI_TYPE_SINT32 = number & { readonly __label: unique symbol }
     type TYPE_OF_FFI_TYPE_UINT64 = number & { readonly __label: unique symbol }
     type TYPE_OF_FFI_TYPE_SINT64 = number & { readonly __label: unique symbol }
+    type TYPE_OF_FFI_TYPE_FLOAT = number & { readonly __label: unique symbol }
+    type TYPE_OF_FFI_TYPE_DOUBLE = number & { readonly __label: unique symbol }
     type TYPE_OF_FFI_TYPE_POINTER = number & { readonly __label: unique symbol }
     
     const FFI_TYPE_VOID: TYPE_OF_FFI_TYPE_VOID;
@@ -565,10 +567,12 @@ declare module "ffi" {
     const FFI_TYPE_SINT32: TYPE_OF_FFI_TYPE_SINT32;
     const FFI_TYPE_UINT64: TYPE_OF_FFI_TYPE_UINT64;
     const FFI_TYPE_SINT64: TYPE_OF_FFI_TYPE_SINT64;
+    const FFI_TYPE_FLOAT: TYPE_OF_FFI_TYPE_FLOAT;
+    const FFI_TYPE_DOUBLE: TYPE_OF_FFI_TYPE_DOUBLE;
     const FFI_TYPE_POINTER: TYPE_OF_FFI_TYPE_POINTER;
 
-    type FfiType = TYPE_OF_FFI_TYPE_VOID | TYPE_OF_FFI_TYPE_UINT8 | TYPE_OF_FFI_TYPE_SINT8 | TYPE_OF_FFI_TYPE_UINT16 | TYPE_OF_FFI_TYPE_SINT16 | TYPE_OF_FFI_TYPE_UINT32 | TYPE_OF_FFI_TYPE_SINT32 | TYPE_OF_FFI_TYPE_UINT64 | TYPE_OF_FFI_TYPE_SINT64 | TYPE_OF_FFI_TYPE_POINTER;
-    type TypeArg<T extends FfiType> = T extends Exclude<FfiType, TYPE_OF_FFI_TYPE_VOID | TYPE_OF_FFI_TYPE_POINTER> ? number : T extends TYPE_OF_FFI_TYPE_POINTER ? (ArrayBuffer | null) : never;
+    type FfiType = TYPE_OF_FFI_TYPE_VOID | TYPE_OF_FFI_TYPE_UINT8 | TYPE_OF_FFI_TYPE_SINT8 | TYPE_OF_FFI_TYPE_UINT16 | TYPE_OF_FFI_TYPE_SINT16 | TYPE_OF_FFI_TYPE_UINT32 | TYPE_OF_FFI_TYPE_SINT32 | TYPE_OF_FFI_TYPE_UINT64 | TYPE_OF_FFI_TYPE_SINT64 | TYPE_OF_FFI_TYPE_FLOAT | TYPE_OF_FFI_TYPE_DOUBLE | TYPE_OF_FFI_TYPE_POINTER;
+    type TypeArg<T extends FfiType> = T extends Exclude<FfiType, TYPE_OF_FFI_TYPE_VOID | TYPE_OF_FFI_TYPE_POINTER> ? number : T extends TYPE_OF_FFI_TYPE_POINTER ? (ArrayBuffer | number | null) : never;
     type TypeArgs<T extends FfiType[], Args extends(number | null | ArrayBuffer)[] = []> = T extends [infer T1 extends FfiType, ...infer RES extends FfiType[]] ? TypeArgs<RES, [...Args, TypeArg<T1>]> : Args;
 
     function ffiCall<const T extends Exclude<FfiType, TYPE_OF_FFI_TYPE_VOID>[], const R extends FfiType>(func: number, argTypes: T, args: TypeArgs<T>, retType: R): R extends TYPE_OF_FFI_TYPE_VOID ? undefined : R extends TYPE_OF_FFI_TYPE_POINTER ? number | null : TypeArg<R>;

package/test/run.js

@@ -23,6 +23,8 @@ const suiteDefs = [
     { name: 'mupdf-twice', file: './test_mupdf_twice.js', tags: ['wasm', 'mupdf'] },
     { name: 'mupdf-render', file: './test_mupdf_render.js', tags: ['wasm', 'mupdf'] },
     { name: 'ffi', file: './test_ffi.js', tags: [] },
+    { name: 'ffi-bind', file: './test_ffi_bind.js', tags: [] },
+    { name: 'ffi-struct', file: './test_ffi_struct.js', tags: [] },
     { name: 'net-fetch', file: './test_net_fetch.js', tags: ['net'] },
     { name: 'net-wolfssl-read', file: './test_wolfssl_read.js', tags: ['net'] },
     { name: 'net-websocket', file: './test_net_websocket.js', tags: ['net'] },

package/test/run.ts

@@ -27,6 +27,8 @@ const suiteDefs = [
     { name: 'mupdf-twice',       file: './test_mupdf_twice.js',      tags: ['wasm', 'mupdf'] },
     { name: 'mupdf-render',      file: './test_mupdf_render.js',     tags: ['wasm', 'mupdf'] },
     { name: 'ffi',               file: './test_ffi.js',              tags: [] },
+    { name: 'ffi-bind',          file: './test_ffi_bind.js',         tags: [] },
+    { name: 'ffi-struct',        file: './test_ffi_struct.js',       tags: [] },
     { name: 'net-fetch',         file: './test_net_fetch.js',        tags: ['net'] },
     { name: 'net-wolfssl-read',   file: './test_wolfssl_read.js',     tags: ['net'] },
     { name: 'net-websocket',     file: './test_net_websocket.js',    tags: ['net'] },

package/test/test_ffi.js

@@ -159,14 +159,18 @@ export const suite = {
         else {
             std.printf('  no printers installed (skip)\n');
         }
-        t.section('pointer arg type check');
-        let threw = false;
-        try {
-            ffi.ffiCall(enumPrinters, [ffi.FFI_TYPE_POINTER], [123], ffi.FFI_TYPE_VOID);
-        }
-        catch (e) {
-            threw = true;
+        t.section('PTR accepts raw number handles (XP 32-bit fix)');
+        const hUser32 = win.LoadLibrary('user32.dll');
+        t.checkTrue('LoadLibrary("user32.dll") succeeds', hUser32 !== null);
+        if (hUser32) {
+            const getDC = win.GetProcAddress(hUser32, 'GetDC');
+            t.checkTrue('GetProcAddress("GetDC") succeeds', getDC !== null);
+            if (getDC) {
+                const screenDc = ffi.ffiCall(getDC, [ffi.FFI_TYPE_POINTER], [0], ffi.FFI_TYPE_POINTER);
+                t.checkTrue('PTR slot takes number (NULL hwnd) and returns a DC handle', screenDc !== 0 && screenDc !== null);
+                const bogus = ffi.ffiCall(getDC, [ffi.FFI_TYPE_POINTER], [0x12345678], ffi.FFI_TYPE_POINTER);
+                t.checkTrue('PTR slot takes non-zero number without throwing', bogus === 0 || bogus === null);
+            }
         }
-        t.checkTrue('non-ArrayBuffer pointer arg throws TypeError', threw);
     }
 };

package/test/test_ffi.ts

@@ -173,18 +173,18 @@ export const suite = {
             std.printf('  no printers installed (skip)\n')
         }
 
-        t.section('pointer arg type check')
-        let threw = false
-        try {
-            ffi.ffiCall(
-                enumPrinters,
-                [ffi.FFI_TYPE_POINTER] as any,
-                [123] as any,
-                ffi.FFI_TYPE_VOID
-            )
-        } catch (e) {
-            threw = true
+        t.section('PTR accepts raw number handles (XP 32-bit fix)')
+        const hUser32 = win.LoadLibrary('user32.dll')
+        t.checkTrue('LoadLibrary("user32.dll") succeeds', hUser32 !== null)
+        if (hUser32) {
+            const getDC = win.GetProcAddress(hUser32, 'GetDC')
+            t.checkTrue('GetProcAddress("GetDC") succeeds', getDC !== null)
+            if (getDC) {
+                const screenDc = ffi.ffiCall(getDC, [ffi.FFI_TYPE_POINTER], [0], ffi.FFI_TYPE_POINTER)
+                t.checkTrue('PTR slot takes number (NULL hwnd) and returns a DC handle', screenDc !== 0 && screenDc !== null)
+                const bogus = ffi.ffiCall(getDC, [ffi.FFI_TYPE_POINTER], [0x12345678], ffi.FFI_TYPE_POINTER)
+                t.checkTrue('PTR slot takes non-zero number without throwing', bogus === 0 || bogus === null)
+            }
         }
-        t.checkTrue('non-ArrayBuffer pointer arg throws TypeError', threw)
     }
 }

package/test/test_ffi_bind.js

@@ -0,0 +1,42 @@
+import * as std from 'std';
+import { bind, bindLib } from '../lib/ffi-bind.js';
+export const suite = {
+    name: 'ffi-bind',
+    run: (t) => {
+        t.section('bind single proc');
+        const getDC = bind('user32.dll', 'GetDC', 'ptr -> ptr');
+        const dc = getDC(0);
+        t.checkTrue('bind GetDC(NULL) returns screen DC', !!dc);
+        t.section('bindLib batch with wstr auto-encode');
+        const user32 = bindLib('user32.dll', {
+            DrawTextW: 'ptr wstr i32 ptr i32 -> i32',
+            ReleaseDC: 'ptr ptr -> i32',
+        });
+        const rect = new ArrayBuffer(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 */);
+        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);
+        if (dc)
+            user32.ReleaseDC(0, dc);
+        t.section('signedness read-back: i32 vs u32');
+        const lstrcmpI = bind('kernel32.dll', 'lstrcmpW', 'wstr wstr -> i32');
+        const lstrcmpU = bind('kernel32.dll', 'lstrcmpW', 'wstr wstr -> u32');
+        const setLastError = bind('kernel32.dll', 'SetLastError', 'u32 -> void');
+        const getErrU = bind('kernel32.dll', 'GetLastError', ' -> u32');
+        const getErrI = bind('kernel32.dll', 'GetLastError', ' -> i32');
+        const ri = lstrcmpI('a', 'b');
+        const ru = lstrcmpU('a', 'b');
+        std.printf('  lstrcmpW("a","b"): i32=%s u32=%s\n', String(ri), String(ru));
+        t.checkTrue('i32 read-back keeps negative sign', ri < 0);
+        t.check('u32 read-back is 0xFFFFFFFF', 4294967295, ru);
+        setLastError(0x80000000);
+        const glU = getErrU();
+        const glI = getErrI();
+        std.printf('  GetLastError after SetLastError(0x80000000): u32=%s i32=%s\n', String(glU), String(glI));
+        t.check('GetLastError u32 keeps big value', 2147483648, glU);
+        t.check('GetLastError i32 reads as negative', -2147483648, glI);
+    },
+};