ChangeLogTag:Mon Mar 26 21:02:24 2001 Darrell Brunsch <brunsch@uci.edu>

5 files changed, 57 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d5eaa272a5..1144d041aa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Mon Mar 26 21:02:24 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Log_Msg_NT_Event_Log.cpp:
+
+          Fixed a compilation problem with RegSetValueEx when 
+          ACE_USES_WCHAR and UNICODE were defined.  Thanks to Nick
+          Pratt <npratt@microstrategy.com> for reporting this.
+
+        * ace/ace_dll.dsp:
+
+          Unchecked the "separate types" option for debug linking.
+          Thanks to Nick Pratt for this suggestion also.
+
 Mon Mar 26 13:00:37 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/Node.h:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 1d5eaa272a5..1144d041aa9 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Mon Mar 26 21:02:24 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Log_Msg_NT_Event_Log.cpp:
+
+          Fixed a compilation problem with RegSetValueEx when 
+          ACE_USES_WCHAR and UNICODE were defined.  Thanks to Nick
+          Pratt <npratt@microstrategy.com> for reporting this.
+
+        * ace/ace_dll.dsp:
+
+          Unchecked the "separate types" option for debug linking.
+          Thanks to Nick Pratt for this suggestion also.
+
 Mon Mar 26 13:00:37 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/Node.h:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 1d5eaa272a5..1144d041aa9 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,16 @@
+Mon Mar 26 21:02:24 2001  Darrell Brunsch <brunsch@uci.edu>
+
+        * ace/Log_Msg_NT_Event_Log.cpp:
+
+          Fixed a compilation problem with RegSetValueEx when 
+          ACE_USES_WCHAR and UNICODE were defined.  Thanks to Nick
+          Pratt <npratt@microstrategy.com> for reporting this.
+
+        * ace/ace_dll.dsp:
+
+          Unchecked the "separate types" option for debug linking.
+          Thanks to Nick Pratt for this suggestion also.
+
 Mon Mar 26 13:00:37 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * ace/Node.h:
diff --git a/ace/Log_Msg_NT_Event_Log.cpp b/ace/Log_Msg_NT_Event_Log.cpp
index 9c8448126da..6a1375c0318 100644
--- a/ace/Log_Msg_NT_Event_Log.cpp
+++ b/ace/Log_Msg_NT_Event_Log.cpp
@@ -50,18 +50,18 @@ ACE_Log_Msg_NT_Event_Log::open (const ACE_TCHAR *logger_key)
                          reg_key,
                          &hkey);
   DWORD flags = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE;
-  RegSetValueEx (hkey,
-                 "TypesSupported",
-                 0,
-                 REG_DWORD,
-                 (LPBYTE) &flags,
-                 sizeof (DWORD));
-  RegSetValueEx (hkey,
-                 "EventMessageFile", 
-                 0,
-                 REG_SZ,
-                 (LPBYTE) msg_file,
-                 msg_file_length + 1);
+  ACE_TEXT_RegSetValueEx (hkey,
+                          ACE_LIB_TEXT ("TypesSupported"),
+                          0,
+                          REG_DWORD,
+                          (LPBYTE) &flags,
+                          sizeof (DWORD));
+  ACE_TEXT_RegSetValueEx (hkey,
+                          ACE_LIB_TEXT ("EventMessageFile"),
+                          0,
+                          REG_SZ,
+                          (LPBYTE) msg_file,
+                          msg_file_length + 1);
   RegCloseKey (hkey);
 
   // Obtain a handle to the event source.
diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp
index b3999691401..bbf46fea953 100644
--- a/ace/ace_dll.dsp
+++ b/ace/ace_dll.dsp
@@ -60,7 +60,7 @@ LINK32=link.exe
 # ADD BASE LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:I386 /out:"..\bin\ace.dll"

 # SUBTRACT BASE LINK32 /pdb:none

 # ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\acemfc.pdb" /machine:I386 /out:"..\bin\acemfc.dll"

-# SUBTRACT LINK32 /pdb:none

+# SUBTRACT LINK32 /pdb:none /pdbtype:<none>

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

 

@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:I386 /out:"..\bin\aced.dll" /pdbtype:sept

 # SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\acemfcd.pdb" /debug /machine:I386 /out:"..\bin\acemfcd.dll" /pdbtype:sept

-# SUBTRACT LINK32 /pdb:none

+# ADD LINK32 advapi32.lib user32.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\acemfcd.pdb" /debug /machine:I386 /out:"..\bin\acemfcd.dll"

+# SUBTRACT LINK32 /pdb:none /pdbtype:<none>

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

 

@@ -119,7 +119,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

 # ADD LINK32 advapi32.lib user32.lib /nologo /subsystem:windows /dll /pdb:".\ace.pdb" /machine:I386 /out:"..\bin\ace.dll"

-# SUBTRACT LINK32 /pdb:none

+# SUBTRACT LINK32 /pdb:none /pdbtype:<none>

 

 !ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

 

@@ -146,8 +146,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o".\ace.bsc"

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 advapi32.lib user32.lib /nologo /version:5.1 /subsystem:windows /dll /pdb:".\aced.pdb" /debug /machine:I386 /out:"..\bin\aced.dll" /pdbtype:sept

-# SUBTRACT LINK32 /pdb:none

+# ADD LINK32 advapi32.lib user32.lib /nologo /version:5.1 /subsystem:windows /dll /pdb:".\aced.pdb" /debug /machine:I386 /out:"..\bin\aced.dll"

+# SUBTRACT LINK32 /pdb:none /pdbtype:<none>

 

 !ENDIF