Vincent Povirk : hhctrl.ocx: Also take basename of folders when searching.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a16344ca1936254b021d82c4dfe6e2f6657010d4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a16344ca1936254b021d82c4df...

Author: Vincent Povirk <vincent(a)codeweavers.com>
Date:   Wed Jan 25 11:23:01 2017 -0600

hhctrl.ocx: Also take basename of folders when searching.

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/hhctrl.ocx/search.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c
index 287e6d0..d758a1b 100644
--- a/dlls/hhctrl.ocx/search.c
+++ b/dlls/hhctrl.ocx/search.c
@@ -167,14 +167,14 @@ static SearchItem *SearchCHM_Storage(SearchItem *item, IStorage *pStorage,
     }
     while (IEnumSTATSTG_Next(elem, 1, &entries, &retr) == NOERROR)
     {
+        filename = entries.pwcsName;
+        while(strchrW(filename, '/'))
+            filename = strchrW(filename, '/')+1;
         switch(entries.type) {
         case STGTY_STORAGE:
-            item = SearchCHM_Folder(item, pStorage, entries.pwcsName, needle);
+            item = SearchCHM_Folder(item, pStorage, filename, needle);
             break;
         case STGTY_STREAM:
-            filename = entries.pwcsName;
-            while(strchrW(filename, '/'))
-                filename = strchrW(filename, '/')+1;
             if(strstrW(filename, szHTMext))
             {
                 WCHAR *title = SearchCHM_File(pStorage, filename, needle);