@@ -19,42 +19,41 @@ mod _winapi {
1919use windows_sys:: Win32 :: Foundation :: { BOOL , HANDLE as RAW_HANDLE } ;
2020
2121#[ pyattr]
22- use winapi:: {
23- shared:: winerror:: {
24- ERROR_ALREADY_EXISTS , ERROR_BROKEN_PIPE , ERROR_IO_PENDING , ERROR_MORE_DATA ,
25- ERROR_NETNAME_DELETED , ERROR_NO_DATA , ERROR_NO_SYSTEM_RESOURCES ,
26- ERROR_OPERATION_ABORTED , ERROR_PIPE_BUSY , ERROR_PIPE_CONNECTED , ERROR_SEM_TIMEOUT ,
27- WAIT_TIMEOUT ,
22+ use windows_sys:: Win32 :: {
23+ Foundation :: {
24+ DUPLICATE_CLOSE_SOURCE , DUPLICATE_SAME_ACCESS , ERROR_ALREADY_EXISTS , ERROR_BROKEN_PIPE ,
25+ ERROR_IO_PENDING , ERROR_MORE_DATA , ERROR_NETNAME_DELETED , ERROR_NO_DATA ,
26+ ERROR_NO_SYSTEM_RESOURCES , ERROR_OPERATION_ABORTED , ERROR_PIPE_BUSY ,
27+ ERROR_PIPE_CONNECTED , ERROR_SEM_TIMEOUT , GENERIC_READ , GENERIC_WRITE , STILL_ACTIVE ,
28+ WAIT_ABANDONED , WAIT_ABANDONED_0 , WAIT_OBJECT_0 , WAIT_TIMEOUT ,
2829} ,
29- um:: {
30- fileapi:: OPEN_EXISTING ,
31- memoryapi:: {
32- FILE_MAP_ALL_ACCESS , FILE_MAP_COPY , FILE_MAP_EXECUTE , FILE_MAP_READ , FILE_MAP_WRITE ,
30+ Storage :: FileSystem :: {
31+ FILE_FLAG_FIRST_PIPE_INSTANCE , FILE_FLAG_OVERLAPPED , FILE_GENERIC_READ ,
32+ FILE_GENERIC_WRITE , FILE_TYPE_CHAR , FILE_TYPE_DISK , FILE_TYPE_PIPE , FILE_TYPE_REMOTE ,
33+ FILE_TYPE_UNKNOWN , OPEN_EXISTING , PIPE_ACCESS_DUPLEX , PIPE_ACCESS_INBOUND , SYNCHRONIZE ,
34+ } ,
35+ System :: {
36+ Console :: { STD_ERROR_HANDLE , STD_INPUT_HANDLE , STD_OUTPUT_HANDLE } ,
37+ Memory :: {
38+ FILE_MAP_ALL_ACCESS , MEM_COMMIT , MEM_FREE , MEM_IMAGE , MEM_MAPPED , MEM_PRIVATE ,
39+ MEM_RESERVE , PAGE_EXECUTE , PAGE_EXECUTE_READ , PAGE_EXECUTE_READWRITE ,
40+ PAGE_EXECUTE_WRITECOPY , PAGE_GUARD , PAGE_NOACCESS , PAGE_NOCACHE , PAGE_READONLY ,
41+ PAGE_READWRITE , PAGE_WRITECOMBINE , PAGE_WRITECOPY , SEC_COMMIT , SEC_IMAGE ,
42+ SEC_LARGE_PAGES , SEC_NOCACHE , SEC_RESERVE , SEC_WRITECOMBINE ,
43+ } ,
44+ Pipes :: {
45+ PIPE_READMODE_MESSAGE , PIPE_TYPE_MESSAGE , PIPE_UNLIMITED_INSTANCES , PIPE_WAIT ,
3346} ,
34- minwinbase :: STILL_ACTIVE ,
35- winbase :: {
47+ SystemServices :: LOCALE_NAME_MAX_LENGTH ,
48+ Threading :: {
3649ABOVE_NORMAL_PRIORITY_CLASS , BELOW_NORMAL_PRIORITY_CLASS ,
3750CREATE_BREAKAWAY_FROM_JOB , CREATE_DEFAULT_ERROR_MODE , CREATE_NEW_CONSOLE ,
38- CREATE_NEW_PROCESS_GROUP , CREATE_NO_WINDOW , DETACHED_PROCESS ,
39- FILE_FLAG_FIRST_PIPE_INSTANCE , FILE_FLAG_OVERLAPPED , FILE_TYPE_CHAR ,
40- FILE_TYPE_DISK , FILE_TYPE_PIPE , FILE_TYPE_REMOTE , FILE_TYPE_UNKNOWN ,
41- HIGH_PRIORITY_CLASS , IDLE_PRIORITY_CLASS , INFINITE , NORMAL_PRIORITY_CLASS ,
42- PIPE_ACCESS_DUPLEX , PIPE_ACCESS_INBOUND , PIPE_READMODE_MESSAGE , PIPE_TYPE_MESSAGE ,
43- PIPE_UNLIMITED_INSTANCES , PIPE_WAIT , REALTIME_PRIORITY_CLASS , STARTF_USESHOWWINDOW ,
44- STARTF_USESTDHANDLES , STD_ERROR_HANDLE , STD_INPUT_HANDLE , STD_OUTPUT_HANDLE ,
45- WAIT_ABANDONED , WAIT_ABANDONED_0 , WAIT_OBJECT_0 ,
46- } ,
47- winnt:: {
48- DUPLICATE_CLOSE_SOURCE , DUPLICATE_SAME_ACCESS , FILE_GENERIC_READ ,
49- FILE_GENERIC_WRITE , GENERIC_READ , GENERIC_WRITE , LOCALE_NAME_MAX_LENGTH ,
50- MEM_COMMIT , MEM_FREE , MEM_IMAGE , MEM_MAPPED , MEM_PRIVATE , MEM_RESERVE ,
51- PAGE_EXECUTE , PAGE_EXECUTE_READ , PAGE_EXECUTE_READWRITE , PAGE_EXECUTE_WRITECOPY ,
52- PAGE_GUARD , PAGE_NOACCESS , PAGE_NOCACHE , PAGE_READONLY , PAGE_READWRITE ,
53- PAGE_WRITECOMBINE , PAGE_WRITECOPY , PROCESS_DUP_HANDLE , SEC_COMMIT , SEC_IMAGE ,
54- SEC_LARGE_PAGES , SEC_NOCACHE , SEC_RESERVE , SEC_WRITECOMBINE , SYNCHRONIZE ,
51+ CREATE_NEW_PROCESS_GROUP , CREATE_NO_WINDOW , DETACHED_PROCESS , HIGH_PRIORITY_CLASS ,
52+ IDLE_PRIORITY_CLASS , INFINITE , NORMAL_PRIORITY_CLASS , PROCESS_DUP_HANDLE ,
53+ REALTIME_PRIORITY_CLASS , STARTF_USESHOWWINDOW , STARTF_USESTDHANDLES ,
5554} ,
56- winuser:: SW_HIDE ,
5755} ,
56+ UI :: WindowsAndMessaging :: SW_HIDE ,
5857} ;
5958
6059fn GetLastError ( ) ->u32 {