52 files changed, 14 insertions, 2341 deletions

diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index df575bdd555..dbef0e70184 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -181,7 +181,7 @@ document</a>.</p><p>
     <td>Maintains ACE on many platforms required for their ACE and
         TAO service offerings. We support AIX,
         Embarcadero C++ Builder,
-        Windows CE, MinGW, Microsoft Visual C++, GCC,
+        MinGW, Microsoft Visual C++, GCC,
         Cygwin, VxWorks 6.x (kernel and rtp), OpenVMS on IA64,
         BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris,
         SuSE Linux on IA32/EM64T/IA64, RTEMS, QNX, LynxOS,
@@ -2065,11 +2065,6 @@ libraries.
       Please see the <a href="#NonStaticObjectManager">Non-static
       ACE_Object_Manager</a> discussion below.</p><p>
 
-  </p></li><li><b>Windows CE</b><p>
-
-      Take a look at (<a href="docs/CE-status.txt">CE-status.txt</a>) for
-      up-to-date information about ACE on Windows CE and Windows Mobile.
-
   </p></li><li><b> Solaris 7, 8, 9, and 10 using Sun ONE Studio 8 (C++ 5.5)
        or higher, Centerline C++ 2.x, GNU gcc 2.95 and
        later.</b><p>
diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp
index ef30f0833fb..1546cd03d07 100644
--- a/ACE/ace/High_Res_Timer.cpp
+++ b/ACE/ace/High_Res_Timer.cpp
@@ -227,7 +227,7 @@ ACE_High_Res_Timer::global_scale_factor ()
 #endif /* (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \
            ACE_HAS_PENTIUM) && \
           ! ACE_HAS_HI_RES_TIMER &&
-          ((WIN32 && ! WINCE) || ghs || __GNUG__) */
+          ((WIN32) || ghs || __GNUG__) */
 
   return ACE_High_Res_Timer::global_scale_factor_;
 }
diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h
index b36fc903eca..2608b6c0eb2 100644
--- a/ACE/ace/Log_Msg.h
+++ b/ACE/ace/Log_Msg.h
@@ -374,10 +374,6 @@ public:
   /// restarted.
   bool restart () const;
 
-  // = Notice that the following two function is equivalent to
-  //   "void msg_ostream (HANDLE)" and "HANDLE msg_ostream ()"
-  //   on Windows CE.  There is no <iostream.h> support on CE.
-
   /// Update the ostream without overwriting the delete_ostream_ flag.
   void msg_ostream (ACE_OSTREAM_TYPE *);
 
diff --git a/ACE/ace/Monitor_Control/Monitor_Control.mpc b/ACE/ace/Monitor_Control/Monitor_Control.mpc
index 11366c50ada..a510ac2da38 100644
--- a/ACE/ace/Monitor_Control/Monitor_Control.mpc
+++ b/ACE/ace/Monitor_Control/Monitor_Control.mpc
@@ -2,7 +2,6 @@
 project(Monitor_Control) : acelib, ace_etcl_parser, ace_output, install {
   dynamicflags += MONITOR_CONTROL_BUILD_DLL
   sharedname   = ACE_Monitor_Control
-  avoids += wince
 
   Source_Files {
     Auto_Update_Starter.cpp
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index 584fc01e02a..3a5a8d99242 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -1463,13 +1463,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
       // Wait to be awakened by a ACE_OS::signal() or
       // ACE_OS::broadcast().
 #     if defined (ACE_WIN32)
-#       if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
       result = ::WaitForSingleObject (cv->sema_, msec_timeout);
-#       else /* ACE_USES_WINCE_SEMA_SIMULATION */
-      // Can't use Win32 API on our simulated semaphores.
-      result = ACE_OS::sema_wait (&cv->sema_,
-                                  timeout);
-#       endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #     elif defined (ACE_VXWORKS)
       // Inline the call to ACE_OS::sema_wait () because it takes an
       // ACE_Time_Value argument.  Avoid the cost of that conversion . . .
@@ -1654,16 +1648,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
     return -1;
 
   // Wait to be awakened by a ACE_OS::signal() or ACE_OS::broadcast().
-#     if defined (ACE_USES_WINCE_SEMA_SIMULATION)
-  // Can't use Win32 API on simulated semaphores.
-  result = ACE_OS::sema_wait (&cv->sema_,
-                              timeout);
-
-  if (result == -1 && errno == ETIME)
-    result = WAIT_TIMEOUT;
-#     else
   result = ::WaitForSingleObject (cv->sema_, msec_timeout);
-#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 
   // Reacquire lock to avoid race conditions.
   if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0)
@@ -1745,16 +1730,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv,
 
   // Wait to be awakened by a ACE_OS::cond_signal() or
   // ACE_OS::cond_broadcast().
-#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
   result = ::WaitForSingleObject (cv->sema_, INFINITE);
-#     else
-  // Can't use Win32 API on simulated semaphores.
-  result = ACE_OS::sema_wait (&cv->sema_);
-
-  if (result != WAIT_OBJECT_0 && errno == ETIME)
-    result = WAIT_TIMEOUT;
-
-#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 
   // Reacquire lock to avoid race conditions.
   if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0)
diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h
index 8ae8f7141aa..763ee8cdd10 100644
--- a/ACE/ace/OS_NS_Thread.h
+++ b/ACE/ace/OS_NS_Thread.h
@@ -264,31 +264,7 @@ typedef struct
 typedef HANDLE ACE_event_t;
 
 #     if defined (ACE_WIN32)
-//@@ ACE_USES_WINCE_SEMA_SIMULATION is used to debug
-//   semaphore simulation on WinNT.  It should be
-//   changed to ACE_USES_HAS_WINCE at some later point.
-#       if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
 typedef HANDLE ACE_sema_t;
-#       else
-/**
- * @class ACE_sema_t
- *
- * @brief Semaphore simulation for Windows CE.
- */
-class ACE_Export ACE_sema_t
-{
-public:
-  /// Serializes access to @c count_.
-  ACE_thread_mutex_t lock_;
-
-  /// This event is signaled whenever the count becomes non-zero.
-  ACE_event_t count_nonzero_;
-
-  /// Current count of the semaphore.
-  u_int count_;
-};
-
-#       endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #     endif /* defined (ACE_WIN32) */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl
index 6286b1b715e..b5bed453b35 100644
--- a/ACE/ace/OS_NS_Thread.inl
+++ b/ACE/ace/OS_NS_Thread.inl
@@ -1474,14 +1474,10 @@ ACE_OS::sema_destroy (ACE_sema_t *s)
   int r2 = ACE_OS::cond_destroy (&s->count_nonzero_);
   return r1 != 0 || r2 != 0 ? -1 : 0;
 # elif defined (ACE_HAS_WTHREADS)
-#  if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CloseHandle (*s), ace_result_), int, -1);
-#  else /* ACE_USES_WINCE_SEMA_SIMULATION */
   // Free up underlying objects of the simulated semaphore.
   int const r1 = ACE_OS::thread_mutex_destroy (&s->lock_);
   int const r2 = ACE_OS::event_destroy (&s->count_nonzero_);
   return r1 != 0 || r2 != 0 ? -1 : 0;
-#  endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 # elif defined (ACE_VXWORKS)
   int result;
   ACE_OSCALL (::semDelete (s->sema_), int, result);
@@ -1782,7 +1778,6 @@ ACE_OS::sema_init (ACE_sema_t *s,
   return result;
 #  elif defined (ACE_HAS_WTHREADS)
   ACE_UNUSED_ARG (attributes);
-#    if ! defined (ACE_USES_WINCE_SEMA_SIMULATION)
   ACE_UNUSED_ARG (type);
   ACE_UNUSED_ARG (arg);
   // Create the semaphore with its value initialized to <count> and
@@ -1804,40 +1799,6 @@ ACE_OS::sema_init (ACE_sema_t *s,
       ACE_OS::set_errno_to_last_error ();
       return 0;
     }
-#    else /* ACE_USES_WINCE_SEMA_SIMULATION */
-  int result = -1;
-
-  // Initialize internal object for semaphore simulation.
-  // Grab the lock as soon as possible when we initializing
-  // the semaphore count.  Notice that we initialize the
-  // event object as "manually reset" so we can amortize the
-  // cost for singling/reseting the event.
-  // @@ I changed the mutex type to thread_mutex.  Notice that this
-  // is basically a CriticalSection object and doesn't not has
-  // any security attribute whatsoever.  However, since this
-  // semaphore implementation only works within a process, there
-  // shouldn't any security issue at all.
-  if (ACE_OS::thread_mutex_init (&s->lock_, type, name, (ACE_mutexattr_t *)arg) == 0
-      && ACE_OS::event_init (&s->count_nonzero_, 1,
-                             count > 0, type, name, arg, sa) == 0
-      && ACE_OS::thread_mutex_lock (&s->lock_) == 0)
-    {
-      s->count_ = count;
-
-      if (ACE_OS::thread_mutex_unlock (&s->lock_) == 0)
-        result = 0;
-    }
-
-  // Destroy the internal objects if we didn't initialize
-  // either of them successfully.  Don't bother to check
-  // for errors.
-  if (result == -1)
-    {
-      ACE_OS::thread_mutex_destroy (&s->lock_);
-      ACE_OS::event_destroy (&s->count_nonzero_);
-    }
-  return result;
-#    endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #  elif defined (ACE_VXWORKS)
   ACE_UNUSED_ARG (attributes);
   ACE_UNUSED_ARG (name);
@@ -1887,7 +1848,6 @@ ACE_OS::sema_init (ACE_sema_t *s,
 {
 # if defined (ACE_HAS_WTHREADS)
   ACE_UNUSED_ARG (attributes);
-#   if ! defined (ACE_USES_WINCE_SEMA_SIMULATION)
   ACE_UNUSED_ARG (type);
   ACE_UNUSED_ARG (arg);
   // Create the semaphore with its value initialized to <count> and
@@ -1909,40 +1869,6 @@ ACE_OS::sema_init (ACE_sema_t *s,
       ACE_OS::set_errno_to_last_error ();
       return 0;
     }
-#   else /* ACE_USES_WINCE_SEMA_SIMULATION */
-  int result = -1;
-
-  // Initialize internal object for semaphore simulation.
-  // Grab the lock as soon as possible when we initializing
-  // the semaphore count.  Notice that we initialize the
-  // event object as "manually reset" so we can amortize the
-  // cost for singling/reseting the event.
-  // @@ I changed the mutex type to thread_mutex.  Notice that this
-  // is basically a CriticalSection object and doesn't not has
-  // any security attribute whatsoever.  However, since this
-  // semaphore implementation only works within a process, there
-  // shouldn't any security issue at all.
-  if (ACE_OS::thread_mutex_init (&s->lock_, type, name, (ACE_mutexattr_t *)arg) == 0
-      && ACE_OS::event_init (&s->count_nonzero_, 1,
-                             count > 0, type, name, arg, sa) == 0
-      && ACE_OS::thread_mutex_lock (&s->lock_) == 0)
-    {
-      s->count_ = count;
-
-      if (ACE_OS::thread_mutex_unlock (&s->lock_) == 0)
-        result = 0;
-    }
-
-  // Destroy the internal objects if we didn't initialize
-  // either of them successfully.  Don't bother to check
-  // for errors.
-  if (result == -1)
-    {
-      ACE_OS::thread_mutex_destroy (&s->lock_);
-      ACE_OS::event_destroy (&s->count_nonzero_);
-    }
-  return result;
-#   endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 # else /* ACE_HAS_WTHREADS */
   // Just call the normal char version.
   return ACE_OS::sema_init (s, count, type, attributes, ACE_Wide_To_Ascii (name).char_rep (), arg, max, sa);
@@ -2016,29 +1942,9 @@ ACE_OS::sema_post (ACE_sema_t *s)
     }
   return result;
 #   elif defined (ACE_HAS_WTHREADS)
-#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::ReleaseSemaphore (*s, 1, 0),
                                           ace_result_),
                         int, -1);
-#     else /* ACE_USES_WINCE_SEMA_SIMULATION */
-  int result = -1;
-
-  // Since we are simulating semaphores, we need to update semaphore
-  // count manually.  Grab the lock to prevent race condition first.
-  if (ACE_OS::thread_mutex_lock (&s->lock_) == 0)
-    {
-      // Check the original state of event object.  Single the event
-      // object in transition from semaphore not available to
-      // semaphore available.
-      if (s->count_++ <= 0)
-        result = ACE_OS::event_signal (&s->count_nonzero_);
-      else
-        result = 0;
-
-      ACE_OS::thread_mutex_unlock (&s->lock_);
-    }
-  return result;
-#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #   elif defined (ACE_VXWORKS)
   return ::semGive (s->sema_);
 #   endif /* ACE_HAS_STHREADS */
