ChangeLogTag:Wed Feb 21 21:46:18 UTC 2007 Steve Huston <shuston@riverace.com>

50 files changed, 217 insertions, 132 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index a207fdb2e70..34c33e01534 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,62 @@
+Wed Feb 21 21:46:18 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-pharlap.h:
+        * ace/config-WinCE.h:
+        * ace/OS_NS_stdio.inl: Changed ACE_LACKS_SETFILEPOINTEREX to
+          ACE_LACKS_WIN32_SETFILEPOINTEREX to be consistent with the other
+          ACE_*_WIN32_*things.
+
+        * ace/config-pharlap.h:
+        * ace/config-WinCE.h:
+        * ace/NT_Service.{h cpp}:
+        * examples/NT_Service/nt_svc.{h cpp}:
+        * examples/NT_Service/main.cpp:
+          Also added ACE_LACKS_WIN32_SERVICES for Pharlap and CE. This marks
+          a platform that is Windows, but doesn't have Windows services.
+
+        * ace/Configuration.{h cpp}:
+        * ace/Registry.{h cpp}: Rather than exclude registry-using code using
+          ACE_HAS_PHARLAP, use a new setting ACE_LACKS_WIN32_REGISTRY.
+
+        * ace/config-pharlap.h: Added ACE_LACKS_WIN32_REGISTRY.
+
+        * protocols/ace/HTBP/HTBP_Environment.cpp:
+        * examples/Reactor/WFMO_Reactor/Registry_Changes.cpp:
+        * examples/Registry/test_registry_update.cpp:
+        * examples/Registry/test_registry_iterator.cpp:
+        * tests/Config_Test.cpp: Don't try registry stuff
+          if ACE_LACKS_WIN32_REGISTRY is set.
+
+        * examples/Reactor/WFMO_Reactor/Window_Messages.cpp: Don't try this if
+          ACE_LACKS_MSG_WFMO is set.
+
+        * apps/JAWS/server/IO.{h cpp}:
+        * apps/JAWS/server/HTTP_Handler.{h cpp}:
+        * apps/JAWS/server/HTTP_Server.{h cpp}:
+        * apps/JAWS2/JAWS/IO.{h cpp}:
+        * apps/JAWS2/JAWS/IO_Acceptor.{h cpp}:
+        * apps/JAWS2/JAWS/IO_Handler.{h cpp}:
+        * apps/JAWS3/jaws3/Asynch_IO.cpp:
+        * examples/APG/Proactor/HA_Proactive_Status.{h cpp}:
+        * examples/Connection/blocking/SPIPE-acceptor.{h cpp}:
+        * examples/Connection/blocking/test_spipe_acceptor.cpp:
+        * examples/Reactor/Proactor/post_completions.cpp:
+        * examples/Reactor/Proactor/simple_test_proactor.cpp:
+        * examples/Reactor/Proactor/test_cancel.cpp:
+        * examples/Reactor/Proactor/test_end_event_loop.cpp:
+        * examples/Reactor/Proactor/test_multiple_loops.cpp:
+        * examples/Reactor/Proactor/test_proactor.cpp:
+        * examples/Reactor/Proactor/test_proactor2.cpp:
+        * examples/Reactor/Proactor/test_proactor3.cpp:
+        * examples/Reactor/Proactor/test_timeout.cpp:
+        * examples/Reactor/Proactor/test_timeout_st.cpp:
+        * examples/Reactor/Proactor/test_udp_proactor.cpp:
+        * examples/Reactor/WFMO_Reactor/Talker.cpp:
+          Decide on whether or not to compile the asynch support classes
+          based on ACE_HAS_WIN32_OVERLAPPED_IO, not ACE_WIN32. ACE_WIN32
+          is broader than that overlapped I/O-capable ones; Pharlap ETS
+          doesn't do overlapped I/O, for instance.
+
 Wed Feb 21 19:27:14 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
 
         * ace/Array_Base.cpp (size):
diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp
index 04e5282dadc..07643676c4b 100644
--- a/ACE/ace/Configuration.cpp
+++ b/ACE/ace/Configuration.cpp
@@ -428,7 +428,7 @@ ACE_Configuration::operator!= (const ACE_Configuration& rhs) const
 
 //////////////////////////////////////////////////////////////////////////////
 
-#if defined (WIN32) && !defined (ACE_HAS_PHARLAP)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
 
 static const int ACE_DEFAULT_BUFSIZE = 256;
 
@@ -1062,7 +1062,7 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey,
   return result;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
 
 ///////////////////////////////////////////////////////////////
 
diff --git a/ACE/ace/Configuration.h b/ACE/ace/Configuration.h
index f1dcd7fe183..bba0cf4ae6a 100644
--- a/ACE/ace/Configuration.h
+++ b/ACE/ace/Configuration.h
@@ -429,7 +429,7 @@ protected:
   ACE_Configuration_Section_Key root_;
 };
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
 
 /**
  * @class ACE_Section_Key_Win32
@@ -554,7 +554,7 @@ protected:
   ACE_Configuration_Win32Registry (const ACE_Configuration_Win32Registry& rhs);
   ACE_Configuration_Win32Registry& operator= (const ACE_Configuration_Win32Registry& rhs);
 };
-#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
 
 // ACE_Allocator version
 
diff --git a/ACE/ace/NT_Service.cpp b/ACE/ace/NT_Service.cpp
index 0a1e249cb4f..10196007ec9 100644
--- a/ACE/ace/NT_Service.cpp
+++ b/ACE/ace/NT_Service.cpp
@@ -1,8 +1,7 @@
 // $Id$
 
 #include "ace/config-all.h"
-#if defined (ACE_WIN32) && \
-   !defined (ACE_HAS_PHARLAP) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ace/NT_Service.h"
 
@@ -615,4 +614,4 @@ ACE_NT_Service::wait_for_service_state (DWORD desired_state,
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
diff --git a/ACE/ace/NT_Service.h b/ACE/ace/NT_Service.h
index fc168158101..249afdc3774 100644
--- a/ACE/ace/NT_Service.h
+++ b/ACE/ace/NT_Service.h
@@ -21,8 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) && \
-   !defined (ACE_HAS_WINCE)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
 
 #include "ace/ACE.h"
 #include "ace/OS_Log_Msg_Attributes.h"
@@ -432,7 +431,7 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc,                \
 #include "ace/NT_Service.inl"
 #endif /* __ACE_INLINE__ */
 
