summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp')
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp131
1 files changed, 72 insertions, 59 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
index 810649d2bb5..cdd4d0939ee 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);
@@ -209,7 +209,7 @@ 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.
@@ -220,9 +220,10 @@ 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;
}
@@ -264,57 +265,61 @@ 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, "IORFile", 0, REG_SZ,
- (LPBYTE) ior_output_file_.c_str (), ior_output_file_.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, "DebugLevel", 0, REG_DWORD,
- (LPBYTE) &debug_ , sizeof (debug_));
+ 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, "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("DebugLevel"), 0, REG_DWORD,
+ (LPBYTE) &debug_ , sizeof(debug_));
+ 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);
+ 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, 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);
@@ -342,8 +347,9 @@ Options::load_registry_options ()
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);
@@ -352,8 +358,9 @@ Options::load_registry_options ()
}
sz = sizeof(tmpstr);
- err = ACE_TEXT_RegQueryValueEx (key, "IORFile", 0, &type,
- (LPBYTE) tmpstr, &sz);
+
+ err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("IORFile"), 0, &type,
+ (LPBYTE) tmpstr, &sz);
if (err == ERROR_SUCCESS)
{
ACE_ASSERT (type == REG_SZ);
@@ -362,8 +369,9 @@ Options::load_registry_options ()
}
sz = sizeof(debug_);
- err = ACE_TEXT_RegQueryValueEx (key, "DebugLevel", 0, &type,
- (LPBYTE) &this->debug_ , &sz);
+
+ err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("DebugLevel"), 0, &type,
+ (LPBYTE) &this->debug_ , &sz);
if (err == ERROR_SUCCESS)
{
ACE_ASSERT (type == REG_DWORD);
@@ -371,8 +379,9 @@ Options::load_registry_options ()
DWORD tmp = 0;
sz = sizeof(tmp);
- err = ACE_TEXT_RegQueryValueEx (key, "PingInterval", 0, &type,
- (LPBYTE) &tmp, &sz);
+
+ err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PingInterval"), 0, &type,
+ (LPBYTE) &tmp, &sz);
if (err == ERROR_SUCCESS)
{
ACE_ASSERT (type == REG_DWORD);
@@ -381,8 +390,9 @@ Options::load_registry_options ()
tmp = 0;
sz = sizeof(tmp);
- err = ACE_TEXT_RegQueryValueEx (key, "Lock", 0, &type,
- (LPBYTE) &tmp, &sz);
+
+ err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Lock"), 0, &type,
+ (LPBYTE) &tmp, &sz);
if (err == ERROR_SUCCESS)
{
ACE_ASSERT (type == REG_DWORD);
@@ -390,8 +400,9 @@ Options::load_registry_options ()
}
sz = sizeof(this->repo_mode_);
- err = ACE_TEXT_RegQueryValueEx (key, "PersistType", 0, &type,
- (LPBYTE) &this->repo_mode_, &sz);
+
+ err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PersistType"), 0, &type,
+ (LPBYTE) &this->repo_mode_, &sz);
if (err == ERROR_SUCCESS)
{
ACE_ASSERT (type == REG_DWORD);
@@ -399,8 +410,9 @@ Options::load_registry_options ()
tmp = 0;
sz = sizeof(tmp);
- err = ACE_TEXT_RegQueryValueEx (key, "Timeout", 0, &type,
- (LPBYTE) &tmp, &sz);
+
+ err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Timeout"), 0, &type,
+ (LPBYTE) &tmp, &sz);
if (err == ERROR_SUCCESS)
{
ACE_ASSERT (type == REG_DWORD);
@@ -409,8 +421,9 @@ Options::load_registry_options ()
tmp = 0;
sz = sizeof(tmp);
- err = ACE_TEXT_RegQueryValueEx (key, "Multicast", 0, &type,
- (LPBYTE) &tmp, &sz);
+
+ err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Multicast"), 0, &type,
+ (LPBYTE) &tmp, &sz);
if (err == ERROR_SUCCESS)
{
ACE_ASSERT (type == REG_DWORD);
@@ -418,8 +431,9 @@ Options::load_registry_options ()
}
sz = sizeof(tmpstr);
- err = ACE_TEXT_RegQueryValueEx (key, "PersistFile", 0, &type,
- (LPBYTE) tmpstr, &sz);
+
+ err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PersistFile"), 0, &type,
+ (LPBYTE) tmpstr, &sz);
if (err == ERROR_SUCCESS)
{
ACE_ASSERT (type == REG_SZ);
@@ -445,7 +459,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 +477,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_;
}
@@ -502,4 +516,3 @@ Options::readonly (void) const
{
return this->readonly_;
}
-
View Lorry Controller Status