diff options
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp')
-rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp | 231 |
1 files changed, 110 insertions, 121 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp index 810649d2bb5..b99f1e3477e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp @@ -42,7 +42,7 @@ Options::Options () } int -Options::parse_args (int &argc, char *argv[]) +Options::parse_args (int &argc, ACE_TCHAR *argv[]) { ACE_Arg_Shifter shifter (argc, argv); @@ -62,20 +62,20 @@ 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 - { - 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) @@ -209,27 +209,27 @@ Options::parse_args (int &argc, char *argv[]) } int -Options::init (int argc, char *argv[]) +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; } int Options::init_from_registry (void) { - this->load_registry_options (); + this->load_registry_options(); return 0; } @@ -256,7 +256,7 @@ Options::print_usage (void) const } int -Options::save_registry_options () +Options::save_registry_options() { #if defined (ACE_WIN32) HKEY key = 0; @@ -264,60 +264,59 @@ 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) ior_output_file_.c_str (), ior_output_file_.length () + 1); - ACE_ASSERT (err == ERROR_SUCCESS); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("IORFile"), 0, REG_SZ, + (LPBYTE) ior_output_file_.c_str(), ior_output_file_.length() + 1); + ACE_ASSERT(err == ERROR_SUCCESS); - err = ACE_TEXT_RegSetValueEx (key, "DebugLevel", 0, REG_DWORD, - (LPBYTE) &debug_ , sizeof (debug_)); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("DebugLevel"), 0, REG_DWORD, + (LPBYTE) &debug_ , sizeof(debug_)); ACE_ASSERT(err == ERROR_SUCCESS); - err = ACE_TEXT_RegSetValueEx (key, "PersistFile", 0, REG_SZ, - (LPBYTE) this->persist_file_name_.c_str (), this->persist_file_name_.length () + 1); - ACE_ASSERT (err == ERROR_SUCCESS); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("PersistFile"), 0, REG_SZ, + (LPBYTE) this->persist_file_name_.c_str(), this->persist_file_name_.length() + 1); + ACE_ASSERT(err == ERROR_SUCCESS); - DWORD tmp = this->ping_interval_.msec (); - err = ACE_TEXT_RegSetValueEx (key, "PingInterval", 0, REG_DWORD, - (LPBYTE) &tmp, sizeof (DWORD)); - ACE_ASSERT (err == ERROR_SUCCESS); + DWORD tmp = this->ping_interval_.msec(); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("PingInterval"), 0, REG_DWORD, + (LPBYTE) &tmp, sizeof(DWORD)); + ACE_ASSERT(err == ERROR_SUCCESS); tmp = this->readonly_ ? 1 : 0; - err = ACE_TEXT_RegSetValueEx (key, "Lock", 0, REG_DWORD, - (LPBYTE) &tmp, sizeof (DWORD)); - ACE_ASSERT (err == ERROR_SUCCESS); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("Lock"), 0, REG_DWORD, + (LPBYTE) &tmp, sizeof(DWORD)); + ACE_ASSERT(err == ERROR_SUCCESS); tmp = this->repo_mode_; - err = ACE_TEXT_RegSetValueEx (key, "PersistType", 0, REG_DWORD, - (LPBYTE) &tmp, sizeof (DWORD)); - ACE_ASSERT (err == ERROR_SUCCESS); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("PersistType"), 0, REG_DWORD, + (LPBYTE) &tmp, sizeof(DWORD)); + ACE_ASSERT(err == ERROR_SUCCESS); tmp = this->startup_timeout_.sec(); - err = ACE_TEXT_RegSetValueEx (key, "Timeout", 0, REG_DWORD, - (LPBYTE) &tmp, sizeof (DWORD)); - ACE_ASSERT (err == ERROR_SUCCESS); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("Timeout"), 0, REG_DWORD, + (LPBYTE) &tmp, sizeof(DWORD)); + ACE_ASSERT(err == ERROR_SUCCESS); tmp = multicast_ ? 1 : 0; - err = ACE_TEXT_RegSetValueEx (key, "Multicast", 0, REG_DWORD, - (LPBYTE) &tmp, sizeof (DWORD)); - ACE_ASSERT (err == ERROR_SUCCESS); + err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("Multicast"), 0, REG_DWORD, + (LPBYTE) &tmp, sizeof(DWORD)); + ACE_ASSERT(err == ERROR_SUCCESS); - err = ::RegCloseKey (key); - ACE_ASSERT (err == ERROR_SUCCESS); + err = ::RegCloseKey(key); + ACE_ASSERT(err == ERROR_SUCCESS); #endif return 0; } @@ -334,101 +333,91 @@ Options::load_registry_options () KEY_READ, &key ); - if (err != ERROR_SUCCESS) - { - // If there aren't any saved parameters, then that's ok. - return 0; - } + 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 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_ = 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); + } DWORD tmp = 0; sz = sizeof(tmp); - err = ACE_TEXT_RegQueryValueEx (key, "PingInterval", 0, &type, + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PingInterval"), 0, &type, (LPBYTE) &tmp, &sz); - if (err == ERROR_SUCCESS) - { - ACE_ASSERT (type == REG_DWORD); - ping_interval_.msec (tmp); - } + if (err == ERROR_SUCCESS) { + ACE_ASSERT(type == REG_DWORD); + ping_interval_.msec(tmp); + } tmp = 0; sz = sizeof(tmp); - err = ACE_TEXT_RegQueryValueEx (key, "Lock", 0, &type, + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Lock"), 0, &type, (LPBYTE) &tmp, &sz); - if (err == ERROR_SUCCESS) - { - ACE_ASSERT (type == REG_DWORD); - readonly_ = tmp != 0; - } + if (err == ERROR_SUCCESS) { + ACE_ASSERT(type == REG_DWORD); + readonly_ = tmp != 0; + } sz = sizeof(this->repo_mode_); - err = ACE_TEXT_RegQueryValueEx (key, "PersistType", 0, &type, + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PersistType"), 0, &type, (LPBYTE) &this->repo_mode_, &sz); - if (err == ERROR_SUCCESS) - { - ACE_ASSERT (type == REG_DWORD); - } + if (err == ERROR_SUCCESS) { + ACE_ASSERT(type == REG_DWORD); + } tmp = 0; sz = sizeof(tmp); - err = ACE_TEXT_RegQueryValueEx (key, "Timeout", 0, &type, + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Timeout"), 0, &type, (LPBYTE) &tmp, &sz); - if (err == ERROR_SUCCESS) - { - ACE_ASSERT (type == REG_DWORD); - this->startup_timeout_.sec (tmp); - } + if (err == ERROR_SUCCESS) { + ACE_ASSERT(type == REG_DWORD); + this->startup_timeout_.sec(tmp); + } tmp = 0; sz = sizeof(tmp); - err = ACE_TEXT_RegQueryValueEx (key, "Multicast", 0, &type, + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Multicast"), 0, &type, (LPBYTE) &tmp, &sz); - if (err == ERROR_SUCCESS) - { - ACE_ASSERT (type == REG_DWORD); - this->multicast_ = tmp != 0; - } + if (err == ERROR_SUCCESS) { + ACE_ASSERT(type == REG_DWORD); + this->multicast_ = tmp != 0; + } sz = sizeof(tmpstr); - err = ACE_TEXT_RegQueryValueEx (key, "PersistFile", 0, &type, + err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PersistFile"), 0, &type, (LPBYTE) tmpstr, &sz); - if (err == ERROR_SUCCESS) - { - ACE_ASSERT (type == REG_SZ); - tmpstr[sz - 1] = '\0'; - this->persist_file_name_ = tmpstr; - } + if (err == ERROR_SUCCESS) { + ACE_ASSERT(type == REG_SZ); + tmpstr[sz - 1] = '\0'; + this->persist_file_name_ = tmpstr; + } - err = ::RegCloseKey (key); - ACE_ASSERT (err == ERROR_SUCCESS); + err = ::RegCloseKey(key); + ACE_ASSERT(err == ERROR_SUCCESS); #endif return 0; } @@ -445,7 +434,7 @@ Options::debug (void) const return this->debug_; } -const ACE_CString& +const ACE_TString& Options::ior_filename (void) const { return this->ior_output_file_; @@ -463,12 +452,12 @@ Options::service_command(void) const return this->service_command_; } -const char* +const ACE_TCHAR* Options::cmdline(void) const { return this->cmdline_.c_str (); } -const ACE_CString& +const ACE_TString& Options::persist_file_name(void) const { return this->persist_file_name_; } |