steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Replace "win32-error-string throw" with windows-error instance throwing" 

This reverts commit 2dfb3b3a73.
fix-linux
Doug Coleman 2020-01-03 13:03:10 -06:00
parent 0f7672c25e
commit 7f395ba7f0
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
basis/alien/libraries/windows/windows.factor
View File

@ -1,9 +1,8 @@
USING: alien.libraries io.pathnames system windows.errors
windows.kernel32 ;
USING: alien.libraries io.pathnames system windows.errors ;
IN: alien.libraries.windows
M: windows >deployed-library-path
file-name ;
M: windows dlerror ( -- message )
GetLastError n>win32-error-string ;
win32-error-string ;

2
basis/calendar/windows/windows.factor
View File

@ -31,7 +31,7 @@ IN: calendar.windows
M: windows gmt-offset ( -- hours minutes seconds )
TIME_ZONE_INFORMATION <struct>
dup GetTimeZoneInformation {
{ TIME_ZONE_ID_INVALID [ win32-error ] }
{ TIME_ZONE_ID_INVALID [ win32-error-string throw ] }
{ TIME_ZONE_ID_UNKNOWN [ Bias>> ] }
{ TIME_ZONE_ID_STANDARD [ Bias>> ] }
{ TIME_ZONE_ID_DAYLIGHT [ [ Bias>> ] [ DaylightBias>> ] bi + ] }

4
basis/io/files/info/windows/windows.factor
View File

@ -19,7 +19,7 @@ TUPLE: windows-file-info < file-info-tuple attributes ;
: get-compressed-file-size ( path -- n )
{ DWORD } [ GetCompressedFileSize ] with-out-parameters
over INVALID_FILE_SIZE = [ win32-error ] [ >64bit ] if ;
over INVALID_FILE_SIZE = [ win32-error-string throw ] [ >64bit ] if ;
: set-windows-size-on-disk ( file-info path -- file-info )
over attributes>> +compressed+ swap member? [
@ -183,7 +183,7 @@ CONSTANT: names-buf-length 16384
[ path-length FindNextVolume ] with-out-parameters
swap 0 = [
GetLastError ERROR_NO_MORE_FILES =
[ drop f ] [ win32-error ] if
[ drop f ] [ win32-error-string throw ] if
] [ alien>native-string ] if ;
: find-volumes ( -- array )

2
basis/io/sockets/secure/windows/windows.factor
View File

@ -14,7 +14,7 @@ M: openssl ssl-certificate-verification-supported? f ;
: load-windows-cert-store ( string -- HCERTSTORE )
[ f ] dip CertOpenSystemStore
[ win32-error ] when-zero ;
[ win32-error-string throw ] when-zero ;
: X509-NAME. ( X509_NAME -- )
f 0 X509_NAME_oneline

3
basis/windows/errors/errors.factor
View File

@ -717,6 +717,9 @@ CONSTANT: FORMAT_MESSAGE_MAX_WIDTH_MASK 0x000000FF
[ drop "Unknown error 0x" id 0xffff,ffff bitand >hex append ]
[ alien>native-string [ blank? ] trim ] if ;
: win32-error-string ( -- str )
GetLastError n>win32-error-string ;
ERROR: windows-error n string ;
: (win32-error) ( n -- )

2
extra/talks/tc-lisp-talk/tc-lisp-talk.factor
View File

@ -456,7 +456,7 @@ xyz
\"TIME_ZONE_INFORMATION\" <c-object>
dup GetTimeZoneInformation {
{ TIME_ZONE_ID_INVALID [
win32-error
win32-error-string throw
] }
{ TIME_ZONE_ID_STANDARD [
TIME_ZONE_INFORMATION-Bias