From 06fd04d7b0c33eb5de77134bbbd1061c45dc6888 Mon Sep 17 00:00:00 2001
From: Brock Mammen <brockmammen@gmail.com>
Date: Fri, 19 Jul 2019 17:06:16 -0500
Subject: [PATCH] [SHELLFIND] Message handler for adding search results

---
 dll/win32/browseui/shellfind/CFindFolder.cpp | 5 +++++
 dll/win32/browseui/shellfind/CFindFolder.h   | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp
index 7983ee74129..f0c2d5edebf 100644
--- a/dll/win32/browseui/shellfind/CFindFolder.cpp
+++ b/dll/win32/browseui/shellfind/CFindFolder.cpp
@@ -273,6 +273,11 @@ STDMETHODIMP CFindFolder::MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam)
             *pViewMode = FVM_DETAILS;
             return S_OK;
         }
+        case SFVM_WINDOWCREATED:
+        {
+            SubclassWindow((HWND) wParam);
+            return S_OK;
+        }
     }
     return E_NOTIMPL;
 }
diff --git a/dll/win32/browseui/shellfind/CFindFolder.h b/dll/win32/browseui/shellfind/CFindFolder.h
index c9aa530b1db..a63efbc60cc 100644
--- a/dll/win32/browseui/shellfind/CFindFolder.h
+++ b/dll/win32/browseui/shellfind/CFindFolder.h
@@ -3,9 +3,9 @@
 #include "shellfind.h"
 
 #define SWM_ADD_ITEM (WM_USER + 0)
-#define SWM_UPDATE_STATUS (WM_USER + 1)
 
 class CFindFolder :
+        public CWindowImpl<CFindFolder>,
         public CComCoClass<CFindFolder, &CLSID_FindFolder>,
         public CComObjectRootEx<CComMultiThreadModelNoCS>,
         public IShellFolder2,
@@ -80,6 +80,10 @@ public:
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
+    BEGIN_MSG_MAP(CFindFolder)
+        MESSAGE_HANDLER(SWM_ADD_ITEM, AddItem)
+    END_MSG_MAP()
+
     BEGIN_COM_MAP(CFindFolder)
         COM_INTERFACE_ENTRY_IID(IID_IShellFolder2, IShellFolder2)
         COM_INTERFACE_ENTRY_IID(IID_IShellFolder, IShellFolder)
-- 
2.17.1