From c308d794dbb78fb60d7a541e80c4455d27f46d2f Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 3 Jan 2020 13:03:52 -0600 Subject: [PATCH] Revert "Replace "n>win32-error-string throw" with windows-error instance throwing" This reverts commit 70d08ce743d8bae6001f28baf8cc0f13afc93c10. --- basis/io/files/windows/windows.factor | 4 ++-- basis/windows/registry/registry.factor | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/basis/io/files/windows/windows.factor b/basis/io/files/windows/windows.factor index 9b5006701d..518fa8daab 100644 --- a/basis/io/files/windows/windows.factor +++ b/basis/io/files/windows/windows.factor @@ -76,7 +76,7 @@ SYMBOL: master-completion-port { [ dup integer? ] [ ] } { [ dup array? ] [ first dup eof? - [ drop 0 ] [ throw-windows-error ] if + [ drop 0 ] [ n>win32-error-string throw ] if ] } } cond ] with-timeout ; @@ -147,7 +147,7 @@ M: windows handle-length ( handle -- n/f ) GetLastError { { [ dup expected-io-error? ] [ drop f ] } { [ dup eof? ] [ drop t ] } - [ throw-windows-error ] + [ n>win32-error-string throw ] } cond ] [ f ] if ; diff --git a/basis/windows/registry/registry.factor b/basis/windows/registry/registry.factor index 932e09d823..be91098276 100644 --- a/basis/windows/registry/registry.factor +++ b/basis/windows/registry/registry.factor @@ -45,7 +45,11 @@ CONSTANT: registry-value-max-length 16384 f 0 KEY_ALL_ACCESS f create-key* drop ; : 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 -- ) key subkey mode open-key :> hkey @@ -78,7 +82,7 @@ PRIVATE> key value-name ptr1 lpType buffer grow-buffer reg-query-value-ex ] [ - ret throw-windows-error + ret n>win32-error-string throw ] if ] if ; -- 2.34.1