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/kernel32.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/kernel32.cc')
-rw-r--r-- | winsup/cygwin/kernel32.cc | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/winsup/cygwin/kernel32.cc b/winsup/cygwin/kernel32.cc index f8fd728cd..fd25358aa 100644 --- a/winsup/cygwin/kernel32.cc +++ b/winsup/cygwin/kernel32.cc @@ -1,6 +1,6 @@ /* kernel32.cc: Win32 replacement functions. - Copyright 2008, 2010 Red Hat, Inc. + Copyright 2008, 2010, 2011 Red Hat, Inc. This file is part of Cygwin. @@ -403,37 +403,3 @@ OpenFileMappingA (DWORD dwDesiredAccess, BOOL bInheritHandle, LPCSTR lpName) } return OpenFileMappingW (dwDesiredAccess, bInheritHandle, lpName ? name : NULL); } - -/* When Terminal Services are installed, the GetWindowsDirectory function - does not return the system installation dir, but a user specific directory - instead. That's not what we have in mind when calling GetWindowsDirectory - from within Cygwin. So we're calling GetSystemWindowsDirectory from here, - except on NT4 where we use the method as described in KB186498. */ - -#define SYSTEM32 (sizeof ("\\System32") - 1) - -UINT WINAPI -GetWindowsDirectoryW (LPWSTR buf, UINT size) -{ - if (wincap.has_terminal_services ()) - return GetSystemWindowsDirectoryW (buf, size); - /* NT4 */ - WCHAR name [size + SYSTEM32]; - UINT ret = GetSystemDirectoryW (name, size + SYSTEM32); - if (ret < size + SYSTEM32) - { - name[ret - SYSTEM32] = L'\0'; - wcscpy (buf, name); - } - return ret - SYSTEM32; -} - -UINT WINAPI -GetWindowsDirectoryA (LPSTR buf, UINT size) -{ - WCHAR name[MAX_PATH]; - UINT ret = GetWindowsDirectoryW (name, min (size, MAX_PATH)); - if (ret < size) - sys_wcstombs (buf, size, name); - return ret; -} |