From 7ae147c3bfd1a49933b551dc623fca3f6aec45a5 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sat, 12 Sep 2009 13:24:45 -0500 Subject: [PATCH 1/2] tools.deploy.test: cut Windows some slack --- basis/tools/deploy/test/test.factor | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 basis/tools/deploy/test/test.factor diff --git a/basis/tools/deploy/test/test.factor b/basis/tools/deploy/test/test.factor old mode 100644 new mode 100755 index 28916033d4..6a6f9cf8fd --- a/basis/tools/deploy/test/test.factor +++ b/basis/tools/deploy/test/test.factor @@ -12,7 +12,11 @@ IN: tools.deploy.test : small-enough? ( n -- ? ) [ "test.image" temp-file file-info size>> ] - [ cell 4 / * cpu ppc? [ 100000 + ] when ] bi* + [ + cell 4 / * + cpu ppc? [ 100000 + ] when + os windows? [ 150000 + ] when + ] bi* <= ; : run-temp-image ( -- ) From 74cebff3712ad6a2ea3aef74358ed99a0db8eff5 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sat, 12 Sep 2009 13:25:31 -0500 Subject: [PATCH 2/2] windows.dinput.constants: fix load error --- basis/windows/dinput/constants/constants.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/windows/dinput/constants/constants.factor b/basis/windows/dinput/constants/constants.factor index e0bfafc5c4..b67b5fa08f 100755 --- a/basis/windows/dinput/constants/constants.factor +++ b/basis/windows/dinput/constants/constants.factor @@ -49,7 +49,7 @@ MEMO: heap-size* ( c-type -- n ) heap-size ; } cleave DIOBJECTDATAFORMAT ; -:: malloc-DIOBJECTDATAFORMAT-array ( struct array -- alien ) +:: make-DIOBJECTDATAFORMAT-array ( struct array -- alien ) [let | alien [ array length malloc-DIOBJECTDATAFORMAT-array ] | array [| args i | struct args @@ -60,7 +60,7 @@ MEMO: heap-size* ( c-type -- n ) heap-size ; : ( dwFlags dwDataSize struct rgodf-array -- alien ) [ DIDATAFORMAT heap-size DIOBJECTDATAFORMAT heap-size ] 4 ndip - [ nip length ] [ malloc-DIOBJECTDATAFORMAT-array ] 2bi + [ nip length ] [ make-DIOBJECTDATAFORMAT-array ] 2bi DIDATAFORMAT ; : initialize ( symbol quot -- )