-#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP && !ACE_HAS_WINCE */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl
index eb0382d8986..466800aa600 100644
--- a/ACE/ace/OS_NS_stdio.inl
+++ b/ACE/ace/OS_NS_stdio.inl
@@ -34,7 +34,7 @@ ACE_OS::flock_adjust_params (ACE_OS::ace_flock_t *lock,
     case SEEK_CUR:
       {
         LARGE_INTEGER offset;
-# if !defined (ACE_LACKS_SETFILEPOINTEREX)
+# if !defined (ACE_LACKS_WIN32_SETFILEPOINTEREX)
         LARGE_INTEGER distance;
         distance.QuadPart = 0;
         if (!::SetFilePointerEx (lock->handle_,
@@ -56,7 +56,7 @@ ACE_OS::flock_adjust_params (ACE_OS::ace_flock_t *lock,
             ACE_OS::set_errno_to_last_error ();
             return;
           }
-# endif /* ACE_LACKS_SETFILEPOINTEREX */
+# endif /* ACE_LACKS_WIN32_SETFILEPOINTEREX */
 
 # if defined (_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
         start += offset.QuadPart;
diff --git a/ACE/ace/OS_main.h b/ACE/ace/OS_main.h
index 536045072be..199c1f8f7ee 100644
--- a/ACE/ace/OS_main.h
+++ b/ACE/ace/OS_main.h
@@ -164,6 +164,16 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
+/*
+** LabVIEW RT cannot directly use an executable. Need to build the program
+** as a DLL and call it from something else. The ACE test framework knows this
+** trick and uses a LabVIEW RT target-resident control program to load a
+** DLL, look up it's main() entrypoint, and call it.
+*/
+#       if defined (ACE_BUILD_LABVIEW_EXE_AS_DLL)
+extern "C" __declspec (dllexport) int main (int, char *[]);
+#       endif /* ACE_BUILD_LABVIEW_EXE_AS_DLL) */
+
 #       define main \
 ace_main_i (int, char *[]); \
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL \
diff --git a/ACE/ace/Registry.cpp b/ACE/ace/Registry.cpp
index b488aa32dee..c2a824918f0 100644
--- a/ACE/ace/Registry.cpp
+++ b/ACE/ace/Registry.cpp
@@ -6,7 +6,7 @@ ACE_RCSID (ace,
            Registry,
            "$Id$")
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
 
 #  include "ace/os_include/os_netdb.h"
 #  include "ace/OS_NS_unistd.h"
@@ -1136,4 +1136,4 @@ ACE_Predefined_Naming_Contexts::is_local_host (const ACE_TCHAR *machine_name)
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
diff --git a/ACE/ace/Registry.h b/ACE/ace/Registry.h
index 8385df282ee..c677a2fe6c7 100644
--- a/ACE/ace/Registry.h
+++ b/ACE/ace/Registry.h
@@ -21,8 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)
-// This only works on Win32 platforms (but Pharlap ETS doesn't offer registry).
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
+// This only works on registry-capable Win32 platforms.
 
 #include "ace/Containers.h"
 #include "ace/SString.h"
@@ -558,6 +558,6 @@ private:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_WIN32 && !ACE_HAS_PHARLAP */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
 #include /**/ "ace/post.h"
 #endif /* ACE_REGISTRY_H */
diff --git a/ACE/ace/config-WinCE.h b/ACE/ace/config-WinCE.h
index 70a9694c857..26e5ab55201 100644
--- a/ACE/ace/config-WinCE.h
+++ b/ACE/ace/config-WinCE.h
@@ -64,7 +64,8 @@
 #define ACE_LACKS_GMTIME_R
 #define ACE_LACKS_LOCALTIME
 #define ACE_LACKS_STRFTIME
-#define ACE_LACKS_SETFILEPOINTEREX
+#define ACE_LACKS_WIN32_SETFILEPOINTEREX
+#define ACE_LACKS_WIN32_SERVICES
 
 #define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1
 
diff --git a/ACE/ace/config-pharlap.h b/ACE/ace/config-pharlap.h
index 4021c27b5ca..2b019bcadef 100644
--- a/ACE/ace/config-pharlap.h
+++ b/ACE/ace/config-pharlap.h
@@ -34,7 +34,10 @@
 #define ACE_LACKS_TCP_NODELAY
 #define ACE_LACKS_MSG_WFMO
 #define ACE_LACKS_WIN32_MOVEFILEEX
+#define ACE_LACKS_WIN32_REGISTRY
 #define ACE_LACKS_WIN32_SECURITY_DESCRIPTORS
+#define ACE_LACKS_WIN32_SERVICES
+#define ACE_LACKS_WIN32_SETFILEPOINTEREX
 
 // There's no host table, by default. So using "localhost" won't work.
 // If your system does have the ability to use "localhost" and you want to,
@@ -59,7 +62,6 @@
 // Now remove things that desktop/server Windows has but Pharlap ETS doesn't.
 #undef ACE_HAS_INTERLOCKED_EXCHANGEADD
 #undef ACE_HAS_WCHAR
-#define ACE_LACKS_SETFILEPOINTEREX
 
 #include /**/ <embkern.h>
 #if defined (ACE_HAS_PHARLAP_RT)
diff --git a/ACE/apps/JAWS/server/HTTP_Handler.cpp b/ACE/apps/JAWS/server/HTTP_Handler.cpp
index 277cfb11f3a..c7f58c55a11 100644
--- a/ACE/apps/JAWS/server/HTTP_Handler.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Handler.cpp
@@ -285,7 +285,7 @@ No_Cache_Synch_HTTP_Handler_Factory::destroy_http_handler (HTTP_Handler &handler
 //----------------
 
 // This only works on Win32
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 void
 Asynch_HTTP_Handler_Factory::open (ACE_HANDLE handle,
 				   ACE_Message_Block &mb)
@@ -311,4 +311,4 @@ Asynch_HTTP_Handler_Factory::create_http_handler (void)
 {
   return 0;
 }
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
diff --git a/ACE/apps/JAWS/server/HTTP_Handler.h b/ACE/apps/JAWS/server/HTTP_Handler.h
index f7eb9b9a693..558b2f64392 100644
--- a/ACE/apps/JAWS/server/HTTP_Handler.h
+++ b/ACE/apps/JAWS/server/HTTP_Handler.h
@@ -188,7 +188,7 @@ public:
 
 //--------------
 
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 class Asynch_HTTP_Handler_Factory : public HTTP_Handler_Factory, public ACE_Service_Handler
   // = TITLE
   //     This class is used to create new HTTP handlers that will use
@@ -217,5 +217,5 @@ private:
   // handlers. New handlers can only be created by the framework when
   // new client connections arrive.
 };
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 #endif /* HTTP_HANDLER_H */
diff --git a/ACE/apps/JAWS/server/HTTP_Server.cpp b/ACE/apps/JAWS/server/HTTP_Server.cpp
index 86ffea0542a..f741b1fc623 100644
--- a/ACE/apps/JAWS/server/HTTP_Server.cpp
+++ b/ACE/apps/JAWS/server/HTTP_Server.cpp
@@ -368,7 +368,7 @@ int
 HTTP_Server::asynch_thread_pool (void)
 {
 // This only works on Win32
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
   // Create the appropriate acceptor for this concurrency strategy and
   // an appropriate handler for this I/O strategy
   ACE_Asynch_Acceptor<Asynch_HTTP_Handler_Factory> acceptor;
@@ -389,12 +389,12 @@ HTTP_Server::asynch_thread_pool (void)
 
   // Wait for the threads to finish.
   return this->tm_.wait ();
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
   return -1;
 }
 
 // This only works on Win32
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 Asynch_Thread_Pool_Task::Asynch_Thread_Pool_Task (ACE_Proactor &proactor,
                                                   ACE_Thread_Manager &tm)
@@ -418,7 +418,7 @@ Asynch_Thread_Pool_Task::svc (void)
   return 0;
 }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 
 // Define the factory function.
 ACE_SVC_FACTORY_DEFINE (HTTP_Server)
diff --git a/ACE/apps/JAWS/server/HTTP_Server.h b/ACE/apps/JAWS/server/HTTP_Server.h
index 9e8534c4cbd..0ccfa92cd28 100644
--- a/ACE/apps/JAWS/server/HTTP_Server.h
+++ b/ACE/apps/JAWS/server/HTTP_Server.h
@@ -130,7 +130,7 @@ private:
 };
 
 // This only works on Win32
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 class Asynch_Thread_Pool_Task : public ACE_Task<ACE_NULL_SYNCH>
   // = TITLE
   //     Used to implement Asynch Thread Pool
@@ -146,7 +146,7 @@ public:
 private:
   ACE_Proactor &proactor_;
 };
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 
 ACE_SVC_FACTORY_DECLARE (HTTP_Server)
 
