1 files changed, 83 insertions, 92 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
index 072ca61ba38..71ee1a8baf2 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
@@ -33,10 +33,10 @@ Activator_Options::Activator_Options ()
 }
 
 int
-Activator_Options::parse_args (int &argc, char *argv[])
+Activator_Options::parse_args (int &argc, ACE_TCHAR *argv[])
 {
   ACE_Arg_Shifter shifter (argc, argv);
-
+ 
   while (shifter.is_anything_left ())
     {
       if (ACE_OS::strcasecmp (shifter.get_current (),
@@ -53,25 +53,25 @@ Activator_Options::parse_args (int &argc, char *argv[])
 
           if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("install")) == 0)
-            {
-              this->service_command_ = SC_INSTALL;
-            }
+          {
+            this->service_command_ = SC_INSTALL;
+          }
           else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("remove")) == 0)
-            {
-              this->service_command_ = SC_REMOVE;
-            }
+          {
+            this->service_command_ = SC_REMOVE;
+          }
           else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("install_no_imr")) == 0)
-            {
-              this->service_command_ = SC_INSTALL_NO_LOCATOR;
-            }
+          {
+            this->service_command_ = SC_INSTALL_NO_LOCATOR;
+          }
           else
-            {
-              ACE_ERROR((LM_ERROR, "Error: Unknown service command : %s\n", shifter.get_current()));
-              this->print_usage ();
-              return -1;
-            }
+          {
+            ACE_ERROR((LM_ERROR, "Error: Unknown service command : %s\n", shifter.get_current()));
+            this->print_usage ();
+            return -1;
+          }
         }
       else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-d")) == 0)
@@ -98,7 +98,7 @@ Activator_Options::parse_args (int &argc, char *argv[])
               this->print_usage ();
               return -1;
             }
-          this->ior_output_file_ = shifter.get_current ();
+          this->ior_output_file_.set (ACE_TEXT_TO_CHAR_IN (shifter.get_current()));
         }
       else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-s")) == 0)
@@ -124,7 +124,7 @@ Activator_Options::parse_args (int &argc, char *argv[])
               this->print_usage ();
               return -1;
             }
-          this->name_ = shifter.get_current ();
+          this->name_.set (ACE_TEXT_TO_CHAR_IN (shifter.get_current()));
         }
       else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-l")) == 0)
@@ -143,20 +143,20 @@ Activator_Options::parse_args (int &argc, char *argv[])
 }
 
 int
-Activator_Options::init (int argc, char *argv[])
+Activator_Options::init (int argc, ACE_TCHAR *argv[])
 {
   // Make an initial pass through and grab the arguments that we recognize.
   // This may also run the commands to install or remove the nt service.
   int result = this->parse_args (argc, argv);
   if (result != 0)
-    {
-      return result;
-    }
+  {
+    return result;
+  }
 
   for (int i = 0; i < argc; ++i)
-    {
-      this->cmdline_ += ACE_CString (argv[i]) + ACE_CString (" ");
-    }
+  {
+    this->cmdline_ += ACE_TString(argv[i]) + ACE_TEXT(" ");
+  }
 
   return 0;
 }
@@ -194,40 +194,39 @@ Activator_Options::save_registry_options()
   LONG err = ACE_TEXT_RegCreateKeyEx (SERVICE_REG_ROOT,
                              SERVICE_REG_PATH,
                              0,
-                             "", // class
+                             ACE_TEXT(""), // class
                              REG_OPTION_NON_VOLATILE,
                              KEY_ALL_ACCESS,
                              NULL,
                              &key,
                              NULL
                              );
-  if (err != ERROR_SUCCESS)
-    {
-      return -1;
-    }
-  err = ACE_TEXT_RegSetValueEx (key, "ORBInitOptions", 0, REG_SZ,
-    (LPBYTE) this->cmdline_.c_str (), this->cmdline_.length () + 1);
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  if (err != ERROR_SUCCESS) {
+    return -1;
+  }
+  err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("ORBInitOptions"), 0, REG_SZ,
+    (LPBYTE) this->cmdline_.c_str(), this->cmdline_.length() + 1);
+  ACE_ASSERT(err == ERROR_SUCCESS);
 
-  err = ACE_TEXT_RegSetValueEx (key, "IORFile", 0, REG_SZ,
-    (LPBYTE) this->ior_output_file_.c_str (), this->ior_output_file_.length () + 1);
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("IORFile"), 0, REG_SZ,
+    (LPBYTE) this->ior_output_file_.c_str(), this->ior_output_file_.length() + 1);
+  ACE_ASSERT(err == ERROR_SUCCESS);
 
-  err = ACE_TEXT_RegSetValueEx (key, "DebugLevel", 0, REG_DWORD,
-    (LPBYTE) &this->debug_ , sizeof (this->debug_));
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("DebugLevel"), 0, REG_DWORD,
+    (LPBYTE) &this->debug_ , sizeof(this->debug_));
+  ACE_ASSERT(err == ERROR_SUCCESS);
 