@@ -2051,7 +1957,7 @@ ACE_OS::sema_post (ACE_sema_t *s)
 ACE_INLINE int
 ACE_OS::sema_post (ACE_sema_t *s, u_int release_count)
 {
-#if defined (ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION)
+#if defined (ACE_WIN32)
   // Win32 supports this natively.
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::ReleaseSemaphore (*s, release_count, 0),
                                           ace_result_), int, -1);
@@ -2125,7 +2031,6 @@ ACE_OS::sema_trywait (ACE_sema_t *s)
     }
   return result;
 #   elif defined (ACE_HAS_WTHREADS)
-#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
   DWORD result = ::WaitForSingleObject (*s, 0);
 
   if (result == WAIT_OBJECT_0)
@@ -2139,41 +2044,6 @@ ACE_OS::sema_trywait (ACE_sema_t *s)
       // This is a hack, we need to find an appropriate mapping...
       return -1;
     }
-#     else /* ACE_USES_WINCE_SEMA_SIMULATION */
-  // Check the status of semaphore first.  Return immediately
-  // if the semaphore is not available and avoid grabing the
-  // lock.
-  DWORD result = ::WaitForSingleObject (s->count_nonzero_, 0);
-
-  if (result == WAIT_OBJECT_0)  // Proceed when it is available.
-    {
-      ACE_OS::thread_mutex_lock (&s->lock_);
-
-      // Need to double check if the semaphore is still available.
-      // The double checking scheme will slightly affect the
-      // efficiency if most of the time semaphores are not blocked.
-      result = ::WaitForSingleObject (s->count_nonzero_, 0);
-      if (result == WAIT_OBJECT_0)
-        {
-          // Adjust the semaphore count.  Only update the event
-          // object status when the state changed.
-          s->count_--;
-          if (s->count_ <= 0)
-            ACE_OS::event_reset (&s->count_nonzero_);
-          result = 0;
-        }
-
-      ACE_OS::thread_mutex_unlock (&s->lock_);
-    }
-
-  // Translate error message to errno used by ACE.
-  if (result == WAIT_TIMEOUT)
-    errno = EBUSY;
-  else
-    ACE_OS::set_errno_to_last_error ();
-  // This is taken from the hack above. ;)
-  return -1;
-#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #   elif defined (ACE_VXWORKS)
   if (::semTake (s->sema_, NO_WAIT) == ERROR)
     if (errno == S_objLib_OBJ_UNAVAILABLE)
@@ -2244,7 +2114,6 @@ ACE_OS::sema_wait (ACE_sema_t *s)
   return result < 0 ? -1 : result;
 
 #   elif defined (ACE_HAS_WTHREADS)
-#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
   switch (::WaitForSingleObject (*s, INFINITE))
     {
     case WAIT_OBJECT_0:
@@ -2255,46 +2124,6 @@ ACE_OS::sema_wait (ACE_sema_t *s)
       return -1;
     }
   /* NOTREACHED */
-#     else /* ACE_USES_WINCE_SEMA_SIMULATION */
-  // Timed wait.
-  int result = -1;
-  for (;;)
-    // Check if the semaphore is avialable or not and wait forever.
-    // Don't bother to grab the lock if it is not available (to avoid
-    // deadlock.)
-    switch (::WaitForSingleObject (s->count_nonzero_, INFINITE))
-      {
-      case WAIT_OBJECT_0:
-        ACE_OS::thread_mutex_lock (&s->lock_);
-
-        // Need to double check if the semaphore is still available.
-        // This time, we shouldn't wait at all.
-        if (::WaitForSingleObject (s->count_nonzero_, 0) == WAIT_OBJECT_0)
-          {
-            // Decrease the internal counter.  Only update the event
-            // object's status when the state changed.
-            s->count_--;
-            if (s->count_ <= 0)
-              ACE_OS::event_reset (&s->count_nonzero_);
-            result = 0;
-          }
-
-        ACE_OS::thread_mutex_unlock (&s->lock_);
-        // if we didn't get a hold on the semaphore, the result won't
-        // be 0 and thus, we'll start from the beginning again.
-        if (result == 0)
-          return 0;
-        break;
-
-      default:
-        // Since we wait indefinitely, anything other than
-        // WAIT_OBJECT_O indicates an error.
-        ACE_OS::set_errno_to_last_error ();
-        // This is taken from the hack above. ;)
-        return -1;
-      }
-  /* NOTREACHED */
-#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #   elif defined (ACE_VXWORKS)
   return ::semTake (s->sema_, WAIT_FOREVER);
 #   endif /* ACE_HAS_STHREADS */
@@ -2447,7 +2276,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
   ACE_PTHREAD_CLEANUP_POP (0);
   return result < 0 ? -1 : result;
 #   elif defined (ACE_HAS_WTHREADS)
-#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
   int msec_timeout;
 
   if (tv == ACE_Time_Value::zero)
@@ -2481,78 +2309,6 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
       return -1;
     }
   /* NOTREACHED */
-#     else /* ACE_USES_WINCE_SEMA_SIMULATION */
-  // Note that in this mode, the acquire is done in two steps, and
-  // we may get signaled but cannot grab the semaphore before
-  // timeout.  In that case, we'll need to restart the process with
-  // updated timeout value.
-
-  // tv is an absolute time, but we need relative to work with the Windows
-  // API. Also, some users have become accustomed to using a 0 time value
-  // as a shortcut for "now", which works on non-Windows because 0 is
-  // always earlier than now. However, the need to convert to relative time
-  // means we need to watch out for this case.
-  ACE_Time_Value relative_time (ACE_Time_Value::zero);
-  if (tv != ACE_Time_Value::zero)
-    relative_time = tv.to_relative_time ();
-  int result = -1;
-
-  // While we are not timeout yet. >= 0 will let this go through once
-  // and if not able to get the object, it should hit WAIT_TIMEOUT
-  // right away.
-  while (relative_time >= ACE_Time_Value::zero)
-    {
-      // Wait for our turn to get the object.
-      switch (::WaitForSingleObject (s->count_nonzero_, relative_time.msec ()))
-        {
-        case WAIT_OBJECT_0:
-          ACE_OS::thread_mutex_lock (&s->lock_);
-
-          // Need to double check if the semaphore is still available.
-          // We can only do a "try lock" styled wait here to avoid
-          // blocking threads that want to signal the semaphore.
-          if (::WaitForSingleObject (s->count_nonzero_, 0) == WAIT_OBJECT_0)
-            {
-              // As before, only reset the object when the semaphore
-              // is no longer available.
-              s->count_--;
-              if (s->count_ <= 0)
-                ACE_OS::event_reset (&s->count_nonzero_);
-              result = 0;
-            }
-
-          ACE_OS::thread_mutex_unlock (&s->lock_);
-
-          // Only return when we successfully get the semaphore.
-          if (result == 0)
-            {
-              tv = tv.now ();     // Update to time acquired
-              return 0;
-            }
-          break;
-
-          // We have timed out.
-        case WAIT_TIMEOUT:
-          errno = ETIME;
-          return -1;
-
-          // What?
-        default:
-          ACE_OS::set_errno_to_last_error ();
-          // This is taken from the hack above. ;)
-          return -1;
-        };
-
-      // Haven't been able to get the semaphore yet, update the
-      // timeout value to reflect the remaining time we want to wait.
-      // in case of tv == 0 relative_time will now be < 0 and we will be out of time
-      relative_time = tv.to_relative_time ();
-    }
-
-  // We have timed out.
-  errno = ETIME;
-  return -1;
-#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 #   elif defined (ACE_VXWORKS)
   // Note that we must convert between absolute time (which is
   // passed as a parameter) and relative time (which is what
diff --git a/ACE/ace/OS_NS_dlfcn.inl b/ACE/ace/OS_NS_dlfcn.inl
index 998c1c235e4..93f09f91229 100644
--- a/ACE/ace/OS_NS_dlfcn.inl
+++ b/ACE/ace/OS_NS_dlfcn.inl
@@ -183,7 +183,6 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
 
   // Get the correct OS type.
 #if defined (ACE_USES_WCHAR)
-  // WinCE is WCHAR always; other platforms need a char * symbol name
   ACE_Wide_To_Ascii w_sname (sname);
   char *symbolname = w_sname.char_rep ();
 #elif defined (ACE_VXWORKS)
diff --git a/ACE/ace/OS_NS_sys_utsname.cpp b/ACE/ace/OS_NS_sys_utsname.cpp
index b073a641a59..604947b5825 100644
--- a/ACE/ace/OS_NS_sys_utsname.cpp
+++ b/ACE/ace/OS_NS_sys_utsname.cpp
@@ -164,8 +164,6 @@ ACE_OS::uname (ACE_utsname *name)
 #     endif
         case PROCESSOR_ARCHITECTURE_UNKNOWN:
         default:
-          // @@ We could provide WinCE specific info here.  But let's
-          //    defer that to some later point.
           ACE_OS::strcpy (processor, "Unknown");
           break;
         }
diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl
index c4406ba083f..dc2f8b7a38c 100644
--- a/ACE/ace/OS_NS_unistd.inl
+++ b/ACE/ace/OS_NS_unistd.inl
@@ -40,7 +40,6 @@ ACE_OS::access (const char *path, int amode)
   ACE_OS_TRACE ("ACE_OS::access");
 #if defined (ACE_LACKS_ACCESS)
 #  if defined (ACE_HAS_ACCESS_EMULATION)
-  // @@ WINCE: There should be a Win32 API that can do this.
   // Hard coded read access here.
   ACE_UNUSED_ARG (amode);
   FILE* handle = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(path),
diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h
index 659128726af..70aa7c2f0d3 100644
--- a/ACE/ace/Process.h
+++ b/ACE/ace/Process.h
@@ -35,11 +35,6 @@ class ACE_Time_Value;
  *
  * This class controls the options passed to <CreateProcess> (or <fork>
  * and <exec>).
- * Notice that on Windows CE, creating a process merely means
- * instantiating a new process.  You can't set the handles (since
- * there's no stdin, stdout and stderr,) specify process/thread
- * options, set environment,...  So, basically, this class only
- * set the command line and nothing else.
  * Notice that on UNIX platforms, if the <setenv> is used, the
  * <spawn> is using the <execve> system call. It means that the
  * <command_line> should include a full path to the program file
diff --git a/ACE/ace/README b/ACE/ace/README
index d43ec628884..af8df013528 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -145,7 +145,6 @@ ACE_DEFAULT_LD_SEARCH_PATH              Specify the platform default search
                                         paths.  This macro should only be
                                         defined on platforms that don't
                                         support environment variables at all
-                                        (i.e., Windows CE.)
 ACE_THREADS_DONT_INHERIT_LOG_MSG        Specify this if you don't want
                                         threads to inherit parent
                                         thread's ACE_Log_Msg
diff --git a/ACE/ace/Stack_Trace.h b/ACE/ace/Stack_Trace.h
index 14cdcc0126b..dce77355f45 100644
--- a/ACE/ace/Stack_Trace.h
+++ b/ACE/ace/Stack_Trace.h
@@ -53,7 +53,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *          (this covers Linux and Mac) and gcc version >= 3.3.
  *        - VxWorks, both kernel and RTP
  *        - Solaris
- *        - Windows 32 and 64 bit (Visual C++, excluding WinCE/mobile)
+ *        - Windows 32 and 64 bit (Visual C++)
  *
  *  @note Since stack trace buffer size has limitation(@c ACE_STACK_TRACE_SYMBUFSIZ), you will not
  *        get a complete stack trace if @c ACE_STACK_TRACE_SYMBUFSIZ value is less than actual stack
diff --git a/ACE/ace/Token.h b/ACE/ace/Token.h
index 9d024820b24..909c25c3cb5 100644
--- a/ACE/ace/Token.h
+++ b/ACE/ace/Token.h
@@ -27,7 +27,7 @@
 
 #include "ace/Thread_Mutex.h"
 
-#if (defined (ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION)) || defined (ACE_HAS_VXTHREADS)
+#if defined (ACE_WIN32) || defined (ACE_HAS_VXTHREADS)
 // If platforms support semaphores with timed wait, then we use semaphores instead of c.v.
 # define ACE_TOKEN_USES_SEMAPHORE
 #endif /* ACE_WIN32 || ACE_HAS_VXTHREADS */
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
index 0ea1e2dc3ad..138031e20f5 100644
--- a/ACE/ace/config-macros.h
+++ b/ACE/ace/config-macros.h
@@ -102,7 +102,7 @@
 # if !defined (ACE_HAS_PROCESS_SPAWN)
 #   if !defined (ACE_LACKS_FORK) || \
        (defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP)) || \