diff --git a/ACE/apps/JAWS/server/IO.cpp b/ACE/apps/JAWS/server/IO.cpp
index 8b727a12019..0d2663c1f85 100644
--- a/ACE/apps/JAWS/server/IO.cpp
+++ b/ACE/apps/JAWS/server/IO.cpp
@@ -195,7 +195,7 @@ JAWS_Synch_IO::send_message (const char *buffer,
 }
 
 // This only works on Win32
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 JAWS_Asynch_IO::JAWS_Asynch_IO (void)
 {
@@ -421,7 +421,7 @@ JAWS_Asynch_IO::handle_write_stream (const ACE_Asynch_Write_Stream::Result &resu
     this->handler_->error_message_complete ();
 }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 
 //-------------------Adding SYNCH IO no Caching
 
diff --git a/ACE/apps/JAWS/server/IO.h b/ACE/apps/JAWS/server/IO.h
index fd5ae0d64b2..0a12785ab6e 100644
--- a/ACE/apps/JAWS/server/IO.h
+++ b/ACE/apps/JAWS/server/IO.h
@@ -174,7 +174,7 @@ protected:
 };
 
 // This only works on Win32
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 class JAWS_Asynch_IO : public JAWS_IO, public ACE_Handler
   // = TITLE
@@ -234,7 +234,7 @@ protected:
   // completes.
 };
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 
 
 //-------------------Adding SYNCH IO no Caching
