quickwin 2.3.1 → 3.0.0

package/lib/ffi/bind.ts

@@ -1,7 +1,6 @@
 import * as ffi from 'ffi'
 import * as os from 'os'
 import * as std from 'std'
-import * as win from 'win'
 import '../text-codec.js'
 import { type C_BasicType, C_BasicType_No_Void, C_BasicType_Token, C_BasicType_Token_No_Void, cTokenToType, isCPtrToken, isCValToken, valName, ArgJsTypeOfToken, RetJsTypeOfToken, normToken, PTR_SIZE, ptrName, type Ptr, readScalar, writeSlot, PtrArrayBuffer } from './ctype.js'
 
@@ -47,12 +46,12 @@ function valCodec(name: string, encoders: CodecMap): StructValCodec | undefined
     return encoders[name] as unknown as StructValCodec | undefined
 }
 
-const _dllCache: Map<string, win.HMODULE> = new Map()
+const _dllCache: Map<string, ffi.HMODULE> = new Map()
 
-function loadDll(dll: string): win.HMODULE {
+function loadDll(dll: string): ffi.HMODULE {
     const cached = _dllCache.get(dll)
     if (cached !== undefined) return cached
-    const loaded = win.LoadLibrary(dll)
+    const loaded = ffi.LoadLibrary(dll)
     if (!loaded) throw new Error(`ffi-bind: LoadLibrary("${dll}") failed`)
     _dllCache.set(dll, loaded)
     return loaded
@@ -105,7 +104,9 @@ function parseSig(sig: string): ParsedSig {
     }
 }
 
-function makeFn(proc: number, sig: string, encoders: CodecMap, decoders: CodecMap): (...a: unknown[]) => unknown {
+/** proc 是 GetProcAddress 拿到的函数地址（<FARPROC>ptr）：调用方已校验非空，故收窄后的
+ *  Ptr 而非 MaybePtr；品牌只在绑定层内部走，落到 ffiCall 的 uintptr 槽（number）时脱落。 */
+function makeFn(proc: Ptr<'FARPROC'>, sig: string, encoders: CodecMap, decoders: CodecMap): (...a: unknown[]) => unknown {
     const ps = parseSig(sig)
     // 按值位的能力校验前移到绑定期（模块加载即炸，不留到首个调用）：布局缺位 / 非结构
     // 布局（无 size）/ 退化 size 都是签名层面的错误，报错指向具体位与可用布局清单。
@@ -134,7 +135,7 @@ const IA32_ARG_SIZE: Record<C_BasicType_No_Void, number> = {
 // x64 桩无条件双读 slots[0..3]，故 argFrame 至少 4 个槽（32 字节）
 const X64_MIN_SLOTS = 4
 
-function callPacked(proc: number, { argTokens, retToken, sig }: ParsedSig, args: any[], encoders: CodecMap, decoders: CodecMap): unknown {
+function callPacked(proc: Ptr<'FARPROC'>, { argTokens, retToken, sig }: ParsedSig, args: any[], encoders: CodecMap, decoders: CodecMap): unknown {
     const is64 = os.arch === 'x64'
 
     const getWidth = (t: C_BasicType_Token_No_Void, is64: boolean): number => {
@@ -381,7 +382,7 @@ export function bind<const S extends string,
     const LE extends CodecMap = {},
     const LD extends CodecMap = LE>(
     dll: string, name: string, sig: S, encoders?: LE, decoders?: LD) {
-    const proc = win.GetProcAddress(loadDll(dll), name)
+    const proc = ffi.GetProcAddress(loadDll(dll), name)
     if (!proc) throw new Error(`ffi-bind: proc "${name}" not found in ${dll}`)
     const effDec = decoders ?? encoders
     return makeFn(proc, sig,
@@ -401,7 +402,7 @@ export function bindLib<const M extends Record<string, string>,
     const encTable = { ...builtinCodecs, ...encoders }
     const decTable = { ...builtinCodecs, ...(effDec ?? {}) }
     for (const [name, sig] of Object.entries(map)) {
-        const proc = win.GetProcAddress(h, name)
+        const proc = ffi.GetProcAddress(h, name)
         if (!proc) throw new Error(`ffi-bind: proc "${name}" not found in ${dll}`)
         out[name] = makeFn(proc, sig, encTable, decTable)
     }

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

@@ -1,9 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { forwardRef, useRef, useEffect, useState } from 'react';
 import * as gui from 'gui';
-import { InvalidateRect } from '../../windows/user32.js';
+import { GetClientRect, InvalidateRect } from '../../windows/user32.js';
 import { NULL } from '../../ffi/ctype.js';
-import { SYSTEMTIME, NMDATETIMECHANGE } from '../../windows/structs.js';
+import { RECT, SYSTEMTIME, NMDATETIMECHANGE } from '../../windows/structs.js';
 import { nmCode } from '../nmhdr.js';
 function dateToSysTimeBuf(d) {
     // wDayOfWeek 设置时被忽略，缺省跳过 = 0
@@ -52,11 +52,10 @@ const DateTimePicker = forwardRef(function DateTimePicker({ value, onChange, def
             return;
         InvalidateRect(h, NULL, 1);
         // 发送 WM_SIZE 让控件（尤其是 DTS_UPDOWN）重新布局内部子窗口
-        const cr = gui.GetClientRect(h);
-        if (cr) {
-            const w = cr.right - cr.left;
-            const hh = cr.bottom - cr.top;
-            gui.SendMessage(h, 5 /* WmMsg.SIZE */, 0, (hh << 16) | w);
+        const cr = RECT.alloc();
+        if (GetClientRect(h, cr.ptr)) {
+            const { left, top, right, bottom } = RECT.decode(cr);
+            gui.SendMessage(h, 5 /* WmMsg.SIZE */, 0, ((bottom - top) << 16) | (right - left));
         }
     }, []);
     return (_jsx("w", { type: "STATIC", ws: 268435456 /* WindowStyle.VISIBLE */ | 33554432 /* WindowStyle.CLIPCHILDREN */, style: { ...style, flexDirection: 'column', alignItems: 'stretch' }, ref: ref, onEvent: (e) => {

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

@@ -2,6 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { forwardRef, useState, useRef, useEffect } from 'react';
 import * as gui from 'gui';
 import { WCHAR } from '../../ffi/bind.js';
+import { GetWindowText, GetWindowTextLength } from '../../windows/user32.js';
 export const Input = forwardRef(({ value: controlledValue, defaultValue = '', onChange, placeholder, password, multiline, readonly, number, disabled, style }, ref) => {
     const [internalValue, setInternalValue] = useState(defaultValue);
     const isControlled = controlledValue !== undefined;
@@ -34,7 +35,10 @@ export const Input = forwardRef(({ value: controlledValue, defaultValue = '', on
                 const h = inputRef.current;
                 if (!h)
                     return;
-                const newText = gui.GetWindowText(h);
+                const cap = GetWindowTextLength(h) + 1;
+                const buf = WCHAR.alloc(cap);
+                GetWindowText(h, buf, cap);
+                const newText = WCHAR.decode(buf);
                 if (!isControlled)
                     setInternalValue(newText);
                 onChange?.(newText);

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

@@ -7,6 +7,8 @@ import { WCHAR } from '../../ffi/bind.js';
 import { nmCode } from '../nmhdr.js';
 import { LoadCursor, SetCursor, ScreenToClient, GetCursorPos } from '../../windows/user32.js';
 import { CreateFontIndirect, DeleteObject, GetObject, SelectObject } from '../../windows/gdi32.js';
+import { createBitmapFromPixels } from '../../bitmap.js';
+import { ImageListCreate, ImageListAdd, ImageListDestroy } from '../../windows/comctl32.js';
 import { LOGFONTW, POINT, NMCUSTOMDRAW, NMLVCUSTOMDRAW, NMLISTVIEW, LVHITTESTINFO, LVITEMW, LVCOLUMNW, } from '../../windows/structs.js';
 export function makeColorBlock(size, bgra) {
     const n = size * size;
@@ -134,27 +136,27 @@ function makeLVItem(i, sub, text, image) {
 }
 const ListView = forwardRef(function ListViewInner({ columns, data, style, icons, iconSize, getIcon }, ref) {
     const lvRef = useRef(null);
-    const iconListRef = useRef(0);
+    const iconListRef = useRef(NULL);
     useEffect(() => {
         const h = lvRef.current;
         if (!h)
             return;
         const il = iconListRef.current;
-        iconListRef.current = 0;
+        iconListRef.current = NULL;
         if (il) {
             gui.SendMessage(h, 4099 /* LvMsg.SETIMAGELIST */, 1 /* LvImageList.SMALL */, 0);
-            gui.ImageListDestroy(il);
+            ImageListDestroy(il);
         }
         if (!icons || icons.length === 0)
             return;
         const size = iconSize ?? 32;
-        const img = gui.ImageListCreate(size, size, 32 /* ImageListFlag.COLOR32 */, icons.length, 1);
+        const img = ImageListCreate(size, size, 32 /* ImageListFlag.COLOR32 */, icons.length, 1);
         if (!img)
             return;
         for (const p of icons) {
-            const hbm = gui.CreateBitmapFromPixels(size, size, p);
+            const hbm = createBitmapFromPixels(size, size, p);
             if (hbm) {
-                gui.ImageListAdd(img, hbm);
+                ImageListAdd(img, hbm, NULL);
                 DeleteObject(hbm);
             }
         }

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

@@ -1,10 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { forwardRef, useLayoutEffect, useRef } from 'react';
-import * as gui from 'gui';
-import { DefWindowProc, SetWindowPos, ShowScrollBar, GetDC, ReleaseDC } from '../../windows/user32.js';
-import { NULL } from '../../ffi/ctype.js';
-import { GetDeviceCaps } from '../../windows/gdi32.js';
+import { DefWindowProc, GetClientRect, GetScrollInfo, SetScrollInfo, SetWindowPos, ShowScrollBar } from '../../windows/user32.js';
+import { RECT, SCROLLINFO } from '../../windows/structs.js';
 import { forceFlexLayout } from '../reconciler.js';
+import { getScaleFactor } from '../../dpi.js';
 export const ScrollView = forwardRef(({ children, style, contentWidth, contentHeight }, ref) => {
     const svRef = useRef(null);
     const contentRef = useRef(null);
@@ -16,16 +15,13 @@ export const ScrollView = forwardRef(({ children, style, contentWidth, contentHe
     //   page  = viewportSize（可见行数）
     //   nPos  = 0 … max - page + 1（即 0 … contentSize - viewportSize）
     function updateScroll(sv, content) {
-        const svRect = gui.GetClientRect(sv);
-        if (!svRect)
+        const svBuf = RECT.alloc();
+        if (!GetClientRect(sv, svBuf.ptr))
             return;
-        const svW = svRect.right - svRect.left;
-        const svH = svRect.bottom - svRect.top;
-        // GetScaleFactor 等价内联：GetDC → GetDeviceCaps(LOGPIXELSX=88) → ReleaseDC 配对
-        const hdc = GetDC(NULL);
-        const scale = hdc ? GetDeviceCaps(hdc, 88) / 96 : 1;
-        if (hdc)
-            ReleaseDC(NULL, hdc);
+        const { left, top, right, bottom } = RECT.decode(svBuf);
+        const svW = right - left;
+        const svH = bottom - top;
+        const scale = getScaleFactor();
         const natW = Math.round((contentWidth ?? (svW / scale)) * scale);
         const natH = Math.round((contentHeight ?? (svH / scale)) * scale);
         scrollXRef.current = Math.max(0, Math.min(scrollXRef.current, natW - svW));
@@ -33,7 +29,10 @@ export const ScrollView = forwardRef(({ children, style, contentWidth, contentHe
         SetWindowPos(content, 0 /* SetWindowPosHwnd.TOP */, -scrollXRef.current, -scrollYRef.current, natW, natH, 4 /* SetWindowPosFlag.SWP_NOZORDER */);
         forceFlexLayout(content);
         if (natW > svW) {
-            gui.SetScrollInfo(sv, 0 /* ScrollBar.HORZ */, { min: 0, max: natW - 1, page: svW, pos: scrollXRef.current }, true);
+            SetScrollInfo(sv, 0 /* ScrollBar.HORZ */, {
+                cbSize: SCROLLINFO.size, fMask: 1 /* ScrollInfoFlag.RANGE */ | 2 /* ScrollInfoFlag.PAGE */ | 4 /* ScrollInfoFlag.POS */,
+                nMin: 0, nMax: natW - 1, nPage: svW, nPos: scrollXRef.current,
+            }, 1);
             ShowScrollBar(sv, 0 /* ScrollBar.HORZ */, 1);
         }
         else {
@@ -41,7 +40,10 @@ export const ScrollView = forwardRef(({ children, style, contentWidth, contentHe
             ShowScrollBar(sv, 0 /* ScrollBar.HORZ */, 0);
         }
         if (natH > svH) {
-            gui.SetScrollInfo(sv, 1 /* ScrollBar.VERT */, { min: 0, max: natH - 1, page: svH, pos: scrollYRef.current }, true);
+            SetScrollInfo(sv, 1 /* ScrollBar.VERT */, {
+                cbSize: SCROLLINFO.size, fMask: 1 /* ScrollInfoFlag.RANGE */ | 2 /* ScrollInfoFlag.PAGE */ | 4 /* ScrollInfoFlag.POS */,
+                nMin: 0, nMax: natH - 1, nPage: svH, nPos: scrollYRef.current,
+            }, 1);
             ShowScrollBar(sv, 1 /* ScrollBar.VERT */, 1);
         }
         else {
@@ -64,15 +66,17 @@ export const ScrollView = forwardRef(({ children, style, contentWidth, contentHe
             scrollXRef.current = newPos;
         }
         SetWindowPos(content, 0 /* SetWindowPosHwnd.TOP */, -scrollXRef.current, -scrollYRef.current, 0, 0, 1 /* SetWindowPosFlag.SWP_NOSIZE */ | 4 /* SetWindowPosFlag.SWP_NOZORDER */);
-        gui.SetScrollInfo(sv, bar, { pos: newPos }, true);
+        SetScrollInfo(sv, bar, { cbSize: SCROLLINFO.size, fMask: 4 /* ScrollInfoFlag.POS */, nPos: newPos }, 1);
     }
     function handleScroll(e, bar) {
         const sv = svRef.current;
         const content = contentRef.current;
         if (!sv || !content)
             return;
-        const info = gui.GetScrollInfo(sv, bar);
-        const maxPos = info.max - info.page + 1;
+        const si = SCROLLINFO.encode({ cbSize: SCROLLINFO.size, fMask: 23 /* ScrollInfoFlag.ALL */ });
+        GetScrollInfo(sv, bar, si.ptr);
+        const info = SCROLLINFO.decode(si);
+        const maxPos = info.nMax - info.nPage + 1;
         const code = e.wParam & 0xFFFF;
         const ref_ = bar === 1 /* ScrollBar.VERT */ ? scrollYRef : scrollXRef;
         let newPos = ref_.current;
@@ -84,9 +88,9 @@ export const ScrollView = forwardRef(({ children, style, contentWidth, contentHe
         else if (code === 1 /* ScrollCmd.LINEDOWN */)
             newPos += 20;
         else if (code === 2 /* ScrollCmd.PAGEUP */)
-            newPos -= info.page;
+            newPos -= info.nPage;
         else if (code === 3 /* ScrollCmd.PAGEDOWN */)
-            newPos += info.page;
+            newPos += info.nPage;
         else
             return;
         newPos = Math.max(0, Math.min(maxPos, newPos));
@@ -106,8 +110,10 @@ export const ScrollView = forwardRef(({ children, style, contentWidth, contentHe
         if (!isHorz && contentHeight === undefined)
             return;
         const bar = isHorz ? 0 /* ScrollBar.HORZ */ : 1 /* ScrollBar.VERT */;
-        const info = gui.GetScrollInfo(sv, bar);
-        const maxPos = info.max - info.page + 1;
+        const si = SCROLLINFO.encode({ cbSize: SCROLLINFO.size, fMask: 23 /* ScrollInfoFlag.ALL */ });
+        GetScrollInfo(sv, bar, si.ptr);
+        const info = SCROLLINFO.decode(si);
+        const maxPos = info.nMax - info.nPage + 1;
         const ref_ = isHorz ? scrollXRef : scrollYRef;
         let newPos = ref_.current + dy;
         newPos = Math.max(0, Math.min(maxPos, newPos));

package/lib/react-qw/index.js

@@ -1,5 +1,5 @@
 import * as gui from 'gui';
-import { DefWindowProc, GetSystemMetrics } from '../windows/user32.js';
+import { DefWindowProc, GetSystemMetrics, ShowWindow, UpdateWindow } from '../windows/user32.js';
 import reconciler, { scaleFactor, instancesByHwnd, forceFlexLayout } from './reconciler.js';
 const noop = () => { };
 let defaultClassRegistered = false;
@@ -34,8 +34,7 @@ export function createRoot(container) {
         const ws = (cfg.ws ?? 0) | 13565952 /* WindowStyle.OVERLAPPEDWINDOW */;
         const w = (cfg.width ?? 800) * scaleFactor;
         const h = (cfg.height ?? 600) * scaleFactor;
-        // GetScreenSize 等价内联：SM_CXSCREEN=0 / SM_CYSCREEN=1
-        const [sw, sh] = [GetSystemMetrics(0), GetSystemMetrics(1)];
+        const [sw, sh] = [GetSystemMetrics(0 /* SysMetrics.CXSCREEN */), GetSystemMetrics(1 /* SysMetrics.CYSCREEN */)];
         const x = cfg.x === undefined ? ((sw - w) / 2) | 0
             : cfg.x === -2147483648 /* CreatePos.USEDEFAULT */ ? -2147483648 /* CreatePos.USEDEFAULT */ : cfg.x * scaleFactor;
         const y = cfg.y === undefined ? ((sh - h) / 2) | 0
@@ -44,8 +43,11 @@ export function createRoot(container) {
         if (!hwin)
             throw new Error('CreateWindow failed');
         hwnd = hwin;
-        if (!cfg.noShowWindow)
-            gui.ShowWindow(hwnd);
+        // 启动首帧：ShowWindow 后立即 WM_PAINT，不留白（原 gui.ShowWindow 复合语义）
+        if (!cfg.noShowWindow) {
+            ShowWindow(hwnd, 1 /* ShowWindowCmd.SHOWNORMAL */);
+            UpdateWindow(hwnd);
+        }
     }
     else {
         hwnd = container;

package/lib/react-qw/index.ts

@@ -1,8 +1,8 @@
 import * as gui from 'gui'
 import React from 'react'
-import { DefWindowProc, GetSystemMetrics } from '../windows/user32.js'
+import { DefWindowProc, GetSystemMetrics, ShowWindow, UpdateWindow } from '../windows/user32.js'
 import reconciler, { scaleFactor, instancesByHwnd, forceFlexLayout, type Instance } from './reconciler.js'
-import { CreatePos, WindowStyle, WmMsg } from '../../constants'
+import { CreatePos, ShowWindowCmd, SysMetrics, WindowStyle, WmMsg } from '../../constants'
 
 const noop = () => { }
 
@@ -48,8 +48,7 @@ export function createRoot(container: gui.HWND | RootWindowConfig) {
     const ws = (cfg.ws ?? 0) | WindowStyle.OVERLAPPEDWINDOW
     const w = (cfg.width ?? 800) * scaleFactor
     const h = (cfg.height ?? 600) * scaleFactor
-    // GetScreenSize 等价内联：SM_CXSCREEN=0 / SM_CYSCREEN=1
-    const [sw, sh] = [GetSystemMetrics(0), GetSystemMetrics(1)]
+    const [sw, sh] = [GetSystemMetrics(SysMetrics.CXSCREEN), GetSystemMetrics(SysMetrics.CYSCREEN)]
     const x = cfg.x === undefined ? ((sw - w) / 2) | 0
       : cfg.x === CreatePos.USEDEFAULT ? CreatePos.USEDEFAULT
       : cfg.x * scaleFactor
@@ -59,7 +58,8 @@ export function createRoot(container: gui.HWND | RootWindowConfig) {
     const hwin = gui.CreateWindow(className, cfg.text || '', ws, x, y, w, h, null, null)
     if (!hwin) throw new Error('CreateWindow failed')
     hwnd = hwin
-    if (!cfg.noShowWindow) gui.ShowWindow(hwnd)
+    // 启动首帧：ShowWindow 后立即 WM_PAINT，不留白（原 gui.ShowWindow 复合语义）
+    if (!cfg.noShowWindow) { ShowWindow(hwnd, ShowWindowCmd.SHOWNORMAL); UpdateWindow(hwnd) }
   } else {
     hwnd = container
   }

package/lib/react-qw/props.js

@@ -1,5 +1,5 @@
 import * as gui from 'gui';
-import { SetWindowText, EnableWindow } from '../windows/user32.js';
+import { SetWindowText, EnableWindow, ShowWindow } from '../windows/user32.js';
 export function applyProps(instance, newProps, _oldProps) {
     const hwnd = instance.hwnd;
     instance.props = newProps;
@@ -24,9 +24,9 @@ export function applyProps(instance, newProps, _oldProps) {
         EnableWindow(hwnd, !newProps.disabled ? 1 : 0);
     }
     if ('hidden' in newProps) {
-        gui.ShowWindow(hwnd, newProps.hidden ? 0 /* ShowWindowCmd.HIDE */ : 5 /* ShowWindowCmd.SHOW */);
+        ShowWindow(hwnd, newProps.hidden ? 0 /* ShowWindowCmd.HIDE */ : 5 /* ShowWindowCmd.SHOW */);
     }
     if ('visible' in newProps) {
-        gui.ShowWindow(hwnd, newProps.visible ? 5 /* ShowWindowCmd.SHOW */ : 0 /* ShowWindowCmd.HIDE */);
+        ShowWindow(hwnd, newProps.visible ? 5 /* ShowWindowCmd.SHOW */ : 0 /* ShowWindowCmd.HIDE */);
     }
 }

package/lib/react-qw/props.ts

@@ -1,5 +1,5 @@
 import * as gui from 'gui'
-import { SetWindowText, EnableWindow } from '../windows/user32.js'
+import { SetWindowText, EnableWindow, ShowWindow } from '../windows/user32.js'
 import type { Instance, Props } from './reconciler.js'
 import { EditMsg, ShowWindowCmd } from '../../constants'
 
@@ -33,9 +33,9 @@ export function applyProps(
     EnableWindow(hwnd, !newProps.disabled ? 1 : 0)
   }
   if ('hidden' in newProps) {
-    gui.ShowWindow(hwnd, newProps.hidden ? ShowWindowCmd.HIDE : ShowWindowCmd.SHOW)
+    ShowWindow(hwnd, newProps.hidden ? ShowWindowCmd.HIDE : ShowWindowCmd.SHOW)
   }
   if ('visible' in newProps) {
-    gui.ShowWindow(hwnd, newProps.visible ? ShowWindowCmd.SHOW : ShowWindowCmd.HIDE)
+    ShowWindow(hwnd, newProps.visible ? ShowWindowCmd.SHOW : ShowWindowCmd.HIDE)
   }
 }

package/lib/react-qw/reconciler.js

@@ -3,21 +3,15 @@ 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 { GetClientRect, GetWindowLongPtr, CallWindowProc, SetWindowPos, ShowWindow, InvalidateRect, SetParent, SetWindowText } from '../windows/user32.js';
+import { createSystemDpiFont, getScaleFactor } from '../dpi.js';
+import { RECT } from '../windows/structs.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();
-// 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 dpiFont = createSystemDpiFont();
+export const scaleFactor = getScaleFactor();
 const DELAYED_CONTROLS = new Set(['SysListView32', 'SysTreeView32', 'LISTBOX', 'COMBOBOX', 'msctls_trackbar32', 'SysDateTimePick32', 'SysLink']);
 function isDelayedControl(winClass) {
     return DELAYED_CONTROLS.has(winClass);
@@ -59,11 +53,12 @@ function runFlexLayout(inst) {
     const visible = children.filter(c => !c.props.hidden);
     if (visible.length === 0)
         return;
-    const rect = gui.GetClientRect(inst.hwnd);
-    if (!rect) {
+    const rcBuf = RECT.alloc();
+    if (!GetClientRect(inst.hwnd, rcBuf.ptr)) {
         console.log('flex: no rect for', inst.hwnd, inst.type);
         return;
     }
+    const rect = RECT.decode(rcBuf);
     const pw = (rect.right - rect.left) / scaleFactor;
     const ph = (rect.bottom - rect.top) / scaleFactor;
     if (pw <= 0 || ph <= 0) {
@@ -260,19 +255,19 @@ const hostConfig = {
     },
     hideInstance(instance) {
         if (instance.hwnd !== null)
-            gui.ShowWindow(instance.hwnd, 0 /* ShowWindowCmd.HIDE */);
+            ShowWindow(instance.hwnd, 0 /* ShowWindowCmd.HIDE */);
     },
     hideTextInstance(instance) {
         if (instance.hwnd !== null)
-            gui.ShowWindow(instance.hwnd, 0 /* ShowWindowCmd.HIDE */);
+            ShowWindow(instance.hwnd, 0 /* ShowWindowCmd.HIDE */);
     },
     unhideInstance(instance, _props) {
         if (instance.hwnd !== null)
-            gui.ShowWindow(instance.hwnd, 5 /* ShowWindowCmd.SHOW */);
+            ShowWindow(instance.hwnd, 5 /* ShowWindowCmd.SHOW */);
     },
     unhideTextInstance(instance, _text) {
         if (instance.hwnd !== null)
-            gui.ShowWindow(instance.hwnd, 5 /* ShowWindowCmd.SHOW */);
+            ShowWindow(instance.hwnd, 5 /* ShowWindowCmd.SHOW */);
     },
     shouldSetTextContent(_type, props) {
         return typeof props.children === 'string' || typeof props.children === 'number';

package/lib/react-qw/reconciler.ts

@@ -3,8 +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 { GetClientRect, GetWindowLongPtr, CallWindowProc, SetWindowPos, ShowWindow, InvalidateRect, SetParent, SetWindowText } from '../windows/user32.js'
+import { createSystemDpiFont, getScaleFactor } from '../dpi.js'
+import { RECT } from '../windows/structs.js'
 import { NULL } from '../ffi/ctype.js'
 import { applyProps } from './props.js'
 import { calculateFlexLayout, type FlexStyle } from './layout.js'
@@ -15,14 +16,8 @@ import { Gwlp, SetWindowPosFlag, SetWindowPosHwnd, ShowWindowCmd, WindowStyle, W
 // DEBUG 由 esbuild --define 在 bundle 时替换（见 build.ts），生产环境为 false
 declare const DEBUG: boolean
 
-const dpiFont = gui.CreateSystemDpiFont()
-// 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 dpiFont = createSystemDpiFont()
+export const scaleFactor = getScaleFactor()
 
 type Container = gui.HWND
 export type Props = WIntrinsicProps
@@ -83,8 +78,9 @@ function runFlexLayout(inst: Instance) {
   const flex: FlexStyle = s || {}
   const visible = children.filter(c => !c.props.hidden)
   if (visible.length === 0) return
-  const rect = gui.GetClientRect(inst.hwnd!)
-  if (!rect) { console.log('flex: no rect for', inst.hwnd, inst.type); return }
+  const rcBuf = RECT.alloc()
+  if (!GetClientRect(inst.hwnd!, rcBuf.ptr)) { console.log('flex: no rect for', inst.hwnd, inst.type); return }
+  const rect = RECT.decode(rcBuf)
   const pw = (rect.right - rect.left) / scaleFactor
   const ph = (rect.bottom - rect.top) / scaleFactor
   if (pw <= 0 || ph <= 0) { console.log('flex: zero size for', inst.hwnd, inst.type, pw, ph); return }
@@ -284,19 +280,19 @@ const hostConfig: QuickWinHostConfig = {
   },
 
   hideInstance(instance: Instance) {
-    if (instance.hwnd !== null) gui.ShowWindow(instance.hwnd, ShowWindowCmd.HIDE)
+    if (instance.hwnd !== null) ShowWindow(instance.hwnd, ShowWindowCmd.HIDE)
   },
 
   hideTextInstance(instance: Instance) {
-    if (instance.hwnd !== null) gui.ShowWindow(instance.hwnd, ShowWindowCmd.HIDE)
+    if (instance.hwnd !== null) ShowWindow(instance.hwnd, ShowWindowCmd.HIDE)
   },
 
   unhideInstance(instance: Instance, _props: Props) {
-    if (instance.hwnd !== null) gui.ShowWindow(instance.hwnd, ShowWindowCmd.SHOW)
+    if (instance.hwnd !== null) ShowWindow(instance.hwnd, ShowWindowCmd.SHOW)
   },
 
   unhideTextInstance(instance: Instance, _text: string) {
-    if (instance.hwnd !== null) gui.ShowWindow(instance.hwnd, ShowWindowCmd.SHOW)
+    if (instance.hwnd !== null) ShowWindow(instance.hwnd, ShowWindowCmd.SHOW)
   },
 
   shouldSetTextContent(_type: string, props: Props) {

package/lib/text-measure.js

@@ -1,6 +1,6 @@
 import { NULL } from './ffi/ctype.js';
 import * as gui from 'gui';
-import { DrawText, GetDC, ReleaseDC } from './windows/user32.js';
+import { DrawText, GetDC, GetClientRect, GetWindowRect, ReleaseDC } from './windows/user32.js';
 import { SelectObject } from './windows/gdi32.js';
 import { RECT, SIZE } from './windows/structs.js';
 export function measureText(hdc, text, maxWidth) {
@@ -29,11 +29,14 @@ export function measureTextForHwnd(hwnd, text) {
     if (hFont)
         SelectObject(hdc, oldFont);
     ReleaseDC(hwnd, hdc);
-    const wr = gui.GetWindowRect(hwnd);
-    const cr = gui.GetClientRect(hwnd);
-    if (wr && cr) {
-        result.width += (wr.right - wr.left) - (cr.right - cr.left);
-        result.height += (wr.bottom - wr.top) - (cr.bottom - cr.top);
+    const wr = RECT.alloc();
+    const cr = RECT.alloc();
+    const okWr = GetWindowRect(hwnd, wr.ptr);
+    const okCr = GetClientRect(hwnd, cr.ptr);
+    if (okWr && okCr) {
+        const w = RECT.decode(wr), c = RECT.decode(cr);
+        result.width += (w.right - w.left) - (c.right - c.left);
+        result.height += (w.bottom - w.top) - (c.bottom - c.top);
     }
     return result;
 }

package/lib/text-measure.ts

@@ -1,6 +1,6 @@
 import { NULL, type Ptr } from './ffi/ctype.js'
 import * as gui from 'gui'
-import { DrawText, GetDC, ReleaseDC } from './windows/user32.js'
+import { DrawText, GetDC, GetClientRect, GetWindowRect, ReleaseDC } from './windows/user32.js'
 import { SelectObject } from './windows/gdi32.js'
 import { RECT, SIZE } from './windows/structs.js'
 import { ButtonExtMsg, DrawTextFlag, WmMsg } from '../constants'
@@ -31,11 +31,14 @@ export function measureTextForHwnd(hwnd: gui.HWND, text: string): { width: numbe
     const result = measureText(hdc, text, 0)
     if (hFont) SelectObject(hdc, oldFont)
     ReleaseDC(hwnd, hdc)
-    const wr = gui.GetWindowRect(hwnd)
-    const cr = gui.GetClientRect(hwnd)
-    if (wr && cr) {
-        result.width += (wr.right - wr.left) - (cr.right - cr.left)
-        result.height += (wr.bottom - wr.top) - (cr.bottom - cr.top)
+    const wr = RECT.alloc()
+    const cr = RECT.alloc()
+    const okWr = GetWindowRect(hwnd, wr.ptr)
+    const okCr = GetClientRect(hwnd, cr.ptr)
+    if (okWr && okCr) {
+        const w = RECT.decode(wr), c = RECT.decode(cr)
+        result.width += (w.right - w.left) - (c.right - c.left)
+        result.height += (w.bottom - w.top) - (c.bottom - c.top)
     }
     return result
 }

package/lib/windows/comctl32.js

@@ -11,8 +11,9 @@ export const ImageListCreate = /*@__PURE__*/ b('ImageList_Create', 'i32 i32 u32
 /** 加位图进图像列表
  *  @returns 新索引（-1 失败）
  *  @param args_0 himl 图像列表句柄
- *  @param args_1 hbm 位图句柄（gdi32 <HGDIOBJ>ptr 产物，如 CreateCompatibleBitmap） */
-export const ImageListAdd = /*@__PURE__*/ b('ImageList_Add', '<HIMAGELIST>ptr <HGDIOBJ>ptr -> i32');
+ *  @param args_1 hbmImage 位图句柄（gdi32 <HGDIOBJ>ptr 产物，如 CreateCompatibleBitmap）
+ *  @param args_2 hbmMask 掩码位图；32bpp 图像传 NULL */
+export const ImageListAdd = /*@__PURE__*/ b('ImageList_Add', '<HIMAGELIST>ptr <HGDIOBJ>ptr <HGDIOBJ>ptr -> i32');
 /** 销毁图像列表
  *  @returns 成功 → 非 0 */
 export const ImageListDestroy = /*@__PURE__*/ b('ImageList_Destroy', '<HIMAGELIST>ptr -> i32');

package/lib/windows/comctl32.ts

@@ -12,8 +12,9 @@ export const ImageListCreate = /*@__PURE__*/ b('ImageList_Create', 'i32 i32 u32
 /** 加位图进图像列表
  *  @returns 新索引（-1 失败）
  *  @param args_0 himl 图像列表句柄
- *  @param args_1 hbm 位图句柄（gdi32 <HGDIOBJ>ptr 产物，如 CreateCompatibleBitmap） */
-export const ImageListAdd = /*@__PURE__*/ b('ImageList_Add', '<HIMAGELIST>ptr <HGDIOBJ>ptr -> i32')
+ *  @param args_1 hbmImage 位图句柄（gdi32 <HGDIOBJ>ptr 产物，如 CreateCompatibleBitmap）
+ *  @param args_2 hbmMask 掩码位图；32bpp 图像传 NULL */
+export const ImageListAdd = /*@__PURE__*/ b('ImageList_Add', '<HIMAGELIST>ptr <HGDIOBJ>ptr <HGDIOBJ>ptr -> i32')
 /** 销毁图像列表
  *  @returns 成功 → 非 0 */
 export const ImageListDestroy = /*@__PURE__*/ b('ImageList_Destroy', '<HIMAGELIST>ptr -> i32')

package/lib/windows/gdi32.js

@@ -80,8 +80,30 @@ export const BitBlt = /*@__PURE__*/ b('BitBlt', '<HDC>ptr! i32 i32 i32 i32 <HDC>
  *  @param args_3 cLines 扫描行数
  *  @param args_4 lpvBits 像素接收缓冲（ArrayBuffer）
  *  @param args_5 lpbmi BITMAPINFO 缓冲（BITMAPINFOHEADER.encode({...}).ptr）
- *  @param args_6 uUsage DIB_RGB_COLORS(0) */
-export const GetDIBits = /*@__PURE__*/ b('GetDIBits', '<HDC>ptr! <HGDIOBJ>ptr u32 u32 <BYTE>ptr <>ptr u32 -> i32');
+ *  @param args_6 uUsage ColorUse.RGB_COLORS */
+export const GetDIBits = /*@__PURE__*/ b('GetDIBits', '<HDC>ptr! <HGDIOBJ>ptr u32 u32 <BYTE>ptr <>ptr u32@ColorUse -> i32');
+/** 建 32bpp DIB 段位图（biHeight 负 = 自顶向下，像素内存由系统分配）——像素内容靠
+ *  SetDIBits 从调用方缓冲装入，故 ppvBits 出参槽可传 NULL 不取位地址（要直写像素
+ *  才需要非空槽）
+ *  @returns 位图句柄；失败 → 0（用完 DeleteObject）
+ *  @param args_0 hdc 参考 DC（NULL 即可，只取 DIB 格式）
+ *  @param args_1 pbmi BITMAPINFO 缓冲（BITMAPINFOHEADER.encode({...}).ptr，同 GetDIBits）
+ *  @param args_2 iUsage ColorUse.RGB_COLORS
+ *  @param args_3 ppvBits 收位地址的出参槽（NULL = 不取）
+ *  @param args_4 hSection NULL（无文件映射区）
+ *  @param args_5 offset 位数据在映射区内的偏移（无映射区恒 0） */
+export const CreateDIBSection = /*@__PURE__*/ b('CreateDIBSection', '<HDC>ptr <>ptr u32@ColorUse <>ptr <>ptr u32 -> <HGDIOBJ>ptr');
+/** 把 lpvBits 的像素装进位图（lpbmi 描述源的格式；ColorUse.RGB_COLORS 时 hdc 只定
+ *  目标格式，本仓传 NULL 实测可用——MSDN：仅 DIB_PAL_COLORS 才用 hdc）
+ *  @returns 成功复制的扫描行数；失败 → 0
+ *  @param args_0 hdc 参考 DC（NULL 即可，见上）
+ *  @param args_1 hbm 目标位图（DIB 段同可用）
+ *  @param args_2 uStartScan 起始扫描行
+ *  @param args_3 cLines 扫描行数
+ *  @param args_4 lpvBits 像素源缓冲（ArrayBuffer）
+ *  @param args_5 lpbmi BITMAPINFO 缓冲（同 GetDIBits）
+ *  @param args_6 iUsage ColorUse.RGB_COLORS */
+export const SetDIBits = /*@__PURE__*/ b('SetDIBits', '<HDC>ptr <HGDIOBJ>ptr! u32 u32 <BYTE>ptr <>ptr u32@ColorUse -> i32');
 /** 取 GDI 对象信息到 lpv（hFont → LOGFONTW 等）
  *  @returns 写入的字节数；失败 → 0
  *  @param args_0 h GDI 对象句柄（字体/画笔/位图等）
@@ -171,8 +193,8 @@ export const MaskBlt = /*@__PURE__*/ b('MaskBlt', '<HDC>ptr! i32 i32 i32 i32 <HD
  *  @param args_8 uNumScans 扫描行数
  *  @param args_9 lpvBits 像素缓冲（ArrayBuffer）
  *  @param args_10 lpbmi BITMAPINFO 缓冲
- *  @param args_11 iUsage DIB_RGB_COLORS(0) */
-export const SetDIBitsToDevice = /*@__PURE__*/ b('SetDIBitsToDevice', '<HDC>ptr! i32 i32 u32 u32 i32 i32 u32 u32 <BYTE>ptr <BYTE>ptr u32 -> i32');
+ *  @param args_11 iUsage ColorUse.RGB_COLORS */
+export const SetDIBitsToDevice = /*@__PURE__*/ b('SetDIBitsToDevice', '<HDC>ptr! i32 i32 u32 u32 i32 i32 u32 u32 <BYTE>ptr <BYTE>ptr u32@ColorUse -> i32');
 /** 拉伸 DIB 传送（内存像素缓冲直接放/缩到目标，免创建 HBITMAP 中转）；
  *  DestWidth/DestHeight 传 0 = 源自然尺寸；SrcWidth/SrcHeight 负 = 翻转
  *  @returns 成功 → 扫描行数；失败 → 0
@@ -186,9 +208,9 @@ export const SetDIBitsToDevice = /*@__PURE__*/ b('SetDIBitsToDevice', '<HDC>ptr!
  *  @param args_8 SrcHeight 源区高
  *  @param args_9 lpvBits 像素缓冲（ArrayBuffer）
  *  @param args_10 lpbmi BITMAPINFO 缓冲（BITMAPINFOHEADER.encode({...}).ptr）
- *  @param args_11 iUsage DIB_RGB_COLORS(0)
+ *  @param args_11 iUsage ColorUse.RGB_COLORS
  *  @param args_12 rop RasterOp.SRCCOPY 等互斥单选光栅操作码 */
-export const StretchDIBits = /*@__PURE__*/ b('StretchDIBits', '<HDC>ptr! i32 i32 i32 i32 i32 i32 i32 i32 <BYTE>ptr <BYTE>ptr u32 u32@RasterOp -> i32');
+export const StretchDIBits = /*@__PURE__*/ b('StretchDIBits', '<HDC>ptr! i32 i32 i32 i32 i32 i32 i32 i32 <BYTE>ptr <BYTE>ptr u32@ColorUse u32@RasterOp -> i32');
 // ============ 画图原语（笔 / 线 / 形状 / 文字） ============
 /** 取系统共享对象（笔/刷/字体/调色板）；共享句柄不要 DeleteObject——
  *  SelectObject 选入 hdc 生效（如 NULL_BRUSH 让形状只描边不填充）