Applied patch [ 1399013 ] More removals of extraneous semicolons

[wxWidgets.git] / src / msw / volume.cpp

diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index 2b4f3291382f53c2fedb445bf79f1b2beb4f156c..c9e25c22d6461b370bde35483af0c3c226b6e0b5 100644 (file)
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "fsvolume.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -44,6 +40,7 @@
 #include "wx/volume.h"
 
 #include <shellapi.h>
 #include "wx/volume.h"
 
 #include <shellapi.h>

+#include <shlobj.h>

 #include "wx/msw/missing.h"
 
 #if wxUSE_BASE
 #include "wx/msw/missing.h"
 
 #if wxUSE_BASE


@@ -146,7 +143,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.
     // 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.


@@ -179,28 +176,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.
 //=============================================================================
 // 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)
 {
                         unsigned flagsSet, unsigned flagsUnset)
 {

-    bool accept = TRUE;
+    bool accept = true;

     unsigned flags = GetBasicFlags(filename);
 
     if (flagsSet & wxFS_VOL_MOUNTED && !(flags & wxFS_VOL_MOUNTED))
     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))
     else if (flagsUnset & wxFS_VOL_MOUNTED && (flags & wxFS_VOL_MOUNTED))

-        accept = FALSE;
+        accept = false;

     else if (flagsSet & wxFS_VOL_REMOVABLE && !(flags & wxFS_VOL_REMOVABLE))
     else if (flagsSet & wxFS_VOL_REMOVABLE && !(flags & wxFS_VOL_REMOVABLE))

-        accept = FALSE;
+        accept = false;

     else if (flagsUnset & wxFS_VOL_REMOVABLE && (flags & wxFS_VOL_REMOVABLE))
     else if (flagsUnset & wxFS_VOL_REMOVABLE && (flags & wxFS_VOL_REMOVABLE))

-        accept = FALSE;
+        accept = false;

     else if (flagsSet & wxFS_VOL_READONLY && !(flags & wxFS_VOL_READONLY))
     else if (flagsSet & wxFS_VOL_READONLY && !(flags & wxFS_VOL_READONLY))

-        accept = FALSE;
+        accept = false;

     else if (flagsUnset & wxFS_VOL_READONLY && (flags & wxFS_VOL_READONLY))
     else if (flagsUnset & wxFS_VOL_READONLY && (flags & wxFS_VOL_READONLY))

-        accept = FALSE;
+        accept = false;

     else if (flagsSet & wxFS_VOL_REMOTE && !(flags & wxFS_VOL_REMOTE))
     else if (flagsSet & wxFS_VOL_REMOTE && !(flags & wxFS_VOL_REMOTE))

-        accept = FALSE;
+        accept = false;

     else if (flagsUnset & wxFS_VOL_REMOTE && (flags & wxFS_VOL_REMOTE))
     else if (flagsUnset & wxFS_VOL_REMOTE && (flags & wxFS_VOL_REMOTE))

-        accept = FALSE;
+        accept = false;

 
     // Add to the list if passed the filter.
     if (accept)
 
     // Add to the list if passed the filter.
     if (accept)


@@ -216,7 +213,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.
 //=============================================================================
 //          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;
                             unsigned flagsSet, unsigned flagsUnset)
 {
     HANDLE hEnum;


@@ -289,9 +286,9 @@ static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc,
 // Function: CompareFcn
 // Purpose: Used to sort the NN list alphabetically, case insensitive.
 //=============================================================================
 // Function: CompareFcn
 // Purpose: Used to sort the NN list alphabetically, case insensitive.
 //=============================================================================

-static int CompareFcn(wxString* first, wxString* second)
+static int CompareFcn(const wxString& first, const wxString& second)

 {
 {

-    return wxStricmp(first->c_str(), second->c_str());
+    return wxStricmp(first.c_str(), second.c_str());

 } // CompareFcn
 
 //=============================================================================
 } // CompareFcn
 
 //=============================================================================


@@ -302,19 +299,19 @@ static int CompareFcn(wxString* first, wxString* second)
 //          way manually.
 //        - The resulting list is sorted alphabetically.
 //=============================================================================
 //          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."));
                             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)
     }
 
     // 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.
 
     //----------------------------------------------
     // Generate the list according to the flags set.


