Merge pull request #236 from SuperSandro2000/new_vfs_library

Update reame.md

1 files changed, 90 insertions, 115 deletions

diff --git a/src/shared/util.cpp b/src/shared/util.cpp
index 5491a9e6..0243bb88 100644
--- a/src/shared/util.cpp
+++ b/src/shared/util.cpp
@@ -18,161 +18,136 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */

 

 #include "util.h"

-#include "windows_error.h"

 #include "error_report.h"

+#include "windows_error.h"

 

-#include <sstream>

-#include <locale>

-#include <algorithm>

 #include <DbgHelp.h>

-#include <set>

+#include <algorithm>

 #include <boost/scoped_array.hpp>

+#include <locale>

+#include <set>

+#include <sstream>

 

 namespace MOShared {

 

+bool FileExists(const std::string& filename) {

+    DWORD dwAttrib = ::GetFileAttributesA(filename.c_str());

 

-bool FileExists(const std::string &filename)

-{

-  DWORD dwAttrib = ::GetFileAttributesA(filename.c_str());

-

-  return (dwAttrib != INVALID_FILE_ATTRIBUTES);

+    return (dwAttrib != INVALID_FILE_ATTRIBUTES);

 }

 

-bool FileExists(const std::wstring &filename)

-{

-  DWORD dwAttrib = ::GetFileAttributesW(filename.c_str());

+bool FileExists(const std::wstring& filename) {

+    DWORD dwAttrib = ::GetFileAttributesW(filename.c_str());

 

-  return (dwAttrib != INVALID_FILE_ATTRIBUTES);

+    return (dwAttrib != INVALID_FILE_ATTRIBUTES);

 }

 

-bool FileExists(const std::wstring &searchPath, const std::wstring &filename)

-{

-  std::wstringstream stream;

-  stream << searchPath << "\\" << filename;

-  return FileExists(stream.str());

+bool FileExists(const std::wstring& searchPath, const std::wstring& filename) {

+    std::wstringstream stream;

+    stream << searchPath << "\\" << filename;

+    return FileExists(stream.str());

 }

 

-std::string ToString(const std::wstring &source, bool utf8)

-{

-  std::string result;

-  if (source.length() > 0) {

-    UINT codepage = CP_UTF8;

-    if (!utf8) {

-      codepage = AreFileApisANSI() ? GetACP() : GetOEMCP();

-    }

-    int sizeRequired = ::WideCharToMultiByte(codepage, 0, &source[0], -1, nullptr, 0, nullptr, nullptr);

-    if (sizeRequired == 0) {

-      throw windows_error("failed to convert string to multibyte");

+std::string ToString(const std::wstring& source, bool utf8) {

+    std::string result;

+    if (source.length() > 0) {

+        UINT codepage = CP_UTF8;

+        if (!utf8) {

+            codepage = AreFileApisANSI() ? GetACP() : GetOEMCP();

+        }

+        int sizeRequired = ::WideCharToMultiByte(codepage, 0, &source[0], -1, nullptr, 0, nullptr, nullptr);

+        if (sizeRequired == 0) {

+            throw windows_error("failed to convert string to multibyte");

+        }

+        // the size returned by WideCharToMultiByte contains zero termination IF -1 is specified for the length.

+        // we don't want that \0 in the string because then the length field would be wrong. Because madness

+        result.resize(sizeRequired - 1, '\0');

+        ::WideCharToMultiByte(codepage, 0, &source[0], (int)source.size(), &result[0], sizeRequired, nullptr, nullptr);

     }

-    // the size returned by WideCharToMultiByte contains zero termination IF -1 is specified for the length.

-    // we don't want that \0 in the string because then the length field would be wrong. Because madness

-    result.resize(sizeRequired - 1, '\0');

-    ::WideCharToMultiByte(codepage, 0, &source[0], (int)source.size(), &result[0], sizeRequired, nullptr, nullptr);

-  }

 

-  return result;

+    return result;

 }

 

-std::wstring ToWString(const std::string &source, bool utf8)

-{

-  std::wstring result;

-  if (source.length() > 0) {

-    UINT codepage = CP_UTF8;

-    if (!utf8) {

-      codepage = AreFileApisANSI() ? GetACP() : GetOEMCP();

-    }

-    int sizeRequired

-        = ::MultiByteToWideChar(codepage, 0, source.c_str(),

-                                static_cast<int>(source.length()), nullptr, 0);

-    if (sizeRequired == 0) {

-      throw windows_error("failed to convert string to wide character");

+std::wstring ToWString(const std::string& source, bool utf8) {

+    std::wstring result;

+    if (source.length() > 0) {

+        UINT codepage = CP_UTF8;

+        if (!utf8) {

+            codepage = AreFileApisANSI() ? GetACP() : GetOEMCP();

+        }

+        int sizeRequired =

+            ::MultiByteToWideChar(codepage, 0, source.c_str(), static_cast<int>(source.length()), nullptr, 0);

+        if (sizeRequired == 0) {

+            throw windows_error("failed to convert string to wide character");

+        }

+        result.resize(sizeRequired, L'\0');

+        ::MultiByteToWideChar(codepage, 0, source.c_str(), static_cast<int>(source.length()), &result[0], sizeRequired);

     }

-    result.resize(sizeRequired, L'\0');

-    ::MultiByteToWideChar(codepage, 0, source.c_str(),

-                          static_cast<int>(source.length()), &result[0],

-                          sizeRequired);

-  }

 

-  return result;

+    return result;

 }

 

 static std::locale loc("");

-static auto locToLowerW = [] (wchar_t in) -> wchar_t {

-  return std::tolower(in, loc);

-};

+static auto locToLowerW = [](wchar_t in) -> wchar_t { return std::tolower(in, loc); };

 

-static auto locToLower = [] (char in) -> char {

-  return std::tolower(in, loc);

-};

+static auto locToLower = [](char in) -> char { return std::tolower(in, loc); };

 

-std::string &ToLower(std::string &text)

-{

-  std::transform(text.begin(), text.end(), text.begin(), locToLower);

-  return text;

+std::string& ToLower(std::string& text) {

+    std::transform(text.begin(), text.end(), text.begin(), locToLower);

+    return text;

 }

 

-std::string ToLower(const std::string &text)

-{

-  std::string result(text);

-  std::transform(result.begin(), result.end(), result.begin(), locToLower);

-  return result;

+std::string ToLower(const std::string& text) {

+    std::string result(text);

+    std::transform(result.begin(), result.end(), result.begin(), locToLower);

+    return result;

 }

 

-std::wstring &ToLower(std::wstring &text)

-{

-  std::transform(text.begin(), text.end(), text.begin(), locToLowerW);

-  return text;

+std::wstring& ToLower(std::wstring& text) {

+    std::transform(text.begin(), text.end(), text.begin(), locToLowerW);

+    return text;

 }

 

-std::wstring ToLower(const std::wstring &text)

-{

-  std::wstring result(text);

-  std::transform(result.begin(), result.end(), result.begin(), locToLowerW);

-  return result;

+std::wstring ToLower(const std::wstring& text) {

+    std::wstring result(text);

+    std::transform(result.begin(), result.end(), result.begin(), locToLowerW);

+    return result;

 }

 

-bool CaseInsenstiveComparePred(wchar_t lhs, wchar_t rhs)

-{

-  return std::tolower(lhs, loc) == std::tolower(rhs, loc);

-}

+bool CaseInsenstiveComparePred(wchar_t lhs, wchar_t rhs) { return std::tolower(lhs, loc) == std::tolower(rhs, loc); }

 

-bool CaseInsensitiveEqual(const std::wstring &lhs, const std::wstring &rhs)

-{

-  return (lhs.length() == rhs.length())

-      && std::equal(lhs.begin(), lhs.end(),

-                    rhs.begin(),

-                    [] (wchar_t lhs, wchar_t rhs) -> bool {

-                      return std::tolower(lhs, loc) == std::tolower(rhs, loc);

-                    });

+bool CaseInsensitiveEqual(const std::wstring& lhs, const std::wstring& rhs) {

+    return (lhs.length() == rhs.length()) &&

+           std::equal(lhs.begin(), lhs.end(), rhs.begin(), [](wchar_t lhs, wchar_t rhs) -> bool {

+               return std::tolower(lhs, loc) == std::tolower(rhs, loc);

+           });

 }

 

-VS_FIXEDFILEINFO GetFileVersion(const std::wstring &fileName)

-{

-  DWORD handle = 0UL;

-  DWORD size = ::GetFileVersionInfoSizeW(fileName.c_str(), &handle);

-  if (size == 0) {

-    throw windows_error("failed to determine file version info size");

-  }

-

-  boost::scoped_array<char> buffer(new char[size]);

-  try {

-    handle = 0UL;

-    if (!::GetFileVersionInfoW(fileName.c_str(), handle, size, buffer.get())) {

-      throw windows_error("failed to determine file version info");

+VS_FIXEDFILEINFO GetFileVersion(const std::wstring& fileName) {

+    DWORD handle = 0UL;

+    DWORD size = ::GetFileVersionInfoSizeW(fileName.c_str(), &handle);

+    if (size == 0) {

+        throw windows_error("failed to determine file version info size");

     }

 

-    void *versionInfoPtr = nullptr;

-    UINT versionInfoLength = 0;

-    if (!::VerQueryValue(buffer.get(), L"\\", &versionInfoPtr, &versionInfoLength)) {

-      throw windows_error("failed to determine file version");

-    }

+    boost::scoped_array<char> buffer(new char[size]);

+    try {

+        handle = 0UL;

+        if (!::GetFileVersionInfoW(fileName.c_str(), handle, size, buffer.get())) {

+            throw windows_error("failed to determine file version info");

+        }

 

-    VS_FIXEDFILEINFO result = *(VS_FIXEDFILEINFO*)versionInfoPtr;

-    return result;

-  } catch (...) {

-    throw;

-  }

-}

+        void* versionInfoPtr = nullptr;

+        UINT versionInfoLength = 0;

+        if (!::VerQueryValue(buffer.get(), L"\\", &versionInfoPtr, &versionInfoLength)) {

+            throw windows_error("failed to determine file version");

+        }

 

+        VS_FIXEDFILEINFO result = *(VS_FIXEDFILEINFO*)versionInfoPtr;

+        return result;

+    } catch (...) {

+        throw;

+    }

+}

 

 } // namespace MOShared