From: Slava Pestov Date: Sun, 23 May 2010 08:27:40 +0000 (-0500) Subject: Fixes for out parameter changes X-Git-Tag: 0.97~4669^2~95^2~10 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=66fcab3721e8933d05c338358da4888c0db66763 Fixes for out parameter changes --- diff --git a/basis/io/backend/windows/nt/nt.factor b/basis/io/backend/windows/nt/nt.factor old mode 100644 new mode 100755 index 14a09bdfac..c0a6ee807d --- a/basis/io/backend/windows/nt/nt.factor +++ b/basis/io/backend/windows/nt/nt.factor @@ -1,9 +1,11 @@ -USING: alien alien.c-types arrays assocs combinators continuations -destructors io io.backend io.ports io.timeouts io.backend.windows -io.files.windows io.files.windows.nt io.files io.pathnames io.buffers -io.streams.c io.streams.null libc kernel math namespaces sequences -threads windows windows.errors windows.kernel32 strings splitting -ascii system accessors locals classes.struct combinators.short-circuit ; +USING: alien alien.c-types alien.data alien.syntax arrays assocs +combinators continuations destructors io io.backend io.ports +io.timeouts io.backend.windows io.files.windows +io.files.windows.nt io.files io.pathnames io.buffers +io.streams.c io.streams.null libc kernel math namespaces +sequences threads windows windows.errors windows.kernel32 +strings splitting ascii system accessors locals classes.struct +combinators.short-circuit ; IN: io.backend.windows.nt ! Global variable with assoc mapping overlapped to threads diff --git a/basis/io/files/info/windows/windows.factor b/basis/io/files/info/windows/windows.factor old mode 100644 new mode 100755 index 73d79b20bf..96e302860d --- a/basis/io/files/info/windows/windows.factor +++ b/basis/io/files/info/windows/windows.factor @@ -6,7 +6,7 @@ windows.time windows.types windows accessors alien.c-types combinators generalizations system alien.strings io.encodings.utf16n sequences splitting windows.errors fry continuations destructors calendar ascii -combinators.short-circuit locals classes.struct +combinators.short-circuit literals locals classes.struct specialized-arrays alien.data ; SPECIALIZED-ARRAY: ushort IN: io.files.info.windows diff --git a/basis/io/launcher/windows/windows.factor b/basis/io/launcher/windows/windows.factor index cee6f3d60e..cc9e52a189 100755 --- a/basis/io/launcher/windows/windows.factor +++ b/basis/io/launcher/windows/windows.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2007, 2010 Doug Coleman, Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: alien alien.c-types arrays continuations io +USING: alien alien.c-types alien.data arrays continuations io io.backend.windows io.pipes.windows.nt io.pathnames libc io.ports windows.types math windows.kernel32 namespaces make io.launcher kernel sequences windows.errors splitting system diff --git a/basis/random/windows/windows.factor b/basis/random/windows/windows.factor old mode 100644 new mode 100755 index f6918eb8f8..0629481a1b --- a/basis/random/windows/windows.factor +++ b/basis/random/windows/windows.factor @@ -16,7 +16,7 @@ M: windows-crypto-context dispose ( tuple -- ) CONSTANT: factor-crypto-container "FactorCryptoContainer" -:: (acquire-crypto-context) ( provider type flags -- handle ) +:: (acquire-crypto-context) ( provider type flags -- ret handle ) { HCRYPTPROV } [ factor-crypto-container provider diff --git a/basis/system-info/windows/nt/nt-tests.factor b/basis/system-info/windows/nt/nt-tests.factor old mode 100644 new mode 100755 index 4ea274df04..dfbd8b3283 --- a/basis/system-info/windows/nt/nt-tests.factor +++ b/basis/system-info/windows/nt/nt-tests.factor @@ -1,5 +1,7 @@ -USING: math.order strings ; -IN: system-info.windows.nt +USING: math.order strings system-info.backend +system-info.windows system-info.windows.nt +tools.test ; +IN: system-info.windows.nt.tests [ t ] [ cpus 0 1024 between? ] unit-test [ t ] [ username string? ] unit-test diff --git a/basis/ui/backend/windows/windows.factor b/basis/ui/backend/windows/windows.factor index 42b565121e..6ce43528e0 100755 --- a/basis/ui/backend/windows/windows.factor +++ b/basis/ui/backend/windows/windows.factor @@ -60,14 +60,14 @@ PIXEL-FORMAT-ATTRIBUTE-TABLE: WGL_ARB { $ WGL_SUPPORT_OPENGL_ARB 1 } H{ : arb-make-pixel-format ( world attributes -- pf ) [ handle>> hDC>> ] dip >WGL_ARB-int-array f 1 { int int } - [ wglChoosePixelFormatARB win32-error=0/f ] with-out-parameters drop ; + [ wglChoosePixelFormatARB win32-error=0/f ] [ ] with-out-parameters drop ; : arb-pixel-format-attribute ( pixel-format attribute -- value ) >WGL_ARB [ drop f ] [ [ [ world>> handle>> hDC>> ] [ handle>> ] bi 0 1 ] dip first { int } - [ wglGetPixelFormatAttribivARB win32-error=0/f ] + [ wglGetPixelFormatAttribivARB win32-error=0/f ] [ ] with-out-parameters ] if-empty ; diff --git a/basis/windows/uniscribe/uniscribe.factor b/basis/windows/uniscribe/uniscribe.factor old mode 100644 new mode 100755 index ca90450f1f..92fec0a677 --- a/basis/windows/uniscribe/uniscribe.factor +++ b/basis/windows/uniscribe/uniscribe.factor @@ -2,10 +2,10 @@ ! See http://factorcode.org/license.txt for BSD license. USING: kernel assocs math sequences fry io.encodings.string io.encodings.utf16n accessors arrays combinators destructors -cache namespaces init fonts alien.c-types windows.usp10 -windows.offscreen windows.gdi32 windows.ole32 windows.types -windows.fonts opengl.textures locals windows.errors -classes.struct ; +cache namespaces init fonts alien.c-types alien.data +windows.usp10 windows.offscreen windows.gdi32 windows.ole32 +windows.types windows.fonts opengl.textures locals +windows.errors classes.struct ; IN: windows.uniscribe TUPLE: script-string < disposable font string metrics ssa size image ;