ChangeLogTag: Fri Jun 27 11:00:00 UTC 2008 Simon Massey <sma at prismtech dot com>

19 files changed, 115 insertions, 95 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 59ca979863e..5eb3cd4b8e9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,25 @@
+Fri Jun 27 11:00:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
+
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
+        * orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp:
+        * orbsvcs/tests/Bug_2800_Regression/NamingTeask.h:
+        * orbsvcs/tests/Bug_2800_Regression/NamingTeask.cpp:
+        * orbsvcs/tests/Bug_2800_Regression/nsmain.cpp:
+        * orbsvcs/tests/Bug_2800_Regression/server.cpp:
+        * orbsvcs/tests/ior_corbaname/client.cpp:
+        * orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h:
+        * orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp:
+        * orbsvcs/tests/ior_corbaname/server.cpp:
+        * orbsvcs/tests/IOR_MCast/client.cpp:
+        * orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h:
+        * orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp:
+        * orbsvcs/tests/IOR_MCast/server.cpp:
+        * orbsvcs/tests/IOR_MCast/server_i.h:
+        * orbsvcs/tests/IOR_MCast/server_i.cpp:
+
+          Fix fuzz errors incorrect ACE_TMAIN/main use.
+
 Fri Jun 27 09:40:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
 
         * orbsvcs/tests/Bug_2248_Regression/client.h:
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp
index a61c488aa29..dad03af99f4 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp
@@ -5,21 +5,20 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/Argv_Type_Converter.h"
 
-NamingTask::NamingTask (const char* orbname, int argc, char** argv, unsigned short port)
+NamingTask::NamingTask (const char* orbname, int argc, ACE_TCHAR **argv, unsigned short port)
  : initialized_(false)
 {
-  char** my_argv = new char*[argc + 2];
-  char buf[128];
+  ACE_TCHAR **my_argv = new ACE_TCHAR *[argc + 2];
+  ACE_TCHAR buf[128];
   int my_argc = 0;
   for(; my_argc<argc ;++my_argc)
     my_argv[my_argc] = argv[my_argc];
-  ACE_OS::sprintf (buf, "iiop://localhost:%d", port);
-  const char* epopt = "-ORBEndpoint";
-  my_argv[my_argc++] = const_cast<char*> (epopt);
+  ACE_OS::sprintf (buf, ACE_TEXT ("iiop://localhost:%d"), port);
+  const ACE_TCHAR* epopt = ACE_TEXT ("-ORBEndpoint");
+  my_argv[my_argc++] = const_cast<ACE_TCHAR *> (epopt);
   my_argv[my_argc++] = buf;
 
-  ACE_Argv_Type_Converter satc (my_argc, my_argv);
-  orb_ = CORBA::ORB_init(satc.get_argc (), satc.get_TCHAR_argv (), orbname);
+  orb_ = CORBA::ORB_init (my_argc, my_argv, orbname);
 }
 
 void NamingTask::waitInit ()
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h
index d909fcc97db..b82ec5dbf88 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.h
@@ -11,7 +11,7 @@
 class NamingTask : public ACE_Task_Base
 {
 public:
-  NamingTask (const char* orbname, int argc, char** argv, unsigned short port);
+  NamingTask (const char* orbname, int argc, ACE_TCHAR **argv, unsigned short port);
   virtual int svc();
   void waitInit ();
   void end();
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
index 0c2b4add23f..c3d0cdefaea 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
@@ -12,10 +12,10 @@ const char *ior_output_file = "shutdown.ior";
 class TestTask : public ACE_Task_Base
 {
 public:
-  TestTask(int argc, char **argv);
-  virtual int svc();
+  TestTask (int argc, ACE_TCHAR **argv);
+  virtual int svc ();
 
-  int parse_args (int argc, char **argv);
+  int parse_args (int argc, ACE_TCHAR **argv);
 
   void end();
 private:
@@ -25,13 +25,13 @@ private:
   CORBA::Boolean shutdown_ns_;
 };
 
-TestTask::TestTask(int argc, char **argv)
+TestTask::TestTask (int argc, ACE_TCHAR **argv)
  : namingServiceA_("NamingORBA", argc, argv, 9931),
    namingServiceB_("NamingORBB", argc, argv, 9932)
 {
-  orb_ = CORBA::ORB_init(argc, argv, "ServerORB");
+  orb_ = CORBA::ORB_init (argc, argv, "ServerORB");
   shutdown_ns_ = false;
-  parse_args(argc, argv);
+  parse_args (argc, argv);
 }
 
 void TestTask::end()
@@ -41,7 +41,7 @@ void TestTask::end()
 }
 
 int
