X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec67cff1f6e63b3b27613a085f0492958e66a28e..50f3c41d61bd9ae69f215bad923f562d509e063c:/src/msw/volume.cpp?ds=sidebyside diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp index 246a4c4e70..1331da183d 100644 --- a/src/msw/volume.cpp +++ b/src/msw/volume.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "fsvolume.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -30,18 +26,21 @@ #if wxUSE_FSVOLUME #ifndef WX_PRECOMP - #include "wx/icon.h" + #if wxUSE_GUI + #include "wx/icon.h" + #endif #include "wx/intl.h" + #include "wx/hashmap.h" #endif // WX_PRECOMP #include "wx/dir.h" -#include "wx/hashmap.h" #include "wx/dynlib.h" #include "wx/arrimpl.cpp" #include "wx/volume.h" #include +#include #include "wx/msw/missing.h" #if wxUSE_BASE @@ -50,7 +49,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); @@ -144,7 +145,7 @@ 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. @@ -177,28 +178,28 @@ static unsigned GetBasicFlags(const wxChar* filename) // Purpose: Add a file to the list if it meets the filter requirement. // Notes: - See GetBasicFlags for remarks about the Mounted flag. //============================================================================= -static bool FilteredAdd(wxArrayString& list, const wxChar* filename, +static bool FilteredAdd(wxArrayString& list, const wxChar* filename, unsigned flagsSet, unsigned flagsUnset) { - bool accept = TRUE; + bool accept = true; unsigned flags = GetBasicFlags(filename); if (flagsSet & wxFS_VOL_MOUNTED && !(flags & wxFS_VOL_MOUNTED)) - accept = FALSE; + accept = false; else if (flagsUnset & wxFS_VOL_MOUNTED && (flags & wxFS_VOL_MOUNTED)) - accept = FALSE; + accept = false; else if (flagsSet & wxFS_VOL_REMOVABLE && !(flags & wxFS_VOL_REMOVABLE)) - accept = FALSE; + accept = false; else if (flagsUnset & wxFS_VOL_REMOVABLE && (flags & wxFS_VOL_REMOVABLE)) - accept = FALSE; + accept = false; else if (flagsSet & wxFS_VOL_READONLY && !(flags & wxFS_VOL_READONLY)) - accept = FALSE; + accept = false; else if (flagsUnset & wxFS_VOL_READONLY && (flags & wxFS_VOL_READONLY)) - accept = FALSE; + accept = false; else if (flagsSet & wxFS_VOL_REMOTE && !(flags & wxFS_VOL_REMOTE)) - accept = FALSE; + accept = false; else if (flagsUnset & wxFS_VOL_REMOTE && (flags & wxFS_VOL_REMOTE)) - accept = FALSE; + accept = false; // Add to the list if passed the filter. if (accept) @@ -214,7 +215,7 @@ static bool FilteredAdd(wxArrayString& list, const wxChar* filename, // all items while determining which are connected and not. So this // function will find either all items or connected items. //============================================================================= -static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc, +static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc, unsigned flagsSet, unsigned flagsUnset) { HANDLE hEnum; @@ -261,7 +262,7 @@ static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc, { wxString filename(pRes->lpRemoteName); - if (filename.Len()) + if (!filename.empty()) { if (filename.Last() != '\\') filename.Append('\\'); @@ -300,19 +301,19 @@ static int CompareFcn(const wxString& first, const wxString& second) // way manually. // - The resulting list is sorted alphabetically. //============================================================================= -static bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc, +static bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc, unsigned flagsSet, unsigned flagsUnset) { // NN query depends on dynamically loaded library. if (!s_pWNetOpenEnum || !s_pWNetEnumResource || !s_pWNetCloseEnum) { wxLogError(_("Failed to load mpr.dll.")); - return FALSE; + return false; } // Don't waste time doing the work if the flags conflict. if (flagsSet & wxFS_VOL_MOUNTED && flagsUnset & wxFS_VOL_MOUNTED) - return FALSE; + return false; //---------------------------------------------- // Generate the list according to the flags set. @@ -333,15 +334,14 @@ 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]); wxString mount(mounted[iMounted]); - while (compare = + while (compare = wxStricmp(list[iList].c_str(), mounted[iMounted].c_str()), compare > 0 && iList >= 0) { @@ -354,7 +354,7 @@ static bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc, { // Found the element. Remove it or mark it mounted. if (flagsUnset & wxFS_VOL_MOUNTED) - list.Remove(iList); + list.RemoveAt(iList); else s_fileInfo[list[iList]].m_flags |= wxFS_VOL_MOUNTED; @@ -364,7 +364,7 @@ static bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc, } } - return TRUE; + return true; } // BuildRemoteList //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -378,8 +378,9 @@ static bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc, //============================================================================= wxArrayString wxFSVolumeBase::GetVolumes(int flagsSet, int flagsUnset) { - InterlockedExchange(&s_cancelSearch, FALSE); // reset + ::InterlockedExchange(&s_cancelSearch, FALSE); // reset +#if wxUSE_DYNLIB_CLASS if (!s_mprLib.IsLoaded() && s_mprLib.Load(_T("mpr.dll"))) { #ifdef UNICODE @@ -391,6 +392,7 @@ wxArrayString wxFSVolumeBase::GetVolumes(int flagsSet, int flagsUnset) #endif s_pWNetCloseEnum = (WNetCloseEnumPtr)s_mprLib.GetSymbol(_T("WNetCloseEnum")); } +#endif wxArrayString list; @@ -398,11 +400,11 @@ 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. - chars = GetLogicalDriveStrings(chars, buf); + GetLogicalDriveStrings(chars, buf); // Parse the list into an array, applying appropriate filters. TCHAR *pVol; @@ -447,7 +449,7 @@ wxArrayString wxFSVolumeBase::GetVolumes(int flagsSet, int flagsUnset) //============================================================================= void wxFSVolumeBase::CancelSearch() { - InterlockedExchange(&s_cancelSearch, TRUE); + ::InterlockedExchange(&s_cancelSearch, TRUE); } // CancelSearch //============================================================================= @@ -456,7 +458,7 @@ void wxFSVolumeBase::CancelSearch() //============================================================================= wxFSVolumeBase::wxFSVolumeBase() { - m_isOk = FALSE; + m_isOk = false; } // wxVolume //============================================================================= @@ -475,7 +477,7 @@ wxFSVolumeBase::wxFSVolumeBase(const wxString& name) bool wxFSVolumeBase::Create(const wxString& name) { // assume fail. - m_isOk = FALSE; + m_isOk = false; // supplied. m_volName = name; @@ -491,12 +493,12 @@ bool wxFSVolumeBase::Create(const wxString& name) m_dispName = fi.szDisplayName; // all tests passed. - return m_isOk = TRUE; + return m_isOk = true; } // Create //============================================================================= // Function: IsOk -// Purpose: returns TRUE if the volume is legal. +// Purpose: returns true if the volume is legal. // Notes: For fixed disks, it must exist. For removable disks, it must also // be present. For Network Shares, it must also be logged in, etc. //============================================================================= @@ -585,7 +587,7 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const case wxFS_VOL_ICO_SEL_LARGE: flags |= SHGFI_SHELLICONSIZE | SHGFI_OPENICON; break; - + case wxFS_VOL_ICO_MAX: wxFAIL_MSG(_T("wxFS_VOL_ICO_MAX is not valid icon type")); break; @@ -604,4 +606,3 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const #endif // wxUSE_GUI #endif // wxUSE_FSVOLUME -