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

Remove win32-error-string, because there was only one place it was used in.
fix-linux
Alexander Iljin 2016-06-29 01:23:36 +03:00 committed by John Benediktsson
parent 70d08ce743
commit 2dfb3b3a73
6 changed files with 8 additions and 10 deletions

View File

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

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-string throw ] }
{ TIME_ZONE_ID_INVALID [ win32-error ] }
{ TIME_ZONE_ID_UNKNOWN [ Bias>> ] }
{ TIME_ZONE_ID_STANDARD [ Bias>> ] }
{ TIME_ZONE_ID_DAYLIGHT [ [ Bias>> ] [ DaylightBias>> ] bi + ] }

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-string throw ] [ >64bit ] if ;
over INVALID_FILE_SIZE = [ win32-error ] [ >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-string throw ] if
[ drop f ] [ win32-error ] if
] [ alien>native-string ] if ;
: find-volumes ( -- array )

View File

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

View File

@ -717,9 +717,6 @@ 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 -- )

View File

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