diff --git a/ACE/apps/JAWS2/JAWS/IO.cpp b/ACE/apps/JAWS2/JAWS/IO.cpp
index 210502b391d..41603c6b626 100644
--- a/ACE/apps/JAWS2/JAWS/IO.cpp
+++ b/ACE/apps/JAWS2/JAWS/IO.cpp
@@ -324,8 +324,8 @@ JAWS_Synch_IO::send_message (JAWS_IO_Handler *ioh,
   stream.send_n (buffer, length);
 }
 
-// This only works on Win32
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+// This only works on asynch I/O-capable systems.
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 JAWS_Asynch_IO::JAWS_Asynch_IO (void)
 {
@@ -591,5 +591,5 @@ JAWS_Asynch2_IO::accept (JAWS_IO_Handler *,
 {
 }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
diff --git a/ACE/apps/JAWS2/JAWS/IO.h b/ACE/apps/JAWS2/JAWS/IO.h
index 840ff327380..e336487bd86 100644
--- a/ACE/apps/JAWS2/JAWS/IO.h
+++ b/ACE/apps/JAWS2/JAWS/IO.h
@@ -170,8 +170,8 @@ protected:
 typedef ACE_Singleton<JAWS_Synch_IO, ACE_SYNCH_MUTEX>
         JAWS_Synch_IO_Singleton;
 
-// This only works on Win32
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+// This only works on asynch I/O-capable systems.
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 class JAWS_Export JAWS_Asynch_IO : public JAWS_IO
   // = TITLE
@@ -258,6 +258,6 @@ public:
 typedef ACE_Singleton<JAWS_Asynch2_IO, ACE_SYNCH_MUTEX>
         JAWS_Asynch2_IO_Singleton;
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
 #endif /* JAWS_IO_H */
diff --git a/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp b/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp
index 40740c370b3..b0d04c260b2 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp
+++ b/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp
@@ -97,7 +97,7 @@ JAWS_IO_Synch_Acceptor::get_handle (void)
 
 
 JAWS_IO_Asynch_Acceptor::JAWS_IO_Asynch_Acceptor (void)
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   : acceptor_ (*(new ACE_Asynch_Acceptor<JAWS_Asynch_Handler>)),
     acceptor_ptr_ (&acceptor_)
 #endif
@@ -106,7 +106,7 @@ JAWS_IO_Asynch_Acceptor::JAWS_IO_Asynch_Acceptor (void)
 
 JAWS_IO_Asynch_Acceptor::~JAWS_IO_Asynch_Acceptor (void)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   delete this->acceptor_ptr_;
   this->acceptor_ptr_ = 0;
 #endif
@@ -115,7 +115,7 @@ JAWS_IO_Asynch_Acceptor::~JAWS_IO_Asynch_Acceptor (void)
 int
 JAWS_IO_Asynch_Acceptor::open (const ACE_INET_Addr &address, int backlog)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   // Tell the acceptor to listen on this->port_, which sets up an
   // asynchronous I/O request to the OS.
 
@@ -133,13 +133,13 @@ JAWS_IO_Asynch_Acceptor::open (const ACE_INET_Addr &address, int backlog)
   ACE_UNUSED_ARG (address);
   ACE_UNUSED_ARG (backlog);
   return -1;
-#endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 }
 
 int
 JAWS_IO_Asynch_Acceptor::open (const ACE_HANDLE &socket)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   ACE_HANDLE handle = this->handle_;
   if (handle == socket)
     return 0;
@@ -152,19 +152,19 @@ JAWS_IO_Asynch_Acceptor::open (const ACE_HANDLE &socket)
 #else
   ACE_UNUSED_ARG (socket);
   return -1;
-#endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 }
 
 int
 JAWS_IO_Asynch_Acceptor::accept (size_t bytes_to_read, const void *act)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   return this->acceptor_.accept (bytes_to_read, act);
 #else
   ACE_UNUSED_ARG (bytes_to_read);
   ACE_UNUSED_ARG (act);
   return -1;
-#endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 }
 
 int
@@ -177,20 +177,20 @@ JAWS_IO_Asynch_Acceptor::accept (ACE_SOCK_Stream &, ACE_Addr *,
 ACE_HANDLE
 JAWS_IO_Asynch_Acceptor::get_handle (void)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   return this->acceptor_.get_handle ();
 #else
   return ACE_INVALID_HANDLE;
-#endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 }
 
 
 void
 JAWS_IO_Asynch_Acceptor::close (void)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   delete this->acceptor_ptr_;
   this->acceptor_ptr_ = 0;
-#endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 }
 
diff --git a/ACE/apps/JAWS2/JAWS/IO_Acceptor.h b/ACE/apps/JAWS2/JAWS/IO_Acceptor.h
index e18bcd55c30..3f97f876d0b 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Acceptor.h
+++ b/ACE/apps/JAWS2/JAWS/IO_Acceptor.h
@@ -125,11 +125,11 @@ private:
                       int reset_new_handle = 0) const;
 
 private:
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   ACE_Asynch_Acceptor<JAWS_Asynch_Handler> &acceptor_;
   ACE_Asynch_Acceptor<JAWS_Asynch_Handler> *acceptor_ptr_;
   ACE_HANDLE handle_;
-#endif /* defined (ACE_WIN32) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 };
 
 typedef ACE_Singleton<JAWS_IO_Synch_Acceptor, ACE_SYNCH_MUTEX>
diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
index 0a96db64f5d..e1ddaa43d2d 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
+++ b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp
@@ -231,7 +231,7 @@ JAWS_IO_Handler::release (void)
 {
 }
 
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 JAWS_Asynch_IO_Handler_Factory::~JAWS_Asynch_IO_Handler_Factory (void)
 {
@@ -498,5 +498,4 @@ JAWS_Asynch_Handler::handler (void)
   return this->ioh_;
 }
 
-#endif /* ACE_WIN32 */
-
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.h b/ACE/apps/JAWS2/JAWS/IO_Handler.h
index 7420a8825c8..6b67fdbaa12 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Handler.h
+++ b/ACE/apps/JAWS2/JAWS/IO_Handler.h
@@ -145,7 +145,7 @@ public:
 
 };
 
-#if defined(ACE_WIN32) || defined(ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined(ACE_HAS_AIO_CALLS)
 
 // Forward reference.
 class JAWS_Asynch_IO_Handler;
@@ -190,7 +190,7 @@ public:
 private:
   JAWS_Asynch_IO_Handler *ioh_;
 };
