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

look at HOME and USERPROFILE in wxGetHomeDir() (patch 527210)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-03-09 17:26:48 +00:00
parent 68d95db4d0
commit 96c21216a6
1 changed files with 47 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/msw/utils.cpp
View File

@@ -382,11 +382,25 @@ const wxChar* wxGetHomeDir(wxString *pstr)
#endif #endif
#else // Windows #else // Windows
#ifdef __WIN32__ #ifdef __WIN32__
const wxChar *szHome = wxGetenv(wxT("HOMEDRIVE")); strDir.clear();
// If we have a valid HOME directory, as is used on many machines that
// have unix utilities on them, we should use that.
const wxChar *szHome = wxGetenv(wxT("HOME"));
if ( szHome != NULL )
{
strDir = szHome;
}
else // no HOME, try HOMEDRIVE/PATH
{
szHome = wxGetenv(wxT("HOMEDRIVE"));
if ( szHome != NULL ) if ( szHome != NULL )
strDir << szHome; strDir << szHome;
szHome = wxGetenv(wxT("HOMEPATH")); szHome = wxGetenv(wxT("HOMEPATH"));
if ( szHome != NULL ) {
if ( szHome != NULL )
{
strDir << szHome; strDir << szHome;
// the idea is that under NT these variables have default values // the idea is that under NT these variables have default values
@@ -395,12 +409,28 @@ const wxChar* wxGetHomeDir(wxString *pstr)
// create it in our program's dir. However, if the user took care // create it in our program's dir. However, if the user took care
// to set HOMEPATH to something other than "\\", we suppose that he // to set HOMEPATH to something other than "\\", we suppose that he
// knows what he is doing and use the supplied value. // knows what he is doing and use the supplied value.
if ( wxStrcmp(szHome, wxT("\\")) != 0 ) if ( wxStrcmp(szHome, wxT("\\")) == 0 )
return strDir.c_str(); strDir.clear();
}
} }
if ( strDir.empty() )
{
// If we have a valid USERPROFILE directory, as is the case in
// Windows NT, 2000 and XP, we should use that as our home directory.
szHome = wxGetenv(wxT("USERPROFILE"));
if ( szHome != NULL )
strDir = szHome;
}
if ( !strDir.empty() )
{
return strDir.c_str();
}
//else: fall back to the prograrm directory
#else // Win16 #else // Win16
// Win16 has no idea about home, so use the working directory instead // Win16 has no idea about home, so use the executable directory instead
#endif // WIN16/32 #endif // WIN16/32
// 260 was taken from windef.h // 260 was taken from windef.h