-  err = ACE_TEXT_RegSetValueEx( key, "Name", 0, REG_SZ,
-    (LPBYTE) this->name_.c_str (), this->name_.length () + 1);
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("Name"), 0, REG_SZ,
+    (LPBYTE) this->name_.c_str(), this->name_.length() + 1);
+  ACE_ASSERT(err == ERROR_SUCCESS);
 
   DWORD tmpint = this->notify_imr_;
-  err = ACE_TEXT_RegSetValueEx (key, "NotifyImR", 0, REG_DWORD,
-    (LPBYTE) &tmpint , sizeof (tmpint));
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("NotifyImR"), 0, REG_DWORD,
+    (LPBYTE) &tmpint , sizeof(tmpint));
+  ACE_ASSERT(err == ERROR_SUCCESS);
 
-  err = ::RegCloseKey (key);
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  err = ::RegCloseKey(key);
+  ACE_ASSERT(err == ERROR_SUCCESS);
 #endif
   return 0;
 }
@@ -244,62 +243,56 @@ Activator_Options::load_registry_options ()
                              KEY_READ,
                              &key
                              );
-  if (err != ERROR_SUCCESS)
-    {
-      // If there aren't any saved parameters, then that's ok.
-      return 0;
-    }
-  char tmpstr[4096];
-  DWORD sz = sizeof (tmpstr);
+  if (err != ERROR_SUCCESS) {
+    // If there aren't any saved parameters, then that's ok.
+    return 0;
+  }
+  ACE_TCHAR tmpstr[4096];
+  DWORD sz = sizeof(tmpstr);
   DWORD type = 0;
-  err = ACE_TEXT_RegQueryValueEx (key, "ORBInitOptions", 0, &type,
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("ORBInitOptions"), 0, &type,
     (LPBYTE) tmpstr, &sz);
-  if (err == ERROR_SUCCESS)
-    {
-      ACE_ASSERT (type == REG_SZ);
-      tmpstr[sz - 1] = '\0';
-      this->cmdline_ = tmpstr;
-    }
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_SZ);
+    tmpstr[sz - 1] = '\0';
+    this->cmdline_ = tmpstr;
+  }
 
   sz = sizeof(tmpstr);
-  err = ACE_TEXT_RegQueryValueEx (key, "IORFile", 0, &type,
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("IORFile"), 0, &type,
     (LPBYTE) tmpstr, &sz);
-  if (err == ERROR_SUCCESS)
-    {
-      ACE_ASSERT (type == REG_SZ);
-      tmpstr[sz - 1] = '\0';
-      this->ior_output_file_ = tmpstr;
-    }
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_SZ);
+    tmpstr[sz - 1] = '\0';
+    this->ior_output_file_.set (ACE_TEXT_TO_CHAR_IN (tmpstr));
+  }
 
   sz = sizeof(debug_);
-  err = ACE_TEXT_RegQueryValueEx (key, "DebugLevel", 0, &type,
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("DebugLevel"), 0, &type,
     (LPBYTE) &this->debug_ , &sz);
-  if (err == ERROR_SUCCESS)
-    {
-      ACE_ASSERT (type == REG_DWORD);
-    }
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_DWORD);
+  }
 
   sz = sizeof(tmpstr);
-  err = ACE_TEXT_RegQueryValueEx (key, "Name", 0, &type,
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Name"), 0, &type,
     (LPBYTE) tmpstr, &sz);
-  if (err == ERROR_SUCCESS)
-    {
-      ACE_ASSERT (type == REG_SZ);
-      tmpstr[sz - 1] = '\0';
-      this->name_ = tmpstr;
-    }
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_SZ);
+    tmpstr[sz - 1] = '\0';
+    this->name_.set (ACE_TEXT_TO_CHAR_IN (tmpstr));
+  }
 
   DWORD tmpint = 0;
   sz = sizeof(tmpint);
-  err = ACE_TEXT_RegQueryValueEx (key, "NotifyImR", 0, &type,
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("NotifyImR"), 0, &type,
     (LPBYTE) &tmpint , &sz);
-  if (err == ERROR_SUCCESS)
-    {
-      ACE_ASSERT (type == REG_DWORD);
-    }
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_DWORD);
+  }
   this->notify_imr_ = tmpint != 0;
 
-  err = ::RegCloseKey (key);
+  err = ::RegCloseKey(key);
   ACE_ASSERT(err == ERROR_SUCCESS);
 #endif /* ACE_WIN32 */
   return 0;
@@ -330,19 +323,17 @@ Activator_Options::ior_filename (void) const
 }
 
 Activator_Options::SERVICE_COMMAND
-Activator_Options::service_command (void) const
+Activator_Options::service_command(void) const
 {
   return this->service_command_;
 }
 
-const char*
-Activator_Options::cmdline (void) const
-{
+const ACE_TCHAR*
+Activator_Options::cmdline(void) const {
   return this->cmdline_.c_str ();
 }
 
 const ACE_CString&
-Activator_Options::name (void) const
-{
+Activator_Options::name(void) const {
   return this->name_;
 }