diff --git a/windows/spy.c b/windows/spy.c
index b4d6f82d6d9..b381b7fe7cd 100644
--- a/windows/spy.c
+++ b/windows/spy.c
@@ -1624,29 +1624,29 @@ static const SPY_NOTIFY spnfy_array[] = {
     SPNFY(HDN_ENDTRACKW,         NMHDR),
     SPNFY(HDN_GETDISPINFOW,      NMHDR),
     /* Treeview       0U-400U  to  0U-499U  */
-    SPNFY(TVN_SELCHANGINGA,      NMHDR),
-    SPNFY(TVN_SELCHANGEDA,       NMHDR),
-    SPNFY(TVN_GETDISPINFOA,      NMHDR),
-    SPNFY(TVN_SETDISPINFOA,      NMHDR),
-    SPNFY(TVN_ITEMEXPANDINGA,    NMHDR),
-    SPNFY(TVN_ITEMEXPANDEDA,     NMHDR),
-    SPNFY(TVN_BEGINDRAGA,        NMHDR),
-    SPNFY(TVN_BEGINRDRAGA,       NMHDR),
-    SPNFY(TVN_DELETEITEMA,       NMHDR),
-    SPNFY(TVN_BEGINLABELEDITA,   NMHDR),
-    SPNFY(TVN_ENDLABELEDITA,     NMHDR),
-    SPNFY(TVN_KEYDOWN,           NMHDR),
-    SPNFY(TVN_SELCHANGINGW,      NMHDR),
-    SPNFY(TVN_SELCHANGEDW,       NMHDR),
-    SPNFY(TVN_GETDISPINFOW,      NMHDR),
-    SPNFY(TVN_SETDISPINFOW,      NMHDR),
-    SPNFY(TVN_ITEMEXPANDINGW,    NMHDR),
-    SPNFY(TVN_ITEMEXPANDEDW,     NMHDR),
-    SPNFY(TVN_BEGINDRAGW,        NMHDR),
-    SPNFY(TVN_BEGINRDRAGW,       NMHDR),
-    SPNFY(TVN_DELETEITEMW,       NMHDR),
-    SPNFY(TVN_BEGINLABELEDITW,   NMHDR),
-    SPNFY(TVN_ENDLABELEDITW,     NMHDR),
+    SPNFY(TVN_SELCHANGINGA,      NMTREEVIEWA),
+    SPNFY(TVN_SELCHANGEDA,       NMTREEVIEWA),
+    SPNFY(TVN_GETDISPINFOA,      NMTVDISPINFOA),
+    SPNFY(TVN_SETDISPINFOA,      NMTVDISPINFOA),
+    SPNFY(TVN_ITEMEXPANDINGA,    NMTREEVIEWA),
+    SPNFY(TVN_ITEMEXPANDEDA,     NMTREEVIEWA),
+    SPNFY(TVN_BEGINDRAGA,        NMTREEVIEWA),
+    SPNFY(TVN_BEGINRDRAGA,       NMTREEVIEWA),
+    SPNFY(TVN_DELETEITEMA,       NMTREEVIEWA),
+    SPNFY(TVN_BEGINLABELEDITA,   NMTVDISPINFOA),
+    SPNFY(TVN_ENDLABELEDITA,     NMTVDISPINFOA),
+    SPNFY(TVN_KEYDOWN,           NMTVKEYDOWN),
+    SPNFY(TVN_SELCHANGINGW,      NMTREEVIEWW),
+    SPNFY(TVN_SELCHANGEDW,       NMTREEVIEWW),
+    SPNFY(TVN_GETDISPINFOW,      NMTVDISPINFOW),
+    SPNFY(TVN_SETDISPINFOW,      NMTVDISPINFOW),
+    SPNFY(TVN_ITEMEXPANDINGW,    NMTREEVIEWW),
+    SPNFY(TVN_ITEMEXPANDEDW,     NMTREEVIEWW),
+    SPNFY(TVN_BEGINDRAGW,        NMTREEVIEWW),
+    SPNFY(TVN_BEGINRDRAGW,       NMTREEVIEWW),
+    SPNFY(TVN_DELETEITEMW,       NMTREEVIEWW),
+    SPNFY(TVN_BEGINLABELEDITW,   NMTVDISPINFOW),
+    SPNFY(TVN_ENDLABELEDITW,     NMTVDISPINFOW),
     /* Tooltips       0U-520U  to  0U-549U  */
     SPNFY(TTN_GETDISPINFOA,      NMHDR),
     SPNFY(TTN_SHOW,              NMHDR),