quickwin 1.3.0 → 2.1.0

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

@@ -1,30 +1,20 @@
 import { useRef, useEffect, Children, cloneElement } from 'react';
 import * as gui from 'gui';
-import * as ffi from 'ffi';
-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 含之）
-});
+import { NULL, PtrArrayBuffer } from '../../ffi/ctype.js';
+import { TTTOOLINFOW } from '../../windows/structs.js';
+import { SetWindowPos } from '../../windows/user32.js';
 function buildToolInfo(hTarget, text) {
     const size = TTTOOLINFOW.size;
     const textLen = (text.length + 1) * 2;
-    const buf = new ArrayBuffer(size + textLen);
-    TTTOOLINFOW.write({
+    const buf = new PtrArrayBuffer(size + textLen);
+    TTTOOLINFOW.encode({
         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,
+        hinst: NULL,
+        lpszText: buf.ptr + size,
         lParam: 0,
         lpReserved: 0,
     }, buf);
@@ -46,16 +36,15 @@ function Tooltip({ text, children, balloon }) {
         if (!hTT)
             return;
         hTTRef.current = hTT;
-        gui.SetWindowPos(hTT, -1 /* gui.SetWindowPosHwnd.TOPMOST */, 0, 0, 0, 0, 2 /* gui.SetWindowPosFlag.SWP_NOMOVE */ | 1 /* gui.SetWindowPosFlag.SWP_NOSIZE */ | 16 /* gui.SetWindowPosFlag.SWP_NOACTIVATE */);
+        SetWindowPos(hTT, -1 /* gui.SetWindowPosHwnd.TOPMOST */, 0, 0, 0, 0, 2 /* gui.SetWindowPosFlag.SWP_NOMOVE */ | 1 /* gui.SetWindowPosFlag.SWP_NOSIZE */ | 16 /* gui.SetWindowPosFlag.SWP_NOACTIVATE */);
         const ti = buildToolInfo(hTarget, text);
-        const tiPtr = ffi.bufferPtr(ti);
-        gui.SendMessage(hTT, 1074 /* gui.TtMsg.ADDTOOLW */, 0, tiPtr);
+        gui.SendMessage(hTT, 1074 /* gui.TtMsg.ADDTOOLW */, 0, ti.ptr);
         gui.SendMessage(hTT, 1048 /* gui.TtMsg.SETMAXTIPWIDTH */, 0, 400);
         gui.SendMessage(hTT, 1025 /* gui.TtMsg.ACTIVATE */, 1, 0);
         return () => {
             if (hTT) {
                 const ti2 = buildToolInfo(hTarget, text);
-                gui.SendMessage(hTT, 1075 /* gui.TtMsg.DELTOOLW */, 0, ffi.bufferPtr(ti2));
+                gui.SendMessage(hTT, 1075 /* gui.TtMsg.DELTOOLW */, 0, ti2.ptr);
                 gui.DestroyWindow(hTT);
             }
             hTTRef.current = null;

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

@@ -1,37 +1,14 @@
 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 { WCHAR } from '../../ffi/bind.js';
+import { TVITEM, TVINSERTSTRUCT } from '../../windows/structs.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);
-    for (let i = 0; i < s.length; i++)
-        dv.setUint16(i * 2, s.charCodeAt(i), true);
-    return buf;
-}
-function bufPtr(buf) {
-    return ffi.bufferPtr(buf);
-}
 function buildTvItem(textPtr, cChildren) {
     let mask = 1 /* gui.TvIfFlag.TEXT */;
     if (cChildren > 0)
         mask |= 64 /* gui.TvIfFlag.CHILDREN */;
-    return TVITEM.write({
+    return TVITEM.encode({
         mask, hItem: 0, state: 0, stateMask: 0,
         pszText: textPtr, cchTextMax: 260,
         iImage: 0, iSelectedImage: 0, cChildren, lParam: 0,
@@ -40,11 +17,11 @@ function buildTvItem(textPtr, cChildren) {
 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 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));
+        const textBuf = WCHAR.encode(node.label);
+        const itemBuf = buildTvItem(textBuf.ptr, cChildren);
+        const item = TVITEM.decode(itemBuf);
+        const tvins = TVINSERTSTRUCT.encode({ hParent: parentHandle, hInsertAfter: -65536 /* gui.TvInsertAfter.ROOT */, item });
+        const hItem = gui.SendMessage(hTree, 4402 /* gui.TvMsg.INSERTITEMW */, 0, tvins.ptr);
         hItemMap.set(hItem, node);
         if (node.key)
             keyMap.set(node.key, hItem);

package/lib/react-qw/index.js

@@ -1,4 +1,5 @@
 import * as gui from 'gui';
+import { DefWindowProc, GetSystemMetrics } from '../windows/user32.js';
 import reconciler, { scaleFactor, instancesByHwnd, forceFlexLayout } from './reconciler.js';
 const noop = () => { };
 let defaultClassRegistered = false;
@@ -20,7 +21,7 @@ function ensureDefaultClass() {
             return result;
         if (msg === 5 /* gui.WmMsg.SIZE */)
             forceFlexLayout(hwnd);
-        return gui.DefWindowProc(hwnd, msg, wParam, lParam);
+        return DefWindowProc(hwnd, msg, wParam, lParam);
     });
     defaultClassRegistered = true;
     return DEFAULT_CLASS;
@@ -33,7 +34,8 @@ export function createRoot(container) {
         const ws = (cfg.ws ?? 0) | 13565952 /* gui.WindowStyle.OVERLAPPEDWINDOW */;
         const w = (cfg.width ?? 800) * scaleFactor;
         const h = (cfg.height ?? 600) * scaleFactor;
-        const [sw, sh] = gui.GetScreenSize();
+        // GetScreenSize 等价内联：SM_CXSCREEN=0 / SM_CYSCREEN=1
+        const [sw, sh] = [GetSystemMetrics(0), GetSystemMetrics(1)];
         const x = cfg.x === undefined ? ((sw - w) / 2) | 0
             : cfg.x === -2147483648 /* gui.CreatePos.USEDEFAULT */ ? -2147483648 /* gui.CreatePos.USEDEFAULT */ : cfg.x * scaleFactor;
         const y = cfg.y === undefined ? ((sh - h) / 2) | 0
@@ -48,7 +50,7 @@ export function createRoot(container) {
     else {
         hwnd = container;
     }
-    const root = reconciler.createContainer(hwnd, 0, null, false, null, '', noop, noop, noop, noop);
+    const root = reconciler.createContainer(hwnd, 0, null, false, null, '', (error, info) => console.log('[React uncaught]', error, error.stack, info.componentStack), (error, info) => console.log('[React caught]', error, error.stack, info.componentStack), (error, info) => console.log('[React recoverable]', error, error.stack, info.componentStack), noop);
     const rootInst = { hwnd, type: '_root', props: { type: '_root', style: { flexDirection: 'column', alignItems: 'stretch' } }, children: [] };
     instancesByHwnd.set(hwnd, rootInst);
     if (typeof container === 'object')

package/lib/react-qw/index.ts

@@ -1,5 +1,6 @@
 import * as gui from 'gui'
 import React from 'react'
+import { DefWindowProc, GetSystemMetrics } from '../windows/user32.js'
 import reconciler, { scaleFactor, instancesByHwnd, forceFlexLayout, type Instance } from './reconciler.js'
 
 const noop = () => { }
@@ -32,7 +33,7 @@ function ensureDefaultClass() {
     const result = entry?.onEvent?.({ hwnd, msg, wParam, lParam })
     if (typeof result === 'number') return result
     if (msg === gui.WmMsg.SIZE) forceFlexLayout(hwnd)
-    return gui.DefWindowProc(hwnd, msg, wParam, lParam)
+    return DefWindowProc(hwnd, msg, wParam, lParam)
   })
   defaultClassRegistered = true
   return DEFAULT_CLASS
@@ -46,7 +47,8 @@ export function createRoot(container: gui.HWND | RootWindowConfig) {
     const ws = (cfg.ws ?? 0) | gui.WindowStyle.OVERLAPPEDWINDOW
     const w = (cfg.width ?? 800) * scaleFactor
     const h = (cfg.height ?? 600) * scaleFactor
-    const [sw, sh] = gui.GetScreenSize()
+    // GetScreenSize 等价内联：SM_CXSCREEN=0 / SM_CYSCREEN=1
+    const [sw, sh] = [GetSystemMetrics(0), GetSystemMetrics(1)]
     const x = cfg.x === undefined ? ((sw - w) / 2) | 0
       : cfg.x === gui.CreatePos.USEDEFAULT ? gui.CreatePos.USEDEFAULT
       : cfg.x * scaleFactor
@@ -62,7 +64,10 @@ export function createRoot(container: gui.HWND | RootWindowConfig) {
   }
   const root = reconciler.createContainer(
     hwnd, 0, null, false, null, '',
-    noop, noop, noop, noop,
+    (error, info) => console.log('[React uncaught]', error, error.stack, info.componentStack),
+    (error, info) => console.log('[React caught]', error, error.stack, info.componentStack),
+    (error, info) => console.log('[React recoverable]', error, error.stack, info.componentStack),
+    noop,
   )
   const rootInst: Instance = { hwnd, type: '_root', props: { type: '_root', style: { flexDirection: 'column', alignItems: 'stretch' } }, children: [] }
   instancesByHwnd.set(hwnd, rootInst)

package/lib/react-qw/nmhdr.js

@@ -1,26 +1,5 @@
-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 通知码）
+import { NMHDR } from '../windows/structs.js';
+// 读 NMHDR.code（WM_NOTIFY 通知码）：lParam 是通知结构的原生指针，decode 直接从该地址读
 export function nmCode(lParam) {
-    return readI32At(lParam, NMHDR_CODE);
+    return NMHDR.decode(lParam).code;
 }

package/lib/react-qw/nmhdr.ts

@@ -1,32 +1,7 @@
-import * as os from 'os'
-import * as ffi from 'ffi'
-import { struct } from '../ffi-struct.js'
+import type { Ptr } from '../ffi/ctype.js'
+import { NMHDR } from '../windows/structs.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 通知码）
+// 读 NMHDR.code（WM_NOTIFY 通知码）：lParam 是通知结构的原生指针，decode 直接从该地址读
 export function nmCode(lParam: number): number {
-  return readI32At(lParam, NMHDR_CODE)
-}
+  return NMHDR.decode(lParam as Ptr<'NMHDR'>).code
+}

package/lib/react-qw/props.js

@@ -1,7 +1,12 @@
 import * as gui from 'gui';
+import { SetWindowText, EnableWindow } from '../windows/user32.js';
 export function applyProps(instance, newProps, _oldProps) {
     const hwnd = instance.hwnd;
     instance.props = newProps;
+    // 延迟控件（DELAYED_CONTROLS）建窗前 hwnd 为 null：窗口操作此刻全是 no-op
+    // （text/ws/style 在 ensureChildWindow 建窗时应用），FFI 位不收 JS null——早退。
+    if (hwnd === null)
+        return;
     const textVal = 'text' in newProps ? newProps.text : (typeof newProps.children === 'string' ? newProps.children :
         typeof newProps.children === 'number' ? String(newProps.children) : undefined);
     if (textVal !== undefined) {
@@ -10,13 +15,13 @@ export function applyProps(instance, newProps, _oldProps) {
             const sel = gui.SendMessage(hwnd, 176 /* gui.EditMsg.GETSEL */, 0, 0);
             cursor = sel >>> 16;
         }
-        gui.SetWindowText(hwnd, textVal);
+        SetWindowText(hwnd, textVal);
         if (instance.type === 'EDIT' && cursor >= 0) {
             gui.SendMessage(hwnd, 177 /* gui.EditMsg.SETSEL */, cursor, cursor);
         }
     }
     if ('disabled' in newProps) {
-        gui.EnableWindow(hwnd, !newProps.disabled);
+        EnableWindow(hwnd, !newProps.disabled ? 1 : 0);
     }
     if ('hidden' in newProps) {
         gui.ShowWindow(hwnd, newProps.hidden ? 0 /* gui.ShowWindowCmd.HIDE */ : 5 /* gui.ShowWindowCmd.SHOW */);

package/lib/react-qw/props.ts

@@ -1,4 +1,5 @@
 import * as gui from 'gui'
+import { SetWindowText, EnableWindow } from '../windows/user32.js'
 import type { Instance, Props } from './reconciler.js'
 
 export function applyProps(
@@ -6,8 +7,11 @@ export function applyProps(
   newProps: Props,
   _oldProps: Props,
 ) {
-  const hwnd = instance.hwnd!
+  const hwnd = instance.hwnd
   instance.props = newProps
+  // 延迟控件（DELAYED_CONTROLS）建窗前 hwnd 为 null：窗口操作此刻全是 no-op
+  // （text/ws/style 在 ensureChildWindow 建窗时应用），FFI 位不收 JS null——早退。
+  if (hwnd === null) return
 
   const textVal = 'text' in newProps ? newProps.text : (
     typeof newProps.children === 'string' ? newProps.children :
@@ -19,13 +23,13 @@ export function applyProps(
       const sel = gui.SendMessage(hwnd, gui.EditMsg.GETSEL, 0, 0)
       cursor = sel >>> 16
     }
-    gui.SetWindowText(hwnd, textVal)
+    SetWindowText(hwnd, textVal)
     if (instance.type === 'EDIT' && cursor >= 0) {
       gui.SendMessage(hwnd, gui.EditMsg.SETSEL, cursor, cursor)
     }
   }
   if ('disabled' in newProps) {
-    gui.EnableWindow(hwnd, !newProps.disabled)
+    EnableWindow(hwnd, !newProps.disabled ? 1 : 0)
   }
   if ('hidden' in newProps) {
     gui.ShowWindow(hwnd, newProps.hidden ? gui.ShowWindowCmd.HIDE : gui.ShowWindowCmd.SHOW)

package/lib/react-qw/reconciler.js

@@ -3,27 +3,37 @@ import { createContext } from 'react';
 import { DefaultEventPriority, NoEventPriority } from 'react-reconciler/constants';
 import * as gui from 'gui';
 import * as os from 'os';
+import { GetDC, ReleaseDC, GetWindowLongPtr, CallWindowProc, SetWindowPos, InvalidateRect, SetParent, SetWindowText } from '../windows/user32.js';
+import { GetDeviceCaps } from '../windows/gdi32.js';
+import { NULL } from '../ffi/ctype.js';
 import { applyProps } from './props.js';
 import { calculateFlexLayout } from './layout.js';
 import { getButtonIdealSize, measureTextForHwnd } from '../text-measure.js';
 const dpiFont = gui.CreateSystemDpiFont();
-export const scaleFactor = gui.GetScaleFactor();
+// GetScaleFactor 等价内联：GetDC → GetDeviceCaps(LOGPIXELSX=88) → ReleaseDC 配对
+export const scaleFactor = (() => {
+    const hdc = GetDC(NULL);
+    const dpi = hdc ? GetDeviceCaps(hdc, 88) : 96;
+    if (hdc)
+        ReleaseDC(NULL, hdc);
+    return dpi / 96;
+})();
 const DELAYED_CONTROLS = new Set(['SysListView32', 'SysTreeView32', 'LISTBOX', 'COMBOBOX', 'msctls_trackbar32', 'SysDateTimePick32', 'SysLink']);
 function isDelayedControl(winClass) {
     return DELAYED_CONTROLS.has(winClass);
 }
 function setupWindowProc(instance, hwnd) {
     instance.hwnd = hwnd;
-    const oldProc = gui.GetWindowLongPtr(hwnd, -4 /* gui.Gwlp.WNDPROC */);
+    const oldProc = GetWindowLongPtr(hwnd, -4 /* gui.Gwlp.WNDPROC */);
     instancesByHwnd.set(hwnd, instance);
     gui.SetWindowProc(hwnd, (hwnd, msg, wParam, lParam) => {
         const ev = instance.props.onEvent;
         if (!ev)
-            return gui.CallWindowProc(oldProc, hwnd, msg, wParam, lParam);
+            return CallWindowProc(oldProc, hwnd, msg, wParam, lParam);
         if (typeof ev === 'object') {
-            return ev.fn({ hwnd, msg, wParam, lParam, callOldWndProc: () => gui.CallWindowProc(oldProc, hwnd, msg, wParam, lParam) });
+            return ev.fn({ hwnd, msg, wParam, lParam, callOldWndProc: () => CallWindowProc(oldProc, hwnd, msg, wParam, lParam) });
         }
-        const result = gui.CallWindowProc(oldProc, hwnd, msg, wParam, lParam);
+        const result = CallWindowProc(oldProc, hwnd, msg, wParam, lParam);
         const override = ev({ hwnd, msg, wParam, lParam });
         return typeof override === 'number' && Number.isInteger(override) ? override : result;
     });
@@ -94,8 +104,8 @@ function runFlexLayout(inst) {
         if (lr && lr.x === r.x && lr.y === r.y && lr.w === r.width && lr.h === r.height)
             continue;
         console.log('flex: set', child.type, child.hwnd, 'to', r.x, r.y, r.width, r.height);
-        gui.SetWindowPos(child.hwnd, 0 /* gui.SetWindowPosHwnd.TOP */, (r.x + pl) * scaleFactor, (r.y + pt) * scaleFactor, r.width * scaleFactor, r.height * scaleFactor, 64 /* gui.SetWindowPosFlag.SWP_SHOWWINDOW */);
-        gui.InvalidateRect(child.hwnd, null, true);
+        SetWindowPos(child.hwnd, 0 /* gui.SetWindowPosHwnd.TOP */, (r.x + pl) * scaleFactor, (r.y + pt) * scaleFactor, r.width * scaleFactor, r.height * scaleFactor, 64 /* gui.SetWindowPosFlag.SWP_SHOWWINDOW */);
+        InvalidateRect(child.hwnd, NULL, 1);
         child.lastRect = { x: r.x, y: r.y, w: r.width, h: r.height };
     }
     for (const c of children)
@@ -143,7 +153,7 @@ const hostConfig = {
             ensureChildWindow(child, parent.hwnd);
         }
         else {
-            gui.SetParent(child.hwnd, parent.hwnd);
+            SetParent(child.hwnd, parent.hwnd ?? NULL);
         }
         if (DEBUG)
             console.log('[reconciler] appendInitialChild parent:', parent.hwnd, 'child:', child.hwnd);
@@ -154,7 +164,7 @@ const hostConfig = {
             ensureChildWindow(child, parent.hwnd);
         }
         else {
-            gui.SetParent(child.hwnd, parent.hwnd);
+            SetParent(child.hwnd, parent.hwnd ?? NULL);
         }
         if (DEBUG)
             console.log('[reconciler] appendChild parent:', parent.hwnd, 'child:', child.hwnd);
@@ -165,7 +175,7 @@ const hostConfig = {
             ensureChildWindow(child, container);
         }
         else {
-            gui.SetParent(child.hwnd, container);
+            SetParent(child.hwnd, container);
         }
         const rootInst = instancesByHwnd.get(container);
         if (rootInst)
@@ -178,7 +188,7 @@ const hostConfig = {
             ensureChildWindow(child, parent.hwnd);
         }
         else {
-            gui.SetParent(child.hwnd, parent.hwnd);
+            SetParent(child.hwnd, parent.hwnd ?? NULL);
         }
         if (DEBUG)
             console.log('[reconciler] insertBefore parent:', parent.hwnd, 'child:', child.hwnd, 'before:', beforeChild.hwnd);
@@ -191,7 +201,7 @@ const hostConfig = {
             ensureChildWindow(child, container);
         }
         else {
-            gui.SetParent(child.hwnd, container);
+            SetParent(child.hwnd, container);
         }
         const rootInst = instancesByHwnd.get(container);
         if (!rootInst)
@@ -246,7 +256,7 @@ const hostConfig = {
     },
     resetTextContent(_instance) { },
     commitTextUpdate(instance, _oldText, newText) {
-        gui.SetWindowText(instance.hwnd, newText);
+        SetWindowText(instance.hwnd, newText);
     },
     hideInstance(instance) {
         if (instance.hwnd !== null)

package/lib/react-qw/reconciler.ts

@@ -3,6 +3,9 @@ import { createContext } from 'react'
 import { DefaultEventPriority, NoEventPriority } from 'react-reconciler/constants'
 import * as gui from 'gui'
 import * as os from 'os'
+import { GetDC, ReleaseDC, GetWindowLongPtr, CallWindowProc, SetWindowPos, InvalidateRect, SetParent, SetWindowText } from '../windows/user32.js'
+import { GetDeviceCaps } from '../windows/gdi32.js'
+import { NULL } from '../ffi/ctype.js'
 import { applyProps } from './props.js'
 import { calculateFlexLayout, type FlexStyle } from './layout.js'
 import { getButtonIdealSize, measureTextForHwnd } from '../text-measure.js'
@@ -12,7 +15,13 @@ import type { WIntrinsicProps } from './jsx.js'
 declare const DEBUG: boolean
 
 const dpiFont = gui.CreateSystemDpiFont()
-export const scaleFactor = gui.GetScaleFactor()
+// GetScaleFactor 等价内联：GetDC → GetDeviceCaps(LOGPIXELSX=88) → ReleaseDC 配对
+export const scaleFactor = (() => {
+    const hdc = GetDC(NULL)
+    const dpi = hdc ? GetDeviceCaps(hdc, 88) : 96
+    if (hdc) ReleaseDC(NULL, hdc)
+    return dpi / 96
+})()
 
 type Container = gui.HWND
 export type Props = WIntrinsicProps
@@ -33,15 +42,15 @@ function isDelayedControl(winClass: string): boolean {
 
 function setupWindowProc(instance: Instance, hwnd: gui.HWND) {
   instance.hwnd = hwnd
-  const oldProc = gui.GetWindowLongPtr(hwnd, gui.Gwlp.WNDPROC)
+  const oldProc = GetWindowLongPtr(hwnd, gui.Gwlp.WNDPROC)
   instancesByHwnd.set(hwnd, instance)
   gui.SetWindowProc(hwnd, (hwnd: gui.HWND, msg: number, wParam: number, lParam: number) => {
     const ev = instance.props.onEvent
-    if (!ev) return gui.CallWindowProc(oldProc, hwnd, msg, wParam, lParam)
+    if (!ev) return CallWindowProc(oldProc, hwnd, msg, wParam, lParam)
     if (typeof ev === 'object') {
-      return ev.fn({ hwnd, msg, wParam, lParam, callOldWndProc: () => gui.CallWindowProc(oldProc, hwnd, msg, wParam, lParam) })
+      return ev.fn({ hwnd, msg, wParam, lParam, callOldWndProc: () => CallWindowProc(oldProc, hwnd, msg, wParam, lParam) })
     }
-    const result = gui.CallWindowProc(oldProc, hwnd, msg, wParam, lParam)
+    const result = CallWindowProc(oldProc, hwnd, msg, wParam, lParam)
     const override = ev({ hwnd, msg, wParam, lParam })
     return typeof override === 'number' && Number.isInteger(override) ? override : result
   })
@@ -109,8 +118,8 @@ function runFlexLayout(inst: Instance) {
     const lr = child.lastRect
     if (lr && lr.x === r.x && lr.y === r.y && lr.w === r.width && lr.h === r.height) continue
     console.log('flex: set', child.type, child.hwnd, 'to', r.x, r.y, r.width, r.height)
-    gui.SetWindowPos(child.hwnd!, gui.SetWindowPosHwnd.TOP, (r.x + pl) * scaleFactor, (r.y + pt) * scaleFactor, r.width * scaleFactor, r.height * scaleFactor, gui.SetWindowPosFlag.SWP_SHOWWINDOW)
-    gui.InvalidateRect(child.hwnd!, null, true)
+    SetWindowPos(child.hwnd!, gui.SetWindowPosHwnd.TOP, (r.x + pl) * scaleFactor, (r.y + pt) * scaleFactor, r.width * scaleFactor, r.height * scaleFactor, gui.SetWindowPosFlag.SWP_SHOWWINDOW)
+    InvalidateRect(child.hwnd!, NULL, 1)
     child.lastRect = { x: r.x, y: r.y, w: r.width, h: r.height }
   }
   for (const c of children) runFlexLayout(c)
@@ -178,7 +187,7 @@ const hostConfig: QuickWinHostConfig = {
     if (child.hwnd === null) {
       ensureChildWindow(child, parent.hwnd!)
     } else {
-      gui.SetParent(child.hwnd, parent.hwnd)
+      SetParent(child.hwnd, parent.hwnd ?? NULL)
     }
     if (DEBUG) console.log('[reconciler] appendInitialChild parent:', parent.hwnd, 'child:', child.hwnd)
     parent.children.push(child)
@@ -188,7 +197,7 @@ const hostConfig: QuickWinHostConfig = {
     if (child.hwnd === null) {
       ensureChildWindow(child, parent.hwnd!)
     } else {
-      gui.SetParent(child.hwnd, parent.hwnd)
+      SetParent(child.hwnd, parent.hwnd ?? NULL)
     }
     if (DEBUG) console.log('[reconciler] appendChild parent:', parent.hwnd, 'child:', child.hwnd)
     parent.children.push(child)
@@ -198,7 +207,7 @@ const hostConfig: QuickWinHostConfig = {
     if (child.hwnd === null) {
       ensureChildWindow(child, container)
     } else {
-      gui.SetParent(child.hwnd, container)
+      SetParent(child.hwnd, container)
     }
     const rootInst = instancesByHwnd.get(container)
     if (rootInst) rootInst.children.push(child)
@@ -209,7 +218,7 @@ const hostConfig: QuickWinHostConfig = {
     if (child.hwnd === null) {
       ensureChildWindow(child, parent.hwnd!)
     } else {
-      gui.SetParent(child.hwnd, parent.hwnd)
+      SetParent(child.hwnd, parent.hwnd ?? NULL)
     }
     if (DEBUG) console.log('[reconciler] insertBefore parent:', parent.hwnd, 'child:', child.hwnd, 'before:', beforeChild.hwnd)
     const idx = parent.children.indexOf(beforeChild)
@@ -220,7 +229,7 @@ const hostConfig: QuickWinHostConfig = {
     if (child.hwnd === null) {
       ensureChildWindow(child, container)
     } else {
-      gui.SetParent(child.hwnd, container)
+      SetParent(child.hwnd, container)
     }
     const rootInst = instancesByHwnd.get(container)
     if (!rootInst) throw new Error('insertInContainerBefore: no root instance for container')
@@ -270,7 +279,7 @@ const hostConfig: QuickWinHostConfig = {
   resetTextContent(_instance: Instance) { },
 
   commitTextUpdate(instance: Instance, _oldText: string, newText: string) {
-    gui.SetWindowText(instance.hwnd!, newText)
+    SetWindowText(instance.hwnd!, newText)
   },
 
   hideInstance(instance: Instance) {

package/lib/text-measure.js

@@ -1,37 +1,34 @@
-import * as ffi from 'ffi';
+import { NULL } from './ffi/ctype.js';
 import * as gui from 'gui';
-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',
-});
+import { DrawText, GetDC, ReleaseDC } from './windows/user32.js';
+import { SelectObject } from './windows/gdi32.js';
+import { RECT, SIZE } from './windows/structs.js';
 export function measureText(hdc, text, maxWidth) {
-    const rect = new ArrayBuffer(16);
-    const dv = new DataView(rect);
-    dv.setInt32(8, maxWidth, true);
-    user32.DrawTextW(hdc, text, -1, rect, 1024 /* gui.DrawTextFlag.CALCRECT */);
-    return { width: dv.getInt32(8, true), height: dv.getInt32(12, true) };
+    // rect 双向位不注册 encoder（CALCRECT 就地写回）：encode(初值) 新建 + DeepPartial 初值一步到位
+    //（left/top/bottom 缺省跳过保持 0）→ 传 .ptr → decode 读回
+    const r = RECT.encode({ right: maxWidth });
+    DrawText(hdc, text, -1, r.ptr, 1024 /* gui.DrawTextFlag.CALCRECT */);
+    const { right, bottom } = RECT.decode(r);
+    return { width: right, height: bottom };
 }
 export function getButtonIdealSize(hwnd) {
-    const size = new ArrayBuffer(8);
-    gui.SendMessage(hwnd, 5633 /* gui.ButtonExtMsg.GETIDEALSIZE */, 0, ffi.bufferPtr(size));
-    const dv = new DataView(size);
-    return { width: dv.getInt32(0, true), height: dv.getInt32(4, true) };
+    // SIZE 纯出参位（GETIDEALSIZE 就地写回）：alloc → 传 .ptr → decode 读回
+    const size = SIZE.alloc();
+    gui.SendMessage(hwnd, 5633 /* gui.ButtonExtMsg.GETIDEALSIZE */, 0, size.ptr);
+    const { cx, cy } = SIZE.decode(size);
+    return { width: cx, height: cy };
 }
 export function measureTextForHwnd(hwnd, text) {
-    const hdc = user32.GetDC(hwnd);
+    const hdc = GetDC(hwnd);
     if (!hdc)
         return { width: 0, height: 0 };
+    // SendMessage 返回 LRESULT 裸数；GETFONT 语义为 HFONT——断言进 GDI 对象品牌链
     const hFont = gui.SendMessage(hwnd, 49 /* gui.WmMsg.GETFONT */, 0, 0);
-    const oldFont = hFont ? gdi32.SelectObject(hdc, hFont) : 0;
+    const oldFont = hFont ? SelectObject(hdc, hFont) : NULL;
     const result = measureText(hdc, text, 0);
     if (hFont)
-        gdi32.SelectObject(hdc, oldFont);
-    user32.ReleaseDC(hwnd, hdc);
+        SelectObject(hdc, oldFont);
+    ReleaseDC(hwnd, hdc);
     const wr = gui.GetWindowRect(hwnd);
     const cr = gui.GetClientRect(hwnd);
     if (wr && cr) {