From 3905460c4565f4d27bf18a1f495f82eff0718893 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sat, 18 Oct 2008 23:03:22 -0500
Subject: [PATCH] fix winnt environment variables
---
basis/environment/winnt/winnt.factor | 16 ++++++++++++----
basis/windows/errors/errors.factor | 1 +
basis/windows/kernel32/kernel32.factor | 11 +++++++----
basis/windows/types/types.factor | 9 ++++-----
4 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/basis/environment/winnt/winnt.factor b/basis/environment/winnt/winnt.factor
index e73db5c292..33cf6a698b 100644
--- a/basis/environment/winnt/winnt.factor
+++ b/basis/environment/winnt/winnt.factor
@@ -1,15 +1,17 @@
! Copyright (C) 2008 Doug Coleman.
! See http://factorcode.org/license.txt for BSD license.
USING: alien.strings fry io.encodings.utf16 kernel
-splitting windows windows.kernel32 ;
+splitting windows windows.kernel32 system environment
+alien.c-types sequences windows.errors io.streams.memory
+io.encodings io ;
IN: environment.winnt
M: winnt os-env ( key -- value )
MAX_UNICODE_PATH "TCHAR" <c-array>
- [ GetEnvironmentVariable ] keep over 0 = [
+ [ dup length GetEnvironmentVariable ] keep over 0 = [
2drop f
] [
- nip utf16 alien>string
+ nip utf16n alien>string
] if ;
M: winnt set-os-env ( value key -- )
@@ -22,4 +24,10 @@ M: winnt unset-os-env ( key -- )
] when ;
M: winnt (os-envs) ( -- seq )
- GetEnvironmentStrings [ "\0" split ] [ FreeEnvironmentStrings ] bi ;
+ GetEnvironmentStrings [
+ <memory-stream> [
+ utf16n decode-input
+ [ "\0" read-until drop dup empty? not ]
+ [ ] [ drop ] produce
+ ] with-input-stream*
+ ] [ FreeEnvironmentStrings win32-error=0/f ] bi ;
diff --git a/basis/windows/errors/errors.factor b/basis/windows/errors/errors.factor
index 2e4e709d43..31a7cd8c09 100644
--- a/basis/windows/errors/errors.factor
+++ b/basis/windows/errors/errors.factor
@@ -4,6 +4,7 @@ IN: windows.errors
: ERROR_SUCCESS 0 ; inline
: ERROR_HANDLE_EOF 38 ; inline
: ERROR_BROKEN_PIPE 109 ; inline
+: ERROR_ENVVAR_NOT_FOUND 203 ; inline
: ERROR_IO_INCOMPLETE 996 ; inline
: ERROR_IO_PENDING 997 ; inline
diff --git a/basis/windows/kernel32/kernel32.factor b/basis/windows/kernel32/kernel32.factor
index d4c610c7b9..f19561cda3 100644
--- a/basis/windows/kernel32/kernel32.factor
+++ b/basis/windows/kernel32/kernel32.factor
@@ -838,7 +838,8 @@ ALIAS: FindNextFile FindNextFileW
! FUNCTION: FormatMessageW
! FUNCTION: FreeConsole
! FUNCTION: FreeEnvironmentStringsA
-! FUNCTION: FreeEnvironmentStringsW
+FUNCTION: BOOL FreeEnvironmentStringsW ( LPTCH lpszEnvironmentBlock ) ;
+ALIAS: FreeEnvironmentStrings FreeEnvironmentStringsW
! FUNCTION: FreeLibrary
! FUNCTION: FreeLibraryAndExitThread
! FUNCTION: FreeResource
@@ -933,11 +934,12 @@ FUNCTION: HANDLE GetCurrentThread ( ) ;
! FUNCTION: GetDllDirectoryW
! FUNCTION: GetDriveTypeA
! FUNCTION: GetDriveTypeW
-FUNCTION: LPTCH GetEnvironmentStrings ( ) ;
+FUNCTION: void* GetEnvironmentStringsW ( ) ;
! FUNCTION: GetEnvironmentStringsA
ALIAS: GetEnvironmentStrings GetEnvironmentStringsW
! FUNCTION: GetEnvironmentVariableA
-! FUNCTION: GetEnvironmentVariableW
+FUNCTION: DWORD GetEnvironmentVariableW ( LPCTSTR lpName, LPTSTR lpBuffer, DWORD nSize ) ;
+ALIAS: GetEnvironmentVariable GetEnvironmentVariableW
FUNCTION: BOOL GetExitCodeProcess ( HANDLE hProcess, LPDWORD lpExitCode ) ;
! FUNCTION: GetExitCodeThread
! FUNCTION: GetExpandedNameA
@@ -1418,7 +1420,8 @@ ALIAS: SetCurrentDirectory SetCurrentDirectoryW
! FUNCTION: SetDllDirectoryW
FUNCTION: BOOL SetEndOfFile ( HANDLE hFile ) ;
! FUNCTION: SetEnvironmentVariableA
-! FUNCTION: SetEnvironmentVariableW
+FUNCTION: BOOL SetEnvironmentVariableW ( LPCTSTR key, LPCTSTR value ) ;
+ALIAS: SetEnvironmentVariable SetEnvironmentVariableW
! FUNCTION: SetErrorMode
! FUNCTION: SetEvent
! FUNCTION: SetFileApisToANSI
diff --git a/basis/windows/types/types.factor b/basis/windows/types/types.factor
index 56d617e835..b1d8914be9 100644
--- a/basis/windows/types/types.factor
+++ b/basis/windows/types/types.factor
@@ -64,13 +64,12 @@ TYPEDEF: ulonglong DWORD64
TYPEDEF: longlong LARGE_INTEGER
TYPEDEF: LARGE_INTEGER* PLARGE_INTEGER
-TYPEDEF: WCHAR TCHAR
-TYPEDEF: TCHAR* LPTCH
-TYPEDEF: TCHAR TBYTE
TYPEDEF: wchar_t* LPCSTR
TYPEDEF: wchar_t* LPWSTR
-
-
+TYPEDEF: WCHAR TCHAR
+TYPEDEF: LPWSTR LPTCH
+TYPEDEF: LPWSTR PTCH
+TYPEDEF: TCHAR TBYTE
TYPEDEF: WORD ATOM
TYPEDEF: BYTE BOOLEAN