ChangeLogTag:Wed Mar 28 21:39:26 2001 Darrell Brunsch <brunsch@uci.edu>

2 files changed, 88 insertions, 78 deletions

diff --git a/ace/NT_Service.h b/ace/NT_Service.h
index 0a17c04aed6..fc6d705d782 100644
--- a/ace/NT_Service.h
+++ b/ace/NT_Service.h
@@ -359,7 +359,7 @@ protected:
     }                                                                       \
     _ace_nt_svc_obj_##SVCNAME->init(dwArgc, lpszArgv);                      \
     _ace_nt_svc_obj_##SVCNAME->svc_handle(                                  \
-                  RegisterServiceCtrlHandler(SVCDESC,                       \
+                  ACE_TEXT_RegisterServiceCtrlHandler(SVCDESC,              \
                                           &ace_nt_svc_handler_##SVCNAME));  \
     _ace_nt_svc_obj_##SVCNAME->open();                                      \
     _ace_nt_svc_obj_##SVCNAME->wait();                                      \
@@ -380,14 +380,14 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc,                \
                       { SVCDESC, &ace_nt_svc_main_##SVCNAME }
 
 #define ACE_NT_SERVICE_RUN(SVCNAME, SVCINSTANCE, RET)                      \
-  SERVICE_TABLE_ENTRY _ace_nt_svc_table[2] =                               \
+  ACE_TEXT_SERVICE_TABLE_ENTRY _ace_nt_svc_table[2] =                      \
   {                                                                        \
-    ACE_NT_SERVICE_ENTRY(#SVCNAME, SVCNAME),                               \
+    ACE_NT_SERVICE_ENTRY(ACE_TEXT (#SVCNAME), SVCNAME),                    \
     { 0, 0 }                                                               \
   };                                                                       \
   _ace_nt_svc_obj_##SVCNAME = SVCINSTANCE;                                 \
   ACE_OS::last_error (0);                                                  \
-  int RET = StartServiceCtrlDispatcher(_ace_nt_svc_table);
+  int RET = ACE_TEXT_StartServiceCtrlDispatcher(_ace_nt_svc_table);
 
 #if defined (__ACE_INLINE__)
 #include "ace/NT_Service.i"
diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h
index cf252ad2d88..cd158cc4022 100644
--- a/ace/ace_wchar.h
+++ b/ace/ace_wchar.h
@@ -192,82 +192,92 @@ typedef ACE_Wide_To_Ascii ACE_OS_WString;
 
 #if defined (ACE_WIN32)
 #if defined (ACE_USES_WCHAR)
-#define ACE_TEXT_STARTUPINFO              STARTUPINFOW
-#define ACE_TEXT_WIN32_FIND_DATA          WIN32_FIND_DATAW
-
-#define ACE_TEXT_CreateEvent              ::CreateEventW
-#define ACE_TEXT_CreateFile               ::CreateFileW
-#define ACE_TEXT_CreateFileMapping        ::CreateFileMappingW
-#define ACE_TEXT_CreateMutex              ::CreateMutexW
-#define ACE_TEXT_CreateProcess            ::CreateProcessW
-#define ACE_TEXT_CreateSemaphore          ::CreateSemaphoreW
-#define ACE_TEXT_CreateService            ::CreateServiceW
-#define ACE_TEXT_ExpandEnvironmentStrings ::ExpandEnvironmentStringsW
-#define ACE_TEXT_FindFirstFile            ::FindFirstFileW
-#define ACE_TEXT_FindNextFile             ::FindNextFileW
-#define ACE_TEXT_FormatMessage            ::FormatMessageW
-#define ACE_TEXT_FreeEnvironmentStrings   ::FreeEnvironmentStringsW
-#define ACE_TEXT_GetComputerName          ::GetComputerNameW
-#define ACE_TEXT_GetModuleFileName        ::GetModuleFileNameW
-#define ACE_TEXT_GetTempPath              ::GetTempPathW
-#define ACE_TEXT_GetUserName              ::GetUserNameW
-#define ACE_TEXT_LoadLibrary              ::LoadLibraryW
-#define ACE_TEXT_MoveFileEx               ::MoveFileExW
-#define ACE_TEXT_OpenSCManager            ::OpenSCManagerW
-#define ACE_TEXT_OpenService              ::OpenServiceW
-#define ACE_TEXT_RegisterEventSource      ::RegisterEventSourceW
-#define ACE_TEXT_RegConnectRegistry       ::RegConnectRegistryW
-#define ACE_TEXT_RegCreateKeyEx           ::RegCreateKeyExW
-#define ACE_TEXT_RegDeleteKey             ::RegDeleteKeyW
-#define ACE_TEXT_RegDeleteValue           ::RegDeleteValueW
-#define ACE_TEXT_RegEnumKeyEx             ::RegEnumKeyExW
-#define ACE_TEXT_RegEnumValue             ::RegEnumValueW
-#define ACE_TEXT_RegCreateKey             ::RegCreateKeyW
-#define ACE_TEXT_RegOpenKey               ::RegOpenKeyW
-#define ACE_TEXT_RegOpenKeyEx             ::RegOpenKeyExW
-#define ACE_TEXT_RegQueryValueEx          ::RegQueryValueExW
-#define ACE_TEXT_RegSetValueEx            ::RegSetValueExW
-#define ACE_TEXT_ReportEvent              ::ReportEventW
-#define ACE_TEXT_StartService             ::StartServiceW
+#define ACE_TEXT_SERVICE_TABLE_ENTRY             SERVICE_TABLE_ENTRYW
+#define ACE_TEXT_STARTUPINFO                     STARTUPINFOW
+#define ACE_TEXT_WIN32_FIND_DATA                 WIN32_FIND_DATAW
+
+#define ACE_TEXT_CreateEvent                     ::CreateEventW
+#define ACE_TEXT_CreateFile                      ::CreateFileW
+#define ACE_TEXT_CreateFileMapping               ::CreateFileMappingW
+#define ACE_TEXT_CreateMutex                     ::CreateMutexW
+#define ACE_TEXT_CreateProcess                   ::CreateProcessW
+#define ACE_TEXT_CreateSemaphore                 ::CreateSemaphoreW
+#define ACE_TEXT_CreateService                   ::CreateServiceW
+#define ACE_TEXT_ExpandEnvironmentStrings        ::ExpandEnvironmentStringsW
+#define ACE_TEXT_FindFirstChangeNotification     ::FindFirstChangeNotificationW
+#define ACE_TEXT_FindFirstFile                   ::FindFirstFileW
+#define ACE_TEXT_FindNextFile                    ::FindNextFileW
+#define ACE_TEXT_FormatMessage                   ::FormatMessageW
+#define ACE_TEXT_FreeEnvironmentStrings          ::FreeEnvironmentStringsW
+#define ACE_TEXT_GetComputerName                 ::GetComputerNameW
+#define ACE_TEXT_GetEnvironmentStrings           ::GetEnvironmentStringsW
+#define ACE_TEXT_GetModuleFileName               ::GetModuleFileNameW
+#define ACE_TEXT_GetTempPath                     ::GetTempPathW
+#define ACE_TEXT_GetUserName                     ::GetUserNameW
+#define ACE_TEXT_LoadLibrary                     ::LoadLibraryW
+#define ACE_TEXT_MoveFileEx                      ::MoveFileExW
+#define ACE_TEXT_OpenSCManager                   ::OpenSCManagerW
+#define ACE_TEXT_OpenService                     ::OpenServiceW
+#define ACE_TEXT_RegisterEventSource             ::RegisterEventSourceW
+#define ACE_TEXT_RegisterServiceCtrlHandler      ::RegisterServiceCtrlHandlerW
+#define ACE_TEXT_RegConnectRegistry              ::RegConnectRegistryW
+#define ACE_TEXT_RegCreateKeyEx                  ::RegCreateKeyExW
+#define ACE_TEXT_RegDeleteKey                    ::RegDeleteKeyW
+#define ACE_TEXT_RegDeleteValue                  ::RegDeleteValueW
+#define ACE_TEXT_RegEnumKeyEx                    ::RegEnumKeyExW
+#define ACE_TEXT_RegEnumValue                    ::RegEnumValueW
+#define ACE_TEXT_RegCreateKey                    ::RegCreateKeyW
+#define ACE_TEXT_RegOpenKey                      ::RegOpenKeyW
+#define ACE_TEXT_RegOpenKeyEx                    ::RegOpenKeyExW
+#define ACE_TEXT_RegQueryValueEx                 ::RegQueryValueExW
+#define ACE_TEXT_RegSetValueEx                   ::RegSetValueExW
+#define ACE_TEXT_ReportEvent                     ::ReportEventW
+#define ACE_TEXT_StartService                    ::StartServiceW
+#define ACE_TEXT_StartServiceCtrlDispatcher      ::StartServiceCtrlDispatcherW
 
 #else /* ACE_USES_WCHAR */
-#define ACE_TEXT_STARTUPINFO              STARTUPINFOA
-#define ACE_TEXT_WIN32_FIND_DATA          WIN32_FIND_DATAA
-
-#define ACE_TEXT_CreateEvent              ::CreateEventA
-#define ACE_TEXT_CreateFile               ::CreateFileA
-#define ACE_TEXT_CreateFileMapping        ::CreateFileMappingA
-#define ACE_TEXT_CreateMutex              ::CreateMutexA
-#define ACE_TEXT_CreateProcess            ::CreateProcessA
-#define ACE_TEXT_CreateSemaphore          ::CreateSemaphoreA
-#define ACE_TEXT_CreateService            ::CreateServiceA
-#define ACE_TEXT_ExpandEnvironmentStrings ::ExpandEnvironmentStringsA
-#define ACE_TEXT_FindFirstFile            ::FindFirstFileA
-#define ACE_TEXT_FindNextFile             ::FindNextFileA
-#define ACE_TEXT_FormatMessage            ::FormatMessageA
-#define ACE_TEXT_FreeEnvironmentStrings   ::FreeEnvironmentStringsA
-#define ACE_TEXT_GetComputerName          ::GetComputerNameA
-#define ACE_TEXT_GetModuleFileName        ::GetModuleFileNameA
-#define ACE_TEXT_GetTempPath              ::GetTempPathA
-#define ACE_TEXT_GetUserName              ::GetUserNameA
-#define ACE_TEXT_LoadLibrary              ::LoadLibraryA
-#define ACE_TEXT_MoveFileEx               ::MoveFileExA
-#define ACE_TEXT_OpenSCManager            ::OpenSCManagerA
-#define ACE_TEXT_OpenService              ::OpenServiceA
-#define ACE_TEXT_RegisterEventSource      ::RegisterEventSourceA
-#define ACE_TEXT_RegConnectRegistry       ::RegConnectRegistryA
-#define ACE_TEXT_RegCreateKeyEx           ::RegCreateKeyExA
-#define ACE_TEXT_RegDeleteKey             ::RegDeleteKeyA
-#define ACE_TEXT_RegDeleteValue           ::RegDeleteValueA
-#define ACE_TEXT_RegEnumKeyEx             ::RegEnumKeyExA
-#define ACE_TEXT_RegEnumValue             ::RegEnumValueA
-#define ACE_TEXT_RegCreateKey             ::RegCreateKeyA
-#define ACE_TEXT_RegOpenKey               ::RegOpenKeyA
-#define ACE_TEXT_RegOpenKeyEx             ::RegOpenKeyExA
-#define ACE_TEXT_RegQueryValueEx          ::RegQueryValueExA
-#define ACE_TEXT_RegSetValueEx            ::RegSetValueExA
-#define ACE_TEXT_ReportEvent              ::ReportEventA
-#define ACE_TEXT_StartService             ::StartServiceA
+#define ACE_TEXT_SERVICE_TABLE_ENTRY             SERVICE_TABLE_ENTRYA
+#define ACE_TEXT_STARTUPINFO                     STARTUPINFOA
+#define ACE_TEXT_WIN32_FIND_DATA                 WIN32_FIND_DATAA
+
+#define ACE_TEXT_CreateEvent                     ::CreateEventA
+#define ACE_TEXT_CreateFile                      ::CreateFileA
+#define ACE_TEXT_CreateFileMapping               ::CreateFileMappingA
+#define ACE_TEXT_CreateMutex                     ::CreateMutexA
+#define ACE_TEXT_CreateProcess                   ::CreateProcessA
+#define ACE_TEXT_CreateSemaphore                 ::CreateSemaphoreA
+#define ACE_TEXT_CreateService                   ::CreateServiceA
+#define ACE_TEXT_ExpandEnvironmentStrings        ::ExpandEnvironmentStringsA
+#define ACE_TEXT_FindFirstChangeNotification     ::FindFirstChangeNotificationA
+#define ACE_TEXT_FindFirstFile                   ::FindFirstFileA
+#define ACE_TEXT_FindNextFile                    ::FindNextFileA
+#define ACE_TEXT_FormatMessage                   ::FormatMessageA
+#define ACE_TEXT_FreeEnvironmentStrings          ::FreeEnvironmentStringsA
+#define ACE_TEXT_GetComputerName                 ::GetComputerNameA
+#define ACE_TEXT_GetEnvironmentStrings           ::GetEnvironmentStringsA
+#define ACE_TEXT_GetModuleFileName               ::GetModuleFileNameA
+#define ACE_TEXT_GetTempPath                     ::GetTempPathA
+#define ACE_TEXT_GetUserName                     ::GetUserNameA
+#define ACE_TEXT_LoadLibrary                     ::LoadLibraryA
+#define ACE_TEXT_MoveFileEx                      ::MoveFileExA
+#define ACE_TEXT_OpenSCManager                   ::OpenSCManagerA
+#define ACE_TEXT_OpenService                     ::OpenServiceA
+#define ACE_TEXT_RegisterEventSource             ::RegisterEventSourceA
+#define ACE_TEXT_RegisterServiceCtrlHandler      ::RegisterServiceCtrlHandlerA
+#define ACE_TEXT_RegConnectRegistry              ::RegConnectRegistryA
+#define ACE_TEXT_RegCreateKeyEx                  ::RegCreateKeyExA
+#define ACE_TEXT_RegDeleteKey                    ::RegDeleteKeyA
+#define ACE_TEXT_RegDeleteValue                  ::RegDeleteValueA
+#define ACE_TEXT_RegEnumKeyEx                    ::RegEnumKeyExA
+#define ACE_TEXT_RegEnumValue                    ::RegEnumValueA
+#define ACE_TEXT_RegCreateKey                    ::RegCreateKeyA
+#define ACE_TEXT_RegOpenKey                      ::RegOpenKeyA
+#define ACE_TEXT_RegOpenKeyEx                    ::RegOpenKeyExA
+#define ACE_TEXT_RegQueryValueEx                 ::RegQueryValueExA
+#define ACE_TEXT_RegSetValueEx                   ::RegSetValueExA
+#define ACE_TEXT_ReportEvent                     ::ReportEventA
+#define ACE_TEXT_StartService                    ::StartServiceA
+#define ACE_TEXT_StartServiceCtrlDispatcher      ::StartServiceCtrlDispatcherA
 #endif /* ACE_USES_WCHAR */
 #endif /* ACE_WIN32 */