diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-03-29 17:39:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-29 17:39:46 +0200 |
| commit | 7acd5d6c2e0927c0bcdc512a7c8a0202030a65fb (patch) | |
| tree | 82c1d7c2af88e7726ee1bb9a66ccc763327065dc | |
| parent | 9427c92cb3fd6661fac93bb110dceec527d88701 (diff) | |
| parent | 6d5ecfa9873a5612940057f2ee852a3c6ec08660 (diff) | |
| download | ATCD-7acd5d6c2e0927c0bcdc512a7c8a0202030a65fb.tar.gz | |
Merge pull request #603 from reicesar/master
Fix Unicode issue on load registry data
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp index ecfe8758e38..dcae5824b66 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp @@ -322,7 +322,7 @@ Activator_Options::load_registry_options () // If there aren't any saved parameters, then that's ok. return 0; } - char tmpstr[4096]; + ACE_TCHAR tmpstr[4096]; DWORD sz = sizeof (tmpstr); DWORD type = 0; err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT("ORBInitOptions"), 0, &type, @@ -331,7 +331,7 @@ Activator_Options::load_registry_options () { ACE_ASSERT (type == REG_SZ); tmpstr[sz - 1] = '\0'; - this->cmdline_ = tmpstr; + this->cmdline_ = ACE_TEXT_ALWAYS_CHAR(tmpstr); } sz = sizeof(tmpstr); @@ -341,7 +341,7 @@ Activator_Options::load_registry_options () { ACE_ASSERT (type == REG_SZ); tmpstr[sz - 1] = '\0'; - this->ior_output_file_ = ACE_TEXT_CHAR_TO_TCHAR(tmpstr); + this->ior_output_file_ = tmpstr; } sz = sizeof(debug_); @@ -359,7 +359,7 @@ Activator_Options::load_registry_options () { ACE_ASSERT (type == REG_SZ); tmpstr[sz - 1] = '\0'; - this->name_ = tmpstr; + this->name_ = ACE_TEXT_ALWAYS_CHAR(tmpstr); } DWORD tmpint = 0; |