-#endif /* defined(ACE_WIN32) || defined(ACE_HAS_AIO_CALLS) */
+#endif /* defined(ACE_HAS_WIN32_OVERLAPPED_IO) || defined(ACE_HAS_AIO_CALLS) */
 
 
 class JAWS_Export JAWS_IO_Handler : public JAWS_Abstract_IO_Handler
@@ -267,7 +267,7 @@ typedef JAWS_IO_Handler_Factory JAWS_Synch_IO_Handler_Factory;
 typedef ACE_Singleton<JAWS_Synch_IO_Handler_Factory, ACE_SYNCH_MUTEX>
         JAWS_Synch_IO_Handler_Factory_Singleton;
 
-#if defined(ACE_WIN32) || defined(ACE_HAS_AIO_CALLS)
+#if defined(ACE_HAS_WIN32_OVERLAPPED_IO) || defined(ACE_HAS_AIO_CALLS)
 
 class JAWS_Export JAWS_Asynch_IO_Handler_Factory : public JAWS_IO_Handler_Factory
 {
@@ -310,7 +310,7 @@ protected:
 typedef JAWS_IO_Handler JAWS_Asynch_IO_Handler;
 typedef JAWS_IO_Handler_Factory JAWS_Asynch_IO_Handler_Factory;
 
-#endif /* defined(ACE_WIN32) || defined(ACE_HAS_AIO_CALLS) */
+#endif /* defined(ACE_HAS_WIN32_OVERLAPPED_IO) || defined(ACE_HAS_AIO_CALLS) */
 
 typedef ACE_Singleton<JAWS_Asynch_IO_Handler_Factory, ACE_SYNCH_MUTEX>
         JAWS_Asynch_IO_Handler_Factory_Singleton;
diff --git a/ACE/apps/JAWS2/JAWS/Server.cpp b/ACE/apps/JAWS2/JAWS/Server.cpp
index 4fbec0cd0f7..b5d3707bc31 100644
--- a/ACE/apps/JAWS2/JAWS/Server.cpp
+++ b/ACE/apps/JAWS2/JAWS/Server.cpp
@@ -61,18 +61,18 @@ JAWS_Server::init (int argc, char *argv[])
       this->policy_.concurrency (JAWS_Thread_Pool_Singleton::instance ());
     }
 
-#if !(defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS))
+#if !(defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS))
   this->dispatch_ = 0;
-#endif /* !defined (ACE_WIN32) */
+#endif /* !(ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS) */
 
   if (this->dispatch_ == 1)
     {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
       this->policy_.io (JAWS_Asynch_IO_Singleton::instance ());
       this->policy_.ioh_factory
         (JAWS_Asynch_IO_Handler_Factory_Singleton::instance ());
       this->policy_.acceptor (JAWS_IO_Asynch_Acceptor_Singleton::instance ());
-#endif /* defined (ACE_WIN32) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
     }
   else
     {
@@ -112,7 +112,7 @@ JAWS_Server::open (JAWS_Pipeline_Handler *protocol,
   // prime the acceptor if appropriate
   if (this->dispatch_ == 1)
     {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
       int n = this->nthreads_;
       if (this->concurrency_ == 1)
@@ -121,7 +121,7 @@ JAWS_Server::open (JAWS_Pipeline_Handler *protocol,
       for (int i = 0; i < n * this->ratio_ - n; i++)
         db->task ()->put (db);
 
-#endif /* defined (ACE_WIN32) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
     }
 
   // The message block should contain an INET_Addr, and call the
diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp b/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp
index 0113e73da39..54b4f1c012d 100644
--- a/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp
+++ b/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp
@@ -11,7 +11,7 @@
 #include "jaws3/Event_Completer.h"
 #include "jaws3/Event_Result.h"
 
-#if defined (ACE_HAS_AIO_CALLS) || defined (ACE_WIN32)
+#if defined (ACE_HAS_AIO_CALLS) || defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 #include "jaws3/Asynch_IO_Helpers.h"
 
@@ -254,7 +254,7 @@ JAWS_Asynch_IO::transmit ( ACE_HANDLE handle
                                           );
 }
 
-#endif /* defined (ACE_HAS_AIO_CALLS) || defined (ACE_WIN32) */
+#endif /* ACE_HAS_AIO_CALLS || ACE_HAS_WIN32_OVERLAPPED_IO */
 
 // For now, we will simulate timed Asynch IO with timed Reactive IO.
 // In the future, we will implement the timed Asynch IO with timers
diff --git a/ACE/examples/APG/Proactor/HA_Proactive_Status.cpp b/ACE/examples/APG/Proactor/HA_Proactive_Status.cpp
index 9d9b9dfb0e5..1ed2aa03620 100644
--- a/ACE/examples/APG/Proactor/HA_Proactive_Status.cpp
+++ b/ACE/examples/APG/Proactor/HA_Proactive_Status.cpp
@@ -11,7 +11,7 @@
 #include "ace/Proactor.h"
 #include "ace/os_include/arpa/os_inet.h"
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 // Listing 1 code/ch08
 void
@@ -159,5 +159,5 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 1;
 }
 
-#endif /* (ACE_WIN32 && != ACE_HAS_WINCE) || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
diff --git a/ACE/examples/APG/Proactor/HA_Proactive_Status.h b/ACE/examples/APG/Proactor/HA_Proactive_Status.h
index f66080b62cd..e6d77c141ef 100644
--- a/ACE/examples/APG/Proactor/HA_Proactive_Status.h
+++ b/ACE/examples/APG/Proactor/HA_Proactive_Status.h
@@ -15,7 +15,7 @@
 // Listing 1 code/ch08
 #include "ace/Asynch_IO.h"
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 class HA_Proactive_Service : public ACE_Service_Handler
 {
@@ -59,7 +59,7 @@ public:
 };
 // Listing 2
 
-#endif /* (ACE_WIN32 && != ACE_HAS_WINCE) || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
 
 #if 0
 // Listing 3 code/ch08
diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp
index ba0001011b6..c25f9508ce5 100644
--- a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp
+++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp
@@ -13,7 +13,7 @@
 
 ACE_RCSID(blocking, SPIPE_acceptor, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 Svc_Handler::Svc_Handler (void)
   : mb_ (BUFSIZ + 1)
@@ -220,6 +220,6 @@ IPC_Server::svc (void)
   return 0;
 }
 
-#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 #endif /* SPIPE_ACCEPTOR_C */
 
diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.h b/ACE/examples/Connection/blocking/SPIPE-acceptor.h
index 546941c48fb..af4d3d52aae 100644
--- a/ACE/examples/Connection/blocking/SPIPE-acceptor.h
+++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.h
@@ -18,7 +18,7 @@
 
 // This only works on Win32 platforms and on Unix platforms
 // supporting POSIX aio calls.
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 // This is the class that does the work once the ACE_Oneshot_Acceptor
 // has accepted a connection.
@@ -74,6 +74,6 @@ private:
   // Signal handler method.
 };
 
