Fix extended listview regression

dmex · dmex · commit ab3ffc2fd990 · 2017-03-17T16:20:48.000+11:00
diff --git a/phlib/extlv.c b/phlib/extlv.c
@@ -164,7 +164,7 @@ LRESULT CALLBACK PhpExtendedListViewWndProc(
                 {
                     HWND headerHandle;
 
-                    headerHandle = (HWND)DefWindowProc(hwnd, LVM_GETHEADER, 0, 0);
+                    headerHandle = (HWND)DefSubclassProc(hwnd, LVM_GETHEADER, 0, 0);
 
                     if (header->hwndFrom == headerHandle)
                     {
@@ -352,7 +352,7 @@ LRESULT CALLBACK PhpExtendedListViewWndProc(
                 {
                     if (i != column)
                     {
-                        if (DefWindowProc(hwnd, LVM_GETCOLUMN, i, (LPARAM)&lvColumn))
+                        if (DefSubclassProc(hwnd, LVM_GETCOLUMN, i, (LPARAM)&lvColumn))
                         {
                             availableWidth -= lvColumn.cx;
                         }
@@ -366,10 +366,10 @@ LRESULT CALLBACK PhpExtendedListViewWndProc(
                 }
 
                 if (availableWidth >= 40)
-                    return DefWindowProc(hwnd, LVM_SETCOLUMNWIDTH, column, availableWidth);
+                    return DefSubclassProc(hwnd, LVM_SETCOLUMNWIDTH, column, availableWidth);
             }
 
-            return DefWindowProc(hwnd, LVM_SETCOLUMNWIDTH, column, width);
+            return DefSubclassProc(hwnd, LVM_SETCOLUMNWIDTH, column, width);
         }
         break;
     case ELVM_SETCOMPAREFUNCTION:

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ LRESULT CALLBACK PhpExtendedListViewWndProc(`
`164`	`164`	`{`
`165`	`165`	`HWND headerHandle;`
`166`	`166`
`167`		`- headerHandle = (HWND)DefWindowProc(hwnd, LVM_GETHEADER, 0, 0);`
	`167`	`+ headerHandle = (HWND)DefSubclassProc(hwnd, LVM_GETHEADER, 0, 0);`
`168`	`168`
`169`	`169`	`if (header->hwndFrom == headerHandle)`
`170`	`170`	`{`
`@@ -352,7 +352,7 @@ LRESULT CALLBACK PhpExtendedListViewWndProc(`
`352`	`352`	`{`
`353`	`353`	`if (i != column)`
`354`	`354`	`{`
`355`		`- if (DefWindowProc(hwnd, LVM_GETCOLUMN, i, (LPARAM)&lvColumn))`
	`355`	`+ if (DefSubclassProc(hwnd, LVM_GETCOLUMN, i, (LPARAM)&lvColumn))`
`356`	`356`	`{`
`357`	`357`	`availableWidth -= lvColumn.cx;`
`358`	`358`	`}`
`@@ -366,10 +366,10 @@ LRESULT CALLBACK PhpExtendedListViewWndProc(`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`if (availableWidth >= 40)`
`369`		`- return DefWindowProc(hwnd, LVM_SETCOLUMNWIDTH, column, availableWidth);`
	`369`	`+ return DefSubclassProc(hwnd, LVM_SETCOLUMNWIDTH, column, availableWidth);`
`370`	`370`	`}`
`371`	`371`
`372`		`- return DefWindowProc(hwnd, LVM_SETCOLUMNWIDTH, column, width);`
	`372`	`+ return DefSubclassProc(hwnd, LVM_SETCOLUMNWIDTH, column, width);`
`373`	`373`	`}`
`374`	`374`	`break;`
`375`	`375`	`case ELVM_SETCOMPAREFUNCTION:`