generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 18:42:41 +01:00
Code Issues Projects Releases Wiki Activity

check USERPROFILE before HOMEDRIVE/HOMEPATH

Browse Source
This commit is contained in:
Günter Obiltschnig
2014-12-09 11:03:09 +01:00
parent a5c8b751d9
commit b8181e4ddb
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Foundation/src/Path_WIN32.cpp
View File

@@ -55,15 +55,15 @@ std::string PathImpl::systemImpl()
std::string PathImpl::homeImpl() std::string PathImpl::homeImpl()
{ {
std::string result; std::string result;
if (EnvironmentImpl::hasImpl("HOMEDRIVE") && EnvironmentImpl::hasImpl("HOMEPATH")) if (EnvironmentImpl::hasImpl("USERPROFILE"))
{
result = EnvironmentImpl::getImpl("USERPROFILE");
}
else if (EnvironmentImpl::hasImpl("HOMEDRIVE") && EnvironmentImpl::hasImpl("HOMEPATH"))
{ {
result = EnvironmentImpl::getImpl("HOMEDRIVE"); result = EnvironmentImpl::getImpl("HOMEDRIVE");
result.append(EnvironmentImpl::getImpl("HOMEPATH")); result.append(EnvironmentImpl::getImpl("HOMEPATH"));
} }
else if (EnvironmentImpl::hasImpl("USERPROFILE"))
{
result = EnvironmentImpl::getImpl("USERPROFILE");
}
else else
{ {
result = systemImpl(); result = systemImpl();

10
Foundation/src/Path_WIN32U.cpp
View File

@@ -65,15 +65,15 @@ std::string PathImpl::systemImpl()
std::string PathImpl::homeImpl() std::string PathImpl::homeImpl()
{ {
std::string result; std::string result;
if (EnvironmentImpl::hasImpl("HOMEDRIVE") && EnvironmentImpl::hasImpl("HOMEPATH")) if (EnvironmentImpl::hasImpl("USERPROFILE"))
{
result = EnvironmentImpl::getImpl("USERPROFILE");
}
else if (EnvironmentImpl::hasImpl("HOMEDRIVE") && EnvironmentImpl::hasImpl("HOMEPATH"))
{ {
result = EnvironmentImpl::getImpl("HOMEDRIVE"); result = EnvironmentImpl::getImpl("HOMEDRIVE");
result.append(EnvironmentImpl::getImpl("HOMEPATH")); result.append(EnvironmentImpl::getImpl("HOMEPATH"));
} }
else if (EnvironmentImpl::hasImpl("USERPROFILE"))
{
result = EnvironmentImpl::getImpl("USERPROFILE");
}
else else
{ {
result = systemImpl(); result = systemImpl();