-#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 #endif /* SP_ACCEPTOR_H */
 
diff --git a/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp b/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp
index 549690ebf43..62a6d776c84 100644
--- a/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp
+++ b/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp
@@ -6,7 +6,7 @@
 
 ACE_RCSID(blocking, test_spipe_acceptor, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
diff --git a/ACE/examples/NT_Service/main.cpp b/ACE/examples/NT_Service/main.cpp
index fbbf4a60cf4..a0b0433b914 100644
--- a/ACE/examples/NT_Service/main.cpp
+++ b/ACE/examples/NT_Service/main.cpp
@@ -19,6 +19,8 @@
 //
 // ============================================================================
 
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
+
 #include "ace/Get_Opt.h"
 #include "ntsvc.h"
 // FUZZ: disable check_for_streams_include
@@ -254,3 +256,15 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   return PROCESS::instance ()->run (argc, argv);
 }
 
+#else
+
+#include "ace/OS_main.h"
+
+int
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
+{
+  // This program needs Windows services.
+  return 0;
+}
+
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
diff --git a/ACE/examples/NT_Service/ntsvc.h b/ACE/examples/NT_Service/ntsvc.h
index cecc91b34c5..caf761716e6 100644
--- a/ACE/examples/NT_Service/ntsvc.h
+++ b/ACE/examples/NT_Service/ntsvc.h
@@ -21,6 +21,8 @@
 #ifndef NTSVC_H_
 #define NTSVC_H_
 
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)
+
 #include "ace/Event_Handler.h"
 #include "ace/NT_Service.h"
 #include "ace/Singleton.h"
@@ -62,4 +64,6 @@ private:
 
 typedef ACE_Singleton<Service, ACE_Mutex> SERVICE;
 
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */
+
 #endif /* #ifndef NTSVC_H_ */
diff --git a/ACE/examples/Reactor/Proactor/post_completions.cpp b/ACE/examples/Reactor/Proactor/post_completions.cpp
index e6545241953..905c5718e5c 100644
--- a/ACE/examples/Reactor/Proactor/post_completions.cpp
+++ b/ACE/examples/Reactor/Proactor/post_completions.cpp
@@ -44,14 +44,13 @@
 static ACE_Atomic_Op <ACE_SYNCH_MUTEX, size_t> Completions_To_Go;
 
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
-     defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 // This only works on Win32 platforms and on Unix platforms supporting
 // POSIX aio calls.
 
 #if defined (ACE_HAS_AIO_CALLS)
 #define RESULT_CLASS ACE_POSIX_Asynch_Result
-#elif defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#elif defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 #define RESULT_CLASS ACE_WIN32_Asynch_Result
 #endif /* ACE_HAS_AIO_CALLS */
 
@@ -292,7 +291,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return status;
 }
 
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
+#else /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
 int
 main (int, char *[])
@@ -302,5 +301,5 @@ main (int, char *[])
   return 1;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
diff --git a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp
index 1f4557d7df5..99d53bda5ac 100644
--- a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp
+++ b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp
@@ -26,7 +26,7 @@
 
 ACE_RCSID(Proactor, test_proactor, "simple_test_proactor.cpp,v 1.1 1999/05/18 22:15:30 alex Exp")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   // This only works on Win32 platforms and on Unix platforms supporting
   // POSIX aio calls.
 
