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

This reverts commit 70d08ce743.
fix-linux
Doug Coleman 2020-01-03 13:03:52 -06:00
parent 7f395ba7f0
commit c308d794db
2 changed files with 8 additions and 4 deletions

View File

@ -76,7 +76,7 @@ SYMBOL: master-completion-port
{ [ dup integer? ] [ ] } { [ dup integer? ] [ ] }
{ [ dup array? ] [ { [ dup array? ] [
first dup eof? first dup eof?
[ drop 0 ] [ throw-windows-error ] if [ drop 0 ] [ n>win32-error-string throw ] if
] } ] }
} cond } cond
] with-timeout ; ] with-timeout ;
@ -147,7 +147,7 @@ M: windows handle-length ( handle -- n/f )
GetLastError { GetLastError {
{ [ dup expected-io-error? ] [ drop f ] } { [ dup expected-io-error? ] [ drop f ] }
{ [ dup eof? ] [ drop t ] } { [ dup eof? ] [ drop t ] }
[ throw-windows-error ] [ n>win32-error-string throw ]
} cond } cond
] [ f ] if ; ] [ f ] if ;

View File

@ -45,7 +45,11 @@ CONSTANT: registry-value-max-length 16384
f 0 KEY_ALL_ACCESS f create-key* drop ; f 0 KEY_ALL_ACCESS f create-key* drop ;
: close-key ( hkey -- ) : close-key ( hkey -- )
RegCloseKey n>win32-error-check ; RegCloseKey dup ERROR_SUCCESS = [
drop
] [
n>win32-error-string throw
] if ;
:: with-open-registry-key ( key subkey mode quot -- ) :: with-open-registry-key ( key subkey mode quot -- )
key subkey mode open-key :> hkey key subkey mode open-key :> hkey
@ -78,7 +82,7 @@ PRIVATE>
key value-name ptr1 lpType buffer key value-name ptr1 lpType buffer
grow-buffer reg-query-value-ex grow-buffer reg-query-value-ex
] [ ] [
ret throw-windows-error ret n>win32-error-string throw
] if ] if
] if ; ] if ;