KWSys 2014-10-31 (88c8cc7f)

Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ 88c8cc7f | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 29ffaf43..88c8cc7f
Ben Boeckel (11):
      9bf03363 Avoid if() quoted auto-dereference
      771e0f22 DynamicLoader: use strings for arguments
      86e20d68 Directory: remove extra define
      6cc24510 SystemTools: use strings in environment functions
      bab5b1f2 SystemTools: add string overload for ReplaceString
      f3fb01cf SystemTools: use strings for path-related APIs
      0dfbe56d SystemTools: use strings for making C identifiers
      4690fc8d SystemTools: use strings in registry function
      1b762a41 SystemTools: search for characters
      4a060347 SystemInformation: use %ls for WCHAR* format specifiers
      d31f7b12 SystemTools: remove unused variable

Brad King (1):
      88c8cc7f Fix configure_file call to use COPYONLY, not COPY_ONLY

Clinton Stimpson (1):
      5bf91dda SystemTools:  Use extended length path for copying files.

Change-Id: I16e8e55dea1c171c04f9c7d04ae3c575531097c3

1 files changed, 3 insertions, 3 deletions

diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 84b5f39..d23c248 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -5156,7 +5156,7 @@ bool SystemInformationImplementation::QueryOSInformation()
             }
           }
 
-        sprintf (operatingSystem, "%s (Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
+        sprintf (operatingSystem, "%ls (Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
         this->OSVersion = operatingSystem;
         }
       else
@@ -5205,7 +5205,7 @@ bool SystemInformationImplementation::QueryOSInformation()
       if (osvi.dwMajorVersion <= 4)
         {
         // NB: NT 4.0 and earlier.
-        sprintf (operatingSystem, "version %ld.%ld %s (Build %ld)",
+        sprintf (operatingSystem, "version %ld.%ld %ls (Build %ld)",
                  osvi.dwMajorVersion,
                  osvi.dwMinorVersion,
                  osvi.szCSDVersion,
@@ -5236,7 +5236,7 @@ bool SystemInformationImplementation::QueryOSInformation()
       else
         {
         // Windows 2000 and everything else.
-        sprintf (operatingSystem,"%s (Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
+        sprintf (operatingSystem,"%ls (Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
         this->OSVersion = operatingSystem;
         }
       break;