@@ -266,4 +266,4 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return success ? 0 : 1;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/examples/Reactor/Proactor/test_cancel.cpp b/ACE/examples/Reactor/Proactor/test_cancel.cpp
index c10f8e9be2c..49c0c0a6490 100644
--- a/ACE/examples/Reactor/Proactor/test_cancel.cpp
+++ b/ACE/examples/Reactor/Proactor/test_cancel.cpp
@@ -52,7 +52,7 @@
 
 ACE_RCSID (Proactor, test_proactor, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   // This only works on Win32 platforms and on Unix platforms supporting
   // POSIX aio calls.
 
@@ -233,7 +233,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#else /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
@@ -243,4 +243,4 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 1;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
index 096f77b089d..641a8785c6f 100644
--- a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
+++ b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp
@@ -31,8 +31,7 @@
 #include "ace/POSIX_Proactor.h"
 #include "ace/OS_main.h"
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
-     (defined (ACE_HAS_AIO_CALLS)) && !defined (ACE_POSIX_AIOCB_PROACTOR))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 // This only works on Win32 platforms and on Unix platforms supporting
 // POSIX aio calls.
 
@@ -154,7 +153,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
   return 0;
 }
 
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
+#else /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
 int
 main (int, char *[])
@@ -164,5 +163,5 @@ main (int, char *[])
   return 1;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
diff --git a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp
index ac4228ab641..5199ac01bb4 100644
--- a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp
+++ b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp
@@ -27,7 +27,7 @@
 
 ACE_RCSID(Proactor, test_multiple_loops, "$Id$")
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 class Timeout_Handler : public ACE_Handler, public ACE_Event_Handler
 {
@@ -137,4 +137,4 @@ main (int, char *[])
 {
   return 0;
 }
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
diff --git a/ACE/examples/Reactor/Proactor/test_proactor.cpp b/ACE/examples/Reactor/Proactor/test_proactor.cpp
index 035a2facf6a..db257d2ae96 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor.cpp
+++ b/ACE/examples/Reactor/Proactor/test_proactor.cpp
@@ -39,7 +39,7 @@
 
 ACE_RCSID(Proactor, test_proactor, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   // This only works on Win32 platforms and on Unix platforms supporting
   // POSIX aio calls.
 
@@ -666,7 +666,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#else /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
@@ -676,4 +676,4 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 1;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/examples/Reactor/Proactor/test_proactor2.cpp b/ACE/examples/Reactor/Proactor/test_proactor2.cpp
index cd5cbf7092e..6afb541eee6 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor2.cpp
+++ b/ACE/examples/Reactor/Proactor/test_proactor2.cpp
@@ -42,11 +42,11 @@
 
 ACE_RCSID(Proactor, test_proactor2, "test_proactor2.cpp,v 1.27 2000/03/07 17:15:56 schmidt Exp")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   // This only works on Win32 platforms and on Unix platforms supporting
   // POSIX aio calls.
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 #include "ace/WIN32_Proactor.h"
 
@@ -676,7 +676,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   if (parse_args (argc, argv) == -1)
     return -1;
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
   ACE_WIN32_Proactor *      pImpl = new ACE_WIN32_Proactor;
 
@@ -805,4 +805,4 @@ int PrintSigMask ()
   return 0;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/examples/Reactor/Proactor/test_proactor3.cpp b/ACE/examples/Reactor/Proactor/test_proactor3.cpp
index c47468276c8..6aaaa50b4dd 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor3.cpp
+++ b/ACE/examples/Reactor/Proactor/test_proactor3.cpp
@@ -40,11 +40,11 @@
 
 ACE_RCSID(Proactor, test_proactor, "test_proactor.cpp,v 1.27 2000/03/07 17:15:56 schmidt Exp")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   // This only works on Win32 platforms and on Unix platforms
   // supporting POSIX aio calls.
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 #	include "ace/WIN32_Proactor.h"
 
@@ -53,7 +53,7 @@ ACE_RCSID(Proactor, test_proactor, "test_proactor.cpp,v 1.27 2000/03/07 17:15:56
 #	include "ace/POSIX_Proactor.h"
 #	include "ace/SUN_Proactor.h"
 
-#endif /* defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
 
 //  Some debug helper functions
 static int disable_signal (int sigmin, int sigmax);
@@ -114,7 +114,7 @@ MyTask::create_proactor (void)
 
   if (threads_ == 0)
     {
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
       ACE_WIN32_Proactor *proactor = new ACE_WIN32_Proactor;
       ACE_DEBUG ((LM_DEBUG,"(%t) Create Proactor Type=WIN32"));
 
@@ -861,4 +861,4 @@ print_sigmask (void)
 }
 #endif /* 0 */
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/examples/Reactor/Proactor/test_timeout.cpp b/ACE/examples/Reactor/Proactor/test_timeout.cpp
index 39351717db9..b1ee421e1d8 100644
--- a/ACE/examples/Reactor/Proactor/test_timeout.cpp
+++ b/ACE/examples/Reactor/Proactor/test_timeout.cpp
@@ -30,8 +30,7 @@
 
 ACE_RCSID(Proactor, test_timeout, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
-     (defined (ACE_HAS_AIO_CALLS)) && !defined (ACE_POSIX_AIOCB_PROACTOR))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
   // This only works on Win32 platforms and on Unix platforms supporting
   // POSIX aio calls.
 
@@ -116,7 +115,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
+#else /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
 int
 main (int, char *[])
@@ -127,4 +126,4 @@ main (int, char *[])
   return 1;
 }
 
-#endif /*  ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
+#endif /*  ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp
index ae44c2ba1f4..c7a984b9eb2 100644
--- a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp
+++ b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp
@@ -24,7 +24,7 @@
 
 ACE_RCSID(Proactor, test_timeout, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
 // This only works on Win32 platforms and on Unix platforms supporting
 // POSIX aio calls.
 
@@ -96,4 +96,4 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
diff --git a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp
index 49d834a2884..c14dc280c9e 100644
--- a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp
+++ b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp
@@ -31,8 +31,8 @@
 
 ACE_RCSID(Proactor, test_udp_proactor, "test_proactor.cpp,v 1.29 2001/02/02 23:41:16 shuston Exp")
 
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) || defined (ACE_HAS_AIO_CALLS)
-  // This only works on Win32 platforms.
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
+  // This only works on asynch I/O-capable platforms.
 
 // Host that we're connecting to.
 static ACE_TCHAR *host = 0;
@@ -418,7 +418,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#else /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS*/
 
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
@@ -428,5 +428,5 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 1;
 }
 
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
 
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
index be787293e65..9f773cfd247 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
@@ -20,7 +20,7 @@
 
 #include "ace/OS_main.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
 
 #include "ace/Reactor.h"
 #include "ace/Registry.h"
@@ -143,4 +143,4 @@ ACE_TMAIN (int, ACE_TCHAR **)
 {
   return 0;
 }
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp
index 32438088614..dd10962b320 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp
@@ -134,7 +134,7 @@
 
 #include "ace/OS_main.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_HAS_WIN32_OVERLAPPED_IO)
 
 #include "ace/Reactor.h"
 #include "ace/Reactor_Notification_Strategy.h"
@@ -585,10 +585,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   return 0;
 }
