*** empty log message ***

10 files changed, 37 insertions, 168 deletions

diff --git a/ChangeLog-97a b/ChangeLog-97a
index 1d8086bf28f..1be848eda97 100644
--- a/ChangeLog-97a
+++ b/ChangeLog-97a
@@ -1,5 +1,13 @@
 Mon Jun 23 01:13:15 1997    <irfan@TWOSTEP>
 
+	* ace/OS.cpp (fork_exec): Fixed the usage of ACE_WIDE_STRING.
+
+	* test_registry_iterator.cpp (main): Fixed the usage of
+ 	  ACE_WIDE_STRING.
+
+	* netsvcs/lib/TS_Clerk_Handler.cpp (parse_args): Fixed the usage
+ 	  of ACE_WIDE_STRING.
+
 	* ace/Auto_Ptr.h: Added support for basic types by seperating the
  	  auto_ptr classes into two. One that requires the -> operator
  	  support and the other that does not. The former inherits from
diff --git a/ace/ace.mak b/ace/ace.mak
index 5a6d92df8b6..a4b29cb8c84 100644
--- a/ace/ace.mak
+++ b/ace/ace.mak
@@ -3887,6 +3887,9 @@ DEP_CPP_SPIPE_A=\
 	{$(INCLUDE)}"\.\ACE.i"\

 	{$(INCLUDE)}"\.\Addr.h"\

 	{$(INCLUDE)}"\.\Addr.i"\

+	{$(INCLUDE)}"\.\Auto_Ptr.cpp"\

+	{$(INCLUDE)}"\.\Auto_Ptr.h"\

+	{$(INCLUDE)}"\.\Auto_Ptr.i"\

 	{$(INCLUDE)}"\.\config-win32-common.h"\

 	{$(INCLUDE)}"\.\config.h"\

 	{$(INCLUDE)}"\.\Log_Msg.h"\

@@ -6629,6 +6632,9 @@ DEP_CPP_OS_CP=\
 	{$(INCLUDE)}"\.\ACE.i"\

 	{$(INCLUDE)}"\.\ARGV.h"\

 	{$(INCLUDE)}"\.\ARGV.i"\

+	{$(INCLUDE)}"\.\Auto_Ptr.cpp"\

+	{$(INCLUDE)}"\.\Auto_Ptr.h"\

+	{$(INCLUDE)}"\.\Auto_Ptr.i"\

 	{$(INCLUDE)}"\.\config-win32-common.h"\

 	{$(INCLUDE)}"\.\config.h"\

 	{$(INCLUDE)}"\.\Containers.cpp"\

@@ -11877,9 +11883,6 @@ DEP_CPP_ASYNC=\
 # Begin Source File

 

 SOURCE=.\Timer_Queue.cpp

-

-!IF  "$(CFG)" == "ace - Win32 Release"

-

 DEP_CPP_TIMER=\

 	{$(INCLUDE)}"\.\ACE.h"\

 	{$(INCLUDE)}"\.\ACE.i"\

@@ -11922,176 +11925,26 @@ DEP_CPP_TIMER=\
 	{$(INCLUDE)}"\.\ws2tcpip.h"\

 	

 

+!IF  "$(CFG)" == "ace - Win32 Release"

+

+

 "$(INTDIR)\Timer_Queue.obj" : $(SOURCE) $(DEP_CPP_TIMER) "$(INTDIR)"

 

 

 !ELSEIF  "$(CFG)" == "ace - Win32 Debug"

 

-DEP_CPP_TIMER=\

-	".\Timer_Hash_T.cpp"\

-	".\Timer_Hash_T.h"\

-	{$(INCLUDE)}"\.\ACE.h"\

-	{$(INCLUDE)}"\.\ACE.i"\

-	{$(INCLUDE)}"\.\config-win32-common.h"\

-	{$(INCLUDE)}"\.\config.h"\

-	{$(INCLUDE)}"\.\Containers.cpp"\

-	{$(INCLUDE)}"\.\Containers.h"\

-	{$(INCLUDE)}"\.\Containers.i"\

-	{$(INCLUDE)}"\.\Event_Handler.h"\

-	{$(INCLUDE)}"\.\Event_Handler.i"\

-	{$(INCLUDE)}"\.\Free_List.cpp"\

