diff options
Diffstat (limited to 'TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp')
| -rw-r--r-- | TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp index 57cee4c14ed..48ad22436b7 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp @@ -11,9 +11,9 @@ #include "ace/Reactor.h" #define REGISTRY_KEY_ROOT HKEY_LOCAL_MACHINE -#define TAO_REGISTRY_SUBKEY "SOFTWARE\\ACE\\TAO" -#define TAO_NOTIFY_SERVICE_OPTS_NAME "TaoNotifyServiceOptions" -#define TAO_SERVICE_PARAM_COUNT "TaoServiceParameterCount" +#define TAO_REGISTRY_SUBKEY ACE_TEXT("SOFTWARE\\ACE\\TAO") +#define TAO_NOTIFY_SERVICE_OPTS_NAME ACE_TEXT("TaoNotifyServiceOptions") +#define TAO_SERVICE_PARAM_COUNT ACE_TEXT("TaoServiceParameterCount") TAO_NT_Notify_Service::TAO_NT_Notify_Service (void) : argc_ (0), @@ -60,7 +60,7 @@ TAO_NT_Notify_Service::init (int argc, ACE_TCHAR *argv[]) { HKEY hkey = 0; - BYTE buf[ACE_DEFAULT_ARGV_BUFSIZ]; + ACE_TCHAR buf[ACE_DEFAULT_ARGV_BUFSIZ]; *buf = '\0'; @@ -84,22 +84,22 @@ TAO_NT_Notify_Service::init (int argc, TAO_NOTIFY_SERVICE_OPTS_NAME, NULL, &type, - buf, + (LPBYTE)buf, &bufSize); RegCloseKey (hkey); // Add options to the args list (if any). - if (ACE_OS::strlen ((char *) buf) > 0) + if (ACE_OS::strlen (buf) > 0) { - ACE_ARGV args ((const char*) buf); + ACE_ARGV args (buf); // Allocate the internal args list to be one bigger than the // args list passed into the function. We use a 'save' list in // case we use a 'destructive' args list processor - this way we // maintain the correct argv and argc for memory freeing // operations in the destructor. - argv_save_ = (char **) ACE_OS::malloc (sizeof (char *) * (argc + args.argc ())); + argv_save_ = (ACE_TCHAR **) ACE_OS::malloc (sizeof (ACE_TCHAR *) * (argc + args.argc ())); // Copy the values into the internal args buffer. int i; |