-#else /* !ACE_WIN32 */
+#else /* !ACE_HAS_WIN32_OVERLAPPED_IO */
 int
 ACE_TMAIN (int , ACE_TCHAR *[])
 {
   return 0;
 }
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_WIN32_OVERLAPPED_IO */
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp b/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp
index f5a1994168c..1694933fd7b 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp
@@ -21,7 +21,7 @@
 
 #include "ace/OS_main.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO)
 
 #include "ace/Msg_WFMO_Reactor.h"
 #include "ace/Reactor.h"
@@ -97,4 +97,4 @@ ACE_TMAIN (int , ACE_TCHAR *[])
 {
   return 0;
 }
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_MSG_WFMO */
diff --git a/ACE/examples/Registry/test_registry_iterator.cpp b/ACE/examples/Registry/test_registry_iterator.cpp
index e24a418ca07..df776ca2fad 100644
--- a/ACE/examples/Registry/test_registry_iterator.cpp
+++ b/ACE/examples/Registry/test_registry_iterator.cpp
@@ -9,7 +9,7 @@
 
 #include "ace/OS_main.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
 
 #include "ace/Registry.h"
 
@@ -137,10 +137,10 @@ indent (u_long indentation)
   for (; indentation > 0; indentation--)
     cout << " ";
 }
-#else /* !ACE_WIN32 */
+#else /* !ACE_WIN32 || ACE_LACKS_WIN32_REGISTRY */
 int
 ACE_TMAIN (int , ACE_TCHAR *[])
 {
   return 0;
 }
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
diff --git a/ACE/examples/Registry/test_registry_update.cpp b/ACE/examples/Registry/test_registry_update.cpp
index 443f1a766ff..78cd0aabd8c 100644
--- a/ACE/examples/Registry/test_registry_update.cpp
+++ b/ACE/examples/Registry/test_registry_update.cpp
@@ -15,7 +15,7 @@
 
 #include "ace/OS_main.h"
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
 
 #include "ace/Registry.h"
 
@@ -152,10 +152,10 @@ setup_names ()
 
   component.id_ = ACE_TEXT ("Instance Counter"), ::counter_name.insert (component);
 }
-#else /* !ACE_WIN32 */
+#else /* !ACE_WIN32 || ACE_LACKS_WIN32_REGISTRY */
 int
 ACE_TMAIN (int , ACE_TCHAR *[])
 {
   return 0;
 }
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
diff --git a/ACE/protocols/ace/HTBP/HTBP_Environment.cpp b/ACE/protocols/ace/HTBP/HTBP_Environment.cpp
index bd14abcce3d..1270b681e0e 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Environment.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Environment.cpp
@@ -76,7 +76,7 @@ ACE::HTBP::Environment::initialize (int use_registry,
 int
 ACE::HTBP::Environment::open_registry_config ()
 {
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
   HKEY root =
     ACE_Configuration_Win32Registry::resolve_key
     (HKEY_LOCAL_MACHINE,ACE_TEXT("Software\\HTBP\\Environment"));
@@ -88,7 +88,7 @@ ACE::HTBP::Environment::open_registry_config ()
 #else
   errno = ENOTSUP;
   return -1;
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
 }
 
 int
diff --git a/ACE/tests/Config_Test.cpp b/ACE/tests/Config_Test.cpp
index 01bc3bf97bf..4d11e5e928b 100644
--- a/ACE/tests/Config_Test.cpp
+++ b/ACE/tests/Config_Test.cpp
@@ -512,7 +512,7 @@ run_tests (void)
     }
   }
 
-#if defined (ACE_WIN32)
+#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
   {
     ACE_Configuration_Win32Registry RegConfig (HKEY_LOCAL_MACHINE);
     int result = test_subkey_path (&RegConfig);
@@ -549,7 +549,8 @@ run_tests (void)
                         -1);
   }
 
-#endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */
+
   // Test Heap version
   ACE_Configuration_Heap heap_config;