-	{$(INCLUDE)}"\.\Free_List.h"\

-	{$(INCLUDE)}"\.\Free_List.i"\

-	{$(INCLUDE)}"\.\High_Res_Timer.h"\

-	{$(INCLUDE)}"\.\High_Res_Timer.i"\

-	{$(INCLUDE)}"\.\Log_Msg.h"\

-	{$(INCLUDE)}"\.\Log_Priority.h"\

-	{$(INCLUDE)}"\.\Log_Record.h"\

-	{$(INCLUDE)}"\.\Log_Record.i"\

-	{$(INCLUDE)}"\.\OS.h"\

-	{$(INCLUDE)}"\.\OS.i"\

-	{$(INCLUDE)}"\.\SString.h"\

-	{$(INCLUDE)}"\.\SString.i"\

-	{$(INCLUDE)}"\.\stdcpp.h"\

-	{$(INCLUDE)}"\.\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\.\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\.\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\.\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\.\Synch.h"\

-	{$(INCLUDE)}"\.\Synch.i"\

-	{$(INCLUDE)}"\.\Synch_T.cpp"\

-	{$(INCLUDE)}"\.\Synch_T.h"\

-	{$(INCLUDE)}"\.\Synch_T.i"\

-	{$(INCLUDE)}"\.\Thread.h"\

-	{$(INCLUDE)}"\.\Thread.i"\

-	{$(INCLUDE)}"\.\Time_Value.h"\

-	{$(INCLUDE)}"\.\Timer_Heap_T.cpp"\

-	{$(INCLUDE)}"\.\Timer_Heap_T.h"\

-	{$(INCLUDE)}"\.\Timer_List_T.cpp"\

-	{$(INCLUDE)}"\.\Timer_List_T.h"\

-	{$(INCLUDE)}"\.\Timer_Queue.h"\

-	{$(INCLUDE)}"\.\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\.\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\.\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\.\Timer_Wheel_T.cpp"\

-	{$(INCLUDE)}"\.\Timer_Wheel_T.h"\

-	{$(INCLUDE)}"\.\Trace.h"\

-	{$(INCLUDE)}"\.\ws2tcpip.h"\

-	

 

 "$(INTDIR)\Timer_Queue.obj" : $(SOURCE) $(DEP_CPP_TIMER) "$(INTDIR)"

 

 

 !ELSEIF  "$(CFG)" == "ace - Win32 Unicode Debug"

 

-DEP_CPP_TIMER=\

-	".\Timer_Hash_T.cpp"\

-	".\Timer_Hash_T.h"\

-	{$(INCLUDE)}"\.\ACE.h"\

-	{$(INCLUDE)}"\.\ACE.i"\

-	{$(INCLUDE)}"\.\config-win32-common.h"\

-	{$(INCLUDE)}"\.\config.h"\

-	{$(INCLUDE)}"\.\Containers.cpp"\

-	{$(INCLUDE)}"\.\Containers.h"\

-	{$(INCLUDE)}"\.\Containers.i"\

-	{$(INCLUDE)}"\.\Event_Handler.h"\

-	{$(INCLUDE)}"\.\Event_Handler.i"\

-	{$(INCLUDE)}"\.\Free_List.cpp"\

-	{$(INCLUDE)}"\.\Free_List.h"\

-	{$(INCLUDE)}"\.\Free_List.i"\

-	{$(INCLUDE)}"\.\High_Res_Timer.h"\

-	{$(INCLUDE)}"\.\High_Res_Timer.i"\

-	{$(INCLUDE)}"\.\Log_Msg.h"\

-	{$(INCLUDE)}"\.\Log_Priority.h"\

-	{$(INCLUDE)}"\.\Log_Record.h"\

-	{$(INCLUDE)}"\.\Log_Record.i"\

-	{$(INCLUDE)}"\.\OS.h"\

-	{$(INCLUDE)}"\.\OS.i"\

-	{$(INCLUDE)}"\.\SString.h"\

-	{$(INCLUDE)}"\.\SString.i"\

-	{$(INCLUDE)}"\.\stdcpp.h"\

-	{$(INCLUDE)}"\.\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\.\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\.\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\.\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\.\Synch.h"\

-	{$(INCLUDE)}"\.\Synch.i"\