-TestTask::parse_args (int argc, char **argv)
+TestTask::parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "s");
   int c;
@@ -75,7 +75,7 @@ int TestTask::svc()
       ACE_ERROR_RETURN ((LM_ERROR,
                           "Cannot open output file for writing IOR: ns.ior\n"),
                           1);
-    ACE_OS::fprintf (output_file, "%s", namingServiceA_.ior ());
+    ACE_OS::fprintf (output_file, "%s", ACE_TEXT_CHAR_TO_TCHAR (namingServiceA_.ior ()));
     ACE_OS::fclose (output_file);
 
     // Get reference to Root POA
@@ -145,8 +145,9 @@ int TestTask::svc()
     output_file= ACE_OS::fopen (ior_output_file, "w");
     if (output_file == 0)
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "Cannot open output file for writing IOR: %s\n",
-                          ior_output_file),
+                          "Cannot open output file %s for writing IOR: %s\n",
+                          ACE_TEXT_CHAR_TO_TCHAR (ior_output_file),
+                          ACE_TEXT_CHAR_TO_TCHAR (ior.in ()) ),
                           1);
     ACE_OS::fprintf (output_file, "%s", ior.in ());
     ACE_OS::fclose (output_file);
@@ -174,10 +175,10 @@ int TestTask::svc()
   return -1;
 }
 
-int main(int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Start the Test task
-  TestTask test_(argc, argv);
+  TestTask test_ (argc, argv);
   if (test_.activate() == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Unable to start test task.\n"), -1);
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
index 8962e0915c1..6895bc74235 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp
@@ -5,15 +5,15 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 
-const char *ior_output_file = "test.ior";
+const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
 
 class TestTask : public ACE_Task_Base
 {
 public:
-  TestTask(int argc, char **argv);
-  virtual int svc();
+  TestTask (int argc, ACE_TCHAR **argv);
+  virtual int svc ();
 
-  int parse_args (int argc, char **argv);
+  int parse_args (int argc, ACE_TCHAR **argv);
 
   void end();
 private:
@@ -21,11 +21,11 @@ private:
   CORBA::Boolean shutdown_ns_;
 };
 
-TestTask::TestTask(int argc, char **argv)
+TestTask::TestTask(int argc, ACE_TCHAR **argv)
 {
-  orb_ = CORBA::ORB_init(argc, argv, "ServerORB");
+  orb_ = CORBA::ORB_init (argc, argv, "ServerORB");
   shutdown_ns_ = false;
-  parse_args(argc, argv);
+  parse_args (argc, argv);
 }
 
 void TestTask::end()
@@ -35,7 +35,7 @@ void TestTask::end()
 }
 
 int
-TestTask::parse_args (int argc, char **argv)
+TestTask::parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "o:s");
   int c;
@@ -117,8 +117,9 @@ int TestTask::svc()
     FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
     if (output_file == 0)
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "Cannot open output file for writing IOR: %s\n",
-                          ior_output_file),
+                          "Cannot open output file %s for writing IOR: %s\n",
+                          ior_output_file,
+                          ACE_TEXT_CHAR_TO_TCHAR (ior.in ()) ),
                           1);
     ACE_OS::fprintf (output_file, "%s", ior.in ());
     ACE_OS::fclose (output_file);
@@ -141,10 +142,10 @@ int TestTask::svc()
   return -1;
 }
 