-       defined (ACE_WINCE) || defined (ACE_OPENVMS)
+       || defined (ACE_OPENVMS)
 #     define ACE_HAS_PROCESS_SPAWN 1
 #   endif
 # endif /* ACE_HAS_PROCESS_SPAWN */
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index 0fefd503072..fd0fbec629d 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -99,8 +99,6 @@
 # define ACE_MT_SAFE 1
 #endif
 
-// On winCE these classes do not exist. If they are
-// introduced in the future, no changes need to be made
 #if defined (ABOVE_NORMAL_PRIORITY_CLASS) && \
   defined (BELOW_NORMAL_PRIORITY_CLASS) && \
   defined (HIGH_PRIORITY_CLASS) && \
diff --git a/ACE/bin/MakeProjectCreator/config/ace_mc.mpb b/ACE/bin/MakeProjectCreator/config/ace_mc.mpb
index 7be197f05a0..1146452ceeb 100644
--- a/ACE/bin/MakeProjectCreator/config/ace_mc.mpb
+++ b/ACE/bin/MakeProjectCreator/config/ace_mc.mpb
@@ -2,7 +2,6 @@
 project : ace_etcl_parser {
   after += Monitor_Control
   libs += ACE_Monitor_Control
-  avoids += wince
 
   specific (prop:microsoft) {
     lit_libs += pdh
diff --git a/ACE/bin/MakeProjectCreator/config/inet.mpb b/ACE/bin/MakeProjectCreator/config/inet.mpb
index dd5094fe901..1915c061c30 100644
--- a/ACE/bin/MakeProjectCreator/config/inet.mpb
+++ b/ACE/bin/MakeProjectCreator/config/inet.mpb
@@ -1,6 +1,5 @@
 // -*- MPC -*-
 project : acelib {
-  avoids   += wince
   avoids   += old_stdstream
   avoids   += exclude_inet
   avoids   += ace_for_tao
@@ -9,4 +8,4 @@ project : acelib {
   libs     += ACE_INet
   includes += $(ACE_ROOT)/protocols
 }
- 
+
diff --git a/ACE/contrib/FaCE/ACE.ico b/ACE/contrib/FaCE/ACE.ico
deleted file mode 100644
index 3efedc9021b..00000000000
--- a/ACE/contrib/FaCE/ACE.ico
+++ /dev/null
diff --git a/ACE/contrib/FaCE/ACE_Racer.bmp b/ACE/contrib/FaCE/ACE_Racer.bmp
deleted file mode 100644
index a487f63f81c..00000000000
--- a/ACE/contrib/FaCE/ACE_Racer.bmp
+++ /dev/null
diff --git a/ACE/contrib/FaCE/CE_ARGV.cpp b/ACE/contrib/FaCE/CE_ARGV.cpp
deleted file mode 100644
index 463ed1e41c8..00000000000
--- a/ACE/contrib/FaCE/CE_ARGV.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-#include "CE_ARGV.h"
-
-CE_ARGV::CE_ARGV(wchar_t* cmdLine)
-: ce_argv_(0)
-, ce_argc_(0)
-{
-    const wchar_t* dummyArgv = L"root";  // dummy for the first argv
-    const wchar_t* separator = L" ";     // blank space is a separator
-
-    int formattedCmdLineLength = wcslen(dummyArgv) +
-                                 wcslen(separator) +
-                                 1;  // 1 is for the NULL at the end
-
-    if (wcslen(cmdLine) > 0) {
-        formattedCmdLineLength += wcslen(cmdLine);
-        formattedCmdLineLength += wcslen(separator);
-    }
-
-    // formattedCmdLine will have dummyArgv and a separator at the beginning of cmdLine
-    // and a separator at the end to generalize format and reduce the amount of code
-    wchar_t* formattedCmdLine = 0;
-    formattedCmdLine = new wchar_t[formattedCmdLineLength];
-
-    wcscpy(formattedCmdLine, dummyArgv);
-    wcscat(formattedCmdLine, separator);
-
-    int max_possible_argc = 1;  // start with 1 because of the dummyArgv at the beginning
-
-    if (wcslen(cmdLine) > 0) {
-        int formattedPos  = wcslen(formattedCmdLine);
-        int cmdLineLength = wcslen(cmdLine);
-
-        // Inside of this for loop, it does same thing as strcat except it
-        // checks and puts only one single white space between two argv entries.
-        for (int i = 0; i < cmdLineLength; ++i) {
-            if (iswspace(cmdLine[i]) != 0) {
-                ++max_possible_argc;  // counting the number of white spaces
-            }
-
-            formattedCmdLine[formattedPos++] = cmdLine[i];
-
-            if (iswspace(cmdLine[i]) != 0) {
-                // make sure there is only one white space between two argv entries.
-                while ((i < cmdLineLength) && (iswspace(cmdLine[i + 1]) != 0)) {
-                    ++i;
-                }
-            }
-        }
-
-        formattedCmdLine[formattedPos] = 0;
-        wcscat(formattedCmdLine, separator);  // make sure formattedCmdLine ends with a blank
-    }
-
-    int formattedCmdLength = wcslen(formattedCmdLine);
-
-    bool insideQuotation = false;
-    int* argv_strlen = 0;
-    int entry_size = 0;
-    argv_strlen = new int[max_possible_argc];
-
-    // determine argc
-    for (int i = 0; i < formattedCmdLength; ++i) {
-        if (formattedCmdLine[i] == '\\') {
-            ++i; // ignore the following character
-            ++entry_size;
-        }
-        else if (formattedCmdLine[i] == '"') {
-            insideQuotation = !insideQuotation;
-        }
-        else if ((!insideQuotation) && (iswspace(formattedCmdLine[i]) != 0)) {
-            // new argv entry end found
-            argv_strlen[ce_argc_++] = entry_size;  // cache the size of this entry
-            entry_size = 0;
-        }
-        else {
-            ++entry_size;
-        }
-    }
-
-    ce_argv_ = new wchar_t*[ce_argc_ + 1];
-    ce_argv_[ce_argc_] = 0;  // Last command line entry is a NULL.
-
-    for (int j = 0, cmdLinePos = 0; j < ce_argc_; ++j, ++cmdLinePos) {
-        int length = argv_strlen[j];
-
-        ce_argv_[j] = new wchar_t[length + 1];
-        ce_argv_[j][length] = 0;  // string termination null
-
-        if (iswspace(formattedCmdLine[cmdLinePos]) != 0) {
-            // This is where prior argv has trailing '"' at the end.
-            ++cmdLinePos;
-        }
-
-        for (int n = 0; n < length; ++n, ++cmdLinePos) {
-            if ((formattedCmdLine[cmdLinePos] == '\\') || (formattedCmdLine[cmdLinePos] == '"')) {
-                ++cmdLinePos;
-            }
-
-            ce_argv_[j][n] = formattedCmdLine[cmdLinePos];
-        }
-    }
-
-    delete [] argv_strlen;
-    delete [] formattedCmdLine;
-}
-
-
-CE_ARGV::~CE_ARGV()
-{
-    for (int i = 0; i < ce_argc_; ++i) {
-        delete [] ce_argv_[i];
-    }
-
-    delete [] ce_argv_;
-}
diff --git a/ACE/contrib/FaCE/CE_ARGV.h b/ACE/contrib/FaCE/CE_ARGV.h
deleted file mode 100644
index 083432bb313..00000000000
--- a/ACE/contrib/FaCE/CE_ARGV.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    CE_ARGV.h
- *
- *  @author Si Mong Park <spark@ociweb.com>
- */
-//=============================================================================
-
-#ifndef CE_ARGV_H
-#define CE_ARGV_H
-
-#include <windows.h>
-#include <ctype.h>
-
-
-/**
- * @class CE_ARGV
- *
- * @brief This class is to hash input parameters, argc and argv, for WinCE platform.
- *
- * Since WinCE only supports wchar_t as an input from OS, some implementation detail,
- * especially for CORBA spec, will not support wchar_t (wchar_t) type parameter.
- * Moreover, WinCE's input parameter type is totally different than any other OS;
- * all command line parameters will be stored in a single wide-character string with
- * each unit parameter divided by blank space, and it does not provide the name of
- * executable (generally known as argv[0]).
- * This class is to convert CE's command line parameters and simulate as in the same
- * manner as other general platforms, adding 'root' as a first argc, which is for the
- * name of executable in other OS.
- */
-class CE_ARGV
-{
-public:
-    /**
-     * Ctor accepts CE command line as a parameter.
-     */
-    CE_ARGV(wchar_t* cmdLine);
-
-    /**
-     * Default Dtor that deletes any memory allocated for the converted string.
-     */
-    ~CE_ARGV();
-
-    /**
-     * Returns the number of command line parameters, same as argc on Unix.
-     */
-    int argc();
-
-    /**
-     * Returns the 'char**' that contains the converted command line parameters.
-     */
-    wchar_t** argv();
-
-private:
-    /**
-     * Copy Ctor is not allowed.
-     */
-    CE_ARGV();
-
-    /**
-     * Copy Ctor is not allowed.
-     */
-    CE_ARGV(CE_ARGV&);
-
-    /**
-     * Pointer of converted command line parameters.
-     */
-    wchar_t** ce_argv_;
-
-    /**
-     * Integer that is same as argc on other OS's.
-     */
-    int ce_argc_;
-};
-
-
-inline int CE_ARGV::argc()
-{
-    return ce_argc_;
-}
-
-
-inline wchar_t** CE_ARGV::argv()
-{
-    return ce_argv_;
-}
-
-#endif  // CE_ARGV_H
diff --git a/ACE/contrib/FaCE/CE_Screen_Output.cpp b/ACE/contrib/FaCE/CE_Screen_Output.cpp
deleted file mode 100644
index f0d0caf6b02..00000000000
--- a/ACE/contrib/FaCE/CE_Screen_Output.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-#include "CE_Screen_Output.h"
-#include <string.h>
-
-// This utility does not use ACE, and shouldn't.
-//FUZZ: disable check_for_lack_ACE_OS
-
-HWND CE_Screen_Output::handler_ = 0;
-
-
-CE_Screen_Output::CE_Screen_Output()
-: pFile_(0)
-{
-}
-
-
-CE_Screen_Output::~CE_Screen_Output()
-{
-    if (pFile_ != 0) {
-        fclose(pFile_);
-    }
-}
-
-
-void CE_Screen_Output::SetOutputWindow(HWND hEdit)
-{
-    handler_ = hEdit;
-}
-
-
-void CE_Screen_Output::clear()
-{
-    SetWindowText(handler_, 0);
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (wchar_t* output)
-{
-    int length = GetWindowTextLength(handler_);
-    SendMessage(handler_, EM_SETSEL, length, length);
-    SendMessage(handler_, EM_REPLACESEL, 0, (LPARAM)output);
-
-    if (pFile_ != 0)
-    {
-        fwprintf(pFile_, L"%s", output);
-    }
-
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (const wchar_t* output)
-{
-    wchar_t* buffer = _wcsdup(output);
-    if (buffer != 0)
-    {
-        *this << buffer;
-        delete buffer;
-    }
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (char* output)
-{
-    int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, 0, 0);
-    wchar_t* w_output = new wchar_t[len];
-
-    MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, w_output, len);
-    *this << w_output;
-
-    delete w_output;
-
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (const char* output)
-{
-    int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, 0, 0);
-    wchar_t* w_output = new wchar_t[len];
-
-    MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, output, -1, w_output, len);
-    *this << w_output;
-
-    delete [] w_output;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (char output)
-{
-    *this << (int)output;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (unsigned char output)
-{
-    *this << (int)output;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (unsigned short output)
-{
-  wchar_t buffer[20];
-  wsprintf(buffer, L"%u", output);
-  *this << buffer;
-  return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (int output)
-{
-    wchar_t buffer[20];
-    wsprintf(buffer, L"%d", output);
-    *this << buffer;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (unsigned int output)
-{
-    wchar_t buffer[20];
-    wsprintf(buffer, L"%du", output);
-    *this << buffer;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (float output)
-{
-    wchar_t buffer[20];
-    swprintf(buffer, L"%f", output);
-    *this << buffer;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (long output)
-{
-    wchar_t buffer[20];
-    wsprintf(buffer, L"%l", output);
-    *this << buffer;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (unsigned long output)
-{
-    wchar_t buffer[20];
-    wsprintf(buffer, L"%lu", output);
-    *this << buffer;
-    return *this;
-}
-
-
-CE_Screen_Output& CE_Screen_Output::operator << (FILE* pFile)
-{
-    pFile_ = pFile;
-    return *this;
-}
-
-//FUZZ: enable check_for_lack_ACE_OS
diff --git a/ACE/contrib/FaCE/CE_Screen_Output.h b/ACE/contrib/FaCE/CE_Screen_Output.h
deleted file mode 100644
index 63746e21a0c..00000000000
--- a/ACE/contrib/FaCE/CE_Screen_Output.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- *  @file    CE_Screen_Output.h
- *
- *  @author Si Mong Park  <spark@ociweb.com>
- */
-//=============================================================================
-
-#ifndef CE_Screen_Output_h
-#define CE_Screen_Output_h
-
-#include <windows.h>
-#include <stdio.h>
-
-const wchar_t endl[] = L"\r\n";
-const wchar_t tab[]  = L"\t";
-
-/**
- * @class CE_Screen_Output
- *
- * @brief Replacement of text output for Windows CE.
- *
- * This class allows standard text output to be displayed on
- * text window for Windows CE.  Generally, all ACE output will
- * go through under CE if and only if user uses WindozeCE
- * implementation by using main_ce instead of main.
- * Also, for the easier debugging purpose, object pointer of
- * this class can be gotten from ACE_Log_Msg::msg_callback()
- * and then can be used directly by user just like cout stream.
- */
-class CE_Screen_Output
-{
-public:
-    /**
-     * Default Ctor
-     */
-    CE_Screen_Output();
-
-    /**
-     * Default Dtor
-     */
-    virtual ~CE_Screen_Output();
-
-    /**
-     * Interface to specify active window handle.
-     */
-    void SetOutputWindow(HWND hWnd);
-
-    /**
-     * Clears text screen.
-     */
-    void clear();
-
-    /**
-     * << operator that performs actual print out.
-     *
-     * Note: This is the only one operator that performs
-     *       output.  All other perators convert the type and
-     *       use this operator underneath.
-     */
-    CE_Screen_Output& operator << (wchar_t*);
-    CE_Screen_Output& operator << (const wchar_t*);
-
-    CE_Screen_Output& operator << (char* output);
-    CE_Screen_Output& operator << (const char* output);
-
-    CE_Screen_Output& operator << (char output);
-    CE_Screen_Output& operator << (unsigned char output);
-
-    CE_Screen_Output& operator << (unsigned short output);
-
-    CE_Screen_Output& operator << (int output);
-    CE_Screen_Output& operator << (unsigned int output);
-
-    CE_Screen_Output& operator << (float output);
-
-    CE_Screen_Output& operator << (long output);
-    CE_Screen_Output& operator << (unsigned long output);
-
-    CE_Screen_Output& operator << (FILE* pFile);
-
-private:
-    /**
-     * Copy Ctor
-     */
-    CE_Screen_Output(CE_Screen_Output&);
-
-    static HWND handler_;
-
-    /**
-     * File pointer that used to save output to file.
-     * This class does not own the file handler pointer.
-     */
-    FILE* pFile_;
-};
-
-#endif  // CE_Screen_Output_h
diff --git a/ACE/contrib/FaCE/FACE.ico b/ACE/contrib/FaCE/FACE.ico
deleted file mode 100644
index 8a91925b128..00000000000
--- a/ACE/contrib/FaCE/FACE.ico
+++ /dev/null
diff --git a/ACE/contrib/FaCE/FaCE.cpp b/ACE/contrib/FaCE/FaCE.cpp
deleted file mode 100644
index 265e21cbeee..00000000000
--- a/ACE/contrib/FaCE/FaCE.cpp
+++ /dev/null
@@ -1,652 +0,0 @@
-#include "FaCE.h"
-
-#ifdef NO_ACE
-
-#include "CE_ARGV.h"
-
-#else
-
-#include <ace/ACE.h>
-#include <ace/ARGV.h>
-#include <ace/Log_Msg.h>
-
-#endif  // NO_ACE
-
-#include <commctrl.h>
-#include <aygshell.h>
-#include <sipapi.h>
-
-// This utility does not use ACE, and shouldn't.
-//FUZZ: disable check_for_lack_ACE_OS
-
-const ACE_TCHAR* g_ParameterFileName = ACE_TEXT("Parameters.txt");
-
-/**
- * This simple and small class manages user-input command line
- * parameters and parameter history file.
- *
- * @author Si Mong Park (spark@ociweb.com)
- */
-class ParameterList
-{
-public:
-    /**
-     * Default Ctor.
-     */
-    ParameterList() : next_(0), param_(0) {};
-
-    /**
-     * Dtor: deletes all sub-PameterList objects as well as
-     *       memory block allocated for the param_ by _wcsdup().
-     */
-    ~ParameterList() { free(param_); delete next_; };
-
-    /**
-     * Add a new parameter to the list.
-     */
-    void addParameter(char*);
-
-    /**
-     * Add a new parameter to the list.
-     */
-    void addParameter(ACE_TCHAR*);
-
-    /**
-     * Save all parameters stored in the list to the
-     * file.
-     * Note that 'outputFile' is only for the internal use
-     * and user must call this function without any parameter.
-     */
-    void saveParameter(FILE* outputFile = 0);
-
-    /**
-     * Send out windows message to load/update parameters.
-     */
-    void sendParameterMSG(HWND, UINT);
-
-private:
-    /**
-     * A pointer to the next ParameterList object.
-     * This attribute is totally hidden from user.
-     */
-    ParameterList* next_;
-
-    /**
-     * User-specified command line parameter.
-     * This attribute is totally hidden from user.
-     */
-    ACE_TCHAR* param_;
-};
-
-
-void ParameterList::addParameter(char* newParameter)
-{
-#ifdef NO_ACE
-    int len = MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, newParameter, -1, 0, 0);
-    wchar_t* w_output = new wchar_t[len];
-
-    MultiByteToWideChar(CP_OEMCP, MB_PRECOMPOSED, newParameter, -1, w_output, len);
-    this->addParameter(w_output);
-
-    delete [] w_output;
-#else
-    this->addParameter(ACE_TEXT_CHAR_TO_TCHAR(newParameter));
-#endif  // NO_ACE
-}
-
-
-void ParameterList::addParameter(ACE_TCHAR* newParameter)
-{
-    if (this->param_ == 0) {
-        this->param_ = _wcsdup(newParameter);
-        this->next_ = new ParameterList();  // create and add a new ParameterList object
-    }
-    else {
-        if (wcscmp(this->param_, newParameter) != 0) {
-            this->next_->addParameter(newParameter);
-        }
-    }
-}
-
-
-void ParameterList::saveParameter(FILE* outputFile)
-{
-    if ( (outputFile == 0) && (this->param_ != 0) ) {
-        outputFile = _wfopen(g_ParameterFileName, ACE_TEXT("w+"));
-    }
-
-    if (outputFile != 0) {
-        if (this->param_ != 0) {
-            fwprintf(outputFile, ACE_TEXT("%s\n"), this->param_);
-            this->next_->saveParameter(outputFile);
-        }
-        else {
-            fclose(outputFile);
-        }
-    }
-}
-
-
-void ParameterList::sendParameterMSG(HWND hDlg, UINT message)
-{
-    if (param_ != 0) {
-        SendDlgItemMessage(hDlg, IDC_CMDEDIT, message, 0, (LPARAM)this->param_);
-        this->next_->sendParameterMSG(hDlg, message);
-    }
-}
-
-
-// Global Variables:
-HINSTANCE g_hInst;          // The current instance
-HWND      g_hwndCB;         // The command bar handle
-HWND      hWndEdit;         // Read only edit box for output display
-FILE*     g_OutputFile;     // File handler for output save
-
-ParameterList g_Parameter;  // command line parameter list
-
-ACE_CE_Screen_Output cout;  // Replacement of std::cout
-
-ACE_TCHAR g_CommandLine[MAX_COMMAND_LINE]; // User-specified command line parameter
-ACE_TCHAR g_SaveFileName[MAX_LOADSTRING];      // Name of the output file
-
-static SHACTIVATEINFO s_sai;
-
-// Forward declarations of functions included in this code module:
-ATOM                MyRegisterClass (HINSTANCE, ACE_TCHAR*);
-BOOL                InitInstance    (HINSTANCE, int);
-LRESULT CALLBACK    WndProc         (HWND, UINT, WPARAM, LPARAM);
-LRESULT CALLBACK    About           (HWND, UINT, WPARAM, LPARAM);
-LRESULT CALLBACK    CommandLine     (HWND, UINT, WPARAM, LPARAM);
-LRESULT CALLBACK    SaveFileName    (HWND, UINT, WPARAM, LPARAM);
-LRESULT CALLBACK    FileError       (HWND, UINT, WPARAM, LPARAM);
-LRESULT CALLBACK    FileExist       (HWND, UINT, WPARAM, LPARAM);
-HWND                CreateRpCommandBar(HWND);
-
-
-void InitSetup()
-{
-    g_OutputFile    = 0;
-    memset(g_CommandLine,  0, MAX_COMMAND_LINE * sizeof(ACE_TCHAR));
-    memset(g_SaveFileName, 0, MAX_LOADSTRING   * sizeof(ACE_TCHAR));
-}
-
-
-void LoadParameterHistory()
-{
-    FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_TEXT("r"));
-
-    if (parameterFile != 0) {
-        while (feof(parameterFile) == 0) {
-            // Note: Remember that fwprintf takes wide-character format specifier but
-            // save string as ASCII.  Thus, history must be read as ASCII then converted
-            // to wide-character (Unicode on WinCE).
-            char singleParameter[MAX_COMMAND_LINE];
-            int size = 0;
-            fread(&singleParameter[size], sizeof(char), 1, parameterFile);
-
-            // WinCE does not have function that reads upto the end of line.
-            while (singleParameter[size] != '\n') {
-                fread(&singleParameter[++size], sizeof(char), 1, parameterFile);
-            }
-
-            if (size > 0) {
-                singleParameter[size] = 0;  // NULL terminator
-                g_Parameter.addParameter(singleParameter);
-            }
-        }
-        fclose(parameterFile);
-    }
-}
-
-
-//
-//  FUNCTION: MyRegisterClass()
-//
-//  PURPOSE: Registers the window class.
-//
-//  COMMENTS:
-//
-//    It is important to call this function so that the application
-//    will get 'well formed' small icons associated with it.
-//
-ATOM MyRegisterClass(HINSTANCE hInstance, ACE_TCHAR* szWindowClass)
-{
-    WNDCLASS    wc;
-
-    wc.style            = CS_HREDRAW | CS_VREDRAW;
-    wc.lpfnWndProc      = (WNDPROC) WndProc;
-    wc.cbClsExtra       = 0;
-    wc.cbWndExtra       = 0;
-    wc.hInstance        = hInstance;
-    wc.hIcon            = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_FACE));
-    wc.hCursor          = 0;
-    wc.hbrBackground    = (HBRUSH) GetStockObject(WHITE_BRUSH);
-    wc.lpszMenuName     = 0;
-    wc.lpszClassName    = szWindowClass;
-
-    return RegisterClass(&wc);
-}
-
-//
-//  FUNCTION: InitInstance(HANDLE, int)
-//
-//  PURPOSE: Saves instance handle and creates main window
-//
-//  COMMENTS:
-//
-//    In this function, we save the instance handle in a global variable and
-//    create and display the main program window.
-//
-BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
-{
-    HWND hWnd = 0;
-
-    ACE_TCHAR szTitle[MAX_LOADSTRING];            // The title bar text
-    ACE_TCHAR szWindowClass[MAX_LOADSTRING];      // The window class name
-
-    g_hInst = hInstance;        // Store instance handle in our global variable
-    // Initialize global strings
-    LoadString(hInstance, IDC_FACE, szWindowClass, MAX_LOADSTRING);
-    LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
-
-    //If it is already running, then focus on the window
-    hWnd = FindWindow(szWindowClass, szTitle);
-    if (hWnd)
-    {
-        // set focus to foremost child window
-        // The "| 0x01" is used to bring any owned windows to the foreground and
-        // activate them.
-        SetForegroundWindow((HWND)((ULONG) hWnd | 0x00000001));
-        return 0;
-    }
-
-    MyRegisterClass(hInstance, szWindowClass);
-
-    RECT    rect;
-    GetClientRect(hWnd, &rect);
-
-    hWnd = CreateWindow(szWindowClass, szTitle, WS_VISIBLE,
-        CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, hInstance, 0);
-
-    if (!hWnd)
-    {
-        int error = 0;
-        error = GetLastError();
-        return FALSE;
-    }
-    //When the main window is created using CW_USEDEFAULT the height of the menubar (if one
-    // is created is not taken into account). So we resize the window after creating it
-    // if a menubar is present
-    {
-        RECT rc;
-        GetWindowRect(hWnd, &rc);
-        rc.bottom -= MENU_HEIGHT;
-        if (g_hwndCB)
-            MoveWindow(hWnd, rc.left, rc.top, rc.right, rc.bottom, FALSE);
-    }
-
-    ShowWindow(hWnd, nCmdShow);
-    UpdateWindow(hWnd);
-
-    return TRUE;
-}
-
-//
-//  FUNCTION: WndProc(HWND, unsigned, WORD, LONG)
-//
-//  PURPOSE:  Processes messages for the main window.
-//
-//  WM_COMMAND  - process the application menu
-//  WM_PAINT    - Paint the main window
-//  WM_DESTROY  - post a quit message and return
-//
-LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    HDC hdc;
-    int wmId, wmEvent, nCmdHt;
-    PAINTSTRUCT ps;
-    RECT textRect;
-
-    switch (message)
-    {
-        case WM_COMMAND:
-            wmId    = LOWORD(wParam);
-            wmEvent = HIWORD(wParam);
-            // Parse the menu selections:
-            switch (wmId)
-            {
-                case IDM_HELP_ABOUT:
-                    DialogBox(g_hInst, (const ACE_TCHAR*)IDD_ABOUTBOX, hWnd, (DLGPROC)About);
-                    break;
-
-                case IDOK:
-                    SendMessage(hWnd, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), (LPARAM)hWnd);
-                    SendMessage(hWnd, WM_CLOSE, 0, 0);
-                    break;
-
-                case ID_SETTING_RUN:
-                    {
-#ifdef NO_ACE
-                        cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl;
-                        CE_ARGV ce_argv(g_CommandLine);
-                        main_i(ce_argv.argc(), ce_argv.argv());
-                        cout << ACE_TEXT("END") << endl << endl;
-#else
-                        cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl;
-                        ACE_ARGV ce_argv(g_CommandLine);
-                        ACE::init();
-                        ACE_LOG_MSG->msg_callback(&cout);  // register call back
-                        ACE_LOG_MSG->set_flags(ACE_Log_Msg::MSG_CALLBACK);  // set call back flag
-                        ace_main_i(ce_argv.argc(), ce_argv.argv());
-                        ACE::fini();
-                        cout << ACE_TEXT("END") << endl << endl;
-#endif  // NO_ACE
-                    }
-                    break;
-
-                case ID_SETTING_EXIT:
-                    SendMessage(hWnd, WM_DESTROY, 0, 0);
-                    break;
-
-                case ID_TOOLS_SAVETOFILE:
-                    // create a dialog box to get the file name
-                    DialogBox(g_hInst, (const ACE_TCHAR*)IDD_OUTFILE, hWnd, (DLGPROC)SaveFileName);
-                    break;
-
-                case ID_SETTING_COMMANDLINE:
-                    // create a dialog box to get the command line
-                    DialogBox(g_hInst, (const ACE_TCHAR*)IDD_CMDLINE, hWnd, (DLGPROC)CommandLine);
-                    break;
-
-                default:
-                   return DefWindowProc(hWnd, message, wParam, lParam);
-            }
-            break;
-
-        case WM_CREATE:
-            SHMENUBARINFO mbi;
-
-            memset(&mbi, 0, sizeof(SHMENUBARINFO));
-            mbi.cbSize     = sizeof(SHMENUBARINFO);
-            mbi.hwndParent = hWnd;
-            mbi.nToolBarId = IDM_MENU;
-            mbi.hInstRes   = g_hInst;
-            mbi.nBmpId     = 0;
-            mbi.cBmpImages = 0;
-
-            if (!SHCreateMenuBar(&mbi))
-                return 0;
-
-            g_hwndCB = mbi.hwndMB;
-
-            // Initialize the shell activate info structure
-            memset (&s_sai, 0, sizeof (s_sai));
-            s_sai.cbSize = sizeof (s_sai);
-
-            GetClientRect(hWnd, &textRect);
-            nCmdHt = CommandBar_Height(mbi.hwndMB);
-
-            hWndEdit = CreateWindow(ACE_TEXT("EDIT"),
-                                    0,
-                                    WS_CHILD | WS_VISIBLE | ES_READONLY | ES_MULTILINE | WS_VSCROLL | WS_HSCROLL,
-                                    0,
-                                    0,
-                                    textRect.right,
-                                    textRect.bottom - MENU_HEIGHT,
-                                    hWnd,
-                                    0,
-                                    g_hInst,
-                                    0);
-            cout.SetOutputWindow(hWndEdit);
-            LoadParameterHistory();
-            break;
-
-        case WM_PAINT:
-            RECT rt;
-            hdc = BeginPaint(hWnd, &ps);
-            GetClientRect(hWnd, &rt);
-            EndPaint(hWnd, &ps);
-            break;
-
-        case WM_ACTIVATE:
-            // Notify shell of our activate message
-            SHHandleWMActivate(hWnd, wParam, lParam, &s_sai, FALSE);
-            break;
-
-        case WM_SETTINGCHANGE:
-            SHHandleWMSettingChange(hWnd, wParam, lParam, &s_sai);
-            break;
-
-        case WM_HIBERNATE:  // low power
-        case WM_CLOSE:
-        case WM_DESTROY:
-            g_Parameter.saveParameter();  // save parameters to history file
-            CommandBar_Destroy(g_hwndCB);
-            PostQuitMessage(0);
-            break;
-
-        default:
-            return DefWindowProc(hWnd, message, wParam, lParam);
-   }
-   return 0;
-}
-
-
-HWND CreateRpCommandBar(HWND hwnd)
-{
-    SHMENUBARINFO mbi;
-
-    memset(&mbi, 0, sizeof(SHMENUBARINFO));
-    mbi.cbSize     = sizeof(SHMENUBARINFO);
-    mbi.hwndParent = hwnd;
-    mbi.nToolBarId = IDM_MENU;
-    mbi.hInstRes   = g_hInst;
-    mbi.nBmpId     = 0;
-    mbi.cBmpImages = 0;
-
-    if (!SHCreateMenuBar(&mbi))
-        return 0;
-
-    return mbi.hwndMB;
-}
-
-// Mesage handler for the About box.
-LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM)
-{
-    SHINITDLGINFO shidi;
-
-    const ACE_TCHAR* copyrightNote =
-ACE_TEXT("ACE and TAO are copyrighted by Dr. Douglas C. Schmidt and Center for Distributed Object") \
-ACE_TEXT("Computing at Washington University, 1993-2002, all rights reserved.")  \
-ACE_TEXT("FaCE is copyrighted by Object Computing, Inc., 2002,\n all rights reserved.\n") \
-ACE_TEXT("See License.txt for more information.");
-
-    switch (message)
-    {
-        case WM_INITDIALOG:
-            // Create a Done button and size it.
-            shidi.dwMask = SHIDIM_FLAGS;
-            shidi.dwFlags = SHIDIF_DONEBUTTON | SHIDIF_SIPDOWN | SHIDIF_SIZEDLGFULLSCREEN;
-            shidi.hDlg = hDlg;
-            SHInitDialog(&shidi);
-            SetDlgItemText(hDlg, IDC_COPYRIGHT, copyrightNote);
-            return TRUE;
-
-        case WM_COMMAND:
-            if (LOWORD(wParam) == IDOK)
-            {
-                EndDialog(hDlg, LOWORD(wParam));
-                return TRUE;
-            }
-            break;
-    }
-    return FALSE;
-}
-
-
-LRESULT CALLBACK CommandLine(HWND hDlg, UINT message, WPARAM wParam, LPARAM)
-{
-    int wmId;
-    int wmEvent;
-
-    switch (message)
-    {
-    case WM_INITDIALOG:
-        g_Parameter.sendParameterMSG(hDlg, CB_INSERTSTRING);
-        SetDlgItemText(hDlg, IDC_CMDEDIT, g_CommandLine);  // pass existing command line for display
-        return TRUE;
-
-    case WM_COMMAND:
-        wmId    = LOWORD(wParam);
-        wmEvent = HIWORD(wParam);
-        // Parse the menu selections:
-        switch (wmId)
-        {
-        case IDOK:
-            // new command line accepted
-            GetDlgItemText(hDlg, IDC_CMDEDIT, g_CommandLine, MAX_COMMAND_LINE - 1);
-            EndDialog(hDlg, wmId);
-            g_Parameter.addParameter(g_CommandLine);
-            return TRUE;
-
-        case IDCANCEL:
-            EndDialog(hDlg, wmId);
-            return TRUE;
-
-        default:
-            return FALSE;
-        }
-        break;
-        default:
-            return FALSE;
-    }
-
-    return FALSE;
-}
-
-
-LRESULT CALLBACK SaveFileName(HWND hDlg, UINT message, WPARAM wParam, LPARAM)
-{
-    int wmId;
-    int wmEvent;
-
-    ACE_TCHAR tempBuffer[MAX_LOADSTRING];
-    ACE_TCHAR fileMode[3] = { 0, '+', 0 };  // mode will either be "a+" or "w+"
-    FILE* tempFile;
-
-    switch (message)
-    {
-    case WM_INITDIALOG:
-        SetDlgItemText(hDlg, IDC_SAVEFILE, g_SaveFileName);
-        return TRUE;
-
-    case WM_COMMAND:
-        wmId    = LOWORD(wParam);
-        wmEvent = HIWORD(wParam);
-        // Parse the menu selections:
-        switch (wmId)
-        {
-        case IDOK:
-            GetDlgItemText(hDlg, IDC_SAVEFILE, tempBuffer, MAX_LOADSTRING - 1);
-            EndDialog(hDlg, wmId);
-
-            tempFile = _wfopen(tempBuffer, ACE_TEXT("r"));
-
-            if (tempFile != 0)  // if file exists
-            {
-                fclose(tempFile);  // close temp handler
-                int choice = DialogBox(g_hInst, (const ACE_TCHAR*)IDD_FILEEXIST, hDlg, (DLGPROC)FileExist);
-                switch (choice)
-                {
-                case IDOVERWRITE:  // overwrite existing file
-                    fileMode[0] = 'w';
-                    break;
-
-                case IDC_APPEND:  // append to existing file
-                    fileMode[0] = 'a';
-                    break;
-
-                case IDCANCEL:  // cancel operation without changing g_OutputFile
-                    return TRUE;
-                }
-            }
-            else  // if file does not exist
-            {
-                fileMode[0] = 'w';
-            }
-
-            tempFile = _wfopen(tempBuffer, fileMode);
-
-            if (tempFile == 0)
-            {
-                DialogBox(g_hInst, (const ACE_TCHAR*)IDD_ERRFILE, hDlg, (DLGPROC)FileError);
-            }
-            else
-            {
-                wcscpy(g_SaveFileName, tempBuffer);
-
-                if (g_OutputFile != 0)
-                {
-                    fclose(g_OutputFile);  // close any open file
-                }
-
-                g_OutputFile = tempFile;
-
-                cout << g_OutputFile;  // update FILE* for the CE_Screen_Output class object.
-            }
-
-            return TRUE;
-
-        case IDCANCEL:
-            EndDialog(hDlg, wmId);
-            return TRUE;
-
-        default:
-            return FALSE;
-        }
-        break;
-        default:
-            return FALSE;
-    }
-
-    return FALSE;
-}
-
-
-LRESULT CALLBACK FileError(HWND hDlg, UINT message, WPARAM wParam, LPARAM)
-{
-    switch (message)
-    {
-        case WM_INITDIALOG:
-            return TRUE;
-
-        case WM_COMMAND:
-            if (LOWORD(wParam) == IDOK)
-            {
-                EndDialog(hDlg, LOWORD(wParam));
-                return TRUE;
-            }
-            break;
-    }
-
-    return FALSE;
-}
-
-
-LRESULT CALLBACK FileExist(HWND hDlg, UINT message, WPARAM wParam, LPARAM)
-{
-    switch (message)
-    {
-    case WM_INITDIALOG:
-        return TRUE;
-    case WM_COMMAND:
-        EndDialog(hDlg, LOWORD(wParam));
-        return TRUE;
-    default:
-        return FALSE;
-    }
-
-    return FALSE;
-}
-
-//FUZZ: enable check_for_lack_ACE_OS
diff --git a/ACE/contrib/FaCE/FaCE.h b/ACE/contrib/FaCE/FaCE.h
deleted file mode 100644
index 63a39d11d65..00000000000
--- a/ACE/contrib/FaCE/FaCE.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    FaCE.h
- *
- *  @author Si Mong Park <spark@ociweb.com>
- */
-//=============================================================================
-
-#if !defined(AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_)
-#define AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers
-
-//////
-// BEGIN FaCE specific preprocessor
-#ifdef NO_ACE
-
-#include <windows.h>
-
-#define ACE_TCHAR wchar_t
-#define ACE_TEXT(STRING) L##STRING
-#define ACE_CE_Screen_Output CE_Screen_Output
-
-int main_i(int, wchar_t**);
-
-#else
-
-#include <ace/CE_Screen_Output.h>
-
-int ace_main_i(int, ACE_TCHAR**);
-
-#endif  // NO_ACE
-// END FaCE specific
-//////
-
-#include "resource.h"
-
-#define MENU_HEIGHT 26
-#define MAX_LOADSTRING    101
-#define MAX_COMMAND_LINE 1001  // Max number of characters + 1 (null at the end) for user-input argv
-
-extern ACE_CE_Screen_Output cout;  // Replacement of std::cout
-
-#endif // !defined(AFX_FACE_H__1043241E_A6A9_4246_A9E4_7A774E19EE73__INCLUDED_)
diff --git a/ACE/contrib/FaCE/FaCE.mpc b/ACE/contrib/FaCE/FaCE.mpc
deleted file mode 100644
index a107075b12d..00000000000
--- a/ACE/contrib/FaCE/FaCE.mpc
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- MPC -*-
-project: aceexe {
-  exename   = FaCE
-  // This is just a dummy_label to prevent the example from being compiled
-  // in MPC builds
-  requires += dummy_label
-  requires += wince
-  lit_libs += aygshell commctrl
-
-  Source_Files {
-    FaCE.cpp
-    Main.cpp
-  }
-}
diff --git a/ACE/contrib/FaCE/FaCE.rc b/ACE/contrib/FaCE/FaCE.rc
deleted file mode 100644
index 1d1b40df81e..00000000000
--- a/ACE/contrib/FaCE/FaCE.rc
+++ /dev/null
@@ -1,268 +0,0 @@
-//Microsoft Developer Studio generated resource script.

-//

-#include "resource.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "newres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_FACE                ICON    DISCARDABLE     "FACE.ico"

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE DISCARDABLE 

-BEGIN

-    "resource.h\0"

-END

-

-2 TEXTINCLUDE DISCARDABLE 

-BEGIN

-    "#include ""newres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE DISCARDABLE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Data

-//

-

-IDM_MENU SHMENUBAR MOVEABLE PURE 

-BEGIN

-    IDM_MENU, 2,

-    I_IMAGENONE, ID_SETTING, TBSTATE_ENABLED, 

-    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_SETTING, 0, 0,

-    I_IMAGENONE, IDM_MAIN_COMMAND1, TBSTATE_ENABLED, 

-    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_HELP, 0, 1,

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Menubar

-//

-

-IDM_MENU MENU DISCARDABLE 

-BEGIN

-    POPUP "Setting"

-    BEGIN

-        MENUITEM "Command Line",                ID_SETTING_COMMANDLINE

-        MENUITEM "Run",                         ID_SETTING_RUN

-        MENUITEM SEPARATOR

-        MENUITEM "Exit",                        ID_SETTING_EXIT

-    END

-    POPUP "Tools"

-    BEGIN

-        MENUITEM "About",                       IDM_HELP_ABOUT

-        MENUITEM "Save To File",                ID_TOOLS_SAVETOFILE

-    END

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Dialog

-//

-

-IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 148, 161

-STYLE WS_POPUP | WS_CAPTION

-EXSTYLE 0x80000000L

-CAPTION "About FACE"

-FONT 8, "System"

-BEGIN

-    CONTROL         113,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,33,6,

-                    69,52

-    CTEXT           "Static",IDC_COPYRIGHT,7,86,128,68

-    CONTROL         114,IDC_TAO,"Static",SS_BITMAP,7,61,134,22

-END

-

-IDD_CMDLINE DIALOG DISCARDABLE  0, 0, 125, 50

-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

-CAPTION "Command Line"

-FONT 8, "System"

-BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,7,29,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,68,29,50,14

-    COMBOBOX        IDC_CMDEDIT,7,7,111,80,CBS_DROPDOWN | CBS_AUTOHSCROLL | 

-                    CBS_OEMCONVERT | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | 

-                    WS_TABSTOP

-END

-

-IDD_OUTFILE DIALOG DISCARDABLE  0, 0, 127, 49

-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

-CAPTION "Output File Name"

-FONT 8, "System"

-BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,7,28,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,70,28,50,14

-    EDITTEXT        IDC_SAVEFILE,7,7,113,14,ES_AUTOHSCROLL

-END

-

-IDD_ERRFILE DIALOG DISCARDABLE  0, 0, 124, 49

-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

-CAPTION "ERROR"

-FONT 8, "System"

-BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,37,28,50,14

-    CTEXT           "File Creation Error!",IDC_ERRFILE,13,7,98,17,

-                    SS_CENTERIMAGE

-END

-

-IDD_FILEEXIST DIALOG DISCARDABLE  0, 0, 114, 90

-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

-CAPTION "File Exists"

-FONT 8, "System"

-BEGIN

-    DEFPUSHBUTTON   "Overwrite",IDOVERWRITE,32,32,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,32,68,50,14

-    PUSHBUTTON      "Append",IDC_APPEND,32,50,50,14

-    CTEXT           "File already exists!",IDC_STATIC,7,15,100,11

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Accelerator

-//

-

-IDC_FACE ACCELERATORS DISCARDABLE 

-BEGIN

-    "A",            IDM_HELP_ABOUT,         VIRTKEY, CONTROL, NOINVERT

-    "Q",            IDOK,                   VIRTKEY, CONTROL, NOINVERT

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO DISCARDABLE 

-BEGIN

-    IDD_ABOUTBOX, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 141

-        TOPMARGIN, 6

-        BOTTOMMARGIN, 154

-    END

-

-    IDD_CMDLINE, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 118

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 43

-    END

-

-    IDD_OUTFILE, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 120

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 42

-    END

-

-    IDD_ERRFILE, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 117

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 42

-    END

-

-    IDD_FILEEXIST, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 107

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 82

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Bitmap

-//

-

-IDB_ACERACER            BITMAP  DISCARDABLE     "ACE_Racer.bmp"

-IDB_TAO                 BITMAP  DISCARDABLE     "TAO.bmp"

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// String Table

-//

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    IDS_APP_TITLE           "FaCE"

-    IDC_FACE                "FaCE"

-END

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    IDS_HELP                "Tools"

-END

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    IDS_COMMAND1            "Done "

-END

-

-STRINGTABLE DISCARDABLE 

-BEGIN

-    IDS_CAP_SETTING         "Setting"

-END

-

-#endif    // English (U.S.) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

diff --git a/ACE/contrib/FaCE/FaCENOACE.mpc b/ACE/contrib/FaCE/FaCENOACE.mpc
deleted file mode 100644
index cc91b9a048d..00000000000
--- a/ACE/contrib/FaCE/FaCENOACE.mpc
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- MPC -*-
-project: vc_warnings {
-  exename   = FaCENOACE
-  requires += wince
-  macros   += NO_ACE
-  lit_libs += aygshell commctrl
-
-  Source_Files {
-    FaCE.cpp
-    Main.cpp
-    CE_ARGV.cpp
-    CE_Screen_Output.cpp
-  }
-}
diff --git a/ACE/contrib/FaCE/FaCE_OS.h b/ACE/contrib/FaCE/FaCE_OS.h
deleted file mode 100644
index 4043068af52..00000000000
--- a/ACE/contrib/FaCE/FaCE_OS.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    FaCE_OS.h
- *
- *  @author Si Mong Park <spark@ociweb.com>
- */
-//=============================================================================
-
-#ifndef FaCE_OS_h
-#define FaCE_OS_h
-
-// This definition is for the "int FaCE_MAIN(int, wchar_t**)" using FaCE.
-#     define FaCE_MAIN \
-ace_main_i (int, ACE_TCHAR**); \
-extern BOOL InitInstance (HINSTANCE, int); \
-extern void InitSetup(); \
-int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, ACE_TCHAR* lpCmdLine, int nCmdShow) \
-{ \
-    MSG msg; \
-    HACCEL hAccelTable; \
-    if (!InitInstance (hInstance, nCmdShow)) return FALSE; \
-    hAccelTable = LoadAccelerators(hInstance, (const ACE_TCHAR*)IDC_FACE); \
-    InitSetup(); \
-    while (GetMessage(&msg, 0, 0, 0)) { \
-        if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) { \
-            TranslateMessage(&msg); \
-            DispatchMessage(&msg); \
-        } \
-    } \
-    return msg.wParam; \
-} \
-int ace_main_i
-
-#endif  // FaCE_OS_h
diff --git a/ACE/contrib/FaCE/License.txt b/ACE/contrib/FaCE/License.txt
deleted file mode 100644
index 1c58219c67a..00000000000
--- a/ACE/contrib/FaCE/License.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-==
-== Copyright and Licensing Information
-==
-==
-
-ACE(tm) and TAO(tm) are copyrighted by Dr. Douglas C. Schmidt and the Center for Distributed
-Object Computing ('DOC' group) at Washington University, Copyright (C) 1993 - 2002, all rights
-reserved.  Since ACE and TAO are open source, free software, you are free to use, modify, and
-distribute the ACE and TAO source code and object code produced from the source, as long as
-you include this copyright statement along with code built using ACE and TAO.  Please refer to
-ACE and TAO documentations for detailed copyright and license information on ACE and TAO.
-
-FaCE is an additional front-end shell package designed for ACE and TAO testing work for Pocket
-PC 2002 platform, created and released by Object Computing, Inc. (OCI) and distributed with ACE
-and TAO under the same licensing terms. You can modify and change the source of FaCE for your
-own use as long as you provide attribution to OCI by including its copyright statement in your
-distributions of source and object code. OCI welcomes submissions of improvements to the FaCE
-code base.
-
-FaCE is copyrighted by Object Computing, Inc., St. Louis Missouri, Copyright (C) 2002,
-all rights reserved.
-
-
-==
-== Warranty Information
-==
-
-FaCE is provided 'as is' without warranties of any kind.
diff --git a/ACE/contrib/FaCE/Main.cpp b/ACE/contrib/FaCE/Main.cpp
deleted file mode 100644
index dd927c27203..00000000000
--- a/ACE/contrib/FaCE/Main.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// ************************************************
-// ** This file is NOT to be used for framework. **
-// ************************************************
-
-// This file defines the entry point for Windows CE, which is defined in OS.h for real applications.
-
-
-#include "FaCE.h"
-
-extern BOOL InitInstance (HINSTANCE, int);
-extern void InitSetup();
-
-
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, ACE_TCHAR*, int nCmdShow)
-{
-    MSG msg;
-    HACCEL hAccelTable;
-    if (!InitInstance (hInstance, nCmdShow)) return FALSE;
-    hAccelTable = LoadAccelerators(hInstance, (const ACE_TCHAR*)IDC_FACE);
-    InitSetup();
-    while (GetMessage(&msg, 0, 0, 0)) {
-        if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-    }
-    return msg.wParam;
-}
-
-
-#ifdef NO_ACE
-
-int main_i(int, ACE_TCHAR**)
-{
-    // this function will be replaced by user's main_ce function
-    return 0;
-}
-
-#else
-
-int ace_main_i(int, ACE_TCHAR**)
-{
-    // this function will be replaced by user's main_ce function
-    return 0;
-}
-
-#endif  // NO_ACE
diff --git a/ACE/contrib/FaCE/README b/ACE/contrib/FaCE/README
deleted file mode 100644
index 5e98790ed95..00000000000
--- a/ACE/contrib/FaCE/README
+++ /dev/null
@@ -1,277 +0,0 @@
-===
-=== FaCE (Front-end for ACE CE)
-===
-=== Object Computing, Inc.  <http://www.ociweb.com>
-=== St. Louis, Missouri
-=== Copyright (C) 2002.  All rights reserved.
-===
-=== V1.01, March 30th, 2002
-===
-
-== What's FaCE?
-
-FaCE is a simple front-end framework for testing and debugging non-Windows
-CE applications on the Pocket PC 2002 platform.  Originally, FaCE was
-developed to test ACE and TAO components internally in Object Computing, Inc.
-However, since it has shown dramatic increase of productivity in a lot
-shorter amount of time, it has been prepared as a package for all programmers
-who want to test and run existing codes (non-WinCE native codes) on Pocket PC
-2002 and WinCE 3.0.
-
-The features of FaCE are:
-
-  1. command line parameter support
-  2. command line history support (never type in same command line again)
-  3. output displayed on the windows screen
-  4. output to file (with append and overwrite support)
-  5. does not use MFC
-  6. almost no modification to existing user code
-  7. easy to enable and disable after install
-
-* Default project files only contain Pocket PC 2002 platform configuration.
-  A new configuration can be added for other WinCE 3.0 platform from eVC.
-
-
-== Package Contents
-
-Files contained in FaCE package are:
-
- Main Framework Files for both ACE users and non-ACE users
-  - ACE_Racer.bmp
-  - FaCE.h & cpp
-  - FaCE.ico
-  - FaCE.rc
-  - newres.h
-  - resource.h
-  - TAO.bmp
-
- ACE entry point definition file
-  - FaCE_OS.h
-
- Additional Framework files for non-ACE users
-  - CE_ARGV.h & cpp
-  - CE_Screen_Output.h & cpp
-
- Files for loading skeleton FaCE from eVC
-  - FaCE.vcp & vcw      : FaCE Project files for ACE users
-  - FaCENOACE.vcp & vcw : FaCE Project files for non-ACE users
-  - Main.cpp            : almost empty entry point function
-
- Misc. Files
-  - ACE.ico         : a bonus icon of ACE logo
-  - License.txt     : license and warranty information
-  - ReadMe.txt      : this document
-
-
-== Requirement
-
- - Microsoft(C) eMbedded Visual Studio/C++ (eVC) 3.0
- - Pocket PC 2002 SDK
-
- ** For ACE-users only:
- - ACE+TAO installed and configured for WinCE build only for ACE-users
- - ace and ace_os libraries built for WinCE and loaded on machine
-
-
-== Important Note
-
-It has been reported that certain Pocket PC 2002 machines with ARM processor
-can be totally dead and will not even respond to the hard reset.  While the
-real cause of this problem is unknown, HP has released a patch for this
-problem.  We have tested it, and it seems working fine on our machine (HP
-Jornada 568), which is our 5th machine that has been running fine for the
-longest time.
-
-As this has been identified by hardware manufacturer and can be fixed as HP
-did, Object Computing, Inc. (OCI) or any member of ACE+TAO community cannot
-be responsible for this problem.  If this problem happens during debugging,
-contact your hardware manufacturer for fix or replacement.  It has found
-that almost all Pocket PC 2002 machines regardless of manufacturers have same
-problem.
-
-Also, Phil Mesnier at OCI has found that virtual function calls under certain
-situation can cause a problem that randomly changes parameter and pointer
-values over function calls.  This is due to the incorrect instructions
-generated by eVC for ARM processor.  So far, no solution or patch has been
-released by compiler vendor, although vendor is aware of this problem.
-
-Since Pocket PC 2002 is based on WinCE 3.0, ACE+TAO as well as FaCE should
-be able to run on any WinCE 3.0 platform by adding a new configuration with
-minimal change.
-
-
-== Installation & Setup
-
-1. Create a subdirectory named 'FaCE' (or anything in your taste) under
-   your current project directory.
-
-2. Copy FaCE_OS.h to the ACE_ROOT/ace directory, and add following line at
-   the end of your ACE_ROOT/ace/config.h file:
-
-   #include "FaCE_OS.h"
-
-3. Copy main framework files listed above and add them into "your" project
-   (NOT FaCE.vcw/vcp).  For non-ACE users, copy additional framework files
-   for non-ACE users in addition to the main framework files.
-   It would be a good idea to create a new folder in your project and put
-   all FaCE files into it.  This way, it will be easy to disable FaCE by
-   setting the folder excluded from the build on the folder property option.
-
-   ** IMPORTANT! **
-   FaCE does NOT use MFC.  Thus, if your project is already set for
-   'Not using MFC', then do not change the setting.
-
-   * Note: Make sure those files are not shared by multiple executables.
-           Each project must have its own copy of those files.
-           It is a good idea to create a separate folder on your project
-           and put FaCE related files into that folder.  In that case,
-           if you want to disable FaCE and run by using normal 'main',
-           then you can simply set the whole FaCE folder excluded from
-           build in the project setting menu.
-
-4. Change your 'main()' function part similar to the following example.
-
-   int ACE_TMAIN (int argc, ACE_TCHAR *argv[])  // ACE normal entry point
-
-   Change the directory name for "FaCE/FaCE.h" if necessary.
-
-   == Possible Additional Change
-
-   Above change will be the only change if your program compiles and links
-   fine under eVC.  It does not mean that your program is WinCE-ready but
-   just means that your program does not include the libraries that are not
-   supported by WinCE, such as iostream.
-
-   For ACE users, good examples will be the ACE test programs under
-   $ACE_ROOT/test.
-
-   For non-ACE users, I highly recommend to create a project for WinCE first
-   if it has not already been done and write your code using wmain.
-   Try compile and link your program without FaCE to check your program does
-   not include any libraries not supported by WinCE.  FaCE supports text output
-   by aliasing 'cout' in FaCE.h; however, it is NOT a real iostream but an alias
-   for CE_Screen_Output class.  You may need to use '#ifdef UNDER_CE' for your
-   iostream includes, if you want to share the code among different platforms.
-
-   Also, it is important to match the parameter types for 'wmain' function.
-   For WinCE, it MUST be in the format of:
-
-     int FaCE_MAIN (int, wchar_t**)
-
-   and you can leave your original wmain type as it was for non-CE platform
-   definition.
-
-5. Go to 'ResourceView' or double-click on the 'FaCE.rc'.  Open 'String Table ->
-   String Table' from the resource browse view, and change the string value (caption)
-   defined for 'IDS_APP_TITLE' from 'FaCE' to your program name.  This will
-   help identifying multiple FaCE-fied applications when you browse them
-   through system memory -> running programs in case of crash.
-
-6. That's it!
-
-** Optionally, you can personalize the icons defined for FaCE for your own.
-   To do this easily, load "FaCE.vcw" (requires ACE library) or "FaCENOACE.vcw"
-   from eVC.  Also, FaCENOACE.vcw can be used as 'hello world'-type starting
-   frame-work for non-WinCE programmers.
-
-** Non-ACE users may see the warning messages saying, "Could not find the file xxx",
-   for ace.h, Log_Msg.h, OS.h, and CE_Screen_Output.h.  This is due to the eVC's
-   not-so-perfect precompilation file checking and totally harmless.
-
-** Later if you don't want to use FaCE anymore, simply restore your original
-   main function and remove FaCE files from your project (or exclude FaCE files
-   from build).  ACE library does not have to be rebuilt as FaCE_OS.h only
-   contains macro.
-
-== Running FaCE
-
-1. Command line option
-
-User can specify the command line option for the program by using 'Settings ->
-Command Line' from the FaCE menu.  FaCE will automatically save all user-entered
-command line parameters as a ASCII format file named 'Parameters.txt' in the
-root directory of WinCE device/emulator.  User can edit and change by opening
-this file from any text editor and save as a ASCII text file with DOS standard
-CR/LF combo.  This will greatly save time especially when you are working on the
-Pocket PC machine that does not have keyboard.  Remember NOT to convert file
-format to Unicode; it must be standard DOS ASCII text file.
-
-2. Output Saving
-
-You can save output to file by selecting 'Tools -> Save To File'.  By default,
-FaCE will not create/save any file.  Also, any output received before setting
-up this feature will not be saved.
-
-If the file with specified name exists, FaCE will ask whether you want to
-append to the end of file or erase and overwrite.  All output files will be
-saved in the root directory of the system.
-
-3. Running Your Program
-
-'Setting -> Run' will execute your program.  Two tags, 'START' and 'END'
-indicate the beginning and end of your code.
-
-For ACE users, any log message sent to ACE message log (ACE_DEBUG, for example)
-will be displayed on the screen.  Also, if you have setup to save to file,
-the same contents will be saved to the file as well.  Note that the output will
-NOT have ACE internal tags (i.e. Dec 04 14:51:12.000 2001@LM_DEBUG@) because
-FaCE uses callback message function, and ACE does not pass those tags along
-with the output message.
-
-For non-ACE users, you can declare your own local copy of CE_Screen_Output
-object.  For example, you can declare CE_Screen_Output object in your cpp file
-like:
-
-  CE_Screen_Output cout;
-
-and use it like,
-
-  int a = 100;
-  wchar_t* strTemp = L"Hello, world!";
-  cout << L"String : " << strTemp << L"a = " << a << endl;
-
-Remember, CE_Screen_Output is just a simple text output function and does not
-have the full capabilities of iostream, which is not available for WinCE 3.0.
-
-4. In case of crash
-
-If you have started your code, but the code crashes, which can be easily
-identified by looking for the 'END' tag, then you can use Windows CE's memory
-program to kill the process (Start -> Settings -> System tag -> Memory ->
-Running Programs tag).  If you have changed IDS_APP_TITLE in the resource
-viewer, then you will see the name you have specified; otherwise, FaCE will be
-listed.  You can select the name and stop the process by clicking 'Stop' button.
-Sometimes, you may need to reset the machine if you cannot access memory program.
-
-
-== Note
-
-- This FaCE framework does not use any MFC; it only uses general Win32
-  API, thus, your project setting does not have to be changed.
-
-- FaCE is for the 'legacy' Unix/DOS style console applications that
-  do not use any Win32 and MFC for Windows OS.  Programs that are already
-  using native Windows/WinCE API's will not need FaCE framework.
-
-- If you run your application from FaCE (Settings -> Run), 'START' and
-  'END' will appear at the beginning and end of output messages from your
-  application.  If you see 'END' lable after execution, you can run your
-  program again without exit and start up FaCE again.
-
-- Make sure to terminate FaCE by selecting 'Settings -> Exit'.  It will
-  completely terminate FaCE session; Clicking on the 'X' button
-  at the top-left corner of the screen will not, just like most WinCE programs.
-
-- FaCE_MAIN is only for the WinCE port of ACE, ensuring proper windows system
-  message filtering along with proper registraion so that user can see the
-  process from memory setting and task switcher applications.
-
-- ACE and FaCE do not overrides native WinMain.  If you are developing for
-  Windows OS only, your WinMain should be just safe from any overrides.
-  In this case, of course, you don't need to use FaCE package.
-
-
-== Question or Comment
-
-If you have question and/or comment specific to the FaCE, please contact
-Si Park at spark@ociweb.com or Justin Michel at michel_j@ociweb.com.
diff --git a/ACE/contrib/FaCE/TAO.bmp b/ACE/contrib/FaCE/TAO.bmp
deleted file mode 100644
index 1492f789509..00000000000
--- a/ACE/contrib/FaCE/TAO.bmp
+++ /dev/null
diff --git a/ACE/contrib/FaCE/newres.h b/ACE/contrib/FaCE/newres.h
deleted file mode 100644
index c0fcf13874f..00000000000
--- a/ACE/contrib/FaCE/newres.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef __NEWRES_H__
-#define __NEWRES_H__
-
-#if !defined(UNDER_CE)
-#define UNDER_CE _WIN32_WCE
-#endif
-
-#if defined(_WIN32_WCE)
-    #if !defined(WCEOLE_ENABLE_DIALOGEX)
-        #define DIALOGEX DIALOG DISCARDABLE
-    #endif
-    #include <commctrl.h>
-    #define  SHMENUBAR RCDATA
-    #if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300)
-        #include <aygshell.h>
-        #define AFXCE_IDR_SCRATCH_SHMENU  28700
-    #else
-        #define I_IMAGENONE     (-2)
-        #define NOMENU          0xFFFF
-        #define IDS_SHNEW       1
-
-        #define IDM_SHAREDNEW        10
-        #define IDM_SHAREDNEWDEFAULT 11
-    #endif // _WIN32_WCE_PSPC
-    #define AFXCE_IDD_SAVEMODIFIEDDLG 28701
-#endif // _WIN32_WCE
-
-#ifdef RC_INVOKED
-#ifndef _INC_WINDOWS
-#define _INC_WINDOWS
-    #include "winuser.h"           // extract from windows header
-    #include "winver.h"
-    #include "windows.h"
-#endif
-#endif
-
-#ifdef IDC_STATIC
-#undef IDC_STATIC
-#endif
-#define IDC_STATIC      (-1)
-
-#endif //__NEWRES_H__
diff --git a/ACE/contrib/FaCE/resource.h b/ACE/contrib/FaCE/resource.h
deleted file mode 100644
index 385039fa6ac..00000000000
--- a/ACE/contrib/FaCE/resource.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by FaCE.rc
-//
-#define IDS_APP_TITLE                   1
-#define IDC_FACE                        3
-#define IDI_FACE                        101
-#define IDM_MENU                        102
-#define IDD_ABOUTBOX                    103
-#define IDS_HELP                        104
-#define IDD_CMDLINE                     104
-#define IDD_OUTFILE                     105
-#define IDD_ERRFILE                     107
-#define IDD_FILEEXIST                   109
-#define IDB_ACERACER                    113
-#define IDB_TAO                         114
-#define IDS_COMMAND1                    301
-#define IDC_CMDEDIT                     1001
-#define IDC_SAVEFILE                    1002
-#define IDC_ERRFILE                     1003
-#define IDOVERWRITE                     1004
-#define IDC_APPEND                      1005
-#define IDC_COPYRIGHT                   1007
-#define IDC_TAO                         1008
-#define IDM_MAIN_COMMAND1               40001
-#define IDM_HELP_ABOUT                  40003
-#define ID_SETTING                      40004
-#define IDS_CAP_SETTING                 40006
-#define ID_SETTING_COMMANDLINE          40007
-#define ID_SETTING_RUN                  40008
-#define ID_SETTING_EXIT                 40011
-#define ID_TOOLS_SAVETOFILE             40012
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        116
-#define _APS_NEXT_COMMAND_VALUE         40013
-#define _APS_NEXT_CONTROL_VALUE         1009
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/ACE/docs/ACE-porting.html b/ACE/docs/ACE-porting.html
index ead06da4ffe..c111a8a778c 100644
--- a/ACE/docs/ACE-porting.html
+++ b/ACE/docs/ACE-porting.html
@@ -86,7 +86,7 @@ thread APIs: <P>
     called draft 10) [MIT, Linux, and Solaris]. <P>
 
 <LI> <B>Win32 Threads</B> (<CODE>ACE_HAS_WTHREADS</CODE>) - Windows
