diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2011-04-04 16:23:36 +0400 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2011-04-04 16:23:36 +0400 |
commit | 6ce541281ec5536c550d4196d41b881d63c7b99e (patch) | |
tree | ec6823106c5ffabb513016efe855553b1fec34f6 /winsup/cygwin/wincap.cc | |
parent | 02dbd9ae87948c48970f3e2b5639606671ac4f0b (diff) |
Drop NT4 support.
* autoload.cc (DnsQuery_A): Fatal if not available.
(DnsRecordListFree): Ditto.
(DsGetDcNameW): Ditto.
(NetGetAnyDCName): Remove.
(NetGetDCName): Remove.
(EnumProcessModules): Fatal if not available.
(GetModuleFileNameExW): Ditto.
(GetModuleInformation): Ditto.
(GetProcessMemoryInfo): Ditto.
(QueryWorkingSet): Ditto.
(LsaRegisterLogonProcess): Ditto.
* fenv.cc (_feinitialise): Drop supports_sse condition.
* fhandler_disk_file.cc (path_conv::isgood_inode): Fix comment.
(fhandler_base::fstat_by_name): Drop has_fileid_dirinfo condition.
(fhandler_disk_file::opendir): Ditto.
* fhandler_netdrive.cc (fhandler_netdrive::readdir): Fix comment.
* fhandler_proc.cc (format_proc_partitions): Drop NT4-only code.
* fhandler_process.cc (get_process_state): Ditto.
* kernel32.cc (GetWindowsDirectoryW): Remove.
(GetWindowsDirectoryA): Remove.
* miscfuncs.cc (nice_to_winprio): Drop NT4-only code.
* mount.cc (fs_info::update): Fix comments.
* net.cc (get_2k_ifs): Drop NT4-only code.
* sec_auth.cc (get_logon_server): Ditto.
(lsaauth): Drop NT4-specific error handling.
* security.cc (alloc_sd): Set SE_DACL_PROTECTED unconditionally.
* select.cc (select_stuff::wait): Always use MWMO_INPUTAVAILABLE.
(peek_windows): Drop NT4-only condition in call to PeekMessage.
* syscalls.cc (gethostid): Remove NT4-only workaround.
* wincap.cc: Througout, drop has_dacl_protect,
has_broken_if_oper_status, has_process_io_counters,
has_terminal_services, has_extended_priority_class, has_guid_volumes,
has_fileid_dirinfo, has_mwmo_inputavailable and supports_sse from
wincaps.
(wincap_nt4sp4): Remove.
(wincap_minimal): Set to wincap_2000.
(wincapc::init): Rely on availability of OSVERSIONINFOEX structure.
Treat error from GetVersionEx as fatal. Treat NT4 as fatal.
* wincap.h (struct wincaps): Drop has_dacl_protect,
has_broken_if_oper_status, has_process_io_counters,
has_terminal_services, has_extended_priority_class, has_guid_volumes,
has_fileid_dirinfo, has_mwmo_inputavailable and supports_sse flags
and methods.
* winlean.h (GetWindowsDirectoryW) Define as GetSystemWindowsDirectoryW.
(GetWindowsDirectoryA): Define as GetSystemWindowsDirectoryA.
Diffstat (limited to 'winsup/cygwin/wincap.cc')
-rw-r--r-- | winsup/cygwin/wincap.cc | 133 |
1 files changed, 6 insertions, 127 deletions
diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc index ed15214a6..af1acd520 100644 --- a/winsup/cygwin/wincap.cc +++ b/winsup/cygwin/wincap.cc @@ -21,66 +21,17 @@ details. */ puzzled that this has never been noticed before... */ /* Minimal set of capabilities required to run Cygwin. */ -#define wincap_minimal wincap_nt4sp4 - -wincaps wincap_nt4sp4 __attribute__((section (".cygwin_dll_common"), shared)) = { - chunksize:0, - heapslop:0x0, - max_sys_priv:SE_CHANGE_NOTIFY_PRIVILEGE, - is_server:false, - has_dacl_protect:false, - has_broken_if_oper_status:true, - has_physical_mem_access:true, - has_process_io_counters:false, - has_terminal_services:false, - has_create_global_privilege:false, - has_ioctl_storage_get_media_types_ex:false, - has_extended_priority_class:false, - has_guid_volumes:false, - has_disk_ex_ioctls:false, - has_fileid_dirinfo:false, - has_buggy_restart_scan:false, - has_mandatory_integrity_control:false, - needs_logon_sid_in_sid_list:true, - needs_count_in_si_lpres2:false, - has_recycle_dot_bin:false, - has_gaa_prefixes:false, - has_gaa_on_link_prefix:false, - supports_all_posix_ai_flags:false, - has_restricted_stack_args:false, - has_transactions:false, - has_recvmsg:false, - has_sendmsg:false, - has_broken_udf:false, - has_console_handle_problem:false, - has_broken_alloc_console:false, - has_always_all_codepages:false, - has_localenames:false, - has_mwmo_inputavailable:false, - has_buggy_thread_startup:false, - has_fast_cwd:false, - has_restricted_raw_disk_access:false, - use_dont_resolve_hack:false, - use_get_sec_info_on_dirs:false, - supports_sse:false, -}; +#define wincap_minimal wincap_2000 wincaps wincap_2000 __attribute__((section (".cygwin_dll_common"), shared)) = { chunksize:0, heapslop:0x0, max_sys_priv:SE_MANAGE_VOLUME_PRIVILEGE, is_server:false, - has_dacl_protect:true, - has_broken_if_oper_status:false, has_physical_mem_access:true, - has_process_io_counters:true, - has_terminal_services:true, has_create_global_privilege:false, has_ioctl_storage_get_media_types_ex:false, - has_extended_priority_class:true, - has_guid_volumes:true, has_disk_ex_ioctls:false, - has_fileid_dirinfo:true, has_buggy_restart_scan:true, has_mandatory_integrity_control:false, needs_logon_sid_in_sid_list:true, @@ -98,13 +49,11 @@ wincaps wincap_2000 __attribute__((section (".cygwin_dll_common"), shared)) = { has_broken_alloc_console:false, has_always_all_codepages:false, has_localenames:false, - has_mwmo_inputavailable:true, has_buggy_thread_startup:false, has_fast_cwd:false, has_restricted_raw_disk_access:false, use_dont_resolve_hack:false, use_get_sec_info_on_dirs:false, - supports_sse:true, }; wincaps wincap_2000sp4 __attribute__((section (".cygwin_dll_common"), shared)) = { @@ -112,17 +61,10 @@ wincaps wincap_2000sp4 __attribute__((section (".cygwin_dll_common"), shared)) = heapslop:0x0, max_sys_priv:SE_CREATE_GLOBAL_PRIVILEGE, is_server:false, - has_dacl_protect:true, - has_broken_if_oper_status:false, has_physical_mem_access:true, - has_process_io_counters:true, - has_terminal_services:true, has_create_global_privilege:true, has_ioctl_storage_get_media_types_ex:false, - has_extended_priority_class:true, - has_guid_volumes:true, has_disk_ex_ioctls:false, - has_fileid_dirinfo:true, has_buggy_restart_scan:true, has_mandatory_integrity_control:false, needs_logon_sid_in_sid_list:true, @@ -140,13 +82,11 @@ wincaps wincap_2000sp4 __attribute__((section (".cygwin_dll_common"), shared)) = has_broken_alloc_console:false, has_always_all_codepages:false, has_localenames:false, - has_mwmo_inputavailable:true, has_buggy_thread_startup:false, has_fast_cwd:false, has_restricted_raw_disk_access:false, use_dont_resolve_hack:false, use_get_sec_info_on_dirs:false, - supports_sse:true, }; wincaps wincap_xp __attribute__((section (".cygwin_dll_common"), shared)) = { @@ -154,17 +94,10 @@ wincaps wincap_xp __attribute__((section (".cygwin_dll_common"), shared)) = { heapslop:0x0, max_sys_priv:SE_MANAGE_VOLUME_PRIVILEGE, is_server:false, - has_dacl_protect:true, - has_broken_if_oper_status:false, has_physical_mem_access:true, - has_process_io_counters:true, - has_terminal_services:true, has_create_global_privilege:false, has_ioctl_storage_get_media_types_ex:true, - has_extended_priority_class:true, - has_guid_volumes:true, has_disk_ex_ioctls:true, - has_fileid_dirinfo:true, has_buggy_restart_scan:false, has_mandatory_integrity_control:false, needs_logon_sid_in_sid_list:false, @@ -182,13 +115,11 @@ wincaps wincap_xp __attribute__((section (".cygwin_dll_common"), shared)) = { has_broken_alloc_console:false, has_always_all_codepages:false, has_localenames:false, - has_mwmo_inputavailable:true, has_buggy_thread_startup:false, has_fast_cwd:false, has_restricted_raw_disk_access:false, use_dont_resolve_hack:true, use_get_sec_info_on_dirs:true, - supports_sse:true, }; wincaps wincap_xpsp1 __attribute__((section (".cygwin_dll_common"), shared)) = { @@ -196,17 +127,10 @@ wincaps wincap_xpsp1 __attribute__((section (".cygwin_dll_common"), shared)) = { heapslop:0x0, max_sys_priv:SE_MANAGE_VOLUME_PRIVILEGE, is_server:false, - has_dacl_protect:true, - has_broken_if_oper_status:false, has_physical_mem_access:true, - has_process_io_counters:true, - has_terminal_services:true, has_create_global_privilege:false, has_ioctl_storage_get_media_types_ex:true, - has_extended_priority_class:true, - has_guid_volumes:true, has_disk_ex_ioctls:true, - has_fileid_dirinfo:true, has_buggy_restart_scan:false, has_mandatory_integrity_control:false, needs_logon_sid_in_sid_list:false, @@ -224,13 +148,11 @@ wincaps wincap_xpsp1 __attribute__((section (".cygwin_dll_common"), shared)) = { has_broken_alloc_console:false, has_always_all_codepages:false, has_localenames:false, - has_mwmo_inputavailable:true, has_buggy_thread_startup:false, has_fast_cwd:false, has_restricted_raw_disk_access:false, use_dont_resolve_hack:true, use_get_sec_info_on_dirs:true, - supports_sse:true, }; wincaps wincap_xpsp2 __attribute__((section (".cygwin_dll_common"), shared)) = { @@ -238,17 +160,10 @@ wincaps wincap_xpsp2 __attribute__((section (".cygwin_dll_common"), shared)) = { heapslop:0x0, max_sys_priv:SE_CREATE_GLOBAL_PRIVILEGE, is_server:false, - has_dacl_protect:true, - has_broken_if_oper_status:false, has_physical_mem_access:true, - has_process_io_counters:true, - has_terminal_services:true, has_create_global_privilege:true, has_ioctl_storage_get_media_types_ex:true, - has_extended_priority_class:true, - has_guid_volumes:true, has_disk_ex_ioctls:true, - has_fileid_dirinfo:true, has_buggy_restart_scan:false, has_mandatory_integrity_control:false, needs_logon_sid_in_sid_list:false, @@ -266,13 +181,11 @@ wincaps wincap_xpsp2 __attribute__((section (".cygwin_dll_common"), shared)) = { has_broken_alloc_console:false, has_always_all_codepages:false, has_localenames:false, - has_mwmo_inputavailable:true, has_buggy_thread_startup:false, has_fast_cwd:false, has_restricted_raw_disk_access:false, use_dont_resolve_hack:true, use_get_sec_info_on_dirs:true, - supports_sse:true, }; wincaps wincap_2003 __attribute__((section (".cygwin_dll_common"), shared)) = { @@ -280,17 +193,10 @@ wincaps wincap_2003 __attribute__((section (".cygwin_dll_common"), shared)) = { heapslop:0x4, max_sys_priv:SE_CREATE_GLOBAL_PRIVILEGE, is_server:true, - has_dacl_protect:true, - has_broken_if_oper_status:false, has_physical_mem_access:false, - has_process_io_counters:true, - has_terminal_services:true, has_create_global_privilege:true, has_ioctl_storage_get_media_types_ex:true, - has_extended_priority_class:true, - has_guid_volumes:true, has_disk_ex_ioctls:true, - has_fileid_dirinfo:true, has_buggy_restart_scan:false, has_mandatory_integrity_control:false, needs_logon_sid_in_sid_list:false, @@ -308,13 +214,11 @@ wincaps wincap_2003 __attribute__((section (".cygwin_dll_common"), shared)) = { has_broken_alloc_console:false, has_always_all_codepages:false, has_localenames:false, - has_mwmo_inputavailable:true, has_buggy_thread_startup:false, has_fast_cwd:false, has_restricted_raw_disk_access:false, use_dont_resolve_hack:true, use_get_sec_info_on_dirs:true, - supports_sse:true, }; wincaps wincap_vista __attribute__((section (".cygwin_dll_common"), shared)) = { @@ -322,17 +226,10 @@ wincaps wincap_vista __attribute__((section (".cygwin_dll_common"), shared)) = { heapslop:0x4, max_sys_priv:SE_CREATE_SYMBOLIC_LINK_PRIVILEGE, is_server:false, - has_dacl_protect:true, - has_broken_if_oper_status:false, has_physical_mem_access:false, - has_process_io_counters:true, - has_terminal_services:true, has_create_global_privilege:true, has_ioctl_storage_get_media_types_ex:true, - has_extended_priority_class:true, - has_guid_volumes:true, has_disk_ex_ioctls:true, - has_fileid_dirinfo:true, has_buggy_restart_scan:false, has_mandatory_integrity_control:true, needs_logon_sid_in_sid_list:false, @@ -350,13 +247,11 @@ wincaps wincap_vista __attribute__((section (".cygwin_dll_common"), shared)) = { has_broken_alloc_console:false, has_always_all_codepages:true, has_localenames:true, - has_mwmo_inputavailable:true, has_buggy_thread_startup:true, has_fast_cwd:true, has_restricted_raw_disk_access:true, use_dont_resolve_hack:false, use_get_sec_info_on_dirs:false, - supports_sse:true, }; wincaps wincap_7 __attribute__((section (".cygwin_dll_common"), shared)) = { @@ -364,17 +259,10 @@ wincaps wincap_7 __attribute__((section (".cygwin_dll_common"), shared)) = { heapslop:0x4, max_sys_priv:SE_CREATE_SYMBOLIC_LINK_PRIVILEGE, is_server:false, - has_dacl_protect:true, - has_broken_if_oper_status:false, has_physical_mem_access:false, - has_process_io_counters:true, - has_terminal_services:true, has_create_global_privilege:true, has_ioctl_storage_get_media_types_ex:true, - has_extended_priority_class:true, - has_guid_volumes:true, has_disk_ex_ioctls:true, - has_fileid_dirinfo:true, has_buggy_restart_scan:false, has_mandatory_integrity_control:true, needs_logon_sid_in_sid_list:false, @@ -392,13 +280,11 @@ wincaps wincap_7 __attribute__((section (".cygwin_dll_common"), shared)) = { has_broken_alloc_console:true, has_always_all_codepages:true, has_localenames:true, - has_mwmo_inputavailable:true, has_buggy_thread_startup:false, has_fast_cwd:true, has_restricted_raw_disk_access:true, use_dont_resolve_hack:false, use_get_sec_info_on_dirs:false, - supports_sse:true, }; wincapc wincap __attribute__((section (".cygwin_dll_common"), shared)); @@ -406,21 +292,13 @@ wincapc wincap __attribute__((section (".cygwin_dll_common"), shared)); void wincapc::init () { - bool has_osversioninfoex = true; - if (caps) return; // already initialized memset (&version, 0, sizeof version); - /* Request versionex info first, which is available on all systems since - NT4 SP6 anyway. If that fails, call the simple version. */ version.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX); if (!GetVersionEx (reinterpret_cast<LPOSVERSIONINFO>(&version))) - { - has_osversioninfoex = false; - version.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); - GetVersionEx (reinterpret_cast<LPOSVERSIONINFO>(&version)); - } + api_fatal ("Cygwin requires at least Windows 2000."); switch (version.dwPlatformId) { @@ -428,8 +306,9 @@ wincapc::init () switch (version.dwMajorVersion) { case 4: - /* No mercy. We require at least NT4 SP4. */ - caps = &wincap_nt4sp4; + /* I'd be very surprised if this code is ever hit, but it doesn't + hurt to keep it. */ + api_fatal ("Cygwin requires at least Windows 2000."); break; case 5: switch (version.dwMinorVersion) @@ -484,7 +363,7 @@ wincapc::init () break; } - if (has_osversioninfoex && version.wProductType != VER_NT_WORKSTATION) + if (version.wProductType != VER_NT_WORKSTATION) ((wincaps *)caps)->is_server = true; if (NT_SUCCESS (NtQueryInformationProcess (NtCurrentProcess (), ProcessWow64Information, |