Amebis/WinStd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add PathRemoveBackslash()

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2022-10-17 15:35:05 +02:00
parent 0fea2d1ed7
commit 93b3157f31
2 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
UnitTests/Shell.cpp
View File

@ -26,5 +26,39 @@ namespace UnitTests
Assert::IsTrue(::PathCanonicalizeW(path, L"C:\\Windows\\Temp\\test\\..")); Assert::IsTrue(::PathCanonicalizeW(path, L"C:\\Windows\\Temp\\test\\.."));
Assert::AreEqual(L"C:\\Windows\\Temp", path.c_str(), true); Assert::AreEqual(L"C:\\Windows\\Temp", path.c_str(), true);
} }
TEST_METHOD(PathRemoveBackslashA)
{
string path;
static const char normal_path[] = "C:\\Windows\\Temp\\test";
path = normal_path; path += '\\'; ::PathRemoveBackslashA(path);
Assert::AreEqual(normal_path, path.c_str());
path = normal_path; ::PathRemoveBackslashA(path);
Assert::AreEqual(normal_path, path.c_str());
static const char very_long_path[] = "C:\\Windows\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\test";
path = very_long_path; path += '\\'; ::PathRemoveBackslashA(path);
Assert::AreEqual(very_long_path, path.c_str());
path = very_long_path; ::PathRemoveBackslashA(path);
Assert::AreEqual(very_long_path, path.c_str());
}
TEST_METHOD(PathRemoveBackslashW)
{
wstring path;
static const wchar_t normal_path[] = L"C:\\Windows\\Temp\\test";
path = normal_path; path += L'\\'; ::PathRemoveBackslashW(path);
Assert::AreEqual(normal_path, path.c_str());
path = normal_path; ::PathRemoveBackslashW(path);
Assert::AreEqual(normal_path, path.c_str());
static const wchar_t very_long_path[] = L"C:\\Windows\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\Temp\\test";
path = very_long_path; path += L'\\'; ::PathRemoveBackslashW(path);
Assert::AreEqual(very_long_path, path.c_str());
path = very_long_path; ::PathRemoveBackslashW(path);
Assert::AreEqual(very_long_path, path.c_str());
}
}; };
} }

46
include/WinStd/Shell.h
View File

@ -39,4 +39,50 @@ static BOOL PathCanonicalizeW(_Inout_ std::basic_string<wchar_t, _Traits, _Ax> &
return bResult; return bResult;
} }
/// @copydoc PathRemoveBackslashW()
template<class _Traits, class _Ax>
static void PathRemoveBackslashA(_Inout_ std::basic_string<char, _Traits, _Ax>& sValue)
{
char szBuffer[MAX_PATH + 1];
size_t len = sValue.length();
if (len < _countof(szBuffer)) {
memcpy(szBuffer, sValue.c_str(), len);
szBuffer[len] = 0;
PathRemoveBackslashA(szBuffer);
sValue.assign(szBuffer);
}
else {
std::unique_ptr<char[]> buf(new char[len + 1]);
memcpy(buf.get(), sValue.c_str(), len);
buf[len] = 0;
PathRemoveBackslashA(buf.get());
sValue.assign(buf.get());
}
}
///
/// Removes the trailing backslash from a given path.
///
/// \sa [PathRemoveBackslashW function](https://learn.microsoft.com/en-us/windows/win32/api/shlwapi/nf-shlwapi-pathremovebackslashw)
///
template<class _Traits, class _Ax>
static void PathRemoveBackslashW(_Inout_ std::basic_string<wchar_t, _Traits, _Ax>& sValue)
{
wchar_t szBuffer[MAX_PATH + 1];
size_t len = sValue.length();
if (len < _countof(szBuffer)) {
wmemcpy(szBuffer, sValue.c_str(), len);
szBuffer[len] = 0;
PathRemoveBackslashW(szBuffer);
sValue.assign(szBuffer);
}
else {
std::unique_ptr<wchar_t[]> buf(new wchar_t[len + 1]);
wmemcpy(buf.get(), sValue.c_str(), len);
buf[len] = 0;
PathRemoveBackslashW(buf.get());
sValue.assign(buf.get());
}
}
/// @} /// @}