diff options
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp')
-rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp | 110 |
1 files changed, 58 insertions, 52 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp index 072ca61ba38..0312d9b86ec 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp @@ -33,7 +33,7 @@ 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); @@ -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,7 +143,7 @@ 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. @@ -154,10 +154,9 @@ Activator_Options::init (int argc, char *argv[]) } 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,37 +193,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); + 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); @@ -244,16 +245,18 @@ 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, - (LPBYTE) tmpstr, &sz); + + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("ORBInitOptions"), 0, &type, + (LPBYTE) tmpstr, &sz); if (err == ERROR_SUCCESS) { ACE_ASSERT (type == REG_SZ); @@ -262,17 +265,19 @@ Activator_Options::load_registry_options () } 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) { @@ -280,18 +285,20 @@ Activator_Options::load_registry_options () } 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) { @@ -335,9 +342,8 @@ 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 (); } |