-int main(int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Start the Test task
-  TestTask test_(argc, argv);
+  TestTask test_ (argc, argv);
   if (test_.activate() == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Unable to start test task.\n"), -1);
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
index 99d6b5c07c1..6e973ad4483 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Server.cpp
@@ -8,22 +8,22 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_strings.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 #if defined ACE_HAS_IPV6
   try
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
-      const char *ior_file_name = "as.ior";
-      const char* address = "224.6.6.1";
-      const char* address6 = "FF01::ABCD";
+      const ACE_TCHAR *ior_file_name = ACE_TEXT ("as.ior");
+      const char *address = "224.6.6.1";
+      const char *address6 = "FF01::ABCD";
       u_short port = 12345;
 
       for (int i = 0; argv[i] != 0; i++)
         {
-          if (ACE_OS::strcasecmp(argv[i], "-o") == 0)
+          if (ACE_OS::strcasecmp (argv[i], ACE_TEXT ("-o")) == 0)
             {
               if (argv[i+1] != 0)
                 ior_file_name = argv[++i];
@@ -55,8 +55,9 @@ int main (int argc, char* argv[])
       FILE *output_file= ACE_OS::fopen (ior_file_name, "w");
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s\n",
-                           ior_file_name),
+                           "Cannot open output file %s for writing IOR: %s\n",
+                           ior_file_name,
+                           ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
                           1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
@@ -70,7 +71,8 @@ int main (int argc, char* argv[])
     {
       ACE_ERROR ((LM_ERROR,
                   "Caught CORBA::Exception\n%s (%s)\n",
-                  exc._name (), exc._rep_id ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (exc._name ()),
+                  ACE_TEXT_CHAR_TO_TCHAR (exc._rep_id ()) ));
     }
 #else
   ACE_UNUSED_ARG (argc);
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
index 4fc71f48a0c..9e3643ef442 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
@@ -16,16 +16,16 @@ const RtecEventComm::EventType     MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1;
 
 const int EVENT_LIMIT = 20;
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
   {
     // Initialize the ORB.
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
+    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
-    const char* ecname = "EventService";
+    const ACE_TCHAR *ecname = ACE_TEXT ("EventService");
     for (int i = 0; argv[i] != 0; i++) {
-      if (ACE_OS::strcmp(argv[i], "-ecname") == 0) {
+      if (ACE_OS::strcmp (argv[i], ACE_TEXT ("-ecname")) == 0) {
         if (argv[i+1] != 0) {
           ecname = argv[i+1];
         } else {
@@ -40,7 +40,7 @@ int main (int argc, char* argv[])
     CosNaming::NamingContextExt_var root_context = CosNaming::NamingContextExt::_narrow(obj.in());
 
     // Find the EchoEventChannel.
-    obj = root_context->resolve_str(ecname);
+    obj = root_context->resolve_str (ACE_TEXT_ALWAYS_CHAR (ecname));
 
     // Downcast the object reference to an EventChannel reference.
     RtecEventChannelAdmin::EventChannel_var ec =
@@ -107,7 +107,8 @@ int main (int argc, char* argv[])
   {
     ACE_ERROR ((LM_ERROR,
     "Caught CORBA::Exception\n%s (%s)\n",
-    exc._name (), exc._rep_id ()));
+    ACE_TEXT_CHAR_TO_TCHAR (exc._name ()),
+    ACE_TEXT_CHAR_TO_TCHAR (exc._rep_id ()) ));
   }
 
   return 1;
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index 6b1ccf7e1a7..20515c9fc21 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -30,7 +30,7 @@ const RtecEventComm::EventType     MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1;
 
 // Initialize the ORB.
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
   {
@@ -38,11 +38,11 @@ int main (int argc, char* argv[])
     TAO_EC_Default_Factory::init_svcs ();
 
     // Initialize the ORB.
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
+    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
-    const char* ecname = "EventService";
-    const char* address = "localhost";
-    const char* iorfile = 0;
+    const ACE_TCHAR *ecname = ACE_TEXT ("EventService");
+    const ACE_TCHAR *address = ACE_TEXT ("localhost");
+    const ACE_TCHAR *iorfile = 0;
     u_short port = 12345;
     u_short listenport = 12345;
 
@@ -50,42 +50,42 @@ int main (int argc, char* argv[])
 
     for (int i = 0; argv[i] != 0; i++)
       {
-        if (ACE_OS::strcasecmp(argv[i], "-ecname") == 0)
+        if (ACE_OS::strcasecmp(argv[i], ACE_TEXT ("-ecname")) == 0)
           {
             if (argv[i+1] != 0)
                 ecname = argv[++i];
             else
               ACE_ERROR_RETURN ((LM_ERROR,  "Missing Event channel name\n"),0);
           }
-        else if (ACE_OS::strcasecmp(argv[i], "-address") == 0)
+        else if (ACE_OS::strcasecmp(argv[i], ACE_TEXT ("-address")) == 0)
           {
             if (argv[i+1] != 0)
               address = argv[++i];
             else
               ACE_ERROR_RETURN ((LM_ERROR, "Missing address\n"),0);
           }
-        else if (ACE_OS::strcasecmp(argv[i], "-port") == 0)
+        else if (ACE_OS::strcasecmp(argv[i], ACE_TEXT ("-port")) == 0)
           {
             if (argv[i+1] != 0)
               port = ACE_OS::atoi(argv[++i]);
             else
               ACE_ERROR_RETURN ((LM_ERROR, "Missing port\n"),0);
           }
-        else if (ACE_OS::strcasecmp(argv[i], "-listenport") == 0)
+        else if (ACE_OS::strcasecmp(argv[i], ACE_TEXT ("-listenport")) == 0)
           {
             if (argv[i+1] != 0)
               listenport = ACE_OS::atoi(argv[++i]);
             else
               ACE_ERROR_RETURN ((LM_ERROR, "Missing port\n"), 0);
           }
-        else if (ACE_OS::strcmp(argv[i], "-iorfile") == 0)
+        else if (ACE_OS::strcasecmp(argv[i], ACE_TEXT ("-iorfile")) == 0)
           {
             if (argv[i+1] != 0)
               iorfile = argv[++i];
              else
               ACE_ERROR_RETURN ((LM_ERROR, "Missing ior file\n"), 0);
           }
-        else if (ACE_OS::strcmp(argv[i], "-udp") == 0)
+        else if (ACE_OS::strcasecmp(argv[i], ACE_TEXT ("-udp")) == 0)
           mcast = 0;
       }
 
@@ -110,7 +110,7 @@ int main (int argc, char* argv[])
       CosNaming::NamingContextExt::_narrow(tmpobj.in());
 
     // Bind the Event Channel using Naming Services
-    CosNaming::Name_var name = root_context->to_name(ecname);
+    CosNaming::Name_var name = root_context->to_name (ACE_TEXT_ALWAYS_CHAR (ecname));
     root_context->rebind(name.in(), ec.in());
 
     // Get a proxy push consumer from the EventChannel.
@@ -213,7 +213,7 @@ int main (int argc, char* argv[])
     }
 
     // Create an event (just a string in this case).
-    const CORBA::String_var eventData = CORBA::string_dup(ecname);
+    const CORBA::String_var eventData = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (ecname));
 
     // Create an event set for one event
     RtecEventComm::EventSet event (1);
@@ -252,7 +252,8 @@ int main (int argc, char* argv[])
   {
     ACE_ERROR ((LM_ERROR,
     "Caught CORBA::Exception\n%s (%s)\n",
-    exc._name (), exc._rep_id ()));
+    ACE_TEXT_CHAR_TO_TCHAR (exc._name ()),
+    ACE_TEXT_CHAR_TO_TCHAR (exc._rep_id ()) ));
   }
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
index 87b2b034d41..6965f0d6721 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
@@ -17,8 +17,8 @@ public:
   TAO_FT_ReplicationManagerController ();
   virtual ~TAO_FT_ReplicationManagerController ();
 
-  int init (int & argc, char * argv[]);
-  int parse_args (int & argc, char* argv[]);
+  int init (int &argc, ACE_TCHAR *argv[]);
+  int parse_args (int &argc, ACE_TCHAR *argv[]);
   int run ();
 
 /////////////////////////////
@@ -39,7 +39,7 @@ private:
 private:
   CORBA::ORB_var orb_;
   FT::ReplicationManager_var replication_manager_;
-  const char * rm_ior_;
+  const ACE_TCHAR *rm_ior_;
   int shutdown_;
 
 };
@@ -56,7 +56,7 @@ TAO_FT_ReplicationManagerController::~TAO_FT_ReplicationManagerController ()
 {
 }
 
-int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[])
+int TAO_FT_ReplicationManagerController::init (int &argc, ACE_TCHAR *argv[])
 {
   int result = 0;
 
@@ -73,7 +73,7 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[])
       if (this->rm_ior_ != 0)
       {
         obj = this->orb_->string_to_object (
-          this->rm_ior_);
+          ACE_TEXT_ALWAYS_CHAR (this->rm_ior_));
       }
       else
       {
@@ -105,7 +105,7 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[])
 }
 
 
