X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27d2dbbccadf25bb1d892fe1c4afbf74cf76bb36..43f4e852a1b2ac37c3db6a2b87315192ac549191:/src/msw/volume.cpp diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp index ec4f016e2c..06c454ebc9 100644 --- a/src/msw/volume.cpp +++ b/src/msw/volume.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "fsvolume.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -29,20 +25,25 @@ #if wxUSE_FSVOLUME +#include "wx/volume.h" + #ifndef WX_PRECOMP #if wxUSE_GUI #include "wx/icon.h" #endif #include "wx/intl.h" + #include "wx/log.h" + #include "wx/hashmap.h" + #include "wx/filefn.h" #endif // WX_PRECOMP #include "wx/dir.h" -#include "wx/hashmap.h" #include "wx/dynlib.h" #include "wx/arrimpl.cpp" -#include "wx/volume.h" - +// some compilers require including before so do it +// even if this is not necessary with most of them +#include "wx/msw/wrapwin.h" #include #include #include "wx/msw/missing.h" @@ -53,7 +54,9 @@ // Dynamic library function defs. //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +#if wxUSE_DYNLIB_CLASS static wxDynamicLibrary s_mprLib; +#endif typedef DWORD (WINAPI* WNetOpenEnumPtr)(DWORD, DWORD, DWORD, LPNETRESOURCE, LPHANDLE); typedef DWORD (WINAPI* WNetEnumResourcePtr)(HANDLE, LPDWORD, LPVOID, LPDWORD); @@ -147,17 +150,19 @@ static unsigned GetBasicFlags(const wxChar* filename) } //----------------------------------------------------------------------- - // The following will most likely will not modify anything not set above, + // The following most likely will not modify anything not set above, // and will not work at all for network shares or empty CD ROM drives. // But it is a good check if the Win API ever gets better about reporting // this information. //----------------------------------------------------------------------- SHFILEINFO fi; - long rc; - rc = SHGetFileInfo(filename, 0, &fi, sizeof(fi), SHGFI_ATTRIBUTES ); + long rc = SHGetFileInfo(filename, 0, &fi, sizeof(fi), SHGFI_ATTRIBUTES); if (!rc) { - wxLogError(_("Cannot read typename from '%s'!"), filename); + // this error is not fatal, so don't show a message to the user about + // it, otherwise it would appear every time a generic directory picker + // dialog is used and there is a connected network drive + wxLogLastError(wxT("SHGetFileInfo")); } else { @@ -264,7 +269,18 @@ static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc, { wxString filename(pRes->lpRemoteName); - if (filename.Len()) + // if the drive is unavailable, FilteredAdd() can hang for + // a long time and, moreover, its failure appears to be not + // cached so this will happen every time we use it, so try + // a much quicker wxDirExists() test (which still hangs but + // for much shorter time) for locally mapped drives first + // to try to avoid this + if ( pRes->lpLocalName && + *pRes->lpLocalName && + !wxDirExists(pRes->lpLocalName) ) + continue; + + if (!filename.empty()) { if (filename.Last() != '\\') filename.Append('\\'); @@ -272,7 +288,7 @@ static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc, // The filter function will not know mounted from unmounted, and neither do we unless // we are iterating using RESOURCE_CONNECTED, in which case they all are mounted. // Volumes on disconnected servers, however, will correctly show as unmounted. - FilteredAdd(list, filename, flagsSet, flagsUnset&~wxFS_VOL_MOUNTED); + FilteredAdd(list, filename.t_str(), flagsSet, flagsUnset&~wxFS_VOL_MOUNTED); if (scope == RESOURCE_GLOBALNET) s_fileInfo[filename].m_flags &= ~wxFS_VOL_MOUNTED; } @@ -336,9 +352,8 @@ static bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc, mounted.Sort(CompareFcn); // apply list from bottom to top to preserve indexes if removing items. - int iList = list.GetCount()-1; - int iMounted; - for (iMounted = mounted.GetCount()-1; iMounted >= 0 && iList >= 0; iMounted--) + ssize_t iList = list.GetCount()-1; + for (ssize_t iMounted = mounted.GetCount()-1; iMounted >= 0 && iList >= 0; iMounted--) { int compare; wxString all(list[iList]); @@ -383,17 +398,19 @@ wxArrayString wxFSVolumeBase::GetVolumes(int flagsSet, int flagsUnset) { ::InterlockedExchange(&s_cancelSearch, FALSE); // reset - if (!s_mprLib.IsLoaded() && s_mprLib.Load(_T("mpr.dll"))) +#if wxUSE_DYNLIB_CLASS + if (!s_mprLib.IsLoaded() && s_mprLib.Load(wxT("mpr.dll"))) { #ifdef UNICODE - s_pWNetOpenEnum = (WNetOpenEnumPtr)s_mprLib.GetSymbol(_T("WNetOpenEnumW")); - s_pWNetEnumResource = (WNetEnumResourcePtr)s_mprLib.GetSymbol(_T("WNetEnumResourceW")); + s_pWNetOpenEnum = (WNetOpenEnumPtr)s_mprLib.GetSymbol(wxT("WNetOpenEnumW")); + s_pWNetEnumResource = (WNetEnumResourcePtr)s_mprLib.GetSymbol(wxT("WNetEnumResourceW")); #else - s_pWNetOpenEnum = (WNetOpenEnumPtr)s_mprLib.GetSymbol(_T("WNetOpenEnumA")); - s_pWNetEnumResource = (WNetEnumResourcePtr)s_mprLib.GetSymbol(_T("WNetEnumResourceA")); + s_pWNetOpenEnum = (WNetOpenEnumPtr)s_mprLib.GetSymbol(wxT("WNetOpenEnumA")); + s_pWNetEnumResource = (WNetEnumResourcePtr)s_mprLib.GetSymbol(wxT("WNetEnumResourceA")); #endif - s_pWNetCloseEnum = (WNetCloseEnumPtr)s_mprLib.GetSymbol(_T("WNetCloseEnum")); + s_pWNetCloseEnum = (WNetCloseEnumPtr)s_mprLib.GetSymbol(wxT("WNetCloseEnum")); } +#endif wxArrayString list; @@ -401,7 +418,7 @@ wxArrayString wxFSVolumeBase::GetVolumes(int flagsSet, int flagsUnset) // Local and mapped drives first. //------------------------------- // Allocate the required space for the API call. - size_t chars = GetLogicalDriveStrings(0, 0); + const DWORD chars = GetLogicalDriveStrings(0, NULL); TCHAR* buf = new TCHAR[chars+1]; // Get the list of drives. @@ -485,16 +502,17 @@ bool wxFSVolumeBase::Create(const wxString& name) // Display name. SHFILEINFO fi; - long rc = SHGetFileInfo(m_volName, 0, &fi, sizeof(fi), SHGFI_DISPLAYNAME); + long rc = SHGetFileInfo(m_volName.t_str(), 0, &fi, sizeof(fi), SHGFI_DISPLAYNAME); if (!rc) { wxLogError(_("Cannot read typename from '%s'!"), m_volName.c_str()); - return m_isOk; + return false; } m_dispName = fi.szDisplayName; // all tests passed. - return m_isOk = true; + m_isOk = true; + return true; } // Create //============================================================================= @@ -565,8 +583,9 @@ void wxFSVolume::InitIcons() wxIcon wxFSVolume::GetIcon(wxFSIconType type) const { wxCHECK_MSG( type >= 0 && (size_t)type < m_icons.GetCount(), wxNullIcon, - _T("wxFSIconType::GetIcon(): invalid icon index") ); + wxT("wxFSIconType::GetIcon(): invalid icon index") ); +#ifdef __WXMSW__ // Load on demand. if (m_icons[type].IsNull()) { @@ -590,21 +609,26 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const break; case wxFS_VOL_ICO_MAX: - wxFAIL_MSG(_T("wxFS_VOL_ICO_MAX is not valid icon type")); + wxFAIL_MSG(wxT("wxFS_VOL_ICO_MAX is not valid icon type")); break; } SHFILEINFO fi; - long rc = SHGetFileInfo(m_volName, 0, &fi, sizeof(fi), flags); + long rc = SHGetFileInfo(m_volName.t_str(), 0, &fi, sizeof(fi), flags); m_icons[type].SetHICON((WXHICON)fi.hIcon); if (!rc || !fi.hIcon) + { wxLogError(_("Cannot load icon from '%s'."), m_volName.c_str()); + } } return m_icons[type]; +#else + wxFAIL_MSG(wxS("Can't convert HICON to wxIcon in this port.")); + return wxNullIcon; +#endif } // GetIcon #endif // wxUSE_GUI #endif // wxUSE_FSVOLUME -