4 files changed, 22 insertions, 22 deletions

diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
index dc1288420cb..9b117727a8c 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
@@ -27,7 +27,7 @@
 #include "ace/Log_Msg.h"
 
 int
-main (int, char*[])
+ACE_TMAIN (int, ACE_TCHAR*[])
 {
   ACE_ERROR ((LM_INFO,
               "This program is only supported "
@@ -53,11 +53,11 @@ public:
   Options (void);
   ~Options (void);
 
-  int run (int argc, char *argv[]);
+  int run (int argc, ACE_TCHAR *argv[]);
 
 private:
   void parse_args (int argc,
-                   char *argv[]);
+                   ACE_TCHAR *argv[]);
   void print_usage_and_die (void);
 
 private:
@@ -112,9 +112,9 @@ Options::print_usage_and_die (void)
 }
 
 void
-Options::parse_args (int argc, char *argv[])
+Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "i:rskt:d");
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:rskt:d"));
   int c;
 
   while ((c = get_opt ()) != -1)
@@ -147,7 +147,7 @@ Options::parse_args (int argc, char *argv[])
       default:
         // -i can also be given without a value - if so, it defaults
         // to defined value.
-        if (ACE_OS::strcmp (get_opt.argv ()[get_opt.opt_ind () - 1], "-i") == 0)
+        if (ACE_OS::strcmp (get_opt.argv ()[get_opt.opt_ind () - 1], ACE_TEXT("-i")) == 0)
           {
             opt_install = 1;
             opt_startup = DEFAULT_SERVICE_INIT_STARTUP;
@@ -169,13 +169,13 @@ ConsoleHandler (DWORD /* ctrlType */)
 
 ACE_NT_SERVICE_DEFINE (service,
                        TAO_NT_Naming_Service,
-                       "TAO NT Naming Service");
+                       ACE_TEXT("TAO NT Naming Service"));
 
 int
-Options::run (int argc, char* argv[])
+Options::run (int argc, ACE_TCHAR* argv[])
 {
-  SERVICE::instance ()->name ("TAO_NT_Naming_Service",
-                              "TAO NT Naming Service");
+  SERVICE::instance ()->name (ACE_TEXT("TAO_NT_Naming_Service"),
+                              ACE_TEXT("TAO NT Naming Service"));
 
   this->parse_args (argc, argv);
 
@@ -220,7 +220,7 @@ Options::run (int argc, char* argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   return OPTIONS::instance ()->run (argc, argv);
 }
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index 506d38edb32..1a6a3a83d56 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -11,9 +11,9 @@
 #include "ace/ARGV.h"
 
 #define REGISTRY_KEY_ROOT HKEY_LOCAL_MACHINE
-#define TAO_REGISTRY_SUBKEY "SOFTWARE\\ACE\\TAO"
-#define TAO_NAMING_SERVICE_OPTS_NAME "TaoNamingServiceOptions"
-#define TAO_SERVICE_PARAM_COUNT "TaoServiceParameterCount"
+#define TAO_REGISTRY_SUBKEY ACE_TEXT("SOFTWARE\\ACE\\TAO")
+#define TAO_NAMING_SERVICE_OPTS_NAME ACE_TEXT("TaoNamingServiceOptions")
+#define TAO_SERVICE_PARAM_COUNT ACE_TEXT("TaoServiceParameterCount")
 
 AutoFinalizer::AutoFinalizer (TAO_NT_Naming_Service &service)
   : service_ (service)
@@ -95,7 +95,7 @@ TAO_NT_Naming_Service::init (int argc,
                              ACE_TCHAR *argv[])
 {
   HKEY hkey = 0;
-  BYTE buf[ACE_DEFAULT_ARGV_BUFSIZ];
+  ACE_TCHAR buf[ACE_DEFAULT_ARGV_BUFSIZ];
 
   *buf = '\0';
 
@@ -119,22 +119,22 @@ TAO_NT_Naming_Service::init (int argc,
                             TAO_NAMING_SERVICE_OPTS_NAME,
                             NULL,
                             &type,
-                            buf,
+                            (LPBYTE)buf,
                             &bufSize);
 
   RegCloseKey (hkey);
 
   // Add options to the args list (if any).
 
-  if (ACE_OS::strlen ((char *) buf) > 0)
+  if (ACE_OS::strlen (buf) > 0)
     {
-      ACE_ARGV args ((const char*) buf);
+      ACE_ARGV args (buf);
       // Allocate the internal args list to be one bigger than the
       // args list passed into the function. We use a 'save' list in
       // case we use a 'destructive' args list processor - this way we
       // maintain the correct argv and argc for memory freeing
       // operations in the destructor.
-      argv_save_ = (char **) ACE_OS::malloc (sizeof (char *) * (argc + args.argc ()));
+      argv_save_ = (ACE_TCHAR **) ACE_OS::malloc (sizeof (ACE_TCHAR *) * (argc + args.argc ()));
 
       // Copy the values into the internal args buffer.
       int i;
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
index 7d0ced9acf7..d6275761bdc 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
@@ -64,8 +64,8 @@ private:
   int argc_save_;
   // Argument count.
 
-  char **argv_;
-  char **argv_save_;
+  ACE_TCHAR **argv_;
+  ACE_TCHAR **argv_save_;
   // Argument list.
 
   friend class ACE_Singleton<TAO_NT_Naming_Service, MUTEX>;
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 22e055649e3..830063d7b59 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -70,7 +70,7 @@ int
 TAO_Naming_Service::parse_args (int &argc,
                                 ACE_TCHAR* argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("-t:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("-t:"));
   int c;
 
   while ((c = get_opts ()) != -1)