-int TAO_FT_ReplicationManagerController::parse_args (int & argc, char * argv[])
+int TAO_FT_ReplicationManagerController::parse_args (int &argc, ACE_TCHAR *argv[])
 {
   int result = 0;
 
@@ -130,7 +130,7 @@ int TAO_FT_ReplicationManagerController::parse_args (int & argc, char * argv[])
 
       default:
         ACE_OS::fprintf (stderr, "%s: Unknown argument - %c\n",
-                         argv[0], c);
+                         ACE_TEXT_ALWAYS_CHAR (argv[0]), c);
         this->usage(stderr);
         result = -1;
         break;
@@ -175,7 +175,7 @@ int TAO_FT_ReplicationManagerController::run ()
   return result;
 }
 
-int main (int argc, char * argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int result = 0;
   TAO_FT_ReplicationManagerController rmctrl;
@@ -186,4 +186,3 @@ int main (int argc, char * argv[])
   }
   return result;
 }
-
diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
index d227490893d..6764fe26742 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
@@ -2,13 +2,10 @@
 
 #include "ior_mcast_client_i.h"
 
-int main (int argc, char *argv [])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
-
   try
     {
-
       ior_mcast_Client_i client;
 
       int init_result;
@@ -18,7 +15,7 @@ int main (int argc, char *argv [])
     }
   catch (const CORBA::SystemException&)
     {
-      //
+      // Ignore
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
index 180c7661520..a9710c25b60 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
@@ -15,9 +15,8 @@ ior_mcast_Client_i::~ior_mcast_Client_i (void)
 
 int
 ior_mcast_Client_i::init (int& argc,
-                          char *argv[])
+                          ACE_TCHAR *argv[])
 {
-
   try
     {
       // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
index 46ca60befd4..57c6b415f21 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
@@ -24,7 +24,7 @@ class ior_mcast_Client_i
   int run (void);
   // Execute the client example code.
 
-  int init (int& argc, char *argv[]);
+  int init (int& argc, ACE_TCHAR *argv[]);
   // Initialize the client communication endpoint with the server.
 
  private:
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index a8cd25a9b2b..29d61bc4d7d 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -2,7 +2,7 @@
 
 #include "server_i.h"
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index 546c0c9a58d..3878ae082c1 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -29,7 +29,7 @@ Server_i::~Server_i (void)
 
 int
 Server_i::init (int &argc,
-                char **&argv)
+                ACE_TCHAR **argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -143,7 +143,7 @@ Server_i::enable_multicast (const char *ior)
 }
 
 int
-Server_i::parse_args (int argc, char *argv [])
+Server_i::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "a:");
   int c;