-    NT, Windows '95/98, and Windows CE <P>
+    NT, Windows '95/98<P>
 
 <LI> <B>VxWorks Tasks</B> (<CODE>ACE_VXWORKS</CODE>) - VxWorks <P>
 </UL>
diff --git a/ACE/docs/CE-status.txt b/ACE/docs/CE-status.txt
deleted file mode 100644
index 963549092f8..00000000000
--- a/ACE/docs/CE-status.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-
-/**
-
-@page wince ACE on Windows CE status
-
-Last updated Friday 14-November-2008 by Johnny Willemsen
-<jwillemsen@remedy.nl>
-
-@subsection ce_status Status
-
-As of ACE 5.6, Remedy IT supports ACE and TAO on Windows CE building with
-Microsoft Visual Studio 2005 and targeting the Windows Mobile 5 and 6. OCI
-supports TAO 1.3 on at least Windows CE 3 with the PocketPC 2002 SDK. Contact
-the individual support provider for complete information regarding these
-platforms as well as the supported hardware targets.
-
-@subsection ce_evc eMbedded Visual C++ Projects
-
-Whereas previous ACE versions had separate ACE and ACE_OS eMbedded Visual C++
-project files, the project and workspace arrangement is now the same as
-for other Windows versions. The project and workspace files themselves are
-generated using the MakeProjectCreator tool when the ACE kit is prepared.
-Both EVC3 and EVC4 use the same project and workspace files.
-
-Developers working with sources checked out from CVS must generate the
-project and workspace files locally using MPC. The autobuild system's
-generate_makefile and generate_workspace commands can be used for this.
-
-@subsection ce_vc8 Visual Studio 2005 Projects
-
-The ACE release process generates the needed Visual Studio 2005 solution and
-project files with "_WinCE" appended to the name (e.g. ACE_WinCE.vcproj) to
-distinguish them from both Win32-targeted VC8 projects (ACE_vc8.vcproj) and
-Visual Studio 2003 projects (ACE_vc71.vcproj). The files are generated with
-the "Pocket PC 2003 SDK (ARMV4)", "Windows Mobile 5.0 Pocket PC SDK
-(ARMV4I)", and "Windows Mobile 6 SDK (ARMV4I)" platforms defined. To add
-additional platforms, the files must be regenerated using MPC.
-
-@subsection ce_wchar Unicode/WChar
-
-ACE on WindowsCE automatically has ACE_HAS_WCHAR and ACE_USES_WCHAR turned
-on. Thus ACE_TCHAR and ACE_TEXT() are the wide char versions.
-
-@subsection ce_tests Running the Test Suite on Windows CE
-
-The ACE test suite in ACE_wrappers/tests is used on Windows CE as well as
-on dekstop Windows. The test suite tools are extended to run remotely
-on the device using the telnet server.
-
-*/
diff --git a/ACE/docs/index.html b/ACE/docs/index.html
index 929c5856ea8..459d5506084 100644
--- a/ACE/docs/index.html
+++ b/ACE/docs/index.html
@@ -87,7 +87,6 @@ ask. <P>
   <li><a href="ACE-SSL.html">ACE+SSL</a> - What is ACE+SSL and how to get it.
   <li><a href="Symbol_Versioning.html">Symbol versioning</a> - How to do symbol versioning
       with ACE+TAO.
-  <li><a href="CE-status.txt">CE-status.txt</a> - The status of ACE on Windows CE.
   <li><a href="ACE-monotonic-timer.html">ACE-monotonic-timer.html</a> - How to use the ACE monotonic timer support.
   <li><a href="../ACEXML/docs/readme.txt">ACEXML</a> - A SAX2-based XML parser ACE uses and provides.
 </ul>
diff --git a/ACE/docs/wchar.txt b/ACE/docs/wchar.txt
index d8b88ad8042..517b89d56b0 100644
--- a/ACE/docs/wchar.txt
+++ b/ACE/docs/wchar.txt
@@ -35,7 +35,7 @@ Like Regular Support, both char and wchar_t versions of some methods are
 available, but unlike Regular Support, other methods that have char arguments
 or return values may have wchar_t arguments or return values.
 
-This has been tested on Windows and Linux, and is the default for Windows CE.
+This has been tested on Windows and Linux.
 
 @subsection wchar_othermacros Other Important Macros
 
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc b/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
index b8fc1278152..56eedf33423 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/sock_sap.mpc
@@ -7,7 +7,6 @@ project(*C_inclient) : aceexe {
 }
 
 project(*C_inserver) : aceexe {
-  avoids += wince
   exename = C-inserver
   Source_Files {
     C-inserver.cpp
diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc
index 43b42f64429..ba8c411b325 100644
--- a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc
+++ b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 project : aceexe, ace_mfc {
-  avoids += wince
   exename = Log_Msg_MFC
-  Source_Files { 
+  Source_Files {
     Log_Msg_MFC.cpp
     Log_Msg_MFCDlg.cpp
     MFC_Log.cpp
diff --git a/ACE/examples/NT_Service/NT_Service.mpc b/ACE/examples/NT_Service/NT_Service.mpc
index 76522621847..756d0562548 100644
--- a/ACE/examples/NT_Service/NT_Service.mpc
+++ b/ACE/examples/NT_Service/NT_Service.mpc
@@ -1,5 +1,4 @@
 // -*- MPC -*-
 project : aceexe, winregistry {
-  avoids += wince
   exename = main
 }
diff --git a/ACE/examples/OS/Process/OS_Process.mpc b/ACE/examples/OS/Process/OS_Process.mpc
index a6cffe93337..3b23928c3ad 100644
--- a/ACE/examples/OS/Process/OS_Process.mpc
+++ b/ACE/examples/OS/Process/OS_Process.mpc
@@ -6,7 +6,6 @@ project(*imore) : aceexe, avoids_ace_for_tao {
   }
 }
 project(*process) : aceexe {
-  avoids += wince
   exename = process
   Source_Files {
     process.cpp
diff --git a/ACE/examples/Service_Configurator/Misc/README b/ACE/examples/Service_Configurator/Misc/README
index d9a9568fbd4..d02bf5fed62 100644
--- a/ACE/examples/Service_Configurator/Misc/README
+++ b/ACE/examples/Service_Configurator/Misc/README
@@ -1,25 +1,6 @@
-
-
 This directory contains an example that illustrates how the ACE
 Service Configurator can configure static and dynamic services, both
 from the command-line and from a svc.config file.  We define several
 instances, i.e., Timer_Service_1 and Timer_Service_2 of the SAME
 service just to exercise different configuration options.  A "real"
 application would usually define different services.
-
-Windows CE:
------------
-
-When using Windows CE (WCE) emulator, make sure that you use the
-following command to copy the svc.conf files into the top-level
-directory in CE emulator.
-
-  empfile -c svc.conf1 wce:\svc.conf1
-  empfile -c svc.conf2 wce:\svc.conf2
-
-The command "empfile" moves the files to emulator's root directory and
-resigters the files with CE emulator's object store.
-
-Also make sure you type in at least one argument (which is argv[0],)
-when the program dialog box requests you to key in the program
-arguments.  Otherwise, the program won't run at all.
diff --git a/ACE/protocols/ace/INet/inet.mpc b/ACE/protocols/ace/INet/inet.mpc
index 3d7d8c815ca..e0c77ec0bc7 100644
--- a/ACE/protocols/ace/INet/inet.mpc
+++ b/ACE/protocols/ace/INet/inet.mpc
@@ -3,7 +3,6 @@ project(INet) : acelib, ace_output, install {
   sharedname   = ACE_INet
   dynamicflags += ACE_INET_BUILD_DLL
   includes += $(ACE_ROOT)/protocols
-  avoids += wince
   avoids += old_stdstream
   avoids += exclude_inet
   avoids += ace_for_tao
diff --git a/ACE/tests/Bug_3505_Regression_Test.cpp b/ACE/tests/Bug_3505_Regression_Test.cpp
index 0609ec07ed7..291fd895f66 100644
--- a/ACE/tests/Bug_3505_Regression_Test.cpp
+++ b/ACE/tests/Bug_3505_Regression_Test.cpp
@@ -14,7 +14,6 @@
 #include "ace/Service_Gestalt.h"
 #include "test_config.h"
 
-
 int
 run_main (int, ACE_TCHAR *[])
 {
diff --git a/ACE/tests/Bug_3541_Regression_Test.cpp b/ACE/tests/Bug_3541_Regression_Test.cpp
index 8fb700a7d34..302ade29a3b 100644
--- a/ACE/tests/Bug_3541_Regression_Test.cpp
+++ b/ACE/tests/Bug_3541_Regression_Test.cpp
@@ -21,7 +21,7 @@ run_main (int, ACE_TCHAR *[])
 
   int ret = 0;
 
-#if defined(ACE_WIN32) && !defined (ACE_USES_WINCE_SEMA_SIMULATION)
+#if defined(ACE_WIN32)
   int lastError;
 
   // ACE_OS::event_init()
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp
index 9243148e525..384f99365f1 100644
--- a/ACE/tests/Malloc_Test.cpp
+++ b/ACE/tests/Malloc_Test.cpp
@@ -307,7 +307,7 @@ child ()
 // virtual address on every 32 bit process.  On WinNT/2k, memory above
 // 2Gb is reserved for the system.  So, we need to check at runtime
 // (we want an ACE_HAS_WINNT4 == 0 ace to run on either).
-// To catch any odd case arising from Pharlap and/or WinCE, do the
+// To catch any odd case arising from Pharlap, do the
 // run time check and run the NT4-or-better code unless we're on
 // CE or something other than NT4 (Pharlap reports itself as NT 3.51).
 static void
diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst
index 26069c4b405..afe19c68eee 100644
--- a/ACE/tests/run_test.lst
+++ b/ACE/tests/run_test.lst
@@ -122,7 +122,7 @@ Dirent_Test: !VxWorks_RTP !LabVIEW_RT
 Dynamic_Priority_Test
 Dynamic_Test
 Enum_Interfaces_Test: !NO_NETWORK !LynxOS
-Env_Value_Test: !WinCE !LabVIEW_RT
+Env_Value_Test: !LabVIEW_RT
 FIFO_Test: !ACE_FOR_TAO
 Framework_Component_Test: !STATIC !nsk
 Future_Set_Test: !nsk !ACE_FOR_TAO
@@ -279,7 +279,7 @@ SOCK_SEQPACK_SCTP_Test: !MSVC !nsk !ACE_FOR_TAO
 SOCK_Test_IPv6: !nsk
 Process_Strategy_Test: !VxWorks !LynxOS !ACE_FOR_TAO !PHARLAP
 Recursive_Condition_Bug_Test: !ST
-UnloadLibACE: !STATIC !WinCE !LabVIEW_RT
+UnloadLibACE: !STATIC !LabVIEW_RT
 UUID_Test: !NO_UUID !ACE_FOR_TAO
 Wild_Match_Test
 SSL/Bug_2912_Regression_Test: SSL !ACE_FOR_TAO !BAD_AIO
diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
index 3a311cb2fae..3bf798d63d3 100644
--- a/ACE/tests/tests.mpc
+++ b/ACE/tests/tests.mpc
@@ -2194,7 +2194,6 @@ project(Based Pointer Test) : acetest {
 }
 
 project(Library Unload): unload_libace {
-  avoids += wince
   exename = UnloadLibACE
   staticflags += ACE_AS_STATIC_LIBS
   Source_Files {