Browse code

pkg/system: deprecate constants in favor of golang.org/x/sys/windows

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/11/25 23:39:05
Showing 1 changed files
... ...
@@ -10,36 +10,36 @@ import (
10 10
 )
11 11
 
12 12
 const (
13
-	OWNER_SECURITY_INFORMATION               = 0x00000001
14
-	GROUP_SECURITY_INFORMATION               = 0x00000002
15
-	DACL_SECURITY_INFORMATION                = 0x00000004
16
-	SACL_SECURITY_INFORMATION                = 0x00000008
17
-	LABEL_SECURITY_INFORMATION               = 0x00000010
18
-	ATTRIBUTE_SECURITY_INFORMATION           = 0x00000020
19
-	SCOPE_SECURITY_INFORMATION               = 0x00000040
13
+	OWNER_SECURITY_INFORMATION               = windows.OWNER_SECURITY_INFORMATION     // Deprecated: use golang.org/x/sys/windows.OWNER_SECURITY_INFORMATION
14
+	GROUP_SECURITY_INFORMATION               = windows.GROUP_SECURITY_INFORMATION     // Deprecated: use golang.org/x/sys/windows.GROUP_SECURITY_INFORMATION
15
+	DACL_SECURITY_INFORMATION                = windows.DACL_SECURITY_INFORMATION      // Deprecated: use golang.org/x/sys/windows.DACL_SECURITY_INFORMATION
16
+	SACL_SECURITY_INFORMATION                = windows.SACL_SECURITY_INFORMATION      // Deprecated: use golang.org/x/sys/windows.SACL_SECURITY_INFORMATION
17
+	LABEL_SECURITY_INFORMATION               = windows.LABEL_SECURITY_INFORMATION     // Deprecated: use golang.org/x/sys/windows.LABEL_SECURITY_INFORMATION
18
+	ATTRIBUTE_SECURITY_INFORMATION           = windows.ATTRIBUTE_SECURITY_INFORMATION // Deprecated: use golang.org/x/sys/windows.ATTRIBUTE_SECURITY_INFORMATION
19
+	SCOPE_SECURITY_INFORMATION               = windows.SCOPE_SECURITY_INFORMATION     // Deprecated: use golang.org/x/sys/windows.SCOPE_SECURITY_INFORMATION
20 20
 	PROCESS_TRUST_LABEL_SECURITY_INFORMATION = 0x00000080
21 21
 	ACCESS_FILTER_SECURITY_INFORMATION       = 0x00000100
22
-	BACKUP_SECURITY_INFORMATION              = 0x00010000
23
-	PROTECTED_DACL_SECURITY_INFORMATION      = 0x80000000
24
-	PROTECTED_SACL_SECURITY_INFORMATION      = 0x40000000
25
-	UNPROTECTED_DACL_SECURITY_INFORMATION    = 0x20000000
26
-	UNPROTECTED_SACL_SECURITY_INFORMATION    = 0x10000000
22
+	BACKUP_SECURITY_INFORMATION              = windows.BACKUP_SECURITY_INFORMATION           // Deprecated: use golang.org/x/sys/windows.BACKUP_SECURITY_INFORMATION
23
+	PROTECTED_DACL_SECURITY_INFORMATION      = windows.PROTECTED_DACL_SECURITY_INFORMATION   // Deprecated: use golang.org/x/sys/windows.PROTECTED_DACL_SECURITY_INFORMATION
24
+	PROTECTED_SACL_SECURITY_INFORMATION      = windows.PROTECTED_SACL_SECURITY_INFORMATION   // Deprecated: use golang.org/x/sys/windows.PROTECTED_SACL_SECURITY_INFORMATION
25
+	UNPROTECTED_DACL_SECURITY_INFORMATION    = windows.UNPROTECTED_DACL_SECURITY_INFORMATION // Deprecated: use golang.org/x/sys/windows.UNPROTECTED_DACL_SECURITY_INFORMATION
26
+	UNPROTECTED_SACL_SECURITY_INFORMATION    = windows.UNPROTECTED_SACL_SECURITY_INFORMATION // Deprecated: use golang.org/x/sys/windows.UNPROTECTED_SACL_SECURITY_INFORMATION
27 27
 )
28 28
 
29 29
 const (
30
-	SE_UNKNOWN_OBJECT_TYPE = iota
31
-	SE_FILE_OBJECT
32
-	SE_SERVICE
33
-	SE_PRINTER
34
-	SE_REGISTRY_KEY
35
-	SE_LMSHARE
36
-	SE_KERNEL_OBJECT
37
-	SE_WINDOW_OBJECT
38
-	SE_DS_OBJECT
39
-	SE_DS_OBJECT_ALL
40
-	SE_PROVIDER_DEFINED_OBJECT
41
-	SE_WMIGUID_OBJECT
42
-	SE_REGISTRY_WOW64_32KEY
30
+	SE_UNKNOWN_OBJECT_TYPE     = windows.SE_UNKNOWN_OBJECT_TYPE     // Deprecated: use golang.org/x/sys/windows.SE_UNKNOWN_OBJECT_TYPE
31
+	SE_FILE_OBJECT             = windows.SE_FILE_OBJECT             // Deprecated: use golang.org/x/sys/windows.SE_FILE_OBJECT
32
+	SE_SERVICE                 = windows.SE_SERVICE                 // Deprecated: use golang.org/x/sys/windows.SE_SERVICE
33
+	SE_PRINTER                 = windows.SE_PRINTER                 // Deprecated: use golang.org/x/sys/windows.SE_PRINTER
34
+	SE_REGISTRY_KEY            = windows.SE_REGISTRY_KEY            // Deprecated: use golang.org/x/sys/windows.SE_REGISTRY_KEY
35
+	SE_LMSHARE                 = windows.SE_LMSHARE                 // Deprecated: use golang.org/x/sys/windows.SE_LMSHARE
36
+	SE_KERNEL_OBJECT           = windows.SE_KERNEL_OBJECT           // Deprecated: use golang.org/x/sys/windows.SE_KERNEL_OBJECT
37
+	SE_WINDOW_OBJECT           = windows.SE_WINDOW_OBJECT           // Deprecated: use golang.org/x/sys/windows.SE_WINDOW_OBJECT
38
+	SE_DS_OBJECT               = windows.SE_DS_OBJECT               // Deprecated: use golang.org/x/sys/windows.SE_DS_OBJECT
39
+	SE_DS_OBJECT_ALL           = windows.SE_DS_OBJECT_ALL           // Deprecated: use golang.org/x/sys/windows.SE_DS_OBJECT_ALL
40
+	SE_PROVIDER_DEFINED_OBJECT = windows.SE_PROVIDER_DEFINED_OBJECT // Deprecated: use golang.org/x/sys/windows.SE_PROVIDER_DEFINED_OBJECT
41
+	SE_WMIGUID_OBJECT          = windows.SE_WMIGUID_OBJECT          // Deprecated: use golang.org/x/sys/windows.SE_WMIGUID_OBJECT
42
+	SE_REGISTRY_WOW64_32KEY    = windows.SE_REGISTRY_WOW64_32KEY    // Deprecated: use golang.org/x/sys/windows.SE_REGISTRY_WOW64_32KEY
43 43
 )
44 44
 
45 45
 const (
... ...
@@ -64,6 +64,7 @@ var (
64 64
 type OSVersion = osversion.OSVersion
65 65
 
66 66
 // https://msdn.microsoft.com/en-us/library/windows/desktop/ms724833(v=vs.85).aspx
67
+// TODO: use golang.org/x/sys/windows.OsVersionInfoEx (needs OSVersionInfoSize to be exported)
67 68
 type osVersionInfoEx struct {
68 69
 	OSVersionInfoSize uint32
69 70
 	MajorVersion      uint32