@@ -152,7 +152,7 @@ Server_i::parse_args (int argc, char *argv [])
     switch (c)
       {
       case 'a':
-        this->mcast_address_ = get_opts.opt_arg ();
+        this->mcast_address_ = ACE_TEXT_ALWAYS_CHAR (get_opts.opt_arg ());
         break;
 
       case '?':
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
index d55765506e6..84aeb82e37e 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
@@ -20,7 +20,7 @@ public:
   Server_i (void);
   ~Server_i (void);
 
-  int init (int &argc, char **&argv);
+  int init (int &argc, ACE_TCHAR **argv);
   // Initialize the server multicast.
 
 private:
@@ -30,14 +30,14 @@ private:
   int enable_multicast (const char *ior);
 
   /// Parse the command line arguments.
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
 
 private:
 
   int argc_;
   // # of arguments on the command line.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // arguments from command line.
 
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
index 40a0e221060..ebd1dbce9dc 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
@@ -21,7 +21,7 @@
 
 #include "ior_corbaname_client_i.h"
 
-int main (int argc, char *argv [])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
index 03f1cfa61d4..7161b22f6aa 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
@@ -53,7 +53,7 @@ IOR_corbaname_Client_i::run (void)
       // <name>. "#" refers to the seperator between the host and the
       // entry.
 
-      ACE_CString corbaname_url (this->argv_[1], 0, 1);
+      ACE_CString corbaname_url (ACE_TEXT_ALWAYS_CHAR (this->argv_[1]), 0, 1);
 
       // Append the seperator '#' to the host.
       corbaname_url += "#";
@@ -107,7 +107,7 @@ IOR_corbaname_Client_i::run (void)
 }
 
 int
-IOR_corbaname_Client_i::init (int argc, char **argv)
+IOR_corbaname_Client_i::init (int argc, ACE_TCHAR **argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -121,7 +121,7 @@ IOR_corbaname_Client_i::init (int argc, char **argv)
       // retrieved
       if (this->argc_ < 2)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "Address of naming context not specified\n",
+                           "%s: Address of naming context not specified\n",
                            this->argv_[0]),
                            -1);
 
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
index 8a54f83270c..18ab287ea32 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
@@ -19,7 +19,6 @@
 //
 //============================================================
 
-
 #if !defined (IOR_CORBANAME_CLIENT_I_H)
 #define IOR_CORBANAME_CLIENT_I_H
 
@@ -42,7 +41,7 @@ class IOR_corbaname_Client_i
   int run (void);
   // Execute the client example code.
 
-  int init (int argc, char **argv);
+  int init (int argc, ACE_TCHAR **argv);
   // Initialize the client communication endpoint with the server.
 
  private:
@@ -50,7 +49,7 @@ class IOR_corbaname_Client_i
   int argc_;
   // # of arguments on the command line.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // arguments from command line.
 
   CORBA::ORB_var orb_;
@@ -58,7 +57,6 @@ class IOR_corbaname_Client_i
 
   CosNaming::NamingContextExt_var naming_context_;
   // Naming context
-
 };
 
 #endif /* IOR_CORBANAME_CLIENT_I_H */
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index 277ca8336b4..21c5cea5115 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -3,7 +3,7 @@
 #include "status_i.h"
 #include "orbsvcs/CosNamingC.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {