* Merge in cygwin-64bit-branch.

1 files changed, 11 insertions, 212 deletions

diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc
index 30c4eb908..9964467e3 100644
--- a/winsup/cygwin/wincap.cc
+++ b/winsup/cygwin/wincap.cc
@@ -21,185 +21,32 @@ details. */
    puzzled that this has never been noticed before... */
 
 /* Minimal set of capabilities required to run Cygwin. */
-#define wincap_minimal wincap_2000
-
-wincaps wincap_2000 __attribute__((section (".cygwin_dll_common"), shared)) = {
-  max_sys_priv:SE_MANAGE_VOLUME_PRIVILEGE,
-  is_server:false,
-  has_physical_mem_access:true,
-  has_create_global_privilege:false,
-  has_ioctl_storage_get_media_types_ex:false,
-  has_disk_ex_ioctls:false,
-  has_buggy_restart_scan:true,
-  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,
-  has_gaa_largeaddress_bug:false,
-  supports_all_posix_ai_flags:false,
-  has_restricted_stack_args:false,
-  has_transactions:false,
-  has_recvmsg:false,
-  has_sendmsg:false,
-  has_broken_udf:true,
-  has_console_handle_problem:false,
-  has_broken_alloc_console:false,
-  has_always_all_codepages:false,
-  has_localenames:false,
-  has_fast_cwd:false,
-  has_restricted_raw_disk_access:false,
-  use_dont_resolve_hack:false,
-  has_stack_size_param_is_a_reservation:false,
-  has_console_logon_sid:false,
-  wow64_has_secondary_stack:false,
-  has_program_compatibility_assistant:false,
-  kernel_is_always_casesensitive:true,
-  terminate_thread_frees_stack:false,
-};
-
-wincaps wincap_2000sp4 __attribute__((section (".cygwin_dll_common"), shared)) = {
-  max_sys_priv:SE_CREATE_GLOBAL_PRIVILEGE,
-  is_server:false,
-  has_physical_mem_access:true,
-  has_create_global_privilege:true,
-  has_ioctl_storage_get_media_types_ex:false,
-  has_disk_ex_ioctls:false,
-  has_buggy_restart_scan:true,
-  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,
-  has_gaa_largeaddress_bug:false,
-  supports_all_posix_ai_flags:false,
-  has_restricted_stack_args:false,
-  has_transactions:false,
-  has_recvmsg:false,
-  has_sendmsg:false,
-  has_broken_udf:true,
-  has_console_handle_problem:false,
-  has_broken_alloc_console:false,
-  has_always_all_codepages:false,
-  has_localenames:false,
-  has_fast_cwd:false,
-  has_restricted_raw_disk_access:false,
-  use_dont_resolve_hack:false,
-  has_stack_size_param_is_a_reservation:false,
-  has_console_logon_sid:false,
-  wow64_has_secondary_stack:false,
-  has_program_compatibility_assistant:false,
-  kernel_is_always_casesensitive:true,
-  terminate_thread_frees_stack:false,
-};
-
-wincaps wincap_xp __attribute__((section (".cygwin_dll_common"), shared)) = {
-  max_sys_priv:SE_MANAGE_VOLUME_PRIVILEGE,
-  is_server:false,
-  has_physical_mem_access:true,
-  has_create_global_privilege:false,
-  has_ioctl_storage_get_media_types_ex:true,
-  has_disk_ex_ioctls:true,
-  has_buggy_restart_scan:false,
-  has_mandatory_integrity_control:false,
-  needs_logon_sid_in_sid_list:false,
-  needs_count_in_si_lpres2:false,
-  has_recycle_dot_bin:false,
-  has_gaa_prefixes:false,
-  has_gaa_on_link_prefix:false,
-  has_gaa_largeaddress_bug:false,
-  supports_all_posix_ai_flags:false,
-  has_restricted_stack_args:false,
-  has_transactions:false,
-  has_recvmsg:true,
-  has_sendmsg:false,
-  has_broken_udf:true,
-  has_console_handle_problem:false,
-  has_broken_alloc_console:false,
-  has_always_all_codepages:false,
-  has_localenames:false,
-  has_fast_cwd:false,
-  has_restricted_raw_disk_access:false,
-  use_dont_resolve_hack:true,
-  has_stack_size_param_is_a_reservation:true,
-  has_console_logon_sid:false,
-  wow64_has_secondary_stack:false,
-  has_program_compatibility_assistant:false,
-  kernel_is_always_casesensitive:false,
-  terminate_thread_frees_stack:false,
-};
-
-wincaps wincap_xpsp1 __attribute__((section (".cygwin_dll_common"), shared)) = {
-  max_sys_priv:SE_MANAGE_VOLUME_PRIVILEGE,
-  is_server:false,
-  has_physical_mem_access:true,
-  has_create_global_privilege:false,
-  has_ioctl_storage_get_media_types_ex:true,
-  has_disk_ex_ioctls:true,
-  has_buggy_restart_scan:false,
-  has_mandatory_integrity_control:false,
-  needs_logon_sid_in_sid_list:false,
-  needs_count_in_si_lpres2:false,
-  has_recycle_dot_bin:false,
-  has_gaa_prefixes:true,
-  has_gaa_on_link_prefix:false,
-  has_gaa_largeaddress_bug:false,
-  supports_all_posix_ai_flags:false,
-  has_restricted_stack_args:false,
-  has_transactions:false,
-  has_recvmsg:true,
-  has_sendmsg:false,
-  has_broken_udf:true,
-  has_console_handle_problem:false,
-  has_broken_alloc_console:false,
-  has_always_all_codepages:false,
-  has_localenames:false,
-  has_fast_cwd:false,
-  has_restricted_raw_disk_access:false,
-  use_dont_resolve_hack:true,
-  has_stack_size_param_is_a_reservation:true,
-  has_console_logon_sid:false,
-  wow64_has_secondary_stack:false,
-  has_program_compatibility_assistant:false,
-  kernel_is_always_casesensitive:false,
-  terminate_thread_frees_stack:false,
-};
+#define wincap_minimal wincap_xpsp2
 
 wincaps wincap_xpsp2 __attribute__((section (".cygwin_dll_common"), shared)) = {
   max_sys_priv:SE_CREATE_GLOBAL_PRIVILEGE,
   is_server:false,
   has_physical_mem_access:true,
-  has_create_global_privilege:true,
-  has_ioctl_storage_get_media_types_ex:true,
-  has_disk_ex_ioctls:true,
-  has_buggy_restart_scan:false,
   has_mandatory_integrity_control:false,
-  needs_logon_sid_in_sid_list:false,
   needs_count_in_si_lpres2:false,
   has_recycle_dot_bin:false,
-  has_gaa_prefixes:true,
   has_gaa_on_link_prefix:false,
   has_gaa_largeaddress_bug:false,
   supports_all_posix_ai_flags:false,
   has_restricted_stack_args:false,
   has_transactions:false,
-  has_recvmsg:true,
   has_sendmsg:false,
   has_broken_udf:true,
-  has_console_handle_problem:false,
   has_broken_alloc_console:false,
   has_always_all_codepages:false,
   has_localenames:false,
   has_fast_cwd:false,
   has_restricted_raw_disk_access:false,
   use_dont_resolve_hack:true,
-  has_stack_size_param_is_a_reservation:true,
   has_console_logon_sid:false,
   wow64_has_secondary_stack:false,
   has_program_compatibility_assistant:false,
-  kernel_is_always_casesensitive:false,
+  has_pipe_reject_remote_clients:false,
   terminate_thread_frees_stack:false,
 };
 
@@ -207,35 +54,26 @@ wincaps wincap_2003 __attribute__((section (".cygwin_dll_common"), shared)) = {
   max_sys_priv:SE_CREATE_GLOBAL_PRIVILEGE,
   is_server:false,
   has_physical_mem_access:false,
-  has_create_global_privilege:true,
-  has_ioctl_storage_get_media_types_ex:true,
-  has_disk_ex_ioctls:true,
-  has_buggy_restart_scan:false,
   has_mandatory_integrity_control:false,
-  needs_logon_sid_in_sid_list:false,
   needs_count_in_si_lpres2:false,
   has_recycle_dot_bin:false,
-  has_gaa_prefixes:true,
   has_gaa_on_link_prefix:false,
   has_gaa_largeaddress_bug:false,
   supports_all_posix_ai_flags:false,
   has_restricted_stack_args:true,
   has_transactions:false,
-  has_recvmsg:true,
   has_sendmsg:false,
   has_broken_udf:true,
-  has_console_handle_problem:false,
   has_broken_alloc_console:false,
   has_always_all_codepages:false,
   has_localenames:false,
   has_fast_cwd:false,
   has_restricted_raw_disk_access:false,
   use_dont_resolve_hack:true,
-  has_stack_size_param_is_a_reservation:true,
   has_console_logon_sid:false,
   wow64_has_secondary_stack:true,
   has_program_compatibility_assistant:false,
-  kernel_is_always_casesensitive:false,
+  has_pipe_reject_remote_clients:false,
   terminate_thread_frees_stack:false,
 };
 
@@ -243,35 +81,26 @@ wincaps wincap_vista __attribute__((section (".cygwin_dll_common"), shared)) = {
   max_sys_priv:SE_CREATE_SYMBOLIC_LINK_PRIVILEGE,
   is_server:false,
   has_physical_mem_access:false,
-  has_create_global_privilege:true,
-  has_ioctl_storage_get_media_types_ex:true,
-  has_disk_ex_ioctls:true,
-  has_buggy_restart_scan:false,
   has_mandatory_integrity_control:true,
-  needs_logon_sid_in_sid_list:false,
   needs_count_in_si_lpres2:true,
   has_recycle_dot_bin:true,
-  has_gaa_prefixes:true,
   has_gaa_on_link_prefix:true,
   has_gaa_largeaddress_bug:true,
   supports_all_posix_ai_flags:true,
   has_restricted_stack_args:false,
   has_transactions:true,
-  has_recvmsg:true,
   has_sendmsg:true,
   has_broken_udf:false,
-  has_console_handle_problem:false,
   has_broken_alloc_console:false,
   has_always_all_codepages:true,
   has_localenames:true,
   has_fast_cwd:true,
   has_restricted_raw_disk_access:true,
   use_dont_resolve_hack:false,
-  has_stack_size_param_is_a_reservation:true,
   has_console_logon_sid:false,
   wow64_has_secondary_stack:false,
   has_program_compatibility_assistant:true,
-  kernel_is_always_casesensitive:false,
+  has_pipe_reject_remote_clients:true,
   terminate_thread_frees_stack:true,
 };
 
@@ -279,35 +108,26 @@ wincaps wincap_7 __attribute__((section (".cygwin_dll_common"), shared)) = {
   max_sys_priv:SE_CREATE_SYMBOLIC_LINK_PRIVILEGE,
   is_server:false,
   has_physical_mem_access:false,
-  has_create_global_privilege:true,
-  has_ioctl_storage_get_media_types_ex:true,
-  has_disk_ex_ioctls:true,
-  has_buggy_restart_scan:false,
   has_mandatory_integrity_control:true,
-  needs_logon_sid_in_sid_list:false,
   needs_count_in_si_lpres2:false,
   has_recycle_dot_bin:true,
-  has_gaa_prefixes:true,
   has_gaa_on_link_prefix:true,
   has_gaa_largeaddress_bug:true,
   supports_all_posix_ai_flags:true,
   has_restricted_stack_args:false,
   has_transactions:true,
-  has_recvmsg:true,
   has_sendmsg:true,
   has_broken_udf:false,
-  has_console_handle_problem:true,
   has_broken_alloc_console:true,
   has_always_all_codepages:true,
   has_localenames:true,
   has_fast_cwd:true,
   has_restricted_raw_disk_access:true,
   use_dont_resolve_hack:false,
-  has_stack_size_param_is_a_reservation:true,
   has_console_logon_sid:true,
   wow64_has_secondary_stack:false,
   has_program_compatibility_assistant:true,
-  kernel_is_always_casesensitive:false,
+  has_pipe_reject_remote_clients:true,
   terminate_thread_frees_stack:true,
 };
 
@@ -315,35 +135,26 @@ wincaps wincap_8 __attribute__((section (".cygwin_dll_common"), shared)) = {
   max_sys_priv:SE_CREATE_SYMBOLIC_LINK_PRIVILEGE,
   is_server:false,
   has_physical_mem_access:false,
-  has_create_global_privilege:true,
-  has_ioctl_storage_get_media_types_ex:true,
-  has_disk_ex_ioctls:true,
-  has_buggy_restart_scan:false,
   has_mandatory_integrity_control:true,
-  needs_logon_sid_in_sid_list:false,
   needs_count_in_si_lpres2:false,
   has_recycle_dot_bin:true,
-  has_gaa_prefixes:true,
   has_gaa_on_link_prefix:true,
   has_gaa_largeaddress_bug:false,
   supports_all_posix_ai_flags:true,
   has_restricted_stack_args:false,
   has_transactions:true,
-  has_recvmsg:true,
   has_sendmsg:true,
   has_broken_udf:false,
-  has_console_handle_problem:true,
   has_broken_alloc_console:true,
   has_always_all_codepages:true,
   has_localenames:true,
   has_fast_cwd:true,
   has_restricted_raw_disk_access:true,
   use_dont_resolve_hack:false,
-  has_stack_size_param_is_a_reservation:true,
   has_console_logon_sid:true,
   wow64_has_secondary_stack:false,
   has_program_compatibility_assistant:true,
-  kernel_is_always_casesensitive:false,
+  has_pipe_reject_remote_clients:true,
   terminate_thread_frees_stack:true,
 };
 
@@ -364,24 +175,8 @@ wincapc::init ()
       case 5:
 	switch (version.dwMinorVersion)
 	  {
-	    case 0:
-	      if (version.wServicePackMajor < 4)
-		caps = &wincap_2000;
-	      else
-		caps = &wincap_2000sp4;
-	      break;
-
 	    case 1:
-	      caps = &wincap_xp;
-	      switch (version.wServicePackMajor)
-		{
-		case 0:
-		  caps = &wincap_xp;
-		case 1:
-		  caps = &wincap_xpsp1;
-		default:
-		  caps = &wincap_xpsp2;
-		}
+	      caps = &wincap_xpsp2;
 	      break;
 
 	    default:
@@ -408,10 +203,14 @@ wincapc::init ()
     }
 
   ((wincaps *)caps)->is_server = (version.wProductType != VER_NT_WORKSTATION);
+#ifdef __x86_64__
+  wow64 = 0;
+#else
   if (NT_SUCCESS (NtQueryInformationProcess (NtCurrentProcess (),
 					     ProcessWow64Information,
 					     &wow64, sizeof wow64, NULL))
       && !wow64)
+#endif
     {
       ((wincaps *)caps)->needs_count_in_si_lpres2 = false;
       ((wincaps *)caps)->has_restricted_stack_args = false;