diff --git a/basis/windows/com/wrapper/wrapper.factor b/basis/windows/com/wrapper/wrapper.factor index 710feeec4d..813d8315ac 100755 --- a/basis/windows/com/wrapper/wrapper.factor +++ b/basis/windows/com/wrapper/wrapper.factor @@ -123,7 +123,7 @@ unless : (make-callbacks) ( implementations -- sequence ) dup [ first ] map (make-iunknown-methods) - [ >r >r first2 r> r> swap (make-interface-callbacks) ] + [ [ first2 ] 2dip swap (make-interface-callbacks) ] curry map-index ; : (malloc-wrapped-object) ( wrapper -- wrapped-object ) diff --git a/basis/windows/time/time.factor b/basis/windows/time/time.factor index 5e23f8cc01..5ffc62680e 100644 --- a/basis/windows/time/time.factor +++ b/basis/windows/time/time.factor @@ -28,8 +28,8 @@ IN: windows.time : windows-time>FILETIME ( n -- FILETIME ) "FILETIME" <c-object> [ - [ >r HEX: ffffffff bitand r> set-FILETIME-dwLowDateTime ] 2keep - >r -32 shift r> set-FILETIME-dwHighDateTime + [ 32 bits set-FILETIME-dwLowDateTime ] 2keep + [ -32 shift ] dip set-FILETIME-dwHighDateTime ] keep ; : timestamp>FILETIME ( timestamp -- FILETIME/f )