-	{$(INCLUDE)}"\.\Synch_T.cpp"\

-	{$(INCLUDE)}"\.\Synch_T.h"\

-	{$(INCLUDE)}"\.\Synch_T.i"\

-	{$(INCLUDE)}"\.\Thread.h"\

-	{$(INCLUDE)}"\.\Thread.i"\

-	{$(INCLUDE)}"\.\Time_Value.h"\

-	{$(INCLUDE)}"\.\Timer_Heap_T.cpp"\

-	{$(INCLUDE)}"\.\Timer_Heap_T.h"\

-	{$(INCLUDE)}"\.\Timer_List_T.cpp"\

-	{$(INCLUDE)}"\.\Timer_List_T.h"\

-	{$(INCLUDE)}"\.\Timer_Queue.h"\

-	{$(INCLUDE)}"\.\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\.\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\.\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\.\Timer_Wheel_T.cpp"\

-	{$(INCLUDE)}"\.\Timer_Wheel_T.h"\

-	{$(INCLUDE)}"\.\Trace.h"\

-	{$(INCLUDE)}"\.\ws2tcpip.h"\

-	

 

 "$(INTDIR)\Timer_Queue.obj" : $(SOURCE) $(DEP_CPP_TIMER) "$(INTDIR)"

 

 

 !ELSEIF  "$(CFG)" == "ace - Win32 Unicode Release"

 

-DEP_CPP_TIMER=\

-	".\Timer_Hash_T.cpp"\

-	".\Timer_Hash_T.h"\

-	{$(INCLUDE)}"\.\ACE.h"\

-	{$(INCLUDE)}"\.\ACE.i"\

-	{$(INCLUDE)}"\.\config-win32-common.h"\

-	{$(INCLUDE)}"\.\config.h"\

-	{$(INCLUDE)}"\.\Containers.cpp"\

-	{$(INCLUDE)}"\.\Containers.h"\

-	{$(INCLUDE)}"\.\Containers.i"\

-	{$(INCLUDE)}"\.\Event_Handler.h"\

-	{$(INCLUDE)}"\.\Event_Handler.i"\

-	{$(INCLUDE)}"\.\Free_List.cpp"\

-	{$(INCLUDE)}"\.\Free_List.h"\

-	{$(INCLUDE)}"\.\Free_List.i"\

-	{$(INCLUDE)}"\.\High_Res_Timer.h"\

-	{$(INCLUDE)}"\.\High_Res_Timer.i"\

-	{$(INCLUDE)}"\.\Log_Msg.h"\

-	{$(INCLUDE)}"\.\Log_Priority.h"\

-	{$(INCLUDE)}"\.\Log_Record.h"\

-	{$(INCLUDE)}"\.\Log_Record.i"\

-	{$(INCLUDE)}"\.\OS.h"\

-	{$(INCLUDE)}"\.\OS.i"\

-	{$(INCLUDE)}"\.\SString.h"\

-	{$(INCLUDE)}"\.\SString.i"\

-	{$(INCLUDE)}"\.\stdcpp.h"\

-	{$(INCLUDE)}"\.\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\.\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\.\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\.\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\.\Synch.h"\

-	{$(INCLUDE)}"\.\Synch.i"\

-	{$(INCLUDE)}"\.\Synch_T.cpp"\

-	{$(INCLUDE)}"\.\Synch_T.h"\

-	{$(INCLUDE)}"\.\Synch_T.i"\

-	{$(INCLUDE)}"\.\Thread.h"\

-	{$(INCLUDE)}"\.\Thread.i"\

-	{$(INCLUDE)}"\.\Time_Value.h"\

-	{$(INCLUDE)}"\.\Timer_Heap_T.cpp"\

-	{$(INCLUDE)}"\.\Timer_Heap_T.h"\

-	{$(INCLUDE)}"\.\Timer_List_T.cpp"\

-	{$(INCLUDE)}"\.\Timer_List_T.h"\

-	{$(INCLUDE)}"\.\Timer_Queue.h"\

-	{$(INCLUDE)}"\.\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\.\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\.\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\.\Timer_Wheel_T.cpp"\

-	{$(INCLUDE)}"\.\Timer_Wheel_T.h"\

-	{$(INCLUDE)}"\.\Trace.h"\

-	{$(INCLUDE)}"\.\ws2tcpip.h"\

