CE stuff.

1 files changed, 17 insertions, 14 deletions

diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y
index b248c66eb8c..1979ca959c4 100644
--- a/ace/Svc_Conf.y
+++ b/ace/Svc_Conf.y
@@ -147,7 +147,7 @@ module
     {
       if ($<static_node_>1 != 0)
         {
-          ACE_ARGV args ($<static_node_>1->parameters ());
+          ACE_ARGV args (ASYS_WIDE_STRING ($<static_node_>1->parameters ()));
           ACE_Module_Type *mt = get_module ($<static_node_>-1, $<static_node_>1);
 
           if (mt->init (args.argc (), args.argv ()) == -1
@@ -202,8 +202,9 @@ svc_location
 
       if (sym != 0)
         {
-          ACE_Service_Type_Impl *stp = ace_create_service_type ($1, $2, sym, flags);
-          $$ = new ACE_Service_Type ($1, stp, $3->handle (), $4);
+          ACE_Service_Type_Impl *stp
+            = ace_create_service_type (ASYS_WIDE_STRING ($1), $2, sym, flags);
+          $$ = new ACE_Service_Type (ASYS_WIDE_STRING ($1), stp, $3->handle (), $4);
         }
       else
         {
@@ -289,7 +290,7 @@ get_module (ACE_Static_Node *str_rec, const char *svc_name)
   const ACE_Service_Type *sr = str_rec->record ();
   const ACE_Service_Type_Impl *type = sr->type ();
   ACE_Stream_Type *st = sr == 0 ? 0 : (ACE_Stream_Type *) type;
-  ACE_Module_Type *mt = st == 0 ? 0 : st->find (svc_name);
+  ACE_Module_Type *mt = st == 0 ? 0 : st->find (ASYS_WIDE_STRING (svc_name));
 
   if (sr == 0 || st == 0 || mt == 0)
     {
@@ -311,34 +312,35 @@ get_module (ACE_Static_Node *str_rec, ACE_Static_Node *svc_type)
   const ACE_Service_Type *sv = svc_type->record ();
   type = sv->type ();
   ACE_Module_Type *mt = (ACE_Module_Type *) type;
+  const char *module_type_name = svc_type->name ();
+  const ASYS_TCHAR *wname = ASYS_WIDE_STRING (module_type_name);
 
   if (sr == 0 || st == 0 || mt == 0)
     {
       ACE_ERROR ((LM_ERROR, ASYS_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"),
-                  ASYS_WIDE_STRING (svc_type->name ()),
+                  wname,
                   ASYS_WIDE_STRING (str_rec->name ())));
       yyerrno++;
     }
 
   // Make sure that the Module has the same name as the
   // Module_Type object from the svc.conf file.
-  const char *module_type_name = svc_type->name ();
   ACE_Module<ACE_SYNCH> *mp = (ACE_Module<ACE_SYNCH> *) mt->object ();
 
-  if (ACE_OS::strcmp (mp->name (), module_type_name) != 0)
+  if (ACE_OS::strcmp (mp->name (), wname) != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ASYS_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"),
-                  ASYS_WIDE_STRING (module_type_name),
-                  ASYS_WIDE_STRING (mp->name ())));
-      mp->name (module_type_name);
+                  wname,
+                  mp->name ()));
+      mp->name (wname);
     }
 
   return mt;
 }
 
 ACE_Service_Type_Impl *
-ace_create_service_type (const char *name,
+ace_create_service_type (const ASYS_TCHAR *name,
                          int type,
                          void *symbol,
                          u_int flags)
@@ -353,17 +355,18 @@ ace_create_service_type (const char *name,
     {
     case ACE_SVC_OBJ_T:
       ACE_NEW_RETURN (stp,
-                      ACE_Service_Object_Type ((ACE_Service_Object *) symbol, name, flags),
+                      ACE_Service_Object_Type ((ACE_Service_Object *) symbol,
+                                               ASYS_WIDE_STRING (name), flags),
                       0);
       break;
     case ACE_MODULE_T:
       ACE_NEW_RETURN (stp,
-                      ACE_Module_Type (symbol, name, flags),
+                      ACE_Module_Type (symbol, ASYS_WIDE_STRING (name), flags),
                       0);
       break;
     case ACE_STREAM_T:
       ACE_NEW_RETURN (stp,
-                      ACE_Stream_Type (symbol, name, flags),
+                      ACE_Stream_Type (symbol, ASYS_WIDE_STRING (name), flags),
                       0);
       break;
     default: