diff --git a/basis/windows/types/types.factor b/basis/windows/types/types.factor index c62de58bcd..fb3ba7f0f5 100755 --- a/basis/windows/types/types.factor +++ b/basis/windows/types/types.factor @@ -287,9 +287,9 @@ C-STRUCT: POINT { "LONG" "x" } { "LONG" "y" } ; -C-STRUCT: SIZE - { "LONG" "cx" } - { "LONG" "cy" } ; +STRUCT: SIZE + { cx LONG } + { cy LONG } ; C-STRUCT: MSG { "HWND" "hWnd" } diff --git a/basis/windows/uniscribe/uniscribe.factor b/basis/windows/uniscribe/uniscribe.factor index 7dd630ca5b..1c1830fa02 100755 --- a/basis/windows/uniscribe/uniscribe.factor +++ b/basis/windows/uniscribe/uniscribe.factor @@ -82,7 +82,7 @@ TUPLE: script-string < disposable font string metrics ssa size image ; : script-string-size ( script-string -- dim ) ssa>> ScriptString_pSize dup win32-error=0/f - [ SIZE-cx ] [ SIZE-cy ] bi 2array ; + [ cx>> ] [ cy>> ] bi 2array ; : dc-metrics ( dc -- metrics ) TEXTMETRICW