-	

 

 "$(INTDIR)\Timer_Queue.obj" : $(SOURCE) $(DEP_CPP_TIMER) "$(INTDIR)"

 

diff --git a/ace/ace.mdp b/ace/ace.mdp
index f1be0b6cbd7..c98e13d8e59 100644
--- a/ace/ace.mdp
+++ b/ace/ace.mdp
diff --git a/examples/Connection/blocking/SPIPE-acceptor.cpp b/examples/Connection/blocking/SPIPE-acceptor.cpp
index d4f7348c713..5c58d7e4e54 100644
--- a/examples/Connection/blocking/SPIPE-acceptor.cpp
+++ b/examples/Connection/blocking/SPIPE-acceptor.cpp
@@ -15,6 +15,7 @@ Svc_Handler::Svc_Handler (void)
   this->mb_.size (BUFSIZ);
 }
 
+
 Svc_Handler::~Svc_Handler (void)
 {
 }
@@ -47,9 +48,9 @@ Svc_Handler::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
 
 IPC_Server::IPC_Server (void)
   : n_threads_ (1),
-    rendezvous_ ("acepipe"),
     done_handler_ (ACE_Sig_Handler_Ex (ACE_Service_Config::end_proactor_event_loop))
 {
+  ACE_OS::strcpy (rendezvous_, __TEXT ("acepipe"));
 }
 
 IPC_Server::~IPC_Server (void)
@@ -62,7 +63,7 @@ IPC_Server::init (int argc, char *argv[])
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_DEBUG ((LM_DEBUG, "Opening %s\n", rendezvous_));
+  ACE_DEBUG ((LM_DEBUG, "Opening %s\n", ACE_MULTIBYTE_STRING (rendezvous_)));
 
   // Initialize named pipe listener.
   if (this->open (ACE_SPIPE_Addr (rendezvous_)) == -1)
@@ -94,7 +95,9 @@ IPC_Server::parse_args (int argc, char *argv[])
       switch (c)
 	{
 	case 'r':
-	  rendezvous_ = get_opt.optarg;
+	  ACE_OS::strncpy (rendezvous_, 
+			   ACE_WIDE_STRING (get_opt.optarg),
+			   sizeof rendezvous_ / sizeof TCHAR);
 	  break;
 	case 't':
 	  n_threads_ = ACE_OS::atoi (get_opt.optarg);
@@ -167,6 +170,7 @@ IPC_Server::svc (void)
 
 #endif /* SPIPE_ACCEPTOR_C */
 
+
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Concurrency_Strategy<Svc_Handler>;
 template class ACE_Oneshot_Acceptor<Svc_Handler, ACE_SPIPE_ACCEPTOR>;
diff --git a/examples/Connection/blocking/SPIPE-acceptor.h b/examples/Connection/blocking/SPIPE-acceptor.h
index 9b77e0c9aa7..6428d6ccf55 100644
--- a/examples/Connection/blocking/SPIPE-acceptor.h
+++ b/examples/Connection/blocking/SPIPE-acceptor.h
@@ -53,7 +53,7 @@ private:
   int n_threads_;
   // Size of thread pool to use.
 
-  const char *rendezvous_;
+  TCHAR rendezvous_[MAXPATHLEN + 1];
   // Meeting place for pipe.
 
   ACE_Sig_Adapter done_handler_;
diff --git a/examples/Connection/blocking/SPIPE-connector.cpp b/examples/Connection/blocking/SPIPE-connector.cpp
index 05f3c911293..9f0913c291a 100644
--- a/examples/Connection/blocking/SPIPE-connector.cpp
+++ b/examples/Connection/blocking/SPIPE-connector.cpp
@@ -98,9 +98,9 @@ Peer_Handler::display_menu (void)
 
 IPC_Client::IPC_Client (void)
   : iterations_ (0),
-    rendezvous_ ("acepipe"),
     done_handler_ (ACE_Sig_Handler_Ex (ACE_Service_Config::end_proactor_event_loop))
 {
+  ACE_OS::strcpy (rendezvous_, __TEXT ("acepipe"));
 }
 
 IPC_Client::~IPC_Client (void)
@@ -119,7 +119,7 @@ IPC_Client::init (int argc, char *argv[])
 	   (SIGINT, &this->done_handler_) == -1)
     return -1;
 
