From 014163e27b85410396859e04a984167873ea842e Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sat, 19 Sep 2009 02:31:06 -0500 Subject: [PATCH 1/4] windows loading fixes --- basis/windows/advapi32/advapi32.factor | 2 +- basis/windows/kernel32/kernel32.factor | 2 +- basis/windows/usp10/usp10.factor | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/basis/windows/advapi32/advapi32.factor b/basis/windows/advapi32/advapi32.factor index 1bc7f30caf..21f048a00f 100755 --- a/basis/windows/advapi32/advapi32.factor +++ b/basis/windows/advapi32/advapi32.factor @@ -1,5 +1,5 @@ USING: alien.syntax kernel math windows.types windows.kernel32 -math.bitwise ; +math.bitwise classes.struct ; IN: windows.advapi32 LIBRARY: advapi32 diff --git a/basis/windows/kernel32/kernel32.factor b/basis/windows/kernel32/kernel32.factor index ef8952be73..075b0218b3 100755 --- a/basis/windows/kernel32/kernel32.factor +++ b/basis/windows/kernel32/kernel32.factor @@ -690,8 +690,8 @@ STRUCT: OFSTRUCT { nErrCode WORD } { Reserved1 WORD } { Reserved2 WORD } - ! { szPathName { CHAR OFS_MAXPATHNAME } } ; { szPathName { CHAR 128 } } ; + ! { szPathName { CHAR OFS_MAXPATHNAME } } ; TYPEDEF: OFSTRUCT* LPOFSTRUCT diff --git a/basis/windows/usp10/usp10.factor b/basis/windows/usp10/usp10.factor index cf8e69ba24..eb57a46925 100755 --- a/basis/windows/usp10/usp10.factor +++ b/basis/windows/usp10/usp10.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2009 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.syntax alien.destructors ; +USING: alien.syntax alien.destructors classes.struct ; IN: windows.usp10 LIBRARY: usp10 From f738a4dc4e39ba31be4d9bdf2a53c2924d4c783d Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sat, 19 Sep 2009 02:44:40 -0500 Subject: [PATCH 2/4] more windows loading fixes --- .../windows/nt/privileges/privileges.factor | 88 +++++++++---------- basis/windows/winsock/winsock.factor | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/basis/io/backend/windows/nt/privileges/privileges.factor b/basis/io/backend/windows/nt/privileges/privileges.factor index 6acc1f3544..bb075233bd 100755 --- a/basis/io/backend/windows/nt/privileges/privileges.factor +++ b/basis/io/backend/windows/nt/privileges/privileges.factor @@ -1,44 +1,44 @@ -USING: alien alien.c-types alien.data alien.syntax arrays continuations -destructors generic io.mmap io.ports io.backend.windows io.files.windows -kernel libc math math.bitwise namespaces quotations sequences windows -windows.advapi32 windows.kernel32 windows.types io.backend system accessors -io.backend.windows.privileges windows.errors ; -IN: io.backend.windows.nt.privileges - -TYPEDEF: TOKEN_PRIVILEGES* PTOKEN_PRIVILEGES - -! Security tokens -! http://msdn.microsoft.com/msdnmag/issues/05/03/TokenPrivileges/ - -: (open-process-token) ( handle -- handle ) - { TOKEN_ADJUST_PRIVILEGES TOKEN_QUERY } flags PHANDLE - [ OpenProcessToken win32-error=0/f ] keep *void* ; - -: open-process-token ( -- handle ) - #! remember to CloseHandle - GetCurrentProcess (open-process-token) ; - -: with-process-token ( quot -- ) - #! quot: ( token-handle -- token-handle ) - [ open-process-token ] dip - [ keep ] curry - [ CloseHandle drop ] [ ] cleanup ; inline - -: lookup-privilege ( string -- luid ) - [ f ] dip LUID - [ LookupPrivilegeValue win32-error=0/f ] keep ; - -: make-token-privileges ( name ? -- obj ) - TOKEN_PRIVILEGES - 1 >>PrivilegeCount - LUID_AND_ATTRIBUTES malloc-struct &free - swap [ SE_PRIVILEGE_ENABLED >>Attributes ] when - >>Privileges - [ lookup-privilege ] dip - [ Privileges>> (>>Luid) ] keep ; - -M: winnt set-privilege ( name ? -- ) - [ - -rot 0 -rot make-token-privileges - dup length f f AdjustTokenPrivileges win32-error=0/f - ] with-process-token ; +USING: alien alien.c-types alien.data alien.syntax arrays continuations +destructors generic io.mmap io.ports io.backend.windows io.files.windows +kernel libc math math.bitwise namespaces quotations sequences windows +windows.advapi32 windows.kernel32 windows.types io.backend system accessors +io.backend.windows.privileges classes.struct windows.errors ; +IN: io.backend.windows.nt.privileges + +TYPEDEF: TOKEN_PRIVILEGES* PTOKEN_PRIVILEGES + +! Security tokens +! http://msdn.microsoft.com/msdnmag/issues/05/03/TokenPrivileges/ + +: (open-process-token) ( handle -- handle ) + { TOKEN_ADJUST_PRIVILEGES TOKEN_QUERY } flags PHANDLE + [ OpenProcessToken win32-error=0/f ] keep *void* ; + +: open-process-token ( -- handle ) + #! remember to CloseHandle + GetCurrentProcess (open-process-token) ; + +: with-process-token ( quot -- ) + #! quot: ( token-handle -- token-handle ) + [ open-process-token ] dip + [ keep ] curry + [ CloseHandle drop ] [ ] cleanup ; inline + +: lookup-privilege ( string -- luid ) + [ f ] dip LUID + [ LookupPrivilegeValue win32-error=0/f ] keep ; + +: make-token-privileges ( name ? -- obj ) + TOKEN_PRIVILEGES + 1 >>PrivilegeCount + LUID_AND_ATTRIBUTES malloc-struct &free + swap [ SE_PRIVILEGE_ENABLED >>Attributes ] when + >>Privileges + [ lookup-privilege ] dip + [ Privileges>> (>>Luid) ] keep ; + +M: winnt set-privilege ( name ? -- ) + [ + -rot 0 -rot make-token-privileges + dup length f f AdjustTokenPrivileges win32-error=0/f + ] with-process-token ; diff --git a/basis/windows/winsock/winsock.factor b/basis/windows/winsock/winsock.factor index 2e59b9fec1..dc751e64a6 100755 --- a/basis/windows/winsock/winsock.factor +++ b/basis/windows/winsock/winsock.factor @@ -204,8 +204,8 @@ CONSTANT: MAX_PROTOCOL_CHAIN 7 STRUCT: WSAPROTOCOLCHAIN { ChainLen int } - ! { ChainEntries { DWORD MAX_PROTOCOL_CHAIN } } ; { ChainEntries { DWORD 7 } } ; + ! { ChainEntries { DWORD MAX_PROTOCOL_CHAIN } } ; TYPEDEF: WSAPROTOCOLCHAIN* LPWSAPROTOCOLCHAIN CONSTANT: WSAPROTOCOL_LEN 255 From b7eff85fe09be0e0cd6255b65fc467f0d1162776 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sat, 19 Sep 2009 10:01:12 -0500 Subject: [PATCH 3/4] fix windows test failures --- .../backend/windows/nt/privileges/privileges.factor | 13 ++++++------- basis/windows/types/types.factor | 9 ++++++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/basis/io/backend/windows/nt/privileges/privileges.factor b/basis/io/backend/windows/nt/privileges/privileges.factor index bb075233bd..6022e91efd 100755 --- a/basis/io/backend/windows/nt/privileges/privileges.factor +++ b/basis/io/backend/windows/nt/privileges/privileges.factor @@ -1,6 +1,6 @@ USING: alien alien.c-types alien.data alien.syntax arrays continuations destructors generic io.mmap io.ports io.backend.windows io.files.windows -kernel libc math math.bitwise namespaces quotations sequences windows +kernel libc locals math math.bitwise namespaces quotations sequences windows windows.advapi32 windows.kernel32 windows.types io.backend system accessors io.backend.windows.privileges classes.struct windows.errors ; IN: io.backend.windows.nt.privileges @@ -28,17 +28,16 @@ TYPEDEF: TOKEN_PRIVILEGES* PTOKEN_PRIVILEGES [ f ] dip LUID [ LookupPrivilegeValue win32-error=0/f ] keep ; -: make-token-privileges ( name ? -- obj ) +:: make-token-privileges ( name enabled? -- obj ) TOKEN_PRIVILEGES 1 >>PrivilegeCount LUID_AND_ATTRIBUTES malloc-struct &free - swap [ SE_PRIVILEGE_ENABLED >>Attributes ] when - >>Privileges - [ lookup-privilege ] dip - [ Privileges>> (>>Luid) ] keep ; + enabled? [ SE_PRIVILEGE_ENABLED >>Attributes ] when + name lookup-privilege >>Luid + >>Privileges ; M: winnt set-privilege ( name ? -- ) [ -rot 0 -rot make-token-privileges - dup length f f AdjustTokenPrivileges win32-error=0/f + dup byte-length f f AdjustTokenPrivileges win32-error=0/f ] with-process-token ; diff --git a/basis/windows/types/types.factor b/basis/windows/types/types.factor index fa043b8033..bac9ebf372 100755 --- a/basis/windows/types/types.factor +++ b/basis/windows/types/types.factor @@ -11,6 +11,12 @@ TYPEDEF: uchar UCHAR TYPEDEF: uchar BYTE TYPEDEF: ushort wchar_t +SYMBOL: wchar_t* +<< +{ char* utf16n } \ wchar_t* typedef +wchar_t wchar_t* "pointer-c-type" set-word-prop +>> + TYPEDEF: wchar_t WCHAR TYPEDEF: short SHORT @@ -70,9 +76,6 @@ TYPEDEF: ulonglong ULARGE_INTEGER TYPEDEF: LARGE_INTEGER* PLARGE_INTEGER TYPEDEF: ULARGE_INTEGER* PULARGE_INTEGER -SYMBOL: wchar_t* -<< { char* utf16n } \ wchar_t* typedef >> - TYPEDEF: wchar_t* LPCSTR TYPEDEF: wchar_t* LPWSTR TYPEDEF: WCHAR TCHAR From 2313b077d2bb50aa0c33f35ed493efd2118dbcd9 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sat, 19 Sep 2009 11:30:23 -0500 Subject: [PATCH 4/4] fix windows bootstrap --- basis/windows/types/types.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/windows/types/types.factor b/basis/windows/types/types.factor index bac9ebf372..6275f2d3c9 100755 --- a/basis/windows/types/types.factor +++ b/basis/windows/types/types.factor @@ -14,7 +14,7 @@ TYPEDEF: ushort wchar_t SYMBOL: wchar_t* << { char* utf16n } \ wchar_t* typedef -wchar_t wchar_t* "pointer-c-type" set-word-prop +\ wchar_t \ wchar_t* "pointer-c-type" set-word-prop >> TYPEDEF: wchar_t WCHAR