[SHELL32][REGEDIT][MSCONFIG_NEW] Correctly check for presence of list view sort header.

diff --git a/base/applications/msconfig_new/comctl32ex/listview.c b/base/applications/msconfig_new/comctl32ex/listview.c
index 0eab585..9e5f533 100644 (file)
--- a/base/applications/msconfig_new/comctl32ex/listview.c
+++ b/base/applications/msconfig_new/comctl32ex/listview.c
@@ -49,7 +49,7 @@ ListView_SortEx(HWND hListView,
     BOOL bSortAsc;
     Sort sort;
 
-    if ((GetWindowLongPtr(hListView, GWL_STYLE) & ~LVS_NOSORTHEADER) == 0)
+    if (GetWindowLongPtr(hListView, GWL_STYLE) & LVS_NOSORTHEADER)
         return TRUE;
 
     hHeader = ListView_GetHeader(hListView);

diff --git a/base/applications/regedit/listview.c b/base/applications/regedit/listview.c
index 4d99cd7..687fb22 100644 (file)
--- a/base/applications/regedit/listview.c
+++ b/base/applications/regedit/listview.c
@@ -478,7 +478,7 @@ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSor
 
 static BOOL ListView_Sort(HWND hListView, int iSortingColumn, int iSortedColumn)
 {
-    if ( (GetWindowLongPtr(hListView, GWL_STYLE) & ~LVS_NOSORTHEADER) &&
+    if (!(GetWindowLongPtr(hListView, GWL_STYLE) & LVS_NOSORTHEADER) &&
          (iSortingColumn >= 0) )
     {
         BOOL bSortAscending;

diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp
index f846cc1..1492724 100644 (file)
--- a/dll/win32/shell32/CDefView.cpp
+++ b/dll/win32/shell32/CDefView.cpp
@@ -698,7 +698,7 @@ BOOL CDefView::_Sort()
     HWND hHeader;
     HDITEM hColumn;
 
-    if ((m_ListView.GetWindowLongPtr(GWL_STYLE) & ~LVS_NOSORTHEADER) == 0)
+    if (m_ListView.GetWindowLongPtr(GWL_STYLE) & LVS_NOSORTHEADER)
         return TRUE;
 
     hHeader = (HWND)m_ListView.SendMessage(LVM_GETHEADER, 0, 0);