summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ace/ACE.cpp6
-rw-r--r--ace/ace_dll.dsp16
-rw-r--r--ace/ace_lib.dsp12
-rw-r--r--apps/Gateway/Gateway/Options.cpp3
-rw-r--r--apps/gperf/src/gperf.dsp6
-rw-r--r--apps/gperf/src/gperf_lib.dsp6
6 files changed, 24 insertions, 25 deletions
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index c4c8a58c7fc..6c0020af481 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -671,11 +671,13 @@ ACE::ldfind (const ASYS_TCHAR filename[],
#if !defined (ACE_HAS_MOSTLY_UNICODE_APIS)
if (::ExpandEnvironmentStringsA (filename,
expanded_filename,
- sizeof expanded_filename))
+ (sizeof expanded_filename
+ / sizeof (ASYS_TCHAR))))
#else
if (::ExpandEnvironmentStringsW (filename,
expanded_filename,
- sizeof expanded_filename))
+ (sizeof expanded_filename
+ / sizeof (ASYS_TCHAR))))
#endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
filename = expanded_filename;
#endif /* ACE_WIN32 && !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */
diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp
index 8fe5d29f594..e13ea1648a9 100644
--- a/ace/ace_dll.dsp
+++ b/ace/ace_dll.dsp
@@ -18,16 +18,16 @@ CFG=ACE DLL - Win32 Debug
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "ACE DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ACE DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ACE DLL - Win32 Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "ACE DLL - Win32 Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ACE DLL - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
+!MESSAGE "ACE DLL - Win32 Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "ACE DLL - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
-!MESSAGE "ACE DLL - Win32 Alpha Unicode Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
+!MESSAGE "ACE DLL - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
!MESSAGE "ACE DLL - Win32 Alpha Unicode Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
-!MESSAGE "ACE DLL - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ACE DLL - Win32 Alpha Unicode Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
!MESSAGE "ACE DLL - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ACE DLL - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ACE DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "ACE DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -359,8 +359,6 @@ LINK32=link.exe
# Begin Target
-# Name "ACE DLL - Win32 Debug"
-# Name "ACE DLL - Win32 Release"
# Name "ACE DLL - Win32 Unicode Debug"
# Name "ACE DLL - Win32 Unicode Release"
# Name "ACE DLL - Win32 Alpha Debug"
@@ -369,6 +367,8 @@ LINK32=link.exe
# Name "ACE DLL - Win32 Alpha Unicode Release"
# Name "ACE DLL - Win32 MFC Debug"
# Name "ACE DLL - Win32 MFC Release"
+# Name "ACE DLL - Win32 Release"
+# Name "ACE DLL - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp"
diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp
index 91dc6fc7fb5..bf3c6df4895 100644
--- a/ace/ace_lib.dsp
+++ b/ace/ace_lib.dsp
@@ -18,16 +18,16 @@ CFG=ACE LIB - Win32 Debug
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "ACE LIB - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "ACE LIB - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ACE LIB - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "ACE LIB - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "ACE LIB - Win32 Alpha Debug" (based on "Win32 (ALPHA) Static Library")
+!MESSAGE "ACE LIB - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "ACE LIB - Win32 Alpha Release" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE "ACE LIB - Win32 Alpha Unicode Debug" (based on "Win32 (ALPHA) Static Library")
+!MESSAGE "ACE LIB - Win32 Alpha Debug" (based on "Win32 (ALPHA) Static Library")
!MESSAGE "ACE LIB - Win32 Alpha Unicode Release" (based on "Win32 (ALPHA) Static Library")
-!MESSAGE "ACE LIB - Win32 PharLap ETS Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "ACE LIB - Win32 Alpha Unicode Debug" (based on "Win32 (ALPHA) Static Library")
!MESSAGE "ACE LIB - Win32 PharLap ETS Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "ACE LIB - Win32 PharLap ETS Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "ACE LIB - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "ACE LIB - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
diff --git a/apps/Gateway/Gateway/Options.cpp b/apps/Gateway/Gateway/Options.cpp
index ae3fae96ef3..7160bdb4c31 100644
--- a/apps/Gateway/Gateway/Options.cpp
+++ b/apps/Gateway/Gateway/Options.cpp
@@ -187,7 +187,8 @@ Options::parse_args (int argc, char *argv[])
case 'C': // Use a different proxy config filename.
ACE_OS::strncpy (this->consumer_config_file_,
get_opt.optarg,
- sizeof this->consumer_config_file_);
+ sizeof this->consumer_config_file_
+ / sizeof (ASYS_TCHAR));
break;
case 'c':
{
diff --git a/apps/gperf/src/gperf.dsp b/apps/gperf/src/gperf.dsp
index 17ea527fa85..1ff7a1dd363 100644
--- a/apps/gperf/src/gperf.dsp
+++ b/apps/gperf/src/gperf.dsp
@@ -18,12 +18,10 @@ CFG=gperf - Win32 Debug
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
+!MESSAGE "gperf - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "gperf - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
!MESSAGE "gperf - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "gperf - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "gperf - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "gperf - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
diff --git a/apps/gperf/src/gperf_lib.dsp b/apps/gperf/src/gperf_lib.dsp
index 9f4ac2bfc3a..f6c96a0357b 100644
--- a/apps/gperf/src/gperf_lib.dsp
+++ b/apps/gperf/src/gperf_lib.dsp
@@ -18,12 +18,10 @@ CFG=gperf_lib - Win32 Debug
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
+!MESSAGE "gperf_lib - Win32 Alpha Release" (based on "Win32 (ALPHA) Static Library")
+!MESSAGE "gperf_lib - Win32 Alpha Debug" (based on "Win32 (ALPHA) Static Library")
!MESSAGE "gperf_lib - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gperf_lib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "gperf_lib - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Static Library")
-!MESSAGE "gperf_lib - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Static Library")
!MESSAGE
# Begin Project
View Lorry Controller Status