diff --git a/basis/windows/fonts/fonts.factor b/basis/windows/fonts/fonts.factor index 8e61d2989a..398e6496bb 100644 --- a/basis/windows/fonts/fonts.factor +++ b/basis/windows/fonts/fonts.factor @@ -44,8 +44,8 @@ MEMO:: (cache-font) ( name size bold? italic? -- HFONT ) \ windows-fonts reset-memoized ] "windows.fonts" add-startup-hook -: TEXTMETRIC>metrics ( TEXTMETRIC -- metrics ) - [ metrics new 0 >>width ] dip { +: \TEXTMETRIC>metrics ( TEXTMETRIC -- metrics ) + [ metrics new 0 >>width ] dip { [ tmHeight>> >>height ] [ tmAscent>> >>ascent ] [ tmDescent>> >>descent ] diff --git a/basis/windows/registry/registry.factor b/basis/windows/registry/registry.factor index 465d617a3d..06bd370f0e 100644 --- a/basis/windows/registry/registry.factor +++ b/basis/windows/registry/registry.factor @@ -137,7 +137,7 @@ TUPLE: registry-enum-key ; max-value uint deref max-value-data uint deref security-descriptor uint deref - last-write-time FILETIME>timestamp + last-write-time \FILETIME>timestamp registry-info boa ] [ ret n>win32-error-string diff --git a/basis/windows/time/time-tests.factor b/basis/windows/time/time-tests.factor index d8f4f8fc56..c560d25753 100644 --- a/basis/windows/time/time-tests.factor +++ b/basis/windows/time/time-tests.factor @@ -2,6 +2,6 @@ USING: calendar calendar.windows kernel tools.test windows.time ; IN: windows.time.tests -[ t ] [ windows-1601 [ timestamp>FILETIME FILETIME>timestamp ] keep = ] unit-test -[ t ] [ windows-time [ windows-time>FILETIME FILETIME>windows-time ] keep = ] unit-test -[ t ] [ windows-1601 400 years time+ [ timestamp>FILETIME FILETIME>timestamp ] keep = ] unit-test +[ t ] [ windows-1601 [ timestamp>FILETIME \FILETIME>timestamp ] keep = ] unit-test +[ t ] [ windows-time [ windows-time>FILETIME \FILETIME>windows-time ] keep = ] unit-test +[ t ] [ windows-1601 400 years time+ [ timestamp>FILETIME \FILETIME>timestamp ] keep = ] unit-test diff --git a/basis/windows/time/time.factor b/basis/windows/time/time.factor index dea0e7de40..56403ffdbb 100644 --- a/basis/windows/time/time.factor +++ b/basis/windows/time/time.factor @@ -10,7 +10,7 @@ IN: windows.time : windows-1601 ( -- timestamp ) 1601 ; -: FILETIME>windows-time ( FILETIME -- n ) +: \FILETIME>windows-time ( FILETIME -- n ) [ dwLowDateTime>> ] [ dwHighDateTime>> ] bi >64bit ; : windows-time>timestamp ( n -- timestamp ) @@ -18,7 +18,7 @@ IN: windows.time : windows-time ( -- n ) FILETIME [ GetSystemTimeAsFileTime ] keep - FILETIME>windows-time ; + \FILETIME>windows-time ; : timestamp>windows-time ( timestamp -- n ) ! 64bit number representing # of nanoseconds since Jan 1, 1601 (UTC) @@ -31,5 +31,5 @@ IN: windows.time : timestamp>FILETIME ( timestamp -- FILETIME/f ) dup [ >gmt timestamp>windows-time windows-time>FILETIME ] when ; -: FILETIME>timestamp ( FILETIME -- timestamp/f ) - FILETIME>windows-time windows-time>timestamp ; +: \FILETIME>timestamp ( FILETIME -- timestamp/f ) + \FILETIME>windows-time windows-time>timestamp ; diff --git a/basis/windows/types/types.factor b/basis/windows/types/types.factor index 1b84607656..608edac5ef 100644 --- a/basis/windows/types/types.factor +++ b/basis/windows/types/types.factor @@ -375,7 +375,7 @@ TYPEDEF: DWORD* LPCOLORREF : color>RGB ( color -- COLORREF ) >rgba-components drop [ 255 * >integer ] tri@ RGB ; -: RGB>color ( COLORREF -- color ) +: \RGB>color ( COLORREF -- color ) >RGB< [ 1/255. * >float ] tri@ 1.0 ; STRUCT: TEXTMETRICW diff --git a/basis/windows/uniscribe/uniscribe.factor b/basis/windows/uniscribe/uniscribe.factor index 1c6c78ff53..b02b4a371f 100755 --- a/basis/windows/uniscribe/uniscribe.factor +++ b/basis/windows/uniscribe/uniscribe.factor @@ -83,7 +83,7 @@ CONSTANT: ssa-dwFlags flags{ SSA_GLYPHS SSA_FALLBACK SSA_TAB } : dc-metrics ( dc -- metrics ) TEXTMETRICW [ GetTextMetrics drop ] keep - TEXTMETRIC>metrics ; + \TEXTMETRIC>metrics ; ! DC limit is default soft-limited to 10,000 per process. : ( font string -- script-string )