-  ACE_DEBUG ((LM_DEBUG, "Opening %s\n", rendezvous_));
+  ACE_DEBUG ((LM_DEBUG, "Opening %s\n", ACE_MULTIBYTE_STRING (rendezvous_)));
 
   Peer_Handler *ph;
   
@@ -169,7 +169,9 @@ IPC_Client::parse_args (int argc, char *argv[])
       switch (c)
 	{
 	case 'r':
-	  rendezvous_ = get_opt.optarg;
+	  ACE_OS::strncpy (rendezvous_, 
+			   ACE_WIDE_STRING (get_opt.optarg),
+			   sizeof rendezvous_ / sizeof TCHAR);
 	  break;
 	case 'i':
 	  iterations_ = ACE_OS::atoi (get_opt.optarg);
diff --git a/examples/Connection/blocking/SPIPE-connector.h b/examples/Connection/blocking/SPIPE-connector.h
index 4776fc6bde2..3bed82195a7 100644
--- a/examples/Connection/blocking/SPIPE-connector.h
+++ b/examples/Connection/blocking/SPIPE-connector.h
@@ -64,7 +64,7 @@ private:
   int iterations_;
   // Number of times to send a buffer.
 
-  const char *rendezvous_;
+  TCHAR rendezvous_[MAXPATHLEN + 1];
   // Meeting place for pipe.
 
   ACE_Sig_Adapter done_handler_;
diff --git a/examples/Registry/test_registry_iterator.cpp b/examples/Registry/test_registry_iterator.cpp
index 5e47c2cfa93..73811bd7bc3 100644
--- a/examples/Registry/test_registry_iterator.cpp
+++ b/examples/Registry/test_registry_iterator.cpp
@@ -34,7 +34,7 @@ main (int argc, char *argv[])
 						    // HKEY_CLASSES_ROOT,
 						    // HKEY_USERS,
 						    // HKEY_CURRENT_USER, 
-						    argc == 2 ? ACE_WIDE_STRING (argv[1]), 0);
+						    argc == 2 ? ACE_WIDE_STRING (argv[1]) : 0);
 							
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Predefined_Naming_Contexts::connect failed"), -1);
diff --git a/netsvcs/lib/TS_Clerk_Handler.cpp b/netsvcs/lib/TS_Clerk_Handler.cpp
index 79b5a879a64..64ae350b33e 100644
--- a/netsvcs/lib/TS_Clerk_Handler.cpp
+++ b/netsvcs/lib/TS_Clerk_Handler.cpp
@@ -289,10 +289,10 @@ ACE_TS_Clerk_Handler::send_request (ACE_UINT32 sequence_num, ACE_Time_Info &time
 
 ACE_TS_Clerk_Processor::ACE_TS_Clerk_Processor ()
 : timeout_ (ACE_DEFAULT_TIMEOUT),
-  poolname_ (ACE_DEFAULT_BACKING_STORE),
   blocking_semantics_ (0),
   cur_sequence_num_ (0)
 {
+  ACE_OS::strcpy (poolname_, ACE_DEFAULT_BACKING_STORE);
 }
 
 void
@@ -559,7 +559,9 @@ ACE_TS_Clerk_Processor::parse_args (int argc, char *argv[])
 	  break;
 	case 'p':
 	  // Get the poolname
-	  this->poolname_ = ACE_WIDE_STRING (get_opt.optarg);
+	  ACE_OS::strncpy (this->poolname_,
+			   ACE_WIDE_STRING (get_opt.optarg),
+			   sizeof this->poolname_ / sizeof TCHAR);
 	  break;
 	case 'b':
 	  // Blocking semantics
diff --git a/netsvcs/lib/TS_Clerk_Handler.h b/netsvcs/lib/TS_Clerk_Handler.h
index 096266bd0d2..c4a6caccdeb 100644
--- a/netsvcs/lib/TS_Clerk_Handler.h
+++ b/netsvcs/lib/TS_Clerk_Handler.h
@@ -214,7 +214,7 @@ private:
   int timeout_;
   // Time period for updating system time
 
-  LPCTSTR poolname_;
+  TCHAR poolname_[MAXNAMLEN + 1];
   // Pool name for backing store
 
   int blocking_semantics_;