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

io: fix for win32-error not throwing on zero.

flac
John Benediktsson 2020-01-06 14:20:15 -08:00 committed by Steve Ayerhart
parent dfac484e00
commit 6e7cd0f131
No known key found for this signature in database
GPG Key ID: 5BFD39C5359E967D
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/io/directories/windows/windows.factor
View File

@ -31,7 +31,7 @@ ERROR: file-delete-failed path error ;
: (delete-file) ( path -- ) : (delete-file) ( path -- )
dup DeleteFile 0 = [ dup DeleteFile 0 = [
GetLastError ERROR_ACCESS_DENIED = GetLastError ERROR_ACCESS_DENIED =
[ delete-read-only-file ] [ win32-error ] if [ delete-read-only-file ] [ drop win32-error ] if
] [ drop ] if ; ] [ drop ] if ;
M: windows delete-file ( path -- ) M: windows delete-file ( path -- )

2
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 ) : get-compressed-file-size ( path -- n )
{ DWORD } [ GetCompressedFileSize ] with-out-parameters { DWORD } [ GetCompressedFileSize ] with-out-parameters
over INVALID_FILE_SIZE = [ win32-error ] [ >64bit ] if ; over INVALID_FILE_SIZE = [ win32-error ] when >64bit ;
: set-windows-size-on-disk ( file-info path -- file-info ) : set-windows-size-on-disk ( file-info path -- file-info )
over attributes>> +compressed+ swap member? [ over attributes>> +compressed+ swap member? [

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

@ -117,7 +117,7 @@ M: windows init-io ( -- )
: handle>file-size ( handle -- n/f ) : handle>file-size ( handle -- n/f )
(handle>file-size) [ (handle>file-size) [
GetLastError ERROR_INVALID_FUNCTION = GetLastError ERROR_INVALID_FUNCTION =
[ f ] [ win32-error ] if [ win32-error ] unless f
] unless* ; ] unless* ;
ERROR: seek-before-start n ; ERROR: seek-before-start n ;
@ -405,7 +405,7 @@ M: windows home
0 0
[ FindFirstStream ] keepd [ FindFirstStream ] keepd
over INVALID_HANDLE_VALUE = [ over INVALID_HANDLE_VALUE = [
2drop win32-error 2drop win32-error f
] [ ] [
1vector swap file-streams-rest 1vector swap file-streams-rest
] if ; ] if ;

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 ) : load-windows-cert-store ( string -- HCERTSTORE )
[ f ] dip CertOpenSystemStore [ f ] dip CertOpenSystemStore
[ win32-error ] when-zero ; [ win32-error f ] when-zero ;
: X509-NAME. ( X509_NAME -- ) : X509-NAME. ( X509_NAME -- )
f 0 X509_NAME_oneline f 0 X509_NAME_oneline