@@ -335,15 +332,14 @@ static bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc,
         mounted.Sort(CompareFcn);
 
         // apply list from bottom to top to preserve indexes if removing items.
         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]);
 
         {
             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)
             {
                      wxStricmp(list[iList].c_str(), mounted[iMounted].c_str()),
                    compare > 0 && iList >= 0)
             {


@@ -366,7 +362,7 @@ static bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc,
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 } // BuildRemoteList
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 } // BuildRemoteList
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++


@@ -380,7 +376,7 @@ static bool BuildRemoteList(wxArrayString& list, NETRESOURCE* pResSrc,
 //=============================================================================
 wxArrayString wxFSVolumeBase::GetVolumes(int flagsSet, int flagsUnset)
 {
 //=============================================================================
 wxArrayString wxFSVolumeBase::GetVolumes(int flagsSet, int flagsUnset)
 {

-    InterlockedExchange(&s_cancelSearch, FALSE);     // reset
+    ::InterlockedExchange(&s_cancelSearch, FALSE);     // reset

 
     if (!s_mprLib.IsLoaded() && s_mprLib.Load(_T("mpr.dll")))
     {
 
     if (!s_mprLib.IsLoaded() && s_mprLib.Load(_T("mpr.dll")))
     {


@@ -400,11 +396,11 @@ wxArrayString wxFSVolumeBase::GetVolumes(int flagsSet, int flagsUnset)
     // Local and mapped drives first.
     //-------------------------------
     // Allocate the required space for the API call.
     // 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.
     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;
 
     // Parse the list into an array, applying appropriate filters.
     TCHAR *pVol;


@@ -449,7 +445,7 @@ wxArrayString wxFSVolumeBase::GetVolumes(int flagsSet, int flagsUnset)
 //=============================================================================
 void wxFSVolumeBase::CancelSearch()
 {
 //=============================================================================
 void wxFSVolumeBase::CancelSearch()
 {

-    InterlockedExchange(&s_cancelSearch, TRUE);
+    ::InterlockedExchange(&s_cancelSearch, TRUE);

 } // CancelSearch
 
 //=============================================================================
 } // CancelSearch
 
 //=============================================================================


@@ -458,7 +454,7 @@ void wxFSVolumeBase::CancelSearch()
 //=============================================================================
 wxFSVolumeBase::wxFSVolumeBase()
 {
 //=============================================================================
 wxFSVolumeBase::wxFSVolumeBase()
 {

-    m_isOk = FALSE;
+    m_isOk = false;

 } // wxVolume
 
 //=============================================================================
 } // wxVolume
 
 //=============================================================================


@@ -477,7 +473,7 @@ wxFSVolumeBase::wxFSVolumeBase(const wxString& name)
 bool wxFSVolumeBase::Create(const wxString& name)
 {
     // assume fail.
 bool wxFSVolumeBase::Create(const wxString& name)
 {
     // assume fail.

-    m_isOk = FALSE;
+    m_isOk = false;

 
     // supplied.
     m_volName = name;
 
     // supplied.
     m_volName = name;


@@ -493,12 +489,12 @@ bool wxFSVolumeBase::Create(const wxString& name)
     m_dispName = fi.szDisplayName;
 
     // all tests passed.
     m_dispName = fi.szDisplayName;
 
     // all tests passed.

-    return m_isOk = TRUE;
+    return m_isOk = true;

 } // Create
 
 //=============================================================================
 // Function: IsOk
 } // 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.
 //=============================================================================
 // 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.
 //=============================================================================


@@ -587,7 +583,7 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
         case wxFS_VOL_ICO_SEL_LARGE:
             flags |= SHGFI_SHELLICONSIZE | SHGFI_OPENICON;
             break;
         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;
         case wxFS_VOL_ICO_MAX:
             wxFAIL_MSG(_T("wxFS_VOL_ICO_MAX is not valid icon type"));
             break;


@@ -606,4 +602,3 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
 #endif // wxUSE_GUI
 
 #endif // wxUSE_FSVOLUME
 #endif // wxUSE_GUI
 
 #endif // wxUSE_FSVOLUME

-