Merge branch 'master' of git://factorcode.org/git/factor

diff --combined basis/windows/advapi32/advapi32.factor
index 6e040871f8d753c1e797aaae07d32ed99b5b1a1f,1ba08e657bdd126816c9fa58420ec4cbb19304b3..6d80534e8ca7c085a9cf24fa4d0bf4417e2d611a
mode 100644,100755..100755
--- 1/basis/windows/advapi32/advapi32.factor
--- 2/basis/windows/advapi32/advapi32.factor
+++ b/basis/windows/advapi32/advapi32.factor
@@@ -1,4 -1,5 +1,5 @@@
- USING: alien.syntax kernel math windows.types math.bitwise ;
+ USING: alien.syntax kernel math windows.types windows.kernel32
+ math.bitwise ;
  IN: windows.advapi32
  
  LIBRARY: advapi32
@@@ -291,40 -292,6 +292,40 @@@ CONSTANT: SE_GROUP_ENABLED 
  CONSTANT: SE_GROUP_OWNER 8
  CONSTANT: SE_GROUP_LOGON_ID -1073741824
  
 +CONSTANT: NTE_BAD_UID HEX: 80090001
 +CONSTANT: NTE_BAD_HASH HEX: 80090002
 +CONSTANT: NTE_BAD_KEY HEX: 80090003
 +CONSTANT: NTE_BAD_LEN HEX: 80090004
 +CONSTANT: NTE_BAD_DATA HEX: 80090005
 +CONSTANT: NTE_BAD_SIGNATURE HEX: 80090006
 +CONSTANT: NTE_BAD_VER HEX: 80090007
 +CONSTANT: NTE_BAD_ALGID HEX: 80090008
 +CONSTANT: NTE_BAD_FLAGS HEX: 80090009
 +CONSTANT: NTE_BAD_TYPE HEX: 8009000A
 +CONSTANT: NTE_BAD_KEY_STATE HEX: 8009000B
 +CONSTANT: NTE_BAD_HASH_STATE HEX: 8009000C
 +CONSTANT: NTE_NO_KEY HEX: 8009000D
 +CONSTANT: NTE_NO_MEMORY HEX: 8009000E
 +CONSTANT: NTE_EXISTS HEX: 8009000F
 +CONSTANT: NTE_PERM HEX: 80090010
 +CONSTANT: NTE_NOT_FOUND HEX: 80090011
 +CONSTANT: NTE_DOUBLE_ENCRYPT HEX: 80090012
 +CONSTANT: NTE_BAD_PROVIDER HEX: 80090013
 +CONSTANT: NTE_BAD_PROV_TYPE HEX: 80090014
 +CONSTANT: NTE_BAD_PUBLIC_KEY HEX: 80090015
 +CONSTANT: NTE_BAD_KEYSET HEX: 80090016
 +CONSTANT: NTE_PROV_TYPE_NOT_DEF HEX: 80090017
 +CONSTANT: NTE_PROV_TYPE_ENTRY_BAD HEX: 80090018
 +CONSTANT: NTE_KEYSET_NOT_DEF HEX: 80090019
 +CONSTANT: NTE_KEYSET_ENTRY_BAD HEX: 8009001A
 +CONSTANT: NTE_PROV_TYPE_NO_MATCH HEX: 8009001B
 +CONSTANT: NTE_SIGNATURE_FILE_BAD HEX: 8009001C
 +CONSTANT: NTE_PROVIDER_DLL_FAIL HEX: 8009001D
 +CONSTANT: NTE_PROV_DLL_NOT_FOUND HEX: 8009001E
 +CONSTANT: NTE_BAD_KEYSET_PARAM HEX: 8009001F
 +CONSTANT: NTE_FAIL HEX: 80090020
 +CONSTANT: NTE_SYS_ERR HEX: 80090021
 +
  ! SID is a variable length structure
  TYPEDEF: void* PSID